Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
384a0271bd | ||
|
|
134ef9df0f | ||
|
|
9133f20e64 | ||
|
|
2b0a0edf77 | ||
|
|
5e22a019e5 | ||
|
|
2a8c713ee0 | ||
|
|
4a95740f96 | ||
|
|
5eee60ee17 | ||
|
|
8f1c86a8c8 |
No files matched your search
@@ -24,11 +24,11 @@ jobs:
|
|||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: apt install gstreamer and deps
|
- name: apt install gstreamer
|
||||||
run: |
|
run: |
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install -y aptitude
|
sudo apt install -y aptitude
|
||||||
sudo aptitude install -y libgstrtspserver-1.0-dev libgstreamer1.0-dev libgtk2.0-dev protobuf-compiler
|
sudo aptitude install -y libgstrtspserver-1.0-dev libgstreamer1.0-dev libgtk2.0-dev
|
||||||
- name: Install nightly rust
|
- name: Install nightly rust
|
||||||
run: |
|
run: |
|
||||||
rustup toolchain install nightly --component clippy
|
rustup toolchain install nightly --component clippy
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
MD013:
|
|
||||||
code_blocks: false
|
|
||||||
@@ -16,5 +16,4 @@ repos:
|
|||||||
hooks:
|
hooks:
|
||||||
- id: markdownlint-fix
|
- id: markdownlint-fix
|
||||||
files: README.md
|
files: README.md
|
||||||
args: [--disable, MD041, --]
|
|
||||||
|
|
||||||
Generated
+23
-553
@@ -32,22 +32,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aho-corasick"
|
name = "aho-corasick"
|
||||||
version = "1.0.1"
|
version = "0.7.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
|
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "android_system_properties"
|
|
||||||
version = "0.1.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anstream"
|
name = "anstream"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
@@ -99,9 +90,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anyhow"
|
name = "anyhow"
|
||||||
version = "1.0.71"
|
version = "1.0.70"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
|
checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "assert_matches"
|
name = "assert_matches"
|
||||||
@@ -217,15 +208,6 @@ version = "1.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "block-buffer"
|
|
||||||
version = "0.10.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
|
|
||||||
dependencies = [
|
|
||||||
"generic-array",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bumpalo"
|
name = "bumpalo"
|
||||||
version = "3.12.0"
|
version = "3.12.0"
|
||||||
@@ -286,19 +268,6 @@ version = "1.0.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "chrono"
|
|
||||||
version = "0.4.24"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
|
|
||||||
dependencies = [
|
|
||||||
"iana-time-zone",
|
|
||||||
"num-integer",
|
|
||||||
"num-traits",
|
|
||||||
"serde",
|
|
||||||
"winapi 0.3.9",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cipher"
|
name = "cipher"
|
||||||
version = "0.4.4"
|
version = "0.4.4"
|
||||||
@@ -311,9 +280,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap"
|
name = "clap"
|
||||||
version = "4.2.7"
|
version = "4.2.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938"
|
checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap_builder",
|
"clap_builder",
|
||||||
"clap_derive",
|
"clap_derive",
|
||||||
@@ -322,9 +291,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap_builder"
|
name = "clap_builder"
|
||||||
version = "4.2.7"
|
version = "4.2.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd"
|
checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anstream",
|
"anstream",
|
||||||
"anstyle",
|
"anstyle",
|
||||||
@@ -488,41 +457,6 @@ dependencies = [
|
|||||||
"typenum",
|
"typenum",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "darling"
|
|
||||||
version = "0.20.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944"
|
|
||||||
dependencies = [
|
|
||||||
"darling_core",
|
|
||||||
"darling_macro",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "darling_core"
|
|
||||||
version = "0.20.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb"
|
|
||||||
dependencies = [
|
|
||||||
"fnv",
|
|
||||||
"ident_case",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"strsim",
|
|
||||||
"syn 2.0.15",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "darling_macro"
|
|
||||||
version = "0.20.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
|
|
||||||
dependencies = [
|
|
||||||
"darling_core",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.15",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "delegate"
|
name = "delegate"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@@ -534,50 +468,12 @@ dependencies = [
|
|||||||
"syn 1.0.109",
|
"syn 1.0.109",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "digest"
|
|
||||||
version = "0.10.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
|
|
||||||
dependencies = [
|
|
||||||
"block-buffer",
|
|
||||||
"crypto-common",
|
|
||||||
"subtle",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ece"
|
|
||||||
version = "2.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8dd5463ffecc0677adcd786c4481f73b215714d4757edf2eb37a573c03d00459"
|
|
||||||
dependencies = [
|
|
||||||
"base64 0.13.1",
|
|
||||||
"byteorder",
|
|
||||||
"hex",
|
|
||||||
"hkdf",
|
|
||||||
"lazy_static",
|
|
||||||
"once_cell",
|
|
||||||
"openssl",
|
|
||||||
"serde",
|
|
||||||
"sha2",
|
|
||||||
"thiserror",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "either"
|
name = "either"
|
||||||
version = "1.8.1"
|
version = "1.8.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
|
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "encoding_rs"
|
|
||||||
version = "0.8.32"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "env_logger"
|
name = "env_logger"
|
||||||
version = "0.10.0"
|
version = "0.10.0"
|
||||||
@@ -635,32 +531,6 @@ dependencies = [
|
|||||||
"instant",
|
"instant",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fcm-push-listener"
|
|
||||||
version = "2.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "51e1e9327cb6abc9da64951727a3cf534ae7101e529382dac7f5d350bccdba42"
|
|
||||||
dependencies = [
|
|
||||||
"base64 0.21.0",
|
|
||||||
"ece",
|
|
||||||
"log",
|
|
||||||
"prost",
|
|
||||||
"prost-build",
|
|
||||||
"reqwest",
|
|
||||||
"serde",
|
|
||||||
"serde_with",
|
|
||||||
"tokio",
|
|
||||||
"tokio-rustls",
|
|
||||||
"uuid",
|
|
||||||
"webpki-roots",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fixedbitset"
|
|
||||||
version = "0.4.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "flate2"
|
name = "flate2"
|
||||||
version = "1.0.26"
|
version = "1.0.26"
|
||||||
@@ -690,21 +560,6 @@ version = "1.0.7"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "foreign-types"
|
|
||||||
version = "0.3.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
|
|
||||||
dependencies = [
|
|
||||||
"foreign-types-shared",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "foreign-types-shared"
|
|
||||||
version = "0.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "form_urlencoded"
|
name = "form_urlencoded"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
@@ -1215,36 +1070,12 @@ version = "0.3.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
|
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hex"
|
|
||||||
version = "0.4.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hex-string"
|
name = "hex-string"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "848ec2dd093df965a34b434580d94852197fc83feac5b2c1962399bbf2cb4f0b"
|
checksum = "848ec2dd093df965a34b434580d94852197fc83feac5b2c1962399bbf2cb4f0b"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hkdf"
|
|
||||||
version = "0.12.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
|
|
||||||
dependencies = [
|
|
||||||
"hmac",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hmac"
|
|
||||||
version = "0.12.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
|
|
||||||
dependencies = [
|
|
||||||
"digest",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "http"
|
name = "http"
|
||||||
version = "0.2.9"
|
version = "0.2.9"
|
||||||
@@ -1321,48 +1152,6 @@ dependencies = [
|
|||||||
"tokio-io-timeout",
|
"tokio-io-timeout",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hyper-tls"
|
|
||||||
version = "0.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
|
|
||||||
dependencies = [
|
|
||||||
"bytes",
|
|
||||||
"hyper",
|
|
||||||
"native-tls",
|
|
||||||
"tokio",
|
|
||||||
"tokio-native-tls",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "iana-time-zone"
|
|
||||||
version = "0.1.56"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
|
|
||||||
dependencies = [
|
|
||||||
"android_system_properties",
|
|
||||||
"core-foundation-sys",
|
|
||||||
"iana-time-zone-haiku",
|
|
||||||
"js-sys",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"windows",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "iana-time-zone-haiku"
|
|
||||||
version = "0.1.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ident_case"
|
|
||||||
version = "1.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "idna"
|
name = "idna"
|
||||||
version = "0.2.3"
|
version = "0.2.3"
|
||||||
@@ -1398,7 +1187,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
"hashbrown",
|
"hashbrown",
|
||||||
"serde",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1436,12 +1224,6 @@ dependencies = [
|
|||||||
"windows-sys 0.48.0",
|
"windows-sys 0.48.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ipnet"
|
|
||||||
version = "2.7.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "is-terminal"
|
name = "is-terminal"
|
||||||
version = "0.4.7"
|
version = "0.4.7"
|
||||||
@@ -1605,12 +1387,6 @@ version = "1.0.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
|
checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "multimap"
|
|
||||||
version = "0.8.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nanorand"
|
name = "nanorand"
|
||||||
version = "0.7.0"
|
version = "0.7.0"
|
||||||
@@ -1620,24 +1396,6 @@ dependencies = [
|
|||||||
"getrandom",
|
"getrandom",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "native-tls"
|
|
||||||
version = "0.2.11"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
|
|
||||||
dependencies = [
|
|
||||||
"lazy_static",
|
|
||||||
"libc",
|
|
||||||
"log",
|
|
||||||
"openssl",
|
|
||||||
"openssl-probe",
|
|
||||||
"openssl-sys",
|
|
||||||
"schannel",
|
|
||||||
"security-framework",
|
|
||||||
"security-framework-sys",
|
|
||||||
"tempfile",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "neli"
|
name = "neli"
|
||||||
version = "0.5.3"
|
version = "0.5.3"
|
||||||
@@ -1650,7 +1408,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "neolink"
|
name = "neolink"
|
||||||
version = "0.5.11"
|
version = "0.5.12"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"byte-slice-cast",
|
"byte-slice-cast",
|
||||||
@@ -1682,7 +1440,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "neolink_core"
|
name = "neolink_core"
|
||||||
version = "0.5.11"
|
version = "0.5.12"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes",
|
"aes",
|
||||||
"assert_matches",
|
"assert_matches",
|
||||||
@@ -1792,50 +1550,12 @@ version = "1.17.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
|
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "openssl"
|
|
||||||
version = "0.10.52"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"cfg-if",
|
|
||||||
"foreign-types",
|
|
||||||
"libc",
|
|
||||||
"once_cell",
|
|
||||||
"openssl-macros",
|
|
||||||
"openssl-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "openssl-macros"
|
|
||||||
version = "0.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.15",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openssl-probe"
|
name = "openssl-probe"
|
||||||
version = "0.1.5"
|
version = "0.1.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "openssl-sys"
|
|
||||||
version = "0.9.87"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"libc",
|
|
||||||
"pkg-config",
|
|
||||||
"vcpkg",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "option-operations"
|
name = "option-operations"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
@@ -1880,16 +1600,6 @@ version = "2.2.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
|
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "petgraph"
|
|
||||||
version = "0.6.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
|
|
||||||
dependencies = [
|
|
||||||
"fixedbitset",
|
|
||||||
"indexmap",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pin-project"
|
name = "pin-project"
|
||||||
version = "1.0.12"
|
version = "1.0.12"
|
||||||
@@ -1946,16 +1656,6 @@ version = "0.3.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
|
checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "prettyplease"
|
|
||||||
version = "0.1.25"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"syn 1.0.109",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro-crate"
|
name = "proc-macro-crate"
|
||||||
version = "1.3.1"
|
version = "1.3.1"
|
||||||
@@ -2009,28 +1709,6 @@ dependencies = [
|
|||||||
"prost-derive",
|
"prost-derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "prost-build"
|
|
||||||
version = "0.11.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
|
|
||||||
dependencies = [
|
|
||||||
"bytes",
|
|
||||||
"heck",
|
|
||||||
"itertools",
|
|
||||||
"lazy_static",
|
|
||||||
"log",
|
|
||||||
"multimap",
|
|
||||||
"petgraph",
|
|
||||||
"prettyplease",
|
|
||||||
"prost",
|
|
||||||
"prost-types",
|
|
||||||
"regex",
|
|
||||||
"syn 1.0.109",
|
|
||||||
"tempfile",
|
|
||||||
"which",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prost-derive"
|
name = "prost-derive"
|
||||||
version = "0.11.9"
|
version = "0.11.9"
|
||||||
@@ -2053,25 +1731,6 @@ dependencies = [
|
|||||||
"prost",
|
"prost",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pushnoti"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"anyhow",
|
|
||||||
"clap",
|
|
||||||
"env_logger",
|
|
||||||
"fcm-push-listener",
|
|
||||||
"lazy_static",
|
|
||||||
"log",
|
|
||||||
"neolink_core",
|
|
||||||
"regex",
|
|
||||||
"serde",
|
|
||||||
"tokio",
|
|
||||||
"toml",
|
|
||||||
"validator",
|
|
||||||
"validator_derive",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.26"
|
version = "1.0.26"
|
||||||
@@ -2131,13 +1790,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex"
|
name = "regex"
|
||||||
version = "1.8.1"
|
version = "1.7.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
|
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aho-corasick",
|
"aho-corasick",
|
||||||
"memchr",
|
"memchr",
|
||||||
"regex-syntax 0.7.1",
|
"regex-syntax",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2146,7 +1805,7 @@ version = "0.1.10"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"regex-syntax 0.6.29",
|
"regex-syntax",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2155,12 +1814,6 @@ version = "0.6.29"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-syntax"
|
|
||||||
version = "0.7.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "requestty"
|
name = "requestty"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
@@ -2187,43 +1840,6 @@ dependencies = [
|
|||||||
"unicode-segmentation",
|
"unicode-segmentation",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "reqwest"
|
|
||||||
version = "0.11.18"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
|
|
||||||
dependencies = [
|
|
||||||
"base64 0.21.0",
|
|
||||||
"bytes",
|
|
||||||
"encoding_rs",
|
|
||||||
"futures-core",
|
|
||||||
"futures-util",
|
|
||||||
"h2",
|
|
||||||
"http",
|
|
||||||
"http-body",
|
|
||||||
"hyper",
|
|
||||||
"hyper-tls",
|
|
||||||
"ipnet",
|
|
||||||
"js-sys",
|
|
||||||
"log",
|
|
||||||
"mime",
|
|
||||||
"native-tls",
|
|
||||||
"once_cell",
|
|
||||||
"percent-encoding",
|
|
||||||
"pin-project-lite",
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"serde_urlencoded",
|
|
||||||
"tokio",
|
|
||||||
"tokio-native-tls",
|
|
||||||
"tower-service",
|
|
||||||
"url",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-futures",
|
|
||||||
"web-sys",
|
|
||||||
"winreg",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ring"
|
name = "ring"
|
||||||
version = "0.16.20"
|
version = "0.16.20"
|
||||||
@@ -2366,18 +1982,18 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.163"
|
version = "1.0.160"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
|
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive"
|
name = "serde_derive"
|
||||||
version = "1.0.163"
|
version = "1.0.160"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
|
checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -2404,57 +2020,6 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_urlencoded"
|
|
||||||
version = "0.7.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
|
|
||||||
dependencies = [
|
|
||||||
"form_urlencoded",
|
|
||||||
"itoa",
|
|
||||||
"ryu",
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_with"
|
|
||||||
version = "2.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
|
|
||||||
dependencies = [
|
|
||||||
"base64 0.13.1",
|
|
||||||
"chrono",
|
|
||||||
"hex",
|
|
||||||
"indexmap",
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"serde_with_macros",
|
|
||||||
"time",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_with_macros"
|
|
||||||
version = "2.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
|
|
||||||
dependencies = [
|
|
||||||
"darling",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.15",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "sha2"
|
|
||||||
version = "0.10.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"cpufeatures",
|
|
||||||
"digest",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sharded-slab"
|
name = "sharded-slab"
|
||||||
version = "0.1.4"
|
version = "0.1.4"
|
||||||
@@ -2552,12 +2117,6 @@ version = "0.10.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "subtle"
|
|
||||||
version = "2.4.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "1.0.109"
|
version = "1.0.109"
|
||||||
@@ -2680,7 +2239,6 @@ version = "0.3.20"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
|
checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"itoa",
|
|
||||||
"libc",
|
"libc",
|
||||||
"num_threads",
|
"num_threads",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -2720,9 +2278,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio"
|
name = "tokio"
|
||||||
version = "1.28.1"
|
version = "1.27.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
|
checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -2735,7 +2293,7 @@ dependencies = [
|
|||||||
"socket2",
|
"socket2",
|
||||||
"tokio-macros",
|
"tokio-macros",
|
||||||
"tracing",
|
"tracing",
|
||||||
"windows-sys 0.48.0",
|
"windows-sys 0.45.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2750,25 +2308,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-macros"
|
name = "tokio-macros"
|
||||||
version = "2.1.0"
|
version = "2.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
|
checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.15",
|
"syn 2.0.15",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tokio-native-tls"
|
|
||||||
version = "0.3.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
|
|
||||||
dependencies = [
|
|
||||||
"native-tls",
|
|
||||||
"tokio",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-rustls"
|
name = "tokio-rustls"
|
||||||
version = "0.23.4"
|
version = "0.23.4"
|
||||||
@@ -3050,28 +2598,6 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "uuid"
|
|
||||||
version = "1.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
|
|
||||||
dependencies = [
|
|
||||||
"getrandom",
|
|
||||||
"rand",
|
|
||||||
"uuid-macro-internal",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "uuid-macro-internal"
|
|
||||||
version = "1.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3f67b459f42af2e6e1ee213cb9da4dbd022d3320788c3fb3e1b893093f1e45da"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.15",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "validator"
|
name = "validator"
|
||||||
version = "0.16.0"
|
version = "0.16.0"
|
||||||
@@ -3119,12 +2645,6 @@ version = "0.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
|
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "vcpkg"
|
|
||||||
version = "0.2.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "version-compare"
|
name = "version-compare"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
@@ -3178,18 +2698,6 @@ dependencies = [
|
|||||||
"wasm-bindgen-shared",
|
"wasm-bindgen-shared",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasm-bindgen-futures"
|
|
||||||
version = "0.4.34"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"js-sys",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-macro"
|
name = "wasm-bindgen-macro"
|
||||||
version = "0.2.84"
|
version = "0.2.84"
|
||||||
@@ -3239,26 +2747,6 @@ dependencies = [
|
|||||||
"untrusted",
|
"untrusted",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "webpki-roots"
|
|
||||||
version = "0.22.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
|
|
||||||
dependencies = [
|
|
||||||
"webpki",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "which"
|
|
||||||
version = "4.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
|
|
||||||
dependencies = [
|
|
||||||
"either",
|
|
||||||
"libc",
|
|
||||||
"once_cell",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi"
|
name = "winapi"
|
||||||
version = "0.2.8"
|
version = "0.2.8"
|
||||||
@@ -3296,15 +2784,6 @@ version = "0.4.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows"
|
|
||||||
version = "0.48.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
|
|
||||||
dependencies = [
|
|
||||||
"windows-targets 0.48.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-sys"
|
name = "windows-sys"
|
||||||
version = "0.42.0"
|
version = "0.42.0"
|
||||||
@@ -3461,15 +2940,6 @@ dependencies = [
|
|||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winreg"
|
|
||||||
version = "0.10.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
|
|
||||||
dependencies = [
|
|
||||||
"winapi 0.3.9",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winsplit"
|
name = "winsplit"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "neolink"
|
name = "neolink"
|
||||||
description = "A standards-compliant bridge to Reolink IP cameras"
|
description = "A standards-compliant bridge to Reolink IP cameras"
|
||||||
version = "0.5.11"
|
version = "0.5.12"
|
||||||
authors = ["George Hilliard <thirtythreeforty@gmail.com>", "Andrew King <sheepchaan@gmail.com>"]
|
authors = ["George Hilliard <thirtythreeforty@gmail.com>", "Andrew King <sheepchaan@gmail.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
@@ -27,7 +27,7 @@ is_sorted = "0.1.1"
|
|||||||
itertools = "0.10.5"
|
itertools = "0.10.5"
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
log = { version = "0.4.17", features = [ "release_max_level_debug" ] }
|
log = { version = "0.4.17", features = [ "release_max_level_debug" ] }
|
||||||
neolink_core = { path = "crates/core", version = "0.5.11" }
|
neolink_core = { path = "crates/core", version = "0.5.12" }
|
||||||
regex = "1.7.3"
|
regex = "1.7.3"
|
||||||
rumqttc = "0.20.0"
|
rumqttc = "0.20.0"
|
||||||
serde = { version = "1.0.160", features = ["derive"] }
|
serde = { version = "1.0.160", features = ["derive"] }
|
||||||
|
|||||||
@@ -145,6 +145,15 @@ In the `[[cameras]]` section of the toml.
|
|||||||
Possible values are `local`, `remote`, `map`, `relay` later values implictly
|
Possible values are `local`, `remote`, `map`, `relay` later values implictly
|
||||||
enable prior methods.
|
enable prior methods.
|
||||||
|
|
||||||
|
#### Cellular
|
||||||
|
|
||||||
|
Cellular cameras should select `"cellular"` which only enables `map` and
|
||||||
|
`relay` since `local` and `remote` will always fail
|
||||||
|
|
||||||
|
```toml
|
||||||
|
discovery = "cellular"
|
||||||
|
```
|
||||||
|
|
||||||
### MQTT
|
### MQTT
|
||||||
|
|
||||||
To use mqtt you will to adjust your config file as such:
|
To use mqtt you will to adjust your config file as such:
|
||||||
@@ -240,11 +249,18 @@ passed by a script for processing.
|
|||||||
|
|
||||||
[Docker](https://hub.docker.com/r/quantumentangledandy/neolink) builds are also
|
[Docker](https://hub.docker.com/r/quantumentangledandy/neolink) builds are also
|
||||||
provided in multiple architectures. The latest tag tracks master while each
|
provided in multiple architectures. The latest tag tracks master while each
|
||||||
|
|
||||||
branch gets it's own tag.
|
branch gets it's own tag.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker pull quantumentangledandy/neolink
|
docker pull quantumentangledandy/neolink
|
||||||
|
|
||||||
|
# Add `-e "RUST_LOG=debug"` to run with debug logs
|
||||||
|
#
|
||||||
|
# --network host is only needed if you require to connect
|
||||||
|
# via local broadcasts. If you can connect via any other
|
||||||
|
# method then normal bridge mode should work fine
|
||||||
|
# and you can ommit this option
|
||||||
|
docker run --network host --volume=$PWD/config.toml:/etc/neolink.toml quantumentangledandy/neolink
|
||||||
```
|
```
|
||||||
|
|
||||||
### Image
|
### Image
|
||||||
@@ -255,11 +271,10 @@ You can write an image from the stream to disk using:
|
|||||||
neolink image --config=config.toml --file-path=filepath CameraName
|
neolink image --config=config.toml --file-path=filepath CameraName
|
||||||
```
|
```
|
||||||
|
|
||||||
Where filepath is the path to save the image to and CameraName is the name o
|
Where filepath is the path to save the image to and CameraName is the name of
|
||||||
the camera from the config to save the image from.
|
the camera from the config to save the image from.
|
||||||
|
|
||||||
File is always jpeg and the extension given in filepath will be added or changed
|
File is always jpeg and the extension given in filepath will be added or changed
|
||||||
|
|
||||||
to reflect this.
|
to reflect this.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "neolink_core"
|
name = "neolink_core"
|
||||||
description = "Core services and structure for Reolink IP cameras"
|
description = "Core services and structure for Reolink IP cameras"
|
||||||
version = "0.5.11"
|
version = "0.5.12"
|
||||||
authors = ["George Hilliard <thirtythreeforty@gmail.com>", "Andrew King <sheepchaan@gmail.com>"]
|
authors = ["George Hilliard <thirtythreeforty@gmail.com>", "Andrew King <sheepchaan@gmail.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
|
|||||||
@@ -35,8 +35,6 @@ pub const MSG_ID_GET_GENERAL: u32 = 104;
|
|||||||
pub const MSG_ID_ABILITY_INFO: u32 = 151;
|
pub const MSG_ID_ABILITY_INFO: u32 = 151;
|
||||||
/// Setting general system info (clock mostly) messages have this ID
|
/// Setting general system info (clock mostly) messages have this ID
|
||||||
pub const MSG_ID_SET_GENERAL: u32 = 105;
|
pub const MSG_ID_SET_GENERAL: u32 = 105;
|
||||||
/// Used to pass the token and client ID for push notifications
|
|
||||||
pub const MSG_ID_PUSH_INFO: u32 = 124;
|
|
||||||
/// Will send the talk config for talk back data to follow this msg
|
/// Will send the talk config for talk back data to follow this msg
|
||||||
pub const MSG_ID_TALKCONFIG: u32 = 201;
|
pub const MSG_ID_TALKCONFIG: u32 = 201;
|
||||||
/// Used to send talk back binary data
|
/// Used to send talk back binary data
|
||||||
|
|||||||
@@ -85,9 +85,6 @@ pub struct BcXml {
|
|||||||
/// Recieved on request for a users persmissions/capabilitoes
|
/// Recieved on request for a users persmissions/capabilitoes
|
||||||
#[yaserde(rename = "AbilityInfo")]
|
#[yaserde(rename = "AbilityInfo")]
|
||||||
pub ability_info: Option<AbilityInfo>,
|
pub ability_info: Option<AbilityInfo>,
|
||||||
/// Recieved on request for a users persmissions/capabilitoes
|
|
||||||
#[yaserde(rename = "PushInfo")]
|
|
||||||
pub push_info: Option<PushInfo>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl BcXml {
|
impl BcXml {
|
||||||
@@ -617,19 +614,6 @@ pub struct AbilityInfoSubModule {
|
|||||||
pub ability_value: String,
|
pub ability_value: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// PushInfo XML
|
|
||||||
#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)]
|
|
||||||
pub struct PushInfo {
|
|
||||||
/// The token from FCM registration
|
|
||||||
pub token: String,
|
|
||||||
/// The phone type, known values: `reo_iphone`
|
|
||||||
#[yaserde(rename = "phoneType")]
|
|
||||||
pub phone_type: String,
|
|
||||||
/// A client ID, seems to be an all CAPS MD5 hash of something
|
|
||||||
#[yaserde(rename = "clientID")]
|
|
||||||
pub client_id: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Convience function to return the xml version used throughout the library
|
/// Convience function to return the xml version used throughout the library
|
||||||
pub fn xml_ver() -> String {
|
pub fn xml_ver() -> String {
|
||||||
"1.1".to_string()
|
"1.1".to_string()
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ mod motion;
|
|||||||
mod ping;
|
mod ping;
|
||||||
mod pirstate;
|
mod pirstate;
|
||||||
mod ptz;
|
mod ptz;
|
||||||
mod pushinfo;
|
|
||||||
mod reboot;
|
mod reboot;
|
||||||
mod resolution;
|
mod resolution;
|
||||||
mod stream;
|
mod stream;
|
||||||
@@ -40,7 +39,6 @@ pub use login::MaxEncryption;
|
|||||||
pub use motion::{MotionData, MotionStatus};
|
pub use motion::{MotionData, MotionStatus};
|
||||||
pub use pirstate::PirState;
|
pub use pirstate::PirState;
|
||||||
pub use ptz::Direction;
|
pub use ptz::Direction;
|
||||||
pub use pushinfo::PhoneType;
|
|
||||||
pub use resolution::*;
|
pub use resolution::*;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
pub use stream::{StreamData, StreamKind};
|
pub use stream::{StreamData, StreamKind};
|
||||||
@@ -141,14 +139,16 @@ impl BcCamera {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
info!("{}: Trying TCP discovery", options.name);
|
if !sockets.is_empty() {
|
||||||
for socket in sockets.drain(..) {
|
info!("{}: Trying TCP discovery", options.name);
|
||||||
let channel_id: u8 = options.channel_id;
|
for socket in sockets.drain(..) {
|
||||||
if let Ok(addr) = Discovery::check_tcp(socket, channel_id).await.map(|_| {
|
let channel_id: u8 = options.channel_id;
|
||||||
info!("{}: TCP Discovery success at {:?}", options.name, &socket);
|
if let Ok(addr) = Discovery::check_tcp(socket, channel_id).await.map(|_| {
|
||||||
socket
|
info!("{}: TCP Discovery success at {:?}", options.name, &socket);
|
||||||
}) {
|
socket
|
||||||
return Ok(CameraLocation::Tcp(addr));
|
}) {
|
||||||
|
return Ok(CameraLocation::Tcp(addr));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -178,6 +178,7 @@ impl BcCamera {
|
|||||||
DiscoveryMethods::Remote => (true, true, false, false),
|
DiscoveryMethods::Remote => (true, true, false, false),
|
||||||
DiscoveryMethods::Map => (true, true, true, false),
|
DiscoveryMethods::Map => (true, true, true, false),
|
||||||
DiscoveryMethods::Relay => (true, true, true, true),
|
DiscoveryMethods::Relay => (true, true, true, true),
|
||||||
|
DiscoveryMethods::Cellular => (false, false, true, true),
|
||||||
DiscoveryMethods::Debug => (false, false, false, true),
|
DiscoveryMethods::Debug => (false, false, false, true),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ use local_ip_address::local_ip;
|
|||||||
use log::*;
|
use log::*;
|
||||||
use rand::{seq::SliceRandom, thread_rng, Rng};
|
use rand::{seq::SliceRandom, thread_rng, Rng};
|
||||||
use std::collections::{btree_map::Entry, BTreeMap};
|
use std::collections::{btree_map::Entry, BTreeMap};
|
||||||
|
use std::convert::TryInto;
|
||||||
use std::net::{Ipv4Addr, SocketAddr, ToSocketAddrs};
|
use std::net::{Ipv4Addr, SocketAddr, ToSocketAddrs};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use tokio::{
|
use tokio::{
|
||||||
@@ -35,9 +36,9 @@ use tokio_util::udp::UdpFramed;
|
|||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
struct RegisterResult {
|
struct RegisterResult {
|
||||||
reg: SocketAddr,
|
reg: SocketAddr,
|
||||||
dev: SocketAddr,
|
dev: Option<SocketAddr>,
|
||||||
dmap: SocketAddr,
|
dmap: Option<SocketAddr>,
|
||||||
relay: SocketAddr,
|
relay: Option<SocketAddr>,
|
||||||
client_id: i32,
|
client_id: i32,
|
||||||
sid: u32,
|
sid: u32,
|
||||||
}
|
}
|
||||||
@@ -445,8 +446,6 @@ impl Discoverer {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
trace!("Registering: {:?}", msg.payload.c2r_c);
|
|
||||||
|
|
||||||
// Send and await acceptance
|
// Send and await acceptance
|
||||||
let (sid, dev, dmap, relay) = self
|
let (sid, dev, dmap, relay) = self
|
||||||
.retry_send(msg, lookup.reg, |bc, _| match bc {
|
.retry_send(msg, lookup.reg, |bc, _| match bc {
|
||||||
@@ -465,17 +464,32 @@ impl Discoverer {
|
|||||||
}),
|
}),
|
||||||
..
|
..
|
||||||
},
|
},
|
||||||
} if !dev.ip.is_empty() && dev.port > 0 && rsp != -1 => {
|
} if (dev.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false)
|
||||||
|
|| dmap.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false)
|
||||||
|
|| relay.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false))
|
||||||
|
&& rsp != -1 =>
|
||||||
|
{
|
||||||
Some(Ok((sid, dev, dmap, relay)))
|
Some(Ok((sid, dev, dmap, relay)))
|
||||||
}
|
}
|
||||||
UdpDiscovery {
|
UdpDiscovery {
|
||||||
tid: _,
|
tid: _,
|
||||||
payload:
|
payload:
|
||||||
UdpXml {
|
UdpXml {
|
||||||
r2c_c_r: Some(R2cCr { dev, rsp, .. }),
|
r2c_c_r:
|
||||||
|
Some(R2cCr {
|
||||||
|
dev,
|
||||||
|
dmap,
|
||||||
|
relay,
|
||||||
|
rsp,
|
||||||
|
..
|
||||||
|
}),
|
||||||
..
|
..
|
||||||
},
|
},
|
||||||
} if !dev.ip.is_empty() && dev.port > 0 && rsp == -1 => {
|
} if (dev.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false)
|
||||||
|
|| dmap.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false)
|
||||||
|
|| relay.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false))
|
||||||
|
&& rsp == -1 =>
|
||||||
|
{
|
||||||
Some(Err(Error::RegisterError))
|
Some(Err(Error::RegisterError))
|
||||||
}
|
}
|
||||||
_ => None,
|
_ => None,
|
||||||
@@ -486,9 +500,9 @@ impl Discoverer {
|
|||||||
reg: lookup.reg,
|
reg: lookup.reg,
|
||||||
sid,
|
sid,
|
||||||
client_id,
|
client_id,
|
||||||
dev: SocketAddr::new(dev.ip.parse()?, dev.port),
|
dev: dev.and_then(|d| d.try_into().ok()),
|
||||||
dmap: SocketAddr::new(dmap.ip.parse()?, dmap.port),
|
dmap: dmap.and_then(|d| d.try_into().ok()),
|
||||||
relay: SocketAddr::new(relay.ip.parse()?, relay.port),
|
relay: relay.and_then(|d| d.try_into().ok()),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -523,7 +537,10 @@ impl Discoverer {
|
|||||||
},
|
},
|
||||||
) if cid == register_result.client_id
|
) if cid == register_result.client_id
|
||||||
&& &sid == register_sid
|
&& &sid == register_sid
|
||||||
&& &addr == register_dmap
|
&& register_dmap
|
||||||
|
.as_ref()
|
||||||
|
.map(|dmap| &addr == dmap)
|
||||||
|
.unwrap_or(false)
|
||||||
&& &conn == "local" =>
|
&& &conn == "local" =>
|
||||||
{
|
{
|
||||||
Some((addr, tid, did))
|
Some((addr, tid, did))
|
||||||
@@ -637,7 +654,10 @@ impl Discoverer {
|
|||||||
},
|
},
|
||||||
) if cid == register_result.client_id
|
) if cid == register_result.client_id
|
||||||
&& &sid == register_sid
|
&& &sid == register_sid
|
||||||
&& &addr == register_dmap
|
&& register_dmap
|
||||||
|
.as_ref()
|
||||||
|
.map(|dmap| &addr == dmap)
|
||||||
|
.unwrap_or(false)
|
||||||
&& &conn == "map" =>
|
&& &conn == "map" =>
|
||||||
{
|
{
|
||||||
Some((addr, tid, did))
|
Some((addr, tid, did))
|
||||||
@@ -726,7 +746,7 @@ impl Discoverer {
|
|||||||
) -> Result<ConnectResult> {
|
) -> Result<ConnectResult> {
|
||||||
let tid = generate_tid();
|
let tid = generate_tid();
|
||||||
|
|
||||||
let dev_addr = register_result.dev;
|
let dev_addr = register_result.dev.ok_or(Error::NoDev)?;
|
||||||
let msg = UdpDiscovery {
|
let msg = UdpDiscovery {
|
||||||
tid,
|
tid,
|
||||||
payload: UdpXml {
|
payload: UdpXml {
|
||||||
@@ -791,6 +811,7 @@ impl Discoverer {
|
|||||||
) -> Result<ConnectResult> {
|
) -> Result<ConnectResult> {
|
||||||
let tid = generate_tid();
|
let tid = generate_tid();
|
||||||
|
|
||||||
|
let relay_addr = register_result.relay.ok_or(Error::NoDev)?;
|
||||||
let msg = UdpDiscovery {
|
let msg = UdpDiscovery {
|
||||||
tid,
|
tid,
|
||||||
payload: UdpXml {
|
payload: UdpXml {
|
||||||
@@ -805,7 +826,7 @@ impl Discoverer {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let (final_addr, local_did) = self
|
let (final_addr, local_did) = self
|
||||||
.retry_send(msg, register_result.relay, |bc, addr| match bc {
|
.retry_send(msg, relay_addr, |bc, addr| match bc {
|
||||||
UdpDiscovery {
|
UdpDiscovery {
|
||||||
tid: _,
|
tid: _,
|
||||||
payload:
|
payload:
|
||||||
|
|||||||
@@ -1,72 +0,0 @@
|
|||||||
use super::{BcCamera, Error, Result};
|
|
||||||
use crate::bc::{model::*, xml::*};
|
|
||||||
|
|
||||||
/// Specifies the phone type for the push notification
|
|
||||||
pub enum PhoneType {
|
|
||||||
/// Specify that this is an ios push notfication
|
|
||||||
///
|
|
||||||
/// In this case the token must be the APNS
|
|
||||||
Ios,
|
|
||||||
/// Specify that this is an andriod push notfication
|
|
||||||
///
|
|
||||||
/// In this case the token must firebase cloud messaging token
|
|
||||||
Android,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl BcCamera {
|
|
||||||
/// Convenience method for andriod of `[send_pushinfo]`
|
|
||||||
pub async fn send_pushinfo_android(&self, token: &str, client_id: &str) -> Result<()> {
|
|
||||||
self.send_pushinfo(token, client_id, PhoneType::Android)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
/// Convenience method for andriod of `[send_pushinfo]`
|
|
||||||
pub async fn send_pushinfo_ios(&self, token: &str, client_id: &str) -> Result<()> {
|
|
||||||
self.send_pushinfo(token, client_id, PhoneType::Ios).await
|
|
||||||
}
|
|
||||||
/// Send the push info to regsiter for push notfications
|
|
||||||
pub async fn send_pushinfo(
|
|
||||||
&self,
|
|
||||||
token: &str,
|
|
||||||
client_id: &str,
|
|
||||||
phone_type: PhoneType,
|
|
||||||
) -> Result<()> {
|
|
||||||
let connection = self.get_connection();
|
|
||||||
let msg_num = self.new_message_num();
|
|
||||||
let mut sub = connection.subscribe(msg_num).await?;
|
|
||||||
|
|
||||||
let phone_type_str = match phone_type {
|
|
||||||
PhoneType::Ios => "reo_iphone",
|
|
||||||
PhoneType::Android => "reo_fcm",
|
|
||||||
};
|
|
||||||
|
|
||||||
let msg = Bc {
|
|
||||||
meta: BcMeta {
|
|
||||||
msg_id: MSG_ID_PUSH_INFO,
|
|
||||||
channel_id: self.channel_id,
|
|
||||||
msg_num,
|
|
||||||
response_code: 0,
|
|
||||||
stream_type: 0,
|
|
||||||
class: 0x6414,
|
|
||||||
},
|
|
||||||
body: BcBody::ModernMsg(ModernMsg {
|
|
||||||
extension: None,
|
|
||||||
payload: Some(BcPayloads::BcXml(BcXml {
|
|
||||||
push_info: Some(PushInfo {
|
|
||||||
token: token.to_owned(),
|
|
||||||
phone_type: phone_type_str.to_owned(),
|
|
||||||
client_id: client_id.to_owned(),
|
|
||||||
}),
|
|
||||||
..Default::default()
|
|
||||||
})),
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
|
|
||||||
sub.send(msg).await?;
|
|
||||||
let msg = sub.recv().await?;
|
|
||||||
if msg.meta.response_code != 200 {
|
|
||||||
return Err(Error::CameraServiceUnavaliable);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -38,6 +38,10 @@ pub enum DiscoveryMethods {
|
|||||||
/// **This also enabled `Local`, `Map` and `Remote` discovery**
|
/// **This also enabled `Local`, `Map` and `Remote` discovery**
|
||||||
#[serde(alias = "relay")]
|
#[serde(alias = "relay")]
|
||||||
Relay,
|
Relay,
|
||||||
|
/// Cellular camera only support relay and map, by choosing this option
|
||||||
|
/// only those are tried
|
||||||
|
#[serde(alias = "cellular")]
|
||||||
|
Cellular,
|
||||||
#[doc(hidden)]
|
#[doc(hidden)]
|
||||||
#[serde(alias = "debug")]
|
#[serde(alias = "debug")]
|
||||||
/// Used for debugging it is set to whatever the dev is currently testing
|
/// Used for debugging it is set to whatever the dev is currently testing
|
||||||
|
|||||||
@@ -91,7 +91,12 @@ impl BcCamera {
|
|||||||
mut buffer_size: usize,
|
mut buffer_size: usize,
|
||||||
strict: bool,
|
strict: bool,
|
||||||
) -> Result<StreamData> {
|
) -> Result<StreamData> {
|
||||||
self.has_ability_rw("preview").await?;
|
if let Err(e) = self.has_ability_rw("preview").await {
|
||||||
|
if self.has_ability_ro("streamTable").await.is_err() {
|
||||||
|
return Err(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let connection = self.get_connection();
|
let connection = self.get_connection();
|
||||||
let msg_num = self.new_message_num();
|
let msg_num = self.new_message_num();
|
||||||
|
|
||||||
@@ -256,7 +261,11 @@ impl BcCamera {
|
|||||||
|
|
||||||
/// Stop a camera from sending more stream data.
|
/// Stop a camera from sending more stream data.
|
||||||
pub async fn stop_video(&self, stream: StreamKind) -> Result<()> {
|
pub async fn stop_video(&self, stream: StreamKind) -> Result<()> {
|
||||||
self.has_ability_rw("preview").await?;
|
if let Err(e) = self.has_ability_rw("preview").await {
|
||||||
|
if self.has_ability_ro("streamTable").await.is_err() {
|
||||||
|
return Err(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
let connection = self.get_connection();
|
let connection = self.get_connection();
|
||||||
let msg_num = self.new_message_num();
|
let msg_num = self.new_message_num();
|
||||||
let mut sub_video = connection.subscribe(msg_num).await?;
|
let mut sub_video = connection.subscribe(msg_num).await?;
|
||||||
|
|||||||
@@ -240,6 +240,17 @@ pub struct IpPort {
|
|||||||
pub port: u16,
|
pub port: u16,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl std::convert::TryFrom<IpPort> for std::net::SocketAddr {
|
||||||
|
type Error = crate::Error;
|
||||||
|
|
||||||
|
fn try_from(src: IpPort) -> Result<Self, Self::Error> {
|
||||||
|
Ok(src
|
||||||
|
.ip
|
||||||
|
.parse::<std::net::IpAddr>()
|
||||||
|
.map(|ip| std::net::SocketAddr::new(ip, src.port))?)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// C2R_C xml
|
/// C2R_C xml
|
||||||
///
|
///
|
||||||
/// This is from client to the register reolink server
|
/// This is from client to the register reolink server
|
||||||
@@ -290,11 +301,11 @@ pub struct R2cT {
|
|||||||
#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)]
|
#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize, Clone)]
|
||||||
pub struct R2cCr {
|
pub struct R2cCr {
|
||||||
/// Dev camera location (actual local ip)
|
/// Dev camera location (actual local ip)
|
||||||
pub dev: IpPort,
|
pub dev: Option<IpPort>,
|
||||||
/// Dmap camera location
|
/// Dmap camera location
|
||||||
pub dmap: IpPort,
|
pub dmap: Option<IpPort>,
|
||||||
/// The location of the relay
|
/// The location of the relay
|
||||||
pub relay: IpPort,
|
pub relay: Option<IpPort>,
|
||||||
/// The nat type. Known values `"NULL"`
|
/// The nat type. Known values `"NULL"`
|
||||||
pub nat: String,
|
pub nat: String,
|
||||||
/// The camera SID
|
/// The camera SID
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "pushnoti"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
anyhow = "1.0.71"
|
|
||||||
clap = { version = "4.2.2", features = ["derive", "cargo"] }
|
|
||||||
env_logger = "0.10.0"
|
|
||||||
fcm-push-listener = "2.0.1"
|
|
||||||
lazy_static = "1.4.0"
|
|
||||||
log = { version = "0.4.17", features = [ "release_max_level_debug" ] }
|
|
||||||
neolink_core = { path = "../core", version = "0.5" }
|
|
||||||
regex = "1.8.1"
|
|
||||||
serde = "1.0.163"
|
|
||||||
tokio = { version = "1.28.1", features = ["full"] }
|
|
||||||
toml = "0.7.3"
|
|
||||||
validator = "0.16.0"
|
|
||||||
validator_derive = "0.16.0"
|
|
||||||
@@ -1,273 +0,0 @@
|
|||||||
# Reolink Push Notifications
|
|
||||||
|
|
||||||
This is the test crate to experiment with RE-ing the push notifications for a
|
|
||||||
camera
|
|
||||||
|
|
||||||
The goal here is to connect to Google's firebase cloud messaging system (FCM)
|
|
||||||
and recieve push notificaions for motion updates. This way we can get motion
|
|
||||||
notifications without being logged in to the camera and this will let us
|
|
||||||
disconnect from battery cameras and save power.
|
|
||||||
|
|
||||||
The following is the reolink data for google extracted from ios.
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
|
|
||||||
<string>ca-app-pub-3940256099942544/2934735716</string>
|
|
||||||
<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
|
|
||||||
<string>ca-app-pub-3940256099942544/4411468910</string>
|
|
||||||
<key>API_KEY</key>
|
|
||||||
<string>AIzaSyAV5l5DbbAkYB5X61wgn81Lb2f7s1h-ANE</string>
|
|
||||||
<key>BUNDLE_ID</key>
|
|
||||||
<string>com.reo.link</string>
|
|
||||||
<key>CLIENT_ID</key>
|
|
||||||
<string>696841269229-mfqfluqdkb0s2raassbsul48h09l2eiv.apps.googleusercontent.com</string>
|
|
||||||
<key>DATABASE_URL</key>
|
|
||||||
<string>https://reolink-for-ios.firebaseio.com</string>
|
|
||||||
<key>GCM_SENDER_ID</key>
|
|
||||||
<string>696841269229</string>
|
|
||||||
<key>GOOGLE_APP_ID</key>
|
|
||||||
<string>1:696841269229:ios:690529b18debb2e3</string>
|
|
||||||
<key>IS_ADS_ENABLED</key>
|
|
||||||
<false/>
|
|
||||||
<key>IS_ANALYTICS_ENABLED</key>
|
|
||||||
<false/>
|
|
||||||
<key>IS_APPINVITE_ENABLED</key>
|
|
||||||
<false/>
|
|
||||||
<key>IS_GCM_ENABLED</key>
|
|
||||||
<false/>
|
|
||||||
<key>IS_SIGNIN_ENABLED</key>
|
|
||||||
<false/>
|
|
||||||
<key>PLIST_VERSION</key>
|
|
||||||
<string>1</string>
|
|
||||||
<key>PROJECT_ID</key>
|
|
||||||
<string>reolink-for-ios</string>
|
|
||||||
<key>REVERSED_CLIENT_ID</key>
|
|
||||||
<string>com.googleusercontent.apps.696841269229-mfqfluqdkb0s2raassbsul48h09l2eiv</string>
|
|
||||||
<key>STORAGE_BUCKET</key>
|
|
||||||
<string>reolink-for-ios.appspot.com</string>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
```
|
|
||||||
|
|
||||||
Key information from this is
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<key>GCM_SENDER_ID</key>
|
|
||||||
<string>696841269229</string>
|
|
||||||
```
|
|
||||||
|
|
||||||
Which we use to register for FCM
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
p.s. maybe some one can do something fun with the API
|
|
||||||
key not sure what thats doing there since anyone can
|
|
||||||
extract that.
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<key>API_KEY</key>
|
|
||||||
<string>AIzaSyAV5l5DbbAkYB5X61wgn81Lb2f7s1h-ANE</string>
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
On android the details are little harder for me to extract (ios here). By
|
|
||||||
extracting the apk with apktook I found the following:
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<string name="gcm_defaultSenderId">743639030586</string>
|
|
||||||
<string name="google_api_key">AIzaSyBEUIuWHnnOEwFahxWgQB4Yt4NsgOmkPyE</string>
|
|
||||||
<string name="google_app_id">1:743639030586:android:86f60a4fb7143876</string>
|
|
||||||
<string name="google_client_id">743639030586-ove5uqrausoqtjjkev4b1tk4vjdfpt4l.apps.googleusercontent.com</string>
|
|
||||||
```
|
|
||||||
|
|
||||||
Where the key we need is `743639030586`
|
|
||||||
|
|
||||||
To emulate the push recievier we use the `fcm-push-listener` crate. Which
|
|
||||||
is a rust implementation of the good
|
|
||||||
[RE work of Matthieu Lemoine.](https://medium.com/@MatthieuLemoine/my-journey-to-bring-web-push-support-to-node-and-electron-ce70eea1c0b0)
|
|
||||||
hats off to you.
|
|
||||||
|
|
||||||
We also need to send the PushInfo command to the camera with the token we get
|
|
||||||
from FCM and some client ID. On IOS the token is the APNS number.
|
|
||||||
|
|
||||||
The client ID is an all CAPS UID of hexadecimal of 33 chars. Not sure how
|
|
||||||
these are generated but they seem to be unique to the device, perhaps a MD5 of
|
|
||||||
something or some generated UID on app initial login.
|
|
||||||
|
|
||||||
To experiment I did a data wipe on the reolink app and found it generates a new UID.
|
|
||||||
I also found out that if you do this while you have Push Notifications turned on
|
|
||||||
then you cannot turn them off anymore. To disable the push notifications you need
|
|
||||||
the UID which I just wiped.... Fortunatly I saved before I wiped it so I could restore.
|
|
||||||
p.d. If you every wipe your reolink data and need to stop the push notifications
|
|
||||||
you can try doing manually using the API listed at the end.
|
|
||||||
|
|
||||||
This is the data of the `PushInfo` command that is sent to the camera:
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<PushInfo version="1.1">
|
|
||||||
<token>TOKEN_FROM_FCM_OR_APNS</token>
|
|
||||||
<phoneType>reo_iphone</phoneType>
|
|
||||||
<clientID>SOMEID</clientID>
|
|
||||||
</PushInfo>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
For ios the phonetype is `reo_iphone` which I observed live but for android
|
|
||||||
no such luck.
|
|
||||||
|
|
||||||
First I just tried `reo_android` but the camera replied with an error code.
|
|
||||||
Which at least told me that I can test other string quickly and see if it
|
|
||||||
returns the error code.
|
|
||||||
|
|
||||||
Next thing to do was dumping the binaries from the apk and searching for a string
|
|
||||||
like `reo_`
|
|
||||||
|
|
||||||
```bash
|
|
||||||
grep -Ria "reo_" .
|
|
||||||
./lib/armeabi-v7a/libavcodec.so:stereo_modeError splitting the input into NAL units.
|
|
||||||
./lib/arm64-v8a/libavcodec.so:stereo_modeError splitting the input into NAL units.
|
|
||||||
./smali_classes2/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.smali:.field private static final ID_STEREO_MODE:I = 0x53b8
|
|
||||||
./smali_classes2/com/google/android/exoplayer2/C.smali:.field public static final STEREO_MODE_LEFT_RIGHT:I = 0x2
|
|
||||||
./smali_classes2/com/google/android/exoplayer2/C.smali:.field public static final STEREO_MODE_MONO:I = 0x0
|
|
||||||
./smali_classes2/com/google/android/exoplayer2/C.smali:.field public static final STEREO_MODE_STEREO_MESH:I = 0x3
|
|
||||||
./smali_classes2/com/google/android/exoplayer2/C.smali:.field public static final STEREO_MODE_TOP_BOTTOM:I = 0x1
|
|
||||||
./smali_classes2/com/android/bc/util/DeviceIdUtil$UpdatePushClientIdRequest.smali: const-string v2, "reo_fcm"
|
|
||||||
./smali_classes2/com/android/bc/pushmanager/MyPushAdapterImpl.smali: const-string v0, "reo_fcm"
|
|
||||||
./smali/androidx/core/text/BidiFormatter.smali:.field private static final FLAG_STEREO_RESET:I = 0x2
|
|
||||||
./smali/com/android/bc/component/BaseWebViewFragment.smali: const-string v2, "REO_LANGUAGE="
|
|
||||||
```
|
|
||||||
|
|
||||||
The interesting one was `MyPushAdapterImpl.smali: const-string v0, "reo_fcm"`
|
|
||||||
which suggested that it is `reo_fcm` stuck that in and voilla
|
|
||||||
no error messages from the camera.
|
|
||||||
|
|
||||||
Now to compile the test app with all this info
|
|
||||||
wait patiently for a motion event and...
|
|
||||||
|
|
||||||
viola!
|
|
||||||
|
|
||||||
Reolink was kinda enough to send this to my test app:
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"data": {
|
|
||||||
"SRVTIME": "2023-05-19T08:07:03.566Z",
|
|
||||||
"ALMNAME": "Motion Alert from Cam01",
|
|
||||||
"sound": "push.wav",
|
|
||||||
"CHNAME": "Cam0",
|
|
||||||
"messageType": "alarm",
|
|
||||||
"DEVNAME": "Cam01",
|
|
||||||
"pushVersion": "v1.1",
|
|
||||||
"UID": "REDACTED",
|
|
||||||
"ALMTYPE": "MD",
|
|
||||||
"ALMCHN": "1",
|
|
||||||
"alert": "Motion Alert from Cam01",
|
|
||||||
"title": "Camera Alert"
|
|
||||||
},
|
|
||||||
"from": "743639030586",
|
|
||||||
"priority": "normal",
|
|
||||||
"notification": { "title": "Camera Alert", "body": "Motion Alert from Cam01" },
|
|
||||||
"fcmMessageId": "REDACTED"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
There's no push notifiation for motion stop event but I can wait for this message
|
|
||||||
then login and use normal motion detection to tell when it stops.
|
|
||||||
|
|
||||||
Yay.... now to just add all this to actual neolink so we can save battery.....
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
While experimenting with the ios app, in addition to observing all the
|
|
||||||
data send to the camera, I also looked at all https calls the app was making
|
|
||||||
(mitmproxy). This showed a set of APIs that could be useful. Including the api
|
|
||||||
for deleting a push notification.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
To disable a PUSH request the following is done:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
curl -v -X DELETE 'https://pushx.reolink.com/devices/<CAMERA_UID>/notifications/listeners/<clientID_FROM_PushInfo>' -H 'Cookie:'
|
|
||||||
```
|
|
||||||
|
|
||||||
Reply is:
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"status" : {
|
|
||||||
"detail" : "OK",
|
|
||||||
"code" : 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Nothing seems to be sent to the camera just this to the reolink api
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
On ios application start reolink send this:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
curl -v -X GET 'https://pushx.reolink.com/listeners/<clientID_FROM_PushInfo>/devices' -H 'Accept-Encoding: gzip, deflate, br' -H 'Accept: */*' -H 'Accept-Language: en-GB,en;q=0.9' -H 'Cookie:'
|
|
||||||
```
|
|
||||||
|
|
||||||
Which resonds with this json which contains a list of all currently
|
|
||||||
enabled push notification camera UIDs for this client
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"status" : {
|
|
||||||
"detail" : "OK",
|
|
||||||
"code" : 0
|
|
||||||
},
|
|
||||||
"data" : [
|
|
||||||
{
|
|
||||||
"uid" : "<CAMERA_UID>",
|
|
||||||
"secret" : ""
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
You can also confirm a device has a listener with
|
|
||||||
|
|
||||||
```bash
|
|
||||||
curl -v -X GET 'https://pushx.reolink.com/devices/<CAMERA_UID>/listeners/<clientID_FROM_PushInfo>/config' -H 'Cookie:'
|
|
||||||
```
|
|
||||||
|
|
||||||
Which returns
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"status": {
|
|
||||||
"code":0,
|
|
||||||
"detail":"OK"
|
|
||||||
},
|
|
||||||
"data": {
|
|
||||||
"sound": {
|
|
||||||
"soundType":0,
|
|
||||||
"soundName":"",
|
|
||||||
"soundVolume":0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
There's also a profile one that the app does when a new camera is added
|
|
||||||
but I forgot to save the details of it.
|
|
||||||
|
|
||||||
It reports all the capabilities of the camera, such as it's model
|
|
||||||
and its resolution etc. Could be useful to test if a UID is valid
|
|
||||||
quickly
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
use lazy_static::lazy_static;
|
|
||||||
use neolink_core::bc_protocol::{DiscoveryMethods, PrintFormat};
|
|
||||||
use regex::Regex;
|
|
||||||
use serde::Deserialize;
|
|
||||||
use std::clone::Clone;
|
|
||||||
use validator::{Validate, ValidationError};
|
|
||||||
use validator_derive::Validate;
|
|
||||||
|
|
||||||
lazy_static! {
|
|
||||||
static ref RE_STREAM_SRC: Regex =
|
|
||||||
Regex::new(r"^(mainStream|subStream|externStream|both|all)$").unwrap();
|
|
||||||
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();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Validate, Clone)]
|
|
||||||
pub(crate) struct Config {
|
|
||||||
#[validate]
|
|
||||||
pub(crate) cameras: Vec<CameraConfig>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Validate, Clone)]
|
|
||||||
#[validate(schema(function = "validate_camera_config"))]
|
|
||||||
pub(crate) struct CameraConfig {
|
|
||||||
pub(crate) name: String,
|
|
||||||
|
|
||||||
#[serde(rename = "address")]
|
|
||||||
pub(crate) camera_addr: Option<String>,
|
|
||||||
|
|
||||||
#[serde(rename = "uid")]
|
|
||||||
pub(crate) camera_uid: Option<String>,
|
|
||||||
|
|
||||||
pub(crate) username: String,
|
|
||||||
pub(crate) password: Option<String>,
|
|
||||||
|
|
||||||
#[validate(range(min = 0, max = 31, message = "Invalid channel", code = "channel_id"))]
|
|
||||||
#[serde(default = "default_channel_id")]
|
|
||||||
pub(crate) channel_id: u8,
|
|
||||||
|
|
||||||
#[serde(default = "default_discovery")]
|
|
||||||
pub(crate) discovery: DiscoveryMethods,
|
|
||||||
|
|
||||||
#[serde(default = "default_maxenc")]
|
|
||||||
#[validate(regex(
|
|
||||||
path = "RE_MAXENC_SRC",
|
|
||||||
message = "Invalid maximum encryption method",
|
|
||||||
code = "max_encryption"
|
|
||||||
))]
|
|
||||||
pub(crate) max_encryption: String,
|
|
||||||
|
|
||||||
#[serde(default = "default_print", alias = "print")]
|
|
||||||
pub(crate) print_format: PrintFormat,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_print() -> PrintFormat {
|
|
||||||
PrintFormat::None
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_discovery() -> DiscoveryMethods {
|
|
||||||
DiscoveryMethods::Relay
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_maxenc() -> String {
|
|
||||||
"Aes".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn default_channel_id() -> u8 {
|
|
||||||
0
|
|
||||||
}
|
|
||||||
|
|
||||||
fn validate_camera_config(camera_config: &CameraConfig) -> Result<(), ValidationError> {
|
|
||||||
match (&camera_config.camera_addr, &camera_config.camera_uid) {
|
|
||||||
(None, None) => Err(ValidationError::new(
|
|
||||||
"Either camera address or uid must be given",
|
|
||||||
)),
|
|
||||||
_ => Ok(()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
use anyhow::{Context, Result};
|
|
||||||
use clap::Parser;
|
|
||||||
use fcm_push_listener::*;
|
|
||||||
use log::*;
|
|
||||||
use std::{fs, path::PathBuf};
|
|
||||||
use validator::Validate;
|
|
||||||
|
|
||||||
mod config;
|
|
||||||
mod opt;
|
|
||||||
mod utils;
|
|
||||||
|
|
||||||
use config::Config;
|
|
||||||
use opt::Opt;
|
|
||||||
use utils::find_and_connect;
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async fn main() -> Result<()> {
|
|
||||||
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
|
|
||||||
|
|
||||||
let opt = Opt::parse();
|
|
||||||
|
|
||||||
let conf_path = opt.config.context("Must supply --config file")?;
|
|
||||||
let config: Config = toml::from_str(
|
|
||||||
&fs::read_to_string(&conf_path)
|
|
||||||
.with_context(|| format!("Failed to read {:?}", conf_path))?,
|
|
||||||
)
|
|
||||||
.with_context(|| format!("Failed to parse the {:?} config file", conf_path))?;
|
|
||||||
|
|
||||||
config
|
|
||||||
.validate()
|
|
||||||
.with_context(|| format!("Failed to validate the {:?} config file", conf_path))?;
|
|
||||||
|
|
||||||
let camera = find_and_connect(&config, &opt.camera).await?;
|
|
||||||
|
|
||||||
// 696841269229 is the reo_iphone FCM Sender_ID
|
|
||||||
// let registration = fcm_push_listener::register("696841269229").await?;
|
|
||||||
// 743639030586 is the reo_fcm FCM Sender_ID
|
|
||||||
// 263684512460 is my test Sender_ID
|
|
||||||
// let registration = fcm_push_listener::register("743639030586").await?
|
|
||||||
// I have confirmed that I can recieve test messages with this SenderID
|
|
||||||
// into this program
|
|
||||||
// let registration = fcm_push_listener::register("263684512460").await?;
|
|
||||||
|
|
||||||
let sender_id = "743639030586"; // andriod
|
|
||||||
|
|
||||||
// let sender_id = "696841269229"; // ios
|
|
||||||
|
|
||||||
// let sender_id = "263684512460"; // test
|
|
||||||
|
|
||||||
let token_path = PathBuf::from("./token.toml");
|
|
||||||
let registration = if let Ok(Ok(registration)) =
|
|
||||||
fs::read_to_string(&token_path).map(|v| toml::from_str::<Registration>(&v))
|
|
||||||
{
|
|
||||||
info!("Loaded token");
|
|
||||||
registration
|
|
||||||
} else {
|
|
||||||
info!("Registering new token");
|
|
||||||
let registration = fcm_push_listener::register(sender_id).await?;
|
|
||||||
let new_token = toml::to_string(®istration)?;
|
|
||||||
fs::write(token_path, new_token)?;
|
|
||||||
registration
|
|
||||||
};
|
|
||||||
|
|
||||||
// Send registration.fcm_token to the server to allow it to send push messages to you.
|
|
||||||
info!("registration.fcm_token: {}", registration.fcm_token);
|
|
||||||
let uid = "6A5443E486511B0D828543445DC55A7D"; // MD5 Hash of "WHY_REOLINK"
|
|
||||||
camera
|
|
||||||
.send_pushinfo_android(®istration.fcm_token, uid)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
info!("Listening");
|
|
||||||
let mut listener = FcmPushListener::create(
|
|
||||||
registration,
|
|
||||||
|message: FcmMessage| {
|
|
||||||
info!("Message JSON: {}", message.payload_json);
|
|
||||||
info!("Persistent ID: {:?}", message.persistent_id);
|
|
||||||
},
|
|
||||||
vec![],
|
|
||||||
);
|
|
||||||
listener.connect().await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
use clap::{crate_authors, crate_version, Parser};
|
|
||||||
use std::path::PathBuf;
|
|
||||||
use std::str::FromStr;
|
|
||||||
|
|
||||||
/// A standards-compliant bridge to Reolink IP cameras
|
|
||||||
///
|
|
||||||
/// Neolink is free software released under the GNU AGPL v3.
|
|
||||||
/// You can find its source code at https://github.com/thirtythreeforty/neolink
|
|
||||||
#[derive(Parser, Debug)]
|
|
||||||
#[command(name = "pushnoti", arg_required_else_help = true, version = crate_version!(), author = crate_authors!("\n"))]
|
|
||||||
pub struct Opt {
|
|
||||||
#[arg(short, long, value_parser = PathBuf::from_str)]
|
|
||||||
pub config: Option<PathBuf>,
|
|
||||||
/// The name of the camera. Must be a name in the config
|
|
||||||
pub camera: String,
|
|
||||||
}
|
|
||||||
@@ -1,152 +0,0 @@
|
|||||||
//! Contains code that is not specific to any of the subcommands
|
|
||||||
//!
|
|
||||||
use log::*;
|
|
||||||
|
|
||||||
use super::config::{CameraConfig, Config};
|
|
||||||
use anyhow::{anyhow, Context, Error, Result};
|
|
||||||
use neolink_core::bc_protocol::{
|
|
||||||
BcCamera, BcCameraOpt, ConnectionProtocol, Credentials, DiscoveryMethods, MaxEncryption,
|
|
||||||
};
|
|
||||||
use std::{
|
|
||||||
fmt::{Display, Error as FmtError, Formatter},
|
|
||||||
net::{IpAddr, ToSocketAddrs},
|
|
||||||
str::FromStr,
|
|
||||||
};
|
|
||||||
|
|
||||||
pub(crate) enum AddressOrUid {
|
|
||||||
Address(String),
|
|
||||||
Uid(String, DiscoveryMethods),
|
|
||||||
AddressWithUid(String, String, DiscoveryMethods),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Display for AddressOrUid {
|
|
||||||
fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
|
|
||||||
match self {
|
|
||||||
AddressOrUid::AddressWithUid(addr, uid, _) => {
|
|
||||||
write!(f, "Address: {}, UID: {}", addr, uid)
|
|
||||||
}
|
|
||||||
AddressOrUid::Address(host) => write!(f, "Address: {}", host),
|
|
||||||
AddressOrUid::Uid(host, _) => write!(f, "UID: {}", host),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AddressOrUid {
|
|
||||||
// Created by translating the config fields directly
|
|
||||||
pub(crate) fn new(
|
|
||||||
address: &Option<String>,
|
|
||||||
uid: &Option<String>,
|
|
||||||
method: &DiscoveryMethods,
|
|
||||||
) -> Result<Self, Error> {
|
|
||||||
match (address, uid) {
|
|
||||||
(None, None) => Err(anyhow!("Neither address or uid given")),
|
|
||||||
(Some(host), Some(uid)) => Ok(AddressOrUid::AddressWithUid(
|
|
||||||
host.clone(),
|
|
||||||
uid.clone(),
|
|
||||||
*method,
|
|
||||||
)),
|
|
||||||
(Some(host), None) => Ok(AddressOrUid::Address(host.clone())),
|
|
||||||
(None, Some(host)) => Ok(AddressOrUid::Uid(host.clone(), *method)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convience method to get the BcCamera with the appropiate method
|
|
||||||
// from a camera_config
|
|
||||||
pub(crate) async fn connect_camera(
|
|
||||||
&self,
|
|
||||||
camera_config: &CameraConfig,
|
|
||||||
) -> Result<BcCamera, Error> {
|
|
||||||
let (port, addrs) = {
|
|
||||||
if let Some(addr_str) = camera_config.camera_addr.as_ref() {
|
|
||||||
match addr_str.to_socket_addrs() {
|
|
||||||
Ok(addr_iter) => {
|
|
||||||
let mut port = None;
|
|
||||||
let mut ipaddrs = vec![];
|
|
||||||
for addr in addr_iter {
|
|
||||||
port = Some(addr.port());
|
|
||||||
ipaddrs.push(addr.ip());
|
|
||||||
}
|
|
||||||
Ok((port, ipaddrs))
|
|
||||||
}
|
|
||||||
Err(_) => match IpAddr::from_str(addr_str) {
|
|
||||||
Ok(ip) => Ok((None, vec![ip])),
|
|
||||||
Err(_) => Err(anyhow!("Could not parse address in config")),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Ok((None, vec![]))
|
|
||||||
}
|
|
||||||
}?;
|
|
||||||
|
|
||||||
let options = BcCameraOpt {
|
|
||||||
name: camera_config.name.clone(),
|
|
||||||
channel_id: camera_config.channel_id,
|
|
||||||
addrs,
|
|
||||||
port,
|
|
||||||
uid: camera_config.camera_uid.clone(),
|
|
||||||
protocol: ConnectionProtocol::TcpUdp,
|
|
||||||
discovery: camera_config.discovery,
|
|
||||||
aux_printing: camera_config.print_format,
|
|
||||||
credentials: Credentials {
|
|
||||||
username: camera_config.username.clone(),
|
|
||||||
password: camera_config.password.clone(),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
trace!("Camera Info: {:?}", options);
|
|
||||||
|
|
||||||
Ok(BcCamera::new(&options).await?)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) async fn find_and_connect(config: &Config, name: &str) -> Result<BcCamera> {
|
|
||||||
let camera_config = find_camera_by_name(config, name)?;
|
|
||||||
connect_and_login(camera_config).await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) async fn connect_and_login(camera_config: &CameraConfig) -> Result<BcCamera> {
|
|
||||||
let camera_addr = AddressOrUid::new(
|
|
||||||
&camera_config.camera_addr,
|
|
||||||
&camera_config.camera_uid,
|
|
||||||
&camera_config.discovery,
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
info!(
|
|
||||||
"{}: Connecting to camera at {}",
|
|
||||||
camera_config.name, camera_addr
|
|
||||||
);
|
|
||||||
|
|
||||||
let camera = camera_addr
|
|
||||||
.connect_camera(camera_config)
|
|
||||||
.await
|
|
||||||
.with_context(|| {
|
|
||||||
format!(
|
|
||||||
"Failed to connect to camera {} at {} on channel {}",
|
|
||||||
camera_config.name, camera_addr, camera_config.channel_id
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let max_encryption = match camera_config.max_encryption.to_lowercase().as_str() {
|
|
||||||
"none" => MaxEncryption::None,
|
|
||||||
"bcencrypt" => MaxEncryption::BcEncrypt,
|
|
||||||
"aes" => MaxEncryption::Aes,
|
|
||||||
_ => MaxEncryption::Aes,
|
|
||||||
};
|
|
||||||
info!("{}: Logging in", camera_config.name);
|
|
||||||
camera
|
|
||||||
.login_with_maxenc(max_encryption)
|
|
||||||
.await
|
|
||||||
.with_context(|| format!("Failed to login to {}", camera_config.name))?;
|
|
||||||
|
|
||||||
info!("{}: Connected and logged in", camera_config.name);
|
|
||||||
|
|
||||||
Ok(camera)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn find_camera_by_name<'a>(config: &'a Config, name: &str) -> Result<&'a CameraConfig> {
|
|
||||||
config
|
|
||||||
.cameras
|
|
||||||
.iter()
|
|
||||||
.find(|c| c.name == name)
|
|
||||||
.ok_or_else(|| anyhow!("Camera {} not found in the config file", name))
|
|
||||||
}
|
|
||||||
@@ -146,14 +146,11 @@ local message_types = {
|
|||||||
[106]="<Dst>",
|
[106]="<Dst>",
|
||||||
[107]="<Dst> (write)",
|
[107]="<Dst> (write)",
|
||||||
[108]="<ConfigFileInfo> (log)",
|
[108]="<ConfigFileInfo> (log)",
|
||||||
[109]="<Snap>",
|
|
||||||
[114]="<Uid>",
|
[114]="<Uid>",
|
||||||
[115]="<WifiSignal>",
|
[115]="<WifiSignal>",
|
||||||
[116]="<Wifi>",
|
|
||||||
[120]="<OnlineUserList>",
|
[120]="<OnlineUserList>",
|
||||||
[122]="<PerformanceInfo>",
|
[122]="<PerformanceInfo>",
|
||||||
[123]="<ReplaySeek>",
|
[123]="<ReplaySeek>",
|
||||||
[124]="<PushInfo>",
|
|
||||||
[132]="<VideoInput>", -- <InputAdvanceCfg>
|
[132]="<VideoInput>", -- <InputAdvanceCfg>
|
||||||
[133]="<RfAlarm>",
|
[133]="<RfAlarm>",
|
||||||
[141]="<Email> (test)",
|
[141]="<Email> (test)",
|
||||||
@@ -163,7 +160,6 @@ local message_types = {
|
|||||||
[151]="<AbilityInfo>",
|
[151]="<AbilityInfo>",
|
||||||
[190]="PTZ Preset",
|
[190]="PTZ Preset",
|
||||||
[194]="<Ftp> (test)",
|
[194]="<Ftp> (test)",
|
||||||
[195]="<AutoUpdate>",
|
|
||||||
[199]="<Support>",
|
[199]="<Support>",
|
||||||
[208]="<LedState>",
|
[208]="<LedState>",
|
||||||
[209]="<LedState> (write)",
|
[209]="<LedState> (write)",
|
||||||
@@ -178,13 +174,9 @@ local message_types = {
|
|||||||
[228]="<Crop>",
|
[228]="<Crop>",
|
||||||
[229]="<Crop> (write)",
|
[229]="<Crop> (write)",
|
||||||
[230]="<cropSnap>",
|
[230]="<cropSnap>",
|
||||||
[232]="<AudioTask>",
|
|
||||||
[234]="UDP Keep Alive",
|
[234]="UDP Keep Alive",
|
||||||
[252]="<BatteryInfoList>",
|
[252]="<BatteryInfoList>",
|
||||||
[253]="<BatteryInfo>",
|
[253]="<BatteryInfo>",
|
||||||
[268]="<CloudBindInfo>",
|
|
||||||
[282]="<CloudLoginKey>",
|
|
||||||
[287]="<TimeCfg>",
|
|
||||||
[272]="<findAlarmVideo>",
|
[272]="<findAlarmVideo>",
|
||||||
[273]="<alarmVideoInfo>",
|
[273]="<alarmVideoInfo>",
|
||||||
[274]="<findAlarmVideo>",
|
[274]="<findAlarmVideo>",
|
||||||
|
|||||||
@@ -1662,64 +1662,6 @@ Message have zero to two payloads.
|
|||||||
</body>
|
</body>
|
||||||
```
|
```
|
||||||
|
|
||||||
- 109: `<Snap>`
|
|
||||||
|
|
||||||
- Client:
|
|
||||||
Usual header
|
|
||||||
|
|
||||||
- Meta:
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<Extension version="1.1">
|
|
||||||
<channelId>0</channelId>
|
|
||||||
</Extension>
|
|
||||||
```
|
|
||||||
|
|
||||||
- Main:
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<Snap version="1.1">
|
|
||||||
<channelId>0</channelId>
|
|
||||||
<logicChannel>0</logicChannel>
|
|
||||||
<time>0</time>
|
|
||||||
<fullFrame>0</fullFrame>
|
|
||||||
<streamType>main</streamType>
|
|
||||||
</Snap>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
- Camera:
|
|
||||||
|
|
||||||
**Notes:** XML & Binary reply over mutliple packets:
|
|
||||||
- Reply 1:
|
|
||||||
- Main:
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<Snap version="1.1">
|
|
||||||
<channelId>0</channelId>
|
|
||||||
<fileName>01_20230518140240.jpg</fileName>
|
|
||||||
<time>0</time>
|
|
||||||
<pictureSize>23644</pictureSize>
|
|
||||||
</Snap>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
- Reply 2:
|
|
||||||
- Meta:
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<Extension version="1.1">
|
|
||||||
<binaryData>1</binaryData>
|
|
||||||
</Extension>
|
|
||||||
```
|
|
||||||
- Main:
|
|
||||||
**Binary data containing the file may be broken over multiple packets**
|
|
||||||
|
|
||||||
|
|
||||||
- 115: `<WifiSignal>`
|
- 115: `<WifiSignal>`
|
||||||
|
|
||||||
- Client
|
- Client
|
||||||
@@ -1749,35 +1691,6 @@ Message have zero to two payloads.
|
|||||||
</body>
|
</body>
|
||||||
```
|
```
|
||||||
|
|
||||||
- 116: `<Wifi>`
|
|
||||||
|
|
||||||
- Client:
|
|
||||||
Usual header
|
|
||||||
|
|
||||||
- Camera:
|
|
||||||
Payload:
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<Wifi version="1.1">
|
|
||||||
<mode>station</mode>
|
|
||||||
<authMode>wpa2psk</authMode>
|
|
||||||
<encryptType>aes</encryptType>
|
|
||||||
<udidList>
|
|
||||||
<udid>
|
|
||||||
<name>WIFINAME</name>
|
|
||||||
<signal>NUMBER</signal>
|
|
||||||
<encrypt>ONE_OR_ZERO</encrypt>
|
|
||||||
</udid>
|
|
||||||
# Repeats for ALL wifi in range
|
|
||||||
</udidList>
|
|
||||||
<ssid>YOUR_CURRENT_WIFI</ssid>
|
|
||||||
<key>YOUR_CURRENT_WIFI_PASSWORD_UNENCRYPTED</key>
|
|
||||||
<channel>YOUR_CURRENT_WIFI_CHANNEL</channel>
|
|
||||||
</Wifi>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
- 132: `<VideoInput>`
|
- 132: `<VideoInput>`
|
||||||
|
|
||||||
- Client
|
- Client
|
||||||
@@ -1890,37 +1803,6 @@ Message have zero to two payloads.
|
|||||||
</body>
|
</body>
|
||||||
```
|
```
|
||||||
|
|
||||||
- 124: `<PushInfo>`
|
|
||||||
|
|
||||||
- Client
|
|
||||||
- Payload:
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<PushInfo version="1.1">
|
|
||||||
<token>A_PUSH_NOTIFICATION_TOKEN</token>
|
|
||||||
<phoneType>reo_iphone</phoneType>
|
|
||||||
<clientID>A_PUSH_NOTIFICATION_CLIENTID</clientID>
|
|
||||||
</PushInfo>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
- Camera
|
|
||||||
- Payload
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<PushRspInfo version="1.1">
|
|
||||||
<registerHandle>-1</registerHandle>
|
|
||||||
<uid>CAMERA_UID</uid>
|
|
||||||
<uidKey>A_4_CHAR_STRING</uidKey>
|
|
||||||
</PushRspInfo>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
- 133: `<RfAlarm>`
|
- 133: `<RfAlarm>`
|
||||||
|
|
||||||
- Client
|
- Client
|
||||||
@@ -2456,154 +2338,6 @@ Message have zero to two payloads.
|
|||||||
|--------------|--------------|----------------|-------------------|-------------------|---------------|---------------|
|
|--------------|--------------|----------------|-------------------|-------------------|---------------|---------------|
|
||||||
| 0a bc de f0 | 00 00 00 d1 | 00 00 00 00 | 85 00 00 00 | c8 00 | 00 00 | 00 00 00 00 |
|
| 0a bc de f0 | 00 00 00 d1 | 00 00 00 00 | 85 00 00 00 | c8 00 | 00 00 | 00 00 00 00 |
|
||||||
|
|
||||||
- 219: `<PushTask>`
|
|
||||||
- Client
|
|
||||||
Usual header
|
|
||||||
|
|
||||||
- Meta:
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<Extension version="1.1">
|
|
||||||
<channelId>0</channelId>
|
|
||||||
</Extension>
|
|
||||||
```
|
|
||||||
- Camera
|
|
||||||
Usual header
|
|
||||||
|
|
||||||
- Payload:
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<PushTask version="1.1">
|
|
||||||
<channelId>0</channelId>
|
|
||||||
<enable>1</enable>
|
|
||||||
<ScheduleList>
|
|
||||||
<Schedule>
|
|
||||||
<alarmType>MD</alarmType>
|
|
||||||
<timeBlockList>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Sunday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Monday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Tuesday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Wednesday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Thursday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Friday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Saturday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
</timeBlockList>
|
|
||||||
</Schedule>
|
|
||||||
</ScheduleList>
|
|
||||||
</PushTask>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
- 232: `<AudioTask>`
|
|
||||||
- Client
|
|
||||||
Usual header
|
|
||||||
|
|
||||||
- Meta:
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<Extension version="1.1">
|
|
||||||
<channelId>0</channelId>
|
|
||||||
</Extension>
|
|
||||||
```
|
|
||||||
- Camera
|
|
||||||
Usual header
|
|
||||||
|
|
||||||
- Payload:
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<AudioTask version="1.1">
|
|
||||||
<channelId>0</channelId>
|
|
||||||
<enable>0</enable>
|
|
||||||
<ScheduleList>
|
|
||||||
<Schedule>
|
|
||||||
<alarmType>MD</alarmType>
|
|
||||||
<timeBlockList>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Sunday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Monday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Tuesday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Wednesday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Thursday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Friday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
<timeBlock>
|
|
||||||
<enable>1</enable>
|
|
||||||
<weekDay>Saturday</weekDay>
|
|
||||||
<beginHour>0</beginHour>
|
|
||||||
<endHour>23</endHour>
|
|
||||||
</timeBlock>
|
|
||||||
</timeBlockList>
|
|
||||||
</Schedule>
|
|
||||||
</ScheduleList>
|
|
||||||
</AudioTask>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
- 264: `<audioCfg>` (write)
|
- 264: `<audioCfg>` (write)
|
||||||
|
|
||||||
@@ -2639,55 +2373,6 @@ Message have zero to two payloads.
|
|||||||
</body>
|
</body>
|
||||||
```
|
```
|
||||||
|
|
||||||
- 268: `CloudBindInfo`
|
|
||||||
- Client:
|
|
||||||
Usual header only packet
|
|
||||||
|
|
||||||
- Camera
|
|
||||||
|
|
||||||
- Payload
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<CloudBindInfo version="1.1">
|
|
||||||
<binded>1</binded>
|
|
||||||
</CloudBindInfo>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
- 282: `CloudLoginKey`
|
|
||||||
|
|
||||||
- Client:
|
|
||||||
Usual header only packet
|
|
||||||
|
|
||||||
- Camera
|
|
||||||
- Payload
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<body>
|
|
||||||
<CloudLoginKey version="1.1">
|
|
||||||
<enable>0</enable>
|
|
||||||
</CloudLoginKey>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
- 287: `<TimeCfg>`
|
|
||||||
- Client:
|
|
||||||
- Payload
|
|
||||||
|
|
||||||
```xml
|
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<body>
|
|
||||||
<TimeCfg version="1.1">
|
|
||||||
<realTime>1684393362</realTime>
|
|
||||||
</TimeCfg>
|
|
||||||
</body>
|
|
||||||
```
|
|
||||||
|
|
||||||
- Camera
|
|
||||||
Header only 200 Ok reply
|
|
||||||
|
|
||||||
- 288: `<FloodlightManual>` (write)
|
- 288: `<FloodlightManual>` (write)
|
||||||
|
|
||||||
- Client
|
- Client
|
||||||
|
|||||||
@@ -61,6 +61,8 @@ address = "192.168.1.187:9000"
|
|||||||
# "remote" # Register our local ip address with reolink but only permit same network connections (useful if broadcast is not possible)
|
# "remote" # Register our local ip address with reolink but only permit same network connections (useful if broadcast is not possible)
|
||||||
# "local" # Do not contact reolink servers at all. Rely soley on local UDP broadcast based discovery
|
# "local" # Do not contact reolink servers at all. Rely soley on local UDP broadcast based discovery
|
||||||
#
|
#
|
||||||
|
# "cellular" # Cellular camera only support Relay and Map to speed up connecting to them this option will skip the local/remote
|
||||||
|
#
|
||||||
# discovery = "relay"
|
# discovery = "relay"
|
||||||
|
|
||||||
# Certain types of camera emit status messages (such as battery levels)
|
# Certain types of camera emit status messages (such as battery levels)
|
||||||
|
|||||||
+11
-18
@@ -635,9 +635,12 @@ impl NeoMediaSender {
|
|||||||
async fn seek(
|
async fn seek(
|
||||||
&mut self,
|
&mut self,
|
||||||
_original_runtime: Option<FrameTime>,
|
_original_runtime: Option<FrameTime>,
|
||||||
_target_runtime: FrameTime,
|
target_runtime: FrameTime,
|
||||||
_master_buffer: &NeoBuffer,
|
_master_buffer: &NeoBuffer,
|
||||||
) -> AnyResult<()> {
|
) -> AnyResult<()> {
|
||||||
|
if let Some(runtime) = self.get_raw_runtime() {
|
||||||
|
self.live_offset = target_runtime - runtime;
|
||||||
|
}
|
||||||
self.jump_to_live().await?;
|
self.jump_to_live().await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -702,28 +705,13 @@ impl NeoMediaSender {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_runtime(&self) -> Option<FrameTime> {
|
fn get_raw_runtime(&self) -> Option<FrameTime> {
|
||||||
if let Some(appsrc) = self.vid.as_ref() {
|
if let Some(appsrc) = self.vid.as_ref() {
|
||||||
if let Some(clock) = appsrc.clock() {
|
if let Some(clock) = appsrc.clock() {
|
||||||
if let Some(time) = clock.time() {
|
if let Some(time) = clock.time() {
|
||||||
if let Some(base_time) = appsrc.base_time() {
|
if let Some(base_time) = appsrc.base_time() {
|
||||||
let runtime = time.saturating_sub(base_time);
|
let runtime = time.saturating_sub(base_time);
|
||||||
let res = Some(
|
return Some(runtime.useconds() as FrameTime);
|
||||||
(runtime.useconds() as FrameTime)
|
|
||||||
.saturating_add(self.live_offset)
|
|
||||||
.max(0),
|
|
||||||
);
|
|
||||||
// debug!("base_time: {:?}", base_time);
|
|
||||||
// debug!("time: {:?}", time);
|
|
||||||
// debug!("runtime: {:?}", runtime);
|
|
||||||
// debug!("Final runtime: {:?}", res);
|
|
||||||
trace!(
|
|
||||||
"Runtime: {:?}, Offset: {:?}, Offseted Runtime: {:?}",
|
|
||||||
runtime,
|
|
||||||
self.live_offset,
|
|
||||||
res
|
|
||||||
);
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -731,6 +719,11 @@ impl NeoMediaSender {
|
|||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn get_runtime(&self) -> Option<FrameTime> {
|
||||||
|
self.get_raw_runtime()
|
||||||
|
.map(|runtime| runtime.saturating_add(self.live_offset).max(0))
|
||||||
|
}
|
||||||
|
|
||||||
fn get_buftime(&self) -> Option<FrameTime> {
|
fn get_buftime(&self) -> Option<FrameTime> {
|
||||||
self.get_runtime().map(|time| self.runtime_to_buftime(time))
|
self.get_runtime().map(|time| self.runtime_to_buftime(time))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user