rivetkit 2.0.3 → 2.0.4

package/src/actor/instance.ts

@@ -3,7 +3,7 @@ import invariant from "invariant";
 import onChange from "on-change";
 import type { ActorKey } from "@/actor/mod";
 import type { Client } from "@/client/client";
-import type { Logger } from "@/common/log";
+import { getBaseLogger, getIncludeTarget, type Logger } from "@/common/log";
 import { isCborSerializable, stringifyError } from "@/common/utils";
 import type { UniversalWebSocket } from "@/common/websocket-interface";
 import { ActorInspector } from "@/inspector/actor";
@@ -12,7 +12,11 @@ import type * as bareSchema from "@/schemas/actor-persist/mod";
 import { PERSISTED_ACTOR_VERSIONED } from "@/schemas/actor-persist/versioned";
 import type * as protocol from "@/schemas/client-protocol/mod";
 import { TO_CLIENT_VERSIONED } from "@/schemas/client-protocol/versioned";
-import { bufferToArrayBuffer, SinglePromiseQueue } from "@/utils";
+import {
+	bufferToArrayBuffer,
+	getEnvUniversal,
+	SinglePromiseQueue,
+} from "@/utils";
 import type { ActionContext } from "./action";
 import type { ActorConfig, OnConnectOptions } from "./config";
 import {
@@ -25,7 +29,8 @@ import { ActorContext } from "./context";
 import type { AnyDatabaseProvider, InferDatabaseClient } from "./database";
 import type { ActorDriver, ConnDriver, ConnectionDriversMap } from "./driver";
 import * as errors from "./errors";
-import { instanceLogger, logger } from "./log";
+import { serializeActorKey } from "./keys";
+import { loggerWithoutContext } from "./log";
 import type {
 	PersistedActor,
 	PersistedConn,
@@ -61,8 +66,6 @@ export type AnyActorInstance = ActorInstance<
 	// biome-ignore lint/suspicious/noExplicitAny: Needs to be used in `extends`
 	any,
 	// biome-ignore lint/suspicious/noExplicitAny: Needs to be used in `extends`
-	any,
-	// biome-ignore lint/suspicious/noExplicitAny: Needs to be used in `extends`
 	any
 >;
 
@@ -78,8 +81,6 @@ export type ExtractActorState<A extends AnyActorInstance> =
 		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
 		any,
 		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
-		any,
-		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
 		any
 	>
 		? State
@@ -97,8 +98,6 @@ export type ExtractActorConnParams<A extends AnyActorInstance> =
 		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
 		any,
 		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
-		any,
-		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
 		any
 	>
 		? ConnParams
@@ -116,24 +115,21 @@ export type ExtractActorConnState<A extends AnyActorInstance> =
 		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
 		any,
 		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
-		any,
-		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
 		any
 	>
 		? ConnState
 		: never;
 
-export class ActorInstance<
-	S,
-	CP,
-	CS,
-	V,
-	I,
-	AD,
-	DB extends AnyDatabaseProvider,
-> {
+export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 	// Shared actor context for this instance
-	actorContext: ActorContext<S, CP, CS, V, I, AD, DB>;
+	actorContext: ActorContext<S, CP, CS, V, I, DB>;
+
+	/** Actor log, intended for the user to call */
+	#log!: Logger;
+
+	/** Runtime log, intended for internal actor logs */
+	#rLog!: Logger;
+
 	#sleepCalled = false;
 	#stopCalled = false;
 
@@ -164,7 +160,7 @@ export class ActorInstance<
 
 	#backgroundPromises: Promise<void>[] = [];
 	#abortController = new AbortController();
-	#config: ActorConfig<S, CP, CS, V, I, AD, DB>;
+	#config: ActorConfig<S, CP, CS, V, I, DB>;
 	#connectionDrivers!: ConnectionDriversMap;
 	#actorDriver!: ActorDriver;
 	#inlineClient!: Client<Registry<any>>;
@@ -174,8 +170,8 @@ export class ActorInstance<
 	#region!: string;
 	#ready = false;
 
-	#connections = new Map<ConnId, Conn<S, CP, CS, V, I, AD, DB>>();
-	#subscriptionIndex = new Map<string, Set<Conn<S, CP, CS, V, I, AD, DB>>>();
+	#connections = new Map<ConnId, Conn<S, CP, CS, V, I, DB>>();
+	#subscriptionIndex = new Map<string, Set<Conn<S, CP, CS, V, I, DB>>>();
 	#checkConnLivenessInterval?: NodeJS.Timeout;
 
 	#sleepTimeout?: NodeJS.Timeout;
@@ -213,7 +209,6 @@ export class ActorInstance<
 					stateEnabled: conn._stateEnabled,
 					params: conn.params as {},
 					state: conn._stateEnabled ? conn.state : undefined,
-					auth: conn.auth as {},
 				}));
 			},
 			setState: async (state: unknown) => {
@@ -253,7 +248,7 @@ export class ActorInstance<
 	 *
 	 * @private
 	 */
-	constructor(config: ActorConfig<S, CP, CS, V, I, AD, DB>) {
+	constructor(config: ActorConfig<S, CP, CS, V, I, DB>) {
 		this.#config = config;
 		this.actorContext = new ActorContext(this);
 	}
@@ -267,6 +262,22 @@ export class ActorInstance<
 		key: ActorKey,
 		region: string,
 	) {
+		const logParams = {
+			actor: name,
+			key: serializeActorKey(key),
+			actorId,
+		};
+
+		this.#log = getBaseLogger().child(
+			Object.assign(getIncludeTarget() ? { target: "actor" } : {}, logParams),
+		);
+		this.#rLog = getBaseLogger().child(
+			Object.assign(
+				getIncludeTarget() ? { target: "actor-runtime" } : {},
+				logParams,
+			),
+		);
+
 		this.#connectionDrivers = connectionDrivers;
 		this.#actorDriver = actorDriver;
 		this.#inlineClient = inlineClient;
@@ -292,7 +303,6 @@ export class ActorInstance<
 						undefined,
 						undefined,
 						undefined,
-						undefined,
 						any
 					>,
 					this.#actorDriver.getContext(this.#actorId),
@@ -314,7 +324,7 @@ export class ActorInstance<
 		}
 
 		// TODO: Exit process if this errors
-		logger().info("actor starting");
+		this.#rLog.info({ msg: "actor starting" });
 		if (this.#config.onStart) {
 			const result = this.#config.onStart(this.actorContext);
 			if (result instanceof Promise) {
@@ -327,9 +337,9 @@ export class ActorInstance<
 			const client = await this.#config.db.createClient({
 				getDatabase: () => actorDriver.getDatabase(this.#actorId),
 			});
-			logger().info("database migration starting");
+			this.#rLog.info({ msg: "database migration starting" });
 			await this.#config.db.onMigrate?.(client);
-			logger().info("database migration complete");
+			this.#rLog.info({ msg: "database migration complete" });
 			this.#db = client;
 		}
 
@@ -338,7 +348,7 @@ export class ActorInstance<
 			await this.#queueSetAlarm(this.#persist.scheduledEvents[0].timestamp);
 		}
 
-		logger().info("actor ready");
+		this.#rLog.info({ msg: "actor ready" });
 		this.#ready = true;
 
 		// Must be called after setting `#ready` or else it will not schedule sleep
@@ -365,7 +375,7 @@ export class ActorInstance<
 	}
 
 	async #scheduleEventInner(newEvent: PersistedScheduleEvent) {
-		this.actorContext.log.info("scheduling event", newEvent);
+		this.actorContext.log.info({ msg: "scheduling event", ...newEvent });
 
 		// Insert event in to index
 		const insertIndex = this.#persist.scheduledEvents.findIndex(
@@ -381,7 +391,8 @@ export class ActorInstance<
 		// - this is the newest event (i.e. at beginning of array) or
 		// - this is the only event (i.e. the only event in the array)
 		if (insertIndex === 0 || this.#persist.scheduledEvents.length === 1) {
-			this.actorContext.log.info("setting alarm", {
+			this.actorContext.log.info({
+				msg: "setting alarm",
 				timestamp: newEvent.timestamp,
 				eventCount: this.#persist.scheduledEvents.length,
 			});
@@ -391,7 +402,8 @@ export class ActorInstance<
 
 	async _onAlarm() {
 		const now = Date.now();
-		this.actorContext.log.debug("alarm triggered", {
+		this.actorContext.log.debug({
+			msg: "alarm triggered",
 			now,
 			events: this.#persist.scheduledEvents.length,
 		});
@@ -408,34 +420,34 @@ export class ActorInstance<
 		if (runIndex === -1) {
 			// No events are due yet. This will happen if timers fire slightly early.
 			// Ensure we reschedule the alarm for the next upcoming event to avoid losing it.
-			logger().warn("no events are due yet, time may have broken");
+			this.#rLog.warn({ msg: "no events are due yet, time may have broken" });
 			if (this.#persist.scheduledEvents.length > 0) {
 				const nextTs = this.#persist.scheduledEvents[0].timestamp;
-				this.actorContext.log.warn(
-					"alarm fired early, rescheduling for next event",
-					{
-						now,
-						nextTs,
-						delta: nextTs - now,
-					},
-				);
+				this.actorContext.log.warn({
+					msg: "alarm fired early, rescheduling for next event",
+					now,
+					nextTs,
+					delta: nextTs - now,
+				});
 				await this.#queueSetAlarm(nextTs);
 			}
-			this.actorContext.log.debug("no events to run", { now });
+			this.actorContext.log.debug({ msg: "no events to run", now });
 			return;
 		}
 		const scheduleEvents = this.#persist.scheduledEvents.splice(
 			0,
 			runIndex + 1,
 		);
-		this.actorContext.log.debug("running events", {
+		this.actorContext.log.debug({
+			msg: "running events",
 			count: scheduleEvents.length,
 		});
 
 		// Set alarm for next event
 		if (this.#persist.scheduledEvents.length > 0) {
 			const nextTs = this.#persist.scheduledEvents[0].timestamp;
-			this.actorContext.log.info("setting next alarm", {
+			this.actorContext.log.info({
+				msg: "setting next alarm",
 				nextTs,
 				remainingEvents: this.#persist.scheduledEvents.length,
 			});
@@ -445,7 +457,8 @@ export class ActorInstance<
 		// Iterate by event key in order to ensure we call the events in order
 		for (const event of scheduleEvents) {
 			try {
-				this.actorContext.log.info("running action for event", {
+				this.actorContext.log.info({
+					msg: "running action for event",
 					event: event.eventId,
 					timestamp: event.timestamp,
 					action: event.kind.generic.actionName,
@@ -470,7 +483,8 @@ export class ActorInstance<
 						: [];
 					await fn.call(undefined, this.actorContext, ...args);
 				} catch (error) {
-					this.actorContext.log.error("error while running event", {
+					this.actorContext.log.error({
+						msg: "error while running event",
 						error: stringifyError(error),
 						event: event.eventId,
 						timestamp: event.timestamp,
@@ -478,7 +492,8 @@ export class ActorInstance<
 					});
 				}
 			} catch (error) {
-				this.actorContext.log.error("internal error while running event", {
+				this.actorContext.log.error({
+					msg: "internal error while running event",
 					error: stringifyError(error),
 					...event,
 				});
@@ -557,7 +572,7 @@ export class ActorInstance<
 
 			if (this.#persistChanged) {
 				const finished = this.#persistWriteQueue.enqueue(async () => {
-					logger().debug("saving persist");
+					this.#rLog.debug({ msg: "saving persist" });
 
 					// There might be more changes while we're writing, so we set this
 					// before writing to KV in order to avoid a race condition.
@@ -570,7 +585,7 @@ export class ActorInstance<
 						PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(bareData),
 					);
 
-					logger().debug("persist saved");
+					this.#rLog.debug({ msg: "persist saved" });
 				});
 
 				await finished;
@@ -662,7 +677,8 @@ export class ActorInstance<
 							this.#persistRaw.state,
 						);
 					} catch (error) {
-						logger().error("error in `_onStateChange`", {
+						this.#rLog.error({
+							msg: "error in `_onStateChange`",
 							error: stringifyError(error),
 						});
 					} finally {
@@ -692,7 +708,8 @@ export class ActorInstance<
 		const persistData = this.#convertFromBarePersisted(bareData);
 
 		if (persistData.hasInitiated) {
-			logger().info("actor restoring", {
+			this.#rLog.info({
+				msg: "actor restoring",
 				connections: persistData.connections.length,
 			});
 
@@ -703,7 +720,7 @@ export class ActorInstance<
 			for (const connPersist of this.#persist.connections) {
 				// Create connections
 				const driver = this.__getConnDriver(connPersist.connDriver);
-				const conn = new Conn<S, CP, CS, V, I, AD, DB>(
+				const conn = new Conn<S, CP, CS, V, I, DB>(
 					this,
 					connPersist,
 					driver,
@@ -717,12 +734,12 @@ export class ActorInstance<
 				}
 			}
 		} else {
-			logger().info("actor creating");
+			this.#rLog.info({ msg: "actor creating" });
 
 			// Initialize actor state
 			let stateData: unknown;
 			if (this.stateEnabled) {
-				logger().info("actor state initializing");
+				this.#rLog.info({ msg: "actor state initializing" });
 
 				if ("createState" in this.#config) {
 					this.#config.createState;
@@ -735,7 +752,6 @@ export class ActorInstance<
 							undefined,
 							undefined,
 							undefined,
-							undefined,
 							undefined
 						>,
 						persistData.input!,
@@ -746,7 +762,7 @@ export class ActorInstance<
 					throw new Error("Both 'createState' or 'state' were not defined");
 				}
 			} else {
-				logger().debug("state not enabled");
+				this.#rLog.debug({ msg: "state not enabled" });
 			}
 
 			// Save state and mark as initialized
@@ -754,7 +770,7 @@ export class ActorInstance<
 			persistData.hasInitiated = true;
 
 			// Update state
-			logger().debug("writing state");
+			this.#rLog.debug({ msg: "writing state" });
 			const bareData = this.#convertToBarePersisted(persistData);
 			await this.#actorDriver.writePersistedData(
 				this.#actorId,
@@ -770,16 +786,16 @@ export class ActorInstance<
 		}
 	}
 
-	__getConnForId(id: string): Conn<S, CP, CS, V, I, AD, DB> | undefined {
+	__getConnForId(id: string): Conn<S, CP, CS, V, I, DB> | undefined {
 		return this.#connections.get(id);
 	}
 
 	/**
 	 * Removes a connection and cleans up its resources.
 	 */
-	__removeConn(conn: Conn<S, CP, CS, V, I, AD, DB> | undefined) {
+	__removeConn(conn: Conn<S, CP, CS, V, I, DB> | undefined) {
 		if (!conn) {
-			logger().warn("`conn` does not exist");
+			this.#rLog.warn({ msg: "`conn` does not exist" });
 			return;
 		}
 
@@ -791,7 +807,8 @@ export class ActorInstance<
 			this.#persist.connections.splice(connIdx, 1);
 			this.saveState({ immediate: true, allowStoppingState: true });
 		} else {
-			logger().warn("could not find persisted connection to remove", {
+			this.#rLog.warn({
+				msg: "could not find persisted connection to remove",
 				connId: conn.id,
 			});
 		}
@@ -811,13 +828,15 @@ export class ActorInstance<
 				if (result instanceof Promise) {
 					// Handle promise but don't await it to prevent blocking
 					result.catch((error) => {
-						logger().error("error in `onDisconnect`", {
+						this.#rLog.error({
+							msg: "error in `onDisconnect`",
 							error: stringifyError(error),
 						});
 					});
 				}
 			} catch (error) {
-				logger().error("error in `onDisconnect`", {
+				this.#rLog.error({
+					msg: "error in `onDisconnect`",
 					error: stringifyError(error),
 				});
 			}
@@ -856,7 +875,6 @@ export class ActorInstance<
 						undefined,
 						undefined,
 						undefined,
-						undefined,
 						undefined
 					>,
 					onBeforeConnectOpts,
@@ -900,7 +918,7 @@ export class ActorInstance<
 		driverId: ConnectionDriver,
 		driverState: unknown,
 		authData: unknown,
-	): Promise<Conn<S, CP, CS, V, I, AD, DB>> {
+	): Promise<Conn<S, CP, CS, V, I, DB>> {
 		this.#assertReady();
 
 		if (this.#connections.has(connectionId)) {
@@ -920,7 +938,7 @@ export class ActorInstance<
 			lastSeen: Date.now(),
 			subscriptions: [],
 		};
-		const conn = new Conn<S, CP, CS, V, I, AD, DB>(
+		const conn = new Conn<S, CP, CS, V, I, DB>(
 			this,
 			persist,
 			driver,
@@ -944,7 +962,8 @@ export class ActorInstance<
 				if (result instanceof Promise) {
 					deadline(result, this.#config.options.onConnectTimeout).catch(
 						(error) => {
-							logger().error("error in `onConnect`, closing socket", {
+							this.#rLog.error({
+								msg: "error in `onConnect`, closing socket",
 								error,
 							});
 							conn?.disconnect("`onConnect` failed");
@@ -952,7 +971,8 @@ export class ActorInstance<
 					);
 				}
 			} catch (error) {
-				logger().error("error in `onConnect`", {
+				this.#rLog.error({
+					msg: "error in `onConnect`",
 					error: stringifyError(error),
 				});
 				conn?.disconnect("`onConnect` failed");
@@ -984,7 +1004,7 @@ export class ActorInstance<
 	// MARK: Messages
 	async processMessage(
 		message: protocol.ToServer,
-		conn: Conn<S, CP, CS, V, I, AD, DB>,
+		conn: Conn<S, CP, CS, V, I, DB>,
 	) {
 		await processMessage(message, this, conn, {
 			onExecuteAction: async (ctx, name, args) => {
@@ -1018,11 +1038,14 @@ export class ActorInstance<
 	// MARK: Events
 	#addSubscription(
 		eventName: string,
-		connection: Conn<S, CP, CS, V, I, AD, DB>,
+		connection: Conn<S, CP, CS, V, I, DB>,
 		fromPersist: boolean,
 	) {
 		if (connection.subscriptions.has(eventName)) {
-			logger().debug("connection already has subscription", { eventName });
+			this.#rLog.debug({
+				msg: "connection already has subscription",
+				eventName,
+			});
 			return;
 		}
 
@@ -1048,11 +1071,14 @@ export class ActorInstance<
 
 	#removeSubscription(
 		eventName: string,
-		connection: Conn<S, CP, CS, V, I, AD, DB>,
+		connection: Conn<S, CP, CS, V, I, DB>,
 		fromRemoveConn: boolean,
 	) {
 		if (!connection.subscriptions.has(eventName)) {
-			logger().warn("connection does not have subscription", { eventName });
+			this.#rLog.warn({
+				msg: "connection does not have subscription",
+				eventName,
+			});
 			return;
 		}
 
@@ -1068,7 +1094,10 @@ export class ActorInstance<
 			if (subIdx !== -1) {
 				connection.__persist.subscriptions.splice(subIdx, 1);
 			} else {
-				logger().warn("subscription does not exist with name", { eventName });
+				this.#rLog.warn({
+					msg: "subscription does not exist with name",
+					eventName,
+				});
 			}
 
 			this.saveState({ immediate: true });
@@ -1097,17 +1126,18 @@ export class ActorInstance<
 	 * Sets up a recurring check based on the configured interval.
 	 */
 	#checkConnectionsLiveness() {
-		logger().debug("checking connections liveness");
+		this.#rLog.debug({ msg: "checking connections liveness" });
 
 		for (const conn of this.#connections.values()) {
 			const liveness = conn[CONNECTION_CHECK_LIVENESS_SYMBOL]();
 			if (liveness.status === "connected") {
-				logger().debug("connection is alive", { connId: conn.id });
+				this.#rLog.debug({ msg: "connection is alive", connId: conn.id });
 			} else {
 				const lastSeen = liveness.lastSeen;
 				const sinceLastSeen = Date.now() - lastSeen;
 				if (sinceLastSeen < this.#config.options.connectionLivenessTimeout) {
-					logger().debug("connection might be alive, will check later", {
+					this.#rLog.debug({
+						msg: "connection might be alive, will check later",
 						connId: conn.id,
 						lastSeen,
 						sinceLastSeen,
@@ -1116,7 +1146,8 @@ export class ActorInstance<
 				}
 
 				// Connection is dead, remove it
-				logger().warn("connection is dead, removing", {
+				this.#rLog.warn({
+					msg: "connection is dead, removing",
 					connId: conn.id,
 					lastSeen,
 				});
@@ -1154,7 +1185,7 @@ export class ActorInstance<
 	 * @internal
 	 */
 	async executeAction(
-		ctx: ActionContext<S, CP, CS, V, I, AD, DB>,
+		ctx: ActionContext<S, CP, CS, V, I, DB>,
 		actionName: string,
 		args: unknown[],
 	): Promise<unknown> {
@@ -1162,14 +1193,15 @@ export class ActorInstance<
 
 		// Prevent calling private or reserved methods
 		if (!(actionName in this.#config.actions)) {
-			logger().warn("action does not exist", { actionName });
+			this.#rLog.warn({ msg: "action does not exist", actionName });
 			throw new errors.ActionNotFound(actionName);
 		}
 
 		// Check if the method exists on this object
 		const actionFunction = this.#config.actions[actionName];
 		if (typeof actionFunction !== "function") {
-			logger().warn("action is not a function", {
+			this.#rLog.warn({
+				msg: "action is not a function",
 				actionName: actionName,
 				type: typeof actionFunction,
 			});
@@ -1181,13 +1213,20 @@ export class ActorInstance<
 		// Call the function on this object with those arguments
 		try {
 			// Log when we start executing the action
-			logger().debug("executing action", { actionName: actionName, args });
+			this.#rLog.debug({
+				msg: "executing action",
+				actionName: actionName,
+				args,
+			});
 
 			const outputOrPromise = actionFunction.call(undefined, ctx, ...args);
 			let output: unknown;
 			if (outputOrPromise instanceof Promise) {
 				// Log that we're waiting for an async action
-				logger().debug("awaiting async action", { actionName: actionName });
+				this.#rLog.debug({
+					msg: "awaiting async action",
+					actionName: actionName,
+				});
 
 				output = await deadline(
 					outputOrPromise,
@@ -1195,7 +1234,10 @@ export class ActorInstance<
 				);
 
 				// Log that async action completed
-				logger().debug("async action completed", { actionName: actionName });
+				this.#rLog.debug({
+					msg: "async action completed",
+					actionName: actionName,
+				});
 			} else {
 				output = outputOrPromise;
 			}
@@ -1210,25 +1252,29 @@ export class ActorInstance<
 						output,
 					);
 					if (processedOutput instanceof Promise) {
-						logger().debug("awaiting onBeforeActionResponse", {
+						this.#rLog.debug({
+							msg: "awaiting onBeforeActionResponse",
 							actionName: actionName,
 						});
 						output = await processedOutput;
-						logger().debug("onBeforeActionResponse completed", {
+						this.#rLog.debug({
+							msg: "onBeforeActionResponse completed",
 							actionName: actionName,
 						});
 					} else {
 						output = processedOutput;
 					}
 				} catch (error) {
-					logger().error("error in `onBeforeActionResponse`", {
+					this.#rLog.error({
+						msg: "error in `onBeforeActionResponse`",
 						error: stringifyError(error),
 					});
 				}
 			}
 
 			// Log the output before returning
-			logger().debug("action completed", {
+			this.#rLog.debug({
+				msg: "action completed",
 				actionName: actionName,
 				outputType: typeof output,
 				isPromise: output instanceof Promise,
@@ -1242,7 +1288,8 @@ export class ActorInstance<
 			if (error instanceof DeadlineError) {
 				throw new errors.ActionTimedOut();
 			}
-			logger().error("action error", {
+			this.#rLog.error({
+				msg: "action error",
 				actionName: actionName,
 				error: stringifyError(error),
 			});
@@ -1262,7 +1309,7 @@ export class ActorInstance<
 	/**
 	 * Handles raw HTTP requests to the actor.
 	 */
-	async handleFetch(request: Request, opts: { auth: AD }): Promise<Response> {
+	async handleFetch(request: Request, opts: {}): Promise<Response> {
 		this.#assertReady();
 
 		if (!this.#config.onFetch) {
@@ -1284,9 +1331,7 @@ export class ActorInstance<
 			}
 			return response;
 		} catch (error) {
-			logger().error("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
@@ -1301,7 +1346,7 @@ export class ActorInstance<
 	 */
 	async handleWebSocket(
 		websocket: UniversalWebSocket,
-		opts: { request: Request; auth: AD },
+		opts: { request: Request },
 	): Promise<void> {
 		this.#assertReady();
 
@@ -1340,7 +1385,8 @@ export class ActorInstance<
 				await this.saveState({ immediate: true });
 			}
 		} catch (error) {
-			logger().error("onWebSocket error", {
+			this.#rLog.error({
+				msg: "onWebSocket error",
 				error: stringifyError(error),
 			});
 			throw error;
@@ -1352,11 +1398,14 @@ export class ActorInstance<
 	// MARK: Lifecycle hooks
 
 	// MARK: Exposed methods
-	/**
-	 * Gets the logger instance.
-	 */
 	get log(): Logger {
-		return instanceLogger();
+		invariant(this.#log, "log not configured");
+		return this.#log;
+	}
+
+	get rLog(): Logger {
+		invariant(this.#rLog, "log not configured");
+		return this.#rLog;
 	}
 
 	/**
@@ -1390,7 +1439,7 @@ export class ActorInstance<
 	/**
 	 * Gets the map of connections.
 	 */
-	get conns(): Map<ConnId, Conn<S, CP, CS, V, I, AD, DB>> {
+	get conns(): Map<ConnId, Conn<S, CP, CS, V, I, DB>> {
 		return this.#connections;
 	}
 
@@ -1484,10 +1533,11 @@ export class ActorInstance<
 		// Add logging to promise and make it non-failable
 		const nonfailablePromise = promise
 			.then(() => {
-				logger().debug("wait until promise complete");
+				this.#rLog.debug({ msg: "wait until promise complete" });
 			})
 			.catch((error) => {
-				logger().error("wait until promise failed", {
+				this.#rLog.error({
+					msg: "wait until promise failed",
 					error: stringifyError(error),
 				});
 			});
@@ -1540,7 +1590,8 @@ export class ActorInstance<
 
 		const canSleep = this.#canSleep();
 
-		logger().debug("resetting sleep timer", {
+		this.#rLog.debug({
+			msg: "resetting sleep timer",
 			canSleep,
 			existingTimeout: !!this.#sleepTimeout,
 		});
@@ -1556,7 +1607,8 @@ export class ActorInstance<
 		if (canSleep) {
 			this.#sleepTimeout = setTimeout(() => {
 				this._sleep().catch((error) => {
-					logger().error("error during sleep", {
+					this.#rLog.error({
+						msg: "error during sleep",
 						error: stringifyError(error),
 					});
 				});
@@ -1592,12 +1644,12 @@ export class ActorInstance<
 		invariant(sleep, "no sleep on driver");
 
 		if (this.#sleepCalled) {
-			logger().warn("already sleeping actor");
+			this.#rLog.warn({ msg: "already sleeping actor" });
 			return;
 		}
 		this.#sleepCalled = true;
 
-		logger().info("actor sleeping");
+		this.#rLog.info({ msg: "actor sleeping" });
 
 		// Schedule sleep to happen on the next tick. This allows for any action that calls _sleep to complete.
 		setImmediate(async () => {
@@ -1611,12 +1663,12 @@ export class ActorInstance<
 	// MARK: Stop
 	async _stop() {
 		if (this.#stopCalled) {
-			logger().warn("already stopping actor");
+			this.#rLog.warn({ msg: "already stopping actor" });
 			return;
 		}
 		this.#stopCalled = true;
 
-		logger().info("actor stopping");
+		this.#rLog.info({ msg: "actor stopping" });
 
 		// Abort any listeners waiting for shutdown
 		try {
@@ -1626,17 +1678,18 @@ export class ActorInstance<
 		// Call onStop lifecycle hook if defined
 		if (this.#config.onStop) {
 			try {
-				logger().debug("calling onStop");
+				this.#rLog.debug({ msg: "calling onStop" });
 				const result = this.#config.onStop(this.actorContext);
 				if (result instanceof Promise) {
 					await deadline(result, this.#config.options.onStopTimeout);
 				}
-				logger().debug("onStop completed");
+				this.#rLog.debug({ msg: "onStop completed" });
 			} catch (error) {
 				if (error instanceof DeadlineError) {
-					logger().error("onStop timed out");
+					this.#rLog.error({ msg: "onStop timed out" });
 				} else {
-					logger().error("error in onStop", {
+					this.#rLog.error({
+						msg: "error in onStop",
 						error: stringifyError(error),
 					});
 				}
@@ -1672,9 +1725,9 @@ export class ActorInstance<
 		]);
 
 		if (await res) {
-			logger().warn(
-				"timed out waiting for connections to close, shutting down anyway",
-			);
+			this.#rLog.warn({
+				msg: "timed out waiting for connections to close, shutting down anyway",
+			});
 		}
 
 		// Wait for queues to finish
@@ -1693,7 +1746,7 @@ export class ActorInstance<
 	async #waitBackgroundPromises(timeoutMs: number) {
 		const pending = this.#backgroundPromises;
 		if (pending.length === 0) {
-			logger().debug("no background promises");
+			this.#rLog.debug({ msg: "no background promises" });
 			return;
 		}
 
@@ -1706,15 +1759,13 @@ export class ActorInstance<
 		]);
 
 		if (timedOut) {
-			logger().error(
-				"timed out waiting for background tasks, background promises may have leaked",
-				{
-					count: pending.length,
-					timeoutMs,
-				},
-			);
+			this.#rLog.error({
+				msg: "timed out waiting for background tasks, background promises may have leaked",
+				count: pending.length,
+				timeoutMs,
+			});
 		} else {
-			logger().debug("background promises finished");
+			this.#rLog.debug({ msg: "background promises finished" });
 		}
 	}
 
@@ -1738,10 +1789,6 @@ export class ActorInstance<
 				),
 				parameters: bufferToArrayBuffer(cbor.encode(conn.params || {})),
 				state: bufferToArrayBuffer(cbor.encode(conn.state || {})),
-				auth:
-					conn.authData !== undefined
-						? bufferToArrayBuffer(cbor.encode(conn.authData))
-						: null,
 				subscriptions: conn.subscriptions.map((sub) => ({
 					eventName: sub.eventName,
 				})),
@@ -1777,9 +1824,6 @@ export class ActorInstance<
 				connDriverState: cbor.decode(new Uint8Array(conn.driverState)),
 				params: cbor.decode(new Uint8Array(conn.parameters)),
 				state: cbor.decode(new Uint8Array(conn.state)),
-				authData: conn.auth
-					? cbor.decode(new Uint8Array(conn.auth))
-					: undefined,
 				subscriptions: conn.subscriptions.map((sub) => ({
 					eventName: sub.eventName,
 				})),