fix(core): fix request not being passed to some lifecycle hooks (#1143)

Author: NathanFlurry

packages/core/fixtures/driver-test-suite/registry.ts

@@ -47,6 +47,8 @@ import {
 	rawWebSocketNoAuthActor,
 	rawWebSocketPublicActor,
 } from "./raw-websocket-auth";
+import { requestAccessActor } from "./request-access";
+import { requestAccessAuthActor } from "./request-access-auth";
 import { scheduled } from "./scheduled";
 import {
 	driverCtxActor,
@@ -119,5 +121,8 @@ export const registry = setup({
 		rawWebSocketNoAuthActor,
 		rawWebSocketPublicActor,
 		rawWebSocketCustomAuthActor,
+		// From request-access.ts
+		requestAccessActor,
+		requestAccessAuthActor,
 	},
 });

packages/core/fixtures/driver-test-suite/request-access-auth.ts

@@ -0,0 +1,56 @@
+import { actor } from "@rivetkit/core";
+
+/**
+ * Test fixture to verify request object access in onAuth hook
+ * onAuth runs on the HTTP server, not in the actor, so we test it separately
+ */
+export const requestAccessAuthActor = actor({
+	onAuth: ({
+		req,
+		intents,
+		params,
+	}: {
+		req: Request;
+		intents: Set<string>;
+		params?: { trackRequest?: boolean };
+	}) => {
+		if (params?.trackRequest) {
+			// Extract request info and return it as auth data
+			const headers: Record<string, string> = {};
+			req.headers.forEach((value, key) => {
+				headers[key] = value;
+			});
+
+			return {
+				hasRequest: true,
+				requestUrl: req.url,
+				requestMethod: req.method,
+				requestHeaders: headers,
+				intents: Array.from(intents),
+			};
+		}
+
+		// Return empty auth data when not tracking
+		return {};
+	},
+	state: {
+		authData: null as any,
+	},
+	onConnect: (c, conn) => {
+		// Store auth data in state so we can retrieve it
+		c.state.authData = conn.auth;
+	},
+	actions: {
+		getAuthRequestInfo: (c) => {
+			// Return the stored auth data or a default object
+			const authData = c.state.authData || {
+				hasRequest: false,
+				requestUrl: null,
+				requestMethod: null,
+				requestHeaders: {},
+				intents: [],
+			};
+			return authData;
+		},
+	},
+});

packages/core/fixtures/driver-test-suite/request-access.ts

@@ -0,0 +1,143 @@
+import { actor } from "@rivetkit/core";
+
+/**
+ * Test fixture to verify request object access in all lifecycle hooks
+ */
+export const requestAccessActor = actor({
+	onAuth: () => {}, // Allow unauthenticated connections
+	state: {
+		// Track request info from different hooks
+		onBeforeConnectRequest: {
+			hasRequest: false,
+			requestUrl: null as string | null,
+			requestMethod: null as string | null,
+			requestHeaders: {} as Record<string, string>,
+		},
+		createConnStateRequest: {
+			hasRequest: false,
+			requestUrl: null as string | null,
+			requestMethod: null as string | null,
+			requestHeaders: {} as Record<string, string>,
+		},
+		onFetchRequest: {
+			hasRequest: false,
+			requestUrl: null as string | null,
+			requestMethod: null as string | null,
+			requestHeaders: {} as Record<string, string>,
+		},
+		onWebSocketRequest: {
+			hasRequest: false,
+			requestUrl: null as string | null,
+			requestMethod: null as string | null,
+			requestHeaders: {} as Record<string, string>,
+		},
+	},
+	createConnState: (
+		c,
+		{
+			params,
+			request,
+		}: { params?: { trackRequest?: boolean }; request?: Request },
+	) => {
+		if (params?.trackRequest && request) {
+			c.state.createConnStateRequest.hasRequest = true;
+			c.state.createConnStateRequest.requestUrl = request.url;
+			c.state.createConnStateRequest.requestMethod = request.method;
+
+			// Store select headers
+			const headers: Record<string, string> = {};
+			request.headers.forEach((value, key) => {
+				headers[key] = value;
+			});
+			c.state.createConnStateRequest.requestHeaders = headers;
+		}
+
+		return {
+			trackRequest: params?.trackRequest || false,
+		};
+	},
+	onBeforeConnect: (c, { request, params }) => {
+		if (params?.trackRequest) {
+			if (request) {
+				c.state.onBeforeConnectRequest.hasRequest = true;
+				c.state.onBeforeConnectRequest.requestUrl = request.url;
+				c.state.onBeforeConnectRequest.requestMethod = request.method;
+
+				// Store select headers
+				const headers: Record<string, string> = {};
+				request.headers.forEach((value, key) => {
+					headers[key] = value;
+				});
+				c.state.onBeforeConnectRequest.requestHeaders = headers;
+			} else {
+				// Track that we tried but request was not available
+				c.state.onBeforeConnectRequest.hasRequest = false;
+			}
+		}
+	},
+	onFetch: (c, request) => {
+		// Store request info
+		c.state.onFetchRequest.hasRequest = true;
+		c.state.onFetchRequest.requestUrl = request.url;
+		c.state.onFetchRequest.requestMethod = request.method;
+
+		// Store select headers
+		const headers: Record<string, string> = {};
+		request.headers.forEach((value, key) => {
+			headers[key] = value;
+		});
+		c.state.onFetchRequest.requestHeaders = headers;
+
+		// Return response with request info
+		return new Response(
+			JSON.stringify({
+				hasRequest: true,
+				requestUrl: request.url,
+				requestMethod: request.method,
+				requestHeaders: headers,
+			}),
+			{
+				status: 200,
+				headers: { "Content-Type": "application/json" },
+			},
+		);
+	},
+	onWebSocket: (c, websocket, { request }) => {
+		// Store request info
+		c.state.onWebSocketRequest.hasRequest = true;
+		c.state.onWebSocketRequest.requestUrl = request.url;
+		c.state.onWebSocketRequest.requestMethod = request.method;
+
+		// Store select headers
+		const headers: Record<string, string> = {};
+		request.headers.forEach((value, key) => {
+			headers[key] = value;
+		});
+		c.state.onWebSocketRequest.requestHeaders = headers;
+
+		// Send request info on connection
+		websocket.send(
+			JSON.stringify({
+				hasRequest: true,
+				requestUrl: request.url,
+				requestMethod: request.method,
+				requestHeaders: headers,
+			}),
+		);
+
+		// Echo messages back
+		websocket.addEventListener("message", (event) => {
+			websocket.send(event.data);
+		});
+	},
+	actions: {
+		getRequestInfo: (c) => {
+			return {
+				onBeforeConnect: c.state.onBeforeConnectRequest,
+				createConnState: c.state.createConnStateRequest,
+				onFetch: c.state.onFetchRequest,
+				onWebSocket: c.state.onWebSocketRequest,
+			};
+		},
+	},
+});

packages/core/src/driver-test-suite/mod.ts

@@ -25,6 +25,7 @@ import { runRawHttpDirectRegistryTests } from "./tests/raw-http-direct-registry"
 import { runRawHttpRequestPropertiesTests } from "./tests/raw-http-request-properties";
 import { runRawWebSocketTests } from "./tests/raw-websocket";
 import { runRawWebSocketDirectRegistryTests } from "./tests/raw-websocket-direct-registry";
+import { runRequestAccessTests } from "./tests/request-access";
 
 export interface SkipTests {
 	schedule?: boolean;
@@ -90,6 +91,8 @@ export function runDriverTests(
 					});
 
 					runActorConnStateTests({ ...driverTestConfig, transport });
+
+					runRequestAccessTests({ ...driverTestConfig, transport });
 				});
 			}