rivetkit 2.0.21 → 2.0.22-rc.2

package/dist/tsup/{chunk-M5BHNJHB.cjs → chunk-YLWF6RFL.cjs}

@@ -4,7 +4,7 @@
 
 
 
-var _chunkZNWE3XBTcjs = require('./chunk-ZNWE3XBT.cjs');
+var _chunkZL6NSKF2cjs = require('./chunk-ZL6NSKF2.cjs');
 
 
 
@@ -17,11 +17,11 @@ var _chunkZNWE3XBTcjs = require('./chunk-ZNWE3XBT.cjs');
 
 
 
-var _chunkLMJHBF26cjs = require('./chunk-LMJHBF26.cjs');
 
+var _chunkQ5CAVEKCcjs = require('./chunk-Q5CAVEKC.cjs');
 
-var _chunk65SAIRRYcjs = require('./chunk-65SAIRRY.cjs');
 
+var _chunkUBMUBNS2cjs = require('./chunk-UBMUBNS2.cjs');
 
 
 
@@ -32,8 +32,8 @@ var _chunk65SAIRRYcjs = require('./chunk-65SAIRRY.cjs');
 
 
 
-var _chunkFDJ3AVNBcjs = require('./chunk-FDJ3AVNB.cjs');
 
+var _chunk5TRXLS6Xcjs = require('./chunk-5TRXLS6X.cjs');
 
 
 
@@ -58,13 +58,13 @@ var _chunkFDJ3AVNBcjs = require('./chunk-FDJ3AVNB.cjs');
 
 
 
-var _chunkJKOUXDK6cjs = require('./chunk-JKOUXDK6.cjs');
 
+var _chunkGXIO5YOTcjs = require('./chunk-GXIO5YOT.cjs');
 
 
 
-var _chunkHN7UXCYQcjs = require('./chunk-HN7UXCYQ.cjs');
 
+var _chunk5N6F5PXDcjs = require('./chunk-5N6F5PXD.cjs');
 
 
 
@@ -75,7 +75,11 @@ var _chunkHN7UXCYQcjs = require('./chunk-HN7UXCYQ.cjs');
 
 
 
-var _chunkELDFBXDVcjs = require('./chunk-ELDFBXDV.cjs');
+
+
+
+
+var _chunkYUBR6XCJcjs = require('./chunk-YUBR6XCJ.cjs');
 
 
 
@@ -124,7 +128,12 @@ var ActorConfigSchema = _zod.z.object({
     connectionLivenessTimeout: _zod.z.number().positive().default(2500),
     connectionLivenessInterval: _zod.z.number().positive().default(5e3),
     noSleep: _zod.z.boolean().default(false),
-    sleepTimeout: _zod.z.number().positive().default(3e4)
+    sleepTimeout: _zod.z.number().positive().default(3e4),
+    /** @experimental */
+    canHibernatWebSocket: _zod.z.union([
+      _zod.z.boolean(),
+      _zod.z.function().args(_zod.z.custom()).returns(_zod.z.boolean())
+    ]).default(false)
   }).strict().default({})
 }).strict().refine(
   (data) => !(data.state !== void 0 && data.createState !== void 0),
@@ -148,7 +157,6 @@ var ActorConfigSchema = _zod.z.object({
 
 // src/actor/router.ts
 var _hono = require('hono');
-var _cors = require('hono/cors');
 var _invariant = require('invariant'); var _invariant2 = _interopRequireDefault(_invariant);
 
 // src/actor/router-endpoints.ts
@@ -158,7 +166,7 @@ var _streaming = require('hono/streaming');
 
 // src/manager/log.ts
 function logger() {
-  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "actor-manager");
+  return _chunk5N6F5PXDcjs.getLogger.call(void 0, "actor-manager");
 }
 
 // src/manager/hono-websocket-adapter.ts
@@ -174,11 +182,19 @@ var HonoWebSocketAdapter = (_class = class {
   #eventListeners = /* @__PURE__ */ new Map();
   #closeCode;
   #closeReason;
-  constructor(ws) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);_class.prototype.__init4.call(this);
+  
+  
+  constructor(ws, rivetRequestId, isHibernatable) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);_class.prototype.__init4.call(this);
     this.#ws = ws;
+    this.rivetRequestId = rivetRequestId;
+    this.isHibernatable = isHibernatable;
     this.#readyState = this.OPEN;
     setTimeout(() => {
-      this.#fireEvent("open", { type: "open", target: this });
+      this.#fireEvent("open", {
+        type: "open",
+        target: this,
+        rivetRequestId: this.rivetRequestId
+      });
     }, 0);
   }
   get readyState() {
@@ -272,7 +288,8 @@ var HonoWebSocketAdapter = (_class = class {
         target: this,
         code,
         reason,
-        wasClean: code === 1e3
+        wasClean: code === 1e3,
+        rivetRequestId: this.rivetRequestId
       });
     } catch (error) {
       logger().error({ msg: "error closing websocket", error });
@@ -282,7 +299,8 @@ var HonoWebSocketAdapter = (_class = class {
         target: this,
         code: 1006,
         reason: "Abnormal closure",
-        wasClean: false
+        wasClean: false,
+        rivetRequestId: this.rivetRequestId
       });
     }
   }
@@ -317,12 +335,20 @@ var HonoWebSocketAdapter = (_class = class {
   // Internal method to handle incoming messages from WSContext
   _handleMessage(data) {
     let messageData;
+    let rivetRequestId;
+    let rivetMessageIndex;
     if (typeof data === "string") {
       messageData = data;
     } else if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) {
       messageData = data;
     } else if (data && typeof data === "object" && "data" in data) {
       messageData = data.data;
+      if ("rivetRequestId" in data) {
+        rivetRequestId = data.rivetRequestId;
+      }
+      if ("rivetMessageIndex" in data) {
+        rivetMessageIndex = data.rivetMessageIndex;
+      }
     } else {
       messageData = String(data);
     }
@@ -330,12 +356,15 @@ var HonoWebSocketAdapter = (_class = class {
       msg: "bridge handling message",
       dataType: typeof messageData,
       isArrayBuffer: messageData instanceof ArrayBuffer,
-      dataStr: typeof messageData === "string" ? messageData : "<binary>"
+      dataStr: typeof messageData === "string" ? messageData : "<binary>",
+      rivetMessageIndex
     });
     this.#fireEvent("message", {
       type: "message",
       target: this,
-      data: messageData
+      data: messageData,
+      rivetRequestId,
+      rivetMessageIndex
     });
   }
   // Internal method to handle close from WSContext
@@ -350,7 +379,8 @@ var HonoWebSocketAdapter = (_class = class {
       target: this,
       code,
       reason,
-      wasClean: code === 1e3
+      wasClean: code === 1e3,
+      rivetRequestId: this.rivetRequestId
     });
   }
   // Internal method to handle errors from WSContext
@@ -459,20 +489,20 @@ var HonoWebSocketAdapter = (_class = class {
 
 // src/actor/router-endpoints.ts
 var SSE_PING_INTERVAL = 1e3;
-async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, encoding, parameters, connId, connToken) {
+async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, encoding, parameters, requestId, connId, connToken) {
   const exposeInternalError = req ? getRequestExposeInternalError(req) : false;
   const {
     promise: handlersPromise,
     resolve: handlersResolve,
     reject: handlersReject
-  } = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+  } = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
   let actor2;
   try {
     actor2 = await actorDriver.loadActor(actorId);
   } catch (error) {
     return {
       onOpen: (_evt, ws) => {
-        const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
+        const { code } = _chunkYUBR6XCJcjs.deconstructError.call(void 0, 
           error,
           actor2.rLog,
           {
@@ -491,8 +521,8 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       }
     };
   }
-  const closePromise = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
-  const socketId = _chunkLMJHBF26cjs.generateConnSocketId.call(void 0, );
+  const closePromise = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
+  let createdConn;
   return {
     onOpen: (_evt, ws) => {
       actor2.rLog.debug("actor websocket open");
@@ -506,7 +536,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
           });
           conn = await actor2.createConn(
             {
-              socketId,
+              requestId,
               driverState: {
                 [0 /* WEBSOCKET */]: {
                   encoding,
@@ -520,10 +550,11 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
             connId,
             connToken
           );
+          createdConn = conn;
           handlersResolve({ conn, actor: actor2, connId: conn.id });
         } catch (error) {
           handlersReject(error);
-          const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
+          const { code } = _chunkYUBR6XCJcjs.deconstructError.call(void 0, 
             error,
             actor2.rLog,
             {
@@ -539,12 +570,12 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       handlersPromise.then(({ conn, actor: actor3 }) => {
         actor3.rLog.debug({ msg: "received message" });
         const value = evt.data.valueOf();
-        _chunkFDJ3AVNBcjs.parseMessage.call(void 0, value, {
+        _chunk5TRXLS6Xcjs.parseMessage.call(void 0, value, {
           encoding,
           maxIncomingMessageSize: runConfig.maxIncomingMessageSize
         }).then((message) => {
           actor3.processMessage(message, conn).catch((error) => {
-            const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
+            const { code } = _chunkYUBR6XCJcjs.deconstructError.call(void 0, 
               error,
               actor3.rLog,
               {
@@ -555,7 +586,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
             ws.close(1011, code);
           });
         }).catch((error) => {
-          const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
+          const { code } = _chunkYUBR6XCJcjs.deconstructError.call(void 0, 
             error,
             actor3.rLog,
             {
@@ -566,7 +597,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
           ws.close(1011, code);
         });
       }).catch((error) => {
-        const { code } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
+        const { code } = _chunkYUBR6XCJcjs.deconstructError.call(void 0, 
           error,
           actor2.rLog,
           {
@@ -596,23 +627,18 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
         });
       }
       ws.close(1e3, "hack_force_close");
-      handlersPromise.then(({ conn, actor: actor3 }) => {
-        const wasClean = event.wasClean || event.code === 1e3;
-        actor3.__connDisconnected(conn, wasClean, socketId);
-      }).catch((error) => {
-        _chunkELDFBXDVcjs.deconstructError.call(void 0, 
-          error,
-          actor2.rLog,
-          { wsEvent: "close" },
-          exposeInternalError
-        );
+      handlersPromise.finally(() => {
+        if (createdConn) {
+          const wasClean = event.wasClean || event.code === 1e3;
+          actor2.__connDisconnected(createdConn, wasClean, requestId);
+        }
       });
     },
     onError: (_error) => {
       try {
         actor2.rLog.warn({ msg: "websocket error" });
       } catch (error) {
-        _chunkELDFBXDVcjs.deconstructError.call(void 0, 
+        _chunkYUBR6XCJcjs.deconstructError.call(void 0, 
           error,
           actor2.rLog,
           { wsEvent: "error" },
@@ -626,9 +652,9 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
   c.header("Content-Encoding", "Identity");
   const encoding = getRequestEncoding(c.req);
   const parameters = getRequestConnParams(c.req);
-  const socketId = _chunkLMJHBF26cjs.generateConnSocketId.call(void 0, );
-  const connId = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_ID);
-  const connToken = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_TOKEN);
+  const requestId = _chunkQ5CAVEKCcjs.generateConnRequestId.call(void 0, );
+  const connId = c.req.header(_chunkGXIO5YOTcjs.HEADER_CONN_ID);
+  const connToken = c.req.header(_chunkGXIO5YOTcjs.HEADER_CONN_TOKEN);
   return _streaming.streamSSE.call(void 0, c, async (stream) => {
     let actor2;
     let conn;
@@ -640,7 +666,7 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
       });
       conn = await actor2.createConn(
         {
-          socketId,
+          requestId,
           driverState: {
             [1 /* SSE */]: {
               encoding,
@@ -653,16 +679,16 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
         connId,
         connToken
       );
-      const abortResolver = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+      const abortResolver = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
       stream.onAbort(() => {
       });
       c.req.raw.signal.addEventListener("abort", async () => {
         _invariant2.default.call(void 0, actor2, "actor should exist");
-        const rLog = _nullishCoalesce(actor2.rLog, () => ( _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, )));
+        const rLog = _nullishCoalesce(actor2.rLog, () => ( _chunkGXIO5YOTcjs.loggerWithoutContext.call(void 0, )));
         try {
           rLog.debug("sse stream aborted");
           if (conn) {
-            actor2.__connDisconnected(conn, false, socketId);
+            actor2.__connDisconnected(conn, false, requestId);
           }
           abortResolver.resolve(void 0);
         } catch (error) {
@@ -683,12 +709,12 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
         await stream.sleep(SSE_PING_INTERVAL);
       }
     } catch (error) {
-      _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).error({
+      _chunkGXIO5YOTcjs.loggerWithoutContext.call(void 0, ).error({
         msg: "error in sse connection",
         error
       });
       if (conn && actor2 !== void 0) {
-        actor2.__connDisconnected(conn, false, socketId);
+        actor2.__connDisconnected(conn, false, requestId);
       }
       stream.close();
     }
@@ -698,13 +724,13 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId) {
   const encoding = getRequestEncoding(c.req);
   const parameters = getRequestConnParams(c.req);
   const arrayBuffer = await c.req.arrayBuffer();
-  const request = _chunkJKOUXDK6cjs.deserializeWithEncoding.call(void 0, 
+  const request = _chunkGXIO5YOTcjs.deserializeWithEncoding.call(void 0, 
     encoding,
     new Uint8Array(arrayBuffer),
-    _chunkFDJ3AVNBcjs.HTTP_ACTION_REQUEST_VERSIONED
+    _chunk5TRXLS6Xcjs.HTTP_ACTION_REQUEST_VERSIONED
   );
   const actionArgs = cbor.decode(new Uint8Array(request.args));
-  const socketId = _chunkLMJHBF26cjs.generateConnSocketId.call(void 0, );
+  const requestId = _chunkQ5CAVEKCcjs.generateConnRequestId.call(void 0, );
   let actor2;
   let conn;
   let output;
@@ -713,38 +739,38 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId) {
     actor2.rLog.debug({ msg: "handling action", actionName, encoding });
     conn = await actor2.createConn(
       {
-        socketId,
+        requestId,
         driverState: { [2 /* HTTP */]: {} }
       },
       parameters,
       c.req.raw
     );
-    const ctx = new (0, _chunkFDJ3AVNBcjs.ActionContext)(actor2.actorContext, conn);
+    const ctx = new (0, _chunk5TRXLS6Xcjs.ActionContext)(actor2.actorContext, conn);
     output = await actor2.executeAction(ctx, actionName, actionArgs);
   } finally {
     if (conn) {
-      actor2 == null ? void 0 : actor2.__connDisconnected(conn, true, socketId);
+      actor2 == null ? void 0 : actor2.__connDisconnected(conn, true, requestId);
     }
   }
   const responseData = {
-    output: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor.encode(output))
+    output: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor.encode(output))
   };
-  const serialized = _chunkJKOUXDK6cjs.serializeWithEncoding.call(void 0, 
+  const serialized = _chunkGXIO5YOTcjs.serializeWithEncoding.call(void 0, 
     encoding,
     responseData,
-    _chunkFDJ3AVNBcjs.HTTP_ACTION_RESPONSE_VERSIONED
+    _chunk5TRXLS6Xcjs.HTTP_ACTION_RESPONSE_VERSIONED
   );
   return c.body(serialized, 200, {
-    "Content-Type": _chunkJKOUXDK6cjs.contentTypeForEncoding.call(void 0, encoding)
+    "Content-Type": _chunkGXIO5YOTcjs.contentTypeForEncoding.call(void 0, encoding)
   });
 }
 async function handleConnectionMessage(c, _runConfig, actorDriver, connId, connToken, actorId) {
   const encoding = getRequestEncoding(c.req);
   const arrayBuffer = await c.req.arrayBuffer();
-  const message = _chunkJKOUXDK6cjs.deserializeWithEncoding.call(void 0, 
+  const message = _chunkGXIO5YOTcjs.deserializeWithEncoding.call(void 0, 
     encoding,
     new Uint8Array(arrayBuffer),
-    _chunkFDJ3AVNBcjs.TO_SERVER_VERSIONED
+    _chunk5TRXLS6Xcjs.TO_SERVER_VERSIONED
   );
   const actor2 = await actorDriver.loadActor(actorId);
   const conn = actor2.conns.get(connId);
@@ -778,27 +804,30 @@ async function handleConnectionClose(c, _runConfig, actorDriver, connId, connTok
 async function handleRawWebSocketHandler(req, path4, actorDriver, actorId) {
   const actor2 = await actorDriver.loadActor(actorId);
   return {
-    onOpen: (_evt, ws) => {
-      const adapter = new HonoWebSocketAdapter(ws);
+    onOpen: (evt, ws) => {
+      const rivetRequestId = evt == null ? void 0 : evt.rivetRequestId;
+      const isHibernatable = actor2[_chunkQ5CAVEKCcjs.PERSIST_SYMBOL].hibernatableWebSocket.findIndex(
+        (ws2) => _chunkYUBR6XCJcjs.arrayBuffersEqual.call(void 0, ws2.requestId, rivetRequestId)
+      ) !== -1;
+      const adapter = new HonoWebSocketAdapter(
+        ws,
+        rivetRequestId,
+        isHibernatable
+      );
       ws.__adapter = adapter;
-      const url = new URL(path4, "http://actor");
-      const pathname = url.pathname.replace(/^\/raw\/websocket\/?/, "") || "/";
-      const normalizedPath = (pathname.startsWith("/") ? pathname : "/" + pathname) + url.search;
+      const newPath = truncateRawWebSocketPathPrefix(path4);
       let newRequest;
       if (req) {
-        newRequest = new Request(`http://actor${normalizedPath}`, req);
+        newRequest = new Request(`http://actor${newPath}`, req);
       } else {
-        newRequest = new Request(`http://actor${normalizedPath}`, {
+        newRequest = new Request(`http://actor${newPath}`, {
           method: "GET"
         });
       }
       actor2.rLog.debug({
         msg: "rewriting websocket url",
-        from: path4,
-        to: newRequest.url,
-        pathname: url.pathname,
-        search: url.search,
-        normalizedPath
+        fromPath: path4,
+        toUrl: newRequest.url
       });
       actor2.handleWebSocket(adapter, {
         request: newRequest
@@ -825,11 +854,11 @@ async function handleRawWebSocketHandler(req, path4, actorDriver, actorId) {
   };
 }
 function getRequestEncoding(req) {
-  const encodingParam = req.header(_chunkJKOUXDK6cjs.HEADER_ENCODING);
+  const encodingParam = req.header(_chunkGXIO5YOTcjs.HEADER_ENCODING);
   if (!encodingParam) {
     throw new (0, _chunkKSRXX3Z4cjs.InvalidEncoding)("undefined");
   }
-  const result = _chunkJKOUXDK6cjs.EncodingSchema.safeParse(encodingParam);
+  const result = _chunkGXIO5YOTcjs.EncodingSchema.safeParse(encodingParam);
   if (!result.success) {
     throw new (0, _chunkKSRXX3Z4cjs.InvalidEncoding)(encodingParam);
   }
@@ -839,7 +868,7 @@ function getRequestExposeInternalError(_req) {
   return false;
 }
 function getRequestConnParams(req) {
-  const paramsParam = req.header(_chunkJKOUXDK6cjs.HEADER_CONN_PARAMS);
+  const paramsParam = req.header(_chunkGXIO5YOTcjs.HEADER_CONN_PARAMS);
   if (!paramsParam) {
     return null;
   }
@@ -847,10 +876,16 @@ function getRequestConnParams(req) {
     return JSON.parse(paramsParam);
   } catch (err) {
     throw new (0, _chunkKSRXX3Z4cjs.InvalidParams)(
-      `Invalid params JSON: ${_chunkELDFBXDVcjs.stringifyError.call(void 0, err)}`
+      `Invalid params JSON: ${_chunkYUBR6XCJcjs.stringifyError.call(void 0, err)}`
     );
   }
 }
+function truncateRawWebSocketPathPrefix(path4) {
+  const url = new URL(path4, "http://actor");
+  const pathname = url.pathname.replace(/^\/raw\/websocket\/?/, "") || "/";
+  const normalizedPath = (pathname.startsWith("/") ? pathname : "/" + pathname) + url.search;
+  return normalizedPath;
+}
 
 // src/common/router.ts
 
@@ -881,7 +916,7 @@ function buildActorNames(registryConfig) {
 
 // src/common/router.ts
 function logger2() {
-  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "router");
+  return _chunk5N6F5PXDcjs.getLogger.call(void 0, "router");
 }
 function loggerMiddleware(logger8) {
   return async (c, next) => {
@@ -899,7 +934,7 @@ function loggerMiddleware(logger8) {
       reqSize: c.req.header("content-length"),
       resSize: c.res.headers.get("content-length"),
       userAgent: c.req.header("user-agent"),
-      ..._chunkELDFBXDVcjs.getEnvUniversal.call(void 0, "_RIVET_LOG_HEADERS") ? { allHeaders: JSON.stringify(c.req.header()) } : {}
+      ..._chunkYUBR6XCJcjs.getEnvUniversal.call(void 0, "_RIVET_LOG_HEADERS") ? { allHeaders: JSON.stringify(c.req.header()) } : {}
     });
   };
 }
@@ -908,7 +943,7 @@ function handleRouteNotFound(c) {
 }
 function handleRouteError(error, c) {
   const exposeInternalError = getRequestExposeInternalError(c.req.raw);
-  const { statusCode, group, code, message, metadata } = _chunkELDFBXDVcjs.deconstructError.call(void 0, 
+  const { statusCode, group, code, message, metadata } = _chunkYUBR6XCJcjs.deconstructError.call(void 0, 
     error,
     logger2(),
     {
@@ -923,29 +958,29 @@ function handleRouteError(error, c) {
   } catch (_) {
     encoding = "json";
   }
-  const output = _chunkJKOUXDK6cjs.serializeWithEncoding.call(void 0, 
+  const output = _chunkGXIO5YOTcjs.serializeWithEncoding.call(void 0, 
     encoding,
     {
       group,
       code,
       message,
       // TODO: Cannot serialize non-binary meta since it requires ArrayBuffer atm
-      metadata: _chunkJKOUXDK6cjs.encodingIsBinary.call(void 0, encoding) ? _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(metadata)) : null
+      metadata: _chunkGXIO5YOTcjs.encodingIsBinary.call(void 0, encoding) ? _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(metadata)) : null
     },
-    _chunkFDJ3AVNBcjs.HTTP_RESPONSE_ERROR_VERSIONED
+    _chunk5TRXLS6Xcjs.HTTP_RESPONSE_ERROR_VERSIONED
   );
   return c.body(output, { status: statusCode });
 }
 function handleMetadataRequest(c, registryConfig, runConfig) {
   const response = {
     runtime: "rivetkit",
-    version: _chunkELDFBXDVcjs.VERSION,
+    version: _chunkYUBR6XCJcjs.VERSION,
     runner: {
       kind: runConfig.runnerKind === "serverless" ? { serverless: {} } : { normal: {} }
     },
     actorNames: buildActorNames(registryConfig),
     // Do not return client endpoint if default server disabled
-    clientEndpoint: _nullishCoalesce(runConfig.overrideServerAddress, () => ( (runConfig.disableDefaultServer ? void 0 : _chunkLMJHBF26cjs.getEndpoint.call(void 0, runConfig))))
+    clientEndpoint: _nullishCoalesce(runConfig.overrideServerAddress, () => ( (runConfig.disableDefaultServer ? void 0 : _chunkQ5CAVEKCcjs.getEndpoint.call(void 0, runConfig))))
   };
   return c.json(response);
 }
@@ -953,7 +988,7 @@ function handleHealthRequest(c) {
   return c.json({
     status: "ok",
     runtime: "rivetkit",
-    version: _chunkELDFBXDVcjs.VERSION
+    version: _chunkYUBR6XCJcjs.VERSION
   });
 }
 
@@ -962,7 +997,16 @@ function createActorRouter(runConfig, actorDriver, isTest) {
   const router = new (0, _hono.Hono)({
     strict: false
   });
-  router.use("*", loggerMiddleware(_chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, )));
+  router.use("*", loggerMiddleware(_chunkGXIO5YOTcjs.loggerWithoutContext.call(void 0, )));
+  router.use("*", async (c, next) => {
+    const actor2 = await actorDriver.loadActor(c.env.actorId);
+    actor2.__beginHonoHttpRequest();
+    try {
+      await next();
+    } finally {
+      actor2.__endHonoHttpRequest();
+    }
+  });
   router.get("/", (c) => {
     return c.text(
       "This is an RivetKit actor.\n\nLearn more at https://rivetkit.org"
@@ -993,7 +1037,7 @@ function createActorRouter(runConfig, actorDriver, isTest) {
       return c.json({ success: true });
     });
   }
-  router.get(_chunkJKOUXDK6cjs.PATH_CONNECT_WEBSOCKET, async (c) => {
+  router.get(_chunkGXIO5YOTcjs.PATH_CONNECT_WEBSOCKET, async (c) => {
     var _a;
     const upgradeWebSocket = (_a = runConfig.getUpgradeWebSocket) == null ? void 0 : _a.call(runConfig);
     if (upgradeWebSocket) {
@@ -1006,28 +1050,28 @@ function createActorRouter(runConfig, actorDriver, isTest) {
         if (protocols) {
           const protocolList = protocols.split(",").map((p) => p.trim());
           for (const protocol of protocolList) {
-            if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
+            if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING)) {
               encodingRaw = protocol.substring(
-                _chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length
+                _chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING.length
               );
-            } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
+            } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS)) {
               connParamsRaw = decodeURIComponent(
                 protocol.substring(
-                  _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length
+                  _chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS.length
                 )
               );
-            } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID)) {
+            } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_ID)) {
               connIdRaw = protocol.substring(
-                _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID.length
+                _chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_ID.length
               );
-            } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN)) {
+            } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_TOKEN)) {
               connTokenRaw = protocol.substring(
-                _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN.length
+                _chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_TOKEN.length
               );
             }
           }
         }
-        const encoding = _chunkJKOUXDK6cjs.EncodingSchema.parse(encodingRaw);
+        const encoding = _chunkGXIO5YOTcjs.EncodingSchema.parse(encodingRaw);
         const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
         return await handleWebSocketConnect(
           c2.req.raw,
@@ -1036,10 +1080,11 @@ function createActorRouter(runConfig, actorDriver, isTest) {
           c2.env.actorId,
           encoding,
           connParams,
+          _chunkQ5CAVEKCcjs.generateConnRequestId.call(void 0, ),
           connIdRaw,
           connTokenRaw
         );
-      })(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
+      })(c, _chunkYUBR6XCJcjs.noopNext.call(void 0, ));
     } else {
       return c.text(
         "WebSockets are not enabled for this driver. Use SSE instead.",
@@ -1061,8 +1106,8 @@ function createActorRouter(runConfig, actorDriver, isTest) {
     );
   });
   router.post("/connections/message", async (c) => {
-    const connId = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_ID);
-    const connToken = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_TOKEN);
+    const connId = c.req.header(_chunkGXIO5YOTcjs.HEADER_CONN_ID);
+    const connToken = c.req.header(_chunkGXIO5YOTcjs.HEADER_CONN_TOKEN);
     if (!connId || !connToken) {
       throw new Error("Missing required parameters");
     }
@@ -1076,8 +1121,8 @@ function createActorRouter(runConfig, actorDriver, isTest) {
     );
   });
   router.post("/connections/close", async (c) => {
-    const connId = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_ID);
-    const connToken = c.req.header(_chunkJKOUXDK6cjs.HEADER_CONN_TOKEN);
+    const connId = c.req.header(_chunkGXIO5YOTcjs.HEADER_CONN_ID);
+    const connToken = c.req.header(_chunkGXIO5YOTcjs.HEADER_CONN_TOKEN);
     if (!connId || !connToken) {
       throw new Error("Missing required parameters");
     }
@@ -1101,7 +1146,7 @@ function createActorRouter(runConfig, actorDriver, isTest) {
       body: c.req.raw.body,
       duplex: "half"
     });
-    _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).debug({
+    _chunkGXIO5YOTcjs.loggerWithoutContext.call(void 0, ).debug({
       msg: "rewriting http url",
       from: c.req.url,
       to: correctedRequest.url
@@ -1112,14 +1157,14 @@ function createActorRouter(runConfig, actorDriver, isTest) {
     }
     return response;
   });
-  router.get(`${_chunkJKOUXDK6cjs.PATH_RAW_WEBSOCKET_PREFIX}*`, async (c) => {
+  router.get(`${_chunkGXIO5YOTcjs.PATH_RAW_WEBSOCKET_PREFIX}*`, async (c) => {
     var _a;
     const upgradeWebSocket = (_a = runConfig.getUpgradeWebSocket) == null ? void 0 : _a.call(runConfig);
     if (upgradeWebSocket) {
       return upgradeWebSocket(async (c2) => {
         const url = new URL(c2.req.url);
         const pathWithQuery = c2.req.path + url.search;
-        _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).debug({
+        _chunkGXIO5YOTcjs.loggerWithoutContext.call(void 0, ).debug({
           msg: "actor router raw websocket",
           path: c2.req.path,
           url: c2.req.url,
@@ -1132,7 +1177,7 @@ function createActorRouter(runConfig, actorDriver, isTest) {
           actorDriver,
           c2.env.actorId
         );
-      })(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
+      })(c, _chunkYUBR6XCJcjs.noopNext.call(void 0, ));
     } else {
       return c.text(
         "WebSockets are not enabled for this driver. Use SSE instead.",
@@ -1140,22 +1185,18 @@ function createActorRouter(runConfig, actorDriver, isTest) {
       );
     }
   });
-  if (_chunkZNWE3XBTcjs.isInspectorEnabled.call(void 0, runConfig, "actor")) {
+  if (_chunkZL6NSKF2cjs.isInspectorEnabled.call(void 0, runConfig, "actor")) {
     router.route(
       "/inspect",
-      new (0, _hono.Hono)().use(
-        _cors.cors.call(void 0, runConfig.inspector.cors),
-        _chunkZNWE3XBTcjs.secureInspector.call(void 0, runConfig),
-        async (c, next) => {
-          const inspector = (await actorDriver.loadActor(c.env.actorId)).inspector;
-          _invariant2.default.call(void 0, 
-            inspector,
-            "inspector not supported on this platform"
-          );
-          c.set("inspector", inspector);
-          return next();
-        }
-      ).route("/", _chunkLMJHBF26cjs.createActorInspectorRouter.call(void 0, ))
+      new (0, _hono.Hono)().use(_chunkZL6NSKF2cjs.secureInspector.call(void 0, runConfig), async (c, next) => {
+        const inspector = (await actorDriver.loadActor(c.env.actorId)).inspector;
+        _invariant2.default.call(void 0, 
+          inspector,
+          "inspector not supported on this platform"
+        );
+        c.set("inspector", inspector);
+        return next();
+      }).route("/", _chunkQ5CAVEKCcjs.createActorInspectorRouter.call(void 0, ))
     );
   }
   router.notFound(handleRouteNotFound);
@@ -1166,13 +1207,13 @@ function createActorRouter(runConfig, actorDriver, isTest) {
 // src/actor/mod.ts
 function actor(input) {
   const config2 = ActorConfigSchema.parse(input);
-  return new (0, _chunkLMJHBF26cjs.ActorDefinition)(config2);
+  return new (0, _chunkQ5CAVEKCcjs.ActorDefinition)(config2);
 }
 
 // src/common/inline-websocket-adapter2.ts
 var _ws2 = require('hono/ws');
 function logger3() {
-  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "fake-event-source2");
+  return _chunk5N6F5PXDcjs.getLogger.call(void 0, "fake-event-source2");
 }
 var InlineWebSocketAdapter2 = (_class2 = class {
   // WebSocket readyState values
@@ -1535,10 +1576,11 @@ var KEYS = {
 
 // src/drivers/engine/log.ts
 function logger4() {
-  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "driver-engine");
+  return _chunk5N6F5PXDcjs.getLogger.call(void 0, "driver-engine");
 }
 
 // src/drivers/engine/actor-driver.ts
+var RUNNER_SSE_PING_INTERVAL = 1e3;
 var EngineActorDriver = class {
   #registryConfig;
   #runConfig;
@@ -1550,14 +1592,18 @@ var EngineActorDriver = class {
   #version = 1;
   // Version for the runner protocol
   #alarmTimeout;
-  #runnerStarted = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
-  #runnerStopped = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+  #runnerStarted = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
+  #runnerStopped = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
+  #isRunnerStopped = false;
+  // WebSocket message acknowledgment debouncing
+  #wsAckQueue = /* @__PURE__ */ new Map();
+  #wsAckFlushInterval;
   constructor(registryConfig, runConfig, managerDriver, inlineClient) {
     this.#registryConfig = registryConfig;
     this.#runConfig = runConfig;
     this.#managerDriver = managerDriver;
     this.#inlineClient = inlineClient;
-    const token = _nullishCoalesce(runConfig.token, () => ( runConfig.token));
+    const token = runConfig.token;
     if (token && runConfig.inspector && runConfig.inspector.enabled) {
       runConfig.inspector.token = () => token;
     }
@@ -1569,12 +1615,12 @@ var EngineActorDriver = class {
     let hasDisconnected = false;
     const engineRunnerConfig = {
       version: this.#version,
-      endpoint: _chunkLMJHBF26cjs.getEndpoint.call(void 0, runConfig),
+      endpoint: _chunkQ5CAVEKCcjs.getEndpoint.call(void 0, runConfig),
       token,
-      namespace: _nullishCoalesce(runConfig.namespace, () => ( runConfig.namespace)),
-      totalSlots: _nullishCoalesce(runConfig.totalSlots, () => ( runConfig.totalSlots)),
-      runnerName: _nullishCoalesce(runConfig.runnerName, () => ( runConfig.runnerName)),
-      runnerKey: runConfig.runnerKey,
+      namespace: runConfig.namespace,
+      totalSlots: runConfig.totalSlots,
+      runnerName: runConfig.runnerName,
+      runnerKey: _nullishCoalesce(runConfig.runnerKey, () => ( crypto.randomUUID())),
       metadata: {
         inspectorToken: this.#runConfig.inspector.token()
       },
@@ -1595,22 +1641,126 @@ var EngineActorDriver = class {
         }
         this.#runnerStarted.resolve(void 0);
       },
-      onDisconnected: () => {
+      onDisconnected: (code, reason) => {
         logger4().warn({
           msg: "runner disconnected",
           namespace: this.#runConfig.namespace,
-          runnerName: this.#runConfig.runnerName
+          runnerName: this.#runConfig.runnerName,
+          code,
+          reason
         });
         hasDisconnected = true;
       },
       onShutdown: () => {
         this.#runnerStopped.resolve(void 0);
+        this.#isRunnerStopped = true;
       },
       fetch: this.#runnerFetch.bind(this),
       websocket: this.#runnerWebSocket.bind(this),
       onActorStart: this.#runnerOnActorStart.bind(this),
       onActorStop: this.#runnerOnActorStop.bind(this),
-      logger: _chunkHN7UXCYQcjs.getLogger.call(void 0, "engine-runner")
+      logger: _chunk5N6F5PXDcjs.getLogger.call(void 0, "engine-runner"),
+      getActorHibernationConfig: (actorId, requestId, request) => {
+        var _a;
+        const url = new URL(request.url);
+        const path4 = url.pathname;
+        const actorInstance = this.#runner.getActor(actorId);
+        if (!actorInstance) {
+          logger4().warn({
+            msg: "actor not found in getActorHibernationConfig",
+            actorId
+          });
+          return { enabled: false, lastMsgIndex: void 0 };
+        }
+        const handler = this.#actors.get(actorId);
+        if (!handler) {
+          logger4().warn({
+            msg: "actor handler not found in getActorHibernationConfig",
+            actorId
+          });
+          return { enabled: false, lastMsgIndex: void 0 };
+        }
+        if (!handler.actor) {
+          logger4().warn({
+            msg: "actor not found in getActorHibernationConfig",
+            actorId
+          });
+          return { enabled: false, lastMsgIndex: void 0 };
+        }
+        const existingWs = handler.actor[_chunkQ5CAVEKCcjs.PERSIST_SYMBOL].hibernatableWebSocket.find(
+          (ws) => _chunkYUBR6XCJcjs.arrayBuffersEqual.call(void 0, ws.requestId, requestId)
+        );
+        let hibernationConfig;
+        if (existingWs) {
+          hibernationConfig = {
+            enabled: true,
+            lastMsgIndex: Number(existingWs.msgIndex)
+          };
+        } else {
+          if (path4 === _chunkGXIO5YOTcjs.PATH_CONNECT_WEBSOCKET) {
+            hibernationConfig = {
+              enabled: true,
+              lastMsgIndex: void 0
+            };
+          } else if (path4.startsWith(_chunkGXIO5YOTcjs.PATH_RAW_WEBSOCKET_PREFIX)) {
+            const definition = _chunkQ5CAVEKCcjs.lookupInRegistry.call(void 0, 
+              this.#registryConfig,
+              actorInstance.config.name
+            );
+            const canHibernatWebSocket = (_a = definition.config.options) == null ? void 0 : _a.canHibernatWebSocket;
+            if (canHibernatWebSocket === true) {
+              hibernationConfig = {
+                enabled: true,
+                lastMsgIndex: void 0
+              };
+            } else if (typeof canHibernatWebSocket === "function") {
+              try {
+                const newPath = truncateRawWebSocketPathPrefix(
+                  url.pathname
+                );
+                const truncatedRequest = new Request(
+                  `http://actor${newPath}`,
+                  request
+                );
+                const canHibernate = canHibernatWebSocket(truncatedRequest);
+                hibernationConfig = {
+                  enabled: canHibernate,
+                  lastMsgIndex: void 0
+                };
+              } catch (error) {
+                logger4().error({
+                  msg: "error calling canHibernatWebSocket",
+                  error
+                });
+                hibernationConfig = {
+                  enabled: false,
+                  lastMsgIndex: void 0
+                };
+              }
+            } else {
+              hibernationConfig = {
+                enabled: false,
+                lastMsgIndex: void 0
+              };
+            }
+          } else {
+            logger4().warn({
+              msg: "unexpected path for getActorHibernationConfig",
+              path: path4
+            });
+            hibernationConfig = {
+              enabled: false,
+              lastMsgIndex: void 0
+            };
+          }
+        }
+        handler.actor[_chunkQ5CAVEKCcjs.PERSIST_SYMBOL].hibernatableWebSocket.push({
+          requestId,
+          lastSeenTimestamp: BigInt(Date.now()),
+          msgIndex: -1n
+        });
+        return hibernationConfig;
+      }
     };
     this.#runner = new (0, _enginerunner.Runner)(engineRunnerConfig);
     this.#runner.start();
@@ -1620,6 +1770,7 @@ var EngineActorDriver = class {
       namespace: runConfig.namespace,
       runnerName: runConfig.runnerName
     });
+    this.#wsAckFlushInterval = setInterval(() => this.#flushWsAcks(), 1e3);
   }
   async #loadActorHandler(actorId) {
     const handler = this.#actors.get(actorId);
@@ -1634,6 +1785,16 @@ var EngineActorDriver = class {
     if (!handler.actor) throw new Error(`Actor ${actorId} failed to load`);
     return handler.actor;
   }
+  #flushWsAcks() {
+    if (this.#wsAckQueue.size === 0) return;
+    for (const {
+      requestIdBuf: requestId,
+      messageIndex: index
+    } of this.#wsAckQueue.values()) {
+      this.#runner.sendWebsocketMessageAck(requestId, index);
+    }
+    this.#wsAckQueue.clear();
+  }
   getContext(actorId) {
     return {};
   }
@@ -1654,7 +1815,7 @@ var EngineActorDriver = class {
       this.#alarmTimeout = void 0;
     }
     const delay = Math.max(0, timestamp - Date.now());
-    this.#alarmTimeout = _chunkELDFBXDVcjs.setLongTimeout.call(void 0, () => {
+    this.#alarmTimeout = _chunkYUBR6XCJcjs.setLongTimeout.call(void 0, () => {
       actor2._onAlarm();
       this.#alarmTimeout = void 0;
     }, delay);
@@ -1680,19 +1841,19 @@ var EngineActorDriver = class {
     let handler = this.#actors.get(actorId);
     if (!handler) {
       handler = {
-        actorStartPromise: _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, ),
+        actorStartPromise: _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, ),
         persistedData: void 0
       };
       this.#actors.set(actorId, handler);
       const [persistedValue] = await this.#runner.kvGet(actorId, [
         KEYS.PERSIST_DATA
       ]);
-      handler.persistedData = persistedValue !== null ? persistedValue : _chunkFDJ3AVNBcjs.serializeEmptyPersistData.call(void 0, input);
+      handler.persistedData = persistedValue !== null ? persistedValue : _chunk5TRXLS6Xcjs.serializeEmptyPersistData.call(void 0, input);
     }
     const name = actorConfig.name;
     _invariant2.default.call(void 0, actorConfig.key, "actor should have a key");
-    const key = _chunkLMJHBF26cjs.deserializeActorKey.call(void 0, actorConfig.key);
-    const definition = _chunkLMJHBF26cjs.lookupInRegistry.call(void 0, 
+    const key = _chunkQ5CAVEKCcjs.deserializeActorKey.call(void 0, actorConfig.key);
+    const definition = _chunkQ5CAVEKCcjs.lookupInRegistry.call(void 0, 
       this.#registryConfig,
       actorConfig.name
     );
@@ -1714,12 +1875,19 @@ var EngineActorDriver = class {
     logger4().debug({ msg: "runner actor stopping", actorId, generation });
     const handler = this.#actors.get(actorId);
     if (handler == null ? void 0 : handler.actor) {
-      await handler.actor._stop();
+      try {
+        await handler.actor._onStop();
+      } catch (err) {
+        logger4().error({
+          msg: "error in _onStop, proceeding with removing actor",
+          err: _chunkYUBR6XCJcjs.stringifyError.call(void 0, err)
+        });
+      }
       this.#actors.delete(actorId);
     }
     logger4().debug({ msg: "runner actor stopped", actorId });
   }
-  async #runnerFetch(runner, actorId, request) {
+  async #runnerFetch(_runner, actorId, _requestIdBuf, request) {
     logger4().debug({
       msg: "runner fetch",
       actorId,
@@ -1728,8 +1896,9 @@ var EngineActorDriver = class {
     });
     return await this.#actorRouter.fetch(request, { actorId });
   }
-  async #runnerWebSocket(runner, actorId, websocketRaw, request) {
+  async #runnerWebSocket(_runner, actorId, websocketRaw, requestIdBuf, request) {
     const websocket = websocketRaw;
+    const requestId = _chunkYUBR6XCJcjs.idToStr.call(void 0, requestIdBuf);
     logger4().debug({ msg: "runner websocket", actorId, url: request.url });
     const url = new URL(request.url);
     const protocols = request.headers.get("sec-websocket-protocol");
@@ -1738,21 +1907,21 @@ var EngineActorDriver = class {
     if (protocols) {
       const protocolList = protocols.split(",").map((p) => p.trim());
       for (const protocol of protocolList) {
-        if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
+        if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING)) {
           encodingRaw = protocol.substring(
-            _chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length
+            _chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING.length
           );
-        } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
+        } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS)) {
           connParamsRaw = decodeURIComponent(
-            protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length)
+            protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS.length)
           );
         }
       }
     }
-    const encoding = _chunkJKOUXDK6cjs.EncodingSchema.parse(encodingRaw);
+    const encoding = _chunkGXIO5YOTcjs.EncodingSchema.parse(encodingRaw);
     const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
     let wsHandlerPromise;
-    if (url.pathname === _chunkJKOUXDK6cjs.PATH_CONNECT_WEBSOCKET) {
+    if (url.pathname === _chunkGXIO5YOTcjs.PATH_CONNECT_WEBSOCKET) {
       wsHandlerPromise = handleWebSocketConnect(
         request,
         this.#runConfig,
@@ -1760,11 +1929,12 @@ var EngineActorDriver = class {
         actorId,
         encoding,
         connParams,
+        requestId,
         // Extract connId and connToken from protocols if needed
         void 0,
         void 0
       );
-    } else if (url.pathname.startsWith(_chunkJKOUXDK6cjs.PATH_RAW_WEBSOCKET_PREFIX)) {
+    } else if (url.pathname.startsWith(_chunkGXIO5YOTcjs.PATH_RAW_WEBSOCKET_PREFIX)) {
       wsHandlerPromise = handleRawWebSocketHandler(
         request,
         url.pathname + url.search,
@@ -1799,8 +1969,29 @@ var EngineActorDriver = class {
         var _a;
         return (_a = x.onMessage) == null ? void 0 : _a.call(x, event, wsContext);
       });
+      _invariant2.default.call(void 0, event.rivetRequestId, "missing rivetRequestId");
+      _invariant2.default.call(void 0, event.rivetMessageIndex, "missing rivetMessageIndex");
+      const currentEntry = this.#wsAckQueue.get(requestId);
+      if (currentEntry) {
+        if (event.rivetMessageIndex > currentEntry.messageIndex) {
+          currentEntry.messageIndex = event.rivetMessageIndex;
+        } else {
+          logger4().warn({
+            msg: "received lower index than ack queue for message",
+            requestId,
+            queuedMessageIndex: currentEntry,
+            eventMessageIndex: event.rivetMessageIndex
+          });
+        }
+      } else {
+        this.#wsAckQueue.set(requestId, {
+          requestIdBuf,
+          messageIndex: event.rivetMessageIndex
+        });
+      }
     });
     websocket.addEventListener("close", (event) => {
+      this.#flushWsAcks();
       wsHandlerPromise.then((x) => {
         var _a;
         return (_a = x.onClose) == null ? void 0 : _a.call(x, event, wsContext);
@@ -1813,11 +2004,16 @@ var EngineActorDriver = class {
       });
     });
   }
-  async sleep(actorId) {
+  startSleep(actorId) {
     this.#runner.sleepActor(actorId);
   }
-  async shutdown(immediate) {
+  async shutdownRunner(immediate) {
     logger4().info({ msg: "stopping engine actor driver" });
+    if (this.#wsAckFlushInterval) {
+      clearInterval(this.#wsAckFlushInterval);
+      this.#wsAckFlushInterval = void 0;
+    }
+    this.#flushWsAcks();
     await this.#runner.shutdown(immediate);
   }
   async serverlessHandleStart(c) {
@@ -1826,15 +2022,36 @@ var EngineActorDriver = class {
       });
       c.req.raw.signal.addEventListener("abort", () => {
         logger4().debug("SSE aborted, shutting down runner");
-        this.shutdown(true);
+        this.shutdownRunner(false);
       });
       await this.#runnerStarted.promise;
       const payload = this.#runner.getServerlessInitPacket();
       _invariant2.default.call(void 0, payload, "runnerId not set");
       await stream.writeSSE({ data: payload });
+      while (true) {
+        if (this.#isRunnerStopped) {
+          logger4().debug({
+            msg: "runner is stopped"
+          });
+          break;
+        }
+        if (stream.closed || stream.aborted) {
+          logger4().debug({
+            msg: "runner sse stream closed",
+            closed: stream.closed,
+            aborted: stream.aborted
+          });
+          break;
+        }
+        await stream.writeSSE({ event: "ping", data: "" });
+        await stream.sleep(RUNNER_SSE_PING_INTERVAL);
+      }
       await this.#runnerStopped.promise;
     });
   }
+  getExtraActorLogParams() {
+    return { runnerId: _nullishCoalesce(this.#runner.runnerId, () => ( "-")) };
+  }
 };
 
 // src/drivers/engine/mod.ts
@@ -1842,7 +2059,7 @@ function createEngineDriver() {
   return {
     name: "engine",
     manager: (_registryConfig, runConfig) => {
-      return new (0, _chunkLMJHBF26cjs.RemoteManagerDriver)(runConfig);
+      return new (0, _chunkQ5CAVEKCcjs.RemoteManagerDriver)(runConfig);
     },
     actor: (registryConfig, runConfig, managerDriver, inlineClient) => {
       return new EngineActorDriver(
@@ -1896,7 +2113,7 @@ var FileSystemActorDriver = class {
     const state = await this.#state.loadActorStateOrError(actorId);
     await this.#state.writeActor(actorId, {
       ...state,
-      persistedData: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, data)
+      persistedData: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, data)
     });
   }
   async setAlarm(actor2, timestamp) {
@@ -1905,8 +2122,8 @@ var FileSystemActorDriver = class {
   getDatabase(actorId) {
     return this.#state.createDatabase(actorId);
   }
-  sleep(actorId) {
-    return this.#state.sleepActor(actorId);
+  startSleep(actorId) {
+    this.#state.sleepActor(actorId);
   }
 };
 
@@ -1999,13 +2216,13 @@ function decodeActorAlarm(bytes) {
 // src/schemas/file-system-driver/versioned.ts
 var CURRENT_VERSION = 1;
 var migrations = /* @__PURE__ */ new Map();
-var ACTOR_STATE_VERSIONED = _chunkFDJ3AVNBcjs.createVersionedDataHandler.call(void 0, {
+var ACTOR_STATE_VERSIONED = _chunk5TRXLS6Xcjs.createVersionedDataHandler.call(void 0, {
   currentVersion: CURRENT_VERSION,
   migrations,
   serializeVersion: (data) => encodeActorState(data),
   deserializeVersion: (bytes) => decodeActorState(bytes)
 });
-var ACTOR_ALARM_VERSIONED = _chunkFDJ3AVNBcjs.createVersionedDataHandler.call(void 0, {
+var ACTOR_ALARM_VERSIONED = _chunk5TRXLS6Xcjs.createVersionedDataHandler.call(void 0, {
   currentVersion: CURRENT_VERSION,
   migrations,
   serializeVersion: (data) => encodeActorAlarm(data),
@@ -2014,7 +2231,7 @@ var ACTOR_ALARM_VERSIONED = _chunkFDJ3AVNBcjs.createVersionedDataHandler.call(vo
 
 // src/drivers/file-system/log.ts
 function logger5() {
-  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "driver-fs");
+  return _chunk5N6F5PXDcjs.getLogger.call(void 0, "driver-fs");
 }
 
 // src/drivers/file-system/utils.ts
@@ -2044,7 +2261,7 @@ async function pathExists(path4) {
   try {
     await fs.access(path4);
     return true;
-  } catch (e) {
+  } catch (e2) {
     return false;
   }
 }
@@ -2196,8 +2413,8 @@ var FileSystemGlobalState = class {
       name,
       key,
       createdAt: BigInt(Date.now()),
-      persistedData: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, 
-        _chunkFDJ3AVNBcjs.serializeEmptyPersistData.call(void 0, input)
+      persistedData: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, 
+        _chunk5TRXLS6Xcjs.serializeEmptyPersistData.call(void 0, input)
       )
     };
     await this.writeActor(actorId, entry.state);
@@ -2248,8 +2465,8 @@ var FileSystemGlobalState = class {
         name,
         key,
         createdAt: BigInt(Date.now()),
-        persistedData: _chunkELDFBXDVcjs.bufferToArrayBuffer.call(void 0, 
-          _chunkFDJ3AVNBcjs.serializeEmptyPersistData.call(void 0, input)
+        persistedData: _chunkYUBR6XCJcjs.bufferToArrayBuffer.call(void 0, 
+          _chunk5TRXLS6Xcjs.serializeEmptyPersistData.call(void 0, input)
         )
       };
       await this.writeActor(actorId, entry.state);
@@ -2269,7 +2486,7 @@ var FileSystemGlobalState = class {
       await actor2.startPromise.promise.catch();
     actor2.removed = true;
     _invariant2.default.call(void 0, actor2.actor, "actor should be loaded");
-    await actor2.actor._stop();
+    await actor2.actor._onStop();
     this.#actors.delete(actorId);
   }
   /**
@@ -2303,7 +2520,7 @@ var FileSystemGlobalState = class {
       } catch (error) {
         try {
           await fs2.unlink(tempPath);
-        } catch (e2) {
+        } catch (e3) {
         }
         logger5().error({
           msg: "failed to write alarm",
@@ -2336,7 +2553,7 @@ var FileSystemGlobalState = class {
     } catch (error) {
       try {
         await fs2.unlink(tempPath);
-      } catch (e3) {
+      } catch (e4) {
       }
       logger5().error({
         msg: "failed to save actor state",
@@ -2388,9 +2605,9 @@ var FileSystemGlobalState = class {
     if (entry.actor) {
       return entry.actor;
     }
-    entry.startPromise = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+    entry.startPromise = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
     try {
-      const definition = _chunkLMJHBF26cjs.lookupInRegistry.call(void 0, 
+      const definition = _chunkQ5CAVEKCcjs.lookupInRegistry.call(void 0, 
         registryConfig,
         entry.state.name
       );
@@ -2459,7 +2676,7 @@ var FileSystemGlobalState = class {
           logger5().error({
             msg: "failed to read alarm file",
             file,
-            error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
+            error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, err)
           });
         }
       }
@@ -2489,7 +2706,7 @@ var FileSystemGlobalState = class {
     (_a = entry.alarmTimeout) == null ? void 0 : _a.abort();
     entry.alarmTimestamp = timestamp;
     const delay = Math.max(0, timestamp - Date.now());
-    entry.alarmTimeout = _chunkELDFBXDVcjs.setLongTimeout.call(void 0, async () => {
+    entry.alarmTimeout = _chunkYUBR6XCJcjs.setLongTimeout.call(void 0, async () => {
       entry.alarmTimestamp = void 0;
       if (this.#persist) {
         try {
@@ -2499,7 +2716,7 @@ var FileSystemGlobalState = class {
             logger5().debug({
               msg: "failed to remove alarm file",
               actorId,
-              error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
+              error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, err)
             });
           }
         }
@@ -2526,7 +2743,7 @@ var FileSystemGlobalState = class {
         logger5().error({
           msg: "failed to handle alarm",
           actorId,
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, err)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, err)
         });
       }
     }, delay);
@@ -2536,7 +2753,7 @@ var FileSystemGlobalState = class {
     if (fsSync2.existsSync(tokenPath)) {
       return fsSync2.readFileSync(tokenPath, "utf-8");
     }
-    const newToken = _chunkJKOUXDK6cjs.generateRandomString.call(void 0, );
+    const newToken = _chunkGXIO5YOTcjs.generateRandomString.call(void 0, );
     fsSync2.writeFileSync(tokenPath, newToken);
     return newToken;
   }
@@ -2598,13 +2815,13 @@ function createManagerInspectorRouter() {
       });
       return c.json(actors, 200);
     } catch (error) {
-      _chunkZNWE3XBTcjs.inspectorLogger.call(void 0, ).error({
+      _chunkZL6NSKF2cjs.inspectorLogger.call(void 0, ).error({
         msg: "Failed to fetch actors",
         error
       });
       return c.json("Failed to fetch actors", 500);
     }
-  }).post("/actors", _standardvalidator.sValidator.call(void 0, "json", _chunk65SAIRRYcjs.CreateActorSchema), async (c) => {
+  }).post("/actors", _standardvalidator.sValidator.call(void 0, "json", _chunkUBMUBNS2cjs.CreateActorSchema), async (c) => {
     const actor2 = await c.var.inspector.accessors.createActor(
       c.req.valid("json")
     );
@@ -2630,7 +2847,7 @@ var ManagerInspector = class {
   
   constructor(accessors) {
     this.accessors = accessors();
-    _chunkZNWE3XBTcjs.inspectorLogger.call(void 0, ).debug({ msg: "Manager Inspector enabled and ready" });
+    _chunkZL6NSKF2cjs.inspectorLogger.call(void 0, ).debug({ msg: "Manager Inspector enabled and ready" });
   }
 };
 
@@ -2686,7 +2903,7 @@ var FileSystemManagerDriver = class {
             try {
               const result = await this.#state.loadActorStateOrError(id);
               return transformActor2(result);
-            } catch (e4) {
+            } catch (e5) {
               return null;
             }
           },
@@ -2704,16 +2921,16 @@ var FileSystemManagerDriver = class {
                 actorId
               );
               return transformActor2(result);
-            } catch (e5) {
+            } catch (e6) {
               return null;
             }
           }
         };
       });
     }
-    const inlineClient = _chunkLMJHBF26cjs.createClientWithDriver.call(void 0, 
+    const inlineClient = _chunkQ5CAVEKCcjs.createClientWithDriver.call(void 0, 
       this,
-      _chunkFDJ3AVNBcjs.ClientConfigSchema.parse({})
+      _chunk5TRXLS6Xcjs.ClientConfigSchema.parse({})
     );
     this.#actorDriver = this.#driverConfig.actor(
       registryConfig,
@@ -2735,7 +2952,7 @@ var FileSystemManagerDriver = class {
   async openWebSocket(path4, actorId, encoding, params, connId, connToken) {
     const pathOnly = path4.split("?")[0];
     const normalizedPath = pathOnly.startsWith("/") ? pathOnly : `/${pathOnly}`;
-    if (normalizedPath === _chunkJKOUXDK6cjs.PATH_CONNECT_WEBSOCKET) {
+    if (normalizedPath === _chunkGXIO5YOTcjs.PATH_CONNECT_WEBSOCKET) {
       const wsHandler = await handleWebSocketConnect(
         void 0,
         this.#runConfig,
@@ -2743,11 +2960,12 @@ var FileSystemManagerDriver = class {
         actorId,
         encoding,
         params,
+        _chunkQ5CAVEKCcjs.generateConnRequestId.call(void 0, ),
         connId,
         connToken
       );
       return new InlineWebSocketAdapter2(wsHandler);
-    } else if (normalizedPath.startsWith(_chunkJKOUXDK6cjs.PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
+    } else if (normalizedPath.startsWith(_chunkGXIO5YOTcjs.PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
       const wsHandler = await handleRawWebSocketHandler(
         void 0,
         path4,
@@ -2770,7 +2988,7 @@ var FileSystemManagerDriver = class {
     _invariant2.default.call(void 0, upgradeWebSocket, "missing getUpgradeWebSocket");
     const pathOnly = path4.split("?")[0];
     const normalizedPath = pathOnly.startsWith("/") ? pathOnly : `/${pathOnly}`;
-    if (normalizedPath === _chunkJKOUXDK6cjs.PATH_CONNECT_WEBSOCKET) {
+    if (normalizedPath === _chunkGXIO5YOTcjs.PATH_CONNECT_WEBSOCKET) {
       const wsHandler = await handleWebSocketConnect(
         c.req.raw,
         this.#runConfig,
@@ -2778,18 +2996,19 @@ var FileSystemManagerDriver = class {
         actorId,
         encoding,
         connParams,
+        _chunkQ5CAVEKCcjs.generateConnRequestId.call(void 0, ),
         connId,
         connToken
       );
-      return upgradeWebSocket(() => wsHandler)(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
-    } else if (normalizedPath.startsWith(_chunkJKOUXDK6cjs.PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
+      return upgradeWebSocket(() => wsHandler)(c, _chunkYUBR6XCJcjs.noopNext.call(void 0, ));
+    } else if (normalizedPath.startsWith(_chunkGXIO5YOTcjs.PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
       const wsHandler = await handleRawWebSocketHandler(
         c.req.raw,
         path4,
         this.#actorDriver,
         actorId
       );
-      return upgradeWebSocket(() => wsHandler)(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
+      return upgradeWebSocket(() => wsHandler)(c, _chunkYUBR6XCJcjs.noopNext.call(void 0, ));
     } else {
       throw new Error(`Unreachable path: ${path4}`);
     }
@@ -2926,13 +3145,13 @@ function chooseDefaultDriver(runConfig) {
     return runConfig.driver;
   }
   if (runConfig.endpoint || runConfig.token || runConfig.runnerKind === "serverless") {
-    _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).debug({
+    _chunkGXIO5YOTcjs.loggerWithoutContext.call(void 0, ).debug({
       msg: "using rivet engine driver",
       endpoint: runConfig.endpoint
     });
     return createEngineDriver();
   }
-  _chunkJKOUXDK6cjs.loggerWithoutContext.call(void 0, ).debug({ msg: "using default file system driver" });
+  _chunkGXIO5YOTcjs.loggerWithoutContext.call(void 0, ).debug({ msg: "using default file system driver" });
   return createFileSystemOrMemoryDriver(true);
 }
 
@@ -2946,7 +3165,7 @@ var _promises2 = require('stream/promises');
 
 // src/engine-process/log.ts
 function logger6() {
-  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "engine-process");
+  return _chunk5N6F5PXDcjs.getLogger.call(void 0, "engine-process");
 }
 
 // src/engine-process/mod.ts
@@ -3001,7 +3220,26 @@ async function ensureEngineProcess(options) {
     cwd: path3.dirname(binaryPath),
     stdio: ["inherit", "pipe", "pipe"],
     env: {
-      ...process.env
+      ...process.env,
+      // In development, runners can be terminated without a graceful
+      // shutdown (i.e. SIGKILL instead of SIGTERM). This is treated as a
+      // crash by Rivet Engine in production and implements a backoff for
+      // rescheduling actors in case of a crash loop.
+      //
+      // This is problematic in development since this will cause actors
+      // to become unresponsive if frequently killing your dev server.
+      //
+      // We reduce the timeouts for resetting a runner as healthy in
+      // order to account for this.
+      RIVET__PEGBOARD__RETRY_RESET_DURATION: "100",
+      RIVET__PEGBOARD__BASE_RETRY_TIMEOUT: "100",
+      // Set max exponent to 1 to have a maximum of base_retry_timeout
+      RIVET__PEGBOARD__RESCHEDULE_BACKOFF_MAX_EXPONENT: "1",
+      // Reduce thresholds for faster development iteration
+      //
+      // Default ping interval is 3s, this gives a 2s & 4s grace
+      RIVET__PEGBOARD__RUNNER_ELIGIBLE_THRESHOLD: "5000",
+      RIVET__PEGBOARD__RUNNER_LOST_THRESHOLD: "7000"
     }
   });
   if (!child.pid) {
@@ -3023,8 +3261,7 @@ async function ensureEngineProcess(options) {
       msg: "engine process exited, please report this error",
       code,
       signal,
-      issues: "https://github.com/rivet-dev/rivetkit/issues",
-      support: "https://rivet.dev/discord"
+      ..._chunkYUBR6XCJcjs.EXTRA_ERROR_LOG
     });
     stdoutStream.end();
     stderrStream.end();
@@ -3113,8 +3350,7 @@ async function downloadEngineBinaryIfNeeded(binaryPath, version, varDir) {
       msg: "engine download failed, please report this error",
       tempPath,
       error,
-      issues: "https://github.com/rivet-dev/rivetkit/issues",
-      support: "https://rivet.dev/discord"
+      ..._chunkYUBR6XCJcjs.EXTRA_ERROR_LOG
     });
     try {
       await fs3.unlink(tempPath);
@@ -3195,7 +3431,7 @@ async function fileExists(filePath) {
   try {
     await fs3.access(filePath);
     return true;
-  } catch (e6) {
+  } catch (e7) {
     return false;
   }
 }
@@ -3238,11 +3474,42 @@ var _zodopenapi = require('@hono/zod-openapi');
 
 
 
-
 var _factory = require('hono/factory');
 
 
 
+// src/common/cors.ts
+var cors = () => {
+  return async (c, next) => {
+    const origin = c.req.header("origin") || "*";
+    if (c.req.method === "OPTIONS") {
+      const requestHeaders = c.req.header("access-control-request-headers") || "*";
+      c.header("access-control-allow-origin", origin);
+      c.header("access-control-allow-credentials", "true");
+      c.header(
+        "access-control-allow-methods",
+        "GET, POST, PUT, DELETE, OPTIONS, PATCH"
+      );
+      c.header("access-control-allow-headers", requestHeaders);
+      c.header("access-control-expose-headers", "*");
+      c.header("access-control-max-age", "86400");
+      if (origin !== "*") {
+        c.header("vary", "Origin");
+      }
+      c.res.headers.delete("content-length");
+      c.res.headers.delete("content-type");
+      return c.body(null, 204);
+    }
+    await next();
+    c.header("access-control-allow-origin", origin);
+    c.header("access-control-allow-credentials", "true");
+    c.header("access-control-expose-headers", "*");
+    if (origin !== "*") {
+      c.header("vary", "Origin");
+    }
+  };
+};
+
 // src/manager-api/actors.ts
 
 
@@ -3306,17 +3573,17 @@ async function handleWebSocketGatewayPathBased(runConfig, managerDriver, c, acto
   if (protocols) {
     const protocolList = protocols.split(",").map((p) => p.trim());
     for (const protocol of protocolList) {
-      if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
-        encodingRaw = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length);
-      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
+      if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING)) {
+        encodingRaw = protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING.length);
+      } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS)) {
         connParamsRaw = decodeURIComponent(
-          protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length)
+          protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS.length)
         );
-      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID)) {
-        connIdRaw = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID.length);
-      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN)) {
+      } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_ID)) {
+        connIdRaw = protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_ID.length);
+      } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_TOKEN)) {
         connTokenRaw = protocol.substring(
-          _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN.length
+          _chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_TOKEN.length
         );
       }
     }
@@ -3421,21 +3688,21 @@ async function handleWebSocketGateway(runConfig, managerDriver, c, strippedPath)
   if (protocols) {
     const protocolList = protocols.split(",").map((p) => p.trim());
     for (const protocol of protocolList) {
-      if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_TARGET)) {
-        target = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_TARGET.length);
-      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ACTOR)) {
-        actorId = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_ACTOR.length);
-      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
-        encodingRaw = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length);
-      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
+      if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_TARGET)) {
+        target = protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_TARGET.length);
+      } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_ACTOR)) {
+        actorId = protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_ACTOR.length);
+      } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING)) {
+        encodingRaw = protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING.length);
+      } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS)) {
         connParamsRaw = decodeURIComponent(
-          protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length)
+          protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS.length)
         );
-      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID)) {
-        connIdRaw = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID.length);
-      } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN)) {
+      } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_ID)) {
+        connIdRaw = protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_ID.length);
+      } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_TOKEN)) {
         connTokenRaw = protocol.substring(
-          _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN.length
+          _chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_TOKEN.length
         );
       }
     }
@@ -3467,8 +3734,8 @@ async function handleWebSocketGateway(runConfig, managerDriver, c, strippedPath)
   );
 }
 async function handleHttpGateway(managerDriver, c, next, strippedPath) {
-  const target = c.req.header(_chunkJKOUXDK6cjs.HEADER_RIVET_TARGET);
-  const actorId = c.req.header(_chunkJKOUXDK6cjs.HEADER_RIVET_ACTOR);
+  const target = c.req.header(_chunkGXIO5YOTcjs.HEADER_RIVET_TARGET);
+  const actorId = c.req.header(_chunkGXIO5YOTcjs.HEADER_RIVET_ACTOR);
   if (target !== "actor") {
     return next();
   }
@@ -3482,8 +3749,8 @@ async function handleHttpGateway(managerDriver, c, next, strippedPath) {
     method: c.req.method
   });
   const proxyHeaders = new Headers(c.req.raw.headers);
-  proxyHeaders.delete(_chunkJKOUXDK6cjs.HEADER_RIVET_TARGET);
-  proxyHeaders.delete(_chunkJKOUXDK6cjs.HEADER_RIVET_ACTOR);
+  proxyHeaders.delete(_chunkGXIO5YOTcjs.HEADER_RIVET_TARGET);
+  proxyHeaders.delete(_chunkGXIO5YOTcjs.HEADER_RIVET_ACTOR);
   const url = new URL(c.req.url);
   const proxyUrl = new URL(`http://actor${strippedPath}${url.search}`);
   const proxyRequest = new Request(proxyUrl, {
@@ -3516,32 +3783,41 @@ function parseActorPath(path4) {
     return null;
   }
   const segments = basePath.split("/").filter((s) => s.length > 0);
-  if (segments.length < 4) {
+  if (segments.length < 2) {
     return null;
   }
-  if (segments[0] !== "gateway" || segments[1] !== "actors") {
+  if (segments[0] !== "gateway") {
     return null;
   }
-  if (segments[2].length === 0) {
+  const actorSegment = segments[1];
+  if (actorSegment.length === 0) {
     return null;
   }
-  const actorId = segments[2];
+  let actorId;
   let token;
-  let remainingPathStartIdx;
-  if (segments.length >= 6 && segments[3] === "tokens" && segments[5] === "route") {
-    if (segments[4].length === 0) {
+  const atPos = actorSegment.indexOf("@");
+  if (atPos !== -1) {
+    const rawActorId = actorSegment.slice(0, atPos);
+    const rawToken = actorSegment.slice(atPos + 1);
+    if (rawActorId.length === 0 || rawToken.length === 0) {
+      return null;
+    }
+    try {
+      actorId = decodeURIComponent(rawActorId);
+      token = decodeURIComponent(rawToken);
+    } catch (e) {
       return null;
     }
-    token = segments[4];
-    remainingPathStartIdx = 6;
-  } else if (segments.length >= 4 && segments[3] === "route") {
-    token = void 0;
-    remainingPathStartIdx = 4;
   } else {
-    return null;
+    try {
+      actorId = decodeURIComponent(actorSegment);
+    } catch (e) {
+      return null;
+    }
+    token = void 0;
   }
   let prefixLen = 0;
-  for (let i = 0; i < remainingPathStartIdx; i++) {
+  for (let i = 0; i < 2; i++) {
     prefixLen += 1 + segments[i].length;
   }
   let remainingBase;
@@ -3568,7 +3844,7 @@ async function createTestWebSocketProxy(clientWsPromise) {
     promise: serverWsPromise,
     resolve: serverWsResolve,
     reject: serverWsReject
-  } = _chunkELDFBXDVcjs.promiseWithResolvers.call(void 0, );
+  } = _chunkYUBR6XCJcjs.promiseWithResolvers.call(void 0, );
   try {
     logger().debug({ msg: "awaiting client websocket promise" });
     const ws = await clientWsPromise;
@@ -3782,7 +4058,7 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, driverCon
   const router = new (0, _zodopenapi.OpenAPIHono)({ strict: false }).basePath(
     runConfig.basePath
   );
-  router.use("*", loggerMiddleware(logger()));
+  router.use("*", loggerMiddleware(logger()), cors());
   router.use(
     "*",
     _factory.createMiddleware.call(void 0, async (c, next) => {
@@ -3807,14 +4083,13 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, driverCon
   } else if (runConfig.runnerKind === "normal") {
     addManagerRoutes(registryConfig, runConfig, managerDriver, router);
   } else {
-    _chunkELDFBXDVcjs.assertUnreachable.call(void 0, runConfig.runnerKind);
+    _chunkYUBR6XCJcjs.assertUnreachable.call(void 0, runConfig.runnerKind);
   }
   router.notFound(handleRouteNotFound);
   router.onError(handleRouteError);
   return { router, openapi: router };
 }
 function addServerlessRoutes(driverConfig, registryConfig, runConfig, managerDriver, client, router) {
-  if (runConfig.cors) router.use("*", _cors.cors.call(void 0, runConfig.cors));
   router.get("/", (c) => {
     return c.text(
       "This is a RivetKit server.\n\nLearn more at https://rivetkit.org"
@@ -3848,6 +4123,13 @@ function addServerlessRoutes(driverConfig, registryConfig, runConfig, managerDri
     newRunConfig.totalSlots = totalSlots;
     newRunConfig.runnerName = runnerName;
     newRunConfig.namespace = namespace;
+    if (newRunConfig.runnerKey) {
+      logger().warn({
+        msg: "runner keys are not supported by serverless runners, this will be overwritten with a random runner key",
+        oldRunnerKey: newRunConfig.runnerKey
+      });
+      newRunConfig.runnerKey = void 0;
+    }
     const actorDriver = driverConfig.actor(
       registryConfig,
       newRunConfig,
@@ -3868,19 +4150,18 @@ function addServerlessRoutes(driverConfig, registryConfig, runConfig, managerDri
 }
 function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
   var _a;
-  if (_chunkZNWE3XBTcjs.isInspectorEnabled.call(void 0, runConfig, "manager")) {
+  if (_chunkZL6NSKF2cjs.isInspectorEnabled.call(void 0, runConfig, "manager")) {
     if (!managerDriver.inspector) {
       throw new (0, _chunkKSRXX3Z4cjs.Unsupported)("inspector");
     }
     router.route(
       "/inspect",
-      new (0, _hono.Hono)().use(_cors.cors.call(void 0, runConfig.inspector.cors)).use(_chunkZNWE3XBTcjs.secureInspector.call(void 0, runConfig)).use((c, next) => {
+      new (0, _hono.Hono)().use(_chunkZL6NSKF2cjs.secureInspector.call(void 0, runConfig)).use((c, next) => {
         c.set("inspector", managerDriver.inspector);
         return next();
       }).route("/", createManagerInspectorRouter())
     );
   }
-  if (runConfig.cors) router.use("*", _cors.cors.call(void 0, runConfig.cors));
   router.use("*", actorGateway.bind(void 0, runConfig, managerDriver));
   router.get("/", (c) => {
     return c.text(
@@ -4085,7 +4366,7 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
         );
         response = { ok: output };
       } catch (rawErr) {
-        const err = _chunkELDFBXDVcjs.deconstructError.call(void 0, rawErr, logger(), {}, true);
+        const err = _chunkYUBR6XCJcjs.deconstructError.call(void 0, rawErr, logger(), {}, true);
         response = { err };
       }
       return c.body(cbor4.encode(response));
@@ -4108,30 +4389,30 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
         let connId;
         let connToken;
         for (const protocol of protocols) {
-          if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ACTOR)) {
-            actorId = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_ACTOR.length);
-          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING)) {
+          if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_ACTOR)) {
+            actorId = protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_ACTOR.length);
+          } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING)) {
             encoding = protocol.substring(
-              _chunkJKOUXDK6cjs.WS_PROTOCOL_ENCODING.length
+              _chunkGXIO5YOTcjs.WS_PROTOCOL_ENCODING.length
             );
-          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_TRANSPORT)) {
+          } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_TRANSPORT)) {
             transport = protocol.substring(
-              _chunkJKOUXDK6cjs.WS_PROTOCOL_TRANSPORT.length
+              _chunkGXIO5YOTcjs.WS_PROTOCOL_TRANSPORT.length
             );
-          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_PATH)) {
+          } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_PATH)) {
             path4 = decodeURIComponent(
-              protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_PATH.length)
+              protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_PATH.length)
             );
-          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS)) {
+          } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS)) {
             const paramsRaw = decodeURIComponent(
-              protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_PARAMS.length)
+              protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_PARAMS.length)
             );
             params = JSON.parse(paramsRaw);
-          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID)) {
-            connId = protocol.substring(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_ID.length);
-          } else if (protocol.startsWith(_chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN)) {
+          } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_ID)) {
+            connId = protocol.substring(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_ID.length);
+          } else if (protocol.startsWith(_chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_TOKEN)) {
             connToken = protocol.substring(
-              _chunkJKOUXDK6cjs.WS_PROTOCOL_CONN_TOKEN.length
+              _chunkGXIO5YOTcjs.WS_PROTOCOL_CONN_TOKEN.length
             );
           }
         }
@@ -4152,10 +4433,10 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
           connToken
         );
         return await createTestWebSocketProxy(clientWsPromise);
-      })(c, _chunkELDFBXDVcjs.noopNext.call(void 0, ));
+      })(c, _chunkYUBR6XCJcjs.noopNext.call(void 0, ));
     });
     router.all(".test/inline-driver/send-request/*", async (c) => {
-      const actorId = c.req.header(_chunkJKOUXDK6cjs.HEADER_ACTOR_ID);
+      const actorId = c.req.header(_chunkGXIO5YOTcjs.HEADER_ACTOR_ID);
       if (!actorId) {
         return c.text("Missing required headers", 400);
       }
@@ -4182,9 +4463,9 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
       } catch (error) {
         logger().error({
           msg: "error in test inline raw http",
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
         });
-        const err = _chunkELDFBXDVcjs.deconstructError.call(void 0, error, logger(), {}, true);
+        const err = _chunkYUBR6XCJcjs.deconstructError.call(void 0, error, logger(), {}, true);
         return c.json(
           {
             error: {
@@ -4229,7 +4510,7 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
       } catch (error) {
         logger().error({
           msg: "error forcing disconnect",
-          error: _chunkELDFBXDVcjs.stringifyError.call(void 0, error)
+          error: _chunkYUBR6XCJcjs.stringifyError.call(void 0, error)
         });
         return c.text(`Error: ${error}`, 500);
       }
@@ -4250,7 +4531,7 @@ function createApiActor(actor2, runnerName = "default") {
   return {
     actor_id: actor2.actorId,
     name: actor2.name,
-    key: _chunkLMJHBF26cjs.serializeActorKey.call(void 0, actor2.key),
+    key: _chunkQ5CAVEKCcjs.serializeActorKey.call(void 0, actor2.key),
     namespace_id: "default",
     // Assert default namespace
     runner_name_selector: runnerName,
@@ -4264,7 +4545,7 @@ function createApiActor(actor2, runnerName = "default") {
 
 // src/registry/log.ts
 function logger7() {
-  return _chunkHN7UXCYQcjs.getLogger.call(void 0, "registry");
+  return _chunk5N6F5PXDcjs.getLogger.call(void 0, "registry");
 }
 
 // src/registry/serve.ts
@@ -4324,7 +4605,7 @@ var Registry = class {
    */
   start(inputConfig) {
     var _a, _b, _c;
-    const config2 = _chunkFDJ3AVNBcjs.RunnerConfigSchema.parse(inputConfig);
+    const config2 = _chunk5TRXLS6Xcjs.RunnerConfigSchema.parse(inputConfig);
     if (config2.autoConfigureServerless && config2.runnerKind !== "serverless") {
       throw new Error(
         "autoConfigureServerless can only be configured when runnerKind is 'serverless'"
@@ -4362,9 +4643,9 @@ var Registry = class {
       config2.disableActorDriver = true;
     }
     if ((_a = config2.logging) == null ? void 0 : _a.baseLogger) {
-      _chunkHN7UXCYQcjs.configureBaseLogger.call(void 0, config2.logging.baseLogger);
+      _chunk5N6F5PXDcjs.configureBaseLogger.call(void 0, config2.logging.baseLogger);
     } else {
-      _chunkHN7UXCYQcjs.configureDefaultLogger.call(void 0, (_b = config2.logging) == null ? void 0 : _b.level);
+      _chunk5N6F5PXDcjs.configureDefaultLogger.call(void 0, (_b = config2.logging) == null ? void 0 : _b.level);
     }
     const driver = chooseDefaultDriver(config2);
     if (driver.name === "engine") {
@@ -4384,8 +4665,8 @@ var Registry = class {
       config2.getUpgradeWebSocket = () => upgradeWebSocket;
     }
     const managerDriver = driver.manager(this.#config, config2);
-    _chunkZNWE3XBTcjs.configureInspectorAccessToken.call(void 0, config2, managerDriver);
-    const client = _chunkLMJHBF26cjs.createClientWithDriver.call(void 0, managerDriver, config2);
+    _chunkZL6NSKF2cjs.configureInspectorAccessToken.call(void 0, config2, managerDriver);
+    const client = _chunkQ5CAVEKCcjs.createClientWithDriver.call(void 0, managerDriver, config2);
     const driverLog = _nullishCoalesce(((_c = managerDriver.extraStartupLog) == null ? void 0 : _c.call(managerDriver)), () => ( {}));
     logger7().info({
       msg: "rivetkit ready",
@@ -4393,18 +4674,18 @@ var Registry = class {
       definitions: Object.keys(this.#config.use).length,
       ...driverLog
     });
-    if (_chunkZNWE3XBTcjs.isInspectorEnabled.call(void 0, config2, "manager") && managerDriver.inspector) {
+    if (_chunkZL6NSKF2cjs.isInspectorEnabled.call(void 0, config2, "manager") && managerDriver.inspector) {
       logger7().info({
         msg: "inspector ready",
-        url: _chunkZNWE3XBTcjs.getInspectorUrl.call(void 0, config2)
+        url: _chunkZL6NSKF2cjs.getInspectorUrl.call(void 0, config2)
       });
     }
     if (!config2.noWelcome) {
       const displayInfo = managerDriver.displayInformation();
       console.log();
-      console.log(`  RivetKit ${_chunkELDFBXDVcjs.package_default.version} (${displayInfo.name})`);
+      console.log(`  RivetKit ${_chunkYUBR6XCJcjs.package_default.version} (${displayInfo.name})`);
       if (!config2.disableDefaultServer) {
-        console.log(`  - Endpoint:     ${_chunkLMJHBF26cjs.getEndpoint.call(void 0, config2)}`);
+        console.log(`  - Endpoint:     ${_chunkQ5CAVEKCcjs.getEndpoint.call(void 0, config2)}`);
       } else if (config2.overrideServerAddress) {
         console.log(
           `  - Endpoint:     ${config2.overrideServerAddress}`
@@ -4418,8 +4699,8 @@ var Registry = class {
         const padding = " ".repeat(Math.max(0, 13 - k.length));
         console.log(`  - ${k}:${padding}${v}`);
       }
-      if (_chunkZNWE3XBTcjs.isInspectorEnabled.call(void 0, config2, "manager") && managerDriver.inspector) {
-        console.log(`  - Inspector:    ${_chunkZNWE3XBTcjs.getInspectorUrl.call(void 0, config2)}`);
+      if (_chunkZL6NSKF2cjs.isInspectorEnabled.call(void 0, config2, "manager") && managerDriver.inspector) {
+        console.log(`  - Inspector:    ${_chunkZL6NSKF2cjs.getInspectorUrl.call(void 0, config2)}`);
       }
       console.log();
     }
@@ -4488,7 +4769,7 @@ async function configureServerlessRunner(config2) {
       msg: "fetching datacenters",
       endpoint: config2.endpoint
     });
-    const dcsRes = await _chunkLMJHBF26cjs.getDatacenters.call(void 0, clientConfig);
+    const dcsRes = await _chunkQ5CAVEKCcjs.getDatacenters.call(void 0, clientConfig);
     logger7().debug({
       msg: "configuring serverless runner",
       runnerName: config2.runnerName,
@@ -4506,7 +4787,7 @@ async function configureServerlessRunner(config2) {
       },
       metadata: _nullishCoalesce(customConfig.metadata, () => ( {}))
     };
-    await _chunkLMJHBF26cjs.updateRunnerConfig.call(void 0, clientConfig, config2.runnerName, {
+    await _chunkQ5CAVEKCcjs.updateRunnerConfig.call(void 0, clientConfig, config2.runnerName, {
       datacenters: Object.fromEntries(
         dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig])
       )
@@ -4544,4 +4825,4 @@ function setup(input) {
 
 exports.handleWebSocketConnect = handleWebSocketConnect; exports.handleRawWebSocketHandler = handleRawWebSocketHandler; exports.RegistryConfigSchema = RegistryConfigSchema; exports.createActorRouter = createActorRouter; exports.actor = actor; exports.InlineWebSocketAdapter2 = InlineWebSocketAdapter2; exports.createEngineDriver = createEngineDriver; exports.createFileSystemOrMemoryDriver = createFileSystemOrMemoryDriver; exports.createFileSystemDriver = createFileSystemDriver; exports.createMemoryDriver = createMemoryDriver; exports.createManagerRouter = createManagerRouter; exports.Registry = Registry; exports.setup = setup;
 //! These configs configs hold anything that's not platform-specific about running actors.
-//# sourceMappingURL=chunk-M5BHNJHB.cjs.map
+//# sourceMappingURL=chunk-YLWF6RFL.cjs.map