From 78375b220dbf3ba20e8edb1af3036f8e62a6ca5c Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 15 Apr 2023 08:05:58 +0700 Subject: [PATCH] Updates of all packages --- Cargo.lock | 1361 ++++++++++++------------- Cargo.toml | 38 +- Dockerfile | 2 + crates/core/Cargo.toml | 49 +- crates/core/src/bc/xml_crypto.rs | 15 +- crates/core/src/bc_protocol/errors.rs | 16 + crates/core/src/bc_protocol/time.rs | 37 +- crates/core/src/bcmedia/de.rs | 22 +- crates/core/src/bcudp/de.rs | 17 +- crates/decoder/Cargo.toml | 8 +- crates/decoder/src/main.rs | 12 +- deny.toml | 34 +- src/cmdline.rs | 15 +- src/image/cmdline.rs | 7 +- src/main.rs | 4 +- src/mqtt/cmdline.rs | 4 +- src/mqtt/mqttc.rs | 3 +- src/pir/cmdline.rs | 6 +- src/reboot/cmdline.rs | 4 +- src/rtsp/cmdline.rs | 4 +- src/rtsp/gst/factory.rs | 24 +- src/rtsp/gst/server.rs | 9 +- src/rtsp/states/loggedin.rs | 2 +- src/statusled/cmdline.rs | 6 +- src/talk/cmdline.rs | 13 +- src/talk/gst.rs | 17 +- 26 files changed, 848 insertions(+), 881 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed309b0..e81c085 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,33 +4,13 @@ version = 3 [[package]] name = "aes" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ - "aes-soft", - "aesni", + "cfg-if", "cipher", -] - -[[package]] -name = "aes-soft" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ - "cipher", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ - "cipher", - "opaque-debug", + "cpufeatures", ] [[package]] @@ -46,33 +26,67 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.11.0" +name = "anstream" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" dependencies = [ - "winapi 0.3.9", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "assert_matches" @@ -80,51 +94,23 @@ 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 = "atomic_refcell" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "857253367827bd9d0fd973f0ef15506a96e79e41b0ad7aa691203a4e3214f6c8" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", -] - [[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - [[package]] name = "base64" -version = "0.13.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "bitflags" @@ -132,23 +118,11 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitvec" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byte-slice-cast" @@ -164,9 +138,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "c_linked_list" @@ -174,32 +148,26 @@ 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" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfb-mode" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6975e91054798d325f85f50115056d7deccf6817fe7f947c438ee45b119632" +checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330" dependencies = [ "cipher", ] [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" dependencies = [ "smallvec", ] @@ -212,48 +180,61 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cipher" -version = "0.2.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clap" -version = "2.33.3" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" dependencies = [ - "ansi_term", - "atty", + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" +dependencies = [ + "anstream", + "anstyle", "bitflags", + "clap_lex", "strsim", - "textwrap 0.11.0", - "unicode-width", - "vec_map", ] [[package]] -name = "concurrent-queue" -version = "1.2.2" +name = "clap_derive" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ - "cache-padded", + "heck", + "proc-macro2", + "quote", + "syn 2.0.15", ] [[package]] -name = "const-sha1" -version = "0.2.0" +name = "clap_lex" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] -name = "const_fn" -version = "0.4.8" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "cookie-factory" @@ -262,19 +243,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" [[package]] -name = "crc32fast" -version = "1.2.1" +name = "core-foundation" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -282,12 +288,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", - "lazy_static", ] [[package]] @@ -315,6 +320,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "delegate" version = "0.9.0" @@ -323,23 +338,17 @@ checksum = "d358e0ec5c59a5e1603b933def447096886121660fc680dc1e64a0753981fe3c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "env_logger" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -347,15 +356,15 @@ dependencies = [ [[package]] name = "err-derive" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4" +checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" dependencies = [ "proc-macro-error", "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", "synstructure", ] @@ -380,12 +389,6 @@ dependencies = [ "libc", ] -[[package]] -name = "event-listener" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" - [[package]] name = "fastrand" version = "1.9.0" @@ -396,32 +399,32 @@ dependencies = [ ] [[package]] -name = "fnv" -version = "1.0.7" +name = "flume" +version = "0.10.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin 0.9.8", +] [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "futures" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -434,9 +437,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -444,15 +447,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -461,38 +464,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -514,9 +517,9 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -546,20 +549,22 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", + "wasm-bindgen", ] [[package]] name = "gio" -version = "0.16.7" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" +checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" dependencies = [ "bitflags", "futures-channel", @@ -577,9 +582,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.16.3" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" dependencies = [ "glib-sys", "gobject-sys", @@ -590,9 +595,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd4df61a866ed7259d6189b8bcb1464989a77f1d85d25d002279bbe9dd38b2f" +checksum = "6cbc688e6c33f2fd89d83864a9e6caaaef83b5f608922b99ac184e436d15b623" dependencies = [ "bitflags", "futures-channel", @@ -605,6 +610,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", + "memchr", "once_cell", "smallvec", "thiserror", @@ -612,24 +618,24 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.16.3" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf" +checksum = "726f25f054ce331f0d971a82a6a85eb4955074d6afbe479e42a63ae9f15f6ac4" dependencies = [ "anyhow", - "heck 0.4.0", + "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "glib-sys" -version = "0.16.3" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" +checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" dependencies = [ "libc", "system-deps", @@ -637,9 +643,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.16.3" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" +checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" dependencies = [ "glib-sys", "libc", @@ -648,9 +654,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.19.7" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61af131b56332ec386a8ea538d961d0c6937054fb2771a9a505395f8471b7b0e" +checksum = "4c46cc10a7ab79329feb68bef54a242ced84c3147cc1b81bc5c6140346a1dbf9" dependencies = [ "bitflags", "cfg-if", @@ -667,14 +673,15 @@ dependencies = [ "option-operations", "paste", "pretty-hex", + "smallvec", "thiserror", ] [[package]] name = "gstreamer-app" -version = "0.19.6" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604836dd21e1c7593743e7de1f95761a5508495dda5ce751a6a89db5face8468" +checksum = "aa1550d18fe8d97900148cc97d63a3212c3d53169c8469b9bf617de8953c05a8" dependencies = [ "bitflags", "futures-core", @@ -689,9 +696,9 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b0159da8dd0672c1a5507445c70c8dc483abfb63a0295cabaedd396f1d67d1" +checksum = "d7cb5375aa8c23012ec5fadde1a37b972e87680776772669d2628772867056e2" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -702,9 +709,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61a299f9ea2ca892b43e2e428b86c679875e95ba23f8ae06fd730308df630f0" +checksum = "5598bfedbff12675a6cddbe420b6a3ba5039c64aaf7df130db6339d09b634b0e" dependencies = [ "atomic_refcell", "bitflags", @@ -717,9 +724,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc3c4476e1503ae245c89fbe20060c30ec6ade5f44620bcc402cbc70a3911a1" +checksum = "26114ed96f6668380f5a1554128159e98e06c3a7a8460f216d7cd6dce28f928c" dependencies = [ "glib-sys", "gobject-sys", @@ -730,9 +737,9 @@ dependencies = [ [[package]] name = "gstreamer-net" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5511fab754d4dbb179925e772913cbf09c76311c2a59bb28727dbb75f420db2" +checksum = "17ee66adedfd176b680fb455f0b07e8cb8ab6a09120b21241399df995ae62ac7" dependencies = [ "gio", "glib", @@ -742,9 +749,9 @@ dependencies = [ [[package]] name = "gstreamer-net-sys" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e852746d59a929202b311379ce82d16f7142f1d51c22709c6597f50ae4b48c" +checksum = "56a94a90959c94b0726aa8d9416519b5fe6f91c47782d69dcaef651ddd2ce4c2" dependencies = [ "gio-sys", "glib-sys", @@ -755,9 +762,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2efcc952ef6c31cfcb7733ced81af39303f138958d8891c2ecd5a21ba50fbb1" +checksum = "61efeded67731e013622858f91e37d52b95c26c3b09cb5a82dec741aa6a5c584" dependencies = [ "bitflags", "glib", @@ -769,9 +776,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e7a60d3baad553dceeee2dea084b56db15ec246ebf704d64a87b0456488606" +checksum = "8b0a9084ed542d84073c83678a65bda4b0d7c558b49c05272140c1c1a17fc58e" dependencies = [ "bitflags", "gio", @@ -787,9 +794,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server-sys" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "855d33d1892b363a78af55cbb72a9ab7ff71f331555e0828a839ed4dd4c00690" +checksum = "9073d4b06c963a7604e32d089437f90be7eb148320c0085780c613aeb4cf83bd" dependencies = [ "gio-sys", "glib-sys", @@ -804,9 +811,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-sys" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "077120871def6cfeeb09f9f7dc6ce77e694131f7c397eb9b15e9a4655e1441a9" +checksum = "d7f4432b9046942875c7626d323c451184bffd836d75f56c505f8d04042ab32b" dependencies = [ "gio-sys", "glib-sys", @@ -819,9 +826,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f485b6f3d222c8a3c885ddffb9ac42f5f1ba4592db0f10edcaa827b0573be752" +checksum = "5bb57c03bfdbb0489bcab6e9b58a2c059e6089dcf660b424949dbe672af726bf" dependencies = [ "glib", "gstreamer", @@ -830,9 +837,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61745562c19858e0df4ce6ceaa906d72785561b52f91195838d4410945789757" +checksum = "be9ae71a2d53659f6da93a83ebe06de12c9e075604e012c45644499b24474e1a" dependencies = [ "glib-sys", "gstreamer-sys", @@ -842,9 +849,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545f52ad8a480732cc4290fd65dfe42952c8ae374fe581831ba15981fedf18a4" +checksum = "e56fe047adef7d47dbafa8bc1340fddb53c325e16574763063702fc94b5786d2" dependencies = [ "glib-sys", "gobject-sys", @@ -863,27 +870,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -906,17 +895,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "848ec2dd093df965a34b434580d94852197fc83feac5b2c1962399bbf2cb4f0b" -[[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" @@ -935,32 +913,44 @@ dependencies = [ ] [[package]] -name = "if_chain" -version = "1.0.1" +name = "idna" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7280c75fb2e2fc47080ec80ccc481376923acb04501957fc38f935c3de5088" - -[[package]] -name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "indoc-impl", - "proc-macro-hack", + "unicode-bidi", + "unicode-normalization", ] [[package]] -name = "indoc-impl" -version = "0.3.6" +name = "if_chain" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", + "autocfg", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", ] [[package]] @@ -984,22 +974,28 @@ dependencies = [ ] [[package]] -name = "itoa" +name = "is-terminal" version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -1010,19 +1006,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if", - "ryu", - "static_assertions", -] - [[package]] name = "libc" version = "0.2.141" @@ -1037,15 +1020,14 @@ checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "local-ip-address" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b143c6ef86e36328caa40a7578e95d1544aca8a1740235fd2b416a69441a5c7" +checksum = "faa9d02443a1741e9f51dafdfcbffb3863b2a89c457d762b40337d6c5153ef81" dependencies = [ "libc", - "memalloc", "neli", "thiserror", - "windows", + "windows-sys 0.42.0", ] [[package]] @@ -1060,18 +1042,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] [[package]] name = "matches" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "md5" @@ -1079,12 +1061,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" -[[package]] -name = "memalloc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" - [[package]] name = "memchr" version = "2.5.0" @@ -1092,31 +1068,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] -name = "mio" -version = "0.8.5" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", -] - -[[package]] -name = "mqttbytes" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d710573f2144656d97b82b7ad85c464a1c35ae065278fbee545d40034ec1de5a" -dependencies = [ - "bytes", + "wasi", + "windows-sys 0.45.0", ] [[package]] name = "muldiv" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] [[package]] name = "neli" @@ -1134,6 +1116,7 @@ version = "0.5.7" dependencies = [ "anyhow", "byte-slice-cast", + "clap", "crossbeam-channel", "env_logger", "futures", @@ -1147,7 +1130,6 @@ dependencies = [ "regex", "rumqttc", "serde", - "structopt", "time", "tokio", "tokio-stream", @@ -1159,7 +1141,7 @@ dependencies = [ [[package]] name = "neolink_core" -version = "0.5.7" +version = "0.5.6" dependencies = [ "aes", "assert_matches", @@ -1186,7 +1168,6 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "xml-rs", "yaserde", "yaserde_derive", ] @@ -1207,22 +1188,19 @@ dependencies = [ [[package]] name = "nom" -version = "6.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "bitvec", - "funty", - "lexical-core", "memchr", - "version_check", + "minimal-lexical", ] [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -1230,9 +1208,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-integer", @@ -1241,9 +1219,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -1258,6 +1236,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + [[package]] name = "once_cell" version = "1.17.1" @@ -1265,10 +1252,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "option-operations" @@ -1291,34 +1278,54 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall 0.2.16", "smallvec", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "paste" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -1328,21 +1335,21 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "pollster" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb20dcc30536a1508e75d47dd0e399bb2fe7354dcf35cda9127f2bf1ed92e30e" +checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" @@ -1352,12 +1359,12 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "proc-macro-crate" -version = "1.0.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit", ] [[package]] @@ -1369,7 +1376,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1384,12 +1391,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "1.0.56" @@ -1408,22 +1409,15 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", "rand_core", - "rand_hc", ] [[package]] @@ -1438,22 +1432,13 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -1474,9 +1459,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -1485,9 +1470,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "requestty" @@ -1511,7 +1496,7 @@ dependencies = [ "bitflags", "crossterm", "once_cell", - "textwrap 0.15.2", + "textwrap", "unicode-segmentation", ] @@ -1524,7 +1509,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi 0.3.9", @@ -1532,29 +1517,20 @@ dependencies = [ [[package]] name = "rumqttc" -version = "0.8.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4cf48aa8588d907fc835c47fbc8ef01dc30552467fbf0123cd794f77fd2072" +checksum = "8b616bf8b706c2a6235604f5d93f9578c37d0c6161e13898b68a1da4af2d812c" dependencies = [ - "async-channel", "bytes", - "http", + "flume", + "futures", "log", - "mqttbytes", "pollster", + "rustls-native-certs", + "rustls-pemfile", "thiserror", "tokio", "tokio-rustls", - "webpki", -] - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", ] [[package]] @@ -1573,11 +1549,10 @@ dependencies = [ [[package]] name = "rustls" -version = "0.19.1" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ - "base64", "log", "ring", "sct", @@ -1585,16 +1560,46 @@ dependencies = [ ] [[package]] -name = "rustversion" -version = "1.0.5" +name = "rustls-native-certs" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] [[package]] name = "scopeguard" @@ -1604,65 +1609,76 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "sct" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ "ring", "untrusted", ] [[package]] -name = "semver" -version = "0.9.0" +name = "security-framework" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "semver-parser", + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] -name = "semver-parser" -version = "0.7.0" +name = "security-framework-sys" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "serde" -version = "1.0.127" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.66" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ - "itoa 0.4.7", + "itoa", "ryu", "serde", ] [[package]] -name = "sha1" -version = "0.6.0" +name = "serde_spanned" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] [[package]] name = "shell-words" @@ -1693,18 +1709,18 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -1723,9 +1739,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", @@ -1738,104 +1754,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "standback" -version = "0.2.17" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "version_check", + "lock_api", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "strsim" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "structopt" -version = "0.3.22" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "unicode-ident", ] [[package]] name = "syn" -version = "1.0.107" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -1844,35 +1792,29 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] [[package]] name = "system-deps" -version = "6.0.3" +version = "6.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" dependencies = [ "cfg-expr", - "heck 0.4.0", + "heck", "pkg-config", "toml", "version-compare", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tempfile" version = "3.5.0" @@ -1888,22 +1830,13 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "textwrap" version = "0.15.2" @@ -1917,87 +1850,76 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "time" -version = "0.2.27" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "const_fn", "libc", - "standback", - "stdweb", + "num_threads", + "serde", + "time-core", "time-macros", - "version_check", - "winapi 0.3.9", ] +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + [[package]] name = "time-macros" -version = "0.1.1" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", + "time-core", ] [[package]] name = "tinyvec" -version = "1.3.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.24.2" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -2005,25 +1927,25 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "tokio-rustls" -version = "0.22.0" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", "tokio", @@ -2044,9 +1966,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -2062,18 +1984,43 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.8" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" dependencies = [ "serde", ] [[package]] -name = "tracing" -version = "0.1.34" +name = "toml_edit" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", @@ -2082,11 +2029,11 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -2097,18 +2044,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-linebreak" @@ -2122,9 +2066,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] @@ -2143,15 +2087,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "unindent" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "untrusted" @@ -2161,23 +2099,28 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna", - "matches", + "idna 0.3.0", "percent-encoding", ] [[package]] -name = "validator" -version = "0.10.1" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e60fadf92c22236de4028ceb0b8af50ed3430d41ad43d7a7d63b6bd1a8f47c38" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "validator" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32ad5bf234c7d3ad1042e5252b7eddb2c4669ee23f32c7dd0e9b7705f07ef591" dependencies = [ - "idna", + "idna 0.2.3", "lazy_static", "regex", "serde", @@ -2188,24 +2131,29 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.10.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d577dfb8ca9440a5c0b053d5a19b68f5c92ef57064bac87c8205c3f6072c20f" +checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" dependencies = [ "if_chain", "lazy_static", + "proc-macro-error", "proc-macro2", "quote", "regex", - "syn", - "validator", + "syn 1.0.109", + "validator_types", ] [[package]] -name = "vec_map" -version = "0.8.2" +name = "validator_types" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] [[package]] name = "version-compare" @@ -2215,15 +2163,9 @@ checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" @@ -2233,9 +2175,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2243,24 +2185,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2268,28 +2210,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -2297,9 +2239,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.4" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ "ring", "untrusted", @@ -2342,30 +2284,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68088239696c06152844eadc03d262f088932cce50c67e4ace86e19d95e976fe" -dependencies = [ - "const-sha1", - "windows_gen", - "windows_macros", -] - [[package]] name = "windows-sys" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -2374,7 +2305,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets 0.42.1", + "windows-targets 0.42.2", ] [[package]] @@ -2388,17 +2319,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -2418,9 +2349,9 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" @@ -2430,9 +2361,9 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" @@ -2440,17 +2371,11 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[package]] -name = "windows_gen" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf583322dc423ee021035b358e535015f7fd163058a31e2d37b99a939141121d" - [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" @@ -2460,9 +2385,9 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" @@ -2470,21 +2395,11 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[package]] -name = "windows_macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58acfb8832e9f707f8997bd161e537a1c1f603e60a5bd9c3cf53484fdcc998f3" -dependencies = [ - "syn", - "windows_gen", -] - [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" @@ -2494,9 +2409,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" @@ -2506,9 +2421,9 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" @@ -2516,18 +2431,21 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] + [[package]] name = "winsplit" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ab703352da6a72f35c39a533526393725640575bb211f61987a2748323ad956" -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "xml-rs" version = "0.8.4" @@ -2536,9 +2454,9 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "yaserde" -version = "0.3.16" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe81055b36d926da70850a7c1a9bc72eff184659da29e008ce9f2af4bfee7c89" +checksum = "4bf52af554a50b866aaad63d7eabd6fca298db3dfe49afd50b7ba5a33dfa0582" dependencies = [ "log", "xml-rs", @@ -2546,11 +2464,14 @@ dependencies = [ [[package]] name = "yaserde_derive" -version = "0.3.17" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fcdf088bb87971689cf7aef14b123c5c85ca8d71267985090369e5eab16a514" +checksum = "7ab8bd5c76eebb8380b26833d30abddbdd885b00dd06178412e0d51d5bfc221f" dependencies = [ + "heck", + "log", "proc-macro2", "quote", - "syn", + "syn 1.0.109", + "xml-rs", ] diff --git a/Cargo.toml b/Cargo.toml index 8b88447..a7e7e6a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,26 +12,26 @@ members = [ ] [dependencies] -anyhow = "1.0.42" +anyhow = "1.0.70" byte-slice-cast = "1.2.2" -crossbeam-channel = "0.5.1" +clap = { version = "4.2.2", features = ["derive"] } +crossbeam-channel = "0.5.8" env_logger = "*" -futures = "0.3.26" -gstreamer = "0.19.0" -gstreamer-app = "0.19.0" -gstreamer-rtsp = "0.19.0" -gstreamer-rtsp-server = { version = "0.19.0", features = ["v1_16"] } -lazy_static = "1.4" -log = { version = "0.4" } +futures = "0.3.28" +gstreamer = "0.20.3" +gstreamer-app = "0.20.0" +gstreamer-rtsp = "0.20.0" +gstreamer-rtsp-server = { version = "0.20.3", features = ["v1_16"] } +lazy_static = "1.4.0" +log = { version = "0.4.17" } neolink_core = { path = "crates/core", version = "0.5.6" } -regex = "1" -rumqttc = "0.8.0" -serde = { version = "1.0", features = ["derive"] } -structopt = "0.3" -time = "0.2" -tokio = { version = "1.0", features = ["rt", "macros", "io-util"] } +regex = "1.7.3" +rumqttc = "0.20.0" +serde = { version = "1.0.160", features = ["derive"] } +time = "0.3.20" +tokio = { version = "1.27.0", features = ["rt", "macros", "io-util"] } tokio-stream = "0.1.12" -toml = "0.5" -validator = "0.10" -validator_derive = "0.10" -yaserde = "0.3.16" +toml = "0.7.3" +validator = "0.16.0" +validator_derive = "0.16.0" +yaserde = "0.8.0" diff --git a/Dockerfile b/Dockerfile index eafe9fe..fc7acda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,8 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ libgstrtspserver-1.0-0 \ libgstreamer1.0-0 \ + gstreamer1.0-tools \ + gstreamer1.0-x \ gstreamer1.0-plugins-base \ gstreamer1.0-plugins-good \ gstreamer1.0-plugins-bad && \ diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 5732f98..696da57 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -1,39 +1,38 @@ [package] name = "neolink_core" description = "Core services and structure for Reolink IP cameras" -version = "0.5.7" +version = "0.5.6" authors = ["George Hilliard ", "Andrew King "] edition = "2018" license = "AGPL-3.0-or-later" [dependencies] -aes = "0.6" -bytes = "1.0.0" -cfb-mode = "0.6" -cookie-factory = "0.3" -crc32fast = "1.2.1" -crossbeam-channel = "0.5.6" +aes = "0.8.2" +bytes = "1.4.0" +cfb-mode = "0.8.2" +cookie-factory = "0.3.2" +crc32fast = "1.3.2" +crossbeam-channel = "0.5.8" delegate = "0.9.0" -err-derive = "0.2" -futures = "0.3.25" +err-derive = "0.3.1" +futures = "0.3.28" get_if_addrs = "0.5.3" -lazy_static = "1.4" -local-ip-address = "0.4.4" -log = { version = "0.4" } -md5 = "0.7" -nom = { version = "6.1.2", features = ["alloc"] } -rand = "0.8.4" -regex = "1.5.4" -serde = { version = "1.0", features = ["derive"] } -time = "0.2" -tokio = { version = "1.24.2", features = ["full"] } -tokio-stream = { version = "0.1.11", features = ["sync", "time", "net"] } -tokio-util = { version = "0.7.4", features = ["full"] } -xml-rs = "0.8" -yaserde = "0.3.16" -yaserde_derive = "0.3.16" +lazy_static = "1.4.0" +local-ip-address = "0.5.1" +log = "0.4.17" +md5 = "0.7.0" +nom = { version = "7.1.3", features = ["alloc"] } +rand = "0.8.5" +regex = "1.7.3" +serde = { version = "1.0.106", features = ["derive"] } +time = { version = "0.3.20" , features = [ "macros", "parsing", "local-offset" ]} +tokio = { version = "1.27.0", features = ["full"] } +tokio-stream = { version = "0.1.12", features = ["sync", "time", "net"] } +tokio-util = { version = "0.7.7", features = ["full"] } +yaserde = "0.8.0" +yaserde_derive = "0.8.0" [dev-dependencies] assert_matches = "1.5.0" env_logger = "*" -indoc = "0.3" +indoc = "2.0.1" diff --git a/crates/core/src/bc/xml_crypto.rs b/crates/core/src/bc/xml_crypto.rs index bd0a499..0c3063b 100644 --- a/crates/core/src/bc/xml_crypto.rs +++ b/crates/core/src/bc/xml_crypto.rs @@ -1,7 +1,12 @@ use super::model::EncryptionProtocol; -use aes::Aes128; -use cfb_mode::cipher::{NewStreamCipher, StreamCipher}; -use cfb_mode::Cfb; +use aes::{ + cipher::{AsyncStreamCipher, KeyIvInit}, + Aes128, +}; +use cfb_mode::{Decryptor, Encryptor}; + +type Aes128CfbEnc = Encryptor; +type Aes128CfbDec = Decryptor; const XML_KEY: [u8; 8] = [0x1F, 0x2D, 0x3C, 0x4B, 0x5A, 0x69, 0x78, 0xFF]; const IV: &[u8] = b"0123456789abcdef"; @@ -20,7 +25,7 @@ pub fn decrypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol // AES decryption let mut decrypted = buf.to_vec(); - Cfb::::new(aeskey.into(), IV.into()).decrypt(&mut decrypted); + Aes128CfbDec::new(aeskey.into(), IV.into()).decrypt(&mut decrypted); decrypted } } @@ -39,7 +44,7 @@ pub fn encrypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol EncryptionProtocol::Aes(aeskey) => { // AES encryption let mut encrypted = buf.to_vec(); - Cfb::::new(aeskey.into(), IV.into()).encrypt(&mut encrypted); + Aes128CfbEnc::new(aeskey.into(), IV.into()).encrypt(&mut encrypted); encrypted } } diff --git a/crates/core/src/bc_protocol/errors.rs b/crates/core/src/bc_protocol/errors.rs index bb1e530..81a1b09 100644 --- a/crates/core/src/bc_protocol/errors.rs +++ b/crates/core/src/bc_protocol/errors.rs @@ -10,6 +10,22 @@ pub enum Error { #[error(display = "IO Error: {:?}", _0)] Io(#[error(source)] std::sync::Arc), + /// Raised when fails to parse time from the camera + #[error(display = "Error in time coversion: {:?}", _0)] + TimeRange(#[error(source)] time::error::ComponentRange), + + /// Raised when fails to parse time from the camera + #[error(display = "Error in time parsing")] + TimeParse, + + /// Raised when fails to parse time from the camera + #[error(display = "Error in try from NonZeroInt")] + TryFromInt(#[error(source)] std::num::TryFromIntError), + + /// /// Raised when fails to parse time from the camera + #[error(display = "Error in time conversion")] + TimeTryFrom(#[error(source)] time::error::TryFromParsed), + /// Raised when a Bc reply was not understood #[error(display = "Communication error")] UnintelligibleReply { diff --git a/crates/core/src/bc_protocol/time.rs b/crates/core/src/bc_protocol/time.rs index a99aec1..593fd71 100644 --- a/crates/core/src/bc_protocol/time.rs +++ b/crates/core/src/bc_protocol/time.rs @@ -1,6 +1,9 @@ use super::{BcCamera, Error, Result}; use crate::bc::{model::*, xml::*}; -use time::{date, Date, OffsetDateTime, PrimitiveDateTime, Time, UtcOffset}; +use std::convert::{TryFrom, TryInto}; +use time::{ + macros::date, parsing::Parsed, Date, OffsetDateTime, PrimitiveDateTime, Time, UtcOffset, +}; impl BcCamera { /// @@ -115,9 +118,9 @@ impl BcCamera { //osd_format: Some("MDY".to_string()), time_format: Some(0), // Reolink uses positive seconds to indicate a negative UTC offset: - time_zone: Some(-timestamp.offset().as_seconds()), + time_zone: Some(-timestamp.offset().whole_seconds()), year: Some(timestamp.year()), - month: Some(timestamp.month()), + month: Some(timestamp.month().into()), day: Some(timestamp.day()), hour: Some(timestamp.hour()), minute: Some(timestamp.minute()), @@ -153,14 +156,26 @@ fn try_build_timestamp( hour: u8, minute: u8, second: u8, -) -> std::result::Result { - let date = Date::try_from_ymd(year, month, day)?; - let time = Time::try_from_hms(hour, minute, second)?; - let offset = if timezone > 0 { - UtcOffset::west_seconds(timezone as u32) - } else { - UtcOffset::east_seconds(-timezone as u32) - }; +) -> std::result::Result { + let date = Date::try_from( + Parsed::new() + .with_year(year) + .ok_or(Error::TimeParse)? + .with_month(month.try_into()?) + .ok_or(Error::TimeParse)? + .with_day(day.try_into()?) + .ok_or(Error::TimeParse)?, + )?; + let time = Time::try_from( + Parsed::new() + .with_hour_24(hour) + .ok_or(Error::TimeParse)? + .with_minute(minute) + .ok_or(Error::TimeParse)? + .with_second(second) + .ok_or(Error::TimeParse)?, + )?; + let offset = UtcOffset::from_whole_seconds(timezone)?; Ok(PrimitiveDateTime::new(date, time).assume_offset(offset)) } diff --git a/crates/core/src/bcmedia/de.rs b/crates/core/src/bcmedia/de.rs index 8023235..778cde9 100644 --- a/crates/core/src/bcmedia/de.rs +++ b/crates/core/src/bcmedia/de.rs @@ -2,7 +2,7 @@ use super::model::BcMediaIframe; use super::model::*; use crate::Error; use bytes::{Buf, BytesMut}; -use nom::{combinator::*, error::context, number::streaming::*, take}; +use nom::{bytes::streaming::take, combinator::*, error::context, number::streaming::*}; type IResult> = Result<(I, O), nom::Err>; @@ -182,18 +182,18 @@ fn bcmedia_iframe(buf: &[u8]) -> IResult<&[u8], BcMediaIframe> { }; let (buf, _unknown_remained) = if additional_header_size > 4 { let remainder = additional_header_size - 4; - let (buf, unknown_remained) = take!(buf, remainder)?; + let (buf, unknown_remained) = take(remainder)(buf)?; (buf, Some(unknown_remained)) } else { (buf, None) }; - let (buf, data_slice) = take!(buf, payload_size)?; + let (buf, data_slice) = take(payload_size)(buf)?; let pad_size = match payload_size % PAD_SIZE { 0 => 0, n => PAD_SIZE - n, }; - let (buf, _padding) = take!(buf, pad_size)?; + let (buf, _padding) = take(pad_size)(buf)?; assert_eq!(payload_size as usize, data_slice.len()); let video_type = match video_type_str { @@ -223,13 +223,13 @@ fn bcmedia_pframe(buf: &[u8]) -> IResult<&[u8], BcMediaPframe> { let (buf, additional_header_size) = le_u32(buf)?; let (buf, microseconds) = le_u32(buf)?; let (buf, _unknown_b) = le_u32(buf)?; - let (buf, _additional_header) = take!(buf, additional_header_size)?; - let (buf, data_slice) = take!(buf, payload_size)?; + let (buf, _additional_header) = take(additional_header_size)(buf)?; + let (buf, data_slice) = take(payload_size)(buf)?; let pad_size = match payload_size % PAD_SIZE { 0 => 0, n => PAD_SIZE - n, }; - let (buf, _padding) = take!(buf, pad_size)?; + let (buf, _padding) = take(pad_size)(buf)?; assert_eq!(payload_size as usize, data_slice.len()); let video_type = match video_type_str { @@ -252,12 +252,12 @@ fn bcmedia_pframe(buf: &[u8]) -> IResult<&[u8], BcMediaPframe> { fn bcmedia_aac(buf: &[u8]) -> IResult<&[u8], BcMediaAac> { let (buf, payload_size) = le_u16(buf)?; let (buf, _payload_size_b) = le_u16(buf)?; - let (buf, data_slice) = take!(buf, payload_size)?; + let (buf, data_slice) = take(payload_size)(buf)?; let pad_size = match payload_size as u32 % PAD_SIZE { 0 => 0, n => PAD_SIZE - n, }; - let (buf, _padding) = take!(buf, pad_size)?; + let (buf, _padding) = take(pad_size)(buf)?; Ok(( buf, @@ -281,12 +281,12 @@ fn bcmedia_adpcm(buf: &[u8]) -> IResult<&[u8], BcMediaAdpcm> { // On other cameras is half the block size without the header let (buf, _half_block_size) = le_u16(buf)?; let block_size = payload_size - SUB_HEADER_SIZE; - let (buf, data_slice) = take!(buf, block_size)?; + let (buf, data_slice) = take(block_size)(buf)?; let pad_size = match payload_size as u32 % PAD_SIZE { 0 => 0, n => PAD_SIZE - n, }; - let (buf, _padding) = take!(buf, pad_size)?; + let (buf, _padding) = take(pad_size)(buf)?; Ok(( buf, diff --git a/crates/core/src/bcudp/de.rs b/crates/core/src/bcudp/de.rs index 0e3ce1b..3bcd9a7 100644 --- a/crates/core/src/bcudp/de.rs +++ b/crates/core/src/bcudp/de.rs @@ -2,10 +2,11 @@ use super::{crc::calc_crc, model::*, xml::*, xml_crypto::decrypt}; use crate::Error; use bytes::{Buf, BytesMut}; use nom::{ + bytes::streaming::take, combinator::*, error::{context as error_context, ContextError, ErrorKind, ParseError}, number::streaming::*, - take, Err, + Err, }; type IResult> = Result<(I, O), nom::Err>; @@ -67,7 +68,7 @@ fn udp_disc(buf: &[u8]) -> IResult<&[u8], UdpDiscovery> { )(buf)?; let (buf, tid) = error_context("DISC: Missing TID", le_u32)(buf)?; let (buf, checksum) = error_context("DISC: Missing checksum", le_u32)(buf)?; - let (buf, enc_data_slice) = take!(buf, payload_size)?; + let (buf, enc_data_slice) = take(payload_size)(buf)?; let actual_checksum = calc_crc(enc_data_slice); assert_eq!(checksum, actual_checksum); @@ -98,11 +99,11 @@ fn udp_ack(buf: &[u8]) -> IResult<&[u8], UdpAck> { let (buf, _unknown) = error_context("ACK: Missing unknown", le_u32)(buf)?; let (buf, payload_size) = error_context("ACK: Missing payload_size", le_u32)(buf)?; let (buf, payload) = if payload_size > 0 { - let (buf, t_payload) = take!(buf, payload_size)?; // It is a binary payload of - // `00 01 01 01 01 00 01` - // This is a truth map of missing packets - // since last contigious packet_id up - // to the last packet we sent and it recieved + let (buf, t_payload) = take(payload_size)(buf)?; // It is a binary payload of + // `00 01 01 01 01 00 01` + // This is a truth map of missing packets + // since last contigious packet_id up + // to the last packet we sent and it recieved (buf, t_payload.to_vec()) } else { (buf, vec![]) @@ -123,7 +124,7 @@ fn udp_data(buf: &[u8]) -> IResult<&[u8], UdpData> { error_context("DATA: Unable to verify UnownA", verify(le_u32, |&x| x == 0))(buf)?; let (buf, packet_id) = error_context("DATA: Missing packet_id", le_u32)(buf)?; let (buf, payload_size) = error_context("DATA: Missing payload_size", le_u32)(buf)?; - let (buf, payload) = take!(buf, payload_size)?; + let (buf, payload) = take(payload_size)(buf)?; let data = UdpData { connection_id, diff --git a/crates/decoder/Cargo.toml b/crates/decoder/Cargo.toml index f01f6d7..03f39ec 100644 --- a/crates/decoder/Cargo.toml +++ b/crates/decoder/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" license = "AGPL-3.0-or-later" [dependencies] -aes = "0.6" +aes = "0.8.2" anyhow = "1.0.42" -cfb-mode = "0.6" +cfb-mode = "0.8.2" env_logger = "*" hex-string = "0.1.0" -md5 = "0.7" +md5 = "0.7.0" requestty = "0.5.0" -log = { version = "0.4" } +log = "0.4.17" diff --git a/crates/decoder/src/main.rs b/crates/decoder/src/main.rs index 0e6d514..5055904 100644 --- a/crates/decoder/src/main.rs +++ b/crates/decoder/src/main.rs @@ -6,15 +6,19 @@ use hex_string::HexString; use requestty::Question; use std::convert::TryInto; -use aes::Aes128; -use cfb_mode::cipher::{NewStreamCipher, StreamCipher}; -use cfb_mode::Cfb; +use aes::{ + cipher::{AsyncStreamCipher, KeyIvInit}, + Aes128, +}; +use cfb_mode::Decryptor; + +type Aes128CfbDec = Decryptor; const IV: &[u8] = b"0123456789abcdef"; fn decrypt(buf: &[u8], aeskey: &[u8; 16]) -> Vec { let mut decrypted = buf.to_vec(); - Cfb::::new(aeskey.into(), IV.into()).decrypt(&mut decrypted); + Aes128CfbDec::new(aeskey.into(), IV.into()).decrypt(&mut decrypted); decrypted } diff --git a/deny.toml b/deny.toml index beb67b3..5b70339 100644 --- a/deny.toml +++ b/deny.toml @@ -75,6 +75,9 @@ notice = "warn" # output a note when they are encountered. ignore = [ #"RUSTSEC-0000-0000", + # This is rust-xml which is unmaintaned. Not much we can do since + # all the xml serde like crates seem to use it + "RUSTSEC-2022-0048", ] # Threshold for security vulnerabilities, any vulnerability with a CVSS score # lower than the range specified will be ignored. Note that ignored advisories @@ -106,10 +109,11 @@ allow = [ "Apache-2.0", "Apache-2.0 WITH LLVM-exception", "BSD-3-Clause", - "AGPL-3.0-only", - "AGPL-3.0-or-later", + "AGPL-3.0", "Unicode-DFS-2016", "ISC", + "OpenSSL", + "Zlib", ] # List of explicitly disallowed licenses # See https://spdx.org/licenses/ for list of possible licenses @@ -118,7 +122,7 @@ deny = [ #"Nokia", ] # Lint level for licenses considered copyleft -copyleft = "warn" +copyleft = "allow" # Blanket approval or denial for OSI-approved or FSF Free/Libre licenses # * both - The license will be approved if it is both OSI-approved *AND* FSF # * either - The license will be approved if it is either OSI-approved *OR* FSF @@ -142,28 +146,28 @@ exceptions = [ # Each entry is the crate and version constraint, and its specific allow # list #{ allow = ["Zlib"], name = "adler32", version = "*" }, - { allow = ["untrusted"], name = "untrusted", version = "*" }, ] # Some crates don't have (easily) machine readable licensing information, # adding a clarification entry for it allows you to manually specify the # licensing information -#[[licenses.clarify]] +[[licenses.clarify]] # The name of the crate the clarification applies to -#name = "ring" +name = "ring" # The optional version constraint for the crate -#version = "*" +version = "*" # The SPDX expression for the license requirements of the crate -#expression = "MIT AND ISC AND OpenSSL" +expression = "MIT AND ISC AND OpenSSL" + # One or more files in the crate's source used as the "source of truth" for # the license expression. If the contents match, the clarification will be used # when running the license check, otherwise the clarification will be ignored # and the crate will be checked normally, which may produce warnings or errors # depending on the rest of your configuration -#license-files = [ +license-files = [ # Each entry is a crate relative path, and the (opaque) hash of its contents - #{ path = "LICENSE", hash = 0xbd0eed23 } -#] + { path = "LICENSE", hash = 0xbd0eed23 } +] [licenses.private] # If true, ignores workspace crates that aren't published, or are only @@ -183,7 +187,7 @@ registries = [ # https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html [bans] # Lint level for when multiple versions of the same crate are detected -multiple-versions = "warn" +multiple-versions = "allow" # Lint level for when a crate version requirement is `*` wildcards = "allow" # The graph highlighting used when creating dotgraphs for crates @@ -268,8 +272,8 @@ allow-git = [] [sources.allow-org] # 1 or more github.com organizations to allow git sources for -github = [""] +#github = [""] # 1 or more gitlab.com organizations to allow git sources for -gitlab = [""] +#gitlab = [""] # 1 or more bitbucket.org organizations to allow git sources for -bitbucket = [""] +#bitbucket = [""] diff --git a/src/cmdline.rs b/src/cmdline.rs index 25b4326..7552ccc 100644 --- a/src/cmdline.rs +++ b/src/cmdline.rs @@ -1,24 +1,21 @@ +use clap::Parser; use std::path::PathBuf; -use structopt::{clap::AppSettings, StructOpt}; +use std::str::FromStr; /// A standards-compliant bridge to Reolink IP cameras /// /// Neolink is free software released under the GNU AGPL v3. /// You can find its source code at https://github.com/thirtythreeforty/neolink -#[derive(StructOpt, Debug)] -#[structopt( - name = "neolink", - setting(AppSettings::ArgRequiredElseHelp), - setting(AppSettings::UnifiedHelpMessage) -)] +#[derive(Parser, Debug)] +#[command(name = "neolink", arg_required_else_help = true)] pub struct Opt { - #[structopt(short, long, global(true), parse(from_os_str))] + #[arg(short, long, global = true, value_parser = PathBuf::from_str)] pub config: Option, #[structopt(subcommand)] pub cmd: Option, } -#[derive(StructOpt, Debug)] +#[derive(Parser, Debug)] pub enum Command { Rtsp(super::rtsp::Opt), StatusLight(super::statusled::Opt), diff --git a/src/image/cmdline.rs b/src/image/cmdline.rs index 52dd104..3de0756 100644 --- a/src/image/cmdline.rs +++ b/src/image/cmdline.rs @@ -1,12 +1,13 @@ +use clap::Parser; use std::path::PathBuf; -use structopt::StructOpt; +use std::str::FromStr; /// The image command will dump a still image from the camera -#[derive(StructOpt, Debug)] +#[derive(Parser, Debug)] pub struct Opt { /// The name of the camera to get the image from. Must be a name in the config pub camera: String, /// The path of the output. - #[structopt(short, long, parse(from_os_str))] + #[structopt(short, long, value_parser = PathBuf::from_str)] pub file_path: PathBuf, } diff --git a/src/main.rs b/src/main.rs index f6243c0..9a2b01d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,10 +23,10 @@ //! Neolink source code is available online at //! use anyhow::{Context, Result}; +use clap::Parser; use env_logger::Env; use log::*; use std::fs; -use structopt::StructOpt; use validator::Validate; mod cmdline; @@ -53,7 +53,7 @@ async fn main() -> Result<()> { env!("NEOLINK_PROFILE") ); - let opt = Opt::from_args(); + let opt = Opt::parse(); let conf_path = opt.config.context("Must supply --config file")?; let config: Config = toml::from_str( diff --git a/src/mqtt/cmdline.rs b/src/mqtt/cmdline.rs index aba365d..6a3c335 100644 --- a/src/mqtt/cmdline.rs +++ b/src/mqtt/cmdline.rs @@ -1,4 +1,4 @@ -use structopt::StructOpt; +use clap::Parser; -#[derive(StructOpt, Debug)] +#[derive(Parser, Debug)] pub struct Opt {} diff --git a/src/mqtt/mqttc.rs b/src/mqtt/mqttc.rs index b38abd8..ba15f67 100644 --- a/src/mqtt/mqttc.rs +++ b/src/mqtt/mqttc.rs @@ -8,6 +8,7 @@ use rumqttc::{ MqttOptions, Publish, QoS, TlsConfiguration, Transport, }; use std::sync::{Arc, Mutex}; +use std::time::Duration; pub(crate) struct Mqtt { app: Arc, @@ -80,7 +81,7 @@ impl Mqtt { mqttoptions.set_credentials(username, password); } - mqttoptions.set_keep_alive(5); + mqttoptions.set_keep_alive(Duration::from_secs(5)); // On unclean disconnect send this mqttoptions.set_last_will(LastWill::new( diff --git a/src/pir/cmdline.rs b/src/pir/cmdline.rs index 0933c89..508b606 100644 --- a/src/pir/cmdline.rs +++ b/src/pir/cmdline.rs @@ -1,5 +1,5 @@ use anyhow::{anyhow, Result}; -use structopt::StructOpt; +use clap::Parser; fn onoff_parse(src: &str) -> Result { match src { @@ -13,11 +13,11 @@ fn onoff_parse(src: &str) -> Result { } /// The pir command will control the PIR status of the camera -#[derive(StructOpt, Debug)] +#[derive(Parser, Debug)] pub struct Opt { /// The name of the camera. Must be a name in the config pub camera: String, /// Whether to turn the PIR ON or OFF - #[structopt(parse(try_from_str = onoff_parse), name = "on|off")] + #[arg(value_parser = onoff_parse, name = "on|off")] pub on: Option, } diff --git a/src/reboot/cmdline.rs b/src/reboot/cmdline.rs index 1f6cd91..7f0f9ce 100644 --- a/src/reboot/cmdline.rs +++ b/src/reboot/cmdline.rs @@ -1,7 +1,7 @@ -use structopt::StructOpt; +use clap::Parser; /// The reboot command will reboot the camera -#[derive(StructOpt, Debug)] +#[derive(Parser, Debug)] pub struct Opt { /// The name of the camera to change the lights of. Must be a name in the config pub camera: String, diff --git a/src/rtsp/cmdline.rs b/src/rtsp/cmdline.rs index baedb75..50e6805 100644 --- a/src/rtsp/cmdline.rs +++ b/src/rtsp/cmdline.rs @@ -1,5 +1,5 @@ -use structopt::StructOpt; +use clap::Parser; /// The rtsp command will serve all cameras in the config over the rtsp protocol -#[derive(StructOpt, Debug)] +#[derive(Parser, Debug)] pub struct Opt {} diff --git a/src/rtsp/gst/factory.rs b/src/rtsp/gst/factory.rs index 5d37b8b..af318e6 100644 --- a/src/rtsp/gst/factory.rs +++ b/src/rtsp/gst/factory.rs @@ -44,7 +44,7 @@ impl Default for NeoMediaFactory { impl NeoMediaFactory { pub(crate) fn new() -> Self { - let factory = Object::new::(&[]); + let factory = Object::new::(); factory.set_shared(false); // factory.set_do_retransmission(false); // Can't use as the method is missing on the 32bit docker gst dll factory.set_launch("videotestsrc pattern=\"snow\" ! video/x-raw,width=896,height=512,framerate=25/1 ! textoverlay name=\"inittextoverlay\" text=\"Stream not Ready\" valignment=top halignment=left font-desc=\"Sans, 32\" ! jpegenc ! rtpjpegpay name=pay0"); @@ -59,13 +59,12 @@ impl NeoMediaFactory { pub(crate) fn add_permitted_roles>(&self, permitted_roles: &HashSet) { for permitted_role in permitted_roles { - self.add_role_from_structure(&Structure::new( - permitted_role.as_ref(), - &[ - (*RTSP_PERM_MEDIA_FACTORY_ACCESS, &true), - (*RTSP_PERM_MEDIA_FACTORY_CONSTRUCT, &true), - ], - )); + self.add_role_from_structure( + &Structure::builder(permitted_role.as_ref()) + .field(RTSP_PERM_MEDIA_FACTORY_ACCESS, true) + .field(RTSP_PERM_MEDIA_FACTORY_CONSTRUCT, true) + .build(), + ); } // During auth, first it binds anonymously. At this point it checks // RTSP_PERM_MEDIA_FACTORY_ACCESS to see if anyone can connect @@ -87,10 +86,11 @@ impl NeoMediaFactory { .collect::>() .contains(&"anonymous") { - self.add_role_from_structure(&Structure::new( - "anonymous", - &[(*RTSP_PERM_MEDIA_FACTORY_ACCESS, &true)], - )); + self.add_role_from_structure( + &Structure::builder("anonymous") + .field(RTSP_PERM_MEDIA_FACTORY_ACCESS, true) + .build(), + ); } } diff --git a/src/rtsp/gst/server.rs b/src/rtsp/gst/server.rs index 35e655d..3a85da0 100644 --- a/src/rtsp/gst/server.rs +++ b/src/rtsp/gst/server.rs @@ -41,7 +41,7 @@ impl Default for NeoRtspServer { impl NeoRtspServer { pub(crate) fn new() -> AnyResult { gstreamer::init().context("Gstreamer failed to initialise")?; - let factory = Object::new::(&[]); + let factory = Object::new::(); Ok(factory) } @@ -259,7 +259,8 @@ impl NeoRtspServerImpl { .expect("The server should have mountpoints"); for path in paths { media.paths.insert(path.clone()); - mounts.add_factory(path, &media.factory); + // We can clone here because GObjects are referernce counted + mounts.add_factory(path, media.factory.clone()); // debug!("Adding path: {}", path); } Ok(()) @@ -302,13 +303,13 @@ impl NeoRtspServerImpl { let auth = self.obj().auth().unwrap_or_else(RTSPAuth::new); auth.set_supported_methods(RTSPAuthMethod::Basic); - let mut un_authtoken = RTSPToken::new(&[(*RTSP_TOKEN_MEDIA_FACTORY_ROLE, &"anonymous")]); + let mut un_authtoken = RTSPToken::new(&[(RTSP_TOKEN_MEDIA_FACTORY_ROLE, &"anonymous")]); auth.set_default_token(Some(&mut un_authtoken)); for credential in credentials { let (user, pass) = credential; trace!("Setting credentials for user {}", user); - let token = RTSPToken::new(&[(*RTSP_TOKEN_MEDIA_FACTORY_ROLE, user)]); + let token = RTSPToken::new(&[(RTSP_TOKEN_MEDIA_FACTORY_ROLE, user)]); let basic = RTSPAuth::make_basic(user, pass); auth.add_basic(basic.as_str(), &token); } diff --git a/src/rtsp/states/loggedin.rs b/src/rtsp/states/loggedin.rs index 11aa7be..87ae651 100644 --- a/src/rtsp/states/loggedin.rs +++ b/src/rtsp/states/loggedin.rs @@ -42,7 +42,7 @@ impl Camera { // We'd like now_local() but it's deprecated - try to get the local time, but if no // time zone, fall back to UTC. let new_time = - OffsetDateTime::try_now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()); + OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()); warn!( "{}: Camera has no time set, setting to {}", diff --git a/src/statusled/cmdline.rs b/src/statusled/cmdline.rs index 1a47514..aca3606 100644 --- a/src/statusled/cmdline.rs +++ b/src/statusled/cmdline.rs @@ -1,5 +1,5 @@ use anyhow::{anyhow, Result}; -use structopt::StructOpt; +use clap::Parser; fn onoff_parse(src: &str) -> Result { match src { @@ -13,11 +13,11 @@ fn onoff_parse(src: &str) -> Result { } /// The status-light command will control the blue status light on the camera -#[derive(StructOpt, Debug)] +#[derive(Parser, Debug)] pub struct Opt { /// The name of the camera to change the lights of. Must be a name in the config pub camera: String, /// Whether to turn the light on or off - #[structopt(parse(try_from_str = onoff_parse), name = "on|off")] + #[arg(value_parser = onoff_parse, name = "on|off")] pub on: bool, } diff --git a/src/talk/cmdline.rs b/src/talk/cmdline.rs index 71da6df..9ca5cc8 100644 --- a/src/talk/cmdline.rs +++ b/src/talk/cmdline.rs @@ -1,5 +1,6 @@ +use clap::Parser; use std::path::PathBuf; -use structopt::StructOpt; +use std::str::FromStr; /// The talk command will send audio for the camera to say /// @@ -7,19 +8,19 @@ use structopt::StructOpt; /// This should be ok with most common formats. /// /// `gst-launch` can be used to prepare this data -#[derive(StructOpt, Debug)] +#[derive(Parser, Debug)] pub struct Opt { /// The name of the camera to talk through. Must be a name in the config pub camera: String, /// The path to the audio file. - #[structopt(short, long, parse(from_os_str), conflicts_with = "microphone")] + #[arg(short, long, value_parser = PathBuf::from_str, conflicts_with = "microphone")] pub file_path: Option, /// Use the microphone as the source. Defaults to autoaudiosrc - Which microphone depends /// on [gstreamer](https://gstreamer.freedesktop.org/documentation/autodetect/autoaudiosrc.html?gi-language=c#autoaudiosrc-page) - #[structopt(short, long, conflicts_with = "file_path")] + #[arg(short, long, conflicts_with = "file_path")] pub microphone: bool, /// Use a specific microphone like "alsasrc device=hw:1" - #[structopt( + #[arg( short, long, default_value = "autoaudiosrc", @@ -27,6 +28,6 @@ pub struct Opt { )] pub input_src: String, /// Use to change the volume of the input - #[structopt(short, long, default_value = "1.0")] + #[arg(short, long, default_value = "1.0")] pub volume: f32, } diff --git a/src/talk/gst.rs b/src/talk/gst.rs index 576589d..689c711 100644 --- a/src/talk/gst.rs +++ b/src/talk/gst.rs @@ -166,15 +166,14 @@ fn create_pipeline( // provide the format we request. // This can be set after linking the two objects, because format negotiation between // both elements will happen during pre-rolling of the pipeline. - appsink.set_caps(Some(&Caps::new_simple( - "audio/x-adpcm", - &[ - ("layout", &"dvi"), - ("block_align", &(block_align as i32)), - ("channels", &(1i32)), - ("rate", &(sample_rate as i32)), - ], - ))); + appsink.set_caps(Some( + &Caps::builder("audio/x-adpcm") + .field("layout", "dvi") + .field("block_align", block_align as i32) + .field("channels", 1i32) + .field("rate", sample_rate as i32) + .build(), + )); Ok(pipeline) }