diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 21b79952..1ae16ae3 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -36,6 +36,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b0e3b97a21e41ec5c19bfd9b4fc1f7086be104f8b988681230247ffc91cc8ed" dependencies = [ "axum", + "axum-extra", "bytes", "cfg-if", "http", @@ -121,7 +122,7 @@ dependencies = [ "async-trait", "axum-core", "axum-macros", - "base64", + "base64 0.22.1", "bytes", "futures-util", "http", @@ -171,6 +172,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum-extra" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" +dependencies = [ + "axum", + "axum-core", + "bytes", + "fastrand", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "mime", + "multer", + "pin-project-lite", + "serde", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-macros" version = "0.4.2" @@ -197,6 +222,12 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -442,6 +473,15 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -666,6 +706,30 @@ dependencies = [ "hashbrown 0.14.5", ] +[[package]] +name = "headers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http", +] + [[package]] name = "heck" version = "0.5.0" @@ -1136,6 +1200,23 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "multer" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http", + "httparse", + "memchr", + "mime", + "spin", + "version_check", +] + [[package]] name = "nom" version = "7.1.3" @@ -1816,7 +1897,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" dependencies = [ "atoi", - "base64", + "base64 0.22.1", "bitflags", "byteorder", "bytes", @@ -1860,7 +1941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" dependencies = [ "atoi", - "base64", + "base64 0.22.1", "bitflags", "byteorder", "chrono", @@ -1952,24 +2033,17 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync-wasm" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "getrandom", - "reconcile", - "sync_lib", - "wasm-bindgen", - "wasm-bindgen-test", -] - [[package]] name = "sync_lib" version = "0.1.0" dependencies = [ - "base64", + "base64 0.22.1", + "console_error_panic_hook", + "getrandom", + "reconcile", "thiserror", + "wasm-bindgen", + "wasm-bindgen-test", ] [[package]] @@ -1979,6 +2053,7 @@ dependencies = [ "aide", "anyhow", "axum", + "axum-extra", "chrono", "log", "rand", @@ -1990,6 +2065,7 @@ dependencies = [ "sync_lib", "thiserror", "tokio", + "tower-http", "tracing-subscriber", "uuid", ] @@ -2186,6 +2262,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower-http" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" +dependencies = [ + "bitflags", + "bytes", + "http", + "pin-project-lite", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 3c92fd6a..e3ca72ae 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -3,7 +3,6 @@ resolver = "2" members = [ "reconcile", "fuzz", - "sync_wasm", "sync_server", "sync_lib" ]