diff --git a/backend/Cargo.lock b/backend/Cargo.lock index cf34e184..f414df5f 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -29,6 +29,15 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + [[package]] name = "aide" version = "0.13.4" @@ -1142,6 +1151,15 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "matchit" version = "0.7.3" @@ -1500,6 +1518,50 @@ dependencies = [ "bitflags", ] +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + [[package]] name = "rsa" version = "0.9.7" @@ -2079,6 +2141,7 @@ dependencies = [ "thiserror", "tokio", "tower-http", + "tracing", "tracing-subscriber", "uuid", ] @@ -2284,9 +2347,11 @@ dependencies = [ "bitflags", "bytes", "http", + "http-body", "pin-project-lite", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -2351,10 +2416,14 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ + "matchers", "nu-ansi-term", + "once_cell", + "regex", "sharded-slab", "smallvec", "thread_local", + "tracing", "tracing-core", "tracing-log", ] diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 2aad6f49..8d7e0221 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -13,9 +13,6 @@ rust-version = "1.83" [workspace.dependencies] serde = { version = "1.0.214", default-features = false, features = ["derive"] } thiserror = { version = "1.0.66", default-features = false } -uuid = { version = "1.11.0", default-features = false, features = ["v4", "serde"] } -log = { version = "0.4.22", default-features = false } -anyhow = { version = "1.0.94", features = ["backtrace"] } [profile.release] codegen-units = 1 diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml index 489e7810..bc77f964 100644 --- a/backend/reconcile/Cargo.toml +++ b/backend/reconcile/Cargo.toml @@ -4,7 +4,6 @@ version = "0.1.0" edition = "2021" [dependencies] -# optional dependencies serde = { version = "1.0.215", optional = true } [features] diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml index a21b01e6..1e3d23d0 100644 --- a/backend/sync_lib/Cargo.toml +++ b/backend/sync_lib/Cargo.toml @@ -12,7 +12,7 @@ base64 = "0.22.1" reconcile = { path = "../reconcile" } wasm-bindgen = "0.2.84" getrandom = { version = "0.2.3", features = ["js"] } -thiserror = {workspace = true} +thiserror = { workspace = true } # The `console_error_panic_hook` crate provides better debugging of panics by # logging them with `console.error`. This is great for development, but requires diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml index 2fbfeef2..4a6d49f5 100644 --- a/backend/sync_server/Cargo.toml +++ b/backend/sync_server/Cargo.toml @@ -7,23 +7,24 @@ edition = "2021" reconcile = { path = "../reconcile" } sync_lib = { path = "../sync_lib" } -serde = {workspace = true} -thiserror = {workspace = true} -anyhow = {workspace = true} -log = {workspace = true} -uuid = {workspace = true} +serde = { workspace = true } +thiserror = { workspace = true } -axum = { version = "0.7.9", features = ["ws", "macros"]} tokio = { version = "1.42.0", features = ["full"]} -tracing-subscriber = "0.3.19" +uuid = { version = "1.11.0", features = ["v4", "serde"] } +log = { version = "0.4.22" } +anyhow = { version = "1.0.94", features = ["backtrace"] } +axum = { version = "0.7.9", features = ["ws", "macros", "tracing"]} +axum-extra = { version = "0.9.6", features = ["typed-header"] } +tower-http = { version = "0.6.1", features = ["cors", "trace"] } +tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]} serde_yaml = "0.9.34" sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] } chrono = { version = "0.4.38", features = ["serde"] } aide = { version = "0.13.4", features = ["axum", "axum-ws", "scalar", "axum-headers"] } schemars = { version = "0.8.21", features = ["chrono", "uuid1"] } +tracing = "0.1" rand = "0.8.5" -axum-extra = { version = "0.9.6", features = ["typed-header"] } -tower-http = { version = "0.6.1", features = ["cors"] } [lints] workspace = true