rivetkit 2.0.21 → 2.0.22-rc.2

package/dist/tsup/{chunk-LMJHBF26.cjs → chunk-Q5CAVEKC.cjs}

@@ -3,11 +3,11 @@
 
 
 
-var _chunk65SAIRRYcjs = require('./chunk-65SAIRRY.cjs');
+var _chunkUBMUBNS2cjs = require('./chunk-UBMUBNS2.cjs');
 
 
 
-var _chunkLWGCMELPcjs = require('./chunk-LWGCMELP.cjs');
+var _chunkZY4DKLMTcjs = require('./chunk-ZY4DKLMT.cjs');
 
 
 
@@ -18,7 +18,7 @@ var _chunkLWGCMELPcjs = require('./chunk-LWGCMELP.cjs');
 
 
 
-var _chunkFDJ3AVNBcjs = require('./chunk-FDJ3AVNB.cjs');
+var _chunk5TRXLS6Xcjs = require('./chunk-5TRXLS6X.cjs');
 
 
 
@@ -46,16 +46,16 @@ var _chunkFDJ3AVNBcjs = require('./chunk-FDJ3AVNB.cjs');
 
 
 
+var _chunkGXIO5YOTcjs = require('./chunk-GXIO5YOT.cjs');
 
 
 
 
-var _chunkJKOUXDK6cjs = require('./chunk-JKOUXDK6.cjs');
+var _chunk5N6F5PXDcjs = require('./chunk-5N6F5PXD.cjs');
 
 
 
 
-var _chunkHN7UXCYQcjs = require('./chunk-HN7UXCYQ.cjs');
 
 
 
@@ -66,9 +66,7 @@ var _chunkHN7UXCYQcjs = require('./chunk-HN7UXCYQ.cjs');
 
 
 
-
-
-var _chunkELDFBXDVcjs = require('./chunk-ELDFBXDV.cjs');
+var _chunkYUBR6XCJcjs = require('./chunk-YUBR6XCJ.cjs');
 
 
 
@@ -89,7 +87,15 @@ var _cborx = require('cbor-x'); var cbor = _interopRequireWildcard(_cborx); var
 
 // src/actor/conn-drivers.ts
 var WEBSOCKET_DRIVER = {
-  sendMessage: (actor, _conn, state, message) => {
+  sendMessage: (actor, conn, state, message) => {
+    if (state.websocket.readyState !== 1 /* OPEN */) {
+      actor.rLog.warn({
+        msg: "attempting to send message to closed websocket, this is likely a bug in RivetKit",
+        connId: conn.id,
+        wsReadyState: state.websocket.readyState
+      });
+      return;
+    }
     const serialized = message.serialize(state.encoding);
     actor.rLog.debug({
       msg: "sending websocket message",
@@ -133,12 +139,21 @@ var WEBSOCKET_DRIVER = {
   },
   getConnectionReadyState: (_actor, _conn, state) => {
     return state.websocket.readyState;
+  },
+  isHibernatable(_actor, _conn, state) {
+    if (state.websocket.raw) {
+      const raw = state.websocket.raw;
+      if (typeof raw.isHibernatable === "boolean") {
+        return raw.isHibernatable;
+      }
+    }
+    return false;
   }
 };
 var SSE_DRIVER = {
   sendMessage: (_actor, _conn, state, message) => {
     state.stream.writeSSE({
-      data: _chunkJKOUXDK6cjs.encodeDataToString.call(void 0, message.serialize(state.encoding))
+      data: _chunkGXIO5YOTcjs.encodeDataToString.call(void 0, message.serialize(state.encoding))
     });
   },
   disconnect: async (_actor, _conn, state, _reason) => {
@@ -149,6 +164,9 @@ var SSE_DRIVER = {
       return 3 /* CLOSED */;
     }
     return 1 /* OPEN */;
+  },
+  isHibernatable() {
+    return false;
   }
 };
 var HTTP_DRIVER = {
@@ -156,6 +174,9 @@ var HTTP_DRIVER = {
     return 1 /* OPEN */;
   },
   disconnect: async () => {
+  },
+  isHibernatable() {
+    return false;
   }
 };
 var CONN_DRIVERS = {
@@ -167,7 +188,7 @@ function getConnDriverKindFromState(state) {
   if (0 /* WEBSOCKET */ in state) return 0 /* WEBSOCKET */;
   else if (1 /* SSE */ in state) return 1 /* SSE */;
   else if (2 /* HTTP */ in state) return 2 /* HTTP */;
-  else _chunkELDFBXDVcjs.assertUnreachable.call(void 0, state);
+  else _chunkYUBR6XCJcjs.assertUnreachable.call(void 0, state);
 }
 
 // src/actor/conn.ts
@@ -175,9 +196,9 @@ function generateConnId() {
   return crypto.randomUUID();
 }
 function generateConnToken() {
-  return _chunkJKOUXDK6cjs.generateSecureToken.call(void 0, 32);
+  return _chunkGXIO5YOTcjs.generateSecureToken.call(void 0, 32);
 }
-function generateConnSocketId() {
+function generateConnRequestId() {
   return crypto.randomUUID();
 }
 var Conn = (_class = class {
@@ -250,6 +271,24 @@ var Conn = (_class = class {
   get status() {
     return this.__status;
   }
+  /**
+   * @experimental
+   *
+   * If the underlying connection can hibernate.
+   */
+  get isHibernatable() {
+    if (this.__driverState) {
+      const driverKind = getConnDriverKindFromState(this.__driverState);
+      const driver = CONN_DRIVERS[driverKind];
+      return driver.isHibernatable(
+        this.#actor,
+        this,
+        this.__driverState[driverKind]
+      );
+    } else {
+      return false;
+    }
+  }
   /**
    * Timestamp of the last time the connection was seen, i.e. the last time the connection was active and checked for liveness.
    */
@@ -318,17 +357,17 @@ var Conn = (_class = class {
       connId: this.id
     });
     this._sendMessage(
-      new (0, _chunkJKOUXDK6cjs.CachedSerializer)(
+      new (0, _chunkGXIO5YOTcjs.CachedSerializer)(
         {
           body: {
             tag: "Event",
             val: {
               name: eventName,
-              args: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor.encode(args))
+              args: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor.encode(args))
             }
           }
         },
-        _chunkFDJ3AVNBcjs.TO_CLIENT_VERSIONED
+        _chunk5TRXLS6Xcjs.TO_CLIENT_VERSIONED
       )
     );
   }
@@ -354,7 +393,7 @@ var Conn = (_class = class {
           conn: this.id
         });
       }
-      this.#actor.__connDisconnected(this, true, this.__socket.socketId);
+      this.#actor.__connDisconnected(this, true, this.__socket.requestId);
     } else {
       this.#actor.rLog.warn({
         msg: "missing connection driver state for disconnect",
@@ -395,7 +434,7 @@ function createActorInspectorRouter() {
     "/state",
     _standardvalidator.sValidator.call(void 0, 
       "json",
-      _v42.default.object({ patch: _chunk65SAIRRYcjs.PatchSchema }).or(_v42.default.object({ replace: _v42.default.any() }))
+      _v42.default.object({ patch: _chunkUBMUBNS2cjs.PatchSchema }).or(_v42.default.object({ replace: _v42.default.any() }))
     ),
     async (c) => {
       if (!await c.var.inspector.accessors.isStateEnabled()) {
@@ -445,7 +484,7 @@ function createActorInspectorRouter() {
             });
           }
         );
-        const { promise } = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+        const { promise } = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
         return promise;
       },
       async () => {
@@ -473,7 +512,7 @@ function createActorInspectorRouter() {
             });
           }
         );
-        const { promise } = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+        const { promise } = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
         return promise;
       },
       async () => {
@@ -501,7 +540,7 @@ function createActorInspectorRouter() {
             id: String(id++)
           });
         });
-        const { promise } = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+        const { promise } = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
         return promise;
       },
       async () => {
@@ -517,7 +556,7 @@ function createActorInspectorRouter() {
     }
     const db = await c.var.inspector.accessors.getDb();
     const rows = await db.execute(`PRAGMA table_list`);
-    const tables = _chunk65SAIRRYcjs.TablesSchema.parse(rows).filter(
+    const tables = _chunkUBMUBNS2cjs.TablesSchema.parse(rows).filter(
       (table) => table.schema !== "temp" && !table.name.startsWith("sqlite_")
     );
     const tablesInfo = await Promise.all(
@@ -525,14 +564,14 @@ function createActorInspectorRouter() {
         (table) => db.execute(`PRAGMA table_info(${table.name})`)
       )
     );
-    const columns = tablesInfo.map((def) => _chunk65SAIRRYcjs.ColumnsSchema.parse(def));
+    const columns = tablesInfo.map((def) => _chunkUBMUBNS2cjs.ColumnsSchema.parse(def));
     const foreignKeysList = await Promise.all(
       tables.map(
         (table) => db.execute(`PRAGMA foreign_key_list(${table.name})`)
       )
     );
     const foreignKeys = foreignKeysList.map(
-      (def) => _chunk65SAIRRYcjs.ForeignKeysSchema.parse(def)
+      (def) => _chunkUBMUBNS2cjs.ForeignKeysSchema.parse(def)
     );
     const countInfo = await Promise.all(
       tables.map(
@@ -733,7 +772,7 @@ var ActorContext = class {
    * @experimental
    */
   sleep() {
-    this.#actor._sleep();
+    this.#actor._startSleep();
   }
 };
 
@@ -810,6 +849,15 @@ var Schedule = class {
 };
 
 // src/actor/instance.ts
+var PERSIST_SYMBOL = Symbol("persist");
+var CanSleep = /* @__PURE__ */ ((CanSleep2) => {
+  CanSleep2[CanSleep2["Yes"] = 0] = "Yes";
+  CanSleep2[CanSleep2["NotReady"] = 1] = "NotReady";
+  CanSleep2[CanSleep2["ActiveConns"] = 2] = "ActiveConns";
+  CanSleep2[CanSleep2["ActiveHonoHttpRequests"] = 3] = "ActiveHonoHttpRequests";
+  CanSleep2[CanSleep2["ActiveRawWebSockets"] = 4] = "ActiveRawWebSockets";
+  return CanSleep2;
+})(CanSleep || {});
 var ActorInstance = class {
   // Shared actor context for this instance
   
@@ -820,7 +868,7 @@ var ActorInstance = class {
   #sleepCalled = false;
   #stopCalled = false;
   get isStopping() {
-    return this.#stopCalled || this.#sleepCalled;
+    return this.#stopCalled;
   }
   #persistChanged = false;
   #isInOnStateChange = false;
@@ -830,10 +878,13 @@ var ActorInstance = class {
    * Any data that should be stored indefinitely should be held within this object.
    */
   #persist;
+  get [PERSIST_SYMBOL]() {
+    return this.#persist;
+  }
   /** Raw state without the proxy wrapper */
   #persistRaw;
-  #persistWriteQueue = new (0, _chunkELDFBXDVcjs.SinglePromiseQueue)();
-  #alarmWriteQueue = new (0, _chunkELDFBXDVcjs.SinglePromiseQueue)();
+  #persistWriteQueue = new (0, _chunkYUBR6XCJcjs.SinglePromiseQueue)();
+  #alarmWriteQueue = new (0, _chunkYUBR6XCJcjs.SinglePromiseQueue)();
   #lastSaveTime = 0;
   #pendingSaveTimeout;
   #vars;
@@ -851,8 +902,11 @@ var ActorInstance = class {
   #subscriptionIndex = /* @__PURE__ */ new Map();
   #checkConnLivenessInterval;
   #sleepTimeout;
-  // Track active raw requests so sleep logic can account for them
-  #activeRawFetchCount = 0;
+  /**
+   * Track active HTTP requests through Hono router so sleep logic can
+   * account for them. Does not include WebSockets.
+   **/
+  #activeHonoHttpRequests = 0;
   #activeRawWebSockets = /* @__PURE__ */ new Set();
   #schedule;
   #db;
@@ -876,12 +930,21 @@ var ActorInstance = class {
       },
       getConnections: async () => {
         return Array.from(this.#connections.entries()).map(
-          ([id, conn]) => ({
-            id,
-            stateEnabled: conn.__stateEnabled,
-            params: conn.params,
-            state: conn.__stateEnabled ? conn.state : void 0
-          })
+          ([id, conn]) => {
+            var _a;
+            return {
+              id,
+              params: conn.params,
+              state: conn.__stateEnabled ? conn.state : void 0,
+              status: conn.status,
+              subscriptions: conn.subscriptions.size,
+              lastSeen: conn.lastSeen,
+              stateEnabled: conn.__stateEnabled,
+              isHibernatable: conn.isHibernatable,
+              requestId: (_a = conn.__socket) == null ? void 0 : _a.requestId,
+              driver: conn.__driverState ? getConnDriverKindFromState(conn.__driverState) : void 0
+            };
+          }
         );
       },
       setState: async (state) => {
@@ -890,10 +953,10 @@ var ActorInstance = class {
         await this.saveState({ immediate: true });
       },
       executeAction: async (name, params) => {
-        const socketId = generateConnSocketId();
+        const requestId = generateConnRequestId();
         const conn = await this.createConn(
           {
-            socketId,
+            requestId,
             driverState: { [2 /* HTTP */]: {} }
           },
           void 0,
@@ -901,12 +964,12 @@ var ActorInstance = class {
         );
         try {
           return await this.executeAction(
-            new (0, _chunkFDJ3AVNBcjs.ActionContext)(this.actorContext, conn),
+            new (0, _chunk5TRXLS6Xcjs.ActionContext)(this.actorContext, conn),
             name,
             params || []
           );
         } finally {
-          this.__connDisconnected(conn, true, socketId);
+          this.__connDisconnected(conn, true, requestId);
         }
       }
     };
@@ -921,7 +984,7 @@ var ActorInstance = class {
     return this.#inspector;
   }
   get #sleepingSupported() {
-    return this.#actorDriver.sleep !== void 0;
+    return this.#actorDriver.startSleep !== void 0;
   }
   /**
    * This constructor should never be used directly.
@@ -935,21 +998,23 @@ var ActorInstance = class {
     this.actorContext = new ActorContext(this);
   }
   async start(actorDriver, inlineClient, actorId, name, key, region) {
-    var _a, _b;
+    var _a, _b, _c;
     const logParams = {
       actor: name,
       key: serializeActorKey(key),
       actorId
     };
-    this.#log = _chunkHN7UXCYQcjs.getBaseLogger.call(void 0, ).child(
+    const extraLogParams = (_a = actorDriver.getExtraActorLogParams) == null ? void 0 : _a.call(actorDriver);
+    if (extraLogParams) Object.assign(logParams, extraLogParams);
+    this.#log = _chunk5N6F5PXDcjs.getBaseLogger.call(void 0, ).child(
       Object.assign(
-        _chunkHN7UXCYQcjs.getIncludeTarget.call(void 0, ) ? { target: "actor" } : {},
+        _chunk5N6F5PXDcjs.getIncludeTarget.call(void 0, ) ? { target: "actor" } : {},
         logParams
       )
     );
-    this.#rLog = _chunkHN7UXCYQcjs.getBaseLogger.call(void 0, ).child(
+    this.#rLog = _chunk5N6F5PXDcjs.getBaseLogger.call(void 0, ).child(
       Object.assign(
-        _chunkHN7UXCYQcjs.getIncludeTarget.call(void 0, ) ? { target: "actor-runtime" } : {},
+        _chunk5N6F5PXDcjs.getIncludeTarget.call(void 0, ) ? { target: "actor-runtime" } : {},
         logParams
       )
     );
@@ -969,7 +1034,7 @@ var ActorInstance = class {
           this.#actorDriver.getContext(this.#actorId)
         );
         if (dataOrPromise instanceof Promise) {
-          vars = await _chunkJKOUXDK6cjs.deadline.call(void 0, 
+          vars = await _chunkGXIO5YOTcjs.deadline.call(void 0, 
             dataOrPromise,
             this.#config.options.createVarsTimeout
           );
@@ -997,7 +1062,7 @@ var ActorInstance = class {
         getDatabase: () => actorDriver.getDatabase(this.#actorId)
       });
       this.#rLog.info({ msg: "database migration starting" });
-      await ((_b = (_a = this.#config.db).onMigrate) == null ? void 0 : _b.call(_a, client));
+      await ((_c = (_b = this.#config.db).onMigrate) == null ? void 0 : _c.call(_b, client));
       this.#rLog.info({ msg: "database migration complete" });
       this.#db = client;
     }
@@ -1107,7 +1172,7 @@ var ActorInstance = class {
         } catch (error) {
           this.actorContext.log.error({
             msg: "error while running event",
-            error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error),
+            error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error),
             event: event.eventId,
             timestamp: event.timestamp,
             action: event.kind.generic.actionName
@@ -1116,7 +1181,7 @@ var ActorInstance = class {
       } catch (error) {
         this.actorContext.log.error({
           msg: "internal error while running event",
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error),
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error),
           ...event
         });
       }
@@ -1129,7 +1194,7 @@ var ActorInstance = class {
       kind: {
         generic: {
           actionName: action,
-          args: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
+          args: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
         }
       }
     });
@@ -1185,7 +1250,7 @@ var ActorInstance = class {
           );
           await this.#actorDriver.writePersistedData(
             this.#actorId,
-            _chunkFDJ3AVNBcjs.PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(
+            _chunk5TRXLS6Xcjs.PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(
               bareData
             )
           );
@@ -1211,7 +1276,7 @@ var ActorInstance = class {
     this.#persistRaw = target;
     if (target === null || typeof target !== "object") {
       let invalidPath = "";
-      if (!_chunkELDFBXDVcjs.isCborSerializable.call(void 0, 
+      if (!_chunkYUBR6XCJcjs.isCborSerializable.call(void 0, 
         target,
         (path) => {
           invalidPath = path;
@@ -1233,7 +1298,7 @@ var ActorInstance = class {
           return;
         }
         let invalidPath = "";
-        if (!_chunkELDFBXDVcjs.isCborSerializable.call(void 0, 
+        if (!_chunkYUBR6XCJcjs.isCborSerializable.call(void 0, 
           value,
           (invalidPathPart) => {
             invalidPath = invalidPathPart;
@@ -1259,7 +1324,7 @@ var ActorInstance = class {
           } catch (error) {
             this.#rLog.error({
               msg: "error in `_onStateChange`",
-              error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+              error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
             });
           } finally {
             this.#isInOnStateChange = false;
@@ -1277,7 +1342,7 @@ var ActorInstance = class {
       persistDataBuffer !== void 0,
       "persist data has not been set, it should be set when initialized"
     );
-    const bareData = _chunkFDJ3AVNBcjs.PERSISTED_ACTOR_VERSIONED.deserializeWithEmbeddedVersion(
+    const bareData = _chunk5TRXLS6Xcjs.PERSISTED_ACTOR_VERSIONED.deserializeWithEmbeddedVersion(
       persistDataBuffer
     );
     const persistData = this.#convertFromBarePersisted(bareData);
@@ -1321,7 +1386,7 @@ var ActorInstance = class {
       const bareData2 = this.#convertToBarePersisted(persistData);
       await this.#actorDriver.writePersistedData(
         this.#actorId,
-        _chunkFDJ3AVNBcjs.PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(
+        _chunk5TRXLS6Xcjs.PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(
           bareData2
         )
       );
@@ -1344,13 +1409,13 @@ var ActorInstance = class {
    *
    * If not a clean disconnect, will keep the connection alive for a given interval to wait for reconnect.
    */
-  __connDisconnected(conn, wasClean, socketId) {
-    if (socketId && conn.__socket && socketId !== conn.__socket.socketId) {
+  __connDisconnected(conn, wasClean, requestId) {
+    if (requestId && conn.__socket && requestId !== conn.__socket.requestId) {
       this.#rLog.debug({
         msg: "ignoring stale disconnect event",
         connId: conn.id,
-        eventSocketId: socketId,
-        currentSocketId: conn.__socket.socketId
+        eventRequestId: requestId,
+        currentRequestId: conn.__socket.requestId
       });
       return;
     }
@@ -1397,14 +1462,14 @@ var ActorInstance = class {
           result.catch((error) => {
             this.#rLog.error({
               msg: "error in `onDisconnect`",
-              error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+              error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
             });
           });
         }
       } catch (error) {
         this.#rLog.error({
           msg: "error in `onDisconnect`",
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
         });
       }
     }
@@ -1445,7 +1510,7 @@ var ActorInstance = class {
         this.#resetSleepTimer();
         this.inspector.emitter.emit("connectionUpdated");
         existingConn._sendMessage(
-          new (0, _chunkJKOUXDK6cjs.CachedSerializer)(
+          new (0, _chunkGXIO5YOTcjs.CachedSerializer)(
             {
               body: {
                 tag: "Init",
@@ -1456,7 +1521,7 @@ var ActorInstance = class {
                 }
               }
             },
-            _chunkFDJ3AVNBcjs.TO_CLIENT_VERSIONED
+            _chunk5TRXLS6Xcjs.TO_CLIENT_VERSIONED
           )
         );
         return existingConn;
@@ -1490,7 +1555,7 @@ var ActorInstance = class {
           params
         );
         if (dataOrPromise instanceof Promise) {
-          connState = await _chunkJKOUXDK6cjs.deadline.call(void 0, 
+          connState = await _chunkGXIO5YOTcjs.deadline.call(void 0, 
             dataOrPromise,
             this.#config.options.createConnStateTimeout
           );
@@ -1523,7 +1588,7 @@ var ActorInstance = class {
       try {
         const result = this.#config.onConnect(this.actorContext, conn);
         if (result instanceof Promise) {
-          _chunkJKOUXDK6cjs.deadline.call(void 0, 
+          _chunkGXIO5YOTcjs.deadline.call(void 0, 
             result,
             this.#config.options.onConnectTimeout
           ).catch((error) => {
@@ -1537,14 +1602,14 @@ var ActorInstance = class {
       } catch (error) {
         this.#rLog.error({
           msg: "error in `onConnect`",
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
         });
         conn == null ? void 0 : conn.disconnect("`onConnect` failed");
       }
     }
     this.inspector.emitter.emit("connectionUpdated");
     conn._sendMessage(
-      new (0, _chunkJKOUXDK6cjs.CachedSerializer)(
+      new (0, _chunkGXIO5YOTcjs.CachedSerializer)(
         {
           body: {
             tag: "Init",
@@ -1555,14 +1620,14 @@ var ActorInstance = class {
             }
           }
         },
-        _chunkFDJ3AVNBcjs.TO_CLIENT_VERSIONED
+        _chunk5TRXLS6Xcjs.TO_CLIENT_VERSIONED
       )
     );
     return conn;
   }
   // MARK: Messages
   async processMessage(message, conn) {
-    await _chunkFDJ3AVNBcjs.processMessage.call(void 0, message, this, conn, {
+    await _chunk5TRXLS6Xcjs.processMessage.call(void 0, message, this, conn, {
       onExecuteAction: async (ctx, name, args) => {
         this.inspector.emitter.emit("eventFired", {
           type: "action",
@@ -1644,8 +1709,6 @@ var ActorInstance = class {
   }
   #assertReady(allowStoppingState = false) {
     if (!this.#ready) throw new (0, _chunkKSRXX3Z4cjs.InternalError)("Actor not ready");
-    if (!allowStoppingState && this.#sleepCalled)
-      throw new (0, _chunkKSRXX3Z4cjs.InternalError)("Actor is going to sleep");
     if (!allowStoppingState && this.#stopCalled)
       throw new (0, _chunkKSRXX3Z4cjs.InternalError)("Actor is stopping");
   }
@@ -1655,13 +1718,18 @@ var ActorInstance = class {
    */
   #checkConnectionsLiveness() {
     this.#rLog.debug({ msg: "checking connections liveness" });
+    let connected = 0;
+    let reconnecting = 0;
+    let removed = 0;
     for (const conn of this.#connections.values()) {
       if (conn.__status === "connected") {
+        connected += 1;
         this.#rLog.debug({
           msg: "connection is alive",
           connId: conn.id
         });
       } else {
+        reconnecting += 1;
         const lastSeen = conn.__persist.lastSeen;
         const sinceLastSeen = Date.now() - lastSeen;
         if (sinceLastSeen < this.#config.options.connectionLivenessTimeout) {
@@ -1678,9 +1746,17 @@ var ActorInstance = class {
           connId: conn.id,
           lastSeen
         });
+        removed += 1;
         this.#removeConn(conn);
       }
     }
+    this.#rLog.debug({
+      msg: "checked connection liveness",
+      total: connected + reconnecting,
+      connected,
+      reconnecting,
+      removed
+    });
   }
   /**
    * Check if the actor is ready to handle requests.
@@ -1738,7 +1814,7 @@ var ActorInstance = class {
           msg: "awaiting async action",
           actionName
         });
-        output = await _chunkJKOUXDK6cjs.deadline.call(void 0, 
+        output = await _chunkGXIO5YOTcjs.deadline.call(void 0, 
           outputOrPromise,
           this.#config.options.actionTimeout
         );
@@ -1773,7 +1849,7 @@ var ActorInstance = class {
         } catch (error) {
           this.#rLog.error({
             msg: "error in `onBeforeActionResponse`",
-            error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+            error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
           });
         }
       }
@@ -1785,13 +1861,13 @@ var ActorInstance = class {
       });
       return output;
     } catch (error) {
-      if (error instanceof _chunkJKOUXDK6cjs.DeadlineError) {
+      if (error instanceof _chunkGXIO5YOTcjs.DeadlineError) {
         throw new (0, _chunkKSRXX3Z4cjs.ActionTimedOut)();
       }
       this.#rLog.error({
         msg: "action error",
         actionName,
-        error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+        error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
       });
       throw error;
     } finally {
@@ -1812,8 +1888,6 @@ var ActorInstance = class {
     if (!this.#config.onFetch) {
       throw new (0, _chunkKSRXX3Z4cjs.FetchHandlerNotDefined)();
     }
-    this.#activeRawFetchCount++;
-    this.#resetSleepTimer();
     try {
       const response = await this.#config.onFetch(
         this.actorContext,
@@ -1827,15 +1901,10 @@ var ActorInstance = class {
     } catch (error) {
       this.#rLog.error({
         msg: "onFetch error",
-        error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+        error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
       });
       throw error;
     } finally {
-      this.#activeRawFetchCount = Math.max(
-        0,
-        this.#activeRawFetchCount - 1
-      );
-      this.#resetSleepTimer();
       this.#savePersistThrottled();
     }
   }
@@ -1851,8 +1920,81 @@ var ActorInstance = class {
       const stateBeforeHandler = this.#persistChanged;
       this.#activeRawWebSockets.add(websocket);
       this.#resetSleepTimer();
-      const onSocketClosed = () => {
+      let rivetRequestId;
+      let persistedHibernatableWebSocket;
+      const onSocketOpened = (event) => {
+        rivetRequestId = event == null ? void 0 : event.rivetRequestId;
+        if (rivetRequestId) {
+          const rivetRequestIdLocal = rivetRequestId;
+          persistedHibernatableWebSocket = this.#persist.hibernatableWebSocket.find(
+            (ws) => _chunkYUBR6XCJcjs.arrayBuffersEqual.call(void 0, 
+              ws.requestId,
+              rivetRequestIdLocal
+            )
+          );
+          if (persistedHibernatableWebSocket) {
+            persistedHibernatableWebSocket.lastSeenTimestamp = BigInt(Date.now());
+          }
+        }
+        this.#rLog.debug({
+          msg: "actor instance onSocketOpened",
+          rivetRequestId,
+          isHibernatable: !!persistedHibernatableWebSocket,
+          hibernationMsgIndex: persistedHibernatableWebSocket == null ? void 0 : persistedHibernatableWebSocket.msgIndex
+        });
+      };
+      const onSocketMessage = (event) => {
+        if (persistedHibernatableWebSocket) {
+          persistedHibernatableWebSocket.lastSeenTimestamp = BigInt(
+            Date.now()
+          );
+          persistedHibernatableWebSocket.msgIndex = BigInt(
+            event.rivetMessageIndex
+          );
+        }
+        this.#rLog.debug({
+          msg: "actor instance onSocketMessage",
+          rivetRequestId,
+          isHibernatable: !!persistedHibernatableWebSocket,
+          hibernationMsgIndex: persistedHibernatableWebSocket == null ? void 0 : persistedHibernatableWebSocket.msgIndex
+        });
+      };
+      const onSocketClosed = (_event) => {
+        if (rivetRequestId) {
+          const rivetRequestIdLocal = rivetRequestId;
+          const wsIndex = this.#persist.hibernatableWebSocket.findIndex(
+            (ws) => _chunkYUBR6XCJcjs.arrayBuffersEqual.call(void 0, 
+              ws.requestId,
+              rivetRequestIdLocal
+            )
+          );
+          const removed = this.#persist.hibernatableWebSocket.splice(
+            wsIndex,
+            1
+          );
+          if (removed.length > 0) {
+            this.#rLog.debug({
+              msg: "removed hibernatable websocket",
+              rivetRequestId,
+              hibernationMsgIndex: persistedHibernatableWebSocket == null ? void 0 : persistedHibernatableWebSocket.msgIndex
+            });
+          } else {
+            this.#rLog.warn({
+              msg: "could not find hibernatable websocket to remove",
+              rivetRequestId,
+              hibernationMsgIndex: persistedHibernatableWebSocket == null ? void 0 : persistedHibernatableWebSocket.msgIndex
+            });
+          }
+        }
+        this.#rLog.debug({
+          msg: "actor instance onSocketMessage",
+          rivetRequestId,
+          isHibernatable: !!persistedHibernatableWebSocket,
+          hibernatableWebSocketCount: this.#persist.hibernatableWebSocket.length
+        });
         try {
+          websocket.removeEventListener("open", onSocketOpened);
+          websocket.removeEventListener("message", onSocketMessage);
           websocket.removeEventListener("close", onSocketClosed);
           websocket.removeEventListener("error", onSocketClosed);
         } catch (e) {
@@ -1861,6 +2003,8 @@ var ActorInstance = class {
         this.#resetSleepTimer();
       };
       try {
+        websocket.addEventListener("open", onSocketOpened);
+        websocket.addEventListener("message", onSocketMessage);
         websocket.addEventListener("close", onSocketClosed);
         websocket.addEventListener("error", onSocketClosed);
       } catch (e2) {
@@ -1872,7 +2016,7 @@ var ActorInstance = class {
     } catch (error) {
       this.#rLog.error({
         msg: "onWebSocket error",
-        error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+        error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
       });
       throw error;
     } finally {
@@ -1967,17 +2111,17 @@ var ActorInstance = class {
     });
     const subscriptions = this.#subscriptionIndex.get(name);
     if (!subscriptions) return;
-    const toClientSerializer = new (0, _chunkJKOUXDK6cjs.CachedSerializer)(
+    const toClientSerializer = new (0, _chunkGXIO5YOTcjs.CachedSerializer)(
       {
         body: {
           tag: "Event",
           val: {
             name,
-            args: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
+            args: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
           }
         }
       },
-      _chunkFDJ3AVNBcjs.TO_CLIENT_VERSIONED
+      _chunk5TRXLS6Xcjs.TO_CLIENT_VERSIONED
     );
     for (const connection of subscriptions) {
       connection._sendMessage(toClientSerializer);
@@ -1998,7 +2142,7 @@ var ActorInstance = class {
     }).catch((error) => {
       this.#rLog.error({
         msg: "wait until promise failed",
-        error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+        error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
       });
     });
     this.#backgroundPromises.push(nonfailablePromise);
@@ -2018,13 +2162,34 @@ var ActorInstance = class {
         await this.#savePersistInner();
       } else {
         if (!this.#onPersistSavedPromise) {
-          this.#onPersistSavedPromise = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+          this.#onPersistSavedPromise = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
         }
         this.#savePersistThrottled();
         await this.#onPersistSavedPromise.promise;
       }
     }
   }
+  /**
+   * Called by router middleware when an HTTP request begins.
+   */
+  __beginHonoHttpRequest() {
+    this.#activeHonoHttpRequests++;
+    this.#resetSleepTimer();
+  }
+  /**
+   * Called by router middleware when an HTTP request ends.
+   */
+  __endHonoHttpRequest() {
+    this.#activeHonoHttpRequests--;
+    if (this.#activeHonoHttpRequests < 0) {
+      this.#activeHonoHttpRequests = 0;
+      this.#rLog.warn({
+        msg: "active hono requests went below 0, this is a RivetKit bug",
+        ..._chunkYUBR6XCJcjs.EXTRA_ERROR_LOG
+      });
+    }
+    this.#resetSleepTimer();
+  }
   // MARK: Sleep
   /**
    * Reset timer from the last actor interaction that allows it to be put to sleep.
@@ -2041,56 +2206,68 @@ var ActorInstance = class {
     const canSleep = this.#canSleep();
     this.#rLog.debug({
       msg: "resetting sleep timer",
-      canSleep,
-      existingTimeout: !!this.#sleepTimeout
+      canSleep: CanSleep[canSleep],
+      existingTimeout: !!this.#sleepTimeout,
+      timeout: this.#config.options.sleepTimeout
     });
     if (this.#sleepTimeout) {
       clearTimeout(this.#sleepTimeout);
       this.#sleepTimeout = void 0;
     }
     if (this.#sleepCalled) return;
-    if (canSleep) {
+    if (canSleep === 0 /* Yes */) {
       this.#sleepTimeout = setTimeout(() => {
-        this._sleep().catch((error) => {
-          this.#rLog.error({
-            msg: "error during sleep",
-            error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
-          });
-        });
+        this._startSleep();
       }, this.#config.options.sleepTimeout);
     }
   }
   /** If this actor can be put in a sleeping state. */
   #canSleep() {
-    if (!this.#ready) return false;
+    if (!this.#ready) return 1 /* NotReady */;
+    if (this.#activeHonoHttpRequests > 0)
+      return 3 /* ActiveHonoHttpRequests */;
+    if (this.#activeRawWebSockets.size > 0)
+      return 4 /* ActiveRawWebSockets */;
     for (const conn of this.#connections.values()) {
-      if (conn.status === "connected") return false;
+      if (conn.status === "connected") return 2 /* ActiveConns */;
     }
-    if (this.#activeRawFetchCount > 0) return false;
-    if (this.#activeRawWebSockets.size > 0) return false;
-    return true;
+    return 0 /* Yes */;
   }
-  /** Puts an actor to sleep. This should just start the sleep sequence, most shutdown logic should be in _stop (which is called by the ActorDriver when sleeping). */
-  async _sleep() {
+  /**
+   * Puts an actor to sleep. This should just start the sleep sequence, most shutdown logic should be in _stop (which is called by the ActorDriver when sleeping).
+   *
+   * For the engine, this will:
+   * 1. Publish EventActorIntent with ActorIntentSleep (via driver.startSleep)
+   * 2. Engine runner will wait for CommandStopActor
+   * 3. Engine runner will call _onStop and wait for it to finish
+   * 4. Engine runner will publish EventActorStateUpdate with ActorStateSTop
+   **/
+  _startSleep() {
     var _a;
-    const sleep = (_a = this.#actorDriver.sleep) == null ? void 0 : _a.bind(
-      this.#actorDriver,
-      this.#actorId
-    );
-    _invariant2.default.call(void 0, this.#sleepingSupported, "sleeping not supported");
-    _invariant2.default.call(void 0, sleep, "no sleep on driver");
     if (this.#sleepCalled) {
       this.#rLog.warn({ msg: "already sleeping actor" });
       return;
     }
     this.#sleepCalled = true;
+    const sleep = (_a = this.#actorDriver.startSleep) == null ? void 0 : _a.bind(
+      this.#actorDriver,
+      this.#actorId
+    );
+    _invariant2.default.call(void 0, this.#sleepingSupported, "sleeping not supported");
+    _invariant2.default.call(void 0, sleep, "no sleep on driver");
     this.#rLog.info({ msg: "actor sleeping" });
-    setImmediate(async () => {
-      await sleep();
+    setImmediate(() => {
+      sleep();
     });
   }
   // MARK: Stop
-  async _stop() {
+  /**
+   * For the engine:
+   * 1. Engine runner receives CommandStopActor
+   * 2. Engine runner calls _onStop and waits for it to finish
+   * 3. Engine runner publishes EventActorStateUpdate with ActorStateSTop
+   */
+  async _onStop() {
     if (this.#stopCalled) {
       this.#rLog.warn({ msg: "already stopping actor" });
       return;
@@ -2110,16 +2287,16 @@ var ActorInstance = class {
         this.#rLog.debug({ msg: "calling onStop" });
         const result = this.#config.onStop(this.actorContext);
         if (result instanceof Promise) {
-          await _chunkJKOUXDK6cjs.deadline.call(void 0, result, this.#config.options.onStopTimeout);
+          await _chunkGXIO5YOTcjs.deadline.call(void 0, result, this.#config.options.onStopTimeout);
         }
         this.#rLog.debug({ msg: "onStop completed" });
       } catch (error) {
-        if (error instanceof _chunkJKOUXDK6cjs.DeadlineError) {
+        if (error instanceof _chunkGXIO5YOTcjs.DeadlineError) {
           this.#rLog.error({ msg: "onStop timed out" });
         } else {
           this.#rLog.error({
             msg: "error in onStop",
-            error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+            error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
           });
         }
       }
@@ -2182,14 +2359,14 @@ var ActorInstance = class {
   // MARK: BARE Conversion Helpers
   #convertToBarePersisted(persist) {
     return {
-      input: persist.input !== void 0 ? _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(persist.input)) : null,
+      input: persist.input !== void 0 ? _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(persist.input)) : null,
       hasInitialized: persist.hasInitiated,
-      state: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(persist.state)),
+      state: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(persist.state)),
       connections: persist.connections.map((conn) => ({
         id: conn.connId,
         token: conn.token,
-        parameters: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(conn.params || {})),
-        state: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(conn.state || {})),
+        parameters: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(conn.params || {})),
+        state: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(conn.state || {})),
         subscriptions: conn.subscriptions.map((sub) => ({
           eventName: sub.eventName
         })),
@@ -2205,6 +2382,11 @@ var ActorInstance = class {
             args: _nullishCoalesce(event.kind.generic.args, () => ( null))
           }
         }
+      })),
+      hibernatableWebSocket: persist.hibernatableWebSocket.map((ws) => ({
+        requestId: ws.requestId,
+        lastSeenTimestamp: ws.lastSeenTimestamp,
+        msgIndex: ws.msgIndex
       }))
     };
   }
@@ -2232,6 +2414,11 @@ var ActorInstance = class {
             args: event.kind.val.args
           }
         }
+      })),
+      hibernatableWebSocket: bareData.hibernatableWebSocket.map((ws) => ({
+        requestId: ws.requestId,
+        lastSeenTimestamp: ws.lastSeenTimestamp,
+        msgIndex: ws.msgIndex
       }))
     };
   }
@@ -2311,7 +2498,7 @@ async function importEventSource() {
         moduleName
       )));
       _EventSource = es.EventSource;
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug("using eventsource from npm");
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug("using eventsource from npm");
     } catch (err) {
       _EventSource = class MockEventSource {
         constructor() {
@@ -2320,7 +2507,7 @@ async function importEventSource() {
           );
         }
       };
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug("using mock eventsource");
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug("using mock eventsource");
     }
     return _EventSource;
   })();
@@ -2329,7 +2516,7 @@ async function importEventSource() {
 
 // src/client/actor-query.ts
 async function queryActor(c, query, managerDriver) {
-  _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "querying actor", query: JSON.stringify(query) });
+  _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "querying actor", query: JSON.stringify(query) });
   let actorOutput;
   if ("getForId" in query) {
     const output = await managerDriver.getForId({
@@ -2376,7 +2563,7 @@ async function queryActor(c, query, managerDriver) {
   } else {
     throw new (0, _chunkKSRXX3Z4cjs.InvalidRequest)("Invalid query format");
   }
-  _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "actor query result", actorId: actorOutput.actorId });
+  _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "actor query result", actorId: actorOutput.actorId });
   return { actorId: actorOutput.actorId };
 }
 
@@ -2426,13 +2613,13 @@ async function rawHttpFetch(driver, actorQuery, params, input, init) {
   }
   try {
     const { actorId } = await queryActor(void 0, actorQuery, driver);
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "found actor for raw http", actorId });
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "found actor for raw http", actorId });
     _invariant2.default.call(void 0, actorId, "Missing actor ID");
     const normalizedPath = path.startsWith("/") ? path.slice(1) : path;
     const url = new URL(`http://actor/raw/http/${normalizedPath}`);
     const proxyRequestHeaders = new Headers(mergedInit.headers);
     if (params) {
-      proxyRequestHeaders.set(_chunkJKOUXDK6cjs.HEADER_CONN_PARAMS, JSON.stringify(params));
+      proxyRequestHeaders.set(_chunkGXIO5YOTcjs.HEADER_CONN_PARAMS, JSON.stringify(params));
     }
     const proxyRequest = new Request(url, {
       ...mergedInit,
@@ -2440,9 +2627,9 @@ async function rawHttpFetch(driver, actorQuery, params, input, init) {
     });
     return driver.sendRequest(actorId, proxyRequest);
   } catch (err) {
-    const { group, code, message, metadata } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
+    const { group, code, message, metadata } = _chunkYUBR6XCJcjs.deconstructError.call(void 0, 
       err,
-      _chunkLWGCMELPcjs.logger.call(void 0, ),
+      _chunkZY4DKLMTcjs.logger.call(void 0, ),
       {},
       true
     );
@@ -2452,7 +2639,7 @@ async function rawHttpFetch(driver, actorQuery, params, input, init) {
 async function rawWebSocket(driver, actorQuery, params, path, protocols) {
   const encoding = "bare";
   const { actorId } = await queryActor(void 0, actorQuery, driver);
-  _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "found actor for action", actorId });
+  _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "found actor for action", actorId });
   _invariant2.default.call(void 0, actorId, "Missing actor ID");
   let pathPortion = "";
   let queryPortion = "";
@@ -2468,8 +2655,8 @@ async function rawWebSocket(driver, actorQuery, params, path, protocols) {
       pathPortion = pathPortion.slice(1);
     }
   }
-  const fullPath = `${_chunkJKOUXDK6cjs.PATH_RAW_WEBSOCKET_PREFIX}${pathPortion}${queryPortion}`;
-  _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+  const fullPath = `${_chunkGXIO5YOTcjs.PATH_RAW_WEBSOCKET_PREFIX}${pathPortion}${queryPortion}`;
+  _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
     msg: "opening websocket",
     actorId,
     encoding,
@@ -2495,10 +2682,10 @@ function messageLength(message) {
   if (typeof message === "string") {
     return message.length;
   }
-  _chunkELDFBXDVcjs.assertUnreachable.call(void 0, message);
+  _chunkYUBR6XCJcjs.assertUnreachable.call(void 0, message);
 }
 async function sendHttpRequest(opts) {
-  _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+  _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
     msg: "sending http request",
     url: opts.url,
     encoding: opts.encoding
@@ -2507,8 +2694,8 @@ async function sendHttpRequest(opts) {
   let bodyData;
   if (opts.method === "POST" || opts.method === "PUT") {
     _invariant2.default.call(void 0, opts.body !== void 0, "missing body");
-    contentType = _chunkJKOUXDK6cjs.contentTypeForEncoding.call(void 0, opts.encoding);
-    bodyData = _chunkJKOUXDK6cjs.serializeWithEncoding.call(void 0, 
+    contentType = _chunkGXIO5YOTcjs.contentTypeForEncoding.call(void 0, opts.encoding);
+    bodyData = _chunkGXIO5YOTcjs.serializeWithEncoding.call(void 0, 
       opts.encoding,
       opts.body,
       opts.requestVersionedDataHandler
@@ -2524,7 +2711,7 @@ async function sendHttpRequest(opts) {
           ...contentType ? {
             "Content-Type": contentType
           } : {},
-          "User-Agent": _chunkELDFBXDVcjs.httpUserAgent.call(void 0, )
+          "User-Agent": _chunkYUBR6XCJcjs.httpUserAgent.call(void 0, )
         },
         body: bodyData,
         credentials: "include",
@@ -2540,10 +2727,10 @@ async function sendHttpRequest(opts) {
     const bufferResponse = await response.arrayBuffer();
     let responseData;
     try {
-      responseData = _chunkJKOUXDK6cjs.deserializeWithEncoding.call(void 0, 
+      responseData = _chunkGXIO5YOTcjs.deserializeWithEncoding.call(void 0, 
         opts.encoding,
         new Uint8Array(bufferResponse),
-        _chunkFDJ3AVNBcjs.HTTP_RESPONSE_ERROR_VERSIONED
+        _chunk5TRXLS6Xcjs.HTTP_RESPONSE_ERROR_VERSIONED
       );
     } catch (error) {
       const textResponse = new TextDecoder("utf-8", {
@@ -2563,7 +2750,7 @@ ${textResponse}`
       }
     }
     let decodedMetadata;
-    if (responseData.metadata && _chunkJKOUXDK6cjs.encodingIsBinary.call(void 0, opts.encoding)) {
+    if (responseData.metadata && _chunkGXIO5YOTcjs.encodingIsBinary.call(void 0, opts.encoding)) {
       decodedMetadata = cbor3.decode(
         new Uint8Array(responseData.metadata)
       );
@@ -2580,7 +2767,7 @@ ${textResponse}`
   }
   try {
     const buffer = new Uint8Array(await response.arrayBuffer());
-    return _chunkJKOUXDK6cjs.deserializeWithEncoding.call(void 0, 
+    return _chunkGXIO5YOTcjs.deserializeWithEncoding.call(void 0, 
       opts.encoding,
       buffer,
       opts.responseVersionedDataHandler
@@ -2627,9 +2814,9 @@ var ActorHandleRaw = class {
         this.#actorQuery,
         this.#driver
       );
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "found actor for action", actorId });
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "found actor for action", actorId });
       _invariant2.default.call(void 0, actorId, "Missing actor ID");
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
         msg: "handling action",
         name: opts.name,
         encoding: this.#encoding
@@ -2638,11 +2825,11 @@ var ActorHandleRaw = class {
         url: `http://actor/action/${encodeURIComponent(opts.name)}`,
         method: "POST",
         headers: {
-          [_chunkJKOUXDK6cjs.HEADER_ENCODING]: this.#encoding,
-          ...this.#params !== void 0 ? { [_chunkJKOUXDK6cjs.HEADER_CONN_PARAMS]: JSON.stringify(this.#params) } : {}
+          [_chunkGXIO5YOTcjs.HEADER_ENCODING]: this.#encoding,
+          ...this.#params !== void 0 ? { [_chunkGXIO5YOTcjs.HEADER_CONN_PARAMS]: JSON.stringify(this.#params) } : {}
         },
         body: {
-          args: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor4.encode(opts.args))
+          args: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor4.encode(opts.args))
         },
         encoding: this.#encoding,
         customFetch: this.#driver.sendRequest.bind(
@@ -2650,14 +2837,14 @@ var ActorHandleRaw = class {
           actorId
         ),
         signal: opts == null ? void 0 : opts.signal,
-        requestVersionedDataHandler: _chunkFDJ3AVNBcjs.HTTP_ACTION_REQUEST_VERSIONED,
-        responseVersionedDataHandler: _chunkFDJ3AVNBcjs.HTTP_ACTION_RESPONSE_VERSIONED
+        requestVersionedDataHandler: _chunk5TRXLS6Xcjs.HTTP_ACTION_REQUEST_VERSIONED,
+        responseVersionedDataHandler: _chunk5TRXLS6Xcjs.HTTP_ACTION_RESPONSE_VERSIONED
       });
       return cbor4.decode(new Uint8Array(responseData.output));
     } catch (err) {
-      const { group, code, message, metadata } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
+      const { group, code, message, metadata } = _chunkYUBR6XCJcjs.deconstructError.call(void 0, 
         err,
-        _chunkLWGCMELPcjs.logger.call(void 0, ),
+        _chunkZY4DKLMTcjs.logger.call(void 0, ),
         {},
         true
       );
@@ -2671,7 +2858,7 @@ var ActorHandleRaw = class {
    * @returns {ActorConn<AD>} A connection to the actor.
    */
   connect() {
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "establishing connection from handle",
       query: this.#actorQuery
     });
@@ -2731,7 +2918,7 @@ var ActorHandleRaw = class {
       } else if ("getOrCreateForKey" in this.#actorQuery) {
         name = this.#actorQuery.getOrCreateForKey.name;
       } else {
-        _chunkJKOUXDK6cjs.assertUnreachable.call(void 0, this.#actorQuery);
+        _chunkGXIO5YOTcjs.assertUnreachable.call(void 0, this.#actorQuery);
       }
       const { actorId } = await queryActor(
         void 0,
@@ -2745,7 +2932,7 @@ var ActorHandleRaw = class {
     } else if ("create" in this.#actorQuery) {
       _invariant2.default.call(void 0, false, "actorQuery cannot be create");
     } else {
-      _chunkJKOUXDK6cjs.assertUnreachable.call(void 0, this.#actorQuery);
+      _chunkGXIO5YOTcjs.assertUnreachable.call(void 0, this.#actorQuery);
     }
   }
 };
@@ -2778,7 +2965,7 @@ var ClientRaw = (_class4 = class {
    * @returns {ActorHandle<AD>} - A handle to the actor.
    */
   getForId(name, actorId, opts) {
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "get handle to actor with id",
       name,
       actorId,
@@ -2804,7 +2991,7 @@ var ClientRaw = (_class4 = class {
    */
   get(name, key, opts) {
     const keyArray = typeof key === "string" ? [key] : key || [];
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "get handle to actor",
       name,
       key: keyArray,
@@ -2830,7 +3017,7 @@ var ClientRaw = (_class4 = class {
    */
   getOrCreate(name, key, opts) {
     const keyArray = typeof key === "string" ? [key] : key || [];
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "get or create handle to actor",
       name,
       key: keyArray,
@@ -2868,7 +3055,7 @@ var ClientRaw = (_class4 = class {
         key: keyArray
       }
     };
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "create actor handle",
       name,
       key: keyArray,
@@ -2880,7 +3067,7 @@ var ClientRaw = (_class4 = class {
       createQuery,
       this.#driver
     );
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "created actor with ID",
       name,
       key: keyArray,
@@ -2917,11 +3104,11 @@ var ClientRaw = (_class4 = class {
    */
   async dispose() {
     if (this.#disposed) {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).warn({ msg: "client already disconnected" });
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).warn({ msg: "client already disconnected" });
       return;
     }
     this.#disposed = true;
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "disposing client" });
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "disposing client" });
     const disposePromises = [];
     for (const conn of this[ACTOR_CONNS_SYMBOL].values()) {
       disposePromises.push(conn.dispose());
@@ -3081,10 +3268,10 @@ var ActorConnRaw = class {
    * @returns {Promise<Response>} - A promise that resolves to the response of the action function.
    */
   async action(opts) {
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "action", name: opts.name, args: opts.args });
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "action", name: opts.name, args: opts.args });
     const actionId = this.#actionIdCounter;
     this.#actionIdCounter += 1;
-    const { promise, resolve, reject } = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+    const { promise, resolve, reject } = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
     this.#actionsInFlight.set(actionId, {
       name: opts.name,
       resolve,
@@ -3096,7 +3283,7 @@ var ActorConnRaw = class {
         val: {
           id: BigInt(actionId),
           name: opts.name,
-          args: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor5.encode(opts.args))
+          args: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor5.encode(opts.args))
         }
       }
     });
@@ -3125,10 +3312,10 @@ var ActorConnRaw = class {
         minTimeout: 250,
         maxTimeout: 3e4,
         onFailedAttempt: (error) => {
-          _chunkLWGCMELPcjs.logger.call(void 0, ).warn({
+          _chunkZY4DKLMTcjs.logger.call(void 0, ).warn({
             msg: "failed to reconnect",
             attempt: error.attemptNumber,
-            error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+            error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
           });
         },
         // Cancel retry if aborted
@@ -3136,7 +3323,7 @@ var ActorConnRaw = class {
       });
     } catch (err) {
       if (err.name === "AbortError") {
-        _chunkLWGCMELPcjs.logger.call(void 0, ).info({ msg: "connection retry aborted" });
+        _chunkZY4DKLMTcjs.logger.call(void 0, ).info({ msg: "connection retry aborted" });
         return;
       } else {
         throw err;
@@ -3148,13 +3335,13 @@ var ActorConnRaw = class {
     try {
       if (this.#onOpenPromise)
         throw new Error("#onOpenPromise already defined");
-      this.#onOpenPromise = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+      this.#onOpenPromise = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
       if (this.#client[TRANSPORT_SYMBOL] === "websocket") {
         await this.#connectWebSocket();
       } else if (this.#client[TRANSPORT_SYMBOL] === "sse") {
         await this.#connectSse();
       } else {
-        _chunkELDFBXDVcjs.assertUnreachable.call(void 0, this.#client[TRANSPORT_SYMBOL]);
+        _chunkYUBR6XCJcjs.assertUnreachable.call(void 0, this.#client[TRANSPORT_SYMBOL]);
       }
       await this.#onOpenPromise.promise;
     } finally {
@@ -3169,13 +3356,13 @@ var ActorConnRaw = class {
     );
     const isReconnection = this.#connectionId && this.#connectionToken;
     if (isReconnection) {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
         msg: "attempting websocket reconnection",
         connectionId: this.#connectionId
       });
     }
     const ws = await this.#driver.openWebSocket(
-      _chunkJKOUXDK6cjs.PATH_CONNECT_WEBSOCKET,
+      _chunkGXIO5YOTcjs.PATH_CONNECT_WEBSOCKET,
       actorId,
       this.#encoding,
       this.#params,
@@ -3183,7 +3370,7 @@ var ActorConnRaw = class {
       isReconnection ? this.#connectionId : void 0,
       isReconnection ? this.#connectionToken : void 0
     );
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "transport set to new websocket",
       connectionId: this.#connectionId,
       readyState: ws.readyState,
@@ -3191,7 +3378,7 @@ var ActorConnRaw = class {
     });
     this.#transport = { websocket: ws };
     ws.addEventListener("open", () => {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
         msg: "client websocket open",
         connectionId: this.#connectionId
       });
@@ -3200,9 +3387,9 @@ var ActorConnRaw = class {
       try {
         await this.#handleOnMessage(ev.data);
       } catch (err) {
-        _chunkLWGCMELPcjs.logger.call(void 0, ).error({
+        _chunkZY4DKLMTcjs.logger.call(void 0, ).error({
           msg: "error in websocket message handler",
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, err)
         });
       }
     });
@@ -3210,9 +3397,9 @@ var ActorConnRaw = class {
       try {
         this.#handleOnClose(ev);
       } catch (err) {
-        _chunkLWGCMELPcjs.logger.call(void 0, ).error({
+        _chunkZY4DKLMTcjs.logger.call(void 0, ).error({
           msg: "error in websocket close handler",
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, err)
         });
       }
     });
@@ -3220,9 +3407,9 @@ var ActorConnRaw = class {
       try {
         this.#handleOnError();
       } catch (err) {
-        _chunkLWGCMELPcjs.logger.call(void 0, ).error({
+        _chunkZY4DKLMTcjs.logger.call(void 0, ).error({
           msg: "error in websocket error handler",
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, err)
         });
       }
     });
@@ -3234,9 +3421,9 @@ var ActorConnRaw = class {
       this.#actorQuery,
       this.#driver
     );
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "found actor for sse connection", actorId });
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "found actor for sse connection", actorId });
     _invariant2.default.call(void 0, actorId, "Missing actor ID");
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "opening sse connection",
       actorId,
       encoding: this.#encoding
@@ -3250,16 +3437,16 @@ var ActorConnRaw = class {
             ...init,
             headers: {
               ...init == null ? void 0 : init.headers,
-              "User-Agent": _chunkELDFBXDVcjs.httpUserAgent.call(void 0, ),
-              [_chunkJKOUXDK6cjs.HEADER_ENCODING]: this.#encoding,
+              "User-Agent": _chunkYUBR6XCJcjs.httpUserAgent.call(void 0, ),
+              [_chunkGXIO5YOTcjs.HEADER_ENCODING]: this.#encoding,
               ...this.#params !== void 0 ? {
-                [_chunkJKOUXDK6cjs.HEADER_CONN_PARAMS]: JSON.stringify(
+                [_chunkGXIO5YOTcjs.HEADER_CONN_PARAMS]: JSON.stringify(
                   this.#params
                 )
               } : {},
               ...isReconnection ? {
-                [_chunkJKOUXDK6cjs.HEADER_CONN_ID]: this.#connectionId,
-                [_chunkJKOUXDK6cjs.HEADER_CONN_TOKEN]: this.#connectionToken
+                [_chunkGXIO5YOTcjs.HEADER_CONN_ID]: this.#connectionId,
+                [_chunkGXIO5YOTcjs.HEADER_CONN_TOKEN]: this.#connectionToken
               } : {}
             }
           })
@@ -3277,7 +3464,7 @@ var ActorConnRaw = class {
   }
   /** Called by the onopen event from drivers. */
   #handleOnOpen() {
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "socket open",
       messageQueueLength: this.#messageQueue.length,
       connectionId: this.#connectionId
@@ -3285,14 +3472,14 @@ var ActorConnRaw = class {
     if (this.#onOpenPromise) {
       this.#onOpenPromise.resolve(void 0);
     } else {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).warn({ msg: "#onOpenPromise is undefined" });
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).warn({ msg: "#onOpenPromise is undefined" });
     }
     for (const eventName of this.#eventSubscriptions.keys()) {
       this.#sendSubscription(eventName, true);
     }
     const queue = this.#messageQueue;
     this.#messageQueue = [];
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
       msg: "flushing message queue",
       queueLength: queue.length
     });
@@ -3302,24 +3489,24 @@ var ActorConnRaw = class {
   }
   /** Called by the onmessage event from drivers. */
   async #handleOnMessage(data) {
-    _chunkLWGCMELPcjs.logger.call(void 0, ).trace({
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).trace({
       msg: "received message",
       dataType: typeof data,
       isBlob: data instanceof Blob,
       isArrayBuffer: data instanceof ArrayBuffer
     });
     const response = await this.#parseMessage(data);
-    _chunkLWGCMELPcjs.logger.call(void 0, ).trace(
-      _chunkELDFBXDVcjs.getEnvUniversal.call(void 0, "_RIVETKIT_LOG_MESSAGE") ? {
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).trace(
+      _chunkYUBR6XCJcjs.getEnvUniversal.call(void 0, "_RIVETKIT_LOG_MESSAGE") ? {
         msg: "parsed message",
-        message: _chunkJKOUXDK6cjs.jsonStringifyCompat.call(void 0, response).substring(0, 100) + "..."
+        message: _chunkGXIO5YOTcjs.jsonStringifyCompat.call(void 0, response).substring(0, 100) + "..."
       } : { msg: "parsed message" }
     );
     if (response.body.tag === "Init") {
       this.#actorId = response.body.val.actorId;
       this.#connectionId = response.body.val.connectionId;
       this.#connectionToken = response.body.val.connectionToken;
-      _chunkLWGCMELPcjs.logger.call(void 0, ).trace({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).trace({
         msg: "received init message",
         actorId: this.#actorId,
         connectionId: this.#connectionId
@@ -3329,7 +3516,7 @@ var ActorConnRaw = class {
       const { group, code, message, metadata, actionId } = response.body.val;
       if (actionId) {
         const inFlight = this.#takeActionInFlight(Number(actionId));
-        _chunkLWGCMELPcjs.logger.call(void 0, ).warn({
+        _chunkZY4DKLMTcjs.logger.call(void 0, ).warn({
           msg: "action error",
           actionId,
           actionName: inFlight == null ? void 0 : inFlight.name,
@@ -3342,7 +3529,7 @@ var ActorConnRaw = class {
           new ActorError(group, code, message, metadata)
         );
       } else {
-        _chunkLWGCMELPcjs.logger.call(void 0, ).warn({
+        _chunkZY4DKLMTcjs.logger.call(void 0, ).warn({
           msg: "connection error",
           group,
           code,
@@ -3366,35 +3553,39 @@ var ActorConnRaw = class {
       }
     } else if (response.body.tag === "ActionResponse") {
       const { id: actionId } = response.body.val;
-      _chunkLWGCMELPcjs.logger.call(void 0, ).trace({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).trace({
         msg: "received action response",
         actionId
       });
       const inFlight = this.#takeActionInFlight(Number(actionId));
-      _chunkLWGCMELPcjs.logger.call(void 0, ).trace({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).trace({
         msg: "resolving action promise",
         actionId,
         actionName: inFlight == null ? void 0 : inFlight.name
       });
       inFlight.resolve(response.body.val);
     } else if (response.body.tag === "Event") {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).trace({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).trace({
         msg: "received event",
         name: response.body.val.name
       });
       this.#dispatchEvent(response.body.val);
     } else {
-      _chunkELDFBXDVcjs.assertUnreachable.call(void 0, response.body);
+      _chunkYUBR6XCJcjs.assertUnreachable.call(void 0, response.body);
     }
   }
   /** Called by the onclose event from drivers. */
   #handleOnClose(event) {
-    if (this.#onOpenPromise) {
-      this.#onOpenPromise.reject(new Error("Closed"));
-    }
     const closeEvent = event;
     const wasClean = closeEvent.wasClean;
-    _chunkLWGCMELPcjs.logger.call(void 0, ).info({
+    if (this.#onOpenPromise) {
+      this.#onOpenPromise.reject(
+        new Error(
+          `websocket closed with code ${closeEvent.code}: ${closeEvent.reason}`
+        )
+      );
+    }
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).info({
       msg: "socket closed",
       code: closeEvent.code,
       reason: closeEvent.reason,
@@ -3404,7 +3595,7 @@ var ActorConnRaw = class {
       actionsInFlight: this.#actionsInFlight.size
     });
     if (this.#actionsInFlight.size > 0) {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
         msg: "rejecting in-flight actions after disconnect",
         count: this.#actionsInFlight.size,
         connectionId: this.#connectionId,
@@ -3420,7 +3611,7 @@ var ActorConnRaw = class {
     }
     this.#transport = void 0;
     if (!this.#disposed && !this.#connecting) {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
         msg: "triggering reconnect",
         connectionId: this.#connectionId,
         messageQueueLength: this.#messageQueue.length
@@ -3431,7 +3622,7 @@ var ActorConnRaw = class {
   /** Called by the onerror event from drivers. */
   #handleOnError() {
     if (this.#disposed) return;
-    _chunkLWGCMELPcjs.logger.call(void 0, ).warn("socket error");
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).warn("socket error");
   }
   #takeActionInFlight(id) {
     const inFlight = this.#actionsInFlight.get(id);
@@ -3461,9 +3652,9 @@ var ActorConnRaw = class {
       try {
         handler(error);
       } catch (err) {
-        _chunkLWGCMELPcjs.logger.call(void 0, ).error({
+        _chunkZY4DKLMTcjs.logger.call(void 0, ).error({
           msg: "error in connection error handler",
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, err)
         });
       }
     }
@@ -3534,11 +3725,11 @@ var ActorConnRaw = class {
     }
     let queueMessage = false;
     if (!this.#transport) {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "no transport, queueing message" });
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "no transport, queueing message" });
       queueMessage = true;
     } else if ("websocket" in this.#transport) {
       const readyState = this.#transport.websocket.readyState;
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
         msg: "websocket send attempt",
         readyState,
         readyStateString: readyState === 0 ? "CONNECTING" : readyState === 1 ? "OPEN" : readyState === 2 ? "CLOSING" : "CLOSED",
@@ -3548,18 +3739,18 @@ var ActorConnRaw = class {
       });
       if (readyState === 1) {
         try {
-          const messageSerialized = _chunkJKOUXDK6cjs.serializeWithEncoding.call(void 0, 
+          const messageSerialized = _chunkGXIO5YOTcjs.serializeWithEncoding.call(void 0, 
             this.#encoding,
             message,
-            _chunkFDJ3AVNBcjs.TO_SERVER_VERSIONED
+            _chunk5TRXLS6Xcjs.TO_SERVER_VERSIONED
           );
           this.#transport.websocket.send(messageSerialized);
-          _chunkLWGCMELPcjs.logger.call(void 0, ).trace({
+          _chunkZY4DKLMTcjs.logger.call(void 0, ).trace({
             msg: "sent websocket message",
             len: messageLength(messageSerialized)
           });
         } catch (error) {
-          _chunkLWGCMELPcjs.logger.call(void 0, ).warn({
+          _chunkZY4DKLMTcjs.logger.call(void 0, ).warn({
             msg: "failed to send message, added to queue",
             error,
             connectionId: this.#connectionId
@@ -3567,7 +3758,7 @@ var ActorConnRaw = class {
           queueMessage = true;
         }
       } else {
-        _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+        _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
           msg: "websocket not open, queueing message",
           readyState
         });
@@ -3580,11 +3771,11 @@ var ActorConnRaw = class {
         queueMessage = true;
       }
     } else {
-      _chunkELDFBXDVcjs.assertUnreachable.call(void 0, this.#transport);
+      _chunkYUBR6XCJcjs.assertUnreachable.call(void 0, this.#transport);
     }
     if (!(opts == null ? void 0 : opts.ephemeral) && queueMessage) {
       this.#messageQueue.push(message);
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
         msg: "queued connection message",
         queueLength: this.#messageQueue.length,
         connectionId: this.#connectionId,
@@ -3599,13 +3790,13 @@ var ActorConnRaw = class {
         throw new InternalError2(
           "Missing connection ID or token."
         );
-      _chunkLWGCMELPcjs.logger.call(void 0, ).trace(
-        _chunkELDFBXDVcjs.getEnvUniversal.call(void 0, "_RIVETKIT_LOG_MESSAGE") ? {
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).trace(
+        _chunkYUBR6XCJcjs.getEnvUniversal.call(void 0, "_RIVETKIT_LOG_MESSAGE") ? {
           msg: "sent http message",
-          message: `${_chunkJKOUXDK6cjs.jsonStringifyCompat.call(void 0, message).substring(0, 100)}...`
+          message: `${_chunkGXIO5YOTcjs.jsonStringifyCompat.call(void 0, message).substring(0, 100)}...`
         } : { msg: "sent http message" }
       );
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({
         msg: "sending http message",
         actorId: this.#actorId,
         connectionId: this.#connectionId
@@ -3614,9 +3805,9 @@ var ActorConnRaw = class {
         url: "http://actor/connections/message",
         method: "POST",
         headers: {
-          [_chunkJKOUXDK6cjs.HEADER_ENCODING]: this.#encoding,
-          [_chunkJKOUXDK6cjs.HEADER_CONN_ID]: this.#connectionId,
-          [_chunkJKOUXDK6cjs.HEADER_CONN_TOKEN]: this.#connectionToken
+          [_chunkGXIO5YOTcjs.HEADER_ENCODING]: this.#encoding,
+          [_chunkGXIO5YOTcjs.HEADER_CONN_ID]: this.#connectionId,
+          [_chunkGXIO5YOTcjs.HEADER_CONN_TOKEN]: this.#connectionToken
         },
         body: message,
         encoding: this.#encoding,
@@ -3625,11 +3816,11 @@ var ActorConnRaw = class {
           this.#driver,
           this.#actorId
         ),
-        requestVersionedDataHandler: _chunkFDJ3AVNBcjs.TO_SERVER_VERSIONED,
-        responseVersionedDataHandler: _chunkFDJ3AVNBcjs.TO_CLIENT_VERSIONED
+        requestVersionedDataHandler: _chunk5TRXLS6Xcjs.TO_SERVER_VERSIONED,
+        responseVersionedDataHandler: _chunk5TRXLS6Xcjs.TO_CLIENT_VERSIONED
       });
     } catch (error) {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).warn({
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).warn({
         msg: "failed to send message, added to queue",
         error
       });
@@ -3640,7 +3831,7 @@ var ActorConnRaw = class {
   }
   async #parseMessage(data) {
     _invariant2.default.call(void 0, this.#transport, "transport must be defined");
-    if (_chunkJKOUXDK6cjs.encodingIsBinary.call(void 0, this.#encoding) && "sse" in this.#transport) {
+    if (_chunkGXIO5YOTcjs.encodingIsBinary.call(void 0, this.#encoding) && "sse" in this.#transport) {
       if (typeof data === "string") {
         const binaryString = atob(data);
         data = new Uint8Array(
@@ -3652,11 +3843,11 @@ var ActorConnRaw = class {
         );
       }
     }
-    const buffer = await _chunkFDJ3AVNBcjs.inputDataToBuffer.call(void 0, data);
-    return _chunkJKOUXDK6cjs.deserializeWithEncoding.call(void 0, 
+    const buffer = await _chunk5TRXLS6Xcjs.inputDataToBuffer.call(void 0, data);
+    return _chunkGXIO5YOTcjs.deserializeWithEncoding.call(void 0, 
       this.#encoding,
       buffer,
-      _chunkFDJ3AVNBcjs.TO_CLIENT_VERSIONED
+      _chunk5TRXLS6Xcjs.TO_CLIENT_VERSIONED
     );
   }
   /**
@@ -3680,39 +3871,39 @@ var ActorConnRaw = class {
    */
   async dispose() {
     if (this.#disposed) {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).warn({ msg: "connection already disconnected" });
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).warn({ msg: "connection already disconnected" });
       return;
     }
     this.#disposed = true;
-    _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "disposing actor conn" });
+    _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "disposing actor conn" });
     clearInterval(this.#keepNodeAliveInterval);
     this.#abortController.abort();
     this.#client[ACTOR_CONNS_SYMBOL].delete(this);
     if (!this.#transport) {
     } else if ("websocket" in this.#transport) {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug("closing ws");
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug("closing ws");
       const ws = this.#transport.websocket;
       if (ws.readyState === 2 || ws.readyState === 3) {
-        _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "ws already closed or closing" });
+        _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "ws already closed or closing" });
       } else {
-        const { promise, resolve } = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+        const { promise, resolve } = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
         ws.addEventListener("close", () => {
-          _chunkLWGCMELPcjs.logger.call(void 0, ).debug({ msg: "ws closed" });
+          _chunkZY4DKLMTcjs.logger.call(void 0, ).debug({ msg: "ws closed" });
           resolve(void 0);
         });
         ws.close(1e3, "Normal closure");
         await promise;
       }
     } else if ("sse" in this.#transport) {
-      _chunkLWGCMELPcjs.logger.call(void 0, ).debug("closing sse");
+      _chunkZY4DKLMTcjs.logger.call(void 0, ).debug("closing sse");
       if (this.#connectionId && this.#connectionToken) {
         try {
           await sendHttpRequest({
             url: "http://actor/connections/close",
             method: "POST",
             headers: {
-              [_chunkJKOUXDK6cjs.HEADER_CONN_ID]: this.#connectionId,
-              [_chunkJKOUXDK6cjs.HEADER_CONN_TOKEN]: this.#connectionToken
+              [_chunkGXIO5YOTcjs.HEADER_CONN_ID]: this.#connectionId,
+              [_chunkGXIO5YOTcjs.HEADER_CONN_TOKEN]: this.#connectionToken
             },
             encoding: this.#encoding,
             skipParseResponse: true,
@@ -3720,11 +3911,11 @@ var ActorConnRaw = class {
               this.#driver,
               this.#actorId
             ),
-            requestVersionedDataHandler: _chunkFDJ3AVNBcjs.TO_SERVER_VERSIONED,
-            responseVersionedDataHandler: _chunkFDJ3AVNBcjs.TO_CLIENT_VERSIONED
+            requestVersionedDataHandler: _chunk5TRXLS6Xcjs.TO_SERVER_VERSIONED,
+            responseVersionedDataHandler: _chunk5TRXLS6Xcjs.TO_CLIENT_VERSIONED
           });
         } catch (error) {
-          _chunkLWGCMELPcjs.logger.call(void 0, ).warn({
+          _chunkZY4DKLMTcjs.logger.call(void 0, ).warn({
             msg: "failed to send close request",
             error
           });
@@ -3732,7 +3923,7 @@ var ActorConnRaw = class {
       }
       this.#transport.sse.close();
     } else {
-      _chunkELDFBXDVcjs.assertUnreachable.call(void 0, this.#transport);
+      _chunkYUBR6XCJcjs.assertUnreachable.call(void 0, this.#transport);
     }
     this.#transport = void 0;
   }
@@ -3758,7 +3949,7 @@ var ActorConnRaw = class {
 
 // src/remote-manager-driver/log.ts
 function logger2() {
-  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "remote-manager-driver");
+  return _chunk5N6F5PXDcjs.getLogger.call(void 0, "remote-manager-driver");
 }
 
 // src/remote-manager-driver/api-utils.ts
@@ -3775,7 +3966,7 @@ function getEndpoint(config) {
 }
 async function apiCall(config, method, path, body) {
   const endpoint = getEndpoint(config);
-  const url = _chunkELDFBXDVcjs.combineUrlPath.call(void 0, endpoint, path, {
+  const url = _chunkYUBR6XCJcjs.combineUrlPath.call(void 0, endpoint, path, {
     namespace: config.namespace
   });
   logger2().debug({ msg: "making api call", method, url });
@@ -3801,7 +3992,10 @@ async function apiCall(config, method, path, body) {
 async function sendHttpRequestToActor(runConfig, actorId, actorRequest) {
   const url = new URL(actorRequest.url);
   const endpoint = getEndpoint(runConfig);
-  const guardUrl = _chunkELDFBXDVcjs.combineUrlPath.call(void 0, endpoint, url.pathname + url.search);
+  const guardUrl = _chunkYUBR6XCJcjs.combineUrlPath.call(void 0, 
+    endpoint,
+    `/gateway/${actorId}${url.pathname}${url.search}`
+  );
   let bodyToSend = null;
   const guardHeaders = buildGuardHeadersForHttp(
     runConfig,
@@ -3838,19 +4032,17 @@ function buildGuardHeadersForHttp(runConfig, actorRequest, actorId) {
   for (const [key, value] of Object.entries(runConfig.headers)) {
     headers.set(key, value);
   }
-  headers.set(_chunkJKOUXDK6cjs.HEADER_RIVET_TARGET, "actor");
-  headers.set(_chunkJKOUXDK6cjs.HEADER_RIVET_ACTOR, actorId);
   if (runConfig.token) {
-    headers.set(_chunkJKOUXDK6cjs.HEADER_RIVET_TOKEN, runConfig.token);
+    headers.set(_chunkGXIO5YOTcjs.HEADER_RIVET_TOKEN, runConfig.token);
   }
   return headers;
 }
 
 // src/remote-manager-driver/actor-websocket-client.ts
 async function openWebSocketToActor(runConfig, path, actorId, encoding, params, connId, connToken) {
-  const WebSocket2 = await _chunkLWGCMELPcjs.importWebSocket.call(void 0, );
+  const WebSocket2 = await _chunkZY4DKLMTcjs.importWebSocket.call(void 0, );
   const endpoint = getEndpoint(runConfig);
-  const guardUrl = _chunkELDFBXDVcjs.combineUrlPath.call(void 0, endpoint, path);
+  const guardUrl = _chunkYUBR6XCJcjs.combineUrlPath.call(void 0, endpoint, `/gateway/${actorId}${path}`);
   logger2().debug({
     msg: "opening websocket to actor via guard",
     actorId,
@@ -3859,38 +4051,29 @@ async function openWebSocketToActor(runConfig, path, actorId, encoding, params,
   });
   const ws = new WebSocket2(
     guardUrl,
-    buildWebSocketProtocols(
-      runConfig,
-      actorId,
-      encoding,
-      params,
-      connId,
-      connToken
-    )
+    buildWebSocketProtocols(runConfig, encoding, params, connId, connToken)
   );
   ws.binaryType = "arraybuffer";
   logger2().debug({ msg: "websocket connection opened", actorId });
   return ws;
 }
-function buildWebSocketProtocols(runConfig, actorId, encoding, params, connId, connToken) {
+function buildWebSocketProtocols(runConfig, encoding, params, connId, connToken) {
   const protocols = [];
-  protocols.push(_chunkJKOUXDK6cjs.WS_PROTOCOL_STANDARD);
-  protocols.push(`${_chunkJKOUXDK6cjs.WS_PROTOCOL_TARGET}actor`);
-  protocols.push(`${_chunkJKOUXDK6cjs.WS_PROTOCOL_ACTOR}${actorId}`);
-  protocols.push(`${_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING}${encoding}`);
+  protocols.push(_chunkGXIO5YOTcjs.WS_PROTOCOL_STANDARD);
+  protocols.push(`${_chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING}${encoding}`);
   if (runConfig.token) {
-    protocols.push(`${_chunkJKOUXDK6cjs.WS_PROTOCOL_TOKEN}${runConfig.token}`);
+    protocols.push(`${_chunkGXIO5YOTcjs.WS_PROTOCOL_TOKEN}${runConfig.token}`);
   }
   if (params) {
     protocols.push(
-      `${_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS}${encodeURIComponent(JSON.stringify(params))}`
+      `${_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS}${encodeURIComponent(JSON.stringify(params))}`
     );
   }
   if (connId) {
-    protocols.push(`${_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID}${connId}`);
+    protocols.push(`${_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_ID}${connId}`);
   }
   if (connToken) {
-    protocols.push(`${_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN}${connToken}`);
+    protocols.push(`${_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_TOKEN}${connToken}`);
   }
   return protocols;
 }
@@ -3951,7 +4134,7 @@ async function updateRunnerConfig(config, runnerName, request) {
 
 // src/remote-manager-driver/ws-proxy.ts
 async function createWebSocketProxy(c, targetUrl, protocols) {
-  const WebSocket2 = await _chunkLWGCMELPcjs.importWebSocket.call(void 0, );
+  const WebSocket2 = await _chunkZY4DKLMTcjs.importWebSocket.call(void 0, );
   const state = {};
   return {
     onOpen: async (event, clientWs) => {
@@ -4014,7 +4197,7 @@ async function createWebSocketProxy(c, targetUrl, protocols) {
         logger2().error({
           msg: "target websocket error",
           targetUrl,
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
         });
         closeWebSocketIfOpen(clientWs, 1011, "Target WebSocket error");
       });
@@ -4094,7 +4277,7 @@ var RemoteManagerDriver = class {
   #config;
   #metadataPromise;
   constructor(runConfig) {
-    if (_chunkELDFBXDVcjs.getEnvUniversal.call(void 0, "NEXT_PHASE") === "phase-production-build") {
+    if (_chunkYUBR6XCJcjs.getEnvUniversal.call(void 0, "NEXT_PHASE") === "phase-production-build") {
       logger2().info(
         "detected next.js build phase, disabling health check"
       );
@@ -4137,7 +4320,7 @@ var RemoteManagerDriver = class {
         logger2().error({
           msg: "health check failed, validate the Rivet endpoint is configured correctly",
           endpoint,
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
         });
       }
     })();
@@ -4220,7 +4403,7 @@ var RemoteManagerDriver = class {
       name,
       key: serializeActorKey(key),
       runner_name_selector: this.#config.runnerName,
-      input: actorInput ? _chunkJKOUXDK6cjs.uint8ArrayToBase64.call(void 0, cbor6.encode(actorInput)) : void 0,
+      input: actorInput ? _chunkGXIO5YOTcjs.uint8ArrayToBase64.call(void 0, cbor6.encode(actorInput)) : void 0,
       crash_policy: "sleep"
     });
     const actorId = actor.actor_id;
@@ -4253,7 +4436,7 @@ var RemoteManagerDriver = class {
       name,
       runner_name_selector: this.#config.runnerName,
       key: serializeActorKey(key),
-      input: input ? _chunkJKOUXDK6cjs.uint8ArrayToBase64.call(void 0, cbor6.encode(input)) : void 0,
+      input: input ? _chunkGXIO5YOTcjs.uint8ArrayToBase64.call(void 0, cbor6.encode(input)) : void 0,
       crash_policy: "sleep"
     });
     const actorId = result.actor.actor_id;
@@ -4314,7 +4497,7 @@ var RemoteManagerDriver = class {
     const upgradeWebSocket = (_b = (_a = this.#config).getUpgradeWebSocket) == null ? void 0 : _b.call(_a);
     _invariant2.default.call(void 0, upgradeWebSocket, "missing getUpgradeWebSocket");
     const endpoint = getEndpoint(this.#config);
-    const guardUrl = _chunkELDFBXDVcjs.combineUrlPath.call(void 0, endpoint, path);
+    const guardUrl = _chunkYUBR6XCJcjs.combineUrlPath.call(void 0, endpoint, path);
     const wsGuardUrl = guardUrl.replace("http://", "ws://");
     logger2().debug({
       msg: "forwarding websocket to actor via guard",
@@ -4324,20 +4507,19 @@ var RemoteManagerDriver = class {
     });
     const protocols = buildWebSocketProtocols(
       this.#config,
-      actorId,
       encoding,
       params,
       connId,
       connToken
     );
     const args = await createWebSocketProxy(c, wsGuardUrl, protocols);
-    return await upgradeWebSocket(() => args)(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
+    return await upgradeWebSocket(() => args)(c, _chunkYUBR6XCJcjs.noopNext.call(void 0, ));
   }
   displayInformation() {
     return { name: "Remote", properties: {} };
   }
   getOrCreateInspectorAccessToken() {
-    return _chunkJKOUXDK6cjs.generateRandomString.call(void 0, );
+    return _chunkGXIO5YOTcjs.generateRandomString.call(void 0, );
   }
 };
 
@@ -4362,5 +4544,6 @@ var RemoteManagerDriver = class {
 
 
 
-exports.generateConnId = generateConnId; exports.generateConnToken = generateConnToken; exports.generateConnSocketId = generateConnSocketId; exports.createActorInspectorRouter = createActorInspectorRouter; exports.serializeActorKey = serializeActorKey; exports.deserializeActorKey = deserializeActorKey; exports.ActorDefinition = ActorDefinition; exports.lookupInRegistry = lookupInRegistry; exports.ActorClientError = ActorClientError; exports.InternalError = InternalError2; exports.ManagerError = ManagerError; exports.MalformedResponseMessage = MalformedResponseMessage; exports.ActorError = ActorError; exports.getEndpoint = getEndpoint; exports.ActorConnRaw = ActorConnRaw; exports.ActorHandleRaw = ActorHandleRaw; exports.createClientWithDriver = createClientWithDriver; exports.getDatacenters = getDatacenters; exports.updateRunnerConfig = updateRunnerConfig; exports.RemoteManagerDriver = RemoteManagerDriver;
-//# sourceMappingURL=chunk-LMJHBF26.cjs.map
+
+exports.generateConnId = generateConnId; exports.generateConnToken = generateConnToken; exports.generateConnRequestId = generateConnRequestId; exports.createActorInspectorRouter = createActorInspectorRouter; exports.serializeActorKey = serializeActorKey; exports.deserializeActorKey = deserializeActorKey; exports.PERSIST_SYMBOL = PERSIST_SYMBOL; exports.ActorDefinition = ActorDefinition; exports.lookupInRegistry = lookupInRegistry; exports.ActorClientError = ActorClientError; exports.InternalError = InternalError2; exports.ManagerError = ManagerError; exports.MalformedResponseMessage = MalformedResponseMessage; exports.ActorError = ActorError; exports.getEndpoint = getEndpoint; exports.ActorConnRaw = ActorConnRaw; exports.ActorHandleRaw = ActorHandleRaw; exports.createClientWithDriver = createClientWithDriver; exports.getDatacenters = getDatacenters; exports.updateRunnerConfig = updateRunnerConfig; exports.RemoteManagerDriver = RemoteManagerDriver;
+//# sourceMappingURL=chunk-Q5CAVEKC.cjs.map