get-convex
diff --git a/‎Cargo.lock‎
Lines changed: 375 additions & 249 deletions b/‎Cargo.lock‎
Lines changed: 375 additions & 249 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 23 additions & 20 deletions b/‎Cargo.toml‎
Lines changed: 23 additions & 20 deletions
diff --git a/‎crates/authentication/src/lib.rs‎
Lines changed: 12 additions & 10 deletions b/‎crates/authentication/src/lib.rs‎
Lines changed: 12 additions & 10 deletions
diff --git a/‎crates/common/Cargo.toml‎
Lines changed: 3 additions & 0 deletions b/‎crates/common/Cargo.toml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎crates/common/src/grpc/mod.rs‎
Lines changed: 2 additions & 3 deletions b/‎crates/common/src/grpc/mod.rs‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎crates/common/src/http/extract.rs‎
Lines changed: 3 additions & 10 deletions b/‎crates/common/src/http/extract.rs‎
Lines changed: 3 additions & 10 deletions
diff --git a/‎crates/common/src/http/fetch.rs‎
Lines changed: 1 addition & 1 deletion b/‎crates/common/src/http/fetch.rs‎
Lines changed: 1 addition & 1 deletion
@@ -15,7 +15,8 @@ async_zip = { version = "0.0.9", default-features = false, features = [ "zstd",
 cbc = { version = "0.1.2" }
 csv-async = "1.2"
 atomic_refcell = "0.1.13"
-axum = { version = "0.6", features = [ "headers", "ws", "original-uri", "macros", "multipart" ] }
+axum = { version = "0.7", features = [ "ws", "original-uri", "macros", "multipart" ] }
+axum-extra = { version = "0.9.3", features = [ "typed-header" ] }
 base32 = "0.4.0"
 base-62 = { rev = "6f91a3da4b83f20379469835f64195bd52d7b9dd", git = "https://github.com/kryptco/base62.rs" }
 base64 = "0.13"
@@ -49,15 +50,17 @@ futures = "0.3"
 futures-async-stream = "0.2.11"
 futures-util = "0.3.30"
 governor = "0.6.0"
-headers = "0.3"
+headers = "0.4"
 hex = "0.4"
 home = "0.5"
 enum-iterator = "2.0.0"
-http = "0.2.8"
+http = "1.0.0"
 http-cache = { version = "0.18", default-features = false }
-http-cache-reqwest = { version = "0.13.0", features = [ "manager-moka" ] }
+http-body-util = "0.1.2"
+http-cache-reqwest = { version = "0.14.0", features = [ "manager-moka" ] }
 humansize = { version = "2.1.3", features = [ "impl_style" ] }
-hyper = "0.14.16"
+hyper = "1.3.1"
+hyper-util = { version = "0.1.5", features = [ "server-graceful" ] }
 proc-macro2 = { version = "1.0" }
 imbl = "3.0.0"
 itertools = "0.13"
@@ -85,10 +88,10 @@ prometheus = { git = "https://github.com/get-convex/rust-prometheus", rev = "061
 prometheus-hyper = "0.2.0"
 proptest = "1"
 proptest-derive = "0.4.0"
-proptest-http = { git = "https://github.com/sujayakar/proptest-http", rev = "12ef4c4ac2002b050ab0944a9587d83d7ea9fce2" }
-prost = "0.12"
-prost-types = "0.12"
-prost-reflect = { version = "0.13.1", features = [ "text-format", "miette" ] }
+proptest-http = { git = "https://github.com/nipunn1313/proptest-http", rev = "0e658bd4f6dbb73bdd3be66f0d2c34c00cc3a446" }
+prost = "0.13"
+prost-types = "0.13"
+prost-reflect = { version = "0.14.0", features = [ "text-format", "miette" ] }
 pyo3 = "0.20.3"
 pyo3-asyncio = { version = "0.20.0", features = [ "tokio-runtime" ] }
 pyo3-build-config = { version = "0.20.3", features = [ "resolve-config" ] }
@@ -99,15 +102,15 @@ rand = "0.8"
 rand_chacha = "0.3.1"
 ref-cast = "1.0.20"
 regex = "1"
-reqwest = { version = "0.11.24", features = [ "json", "stream", "gzip", "native-tls-vendored" ] }
-reqwest-middleware = "0.2.0"
+reqwest = { version = "0.12.1", features = [ "json", "stream", "gzip", "native-tls-vendored" ] }
+reqwest-middleware = "0.3.2"
 ring = "0.17.8"
 rsa = "0.9.6"
 rusqlite = { version = "0.30", features = [ "bundled" ] }
 saffron = { git = "https://github.com/get-convex/saffron", rev = "1d842379919fb5c1988ac127cebd6167b1eb9bec", features = [ "std" ] }
 schemars = { version = "0.8" }
 semver = { version = "1", features = [ "serde" ] }
-sentry = { version = "0.31", features = [ "anyhow", "tower", "tower-http" ] }
+sentry = { version = "0.32", features = [ "anyhow", "tower", "tower-http" ] }
 serde = { version = "1", features = [ "derive" ] }
 serde_json = { version = "1", features = [ "float_roundtrip", "preserve_order" ] }
 sha1 = { version = "0.10.5", features = [ "oid" ] }
@@ -128,19 +131,19 @@ tokio = { version = "1", features = [ "full" ] }
 tokio-metrics-collector = { version = "0.2.1" }
 tokio-process-stream = { version = "0.4.0" }
 tokio-stream = { version = "0.1", features = [ "io-util", "sync", "signal" ] }
-tokio-tungstenite = { version = "0.20.0", features = [ "native-tls-vendored" ] }
-tonic = { version = "0.10.2", features = [ "gzip" ] }
-tonic-build = "0.10.0"
-tonic-health = "0.10.0"
+tokio-tungstenite = { version = "0.21.0", features = [ "native-tls-vendored" ] }
+tonic = { version = "0.12.0", features = [ "gzip" ] }
+tonic-build = "0.12.0"
+tonic-health = "0.12.0"
 tower = { version = "0.4", features = [ "limit", "timeout" ] }
-tower-cookies = "0.9"
-tower-http = { version = "0.4", features = [ "trace", "cors", "decompression-br" ] }
+tower-cookies = "0.10"
+tower-http = { version = "0.5", features = [ "trace", "cors", "decompression-br" ] }
 tracing = "0.1"
 tracing-appender = { version = "0.2" }
 tracing-subscriber = { version = "0.3.17", features = [ "env-filter", "json" ] }
 tracy-client = { version = "0.17.0", default-features = false, features = [ "fibers" ] }
-tungstenite = { version = "0.20.0", features = [ "native-tls-vendored" ] }
-url = "2"
+tungstenite = { version = "0.21.0", features = [ "url", "native-tls-vendored" ] }
+url = "2.5.2"
 urlencoding = "2.1.3"
 uuid = { version = "1.6", features = [ "serde", "v4" ] }
 walkdir = "2"
 
@@ -19,12 +19,6 @@ use chrono::TimeZone;
 use common::auth::AuthInfo;
 use errors::ErrorMetadata;
 use futures::Future;
-use http::{
-    header::ACCEPT,
-    HeaderValue,
-    Method,
-    StatusCode,
-};
 use keybroker::UserIdentity;
 use oauth2::{
     HttpRequest,
@@ -36,6 +30,12 @@ use openidconnect::{
         CoreIdTokenVerifier,
         CoreProviderMetadata,
     },
+    http::{
+        header::ACCEPT,
+        HeaderValue,
+        Method,
+        StatusCode,
+    },
     ClaimsVerificationError,
     ClientId,
     DiscoveryError,
@@ -162,9 +162,11 @@ where
             match e {
                 DiscoveryError::Response(code, body, _) => {
                     let long = format!("{long}: {} {}", code, String::from_utf8_lossy(&body));
-                    if let Some(em) =
-                        ErrorMetadata::from_http_status_code(code, short, long.clone())
-                    {
+                    if let Some(em) = ErrorMetadata::from_http_status_code(
+                        code.to_string().parse().unwrap(),
+                        short,
+                        long.clone(),
+                    ) {
                         em
                     } else {
                         ErrorMetadata::bad_request(short, long)
@@ -397,7 +399,6 @@ mod tests {
         Future,
         FutureExt,
     };
-    use http::StatusCode;
     use keybroker::testing::TEST_SIGNING_KEY;
     use openidconnect::{
         core::{
@@ -413,6 +414,7 @@ mod tests {
             CoreResponseType,
             CoreSubjectIdentifierType,
         },
+        http::StatusCode,
         AdditionalClaims,
         Audience,
         EmptyAdditionalClaims,
 
@@ -30,11 +30,14 @@ event-listener = { workspace = true }
 float_next_after = { workspace = true }
 futures = { workspace = true }
 futures-async-stream = { workspace = true }
+futures-util = { workspace = true }
 governor = { workspace = true }
 headers = { workspace = true }
 hex = { workspace = true }
 http = { workspace = true }
+http-body-util = { workspace = true }
 hyper = { workspace = true }
+hyper-util = { workspace = true }
 imbl = { workspace = true }
 itertools = { workspace = true }
 maplit = { workspace = true }
 
@@ -3,12 +3,11 @@ use std::{
     net::SocketAddr,
 };
 
-use axum::body::Body;
 use futures::Future;
 use sentry::integrations::tower as sentry_tower;
 use tonic::{
     server::NamedService,
-    transport::server::Routes,
+    service::Routes,
 };
 use tonic_health::{
     server::{
@@ -39,7 +38,7 @@ impl ConvexGrpcService {
     pub fn add_service<S>(mut self, service: S) -> Self
     where
         S: tower::Service<
-                http::Request<Body>,
+                http::Request<tonic::body::BoxBody>,
                 Response = http::Response<tonic::body::BoxBody>,
                 Error = Infallible,
             > + NamedService
 
@@ -2,20 +2,16 @@ use std::time::Instant;
 
 use async_trait::async_trait;
 use axum::{
-    body::HttpBody,
     extract::{
         FromRequest,
         FromRequestParts,
-    },
-    http::request::{
-        Parts,
         Request,
     },
+    http::request::Parts,
     response::{
         IntoResponse,
         Response,
     },
-    BoxError,
 };
 use errors::ErrorMetadata;
 use serde::{
@@ -90,17 +86,14 @@ pub struct Json<T>(pub T);
 /// Wrapper type around axum::Json that uses HttpResponseError instead
 /// of JsonRejection to make sure we get propper logging / error reporting.
 #[async_trait]
-impl<S, B, T> FromRequest<S, B> for Json<T>
+impl<S, T> FromRequest<S> for Json<T>
 where
     T: DeserializeOwned,
-    B: HttpBody + Send + 'static,
-    B::Data: Send,
-    B::Error: Into<BoxError>,
     S: Send + Sync,
 {
     type Rejection = HttpResponseError;
 
-    async fn from_request(req: Request<B>, state: &S) -> Result<Self, Self::Rejection> {
+    async fn from_request(req: Request, state: &S) -> Result<Self, Self::Rejection> {
         #[allow(clippy::disallowed_types)]
         let t = axum::Json::<T>::from_request(req, state)
             .await
 
@@ -242,7 +242,7 @@ mod tests {
 
         // Ensure it doesn't panic. Regression test for.
         // https://github.com/seanmonstar/reqwest/issues/668
-        assert!(err.to_string().contains("Parsed Url is not a valid Uri"));
+        assert!(format!("{err:?}").contains("Parsed Url is not a valid Uri"));
 
         Ok(())
     }
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ mod tests {`
`242`	`242`
`243`	`243`	`// Ensure it doesn't panic. Regression test for.`
`244`	`244`	`// https://github.com/seanmonstar/reqwest/issues/668`
`245`		`- assert!(err.to_string().contains("Parsed Url is not a valid Uri"));`
	`245`	`+ assert!(format!("{err:?}").contains("Parsed Url is not a valid Uri"));`
`246`	`246`
`247`	`247`	`Ok(())`
`248`	`248`	`}`