diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 331ada0..0896155 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,8 @@ jobs: uses: fkirc/skip-duplicate-actions@v5 with: # All of these options are optional, so you can remove them if you are happy with the defaults - concurrent_skipping: 'same_content_newer' - skip_after_successful_duplicate: 'false' + concurrent_skipping: "same_content_newer" + skip_after_successful_duplicate: "false" native: needs: pre_job @@ -190,9 +190,9 @@ jobs: id: vars shell: bash run: | - unset HAS_SECRET - if [ -n $SECRET ]; then HAS_SECRET='true' ; fi - echo "HAS_SECRET_TOKEN=${HAS_SECRET}" >> $GITHUB_OUTPUT + unset HAS_SECRET + if [ -n $SECRET ]; then HAS_SECRET='true' ; fi + echo "HAS_SECRET_TOKEN=${HAS_SECRET}" >> $GITHUB_OUTPUT env: SECRET: "${{ secrets.DOCKER_TOKEN }}" - name: Check out the repo @@ -268,7 +268,7 @@ jobs: REPO_NAME: ${{ steps.docker_repo.outputs.DOCKER_NWO }} - name: Install latest rust run: | - rustup toolchain install stable + rustup toolchain install stable - name: Install toml-cli run: | cargo install toml-cli @@ -327,7 +327,7 @@ jobs: uses: actions/checkout@v3 - name: Install latest rust run: | - rustup toolchain install stable + rustup toolchain install stable - name: Install toml-cli run: | cargo install toml-cli @@ -401,4 +401,4 @@ jobs: body: | Neolink Release ${{steps.toml.outputs.version}} draft: true - prerelease: ${{ contains(github.ref_name, 'rc') }} \ No newline at end of file + prerelease: ${{ contains(github.ref_name, 'rc') }} diff --git a/Cargo.lock b/Cargo.lock index 4d83ab4..8c3f553 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -30,24 +30,31 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "getrandom", + "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -65,9 +72,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -79,43 +86,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "assert_matches" @@ -142,18 +149,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", -] - -[[package]] -name = "async-trait" -version = "0.1.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -164,60 +160,15 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -236,9 +187,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "bitflags" @@ -248,9 +205,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block-buffer" @@ -263,9 +220,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "byte-slice-cast" @@ -281,9 +238,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "c_linked_list" @@ -293,12 +250,9 @@ checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfb-mode" @@ -311,9 +265,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -327,15 +281,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets", + "windows-targets 0.52.4", ] [[package]] @@ -350,9 +304,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -360,33 +314,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -394,54 +348,20 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" -[[package]] -name = "console-api" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" -dependencies = [ - "futures-core", - "prost 0.12.1", - "prost-types 0.12.1", - "tonic", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures-task", - "hdrhistogram", - "humantime", - "prost-types 0.12.1", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "cookie-factory" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -449,46 +369,42 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -527,9 +443,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -537,45 +453,45 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.38", + "strsim 0.10.0", + "syn 2.0.58", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "delegate" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee5df75c70b95bd3aacc8e2fd098797692fb1d54121019c4de481e42f04c8a1" +checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -610,16 +526,16 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "ece" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5463ffecc0677adcd786c4481f73b215714d4757edf2eb37a573c03d00459" +checksum = "c2ea1d2f2cc974957a4e2575d8e5bb494549bab66338d6320c2789abcfff5746" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "byteorder", "hex", "hkdf", @@ -633,9 +549,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encoding_rs" @@ -647,10 +563,20 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.0" +name = "env_filter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -659,52 +585,51 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + [[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "err-derive" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", - "synstructure", -] - [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fcm-push-listener" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e1e9327cb6abc9da64951727a3cf534ae7101e529382dac7f5d350bccdba42" +checksum = "40a866e2e57db37ca41fb0180d9f728e68b1b7f2927fc0e3528add0a43284655" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "ece", "log", - "prost 0.11.9", + "prost", "prost-build", "reqwest", "serde", @@ -721,26 +646,14 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "nanorand", - "pin-project", "spin 0.9.8", ] @@ -767,18 +680,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -791,9 +704,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -801,15 +714,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -818,38 +731,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -903,28 +816,26 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.18.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57052f84e8e5999b258e8adf8f5f2af0ac69033864936b8b6838321db2f759b1" +checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" dependencies = [ "futures-channel", "futures-core", @@ -933,7 +844,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -941,24 +851,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.18.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" +checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -970,30 +880,28 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" +checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro-crate", - "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" dependencies = [ "libc", "system-deps", @@ -1001,9 +909,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ "glib-sys", "libc", @@ -1012,9 +920,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.21.1" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b369a1eb2f7db49920d3d590bd988c5fb56dbf2347e1efb60307fe953546ee5d" +checksum = "066f3c354c526792a3deb8b6d349eba8ffcc13bae4d0bf05d4adf4bf1b91e459" dependencies = [ "cfg-if", "futures-channel", @@ -1022,23 +930,24 @@ dependencies = [ "futures-util", "glib", "gstreamer-sys", - "itertools 0.11.0", + "itertools 0.12.1", "libc", "muldiv", "num-integer", "num-rational", + "once_cell", "option-operations", "paste", - "pretty-hex", + "pin-project-lite", "smallvec", "thiserror", ] [[package]] name = "gstreamer-app" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343376fe0a5b39e7e46fb0fed6a1ead4206ea34584c153130d0f20e51a480b80" +checksum = "50184e88d3462a796a5924fb329839c102b22f9383c1636323fa4ef5255dea92" dependencies = [ "futures-core", "futures-sink", @@ -1051,9 +960,9 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aea07f07a3f17278e6998390ecaea127e476f0af0360c2d83d96e6d3a97fb75e" +checksum = "6771c0939f286fb261525494a0aad29435b37e802284756bab24afe3bbca7476" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -1064,9 +973,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe38a6d5c1e516ce3fd6069e972a540d315448ed69fdadad739e6c6c6eb2a01" +checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" dependencies = [ "atomic_refcell", "cfg-if", @@ -1078,9 +987,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ca701f9078fe115b29b24c80910b577f9cb5b039182f050dbadf5933594b64" +checksum = "286591e0f85bbda1adf9bab6f21d015acd9ca0a4d4acb61da65e3d0487e23c4e" dependencies = [ "glib-sys", "gobject-sys", @@ -1091,9 +1000,9 @@ dependencies = [ [[package]] name = "gstreamer-net" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09decec00a21c881eec5f5a9c903bb0ebe39d4ee1c7dce6e245b3103bc5af84d" +checksum = "de0f4ff263821ae2c3a2de4771510dd07faba7af9d908441a738da6eb2cfc901" dependencies = [ "gio", "glib", @@ -1103,9 +1012,9 @@ dependencies = [ [[package]] name = "gstreamer-net-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237f2dceda3ba258a943465706b91881b1031a0655f08777cad38dbf5a887570" +checksum = "3fab77482d011b99fb78ad133cd30c11b27bfc203b58da9d18d8eccecea56273" dependencies = [ "gio-sys", "glib-sys", @@ -1116,9 +1025,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fa437b3e7409968de28b2fc8210c7322b7088b44f465b3b471afe326165048" +checksum = "60d55c8cffe9edc8e3156c3d2f6305e86e2e4eda303f02c00e1255739f970b1f" dependencies = [ "glib", "gstreamer", @@ -1129,9 +1038,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a857101b15e1cce0c42b399e985ada818d59ea246605b16357c82c162cfdd50" +checksum = "7494b38cf577bf33fe1e3c28cf80ef5ee7f1d7724c6f5e37e1fddacd35f4d382" dependencies = [ "gio", "glib", @@ -1145,9 +1054,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ddad8f97bba42e4fba019732e2660152374da5992e916ada3ac8a786ae4ae2c" +checksum = "dc8c571931ce0ec8a4f342ed0e5094d37192ffd7bb1a463def3d89c43a273d51" dependencies = [ "gio-sys", "glib-sys", @@ -1162,9 +1071,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09d36a75071fe66ca48c6d9db30e2d03c006d0341aae1a5067ec0c016d780da" +checksum = "0dc20e7083bf12ee94c880bd50410948addb2ed080a05f38982f06a43640b490" dependencies = [ "gio-sys", "glib-sys", @@ -1177,9 +1086,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87946f9c6fabb44a73fb0b3b3d611c7d4468f741dd8e4f9a3d54e1ab2a6a8b36" +checksum = "2f9aa459d119aa787efc18edcc591736e1e6cd488835825d1807532456ba2dbd" dependencies = [ "glib", "gstreamer", @@ -1188,9 +1097,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e4bdf4618c70a2cb440ca4adf1a4140fc118b1b314684903a48f0ef5e1da1" +checksum = "5d80dfc4811c67ca66586b4e470f85ab25aca4ea92bd2ba2665552c1dd0e5609" dependencies = [ "glib-sys", "gstreamer-sys", @@ -1200,9 +1109,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.21.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86bf9de67a6ab7af67ac11588f4939e984a936030437219f269fe969d79ad8c" +checksum = "d5ddf526b3bf90ea627224c804f00b8bcb0452e3b447978b4d5092f8e8ff5918" dependencies = [ "glib-sys", "gobject-sys", @@ -1212,9 +1121,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", @@ -1222,7 +1131,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -1234,27 +1143,15 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" - -[[package]] -name = "hdrhistogram" -version = "7.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "base64 0.13.1", - "byteorder", - "flate2", - "nom", - "num-traits", + "ahash", + "allocator-api2", ] [[package]] @@ -1264,10 +1161,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1283,9 +1186,9 @@ checksum = "848ec2dd093df965a34b434580d94852197fc83feac5b2c1962399bbf2cb4f0b" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -1301,18 +1204,18 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1321,9 +1224,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1350,9 +1253,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1365,25 +1268,13 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", "want", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyper-tls" version = "0.5.0" @@ -1399,9 +1290,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1436,6 +1327,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if_chain" version = "1.0.2" @@ -1455,19 +1356,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inout" @@ -1480,19 +1381,19 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1506,24 +1407,24 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1536,15 +1437,25 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -1558,24 +1469,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "md5" @@ -1585,9 +1481,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mime" @@ -1603,23 +1499,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1634,15 +1530,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -1667,24 +1554,25 @@ version = "0.6.3-rc.2" dependencies = [ "anyhow", "async-stream", - "base64 0.21.4", + "base64 0.22.0", "byte-slice-cast", + "bytes", "clap", - "console-subscriber", "crossbeam-channel", "dirs", - "env_logger", + "env_logger 0.11.3", "fcm-push-listener", "futures", "gstreamer", "gstreamer-app", "gstreamer-rtsp", "gstreamer-rtsp-server", - "heck", - "lazy_static", + "heck 0.5.0", "log", "md5", "neolink_core", + "once_cell", + "quick-xml", "regex", "rumqttc", "serde", @@ -1694,9 +1582,8 @@ dependencies = [ "tokio-stream", "tokio-util", "toml", - "validator", - "validator_derive", - "yaserde", + "validator 0.17.0", + "validator_derive 0.17.0", ] [[package]] @@ -1711,8 +1598,7 @@ dependencies = [ "crc32fast", "crossbeam-channel", "delegate", - "env_logger", - "err-derive", + "env_logger 0.11.3", "futures", "get_if_addrs", "indoc", @@ -1720,15 +1606,15 @@ dependencies = [ "log", "md5", "nom", + "quick-xml", "rand", "regex", "serde", + "thiserror", "time", "tokio", "tokio-stream", "tokio-util", - "yaserde", - "yaserde_derive", ] [[package]] @@ -1738,7 +1624,7 @@ dependencies = [ "aes", "anyhow", "cfb-mode", - "env_logger", + "env_logger 0.11.3", "hex-string", "log", "md5", @@ -1756,12 +1642,17 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -1778,9 +1669,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -1797,35 +1688,35 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -1842,7 +1733,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -1853,9 +1744,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -1896,9 +1787,9 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -1909,9 +1800,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -1920,34 +1811,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.2", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", + "indexmap 2.2.6", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1957,9 +1828,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "powerfmt" @@ -1973,12 +1844,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - [[package]] name = "prettyplease" version = "0.1.25" @@ -1991,12 +1856,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "toml_edit 0.21.1", ] [[package]] @@ -2025,9 +1889,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -2039,17 +1903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive 0.11.9", -] - -[[package]] -name = "prost" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" -dependencies = [ - "bytes", - "prost-derive 0.12.1", + "prost-derive", ] [[package]] @@ -2059,15 +1913,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", "multimap", "petgraph", "prettyplease", - "prost 0.11.9", - "prost-types 0.11.9", + "prost", + "prost-types", "regex", "syn 1.0.109", "tempfile", @@ -2087,35 +1941,13 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "prost-derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" -dependencies = [ - "anyhow", - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "prost-types" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost 0.11.9", -] - -[[package]] -name = "prost-types" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" -dependencies = [ - "prost 0.12.1", + "prost", ] [[package]] @@ -2124,7 +1956,7 @@ version = "0.6.3-rc.2" dependencies = [ "anyhow", "clap", - "env_logger", + "env_logger 0.10.2", "fcm-push-listener", "lazy_static", "log", @@ -2133,15 +1965,25 @@ dependencies = [ "serde", "tokio", "toml", - "validator", - "validator_derive", + "validator 0.16.1", + "validator_derive 0.16.0", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", + "serde", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2176,24 +2018,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -2205,58 +2029,43 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "requestty" @@ -2286,11 +2095,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -2308,9 +2117,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -2339,34 +2150,35 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rumqttc" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2433b134712bc17a6f85a35e06b901e6e8d0bb20b5367e1121e6fedc140c0ac" +checksum = "e1568e15fab2d546f940ed3a21f48bbbd1c494c90c99c4481339364a497f94a9" dependencies = [ "bytes", "flume", - "futures", + "futures-util", "log", "rustls-native-certs", - "rustls-pemfile", - "rustls-webpki 0.100.3", + "rustls-pemfile 2.1.1", + "rustls-webpki", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.25.0", ] [[package]] @@ -2377,15 +2189,15 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2402,76 +2214,80 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" dependencies = [ "log", - "ring 0.16.20", - "rustls-webpki 0.101.6", - "sct", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 2.1.1", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +dependencies = [ + "base64 0.21.7", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + [[package]] name = "rustls-webpki" -version = "0.100.3" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", ] -[[package]] -name = "rustls-webpki" -version = "0.101.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2482,19 +2298,19 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -2505,9 +2321,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -2515,29 +2331,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.189" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -2546,9 +2362,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -2590,7 +2406,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -2604,15 +2420,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - [[package]] name = "shell-words" version = "1.1.0" @@ -2660,9 +2467,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -2672,22 +2479,12 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" -dependencies = [ - "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2711,6 +2508,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "subtle" version = "2.5.0" @@ -2730,9 +2533,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -2745,18 +2548,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "system-configuration" version = "0.5.1" @@ -2780,12 +2571,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.2" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck", + "heck 0.5.0", "pkg-config", "toml", "version-compare", @@ -2793,28 +2584,27 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -2832,32 +2622,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", + "syn 2.0.58", ] [[package]] @@ -2882,13 +2662,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -2904,10 +2685,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -2928,9 +2710,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2940,31 +2722,21 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2", "tokio-macros", "tracing", - "windows-sys", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -2990,19 +2762,20 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.21.7", + "rustls 0.22.3", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -3012,16 +2785,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown 0.12.3", + "hashbrown 0.14.3", "pin-project-lite", "slab", "tokio", @@ -3030,102 +2803,49 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.9", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.2.6", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] -[[package]] -name = "tonic" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.4", - "bytes", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.12.1", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" version = "0.3.2" @@ -3139,21 +2859,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "tracing-core" version = "0.1.32" @@ -3161,29 +2869,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "once_cell", - "regex", - "sharded-slab", - "thread_local", - "tracing", - "tracing-core", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -3193,9 +2885,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -3211,18 +2903,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -3230,12 +2922,6 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "untrusted" version = "0.7.1" @@ -3250,12 +2936,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna", + "idna 0.5.0", "percent-encoding", ] @@ -3267,9 +2953,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", "rand", @@ -3278,13 +2964,13 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8c6bba9b149ee82950daefc9623b32bb1dacbfb1890e352f6b887bd582adaf" +checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", ] [[package]] @@ -3293,7 +2979,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" dependencies = [ - "idna", + "idna 0.4.0", "lazy_static", "regex", "serde", @@ -3302,6 +2988,21 @@ dependencies = [ "url", ] +[[package]] +name = "validator" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da339118f018cc70ebf01fafc103360528aad53717e4bf311db929cb01cb9345" +dependencies = [ + "idna 0.5.0", + "once_cell", + "regex", + "serde", + "serde_derive", + "serde_json", + "url", +] + [[package]] name = "validator_derive" version = "0.16.0" @@ -3318,6 +3019,20 @@ dependencies = [ "validator_types", ] +[[package]] +name = "validator_derive" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e88ea23b8f5e59230bff8a2f03c0ee0054a61d5b8343a38946bcd406fe624c" +dependencies = [ + "darling", + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 2.0.58", +] + [[package]] name = "validator_types" version = "0.16.0" @@ -3328,12 +3043,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "vcpkg" version = "0.2.15" @@ -3342,9 +3051,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -3369,9 +3078,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3379,24 +3088,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3406,9 +3115,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3416,28 +3125,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3449,7 +3158,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.5", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -3513,11 +3222,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.4", ] [[package]] @@ -3526,7 +3235,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", ] [[package]] @@ -3535,13 +3253,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -3550,36 +3283,72 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -3587,10 +3356,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "winnow" -version = "0.5.17" +name = "windows_x86_64_msvc" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -3602,7 +3386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3612,31 +3396,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ab703352da6a72f35c39a533526393725640575bb211f61987a2748323ad956" [[package]] -name = "xml-rs" -version = "0.8.19" +name = "zerocopy" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" - -[[package]] -name = "yaserde" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf52af554a50b866aaad63d7eabd6fca298db3dfe49afd50b7ba5a33dfa0582" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ - "log", - "xml-rs", + "zerocopy-derive", ] [[package]] -name = "yaserde_derive" -version = "0.8.0" +name = "zerocopy-derive" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab8bd5c76eebb8380b26833d30abddbdd885b00dd06178412e0d51d5bfc221f" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ - "heck", - "log", "proc-macro2", "quote", - "syn 1.0.109", - "xml-rs", + "syn 2.0.58", ] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/Cargo.toml b/Cargo.toml index ff39da5..666d210 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,35 +14,35 @@ members = [ [dependencies] anyhow = "1.0.70" async-stream = "0.3.5" -base64 = "0.21.2" +base64 = "0.22.0" byte-slice-cast = "1.2.2" +bytes = "1.6.0" clap = { version = "4.2.2", features = ["derive", "cargo"] } -console-subscriber = "0.2.0" crossbeam-channel = "0.5.8" dirs = "5.0.1" -env_logger = "0.10.0" -fcm-push-listener = "2.0.1" +env_logger = "0.11.3" +fcm-push-listener = "2.0.3" futures = "0.3.28" -gstreamer = "0.21.0" -gstreamer-app = { version = "0.21.0", features = ["v1_18"] } -gstreamer-rtsp = { version = "0.21.0", features = ["v1_18"] } -gstreamer-rtsp-server = { version = "0.21.0", features = ["v1_18"] } -heck = "0.4.1" -lazy_static = "1.4.0" +gstreamer = "0.22.3" +gstreamer-app = { version = "0.22.0", features = ["v1_18"] } +gstreamer-rtsp = { version = "0.22.0", features = ["v1_18"] } +gstreamer-rtsp-server = { version = "0.22.0", features = ["v1_18"] } +heck = "0.5.0" log = { version = "0.4.17", features = [ "release_max_level_debug" ] } md5 = "0.7.0" neolink_core = { path = "crates/core", version = "0.6.3-rc.2" } +once_cell = "1.19.0" +quick-xml = { version = "0.31.0", features = ["serialize"] } regex = "1.7.3" -rumqttc = "0.22.0" +rumqttc = "0.24.0" serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" tokio = { version = "1.27.0", features = ["rt-multi-thread", "macros", "io-util", "tracing"] } tokio-stream = "0.1.12" tokio-util = { version = "0.7.7", features = ["full", "tracing"] } toml = "0.8.2" -validator = "0.16.0" -validator_derive = "0.16.0" -yaserde = "0.8.0" +validator = "0.17.0" +validator_derive = "0.17.0" [target.'cfg(not(target_env = "msvc"))'.dependencies] tikv-jemallocator = "0.5" diff --git a/build.rs b/build.rs index 9bcd1ac..04f0f3a 100644 --- a/build.rs +++ b/build.rs @@ -63,9 +63,18 @@ fn platform_cfg() { let gstreamer_dir = env::var_os("GSTREAMER_1_0_ROOT_MACOSX") .and_then(|x| x.into_string().ok()) .unwrap_or_else(|| r"/Library/Frameworks/GStreamer.framework/Versions/1.0".to_string()); + let openssl_dir = env::var_os("OPENSSL_1_1_ROOT_MACOSX") + .and_then(|x| x.into_string().ok()) + .unwrap_or_else(|| r"/usr/local/opt/openssl@1.1".to_string()); - println!(r"cargo:rustc-link-search=native={}/lib", gstreamer_dir); - println!(r"cargo:rustc-link-arg=-Wl,-rpath,{}/lib", gstreamer_dir); + println!( + r"cargo:rustc-link-search=native={}/lib;{}/lib", + gstreamer_dir, openssl_dir + ); + println!( + r"cargo:rustc-link-arg=-Wl,-rpath,{}/lib;{}/lib/", + gstreamer_dir, openssl_dir + ); } #[cfg(all(not(target_os = "macos"), not(target_os = "windows")))] diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 088ee9d..a96faa4 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -13,23 +13,22 @@ cfb-mode = "0.8.2" cookie-factory = "0.3.2" crc32fast = "1.3.2" crossbeam-channel = "0.5.8" -delegate = "0.10.0" -err-derive = "0.3.1" +delegate = "0.12.0" futures = "0.3.28" get_if_addrs = "0.5.3" lazy_static = "1.4.0" log = "0.4.17" md5 = "0.7.0" nom = { version = "7.1.3", features = ["alloc"] } +quick-xml = { version = "0.31.0", features = ["serialize"] } rand = "0.8.5" regex = "1.7.3" serde = { version = "1.0.106", features = ["derive"] } +thiserror = "1.0.58" 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", "tracing"] } -yaserde = "0.8.0" -yaserde_derive = "0.8.0" [dev-dependencies] assert_matches = "1.5.0" diff --git a/crates/core/src/bc/de.rs b/crates/core/src/bc/de.rs index 473c7df..a8ff8c2 100644 --- a/crates/core/src/bc/de.rs +++ b/crates/core/src/bc/de.rs @@ -1,5 +1,4 @@ use super::model::*; -use super::xml::{BcPayloads, BcXml}; use super::xml_crypto; use crate::Error; use bytes::{Buf, BytesMut}; @@ -84,10 +83,10 @@ fn bc_modern_msg<'a>( Err, }; - fn make_error>(input: I, ctx: &'static str, kind: ErrorKind) -> E + fn make_error(input: I, ctx: &'static str, kind: ErrorKind) -> E where I: std::marker::Copy, - E: ContextError, + E: ParseError + ContextError, { E::add_context(input, ctx, E::from_error_kind(input, kind)) } diff --git a/crates/core/src/bc/ser.rs b/crates/core/src/bc/ser.rs index 9860834..5b5b24c 100644 --- a/crates/core/src/bc/ser.rs +++ b/crates/core/src/bc/ser.rs @@ -1,5 +1,4 @@ use super::model::*; -use super::xml::BcPayloads; use super::xml_crypto; use cookie_factory::bytes::*; use cookie_factory::sequence::tuple; @@ -79,7 +78,7 @@ fn bc_ext( xml: &Extension, encryption_protocol: &EncryptionProtocol, ) -> impl SerializeFn { - let xml_bytes = xml.serialize(vec![]).unwrap(); + let xml_bytes = xml.serialize(bytes::BytesMut::new()).unwrap(); let enc_bytes = xml_crypto::encrypt(enc_offset, &xml_bytes, encryption_protocol); slice(enc_bytes) } @@ -91,7 +90,7 @@ fn bc_payload( ) -> impl SerializeFn { let payload_bytes = match payload { BcPayloads::BcXml(x) => { - let xml_bytes = x.serialize(vec![]).unwrap(); + let xml_bytes = x.serialize(bytes::BytesMut::new()).unwrap(); xml_crypto::encrypt(enc_offset, &xml_bytes, encryption_protocol) } BcPayloads::Binary(x) => x.to_owned(), diff --git a/crates/core/src/bc/xml.rs b/crates/core/src/bc/xml.rs index dccacba..4c214ad 100644 --- a/crates/core/src/bc/xml.rs +++ b/crates/core/src/bc/xml.rs @@ -1,156 +1,144 @@ -// YaSerde currently macro-expands names like __type__value from type_ #![allow(non_snake_case)] -use std::io::{Read, Write}; -// YaSerde is currently naming the traits and the derive macros identically -use yaserde::ser::Config; -use yaserde_derive::{YaDeserialize, YaSerialize}; +use serde::{Deserialize, Serialize}; +use std::{fmt::Write, io::BufRead}; #[cfg(test)] use indoc::indoc; /// There are two types of payloads xml and binary -#[derive(PartialEq, Debug, YaDeserialize)] -#[yaserde(flatten)] +#[derive(PartialEq, Debug)] #[allow(clippy::large_enum_variant)] pub enum BcPayloads { /// XML payloads are the more common ones and include payloads for camera controls - #[yaserde(rename = "body")] BcXml(BcXml), /// Binary payloads are received from the camera for streams and sent to the camera /// for talk-back and firmware updates - #[yaserde(flatten)] Binary(Vec), } -// Required for YaDeserialize -impl Default for BcPayloads { - fn default() -> Self { - BcPayloads::Binary(Default::default()) - } -} - /// The top level BC Xml -#[derive(PartialEq, Default, Debug, YaDeserialize, YaSerialize)] -#[yaserde(rename = "body")] +#[derive(PartialEq, Default, Debug, Deserialize, Serialize)] pub struct BcXml { /// Encryption xml is received during login and contain the NONCE - #[yaserde(rename = "Encryption")] + #[serde(rename = "Encryption")] pub encryption: Option, /// LoginUser xml is used during modern login - #[yaserde(rename = "LoginUser")] + #[serde(rename = "LoginUser")] pub login_user: Option, /// LoginNet xml is used during modern login - #[yaserde(rename = "LoginNet")] + #[serde(rename = "LoginNet")] pub login_net: Option, /// The final part of a login sequence will return DeviceInfo xml - #[yaserde(rename = "DeviceInfo")] + #[serde(rename = "DeviceInfo")] pub device_info: Option, /// The VersionInfo xml is recieved in reply to a version request - #[yaserde(rename = "VersionInfo")] + #[serde(rename = "VersionInfo")] pub version_info: Option, /// Preview xml is used as part of the stream request to set the stream quality and channel - #[yaserde(rename = "Preview")] + #[serde(rename = "Preview")] pub preview: Option, - #[yaserde(rename = "SystemGeneral")] + #[serde(rename = "SystemGeneral")] /// SystemGeneral xml is sent or recieved as part of the clock get/setting pub system_general: Option, /// Received as part of the Genral system info request - #[yaserde(rename = "Norm")] + #[serde(rename = "Norm")] pub norm: Option, /// Received as part of the LEDState info request - #[yaserde(rename = "LedState")] + #[serde(rename = "LedState")] pub led_state: Option, /// Sent as part of the TalkConfig to prepare the camera for audio talk-back - #[yaserde(rename = "TalkConfig")] + #[serde(rename = "TalkConfig")] pub talk_config: Option, /// rfAlarmCfg xml is sent or recieved as part of the PIR get/setting - #[yaserde(rename = "rfAlarmCfg")] + #[serde(rename = "rfAlarmCfg")] pub rf_alarm_cfg: Option, /// Revieced as part of the TalkAbility request - #[yaserde(rename = "TalkAbility")] + #[serde(rename = "TalkAbility")] pub talk_ability: Option, /// Received when motion is detected - #[yaserde(rename = "AlarmEventList")] + #[serde(rename = "AlarmEventList")] pub alarm_event_list: Option, /// Sent to move the camera - #[yaserde(rename = "PtzControl")] + #[serde(rename = "PtzControl")] pub ptz_control: Option, /// Sent to manually control the floodlight - #[yaserde(rename = "FloodlightManual")] + #[serde(rename = "FloodlightManual")] pub floodlight_manual: Option, /// Received when the floodlight status is updated - #[yaserde(rename = "FloodlightStatusList")] + #[serde(rename = "FloodlightStatusList")] pub floodlight_status_list: Option, /// Sent or received for the PTZ preset functionality - #[yaserde(rename = "PtzPreset")] + #[serde(rename = "PtzPreset")] pub ptz_preset: Option, /// Recieved on login/low battery events - #[yaserde(rename = "BatteryList")] + #[serde(rename = "BatteryList")] pub battery_list: Option, /// Recieved on request for battery info - #[yaserde(rename = "BatteryInfo")] + #[serde(rename = "BatteryInfo")] pub battery_info: Option, /// Recieved on request for a users persmissions/capabilitoes - #[yaserde(rename = "AbilityInfo")] + #[serde(rename = "AbilityInfo")] pub ability_info: Option, /// Recieved on request for a users persmissions/capabilitoes - #[yaserde(rename = "PushInfo")] + #[serde(rename = "PushInfo")] pub push_info: Option, /// Recieved on request for a link type - #[yaserde(rename = "LinkType")] + #[serde(rename = "LinkType")] pub link_type: Option, /// Recieved AND send for the snap message - #[yaserde(rename = "Snap")] + #[serde(rename = "Snap")] pub snap: Option, /// The list of streams and their configuration - #[yaserde(rename = "StreamInfoList")] + #[serde(rename = "StreamInfoList")] pub stream_info_list: Option, /// Thre list of streams and their configuration - #[yaserde(rename = "Uid")] + #[serde(rename = "Uid")] pub uid: Option, /// The floodlight settings for automatically turning on/off on schedule/motion - #[yaserde(rename = "FloodlightTask")] + #[serde(rename = "FloodlightTask")] pub floodlight_task: Option, /// For geting the zoom anf focus of the camera - #[yaserde(rename = "PtzZoomFocus")] + #[serde(rename = "PtzZoomFocus")] pub ptz_zoom_focus: Option, /// For zooming the camera - #[yaserde(rename = "StartZoomFocus")] + #[serde(rename = "StartZoomFocus")] pub start_zoom_focus: Option, /// Get the support xml - #[yaserde(rename = "Support")] + #[serde(rename = "Support")] pub support: Option, /// Play a sound - #[yaserde(rename = "audioPlayInfo")] + #[serde(rename = "audioPlayInfo")] pub audio_play_info: Option, } impl BcXml { - pub(crate) fn try_parse(s: impl Read) -> Result { - yaserde::de::from_reader(s) + pub(crate) fn try_parse(s: impl BufRead) -> Result { + quick_xml::de::from_reader(s) } - pub(crate) fn serialize(&self, w: W) -> Result { - yaserde::ser::serialize_with_writer(self, w, &Config::default()) + pub(crate) fn serialize(&self, mut w: W) -> Result { + quick_xml::se::to_writer(&mut w, self)?; + Ok(w) } } impl Extension { - pub(crate) fn try_parse(s: impl Read) -> Result { - yaserde::de::from_reader(s) + pub(crate) fn try_parse(s: impl BufRead) -> Result { + quick_xml::de::from_reader(s) } - pub(crate) fn serialize(&self, w: W) -> Result { - yaserde::ser::serialize_with_writer(self, w, &Config::default()) + pub(crate) fn serialize(&self, mut w: W) -> Result { + quick_xml::se::to_writer(&mut w, self)?; + Ok(w) } } /// Encryption xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct Encryption { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, - #[yaserde(rename = "type")] + #[serde(rename = "type")] /// The hashing algorithm used. Only observed the value of "md5" pub type_: String, /// The nonce used to negotiate the login and to generate the AES key @@ -158,32 +146,32 @@ pub struct Encryption { } /// LoginUser xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct LoginUser { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Username to login as - #[yaserde(rename = "userName")] + #[serde(rename = "userName")] pub user_name: String, /// Password for login in plain text pub password: String, /// Unknown always `1` - #[yaserde(rename = "userVer")] + #[serde(rename = "userVer")] pub user_ver: u32, } /// LoginNet xml -#[derive(PartialEq, Eq, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Debug, Deserialize, Serialize)] pub struct LoginNet { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Type of connection usually LAN (even on wifi) - #[yaserde(rename = "type")] + #[serde(rename = "type")] pub type_: String, /// The port for the udp will be `0` for tcp - #[yaserde(rename = "udpPort")] + #[serde(rename = "udpPort")] pub udp_port: u16, } @@ -200,19 +188,19 @@ impl Default for LoginNet { /// DeviceInfo xml /// /// There is more to this xml but we don't deserialize it all -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct DeviceInfo { /// The resolution xml block pub resolution: Resolution, } /// VersionInfo xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct VersionInfo { /// Name assigned to the camera pub name: String, /// Model Name - #[yaserde(rename = "type")] + #[serde(rename = "type")] pub model: Option, /// Camera's serial number pub serialNumber: String, @@ -230,10 +218,10 @@ pub struct VersionInfo { } /// Resolution xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct Resolution { /// Resolution name is in the format "width*height" i.e. "2304*1296" - #[yaserde(rename = "resolutionName")] + #[serde(rename = "resolutionName")] pub name: String, /// Height of the stream in pixels pub width: u32, @@ -244,56 +232,56 @@ pub struct Resolution { /// Preview xml /// /// This xml is used to request a stream to start -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct Preview { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Channel id is usually zero unless using a NVR - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// Handle usually 0 for mainStream and 1 for subStream pub handle: u32, /// Either `"mainStream"` or `"subStream"` - #[yaserde(rename = "streamType")] + #[serde(rename = "streamType")] pub stream_type: Option, } /// Extension xml /// /// This is used to describe the subsequent payload passed the `payload_offset` -#[derive(PartialEq, Eq, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Debug, Deserialize, Serialize)] pub struct Extension { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// If the subsequent payload is binary this will be set to 1. Otherwise it is ommited - #[yaserde(rename = "binaryData")] + #[serde(rename = "binaryData")] pub binary_data: Option, /// Certain requests such `AbilitySupport` require to know which user this /// ability support request is for (why camera dosen't know this based on who /// is logged in is unknown... Possible security hole) - #[yaserde(rename = "userName")] + #[serde(rename = "userName")] pub user_name: Option, /// Certain requests such as `AbilitySupport` require details such as what type of /// abilities are you intested in. This is a comma seperated list such as /// `"system, network, alarm, record, video, image"` pub token: Option, /// The channel ID. This is usually `0` unless using an NVR - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: Option, /// The rfID used in the PIR - #[yaserde(rename = "rfId")] + #[serde(rename = "rfId")] pub rf_id: Option, /// Encrypted binary has this to verify successful decryption - #[yaserde(rename = "checkPos")] + #[serde(rename = "checkPos")] pub check_pos: Option, /// Encrypted binary has this to verify successful decryption - #[yaserde(rename = "checkValue")] + #[serde(rename = "checkValue")] pub check_value: Option, /// Used in newer encrypted payload packets - #[yaserde(rename = "encryptLen")] + #[serde(rename = "encryptLen")] pub encrypt_len: Option, } @@ -314,14 +302,14 @@ impl Default for Extension { } /// SystemGeneral xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct SystemGeneral { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Time zone is negative seconds offset from UTC. So +7:00 is -25200 - #[yaserde(rename = "timeZone")] + #[serde(rename = "timeZone")] pub time_zone: Option, /// Current year pub year: Option, @@ -337,77 +325,77 @@ pub struct SystemGeneral { pub second: Option, /// Format to use for On Screen Display usually `"DMY"` - #[yaserde(rename = "osdFormat")] + #[serde(rename = "osdFormat")] pub osd_format: Option, /// Unknown usually `0` - #[yaserde(rename = "timeFormat")] + #[serde(rename = "timeFormat")] pub time_format: Option, /// Language e.g. `English` will set the language on the reolink app pub language: Option, /// Name assigned to the camera - #[yaserde(rename = "deviceName")] + #[serde(rename = "deviceName")] pub device_name: Option, } /// Norm xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct Norm { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, // This is usually just `"NTSC"` norm: String, } /// LedState xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct LedState { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Channel ID of camera to get/set its LED state - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// LED Version, observed value is "2". Should be None when setting the LedState - #[yaserde(rename = "ledVersion")] + #[serde(rename = "ledVersion")] pub led_version: Option, /// State of the IR LEDs values are "auto", "open", "close" pub state: String, /// State of the LED status light (blue on light), values are "open", "close" - #[yaserde(rename = "lightState")] + #[serde(rename = "lightState")] pub light_state: String, } /// FloodlightStatus xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct FloodlightStatus { /// Channel ID of floodlight - #[yaserde(rename = "channel")] + #[serde(rename = "channel")] pub channel_id: u8, /// On or off pub status: u8, } /// FloodlightStatusList xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct FloodlightStatusList { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// List of events - #[yaserde(rename = "FloodlightStatus")] + #[serde(rename = "FloodlightStatus")] pub floodlight_status_list: Vec, } /// FloodlightManual xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct FloodlightManual { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Channel ID of floodlight - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// On or off pub status: u8, @@ -416,13 +404,13 @@ pub struct FloodlightManual { } /// rfAlarmCfg xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct RfAlarmCfg { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Rfid - #[yaserde(rename = "rfID")] + #[serde(rename = "rfID")] pub rf_id: u8, /// PIR status pub enable: u8, @@ -433,182 +421,182 @@ pub struct RfAlarmCfg { /// reduce False alarm boolean pub reduceFalseAlarm: u8, /// XML time block for all week days - #[yaserde(rename = "timeBlockList")] + #[serde(rename = "timeBlockList")] pub time_block_list: TimeBlockList, /// The alarm handle to attach to this Rf - #[yaserde(rename = "alarmHandle")] + #[serde(rename = "alarmHandle")] pub alarm_handle: AlarmHandle, } /// TimeBlockList XML -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] -#[yaserde(rename = "timeBlockList")] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] +#[serde(rename = "timeBlockList")] pub struct TimeBlockList { /// List of time block entries which disable/enable the PIR at a time - #[yaserde(rename = "timeBlock")] + #[serde(rename = "timeBlock")] pub time_block: Vec, } /// TimeBlock XML Used to set the time to enable/disable PIR dectection -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] -#[yaserde(rename = "timeBlock")] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] +#[serde(rename = "timeBlock")] pub struct TimeBlock { /// Whether to enable or disable for this time block pub enable: u8, /// The day of the week for this block pub weekDay: String, /// Time to start this block - #[yaserde(rename = "beginHour")] + #[serde(rename = "beginHour")] pub begin_hour: u8, /// Time to end this block - #[yaserde(rename = "endHour")] + #[serde(rename = "endHour")] pub end_hour: u8, } -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] /// AlarmHandle Xml pub struct AlarmHandle { /// Items in the alarm handle pub item: Vec, } -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] /// An item in the alarm handle -#[yaserde(rename = "item")] +#[serde(rename = "item")] pub struct AlarmHandleItem { /// The channel ID pub channel: u8, /// The handle type: Known values, comma seperated list of snap,rec,push - #[yaserde(rename = "handleType")] + #[serde(rename = "handleType")] pub handle_type: String, } /// TalkConfig xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct TalkConfig { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Channel ID of camera to set the TalkConfig - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// Duplex known values `"FDX"` pub duplex: String, /// audioStreamMode known values `"followVideoStream"` - #[yaserde(rename = "audioStreamMode")] + #[serde(rename = "audioStreamMode")] pub audio_stream_mode: String, /// AudioConfig contans the details of the audio to follow - #[yaserde(rename = "audioConfig")] + #[serde(rename = "audioConfig")] pub audio_config: AudioConfig, } /// audioConfig xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] -#[yaserde(rename = "audioConfig")] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] +#[serde(rename = "audioConfig")] pub struct AudioConfig { /// Unknown only sent during TalkAbility request from the camera pub priority: Option, /// Audio type known values are `"adpcm"` /// /// Do not expect camera to support anything else. - #[yaserde(rename = "audioType")] + #[serde(rename = "audioType")] pub audio_type: String, /// Audio sample rate known values are `16000` - #[yaserde(rename = "sampleRate")] + #[serde(rename = "sampleRate")] pub sample_rate: u16, /// Precision of data known vaues are `16` (i.e. 16bit) - #[yaserde(rename = "samplePrecision")] + #[serde(rename = "samplePrecision")] pub sample_precision: u16, /// Number of audio samples this should be twice the block size for adpcm - #[yaserde(rename = "lengthPerEncoder")] + #[serde(rename = "lengthPerEncoder")] pub length_per_encoder: u16, /// Sound track is the number of tracks known values are `"mono"` /// /// Do not expect camera to support anything else - #[yaserde(rename = "soundTrack")] + #[serde(rename = "soundTrack")] pub sound_track: String, } /// TalkAbility xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct TalkAbility { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Duplexes known values `"FDX"` - #[yaserde(rename = "duplexList")] + #[serde(rename = "duplexList")] pub duplex_list: Vec, /// audioStreamModes known values `"followVideoStream"` - #[yaserde(rename = "audioStreamModeList")] + #[serde(rename = "audioStreamModeList")] pub audio_stream_mode_list: Vec, /// AudioConfigs contans the details of the audio to follow - #[yaserde(rename = "audioConfigList")] + #[serde(rename = "audioConfigList")] pub audio_config_list: Vec, } /// duplexList xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct DuplexList { /// The supported duplex known values are "FBX" pub duplex: String, } /// audioStreamModeList xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct AudioStreamModeList { /// The supported audio stream mode - #[yaserde(rename = "audioStreamMode")] + #[serde(rename = "audioStreamMode")] pub audio_stream_mode: String, } /// audioConfigList xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct AudioConfigList { /// The supported audio configs - #[yaserde(rename = "audioConfig")] + #[serde(rename = "audioConfig")] pub audio_config: AudioConfig, } /// An XML that desctibes a list of events such as motion detection -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct AlarmEventList { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// List of events - #[yaserde(rename = "AlarmEvent")] + #[serde(rename = "AlarmEvent")] pub alarm_events: Vec, } /// An alarm event. Camera can send multiple per message as an array in AlarmEventList. -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct AlarmEvent { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// The channel the event occured on. Usually zero unless from an NVR - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// Motion status. Known values are `"MD"` or `"none"` pub status: String, /// AI status. Known values are `"people"` or `"none"` - #[yaserde(rename = "AItype")] + #[serde(rename = "AItype")] pub ai_type: Option, /// The recording status. Known values `0` or `1` pub recording: i32, /// The timestamp associated with the recording. `0` if not recording - #[yaserde(rename = "timeStamp")] + #[serde(rename = "timeStamp")] pub timeStamp: i32, } /// The Ptz messages used to move the camera -#[derive(PartialEq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Default, Debug, Deserialize, Serialize)] pub struct PtzControl { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// The channel the event occured on. Usually zero unless from an NVR - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// The amount of movement to perform pub speed: f32, @@ -618,28 +606,28 @@ pub struct PtzControl { } /// An XML that describes a list of available PTZ presets -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct PtzPreset { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// The channel ID. Usually zero unless from an NVR - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// List of presets - #[yaserde(rename = "presetList")] + #[serde(rename = "presetList")] pub preset_list: PresetList, } /// A preset list -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct PresetList { /// List of Presets pub preset: Vec, } /// A preset. Either contains the ID and the name or the ID and the command -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct Preset { /// The ID of the preset pub id: u8, @@ -651,27 +639,27 @@ pub struct Preset { /// A list of battery infos. This message is sent from the camera as /// an event -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct BatteryList { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Battery info items - #[yaserde(rename = "BatteryInfo")] + #[serde(rename = "BatteryInfo")] pub battery_info: Vec, } /// The individual battery info -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct BatteryInfo { /// The channel the for the camera usually 0 - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// Charge status known values, "chargeComplete", "charging", "none", - #[yaserde(rename = "chargeStatus")] + #[serde(rename = "chargeStatus")] pub charge_status: String, /// Status of charging port known values: "solarPanel" - #[yaserde(rename = "adapterStatus")] + #[serde(rename = "adapterStatus")] pub adapter_status: String, /// Voltage pub voltage: i32, @@ -680,21 +668,21 @@ pub struct BatteryInfo { /// Temperture pub temperature: i32, /// % charge from 0-100 - #[yaserde(rename = "batteryPercent")] + #[serde(rename = "batteryPercent")] pub battery_percent: u32, /// Low power flag. Known values 0, 1 (0=false) - #[yaserde(rename = "lowPower")] + #[serde(rename = "lowPower")] pub low_power: u32, /// Battery version info: Known values 2 - #[yaserde(rename = "batteryVersion")] + #[serde(rename = "batteryVersion")] pub battery_version: u32, } /// The ability battery info -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct AbilityInfo { /// Username with this ability - #[yaserde(rename = "userName")] + #[serde(rename = "userName")] pub username: String, /// System permissions pub system: Option, @@ -711,132 +699,132 @@ pub struct AbilityInfo { /// Replay permissions pub replay: Option, /// PTZ permissions - #[yaserde(rename = "PTZ")] + #[serde(rename = "PTZ")] pub ptz: Option, /// IO permissions - #[yaserde(rename = "IO")] + #[serde(rename = "IO")] pub io: Option, /// Streaming permissions pub streaming: Option, } /// Ability info for system token -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct AbilityInfoToken { /// Submodule for this ability info token - #[yaserde(rename = "subModule")] + #[serde(rename = "subModule")] pub sub_module: Vec, } /// Token submodule infomation -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] -#[yaserde(rename = "subModule")] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] +#[serde(rename = "subModule")] pub struct AbilityInfoSubModule { /// The channel the for the camera usually 0 - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: Option, /// The comma seperated list of permissions like this: `general_rw, norm_rw, version_ro` - #[yaserde(rename = "abilityValue")] + #[serde(rename = "abilityValue")] pub ability_value: String, } /// PushInfo XML -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct PushInfo { /// The token from FCM registration pub token: String, /// The phone type, known values: `reo_iphone` - #[yaserde(rename = "phoneType")] + #[serde(rename = "phoneType")] pub phone_type: String, /// A client ID, seems to be an all CAPS MD5 hash of something - #[yaserde(rename = "clientID")] + #[serde(rename = "clientID")] pub client_id: String, } /// The Link Type contains the type of connection present -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct LinkType { - #[yaserde(rename = "type")] + #[serde(rename = "type")] /// Type of connection known values `"LAN"` pub link_type: String, } /// The Snap contains the binary jpeg image details -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct Snap { /// The snap xml version. Observed values "1.1" - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] /// The channel id to get the snapshot from pub channel_id: u8, /// Unknown, observed values: 0 /// value is only set on request - #[yaserde(rename = "logicChannel")] + #[serde(rename = "logicChannel")] pub logic_channel: Option, /// Time of snapshot, zero when requesting pub time: u32, /// Request a full frame, observed values: 0 /// value is only set on request - #[yaserde(rename = "fullFrame")] + #[serde(rename = "fullFrame")] pub full_frame: Option, /// Stream name, observed values: `main`, `sub` /// value is only set on request - #[yaserde(rename = "streamType")] + #[serde(rename = "streamType")] pub stream_type: Option, /// File name, usually of the form `01_20230518140240.jpg` /// value is only set on recieve - #[yaserde(rename = "fileName")] + #[serde(rename = "fileName")] pub file_name: Option, /// Size in bytes of the picture /// value is only set on recieve - #[yaserde(rename = "pictureSize")] + #[serde(rename = "pictureSize")] pub picture_size: Option, } /// The primary reply when asked about the stream info -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct StreamInfoList { /// The stream infos. There is usually only one of these - #[yaserde(rename = "StreamInfo")] + #[serde(rename = "StreamInfo")] pub stream_infos: Vec, } /// The individual reply about the stream info -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct StreamInfo { /// Bits in the channel number. Observed values `1` - #[yaserde(rename = "channelBits")] + #[serde(rename = "channelBits")] pub channel_bits: u32, /// List of encode tabeles. These hold the actual stream data - #[yaserde(rename = "encodeTable")] + #[serde(rename = "encodeTable")] pub encode_tables: Vec, } /// The individual reply about the stream info -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct EncodeTable { /// The internal name of the stream observed values `"mainStream"`, `"subStream"` - #[yaserde(rename = "type")] + #[serde(rename = "type")] pub name: String, /// The resolution of the stream pub resolution: StreamResolution, /// The default framerate. This is sometimes an index into the table - #[yaserde(rename = "defaultFramerate")] + #[serde(rename = "defaultFramerate")] pub default_framerate: u32, /// The default bitrate. This is sometimes an index into the table - #[yaserde(rename = "defaultBitrate")] + #[serde(rename = "defaultBitrate")] pub default_bitrate: u32, /// Table of valid framerates - #[yaserde(rename = "framerateTable")] + #[serde(rename = "framerateTable")] pub framerate_table: Vec, /// Table of valid bitrates - #[yaserde(rename = "bitrateTable")] + #[serde(rename = "bitrateTable")] pub bitrate_table: Vec, } /// The resolution of the stream -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct StreamResolution { /// Width of the stream pub width: u32, @@ -845,30 +833,30 @@ pub struct StreamResolution { } /// Uid xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct Uid { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// This the UID of the camera pub uid: String, } /// FloodlightTask xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct FloodlightTask { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Channel of the camera pub channel: u8, /// Alarm Mode: Observed values 1 - #[yaserde(rename = "alarmMode")] + #[serde(rename = "alarmMode")] pub alarm_mode: u32, /// Enable/Disable floor light on motion pub enable: u32, /// Last Alarm Mode: Observed values 2 - #[yaserde(rename = "lastAlarmMode")] + #[serde(rename = "lastAlarmMode")] pub last_alarm_mode: u32, /// Preview Auto: Observed values 0 pub preview_auto: u32, @@ -883,80 +871,80 @@ pub struct FloodlightTask { /// Schedule fot auto floodlight pub schedule: Schedule, /// Threshold settings for light sensor to consider nightime - #[yaserde(rename = "lightSensThreshold")] + #[serde(rename = "lightSensThreshold")] pub light_sens_threshold: LightSensThreshold, /// Light of schedled auto floodlights - #[yaserde(rename = "FloodlightScheduleList")] + #[serde(rename = "FloodlightScheduleList")] pub floodlight_schedule_list: FloodlightScheduleList, /// Some sort of multi brightness - #[yaserde(rename = "nightLongViewMultiBrightness")] + #[serde(rename = "nightLongViewMultiBrightness")] pub night_long_view_multi_brightness: NightLongViewMultiBrightness, /// Detection Type: Observed values none - #[yaserde(rename = "detectType")] + #[serde(rename = "detectType")] pub detect_type: String, } /// Schedule for Floodlight Task -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct Schedule { /// startHour - #[yaserde(rename = "startHour")] + #[serde(rename = "startHour")] pub start_hour: u32, /// startMin: Observed values 0 - #[yaserde(rename = "startMin")] + #[serde(rename = "startMin")] pub start_min: Option, /// endHour - #[yaserde(rename = "endHour")] + #[serde(rename = "endHour")] pub end_hour: u32, /// endMin: Observed values 0 - #[yaserde(rename = "endMin")] + #[serde(rename = "endMin")] pub end_min: Option, } /// Light Sensor Threshold for FloodLightTask -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct LightSensThreshold { /// Min: Observed values 1000 pub min: Option, /// Max: OBserved values 2300 pub max: Option, /// Light Current Value: Observed Value 1000 - #[yaserde(rename = "lightCur")] + #[serde(rename = "lightCur")] pub light_cur: u32, /// Dark Current Value: Observed Value 1900 - #[yaserde(rename = "darkCur")] + #[serde(rename = "darkCur")] pub dark_cur: u32, /// Light Default: Observed Value 1000 - #[yaserde(rename = "lightDef")] + #[serde(rename = "lightDef")] pub light_def: Option, /// Dark Default: Observed Value 1900 - #[yaserde(rename = "darkDef")] + #[serde(rename = "darkDef")] pub dark_def: Option, } /// Floodlight schdule list for FloodlightTask -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct FloodlightScheduleList { /// Max Num observed values 32 - #[yaserde(rename = "maxNum")] + #[serde(rename = "maxNum")] pub max_num: u32, } /// NightView Brightness for FloodLightTask -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct NightLongViewMultiBrightness { /// Enabled: Observed values 0, 1 pub enable: u8, /// alarmBrightness settings - #[yaserde(rename = "alarmBrightness")] + #[serde(rename = "alarmBrightness")] pub alarm_brightness: AlarmBrightness, /// alarmDelay settings - #[yaserde(rename = "alarmDelay")] + #[serde(rename = "alarmDelay")] pub alarm_delay: AlarmDelay, } /// Alarm brightness for NightLongViewMultiBrightness -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct AlarmBrightness { /// Min: Observed values 1 pub min: Option, @@ -969,7 +957,7 @@ pub struct AlarmBrightness { } /// Alarm delay for NightLongViewMultiBrightness -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct AlarmDelay { /// Min: Observed values 5 pub min: Option, @@ -982,13 +970,13 @@ pub struct AlarmDelay { } /// PtzZoomFocus xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct PtzZoomFocus { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Channel ID - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// Max, min and current zoom. (Read Only) pub zoom: HelperPosition, @@ -997,75 +985,75 @@ pub struct PtzZoomFocus { } /// StartZoomFocus xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct StartZoomFocus { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// Channel ID - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// Command: Observed values: zoomPos. (Write Only) pub command: String, /// Target Position: Observed Values: 2994, 2508, 2888, 3089, 3194, 3163. (Write Only) - #[yaserde(rename = "movePos")] + #[serde(rename = "movePos")] pub move_pos: u32, } /// Helper for Max, Min, Curr pos of zoom/focus -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct HelperPosition { /// Max value - #[yaserde(rename = "maxPos")] + #[serde(rename = "maxPos")] pub max_pos: u32, /// Min value - #[yaserde(rename = "minPos")] + #[serde(rename = "minPos")] pub min_pos: u32, /// Curr value - #[yaserde(rename = "curPos")] + #[serde(rename = "curPos")] pub cur_pos: u32, } /// Support xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct Support { /// XML Version - #[yaserde(attribute)] + #[serde(rename = "@version")] pub version: String, /// IO port number (input) - #[yaserde(rename = "IOInputPortNum")] + #[serde(rename = "IOInputPortNum")] pub io_input_port_num: Option, /// IO port number (output) - #[yaserde(rename = "IOOutputPortNum")] + #[serde(rename = "IOOutputPortNum")] pub io_output_port_num: Option, - #[yaserde(rename = "diskNum")] + #[serde(rename = "diskNum")] /// Number of disks pub disk_num: Option, /// Number of video channels - #[yaserde(rename = "channelNum")] + #[serde(rename = "channelNum")] pub channel_num: Option, /// Number of audio channels - #[yaserde(rename = "audioNum")] + #[serde(rename = "audioNum")] pub audio_num: Option, /// The supported PTZ Mode: pt - #[yaserde(rename = "ptzMode")] + #[serde(rename = "ptzMode")] pub ptz_mode: Option, /// PTZ cfg: 0 - #[yaserde(rename = "ptzCfg")] + #[serde(rename = "ptzCfg")] pub ptz_cfg: Option, /// Use b485 ptz - #[yaserde(rename = "")] + #[serde(rename = "")] pub B485: Option, /// Support autoupdate - #[yaserde(rename = "autoUpdate")] + #[serde(rename = "autoUpdate")] pub auto_update: Option, /// Support push notificaion alarms - #[yaserde(rename = "pushAlarm")] + #[serde(rename = "pushAlarm")] pub push_alarm: Option, /// Support ftp pub ftp: Option, /// Support test for ftp - #[yaserde(rename = "ftpTest")] + #[serde(rename = "ftpTest")] pub ftp_test: Option, /// Support email notification pub email: Option, @@ -1074,133 +1062,133 @@ pub struct Support { /// Support recording pub record: Option, /// Support test for wifi - #[yaserde(rename = "wifiTest")] + #[serde(rename = "wifiTest")] pub wifi_test: Option, /// Support rtsp pub rtsp: Option, /// Support onvif pub onvif: Option, /// Support audio talk - #[yaserde(rename = "audioTalk")] + #[serde(rename = "audioTalk")] pub audio_talk: Option, /// RF version - #[yaserde(rename = "rfVersion")] + #[serde(rename = "rfVersion")] pub rf_version: Option, /// Support rtmp pub rtmp: Option, /// Has external stream - #[yaserde(rename = "noExternStream")] + #[serde(rename = "noExternStream")] pub no_extern_stream: Option, /// Time format - #[yaserde(rename = "timeFormat")] + #[serde(rename = "timeFormat")] pub time_format: Option, /// DDNS version - #[yaserde(rename = "ddnsVersion")] + #[serde(rename = "ddnsVersion")] pub ddns_version: Option, /// Email version - #[yaserde(rename = "emailVersion")] + #[serde(rename = "emailVersion")] pub email_version: Option, /// Push notification version - #[yaserde(rename = "pushVersion")] + #[serde(rename = "pushVersion")] pub push_version: Option, /// Push notification type: 1 - #[yaserde(rename = "pushType")] + #[serde(rename = "pushType")] pub push_type: Option, /// Support audio alarm - #[yaserde(rename = "audioAlarm")] + #[serde(rename = "audioAlarm")] pub audio_alarm: Option, /// Support AP - #[yaserde(rename = "apMode")] + #[serde(rename = "apMode")] pub ap_mode: Option, /// Could version - #[yaserde(rename = "cloudVersion")] + #[serde(rename = "cloudVersion")] pub cloud_version: Option, /// Replay version - #[yaserde(rename = "replayVersion")] + #[serde(rename = "replayVersion")] pub replay_version: Option, /// mobComVersion - #[yaserde(rename = "mobComVersion")] + #[serde(rename = "mobComVersion")] pub mob_com_version: Option, /// Export images - #[yaserde(rename = "ExportImport")] + #[serde(rename = "ExportImport")] pub export_import: Option, /// Language version - #[yaserde(rename = "languageVer")] + #[serde(rename = "languageVer")] pub language_ver: Option, /// Video standard - #[yaserde(rename = "videoStandard")] + #[serde(rename = "videoStandard")] pub video_standard: Option, /// Support sync time - #[yaserde(rename = "syncTime")] + #[serde(rename = "syncTime")] pub sync_time: Option, /// Support net port - #[yaserde(rename = "netPort")] + #[serde(rename = "netPort")] pub net_port: Option, /// NAS version - #[yaserde(rename = "nasVersion")] + #[serde(rename = "nasVersion")] pub nas_version: Option, /// Reboot required - #[yaserde(rename = "needReboot")] + #[serde(rename = "needReboot")] pub need_reboot: Option, /// Support reboot pub reboot: Option, /// Support Audio config - #[yaserde(rename = "audioCfg")] + #[serde(rename = "audioCfg")] pub audio_cfg: Option, /// Support network diagnosis - #[yaserde(rename = "networkDiagnosis")] + #[serde(rename = "networkDiagnosis")] pub network_diagnosis: Option, /// Support height adjustment - #[yaserde(rename = "heightDiffAdjust")] + #[serde(rename = "heightDiffAdjust")] pub height_diff_adjust: Option, /// Support upgrade pub upgrade: Option, /// Support GPS pub gps: Option, /// Support power save config - #[yaserde(rename = "powerSavingCfg")] + #[serde(rename = "powerSavingCfg")] pub power_saving_cfg: Option, /// Login Locked - #[yaserde(rename = "loginLocked")] + #[serde(rename = "loginLocked")] pub login_locked: Option, /// View plan - #[yaserde(rename = "viewPlan")] + #[serde(rename = "viewPlan")] pub view_plan: Option, /// Preview replay limit - #[yaserde(rename = "previewReplayLimit")] + #[serde(rename = "previewReplayLimit")] pub preview_replay_limit: Option, /// IOT link - #[yaserde(rename = "IOTLink")] + #[serde(rename = "IOTLink")] pub iot_link: Option, /// IOT link maximum actions - #[yaserde(rename = "IOTLinkActionMax")] + #[serde(rename = "IOTLinkActionMax")] pub iot_link_action_max: Option, /// Support record config - #[yaserde(rename = "recordCfg")] + #[serde(rename = "recordCfg")] pub record_cfg: Option, /// Has large battery - #[yaserde(rename = "largeBattery")] + #[serde(rename = "largeBattery")] pub large_battery: Option, /// Smart home config - #[yaserde(rename = "smartHome")] + #[serde(rename = "smartHome")] pub smart_home: Option, /// Support config for specific channels - #[yaserde(rename = "item")] + #[serde(rename = "item")] pub items: Vec, } /// List of smart home items -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct SmartHome { /// Versionm pub version: u32, /// The smarthome items - #[yaserde(rename = "item")] + #[serde(rename = "item")] pub items: Vec, } /// Smart home items, are name:version pairs -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct SmartHomeItem { /// Name of item: Option<"googleHome">, "amazonAlexa" pub name: String, @@ -1209,115 +1197,115 @@ pub struct SmartHomeItem { } /// Support Items for an individual channel -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct SupportItem { /// Channel ID of the item - #[yaserde(rename = "chnID")] + #[serde(rename = "chnID")] pub chn_id: u32, /// PTZ type of the channel - #[yaserde(rename = "ptzType")] + #[serde(rename = "ptzType")] pub ptz_type: Option, /// RF config - #[yaserde(rename = "rfCfg")] + #[serde(rename = "rfCfg")] pub rf_cfg: Option, /// Support audio - #[yaserde(rename = "noAudio")] + #[serde(rename = "noAudio")] pub no_audio: Option, /// Support auto focus - #[yaserde(rename = "autoFocus")] + #[serde(rename = "autoFocus")] pub auto_focus: Option, /// Support video clip - #[yaserde(rename = "videoClip")] + #[serde(rename = "videoClip")] pub video_clip: Option, /// Has battery pub battery: Option, /// ISP config - #[yaserde(rename = "ispCfg")] + #[serde(rename = "ispCfg")] pub isp_cfg: Option, /// OSD config - #[yaserde(rename = "osdCfg")] + #[serde(rename = "osdCfg")] pub osd_cfg: Option, /// Support battery analysis - #[yaserde(rename = "batAnalysis")] + #[serde(rename = "batAnalysis")] pub bat_analysis: Option, /// Supports dynamic resolution - #[yaserde(rename = "dynamicReso")] + #[serde(rename = "dynamicReso")] pub dynamic_reso: Option, /// Audio version - #[yaserde(rename = "audioVersion")] + #[serde(rename = "audioVersion")] pub audio_version: Option, /// Supports LED control - #[yaserde(rename = "ledCtrl")] + #[serde(rename = "ledCtrl")] pub led_ctrl: Option, /// Supports PTZ Control - #[yaserde(rename = "ptzControl")] + #[serde(rename = "ptzControl")] pub ptz_control: Option, /// Supports new ISP config - #[yaserde(rename = "newIspCfg")] + #[serde(rename = "newIspCfg")] pub new_isp_cfg: Option, /// Supports PTZ presets - #[yaserde(rename = "ptzPreset")] + #[serde(rename = "ptzPreset")] pub ptz_preset: Option, /// Supports PTZ patrol - #[yaserde(rename = "ptzPatrol")] + #[serde(rename = "ptzPatrol")] pub ptz_patrol: Option, /// Supports PTZ Tattern - #[yaserde(rename = "ptzTattern")] + #[serde(rename = "ptzTattern")] pub ptz_tattern: Option, /// Supports Auto PT - #[yaserde(rename = "autoPt")] + #[serde(rename = "autoPt")] pub auto_pt: Option, /// H264 Profile: 7 - #[yaserde(rename = "h264Profile")] + #[serde(rename = "h264Profile")] pub h264_profile: Option, /// Supports motion alarm pub motion: Option, /// AI Type - #[yaserde(rename = "aitype")] + #[serde(rename = "aitype")] pub ai_type: Option, /// Animal AI Type - #[yaserde(rename = "aiAnimalType")] + #[serde(rename = "aiAnimalType")] pub ai_animal_type: Option, /// Supports time lapse pub timelapse: Option, /// Supports snap pub snap: Option, /// Supports encoding control - #[yaserde(rename = "encCtrl")] + #[serde(rename = "encCtrl")] pub enc_ctrl: Option, /// Has Zoom focus backlash - #[yaserde(rename = "zfBacklash")] + #[serde(rename = "zfBacklash")] pub zf_backlash: Option, /// Supports IOT Link Ability - #[yaserde(rename = "IOTLinkAbility")] + #[serde(rename = "IOTLinkAbility")] pub iot_link_ability: Option, /// Supports IPC audio talk - #[yaserde(rename = "ipcAudioTalk")] + #[serde(rename = "ipcAudioTalk")] pub ipc_audio_talk: Option, /// Supports Bino Config - #[yaserde(rename = "binoCfg")] + #[serde(rename = "binoCfg")] pub bino_cfg: Option, /// Supports thumbnail pub thumbnail: Option, } /// Instruct camera to play an audio alarm, usually this is the siren -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize)] pub struct AudioPlayInfo { /// Channel ID - #[yaserde(rename = "channelId")] + #[serde(rename = "channelId")] pub channel_id: u8, /// Playmode: 0 - #[yaserde(rename = "playMode")] + #[serde(rename = "playMode")] pub play_mode: u32, /// Duration: 0 - #[yaserde(rename = "playDuration")] + #[serde(rename = "playDuration")] pub play_duration: u32, /// Times to play: 1 - #[yaserde(rename = "playTimes")] + #[serde(rename = "playTimes")] pub play_times: u32, /// On or Off: 0 - #[yaserde(rename = "onOff")] + #[serde(rename = "onOff")] pub on_off: u32, } @@ -1338,7 +1326,7 @@ fn test_encryption_deser() { "# ); - let b: BcXml = yaserde::de::from_str(sample).unwrap(); + let b: BcXml = quick_xml::de::from_str(sample).unwrap(); let enc = b.encryption.as_ref().unwrap(); assert_eq!(enc.version, "1.1"); @@ -1369,7 +1357,7 @@ fn test_login_deser() { "# ); - let b: BcXml = yaserde::de::from_str(sample).unwrap(); + let b: BcXml = quick_xml::de::from_str(sample).unwrap(); let login_user = b.login_user.unwrap(); let login_net = b.login_net.unwrap(); @@ -1417,8 +1405,7 @@ fn test_login_ser() { }; let b2 = BcXml::try_parse(sample.as_bytes()).unwrap(); - let b3 = BcXml::try_parse(b.serialize(vec![]).unwrap().as_slice()).unwrap(); - + let b3 = BcXml::try_parse(b.serialize(bytes::BytesMut::new()).unwrap().as_ref()).unwrap(); assert_eq!(b, b2); assert_eq!(b, b3); assert_eq!(b2, b3); diff --git a/crates/core/src/bc_protocol/abilityinfo.rs b/crates/core/src/bc_protocol/abilityinfo.rs index ff82529..cbf97a7 100644 --- a/crates/core/src/bc_protocol/abilityinfo.rs +++ b/crates/core/src/bc_protocol/abilityinfo.rs @@ -54,8 +54,9 @@ impl BcCamera { /// Populate ability list of the camera pub async fn polulate_abilities(&self) -> Result<()> { let info = self.get_abilityinfo().await?; - let info_res = yaserde::ser::serialize_with_writer(&info, vec![], &Default::default()); - if let Ok(Ok(info_str)) = info_res.map(String::from_utf8) { + let mut ser_buf = bytes::BytesMut::new(); + let info_res = quick_xml::se::to_writer(&mut ser_buf, &info).map(|_| ser_buf); + if let Ok(Ok(info_str)) = info_res.map(|b| std::str::from_utf8(&b).map(|a| a.to_owned())) { debug!("Abilities: {}", info_str); } diff --git a/crates/core/src/bc_protocol/battery.rs b/crates/core/src/bc_protocol/battery.rs index dbcc9ea..6fd1f1c 100644 --- a/crates/core/src/bc_protocol/battery.rs +++ b/crates/core/src/bc_protocol/battery.rs @@ -57,14 +57,13 @@ impl BcCamera { ); } PrintFormat::Xml => { - let bat_ser = String::from_utf8( - yaserde::ser::serialize_with_writer( - battery, - vec![], - &Default::default(), - ) - .expect("Should Ser the struct"), - ) + let bat_ser = String::from_utf8({ + let mut ser_buf = bytes::BytesMut::new(); + let parsed = + quick_xml::se::to_writer(&mut ser_buf, &battery) + .map(|_| ser_buf); + parsed.expect("Could not serialise data").to_vec() + }) .expect("Should be UTF8"); println!("{}", bat_ser); } diff --git a/crates/core/src/bc_protocol/connection/discovery.rs b/crates/core/src/bc_protocol/connection/discovery.rs index 0b91b0f..804e81c 100644 --- a/crates/core/src/bc_protocol/connection/discovery.rs +++ b/crates/core/src/bc_protocol/connection/discovery.rs @@ -350,28 +350,21 @@ impl Discoverer { let port = self.local_addr().port(); let msg = UdpDiscovery { tid, - payload: UdpXml { - c2d_c: Some(C2dC { - uid: uid.to_string(), - cli: ClientList { port: port as u32 }, - cid: client_id, - mtu: MTU, - debug: false, - os: "MAC".to_string(), - }), - ..Default::default() - }, + payload: UdpXml::C2dC(C2dC { + uid: uid.to_string(), + cli: ClientList { port: port as u32 }, + cid: client_id, + mtu: MTU, + debug: false, + os: "MAC".to_string(), + }), }; let (camera_address, camera_id) = self .retry_send(msg, addr, |bc, addr| match bc { UdpDiscovery { tid: _, - payload: - UdpXml { - d2c_c_r: Some(D2cCr { did, cid, .. }), - .. - }, + payload: UdpXml::D2cCr(D2cCr { did, cid, .. }), } if cid == client_id => Some((addr, did)), _ => None, }) @@ -422,24 +415,17 @@ impl Discoverer { async fn uid_lookup(&self, uid: &str, addr: SocketAddr) -> Result { let msg = UdpDiscovery { tid: 0, - payload: UdpXml { - c2m_q: Some(C2mQ { - uid: uid.to_string(), - os: "MAC".to_string(), - }), - ..Default::default() - }, + payload: UdpXml::C2mQ(C2mQ { + uid: uid.to_string(), + os: "MAC".to_string(), + }), }; trace!("Sending look up {:?}", msg); let (packet, _) = self .retry_send(msg, addr, |bc, addr| match bc { UdpDiscovery { tid: _, - payload: - UdpXml { - m2c_q_r: Some(m2c_q_r), - .. - }, + payload: UdpXml::M2cQr(m2c_q_r), } if valid_addr(&m2c_q_r.reg) => Some((m2c_q_r, addr)), _ => None, }) @@ -469,28 +455,27 @@ impl Discoverer { let msg = UdpDiscovery { tid, - payload: UdpXml { - c2r_c: Some(C2rC { - uid: uid.to_string(), - cli: IpPort { - ip: local_ip.to_string(), - port: local_port, - }, - relay: IpPort { - ip: lookup.relay.ip().to_string(), - port: lookup.relay.port(), - }, - cid: client_id, - family: local_family, - debug: false, - os: "MAC".to_string(), - revision: Some(3), - }), - ..Default::default() - }, + payload: UdpXml::C2rC(C2rC { + uid: uid.to_string(), + cli: IpPort { + ip: local_ip.to_string(), + port: local_port, + }, + relay: IpPort { + ip: lookup.relay.ip().to_string(), + port: lookup.relay.port(), + }, + cid: client_id, + family: local_family, + debug: false, + os: "MAC".to_string(), + revision: Some(3), + }), }; - trace!("Registering: {:?}", msg.payload.c2r_c); + if let UdpXml::C2rC(ref c2r_c) = msg.payload { + trace!("Registering: {:?}", c2r_c); + } // Send and await acceptance let (sid, dev, dmap, relay) = self @@ -500,18 +485,14 @@ impl Discoverer { UdpDiscovery { tid: _, payload: - UdpXml { - r2c_c_r: - Some(R2cCr { - dmap, - dev, - relay, - sid, - rsp, - .. - }), + UdpXml::R2cCr(R2cCr { + dmap, + dev, + relay, + sid, + rsp, .. - }, + }), } if (dev.as_ref().map(valid_addr).unwrap_or(false) || dmap.as_ref().map(valid_addr).unwrap_or(false) || relay.as_ref().map(valid_addr).unwrap_or(false)) @@ -553,17 +534,13 @@ impl Discoverer { UdpDiscovery { tid: _, payload: - UdpXml { - r2c_c_r: - Some(R2cCr { - dev, - dmap, - relay, - rsp, - .. - }), + UdpXml::R2cCr(R2cCr { + dev, + dmap, + relay, + rsp, .. - }, + }), } if (dev.as_ref().map(valid_addr).unwrap_or(false) || dmap.as_ref().map(valid_addr).unwrap_or(false) || relay.as_ref().map(valid_addr).unwrap_or(false)) @@ -598,17 +575,13 @@ impl Discoverer { UdpDiscovery { tid, payload: - UdpXml { - d2c_t: - Some(D2cT { - sid, - cid, - did, - conn, - .. - }), + UdpXml::D2cT(D2cT { + sid, + cid, + did, + conn, .. - }, + }), }, RegisterResult { dmap: register_dmap, @@ -632,16 +605,13 @@ impl Discoverer { let msg = UdpDiscovery { tid: local_tid, - payload: UdpXml { - c2d_a: Some(C2dA { - sid: register_result.sid, - conn: "local".to_string(), - cid: register_result.client_id, - did: local_did, - mtu: MTU, - }), - ..Default::default() - }, + payload: UdpXml::C2dA(C2dA { + sid: register_result.sid, + conn: "local".to_string(), + cid: register_result.client_id, + did: local_did, + mtu: MTU, + }), }; let permit = self @@ -657,17 +627,13 @@ impl Discoverer { UdpDiscovery { tid: _, payload: - UdpXml { - d2c_cfm: - Some(D2cCfm { - sid, - cid, - did, - conn, - .. - }), + UdpXml::D2cCfm(D2cCfm { + sid, + cid, + did, + conn, .. - }, + }), } if sid == register_result.sid && did == local_did && cid == register_result.client_id @@ -690,16 +656,13 @@ impl Discoverer { // Confirm local to register let msg = UdpDiscovery { tid: 0, - payload: UdpXml { - c2r_cfm: Some(C2rCfm { - sid: result.sid, - cid: result.client_id, - did: result.camera_id, - rsp: 0, - conn: "local".to_string(), - }), - ..Default::default() - }, + payload: UdpXml::C2rCfm(C2rCfm { + sid: result.sid, + cid: result.client_id, + did: result.camera_id, + rsp: 0, + conn: "local".to_string(), + }), }; self.send_and_forget(msg, register_result.reg).await?; @@ -723,17 +686,13 @@ impl Discoverer { UdpDiscovery { tid, payload: - UdpXml { - d2c_t: - Some(D2cT { - sid, - cid, - did, - conn, - .. - }), + UdpXml::D2cT(D2cT { + sid, + cid, + did, + conn, .. - }, + }), }, RegisterResult { dmap: register_dmap, @@ -757,16 +716,13 @@ impl Discoverer { let msg = UdpDiscovery { tid: local_tid, - payload: UdpXml { - c2d_a: Some(C2dA { - sid: register_result.sid, - conn: "map".to_string(), - cid: register_result.client_id, - did: local_did, - mtu: MTU, - }), - ..Default::default() - }, + payload: UdpXml::C2dA(C2dA { + sid: register_result.sid, + conn: "map".to_string(), + cid: register_result.client_id, + did: local_did, + mtu: MTU, + }), }; let permit = self @@ -782,17 +738,13 @@ impl Discoverer { UdpDiscovery { tid: _, payload: - UdpXml { - d2c_cfm: - Some(D2cCfm { - sid, - cid, - did, - conn, - .. - }), + UdpXml::D2cCfm(D2cCfm { + sid, + cid, + did, + conn, .. - }, + }), } if sid == register_result.sid && did == local_did && cid == register_result.client_id @@ -815,16 +767,13 @@ impl Discoverer { // Confirm map to register let msg = UdpDiscovery { tid: 0, - payload: UdpXml { - c2r_cfm: Some(C2rCfm { - sid: result.sid, - cid: result.client_id, - did: result.camera_id, - rsp: 0, - conn: "map".to_string(), - }), - ..Default::default() - }, + payload: UdpXml::C2rCfm(C2rCfm { + sid: result.sid, + cid: result.client_id, + did: result.camera_id, + rsp: 0, + conn: "map".to_string(), + }), }; self.send_and_forget(msg, register_result.reg).await?; @@ -845,26 +794,19 @@ impl Discoverer { let dev_addr = register_result.dev.ok_or(Error::NoDev)?; let msg = UdpDiscovery { tid, - payload: UdpXml { - c2d_t: Some(C2dT { - sid: register_result.sid, - cid: register_result.client_id, - mtu: MTU, - conn: "local".to_string(), - }), - ..Default::default() - }, + payload: UdpXml::C2dT(C2dT { + sid: register_result.sid, + cid: register_result.client_id, + mtu: MTU, + conn: "local".to_string(), + }), }; let (final_addr, local_did) = self .retry_send(msg, dev_addr, |bc, addr| match bc { UdpDiscovery { tid: _, - payload: - UdpXml { - d2c_cfm: Some(D2cCfm { cid, did, sid, .. }), - .. - }, + payload: UdpXml::D2cCfm(D2cCfm { cid, did, sid, .. }), } if cid == register_result.client_id && sid == register_result.sid => { Some((addr, did)) } @@ -888,16 +830,13 @@ impl Discoverer { // Confirm local to register let msg = UdpDiscovery { tid: 0, - payload: UdpXml { - c2r_cfm: Some(C2rCfm { - sid: result.sid, - cid: result.client_id, - did: result.camera_id, - conn: "local".to_string(), - rsp: 0, - }), - ..Default::default() - }, + payload: UdpXml::C2rCfm(C2rCfm { + sid: result.sid, + cid: result.client_id, + did: result.camera_id, + conn: "local".to_string(), + rsp: 0, + }), }; self.send_and_forget(msg, register_result.reg).await?; @@ -918,15 +857,12 @@ impl Discoverer { let relay_addr = register_result.relay.ok_or(Error::NoDev)?; let msg = UdpDiscovery { tid, - payload: UdpXml { - c2d_t: Some(C2dT { - sid: register_result.sid, - cid: register_result.client_id, - mtu: MTU, - conn: "relay".to_string(), - }), - ..Default::default() - }, + payload: UdpXml::C2dT(C2dT { + sid: register_result.sid, + cid: register_result.client_id, + mtu: MTU, + conn: "relay".to_string(), + }), }; let permit = self @@ -940,17 +876,13 @@ impl Discoverer { UdpDiscovery { tid: _, payload: - UdpXml { - d2c_cfm: - Some(D2cCfm { - cid, - did, - sid, - conn, - .. - }), + UdpXml::D2cCfm(D2cCfm { + cid, + did, + sid, + conn, .. - }, + }), } if cid == register_result.client_id && sid == register_result.sid && &conn == "relay" => @@ -971,16 +903,13 @@ impl Discoverer { // Confirm relay to register let msg = UdpDiscovery { tid: 0, - payload: UdpXml { - c2r_cfm: Some(C2rCfm { - sid: result.sid, - cid: result.client_id, - did: result.camera_id, - conn: "relay".to_string(), - rsp: 0, - }), - ..Default::default() - }, + payload: UdpXml::C2rCfm(C2rCfm { + sid: result.sid, + cid: result.client_id, + did: result.camera_id, + conn: "relay".to_string(), + rsp: 0, + }), }; self.send_and_forget(msg, register_result.reg).await?; @@ -1009,13 +938,10 @@ impl Discoverer { interval.tick().await; let msg = BcUdp::Discovery(UdpDiscovery { tid, - payload: UdpXml { - c2d_hb: Some(C2dHb { + payload: UdpXml::C2dHb(C2dHb { cid: client_id, did: camera_id, }), - ..Default::default() - }, }); if sender.send((msg, addr)).await.is_err() { break Result::Ok(()); @@ -1044,14 +970,11 @@ impl Discoverer { interval.tick().await; let msg = BcUdp::Discovery(UdpDiscovery { tid, - payload: UdpXml { - c2r_hb: Some(C2rHb { + payload: UdpXml::C2rHb(C2rHb { sid, cid: client_id, did: camera_id, }), - ..Default::default() - }, }); if sender.send((msg, addr)).await.is_err() { break Result::Ok(()); @@ -1167,7 +1090,7 @@ impl Discovery { ) -> Result { let mut dests = get_broadcasts(&[2015, 2018])?; if let Some(mut optional_addrs) = optional_addrs.take() { - trace!("Also sending to {:?}", optional_addrs); + debug!("Also sending to {:?}", optional_addrs); dests.append(&mut optional_addrs); } let discoverer_ref = &self.discoverer; diff --git a/crates/core/src/bc_protocol/connection/udpsource.rs b/crates/core/src/bc_protocol/connection/udpsource.rs index 0acbb8d..2e7f49b 100644 --- a/crates/core/src/bc_protocol/connection/udpsource.rs +++ b/crates/core/src/bc_protocol/connection/udpsource.rs @@ -384,13 +384,10 @@ impl UdpPayloadInner { let mut rng = thread_rng(); (rng.gen::()) as u32 }, - payload: UdpXml { - c2d_hb: Some(C2dHb { + payload: UdpXml::C2dHb(C2dHb { cid: thread_client_id, did: thread_camera_id, }), - ..Default::default() - }, }); let _ = tokio::time::timeout(tokio::time::Duration::from_millis(250), inner.send((msg, thread_camera_addr))).await; } @@ -449,13 +446,10 @@ impl UdpPayloadInner { let mut rng = thread_rng(); (rng.gen::()) as u32 }, - payload: UdpXml { - c2d_hb: Some(C2dHb { + payload: UdpXml::C2dHb(C2dHb { cid: thread_client_id, did: thread_camera_id, }), - ..Default::default() - }, }); if thread_sender.send(msg).await.is_err() { break Result::Ok(()); diff --git a/crates/core/src/bc_protocol/errors.rs b/crates/core/src/bc_protocol/errors.rs index 47471d6..e3ade19 100644 --- a/crates/core/src/bc_protocol/errors.rs +++ b/crates/core/src/bc_protocol/errors.rs @@ -1,33 +1,33 @@ use super::bc::model::Bc; use crate::NomErrorType; -use err_derive::Error; +use thiserror::Error; /// This is the primary error type of the library #[derive(Debug, Error, Clone)] #[allow(clippy::large_enum_variant)] pub enum Error { /// Underlying IO errors - #[error(display = "IO Error: {:?}", _0)] - Io(#[error(source)] std::sync::Arc), + #[error("IO Error: {:?}", _0)] + Io(#[from] 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), + #[error("Error in time coversion: {:?}", _0)] + TimeRange(#[from] time::error::ComponentRange), /// Raised when fails to parse time from the camera - #[error(display = "Error in time parsing")] + #[error("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), + #[error("Error in try from NonZeroInt")] + TryFromInt(#[from] std::num::TryFromIntError), /// /// Raised when fails to parse time from the camera - #[error(display = "Error in time conversion")] - TimeTryFrom(#[error(source)] time::error::TryFromParsed), + #[error("Error in time conversion")] + TimeTryFrom(#[from] time::error::TryFromParsed), /// Raised when a Bc reply was not understood - #[error(display = "Communication error")] + #[error("Communication error")] UnintelligibleReply { /// The Bc packet that was not understood reply: std::sync::Arc>, @@ -36,140 +36,135 @@ pub enum Error { }, /// Raised when the camera responds with a status code over than OK - #[error(display = "Camera responded with Service Unavaliable: {}", _0)] + #[error("Camera responded with Service Unavaliable: {}", _0)] CameraServiceUnavaliable(u16), /// Raised when the camera responds with a status code over than OK during login - #[error(display = "Camera responded with Err during login")] + #[error("Camera responded with Err during login")] CameraLoginFail, /// Raised when a connection is dropped. - #[error(display = "Dropped connection")] + #[error("Dropped connection")] DroppedConnection, /// Raised when a connection is dropped during a tokio mpsc TryRecv event - #[error(display = "Dropped connection (TryRecv)")] - DroppedConnectionTry(#[error(source)] tokio::sync::mpsc::error::TryRecvError), + #[error("Dropped connection (TryRecv)")] + DroppedConnectionTry(#[from] tokio::sync::mpsc::error::TryRecvError), /// Raised when a connection is dropped during a TryRecv event - #[error(display = "Dropped connection (Broadcast TryRecv)")] - BroadcastDroppedConnectionTry(#[error(source)] tokio::sync::broadcast::error::TryRecvError), + #[error("Dropped connection (Broadcast TryRecv)")] + BroadcastDroppedConnectionTry(#[from] tokio::sync::broadcast::error::TryRecvError), /// Raised when a connection is dropped during a TryRecv event - #[error(display = "Send Error")] + #[error("Send Error")] TokioBcSendError, /// Raised when the TIMEOUT is reach - #[error(display = "Timeout")] - Timeout(#[error(source)] std::sync::Arc), + #[error("Timeout")] + Timeout(#[from] std::sync::Arc), /// Raised when a timeout fails in a non standard way such as timeout during shutdown - #[error(display = "TimeoutError")] - TimeoutError(#[error(source)] tokio::time::error::Error), + #[error("TimeoutError")] + TimeoutError(#[from] tokio::time::error::Error), /// Raised when connection is dropped because the timeout is reach - #[error(display = "Dropped connection (Timeout)")] + #[error("Dropped connection (Timeout)")] TimeoutDisconnected, /// Raised when a camera cannot be connected to ay any of the given addresses - #[error(display = "Cannot contact camera at given address")] + #[error("Cannot contact camera at given address")] CannotInitCamera, /// Raised when failed to login to the camera - #[error(display = "Credential error")] + #[error("Credential error")] AuthFailed, /// Raised when the given camera url could not be resolved - #[error(display = "Failed to translate camera address")] + #[error("Failed to translate camera address")] AddrResolutionError, /// Raised non adpcm data is sent to the talk command - #[error(display = "Talk data is not ADPCM")] + #[error("Talk data is not ADPCM")] UnknownTalkEncoding, /// Raised when dicovery times out waiting for a reply - #[error(display = "Timed out while waiting for camera reply")] + #[error("Timed out while waiting for camera reply")] DiscoveryTimeout, /// Raised during a (de)seralisation error - #[error(display = "Cookie GenError")] - GenError(#[error(source)] std::sync::Arc), + #[error("Cookie GenError")] + GenError(#[from] std::sync::Arc), /// Raised when a connection is subscrbed to more than once for msg_num - #[error(display = "Simultaneous subscription, {:?}", _0)] + #[error("Simultaneous subscription, {msg_num:?}")] SimultaneousSubscription { /// The message number that was subscribed to msg_num: Option, }, /// Raised when a connection is subscrbed to more than once for msg_id - #[error(display = "Simultaneous subscription, {}", _0)] + #[error("Simultaneous subscription, {msg_id}")] SimultaneousSubscriptionId { /// The message number that was subscribed to msg_id: u32, }, /// Raised when a new encyrption byte is observed - #[error(display = "Unknown encryption: {:x?}", _0)] + #[error("Unknown encryption: {0:x?}")] UnknownEncryption(usize), /// Raised when the camera cannot be found - #[error(display = "Camera Not Findable")] + #[error("Camera Not Findable")] ConnectionUnavaliable, /// Raised when the subscription id dropped too soon - #[error(display = "Dropped Subscriber")] + #[error("Dropped Subscriber")] DroppedSubscriber, /// Raised when a unknown connection ID attempts to connect with us over UDP - #[error(display = "Connection with unknown connectionID: {:?}", _0)] + #[error("Connection with unknown connectionID: {0:?}")] UnknownConnectionId(i32), /// Raised when a unknown SocketAddr attempts to connect with us over UDP - #[error(display = "Connection from unknown source: {:?}", _0)] + #[error("Connection from unknown source: {0:?}")] UnknownSource(std::net::SocketAddr), /// Raised when the IP/Hostname cannot be understood - #[error(display = "Could not parse as IP")] - AddrParseError(#[error(source)] std::net::AddrParseError), + #[error("Could not parse as IP")] + AddrParseError(#[from] std::net::AddrParseError), /// Raised when a relay connection is not possible /// usually happens if the camera has not contacted reolink yet - #[error(display = "Cannot perform relay connection with this camera")] + #[error("Cannot perform relay connection with this camera")] NoDmap, /// Raised when a dev connection is not possible /// usually happens if the camera has not contacted reolink yet - #[error(display = "Cannot perform lookup with this camera against reolink servers")] + #[error("Cannot perform lookup with this camera against reolink servers")] NoDev, /// Raised when a discovery fails to be accepted by the register - #[error(display = "Register refuses to accept us")] + #[error("Register refuses to accept us")] RegisterError, /// Raised when a the relay terminates the connection by sending a R2C_DISC - #[error(display = "Relay terminated the connection")] + #[error("Relay terminated the connection")] RelayTerminate, /// Raised when a the camera terminates the connection by sending a D2C_DISC - #[error(display = "Camera terminated the connection")] + #[error("Camera terminated the connection")] CameraTerminate, /// Raised when the stream is not enough to complete a message - #[error(display = "Nom Parsing incomplete: {}", _0)] + #[error("Nom Parsing incomplete: {0}")] NomIncomplete(usize), /// Raised when a stream cannot be decoded - #[error(display = "Nom Parsing error: {}", _0)] + #[error("Nom Parsing error: {0}")] NomError(String), /// Raised when a camera/user lacks an ability - #[error( - display = "Missing ability: {} with {} permission has only {}", - name, - requested, - actual - )] + #[error("Missing ability: {name} with {requested} permission has only {actual}")] MissingAbility { /// Name of the ability name: String, @@ -180,15 +175,15 @@ pub enum Error { }, /// Raised when a thread panics - #[error(display = "Thread panicked")] - JoinError(#[error(source)] std::sync::Arc), + #[error("Thread panicked")] + JoinError(#[from] std::sync::Arc), /// A generic catch all error - #[error(display = "Other error: {}", _0)] + #[error("Other error: {0}")] Other(&'static str), /// A generic catch all error - #[error(display = "Other error: {}", _0)] + #[error("Other error: {0}")] OtherString(String), } diff --git a/crates/core/src/bcmedia/codex.rs b/crates/core/src/bcmedia/codex.rs index f0fe817..e2e9763 100644 --- a/crates/core/src/bcmedia/codex.rs +++ b/crates/core/src/bcmedia/codex.rs @@ -50,7 +50,7 @@ impl Decoder for BcMediaCodex { fn decode(&mut self, src: &mut BytesMut) -> Result> { loop { - match { BcMedia::deserialize(src) } { + match BcMedia::deserialize(src) { Ok(bc) => { if self.amount_skipped > 0 { debug!("Amount skipped to restore stream: {}", self.amount_skipped); diff --git a/crates/core/src/bcmedia/de.rs b/crates/core/src/bcmedia/de.rs index 9483db5..f3f1851 100644 --- a/crates/core/src/bcmedia/de.rs +++ b/crates/core/src/bcmedia/de.rs @@ -1,4 +1,3 @@ -use super::model::BcMediaIframe; use super::model::*; use crate::Error; use bytes::{Buf, BytesMut}; diff --git a/crates/core/src/bcudp/codex.rs b/crates/core/src/bcudp/codex.rs index 5c82fef..8bb6276 100644 --- a/crates/core/src/bcudp/codex.rs +++ b/crates/core/src/bcudp/codex.rs @@ -48,20 +48,16 @@ impl Decoder for BcUdpCodex { if src.is_empty() { return Ok(None); } - match { BcUdp::deserialize(src) } { + match BcUdp::deserialize(src) { Ok(BcUdp::Discovery(UdpDiscovery { - payload: UdpXml { - r2c_disc: Some(_), .. - }, + payload: UdpXml::R2cDisc(_), .. })) => { log::trace!(" Decoding: Relay terminate"); Err(Error::RelayTerminate) } Ok(BcUdp::Discovery(UdpDiscovery { - payload: UdpXml { - d2c_disc: Some(_), .. - }, + payload: UdpXml::D2cDisc(_), .. })) => { log::trace!(" Decoding:Camera terminate"); diff --git a/crates/core/src/bcudp/de.rs b/crates/core/src/bcudp/de.rs index f01f71d..d2daf13 100644 --- a/crates/core/src/bcudp/de.rs +++ b/crates/core/src/bcudp/de.rs @@ -11,10 +11,10 @@ use nom::{ type IResult> = Result<(I, O), nom::Err>; -fn make_error>(input: I, ctx: &'static str, kind: ErrorKind) -> E +fn make_error(input: I, ctx: &'static str, kind: ErrorKind) -> E where I: std::marker::Copy, - E: ContextError, + E: ContextError + ParseError, { E::add_context(input, ctx, E::from_error_kind(input, kind)) } @@ -164,13 +164,10 @@ mod tests { e, Ok(BcUdp::Discovery(UdpDiscovery { tid: 96, - payload: UdpXml { - c2d_disc: Some(C2dDisc { - cid: 82000, - did: 80, - }), - .. - }, + payload: UdpXml::C2dDisc(C2dDisc { + cid: 82000, + did: 80, + }), })) ); } @@ -187,15 +184,12 @@ mod tests { e, Ok(BcUdp::Discovery(UdpDiscovery { tid: 113, - payload: UdpXml { - d2c_t: Some(D2cT { + payload: UdpXml::D2cT(D2cT { sid: 62098713, conn: conn_str, cid: 82001, did: 96, }), - .. - }, })) if &conn_str == "local" ); } @@ -212,15 +206,12 @@ mod tests { e, Ok(BcUdp::Discovery(UdpDiscovery { tid: 1101, - payload: UdpXml { - c2d_t: Some(C2dT { + payload: UdpXml::C2dT(C2dT { sid: 62098713, conn: conn_str, cid: 82001, mtu: 1350, }), - .. - }, })) if &conn_str == "local" ); } @@ -237,8 +228,7 @@ mod tests { e, Ok(BcUdp::Discovery(UdpDiscovery { tid: 1101, - payload: UdpXml { - d2c_cfm: Some(D2cCfm { + payload: UdpXml::D2cCfm(D2cCfm { sid: 62098713, conn: conn_str, rsp: 0, @@ -246,8 +236,6 @@ mod tests { did: 96, time_r: 0, }), - .. - }, })) if &conn_str == "local" ); } diff --git a/crates/core/src/bcudp/ser.rs b/crates/core/src/bcudp/ser.rs index b911a6c..1d35569 100644 --- a/crates/core/src/bcudp/ser.rs +++ b/crates/core/src/bcudp/ser.rs @@ -1,5 +1,6 @@ use super::{crc::calc_crc, model::*, xml_crypto::encrypt}; use crate::Error; +use bytes::BytesMut; use cookie_factory::bytes::*; use cookie_factory::sequence::tuple; use cookie_factory::SerializeFn; @@ -10,7 +11,10 @@ impl BcUdp { pub(crate) fn serialize(&self, buf: W) -> Result { let (buf, _) = match &self { BcUdp::Discovery(payload) => { - let xml_payload = encrypt(payload.tid, &payload.payload.serialize(vec![]).unwrap()); + let xml_payload = encrypt( + payload.tid, + &payload.payload.serialize(BytesMut::new()).unwrap(), + ); gen(bcudp_disc(payload, &xml_payload), buf)? } BcUdp::Ack(payload) => { @@ -96,7 +100,7 @@ mod tests { let msg2 = BcUdp::deserialize(&mut BytesMut::from(ser_buf.as_slice())).unwrap(); assert_eq!(msg, msg2); // Raw samples don't quite match exactly - // because the yaserde for xml puts spaces and new lines in different places + // because the serde for xml puts spaces and new lines in different places // then the raw data from the camera so we skip this last assert //assert_eq!(&sample[..], ser_buf.as_slice()); } @@ -113,7 +117,7 @@ mod tests { let msg2 = BcUdp::deserialize(&mut BytesMut::from(ser_buf.as_slice())).unwrap(); assert_eq!(msg, msg2); // Raw samples don't quite match exactly - // because the yaserde for xml puts spaces and new lines in different places + // because the serde for xml puts spaces and new lines in different places // then the raw data from the camera so we skip this last assert //assert_eq!(&sample[..], ser_buf.as_slice()); } @@ -130,7 +134,7 @@ mod tests { let msg2 = BcUdp::deserialize(&mut BytesMut::from(ser_buf.as_slice())).unwrap(); assert_eq!(msg, msg2); // Raw samples don't quite match exactly - // because the yaserde for xml puts spaces and new lines in different places + // because the serde for xml puts spaces and new lines in different places // then the raw data from the camera so we skip this last assert //assert_eq!(&sample[..], ser_buf.as_slice()); } @@ -147,7 +151,7 @@ mod tests { let msg2 = BcUdp::deserialize(&mut BytesMut::from(ser_buf.as_slice())).unwrap(); assert_eq!(msg, msg2); // Raw samples don't quite match exactly - // because the yaserde for xml puts spaces and new lines in different places + // because the serde for xml puts spaces and new lines in different places // then the raw data from the camera so we skip this last assert //assert_eq!(&sample[..], ser_buf.as_slice()); } diff --git a/crates/core/src/bcudp/xml.rs b/crates/core/src/bcudp/xml.rs index 1dc1f44..6bbf005 100644 --- a/crates/core/src/bcudp/xml.rs +++ b/crates/core/src/bcudp/xml.rs @@ -1,76 +1,73 @@ -// YaSerde currently macro-expands names like __type__value from type_ - -use std::io::{Read, Write}; -// YaSerde is currently naming the traits and the derive macros identically -use yaserde::ser::Config; -use yaserde_derive::{YaDeserialize, YaSerialize}; +use serde::{Deserialize, Serialize}; +use std::fmt::Write; +use std::io::BufRead; /// The top level of the UDP xml is P2P -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] -#[yaserde(rename = "P2P")] -pub struct UdpXml { +#[derive(PartialEq, Eq, Debug, Deserialize, Serialize, Clone)] +pub enum UdpXml { /// C2D_S xml Discovery of any client - #[yaserde(rename = "C2D_S")] - pub c2d_s: Option, + #[serde(rename = "C2D_S")] + C2dS(C2dS), /// C2D_S xml Discovery of client with a UID - #[yaserde(rename = "C2D_C")] - pub c2d_c: Option, + #[serde(rename = "C2D_C")] + C2dC(C2dC), /// D2C_C_C xml Reply from discovery - #[yaserde(rename = "D2C_C_R")] - pub d2c_c_r: Option, + #[serde(rename = "D2C_C_R")] + D2cCr(D2cCr), /// D2C_T xml - #[yaserde(rename = "D2C_T")] - pub d2c_t: Option, + #[serde(rename = "D2C_T")] + D2cT(D2cT), /// C2D_T xml - #[yaserde(rename = "C2D_T")] - pub c2d_t: Option, + #[serde(rename = "C2D_T")] + C2dT(C2dT), /// D2C_CFM xml - #[yaserde(rename = "D2C_CFM")] - pub d2c_cfm: Option, + #[serde(rename = "D2C_CFM")] + D2cCfm(D2cCfm), /// C2D_DISC xml Disconnect - #[yaserde(rename = "C2D_DISC")] - pub c2d_disc: Option, + #[serde(rename = "C2D_DISC")] + C2dDisc(C2dDisc), /// D2C_DISC xml Disconnect - #[yaserde(rename = "D2C_DISC")] - pub d2c_disc: Option, + #[serde(rename = "D2C_DISC")] + D2cDisc(D2cDisc), /// R2C_DISC xml Disconnect - #[yaserde(rename = "R2C_DISC")] - pub r2c_disc: Option, + #[serde(rename = "R2C_DISC")] + R2cDisc(R2cDisc), /// C2M_Q xml client to middle man query - #[yaserde(rename = "C2M_Q")] - pub c2m_q: Option, + #[serde(rename = "C2M_Q")] + C2mQ(C2mQ), /// M2C_Q_R xml middle man to client query reply - #[yaserde(rename = "M2C_Q_R")] - pub m2c_q_r: Option, + #[serde(rename = "M2C_Q_R")] + M2cQr(M2cQr), /// C2R_C xml client to register connect - #[yaserde(rename = "C2R_C")] - pub c2r_c: Option, + #[serde(rename = "C2R_C")] + C2rC(C2rC), /// R2C_T xml register to clinet with device ID etc - #[yaserde(rename = "R2C_T")] - pub r2c_t: Option, + #[serde(rename = "R2C_T")] + R2cT(R2cT), /// R2C_T xml register to clinet with device ID etc handled over dmap ONLY - #[yaserde(rename = "R2C_C_R")] - pub r2c_c_r: Option, + #[serde(rename = "R2C_C_R")] + R2cCr(R2cCr), /// C2R_CFM xml client to register CFM - #[yaserde(rename = "C2R_CFM")] - pub c2r_cfm: Option, + #[serde(rename = "C2R_CFM")] + C2rCfm(C2rCfm), /// C2D_A xml client to device accept - #[yaserde(rename = "C2D_A")] - pub c2d_a: Option, + #[serde(rename = "C2D_A")] + C2dA(C2dA), /// C2D_HB xml client to device heartbeat. This is the keep alive - #[yaserde(rename = "C2D_HB")] - pub c2d_hb: Option, + #[serde(rename = "C2D_HB")] + C2dHb(C2dHb), /// C2D_HB xml client to device heartbeat. This is the keep alive - #[yaserde(rename = "C2R_HB")] - pub c2r_hb: Option, + #[serde(rename = "C2R_HB")] + C2rHb(C2rHb), } impl UdpXml { - pub(crate) fn try_parse(s: impl Read) -> Result { - yaserde::de::from_reader(s) + pub(crate) fn try_parse(s: impl BufRead) -> Result { + quick_xml::de::from_reader(s) } - pub(crate) fn serialize(&self, w: W) -> Result { - yaserde::ser::serialize_with_writer(self, w, &Config::default()) + pub(crate) fn serialize(&self, mut w: W) -> Result { + quick_xml::se::to_writer(&mut w, self)?; + Ok(w) } } @@ -80,14 +77,14 @@ impl UdpXml { /// to whoever it gets this message from /// /// It should be broadcasted to port 2015 -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2dS { /// The destination to reply to pub to: PortList, } /// Port list xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct PortList { /// Port to open udp connections with pub port: u32, @@ -97,7 +94,7 @@ pub struct PortList { /// /// This will start a connection with any camera that has this UID /// It should be broadcasted to port 2018 -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2dC { /// UID of the camera the client wants to connect with pub uid: String, @@ -110,12 +107,12 @@ pub struct C2dC { /// Debug mode. Purpose unknown pub debug: bool, /// Os of the machine known values are `"MAC"`, `"WIN"` - #[yaserde(rename = "p")] + #[serde(rename = "p")] pub os: String, } /// Client List xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct ClientList { /// Port to start udp communication with pub port: u32, @@ -125,7 +122,7 @@ pub struct ClientList { /// /// This will start a connection with any camera that has this UID /// It should be broadcasted to port 2018 -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct D2cCr { /// Called timer but not sure what it is a timer of pub timer: Timer, @@ -138,7 +135,7 @@ pub struct D2cCr { } /// Timer provided by D2C_C_R -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct Timer { /// Unknown def: u32, @@ -149,7 +146,7 @@ pub struct Timer { } /// C2D_DISC xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2dDisc { /// The client connection ID pub cid: i32, @@ -158,7 +155,7 @@ pub struct C2dDisc { } /// D2C_DISC xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct D2cDisc { /// The client connection ID pub cid: i32, @@ -167,14 +164,14 @@ pub struct D2cDisc { } /// R2C_DISC xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct R2cDisc { /// The sid pub sid: u32, } /// D2C_T xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct D2cT { /// The camera SID pub sid: u32, @@ -187,7 +184,7 @@ pub struct D2cT { } /// C2D_T xml -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2dT { /// The camera SID pub sid: u32, @@ -204,12 +201,12 @@ pub struct C2dT { /// This is from client to a reolink middle man server /// /// It should be sent to a reolink p2p sever on port 9999 -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2mQ { /// UID to look up pub uid: String, /// Os of the machine known values are `"MAC"`, `"WIN"` - #[yaserde(rename = "p")] + #[serde(rename = "p")] pub os: String, } @@ -217,7 +214,7 @@ pub struct C2mQ { /// /// This is from middle man reolink server to client /// -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct M2cQr { /// The register server location pub reg: IpPort, @@ -232,7 +229,7 @@ pub struct M2cQr { /// Used as part of M2C_Q_R to provide the host and port /// /// of the register, relay and log servers -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct IpPort { /// Ip of the service pub ip: String, @@ -255,7 +252,7 @@ impl std::convert::TryFrom for std::net::SocketAddr { /// /// This is from client to the register reolink server /// -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2rC { /// The UID to register connecition request with pub uid: String, @@ -270,10 +267,10 @@ pub struct C2rC { /// Inet family. Observed values `4` pub family: u8, /// Os of the machine known values are `"MAC"`, `"WIN"` - #[yaserde(rename = "p")] + #[serde(rename = "p")] pub os: String, /// The revision. Known values None and 3 - #[yaserde(rename = "r")] + #[serde(rename = "r")] pub revision: Option, } @@ -281,7 +278,7 @@ pub struct C2rC { /// /// This is from register reolink server to clinet with device ip and did etc /// -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct R2cT { /// The location of the camera pub dmap: Option, @@ -298,7 +295,7 @@ pub struct R2cT { /// This is from register reolink server to clinet with device ip and did etc /// during a relay /// -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct R2cCr { /// Dev camera location (actual local ip) pub dev: Option, @@ -319,7 +316,7 @@ pub struct R2cCr { /// D2C_CFM xml /// /// Device to client, with connection started from middle man server -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct D2cCfm { /// The camera SID pub sid: u32, @@ -338,7 +335,7 @@ pub struct D2cCfm { /// C2R_CFM xml /// /// Client to register -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2rCfm { /// The camera SID pub sid: u32, @@ -356,7 +353,7 @@ pub struct C2rCfm { /// /// Client to device accept. /// Sent it reply to a D2C_T -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2dA { /// The camera SID pub sid: u32, @@ -374,7 +371,7 @@ pub struct C2dA { /// /// Client to device heart beat. /// Seems to act as a keep alive -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2dHb { /// The client connection ID pub cid: i32, @@ -386,7 +383,7 @@ pub struct C2dHb { /// /// Client to device heart beat. /// Seems to act as a keep alive -#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)] +#[derive(PartialEq, Eq, Default, Debug, Deserialize, Serialize, Clone)] pub struct C2rHb { /// The connection ID pub sid: u32, diff --git a/src/battery/mod.rs b/src/battery/mod.rs index b29671f..b9e6f12 100644 --- a/src/battery/mod.rs +++ b/src/battery/mod.rs @@ -35,10 +35,11 @@ pub(crate) async fn main(opt: Opt, reactor: NeoReactor) -> Result<()> { }) .await?; - let ser = String::from_utf8( - yaserde::ser::serialize_with_writer(&state, vec![], &Default::default()) - .expect("Should Ser the struct"), - ) + let ser = String::from_utf8({ + let mut buf = bytes::BytesMut::new(); + quick_xml::se::to_writer(&mut buf, &state).expect("Should Ser the struct"); + buf.to_vec() + }) .expect("Should be UTF8"); println!("{}", ser); diff --git a/src/common/mdthread.rs b/src/common/mdthread.rs index ed512fd..b66f987 100644 --- a/src/common/mdthread.rs +++ b/src/common/mdthread.rs @@ -18,6 +18,7 @@ use crate::{AnyResult, Result}; use neolink_core::bc_protocol::MotionStatus; pub(crate) enum MdState { + #[allow(dead_code)] Start(Instant), Stop(Instant), Unknown, diff --git a/src/common/pushnoti.rs b/src/common/pushnoti.rs index 80b0690..6981c03 100644 --- a/src/common/pushnoti.rs +++ b/src/common/pushnoti.rs @@ -67,6 +67,11 @@ impl PushNotiThread { let sender_id = "743639030586"; // andriod // let sender_id = "696841269229"; // ios + // let firebase_app_id = "1:743639030586:android:86f60a4fb7143876"; + // let firebase_project_id = "reolink-login"; + // let firebase_api_key = "AIzaSyBEUIuWHnnOEwFahxWgQB4Yt4NsgOmkPyE"; + // let vapid_key = "????"; + let token_path = dirs::config_dir().map(|mut d| { d.push("./neolink_token.toml"); d diff --git a/src/config.rs b/src/config.rs index cfea560..3653dc9 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,19 +1,19 @@ use crate::mqtt::Discoveries; -use lazy_static::lazy_static; use neolink_core::bc_protocol::{DiscoveryMethods, PrintFormat, StreamKind}; +use once_cell::sync::Lazy; use regex::Regex; use serde::{Deserialize, Serialize}; use std::clone::Clone; use std::collections::HashSet; -use validator::{Validate, ValidationError}; +use validator::ValidationError; use validator_derive::Validate; -lazy_static! { - static ref RE_TLS_CLIENT_AUTH: Regex = Regex::new(r"^(none|request|require)$").unwrap(); - static ref RE_PAUSE_MODE: Regex = Regex::new(r"^(black|still|test|none)$").unwrap(); - static ref RE_MAXENC_SRC: Regex = - Regex::new(r"^([nN]one|[Aa][Ee][Ss]|[Bb][Cc][Ee][Nn][Cc][Rr][Yy][Pp][Tt])$").unwrap(); -} +static RE_TLS_CLIENT_AUTH: Lazy = + Lazy::new(|| Regex::new(r"^(none|request|require)$").unwrap()); +static RE_PAUSE_MODE: Lazy = Lazy::new(|| Regex::new(r"^(black|still|test|none)$").unwrap()); +static RE_MAXENC_SRC: Lazy = Lazy::new(|| { + Regex::new(r"^([nN]one|[Aa][Ee][Ss]|[Bb][Cc][Ee][Nn][Cc][Rr][Yy][Pp][Tt])$").unwrap() +}); #[derive(Debug, Deserialize, Serialize, Validate, Clone, PartialEq)] pub(crate) struct Config { @@ -37,7 +37,7 @@ pub(crate) struct Config { pub(crate) mqtt: Option, #[validate(regex( - path = "RE_TLS_CLIENT_AUTH", + path = *RE_TLS_CLIENT_AUTH, message = "Incorrect tls auth", code = "tls_client_auth" ))] @@ -159,7 +159,7 @@ pub(crate) struct CameraConfig { #[serde(default = "default_maxenc")] #[validate(regex( - path = "RE_MAXENC_SRC", + path = *RE_MAXENC_SRC, message = "Invalid maximum encryption method", code = "max_encryption" ))] @@ -212,7 +212,7 @@ pub(crate) struct CameraConfig { #[derive(Debug, Deserialize, Serialize, Validate, Clone, PartialEq, Eq, Hash)] pub(crate) struct UserConfig { - #[validate(custom = "validate_username")] + #[validate(custom(function = "validate_username"))] #[serde(alias = "username")] pub(crate) name: String, @@ -329,7 +329,7 @@ pub(crate) struct PauseConfig { #[serde(default = "default_pause_mode")] #[validate(regex( - path = "RE_PAUSE_MODE", + path = *RE_PAUSE_MODE, message = "Incorrect pause mode", code = "mode" ))] diff --git a/src/errors.rs b/src/errors.rs index 09e2cee..4ae949f 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,16 +1,16 @@ -use err_derive::Error; +use thiserror::Error; #[derive(Debug, Error)] #[allow(clippy::large_enum_variant)] pub enum Error { - #[error(display = "RTSP Error")] - Rtsp(#[error(source)] super::rtsp::Error), - #[error(display = "Status LED Error")] - StatusLight(#[error(source)] super::statusled::Error), - #[error(display = "Reboot Error")] - Reboot(#[error(source)] super::reboot::Error), - #[error(display = "Talk Error")] - Talk(#[error(source)] super::talk::Error), - #[error(display = "Talk Error")] - Mqtt(#[error(source)] super::mqtt::Error), + #[error("RTSP Error")] + Rtsp(#[from] super::rtsp::Error), + #[error("Status LED Error")] + StatusLight(#[from] super::statusled::Error), + #[error("Reboot Error")] + Reboot(#[from] super::reboot::Error), + #[error("Talk Error")] + Talk(#[from] super::talk::Error), + #[error("Talk Error")] + Mqtt(#[from] super::mqtt::Error), } diff --git a/src/image/gst.rs b/src/image/gst.rs index 13bb8b8..f4c6100 100644 --- a/src/image/gst.rs +++ b/src/image/gst.rs @@ -1,7 +1,9 @@ use std::path::Path; use anyhow::{anyhow, Context, Result}; -use gstreamer::{parse_launch, prelude::*, ClockTime, MessageView, Pipeline, State}; +use gstreamer::{ + parse::launch_full, prelude::*, ClockTime, MessageView, ParseFlags, Pipeline, State, +}; use gstreamer_app::AppSrc; use tokio::{ sync::{ @@ -203,7 +205,7 @@ fn create_pipeline(format: VidFormat, file_path: &Path) -> Result { // Parse the pipeline we want to probe from a static in-line string. // Here we give our audiotestsrc a name, so we can retrieve that element // from the resulting pipeline. - let pipeline = parse_launch(&launch_str) + let pipeline = launch_full(&launch_str, None, ParseFlags::empty()) .context("Unable to load gstreamer pipeline ensure all gstramer plugins are installed")?; let pipeline = pipeline.dynamic_cast::().map_err(|_| { anyhow!("Unable to create gstreamer pipeline ensure all gstramer plugins are installed") diff --git a/src/main.rs b/src/main.rs index 8deb715..728b600 100644 --- a/src/main.rs +++ b/src/main.rs @@ -53,21 +53,9 @@ mod utils; use cmdline::{Command, Opt}; use common::NeoReactor; use config::Config; -use console_subscriber as _; pub(crate) type AnyResult = Result; -#[cfg(tokio_unstable)] -fn tokio_console_enable() { - info!("Tokio Console Enabled"); - console_subscriber::init(); -} - -#[cfg(not(tokio_unstable))] -fn tokio_console_enable() { - debug!("Tokio Console Disabled"); -} - #[tokio::main] async fn main() -> Result<()> { env_logger::Builder::from_env(Env::default().default_filter_or("info")).init(); @@ -91,10 +79,6 @@ async fn main() -> Result<()> { .validate() .with_context(|| format!("Failed to validate the {:?} config file", conf_path))?; - if config.tokio_console { - tokio_console_enable(); - } - let neo_reactor = NeoReactor::new(config.clone()).await; match opt.cmd { diff --git a/src/mqtt/mod.rs b/src/mqtt/mod.rs index 1bed2c4..299ef93 100644 --- a/src/mqtt/mod.rs +++ b/src/mqtt/mod.rs @@ -1156,9 +1156,11 @@ async fn handle_mqtt_message( "FAIL" } Ok(xml) => { - let bytes_res = - yaserde::ser::serialize_with_writer(&xml, vec![], &Default::default()); - match bytes_res { + let ser_xml = { + let mut buf = bytes::BytesMut::new(); + quick_xml::se::to_writer(&mut buf, &xml).map(|_| buf.to_vec()) + }; + match ser_xml { Ok(bytes) => match String::from_utf8(bytes) { Ok(str) => { mqtt.send_message("status/battery", &str, false) @@ -1200,9 +1202,11 @@ async fn handle_mqtt_message( "FAIL" } Ok(xml) => { - let bytes_res = - yaserde::ser::serialize_with_writer(&xml, vec![], &Default::default()); - match bytes_res { + let ser_xml = { + let mut buf = bytes::BytesMut::new(); + quick_xml::se::to_writer(&mut buf, &xml).map(|_| buf.to_vec()) + }; + match ser_xml { Ok(bytes) => match String::from_utf8(bytes) { Ok(str) => { mqtt.send_message("status/pir", &str, false) @@ -1245,9 +1249,11 @@ async fn handle_mqtt_message( "FAIL" } Ok(xml) => { - let bytes_res = - yaserde::ser::serialize_with_writer(&xml, vec![], &Default::default()); - match bytes_res { + let ser_xml = { + let mut buf = bytes::BytesMut::new(); + quick_xml::se::to_writer(&mut buf, &xml).map(|_| buf.to_vec()) + }; + match ser_xml { Ok(bytes) => match String::from_utf8(bytes) { Ok(str) => { mqtt.send_message("status/ptz", &str, false) diff --git a/src/mqtt/mqttc.rs b/src/mqtt/mqttc.rs index 44c20df..338fc73 100644 --- a/src/mqtt/mqttc.rs +++ b/src/mqtt/mqttc.rs @@ -6,8 +6,8 @@ use anyhow::{anyhow, Context, Result}; use futures::future::FutureExt; use log::*; use rumqttc::{ - AsyncClient, ConnectReturnCode, Event, Incoming, Key, LastWill, MqttOptions, QoS, - TlsConfiguration, Transport, + AsyncClient, ConnectReturnCode, Event, Incoming, LastWill, MqttOptions, QoS, TlsConfiguration, + Transport, }; use std::sync::Arc; use tokio::task::JoinSet; @@ -140,7 +140,7 @@ impl<'a> MqttBackend<'a> { if let (Ok(cert_buf), Ok(key_buf)) = (std::fs::read(cert_path), std::fs::read(key_path)) { - Some((cert_buf, Key::RSA(key_buf))) + Some((cert_buf, key_buf)) } else { error!("Failed to set client tls"); None @@ -534,7 +534,7 @@ impl LastWillMqtt { if let (Ok(cert_buf), Ok(key_buf)) = (std::fs::read(cert_path), std::fs::read(key_path)) { - Some((cert_buf, Key::RSA(key_buf))) + Some((cert_buf, key_buf)) } else { error!("Failed to set client tls"); None diff --git a/src/pir/mod.rs b/src/pir/mod.rs index 7b59b19..269d862 100644 --- a/src/pir/mod.rs +++ b/src/pir/mod.rs @@ -47,8 +47,11 @@ pub(crate) async fn main(opt: Opt, reactor: NeoReactor) -> Result<()> { }) .await?; let pir_ser = String::from_utf8( - yaserde::ser::serialize_with_writer(&pir_state, vec![], &Default::default()) - .expect("Should Ser the struct"), + { + let mut buf = bytes::BytesMut::new(); + quick_xml::se::to_writer(&mut buf, &pir_state).map(|_| buf.to_vec()) + } + .expect("Should Ser the struct"), ) .expect("Should be UTF8"); println!("{}", pir_ser); diff --git a/src/rtsp/factory.rs b/src/rtsp/factory.rs index 3a9ae99..6a875cf 100644 --- a/src/rtsp/factory.rs +++ b/src/rtsp/factory.rs @@ -1,7 +1,6 @@ use anyhow::{anyhow, Context, Result}; use gstreamer::{prelude::*, Bin, Caps, Element, ElementFactory, GhostPad}; use gstreamer_app::{AppSrc, AppSrcCallbacks, AppStreamType}; -use log::*; use tokio::sync::mpsc::{channel as mpsc, Receiver as MpscReceiver}; use crate::{ @@ -342,7 +341,6 @@ fn build_adpcm(bin: &Element, block_size: u32, stream_config: &StreamConfig) -> Element::link_many([&source, &queue, &decoder])?; Element::link_many([&encoder, &payload])?; decoder.connect_pad_added(move |_element, pad| { - debug!("Linking encoder to decoder: {:?}", pad.caps()); let sink_pad = encoder .static_pad("sink") .expect("Encoder is missing its pad"); @@ -388,7 +386,8 @@ fn make_element(kind: &str, name: &str) -> AnyResult { }) } -fn make_queue(name: &str, buffer_size: u32) -> AnyResult { +#[allow(dead_code)] +fn make_dbl_queue(name: &str, buffer_size: u32) -> AnyResult { let queue = make_element("queue", &format!("queue1_{}", name))?; queue.set_property("max-size-bytes", buffer_size); queue.set_property("max-size-buffers", 0u32); @@ -403,11 +402,11 @@ fn make_queue(name: &str, buffer_size: u32) -> AnyResult { queue2.set_property("max-size-bytes", buffer_size * 2u32 / 3u32); queue.set_property("max-size-buffers", 0u32); queue.set_property("max-size-time", 0u64); - // queue2.set_property( - // "max-size-time", - // std::convert::TryInto::::try_into(tokio::time::Duration::from_secs(5).as_nanos()) - // .unwrap_or(0), - // ); + queue2.set_property( + "max-size-time", + std::convert::TryInto::::try_into(tokio::time::Duration::from_secs(5).as_nanos()) + .unwrap_or(0), + ); queue2.set_property("use-buffering", false); let bin = gstreamer::Bin::builder().name(name).build(); @@ -434,6 +433,19 @@ fn make_queue(name: &str, buffer_size: u32) -> AnyResult { Ok(bin) } +fn make_queue(name: &str, buffer_size: u32) -> AnyResult { + let queue = make_element("queue", &format!("queue1_{}", name))?; + queue.set_property("max-size-bytes", buffer_size); + queue.set_property("max-size-buffers", 0u32); + queue.set_property("max-size-time", 0u64); + queue.set_property( + "max-size-time", + std::convert::TryInto::::try_into(tokio::time::Duration::from_secs(5).as_nanos()) + .unwrap_or(0), + ); + Ok(queue) +} + fn buffer_size(bitrate: u32) -> u32 { std::cmp::max(bitrate * 15u32 / 8u32, 4u32 * 1024u32 * 1024u32) } diff --git a/src/rtsp/gst/factory.rs b/src/rtsp/gst/factory.rs index 469abf8..3fb6f95 100644 --- a/src/rtsp/gst/factory.rs +++ b/src/rtsp/gst/factory.rs @@ -5,7 +5,6 @@ use super::AnyResult; use gstreamer::glib::object_subclass; -use gstreamer::glib::subclass::types::ObjectSubclass; use gstreamer::Element; use gstreamer::{ glib::{self, Object}, diff --git a/src/rtsp/gst/server.rs b/src/rtsp/gst/server.rs index fc41e9d..bd881cb 100644 --- a/src/rtsp/gst/server.rs +++ b/src/rtsp/gst/server.rs @@ -7,7 +7,7 @@ use super::AnyResult; use crate::config::*; use anyhow::Context; -use gstreamer::glib::{self, object_subclass, subclass::types::ObjectSubclass, MainLoop, Object}; +use gstreamer::glib::{self, object_subclass, MainLoop, Object}; use gstreamer_rtsp::RTSPAuthMethod; use gstreamer_rtsp_server::{ gio::{TlsAuthenticationMode, TlsCertificate}, diff --git a/src/talk/gst.rs b/src/talk/gst.rs index 97734dc..6c83a8d 100644 --- a/src/talk/gst.rs +++ b/src/talk/gst.rs @@ -2,8 +2,8 @@ use crate::AnyResult; use anyhow::{anyhow, Context, Result}; use crossbeam_channel::{bounded, Receiver, Sender}; use gstreamer::{ - element_error, parse_launch, prelude::*, Caps, ClockTime, FlowError, FlowSuccess, MessageView, - Pipeline, ResourceError, State, + element_error, parse::launch_full, prelude::*, Caps, ClockTime, FlowError, FlowSuccess, + MessageView, ParseFlags, Pipeline, ResourceError, State, }; use gstreamer_app::{AppSink, AppSinkCallbacks}; use tokio::task::JoinSet; @@ -159,7 +159,7 @@ fn create_pipeline( // Parse the pipeline we want to probe from a static in-line string. // Here we give our audiotestsrc a name, so we can retrieve that element // from the resulting pipeline. - let pipeline = parse_launch(&launch_str) + let pipeline = launch_full(&launch_str, None, ParseFlags::empty()) .context("Unable to load gstreamer pipeline ensure all gstramer plugins are installed")?; let pipeline = pipeline.dynamic_cast::().map_err(|_| { anyhow!("Unable to create gstreamer pipeline ensure all gstramer plugins are installed") diff --git a/src/utils.rs b/src/utils.rs index 3913247..5eaeffd 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -22,7 +22,9 @@ where pub(crate) enum AddressOrUid { Address(String), + #[allow(dead_code)] Uid(String, DiscoveryMethods), + #[allow(dead_code)] AddressWithUid(String, String, DiscoveryMethods), }