rivetkit 2.0.20 → 2.0.21

package/src/actor/config.ts

@@ -84,7 +84,10 @@ export const ActorConfigSchema = z
 	)
 	.refine(
 		(data) =>
-			!(data.connState !== undefined && data.createConnState !== undefined),
+			!(
+				data.connState !== undefined &&
+				data.createConnState !== undefined
+			),
 		{
 			message: "Cannot define both 'connState' and 'createConnState'",
 			path: ["connState"],
@@ -115,7 +118,10 @@ export interface OnConnectOptions {
 type CreateState<TState, TConnParams, TConnState, TVars, TInput, TDatabase> =
 	| { state: TState }
 	| {
-			createState: (c: InitContext, input: TInput) => TState | Promise<TState>;
+			createState: (
+				c: InitContext,
+				input: TInput,
+			) => TState | Promise<TState>;
 	  }
 	| Record<never, never>;
 
@@ -159,7 +165,10 @@ type CreateVars<TState, TConnParams, TConnState, TVars, TInput, TDatabase> =
 			/**
 			 * @experimental
 			 */
-			createVars: (c: InitContext, driverCtx: any) => TVars | Promise<TVars>;
+			createVars: (
+				c: InitContext,
+				driverCtx: any,
+			) => TVars | Promise<TVars>;
 	  }
 	| Record<never, never>;
 
@@ -172,7 +181,14 @@ export interface Actions<
 	TDatabase extends AnyDatabaseProvider,
 > {
 	[Action: string]: (
-		c: ActionContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActionContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 		...args: any[]
 	) => any;
 }
@@ -210,7 +226,14 @@ interface BaseActorConfig<
 	 * This is called before any other lifecycle hooks.
 	 */
 	onCreate?: (
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 		input: TInput,
 	) => void | Promise<void>;
 
@@ -223,7 +246,14 @@ interface BaseActorConfig<
 	 * @returns Void or a Promise that resolves when startup is complete
 	 */
 	onStart?: (
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 	) => void | Promise<void>;
 
 	/**
@@ -237,7 +267,14 @@ interface BaseActorConfig<
 	 * @returns Void or a Promise that resolves when shutdown is complete
 	 */
 	onStop?: (
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 	) => void | Promise<void>;
 
 	/**
@@ -252,7 +289,14 @@ interface BaseActorConfig<
 	 * @param newState The updated state
 	 */
 	onStateChange?: (
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 		newState: TState,
 	) => void;
 
@@ -267,7 +311,14 @@ interface BaseActorConfig<
 	 * @throws Throw an error to reject the connection
 	 */
 	onBeforeConnect?: (
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 		opts: OnConnectOptions,
 		params: TConnParams,
 	) => void | Promise<void>;
@@ -282,7 +333,14 @@ interface BaseActorConfig<
 	 * @returns Void or a Promise that resolves when connection handling is complete
 	 */
 	onConnect?: (
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 		conn: Conn<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
 	) => void | Promise<void>;
 
@@ -296,7 +354,14 @@ interface BaseActorConfig<
 	 * @returns Void or a Promise that resolves when disconnect handling is complete
 	 */
 	onDisconnect?: (
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 		conn: Conn<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
 	) => void | Promise<void>;
 
@@ -313,7 +378,14 @@ interface BaseActorConfig<
 	 * @returns The modified output to send to the client
 	 */
 	onBeforeActionResponse?: <Out>(
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 		name: string,
 		args: unknown[],
 		output: Out,
@@ -329,7 +401,14 @@ interface BaseActorConfig<
 	 * @returns A Response object to send back, or void to continue with default routing
 	 */
 	onFetch?: (
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 		request: Request,
 		opts: {},
 	) => Response | Promise<Response>;
@@ -344,7 +423,14 @@ interface BaseActorConfig<
 	 * @param request The original HTTP upgrade request
 	 */
 	onWebSocket?: (
-		c: ActorContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase>,
+		c: ActorContext<
+			TState,
+			TConnParams,
+			TConnState,
+			TVars,
+			TInput,
+			TDatabase
+		>,
 		websocket: UniversalWebSocket,
 		opts: { request: Request },
 	) => void | Promise<void>;
@@ -422,7 +508,14 @@ export type ActorConfigInput<
 		TDatabase
 	> = Record<never, never>,
 > = {
-	types?: ActorTypes<TState, TConnParams, TConnState, TVars, TInput, TDatabase>;
+	types?: ActorTypes<
+		TState,
+		TConnParams,
+		TConnState,
+		TVars,
+		TInput,
+		TDatabase
+	>;
 } & Omit<
 	z.input<typeof ActorConfigSchema>,
 	| "actions"

package/src/actor/conn-drivers.ts

@@ -85,7 +85,8 @@ const WEBSOCKET_DRIVER: ConnDriver<ConnDriverWebSocketState> = {
 			dataType: typeof serialized,
 			isUint8Array: serialized instanceof Uint8Array,
 			isArrayBuffer: serialized instanceof ArrayBuffer,
-			dataLength: (serialized as any).byteLength || (serialized as any).length,
+			dataLength:
+				(serialized as any).byteLength || (serialized as any).length,
 		});
 
 		// Convert Uint8Array to ArrayBuffer for proper transmission

package/src/actor/instance.ts

@@ -20,12 +20,19 @@ import {
 	promiseWithResolvers,
 	SinglePromiseQueue,
 } from "@/utils";
-import type { ActionContext } from "./action";
+import { ActionContext } from "./action";
 import type { ActorConfig, OnConnectOptions } from "./config";
-import { Conn, type ConnId, generateConnId, generateConnToken } from "./conn";
+import {
+	Conn,
+	type ConnId,
+	generateConnId,
+	generateConnSocketId,
+	generateConnToken,
+} from "./conn";
 import {
 	CONN_DRIVERS,
 	type ConnDriver,
+	ConnDriverKind,
 	type ConnDriverState,
 	getConnDriverKindFromState,
 } from "./conn-drivers";
@@ -207,12 +214,14 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 				return Object.keys(this.#config.actions);
 			},
 			getConnections: async () => {
-				return Array.from(this.#connections.entries()).map(([id, conn]) => ({
-					id,
-					stateEnabled: conn.__stateEnabled,
-					params: conn.params as any,
-					state: conn.__stateEnabled ? conn.state : undefined,
-				}));
+				return Array.from(this.#connections.entries()).map(
+					([id, conn]) => ({
+						id,
+						stateEnabled: conn.__stateEnabled,
+						params: conn.params as any,
+						state: conn.__stateEnabled ? conn.state : undefined,
+					}),
+				);
 			},
 			setState: async (state: unknown) => {
 				this.#validateStateEnabled();
@@ -225,6 +234,27 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 				this.#persist.state = { ...(state as S) };
 				await this.saveState({ immediate: true });
 			},
+			executeAction: async (name, params) => {
+				const socketId = generateConnSocketId();
+				const conn = await this.createConn(
+					{
+						socketId,
+						driverState: { [ConnDriverKind.HTTP]: {} },
+					},
+					undefined,
+					undefined,
+				);
+
+				try {
+					return await this.executeAction(
+						new ActionContext(this.actorContext, conn),
+						name,
+						params || [],
+					);
+				} finally {
+					this.__connDisconnected(conn, true, socketId);
+				}
+			},
 		};
 	});
 
@@ -271,7 +301,10 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 		};
 
 		this.#log = getBaseLogger().child(
-			Object.assign(getIncludeTarget() ? { target: "actor" } : {}, logParams),
+			Object.assign(
+				getIncludeTarget() ? { target: "actor" } : {},
+				logParams,
+			),
 		);
 		this.#rLog = getBaseLogger().child(
 			Object.assign(
@@ -319,7 +352,9 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 			} else if ("vars" in this.#config) {
 				vars = structuredClone(this.#config.vars);
 			} else {
-				throw new Error("Could not variables from 'createVars' or 'vars'");
+				throw new Error(
+					"Could not variables from 'createVars' or 'vars'",
+				);
 			}
 			this.#vars = vars;
 		}
@@ -346,7 +381,9 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 
 		// Set alarm for next scheduled event if any exist after finishing initiation sequence
 		if (this.#persist.scheduledEvents.length > 0) {
-			await this.#queueSetAlarm(this.#persist.scheduledEvents[0].timestamp);
+			await this.#queueSetAlarm(
+				this.#persist.scheduledEvents[0].timestamp,
+			);
 		}
 
 		this.#rLog.info({ msg: "actor ready" });
@@ -475,7 +512,8 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 				});
 
 				// Look up function
-				const fn: unknown = this.#config.actions[event.kind.generic.actionName];
+				const fn: unknown =
+					this.#config.actions[event.kind.generic.actionName];
 
 				if (!fn)
 					throw new Error(
@@ -589,10 +627,14 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 					this.#persistChanged = false;
 
 					// Convert to BARE types and write to KV
-					const bareData = this.#convertToBarePersisted(this.#persistRaw);
+					const bareData = this.#convertToBarePersisted(
+						this.#persistRaw,
+					);
 					await this.#actorDriver.writePersistedData(
 						this.#actorId,
-						PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(bareData),
+						PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(
+							bareData,
+						),
 					);
 
 					this.#rLog.debug({ msg: "persist saved" });
@@ -649,7 +691,12 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 		this.#persist = onChange(
 			target,
 			// biome-ignore lint/suspicious/noExplicitAny: Don't know types in proxy
-			(path: string, value: any, _previousValue: any, _applyData: any) => {
+			(
+				path: string,
+				value: any,
+				_previousValue: any,
+				_applyData: any,
+			) => {
 				if (path !== "state" && !path.startsWith("state.")) {
 					return;
 				}
@@ -671,7 +718,10 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 				this.#persistChanged = true;
 
 				// Inform the inspector about state changes
-				this.inspector.emitter.emit("stateUpdated", this.#persist.state);
+				this.inspector.emitter.emit(
+					"stateUpdated",
+					this.#persist.state,
+				);
 
 				// Call onStateChange if it exists
 				// Skip if we're already inside onStateChange to prevent infinite recursion
@@ -763,7 +813,9 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 				} else if ("state" in this.#config) {
 					stateData = structuredClone(this.#config.state);
 				} else {
-					throw new Error("Both 'createState' or 'state' were not defined");
+					throw new Error(
+						"Both 'createState' or 'state' were not defined",
+					);
 				}
 			} else {
 				this.#rLog.debug({ msg: "state not enabled" });
@@ -778,14 +830,19 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 			const bareData = this.#convertToBarePersisted(persistData);
 			await this.#actorDriver.writePersistedData(
 				this.#actorId,
-				PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(bareData),
+				PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(
+					bareData,
+				),
 			);
 
 			this.#setPersist(persistData);
 
 			// Notify creation
 			if (this.#config.onCreate) {
-				await this.#config.onCreate(this.actorContext, persistData.input!);
+				await this.#config.onCreate(
+					this.actorContext,
+					persistData.input!,
+				);
 			}
 		}
 	}
@@ -870,7 +927,10 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 		this.inspector.emitter.emit("connectionUpdated");
 		if (this.#config.onDisconnect) {
 			try {
-				const result = this.#config.onDisconnect(this.actorContext, conn);
+				const result = this.#config.onDisconnect(
+					this.actorContext,
+					conn,
+				);
 				if (result instanceof Promise) {
 					// Handle promise but don't await it to prevent blocking
 					result.catch((error) => {
@@ -1054,15 +1114,16 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 			try {
 				const result = this.#config.onConnect(this.actorContext, conn);
 				if (result instanceof Promise) {
-					deadline(result, this.#config.options.onConnectTimeout).catch(
-						(error) => {
-							this.#rLog.error({
-								msg: "error in `onConnect`, closing socket",
-								error,
-							});
-							conn?.disconnect("`onConnect` failed");
-						},
-					);
+					deadline(
+						result,
+						this.#config.options.onConnectTimeout,
+					).catch((error) => {
+						this.#rLog.error({
+							msg: "error in `onConnect`, closing socket",
+							error,
+						});
+						conn?.disconnect("`onConnect` failed");
+					});
 				}
 			} catch (error) {
 				this.#rLog.error({
@@ -1224,11 +1285,17 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 
 		for (const conn of this.#connections.values()) {
 			if (conn.__status === "connected") {
-				this.#rLog.debug({ msg: "connection is alive", connId: conn.id });
+				this.#rLog.debug({
+					msg: "connection is alive",
+					connId: conn.id,
+				});
 			} else {
 				const lastSeen = conn.__persist.lastSeen;
 				const sinceLastSeen = Date.now() - lastSeen;
-				if (sinceLastSeen < this.#config.options.connectionLivenessTimeout) {
+				if (
+					sinceLastSeen <
+					this.#config.options.connectionLivenessTimeout
+				) {
 					this.#rLog.debug({
 						msg: "connection might be alive, will check later",
 						connId: conn.id,
@@ -1311,7 +1378,11 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 				args,
 			});
 
-			const outputOrPromise = actionFunction.call(undefined, ctx, ...args);
+			const outputOrPromise = actionFunction.call(
+				undefined,
+				ctx,
+				...args,
+			);
 			let output: unknown;
 			if (outputOrPromise instanceof Promise) {
 				// Log that we're waiting for an async action
@@ -1426,11 +1497,17 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 			}
 			return response;
 		} catch (error) {
-			this.#rLog.error({ msg: "onFetch error", error: stringifyError(error) });
+			this.#rLog.error({
+				msg: "onFetch error",
+				error: stringifyError(error),
+			});
 			throw error;
 		} finally {
 			// Decrement active raw fetch counter and re-evaluate sleep
-			this.#activeRawFetchCount = Math.max(0, this.#activeRawFetchCount - 1);
+			this.#activeRawFetchCount = Math.max(
+				0,
+				this.#activeRawFetchCount - 1,
+			);
 			this.#resetSleepTimer();
 			this.#savePersistThrottled();
 		}
@@ -1765,6 +1842,11 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 
 		this.#rLog.info({ msg: "actor stopping" });
 
+		if (this.#sleepTimeout) {
+			clearTimeout(this.#sleepTimeout);
+			this.#sleepTimeout = undefined;
+		}
+
 		// Abort any listeners waiting for shutdown
 		try {
 			this.#abortController.abort();
@@ -1800,7 +1882,9 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 		}
 
 		// Wait for any background tasks to finish, with timeout
-		await this.#waitBackgroundPromises(this.#config.options.waitUntilTimeout);
+		await this.#waitBackgroundPromises(
+			this.#config.options.waitUntilTimeout,
+		);
 
 		// Clear timeouts
 		if (this.#pendingSaveTimeout) clearTimeout(this.#pendingSaveTimeout);

package/src/actor/keys.test.ts

@@ -25,7 +25,9 @@ describe("Key serialization and deserialization", () => {
 
 		test("escapes forward slashes in keys", () => {
 			expect(serializeActorKey(["a/b"])).toBe("a\\/b");
-			expect(serializeActorKey(["a/b", "c"])).toBe(`a\\/b${KEY_SEPARATOR}c`);
+			expect(serializeActorKey(["a/b", "c"])).toBe(
+				`a\\/b${KEY_SEPARATOR}c`,
+			);
 		});
 
 		test("escapes empty key marker in keys", () => {
@@ -46,7 +48,9 @@ describe("Key serialization and deserialization", () => {
 		});
 
 		test("deserializes undefined/null", () => {
-			expect(deserializeActorKey(undefined as unknown as string)).toEqual([]);
+			expect(deserializeActorKey(undefined as unknown as string)).toEqual(
+				[],
+			);
 			expect(deserializeActorKey(null as unknown as string)).toEqual([]);
 		});
 
@@ -127,7 +131,9 @@ describe("Key serialization and deserialization", () => {
 			expect(serialized2).toBe("\\0"); // Empty string becomes \0 marker
 
 			expect(deserializeActorKey(serialized1)).toEqual(emptyArray);
-			expect(deserializeActorKey(serialized2)).toEqual(arrayWithEmptyString);
+			expect(deserializeActorKey(serialized2)).toEqual(
+				arrayWithEmptyString,
+			);
 		});
 
 		test("handles mix of empty strings and forward slash (EMPTY_KEY)", () => {
@@ -194,7 +200,10 @@ describe("Key serialization and deserialization", () => {
 			const testCases: Array<[string[], string]> = [
 				[["path\\to\\file/dir"], "path\\\\to\\\\file\\/dir"],
 				[["file\\with/slash"], "file\\\\with\\/slash"],
-				[["path\\to\\file", "with/slash"], "path\\\\to\\\\file/with\\/slash"],
+				[
+					["path\\to\\file", "with/slash"],
+					"path\\\\to\\\\file/with\\/slash",
+				],
 			];
 
 			for (const [key, expectedSerialized] of testCases) {

package/src/actor/protocol/old.ts

@@ -57,7 +57,10 @@ export async function inputDataToBuffer(
 		return new Uint8Array(arrayBuffer);
 	} else if (data instanceof Uint8Array) {
 		return data;
-	} else if (data instanceof ArrayBuffer || data instanceof SharedArrayBuffer) {
+	} else if (
+		data instanceof ArrayBuffer ||
+		data instanceof SharedArrayBuffer
+	) {
 		return new Uint8Array(data);
 	} else {
 		throw new errors.MalformedMessage();
@@ -171,7 +174,9 @@ export async function processMessage<
 							tag: "ActionResponse",
 							val: {
 								id: id,
-								output: bufferToArrayBuffer(cbor.encode(output)),
+								output: bufferToArrayBuffer(
+									cbor.encode(output),
+								),
 							},
 						},
 					},
@@ -240,7 +245,9 @@ export async function processMessage<
 							group,
 							code,
 							message,
-							metadata: bufferToArrayBuffer(cbor.encode(metadata)),
+							metadata: bufferToArrayBuffer(
+								cbor.encode(metadata),
+							),
 							actionId: actionId ?? null,
 						},
 					},

package/src/actor/router-endpoints.ts

@@ -114,7 +114,9 @@ export async function handleWebSocketConnect(
 	connId?: string,
 	connToken?: string,
 ): Promise<UpgradeWebSocketArgs> {
-	const exposeInternalError = req ? getRequestExposeInternalError(req) : false;
+	const exposeInternalError = req
+		? getRequestExposeInternalError(req)
+		: false;
 
 	// Setup promise for the init handlers since all other behavior depends on this
 	const {
@@ -218,20 +220,23 @@ export async function handleWebSocketConnect(
 					const value = evt.data.valueOf() as InputData;
 					parseMessage(value, {
 						encoding: encoding,
-						maxIncomingMessageSize: runConfig.maxIncomingMessageSize,
+						maxIncomingMessageSize:
+							runConfig.maxIncomingMessageSize,
 					})
 						.then((message) => {
-							actor.processMessage(message, conn).catch((error) => {
-								const { code } = deconstructError(
-									error,
-									actor.rLog,
-									{
-										wsEvent: "message",
-									},
-									exposeInternalError,
-								);
-								ws.close(1011, code);
-							});
+							actor
+								.processMessage(message, conn)
+								.catch((error) => {
+									const { code } = deconstructError(
+										error,
+										actor.rLog,
+										{
+											wsEvent: "message",
+										},
+										exposeInternalError,
+									);
+									ws.close(1011, code);
+								});
 						})
 						.catch((error) => {
 							const { code } = deconstructError(
@@ -419,7 +424,10 @@ export async function handleSseConnect(
 				await stream.sleep(SSE_PING_INTERVAL);
 			}
 		} catch (error) {
-			loggerWithoutContext().error({ msg: "error in sse connection", error });
+			loggerWithoutContext().error({
+				msg: "error in sse connection",
+				error,
+			});
 
 			// Cleanup on error
 			if (conn && actor !== undefined) {
@@ -597,9 +605,11 @@ export async function handleRawWebSocketHandler(
 			// Extract the path after prefix and preserve query parameters
 			// Use URL API for cleaner parsing
 			const url = new URL(path, "http://actor");
-			const pathname = url.pathname.replace(/^\/raw\/websocket\/?/, "") || "/";
+			const pathname =
+				url.pathname.replace(/^\/raw\/websocket\/?/, "") || "/";
 			const normalizedPath =
-				(pathname.startsWith("/") ? pathname : "/" + pathname) + url.search;
+				(pathname.startsWith("/") ? pathname : "/" + pathname) +
+				url.search;
 
 			let newRequest: Request;
 			if (req) {