rivetkit 2.0.22-rc.2 → 2.0.23

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

@@ -4,7 +4,7 @@ import {
   inspectorLogger,
   isInspectorEnabled,
   secureInspector
-} from "./chunk-EJXZYQ3N.js";
+} from "./chunk-YAYNBR37.js";
 import {
   ActorDefinition,
   PERSIST_SYMBOL,
@@ -18,10 +18,10 @@ import {
   lookupInRegistry,
   serializeActorKey,
   updateRunnerConfig
-} from "./chunk-AMK3AACS.js";
+} from "./chunk-FTQ62XTN.js";
 import {
   CreateActorSchema
-} from "./chunk-C4FPCW7T.js";
+} from "./chunk-DLYZKFRY.js";
 import {
   ActionContext,
   ClientConfigSchema,
@@ -33,7 +33,7 @@ import {
   createVersionedDataHandler,
   parseMessage,
   serializeEmptyPersistData
-} from "./chunk-BHLQTKOD.js";
+} from "./chunk-RUTBXBRR.js";
 import {
   EncodingSchema,
   HEADER_ACTOR_ID,
@@ -59,27 +59,25 @@ import {
   generateRandomString,
   loggerWithoutContext,
   serializeWithEncoding
-} from "./chunk-CVLO2OOK.js";
-import {
-  configureBaseLogger,
-  configureDefaultLogger,
-  getLogger
-} from "./chunk-VMFBKBJL.js";
+} from "./chunk-PHNIVSG5.js";
 import {
   EXTRA_ERROR_LOG,
   VERSION,
   arrayBuffersEqual,
   assertUnreachable,
   bufferToArrayBuffer,
+  configureBaseLogger,
+  configureDefaultLogger,
   deconstructError,
   getEnvUniversal,
+  getLogger,
   idToStr,
   noopNext,
   package_default,
   promiseWithResolvers,
   setLongTimeout,
   stringifyError
-} from "./chunk-7RUROQAZ.js";
+} from "./chunk-5PKKNNNS.js";
 import {
   ActorAlreadyExists,
   ConnNotFound,
@@ -489,7 +487,7 @@ var HonoWebSocketAdapter = class {
 
 // src/actor/router-endpoints.ts
 var SSE_PING_INTERVAL = 1e3;
-async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, encoding, parameters, requestId, connId, connToken) {
+async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, encoding, parameters, requestId, requestIdBuf, connId, connToken) {
   const exposeInternalError = req ? getRequestExposeInternalError(req) : false;
   const {
     promise: handlersPromise,
@@ -534,9 +532,14 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
             connId,
             actorId
           });
+          const isHibernatable = !!requestIdBuf && actor2[PERSIST_SYMBOL].hibernatableWebSocket.findIndex(
+            (ws2) => arrayBuffersEqual(ws2.requestId, requestIdBuf)
+          ) !== -1;
           conn = await actor2.createConn(
             {
               requestId,
+              requestIdBuf,
+              hibernatable: isHibernatable,
               driverState: {
                 [0 /* WEBSOCKET */]: {
                   encoding,
@@ -667,6 +670,7 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId) {
       conn = await actor2.createConn(
         {
           requestId,
+          hibernatable: false,
           driverState: {
             [1 /* SSE */]: {
               encoding,
@@ -740,6 +744,7 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId) {
     conn = await actor2.createConn(
       {
         requestId,
+        hibernatable: false,
         driverState: { [2 /* HTTP */]: {} }
       },
       parameters,
@@ -801,7 +806,7 @@ async function handleConnectionClose(c, _runConfig, actorDriver, connId, connTok
   await conn.disconnect("Connection closed by client request");
   return c.json({});
 }
-async function handleRawWebSocketHandler(req, path4, actorDriver, actorId) {
+async function handleRawWebSocketHandler(req, path4, actorDriver, actorId, requestIdBuf) {
   const actor2 = await actorDriver.loadActor(actorId);
   return {
     onOpen: (evt, ws) => {
@@ -1081,6 +1086,7 @@ function createActorRouter(runConfig, actorDriver, isTest) {
           encoding,
           connParams,
           generateConnRequestId(),
+          void 0,
           connIdRaw,
           connTokenRaw
         );
@@ -1175,7 +1181,8 @@ function createActorRouter(runConfig, actorDriver, isTest) {
           c2.req.raw,
           pathWithQuery,
           actorDriver,
-          c2.env.actorId
+          c2.env.actorId,
+          void 0
         );
       })(c, noopNext());
     } else {
@@ -1612,7 +1619,6 @@ var EngineActorDriver = class {
       this,
       registryConfig.test.enabled
     );
-    let hasDisconnected = false;
     const engineRunnerConfig = {
       version: this.#version,
       endpoint: getEndpoint(runConfig),
@@ -1626,30 +1632,9 @@ var EngineActorDriver = class {
       },
       prepopulateActorNames: buildActorNames(registryConfig),
       onConnected: () => {
-        if (hasDisconnected) {
-          logger4().info({
-            msg: "runner reconnected",
-            namespace: this.#runConfig.namespace,
-            runnerName: this.#runConfig.runnerName
-          });
-        } else {
-          logger4().debug({
-            msg: "runner connected",
-            namespace: this.#runConfig.namespace,
-            runnerName: this.#runConfig.runnerName
-          });
-        }
         this.#runnerStarted.resolve(void 0);
       },
-      onDisconnected: (code, reason) => {
-        logger4().warn({
-          msg: "runner disconnected",
-          namespace: this.#runConfig.namespace,
-          runnerName: this.#runConfig.runnerName,
-          code,
-          reason
-        });
-        hasDisconnected = true;
+      onDisconnected: (_code, _reason) => {
       },
       onShutdown: () => {
         this.#runnerStopped.resolve(void 0);
@@ -1687,16 +1672,31 @@ var EngineActorDriver = class {
           });
           return { enabled: false, lastMsgIndex: void 0 };
         }
-        const existingWs = handler.actor[PERSIST_SYMBOL].hibernatableWebSocket.find(
+        const hibernatableArray = handler.actor[PERSIST_SYMBOL].hibernatableWebSocket;
+        logger4().debug({
+          msg: "checking hibernatable websockets",
+          requestId: idToStr(requestId),
+          existingHibernatableWebSockets: hibernatableArray.length
+        });
+        const existingWs = hibernatableArray.find(
           (ws) => arrayBuffersEqual(ws.requestId, requestId)
         );
         let hibernationConfig;
         if (existingWs) {
+          logger4().debug({
+            msg: "found existing hibernatable websocket",
+            requestId: idToStr(requestId),
+            lastMsgIndex: existingWs.msgIndex
+          });
           hibernationConfig = {
             enabled: true,
             lastMsgIndex: Number(existingWs.msgIndex)
           };
         } else {
+          logger4().debug({
+            msg: "no existing hibernatable websocket found",
+            requestId: idToStr(requestId)
+          });
           if (path4 === PATH_CONNECT_WEBSOCKET) {
             hibernationConfig = {
               enabled: true,
@@ -1754,11 +1754,23 @@ var EngineActorDriver = class {
             };
           }
         }
-        handler.actor[PERSIST_SYMBOL].hibernatableWebSocket.push({
-          requestId,
-          lastSeenTimestamp: BigInt(Date.now()),
-          msgIndex: -1n
-        });
+        if (existingWs) {
+          logger4().debug({
+            msg: "updated existing hibernatable websocket timestamp",
+            requestId: idToStr(requestId)
+          });
+          existingWs.lastSeenTimestamp = BigInt(Date.now());
+        } else {
+          logger4().debug({
+            msg: "created new hibernatable websocket entry",
+            requestId: idToStr(requestId)
+          });
+          handler.actor[PERSIST_SYMBOL].hibernatableWebSocket.push({
+            requestId,
+            lastSeenTimestamp: BigInt(Date.now()),
+            msgIndex: -1n
+          });
+        }
         return hibernationConfig;
       }
     };
@@ -1807,6 +1819,11 @@ var EngineActorDriver = class {
     const handler = this.#actors.get(actorId);
     if (!handler) throw new Error(`Actor ${actorId} not loaded`);
     handler.persistedData = data;
+    logger4().debug({
+      msg: "writing persisted data for actor",
+      actorId,
+      dataSize: data.byteLength
+    });
     await this.#runner.kvPut(actorId, [[KEYS.PERSIST_DATA, data]]);
   }
   async setAlarm(actor2, timestamp) {
@@ -1826,7 +1843,7 @@ var EngineActorDriver = class {
   }
   // Runner lifecycle callbacks
   async #runnerOnActorStart(actorId, generation, actorConfig) {
-    var _a;
+    var _a, _b;
     logger4().debug({
       msg: "runner actor starting",
       actorId,
@@ -1849,6 +1866,12 @@ var EngineActorDriver = class {
         KEYS.PERSIST_DATA
       ]);
       handler.persistedData = persistedValue !== null ? persistedValue : serializeEmptyPersistData(input);
+      logger4().debug({
+        msg: "loaded persisted data for actor",
+        actorId,
+        dataSize: (_a = handler.persistedData) == null ? void 0 : _a.byteLength,
+        wasInStorage: persistedValue !== null
+      });
     }
     const name = actorConfig.name;
     invariant3(actorConfig.key, "actor should have a key");
@@ -1867,7 +1890,7 @@ var EngineActorDriver = class {
       "unknown"
       // TODO: Add regions
     );
-    (_a = handler.actorStartPromise) == null ? void 0 : _a.resolve();
+    (_b = handler.actorStartPromise) == null ? void 0 : _b.resolve();
     handler.actorStartPromise = void 0;
     logger4().debug({ msg: "runner actor started", actorId, name, key });
   }
@@ -1930,6 +1953,7 @@ var EngineActorDriver = class {
         encoding,
         connParams,
         requestId,
+        requestIdBuf,
         // Extract connId and connToken from protocols if needed
         void 0,
         void 0
@@ -1939,7 +1963,8 @@ var EngineActorDriver = class {
         request,
         url.pathname + url.search,
         this,
-        actorId
+        actorId,
+        requestIdBuf
       );
     } else {
       throw new Error(`Unreachable path: ${url.pathname}`);
@@ -2008,7 +2033,27 @@ var EngineActorDriver = class {
     this.#runner.sleepActor(actorId);
   }
   async shutdownRunner(immediate) {
-    logger4().info({ msg: "stopping engine actor driver" });
+    logger4().info({ msg: "stopping engine actor driver", immediate });
+    logger4().debug({
+      msg: "stopping all actors before shutdown",
+      actorCount: this.#actors.size
+    });
+    const stopPromises = [];
+    for (const [_actorId, handler] of this.#actors.entries()) {
+      if (handler.actor) {
+        stopPromises.push(
+          handler.actor._onStop().catch((err) => {
+            var _a;
+            (_a = handler.actor) == null ? void 0 : _a.rLog.error({
+              msg: "_onStop errored",
+              error: stringifyError(err)
+            });
+          })
+        );
+      }
+    }
+    await Promise.all(stopPromises);
+    logger4().debug({ msg: "all actors stopped" });
     if (this.#wsAckFlushInterval) {
       clearInterval(this.#wsAckFlushInterval);
       this.#wsAckFlushInterval = void 0;
@@ -2961,6 +3006,7 @@ var FileSystemManagerDriver = class {
         encoding,
         params,
         generateConnRequestId(),
+        void 0,
         connId,
         connToken
       );
@@ -2970,7 +3016,8 @@ var FileSystemManagerDriver = class {
         void 0,
         path4,
         this.#actorDriver,
-        actorId
+        actorId,
+        void 0
       );
       return new InlineWebSocketAdapter2(wsHandler);
     } else {
@@ -2997,6 +3044,7 @@ var FileSystemManagerDriver = class {
         encoding,
         connParams,
         generateConnRequestId(),
+        void 0,
         connId,
         connToken
       );
@@ -3006,7 +3054,8 @@ var FileSystemManagerDriver = class {
         c.req.raw,
         path4,
         this.#actorDriver,
-        actorId
+        actorId,
+        void 0
       );
       return upgradeWebSocket(() => wsHandler)(c, noopNext());
     } else {
@@ -4825,4 +4874,4 @@ export {
   setup
 };
 //! These configs configs hold anything that's not platform-specific about running actors.
-//# sourceMappingURL=chunk-HLZT5C6A.js.map
+//# sourceMappingURL=chunk-NOZSCUPQ.js.map