fix(guard): clean up guard

Author: MasterPtato

engine/packages/gasoline/src/ctx/standalone.rs

@@ -66,6 +66,23 @@ impl StandaloneCtx {
 		})
 	}
 
+	#[tracing::instrument(skip_all)]
+	pub fn with_ray(&self, ray_id: Id, req_id: Id) -> WorkflowResult<Self> {
+		let mut ctx = StandaloneCtx::new(
+			self.db.clone(),
+			self.config.clone(),
+			self.pools.clone(),
+			self.cache.clone(),
+			&self.name,
+			ray_id,
+			req_id,
+		)?;
+
+		ctx.from_workflow = self.from_workflow;
+
+		Ok(ctx)
+	}
+
 	#[tracing::instrument(skip_all)]
 	pub fn new_from_activity(ctx: &ActivityCtx, req_id: Id) -> WorkflowResult<Self> {
 		let mut ctx = StandaloneCtx::new(

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

@@ -4,11 +4,11 @@ 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;
 
 pub enum HibernationResult {
 	Continue,
@@ -22,7 +22,8 @@ pub trait CustomServeTrait: Send + Sync {
 	async fn handle_request(
 		&self,
 		req: Request<Full<Bytes>>,
-		request_context: &mut RequestContext,
+		ray_id: Id,
+		req_id: Id,
 		request_id: protocol::RequestId,
 	) -> Result<Response<ResponseBody>>;
 
@@ -32,9 +33,10 @@ pub trait CustomServeTrait: Send + Sync {
 		_websocket: WebSocketHandle,
 		_headers: &hyper::HeaderMap,
 		_path: &str,
-		_request_context: &mut RequestContext,
+		_ray_id: Id,
+		_req_id: Id,
 		// Identifies the websocket across retries.
-		_unique_request_id: protocol::RequestId,
+		_request_id: protocol::RequestId,
 		// True if this websocket is reconnecting after hibernation.
 		_after_hibernation: bool,
 	) -> Result<Option<CloseFrame>> {
@@ -45,7 +47,9 @@ pub trait CustomServeTrait: Send + Sync {
 	async fn handle_websocket_hibernation(
 		&self,
 		_websocket: WebSocketHandle,
-		_unique_request_id: protocol::RequestId,
+		_ray_id: Id,
+		_req_id: Id,
+		_request_id: protocol::RequestId,
 	) -> Result<HibernationResult> {
 		bail!("service does not support websocket hibernation");
 	}

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

@@ -1,16 +1,14 @@
 use rivet_error::*;
-use rivet_util::Id;
 use serde::{Deserialize, Serialize};
 
 #[derive(RivetError, Serialize, Deserialize)]
 #[error(
 	"guard",
 	"rate_limit",
 	"Too many requests. Try again later.",
-	"Too many requests to '{method} {path}' (actor_id: {actor_id:?}) from IP {ip}."
+	"Too many requests to '{method} {path}' from IP {ip}."
 )]
 pub struct RateLimit {
-	pub actor_id: Option<Id>,
 	pub method: String,
 	pub path: String,
 	pub ip: String,

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

@@ -4,7 +4,6 @@ pub mod custom_serve;
 pub mod errors;
 pub mod metrics;
 pub mod proxy_service;
-pub mod request_context;
 mod server;
 mod task_group;
 pub mod types;