diff --git a/Cargo.lock b/Cargo.lock index f740127..f5eea45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,9 +8,9 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3720d0064a0ce5c0de7bd93bdb0a6caebab2a9b5668746145d7b3b0c5da02914" dependencies = [ - "actix-rt 2.7.0", + "actix-rt", "bitflags", - "bytes 1.1.0", + "bytes", "crossbeam-channel", "futures-core", "futures-sink", @@ -19,9 +19,9 @@ dependencies = [ "log", "once_cell", "parking_lot 0.11.2", - "pin-project-lite 0.2.8", + "pin-project-lite", "smallvec", - "tokio 1.17.0", + "tokio", "tokio-util 0.6.9", ] @@ -31,10 +31,10 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f728064aca1c318585bf4bb04ffcfac9e75e508ab4e8b1bd9ba5dfe04e2cbed5" dependencies = [ - "actix-rt 2.7.0", + "actix-rt", "actix_derive", "bitflags", - "bytes 1.1.0", + "bytes", "crossbeam-channel", "futures-core", "futures-sink", @@ -43,25 +43,12 @@ dependencies = [ "log", "once_cell", "parking_lot 0.12.0", - "pin-project-lite 0.2.8", + "pin-project-lite", "smallvec", - "tokio 1.17.0", + "tokio", "tokio-util 0.7.1", ] -[[package]] -name = "actix-auth" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027868b1de04a26d59fedf200b1d8bd10c9ffa525abb08faac0cce7d73c834b5" -dependencies = [ - "actix-identity 0.2.1", - "actix-web 2.0.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "actix-broker" version = "0.4.2" @@ -73,37 +60,6 @@ dependencies = [ "log", ] -[[package]] -name = "actix-codec" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380" -dependencies = [ - "bitflags", - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "tokio 0.2.25", - "tokio-util 0.2.0", -] - -[[package]] -name = "actix-codec" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" -dependencies = [ - "bitflags", - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project 0.4.29", - "tokio 0.2.25", - "tokio-util 0.3.1", -] - [[package]] name = "actix-codec" version = "0.5.0" @@ -111,43 +67,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" dependencies = [ "bitflags", - "bytes 1.1.0", + "bytes", "futures-core", "futures-sink", "log", "memchr", - "pin-project-lite 0.2.8", - "tokio 1.17.0", + "pin-project-lite", + "tokio", "tokio-util 0.7.1", ] -[[package]] -name = "actix-connect" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95cc9569221e9802bf4c377f6c18b90ef10227d787611decf79fd47d2a8e76c" -dependencies = [ - "actix-codec 0.2.0", - "actix-rt 1.1.1", - "actix-service 1.0.6", - "actix-utils 1.0.6", - "derive_more", - "either", - "futures", - "http", - "log", - "trust-dns-proto", - "trust-dns-resolver", -] - [[package]] name = "actix-cors" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "414360eed71ba2d5435b185ba43ecbe281dfab5df3898286d6b7be8074372c92" dependencies = [ - "actix-utils 3.0.0", - "actix-web 4.0.1", + "actix-utils", + "actix-web", "derive_more", "futures-util", "log", @@ -161,13 +98,13 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d81bde9a79336aa51ebed236e91fc1a0528ff67cfdf4f68ca4c61ede9fd26fb5" dependencies = [ - "actix-http 3.0.4", - "actix-service 2.0.2", - "actix-utils 3.0.0", - "actix-web 4.0.1", + "actix-http", + "actix-service", + "actix-utils", + "actix-web", "askama_escape", "bitflags", - "bytes 1.1.0", + "bytes", "derive_more", "futures-core", "http-range", @@ -175,55 +112,7 @@ dependencies = [ "mime", "mime_guess", "percent-encoding", - "pin-project-lite 0.2.8", -] - -[[package]] -name = "actix-http" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16664cc4fdea8030837ad5a845eb231fb93fc3c5c171edfefb52fad92ce9019" -dependencies = [ - "actix-codec 0.2.0", - "actix-connect", - "actix-rt 1.1.1", - "actix-service 1.0.6", - "actix-threadpool", - "actix-utils 1.0.6", - "base64 0.11.0", - "bitflags", - "brotli2", - "bytes 0.5.6", - "chrono", - "copyless", - "derive_more", - "either", - "encoding_rs", - "failure", - "flate2", - "futures-channel", - "futures-core", - "futures-util", - "fxhash", - "h2 0.2.7", - "http", - "httparse", - "indexmap", - "language-tags 0.2.2", - "lazy_static", - "log", - "mime", - "percent-encoding", - "pin-project 0.4.29", - "rand 0.7.3", - "regex", - "ring", - "serde", - "serde_json", - "serde_urlencoded 0.6.1", - "sha1", - "slab", - "time 0.1.44", + "pin-project-lite", ] [[package]] @@ -232,76 +121,52 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5885cb81a0d4d0d322864bea1bb6c2a8144626b4fdc625d4c51eba197e7797a" dependencies = [ - "actix-codec 0.5.0", - "actix-rt 2.7.0", - "actix-service 2.0.2", - "actix-utils 3.0.0", + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", "ahash", - "base64 0.13.0", + "base64", "bitflags", "brotli", - "bytes 1.1.0", + "bytes", "bytestring", "derive_more", "encoding_rs", "flate2", "futures-core", - "h2 0.3.13", + "h2", "http", "httparse", "httpdate", - "itoa 1.0.1", - "language-tags 0.3.2", + "itoa", + "language-tags", "local-channel", "log", "mime", "percent-encoding", - "pin-project-lite 0.2.8", - "rand 0.8.5", + "pin-project-lite", + "rand", "sha-1 0.10.0", "smallvec", "zstd", ] -[[package]] -name = "actix-identity" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a379b0639c293292d71defb8cc1f94c87b7705c904adf044338ad392df77c7a" -dependencies = [ - "actix-service 1.0.6", - "actix-web 2.0.0", - "futures", - "serde", - "serde_json", - "time 0.1.44", -] - [[package]] name = "actix-identity" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "171fe3ed055b2dd50c61967911d253d47e76e1d4308acfbf99fc7affe5ec42aa" dependencies = [ - "actix-service 2.0.2", - "actix-utils 3.0.0", - "actix-web 4.0.1", + "actix-service", + "actix-utils", + "actix-web", "futures-util", "serde", "serde_json", "time 0.3.9", ] -[[package]] -name = "actix-macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "actix-macros" version = "0.2.3" @@ -318,9 +183,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9edfb0e7663d7fe18c8d5b668c9c1bcf79176b1dcc9d4da9592503209a6bfb0" dependencies = [ - "actix-utils 3.0.0", - "actix-web 4.0.1", - "bytes 1.1.0", + "actix-utils", + "actix-web", + "bytes", "derive_more", "futures-core", "httparse", @@ -337,33 +202,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dde9fa8bde15d084d459eb59f766c08d00a6f550e7054187878fc9cbaa19115" dependencies = [ "actix 0.12.0", - "actix-rt 2.7.0", - "actix-service 2.0.2", - "actix-tls 3.0.3", - "actix-web 4.0.1", + "actix-rt", + "actix-service", + "actix-tls", + "actix-web", "backoff", "derive_more", "futures-core", "log", "redis-async", "time 0.3.9", - "tokio 1.17.0", + "tokio", "tokio-util 0.6.9", ] -[[package]] -name = "actix-router" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c" -dependencies = [ - "bytestring", - "http", - "log", - "regex", - "serde", -] - [[package]] name = "actix-router" version = "0.5.0" @@ -378,50 +230,15 @@ dependencies = [ "serde", ] -[[package]] -name = "actix-rt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143fcc2912e0d1de2bcf4e2f720d2a60c28652ab4179685a1ee159e0fb3db227" -dependencies = [ - "actix-macros 0.1.3", - "actix-threadpool", - "copyless", - "futures-channel", - "futures-util", - "smallvec", - "tokio 0.2.25", -] - [[package]] name = "actix-rt" version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" dependencies = [ - "actix-macros 0.2.3", + "actix-macros", "futures-core", - "tokio 1.17.0", -] - -[[package]] -name = "actix-server" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e" -dependencies = [ - "actix-codec 0.3.0", - "actix-rt 1.1.1", - "actix-service 1.0.6", - "actix-utils 2.0.0", - "futures-channel", - "futures-util", - "log", - "mio 0.6.23", - "mio-uds", - "num_cpus", - "slab", - "socket2 0.3.19", + "tokio", ] [[package]] @@ -430,28 +247,18 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824" dependencies = [ - "actix-rt 2.7.0", - "actix-service 2.0.2", - "actix-utils 3.0.0", + "actix-rt", + "actix-service", + "actix-utils", "futures-core", "futures-util", - "mio 0.8.2", + "mio", "num_cpus", - "socket2 0.4.4", - "tokio 1.17.0", + "socket2", + "tokio", "tracing", ] -[[package]] -name = "actix-service" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" -dependencies = [ - "futures-util", - "pin-project 0.4.29", -] - [[package]] name = "actix-service" version = "2.0.2" @@ -460,7 +267,7 @@ checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" dependencies = [ "futures-core", "paste", - "pin-project-lite 0.2.8", + "pin-project-lite", ] [[package]] @@ -471,119 +278,36 @@ checksum = "0c9138a66462f1e65da829f9c0de81b44a96dfe193a4f19bfea32ee2be312368" dependencies = [ "actix 0.12.0", "actix-redis", - "actix-service 2.0.2", - "actix-utils 3.0.0", - "actix-web 4.0.1", + "actix-service", + "actix-utils", + "actix-web", "anyhow", "async-trait", "derive_more", "futures-core", - "rand 0.8.5", + "rand", "serde", "serde_json", "time 0.3.9", "tracing", ] -[[package]] -name = "actix-testing" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47239ca38799ab74ee6a8a94d1ce857014b2ac36f242f70f3f75a66f691e791c" -dependencies = [ - "actix-macros 0.1.3", - "actix-rt 1.1.1", - "actix-server 1.0.4", - "actix-service 1.0.6", - "log", - "socket2 0.3.19", -] - -[[package]] -name = "actix-threadpool" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d209f04d002854b9afd3743032a27b066158817965bf5d036824d19ac2cc0e30" -dependencies = [ - "derive_more", - "futures-channel", - "lazy_static", - "log", - "num_cpus", - "parking_lot 0.11.2", - "threadpool", -] - -[[package]] -name = "actix-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e5b4faaf105e9a6d389c606c298dcdb033061b00d532af9df56ff3a54995a8" -dependencies = [ - "actix-codec 0.2.0", - "actix-rt 1.1.1", - "actix-service 1.0.6", - "actix-utils 1.0.6", - "derive_more", - "either", - "futures", - "log", -] - [[package]] name = "actix-tls" version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" dependencies = [ - "actix-codec 0.5.0", - "actix-rt 2.7.0", - "actix-service 2.0.2", - "actix-utils 3.0.0", + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", "futures-core", "log", - "pin-project-lite 0.2.8", + "pin-project-lite", "tokio-util 0.7.1", ] -[[package]] -name = "actix-utils" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e" -dependencies = [ - "actix-codec 0.2.0", - "actix-rt 1.1.1", - "actix-service 1.0.6", - "bitflags", - "bytes 0.5.6", - "either", - "futures", - "log", - "pin-project 0.4.29", - "slab", -] - -[[package]] -name = "actix-utils" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" -dependencies = [ - "actix-codec 0.3.0", - "actix-rt 1.1.1", - "actix-service 1.0.6", - "bitflags", - "bytes 0.5.6", - "either", - "futures-channel", - "futures-sink", - "futures-util", - "log", - "pin-project 0.4.29", - "slab", -] - [[package]] name = "actix-utils" version = "3.0.0" @@ -591,43 +315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94" dependencies = [ "local-waker", - "pin-project-lite 0.2.8", -] - -[[package]] -name = "actix-web" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3158e822461040822f0dbf1735b9c2ce1f95f93b651d7a7aded00b1efbb1f635" -dependencies = [ - "actix-codec 0.2.0", - "actix-http 1.0.1", - "actix-macros 0.1.3", - "actix-router 0.2.7", - "actix-rt 1.1.1", - "actix-server 1.0.4", - "actix-service 1.0.6", - "actix-testing", - "actix-threadpool", - "actix-tls 1.0.0", - "actix-utils 1.0.6", - "actix-web-codegen 0.2.2", - "awc", - "bytes 0.5.6", - "derive_more", - "encoding_rs", - "futures", - "fxhash", - "log", - "mime", - "net2", - "pin-project 0.4.29", - "regex", - "serde", - "serde_json", - "serde_urlencoded 0.6.1", - "time 0.1.44", - "url", + "pin-project-lite", ] [[package]] @@ -636,58 +324,47 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4e5ebffd51d50df56a3ae0de0e59487340ca456f05dd0b90c0a7a6dd6a74d31" dependencies = [ - "actix-codec 0.5.0", - "actix-http 3.0.4", - "actix-macros 0.2.3", - "actix-router 0.5.0", - "actix-rt 2.7.0", - "actix-server 2.1.1", - "actix-service 2.0.2", - "actix-utils 3.0.0", - "actix-web-codegen 4.0.0", + "actix-codec", + "actix-http", + "actix-macros", + "actix-router", + "actix-rt", + "actix-server", + "actix-service", + "actix-utils", + "actix-web-codegen", "ahash", - "bytes 1.1.0", + "bytes", "bytestring", - "cfg-if 1.0.0", + "cfg-if", "cookie", "derive_more", "encoding_rs", "futures-core", "futures-util", - "itoa 1.0.1", - "language-tags 0.3.2", + "itoa", + "language-tags", "log", "mime", "once_cell", - "pin-project-lite 0.2.8", + "pin-project-lite", "regex", "serde", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", "smallvec", - "socket2 0.4.4", + "socket2", "time 0.3.9", "url", ] -[[package]] -name = "actix-web-codegen" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a71bf475cbe07281d0b3696abb48212db118e7e23219f13596ce865235ff5766" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "actix-web-codegen" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7525bedf54704abb1d469e88d7e7e9226df73778798a69cea5022d53b2ae91bc" dependencies = [ - "actix-router 0.5.0", + "actix-router", "proc-macro2", "quote", "syn", @@ -699,13 +376,13 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08c25a48b4684f90520183cd1a688e5f4f7e9905835fa75d02c0fe4f60fcdbe6" dependencies = [ - "actix-service 2.0.2", - "actix-utils 3.0.0", - "actix-web 4.0.1", - "base64 0.13.0", + "actix-service", + "actix-utils", + "actix-web", + "base64", "futures-core", "futures-util", - "pin-project-lite 0.2.8", + "pin-project-lite", ] [[package]] @@ -714,8 +391,8 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "503ff1136a085f39fc9fd96818a5e9c7ab58ccd36682f3cfc32a001d01cc3a50" dependencies = [ - "actix-http 3.0.4", - "actix-web 4.0.1", + "actix-http", + "actix-web", "futures-util", "opentelemetry", "opentelemetry-semantic-conventions", @@ -733,15 +410,6 @@ dependencies = [ "syn", ] -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" @@ -763,7 +431,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures", "opaque-debug 0.3.0", @@ -789,7 +457,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.6", + "getrandom", "once_cell", "version_check", ] @@ -876,7 +544,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -885,53 +553,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "awc" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7601d4d1d7ef2335d6597a41b5fe069f6ab799b85f53565ab390e7b7065aac5" -dependencies = [ - "actix-codec 0.2.0", - "actix-http 1.0.1", - "actix-rt 1.1.1", - "actix-service 1.0.6", - "base64 0.11.0", - "bytes 0.5.6", - "derive_more", - "futures-core", - "log", - "mime", - "percent-encoding", - "rand 0.7.3", - "serde", - "serde_json", - "serde_urlencoded 0.6.1", -] - [[package]] name = "backoff" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.6", + "getrandom", "instant", - "rand 0.8.5", -] - -[[package]] -name = "backtrace" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.4.4", - "object", - "rustc-demangle", + "rand", ] [[package]] @@ -940,12 +570,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.13.0" @@ -963,16 +587,15 @@ name = "bazzar" version = "0.1.0" dependencies = [ "actix 0.13.0", - "actix-auth", "actix-broker", "actix-cors", "actix-files", - "actix-identity 0.4.0", + "actix-identity", "actix-multipart", "actix-redis", - "actix-rt 2.7.0", + "actix-rt", "actix-session", - "actix-web 4.0.1", + "actix-web", "actix-web-httpauth", "actix-web-opentelemetry", "argon2", @@ -984,13 +607,14 @@ dependencies = [ "futures-util", "gumdrop", "hmac", + "jemallocator", "jwt", "log", "oauth2", "parking_lot 0.12.0", "password-hash", "pretty_env_logger", - "rand_core 0.6.3", + "rand_core", "serde", "serde_json", "sha2 0.10.2", @@ -998,7 +622,7 @@ dependencies = [ "sqlx-core", "tera", "thiserror", - "tokio 1.17.0", + "tokio", "toml", "tracing", "uuid", @@ -1097,26 +721,6 @@ dependencies = [ "alloc-stdlib", ] -[[package]] -name = "brotli-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "brotli2" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -dependencies = [ - "brotli-sys", - "libc", -] - [[package]] name = "bstr" version = "0.2.17" @@ -1144,12 +748,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.1.0" @@ -1162,7 +760,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" dependencies = [ - "bytes 1.1.0", + "bytes", ] [[package]] @@ -1174,12 +772,6 @@ dependencies = [ "jobserver", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -1197,7 +789,7 @@ dependencies = [ "num-traits", "serde", "time 0.1.44", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1250,23 +842,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" dependencies = [ "aes-gcm", - "base64 0.13.0", + "base64", "hkdf", "hmac", "percent-encoding", - "rand 0.8.5", + "rand", "sha2 0.10.2", "subtle", "time 0.3.9", "version_check", ] -[[package]] -name = "copyless" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" - [[package]] name = "cpufeatures" version = "0.2.2" @@ -1297,7 +883,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1306,7 +892,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1316,7 +902,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -1328,7 +914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "lazy_static", "memoffset", @@ -1341,7 +927,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1351,7 +937,7 @@ version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "lazy_static", ] @@ -1439,7 +1025,7 @@ checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1454,12 +1040,6 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" -[[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" @@ -1472,19 +1052,7 @@ version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "enum-as-inner" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", + "cfg-if", ] [[package]] @@ -1506,28 +1074,6 @@ version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -1546,10 +1092,10 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crc32fast", "libc", - "miniz_oxide 0.5.1", + "miniz_oxide", ] [[package]] @@ -1569,20 +1115,10 @@ dependencies = [ ] [[package]] -name = "fuchsia-zircon" -version = "0.3.3" +name = "fs_extra" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" [[package]] name = "futures" @@ -1679,20 +1215,11 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.8", + "pin-project-lite", "pin-utils", "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.12.4" @@ -1712,24 +1239,13 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -1746,12 +1262,6 @@ dependencies = [ "polyval", ] -[[package]] -name = "gimli" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" - [[package]] name = "git2" version = "0.13.25" @@ -1809,33 +1319,13 @@ dependencies = [ "syn", ] -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio 0.2.25", - "tokio-util 0.3.1", - "tracing", - "tracing-futures", -] - [[package]] name = "h2" version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -1843,7 +1333,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.17.0", + "tokio", "tokio-util 0.7.1", "tracing", ] @@ -1908,26 +1398,15 @@ dependencies = [ "digest 0.10.3", ] -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi 0.3.9", -] - [[package]] name = "http" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", - "itoa 1.0.1", + "itoa", ] [[package]] @@ -1936,9 +1415,9 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ - "bytes 1.1.0", + "bytes", "http", - "pin-project-lite 0.2.8", + "pin-project-lite", ] [[package]] @@ -1980,19 +1459,19 @@ version = "0.14.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.13", + "h2", "http", "http-body", "httparse", "httpdate", - "itoa 1.0.1", - "pin-project-lite 0.2.8", - "socket2 0.4.4", - "tokio 1.17.0", + "itoa", + "pin-project-lite", + "socket2", + "tokio", "tower-service", "tracing", "want", @@ -2007,7 +1486,7 @@ dependencies = [ "http", "hyper", "rustls 0.20.4", - "tokio 1.17.0", + "tokio", "tokio-rustls 0.23.3", ] @@ -2056,28 +1535,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipconfig" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" -dependencies = [ - "socket2 0.3.19", - "widestring", - "winapi 0.3.9", - "winreg 0.6.2", + "cfg-if", ] [[package]] @@ -2101,18 +1559,33 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -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 = "jemalloc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + +[[package]] +name = "jemallocator" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69" +dependencies = [ + "jemalloc-sys", + "libc", +] + [[package]] name = "jobserver" version = "0.1.24" @@ -2137,7 +1610,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6204285f77fe7d9784db3fdc449ecce1a0114927a51d5a41c4c7a292011c015f" dependencies = [ - "base64 0.13.0", + "base64", "crypto-common", "digest 0.10.3", "hmac", @@ -2146,22 +1619,6 @@ dependencies = [ "sha2 0.10.2", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "language-tags" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - [[package]] name = "language-tags" version = "0.3.2" @@ -2204,12 +1661,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linked-hash-map" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" - [[package]] name = "local-channel" version = "0.1.2" @@ -2244,16 +1695,7 @@ version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", + "cfg-if", ] [[package]] @@ -2263,7 +1705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df1d1bc1084549d60725ccc53a2bfa07f67fe4689fda07b05a36531f2988104a" dependencies = [ "nix", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2272,12 +1714,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - [[package]] name = "matches" version = "0.1.9" @@ -2330,16 +1766,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - [[package]] name = "miniz_oxide" version = "0.5.1" @@ -2349,25 +1775,6 @@ dependencies = [ "adler", ] -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", -] - [[package]] name = "mio" version = "0.8.2" @@ -2376,33 +1783,10 @@ checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", - "miow 0.3.7", + "miow", "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio 0.6.23", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "winapi", ] [[package]] @@ -2411,18 +1795,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2433,7 +1806,7 @@ checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset", ] @@ -2454,7 +1827,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2512,11 +1885,11 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e47cfc4c0a1a519d9a025ebfbac3a2439d1b5cdf397d72dcb79b11d9920dab" dependencies = [ - "base64 0.13.0", + "base64", "chrono", - "getrandom 0.2.6", + "getrandom", "http", - "rand 0.8.5", + "rand", "reqwest", "serde", "serde_json", @@ -2526,15 +1899,6 @@ dependencies = [ "url", ] -[[package]] -name = "object" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.10.0" @@ -2567,10 +1931,10 @@ dependencies = [ "js-sys", "lazy_static", "percent-encoding", - "pin-project 1.0.10", - "rand 0.8.5", + "pin-project", + "rand", "thiserror", - "tokio 1.17.0", + "tokio", "tokio-stream", ] @@ -2610,12 +1974,12 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2624,7 +1988,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -2647,7 +2011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa26fd5c3cd6e6bb83dd9c0cef40fbeb77d7596339ca46c18a6f66919bb07769" dependencies = [ "base64ct", - "rand_core 0.6.3", + "rand_core", "subtle", ] @@ -2732,7 +2096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared", - "rand 0.8.5", + "rand", ] [[package]] @@ -2745,33 +2109,13 @@ dependencies = [ "uncased", ] -[[package]] -name = "pin-project" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" -dependencies = [ - "pin-project-internal 0.4.29", -] - [[package]] name = "pin-project" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal 1.0.10", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "pin-project-internal", ] [[package]] @@ -2785,12 +2129,6 @@ dependencies = [ "syn", ] -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - [[package]] name = "pin-project-lite" version = "0.2.8" @@ -2815,7 +2153,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "opaque-debug 0.3.0", "universal-hash", @@ -2867,19 +2205,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -2887,18 +2212,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -2908,16 +2223,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -2926,16 +2232,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.6", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -2968,12 +2265,12 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76b00c604527d485d7a146d1e324ec1cf0a5ec522acb3d05bf7d51a9c28d7c0c" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-channel", "futures-sink", "futures-util", "log", - "tokio 1.17.0", + "tokio", "tokio-util 0.6.9", ] @@ -2992,7 +2289,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.6", + "getrandom", "redox_syscall", "thiserror", ] @@ -3020,12 +2317,12 @@ version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" dependencies = [ - "base64 0.13.0", - "bytes 1.1.0", + "base64", + "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.13", + "h2", "http", "http-body", "hyper", @@ -3036,30 +2333,20 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project-lite 0.2.8", + "pin-project-lite", "rustls 0.20.4", "rustls-pemfile", "serde", "serde_json", - "serde_urlencoded 0.7.1", - "tokio 1.17.0", + "serde_urlencoded", + "tokio", "tokio-rustls 0.23.3", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "webpki-roots 0.22.3", - "winreg 0.10.1", -] - -[[package]] -name = "resolv-conf" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11834e137f3b14e309437a8276714eed3a80d1ef894869e510f2c0c0b98b9f4a" -dependencies = [ - "hostname", - "quick-error", + "winreg", ] [[package]] @@ -3074,7 +2361,7 @@ dependencies = [ "spin", "untrusted", "web-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3088,12 +2375,6 @@ dependencies = [ "serde", ] -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - [[package]] name = "rustc_version" version = "0.2.3" @@ -3118,7 +2399,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.13.0", + "base64", "log", "ring", "sct 0.6.1", @@ -3143,7 +2424,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" dependencies = [ - "base64 0.13.0", + "base64", ] [[package]] @@ -3234,7 +2515,7 @@ version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ - "itoa 1.0.1", + "itoa", "ryu", "serde", ] @@ -3248,18 +2529,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde", - "url", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3267,7 +2536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.1", + "itoa", "ryu", "serde", ] @@ -3290,7 +2559,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.3", ] @@ -3317,7 +2586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -3329,7 +2598,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.3", ] @@ -3370,17 +2639,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - [[package]] name = "socket2" version = "0.4.4" @@ -3388,7 +2646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3426,13 +2684,13 @@ checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" dependencies = [ "ahash", "atoi", - "base64 0.13.0", + "base64", "bigdecimal", "bit-vec", "bitflags", "bstr", "byteorder", - "bytes 1.1.0", + "bytes", "chrono", "crc", "crossbeam-queue", @@ -3450,7 +2708,7 @@ dependencies = [ "hmac", "indexmap", "ipnetwork", - "itoa 1.0.1", + "itoa", "libc", "log", "mac_address", @@ -3460,7 +2718,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rand 0.8.5", + "rand", "rust_decimal", "rustls 0.19.1", "serde", @@ -3507,9 +2765,9 @@ version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae" dependencies = [ - "actix-rt 2.7.0", + "actix-rt", "once_cell", - "tokio 1.17.0", + "tokio", "tokio-rustls 0.22.0", ] @@ -3598,18 +2856,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - [[package]] name = "tera" version = "1.15.0" @@ -3624,7 +2870,7 @@ dependencies = [ "percent-encoding", "pest", "pest_derive", - "rand 0.8.5", + "rand", "regex", "serde", "serde_json", @@ -3670,15 +2916,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "time" version = "0.1.44" @@ -3687,7 +2924,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3702,7 +2939,7 @@ dependencies = [ "stdweb", "time-macros 0.1.1", "version_check", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3711,7 +2948,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" dependencies = [ - "itoa 1.0.1", + "itoa", "libc", "num_threads", "time-macros 0.2.4", @@ -3761,44 +2998,24 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "iovec", - "lazy_static", - "libc", - "memchr", - "mio 0.6.23", - "mio-uds", - "pin-project-lite 0.1.12", - "signal-hook-registry", - "slab", - "winapi 0.3.9", -] - [[package]] name = "tokio" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" dependencies = [ - "bytes 1.1.0", + "bytes", "libc", "memchr", - "mio 0.8.2", + "mio", "num_cpus", "once_cell", "parking_lot 0.12.0", - "pin-project-lite 0.2.8", + "pin-project-lite", "signal-hook-registry", - "socket2 0.4.4", + "socket2", "tokio-macros", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3819,7 +3036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", - "tokio 1.17.0", + "tokio", "webpki 0.21.4", ] @@ -3830,7 +3047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" dependencies = [ "rustls 0.20.4", - "tokio 1.17.0", + "tokio", "webpki 0.22.0", ] @@ -3841,36 +3058,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", - "pin-project-lite 0.2.8", - "tokio 1.17.0", -] - -[[package]] -name = "tokio-util" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", -] - -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", + "pin-project-lite", + "tokio", ] [[package]] @@ -3879,12 +3068,12 @@ version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.8", - "tokio 1.17.0", + "pin-project-lite", + "tokio", ] [[package]] @@ -3893,11 +3082,11 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-core", "futures-sink", - "pin-project-lite 0.2.8", - "tokio 1.17.0", + "pin-project-lite", + "tokio", "tracing", ] @@ -3922,9 +3111,9 @@ version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", - "pin-project-lite 0.2.8", + "pin-project-lite", "tracing-attributes", "tracing-core", ] @@ -3949,55 +3138,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.0.10", - "tracing", -] - -[[package]] -name = "trust-dns-proto" -version = "0.18.0-alpha.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7f3a2ab8a919f5eca52a468866a67ed7d3efa265d48a652a9a3452272b413f" -dependencies = [ - "async-trait", - "enum-as-inner", - "failure", - "futures", - "idna", - "lazy_static", - "log", - "rand 0.7.3", - "smallvec", - "socket2 0.3.19", - "tokio 0.2.25", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.18.0-alpha.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f90b1502b226f8b2514c6d5b37bafa8c200d7ca4102d57dc36ee0f3b7a04a2f" -dependencies = [ - "cfg-if 0.1.10", - "failure", - "futures", - "ipconfig", - "lazy_static", - "log", - "lru-cache", - "resolv-conf", - "smallvec", - "tokio 0.2.25", - "trust-dns-proto", -] - [[package]] name = "try-lock" version = "0.2.3" @@ -4216,7 +3356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -4230,12 +3370,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" @@ -4254,7 +3388,7 @@ version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -4279,7 +3413,7 @@ version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -4372,18 +3506,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -4394,12 +3516,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -4412,7 +3528,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4464,32 +3580,13 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" -[[package]] -name = "winreg" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "winreg" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", + "winapi", ] [[package]] diff --git a/api/Cargo.toml b/api/Cargo.toml index 43694d6..3b4dd8b 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -4,60 +4,61 @@ version = "0.1.0" edition = "2021" [dependencies] -actix = { version = "0.13.0" } -actix-rt = { version = "2.7.0" } -actix-web = { version = "4.0.1" } -actix-web-httpauth = { version = "0.6.0" } -actix-auth = { version = "0.1.0" } -actix-cors = { version = "0.6.1" } -actix-files = { version = "0.6.0" } -actix-multipart = { version = "0.4.0" } -actix-broker = { version = "0.4.2" } -actix-identity = { version = "0.4.0" } -actix-web-opentelemetry = { version = "0.12.0" } +actix = { version = "0.13.0", features = [] } +actix-rt = { version = "2.7.0", features = [] } +actix-web = { version = "4.0.1", features = [] } +actix-web-httpauth = { version = "0.6.0", features = [] } +actix-cors = { version = "0.6.1", features = [] } +actix-files = { version = "0.6.0", features = [] } +actix-multipart = { version = "0.4.0", features = [] } +actix-broker = { version = "0.4.2", features = [] } +actix-identity = { version = "0.4.0", features = [] } +actix-web-opentelemetry = { version = "0.12.0", features = [] } actix-session = { version = "0.6.2", features = ["actix-redis", "redis-actor-session"] } -actix-redis = { version = "0.11.0" } +actix-redis = { version = "0.11.0", features = [] } -gumdrop = { version = "0.8.1" } +gumdrop = { version = "0.8.1", features = [] } -tera = { version = "1.15.0" } +tera = { version = "1.15.0", features = [] } -tracing = { version = "0.1.33" } +tracing = { version = "0.1.33", features = [] } uuid = { version = "0.8.2", features = ["serde"] } chrono = { version = "*", features = ["serde"] } serde = { version = "1.0.136", features = ["derive"] } -serde_json = { version = "1.0.79" } -toml = { version = "0.5.8" } +serde_json = { version = "1.0.79", features = [] } +toml = { version = "0.5.8", features = [] } sqlx = { version = "0.5.13", features = ["migrate", "runtime-actix-rustls", "all-types", "postgres"] } -sqlx-core = { version = "0.5.13" } +sqlx-core = { version = "0.5.13", features = [] } -thiserror = { version = "1.0.30" } +thiserror = { version = "1.0.30", features = [] } -validator = { version = "0.14.0" } +validator = { version = "0.14.0", features = [] } -log = { version = "0.4.16" } -pretty_env_logger = { version = "0.4.0" } +log = { version = "0.4.16", features = [] } +pretty_env_logger = { version = "0.4.0", features = [] } -dotenv = { version = "0.15.0" } +dotenv = { version = "0.15.0", features = [] } -derive_more = { version = "0.99.17" } -parking_lot = { version = "0.12.0" } +derive_more = { version = "0.99.17", features = [] } +parking_lot = { version = "0.12.0", features = [] } password-hash = { version = "0.4.0", features = ["alloc"] } argon2 = { version = "0.4.0", features = ["parallel", "password-hash"] } rand_core = { version = "0.6", features = ["std"] } tokio = { version = "1.17.0", features = ["full"] } -futures = { version = "0.3.21" } -futures-util = { version = "0.3.21" } +futures = { version = "0.3.21", features = [] } +futures-util = { version = "0.3.21", features = [] } jwt = { version = "0.16.0", features = [] } -hmac = { version = "0.12.1" } -sha2 = { version = "0.10.2" } +hmac = { version = "0.12.1", features = [] } +sha2 = { version = "0.10.2", features = [] } -oauth2 = { version = "4.1.0" } +oauth2 = { version = "4.1.0", features = [] } -async-trait = { version = "0.1.53" } +async-trait = { version = "0.1.53", features = [] } + +jemallocator = { version = "0.3.2", features = [] } diff --git a/api/src/actors/cart_manager.rs b/api/src/actors/cart_manager.rs index a0554ae..9ecd9da 100644 --- a/api/src/actors/cart_manager.rs +++ b/api/src/actors/cart_manager.rs @@ -1,11 +1,25 @@ use actix::{Actor, Addr, Context, Message}; -use crate::database::Database; +use crate::database::{self, Database}; use crate::model::{ AccountId, ProductId, Quantity, QuantityUnit, ShoppingCartId, ShoppingCartItem, ShoppingCartItemId, ShoppingCartState, }; -use crate::{cart_async_handler, database}; + +#[macro_export] +macro_rules! cart_async_handler { + ($msg: ty, $async: ident, $res: ty) => { + impl actix::Handler<$msg> for CartManager { + type Result = actix::ResponseActFuture>; + + fn handle(&mut self, msg: $msg, _ctx: &mut Self::Context) -> Self::Result { + use actix::WrapFuture; + let db = self.db.clone(); + Box::pin(async { $async(msg, db).await }.into_actor(self)) + } + } + }; +} #[derive(Debug, thiserror::Error)] pub enum Error { diff --git a/api/src/actors/database.rs b/api/src/actors/database.rs index 426679c..1c3f2fe 100644 --- a/api/src/actors/database.rs +++ b/api/src/actors/database.rs @@ -18,6 +18,21 @@ pub mod shopping_carts; pub mod stocks; pub mod tokens; +#[macro_export] +macro_rules! db_async_handler { + ($msg: ty, $async: ident, $res: ty) => { + impl actix::Handler<$msg> for Database { + type Result = actix::ResponseActFuture>; + + fn handle(&mut self, msg: $msg, _ctx: &mut Self::Context) -> Self::Result { + use actix::WrapFuture; + let pool = self.pool.clone(); + Box::pin(async { $async(msg, pool).await }.into_actor(self)) + } + } + }; +} + #[derive(Debug, thiserror::Error)] pub enum Error { #[error("Failed to connect to database. {0:?}")] @@ -46,6 +61,8 @@ pub struct Database { pool: PgPool, } +pub type SharedDatabase = actix::Addr; + impl Clone for Database { fn clone(&self) -> Self { Self { diff --git a/api/src/actors/mod.rs b/api/src/actors/mod.rs index 4ea0123..b921207 100644 --- a/api/src/actors/mod.rs +++ b/api/src/actors/mod.rs @@ -1,3 +1,4 @@ pub mod cart_manager; pub mod database; +pub mod order_manager; pub mod token_manager; diff --git a/api/src/actors/order_manager.rs b/api/src/actors/order_manager.rs new file mode 100644 index 0000000..bae3a1c --- /dev/null +++ b/api/src/actors/order_manager.rs @@ -0,0 +1,70 @@ +use actix::Addr; +use actix_web::Message; +use sqlx_core::postgres::PgPool; + +use crate::database::{Database, SharedDatabase, self}; +use crate::model::{AccountOrder, OrderStatus, ShoppingCartId}; + +#[macro_export] +macro_rules! order_async_handler { + ($msg: ty, $async: ident, $res: ty) => { + impl actix::Handler<$msg> for OrderManager { + type Result = actix::ResponseActFuture>; + + fn handle(&mut self, msg: $msg, _ctx: &mut Self::Context) -> Self::Result { + use actix::WrapFuture; + let db = self.db.clone(); + Box::pin(async { $async(msg, db).await }.into_actor(self)) + } + } + }; +} + +#[derive(Debug, thiserror::Error)] +pub enum Error {} + +pub type Result = std::result::Result; + +pub struct OrderManager { + db: SharedDatabase, +} + +impl actix::Actor for OrderManager { + type Context = actix::Context; +} + +impl OrderManager { + pub fn new(db: SharedDatabase) -> Self { + Self { db } + } +} + +#[derive(Message, Debug)] +#[rtype(result = "Result")] +pub struct CreateOrder { + pub shopping_cart_id: ShoppingCartId, +} + +pub(crate) async fn create_order(msg: CreateOrder, db: SharedDatabase) -> Result { + let cart = match db.send(database) +} + +pub fn change(current: OrderStatus, next: OrderStatus) -> Option { + match (current, next) { + // paying + (OrderStatus::Confirmed, OrderStatus::Payed) => Some(OrderStatus::Payed), + + // delivering + (OrderStatus::Confirmed | OrderStatus::Payed, OrderStatus::Delivered) => { + Some(OrderStatus::Delivered) + } + + // cancelling + (OrderStatus::Confirmed, OrderStatus::Cancelled) => Some(OrderStatus::Cancelled), + (OrderStatus::Payed, OrderStatus::Cancelled) => Some(OrderStatus::RequireRefund), + (OrderStatus::Payed, OrderStatus::RequireRefund) => Some(OrderStatus::RequireRefund), + (OrderStatus::RequireRefund, OrderStatus::Refunded) => Some(OrderStatus::Refunded), + + _ => None, + } +} diff --git a/api/src/actors/token_manager.rs b/api/src/actors/token_manager.rs index 828ef5e..1b3edbd 100644 --- a/api/src/actors/token_manager.rs +++ b/api/src/actors/token_manager.rs @@ -10,7 +10,23 @@ use sha2::Sha256; use crate::database::{Database, TokenByJti}; use crate::model::{AccountId, Audience, Token, TokenString}; -use crate::{database, token_async_handler, Role}; +use crate::{database, Role}; + +#[macro_export] +macro_rules! token_async_handler { + ($msg: ty, $async: ident, $res: ty) => { + impl actix::Handler<$msg> for TokenManager { + type Result = actix::ResponseActFuture>; + + fn handle(&mut self, msg: $msg, _ctx: &mut Self::Context) -> Self::Result { + use actix::WrapFuture; + let db = self.db.clone(); + let secret = self.secret.clone(); + Box::pin(async { $async(msg, db, secret).await }.into_actor(self)) + } + } + }; +} /*struct Jwt { /// cti (customer id): Customer uuid identifier used by payment service diff --git a/api/src/logic/order_state.rs b/api/src/logic/order_state.rs index 5843ef2..8093113 100644 --- a/api/src/logic/order_state.rs +++ b/api/src/logic/order_state.rs @@ -1,21 +1 @@ use crate::model::OrderStatus; - -pub fn change(current: OrderStatus, next: OrderStatus) -> Option { - match (current, next) { - // paying - (OrderStatus::Confirmed, OrderStatus::Payed) => Some(OrderStatus::Payed), - - // delivering - (OrderStatus::Confirmed | OrderStatus::Payed, OrderStatus::Delivered) => { - Some(OrderStatus::Delivered) - } - - // cancelling - (OrderStatus::Confirmed, OrderStatus::Cancelled) => Some(OrderStatus::Cancelled), - (OrderStatus::Payed, OrderStatus::Cancelled) => Some(OrderStatus::RequireRefund), - (OrderStatus::Payed, OrderStatus::RequireRefund) => Some(OrderStatus::RequireRefund), - (OrderStatus::RequireRefund, OrderStatus::Refunded) => Some(OrderStatus::Refunded), - - _ => None, - } -} diff --git a/api/src/main.rs b/api/src/main.rs index 17b357e..4f60014 100644 --- a/api/src/main.rs +++ b/api/src/main.rs @@ -9,6 +9,7 @@ use actix_web::middleware::Logger; use actix_web::web::Data; use actix_web::{App, HttpServer}; use gumdrop::Options; +use jemallocator::Jemalloc; use password_hash::SaltString; use validator::{validate_email, validate_length}; @@ -20,7 +21,9 @@ pub mod actors; pub mod logic; pub mod model; pub mod routes; -mod utils; + +#[global_allocator] +static GLOBAL: Jemalloc = Jemalloc; trait ResolveDbUrl { fn own_db_url(&self) -> Option; diff --git a/api/src/routes/admin/mod.rs b/api/src/routes/admin.rs similarity index 98% rename from api/src/routes/admin/mod.rs rename to api/src/routes/admin.rs index 52f8e60..3c82571 100644 --- a/api/src/routes/admin/mod.rs +++ b/api/src/routes/admin.rs @@ -178,7 +178,7 @@ async fn register( async fn landing() -> Result { Ok(HttpResponse::NotImplemented() .append_header(("Content-Type", "text/html")) - .body(include_str!("../../../assets/index.html"))) + .body(include_str!("../../assets/index.html"))) } pub fn configure(config: &mut ServiceConfig) { diff --git a/api/src/routes/public/api_v1.rs b/api/src/routes/public/api_v1.rs index 6ec4829..640cbad 100644 --- a/api/src/routes/public/api_v1.rs +++ b/api/src/routes/public/api_v1.rs @@ -20,7 +20,7 @@ pub enum Error { AddItem, } -pub fn configure(config: &mut ServiceConfig) { +pub(crate) fn configure(config: &mut ServiceConfig) { config.service( scope("/api/v1") .configure(unrestricted::configure) diff --git a/api/src/routes/public/api_v1/restricted.rs b/api/src/routes/public/api_v1/restricted.rs index 3e8f2e9..60c6833 100644 --- a/api/src/routes/public/api_v1/restricted.rs +++ b/api/src/routes/public/api_v1/restricted.rs @@ -186,7 +186,9 @@ async fn delete_cart_item( } } -pub fn configure(config: &mut ServiceConfig) { +pub(crate) async fn create_order() {} + +pub(crate) fn configure(config: &mut ServiceConfig) { config.service(scope("") .app_data(actix_web_httpauth::extractors::bearer::Config::default() .realm("user api") diff --git a/api/src/routes/public/api_v1/unrestricted.rs b/api/src/routes/public/api_v1/unrestricted.rs index 0c2be4c..6bd5532 100644 --- a/api/src/routes/public/api_v1/unrestricted.rs +++ b/api/src/routes/public/api_v1/unrestricted.rs @@ -84,6 +84,6 @@ async fn sign_in( Ok(HttpResponse::Created().json(SignInOutput { token: string })) } -pub fn configure(config: &mut ServiceConfig) { +pub(crate) fn configure(config: &mut ServiceConfig) { config.service(products).service(stocks).service(sign_in); } diff --git a/api/src/utils.rs b/api/src/utils.rs deleted file mode 100644 index 49006de..0000000 --- a/api/src/utils.rs +++ /dev/null @@ -1,45 +0,0 @@ -#[macro_export] -macro_rules! db_async_handler { - ($msg: ty, $async: ident, $res: ty) => { - impl actix::Handler<$msg> for Database { - type Result = actix::ResponseActFuture>; - - fn handle(&mut self, msg: $msg, _ctx: &mut Self::Context) -> Self::Result { - use actix::WrapFuture; - let pool = self.pool.clone(); - Box::pin(async { $async(msg, pool).await }.into_actor(self)) - } - } - }; -} - -#[macro_export] -macro_rules! cart_async_handler { - ($msg: ty, $async: ident, $res: ty) => { - impl actix::Handler<$msg> for CartManager { - type Result = actix::ResponseActFuture>; - - fn handle(&mut self, msg: $msg, _ctx: &mut Self::Context) -> Self::Result { - use actix::WrapFuture; - let db = self.db.clone(); - Box::pin(async { $async(msg, db).await }.into_actor(self)) - } - } - }; -} - -#[macro_export] -macro_rules! token_async_handler { - ($msg: ty, $async: ident, $res: ty) => { - impl actix::Handler<$msg> for TokenManager { - type Result = actix::ResponseActFuture>; - - fn handle(&mut self, msg: $msg, _ctx: &mut Self::Context) -> Self::Result { - use actix::WrapFuture; - let db = self.db.clone(); - let secret = self.secret.clone(); - Box::pin(async { $async(msg, db, secret).await }.into_actor(self)) - } - } - }; -}