rivetkit 2.1.2 → 2.1.4

package/dist/tsup/test/mod.cjs

@@ -1,18 +1,18 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkQABDKI3Wcjs = require('../chunk-QABDKI3W.cjs');
+var _chunkUWAGLDT6cjs = require('../chunk-UWAGLDT6.cjs');
 
 
-var _chunkPZAV6PP2cjs = require('../chunk-PZAV6PP2.cjs');
-require('../chunk-ZHQDRRMY.cjs');
+var _chunkTEUL4UYNcjs = require('../chunk-TEUL4UYN.cjs');
+require('../chunk-QPADHLDU.cjs');
 
 
-var _chunkMNS5LY6Mcjs = require('../chunk-MNS5LY6M.cjs');
+var _chunk3B6PCYJBcjs = require('../chunk-3B6PCYJB.cjs');
 require('../chunk-NIYZDWMW.cjs');
-require('../chunk-HFWRHT5T.cjs');
+require('../chunk-LK36OGGO.cjs');
 
 
-var _chunkRMJJE43Bcjs = require('../chunk-RMJJE43B.cjs');
+var _chunk4KSHPFXFcjs = require('../chunk-4KSHPFXF.cjs');
 require('../chunk-L47L3ZWJ.cjs');
 require('../chunk-HDQ2JUQT.cjs');
 
@@ -23,14 +23,14 @@ var _invariant = require('invariant'); var _invariant2 = _interopRequireDefault(
 
 // src/test/log.ts
 function logger() {
-  return _chunkRMJJE43Bcjs.getLogger.call(void 0, "test");
+  return _chunk4KSHPFXFcjs.getLogger.call(void 0, "test");
 }
 
 // src/test/mod.ts
 async function setupTest(c, registry) {
   var _a;
   registry.config.test = { ...registry.config.test, enabled: true };
-  const driver = _chunkQABDKI3Wcjs.createFileSystemOrMemoryDriver.call(void 0, 
+  const driver = _chunkUWAGLDT6cjs.createFileSystemOrMemoryDriver.call(void 0, 
     true,
     { path: `/tmp/rivetkit-test-${crypto.randomUUID()}` }
   );
@@ -45,7 +45,7 @@ async function setupTest(c, registry) {
   _invariant2.default.call(void 0, managerDriver, "missing manager driver");
   const getUpgradeWebSocket = () => upgradeWebSocket;
   managerDriver.setGetUpgradeWebSocket(getUpgradeWebSocket);
-  const { router } = _chunkMNS5LY6Mcjs.buildManagerRouter.call(void 0, 
+  const { router } = _chunk3B6PCYJBcjs.buildManagerRouter.call(void 0, 
     parsedConfig,
     managerDriver,
     getUpgradeWebSocket
@@ -75,7 +75,7 @@ async function setupTest(c, registry) {
   c.onTestFinished(async () => {
     await new Promise((resolve) => server.close(() => resolve(void 0)));
   });
-  const client = _chunkPZAV6PP2cjs.createClient.call(void 0, {
+  const client = _chunkTEUL4UYNcjs.createClient.call(void 0, {
     endpoint,
     namespace: "default",
     runnerName: "default",

package/dist/tsup/test/mod.d.cts

@@ -1,5 +1,5 @@
 import { TestContext } from 'vitest';
-import { a5 as Registry, C as Client } from '../config-_gfywqqI.cjs';
+import { a5 as Registry, C as Client } from '../config-iPj5l1bL.cjs';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';
 import '../config-BiNoIHRs.cjs';

package/dist/tsup/test/mod.d.ts

@@ -1,5 +1,5 @@
 import { TestContext } from 'vitest';
-import { a5 as Registry, C as Client } from '../config-P3XujgRr.js';
+import { a5 as Registry, C as Client } from '../config-Qj-zLJPc.js';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';
 import '../config-BiNoIHRs.js';

package/dist/tsup/test/mod.js

@@ -1,18 +1,18 @@
 import {
   createFileSystemOrMemoryDriver
-} from "../chunk-RHUII57M.js";
+} from "../chunk-KTWY3K6Z.js";
 import {
   createClient
-} from "../chunk-HB4RGGMC.js";
-import "../chunk-PW3YONDJ.js";
+} from "../chunk-I6PL6QIY.js";
+import "../chunk-5UEFNG7P.js";
 import {
   buildManagerRouter
-} from "../chunk-VMX4I4MP.js";
+} from "../chunk-UDMRZR6A.js";
 import "../chunk-LXUQ667X.js";
-import "../chunk-PSUVV4HM.js";
+import "../chunk-ANKZ2FS6.js";
 import {
   getLogger
-} from "../chunk-WUXR722E.js";
+} from "../chunk-DZXDUGLL.js";
 import "../chunk-7HTNH26M.js";
 import "../chunk-424PT5DM.js";
 

package/dist/tsup/utils.cjs

@@ -17,7 +17,7 @@
 
 
 
-var _chunkRMJJE43Bcjs = require('./chunk-RMJJE43B.cjs');
+var _chunk4KSHPFXFcjs = require('./chunk-4KSHPFXF.cjs');
 require('./chunk-L47L3ZWJ.cjs');
 require('./chunk-HDQ2JUQT.cjs');
 
@@ -39,5 +39,5 @@ require('./chunk-HDQ2JUQT.cjs');
 
 
 
-exports.EXTRA_ERROR_LOG = _chunkRMJJE43Bcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunkRMJJE43Bcjs.SinglePromiseQueue; exports.VERSION = _chunkRMJJE43Bcjs.VERSION; exports.arrayBuffersEqual = _chunkRMJJE43Bcjs.arrayBuffersEqual; exports.assertUnreachable = _chunkRMJJE43Bcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunkRMJJE43Bcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunkRMJJE43Bcjs.combineUrlPath; exports.dbg = _chunkRMJJE43Bcjs.dbg; exports.detectRuntime = _chunkRMJJE43Bcjs.detectRuntime; exports.getEnvUniversal = _chunkRMJJE43Bcjs.getEnvUniversal; exports.httpUserAgent = _chunkRMJJE43Bcjs.httpUserAgent; exports.interval = _chunkRMJJE43Bcjs.interval; exports.joinSignals = _chunkRMJJE43Bcjs.joinSignals; exports.promiseWithResolvers = _chunkRMJJE43Bcjs.promiseWithResolvers; exports.setLongTimeout = _chunkRMJJE43Bcjs.setLongTimeout; exports.sleep = _chunkRMJJE43Bcjs.sleep; exports.stringifyError = _chunkRMJJE43Bcjs.stringifyError; exports.toUint8Array = _chunkRMJJE43Bcjs.toUint8Array;
+exports.EXTRA_ERROR_LOG = _chunk4KSHPFXFcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunk4KSHPFXFcjs.SinglePromiseQueue; exports.VERSION = _chunk4KSHPFXFcjs.VERSION; exports.arrayBuffersEqual = _chunk4KSHPFXFcjs.arrayBuffersEqual; exports.assertUnreachable = _chunk4KSHPFXFcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunk4KSHPFXFcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunk4KSHPFXFcjs.combineUrlPath; exports.dbg = _chunk4KSHPFXFcjs.dbg; exports.detectRuntime = _chunk4KSHPFXFcjs.detectRuntime; exports.getEnvUniversal = _chunk4KSHPFXFcjs.getEnvUniversal; exports.httpUserAgent = _chunk4KSHPFXFcjs.httpUserAgent; exports.interval = _chunk4KSHPFXFcjs.interval; exports.joinSignals = _chunk4KSHPFXFcjs.joinSignals; exports.promiseWithResolvers = _chunk4KSHPFXFcjs.promiseWithResolvers; exports.setLongTimeout = _chunk4KSHPFXFcjs.setLongTimeout; exports.sleep = _chunk4KSHPFXFcjs.sleep; exports.stringifyError = _chunk4KSHPFXFcjs.stringifyError; exports.toUint8Array = _chunk4KSHPFXFcjs.toUint8Array;
 //# sourceMappingURL=utils.cjs.map

package/dist/tsup/utils.js

@@ -17,7 +17,7 @@ import {
   sleep,
   stringifyError,
   toUint8Array
-} from "./chunk-WUXR722E.js";
+} from "./chunk-DZXDUGLL.js";
 import "./chunk-7HTNH26M.js";
 import "./chunk-424PT5DM.js";
 export {

package/dist/tsup/workflow/mod.cjs

@@ -2,15 +2,15 @@
 
 
 
-var _chunkNXEHFUDBcjs = require('../chunk-NXEHFUDB.cjs');
-require('../chunk-GVQAVU7R.cjs');
-require('../chunk-HFWRHT5T.cjs');
-require('../chunk-RMJJE43B.cjs');
+var _chunkGXRVSSVDcjs = require('../chunk-GXRVSSVD.cjs');
+require('../chunk-AQD4CBZ2.cjs');
+require('../chunk-LK36OGGO.cjs');
+require('../chunk-4KSHPFXF.cjs');
 require('../chunk-L47L3ZWJ.cjs');
 require('../chunk-HDQ2JUQT.cjs');
 
 
 
 
-exports.ActorWorkflowContext = _chunkNXEHFUDBcjs.ActorWorkflowContext; exports.Loop = _chunkNXEHFUDBcjs.Loop; exports.workflow = _chunkNXEHFUDBcjs.workflow;
+exports.ActorWorkflowContext = _chunkGXRVSSVDcjs.ActorWorkflowContext; exports.Loop = _chunkGXRVSSVDcjs.Loop; exports.workflow = _chunkGXRVSSVDcjs.workflow;
 //# sourceMappingURL=mod.cjs.map

package/dist/tsup/workflow/mod.d.cts

@@ -1,7 +1,7 @@
-import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-_gfywqqI.cjs';
+import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-iPj5l1bL.cjs';
 import { A as AnyDatabaseProvider } from '../config-BiNoIHRs.cjs';
-import { A as ActorWorkflowContext } from '../context-Bxd8Cx4H.cjs';
-export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from '../context-Bxd8Cx4H.cjs';
+import { A as ActorWorkflowContext } from '../context-DzvH1PBK.cjs';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from '../context-DzvH1PBK.cjs';
 export { Loop } from '@rivetkit/workflow-engine';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';

package/dist/tsup/workflow/mod.d.ts

@@ -1,7 +1,7 @@
-import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-P3XujgRr.js';
+import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-Qj-zLJPc.js';
 import { A as AnyDatabaseProvider } from '../config-BiNoIHRs.js';
-import { A as ActorWorkflowContext } from '../context-uNA4TRn3.js';
-export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from '../context-uNA4TRn3.js';
+import { A as ActorWorkflowContext } from '../context-CQCMuHND.js';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from '../context-CQCMuHND.js';
 export { Loop } from '@rivetkit/workflow-engine';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';

package/dist/tsup/workflow/mod.js

@@ -2,10 +2,10 @@ import {
   ActorWorkflowContext,
   Loop,
   workflow
-} from "../chunk-YQ5P6KMN.js";
-import "../chunk-TDFDR7AO.js";
-import "../chunk-PSUVV4HM.js";
-import "../chunk-WUXR722E.js";
+} from "../chunk-3GTO6H3E.js";
+import "../chunk-HBYEYBIC.js";
+import "../chunk-ANKZ2FS6.js";
+import "../chunk-DZXDUGLL.js";
 import "../chunk-7HTNH26M.js";
 import "../chunk-424PT5DM.js";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rivetkit",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "Lightweight libraries for building stateful actors on edge platforms",
   "license": "Apache-2.0",
   "keywords": [
@@ -219,11 +219,11 @@
     "vbare": "^0.0.4",
     "@rivetkit/sqlite": "^0.1.1",
     "zod": "^4.1.0",
-    "@rivetkit/engine-runner": "2.1.2",
-    "@rivetkit/traces": "2.1.2",
+    "@rivetkit/sqlite-vfs": "2.1.4",
+    "@rivetkit/engine-runner": "2.1.4",
+    "@rivetkit/traces": "2.1.4",
     "@rivetkit/virtual-websocket": "2.0.33",
-    "@rivetkit/sqlite-vfs": "2.1.2",
-    "@rivetkit/workflow-engine": "2.1.2"
+    "@rivetkit/workflow-engine": "2.1.4"
   },
   "devDependencies": {
     "@bare-ts/tools": "^0.13.0",

package/src/actor/config.ts

@@ -208,9 +208,7 @@ export const ActorConfigSchema = z
 				createVarsTimeout: z.number().positive().default(5000),
 				createConnStateTimeout: z.number().positive().default(5000),
 				onConnectTimeout: z.number().positive().default(5000),
-				// This must be less than engine config > pegboard.actor_stop_threshold
 				onSleepTimeout: z.number().positive().default(5000),
-				// This must be less than engine config > pegboard.actor_stop_threshold
 				onDestroyTimeout: z.number().positive().default(5000),
 				stateSaveInterval: z.number().positive().default(10_000),
 				actionTimeout: z.number().positive().default(60_000),

package/src/actor/instance/mod.ts

@@ -195,6 +195,19 @@ export class ActorInstance<
 	// MARK: - Tracing
 	#traces!: Traces<OtlpExportTraceServiceRequestJson>;
 
+	// MARK: - Driver Overrides
+	/**
+	 * Per-instance config option overrides applied by the driver after creation.
+	 * When set, the effective option value is the minimum of the base config
+	 * value and the override value.
+	 */
+	overrides: {
+		onSleepTimeout?: number;
+		onDestroyTimeout?: number;
+		runStopTimeout?: number;
+		waitUntilTimeout?: number;
+	} = {};
+
 	// MARK: - Constructor
 	constructor(config: ActorConfig<S, CP, CS, V, I, DB, E, Q>) {
 		this.#config = config;
@@ -486,13 +499,16 @@ export class ActorInstance<
 				this.#sleepTimeout = undefined;
 			}
 
-			// Abort listeners
+			// Abort listeners in the canonical stop path.
+			// This must run for all stop modes, including sleep and remote stop.
+			// Destroy may have already triggered an early abort, but repeating abort
+			// is intentional and safe.
 			try {
 				this.#abortController.abort();
 			} catch { }
 
 			// Wait for run handler to complete
-			await this.#waitForRunHandler(this.#config.options.runStopTimeout);
+			await this.#waitForRunHandler(this.overrides.runStopTimeout !== undefined ? Math.min(this.#config.options.runStopTimeout, this.overrides.runStopTimeout) : this.#config.options.runStopTimeout);
 
 			// Call onStop lifecycle
 			if (mode === "sleep") {
@@ -508,7 +524,7 @@ export class ActorInstance<
 
 			// Wait for background tasks
 			await this.#waitBackgroundPromises(
-				this.#config.options.waitUntilTimeout,
+				this.overrides.waitUntilTimeout !== undefined ? Math.min(this.#config.options.waitUntilTimeout, this.overrides.waitUntilTimeout) : this.#config.options.waitUntilTimeout,
 			);
 
 			// Clear timeouts and save state
@@ -574,6 +590,14 @@ export class ActorInstance<
 		}
 		this.#destroyCalled = true;
 
+		// Abort immediately so in flight waits can exit before the driver stop
+		// handshake completes.
+		// The onStop path will call abort again as a safety net for all stop
+		// modes.
+		try {
+			this.#abortController.abort();
+		} catch {}
+
 		const destroy = this.driver.startDestroy.bind(
 			this.driver,
 			this.#actorId,
@@ -958,7 +982,7 @@ export class ActorInstance<
 	 * Errors are propagated to the caller.
 	 */
 	async keepAwake<T>(promise: Promise<T>): Promise<T> {
-		this.assertReady();
+		this.assertReady(true);
 
 		this.#activeKeepAwakeCount++;
 		this.resetSleepTimer();
@@ -1254,7 +1278,7 @@ export class ActorInstance<
 						if (result instanceof Promise) {
 							await deadline(
 								result,
-								this.#config.options.onSleepTimeout,
+								this.overrides.onSleepTimeout !== undefined ? Math.min(this.#config.options.onSleepTimeout, this.overrides.onSleepTimeout) : this.#config.options.onSleepTimeout,
 							);
 						}
 					},
@@ -1286,7 +1310,7 @@ export class ActorInstance<
 						if (result instanceof Promise) {
 							await deadline(
 								result,
-								this.#config.options.onDestroyTimeout,
+								this.overrides.onDestroyTimeout !== undefined ? Math.min(this.#config.options.onDestroyTimeout, this.overrides.onDestroyTimeout) : this.#config.options.onDestroyTimeout,
 							);
 						}
 					},

package/src/actor/router.ts

@@ -20,11 +20,10 @@ import {
 } from "@/common/router";
 import { noopNext } from "@/common/utils";
 import { inspectorLogger } from "@/inspector/log";
-import { timingSafeEqual } from "@/utils/crypto";
-import { getNodeEnv } from "@/utils/env-vars";
-
 import type { RegistryConfig } from "@/registry/config";
 import { type GetUpgradeWebSocket, VERSION } from "@/utils";
+import { timingSafeEqual } from "@/utils/crypto";
+import { isDev } from "@/utils/env-vars";
 import { CONN_DRIVER_SYMBOL } from "./conn/mod";
 import type { ActorDriver } from "./driver";
 import { loggerWithoutContext } from "./log";
@@ -167,14 +166,16 @@ export function createActorRouter(
 	if (config.inspector.enabled) {
 		// Auth middleware for inspector routes
 		const inspectorAuth = async (c: any): Promise<Response | undefined> => {
-			if (getNodeEnv() === "development" && !config.inspector.token()) {
+			if (isDev() && !config.inspector.token()) {
 				inspectorLogger().warn({
 					msg: "RIVET_INSPECTOR_TOKEN is not set, skipping inspector auth in development mode",
 				});
 				return undefined;
 			}
 
-			const userToken = c.req.header("Authorization")?.replace("Bearer ", "");
+			const userToken = c.req
+				.header("Authorization")
+				?.replace("Bearer ", "");
 			if (!userToken) {
 				return c.text("Unauthorized", 401);
 			}
@@ -197,7 +198,9 @@ export function createActorRouter(
 
 			const actor = await actorDriver.loadActor(c.env.actorId);
 			const isStateEnabled = actor.inspector.isStateEnabled();
-			const state = isStateEnabled ? actor.inspector.getStateJson() : undefined;
+			const state = isStateEnabled
+				? actor.inspector.getStateJson()
+				: undefined;
 			return c.json({ state, isStateEnabled });
 		});
 

package/src/driver-test-suite/mod.ts

@@ -17,6 +17,7 @@ import { runActorConnTests } from "./tests/actor-conn";
 import { runActorConnHibernationTests } from "./tests/actor-conn-hibernation";
 import { runActorConnStateTests } from "./tests/actor-conn-state";
 import { runActorDbTests } from "./tests/actor-db";
+import { runConnErrorSerializationTests } from "./tests/conn-error-serialization";
 import { runActorDestroyTests } from "./tests/actor-destroy";
 import { runActorDriverTests } from "./tests/actor-driver";
 import { runActorErrorHandlingTests } from "./tests/actor-error-handling";
@@ -111,6 +112,8 @@ export function runDriverTests(
 
 						runActorConnHibernationTests(driverTestConfig);
 
+						runConnErrorSerializationTests(driverTestConfig);
+
 						runActorDbTests(driverTestConfig);
 
 						runActorDestroyTests(driverTestConfig);