rivetkit 3.0.0-preview.2 → 3.0.0-preview.4

package/dist/tsup/test/mod.cjs

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkCJ3MX5MIcjs = require('../chunk-CJ3MX5MI.cjs');
+var _chunkWE5DMJFVcjs = require('../chunk-WE5DMJFV.cjs');
 
 
-var _chunk25MUHNWEcjs = require('../chunk-25MUHNWE.cjs');
+var _chunk5IZ36V3Ncjs = require('../chunk-5IZ36V3N.cjs');
 require('../chunk-RTWH3AX3.cjs');
+require('../chunk-S5QNPQ6K.cjs');
 require('../chunk-KVFIONKQ.cjs');
-require('../chunk-3SPYZMME.cjs');
-require('../chunk-XSOHGU4G.cjs');
+require('../chunk-SR362FVR.cjs');
 require('../chunk-MGI2VVF6.cjs');
 
 // src/test/ready.ts
@@ -36,8 +36,8 @@ async function setupTest(c, registry) {
   registry.config.noWelcome = true;
   registry.start();
   await waitForRegistryReady(registry);
-  const client = _chunkCJ3MX5MIcjs.createClient.call(void 0, {
-    ..._chunk25MUHNWEcjs.convertRegistryConfigToClientConfig.call(void 0, registry.parseConfig()),
+  const client = _chunkWE5DMJFVcjs.createClient.call(void 0, {
+    ..._chunk5IZ36V3Ncjs.convertRegistryConfigToClientConfig.call(void 0, registry.parseConfig()),
     disableMetadataLookup: false
   });
   c.onTestFinished(async () => {

package/dist/tsup/test/mod.js

@@ -1,13 +1,13 @@
 import {
   createClient
-} from "../chunk-442XBCAF.js";
+} from "../chunk-KM34T23X.js";
 import {
   convertRegistryConfigToClientConfig
-} from "../chunk-6IGGYL2C.js";
+} from "../chunk-C45DIKGB.js";
 import "../chunk-A2CF6PFH.js";
+import "../chunk-IPDSE33U.js";
 import "../chunk-JTHHCZCZ.js";
-import "../chunk-WGKL7HMH.js";
-import "../chunk-5F7FWAJI.js";
+import "../chunk-MAUVZIXL.js";
 import "../chunk-ZOVJDAOW.js";
 
 // src/test/ready.ts

package/dist/tsup/utils.cjs

@@ -19,7 +19,7 @@
 
 
 
-var _chunkXSOHGU4Gcjs = require('./chunk-XSOHGU4G.cjs');
+var _chunkSR362FVRcjs = require('./chunk-SR362FVR.cjs');
 require('./chunk-MGI2VVF6.cjs');
 
 
@@ -42,5 +42,5 @@ require('./chunk-MGI2VVF6.cjs');
 
 
 
-exports.EXTRA_ERROR_LOG = _chunkXSOHGU4Gcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunkXSOHGU4Gcjs.SinglePromiseQueue; exports.VERSION = _chunkXSOHGU4Gcjs.VERSION; exports.arrayBuffersEqual = _chunkXSOHGU4Gcjs.arrayBuffersEqual; exports.assertUnreachable = _chunkXSOHGU4Gcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunkXSOHGU4Gcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunkXSOHGU4Gcjs.combineUrlPath; exports.dbg = _chunkXSOHGU4Gcjs.dbg; exports.detectRuntime = _chunkXSOHGU4Gcjs.detectRuntime; exports.getEnvUniversal = _chunkXSOHGU4Gcjs.getEnvUniversal; exports.httpUserAgent = _chunkXSOHGU4Gcjs.httpUserAgent; exports.interval = _chunkXSOHGU4Gcjs.interval; exports.joinSignals = _chunkXSOHGU4Gcjs.joinSignals; exports.jsonParseCompat = _chunkXSOHGU4Gcjs.jsonParseCompat; exports.jsonStringifyCompat = _chunkXSOHGU4Gcjs.jsonStringifyCompat; exports.promiseWithResolvers = _chunkXSOHGU4Gcjs.promiseWithResolvers; exports.setLongTimeout = _chunkXSOHGU4Gcjs.setLongTimeout; exports.sleep = _chunkXSOHGU4Gcjs.sleep; exports.stringifyError = _chunkXSOHGU4Gcjs.stringifyError; exports.toUint8Array = _chunkXSOHGU4Gcjs.toUint8Array;
+exports.EXTRA_ERROR_LOG = _chunkSR362FVRcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunkSR362FVRcjs.SinglePromiseQueue; exports.VERSION = _chunkSR362FVRcjs.VERSION; exports.arrayBuffersEqual = _chunkSR362FVRcjs.arrayBuffersEqual; exports.assertUnreachable = _chunkSR362FVRcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunkSR362FVRcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunkSR362FVRcjs.combineUrlPath; exports.dbg = _chunkSR362FVRcjs.dbg; exports.detectRuntime = _chunkSR362FVRcjs.detectRuntime; exports.getEnvUniversal = _chunkSR362FVRcjs.getEnvUniversal; exports.httpUserAgent = _chunkSR362FVRcjs.httpUserAgent; exports.interval = _chunkSR362FVRcjs.interval; exports.joinSignals = _chunkSR362FVRcjs.joinSignals; exports.jsonParseCompat = _chunkSR362FVRcjs.jsonParseCompat; exports.jsonStringifyCompat = _chunkSR362FVRcjs.jsonStringifyCompat; exports.promiseWithResolvers = _chunkSR362FVRcjs.promiseWithResolvers; exports.setLongTimeout = _chunkSR362FVRcjs.setLongTimeout; exports.sleep = _chunkSR362FVRcjs.sleep; exports.stringifyError = _chunkSR362FVRcjs.stringifyError; exports.toUint8Array = _chunkSR362FVRcjs.toUint8Array;
 //# sourceMappingURL=utils.cjs.map

package/dist/tsup/utils.js

@@ -19,7 +19,7 @@ import {
   sleep,
   stringifyError,
   toUint8Array
-} from "./chunk-5F7FWAJI.js";
+} from "./chunk-MAUVZIXL.js";
 import "./chunk-ZOVJDAOW.js";
 export {
   EXTRA_ERROR_LOG,

package/dist/tsup/workflow/mod.cjs

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } var _class; var _class2;
 
-var _chunkQDRZMCX5cjs = require('../chunk-QDRZMCX5.cjs');
-require('../chunk-YZVVID47.cjs');
-require('../chunk-BCG7PTBS.cjs');
+var _chunkU2QBZJTLcjs = require('../chunk-U2QBZJTL.cjs');
+require('../chunk-KSQ3VVZX.cjs');
+require('../chunk-SLIGV2T4.cjs');
 
 
 
@@ -13,7 +13,7 @@ var _chunkHDVZ6YZGcjs = require('../chunk-HDVZ6YZG.cjs');
 var _chunkRTWH3AX3cjs = require('../chunk-RTWH3AX3.cjs');
 
 
-var _chunkXSOHGU4Gcjs = require('../chunk-XSOHGU4G.cjs');
+var _chunkSR362FVRcjs = require('../chunk-SR362FVR.cjs');
 
 
 
@@ -743,7 +743,7 @@ function workflow(fn, options = {}) {
   function getWorkflowInspector(actorId) {
     let workflowInspector = workflowInspectors.get(actorId);
     if (!workflowInspector) {
-      workflowInspector = _chunkQDRZMCX5cjs.createWorkflowInspectorAdapter.call(void 0, );
+      workflowInspector = _chunkU2QBZJTLcjs.createWorkflowInspectorAdapter.call(void 0, );
       workflowInspectors.set(actorId, workflowInspector);
     }
     return workflowInspector;
@@ -816,13 +816,13 @@ function workflow(fn, options = {}) {
       if (shouldRethrowWorkflowError(error)) {
         runCtx.log.error({
           msg: "workflow run failed",
-          error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, error)
+          error: _chunkSR362FVRcjs.stringifyError.call(void 0, error)
         });
         throw error;
       }
       runCtx.log.warn({
         msg: "workflow failed and will sleep until woken",
-        error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, error)
+        error: _chunkSR362FVRcjs.stringifyError.call(void 0, error)
       });
     } finally {
       runCtx.abortSignal.removeEventListener("abort", onAbort);

package/dist/tsup/workflow/mod.js

@@ -1,8 +1,8 @@
 import {
   createWorkflowInspectorAdapter
-} from "../chunk-OLZ4KAFL.js";
-import "../chunk-WGQHG26S.js";
-import "../chunk-3URL73AV.js";
+} from "../chunk-WQFXPN6S.js";
+import "../chunk-DCUTYXIX.js";
+import "../chunk-ZWBTTPP3.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   defineRunHandler
@@ -13,7 +13,7 @@ import {
 } from "../chunk-A2CF6PFH.js";
 import {
   stringifyError
-} from "../chunk-5F7FWAJI.js";
+} from "../chunk-MAUVZIXL.js";
 import {
   RivetError,
   isActorAbortedError

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rivetkit",
-	"version": "3.0.0-preview.2",
+	"version": "3.0.0-preview.4",
 	"description": "Lightweight libraries for building stateful actors on edge platforms",
 	"license": "Apache-2.0",
 	"keywords": [
@@ -211,15 +211,15 @@
 		"@hono/zod-openapi": "^1.1.5",
 		"@opentelemetry/api": "^1.1.0",
 		"@rivetkit/bare-ts": "^0.6.2",
-		"@rivetkit/engine-api-full": "3.0.0-preview.2",
-		"@rivetkit/engine-cli": "3.0.0-preview.2",
-		"@rivetkit/engine-envoy-protocol": "3.0.0-preview.2",
+		"@rivetkit/engine-api-full": "3.0.0-preview.4",
+		"@rivetkit/engine-cli": "3.0.0-preview.4",
+		"@rivetkit/engine-envoy-protocol": "3.0.0-preview.4",
 		"@rivetkit/on-change": "6.0.1",
-		"@rivetkit/rivetkit-napi": "3.0.0-preview.2",
-		"@rivetkit/rivetkit-wasm": "3.0.0-preview.2",
-		"@rivetkit/traces": "3.0.0-preview.2",
-		"@rivetkit/virtual-websocket": "3.0.0-preview.2",
-		"@rivetkit/workflow-engine": "3.0.0-preview.2",
+		"@rivetkit/rivetkit-napi": "3.0.0-preview.4",
+		"@rivetkit/rivetkit-wasm": "3.0.0-preview.4",
+		"@rivetkit/traces": "3.0.0-preview.4",
+		"@rivetkit/virtual-websocket": "3.0.0-preview.4",
+		"@rivetkit/workflow-engine": "3.0.0-preview.4",
 		"cbor-x": "^1.6.0",
 		"drizzle-orm": "0.45.2",
 		"hono": "^4.7.0",

package/src/client/actor-conn.ts

@@ -611,6 +611,13 @@ export class ActorConnRaw {
 		if (isConnectionOpenTimeout(error)) {
 			return true;
 		}
+		if (
+			error instanceof errors.ActorError &&
+			error.group === "client" &&
+			error.code === "connection_open_interrupted"
+		) {
+			return true;
+		}
 		if (
 			error instanceof errors.ActorError &&
 			isInvalidToken(error.group, error.code) &&
@@ -692,16 +699,18 @@ export class ActorConnRaw {
 		});
 		this.#websocket = ws;
 		ws.addEventListener("open", () => {
-			if (this.#abandonedSockets.has(ws)) return;
+			if (this.#websocket !== ws || this.#abandonedSockets.has(ws))
+				return;
 			logger().debug({
 				msg: "client websocket open",
 				connId: this.#connId,
 			});
 		});
 		ws.addEventListener("message", async (ev: { data: ConnMessage }) => {
-			if (this.#abandonedSockets.has(ws)) return;
+			if (this.#websocket !== ws || this.#abandonedSockets.has(ws))
+				return;
 			try {
-				await this.#handleOnMessage(ev.data);
+				await this.#handleOnMessage(ev.data, ws);
 			} catch (err) {
 				logger().error({
 					msg: "error in websocket message handler",
@@ -710,7 +719,8 @@ export class ActorConnRaw {
 			}
 		});
 		ws.addEventListener("close", async (ev: Event | CloseEventLike) => {
-			if (this.#abandonedSockets.has(ws)) return;
+			if (this.#websocket !== ws || this.#abandonedSockets.has(ws))
+				return;
 			try {
 				await this.#handleOnClose(ev);
 			} catch (err) {
@@ -721,7 +731,8 @@ export class ActorConnRaw {
 			}
 		});
 		ws.addEventListener("error", () => {
-			if (this.#abandonedSockets.has(ws)) return;
+			if (this.#websocket !== ws || this.#abandonedSockets.has(ws))
+				return;
 			try {
 				this.#handleOnError();
 			} catch (err) {
@@ -803,7 +814,7 @@ export class ActorConnRaw {
 	}
 
 	/** Called by the onmessage event from drivers. */
-	async #handleOnMessage(data: any) {
+	async #handleOnMessage(data: any, socket: UniversalWebSocket) {
 		logger().trace({
 			msg: "received message",
 			dataType: typeof data,
@@ -812,6 +823,10 @@ export class ActorConnRaw {
 		});
 
 		const response = await this.#parseMessage(data as ConnMessage);
+		// Decoding can yield while this socket closes and another connects. Apply
+		// the message only while its socket still owns the connection.
+		if (this.#websocket !== socket || this.#abandonedSockets.has(socket))
+			return;
 		logger().trace(
 			getLogMessage()
 				? {
@@ -897,6 +912,12 @@ export class ActorConnRaw {
 						this.#actorResolutionState,
 						this.#driver,
 					);
+					if (
+						this.#websocket !== socket ||
+						this.#abandonedSockets.has(socket)
+					) {
+						return;
+					}
 					if (schedulingError) {
 						errorToThrow = schedulingError;
 					}
@@ -1047,9 +1068,17 @@ export class ActorConnRaw {
 				this.#invalidateActorIfStale(group, code);
 			} else {
 				// Default error for non-structured close reasons
-				error = new Error(
-					`${wasClean ? "Connection closed" : "Connection lost"} (code: ${closeEvent.code}, reason: ${reason})`,
-				);
+				const message = `${wasClean ? "Connection closed" : "Connection lost"} (code: ${closeEvent.code}, reason: ${reason})`;
+				// A transport loss during the handshake can outlast an Engine
+				// restart. Retry opening without replaying actions with unknown outcomes.
+				error =
+					!wasConnected && closeEvent.code === 1006
+						? new errors.ActorError(
+								"client",
+								"connection_open_interrupted",
+								message,
+							)
+						: new Error(message);
 			}
 
 			this.#rejectPendingPromises(error, false);

package/src/registry/config/index.ts

@@ -291,7 +291,8 @@ export const RegistryConfigSchema = z
 				 * after calling `CoreRegistry::shutdown()`. Defaults to the
 				 * engine-provided actor stop threshold once the node connects. A
 				 * signal-driven shutdown of a managed local development engine waits
-				 * one second by default so a file watcher can restart promptly.
+				 * four seconds by default so actors can acknowledge stopping before
+				 * a file watcher restarts the process.
 				 *
 				 * Set a longer period when a complete graceful node drain is required.
 				 */

package/src/registry/index.ts

@@ -29,6 +29,13 @@ import type {
 type ShutdownSignal = "SIGINT" | "SIGTERM";
 
 const REGISTRY_READY_TIMEOUT_MS = 30_000;
+// A managed Engine restart can wait for the old process to release storage and
+// for its worker lease to expire before the replacement can register.
+const LOCAL_ENGINE_READY_TIMEOUT_MS = 60_000;
+// Core gives local actors three seconds to drain and acknowledge their stopped
+// reports. Leave time to close the node connection after that, while staying
+// below the five-second force-kill ceiling used by tsx watch.
+const LOCAL_DEV_SHUTDOWN_GRACE_PERIOD_MS = 4_000;
 
 // Serverless is disabled for v3; keep the implementation for a later release.
 function rejectServerless(): void {
@@ -789,7 +796,7 @@ export class Registry<A extends RegistryActors> {
 		let gracePeriodMs = config.shutdown?.gracePeriodMs;
 		if (gracePeriodMs === undefined) {
 			gracePeriodMs = localDevSignal
-				? 1_000
+				? LOCAL_DEV_SHUTDOWN_GRACE_PERIOD_MS
 				: ((await this.#actorStopThresholdMs(
 						modeAPromise ?? modeBPromise,
 					)) ?? 30 * 60 * 1000);
@@ -942,16 +949,22 @@ export class Registry<A extends RegistryActors> {
 			throw new Error("registry envoy startup did not initialize");
 		}
 
+		const readyTimeoutMs =
+			config.engineSpawn &&
+			config.endpoint !== undefined &&
+			isLocalEngineEndpoint(config.endpoint)
+				? LOCAL_ENGINE_READY_TIMEOUT_MS
+				: REGISTRY_READY_TIMEOUT_MS;
 		let timeout: ReturnType<typeof setTimeout> | undefined;
 		const timeoutPromise = new Promise<never>((_resolve, reject) => {
 			timeout = setTimeout(
 				() =>
 					reject(
 						new Error(
-							`RivetKit registry did not register with the Engine within ${REGISTRY_READY_TIMEOUT_MS}ms`,
+							`RivetKit registry did not register with the Engine within ${readyTimeoutMs}ms`,
 						),
 					),
-				REGISTRY_READY_TIMEOUT_MS,
+				readyTimeoutMs,
 			);
 			timeout.unref?.();
 		});