eggfetch 0.2.2__tar.gz → 0.3.0__tar.gz

{eggfetch-0.2.2 → eggfetch-0.3.0}/Cargo.lock

@@ -19,15 +19,15 @@ dependencies = [
 
 [[package]]
 name = "alloc-no-stdlib"
-version = "2.0.4"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+checksum = "c2fb6cfd47bf496ff64095c20eaba0c201404ee38714d4142fcfa1dc334fcc7a"
 
 [[package]]
 name = "alloc-stdlib"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195"
+checksum = "0b5c1865780388bfa186411ab5f247819487fc4864c6e9c3106611fa347586e1"
 dependencies = [
  "alloc-no-stdlib",
 ]
@@ -96,9 +96,9 @@ checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "async-compression"
-version = "0.4.42"
+version = "0.4.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac"
+checksum = "9d5755640120b24961f8231e05892e4a4f7e0d04e8aeca161508c9c397946970"
 dependencies = [
  "compression-codecs",
  "compression-core",
@@ -159,9 +159,9 @@ checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 
 [[package]]
 name = "brotli"
-version = "8.0.4"
+version = "9.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc91aac060a7a1e25823bdccbfb6af1875b88f17c6daac97894eed8207166b3"
+checksum = "627b7cfb0578f0eafce087a90fcd40add1231900b69e4d4de2d456260a4f5d81"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -170,9 +170,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "5.0.3"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583"
+checksum = "34c6783f42c21c952ad7112b354f0ba2f10760e9decea5b1b60523d6e270faaf"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -316,9 +316,9 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "compression-codecs"
-version = "0.4.38"
+version = "0.4.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf"
+checksum = "cae36683101b2899f48bd31f8db9839437356188e3b1ff23096e73dab09ba8fe"
 dependencies = [
  "brotli",
  "compression-core",
@@ -330,9 +330,9 @@ dependencies = [
 
 [[package]]
 name = "compression-core"
-version = "0.4.32"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789"
+checksum = "2ebdda89edc534bf8d5dd2857562633b6495557e5846552ade994b99ed13c36a"
 
 [[package]]
 name = "convert_case"
@@ -505,7 +505,7 @@ dependencies = [
 
 [[package]]
 name = "eggfetch-cli"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -514,15 +514,20 @@ dependencies = [
  "eggfetch-core",
  "flate2",
  "futures-util",
+ "h2",
  "http",
+ "rcgen",
+ "rustls",
  "serde_json",
  "tempfile",
  "tokio",
+ "tokio-rustls",
+ "tracing",
 ]
 
 [[package]]
 name = "eggfetch-core"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "async-compression",
  "base64 0.23.1",
@@ -568,7 +573,7 @@ dependencies = [
 
 [[package]]
 name = "eggfetch-ffi"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "bytes",
  "eggfetch-core",
@@ -580,7 +585,7 @@ dependencies = [
 
 [[package]]
 name = "eggfetch-http-connect"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "base64 0.23.1",
  "thiserror",
@@ -589,7 +594,7 @@ dependencies = [
 
 [[package]]
 name = "eggfetch-node"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "eggfetch-ffi",
  "napi",
@@ -601,7 +606,7 @@ dependencies = [
 
 [[package]]
 name = "eggfetch-python"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "bytes",
  "eggfetch-core",
@@ -642,7 +647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1097,7 +1102,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1545,9 +1550,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.16"
+version = "0.11.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
+checksum = "a9746dbde176634f4f2f1faf2404e30a31b2bc1e9cafb5329c95d8177a18c9fc"
 dependencies = [
  "bytes",
  "getrandom 0.4.3",
@@ -1576,7 +1581,7 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1751,14 +1756,14 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.45"
+version = "0.23.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634"
+checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf"
 dependencies = [
  "log",
  "once_cell",
@@ -1793,9 +1798,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.15"
+version = "0.103.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
+checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -2010,7 +2015,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2110,9 +2115,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.52.3"
+version = "1.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
+checksum = "ce3335fa71841cda333a58d7615b03901380ecf09d59b3296d21f8bbac0dde4e"
 dependencies = [
  "bytes",
  "libc",
@@ -2360,14 +2365,14 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "webpki-roots 1.0.8",
+ "webpki-roots 1.0.10",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf"
+checksum = "1c1c8e20c8a38fc7d65abfe74eb7280e4aa667e8eec8bc84996d2874810748d9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2378,7 +2383,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2595,27 +2600,27 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 
 [[package]]
 name = "zstd"
-version = "0.13.3"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+checksum = "db3ae9bf90af6e40197bef767eeefc46ad6397420fe873830bd85e5fbbfb3c70"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.4"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+checksum = "ded520f16b29e1a9b771c722221b2b0a0398c2316d9bb3c42b458a5414d7434b"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.16+zstd.1.5.7"
+version = "2.1.2+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
+checksum = "481ada9c543b2323cbb7bbdbb5249177fbf0188ed959ed2c15e4b22421c84ed3"
 dependencies = [
  "cc",
  "pkg-config",

{eggfetch-0.2.2 → eggfetch-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eggfetch
-Version: 0.2.2
+Version: 0.3.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -11,8 +11,10 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: MIT License
+Requires-Dist: httpx>=0.28,<0.29 ; extra == 'httpx-transport'
 Requires-Dist: pytest>=8.4 ; extra == 'test'
 Requires-Dist: pytest-asyncio>=1.0 ; extra == 'test'
+Provides-Extra: httpx-transport
 Provides-Extra: test
 Summary: Python bindings for eggfetch
 Keywords: http,client,httpx,async,rust

{eggfetch-0.2.2 → eggfetch-0.3.0}/crates/eggfetch-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "eggfetch-core"
-version = "0.2.2"
+version = "0.3.0"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true
@@ -82,7 +82,7 @@ test-util = ["tokio/test-util"]
 
 [dependencies]
 bytes = "1"
-eggfetch-http-connect = { version = "0.2.2", path = "../eggfetch-http-connect", optional = true }
+eggfetch-http-connect = { version = "0.3.0", path = "../eggfetch-http-connect", optional = true }
 futures-core = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
 http = "1"
@@ -109,8 +109,8 @@ cookie = { version = "0.18", default-features = false, features = ["percent-enco
 async-compression = { version = "0.4", default-features = false, features = ["tokio"], optional = true }
 tokio-util = { version = "0.7", features = ["io"], optional = true }
 flate2 = { version = "1", optional = true }
-brotli = { version = "8", optional = true, default-features = false, features = ["std"] }
-zstd = { version = "0.13", optional = true }
+brotli = { version = "9", optional = true, default-features = false, features = ["std"] }
+zstd = { version = "0.14", optional = true }
 tracing = { version = "0.1", optional = true }
 getrandom = { version = "0.2", optional = true }
 httpdate = { version = "1", optional = true }
@@ -131,3 +131,11 @@ proptest = "=1.5.0"
 rcgen = "0.13"
 tempfile = "3"
 tokio = { version = "1", features = ["io-util", "net", "macros", "sync", "time", "rt-multi-thread"] }
+
+# The quickstart example exercises redirect following and basic auth, which
+# are compiled out of the lean profiles. Declaring the requirement keeps the
+# example out of the lean-profile `--all-targets` compile instead of failing
+# it, so the whole-suite lean gate can be green.
+[[example]]
+name = "quickstart"
+required-features = ["redirects", "basic-auth"]

{eggfetch-0.2.2 → eggfetch-0.3.0}/crates/eggfetch-core/src/auth.rs

@@ -621,6 +621,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "high-level-url")]
     fn request_builder_without_auth_sets_disabled_and_clears_auth() {
         let client = crate::client::Client::builder().build();
         let req = client
@@ -636,6 +637,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "high-level-url")]
     fn request_builder_auth_clears_disabled() {
         let client = crate::client::Client::builder().build();
         let req = client

{eggfetch-0.2.2 → eggfetch-0.3.0}/crates/eggfetch-core/src/body.rs

@@ -267,7 +267,10 @@ impl RequestBody {
     /// piped through to the transport incrementally. Bytes and empty
     /// bodies are wrapped as `Full` and `Empty` respectively. No eager
     /// buffering is performed.
-    #[allow(clippy::type_complexity)]
+    #[allow(
+        clippy::type_complexity,
+        reason = "the Hyper body type is fixed by the `http-body-util` API and cannot be named more simply without changing the transport contract"
+    )]
     pub(crate) fn into_http_body(
         self,
     ) -> http_body_util::combinators::UnsyncBoxBody<Bytes, Box<dyn std::error::Error + Send + Sync>>
@@ -877,7 +880,10 @@ impl ResponseBody {
 
     /// Create a streaming response body with an attached pool permit.
     /// The permit is released when the body is dropped.
-    #[allow(dead_code)]
+    #[allow(
+        dead_code,
+        reason = "the lease-carrying constructor is only called by the pool-lease test; production bodies attach their lease through `attach_lease`"
+    )]
     pub(crate) fn streaming_with_lease(stream: BoxBytesStream, lease: PoolGuardArc) -> Self {
         Self::Streaming {
             stream,

{eggfetch-0.2.2 → eggfetch-0.3.0}/crates/eggfetch-core/src/client/routes.rs

@@ -78,7 +78,10 @@ impl ResolvedRouteKey {
     /// `HttpOrigin::from_url` + `from_origin` so pool and route identity
     /// share one canonical constructor.
     #[cfg(all(feature = "high-level-url", any(test, feature = "test-util")))]
-    #[allow(dead_code)]
+    #[allow(
+        dead_code,
+        reason = "the high-level adapter is retained as the test-util entry point for the canonical origin form; the current tree has no caller for it, so the allow keeps the retained constructor warning-free"
+    )]
     pub(crate) fn new(
         origin_url: &url::Url,
         target: &crate::transport_hints::ResolvedTarget,
@@ -97,6 +100,105 @@ impl ResolvedRouteKey {
     }
 }
 
+/// How a direct Hyper client binds its logical destination.
+///
+/// The resolved-target route pins the physical addresses and may additionally
+/// override the TLS identity; the SNI route leaves DNS and TCP to the URL
+/// host and only overrides the TLS identity. Everything else — TLS
+/// materialization, connect timeout, metrics, idle-pool policy, and lifecycle
+/// policy — is identical for both.
+#[cfg(feature = "advanced-routing")]
+#[derive(Debug, Clone, Copy)]
+enum DirectRouteBinding<'a> {
+    /// Bind a caller-supplied resolved address snapshot, with an optional SNI
+    /// override on top of it.
+    Resolved {
+        /// The pinned destination addresses.
+        target: &'a crate::transport_hints::ResolvedTarget,
+        /// The TLS identity override, when the route carries one.
+        sni_hostname: Option<&'a str>,
+    },
+    /// Bind a logical SNI hostname; DNS and TCP still resolve the URL host.
+    Sni {
+        /// The TLS identity override.
+        sni_hostname: &'a str,
+    },
+}
+
+/// Build a direct Hyper client for one cached route, without touching the
+/// route cache.
+///
+/// CPU/local configuration only (connector + TLS policy + Hyper builder);
+/// performs no network I/O, so callers may hold the route-cache mutex while
+/// building, matching the documented route-cache locking contract.
+/// Construction failures return before insert and never poison the cache.
+#[cfg(feature = "advanced-routing")]
+fn build_direct_client(
+    config: &ClientConfig,
+    direct_connector_config: Option<&crate::transport::direct_connector::DirectConnectorConfig>,
+    transport_metrics: &Arc<crate::transport::metrics::TransportMetrics>,
+    pool: &Pool,
+    lifecycle: &Arc<LifecycleConfig>,
+    binding: DirectRouteBinding<'_>,
+) -> Result<crate::transport::TimeoutDirectClient> {
+    let connect_timeout = config.timeout.as_ref().and_then(|t| t.connect);
+    let enabler =
+        crate::http_version::HttpVersionPolicyEnabler::from_policy(config.http_version_policy);
+    #[cfg(feature = "tls-rustls")]
+    let tls_connector = {
+        let tls_config = config.tls_config.clone().unwrap_or_default();
+        let rustls_config = tls_config
+            .build_rustls_config()
+            .map_err(|e| Error::Tls(format!("failed to build TLS config: {e}")))?;
+        let rustls_config = configure_tls_alpn(rustls_config, enabler);
+        Some(tokio_rustls::TlsConnector::from(Arc::new(rustls_config)))
+    };
+    #[cfg(not(feature = "tls-rustls"))]
+    let tls_connector = None;
+
+    let base_config = direct_connector_config.cloned().unwrap_or(
+        crate::transport::direct_connector::DirectConnectorConfig {
+            local_address: None,
+            socket_options: Vec::new(),
+        },
+    );
+    let mut connector = crate::transport::direct_connector::DirectConnector::with_metrics(
+        base_config,
+        tls_connector,
+        transport_metrics.clone(),
+    );
+    let sni_hostname = match binding {
+        DirectRouteBinding::Resolved {
+            target,
+            sni_hostname,
+        } => {
+            connector = connector.with_resolved_target(target);
+            sni_hostname
+        }
+        DirectRouteBinding::Sni { sni_hostname } => Some(sni_hostname),
+    };
+    if let Some(sni_hostname) = sni_hostname {
+        connector = connector.with_sni(sni_hostname.to_owned());
+    }
+    // Idle-connection lifetime comes from the pool configuration
+    // (`Limits::keepalive_expiry`), matching the standard, direct,
+    // and UDS paths. `Timeout.pool`/`total` are acquisition budgets
+    // and must not close idle connections early. The effective
+    // per-host idle cap is shared as well; see `Pool::max_idle_per_host`.
+    let policy = HyperClientPolicy::new(
+        config.retry_canceled_requests,
+        pool.idle_timeout(),
+        pool.max_idle_per_host(),
+        enabler,
+    );
+    Ok(build_hyper_client(
+        connector,
+        &policy,
+        connect_timeout,
+        lifecycle,
+    ))
+}
+
 impl ClientInner {
     /// Get or create a cached Hyper client for one direct resolved-target
     /// route.
@@ -119,84 +221,21 @@ impl ClientInner {
         if let Some(client) = clients.get(&key) {
             return Ok(client.clone());
         }
-        let client = Self::build_resolved_client(
+        let client = build_direct_client(
             &self.config,
             self.direct_connector_config.as_ref(),
             &self.transport_metrics,
             &self.pool,
             &self.lifecycle,
-            target,
-            sni_hostname,
+            DirectRouteBinding::Resolved {
+                target,
+                sni_hostname,
+            },
         )?;
         clients.insert(key, client.clone());
         Ok(client)
     }
 
-    /// Build a configured resolved-route Hyper client without touching the
-    /// route cache.
-    ///
-    /// CPU/local configuration only (connector + TLS policy + Hyper builder);
-    /// performs no network I/O, so callers may hold the route-cache mutex
-    /// while building, matching the documented route-cache locking contract.
-    /// Construction failures return before insert and never poison the cache.
-    #[cfg(feature = "advanced-routing")]
-    #[allow(clippy::too_many_arguments)]
-    fn build_resolved_client(
-        config: &ClientConfig,
-        direct_connector_config: Option<&crate::transport::direct_connector::DirectConnectorConfig>,
-        transport_metrics: &Arc<crate::transport::metrics::TransportMetrics>,
-        pool: &Pool,
-        lifecycle: &Arc<LifecycleConfig>,
-        target: &crate::transport_hints::ResolvedTarget,
-        sni_hostname: Option<&str>,
-    ) -> Result<crate::transport::TimeoutDirectClient> {
-        let connect_timeout = config.timeout.as_ref().and_then(|t| t.connect);
-        #[cfg(feature = "tls-rustls")]
-        let tls_connector = {
-            let tls_config = config.tls_config.clone().unwrap_or_default();
-            let rustls_config = tls_config
-                .build_rustls_config()
-                .map_err(|e| Error::Tls(format!("failed to build TLS config: {e}")))?;
-            let rustls_config = configure_tls_alpn(
-                rustls_config,
-                crate::http_version::HttpVersionPolicyEnabler::from_policy(
-                    config.http_version_policy,
-                ),
-            );
-            Some(tokio_rustls::TlsConnector::from(Arc::new(rustls_config)))
-        };
-        #[cfg(not(feature = "tls-rustls"))]
-        let tls_connector = None;
-
-        let base_config = direct_connector_config.cloned().unwrap_or(
-            crate::transport::direct_connector::DirectConnectorConfig {
-                local_address: None,
-                socket_options: Vec::new(),
-            },
-        );
-        let mut connector = crate::transport::direct_connector::DirectConnector::with_metrics(
-            base_config,
-            tls_connector,
-            transport_metrics.clone(),
-        )
-        .with_resolved_target(target);
-        if let Some(sni_hostname) = sni_hostname {
-            connector = connector.with_sni(sni_hostname.to_owned());
-        }
-        let policy = HyperClientPolicy::cached_route(
-            config.retry_canceled_requests,
-            pool.idle_timeout(),
-            pool.max_idle_per_host(),
-            crate::http_version::HttpVersionPolicyEnabler::from_policy(config.http_version_policy),
-        );
-        Ok(build_hyper_client(
-            connector,
-            &policy,
-            connect_timeout,
-            lifecycle,
-        ))
-    }
-
     /// Get or create a cached hyper client with TLS SNI hostname override.
     ///
     /// The returned client uses a [`DirectConnector`](crate::transport::direct_connector::DirectConnector)
@@ -213,47 +252,14 @@ impl ClientInner {
             return Ok(client.clone());
         }
 
-        let connect_timeout = self.config.timeout.as_ref().and_then(|t| t.connect);
-        let enabler = crate::http_version::HttpVersionPolicyEnabler::from_policy(
-            self.config.http_version_policy,
-        );
-
-        #[cfg(feature = "tls-rustls")]
-        let tls_connector = {
-            let tls_config = self.config.tls_config.clone().unwrap_or_default();
-            let rc = tls_config
-                .build_rustls_config()
-                .map_err(|e| Error::Tls(format!("failed to build TLS config: {e}")))?;
-            let rc = configure_tls_alpn(rc, enabler);
-            Some(tokio_rustls::TlsConnector::from(Arc::new(rc)))
-        };
-        #[cfg(not(feature = "tls-rustls"))]
-        let tls_connector = None;
-
-        let base_config = self.direct_connector_config.clone().unwrap_or(
-            crate::transport::direct_connector::DirectConnectorConfig {
-                local_address: None,
-                socket_options: Vec::new(),
-            },
-        );
-        let base_connector = crate::transport::direct_connector::DirectConnector::with_metrics(
-            base_config,
-            tls_connector,
-            self.transport_metrics.clone(),
-        );
-        let sni_connector = base_connector.with_sni(sni_hostname.to_owned());
-        // Idle-connection lifetime comes from the pool configuration
-        // (`Limits::keepalive_expiry`), matching the standard, direct,
-        // and UDS paths. `Timeout.pool`/`total` are acquisition budgets
-        // and must not close idle connections early. The effective
-        // per-host idle cap is shared as well; see `Pool::max_idle_per_host`.
-        let policy = HyperClientPolicy::cached_route(
-            self.config.retry_canceled_requests,
-            self.pool.idle_timeout(),
-            self.pool.max_idle_per_host(),
-            enabler,
-        );
-        let client = build_hyper_client(sni_connector, &policy, connect_timeout, &self.lifecycle);
+        let client = build_direct_client(
+            &self.config,
+            self.direct_connector_config.as_ref(),
+            &self.transport_metrics,
+            &self.pool,
+            &self.lifecycle,
+            DirectRouteBinding::Sni { sni_hostname },
+        )?;
         clients.insert(sni_hostname.to_owned(), client.clone());
         Ok(client)
     }
@@ -291,7 +297,7 @@ impl ClientInner {
             ),
             Some(sni_hostname),
         )?;
-        let policy = HyperClientPolicy::cached_route(
+        let policy = HyperClientPolicy::new(
             self.config.retry_canceled_requests,
             self.pool.idle_timeout(),
             self.pool.max_idle_per_host(),
@@ -350,7 +356,7 @@ impl ClientInner {
         // (timeout plus effective per-host cap) with every other persistent
         // Hyper family. `HyperClientPolicy::apply` installs the pool timer
         // the timeout requires.
-        let policy = HyperClientPolicy::cached_route(
+        let policy = HyperClientPolicy::new(
             self.config.retry_canceled_requests,
             self.pool.idle_timeout(),
             self.pool.max_idle_per_host(),
@@ -447,7 +453,7 @@ impl ClientInner {
             self.config.http_version_policy,
             self.transport_metrics.clone(),
         );
-        let policy = HyperClientPolicy::cached_route(
+        let policy = HyperClientPolicy::new(
             self.config.retry_canceled_requests,
             self.pool.idle_timeout(),
             self.pool.max_idle_per_host(),