rivetkit 2.1.2 → 2.1.4

package/dist/tsup/{chunk-BSIJG3LG.js → chunk-M6H4XIF4.js}

@@ -5,7 +5,7 @@ import {
   ensureDirectoryExists,
   getStoragePath,
   lookupInRegistry
-} from "./chunk-RHUII57M.js";
+} from "./chunk-KTWY3K6Z.js";
 import {
   ClientConfigSchemaBase,
   RemoteManagerDriver,
@@ -16,7 +16,7 @@ import {
   getEndpoint,
   transformClientConfig,
   updateRunnerConfig
-} from "./chunk-HB4RGGMC.js";
+} from "./chunk-I6PL6QIY.js";
 import {
   CONN_STATE_MANAGER_SYMBOL,
   ENGINE_ENDPOINT,
@@ -30,7 +30,9 @@ import {
   buildActorNames,
   buildManagerRouter,
   createRouter,
+  crossPlatformServe,
   deserializeActorKey,
+  findFreePort,
   getInitialActorKvState,
   getNodeChildProcess,
   getNodeCrypto,
@@ -42,17 +44,18 @@ import {
   handleHealthRequest,
   handleMetadataRequest,
   importNodeDependencies,
+  logger,
   parseWebSocketProtocols,
   routeWebSocket,
   truncateRawWebSocketPathPrefix
-} from "./chunk-VMX4I4MP.js";
+} from "./chunk-UDMRZR6A.js";
 import {
   ActorConfigSchema,
   KEYS,
   event,
   loggerWithoutContext,
   queue
-} from "./chunk-PSUVV4HM.js";
+} from "./chunk-ANKZ2FS6.js";
 import {
   LogLevelSchema,
   VERSION,
@@ -71,7 +74,7 @@ import {
   promiseWithResolvers,
   setLongTimeout,
   stringifyError
-} from "./chunk-WUXR722E.js";
+} from "./chunk-DZXDUGLL.js";
 import {
   EndpointMismatch,
   InvalidRequest,
@@ -95,12 +98,13 @@ import { WSContext } from "hono/ws";
 import invariant from "invariant";
 
 // src/drivers/engine/log.ts
-function logger() {
+function logger2() {
   return getLogger("driver-engine");
 }
 
 // src/drivers/engine/actor-driver.ts
 var RUNNER_SSE_PING_INTERVAL = 1e3;
+var RUNNER_STOP_WAIT_MS = 15e3;
 var CONN_MESSAGE_ACK_DEADLINE = 5e3;
 var CONN_BUFFERED_MESSAGE_SIZE_THRESHOLD = 5e5;
 var EngineActorDriver = class {
@@ -110,8 +114,8 @@ var EngineActorDriver = class {
   #runner;
   #actors = /* @__PURE__ */ new Map();
   #actorRouter;
-  #runnerStarted = promiseWithResolvers((reason) => logger().warn({ msg: "unhandled runner started promise rejection", reason }));
-  #runnerStopped = promiseWithResolvers((reason) => logger().warn({ msg: "unhandled runner stopped promise rejection", reason }));
+  #runnerStarted = promiseWithResolvers((reason) => logger2().warn({ msg: "unhandled runner started promise rejection", reason }));
+  #runnerStopped = promiseWithResolvers((reason) => logger2().warn({ msg: "unhandled runner stopped promise rejection", reason }));
   #isRunnerStopped = false;
   // HACK: Track actor stop intent locally since the runner protocol doesn't
   // pass the stop reason to onActorStop. This will be fixed when the runner
@@ -173,7 +177,7 @@ var EngineActorDriver = class {
     };
     this.#runner = new Runner(engineRunnerConfig);
     this.#runner.start();
-    logger().debug({
+    logger2().debug({
       msg: "engine runner started",
       endpoint: config.endpoint,
       namespace: config.namespace,
@@ -188,6 +192,7 @@ var EngineActorDriver = class {
     if (!handler)
       throw new Error(`Actor handler does not exist ${actorId}`);
     if (handler.actorStartPromise) await handler.actorStartPromise.promise;
+    if (handler.actorStartError) throw handler.actorStartError;
     if (!handler.actor) throw new Error("Actor should be loaded");
     return handler;
   }
@@ -197,7 +202,7 @@ var EngineActorDriver = class {
   async setAlarm(actor2, timestamp) {
     const handler = this.#actors.get(actor2.id);
     if (!handler) {
-      logger().warn({
+      logger2().warn({
         msg: "no handler for actor to set alarm"
       });
       return;
@@ -230,7 +235,7 @@ var EngineActorDriver = class {
       new Uint8Array()
     );
     const keys = entries.map(([key]) => key);
-    logger().info({
+    logger2().info({
       msg: "kvList called",
       actorId,
       keysCount: keys.length,
@@ -240,7 +245,7 @@ var EngineActorDriver = class {
   }
   async kvListPrefix(actorId, prefix) {
     const result = await this.#runner.kvListPrefix(actorId, prefix);
-    logger().info({
+    logger2().info({
       msg: "kvListPrefix called",
       actorId,
       prefixStr: new TextDecoder().decode(prefix),
@@ -249,6 +254,12 @@ var EngineActorDriver = class {
     });
     return result;
   }
+  /** Creates a SQLite VFS instance for creating KV-backed databases */
+  async createSqliteVfs() {
+    const specifier = "@rivetkit/sqlite-vfs";
+    const { SqliteVfs } = await import(specifier);
+    return new SqliteVfs();
+  }
   // MARK: - Actor Lifecycle
   async loadActor(actorId) {
     const handler = await this.#loadActorHandler(actorId);
@@ -264,8 +275,8 @@ var EngineActorDriver = class {
     this.#runner.stopActor(actorId);
   }
   async shutdownRunner(immediate) {
-    logger().info({ msg: "stopping engine actor driver", immediate });
-    logger().debug({
+    logger2().info({ msg: "stopping engine actor driver", immediate });
+    logger2().debug({
       msg: "stopping all actors before shutdown",
       actorCount: this.#actors.size
     });
@@ -284,15 +295,39 @@ var EngineActorDriver = class {
       }
     }
     await Promise.all(stopPromises);
-    logger().debug({ msg: "all actors stopped" });
-    await this.#runner.shutdown(immediate);
+    logger2().debug({ msg: "all actors stopped" });
+    try {
+      await this.#runner.shutdown(immediate);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (message.includes("WebSocket connection closed during shutdown")) {
+        logger2().debug({
+          msg: "ignoring shutdown websocket close race",
+          error: message
+        });
+      } else {
+        throw error;
+      }
+    }
+    const stopped = await Promise.race([
+      this.#runnerStopped.promise.then(() => true),
+      new Promise(
+        (resolve) => setTimeout(() => resolve(false), RUNNER_STOP_WAIT_MS)
+      )
+    ]);
+    if (!stopped) {
+      logger2().warn({
+        msg: "timed out waiting for runner shutdown",
+        waitMs: RUNNER_STOP_WAIT_MS
+      });
+    }
   }
   async serverlessHandleStart(c) {
     return streamSSE(c, async (stream) => {
       stream.onAbort(() => {
       });
       c.req.raw.signal.addEventListener("abort", () => {
-        logger().debug("SSE aborted, shutting down runner");
+        logger2().debug("SSE aborted, shutting down runner");
         this.shutdownRunner(false);
       });
       await this.#runnerStarted.promise;
@@ -301,13 +336,13 @@ var EngineActorDriver = class {
       await stream.writeSSE({ data: payload });
       while (true) {
         if (this.#isRunnerStopped) {
-          logger().debug({
+          logger2().debug({
             msg: "runner is stopped"
           });
           break;
         }
         if (stream.closed || stream.aborted) {
-          logger().debug({
+          logger2().debug({
             msg: "runner sse stream closed",
             closed: stream.closed,
             aborted: stream.aborted
@@ -322,7 +357,7 @@ var EngineActorDriver = class {
   }
   async #runnerOnActorStart(actorId, generation, actorConfig) {
     var _a;
-    logger().debug({
+    logger2().debug({
       msg: "runner actor starting",
       actorId,
       name: actorConfig.name,
@@ -336,10 +371,11 @@ var EngineActorDriver = class {
     let handler = this.#actors.get(actorId);
     if (!handler) {
       handler = {
-        actorStartPromise: promiseWithResolvers((reason) => logger().warn({ msg: "unhandled actor start promise rejection", reason }))
+        actorStartPromise: promiseWithResolvers((reason) => logger2().warn({ msg: "unhandled actor start promise rejection", reason }))
       };
       this.#actors.set(actorId, handler);
     }
+    handler.actorStartError = void 0;
     const name = actorConfig.name;
     invariant(actorConfig.key, "actor should have a key");
     const key = deserializeActorKey(actorConfig.key);
@@ -350,12 +386,12 @@ var EngineActorDriver = class {
       if (persistDataBuffer === null) {
         const initialKvState = getInitialActorKvState(input);
         await this.#runner.kvPut(actorId, initialKvState);
-        logger().debug({
+        logger2().debug({
           msg: "initialized persist data for new actor",
           actorId
         });
       } else {
-        logger().debug({
+        logger2().debug({
           msg: "found existing persist data for actor",
           actorId,
           dataSize: persistDataBuffer.byteLength
@@ -363,6 +399,21 @@ var EngineActorDriver = class {
       }
       const definition = lookupInRegistry(this.#config, actorConfig.name);
       handler.actor = await definition.instantiate();
+      const protocolMetadata = this.#runner.getProtocolMetadata();
+      if (protocolMetadata) {
+        logger2().debug({
+          msg: "applying config limits from protocol",
+          protocolMetadata
+        });
+        const stopThresholdMax = Math.max(Number(protocolMetadata.actorStopThreshold) - 1e3, 0);
+        handler.actor.overrides.onSleepTimeout = stopThresholdMax;
+        handler.actor.overrides.onDestroyTimeout = stopThresholdMax;
+        if (protocolMetadata.serverlessDrainGracePeriod) {
+          const drainMax = Math.max(Number(protocolMetadata.serverlessDrainGracePeriod) - 1e3, 0);
+          handler.actor.overrides.runStopTimeout = drainMax;
+          handler.actor.overrides.waitUntilTimeout = drainMax;
+        }
+      }
       await handler.actor.start(
         this,
         this.#inlineClient,
@@ -372,38 +423,71 @@ var EngineActorDriver = class {
         "unknown"
         // TODO: Add regions
       );
-      logger().debug({ msg: "runner actor started", actorId, name, key });
+      logger2().debug({ msg: "runner actor started", actorId, name, key });
     } catch (innerError) {
-      const error = new Error(
-        `Failed to start actor ${actorId}: ${innerError}`,
+      const error = innerError instanceof Error ? new Error(
+        `Failed to start actor ${actorId}: ${innerError.message}`,
         { cause: innerError }
-      );
+      ) : new Error(`Failed to start actor ${actorId}: ${String(innerError)}`);
+      handler.actor = void 0;
+      handler.actorStartError = error;
       (_a = handler.actorStartPromise) == null ? void 0 : _a.reject(error);
       handler.actorStartPromise = void 0;
-      throw error;
+      logger2().error({
+        msg: "runner actor failed to start",
+        actorId,
+        name,
+        key,
+        err: stringifyError(error)
+      });
+      try {
+        this.#runner.stopActor(actorId);
+      } catch (stopError) {
+        logger2().debug({
+          msg: "failed to stop actor after start failure",
+          actorId,
+          err: stringifyError(stopError)
+        });
+      }
     }
   }
   async #runnerOnActorStop(actorId, generation) {
-    logger().debug({ msg: "runner actor stopping", actorId, generation });
+    logger2().debug({ msg: "runner actor stopping", actorId, generation });
     const reason = this.#actorStopIntent.get(actorId) ?? "sleep";
     this.#actorStopIntent.delete(actorId);
     const handler = this.#actors.get(actorId);
-    if (handler == null ? void 0 : handler.actor) {
+    if (!handler) {
+      logger2().debug({ msg: "no runner actor handler to stop", actorId, reason });
+      return;
+    }
+    if (handler.actorStartPromise) {
+      try {
+        logger2().debug({ msg: "runner actor stopping before it started, waiting", actorId, generation });
+        await handler.actorStartPromise.promise;
+      } catch (err) {
+        logger2().debug({
+          msg: "actor start failed during stop, cleaning up handler",
+          actorId,
+          err: stringifyError(err)
+        });
+      }
+    }
+    if (handler.actor) {
       try {
         await handler.actor.onStop(reason);
       } catch (err) {
-        logger().error({
+        logger2().error({
           msg: "error in onStop, proceeding with removing actor",
           err: stringifyError(err)
         });
       }
-      this.#actors.delete(actorId);
     }
-    logger().debug({ msg: "runner actor stopped", actorId, reason });
+    this.#actors.delete(actorId);
+    logger2().debug({ msg: "runner actor stopped", actorId, reason });
   }
   // MARK: - Runner Networking
   async #runnerFetch(_runner, actorId, _gatewayIdBuf, _requestIdBuf, request) {
-    logger().debug({
+    logger2().debug({
       msg: "runner fetch",
       actorId,
       url: request.url,
@@ -416,7 +500,7 @@ var EngineActorDriver = class {
     const websocket = websocketRaw;
     const wsUniqueId = `ws_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
     websocket.__rivet_ws_id = wsUniqueId;
-    logger().debug({
+    logger2().debug({
       msg: "runner websocket",
       actorId,
       url: request.url,
@@ -445,7 +529,7 @@ var EngineActorDriver = class {
         isRestoringHibernatable
       );
     } catch (err) {
-      logger().error({ msg: "building websocket handlers errored", err });
+      logger2().error({ msg: "building websocket handlers errored", err });
       websocketRaw.close(1011, "ws.route_error");
       return;
     }
@@ -454,7 +538,7 @@ var EngineActorDriver = class {
     const conn = wsHandler.conn;
     const actor2 = wsHandler.actor;
     const connStateManager = conn == null ? void 0 : conn[CONN_STATE_MANAGER_SYMBOL];
-    logger().debug({
+    logger2().debug({
       msg: "attaching websocket event listeners",
       actorId,
       connId: conn == null ? void 0 : conn.id,
@@ -470,7 +554,7 @@ var EngineActorDriver = class {
     });
     websocket.addEventListener("message", (event3) => {
       var _a2, _b2;
-      logger().debug({
+      logger2().debug({
         msg: "websocket message event listener triggered",
         connId: conn == null ? void 0 : conn.id,
         actorId: actor2 == null ? void 0 : actor2.id,
@@ -483,7 +567,7 @@ var EngineActorDriver = class {
         eventTargetWsId: (_b2 = event3.target) == null ? void 0 : _b2.__rivet_ws_id
       });
       if (actor2 == null ? void 0 : actor2.isStopping) {
-        logger().debug({
+        logger2().debug({
           msg: "ignoring ws message, actor is stopping",
           connId: conn == null ? void 0 : conn.id,
           actorId: actor2 == null ? void 0 : actor2.id,
@@ -491,7 +575,7 @@ var EngineActorDriver = class {
         });
         return;
       }
-      logger().debug({
+      logger2().debug({
         msg: "calling wsHandler.onMessage",
         connId: conn == null ? void 0 : conn.id,
         messageIndex: event3.rivetMessageIndex
@@ -505,7 +589,7 @@ var EngineActorDriver = class {
         );
         const previousMsgIndex = hibernate.serverMessageIndex;
         hibernate.serverMessageIndex = event3.rivetMessageIndex;
-        logger().info({
+        logger2().info({
           msg: "persisting message index",
           connId: conn.id,
           previousMsgIndex,
@@ -540,7 +624,7 @@ var EngineActorDriver = class {
       wsHandler.onError(event3, wsContext);
     });
     if (isRestoringHibernatable) {
-      logger().info({
+      logger2().info({
         msg: "event listeners attached to restored websocket",
         actorId,
         connId: conn == null ? void 0 : conn.id,
@@ -558,7 +642,7 @@ var EngineActorDriver = class {
     const path = url.pathname;
     const actorInstance = this.#runner.getActor(actorId);
     if (!actorInstance) {
-      logger().warn({
+      logger2().warn({
         msg: "actor not found in #hwsCanHibernate",
         actorId
       });
@@ -566,20 +650,20 @@ var EngineActorDriver = class {
     }
     const handler = this.#actors.get(actorId);
     if (!handler) {
-      logger().warn({
+      logger2().warn({
         msg: "actor handler not found in #hwsCanHibernate",
         actorId
       });
       return false;
     }
     if (!handler.actor) {
-      logger().warn({
+      logger2().warn({
         msg: "actor not found in #hwsCanHibernate",
         actorId
       });
       return false;
     }
-    logger().debug({
+    logger2().debug({
       msg: "no existing hibernatable websocket found",
       gatewayId: idToStr(gatewayId),
       requestId: idToStr(requestId)
@@ -606,7 +690,7 @@ var EngineActorDriver = class {
           const canHibernate = canHibernateWebSocket(truncatedRequest);
           return canHibernate;
         } catch (error) {
-          logger().error({
+          logger2().error({
             msg: "error calling canHibernateWebSocket",
             error
           });
@@ -618,7 +702,7 @@ var EngineActorDriver = class {
     } else if (path === PATH_INSPECTOR_CONNECT) {
       return false;
     } else {
-      logger().warn({
+      logger2().warn({
         msg: "unexpected path for getActorHibernationConfig",
         path
       });
@@ -645,6 +729,7 @@ var EngineActorDriver = class {
     var _a;
     const handler = this.#actors.get(actor2.id);
     invariant(handler, "missing actor handler in onBeforeActorReady");
+    handler.actorStartError = void 0;
     (_a = handler.actorStartPromise) == null ? void 0 : _a.resolve();
     handler.actorStartPromise = void 0;
     const metaEntries = await this.#hwsLoadAll(actor2.id);
@@ -659,7 +744,7 @@ var EngineActorDriver = class {
       pendingAckFromMessageIndex: false,
       pendingAckFromBufferSize: false
     });
-    logger().debug({
+    logger2().debug({
       msg: "created #hwsMessageIndex entry",
       connId: conn.id,
       serverMessageIndex: hibernatable.serverMessageIndex
@@ -667,7 +752,7 @@ var EngineActorDriver = class {
   }
   onDestroyConn(conn) {
     this.#hwsMessageIndex.delete(conn.id);
-    logger().debug({
+    logger2().debug({
       msg: "removed #hwsMessageIndex entry",
       connId: conn.id
     });
@@ -677,7 +762,7 @@ var EngineActorDriver = class {
     const hibernatable = stateManager.hibernatableDataOrError();
     const entry = this.#hwsMessageIndex.get(conn.id);
     if (!entry) {
-      logger().warn({
+      logger2().warn({
         msg: "missing EngineActorDriver.#hwsMessageIndex entry for conn",
         connId: conn.id
       });
@@ -691,7 +776,7 @@ var EngineActorDriver = class {
     const hibernatable = stateManager.hibernatableDataOrError();
     const entry = this.#hwsMessageIndex.get(conn.id);
     if (!entry) {
-      logger().warn({
+      logger2().warn({
         msg: "missing EngineActorDriver.#hwsMessageIndex entry for conn",
         connId: conn.id
       });
@@ -876,7 +961,7 @@ function chooseDefaultDriver(config) {
 }
 
 // src/engine-process/log.ts
-function logger2() {
+function logger3() {
   return getLogger("engine-process");
 }
 
@@ -885,7 +970,7 @@ var ENGINE_BASE_URL = "https://releases.rivet.dev/rivet";
 var ENGINE_BINARY_NAME = "rivet-engine";
 async function ensureEngineProcess(options) {
   importNodeDependencies();
-  logger2().debug({
+  logger3().debug({
     msg: "ensuring engine process",
     version: options.version
   });
@@ -900,13 +985,13 @@ async function ensureEngineProcess(options) {
   if (await isEngineRunning()) {
     try {
       const health = await waitForEngineHealth();
-      logger2().debug({
+      logger3().debug({
         msg: "engine already running and healthy",
         version: health.version
       });
       return;
     } catch (error) {
-      logger2().warn({
+      logger3().warn({
         msg: "existing engine process not healthy, cannot restart automatically",
         error
       });
@@ -928,7 +1013,7 @@ async function ensureEngineProcess(options) {
   const stderrStream = fsSync.createWriteStream(stderrLogPath, {
     flags: "a"
   });
-  logger2().debug({
+  logger3().debug({
     msg: "creating engine log files",
     stdout: stdoutLogPath,
     stderr: stderrLogPath
@@ -985,7 +1070,7 @@ async function ensureEngineProcess(options) {
     });
     child.stderr.pipe(stderrStream);
   }
-  logger2().debug({
+  logger3().debug({
     msg: "spawned engine process",
     pid: child.pid,
     cwd: path.dirname(binaryPath)
@@ -993,7 +1078,7 @@ async function ensureEngineProcess(options) {
   child.once("exit", (code, signal) => {
     const stderrOutput = Buffer.concat(stderrChunks).toString("utf-8");
     if (stderrOutput.includes("LOCK: Resource temporarily unavailable")) {
-      logger2().error({
+      logger3().error({
         msg: "another instance of rivet engine is unexpectedly running, this is an internal error",
         code,
         signal,
@@ -1003,7 +1088,7 @@ async function ensureEngineProcess(options) {
         support: "https://rivet.dev/discord"
       });
     } else if (stderrOutput.includes("Rivet Engine has been rolled back to a previous version")) {
-      logger2().error({
+      logger3().error({
         msg: "rivet engine version downgrade detected",
         hint: `You attempted to downgrade the RivetKit version in development. To fix this, nuke the database by running: '${binaryPath}' database nuke --yes`,
         code,
@@ -1012,7 +1097,7 @@ async function ensureEngineProcess(options) {
         stderrLog: stderrLogPath
       });
     } else {
-      logger2().warn({
+      logger3().warn({
         msg: "engine process exited, please report this error",
         code,
         signal,
@@ -1026,7 +1111,7 @@ async function ensureEngineProcess(options) {
     stderrStream.end();
   });
   child.once("error", (error) => {
-    logger2().error({
+    logger3().error({
       msg: "engine process failed",
       error
     });
@@ -1034,7 +1119,7 @@ async function ensureEngineProcess(options) {
     stderrStream.end();
   });
   await waitForEngineHealth();
-  logger2().info({
+  logger3().info({
     msg: "engine process started",
     pid: child.pid,
     version: options.version,
@@ -1047,7 +1132,7 @@ async function ensureEngineProcess(options) {
 async function downloadEngineBinaryIfNeeded(binaryPath, version, varDir) {
   const binaryExists = await fileExists(binaryPath);
   if (binaryExists) {
-    logger2().debug({
+    logger3().debug({
       msg: "engine binary already cached",
       version,
       path: binaryPath
@@ -1057,7 +1142,7 @@ async function downloadEngineBinaryIfNeeded(binaryPath, version, varDir) {
   const { targetTriplet, extension } = resolveTargetTriplet();
   const remoteFile = `${ENGINE_BINARY_NAME}-${targetTriplet}${extension}`;
   const downloadUrl = `${ENGINE_BASE_URL}/${version}/engine/${remoteFile}`;
-  logger2().info({
+  logger3().info({
     msg: "downloading engine binary",
     url: downloadUrl,
     path: binaryPath,
@@ -1072,13 +1157,13 @@ async function downloadEngineBinaryIfNeeded(binaryPath, version, varDir) {
   const crypto2 = getNodeCrypto();
   const tempPath = `${binaryPath}.${crypto2.randomUUID()}.tmp`;
   const startTime = Date.now();
-  logger2().debug({
+  logger3().debug({
     msg: "starting binary download",
     tempPath,
     contentLength: response.headers.get("content-length")
   });
   const slowDownloadWarning = setTimeout(() => {
-    logger2().warn({
+    logger3().warn({
       msg: "engine binary download is taking longer than expected, please be patient",
       version
     });
@@ -1098,21 +1183,21 @@ async function downloadEngineBinaryIfNeeded(binaryPath, version, varDir) {
       await fs.chmod(tempPath, 493);
     }
     await fs.rename(tempPath, binaryPath);
-    logger2().debug({
+    logger3().debug({
       msg: "engine binary download complete",
       version,
       path: binaryPath,
       size: stats.size,
       durationMs: downloadDuration
     });
-    logger2().info({
+    logger3().info({
       msg: "engine binary downloaded",
       version,
       path: binaryPath
     });
   } catch (error) {
     clearTimeout(slowDownloadWarning);
-    logger2().warn({
+    logger3().warn({
       msg: "engine download failed, please report this error",
       tempPath,
       error,
@@ -1174,13 +1259,13 @@ async function checkIfEngineAlreadyRunningOnPort(port) {
   if (response.ok) {
     const health = await response.json();
     if (health.runtime === "engine") {
-      logger2().debug({
+      logger3().debug({
         msg: "rivet engine already running on port",
         port
       });
       return true;
     } else if (health.runtime === "rivetkit") {
-      logger2().error({
+      logger3().error({
         msg: "another rivetkit process is already running on port",
         port
       });
@@ -1208,7 +1293,7 @@ var HEALTH_MAX_WAIT = 1e4;
 var HEALTH_INTERVAL = 100;
 async function waitForEngineHealth() {
   const maxRetries = Math.ceil(HEALTH_MAX_WAIT / HEALTH_INTERVAL);
-  logger2().debug({ msg: "waiting for engine health check" });
+  logger3().debug({ msg: "waiting for engine health check" });
   for (let i = 0; i < maxRetries; i++) {
     try {
       const response = await fetch(`${ENGINE_ENDPOINT}/health`, {
@@ -1216,11 +1301,11 @@ async function waitForEngineHealth() {
       });
       if (response.ok) {
         const health = await response.json();
-        logger2().debug({ msg: "engine health check passed" });
+        logger3().debug({ msg: "engine health check passed" });
         return health;
       }
     } catch (error) {
-      logger2().debug({ msg: "engine health check failed", error });
+      logger3().debug({ msg: "engine health check failed", error });
       if (i === maxRetries - 1) {
         throw new Error(
           `engine health check failed after ${maxRetries} retries: ${error}`
@@ -1228,7 +1313,7 @@ async function waitForEngineHealth() {
       }
     }
     if (i < maxRetries - 1) {
-      logger2().trace({
+      logger3().trace({
         msg: "engine not ready, retrying",
         attempt: i + 1,
         maxRetries
@@ -1250,14 +1335,14 @@ function getInspectorUrl(config, managerPort) {
 }
 
 // src/serverless/log.ts
-function logger3() {
+function logger4() {
   return getLogger("serverless");
 }
 
 // src/serverless/configure.ts
 import invariant2 from "invariant";
 async function configureServerlessRunner(config) {
-  logger3().debug("configuring serverless runner");
+  logger4().debug("configuring serverless runner");
   try {
     if (!config.namespace) {
       throw new Error(
@@ -1272,13 +1357,13 @@ async function configureServerlessRunner(config) {
     const customConfig = config.serverless.configureRunnerPool;
     invariant2(customConfig, "configureRunnerPool should exist");
     const clientConfig = convertRegistryConfigToClientConfig(config);
-    logger3().debug({
+    logger4().debug({
       msg: "fetching datacenters",
       endpoint: config.endpoint
     });
     const dcsRes = await getDatacenters(clientConfig);
     const runnerName = customConfig.name ?? "default";
-    logger3().debug({
+    logger4().debug({
       msg: "configuring serverless runner",
       runnerName,
       namespace: config.namespace
@@ -1303,143 +1388,19 @@ async function configureServerlessRunner(config) {
         dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig])
       )
     });
-    logger3().info({
+    logger4().info({
       msg: "serverless runner configured successfully",
       runnerName,
       namespace: config.namespace
     });
   } catch (error) {
-    logger3().error({
+    logger4().error({
       msg: "failed to configure serverless runner, validate endpoint is configured correctly then restart this process",
       error
     });
   }
 }
 
-// src/registry/log.ts
-function logger4() {
-  return getLogger("registry");
-}
-
-// src/registry/serve.ts
-import getPort from "get-port";
-var DEFAULT_PORT = 6420;
-async function findFreePort(startPort = DEFAULT_PORT) {
-  function* portRange(start, count = 100) {
-    for (let i = 0; i < count; i++) {
-      yield start + i;
-    }
-  }
-  return getPort({ port: portRange(startPort) });
-}
-async function crossPlatformServe(config, managerPort, app) {
-  const runtime = detectRuntime();
-  logger4().debug({ msg: "detected runtime for serve", runtime });
-  switch (runtime) {
-    case "deno":
-      return serveDeno(config, managerPort, app);
-    case "bun":
-      return serveBun(config, managerPort, app);
-    case "node":
-      return serveNode(config, managerPort, app);
-    default:
-      return serveNode(config, managerPort, app);
-  }
-}
-async function serveNode(config, managerPort, app) {
-  const nodeServerModule = "@hono/node-server";
-  let serve;
-  try {
-    const dep = await import(
-      /* webpackIgnore: true */
-      nodeServerModule
-    );
-    serve = dep.serve;
-  } catch (err) {
-    logger4().error({
-      msg: "failed to import @hono/node-server. please run 'npm install @hono/node-server @hono/node-ws'",
-      error: stringifyError(err)
-    });
-    process.exit(1);
-  }
-  const nodeWsModule = "@hono/node-ws";
-  let createNodeWebSocket;
-  try {
-    const dep = await import(
-      /* webpackIgnore: true */
-      nodeWsModule
-    );
-    createNodeWebSocket = dep.createNodeWebSocket;
-  } catch (err) {
-    logger4().error({
-      msg: "failed to import @hono/node-ws. please run 'npm install @hono/node-server @hono/node-ws'",
-      error: stringifyError(err)
-    });
-    process.exit(1);
-  }
-  const { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({
-    app
-  });
-  const port = managerPort;
-  const hostname = config.managerHost;
-  const server = serve(
-    { fetch: app.fetch, port, hostname },
-    () => logger4().info({ msg: "server listening", port, hostname })
-  );
-  injectWebSocket(server);
-  return { upgradeWebSocket };
-}
-async function serveDeno(config, managerPort, app) {
-  const honoDenoModule = "hono/deno";
-  let upgradeWebSocket;
-  try {
-    const dep = await import(
-      /* webpackIgnore: true */
-      honoDenoModule
-    );
-    upgradeWebSocket = dep.upgradeWebSocket;
-  } catch (err) {
-    logger4().error({
-      msg: "failed to import hono/deno",
-      error: stringifyError(err)
-    });
-    process.exit(1);
-  }
-  const port = config.managerPort;
-  const hostname = config.managerHost;
-  Deno.serve({ port, hostname }, app.fetch);
-  logger4().info({ msg: "server listening", port, hostname });
-  return { upgradeWebSocket };
-}
-async function serveBun(config, managerPort, app) {
-  const honoBunModule = "hono/bun";
-  let createBunWebSocket;
-  try {
-    const dep = await import(
-      /* webpackIgnore: true */
-      honoBunModule
-    );
-    createBunWebSocket = dep.createBunWebSocket;
-  } catch (err) {
-    logger4().error({
-      msg: "failed to import hono/bun",
-      error: stringifyError(err)
-    });
-    process.exit(1);
-  }
-  const { websocket, upgradeWebSocket } = createBunWebSocket();
-  const port = config.managerPort;
-  const hostname = config.managerHost;
-  Bun.serve({
-    fetch: app.fetch,
-    port,
-    hostname,
-    websocket
-  });
-  logger4().info({ msg: "server listening", port, hostname });
-  return { upgradeWebSocket };
-}
-
 // src/serverless/router.ts
 import invariant3 from "invariant";
 
@@ -1484,7 +1445,7 @@ function buildServerlessRouter(driverConfig, config) {
         );
       }
       const { endpoint, token, totalSlots, runnerName, namespace } = parseResult.data;
-      logger3().debug({
+      logger4().debug({
         msg: "received serverless runner start request",
         endpoint,
         totalSlots,
@@ -1612,7 +1573,7 @@ var Runtime = class _Runtime {
   }
   static async create(registry) {
     var _a, _b, _c;
-    logger4().info("rivetkit starting");
+    logger().info("rivetkit starting");
     const config = registry.parseConfig();
     if ((_a = config.logging) == null ? void 0 : _a.baseLogger) {
       configureBaseLogger(config.logging.baseLogger);
@@ -1628,7 +1589,7 @@ var Runtime = class _Runtime {
     let managerPort;
     if (config.serverless.spawnEngine) {
       managerPort = ENGINE_PORT;
-      logger4().debug({
+      logger().debug({
         msg: "spawning engine",
         version: config.serverless.engineVersion
       });
@@ -1637,16 +1598,18 @@ var Runtime = class _Runtime {
       });
     } else if (config.serveManager) {
       const configuredManagerPort = config.managerPort;
+      const serveRuntime = detectRuntime();
       let upgradeWebSocket;
       const getUpgradeWebSocket = () => upgradeWebSocket;
       managerDriver.setGetUpgradeWebSocket(getUpgradeWebSocket);
       const { router: managerRouter } = buildManagerRouter(
         config,
         managerDriver,
-        getUpgradeWebSocket
+        getUpgradeWebSocket,
+        serveRuntime
       );
       managerPort = await findFreePort(config.managerPort);
-      logger4().debug({
+      logger().debug({
         msg: "serving manager",
         port: managerPort
       });
@@ -1658,7 +1621,8 @@ var Runtime = class _Runtime {
       const out = await crossPlatformServe(
         config,
         managerPort,
-        managerRouter
+        managerRouter,
+        serveRuntime
       );
       upgradeWebSocket = out.upgradeWebSocket;
     }
@@ -1670,7 +1634,7 @@ var Runtime = class _Runtime {
       managerPort
     );
     const driverLog = ((_c = managerDriver.extraStartupLog) == null ? void 0 : _c.call(managerDriver)) ?? {};
-    logger4().info({
+    logger().info({
       msg: "rivetkit ready",
       driver: driver.name,
       definitions: Object.keys(config.use).length,
@@ -1696,7 +1660,7 @@ var Runtime = class _Runtime {
     invariant4(!this.#startKind, "Runtime already started as serverless");
     this.#startKind = "runner";
     if (this.#config.runner && this.#driver.autoStartActorDriver) {
-      logger4().debug("starting actor driver");
+      logger().debug("starting actor driver");
       const inlineClient = createClientWithDriver(
         this.#managerDriver
       );
@@ -1868,4 +1832,4 @@ export {
   Registry,
   setup
 };
-//# sourceMappingURL=chunk-BSIJG3LG.js.map
+//# sourceMappingURL=chunk-M6H4XIF4.js.map