chore(guard): clean up guard

Author: MasterPtato

engine/packages/guard-core/src/analytics.rs

@@ -3,12 +3,11 @@ use async_trait::async_trait;
 use bytes::Bytes;
 use http_body_util::Full;
 use hyper::{Request, Response};
-use rivet_runner_protocol as protocol;
-use rivet_util::Id;
 use tokio_tungstenite::tungstenite::protocol::frame::CloseFrame;
 
 use crate::WebSocketHandle;
-use crate::proxy_service::ResponseBody;
+use crate::request_context::RequestContext;
+use crate::response_body::ResponseBody;
 
 pub enum HibernationResult {
 	Continue,
@@ -22,21 +21,14 @@ pub trait CustomServeTrait: Send + Sync {
 	async fn handle_request(
 		&self,
 		req: Request<Full<Bytes>>,
-		ray_id: Id,
-		req_id: Id,
-		request_id: protocol::RequestId,
+		req_ctx: &mut RequestContext,
 	) -> Result<Response<ResponseBody>>;
 
 	/// Handle a WebSocket connection after upgrade. Supports connection retries.
 	async fn handle_websocket(
 		&self,
+		_req_ctx: &mut RequestContext,
 		_websocket: WebSocketHandle,
-		_headers: &hyper::HeaderMap,
-		_path: &str,
-		_ray_id: Id,
-		_req_id: Id,
-		// Identifies the websocket across retries.
-		_request_id: protocol::RequestId,
 		// True if this websocket is reconnecting after hibernation.
 		_after_hibernation: bool,
 	) -> Result<Option<CloseFrame>> {
@@ -46,10 +38,8 @@ pub trait CustomServeTrait: Send + Sync {
 	/// Returns true if the websocket should close.
 	async fn handle_websocket_hibernation(
 		&self,
+		_req_ctx: &mut RequestContext,
 		_websocket: WebSocketHandle,
-		_ray_id: Id,
-		_req_id: Id,
-		_request_id: protocol::RequestId,
 	) -> Result<HibernationResult> {
 		bail!("service does not support websocket hibernation");
 	}

engine/packages/guard-core/src/custom_serve.rs

@@ -1,19 +1,22 @@
-pub mod analytics;
 pub mod cert_resolver;
 pub mod custom_serve;
 pub mod errors;
 pub mod metrics;
 pub mod proxy_service;
+pub mod request_context;
+mod response_body;
+mod route;
 mod server;
 mod task_group;
 pub mod types;
+pub mod utils;
 pub mod websocket_handle;
 
 pub use cert_resolver::CertResolverFn;
 pub use custom_serve::CustomServeTrait;
-pub use proxy_service::{
-	CacheKeyFn, MiddlewareFn, ProxyService, ProxyState, RouteTarget, RoutingFn, RoutingOutput,
-};
+pub use proxy_service::{ProxyService, ProxyState};
+pub use response_body::ResponseBody;
+pub use route::{CacheKeyFn, RouteConfig, RouteTarget, RoutingFn, RoutingOutput};
 pub use websocket_handle::WebSocketHandle;
 
 // Re-export hyper StatusCode for use in other crates