Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 59e108edbd | |||
| 1e2ca68fc7 | |||
| 4c76a9f9f3 | |||
| 8e76c42cea |
13
changelog.md
13
changelog.md
@@ -1,5 +1,18 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-03-16 - 25.11.11 - fix(rustproxy-http)
|
||||||
|
improve HTTP/2 proxy error logging with warning-level connection failures and debug error details
|
||||||
|
|
||||||
|
- Adds debug-formatted error fields to HTTP/2 handshake, retry, fallback, and request failure logs
|
||||||
|
- Promotes upstream HTTP/2 connection error logs from debug to warn to improve operational visibility
|
||||||
|
|
||||||
|
## 2026-03-16 - 25.11.10 - fix(rustproxy-http)
|
||||||
|
validate pooled HTTP/2 connections asynchronously before reuse and evict stale senders
|
||||||
|
|
||||||
|
- Add an async ready() check with a 500ms timeout before reusing pooled HTTP/2 senders to catch GOAWAY/RST states before forwarding requests
|
||||||
|
- Return connection age from the HTTP/2 pool checkout path and log warnings for older pooled connections
|
||||||
|
- Evict pooled HTTP/2 senders when they are closed, exceed max age, fail readiness validation, or time out during readiness checks
|
||||||
|
|
||||||
## 2026-03-16 - 25.11.9 - fix(rustproxy-routing)
|
## 2026-03-16 - 25.11.9 - fix(rustproxy-routing)
|
||||||
reduce hot-path allocations in routing, metrics, and proxy protocol handling
|
reduce hot-path allocations in routing, metrics, and proxy protocol handling
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@push.rocks/smartproxy",
|
"name": "@push.rocks/smartproxy",
|
||||||
"version": "25.11.9",
|
"version": "25.11.11",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.",
|
"description": "A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ use bytes::Bytes;
|
|||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use http_body_util::combinators::BoxBody;
|
use http_body_util::combinators::BoxBody;
|
||||||
use hyper::client::conn::{http1, http2};
|
use hyper::client::conn::{http1, http2};
|
||||||
use tracing::debug;
|
use tracing::{debug, warn};
|
||||||
|
|
||||||
/// Maximum idle connections per backend key.
|
/// Maximum idle connections per backend key.
|
||||||
const MAX_IDLE_PER_KEY: usize = 16;
|
const MAX_IDLE_PER_KEY: usize = 16;
|
||||||
@@ -115,20 +115,27 @@ impl ConnectionPool {
|
|||||||
|
|
||||||
/// Try to get a cloned HTTP/2 sender for the given key.
|
/// Try to get a cloned HTTP/2 sender for the given key.
|
||||||
/// HTTP/2 senders are Clone-able (multiplexed), so we clone rather than remove.
|
/// HTTP/2 senders are Clone-able (multiplexed), so we clone rather than remove.
|
||||||
pub fn checkout_h2(&self, key: &PoolKey) -> Option<http2::SendRequest<BoxBody<Bytes, hyper::Error>>> {
|
pub fn checkout_h2(&self, key: &PoolKey) -> Option<(http2::SendRequest<BoxBody<Bytes, hyper::Error>>, Duration)> {
|
||||||
let entry = self.h2_pool.get(key)?;
|
let entry = self.h2_pool.get(key)?;
|
||||||
let pooled = entry.value();
|
let pooled = entry.value();
|
||||||
|
let age = pooled.created_at.elapsed();
|
||||||
|
|
||||||
// Check if the h2 connection is still alive and not too old
|
// Check if the h2 connection is still alive and not too old
|
||||||
if pooled.sender.is_closed() || pooled.created_at.elapsed() >= MAX_H2_AGE {
|
if pooled.sender.is_closed() || age >= MAX_H2_AGE {
|
||||||
|
let reason = if pooled.sender.is_closed() { "closed" } else { "max_age" };
|
||||||
|
debug!("Pool evict (h2): {}:{} (reason={}, age={:.1}s)", key.host, key.port, reason, age.as_secs_f64());
|
||||||
drop(entry);
|
drop(entry);
|
||||||
self.h2_pool.remove(key);
|
self.h2_pool.remove(key);
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
if pooled.sender.is_ready() {
|
if pooled.sender.is_ready() {
|
||||||
debug!("Pool hit (h2): {}:{}", key.host, key.port);
|
if age > Duration::from_secs(30) {
|
||||||
return Some(pooled.sender.clone());
|
warn!("Pool hit (h2): {}:{} — connection age {:.1}s (>30s, may be stale)", key.host, key.port, age.as_secs_f64());
|
||||||
|
} else {
|
||||||
|
debug!("Pool hit (h2): {}:{} (age={:.1}s)", key.host, key.port, age.as_secs_f64());
|
||||||
|
}
|
||||||
|
return Some((pooled.sender.clone(), age));
|
||||||
}
|
}
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -659,17 +659,40 @@ impl HttpProxyService {
|
|||||||
h2: use_h2,
|
h2: use_h2,
|
||||||
};
|
};
|
||||||
|
|
||||||
// H2 pool checkout (H2 senders are Clone and multiplexed)
|
// H2 pool checkout with async readiness validation.
|
||||||
|
// checkout_h2 does synchronous is_closed()/is_ready() checks, but these
|
||||||
|
// reflect cached state — the H2 connection driver (a separate tokio task)
|
||||||
|
// may not have processed a pending GOAWAY/RST yet. The ready().await
|
||||||
|
// forces the runtime to yield, giving the driver a chance to detect failures.
|
||||||
if use_h2 {
|
if use_h2 {
|
||||||
if let Some(sender) = self.connection_pool.checkout_h2(&pool_key) {
|
if let Some((mut sender, age)) = self.connection_pool.checkout_h2(&pool_key) {
|
||||||
self.metrics.backend_pool_hit(&upstream_key);
|
match tokio::time::timeout(
|
||||||
self.metrics.set_backend_protocol(&upstream_key, "h2");
|
std::time::Duration::from_millis(500),
|
||||||
let result = self.forward_h2_pooled(
|
sender.ready(),
|
||||||
sender, parts, body, upstream_headers, &upstream_path,
|
).await {
|
||||||
route_match.route, route_id, &ip_str, &pool_key, domain_str, &conn_activity,
|
Ok(Ok(())) => {
|
||||||
).await;
|
self.metrics.backend_pool_hit(&upstream_key);
|
||||||
self.upstream_selector.connection_ended(&upstream_key);
|
self.metrics.set_backend_protocol(&upstream_key, "h2");
|
||||||
return result;
|
let result = self.forward_h2_pooled(
|
||||||
|
sender, parts, body, upstream_headers, &upstream_path,
|
||||||
|
route_match.route, route_id, &ip_str, &pool_key, domain_str, &conn_activity,
|
||||||
|
).await;
|
||||||
|
self.upstream_selector.connection_ended(&upstream_key);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
Ok(Err(e)) => {
|
||||||
|
warn!(backend = %upstream_key, age_secs = age.as_secs(),
|
||||||
|
"Pooled H2 sender failed ready check (GOAWAY/RST): {}, evicting", e);
|
||||||
|
self.connection_pool.remove_h2(&pool_key);
|
||||||
|
// Fall through to fresh connection
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
warn!(backend = %upstream_key, age_secs = age.as_secs(),
|
||||||
|
"Pooled H2 sender ready check timed out (500ms), evicting");
|
||||||
|
self.connection_pool.remove_h2(&pool_key);
|
||||||
|
// Fall through to fresh connection
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -967,7 +990,7 @@ impl HttpProxyService {
|
|||||||
) = match tokio::time::timeout(self.connect_timeout, h2_builder.handshake(io)).await {
|
) = match tokio::time::timeout(self.connect_timeout, h2_builder.handshake(io)).await {
|
||||||
Ok(Ok(h)) => h,
|
Ok(Ok(h)) => h,
|
||||||
Ok(Err(e)) => {
|
Ok(Err(e)) => {
|
||||||
error!(backend = %backend_key, domain = %domain, error = %e, "Backend H2 handshake failed");
|
error!(backend = %backend_key, domain = %domain, error = %e, error_debug = ?e, "Backend H2 handshake failed");
|
||||||
self.metrics.backend_handshake_error(&backend_key);
|
self.metrics.backend_handshake_error(&backend_key);
|
||||||
return Ok(error_response(StatusCode::BAD_GATEWAY, "Backend H2 handshake failed"));
|
return Ok(error_response(StatusCode::BAD_GATEWAY, "Backend H2 handshake failed"));
|
||||||
}
|
}
|
||||||
@@ -985,7 +1008,7 @@ impl HttpProxyService {
|
|||||||
let key = pool_key.clone();
|
let key = pool_key.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
if let Err(e) = conn.await {
|
if let Err(e) = conn.await {
|
||||||
debug!("HTTP/2 upstream connection error: {}", e);
|
warn!("HTTP/2 upstream connection error: {} ({:?})", e, e);
|
||||||
}
|
}
|
||||||
pool.remove_h2(&key);
|
pool.remove_h2(&key);
|
||||||
});
|
});
|
||||||
@@ -1117,7 +1140,7 @@ impl HttpProxyService {
|
|||||||
) = match tokio::time::timeout(self.connect_timeout, h2_builder.handshake(io)).await {
|
) = match tokio::time::timeout(self.connect_timeout, h2_builder.handshake(io)).await {
|
||||||
Ok(Ok(h)) => h,
|
Ok(Ok(h)) => h,
|
||||||
Ok(Err(e)) => {
|
Ok(Err(e)) => {
|
||||||
error!(backend = %backend_key, domain = %domain, error = %e, "H2 retry: handshake failed");
|
error!(backend = %backend_key, domain = %domain, error = %e, error_debug = ?e, "H2 retry: handshake failed");
|
||||||
self.metrics.backend_handshake_error(&backend_key);
|
self.metrics.backend_handshake_error(&backend_key);
|
||||||
self.metrics.backend_connection_closed(&backend_key);
|
self.metrics.backend_connection_closed(&backend_key);
|
||||||
return Ok(error_response(StatusCode::BAD_GATEWAY, "Backend H2 retry handshake failed"));
|
return Ok(error_response(StatusCode::BAD_GATEWAY, "Backend H2 retry handshake failed"));
|
||||||
@@ -1136,7 +1159,7 @@ impl HttpProxyService {
|
|||||||
let key = pool_key.clone();
|
let key = pool_key.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
if let Err(e) = conn.await {
|
if let Err(e) = conn.await {
|
||||||
debug!("H2 retry: upstream connection error: {}", e);
|
warn!("H2 retry: upstream connection error: {} ({:?})", e, e);
|
||||||
}
|
}
|
||||||
pool.remove_h2(&key);
|
pool.remove_h2(&key);
|
||||||
});
|
});
|
||||||
@@ -1265,7 +1288,7 @@ impl HttpProxyService {
|
|||||||
let key = pool_key.clone();
|
let key = pool_key.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
if let Err(e) = conn.await {
|
if let Err(e) = conn.await {
|
||||||
debug!("HTTP/2 upstream connection error: {}", e);
|
warn!("HTTP/2 upstream connection error: {} ({:?})", e, e);
|
||||||
}
|
}
|
||||||
pool.remove_h2(&key);
|
pool.remove_h2(&key);
|
||||||
});
|
});
|
||||||
@@ -1320,6 +1343,7 @@ impl HttpProxyService {
|
|||||||
backend = %bk,
|
backend = %bk,
|
||||||
domain = %domain,
|
domain = %domain,
|
||||||
error = %e,
|
error = %e,
|
||||||
|
error_debug = ?e,
|
||||||
"Auto-detect: H2 request failed, falling back to H1"
|
"Auto-detect: H2 request failed, falling back to H1"
|
||||||
);
|
);
|
||||||
self.metrics.backend_h2_failure(&bk);
|
self.metrics.backend_h2_failure(&bk);
|
||||||
@@ -1577,11 +1601,11 @@ impl HttpProxyService {
|
|||||||
// Evict the dead sender so subsequent requests get fresh connections
|
// Evict the dead sender so subsequent requests get fresh connections
|
||||||
if let Some(key) = pool_key {
|
if let Some(key) = pool_key {
|
||||||
let bk = format!("{}:{}", key.host, key.port);
|
let bk = format!("{}:{}", key.host, key.port);
|
||||||
error!(backend = %bk, domain = %domain, error = %e, "Backend H2 request failed");
|
error!(backend = %bk, domain = %domain, error = %e, error_debug = ?e, "Backend H2 request failed");
|
||||||
self.metrics.backend_request_error(&bk);
|
self.metrics.backend_request_error(&bk);
|
||||||
self.connection_pool.remove_h2(key);
|
self.connection_pool.remove_h2(key);
|
||||||
} else {
|
} else {
|
||||||
error!(domain = %domain, error = %e, "Backend H2 request failed");
|
error!(domain = %domain, error = %e, error_debug = ?e, "Backend H2 request failed");
|
||||||
}
|
}
|
||||||
return Ok(error_response(StatusCode::BAD_GATEWAY, "Backend H2 request failed"));
|
return Ok(error_response(StatusCode::BAD_GATEWAY, "Backend H2 request failed"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@push.rocks/smartproxy',
|
name: '@push.rocks/smartproxy',
|
||||||
version: '25.11.9',
|
version: '25.11.11',
|
||||||
description: 'A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.'
|
description: 'A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.'
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user