aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFxQnLr <[email protected]>2023-11-29 15:48:26 +0100
committerFxQnLr <[email protected]>2023-11-29 15:48:26 +0100
commit6f94a825485b1d622d8ebe88ddf3e2f426d1c69c (patch)
treebabf4a5c1dcb7746185a1c97e0d889df07df20e8
parentda6367885d31698464e1bec122e3e673974427c6 (diff)
downloadwebol-6f94a825485b1d622d8ebe88ddf3e2f426d1c69c.tar
webol-6f94a825485b1d622d8ebe88ddf3e2f426d1c69c.tar.gz
webol-6f94a825485b1d622d8ebe88ddf3e2f426d1c69c.zip
update to axum 0.7 and cargo update
-rw-r--r--Cargo.lock537
-rw-r--r--Cargo.toml31
-rw-r--r--src/auth.rs3
-rw-r--r--src/main.rs17
-rw-r--r--src/routes/device.rs2
-rw-r--r--src/routes/start.rs4
-rw-r--r--src/services/ping.rs66
-rw-r--r--src/wol.rs2
8 files changed, 421 insertions, 241 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 8f62060..8fcbfe8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -64,7 +64,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
64dependencies = [ 64dependencies = [
65 "proc-macro2", 65 "proc-macro2",
66 "quote", 66 "quote",
67 "syn 2.0.38", 67 "syn 2.0.39",
68] 68]
69 69
70[[package]] 70[[package]]
@@ -77,6 +77,16 @@ dependencies = [
77] 77]
78 78
79[[package]] 79[[package]]
80name = "atomic-write-file"
81version = "0.1.1"
82source = "registry+https://github.com/rust-lang/crates.io-index"
83checksum = "9ae364a6c1301604bbc6dfbf8c385c47ff82301dd01eef506195a029196d8d04"
84dependencies = [
85 "nix",
86 "rand",
87]
88
89[[package]]
80name = "autocfg" 90name = "autocfg"
81version = "1.1.0" 91version = "1.1.0"
82source = "registry+https://github.com/rust-lang/crates.io-index" 92source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -84,20 +94,20 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
84 94
85[[package]] 95[[package]]
86name = "axum" 96name = "axum"
87version = "0.6.20" 97version = "0.7.1"
88source = "registry+https://github.com/rust-lang/crates.io-index" 98source = "registry+https://github.com/rust-lang/crates.io-index"
89checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" 99checksum = "810a80b128d70e6ed2bdf3fe8ed72c0ae56f5f5948d01c2753282dd92a84fce8"
90dependencies = [ 100dependencies = [
91 "async-trait", 101 "async-trait",
92 "axum-core", 102 "axum-core",
93 "base64 0.21.5", 103 "base64 0.21.5",
94 "bitflags 1.3.2",
95 "bytes", 104 "bytes",
96 "futures-util", 105 "futures-util",
97 "headers", 106 "http 1.0.0",
98 "http",
99 "http-body", 107 "http-body",
108 "http-body-util",
100 "hyper", 109 "hyper",
110 "hyper-util",
101 "itoa", 111 "itoa",
102 "matchit", 112 "matchit",
103 "memchr", 113 "memchr",
@@ -120,31 +130,34 @@ dependencies = [
120 130
121[[package]] 131[[package]]
122name = "axum-core" 132name = "axum-core"
123version = "0.3.4" 133version = "0.4.0"
124source = "registry+https://github.com/rust-lang/crates.io-index" 134source = "registry+https://github.com/rust-lang/crates.io-index"
125checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" 135checksum = "de0ddc355eab88f4955090a823715df47acf0b7660aab7a69ad5ce6301ee3b73"
126dependencies = [ 136dependencies = [
127 "async-trait", 137 "async-trait",
128 "bytes", 138 "bytes",
129 "futures-util", 139 "futures-util",
130 "http", 140 "http 1.0.0",
131 "http-body", 141 "http-body",
142 "http-body-util",
132 "mime", 143 "mime",
144 "pin-project-lite",
133 "rustversion", 145 "rustversion",
146 "sync_wrapper",
134 "tower-layer", 147 "tower-layer",
135 "tower-service", 148 "tower-service",
136] 149]
137 150
138[[package]] 151[[package]]
139name = "axum-macros" 152name = "axum-macros"
140version = "0.3.8" 153version = "0.4.0"
141source = "registry+https://github.com/rust-lang/crates.io-index" 154source = "registry+https://github.com/rust-lang/crates.io-index"
142checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" 155checksum = "5a2edad600410b905404c594e2523549f1bcd4bded1e252c8f74524ccce0b867"
143dependencies = [ 156dependencies = [
144 "heck", 157 "heck",
145 "proc-macro2", 158 "proc-macro2",
146 "quote", 159 "quote",
147 "syn 2.0.38", 160 "syn 2.0.39",
148] 161]
149 162
150[[package]] 163[[package]]
@@ -232,10 +245,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
232checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" 245checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
233 246
234[[package]] 247[[package]]
248name = "color-eyre"
249version = "0.6.2"
250source = "registry+https://github.com/rust-lang/crates.io-index"
251checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
252dependencies = [
253 "backtrace",
254 "color-spantrace",
255 "eyre",
256 "indenter",
257 "once_cell",
258 "owo-colors",
259 "tracing-error",
260]
261
262[[package]]
263name = "color-spantrace"
264version = "0.2.1"
265source = "registry+https://github.com/rust-lang/crates.io-index"
266checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
267dependencies = [
268 "once_cell",
269 "owo-colors",
270 "tracing-core",
271 "tracing-error",
272]
273
274[[package]]
235name = "config" 275name = "config"
236version = "0.13.3" 276version = "0.13.4"
237source = "registry+https://github.com/rust-lang/crates.io-index" 277source = "registry+https://github.com/rust-lang/crates.io-index"
238checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" 278checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca"
239dependencies = [ 279dependencies = [
240 "async-trait", 280 "async-trait",
241 "json5", 281 "json5",
@@ -276,9 +316,9 @@ dependencies = [
276 316
277[[package]] 317[[package]]
278name = "crc-catalog" 318name = "crc-catalog"
279version = "2.3.0" 319version = "2.4.0"
280source = "registry+https://github.com/rust-lang/crates.io-index" 320source = "registry+https://github.com/rust-lang/crates.io-index"
281checksum = "4939f9ed1444bd8c896d37f3090012fa6e7834fe84ef8c9daa166109515732f9" 321checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
282 322
283[[package]] 323[[package]]
284name = "crossbeam-queue" 324name = "crossbeam-queue"
@@ -316,7 +356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
316checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" 356checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
317dependencies = [ 357dependencies = [
318 "cfg-if", 358 "cfg-if",
319 "hashbrown 0.14.2", 359 "hashbrown 0.14.3",
320 "lock_api", 360 "lock_api",
321 "once_cell", 361 "once_cell",
322 "parking_lot_core", 362 "parking_lot_core",
@@ -324,9 +364,9 @@ dependencies = [
324 364
325[[package]] 365[[package]]
326name = "data-encoding" 366name = "data-encoding"
327version = "2.4.0" 367version = "2.5.0"
328source = "registry+https://github.com/rust-lang/crates.io-index" 368source = "registry+https://github.com/rust-lang/crates.io-index"
329checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" 369checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
330 370
331[[package]] 371[[package]]
332name = "der" 372name = "der"
@@ -389,12 +429,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
389 429
390[[package]] 430[[package]]
391name = "errno" 431name = "errno"
392version = "0.3.5" 432version = "0.3.8"
393source = "registry+https://github.com/rust-lang/crates.io-index" 433source = "registry+https://github.com/rust-lang/crates.io-index"
394checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 434checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
395dependencies = [ 435dependencies = [
396 "libc", 436 "libc",
397 "windows-sys", 437 "windows-sys 0.52.0",
398] 438]
399 439
400[[package]] 440[[package]]
@@ -405,7 +445,7 @@ checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
405dependencies = [ 445dependencies = [
406 "cfg-if", 446 "cfg-if",
407 "home", 447 "home",
408 "windows-sys", 448 "windows-sys 0.48.0",
409] 449]
410 450
411[[package]] 451[[package]]
@@ -415,6 +455,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
415checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" 455checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
416 456
417[[package]] 457[[package]]
458name = "eyre"
459version = "0.6.9"
460source = "registry+https://github.com/rust-lang/crates.io-index"
461checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd"
462dependencies = [
463 "indenter",
464 "once_cell",
465]
466
467[[package]]
418name = "fastrand" 468name = "fastrand"
419version = "2.0.1" 469version = "2.0.1"
420source = "registry+https://github.com/rust-lang/crates.io-index" 470source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -445,9 +495,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
445 495
446[[package]] 496[[package]]
447name = "form_urlencoded" 497name = "form_urlencoded"
448version = "1.2.0" 498version = "1.2.1"
449source = "registry+https://github.com/rust-lang/crates.io-index" 499source = "registry+https://github.com/rust-lang/crates.io-index"
450checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" 500checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
451dependencies = [ 501dependencies = [
452 "percent-encoding", 502 "percent-encoding",
453] 503]
@@ -536,9 +586,9 @@ dependencies = [
536 586
537[[package]] 587[[package]]
538name = "getrandom" 588name = "getrandom"
539version = "0.2.10" 589version = "0.2.11"
540source = "registry+https://github.com/rust-lang/crates.io-index" 590source = "registry+https://github.com/rust-lang/crates.io-index"
541checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" 591checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
542dependencies = [ 592dependencies = [
543 "cfg-if", 593 "cfg-if",
544 "libc", 594 "libc",
@@ -547,9 +597,9 @@ dependencies = [
547 597
548[[package]] 598[[package]]
549name = "gimli" 599name = "gimli"
550version = "0.28.0" 600version = "0.28.1"
551source = "registry+https://github.com/rust-lang/crates.io-index" 601source = "registry+https://github.com/rust-lang/crates.io-index"
552checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" 602checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
553 603
554[[package]] 604[[package]]
555name = "glob" 605name = "glob"
@@ -558,6 +608,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
558checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" 608checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
559 609
560[[package]] 610[[package]]
611name = "h2"
612version = "0.4.0"
613source = "registry+https://github.com/rust-lang/crates.io-index"
614checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a"
615dependencies = [
616 "bytes",
617 "fnv",
618 "futures-core",
619 "futures-sink",
620 "futures-util",
621 "http 1.0.0",
622 "indexmap",
623 "slab",
624 "tokio",
625 "tokio-util",
626 "tracing",
627]
628
629[[package]]
561name = "hashbrown" 630name = "hashbrown"
562version = "0.12.3" 631version = "0.12.3"
563source = "registry+https://github.com/rust-lang/crates.io-index" 632source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -568,9 +637,9 @@ dependencies = [
568 637
569[[package]] 638[[package]]
570name = "hashbrown" 639name = "hashbrown"
571version = "0.14.2" 640version = "0.14.3"
572source = "registry+https://github.com/rust-lang/crates.io-index" 641source = "registry+https://github.com/rust-lang/crates.io-index"
573checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" 642checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
574dependencies = [ 643dependencies = [
575 "ahash 0.8.6", 644 "ahash 0.8.6",
576 "allocator-api2", 645 "allocator-api2",
@@ -582,31 +651,7 @@ version = "0.8.4"
582source = "registry+https://github.com/rust-lang/crates.io-index" 651source = "registry+https://github.com/rust-lang/crates.io-index"
583checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" 652checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
584dependencies = [ 653dependencies = [
585 "hashbrown 0.14.2", 654 "hashbrown 0.14.3",
586]
587
588[[package]]
589name = "headers"
590version = "0.3.9"
591source = "registry+https://github.com/rust-lang/crates.io-index"
592checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
593dependencies = [
594 "base64 0.21.5",
595 "bytes",
596 "headers-core",
597 "http",
598 "httpdate",
599 "mime",
600 "sha1",
601]
602
603[[package]]
604name = "headers-core"
605version = "0.2.0"
606source = "registry+https://github.com/rust-lang/crates.io-index"
607checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
608dependencies = [
609 "http",
610] 655]
611 656
612[[package]] 657[[package]]
@@ -654,14 +699,25 @@ version = "0.5.5"
654source = "registry+https://github.com/rust-lang/crates.io-index" 699source = "registry+https://github.com/rust-lang/crates.io-index"
655checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" 700checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
656dependencies = [ 701dependencies = [
657 "windows-sys", 702 "windows-sys 0.48.0",
703]
704
705[[package]]
706name = "http"
707version = "0.2.11"
708source = "registry+https://github.com/rust-lang/crates.io-index"
709checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
710dependencies = [
711 "bytes",
712 "fnv",
713 "itoa",
658] 714]
659 715
660[[package]] 716[[package]]
661name = "http" 717name = "http"
662version = "0.2.9" 718version = "1.0.0"
663source = "registry+https://github.com/rust-lang/crates.io-index" 719source = "registry+https://github.com/rust-lang/crates.io-index"
664checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" 720checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
665dependencies = [ 721dependencies = [
666 "bytes", 722 "bytes",
667 "fnv", 723 "fnv",
@@ -670,12 +726,24 @@ dependencies = [
670 726
671[[package]] 727[[package]]
672name = "http-body" 728name = "http-body"
673version = "0.4.5" 729version = "1.0.0"
730source = "registry+https://github.com/rust-lang/crates.io-index"
731checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
732dependencies = [
733 "bytes",
734 "http 1.0.0",
735]
736
737[[package]]
738name = "http-body-util"
739version = "0.1.0"
674source = "registry+https://github.com/rust-lang/crates.io-index" 740source = "registry+https://github.com/rust-lang/crates.io-index"
675checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" 741checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
676dependencies = [ 742dependencies = [
677 "bytes", 743 "bytes",
678 "http", 744 "futures-util",
745 "http 1.0.0",
746 "http-body",
679 "pin-project-lite", 747 "pin-project-lite",
680] 748]
681 749
@@ -693,45 +761,67 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
693 761
694[[package]] 762[[package]]
695name = "hyper" 763name = "hyper"
696version = "0.14.27" 764version = "1.0.1"
697source = "registry+https://github.com/rust-lang/crates.io-index" 765source = "registry+https://github.com/rust-lang/crates.io-index"
698checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" 766checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56"
699dependencies = [ 767dependencies = [
700 "bytes", 768 "bytes",
701 "futures-channel", 769 "futures-channel",
702 "futures-core",
703 "futures-util", 770 "futures-util",
704 "http", 771 "h2",
772 "http 1.0.0",
705 "http-body", 773 "http-body",
706 "httparse", 774 "httparse",
707 "httpdate", 775 "httpdate",
708 "itoa", 776 "itoa",
709 "pin-project-lite", 777 "pin-project-lite",
710 "socket2 0.4.10",
711 "tokio", 778 "tokio",
779]
780
781[[package]]
782name = "hyper-util"
783version = "0.1.1"
784source = "registry+https://github.com/rust-lang/crates.io-index"
785checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d"
786dependencies = [
787 "bytes",
788 "futures-channel",
789 "futures-util",
790 "http 1.0.0",
791 "http-body",
792 "hyper",
793 "pin-project-lite",
794 "socket2",
795 "tokio",
796 "tower",
712 "tower-service", 797 "tower-service",
713 "tracing", 798 "tracing",
714 "want",
715] 799]
716 800
717[[package]] 801[[package]]
718name = "idna" 802name = "idna"
719version = "0.4.0" 803version = "0.5.0"
720source = "registry+https://github.com/rust-lang/crates.io-index" 804source = "registry+https://github.com/rust-lang/crates.io-index"
721checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" 805checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
722dependencies = [ 806dependencies = [
723 "unicode-bidi", 807 "unicode-bidi",
724 "unicode-normalization", 808 "unicode-normalization",
725] 809]
726 810
727[[package]] 811[[package]]
812name = "indenter"
813version = "0.3.3"
814source = "registry+https://github.com/rust-lang/crates.io-index"
815checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
816
817[[package]]
728name = "indexmap" 818name = "indexmap"
729version = "2.1.0" 819version = "2.1.0"
730source = "registry+https://github.com/rust-lang/crates.io-index" 820source = "registry+https://github.com/rust-lang/crates.io-index"
731checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" 821checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
732dependencies = [ 822dependencies = [
733 "equivalent", 823 "equivalent",
734 "hashbrown 0.14.2", 824 "hashbrown 0.14.3",
735] 825]
736 826
737[[package]] 827[[package]]
@@ -771,9 +861,9 @@ dependencies = [
771 861
772[[package]] 862[[package]]
773name = "libc" 863name = "libc"
774version = "0.2.149" 864version = "0.2.150"
775source = "registry+https://github.com/rust-lang/crates.io-index" 865source = "registry+https://github.com/rust-lang/crates.io-index"
776checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" 866checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
777 867
778[[package]] 868[[package]]
779name = "libm" 869name = "libm"
@@ -783,9 +873,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
783 873
784[[package]] 874[[package]]
785name = "libsqlite3-sys" 875name = "libsqlite3-sys"
786version = "0.26.0" 876version = "0.27.0"
787source = "registry+https://github.com/rust-lang/crates.io-index" 877source = "registry+https://github.com/rust-lang/crates.io-index"
788checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" 878checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
789dependencies = [ 879dependencies = [
790 "cc", 880 "cc",
791 "pkg-config", 881 "pkg-config",
@@ -800,9 +890,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
800 890
801[[package]] 891[[package]]
802name = "linux-raw-sys" 892name = "linux-raw-sys"
803version = "0.4.10" 893version = "0.4.11"
804source = "registry+https://github.com/rust-lang/crates.io-index" 894source = "registry+https://github.com/rust-lang/crates.io-index"
805checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" 895checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
806 896
807[[package]] 897[[package]]
808name = "lock_api" 898name = "lock_api"
@@ -880,7 +970,18 @@ checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
880dependencies = [ 970dependencies = [
881 "libc", 971 "libc",
882 "wasi", 972 "wasi",
883 "windows-sys", 973 "windows-sys 0.48.0",
974]
975
976[[package]]
977name = "nix"
978version = "0.27.1"
979source = "registry+https://github.com/rust-lang/crates.io-index"
980checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
981dependencies = [
982 "bitflags 2.4.1",
983 "cfg-if",
984 "libc",
884] 985]
885 986
886[[package]] 987[[package]]
@@ -1008,6 +1109,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1008checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" 1109checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
1009 1110
1010[[package]] 1111[[package]]
1112name = "owo-colors"
1113version = "3.5.0"
1114source = "registry+https://github.com/rust-lang/crates.io-index"
1115checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
1116
1117[[package]]
1011name = "parking_lot" 1118name = "parking_lot"
1012version = "0.12.1" 1119version = "0.12.1"
1013source = "registry+https://github.com/rust-lang/crates.io-index" 1120source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1027,7 +1134,7 @@ dependencies = [
1027 "libc", 1134 "libc",
1028 "redox_syscall", 1135 "redox_syscall",
1029 "smallvec", 1136 "smallvec",
1030 "windows-targets", 1137 "windows-targets 0.48.5",
1031] 1138]
1032 1139
1033[[package]] 1140[[package]]
@@ -1053,9 +1160,9 @@ dependencies = [
1053 1160
1054[[package]] 1161[[package]]
1055name = "percent-encoding" 1162name = "percent-encoding"
1056version = "2.3.0" 1163version = "2.3.1"
1057source = "registry+https://github.com/rust-lang/crates.io-index" 1164source = "registry+https://github.com/rust-lang/crates.io-index"
1058checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" 1165checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
1059 1166
1060[[package]] 1167[[package]]
1061name = "pest" 1168name = "pest"
@@ -1088,7 +1195,7 @@ dependencies = [
1088 "pest_meta", 1195 "pest_meta",
1089 "proc-macro2", 1196 "proc-macro2",
1090 "quote", 1197 "quote",
1091 "syn 2.0.38", 1198 "syn 2.0.39",
1092] 1199]
1093 1200
1094[[package]] 1201[[package]]
@@ -1119,7 +1226,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
1119dependencies = [ 1226dependencies = [
1120 "proc-macro2", 1227 "proc-macro2",
1121 "quote", 1228 "quote",
1122 "syn 2.0.38", 1229 "syn 2.0.39",
1123] 1230]
1124 1231
1125[[package]] 1232[[package]]
@@ -1217,9 +1324,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
1217 1324
1218[[package]] 1325[[package]]
1219name = "proc-macro2" 1326name = "proc-macro2"
1220version = "1.0.69" 1327version = "1.0.70"
1221source = "registry+https://github.com/rust-lang/crates.io-index" 1328source = "registry+https://github.com/rust-lang/crates.io-index"
1222checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" 1329checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
1223dependencies = [ 1330dependencies = [
1224 "unicode-ident", 1331 "unicode-ident",
1225] 1332]
@@ -1329,9 +1436,9 @@ dependencies = [
1329 1436
1330[[package]] 1437[[package]]
1331name = "rsa" 1438name = "rsa"
1332version = "0.9.3" 1439version = "0.9.5"
1333source = "registry+https://github.com/rust-lang/crates.io-index" 1440source = "registry+https://github.com/rust-lang/crates.io-index"
1334checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" 1441checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474"
1335dependencies = [ 1442dependencies = [
1336 "const-oid", 1443 "const-oid",
1337 "digest", 1444 "digest",
@@ -1365,15 +1472,15 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
1365 1472
1366[[package]] 1473[[package]]
1367name = "rustix" 1474name = "rustix"
1368version = "0.38.21" 1475version = "0.38.25"
1369source = "registry+https://github.com/rust-lang/crates.io-index" 1476source = "registry+https://github.com/rust-lang/crates.io-index"
1370checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" 1477checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
1371dependencies = [ 1478dependencies = [
1372 "bitflags 2.4.1", 1479 "bitflags 2.4.1",
1373 "errno", 1480 "errno",
1374 "libc", 1481 "libc",
1375 "linux-raw-sys", 1482 "linux-raw-sys",
1376 "windows-sys", 1483 "windows-sys 0.48.0",
1377] 1484]
1378 1485
1379[[package]] 1486[[package]]
@@ -1396,22 +1503,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
1396 1503
1397[[package]] 1504[[package]]
1398name = "serde" 1505name = "serde"
1399version = "1.0.190" 1506version = "1.0.193"
1400source = "registry+https://github.com/rust-lang/crates.io-index" 1507source = "registry+https://github.com/rust-lang/crates.io-index"
1401checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" 1508checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
1402dependencies = [ 1509dependencies = [
1403 "serde_derive", 1510 "serde_derive",
1404] 1511]
1405 1512
1406[[package]] 1513[[package]]
1407name = "serde_derive" 1514name = "serde_derive"
1408version = "1.0.190" 1515version = "1.0.193"
1409source = "registry+https://github.com/rust-lang/crates.io-index" 1516source = "registry+https://github.com/rust-lang/crates.io-index"
1410checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" 1517checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
1411dependencies = [ 1518dependencies = [
1412 "proc-macro2", 1519 "proc-macro2",
1413 "quote", 1520 "quote",
1414 "syn 2.0.38", 1521 "syn 2.0.39",
1415] 1522]
1416 1523
1417[[package]] 1524[[package]]
@@ -1480,9 +1587,9 @@ dependencies = [
1480 1587
1481[[package]] 1588[[package]]
1482name = "signature" 1589name = "signature"
1483version = "2.1.0" 1590version = "2.2.0"
1484source = "registry+https://github.com/rust-lang/crates.io-index" 1591source = "registry+https://github.com/rust-lang/crates.io-index"
1485checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" 1592checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
1486dependencies = [ 1593dependencies = [
1487 "digest", 1594 "digest",
1488 "rand_core", 1595 "rand_core",
@@ -1499,19 +1606,9 @@ dependencies = [
1499 1606
1500[[package]] 1607[[package]]
1501name = "smallvec" 1608name = "smallvec"
1502version = "1.11.1" 1609version = "1.11.2"
1503source = "registry+https://github.com/rust-lang/crates.io-index"
1504checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
1505
1506[[package]]
1507name = "socket2"
1508version = "0.4.10"
1509source = "registry+https://github.com/rust-lang/crates.io-index" 1610source = "registry+https://github.com/rust-lang/crates.io-index"
1510checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" 1611checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
1511dependencies = [
1512 "libc",
1513 "winapi",
1514]
1515 1612
1516[[package]] 1613[[package]]
1517name = "socket2" 1614name = "socket2"
@@ -1520,7 +1617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1520checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" 1617checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
1521dependencies = [ 1618dependencies = [
1522 "libc", 1619 "libc",
1523 "windows-sys", 1620 "windows-sys 0.48.0",
1524] 1621]
1525 1622
1526[[package]] 1623[[package]]
@@ -1540,9 +1637,9 @@ dependencies = [
1540 1637
1541[[package]] 1638[[package]]
1542name = "spki" 1639name = "spki"
1543version = "0.7.2" 1640version = "0.7.3"
1544source = "registry+https://github.com/rust-lang/crates.io-index" 1641source = "registry+https://github.com/rust-lang/crates.io-index"
1545checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" 1642checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
1546dependencies = [ 1643dependencies = [
1547 "base64ct", 1644 "base64ct",
1548 "der", 1645 "der",
@@ -1561,9 +1658,9 @@ dependencies = [
1561 1658
1562[[package]] 1659[[package]]
1563name = "sqlx" 1660name = "sqlx"
1564version = "0.7.2" 1661version = "0.7.3"
1565source = "registry+https://github.com/rust-lang/crates.io-index" 1662source = "registry+https://github.com/rust-lang/crates.io-index"
1566checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" 1663checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf"
1567dependencies = [ 1664dependencies = [
1568 "sqlx-core", 1665 "sqlx-core",
1569 "sqlx-macros", 1666 "sqlx-macros",
@@ -1574,9 +1671,9 @@ dependencies = [
1574 1671
1575[[package]] 1672[[package]]
1576name = "sqlx-core" 1673name = "sqlx-core"
1577version = "0.7.2" 1674version = "0.7.3"
1578source = "registry+https://github.com/rust-lang/crates.io-index" 1675source = "registry+https://github.com/rust-lang/crates.io-index"
1579checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" 1676checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
1580dependencies = [ 1677dependencies = [
1581 "ahash 0.8.6", 1678 "ahash 0.8.6",
1582 "atoi", 1679 "atoi",
@@ -1614,9 +1711,9 @@ dependencies = [
1614 1711
1615[[package]] 1712[[package]]
1616name = "sqlx-macros" 1713name = "sqlx-macros"
1617version = "0.7.2" 1714version = "0.7.3"
1618source = "registry+https://github.com/rust-lang/crates.io-index" 1715source = "registry+https://github.com/rust-lang/crates.io-index"
1619checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" 1716checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5"
1620dependencies = [ 1717dependencies = [
1621 "proc-macro2", 1718 "proc-macro2",
1622 "quote", 1719 "quote",
@@ -1627,10 +1724,11 @@ dependencies = [
1627 1724
1628[[package]] 1725[[package]]
1629name = "sqlx-macros-core" 1726name = "sqlx-macros-core"
1630version = "0.7.2" 1727version = "0.7.3"
1631source = "registry+https://github.com/rust-lang/crates.io-index" 1728source = "registry+https://github.com/rust-lang/crates.io-index"
1632checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" 1729checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841"
1633dependencies = [ 1730dependencies = [
1731 "atomic-write-file",
1634 "dotenvy", 1732 "dotenvy",
1635 "either", 1733 "either",
1636 "heck", 1734 "heck",
@@ -1653,9 +1751,9 @@ dependencies = [
1653 1751
1654[[package]] 1752[[package]]
1655name = "sqlx-mysql" 1753name = "sqlx-mysql"
1656version = "0.7.2" 1754version = "0.7.3"
1657source = "registry+https://github.com/rust-lang/crates.io-index" 1755source = "registry+https://github.com/rust-lang/crates.io-index"
1658checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" 1756checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4"
1659dependencies = [ 1757dependencies = [
1660 "atoi", 1758 "atoi",
1661 "base64 0.21.5", 1759 "base64 0.21.5",
@@ -1695,9 +1793,9 @@ dependencies = [
1695 1793
1696[[package]] 1794[[package]]
1697name = "sqlx-postgres" 1795name = "sqlx-postgres"
1698version = "0.7.2" 1796version = "0.7.3"
1699source = "registry+https://github.com/rust-lang/crates.io-index" 1797source = "registry+https://github.com/rust-lang/crates.io-index"
1700checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" 1798checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24"
1701dependencies = [ 1799dependencies = [
1702 "atoi", 1800 "atoi",
1703 "base64 0.21.5", 1801 "base64 0.21.5",
@@ -1734,9 +1832,9 @@ dependencies = [
1734 1832
1735[[package]] 1833[[package]]
1736name = "sqlx-sqlite" 1834name = "sqlx-sqlite"
1737version = "0.7.2" 1835version = "0.7.3"
1738source = "registry+https://github.com/rust-lang/crates.io-index" 1836source = "registry+https://github.com/rust-lang/crates.io-index"
1739checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" 1837checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490"
1740dependencies = [ 1838dependencies = [
1741 "atoi", 1839 "atoi",
1742 "flume", 1840 "flume",
@@ -1752,6 +1850,7 @@ dependencies = [
1752 "sqlx-core", 1850 "sqlx-core",
1753 "tracing", 1851 "tracing",
1754 "url", 1852 "url",
1853 "urlencoding",
1755] 1854]
1756 1855
1757[[package]] 1856[[package]]
@@ -1781,7 +1880,7 @@ dependencies = [
1781 "parking_lot", 1880 "parking_lot",
1782 "pnet_packet", 1881 "pnet_packet",
1783 "rand", 1882 "rand",
1784 "socket2 0.5.5", 1883 "socket2",
1785 "thiserror", 1884 "thiserror",
1786 "tokio", 1885 "tokio",
1787 "tracing", 1886 "tracing",
@@ -1800,9 +1899,9 @@ dependencies = [
1800 1899
1801[[package]] 1900[[package]]
1802name = "syn" 1901name = "syn"
1803version = "2.0.38" 1902version = "2.0.39"
1804source = "registry+https://github.com/rust-lang/crates.io-index" 1903source = "registry+https://github.com/rust-lang/crates.io-index"
1805checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" 1904checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
1806dependencies = [ 1905dependencies = [
1807 "proc-macro2", 1906 "proc-macro2",
1808 "quote", 1907 "quote",
@@ -1825,7 +1924,7 @@ dependencies = [
1825 "fastrand", 1924 "fastrand",
1826 "redox_syscall", 1925 "redox_syscall",
1827 "rustix", 1926 "rustix",
1828 "windows-sys", 1927 "windows-sys 0.48.0",
1829] 1928]
1830 1929
1831[[package]] 1930[[package]]
@@ -1845,7 +1944,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
1845dependencies = [ 1944dependencies = [
1846 "proc-macro2", 1945 "proc-macro2",
1847 "quote", 1946 "quote",
1848 "syn 2.0.38", 1947 "syn 2.0.39",
1849] 1948]
1850 1949
1851[[package]] 1950[[package]]
@@ -1906,9 +2005,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
1906 2005
1907[[package]] 2006[[package]]
1908name = "tokio" 2007name = "tokio"
1909version = "1.33.0" 2008version = "1.34.0"
1910source = "registry+https://github.com/rust-lang/crates.io-index" 2009source = "registry+https://github.com/rust-lang/crates.io-index"
1911checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" 2010checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
1912dependencies = [ 2011dependencies = [
1913 "backtrace", 2012 "backtrace",
1914 "bytes", 2013 "bytes",
@@ -1916,20 +2015,20 @@ dependencies = [
1916 "mio", 2015 "mio",
1917 "num_cpus", 2016 "num_cpus",
1918 "pin-project-lite", 2017 "pin-project-lite",
1919 "socket2 0.5.5", 2018 "socket2",
1920 "tokio-macros", 2019 "tokio-macros",
1921 "windows-sys", 2020 "windows-sys 0.48.0",
1922] 2021]
1923 2022
1924[[package]] 2023[[package]]
1925name = "tokio-macros" 2024name = "tokio-macros"
1926version = "2.1.0" 2025version = "2.2.0"
1927source = "registry+https://github.com/rust-lang/crates.io-index" 2026source = "registry+https://github.com/rust-lang/crates.io-index"
1928checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" 2027checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
1929dependencies = [ 2028dependencies = [
1930 "proc-macro2", 2029 "proc-macro2",
1931 "quote", 2030 "quote",
1932 "syn 2.0.38", 2031 "syn 2.0.39",
1933] 2032]
1934 2033
1935[[package]] 2034[[package]]
@@ -1956,6 +2055,20 @@ dependencies = [
1956] 2055]
1957 2056
1958[[package]] 2057[[package]]
2058name = "tokio-util"
2059version = "0.7.10"
2060source = "registry+https://github.com/rust-lang/crates.io-index"
2061checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
2062dependencies = [
2063 "bytes",
2064 "futures-core",
2065 "futures-sink",
2066 "pin-project-lite",
2067 "tokio",
2068 "tracing",
2069]
2070
2071[[package]]
1959name = "toml" 2072name = "toml"
1960version = "0.5.11" 2073version = "0.5.11"
1961source = "registry+https://github.com/rust-lang/crates.io-index" 2074source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2012,7 +2125,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
2012dependencies = [ 2125dependencies = [
2013 "proc-macro2", 2126 "proc-macro2",
2014 "quote", 2127 "quote",
2015 "syn 2.0.38", 2128 "syn 2.0.39",
2016] 2129]
2017 2130
2018[[package]] 2131[[package]]
@@ -2026,10 +2139,20 @@ dependencies = [
2026] 2139]
2027 2140
2028[[package]] 2141[[package]]
2142name = "tracing-error"
2143version = "0.2.0"
2144source = "registry+https://github.com/rust-lang/crates.io-index"
2145checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
2146dependencies = [
2147 "tracing",
2148 "tracing-subscriber",
2149]
2150
2151[[package]]
2029name = "tracing-log" 2152name = "tracing-log"
2030version = "0.1.4" 2153version = "0.2.0"
2031source = "registry+https://github.com/rust-lang/crates.io-index" 2154source = "registry+https://github.com/rust-lang/crates.io-index"
2032checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" 2155checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
2033dependencies = [ 2156dependencies = [
2034 "log", 2157 "log",
2035 "once_cell", 2158 "once_cell",
@@ -2038,9 +2161,9 @@ dependencies = [
2038 2161
2039[[package]] 2162[[package]]
2040name = "tracing-subscriber" 2163name = "tracing-subscriber"
2041version = "0.3.17" 2164version = "0.3.18"
2042source = "registry+https://github.com/rust-lang/crates.io-index" 2165source = "registry+https://github.com/rust-lang/crates.io-index"
2043checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" 2166checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
2044dependencies = [ 2167dependencies = [
2045 "matchers", 2168 "matchers",
2046 "nu-ansi-term", 2169 "nu-ansi-term",
@@ -2056,12 +2179,6 @@ dependencies = [
2056] 2179]
2057 2180
2058[[package]] 2181[[package]]
2059name = "try-lock"
2060version = "0.2.4"
2061source = "registry+https://github.com/rust-lang/crates.io-index"
2062checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
2063
2064[[package]]
2065name = "tungstenite" 2182name = "tungstenite"
2066version = "0.20.1" 2183version = "0.20.1"
2067source = "registry+https://github.com/rust-lang/crates.io-index" 2184source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2070,7 +2187,7 @@ dependencies = [
2070 "byteorder", 2187 "byteorder",
2071 "bytes", 2188 "bytes",
2072 "data-encoding", 2189 "data-encoding",
2073 "http", 2190 "http 0.2.11",
2074 "httparse", 2191 "httparse",
2075 "log", 2192 "log",
2076 "rand", 2193 "rand",
@@ -2127,9 +2244,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
2127 2244
2128[[package]] 2245[[package]]
2129name = "url" 2246name = "url"
2130version = "2.4.1" 2247version = "2.5.0"
2131source = "registry+https://github.com/rust-lang/crates.io-index" 2248source = "registry+https://github.com/rust-lang/crates.io-index"
2132checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" 2249checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
2133dependencies = [ 2250dependencies = [
2134 "form_urlencoded", 2251 "form_urlencoded",
2135 "idna", 2252 "idna",
@@ -2137,6 +2254,12 @@ dependencies = [
2137] 2254]
2138 2255
2139[[package]] 2256[[package]]
2257name = "urlencoding"
2258version = "2.1.3"
2259source = "registry+https://github.com/rust-lang/crates.io-index"
2260checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
2261
2262[[package]]
2140name = "utf-8" 2263name = "utf-8"
2141version = "0.7.6" 2264version = "0.7.6"
2142source = "registry+https://github.com/rust-lang/crates.io-index" 2265source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2144,9 +2267,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
2144 2267
2145[[package]] 2268[[package]]
2146name = "uuid" 2269name = "uuid"
2147version = "1.5.0" 2270version = "1.6.1"
2148source = "registry+https://github.com/rust-lang/crates.io-index" 2271source = "registry+https://github.com/rust-lang/crates.io-index"
2149checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" 2272checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
2150dependencies = [ 2273dependencies = [
2151 "getrandom", 2274 "getrandom",
2152 "rand", 2275 "rand",
@@ -2171,15 +2294,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2171checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" 2294checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
2172 2295
2173[[package]] 2296[[package]]
2174name = "want"
2175version = "0.3.1"
2176source = "registry+https://github.com/rust-lang/crates.io-index"
2177checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
2178dependencies = [
2179 "try-lock",
2180]
2181
2182[[package]]
2183name = "wasi" 2297name = "wasi"
2184version = "0.11.0+wasi-snapshot-preview1" 2298version = "0.11.0+wasi-snapshot-preview1"
2185source = "registry+https://github.com/rust-lang/crates.io-index" 2299source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2191,6 +2305,7 @@ version = "0.3.0"
2191dependencies = [ 2305dependencies = [
2192 "axum", 2306 "axum",
2193 "axum-macros", 2307 "axum-macros",
2308 "color-eyre",
2194 "config", 2309 "config",
2195 "dashmap", 2310 "dashmap",
2196 "once_cell", 2311 "once_cell",
@@ -2239,7 +2354,16 @@ version = "0.48.0"
2239source = "registry+https://github.com/rust-lang/crates.io-index" 2354source = "registry+https://github.com/rust-lang/crates.io-index"
2240checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" 2355checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
2241dependencies = [ 2356dependencies = [
2242 "windows-targets", 2357 "windows-targets 0.48.5",
2358]
2359
2360[[package]]
2361name = "windows-sys"
2362version = "0.52.0"
2363source = "registry+https://github.com/rust-lang/crates.io-index"
2364checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
2365dependencies = [
2366 "windows-targets 0.52.0",
2243] 2367]
2244 2368
2245[[package]] 2369[[package]]
@@ -2248,13 +2372,28 @@ version = "0.48.5"
2248source = "registry+https://github.com/rust-lang/crates.io-index" 2372source = "registry+https://github.com/rust-lang/crates.io-index"
2249checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 2373checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
2250dependencies = [ 2374dependencies = [
2251 "windows_aarch64_gnullvm", 2375 "windows_aarch64_gnullvm 0.48.5",
2252 "windows_aarch64_msvc", 2376 "windows_aarch64_msvc 0.48.5",
2253 "windows_i686_gnu", 2377 "windows_i686_gnu 0.48.5",
2254 "windows_i686_msvc", 2378 "windows_i686_msvc 0.48.5",
2255 "windows_x86_64_gnu", 2379 "windows_x86_64_gnu 0.48.5",
2256 "windows_x86_64_gnullvm", 2380 "windows_x86_64_gnullvm 0.48.5",
2257 "windows_x86_64_msvc", 2381 "windows_x86_64_msvc 0.48.5",
2382]
2383
2384[[package]]
2385name = "windows-targets"
2386version = "0.52.0"
2387source = "registry+https://github.com/rust-lang/crates.io-index"
2388checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
2389dependencies = [
2390 "windows_aarch64_gnullvm 0.52.0",
2391 "windows_aarch64_msvc 0.52.0",
2392 "windows_i686_gnu 0.52.0",
2393 "windows_i686_msvc 0.52.0",
2394 "windows_x86_64_gnu 0.52.0",
2395 "windows_x86_64_gnullvm 0.52.0",
2396 "windows_x86_64_msvc 0.52.0",
2258] 2397]
2259 2398
2260[[package]] 2399[[package]]
@@ -2264,42 +2403,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2264checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" 2403checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
2265 2404
2266[[package]] 2405[[package]]
2406name = "windows_aarch64_gnullvm"
2407version = "0.52.0"
2408source = "registry+https://github.com/rust-lang/crates.io-index"
2409checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
2410
2411[[package]]
2267name = "windows_aarch64_msvc" 2412name = "windows_aarch64_msvc"
2268version = "0.48.5" 2413version = "0.48.5"
2269source = "registry+https://github.com/rust-lang/crates.io-index" 2414source = "registry+https://github.com/rust-lang/crates.io-index"
2270checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" 2415checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
2271 2416
2272[[package]] 2417[[package]]
2418name = "windows_aarch64_msvc"
2419version = "0.52.0"
2420source = "registry+https://github.com/rust-lang/crates.io-index"
2421checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
2422
2423[[package]]
2273name = "windows_i686_gnu" 2424name = "windows_i686_gnu"
2274version = "0.48.5" 2425version = "0.48.5"
2275source = "registry+https://github.com/rust-lang/crates.io-index" 2426source = "registry+https://github.com/rust-lang/crates.io-index"
2276checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" 2427checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
2277 2428
2278[[package]] 2429[[package]]
2430name = "windows_i686_gnu"
2431version = "0.52.0"
2432source = "registry+https://github.com/rust-lang/crates.io-index"
2433checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
2434
2435[[package]]
2279name = "windows_i686_msvc" 2436name = "windows_i686_msvc"
2280version = "0.48.5" 2437version = "0.48.5"
2281source = "registry+https://github.com/rust-lang/crates.io-index" 2438source = "registry+https://github.com/rust-lang/crates.io-index"
2282checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" 2439checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
2283 2440
2284[[package]] 2441[[package]]
2442name = "windows_i686_msvc"
2443version = "0.52.0"
2444source = "registry+https://github.com/rust-lang/crates.io-index"
2445checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
2446
2447[[package]]
2285name = "windows_x86_64_gnu" 2448name = "windows_x86_64_gnu"
2286version = "0.48.5" 2449version = "0.48.5"
2287source = "registry+https://github.com/rust-lang/crates.io-index" 2450source = "registry+https://github.com/rust-lang/crates.io-index"
2288checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" 2451checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
2289 2452
2290[[package]] 2453[[package]]
2454name = "windows_x86_64_gnu"
2455version = "0.52.0"
2456source = "registry+https://github.com/rust-lang/crates.io-index"
2457checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
2458
2459[[package]]
2291name = "windows_x86_64_gnullvm" 2460name = "windows_x86_64_gnullvm"
2292version = "0.48.5" 2461version = "0.48.5"
2293source = "registry+https://github.com/rust-lang/crates.io-index" 2462source = "registry+https://github.com/rust-lang/crates.io-index"
2294checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" 2463checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
2295 2464
2296[[package]] 2465[[package]]
2466name = "windows_x86_64_gnullvm"
2467version = "0.52.0"
2468source = "registry+https://github.com/rust-lang/crates.io-index"
2469checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
2470
2471[[package]]
2297name = "windows_x86_64_msvc" 2472name = "windows_x86_64_msvc"
2298version = "0.48.5" 2473version = "0.48.5"
2299source = "registry+https://github.com/rust-lang/crates.io-index" 2474source = "registry+https://github.com/rust-lang/crates.io-index"
2300checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" 2475checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
2301 2476
2302[[package]] 2477[[package]]
2478name = "windows_x86_64_msvc"
2479version = "0.52.0"
2480source = "registry+https://github.com/rust-lang/crates.io-index"
2481checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
2482
2483[[package]]
2303name = "yaml-rust" 2484name = "yaml-rust"
2304version = "0.4.5" 2485version = "0.4.5"
2305source = "registry+https://github.com/rust-lang/crates.io-index" 2486source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2310,26 +2491,26 @@ dependencies = [
2310 2491
2311[[package]] 2492[[package]]
2312name = "zerocopy" 2493name = "zerocopy"
2313version = "0.7.23" 2494version = "0.7.26"
2314source = "registry+https://github.com/rust-lang/crates.io-index" 2495source = "registry+https://github.com/rust-lang/crates.io-index"
2315checksum = "e50cbb27c30666a6108abd6bc7577556265b44f243e2be89a8bc4e07a528c107" 2496checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
2316dependencies = [ 2497dependencies = [
2317 "zerocopy-derive", 2498 "zerocopy-derive",
2318] 2499]
2319 2500
2320[[package]] 2501[[package]]
2321name = "zerocopy-derive" 2502name = "zerocopy-derive"
2322version = "0.7.23" 2503version = "0.7.26"
2323source = "registry+https://github.com/rust-lang/crates.io-index" 2504source = "registry+https://github.com/rust-lang/crates.io-index"
2324checksum = "a25f293fe55f0a48e7010d65552bb63704f6ceb55a1a385da10d41d8f78e4a3d" 2505checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
2325dependencies = [ 2506dependencies = [
2326 "proc-macro2", 2507 "proc-macro2",
2327 "quote", 2508 "quote",
2328 "syn 2.0.38", 2509 "syn 2.0.39",
2329] 2510]
2330 2511
2331[[package]] 2512[[package]]
2332name = "zeroize" 2513name = "zeroize"
2333version = "1.6.0" 2514version = "1.7.0"
2334source = "registry+https://github.com/rust-lang/crates.io-index" 2515source = "registry+https://github.com/rust-lang/crates.io-index"
2335checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" 2516checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
diff --git a/Cargo.toml b/Cargo.toml
index 3207453..f58f3ad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,22 +1,23 @@
1[package] 1[package]
2name = "webol" 2name = "webol"
3version = "0.3.0" 3version = "0.3.1"
4edition = "2021" 4edition = "2021"
5 5
6# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html 6# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
7 7
8[dependencies] 8[dependencies]
9axum = { version = "0.6.20", features = ["headers", "ws"] } 9axum = { version = "0.7", features = ["ws"] }
10tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] } 10tokio = { version = "1.34", features = ["macros", "rt-multi-thread"] }
11tracing = "0.1.40" 11tracing = "0.1"
12tracing-subscriber = { version = "0.3.17", features = ["env-filter", "local-time", "time"] } 12tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time", "time"] }
13time = { version = "0.3.30", features = ["macros"] } 13time = { version = "0.3", features = ["macros"] }
14serde = { version = "1.0.190", features = ["derive"] } 14serde = { version = "1.0", features = ["derive"] }
15serde_json = "1.0.107" 15serde_json = "1.0"
16config = "0.13.3" 16config = "0.13"
17once_cell = "1.18.0" 17once_cell = "1.18"
18sqlx = { version = "0.7.2", features = ["postgres", "runtime-tokio"]} 18sqlx = { version = "0.7", features = ["postgres", "runtime-tokio"]}
19surge-ping = "0.8.0" 19surge-ping = "0.8"
20axum-macros = "0.3.8" 20axum-macros = "0.4"
21uuid = { version = "1.5.0", features = ["v4", "fast-rng"] } 21uuid = { version = "1.6", features = ["v4", "fast-rng"] }
22dashmap = "5.5.3" 22dashmap = "5.5"
23color-eyre = "0.6"
diff --git a/src/auth.rs b/src/auth.rs
index e4b1c2f..90d920f 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -1,5 +1,4 @@
1use axum::headers::HeaderValue; 1use axum::http::{StatusCode, HeaderValue};
2use axum::http::StatusCode;
3use axum::http::header::ToStrError; 2use axum::http::header::ToStrError;
4use tracing::{debug, error, trace}; 3use tracing::{debug, error, trace};
5use crate::auth::AuthError::{MissingSecret, WrongSecret}; 4use crate::auth::AuthError::{MissingSecret, WrongSecret};
diff --git a/src/main.rs b/src/main.rs
index e96b736..aab9df3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
1use std::env; 1use std::env;
2use std::net::SocketAddr;
2use std::sync::Arc; 3use std::sync::Arc;
3use axum::{Router, routing::post}; 4use axum::{Router, routing::post};
4use axum::routing::{get, put}; 5use axum::routing::{get, put};
@@ -24,7 +25,10 @@ mod error;
24mod services; 25mod services;
25 26
26#[tokio::main] 27#[tokio::main]
27async fn main() { 28async fn main() -> color_eyre::eyre::Result<()> {
29
30 color_eyre::install()?;
31
28 unsafe { local_offset::set_soundness(local_offset::Soundness::Unsound); } 32 unsafe { local_offset::set_soundness(local_offset::Soundness::Unsound); }
29 let time_format = 33 let time_format =
30 time::macros::format_description!("[year]-[month]-[day] [hour]:[minute]:[second]"); 34 time::macros::format_description!("[year]-[month]-[day] [hour]:[minute]:[second]");
@@ -64,14 +68,15 @@ async fn main() {
64 68
65 let addr = SETTINGS.get_string("serveraddr").unwrap_or("0.0.0.0:7229".to_string()); 69 let addr = SETTINGS.get_string("serveraddr").unwrap_or("0.0.0.0:7229".to_string());
66 info!("start server on {}", addr); 70 info!("start server on {}", addr);
67 axum::Server::bind(&addr.parse().unwrap()) 71 let listener = tokio::net::TcpListener::bind(addr.parse::<SocketAddr>()?)
68 .serve(app.into_make_service()) 72 .await?;
69 .await 73 axum::serve(listener, app).await?;
70 .unwrap(); 74
75 Ok(())
71} 76}
72 77
73pub struct AppState { 78pub struct AppState {
74 db: PgPool, 79 db: PgPool,
75 ping_send: Sender<BroadcastCommands>, 80 ping_send: Sender<BroadcastCommands>,
76 ping_map: PingMap, 81 ping_map: PingMap,
77} \ No newline at end of file 82}
diff --git a/src/routes/device.rs b/src/routes/device.rs
index 678d117..a3308d4 100644
--- a/src/routes/device.rs
+++ b/src/routes/device.rs
@@ -1,7 +1,7 @@
1use std::sync::Arc; 1use std::sync::Arc;
2use axum::extract::State; 2use axum::extract::State;
3use axum::headers::HeaderMap;
4use axum::Json; 3use axum::Json;
4use axum::http::HeaderMap;
5use serde::{Deserialize, Serialize}; 5use serde::{Deserialize, Serialize};
6use serde_json::{json, Value}; 6use serde_json::{json, Value};
7use tracing::{debug, info}; 7use tracing::{debug, info};
diff --git a/src/routes/start.rs b/src/routes/start.rs
index 1555db3..a206cbd 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -1,5 +1,5 @@
1use axum::headers::HeaderMap;
2use axum::Json; 1use axum::Json;
2use axum::http::HeaderMap;
3use serde::{Deserialize, Serialize}; 3use serde::{Deserialize, Serialize};
4use std::sync::Arc; 4use std::sync::Arc;
5use axum::extract::State; 5use axum::extract::State;
@@ -60,7 +60,7 @@ pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap
60 debug!("init ping service"); 60 debug!("init ping service");
61 state.ping_map.insert(uuid_gen.clone(), PingValue { ip: device.ip.clone(), online: false }); 61 state.ping_map.insert(uuid_gen.clone(), PingValue { ip: device.ip.clone(), online: false });
62 62
63 crate::services::ping::spawn(state.ping_send.clone(), device, uuid_gen.clone(), &state.ping_map, &state.db).await 63 crate::services::ping::spawn(state.ping_send.clone(), device, uuid_gen.clone(), &state.ping_map, &state.db).await;
64 }); 64 });
65 Some(uuid_genc) 65 Some(uuid_genc)
66 } else { None }; 66 } else { None };
diff --git a/src/services/ping.rs b/src/services/ping.rs
index c3bdced..0f773f4 100644
--- a/src/services/ping.rs
+++ b/src/services/ping.rs
@@ -85,17 +85,14 @@ pub async fn status_websocket(mut socket: WebSocket, state: Arc<AppState>) {
85 trace!("Search for uuid: {}", uuid); 85 trace!("Search for uuid: {}", uuid);
86 86
87 let eta = get_eta(&state.db).await; 87 let eta = get_eta(&state.db).await;
88 let _ = socket.send(Message::Text(format!("eta_{}_{}", eta, uuid))).await; 88 let _ = socket.send(Message::Text(format!("eta_{eta}_{uuid}"))).await;
89 89
90 let device_exists = state.ping_map.contains_key(&uuid); 90 let device_exists = state.ping_map.contains_key(&uuid);
91 match device_exists { 91 if device_exists {
92 true => { 92 let _ = socket.send(process_device(state.clone(), uuid).await).await;
93 let _ = socket.send(process_device(state.clone(), uuid).await).await; 93 } else {
94 }, 94 debug!("didn't find any device");
95 false => { 95 let _ = socket.send(Message::Text(format!("notfound_{uuid}"))).await;
96 debug!("didn't find any device");
97 let _ = socket.send(Message::Text(format!("notfound_{}", uuid))).await;
98 },
99 }; 96 };
100 97
101 let _ = socket.close().await; 98 let _ = socket.close().await;
@@ -118,34 +115,31 @@ async fn process_device(state: Arc<AppState>, uuid: String) -> Message {
118 let pm = state.ping_map.clone().into_read_only(); 115 let pm = state.ping_map.clone().into_read_only();
119 let device = pm.get(&uuid).expect("fatal error"); 116 let device = pm.get(&uuid).expect("fatal error");
120 debug!("got device: {} (online: {})", device.ip, device.online); 117 debug!("got device: {} (online: {})", device.ip, device.online);
121 match device.online { 118 if device.online {
122 true => { 119 debug!("already started");
123 debug!("already started"); 120 Message::Text(format!("start_{uuid}"))
124 Message::Text(format!("start_{}", uuid)) 121 } else {
125 }, 122 loop {
126 false => { 123 trace!("wait for tx message");
127 loop{ 124 let message = state.ping_send.subscribe().recv().await.expect("fatal error");
128 trace!("wait for tx message"); 125 trace!("got message {:?}", message);
129 let message = state.ping_send.subscribe().recv().await.expect("fatal error"); 126 return match message {
130 trace!("got message {:?}", message); 127 BroadcastCommands::Success(msg_uuid) => {
131 return match message { 128 if msg_uuid != uuid { continue; }
132 BroadcastCommands::Success(msg_uuid) => { 129 trace!("message == uuid success");
133 if msg_uuid != uuid { continue; } 130 Message::Text(format!("start_{uuid}"))
134 trace!("message == uuid success"); 131 },
135 Message::Text(format!("start_{}", uuid)) 132 BroadcastCommands::Timeout(msg_uuid) => {
136 }, 133 if msg_uuid != uuid { continue; }
137 BroadcastCommands::Timeout(msg_uuid) => { 134 trace!("message == uuid timeout");
138 if msg_uuid != uuid { continue; } 135 Message::Text(format!("timeout_{uuid}"))
139 trace!("message == uuid timeout"); 136 },
140 Message::Text(format!("timeout_{}", uuid)) 137 BroadcastCommands::Error(msg_uuid) => {
141 }, 138 if msg_uuid != uuid { continue; }
142 BroadcastCommands::Error(msg_uuid) => { 139 trace!("message == uuid error");
143 if msg_uuid != uuid { continue; } 140 Message::Text(format!("error_{uuid}"))
144 trace!("message == uuid error");
145 Message::Text(format!("error_{}", uuid))
146 }
147 } 141 }
148 } 142 }
149 } 143 }
150 } 144 }
151} \ No newline at end of file 145}
diff --git a/src/wol.rs b/src/wol.rs
index 0cdcae3..8755b21 100644
--- a/src/wol.rs
+++ b/src/wol.rs
@@ -11,7 +11,7 @@ pub fn create_buffer(mac_addr: &str) -> Result<Vec<u8>, WebolError> {
11 let mut mac = Vec::new(); 11 let mut mac = Vec::new();
12 let sp = mac_addr.split(':'); 12 let sp = mac_addr.split(':');
13 for f in sp { 13 for f in sp {
14 mac.push(u8::from_str_radix(f, 16).map_err(WebolError::BufferParse)?) 14 mac.push(u8::from_str_radix(f, 16).map_err(WebolError::BufferParse)?);
15 }; 15 };
16 let mut buf = vec![255; 6]; 16 let mut buf = vec![255; 6];
17 for _ in 0..16 { 17 for _ in 0..16 {