diff --git a/Cargo.lock b/Cargo.lock index 751dac4..1d3ed44 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -105,20 +105,20 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] name = "async-trait" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -243,7 +243,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -252,7 +252,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.8.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "byte-tools" @@ -362,9 +362,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c01c1c607d25c71bbaa67c113d6c6b36c434744b4fd66691d711b5b1bc0c8b" +checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552" dependencies = [ "chrono", "chrono-tz-build", @@ -388,7 +388,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -417,9 +417,9 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] name = "convert_case" @@ -441,7 +441,7 @@ dependencies = [ "sha2", "subtle", "time 0.2.27", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -528,9 +528,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" dependencies = [ "cfg-if 1.0.0", "lazy_static", @@ -542,7 +542,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -551,7 +551,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle", ] @@ -570,7 +570,7 @@ version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf" dependencies = [ - "nix 0.23.0", + "nix 0.23.1", "winapi 0.3.9", ] @@ -581,10 +581,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.33", - "quote 1.0.10", + "proc-macro2 1.0.36", + "quote 1.0.14", "rustc_version 0.4.0", - "syn 1.0.82", + "syn 1.0.85", ] [[package]] @@ -610,7 +610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2" dependencies = [ "devise_core", - "quote 1.0.10", + "quote 1.0.14", ] [[package]] @@ -620,10 +620,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0" dependencies = [ "bitflags 1.3.2", - "proc-macro2 1.0.33", + "proc-macro2 1.0.36", "proc-macro2-diagnostics", - "quote 1.0.10", - "syn 1.0.82", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -641,7 +641,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -652,7 +652,7 @@ checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" dependencies = [ "block-buffer 0.10.0", "crypto-common", - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -687,12 +687,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - [[package]] name = "either" version = "1.6.1" @@ -721,9 +715,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.29" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" +checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ "cfg-if 1.0.0", ] @@ -774,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" dependencies = [ "backtrace", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -793,9 +787,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", "synstructure", ] @@ -805,6 +799,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +[[package]] +name = "fastrand" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" +dependencies = [ + "instant", +] + [[package]] name = "figment" version = "0.10.6" @@ -813,10 +816,10 @@ checksum = "790b4292c72618abbab50f787a477014fe15634f96291de45672ce46afe122df" dependencies = [ "atomic", "pear", - "serde 1.0.130", + "serde 1.0.133", "toml", "uncased", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -911,9 +914,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" +checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" dependencies = [ "futures-channel", "futures-core", @@ -926,9 +929,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" +checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" dependencies = [ "futures-core", "futures-sink", @@ -936,9 +939,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" +checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" [[package]] name = "futures-cpupool" @@ -952,9 +955,9 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" +checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" dependencies = [ "futures-core", "futures-task", @@ -964,38 +967,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" +checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" [[package]] name = "futures-macro" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" +checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] name = "futures-sink" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" +checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" [[package]] name = "futures-task" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" +checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" [[package]] name = "futures-util" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" +checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" dependencies = [ "futures 0.1.31", "futures-channel", @@ -1040,12 +1043,12 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -1170,19 +1173,19 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.7" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" +checksum = "0c9de88456263e249e241fcd211d3954e2c9b0ef7ccfc235a444eb367cae3689" dependencies = [ "bytes 1.1.0", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.5", + "http 0.2.6", "indexmap", "slab 0.4.5", - "tokio 1.14.0", + "tokio 1.15.0", "tokio-util", "tracing", ] @@ -1239,18 +1242,18 @@ checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" dependencies = [ "bytes 0.4.12", "fnv", - "itoa", + "itoa 0.4.8", ] [[package]] name = "http" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes 1.1.0", "fnv", - "itoa", + "itoa 1.0.1", ] [[package]] @@ -1272,7 +1275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes 1.1.0", - "http 0.2.5", + "http 0.2.6", "pin-project-lite", ] @@ -1350,7 +1353,7 @@ dependencies = [ "http-body 0.1.0", "httparse", "iovec", - "itoa", + "itoa 0.4.8", "log 0.4.14", "net2", "rustc_version 0.2.3", @@ -1368,23 +1371,23 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.15" +version = "0.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" +checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" dependencies = [ "bytes 1.1.0", "futures-channel", "futures-core", "futures-util", - "h2 0.3.7", - "http 0.2.5", + "h2 0.3.10", + "http 0.2.6", "http-body 0.4.4", "httparse", "httpdate", - "itoa", + "itoa 0.4.8", "pin-project-lite", "socket2", - "tokio 1.14.0", + "tokio 1.15.0", "tower-service", "tracing", "want 0.3.0", @@ -1419,7 +1422,7 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.6", "globset", "lazy_static", "log 0.4.14", @@ -1433,20 +1436,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg 1.0.1", "hashbrown", - "serde 1.0.130", + "serde 1.0.133", ] [[package]] name = "inlinable_string" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3094308123a0e9fd59659ce45e22de9f53fc1d2ac6e1feb9fef988e4f76cad77" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" [[package]] name = "inotify" @@ -1492,6 +1495,12 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + [[package]] name = "jsonrpc-client-core" version = "0.5.0" @@ -1502,7 +1511,7 @@ dependencies = [ "futures 0.1.31", "jsonrpc-core 8.0.1", "log 0.4.14", - "serde 1.0.130", + "serde 1.0.133", "serde_json", ] @@ -1527,11 +1536,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ "derive_more", - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core 18.0.0", "jsonrpc-pubsub 18.0.0", "log 0.4.14", - "serde 1.0.130", + "serde 1.0.133", "serde_json", "url", ] @@ -1544,7 +1553,7 @@ checksum = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c" dependencies = [ "futures 0.1.31", "log 0.3.9", - "serde 1.0.130", + "serde 1.0.133", "serde_derive", "serde_json", ] @@ -1557,7 +1566,7 @@ checksum = "97b83fdc5e0218128d0d270f2f2e7a5ea716f3240c8518a58bc89e6716ba8581" dependencies = [ "futures 0.1.31", "log 0.4.14", - "serde 1.0.130", + "serde 1.0.133", "serde_derive", "serde_json", ] @@ -1568,11 +1577,11 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "futures-executor", "futures-util", "log 0.4.14", - "serde 1.0.130", + "serde 1.0.133", "serde_derive", "serde_json", ] @@ -1587,7 +1596,7 @@ dependencies = [ "futures 0.1.31", "jsonrpc-core 11.0.0", "log 0.4.14", - "serde 1.0.130", + "serde 1.0.133", "serde_json", ] @@ -1597,7 +1606,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-client-transports", ] @@ -1621,8 +1630,8 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ - "futures 0.3.18", - "hyper 0.14.15", + "futures 0.3.19", + "hyper 0.14.16", "jsonrpc-core 18.0.0", "jsonrpc-server-utils 18.0.0", "log 0.4.14", @@ -1640,7 +1649,7 @@ dependencies = [ "jsonrpc-core 11.0.0", "log 0.4.14", "parking_lot 0.7.1", - "serde 1.0.130", + "serde 1.0.133", ] [[package]] @@ -1649,13 +1658,13 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" dependencies = [ - "futures 0.3.18", + "futures 0.3.19", "jsonrpc-core 18.0.0", "lazy_static", "log 0.4.14", "parking_lot 0.11.2", "rand 0.7.3", - "serde 1.0.130", + "serde 1.0.133", ] [[package]] @@ -1682,12 +1691,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ "bytes 1.1.0", - "futures 0.3.18", + "futures 0.3.19", "globset", "jsonrpc-core 18.0.0", "lazy_static", "log 0.4.14", - "tokio 1.14.0", + "tokio 1.15.0", "tokio-stream", "tokio-util", "unicase", @@ -1703,7 +1712,7 @@ dependencies = [ "jsonrpc-core-client 11.0.0", "jsonrpc-pubsub 11.0.0", "log 0.4.14", - "serde 1.0.130", + "serde 1.0.133", "serde_json", ] @@ -1717,7 +1726,7 @@ dependencies = [ "jsonrpc-core-client 18.0.0", "jsonrpc-pubsub 18.0.0", "log 0.4.14", - "serde 1.0.130", + "serde 1.0.133", "serde_json", ] @@ -1771,9 +1780,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.109" +version = "0.2.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01" +checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" [[package]] name = "linked-hash-map" @@ -1859,7 +1868,7 @@ dependencies = [ "cfg-if 1.0.0", "generator", "scoped-tls 1.0.0", - "serde 1.0.130", + "serde 1.0.133", "serde_json", "tracing", "tracing-subscriber", @@ -1924,13 +1933,13 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mini-internal" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926fbf1cd8695183e4712d1c77cdf2c5f7916f9f73ba103dca78ff2e6755ab47" +checksum = "4cff801412f35cc16309997f9709a7933a3229df170fa9b3a9cae12e95eef0b5" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -1941,11 +1950,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniserde" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0767e42acf28c5e08fee73cb657bcb23432c3769cbdf3881a8cb69d8df5020df" +checksum = "5c57dcbb3bace5647e7254cae926a5251bd6243c9e25b70514199f39f7df118b" dependencies = [ - "itoa", + "itoa 1.0.1", "mini-internal", "ryu", ] @@ -2044,22 +2053,22 @@ checksum = "9796ba90f2e7187d7837ea05033ed6dff5320cbf2944fe2dc1da53569396ca07" [[package]] name = "multer" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "408327e2999b839cd1af003fc01b2019a6c10a1361769542203f6fedc5179680" +checksum = "5f8f35e687561d5c1667590911e6698a8cb714a134a7505718a182e7bc9d3836" dependencies = [ "bytes 1.1.0", "encoding_rs", "futures-util", - "http 0.2.5", + "http 0.2.6", "httparse", "log 0.4.14", + "memchr", "mime", "spin", - "tokio 1.14.0", + "tokio 1.15.0", "tokio-util", - "twoway", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -2155,9 +2164,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags 1.3.2", "cc", @@ -2183,7 +2192,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "memchr", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -2194,14 +2203,14 @@ checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" dependencies = [ "memchr", "minimal-lexical", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] name = "normpath" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640c20e9df4a2d4a5adad5b47e17d76dac3e824346b181931c3ec9f7a85687b1" +checksum = "04aaf5e9cb0fbf883cc0423159eacdf96a9878022084b35c462c428cab73bcaf" dependencies = [ "winapi 0.3.9", ] @@ -2263,9 +2272,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -2288,9 +2297,9 @@ checksum = "2069a3ae3dad97a4ae47754e8f47e5d2f1fd32ab7ad8a84bb31d051faa59cc3c" [[package]] name = "once_cell" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" [[package]] name = "opaque-debug" @@ -2320,18 +2329,18 @@ dependencies = [ [[package]] name = "openssl-src" -version = "300.0.2+3.0.0" +version = "111.17.0+1.1.1m" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a760a11390b1a5daf72074d4f6ff1a6e772534ae191f999f57e9ee8146d1fb" +checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.71" +version = "0.9.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73" +checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" dependencies = [ "autocfg 1.0.1", "cc", @@ -2459,7 +2468,7 @@ dependencies = [ "peach-lib", "regex", "rpassword", - "serde 1.0.130", + "serde 1.0.133", "serde_json", "snafu 0.6.10", "structopt", @@ -2499,7 +2508,7 @@ dependencies = [ "log 0.4.14", "nanorand", "regex", - "serde 1.0.130", + "serde 1.0.133", "serde_json", "serde_yaml", "sha3", @@ -2517,7 +2526,7 @@ dependencies = [ "jsonrpc-http-server 11.0.0", "log 0.4.14", "peach-lib", - "serde 1.0.130", + "serde 1.0.133", "serde_json", "ws", ] @@ -2542,7 +2551,7 @@ dependencies = [ "miniserde", "probes 0.4.1", "regex", - "serde 1.0.130", + "serde 1.0.133", "wpactrl", ] @@ -2558,7 +2567,7 @@ dependencies = [ "linux-embedded-hal", "log 0.4.14", "nix 0.11.1", - "serde 1.0.130", + "serde 1.0.133", "ssd1306", "tinybmp", ] @@ -2570,7 +2579,7 @@ dependencies = [ "log 0.4.14", "miniserde", "probes 0.4.1", - "serde 1.0.130", + "serde 1.0.133", "systemstat", ] @@ -2583,11 +2592,13 @@ dependencies = [ "nest", "openssl", "peach-lib", + "peach-network", + "peach-stats", "percent-encoding 2.1.0", "regex", "rocket", "rocket_dyn_templates", - "serde 1.0.130", + "serde 1.0.133", "serde_json", "snafu 0.6.10", "tera", @@ -2611,10 +2622,10 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0" dependencies = [ - "proc-macro2 1.0.33", + "proc-macro2 1.0.36", "proc-macro2-diagnostics", - "quote 1.0.10", - "syn 1.0.82", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -2656,9 +2667,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -2674,9 +2685,9 @@ dependencies = [ [[package]] name = "phf" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fc3db1018c4b59d7d582a739436478b6035138b6aecbce989fc91c3e98409f" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ "phf_shared", ] @@ -2713,9 +2724,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -2725,9 +2736,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a3ea4f0dd7f1f3e512cf97bf100819aa547f36a6eccac8dbaae839eb92363e" +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "polyval" @@ -2742,9 +2753,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "probes" @@ -2753,7 +2764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f77e66f6d6d898cbbd4a09c48fd3507cfc210b7c83055de02a38b5f7a1e6d216" dependencies = [ "libc", - "time 0.2.27", + "time 0.1.44", ] [[package]] @@ -2773,10 +2784,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", - "version_check 0.9.3", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", + "version_check 0.9.4", ] [[package]] @@ -2785,9 +2796,9 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "version_check 0.9.3", + "proc-macro2 1.0.36", + "quote 1.0.14", + "version_check 0.9.4", ] [[package]] @@ -2807,9 +2818,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid 0.2.2", ] @@ -2820,10 +2831,10 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", - "version_check 0.9.3", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", + "version_check 0.9.4", "yansi", ] @@ -2844,11 +2855,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.10" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" dependencies = [ - "proc-macro2 1.0.33", + "proc-macro2 1.0.36", ] [[package]] @@ -3110,9 +3121,9 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -3173,7 +3184,7 @@ dependencies = [ "bytes 1.1.0", "either", "figment", - "futures 0.3.18", + "futures 0.3.19", "indexmap", "log 0.4.14", "memchr", @@ -3185,16 +3196,16 @@ dependencies = [ "ref-cast", "rocket_codegen", "rocket_http", - "serde 1.0.130", + "serde 1.0.133", "serde_json", "state", "tempfile", "time 0.2.27", - "tokio 1.14.0", + "tokio 1.15.0", "tokio-stream", "tokio-util", "ubyte", - "version_check 0.9.3", + "version_check 0.9.4", "yansi", ] @@ -3207,10 +3218,10 @@ dependencies = [ "devise", "glob", "indexmap", - "proc-macro2 1.0.33", - "quote 1.0.10", + "proc-macro2 1.0.36", + "quote 1.0.14", "rocket_http", - "syn 1.0.82", + "syn 1.0.85", "unicode-xid 0.2.2", ] @@ -3224,7 +3235,7 @@ dependencies = [ "normpath", "notify", "rocket", - "serde 1.0.130", + "serde 1.0.133", "serde_json", "tera", ] @@ -3237,8 +3248,8 @@ checksum = "23c8b7d512d2fcac2316ebe590cde67573844b99e6cc9ee0f53375fa16e25ebd" dependencies = [ "cookie", "either", - "http 0.2.5", - "hyper 0.14.15", + "http 0.2.6", + "hyper 0.14.16", "indexmap", "log 0.4.14", "memchr", @@ -3248,12 +3259,12 @@ dependencies = [ "percent-encoding 2.1.0", "pin-project-lite", "ref-cast", - "serde 1.0.130", + "serde 1.0.133", "smallvec 1.7.0", "stable-pattern", "state", "time 0.2.27", - "tokio 1.14.0", + "tokio 1.15.0", "uncased", ] @@ -3308,9 +3319,9 @@ checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" [[package]] name = "ryu" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" [[package]] name = "safemem" @@ -3386,9 +3397,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" dependencies = [ "serde_derive", ] @@ -3408,25 +3419,25 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] name = "serde_json" -version = "1.0.72" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" +checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "indexmap", - "itoa", + "itoa 1.0.1", "ryu", - "serde 1.0.130", + "serde 1.0.133", ] [[package]] @@ -3440,13 +3451,13 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.21" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af" +checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" dependencies = [ - "dtoa", "indexmap", - "serde 1.0.130", + "ryu", + "serde 1.0.133", "yaml-rust", ] @@ -3470,9 +3481,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -3616,9 +3627,9 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -3679,7 +3690,7 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" dependencies = [ - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -3711,11 +3722,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "serde 1.0.130", + "proc-macro2 1.0.36", + "quote 1.0.14", + "serde 1.0.133", "serde_derive", - "syn 1.0.82", + "syn 1.0.85", ] [[package]] @@ -3725,13 +3736,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" dependencies = [ "base-x", - "proc-macro2 1.0.33", - "quote 1.0.10", - "serde 1.0.130", + "proc-macro2 1.0.36", + "quote 1.0.14", + "serde 1.0.133", "serde_derive", "serde_json", "sha1", - "syn 1.0.82", + "syn 1.0.85", ] [[package]] @@ -3774,9 +3785,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -3798,12 +3809,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", + "proc-macro2 1.0.36", + "quote 1.0.14", "unicode-xid 0.2.2", ] @@ -3813,9 +3824,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", "unicode-xid 0.2.2", ] @@ -3860,13 +3871,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if 1.0.0", + "fastrand", "libc", - "rand 0.8.4", "redox_syscall 0.2.10", "remove_dir_all", "winapi 0.3.9", @@ -3888,7 +3899,7 @@ dependencies = [ "pest_derive", "rand 0.8.4", "regex", - "serde 1.0.130", + "serde 1.0.133", "serde_json", "slug", "unic-segment", @@ -3943,7 +3954,7 @@ dependencies = [ "standback", "stdweb", "time-macros", - "version_check 0.9.3", + "version_check 0.9.4", "winapi 0.3.9", ] @@ -3964,10 +3975,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.33", - "quote 1.0.10", + "proc-macro2 1.0.36", + "quote 1.0.14", "standback", - "syn 1.0.82", + "syn 1.0.85", ] [[package]] @@ -4029,11 +4040,10 @@ dependencies = [ [[package]] name = "tokio" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144" +checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" dependencies = [ - "autocfg 1.0.1", "bytes 1.1.0", "libc", "memchr", @@ -4131,13 +4141,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -4194,7 +4204,7 @@ checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", "pin-project-lite", - "tokio 1.14.0", + "tokio 1.15.0", ] [[package]] @@ -4294,7 +4304,7 @@ dependencies = [ "futures-sink", "log 0.4.14", "pin-project-lite", - "tokio 1.14.0", + "tokio 1.15.0", ] [[package]] @@ -4304,7 +4314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "indexmap", - "serde 1.0.130", + "serde 1.0.133", ] [[package]] @@ -4331,9 +4341,9 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -4358,9 +4368,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3" +checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594" dependencies = [ "ansi_term", "lazy_static", @@ -4386,21 +4396,11 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -[[package]] -name = "twoway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47" -dependencies = [ - "memchr", - "unchecked-index", -] - [[package]] name = "typenum" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ubyte" @@ -4408,7 +4408,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42756bb9e708855de2f8a98195643dff31a97f0485d90d8467b39dc24be9e8fe" dependencies = [ - "serde 1.0.130", + "serde 1.0.133", ] [[package]] @@ -4423,16 +4423,10 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0" dependencies = [ - "serde 1.0.130", - "version_check 0.9.3", + "serde 1.0.133", + "version_check 0.9.4", ] -[[package]] -name = "unchecked-index" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" - [[package]] name = "unic-char-property" version = "0.9.0" @@ -4489,7 +4483,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -4537,7 +4531,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle", ] @@ -4572,9 +4566,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "void" @@ -4656,9 +4650,9 @@ dependencies = [ "bumpalo", "lazy_static", "log 0.4.14", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", "wasm-bindgen-shared", ] @@ -4668,7 +4662,7 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ - "quote 1.0.10", + "quote 1.0.14", "wasm-bindgen-macro-support", ] @@ -4678,9 +4672,9 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/peach-web/Cargo.toml b/peach-web/Cargo.toml index 860508d..1c729cc 100644 --- a/peach-web/Cargo.toml +++ b/peach-web/Cargo.toml @@ -41,6 +41,8 @@ log = "0.4" nest = "1.0.0" openssl = { version = "0.10", features = ["vendored"] } peach-lib = { path = "../peach-lib" } +peach-network = { path = "../peach-network", features = ["serde_support"] } +peach-stats = { path = "../peach-stats", features = ["serde_support"] } percent-encoding = "2.1.0" regex = "1" rocket = { version = "0.5.0-rc.1", features = ["json", "secrets"] } diff --git a/peach-web/src/routes/status/device.rs b/peach-web/src/routes/status/device.rs index 49f71cb..35870cb 100644 --- a/peach-web/src/routes/status/device.rs +++ b/peach-web/src/routes/status/device.rs @@ -3,8 +3,8 @@ use rocket::{ get, post, request::FlashMessage, response::{Flash, Redirect}, + serde::json::Value, }; - use rocket_dyn_templates::Template; use serde::Serialize; use std::{ @@ -12,13 +12,16 @@ use std::{ process::{Command, Output}, }; -use peach_lib::config_manager::load_peach_config; -use peach_lib::stats_client::{CpuStatPercentages, DiskUsage, LoadAverage, MemStat}; -use peach_lib::{dyndns_client, network_client, oled_client, sbot_client, stats_client}; +use peach_lib::{ + config_manager::load_peach_config, dyndns_client, network_client, oled_client, sbot_client, +}; +use peach_stats::{ + stats, + stats::{CpuStatPercentages, DiskUsage, LoadAverage, MemStat}, +}; use crate::routes::authentication::Authenticated; use crate::utils::build_json_response; -use rocket::serde::json::Value; // HELPERS AND ROUTES FOR /status @@ -34,7 +37,6 @@ pub struct StatusContext { pub mem_stats: Option, pub network_ping: String, pub oled_ping: String, - pub stats_ping: String, pub dyndns_enabled: bool, pub dyndns_is_online: bool, pub config_is_valid: bool, @@ -46,9 +48,12 @@ pub struct StatusContext { impl StatusContext { pub fn build() -> StatusContext { // convert result to Option, discard any error - let cpu_stat_percent = stats_client::cpu_stats_percent().ok(); - let load_average = stats_client::load_average().ok(); - let mem_stats = stats_client::mem_stats().ok(); + let cpu_stat_percent = stats::cpu_stats_percent().ok(); + let load_average = stats::load_average().ok(); + let mem_stats = stats::mem_stats().ok(); + // TODO: add `wpa_supplicant_status` to peach_network to replace this ping call + // instead of: "is the network json-rpc server running?", we want to ask: + // "is the wpa_supplicant systemd service functioning correctly?" let network_ping = match network_client::ping() { Ok(_) => "ONLINE".to_string(), Err(_) => "OFFLINE".to_string(), @@ -57,22 +62,21 @@ impl StatusContext { Ok(_) => "ONLINE".to_string(), Err(_) => "OFFLINE".to_string(), }; - let stats_ping = match stats_client::ping() { - Ok(_) => "ONLINE".to_string(), - Err(_) => "OFFLINE".to_string(), - }; - let uptime = match stats_client::uptime() { - Ok(mins) => mins, + + let uptime = match stats::uptime() { + Ok(secs) => { + let uptime_mins = secs / 60; + uptime_mins.to_string() + } Err(_) => "Unavailable".to_string(), }; + // parse the uptime string to a signed integer (for math) + let uptime_parsed = uptime.parse::().ok(); + // serialize disk usage data into Vec - let disk_usage_stats = match stats_client::disk_usage() { - Ok(disks) => { - let partitions: Vec = serde_json::from_str(disks.as_str()) - .expect("Failed to deserialize disk_usage response"); - partitions - } + let disk_usage_stats = match stats::disk_usage() { + Ok(disks) => disks, Err(_) => Vec::new(), }; @@ -84,9 +88,6 @@ impl StatusContext { } } - // parse the uptime string to a signed integer (for math) - let uptime_parsed = uptime.parse::().ok(); - // dyndns_is_online & config_is_valid let dyndns_enabled: bool; let dyndns_is_online: bool; @@ -139,7 +140,6 @@ impl StatusContext { mem_stats, network_ping, oled_ping, - stats_ping, dyndns_enabled, dyndns_is_online, config_is_valid, diff --git a/peach-web/src/routes/status/network.rs b/peach-web/src/routes/status/network.rs index ff6c6af..aefa766 100644 --- a/peach-web/src/routes/status/network.rs +++ b/peach-web/src/routes/status/network.rs @@ -2,25 +2,77 @@ use rocket::{get, request::FlashMessage}; use rocket_dyn_templates::Template; use serde::Serialize; -use peach_lib::network_client; -use peach_lib::stats_client::Traffic; +use peach_network::{ + network, + network::{Status, Traffic}, +}; use crate::routes::authentication::Authenticated; // HELPERS AND ROUTES FOR /status/network +#[derive(Debug, Serialize)] +pub struct IfaceTraffic { + pub rx: u64, + pub rx_unit: Option, + pub tx: u64, + pub tx_unit: Option, +} + +impl IfaceTraffic { + fn default() -> Self { + IfaceTraffic { + rx: 0, + rx_unit: None, + tx: 0, + tx_unit: None, + } + } +} + +fn convert_traffic(traffic: Traffic) -> Option { + let mut t = IfaceTraffic::default(); + // modify traffic values & assign measurement units + // based on received and transmitted values. + // if received > 999 MB, convert it to GB + if traffic.received > 1_047_527_424 { + t.rx = traffic.received / 1_073_741_824; + t.rx_unit = Some("GB".to_string()); + } else if traffic.received > 0 { + // otherwise, convert it to MB + t.rx = (traffic.received / 1024) / 1024; + t.rx_unit = Some("MB".to_string()); + } else { + t.rx = 0; + t.rx_unit = Some("MB".to_string()); + } + + if traffic.transmitted > 1_047_527_424 { + t.tx = traffic.transmitted / 1_073_741_824; + t.tx_unit = Some("GB".to_string()); + } else if traffic.transmitted > 0 { + t.tx = (traffic.transmitted / 1024) / 1024; + t.tx_unit = Some("MB".to_string()); + } else { + t.tx = 0; + t.tx_unit = Some("MB".to_string()); + } + + Some(t) +} + #[derive(Debug, Serialize)] pub struct NetworkContext { pub ap_ip: String, pub ap_ssid: String, pub ap_state: String, - pub ap_traffic: Option, + pub ap_traffic: Option, pub wlan_ip: String, pub wlan_rssi: Option, pub wlan_ssid: String, pub wlan_state: String, - pub wlan_status: String, - pub wlan_traffic: Option, + pub wlan_status: Option, + pub wlan_traffic: Option, pub flash_name: Option, pub flash_msg: Option, // page title for header in navbar @@ -31,101 +83,47 @@ pub struct NetworkContext { impl NetworkContext { pub fn build() -> NetworkContext { - let ap_ip = match network_client::ip("ap0") { - Ok(ip) => ip, - Err(_) => "x.x.x.x".to_string(), + let ap_ip = match network::ip("ap0") { + Ok(Some(ip)) => ip, + _ => "x.x.x.x".to_string(), }; - let ap_ssid = match network_client::ssid("ap0") { - Ok(ssid) => ssid, - Err(_) => "Not currently activated".to_string(), + let ap_ssid = match network::ssid("ap0") { + Ok(Some(ssid)) => ssid, + _ => "Not currently activated".to_string(), }; - let ap_state = match network_client::state("ap0") { - Ok(state) => state, - Err(_) => "Interface unavailable".to_string(), + let ap_state = match network::state("ap0") { + Ok(Some(state)) => state, + _ => "Interface unavailable".to_string(), }; - let ap_traffic = match network_client::traffic("ap0") { - Ok(traffic) => { - let mut t = traffic; - // modify traffic values & assign measurement unit - // based on received and transmitted values - // if received > 999 MB, convert it to GB - if t.received > 1_047_527_424 { - t.received /= 1_073_741_824; - t.rx_unit = Some("GB".to_string()); - } else if t.received > 0 { - // otherwise, convert it to MB - t.received = (t.received / 1024) / 1024; - t.rx_unit = Some("MB".to_string()); - } else { - t.received = 0; - t.rx_unit = Some("MB".to_string()); - } - - if t.transmitted > 1_047_527_424 { - t.transmitted /= 1_073_741_824; - t.tx_unit = Some("GB".to_string()); - } else if t.transmitted > 0 { - t.transmitted = (t.transmitted / 1024) / 1024; - t.tx_unit = Some("MB".to_string()); - } else { - t.transmitted = 0; - t.tx_unit = Some("MB".to_string()); - } - Some(t) - } - Err(_) => None, + let ap_traffic = match network::traffic("ap0") { + // convert bytes to mb or gb and add appropriate units + Ok(Some(traffic)) => convert_traffic(traffic), + _ => None, }; - let wlan_ip = match network_client::ip("wlan0") { - Ok(ip) => ip, - Err(_) => "x.x.x.x".to_string(), + let wlan_ip = match network::ip("wlan0") { + Ok(Some(ip)) => ip, + _ => "x.x.x.x".to_string(), }; - let wlan_rssi = match network_client::rssi_percent("wlan0") { - Ok(rssi) => Some(rssi), - Err(_) => None, + let wlan_rssi = match network::rssi_percent("wlan0") { + Ok(rssi) => rssi, + _ => None, }; - let wlan_ssid = match network_client::ssid("wlan0") { - Ok(ssid) => ssid, - Err(_) => "Not connected".to_string(), + let wlan_ssid = match network::ssid("wlan0") { + Ok(Some(ssid)) => ssid, + _ => "Not connected".to_string(), }; - let wlan_state = match network_client::state("wlan0") { - Ok(state) => state, - Err(_) => "Interface unavailable".to_string(), + let wlan_state = match network::state("wlan0") { + Ok(Some(state)) => state, + _ => "Interface unavailable".to_string(), }; - let wlan_status = match network_client::status("wlan0") { + let wlan_status = match network::status("wlan0") { Ok(status) => status, - Err(_) => "Interface unavailable".to_string(), + _ => None, }; - let wlan_traffic = match network_client::traffic("wlan0") { - Ok(traffic) => { - let mut t = traffic; - // modify traffic values & assign measurement unit - // based on received and transmitted values - // if received > 999 MB, convert it to GB - if t.received > 1_047_527_424 { - t.received /= 1_073_741_824; - t.rx_unit = Some("GB".to_string()); - } else if t.received > 0 { - // otherwise, convert it to MB - t.received = (t.received / 1024) / 1024; - t.rx_unit = Some("MB".to_string()); - } else { - t.received = 0; - t.rx_unit = Some("MB".to_string()); - } - - if t.transmitted > 1_047_527_424 { - t.transmitted /= 1_073_741_824; - t.tx_unit = Some("GB".to_string()); - } else if t.transmitted > 0 { - t.transmitted = (t.transmitted / 1024) / 1024; - t.tx_unit = Some("MB".to_string()); - } else { - t.transmitted = 0; - t.tx_unit = Some("MB".to_string()); - } - Some(t) - } - Err(_) => None, + let wlan_traffic = match network::traffic("wlan0") { + // convert bytes to mb or gb and add appropriate units + Ok(Some(traffic)) => convert_traffic(traffic), + _ => None, }; NetworkContext { diff --git a/peach-web/templates/status/device.html.tera b/peach-web/templates/status/device.html.tera index 42b225c..f48bb58 100644 --- a/peach-web/templates/status/device.html.tera +++ b/peach-web/templates/status/device.html.tera @@ -42,11 +42,11 @@ -
- Stats +
+ Stats
- +
{# Display status for dynsdns, config & sbot #}