rivetkit 2.0.22-rc.1 → 2.0.22-rc.2

package/dist/tsup/{chunk-4B25D5OW.js → chunk-HLZT5C6A.js}

@@ -4,23 +4,24 @@ import {
   inspectorLogger,
   isInspectorEnabled,
   secureInspector
-} from "./chunk-NDLOG2JH.js";
+} from "./chunk-EJXZYQ3N.js";
 import {
   ActorDefinition,
+  PERSIST_SYMBOL,
   RemoteManagerDriver,
   createActorInspectorRouter,
   createClientWithDriver,
   deserializeActorKey,
-  generateConnSocketId,
+  generateConnRequestId,
   getDatacenters,
   getEndpoint,
   lookupInRegistry,
   serializeActorKey,
   updateRunnerConfig
-} from "./chunk-FETQGZN4.js";
+} from "./chunk-AMK3AACS.js";
 import {
   CreateActorSchema
-} from "./chunk-RPI45FGS.js";
+} from "./chunk-C4FPCW7T.js";
 import {
   ActionContext,
   ClientConfigSchema,
@@ -32,7 +33,7 @@ import {
   createVersionedDataHandler,
   parseMessage,
   serializeEmptyPersistData
-} from "./chunk-I7EJWHYV.js";
+} from "./chunk-BHLQTKOD.js";
 import {
   EncodingSchema,
   HEADER_ACTOR_ID,
@@ -58,24 +59,27 @@ import {
   generateRandomString,
   loggerWithoutContext,
   serializeWithEncoding
-} from "./chunk-ZVEDMBFT.js";
+} from "./chunk-CVLO2OOK.js";
 import {
   configureBaseLogger,
   configureDefaultLogger,
   getLogger
-} from "./chunk-GJPOIJHZ.js";
+} from "./chunk-VMFBKBJL.js";
 import {
+  EXTRA_ERROR_LOG,
   VERSION,
+  arrayBuffersEqual,
   assertUnreachable,
   bufferToArrayBuffer,
   deconstructError,
   getEnvUniversal,
+  idToStr,
   noopNext,
   package_default,
   promiseWithResolvers,
   setLongTimeout,
   stringifyError
-} from "./chunk-JKNDUKFI.js";
+} from "./chunk-7RUROQAZ.js";
 import {
   ActorAlreadyExists,
   ConnNotFound,
@@ -124,7 +128,12 @@ var ActorConfigSchema = z.object({
     connectionLivenessTimeout: z.number().positive().default(2500),
     connectionLivenessInterval: z.number().positive().default(5e3),
     noSleep: z.boolean().default(false),
-    sleepTimeout: z.number().positive().default(3e4)
+    sleepTimeout: z.number().positive().default(3e4),
+    /** @experimental */
+    canHibernatWebSocket: z.union([
+      z.boolean(),
+      z.function().args(z.custom()).returns(z.boolean())
+    ]).default(false)
   }).strict().default({})
 }).strict().refine(
   (data) => !(data.state !== void 0 && data.createState !== void 0),
@@ -148,7 +157,6 @@ var ActorConfigSchema = z.object({
 
 // src/actor/router.ts
 import { Hono } from "hono";
-import { cors } from "hono/cors";
 import invariant2 from "invariant";
 
 // src/actor/router-endpoints.ts
@@ -174,11 +182,19 @@ var HonoWebSocketAdapter = class {
   #eventListeners = /* @__PURE__ */ new Map();
   #closeCode;
   #closeReason;
-  constructor(ws) {
+  rivetRequestId;
+  isHibernatable;
+  constructor(ws, rivetRequestId, isHibernatable) {
     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 {
         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 {
         target: this,
         code: 1006,
         reason: "Abnormal closure",
-        wasClean: false
+        wasClean: false,
+        rivetRequestId: this.rivetRequestId
       });
     }
   }
@@ -317,12 +335,20 @@ var HonoWebSocketAdapter = 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 {
       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 {
       target: this,
       code,
       reason,
-      wasClean: code === 1e3
+      wasClean: code === 1e3,
+      rivetRequestId: this.rivetRequestId
     });
   }
   // Internal method to handle errors from WSContext
@@ -459,7 +489,7 @@ var HonoWebSocketAdapter = 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,
@@ -492,7 +522,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
     };
   }
   const closePromise = promiseWithResolvers();
-  const socketId = generateConnSocketId();
+  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,6 +550,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
             connId,
             connToken
           );
+          createdConn = conn;
           handlersResolve({ conn, actor: actor2, connId: conn.id });
         } catch (error) {
           handlersReject(error);
@@ -596,16 +627,11 @@ 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) => {
-        deconstructError(
-          error,
-          actor2.rLog,
-          { wsEvent: "close" },
-          exposeInternalError
-        );
+      handlersPromise.finally(() => {
+        if (createdConn) {
+          const wasClean = event.wasClean || event.code === 1e3;
+          actor2.__connDisconnected(createdConn, wasClean, requestId);
+        }
       });
     },
     onError: (_error) => {
@@ -626,7 +652,7 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
   c.header("Content-Encoding", "Identity");
   const encoding = getRequestEncoding(c.req);
   const parameters = getRequestConnParams(c.req);
-  const socketId = generateConnSocketId();
+  const requestId = generateConnRequestId();
   const connId = c.req.header(HEADER_CONN_ID);
   const connToken = c.req.header(HEADER_CONN_TOKEN);
   return streamSSE(c, async (stream) => {
@@ -640,7 +666,7 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
       });
       conn = await actor2.createConn(
         {
-          socketId,
+          requestId,
           driverState: {
             [1 /* SSE */]: {
               encoding,
@@ -662,7 +688,7 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
         try {
           rLog.debug("sse stream aborted");
           if (conn) {
-            actor2.__connDisconnected(conn, false, socketId);
+            actor2.__connDisconnected(conn, false, requestId);
           }
           abortResolver.resolve(void 0);
         } catch (error) {
@@ -688,7 +714,7 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
         error
       });
       if (conn && actor2 !== void 0) {
-        actor2.__connDisconnected(conn, false, socketId);
+        actor2.__connDisconnected(conn, false, requestId);
       }
       stream.close();
     }
@@ -704,7 +730,7 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId) {
     HTTP_ACTION_REQUEST_VERSIONED
   );
   const actionArgs = cbor.decode(new Uint8Array(request.args));
-  const socketId = generateConnSocketId();
+  const requestId = generateConnRequestId();
   let actor2;
   let conn;
   let output;
@@ -713,7 +739,7 @@ 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,
@@ -723,7 +749,7 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId) {
     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 = {
@@ -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[PERSIST_SYMBOL].hibernatableWebSocket.findIndex(
+        (ws2) => arrayBuffersEqual(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
@@ -851,6 +880,12 @@ function getRequestConnParams(req) {
     );
   }
 }
+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
 import * as cbor2 from "cbor-x";
@@ -963,6 +998,15 @@ function createActorRouter(runConfig, actorDriver, isTest) {
     strict: false
   });
   router.use("*", loggerMiddleware(loggerWithoutContext()));
+  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"
@@ -1036,6 +1080,7 @@ function createActorRouter(runConfig, actorDriver, isTest) {
           c2.env.actorId,
           encoding,
           connParams,
+          generateConnRequestId(),
           connIdRaw,
           connTokenRaw
         );
@@ -1143,19 +1188,15 @@ function createActorRouter(runConfig, actorDriver, isTest) {
   if (isInspectorEnabled(runConfig, "actor")) {
     router.route(
       "/inspect",
-      new Hono().use(
-        cors(runConfig.inspector.cors),
-        secureInspector(runConfig),
-        async (c, next) => {
-          const inspector = (await actorDriver.loadActor(c.env.actorId)).inspector;
-          invariant2(
-            inspector,
-            "inspector not supported on this platform"
-          );
-          c.set("inspector", inspector);
-          return next();
-        }
-      ).route("/", createActorInspectorRouter())
+      new Hono().use(secureInspector(runConfig), async (c, next) => {
+        const inspector = (await actorDriver.loadActor(c.env.actorId)).inspector;
+        invariant2(
+          inspector,
+          "inspector not supported on this platform"
+        );
+        c.set("inspector", inspector);
+        return next();
+      }).route("/", createActorInspectorRouter())
     );
   }
   router.notFound(handleRouteNotFound);
@@ -1539,6 +1580,7 @@ function logger4() {
 }
 
 // src/drivers/engine/actor-driver.ts
+var RUNNER_SSE_PING_INTERVAL = 1e3;
 var EngineActorDriver = class {
   #registryConfig;
   #runConfig;
@@ -1552,12 +1594,16 @@ var EngineActorDriver = class {
   #alarmTimeout;
   #runnerStarted = promiseWithResolvers();
   #runnerStopped = promiseWithResolvers();
+  #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 = runConfig.token ?? runConfig.token;
+    const token = runConfig.token;
     if (token && runConfig.inspector && runConfig.inspector.enabled) {
       runConfig.inspector.token = () => token;
     }
@@ -1571,10 +1617,10 @@ var EngineActorDriver = class {
       version: this.#version,
       endpoint: getEndpoint(runConfig),
       token,
-      namespace: runConfig.namespace ?? runConfig.namespace,
-      totalSlots: runConfig.totalSlots ?? runConfig.totalSlots,
-      runnerName: runConfig.runnerName ?? runConfig.runnerName,
-      runnerKey: runConfig.runnerKey,
+      namespace: runConfig.namespace,
+      totalSlots: runConfig.totalSlots,
+      runnerName: runConfig.runnerName,
+      runnerKey: 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: getLogger("engine-runner")
+      logger: getLogger("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[PERSIST_SYMBOL].hibernatableWebSocket.find(
+          (ws) => arrayBuffersEqual(ws.requestId, requestId)
+        );
+        let hibernationConfig;
+        if (existingWs) {
+          hibernationConfig = {
+            enabled: true,
+            lastMsgIndex: Number(existingWs.msgIndex)
+          };
+        } else {
+          if (path4 === PATH_CONNECT_WEBSOCKET) {
+            hibernationConfig = {
+              enabled: true,
+              lastMsgIndex: void 0
+            };
+          } else if (path4.startsWith(PATH_RAW_WEBSOCKET_PREFIX)) {
+            const definition = lookupInRegistry(
+              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[PERSIST_SYMBOL].hibernatableWebSocket.push({
+          requestId,
+          lastSeenTimestamp: BigInt(Date.now()),
+          msgIndex: -1n
+        });
+        return hibernationConfig;
+      }
     };
     this.#runner = new 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 {};
   }
@@ -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: stringifyError(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 = idToStr(requestIdBuf);
     logger4().debug({ msg: "runner websocket", actorId, url: request.url });
     const url = new URL(request.url);
     const protocols = request.headers.get("sec-websocket-protocol");
@@ -1760,6 +1929,7 @@ var EngineActorDriver = class {
         actorId,
         encoding,
         connParams,
+        requestId,
         // Extract connId and connToken from protocols if needed
         void 0,
         void 0
@@ -1799,8 +1969,29 @@ var EngineActorDriver = class {
         var _a;
         return (_a = x.onMessage) == null ? void 0 : _a.call(x, event, wsContext);
       });
+      invariant3(event.rivetRequestId, "missing rivetRequestId");
+      invariant3(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();
       invariant3(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: this.#runner.runnerId ?? "-" };
+  }
 };
 
 // src/drivers/engine/mod.ts
@@ -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);
   }
 };
 
@@ -2269,7 +2486,7 @@ var FileSystemGlobalState = class {
       await actor2.startPromise.promise.catch();
     actor2.removed = true;
     invariant4(actor2.actor, "actor should be loaded");
-    await actor2.actor._stop();
+    await actor2.actor._onStop();
     this.#actors.delete(actorId);
   }
   /**
@@ -2743,6 +2960,7 @@ var FileSystemManagerDriver = class {
         actorId,
         encoding,
         params,
+        generateConnRequestId(),
         connId,
         connToken
       );
@@ -2778,6 +2996,7 @@ var FileSystemManagerDriver = class {
         actorId,
         encoding,
         connParams,
+        generateConnRequestId(),
         connId,
         connToken
       );
@@ -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"
+      ...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"
+      ...EXTRA_ERROR_LOG
     });
     try {
       await fs3.unlink(tempPath);
@@ -3238,11 +3474,42 @@ import * as cbor4 from "cbor-x";
 import {
   Hono as Hono3
 } from "hono";
-import { cors as corsMiddleware } from "hono/cors";
 import { createMiddleware } from "hono/factory";
 import invariant6 from "invariant";
 import { z as z6 } from "zod";
 
+// 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
 import { z as z4 } from "zod";
 
@@ -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;
@@ -3782,7 +4058,7 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, driverCon
   const router = new OpenAPIHono({ strict: false }).basePath(
     runConfig.basePath
   );
-  router.use("*", loggerMiddleware(logger()));
+  router.use("*", loggerMiddleware(logger()), cors());
   router.use(
     "*",
     createMiddleware(async (c, next) => {
@@ -3814,7 +4090,6 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, driverCon
   return { router, openapi: router };
 }
 function addServerlessRoutes(driverConfig, registryConfig, runConfig, managerDriver, client, router) {
-  if (runConfig.cors) router.use("*", corsMiddleware(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,
@@ -3874,13 +4156,12 @@ function addManagerRoutes(registryConfig, runConfig, managerDriver, router) {
     }
     router.route(
       "/inspect",
-      new Hono3().use(corsMiddleware(runConfig.inspector.cors)).use(secureInspector(runConfig)).use((c, next) => {
+      new Hono3().use(secureInspector(runConfig)).use((c, next) => {
         c.set("inspector", managerDriver.inspector);
         return next();
       }).route("/", createManagerInspectorRouter())
     );
   }
-  if (runConfig.cors) router.use("*", corsMiddleware(runConfig.cors));
   router.use("*", actorGateway.bind(void 0, runConfig, managerDriver));
   router.get("/", (c) => {
     return c.text(
@@ -4544,4 +4825,4 @@ export {
   setup
 };
 //! These configs configs hold anything that's not platform-specific about running actors.
-//# sourceMappingURL=chunk-4B25D5OW.js.map
+//# sourceMappingURL=chunk-HLZT5C6A.js.map