diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7565234..6decfc0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,6 +94,7 @@ jobs: apt-get install --assume-yes --no-install-recommends \ build-essential \ gcc-${{ matrix.gcc }} \ + g++-${{ matrix.gcc }} \ libgstrtspserver-1.0-dev:${{ matrix.arch }} \ libgstreamer1.0-dev:${{ matrix.arch }} \ libgtk2.0-dev:${{ matrix.arch }} \ diff --git a/Cargo.lock b/Cargo.lock index 363e7ac..b0d6c31 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,27 +35,27 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] [[package]] name = "ansi_term" -version = "0.12.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ "winapi 0.3.9", ] [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" [[package]] name = "arrayvec" @@ -69,6 +69,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-channel" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + [[package]] name = "atty" version = "0.2.14" @@ -82,27 +93,33 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base-x" -version = "0.2.11" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bitflags" -version = "1.3.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitvec" -version = "0.19.6" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" dependencies = [ "funty", "radium", @@ -112,15 +129,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" [[package]] name = "byte-slice-cast" -version = "1.2.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e" +checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81" [[package]] name = "byteorder" @@ -128,12 +145,30 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + [[package]] name = "c_linked_list" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" +[[package]] +name = "cache-padded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" + +[[package]] +name = "cc" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" + [[package]] name = "cfb-mode" version = "0.6.0" @@ -145,13 +180,19 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.8.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" +checksum = "70a1d12766bbdd5d44caab5df04a9bffec9cd855a1b44b15de5665d70c085f94" dependencies = [ "smallvec", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -169,9 +210,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", @@ -183,10 +224,25 @@ dependencies = [ ] [[package]] -name = "const_fn" -version = "0.4.9" +name = "concurrent-queue" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" +checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +dependencies = [ + "cache-padded", +] + +[[package]] +name = "const-sha1" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" + +[[package]] +name = "const_fn" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" [[package]] name = "cookie-factory" @@ -196,80 +252,103 @@ checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] name = "crossbeam" -version = "0.8.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ - "cfg-if", - "crossbeam-channel", + "cfg-if 0.1.10", + "crossbeam-channel 0.4.4", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" dependencies = [ - "cfg-if", - "crossbeam-utils", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.5", ] [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" dependencies = [ - "cfg-if", "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", - "cfg-if", - "crossbeam-utils", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "lazy_static", + "maybe-uninit", "memoffset", - "once_cell", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", - "crossbeam-utils", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "cfg-if", - "once_cell", + "autocfg", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ + "cfg-if 1.0.0", + "lazy_static", ] [[package]] @@ -280,9 +359,9 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "either" -version = "1.8.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "env_logger" @@ -312,11 +391,24 @@ dependencies = [ ] [[package]] -name = "form_urlencoded" -version = "1.1.0" +name = "event-listener" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ + "matches", "percent-encoding", ] @@ -328,24 +420,24 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" dependencies = [ "futures-core", "futures-task", @@ -354,28 +446,29 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" dependencies = [ + "autocfg", "futures-core", "futures-task", "pin-project-lite", @@ -391,9 +484,9 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", "version_check", @@ -423,20 +516,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "wasi", ] [[package]] name = "gio" -version = "0.14.8" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0" +checksum = "86c6823b39d46d22cac2466de261f28d7f049ebc18f7b35296a42c7ed8a88325" dependencies = [ "bitflags", "futures-channel", @@ -464,9 +557,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.14.8" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4" +checksum = "dbecad7a3a898ee749d491ce2ae0decb0bce9e736f9747bc49159b1cea5d37f4" dependencies = [ "bitflags", "futures-channel", @@ -519,12 +612,12 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.17.4" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a255f142048ba2c4a4dce39106db1965abe355d23f4b5335edea43a553faa4" +checksum = "1f71e8c163945a3e0140e6b1ed10d1507da7e71196fedec568cbad92db63d762" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 1.0.0", "futures-channel", "futures-core", "futures-util", @@ -542,9 +635,9 @@ dependencies = [ [[package]] name = "gstreamer-app" -version = "0.17.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73b8d33b1bbe9f22d0cf56661a1d2a2c9a0e099ea10e5f1f347be5038f5c043" +checksum = "d2ed9c3e9ce3a406ea5026c2d4e094acd8efd61084bb107f8ff97d13f739b542" dependencies = [ "bitflags", "futures-core", @@ -572,12 +665,12 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.17.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0c1d8c62eb5d08fb80173609f2eea71d385393363146e4e78107facbd67715" +checksum = "5cf50118e1933d9e9e043036f2306d0b9660182ea61a75f266cd9fb3607b7a19" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 1.0.0", "glib", "gstreamer", "gstreamer-base-sys", @@ -638,9 +731,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server" -version = "0.17.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2714746d7bfd1b4a0770ae1db002cee49d5b36780ad24cebe78ba127a8ee6af" +checksum = "2ca2a54cc0094a0d7926c12ae58de190f5883605bbe5ff7fb78b4a3832ca85f6" dependencies = [ "bitflags", "gio", @@ -711,9 +804,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.17.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81704feeb3e8599913bdd1e738455c2991a01ff4a1780cb62200993e454cc3e" +checksum = "8188ba998999a4a16005c3984812807ff882a87f5f3457c3d5bbbfcbdf631ebd" dependencies = [ "glib-sys", "gobject-sys", @@ -739,6 +832,17 @@ dependencies = [ "libc", ] +[[package]] +name = "http" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.1", +] + [[package]] name = "humantime" version = "2.1.0" @@ -756,21 +860,11 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "if_chain" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" +checksum = "1f7280c75fb2e2fc47080ec80ccc481376923acb04501957fc38f935c3de5088" [[package]] name = "indoc" @@ -806,18 +900,33 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bf247779e67a9082a4790b45e71ac7cfd1321331a5c856a74a9faebdab78d0" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "js-sys" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +dependencies = [ + "wasm-bindgen", +] [[package]] name = "lazy_static" @@ -833,43 +942,50 @@ checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", "bitflags", - "cfg-if", + "cfg-if 1.0.0", "ryu", "static_assertions", ] [[package]] name = "libc" -version = "0.2.132" +version = "0.2.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" [[package]] name = "local-ip-address" -version = "0.4.8" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b43d3cb4e084406601465db50bfb3e7e4823092f7c836d962df6d5f5597b4802" +checksum = "8b143c6ef86e36328caa40a7578e95d1544aca8a1740235fd2b416a69441a5c7" dependencies = [ "libc", + "memalloc", "neli", "thiserror", - "windows-sys", + "windows", ] [[package]] name = "log" -version = "0.4.17" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] name = "matches" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "md5" @@ -878,20 +994,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] -name = "memchr" -version = "2.5.0" +name = "memalloc" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ "autocfg", ] +[[package]] +name = "mio" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +dependencies = [ + "libc", + "log", + "miow", + "ntapi", + "winapi 0.3.9", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "mqttbytes" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d710573f2144656d97b82b7ad85c464a1c35ae065278fbee545d40034ec1de5a" +dependencies = [ + "bytes", +] + [[package]] name = "muldiv" version = "1.0.0" @@ -918,6 +1071,7 @@ dependencies = [ "cfb-mode", "cookie-factory", "crossbeam", + "crossbeam-channel 0.5.1", "env_logger", "err-derive", "gstreamer", @@ -931,10 +1085,12 @@ dependencies = [ "neolink_core", "nom", "regex", + "rumqttc", "serde", "socket2", "structopt", "time", + "tokio", "toml", "validator", "validator_derive", @@ -952,7 +1108,7 @@ dependencies = [ "cfb-mode", "cookie-factory", "crc32fast", - "crossbeam-channel", + "crossbeam-channel 0.5.1", "env_logger", "err-derive", "get_if_addrs", @@ -985,10 +1141,19 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "ntapi" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg", "num-traits", @@ -996,9 +1161,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" dependencies = [ "autocfg", "num-integer", @@ -1007,18 +1172,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.14.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "opaque-debug" @@ -1028,21 +1193,21 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "paste" -version = "1.0.9" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -1052,15 +1217,21 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + +[[package]] +name = "pollster" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb20dcc30536a1508e75d47dd0e399bb2fe7354dcf35cda9127f2bf1ed92e30e" [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "pretty-hex" @@ -1070,11 +1241,10 @@ checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" dependencies = [ - "once_cell", "thiserror", "toml", ] @@ -1111,18 +1281,18 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" dependencies = [ - "unicode-ident", + "unicode-xid", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] @@ -1135,13 +1305,14 @@ checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "rand" -version = "0.8.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", "rand_chacha", "rand_core", + "rand_hc", ] [[package]] @@ -1156,18 +1327,27 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ "getrandom", ] [[package]] -name = "regex" -version = "1.6.0" +name = "rand_hc" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ + "rand_core", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", @@ -1176,9 +1356,42 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "rumqttc" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd4cf48aa8588d907fc835c47fbc8ef01dc30552467fbf0123cd794f77fd2072" +dependencies = [ + "async-channel", + "bytes", + "http", + "log", + "mqttbytes", + "pollster", + "thiserror", + "tokio", + "tokio-rustls", + "webpki", +] [[package]] name = "rustc_version" @@ -1190,16 +1403,29 @@ dependencies = [ ] [[package]] -name = "rustversion" -version = "1.0.9" +name = "rustls" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64", + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustversion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "scopeguard" @@ -1207,6 +1433,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "semver" version = "0.9.0" @@ -1224,18 +1460,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.144" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" dependencies = [ "proc-macro2", "quote", @@ -1244,44 +1480,32 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" dependencies = [ - "itoa", + "itoa 0.4.7", "ryu", "serde", ] [[package]] name = "sha1" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" [[package]] name = "smallvec" -version = "1.9.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" @@ -1289,11 +1513,17 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "winapi 0.3.9", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "standback" version = "0.2.17" @@ -1366,9 +1596,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.26" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" dependencies = [ "clap", "lazy_static", @@ -1377,9 +1607,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.18" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" dependencies = [ "heck", "proc-macro-error", @@ -1408,20 +1638,20 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" dependencies = [ "proc-macro2", "quote", - "unicode-ident", + "unicode-xid", ] [[package]] name = "synstructure" -version = "0.12.6" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" dependencies = [ "proc-macro2", "quote", @@ -1438,7 +1668,7 @@ dependencies = [ "anyhow", "cfg-expr", "heck", - "itertools 0.10.4", + "itertools 0.10.1", "pkg-config", "strum", "strum_macros", @@ -1455,9 +1685,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "termcolor" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] @@ -1473,18 +1703,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.35" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85" +checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.35" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783" +checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" dependencies = [ "proc-macro2", "quote", @@ -1531,9 +1761,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" dependencies = [ "tinyvec_macros", ] @@ -1545,73 +1775,114 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] -name = "toml" -version = "0.5.9" +name = "tokio" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" +dependencies = [ + "bytes", + "libc", + "memchr", + "mio", + "pin-project-lite", + "tokio-macros", + "winapi 0.3.9", +] + +[[package]] +name = "tokio-macros" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] [[package]] name = "typenum" -version = "1.15.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" +dependencies = [ + "matches", +] [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "unindent" -version = "0.1.10" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna", + "matches", "percent-encoding", ] @@ -1621,7 +1892,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e60fadf92c22236de4028ceb0b8af50ed3430d41ad43d7a7d63b6bd1a8f47c38" dependencies = [ - "idna 0.2.3", + "idna", "lazy_static", "regex", "serde", @@ -1659,35 +1930,35 @@ checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" dependencies = [ "bumpalo", + "lazy_static", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -1696,9 +1967,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1706,9 +1977,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ "proc-macro2", "quote", @@ -1719,9 +1990,29 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" + +[[package]] +name = "web-sys" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] [[package]] name = "winapi" @@ -1761,47 +2052,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "68088239696c06152844eadc03d262f088932cce50c67e4ace86e19d95e976fe" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "const-sha1", + "windows_gen", + "windows_macros", ] [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows_gen" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "cf583322dc423ee021035b358e535015f7fd163058a31e2d37b99a939141121d" [[package]] -name = "windows_i686_gnu" -version = "0.36.1" +name = "windows_macros" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "58acfb8832e9f707f8997bd161e537a1c1f603e60a5bd9c3cf53484fdcc998f3" +dependencies = [ + "syn", + "windows_gen", +] [[package]] name = "wyz" diff --git a/Cargo.toml b/Cargo.toml index bbe1afc..fe9d4d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,4 +39,7 @@ xml-rs = "0.8" validator = "0.10" validator_derive = "0.10" byte-slice-cast = "1.0.0" +rumqttc = "0.8.0" +tokio = { version = "1.0", features = ["rt", "macros", "io-util"] } +crossbeam-channel = "0.5.1" anyhow = "1.0.42" diff --git a/crates/core/src/bc_protocol.rs b/crates/core/src/bc_protocol.rs index ed51272..ca611b4 100644 --- a/crates/core/src/bc_protocol.rs +++ b/crates/core/src/bc_protocol.rs @@ -27,6 +27,7 @@ pub(crate) use connection::*; pub use errors::Error; pub use ledstate::LightState; pub use pirstate::PirState; +pub use motion::{MotionOutput, MotionOutputError, MotionStatus}; pub use resolution::*; pub use motion::{MotionOutput, MotionOutputError, MotionStatus}; pub use stream::{Stream, StreamOutput, StreamOutputError}; diff --git a/src/cmdline.rs b/src/cmdline.rs index a550b9d..46d9bc5 100644 --- a/src/cmdline.rs +++ b/src/cmdline.rs @@ -22,4 +22,5 @@ pub enum Command { Reboot(super::reboot::Opt), Pir(super::pir::Opt), Talk(super::talk::Opt), + Mqtt(super::mqtt::Opt), } diff --git a/src/config.rs b/src/config.rs index 013c3de..7e6582e 100644 --- a/src/config.rs +++ b/src/config.rs @@ -73,6 +73,10 @@ pub(crate) struct CameraConfig { #[validate(range(min = 0, max = 31, message = "Invalid channel", code = "channel_id"))] #[serde(default = "default_channel_id")] pub(crate) channel_id: u8, + + #[validate] + #[serde(default = "default_mqtt")] + pub(crate) mqtt: Option, } #[derive(Debug, Deserialize, Validate, Clone)] @@ -85,6 +89,38 @@ pub(crate) struct UserConfig { pub(crate) pass: String, } +#[derive(Debug, Deserialize, Clone, Validate)] +#[validate(schema(function = "validate_mqtt_config", skip_on_field_errors = true))] +pub(crate) struct MqttConfig { + #[serde(alias = "server")] + pub(crate) broker_addr: String, + + pub(crate) port: u16, + + #[serde(default)] + pub(crate) credentials: Option<(String, String)>, + + #[serde(default)] + pub(crate) ca: Option, + + #[serde(default)] + pub(crate) client_auth: Option<(std::path::PathBuf, std::path::PathBuf)>, +} + +fn validate_mqtt_config(config: &MqttConfig) -> Result<(), ValidationError> { + if config.ca.is_some() && config.client_auth.is_some() { + Err(ValidationError::new( + "Cannot have both ca and client_auth set", + )) + } else { + Ok(()) + } +} + +fn default_mqtt() -> Option { + None +} + fn default_bind_addr() -> String { "0.0.0.0".to_string() } diff --git a/src/errors.rs b/src/errors.rs new file mode 100644 index 0000000..09e2cee --- /dev/null +++ b/src/errors.rs @@ -0,0 +1,16 @@ +use err_derive::Error; + +#[derive(Debug, Error)] +#[allow(clippy::large_enum_variant)] +pub enum Error { + #[error(display = "RTSP Error")] + Rtsp(#[error(source)] super::rtsp::Error), + #[error(display = "Status LED Error")] + StatusLight(#[error(source)] super::statusled::Error), + #[error(display = "Reboot Error")] + Reboot(#[error(source)] super::reboot::Error), + #[error(display = "Talk Error")] + Talk(#[error(source)] super::talk::Error), + #[error(display = "Talk Error")] + Mqtt(#[error(source)] super::mqtt::Error), +} diff --git a/src/main.rs b/src/main.rs index 5068eee..2d99761 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,6 +17,7 @@ use validator::Validate; mod cmdline; mod config; mod pir; +mod mqtt; mod reboot; mod rtsp; mod statusled; @@ -71,6 +72,9 @@ fn main() -> Result<()> { Some(Command::Talk(opts)) => { talk::main(opts, config)?; } + Some(Command::Mqtt(opts)) => { + mqtt::main(opts, config)?; + } } Ok(()) diff --git a/src/mqtt/app.rs b/src/mqtt/app.rs new file mode 100644 index 0000000..18042df --- /dev/null +++ b/src/mqtt/app.rs @@ -0,0 +1,35 @@ +use std::collections::HashSet; +use std::sync::{Arc, Mutex}; + +// Handles app wide things like aborting all connections +pub(crate) struct App { + aborters: Arc>>, +} + +impl App { + pub(crate) fn new() -> Self { + Self { + aborters: Default::default(), + } + } + + // Abort at a level + // e.g. about camera_event_loop + pub(crate) fn abort(&self, level: &str) { + let mut aborters = self.aborters.lock().unwrap(); + aborters.insert(level.to_string()); + } + + // Checks if any level has aborted + // e.g. app:camera_a::camera_event_loop + // will check if app, camera_a or camera_event_loop has been aborted + pub(crate) fn running(&self, levels: &str) -> bool { + let aborters = self.aborters.lock().unwrap(); + for level in levels.split(':') { + if aborters.contains(&level.to_string()) { + return false; + } + } + true + } +} diff --git a/src/mqtt/cmdline.rs b/src/mqtt/cmdline.rs new file mode 100644 index 0000000..f6e02a7 --- /dev/null +++ b/src/mqtt/cmdline.rs @@ -0,0 +1,10 @@ +use std::path::PathBuf; +use structopt::StructOpt; + +/// The reboot command will reboot the camera +#[derive(StructOpt, Debug)] +pub struct Opt { + /// The path to the config file + #[structopt(short, long, parse(from_os_str))] + pub config: PathBuf, +} diff --git a/src/mqtt/event_cam.rs b/src/mqtt/event_cam.rs new file mode 100644 index 0000000..81e9851 --- /dev/null +++ b/src/mqtt/event_cam.rs @@ -0,0 +1,259 @@ +use super::App; +use crate::config::CameraConfig; +use crate::utils::AddressOrUid; +use anyhow::{anyhow, Context, Result}; +use crossbeam_channel::{unbounded, Receiver, Sender, TryRecvError}; +use log::*; +use neolink_core::bc_protocol::{ + BcCamera, Error as BcError, LightState, MotionOutput, MotionOutputError, MotionStatus, +}; +use std::sync::{Arc, Mutex}; + +pub(crate) enum Messages { + None, + Login, + MotionStop, + MotionStart, + Reboot, + StatusLedOn, + StatusLedOff, + IRLedOn, + IRLedOff, + IRLedAuto, +} + +pub(crate) struct EventCam<'a> { + config: &'a CameraConfig, + app: Arc, + channel_out: Arc>>>, + channel_in: Arc>>>, +} + +impl<'a> EventCam<'a> { + pub(crate) fn new(config: &'a CameraConfig, app: Arc) -> Self { + Self { + config, + app, + channel_out: Arc::new(Mutex::new(None)), + channel_in: Arc::new(Mutex::new(None)), + } + } + + pub(crate) fn poll(&self) -> Result { + if let Ok(ref mut channel_out) = self.channel_out.try_lock() { + if let Some(channel_out) = channel_out.as_mut() { + channel_out.recv().context("Camera failed to poll") + } else { + Ok(Messages::None) + } + } else { + Ok(Messages::None) + } + } + + pub(crate) fn send_message(&self, msg: Messages) -> Result<()> { + if let Ok(ref mut channel_in) = self.channel_in.lock() { + if let Some(channel_in) = channel_in.as_mut() { + channel_in + .send(msg) + .context("Failed to send message from camera") + } else { + Err(anyhow!("Failed to send camera data over crossbeam")) + } + } else { + Err(anyhow!("Failed to lock")) + } + } + + pub(crate) fn abort(&self) { + self.app.abort(&self.config.name); + } + + pub(crate) fn start_listening(&self) { + let loop_config = self.config; + + // Channels from the camera + let (tx, rx) = unbounded(); + let loop_tx = Arc::new(Mutex::new(tx)); + *self.channel_out.lock().unwrap() = Some(rx); + + // Channels to the camera + let (stx, srx) = unbounded(); + let loop_rx = Arc::new(Mutex::new(srx)); + *self.channel_in.lock().unwrap() = Some(stx); + + while self.app.running(&self.config.name) { + // Ignore errors and just loop + let _ = Self::cam_run( + loop_config, + loop_tx.clone(), + loop_rx.clone(), + self.app.clone(), + ); + } + } + + fn cam_run( + camera_config: &CameraConfig, + tx: Arc>>, + rx: Arc>>, + app: Arc, + ) -> Result<()> { + let camera_addr = + AddressOrUid::new(&camera_config.camera_addr, &camera_config.camera_uid).unwrap(); + + info!( + "{}: Connecting to camera at {}", + camera_config.name, camera_addr + ); + let mut camera = camera_addr + .connect_camera(camera_config.channel_id) + .with_context(|| { + format!( + "Failed to connect to camera {} at {} on channel {}", + camera_config.name, camera_addr, camera_config.channel_id + ) + })?; + + info!("{}: Logging in", camera_config.name); + camera + .login(&camera_config.username, camera_config.password.as_deref()) + .context("Failed to login to the camera")?; + info!("{}: Connected and logged in", camera_config.name); + + (tx.lock().map_err(|_| anyhow!("Failed to lock"))?).send(Messages::Login)?; + + // Shararble cameras + let arc_cam = Arc::new(camera); + let cam_motion = arc_cam.clone(); + let cam_mesg = arc_cam; + + let mut motion_callback = MotionCallback { + app: app.clone(), + tx, + name: camera_config.name.to_string(), + }; + + let mut message_handler = MessageHandler { + app: app.clone(), + rx, + camera: cam_mesg, + name: camera_config.name.to_string(), + }; + + let _ = crossbeam::scope(|s| { + info!("{}: Listening to Camera Motion", camera_config.name); + s.spawn(|_| { + let _ = cam_motion.listen_on_motion(&mut motion_callback); + // If listen_on_motion returns then camera disconnect + app.abort(&camera_config.name); + }); + + info!("{}: Setting up camera actions", camera_config.name); + s.spawn(|_| { + let _ = message_handler.listen(); + }); + }); + + Ok(()) + } +} + +struct MotionCallback { + app: Arc, + tx: Arc>>, + name: String, +} + +impl MotionOutput for MotionCallback { + fn motion_recv(&mut self, motion_status: MotionStatus) -> MotionOutputError { + if self.app.running(&format!("app:{}", self.name)) { + match motion_status { + MotionStatus::Start => { + (self + .tx + .lock() + .map_err(|_| BcError::Other("Failed to lock mutex"))?) + .send(Messages::MotionStart) + .map_err(|_| BcError::Other("Failed to send Message"))?; + } + MotionStatus::Stop => { + (self + .tx + .lock() + .map_err(|_| BcError::Other("Failed to lock mutex"))?) + .send(Messages::MotionStop) + .map_err(|_| BcError::Other("Failed to send Message"))?; + } + _ => {} + } + Ok(true) + } else { + Ok(false) + } + } +} + +struct MessageHandler { + app: Arc, + rx: Arc>>, + camera: Arc, + name: String, +} + +impl MessageHandler { + fn listen(&mut self) { + while self.app.running(&format!("app:{}", self.name)) { + // Try and lock don't worry if not + if let Ok(ref mut channel_out) = self.rx.try_lock() { + match channel_out.try_recv() { + Ok(message) => match message { + Messages::Reboot => { + if self.camera.reboot().is_err() { + error!("Failed to reboot the camera"); + self.abort() + } + } + Messages::StatusLedOn => { + if self.camera.led_light_set(true).is_err() { + error!("Failed to turn on the status light"); + self.abort(); + } + } + Messages::StatusLedOff => { + if self.camera.led_light_set(false).is_err() { + error!("Failed to turn off the status light"); + self.abort(); + } + } + Messages::IRLedOn => { + if self.camera.irled_light_set(LightState::On).is_err() { + error!("Failed to turn on the status light"); + self.abort(); + } + } + Messages::IRLedOff => { + if self.camera.irled_light_set(LightState::Off).is_err() { + error!("Failed to turn on the status light"); + self.abort(); + } + } + Messages::IRLedAuto => { + if self.camera.irled_light_set(LightState::Auto).is_err() { + error!("Failed to turn on the status light"); + self.abort(); + } + } + _ => {} + }, + Err(TryRecvError::Empty) => (), + Err(TryRecvError::Disconnected) => self.abort(), + } + } + } + } + + fn abort(&self) { + self.app.abort(&self.name); + } +} diff --git a/src/mqtt/mod.rs b/src/mqtt/mod.rs new file mode 100644 index 0000000..453e491 --- /dev/null +++ b/src/mqtt/mod.rs @@ -0,0 +1,163 @@ +use log::*; +/// +/// # Neolink Reboot +/// +/// This module handles the reboot subcommand +/// +/// The subcommand attepts to reboot the camera. +/// +/// # Usage +/// +/// ```bash +/// neolink reboot --config=config.toml CameraName +/// ``` +/// +use std::sync::Arc; + +mod app; +mod cmdline; +mod event_cam; +mod mqttc; + +use crate::config::{CameraConfig, Config, MqttConfig}; +use anyhow::Result; +pub(crate) use app::App; +pub(crate) use cmdline::Opt; +use event_cam::EventCam; +pub(crate) use event_cam::Messages; +use mqttc::{Mqtt, MqttReplyRef}; + +/// Entry point for the reboot subcommand +/// +/// Opt is the command line options +pub(crate) fn main(_: Opt, config: Config) -> Result<()> { + let app = App::new(); + let arc_app = Arc::new(app); + + let _ = crossbeam::scope(|s| { + for camera_config in &config.cameras { + if let Some(mqtt_config) = camera_config.mqtt.as_ref() { + let loop_arc_app = arc_app.clone(); + info!("{}: Setting up mqtt", camera_config.name); + s.spawn(move |_| { + while loop_arc_app.running("app") { + let _ = listen_on_camera(camera_config, mqtt_config, loop_arc_app.clone()); + } + }); + } + } + }); + + Ok(()) +} + +fn listen_on_camera( + cam_config: &CameraConfig, + mqtt_config: &MqttConfig, + app: Arc, +) -> Result<()> { + // Camera thread + let event_cam = EventCam::new(cam_config, app.clone()); + let mqtt = Mqtt::new(mqtt_config, &cam_config.name, app.clone()); + + let _ = crossbeam::scope(|s| { + // Start listening to camera events + s.spawn(|_| { + event_cam.start_listening(); // Loop forever + event_cam.abort(); // Just to ensure everything aborts + }); + + // Start listening to mqtt events + s.spawn(|_| { + let _ = mqtt.start().is_err(); + event_cam.abort(); + }); + + // Listen on camera messages and post on mqtt + s.spawn(|_| { + while app.running(&format!("app: {}", cam_config.name)) { + if let Ok(msg) = event_cam.poll() { + match msg { + Messages::Login => { + if mqtt.send_message("status", "connected", true).is_err() { + error!("Failed to post connect over MQTT for {}", cam_config.name); + } + } + Messages::MotionStop => { + if mqtt.send_message("status/motion", "off", true).is_err() { + error!("Failed to publish motion stop for {}", cam_config.name); + } + } + Messages::MotionStart => { + if mqtt.send_message("status/motion", "on", true).is_err() { + error!("Failed to publish motion start for {}", cam_config.name); + } + } + _ => {} + } + } + } + }); + + // Listen on mqtt messages and post on camera + s.spawn(|_| { + while app.running(&format!("app: {}", cam_config.name)) { + if let Ok(msg) = mqtt.poll() { + match msg.as_ref() { + MqttReplyRef { + topic: "control/led", + message: "on", + } => { + if event_cam.send_message(Messages::StatusLedOn).is_err() { + error!("Failed to set camera status light on"); + } + } + MqttReplyRef { + topic: "control/led", + message: "off", + } => { + if event_cam.send_message(Messages::StatusLedOff).is_err() { + error!("Failed to set camera status light off"); + } + } + MqttReplyRef { + topic: "control/ir", + message: "on", + } => { + if event_cam.send_message(Messages::IRLedOn).is_err() { + error!("Failed to set camera status light off"); + } + } + MqttReplyRef { + topic: "control/ir", + message: "off", + } => { + if event_cam.send_message(Messages::IRLedOff).is_err() { + error!("Failed to set camera status light off"); + } + } + MqttReplyRef { + topic: "control/ir", + message: "auto", + } => { + if event_cam.send_message(Messages::IRLedAuto).is_err() { + error!("Failed to set camera status light off"); + } + } + MqttReplyRef { + topic: "control/reboot", + .. + } => { + if event_cam.send_message(Messages::Reboot).is_err() { + error!("Failed to set camera status light off"); + } + } + _ => {} + } + } + } + }); + }); + + Ok(()) +} diff --git a/src/mqtt/mqttc.rs b/src/mqtt/mqttc.rs new file mode 100644 index 0000000..b38abd8 --- /dev/null +++ b/src/mqtt/mqttc.rs @@ -0,0 +1,251 @@ +use super::App; +use crate::config::MqttConfig; +use anyhow::{Context, Result}; +use crossbeam_channel::{unbounded, Receiver, RecvError, Sender}; +use log::*; +use rumqttc::{ + Client, ClientError, ConnectReturnCode, Connection, Event, Incoming, Key, LastWill, + MqttOptions, Publish, QoS, TlsConfiguration, Transport, +}; +use std::sync::{Arc, Mutex}; + +pub(crate) struct Mqtt { + app: Arc, + client: Mutex, + connection: Mutex, + name: String, + incoming: (Sender, Receiver), + msg_channel: (Sender, Receiver), + drop_message: Mutex>, +} + +pub(crate) struct MqttReply { + pub(crate) topic: String, + pub(crate) message: String, +} + +impl MqttReply { + pub(crate) fn as_ref(&self) -> MqttReplyRef { + MqttReplyRef { + topic: &self.topic, + message: &self.message, + } + } +} + +pub(crate) struct MqttReplyRef<'a> { + pub(crate) topic: &'a str, + pub(crate) message: &'a str, +} + +impl Mqtt { + pub(crate) fn new(config: &MqttConfig, name: &str, app: Arc) -> Arc { + let incoming = unbounded::(); + let msg_channel = unbounded::(); + let mut mqttoptions = MqttOptions::new( + format!("Neolink-{}", name), + &config.broker_addr, + config.port, + ); + + // Use TLS if ca path is set + if let Some(ca_path) = &config.ca { + if let Ok(ca) = std::fs::read(ca_path) { + // Use client_auth if they have cert and key + let client_auth = if let Some((cert_path, key_path)) = &config.client_auth { + if let (Ok(cert_buf), Ok(key_buf)) = + (std::fs::read(cert_path), std::fs::read(key_path)) + { + Some((cert_buf, Key::RSA(key_buf))) + } else { + error!("Failed to set client tls"); + None + } + } else { + None + }; + + let transport = Transport::Tls(TlsConfiguration::Simple { + ca, + alpn: None, + client_auth, + }); + mqttoptions.set_transport(transport); + } else { + error!("Failed to set CA"); + } + }; + + if let Some((username, password)) = &config.credentials { + mqttoptions.set_credentials(username, password); + } + + mqttoptions.set_keep_alive(5); + + // On unclean disconnect send this + mqttoptions.set_last_will(LastWill::new( + format!("neolink/{}/status", name), + "offline", + QoS::AtLeastOnce, + true, + )); + + let (client, connection) = Client::new(mqttoptions, 10); + + let me = Self { + app: app.clone(), + client: Mutex::new(client), + connection: Mutex::new(connection), + name: name.to_string(), + incoming, + msg_channel, + // Send the drop message on clean disconnect + drop_message: Mutex::new(Some(MqttReply { + topic: "status".to_string(), + message: "offline".to_string(), + })), + }; + + let arc_me = Arc::new(me); + + // Start the mqtt server + let mqtt_running = arc_me.clone(); + let mqtt_app = app.clone(); + let mqtt_name = name.to_string(); + std::thread::spawn(move || { + let _ = (*mqtt_running).start(); + mqtt_app.abort(&mqtt_name) + }); + + // Start polling messages + info!("{}: Starting listening to mqtt", name); + let mqtt_read_app = app; + let mqtt_reading = arc_me.clone(); + let mqtt_read_name = name.to_string(); + std::thread::spawn(move || { + while mqtt_read_app.running(&format!("app:{}", mqtt_read_name)) { + if (*mqtt_reading).handle_message().is_err() { + error!( + "Failed to get messages from mqtt client {}", + (mqtt_read_name) + ); + } + } + }); + + arc_me + } + + #[allow(unused)] + pub(crate) fn set_drop_message(&mut self, topic: &str, message: &str) { + self.drop_message.lock().unwrap().replace(MqttReply { + topic: topic.to_string(), + message: message.to_string(), + }); + } + + fn subscribe(&self) -> Result<(), ClientError> { + let mut client = self.client.lock().unwrap(); + client.subscribe(format!("neolink/{}/#", self.name), QoS::AtMostOnce)?; + Ok(()) + } + + fn update_status(&self) -> Result<(), ClientError> { + self.send_message("status", "disconnected", true)?; + Ok(()) + } + + pub fn send_message( + &self, + sub_topic: &str, + message: &str, + retain: bool, + ) -> Result<(), ClientError> { + let mut client = self.client.lock().unwrap(); + client.publish( + format!("neolink/{}/{}", self.name, sub_topic), + QoS::AtLeastOnce, + retain, + message, + )?; + Ok(()) + } + + fn handle_message(&self) -> Result<(), RecvError> { + let (_, receiver) = &self.incoming; + let published_message = receiver.recv()?; + + if let Some(sub_topic) = published_message + .topic + .strip_prefix(&format!("neolink/{}/", &self.name)) + { + if self + .msg_channel + .0 + .send(MqttReply { + topic: sub_topic.to_string(), + message: String::from_utf8_lossy(published_message.payload.as_ref()) + .into_owned(), + }) + .is_err() + { + error!("Failed to send messages up the mqtt msg channel"); + } + } + + Ok(()) + } + + pub fn get_message_listener(&self) -> Receiver { + self.msg_channel.1.clone() + } + + pub(crate) fn poll(&self) -> Result { + self.get_message_listener() + .recv() + .context("Mqtt Polling error") + } + + pub(crate) fn start(&self) -> Result<()> { + // This acts as an event loop + let mut connection = self.connection.lock().unwrap(); + let (sender, _) = &self.incoming; + info!("Starting MQTT Client for {}", self.name); + while self.app.running(&format!("app:{}", self.name)) { + for (_i, notification) in connection.iter().enumerate() { + if let Ok(notification) = notification { + match notification { + Event::Incoming(Incoming::ConnAck(connected)) => { + if ConnectReturnCode::Success == connected.code { + self.update_status().context("Failed to update status")?; + // We succesfully logged in. Now ask for the cameras subscription. + self.subscribe().context("Failed to subscribe")?; + } + } + Event::Incoming(Incoming::Publish(published_message)) => { + if sender.send(published_message).is_err() { + error!("Failed to publish motion message on mqtt"); + } + } + _ => {} + } + } + } + } + Ok(()) + } +} + +impl Drop for Mqtt { + fn drop(&mut self) { + let drop_message = self.drop_message.lock().unwrap(); + if let Some(drop_message) = drop_message.as_ref() { + if self + .send_message(&drop_message.topic, &drop_message.message, true) + .is_err() + { + error!("Failed to send offline message to mqtt"); + } + } + } +} diff --git a/src/statusled/mod.rs b/src/statusled/mod.rs index ed50013..d1efd17 100644 --- a/src/statusled/mod.rs +++ b/src/statusled/mod.rs @@ -27,7 +27,7 @@ pub(crate) use cmdline::Opt; /// /// Opt is the command line options pub(crate) fn main(opt: Opt, config: Config) -> Result<()> { - let mut camera = find_and_connect(&config, &opt.camera)?; + let camera = find_and_connect(&config, &opt.camera)?; camera .led_light_set(opt.on)