Skip to content

Commit

Permalink
Merge pull request #213 from frog-pond/hawken/updates
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkrives authored Jan 25, 2025
2 parents ed61e39 + 2c365b5 commit 67f8ded
Show file tree
Hide file tree
Showing 13 changed files with 245 additions and 231 deletions.
106 changes: 70 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,29 @@ members = [
"ccc-types",
"e2e",
]

[workspace.dependencies]
axum = "0.7.4"
axum-macros = "0.4.1"
bytes = "1.5.0"
ccc-handlers = { path = "./ccc-handlers" }
ccc-proxy = { path = "./ccc-proxy" }
ccc-routes = { path = "./ccc-routes" }
ccc-types = { path = "./ccc-types" }
chrono = { version = "0.4", features = ["serde"] }
clap = { version = "4.5.3", features = ["derive"] }
http = "1.1.0"
phf = { version = "0.11.2", features = ["macros"] }
reqwest = { version = "0.12.0", features = ["json"] }
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.114"
serde_urlencoded = "0.7.1"
similar = "2.4.0"
thiserror = "1.0.58"
tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] }
tower = { version = "0.4.13", features = ["filter", "timeout"] }
tower-http = { version = "0.5.2", features = ["trace"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
ts-rs = { version = "8.0.0" }
url = "2.5.0"
26 changes: 13 additions & 13 deletions ccc-handlers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ edition = "2021"
publish = false

[dependencies]
ccc-proxy = { path = "../ccc-proxy" }
ccc-types = { path = "../ccc-types" }
axum = "0.8.0"
axum-macros = "0.5.0"
http = "1.1.0"
reqwest = { version = "0.12.0", features = ["json"] }
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.114"
thiserror = { version = "2.0.0" }
tracing = "0.1.40"
serde_urlencoded = "0.7.1"
phf = { version = "0.11.2", features = ["macros"] }
chrono = { version = "0.4", features = ["serde"] }
ccc-proxy = { workspace = true }
ccc-types = { workspace = true }
axum = { workspace = true }
axum-macros = { workspace = true }
http = { workspace = true }
reqwest = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
serde_urlencoded = { workspace = true }
phf = { workspace = true }
chrono = { workspace = true }
16 changes: 8 additions & 8 deletions ccc-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
axum = "0.8.0"
bytes = "1.5.0"
http = "1.1.0"
reqwest = { version = "0.12.0", features = ["json"] }
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.114"
thiserror = { version = "2.0.0" }
tracing = "0.1.40"
axum = { workspace = true }
bytes = { workspace = true }
http = { workspace = true }
reqwest = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
2 changes: 1 addition & 1 deletion ccc-proxy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub struct Proxy {
pub static GLOBAL_PROXY: OnceLock<Proxy> = OnceLock::new();

pub fn global_proxy() -> &'static Proxy {
GLOBAL_PROXY.get_or_init(|| Proxy::default())
GLOBAL_PROXY.get_or_init(Proxy::default)
}

fn user_agent() -> HeaderValue {
Expand Down
4 changes: 2 additions & 2 deletions ccc-routes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2021"
publish = false

[dependencies]
axum = "0.8.0"
ccc-handlers = { path = "../ccc-handlers" }
axum = { workspace = true }
ccc-handlers = { workspace = true }
Loading

0 comments on commit 67f8ded

Please sign in to comment.