From 14e8d10ad37f821a4ec1843828184f88f0dbef9c Mon Sep 17 00:00:00 2001
From: Alexey <247128645+axkurcom@users.noreply.github.com>
Date: Thu, 27 Aug 2026 00:06:37 +0300
Subject: [PATCH] Rustfmt
---
src/api/web_status/details.rs | 5 +-
src/config/load/validate_web/timeouts.rs | 4 +-
.../tests/load_basic_tests/web_tests.rs | 11 ++-
src/config/types.rs | 4 +-
src/config/types/web.rs | 9 +-
src/web/bridge/tests.rs | 48 ++++++-----
src/web/http.rs | 6 +-
src/web/http/down.rs | 6 +-
src/web/http/negotiation_tests.rs | 69 ++++++++--------
src/web/http/request.rs | 25 ++----
src/web/http/session.rs | 9 +-
src/web/http/tests.rs | 11 +--
src/web/http/websocket.rs | 34 ++++----
src/web/http/websocket/driver.rs | 19 +----
src/web/http/websocket/driver/io.rs | 12 +--
src/web/http/websocket/driver/lane.rs | 15 +---
src/web/http/websocket/tests.rs | 3 +-
src/web/manager.rs | 7 +-
src/web/manager/carrier_learning.rs | 30 ++++---
src/web/manager/negotiation.rs | 9 +-
src/web/manager/session_creation.rs | 82 ++++++++++---------
src/web/manager/websocket.rs | 11 +--
src/web/session.rs | 1 -
src/web/session/downlink.rs | 6 +-
src/web/session/downlink_tests.rs | 3 +-
src/web/session/lane_uplink.rs | 6 +-
src/web/session/lanes.rs | 17 ++--
src/web/session/lanes/tests.rs | 14 ++--
src/web/session/lifecycle.rs | 14 +---
src/web/session/negotiation.rs | 5 +-
src/web/session/resident.rs | 12 ++-
src/web/session/uplink.rs | 8 +-
src/web/session/websocket.rs | 3 +-
src/web/trace/sanitize.rs | 2 +-
34 files changed, 221 insertions(+), 299 deletions(-)
diff --git a/src/api/web_status/details.rs b/src/api/web_status/details.rs
index e48775b..90ce3a2 100644
--- a/src/api/web_status/details.rs
+++ b/src/api/web_status/details.rs
@@ -85,10 +85,7 @@ pub(super) fn push_body(
html.push_str("");
}
-pub(super) fn push_lifecycle(
- html: &mut String,
- event: &crate::web::trace::TraceLifecycleRecord,
-) {
+pub(super) fn push_lifecycle(html: &mut String, event: &crate::web::trace::TraceLifecycleRecord) {
html.push_str("
event: ");
html.push_str(event.event.as_str());
html.push_str("\nstream: ");
diff --git a/src/config/load/validate_web/timeouts.rs b/src/config/load/validate_web/timeouts.rs
index 73360a0..dd4b989 100644
--- a/src/config/load/validate_web/timeouts.rs
+++ b/src/config/load/validate_web/timeouts.rs
@@ -43,9 +43,7 @@ pub(super) fn validate(timeouts: &WebTimeoutsConfig) -> Result<()> {
return config_error("web.timeouts.websocket_open_secs must be within [1, 300]");
}
if timeouts.lane_open_wait_secs > timeouts.long_poll_secs {
- return config_error(
- "web.timeouts.lane_open_wait_secs must not exceed long_poll_secs",
- );
+ return config_error("web.timeouts.lane_open_wait_secs must not exceed long_poll_secs");
}
if timeouts.carrier_health_secs > timeouts.reconnect_grace_secs {
return config_error(
diff --git a/src/config/tests/load_basic_tests/web_tests.rs b/src/config/tests/load_basic_tests/web_tests.rs
index 28200bb..c12919a 100644
--- a/src/config/tests/load_basic_tests/web_tests.rs
+++ b/src/config/tests/load_basic_tests/web_tests.rs
@@ -50,7 +50,10 @@ fn web_config_builds_canonical_runtime_snapshot() {
assert_eq!(vhost.profiles[0].key_fingerprint.len(), 16);
assert_ne!(vhost.profiles[0].key_fingerprint, "0001020304050607");
assert!(!vhost.profiles[0].carrier_negotiation_enabled);
- assert_eq!(vhost.profiles[0].carriers.as_ref(), [WebCarrier::HttpsLanes]);
+ assert_eq!(
+ vhost.profiles[0].carriers.as_ref(),
+ [WebCarrier::HttpsLanes]
+ );
}
#[test]
@@ -95,11 +98,7 @@ fn web_carrier_array_enables_ordered_negotiation_and_appends_fallback() {
#[test]
fn web_carriers_reject_true_empty_and_duplicates() {
- for value in [
- "true",
- "[]",
- "[\"https\", \"https\"]",
- ] {
+ for value in ["true", "[]", "[\"https\", \"https\"]"] {
let invalid = WEB_CONFIG.replace(
"carrier = \"https-lanes\"",
&format!("carrier = \"https-lanes\"\ncarriers = {value}"),
diff --git a/src/config/types.rs b/src/config/types.rs
index 0b9f907..562f54e 100644
--- a/src/config/types.rs
+++ b/src/config/types.rs
@@ -56,12 +56,12 @@ pub use web::{
WebCarrierNegotiationAggressiveness, WebConfig, WebDecoyConfig, WebLimitsConfig,
WebProfileConfig, WebSecretMode, WebTimeoutsConfig, WebVhostConfig,
};
-#[allow(unused_imports)]
-pub use web_carrier::{WebCarrier, WebCarriers};
pub(crate) use web::{
WebRuntimeConfig, WebRuntimeDecoy, WebRuntimeProfile, WebRuntimeVhost, WebStaticAsset,
WebStaticSite,
};
+#[allow(unused_imports)]
+pub use web_carrier::{WebCarrier, WebCarriers};
pub(crate) use web_debug::web_debug_fits_limits;
pub use web_debug::{WebDebugBodyCapture, WebDebugConfig};
diff --git a/src/config/types/web.rs b/src/config/types/web.rs
index 2a8fc58..863b533 100644
--- a/src/config/types/web.rs
+++ b/src/config/types/web.rs
@@ -234,8 +234,7 @@ impl Default for WebLimitsConfig {
websocket_admission_watermark_pct: default_web_websocket_admission_watermark_pct(),
websocket_eviction_watermark_pct: default_web_websocket_eviction_watermark_pct(),
websocket_http_connection_reserve: default_web_websocket_http_connection_reserve(),
- max_websocket_evictions_in_flight:
- default_web_max_websocket_evictions_in_flight(),
+ max_websocket_evictions_in_flight: default_web_max_websocket_evictions_in_flight(),
max_carrier_learning_entries: default_web_max_carrier_learning_entries(),
max_body_readers: default_web_max_body_readers(),
max_body_bytes_global: default_web_max_body_bytes_global(),
@@ -348,8 +347,7 @@ impl Default for WebTimeoutsConfig {
websocket_write_secs: default_web_websocket_write_secs(),
websocket_backpressure_secs: default_web_websocket_backpressure_secs(),
websocket_eviction_secs: default_web_websocket_eviction_secs(),
- carrier_negotiation_deadlines_secs:
- default_web_carrier_negotiation_deadlines_secs(),
+ carrier_negotiation_deadlines_secs: default_web_carrier_negotiation_deadlines_secs(),
carrier_learning_secs: default_web_carrier_learning_secs(),
bootstrap_lifetime_secs: default_web_bootstrap_lifetime_secs(),
reconnect_grace_secs: default_web_reconnect_grace_secs(),
@@ -436,8 +434,7 @@ impl Default for WebConfig {
carrier: WebCarrier::default(),
carriers: WebCarriers::default(),
carrier_learning: default_web_carrier_learning(),
- carrier_negotiation_aggressiveness:
- WebCarrierNegotiationAggressiveness::default(),
+ carrier_negotiation_aggressiveness: WebCarrierNegotiationAggressiveness::default(),
limits: WebLimitsConfig::default(),
debug: WebDebugConfig::default(),
timeouts: WebTimeoutsConfig::default(),
diff --git a/src/web/bridge/tests.rs b/src/web/bridge/tests.rs
index aa674d2..58fa517 100644
--- a/src/web/bridge/tests.rs
+++ b/src/web/bridge/tests.rs
@@ -16,10 +16,7 @@ fn render_page(bootstrap: &str, candidate_count: usize) -> BridgePage {
#[test]
fn rendered_page_contains_bounded_negotiation_contract() {
- let page = render_page(
- "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
- 4,
- );
+ let page = render_page("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", 4);
assert!(!page.body.contains("__"));
assert!(!page.body.contains("bridge="));
assert!(page.body.contains("X-Carrier-Capabilities"));
@@ -40,17 +37,23 @@ fn rendered_page_contains_bounded_negotiation_contract() {
fn rendered_page_preserves_the_ios_bootstrap_literal() {
let bootstrap = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB";
let page = render_page(bootstrap, 2);
- assert!(page.body.contains(&format!("const bootstrap=\"{bootstrap}\"")));
+ assert!(
+ page.body
+ .contains(&format!("const bootstrap=\"{bootstrap}\""))
+ );
}
#[test]
fn effective_deadline_formula_uses_the_final_checkpoint() {
- let page = render_page(
- "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
- 3,
+ let page = render_page("CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC", 3);
+ assert!(
+ page.body
+ .contains("negotiatedFinalDeadline=candidateDeadlines[3]")
+ );
+ assert!(
+ page.body
+ .contains("carrierAttempt>=negotiatedCandidateCount?negotiatedFinalDeadline")
);
- assert!(page.body.contains("negotiatedFinalDeadline=candidateDeadlines[3]"));
- assert!(page.body.contains("carrierAttempt>=negotiatedCandidateCount?negotiatedFinalDeadline"));
}
#[test]
@@ -69,18 +72,19 @@ fn disabled_negotiation_does_not_arm_a_carrier_deadline() {
assert!(page.body.contains(
"if(negotiationEnabled){negotiationStartedAt=Date.now();armCarrierDeadline(attemptEpoch)}"
));
- assert!(page.body.contains(
- "negotiationEnabled?'tproxy-auto-v1.':'tproxy-v1.'"
- ));
+ assert!(
+ page.body
+ .contains("negotiationEnabled?'tproxy-auto-v1.':'tproxy-v1.'")
+ );
}
#[test]
fn retry_and_attempt_state_are_frozen_before_fetch() {
- let page = render_page(
- "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE",
- 4,
+ let page = render_page("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE", 4);
+ assert!(
+ page.body
+ .contains("async function request(path,frozenOptions)")
);
- assert!(page.body.contains("async function request(path,frozenOptions)"));
assert!(!page.body.contains("makeOptions"));
assert!(
page.body
@@ -93,14 +97,14 @@ fn retry_and_attempt_state_are_frozen_before_fetch() {
#[test]
fn ambiguous_commit_is_resolved_before_carrier_advance() {
- let page = render_page(
- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
- 4,
- );
+ let page = render_page("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", 4);
assert!(page.body.contains("resolveAttempt(reason,epoch,snapshot)"));
assert!(page.body.contains(
"sessionEcho(response,snapshot.attempt,['provisional','committed','healthy'],true)"
));
- assert!(page.body.contains("if(echo.state!=='provisional'){switching=false;fail();return}"));
+ assert!(
+ page.body
+ .contains("if(echo.state!=='provisional'){switching=false;fail();return}")
+ );
assert!(page.body.contains("const token=cleanupToken||sessionToken"));
}
diff --git a/src/web/http.rs b/src/web/http.rs
index 74e81aa..c7f1946 100644
--- a/src/web/http.rs
+++ b/src/web/http.rs
@@ -356,11 +356,7 @@ async fn handle_up(
}
};
if let Some(trace) = request_trace(&request) {
- trace.record_frames(
- TraceDirection::Request,
- &body,
- session.limits(),
- );
+ trace.record_frames(TraceDirection::Request, &body, session.limits());
}
let result = match lane_id {
Some(lane_id) => session.process_up_lane(lane_id, sequence, &body),
diff --git a/src/web/http/down.rs b/src/web/http/down.rs
index a60fb44..4796aaa 100644
--- a/src/web/http/down.rs
+++ b/src/web/http/down.rs
@@ -89,11 +89,7 @@ pub(super) async fn handle_down(
}
Ok(result) => {
if let Some(trace) = request_trace(&request) {
- trace.record_frames(
- TraceDirection::Response,
- &result.body,
- session.limits(),
- );
+ trace.record_frames(TraceDirection::Response, &result.body, session.limits());
}
let mut response = full_response(StatusCode::OK, result.body);
carrier_headers(&mut response);
diff --git a/src/web/http/negotiation_tests.rs b/src/web/http/negotiation_tests.rs
index 47fa1b3..2ce9244 100644
--- a/src/web/http/negotiation_tests.rs
+++ b/src/web/http/negotiation_tests.rs
@@ -130,13 +130,7 @@ async fn metadata_free_native_client_can_use_each_fixed_carrier() {
let response = request(
&listener,
&runtime,
- create_request_with_headers(
- &bootstrap,
- &hello,
- None,
- None,
- NATIVE_USER_AGENT_HEADER,
- ),
+ create_request_with_headers(&bootstrap, &hello, None, None, NATIVE_USER_AGENT_HEADER),
)
.await;
let (headers, _) = split_response(&response);
@@ -170,13 +164,7 @@ async fn metadata_free_native_client_uses_fallback_when_candidates_are_enabled()
let response = request(
&listener,
&runtime,
- create_request_with_headers(
- &bootstrap,
- &hello,
- None,
- None,
- NATIVE_USER_AGENT_HEADER,
- ),
+ create_request_with_headers(&bootstrap, &hello, None, None, NATIVE_USER_AGENT_HEADER),
)
.await;
let (headers, _) = split_response(&response);
@@ -209,13 +197,7 @@ async fn explicit_native_capabilities_participate_in_automatic_selection() {
let response = request(
&listener,
&runtime,
- create_request_with_headers(
- &bootstrap,
- &hello,
- Some(1),
- None,
- NATIVE_USER_AGENT_HEADER,
- ),
+ create_request_with_headers(&bootstrap, &hello, Some(1), None, NATIVE_USER_AGENT_HEADER),
)
.await;
let (headers, _) = split_response(&response);
@@ -261,9 +243,18 @@ async fn negotiation_replays_replaces_and_freezes_after_carrier_commit() {
let replay = request(&listener, &runtime, first_request).await;
let (replay_headers, _) = split_response(&replay);
- assert_eq!(response_header(replay_headers, "x-session-token"), first_token);
- assert_eq!(response_header(replay_headers, "x-carrier-candidate-count"), "3");
- assert_eq!(response_header(replay_headers, "x-carrier-state"), "provisional");
+ assert_eq!(
+ response_header(replay_headers, "x-session-token"),
+ first_token
+ );
+ assert_eq!(
+ response_header(replay_headers, "x-carrier-candidate-count"),
+ "3"
+ );
+ assert_eq!(
+ response_header(replay_headers, "x-carrier-state"),
+ "provisional"
+ );
let second_request = create_request(&bootstrap, &hello, Some(2), Some("timeout"));
let second = request(&listener, &runtime, second_request.clone()).await;
@@ -346,11 +337,20 @@ async fn negotiation_replays_replaces_and_freezes_after_carrier_commit() {
let (third_headers, _) = split_response(&third);
assert!(third_headers.starts_with(b"HTTP/1.1 409"));
assert!(optional_response_header(third_headers, "x-session-token").is_none());
- assert_eq!(response_header(third_headers, "x-carrier-mode"), "https-lanes");
+ assert_eq!(
+ response_header(third_headers, "x-carrier-mode"),
+ "https-lanes"
+ );
assert_eq!(response_header(third_headers, "x-carrier-attempt"), "2");
- assert_eq!(response_header(third_headers, "x-carrier-candidate-count"), "3");
+ assert_eq!(
+ response_header(third_headers, "x-carrier-candidate-count"),
+ "3"
+ );
assert_eq!(response_header(third_headers, "x-carrier-deadline"), "12");
- assert_eq!(response_header(third_headers, "x-carrier-state"), "committed");
+ assert_eq!(
+ response_header(third_headers, "x-carrier-state"),
+ "committed"
+ );
assert!(
runtime
.get_session(token_hash(&second_token), "proxy.example.com")
@@ -397,7 +397,10 @@ async fn timed_out_attempt_replays_before_successor_own_deadline() {
response_header(replay_headers, "x-session-token"),
first_token
);
- assert_eq!(response_header(replay_headers, "x-carrier-state"), "provisional");
+ assert_eq!(
+ response_header(replay_headers, "x-carrier-state"),
+ "provisional"
+ );
let second = request(
&listener,
@@ -453,9 +456,8 @@ async fn https_lane_downlink_can_arrive_before_its_uplink_open() {
.into_bytes();
let down_listener = Arc::clone(&listener);
let down_runtime = Arc::clone(&runtime);
- let down = tokio::spawn(async move {
- request(&down_listener, &down_runtime, down_request).await
- });
+ let down =
+ tokio::spawn(async move { request(&down_listener, &down_runtime, down_request).await });
tokio::task::yield_now().await;
let open = frame::encode(FrameType::Open, 7, &[]);
@@ -477,10 +479,7 @@ async fn https_lane_downlink_can_arrive_before_its_uplink_open() {
.unwrap()
.unwrap();
let (down_headers, _) = split_response(&down);
- assert!(
- down_headers.starts_with(b"HTTP/1.1 200")
- || down_headers.starts_with(b"HTTP/1.1 204")
- );
+ assert!(down_headers.starts_with(b"HTTP/1.1 200") || down_headers.starts_with(b"HTTP/1.1 204"));
assert!(optional_response_header(down_headers, "x-down-cursor").is_some());
runtime.shutdown().await;
diff --git a/src/web/http/request.rs b/src/web/http/request.rs
index 239dea5..4c677da 100644
--- a/src/web/http/request.rs
+++ b/src/web/http/request.rs
@@ -15,9 +15,7 @@ const USER_AGENT_CONTEXT: &[u8] = b"telemt-web-carrier-user-agent-v1\0";
// Canonical host and forwarded-address provenance remain isolated from credentials.
mod identity;
-pub(super) use identity::{
- canonical_request_host, carrier_ip_learning_eligible, client_ip,
-};
+pub(super) use identity::{canonical_request_host, carrier_ip_learning_eligible, client_ip};
/// Decodes an exact canonical bridge query without allocating credential strings.
pub(super) fn bridge_candidate(query: Option<&str>) -> ([u8; 32], bool) {
@@ -205,17 +203,13 @@ fn parse_capabilities(value: &str) -> Option {
}
fn strict_browser_hint(request: &Request, host: &str) -> bool {
- single_header(request, header::ORIGIN)
- .is_some_and(|value| value == format!("https://{host}"))
+ single_header(request, header::ORIGIN).is_some_and(|value| value == format!("https://{host}"))
&& single_header(request, "sec-fetch-site") == Some("same-origin")
&& single_header(request, "sec-fetch-mode") == Some("cors")
&& single_header(request, "sec-fetch-dest") == Some("empty")
}
-fn optional_canonical_u8_header(
- request: &Request,
- name: &'static str,
-) -> Option