fix(pb, tunnel, gateway): refactor error handling

Author: MasterPtato

Cargo.lock

@@ -944,10 +944,10 @@ impl ProxyService {
 							if !err.is_connect() || attempts >= max_attempts {
 								tracing::error!(?err, "Request error after {} attempts", attempts);
 								return Err(errors::UpstreamError(
-							"failed to connect to runner. Make sure your runners are healthy and the provided runner address is reachable by Rivet."
-								.to_string(),
-						)
-						.build());
+									"failed to connect to runner. Make sure your runners are healthy and the provided runner address is reachable by Rivet."
+										.to_string(),
+								)
+								.build());
 							} else {
 								// Request connect error, might retry
 								tracing::debug!(?err, "Request attempt {attempts} failed");
@@ -2327,7 +2327,7 @@ fn err_to_close_frame(err: anyhow::Error) -> CloseFrame {
 		.unwrap_or_else(|| RivetError::from(&INTERNAL_ERROR));
 
 	let code = match (rivet_err.group(), rivet_err.code()) {
-		("ws", "connection_closed") => CloseCode::Normal,
+		("ws", "connection_closed") | ("ws", "eviction") => CloseCode::Normal,
 		_ => CloseCode::Error,
 	};
 

packages/core/guard/core/src/proxy_service.rs

@@ -150,7 +150,6 @@ pub async fn route_request(
 
 	// Return pegboard-gateway instance
 	let gateway = pegboard_gateway::PegboardGateway::new(
-		ctx.clone(),
 		shared_state.pegboard_gateway.clone(),
 		runner_id,
 		actor_id,

packages/core/guard/server/src/routing/pegboard_gateway.rs

@@ -15,11 +15,12 @@ http-body-util.workspace = true
 hyper = "1.6"
 hyper-tungstenite.workspace = true
 pegboard.workspace = true
-rivet-runner-protocol.workspace = true
 rand.workspace = true
 rivet-error.workspace = true
 rivet-guard-core.workspace = true
+rivet-runner-protocol.workspace = true
 rivet-util.workspace = true
+serde.workspace = true
 thiserror.workspace = true
 tokio-tungstenite.workspace = true
 tokio.workspace = true