rivetkit 2.0.6 → 2.0.7-rc.1

package/dist/tsup/{chunk-W6LN7AF5.js → chunk-HPT3I7UU.js}

@@ -1,19 +1,23 @@
+import {
+  configureInspectorAccessToken,
+  getInspectorUrl,
+  inspectorLogger,
+  isInspectorEnabled,
+  secureInspector
+} from "./chunk-4GP7BZSR.js";
 import {
   ActorDefinition,
-  CONNECTION_DRIVER_HTTP,
-  CONNECTION_DRIVER_SSE,
-  CONNECTION_DRIVER_WEBSOCKET,
   RemoteManagerDriver,
   createActorInspectorRouter,
   createClientWithDriver,
   deserializeActorKey,
-  generateConnId,
-  generateConnToken,
-  lookupInRegistry
-} from "./chunk-4CKHQRXG.js";
+  generateConnSocketId,
+  lookupInRegistry,
+  serializeActorKey
+} from "./chunk-BW5DPM6Z.js";
 import {
   CreateActorSchema
-} from "./chunk-ZYLTS2EM.js";
+} from "./chunk-GZVBFXBI.js";
 import {
   ActionContext,
   HTTP_ACTION_REQUEST_VERSIONED,
@@ -24,42 +28,50 @@ import {
   createVersionedDataHandler,
   parseMessage,
   serializeEmptyPersistData
-} from "./chunk-7OUKNSTU.js";
+} from "./chunk-JD54PXWP.js";
 import {
   EncodingSchema,
   HEADER_ACTOR_ID,
-  HEADER_AUTH_DATA,
   HEADER_CONN_ID,
   HEADER_CONN_PARAMS,
   HEADER_CONN_TOKEN,
   HEADER_ENCODING,
+  HEADER_RIVET_ACTOR,
+  HEADER_RIVET_TARGET,
   PATH_CONNECT_WEBSOCKET,
   PATH_RAW_WEBSOCKET_PREFIX,
+  WS_PROTOCOL_ACTOR,
+  WS_PROTOCOL_CONN_ID,
+  WS_PROTOCOL_CONN_PARAMS,
+  WS_PROTOCOL_CONN_TOKEN,
+  WS_PROTOCOL_ENCODING,
+  WS_PROTOCOL_PATH,
+  WS_PROTOCOL_TARGET,
+  WS_PROTOCOL_TRANSPORT,
   contentTypeForEncoding,
   deserializeWithEncoding,
-  encodeDataToString,
   encodingIsBinary,
   generateRandomString,
   loggerWithoutContext,
   serializeWithEncoding
-} from "./chunk-2K3JMDAN.js";
+} from "./chunk-YQ4XQYPM.js";
 import {
   configureBaseLogger,
   configureDefaultLogger,
   getLogger
-} from "./chunk-WC2PSJWN.js";
+} from "./chunk-PUSQNDJG.js";
 import {
   bufferToArrayBuffer,
   deconstructError,
   getEnvUniversal,
   noopNext,
   package_default,
+  promiseWithResolvers,
   setLongTimeout,
   stringifyError
-} from "./chunk-RGQR2J7S.js";
+} from "./chunk-RVP5RUSC.js";
 import {
   ActorAlreadyExists,
-  ActorNotFound,
   ConnNotFound,
   IncorrectConnToken,
   InternalError,
@@ -127,163 +139,15 @@ var ActorConfigSchema = z.object({
   }
 );
 
-// src/actor/generic-conn-driver.ts
-var GenericConnGlobalState = class {
-  websockets = /* @__PURE__ */ new Map();
-  sseStreams = /* @__PURE__ */ new Map();
-};
-function createGenericConnDrivers(globalState) {
-  return {
-    [CONNECTION_DRIVER_WEBSOCKET]: createGenericWebSocketDriver(globalState),
-    [CONNECTION_DRIVER_SSE]: createGenericSseDriver(globalState),
-    [CONNECTION_DRIVER_HTTP]: createGenericHttpDriver()
-  };
-}
-function createGenericWebSocketDriver(globalState) {
-  return {
-    sendMessage: (actor2, conn, state, message) => {
-      const ws = globalState.websockets.get(conn.id);
-      if (!ws) {
-        actor2.rLog.warn({
-          msg: "missing ws for sendMessage",
-          actorId: actor2.id,
-          connId: conn.id,
-          totalCount: globalState.websockets.size
-        });
-        return;
-      }
-      const serialized = message.serialize(state.encoding);
-      actor2.rLog.debug({
-        msg: "sending websocket message",
-        encoding: state.encoding,
-        dataType: typeof serialized,
-        isUint8Array: serialized instanceof Uint8Array,
-        isArrayBuffer: serialized instanceof ArrayBuffer,
-        dataLength: serialized.byteLength || serialized.length
-      });
-      if (serialized instanceof Uint8Array) {
-        const buffer = serialized.buffer.slice(
-          serialized.byteOffset,
-          serialized.byteOffset + serialized.byteLength
-        );
-        if (buffer instanceof SharedArrayBuffer) {
-          const arrayBuffer = new ArrayBuffer(buffer.byteLength);
-          new Uint8Array(arrayBuffer).set(new Uint8Array(buffer));
-          actor2.rLog.debug({
-            msg: "converted SharedArrayBuffer to ArrayBuffer",
-            byteLength: arrayBuffer.byteLength
-          });
-          ws.send(arrayBuffer);
-        } else {
-          actor2.rLog.debug({
-            msg: "sending ArrayBuffer",
-            byteLength: buffer.byteLength
-          });
-          ws.send(buffer);
-        }
-      } else {
-        actor2.rLog.debug({
-          msg: "sending string data",
-          length: serialized.length
-        });
-        ws.send(serialized);
-      }
-    },
-    disconnect: async (actor2, conn, _state, reason) => {
-      const ws = globalState.websockets.get(conn.id);
-      if (!ws) {
-        actor2.rLog.warn({
-          msg: "missing ws for disconnect",
-          actorId: actor2.id,
-          connId: conn.id,
-          totalCount: globalState.websockets.size
-        });
-        return;
-      }
-      const raw = ws.raw;
-      if (!raw) {
-        actor2.rLog.warn({ msg: "ws.raw does not exist" });
-        return;
-      }
-      const { promise, resolve } = Promise.withResolvers();
-      raw.addEventListener("close", () => resolve());
-      ws.close(1e3, reason);
-      await promise;
-    },
-    getConnectionReadyState: (actor2, conn) => {
-      const ws = globalState.websockets.get(conn.id);
-      if (!ws) {
-        actor2.rLog.warn({
-          msg: "missing ws for getConnectionReadyState",
-          connId: conn.id
-        });
-        return void 0;
-      }
-      const raw = ws.raw;
-      return raw.readyState;
-    }
-  };
-}
-function createGenericSseDriver(globalState) {
-  return {
-    sendMessage: (actor2, conn, state, message) => {
-      const stream = globalState.sseStreams.get(conn.id);
-      if (!stream) {
-        actor2.rLog.warn({
-          msg: "missing sse stream for sendMessage",
-          connId: conn.id
-        });
-        return;
-      }
-      stream.writeSSE({
-        data: encodeDataToString(message.serialize(state.encoding))
-      });
-    },
-    disconnect: async (actor2, conn, _state, _reason) => {
-      const stream = globalState.sseStreams.get(conn.id);
-      if (!stream) {
-        actor2.rLog.warn({
-          msg: "missing sse stream for disconnect",
-          connId: conn.id
-        });
-        return;
-      }
-      stream.close();
-    },
-    getConnectionReadyState: (actor2, conn) => {
-      const stream = globalState.sseStreams.get(conn.id);
-      if (!stream) {
-        actor2.rLog.warn({
-          msg: "missing sse stream for getConnectionReadyState",
-          connId: conn.id
-        });
-        return void 0;
-      }
-      if (stream.aborted || stream.closed) {
-        return 3 /* CLOSED */;
-      }
-      return 1 /* OPEN */;
-    }
-  };
-}
-function createGenericHttpDriver() {
-  return {
-    getConnectionReadyState(_actor, _conn) {
-      return 1 /* OPEN */;
-    },
-    disconnect: async () => {
-    }
-  };
-}
-
 // src/actor/router.ts
 import { Hono } from "hono";
 import { cors } from "hono/cors";
-import invariant from "invariant";
+import invariant2 from "invariant";
 
 // src/actor/router-endpoints.ts
 import * as cbor from "cbor-x";
 import { streamSSE } from "hono/streaming";
+import invariant from "invariant";
 
 // src/manager/log.ts
 function logger() {
@@ -568,13 +432,14 @@ var HonoWebSocketAdapter = class {
 };
 
 // src/actor/router-endpoints.ts
-async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, encoding, parameters, authData) {
+var SSE_PING_INTERVAL = 1e3;
+async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, encoding, parameters, connId, connToken) {
   const exposeInternalError = req ? getRequestExposeInternalError(req) : false;
   const {
     promise: handlersPromise,
     resolve: handlersResolve,
     reject: handlersReject
-  } = Promise.withResolvers();
+  } = promiseWithResolvers();
   let actor2;
   try {
     actor2 = await actorDriver.loadActor(actorId);
@@ -600,31 +465,36 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       }
     };
   }
+  const closePromise = promiseWithResolvers();
+  const socketId = generateConnSocketId();
   return {
     onOpen: (_evt, ws) => {
-      actor2.rLog.debug("websocket open");
+      actor2.rLog.debug("actor websocket open");
       (async () => {
         try {
-          const connId = generateConnId();
-          const connToken = generateConnToken();
-          const connState = await actor2.prepareConn(parameters, req);
-          const connGlobalState = actorDriver.getGenericConnGlobalState(actorId);
-          connGlobalState.websockets.set(connId, ws);
+          let conn;
           actor2.rLog.debug({
-            msg: "registered websocket for conn",
-            actorId,
-            totalCount: connGlobalState.websockets.size
-          });
-          const conn = await actor2.createConn(
+            msg: connId ? "websocket reconnection attempt" : "new websocket connection",
             connId,
-            connToken,
+            actorId
+          });
+          conn = await actor2.createConn(
+            {
+              socketId,
+              driverState: {
+                [0 /* WEBSOCKET */]: {
+                  encoding,
+                  websocket: ws,
+                  closePromise
+                }
+              }
+            },
             parameters,
-            connState,
-            CONNECTION_DRIVER_WEBSOCKET,
-            { encoding },
-            authData
+            req,
+            connId,
+            connToken
           );
-          handlersResolve({ conn, actor: actor2, connId });
+          handlersResolve({ conn, actor: actor2, connId: conn.id });
         } catch (error) {
           handlersReject(error);
           const { code } = deconstructError(
@@ -682,6 +552,8 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       });
     },
     onClose: (event, ws) => {
+      handlersReject(`WebSocket closed (${event.code}): ${event.reason}`);
+      closePromise.resolve();
       if (event.wasClean) {
         actor2.rLog.info({
           msg: "websocket closed",
@@ -698,22 +570,8 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
         });
       }
       ws.close(1e3, "hack_force_close");
-      handlersPromise.then(({ conn, actor: actor3, connId }) => {
-        const connGlobalState = actorDriver.getGenericConnGlobalState(actorId);
-        const didDelete = connGlobalState.websockets.delete(connId);
-        if (didDelete) {
-          actor3.rLog.info({
-            msg: "removing websocket for conn",
-            totalCount: connGlobalState.websockets.size
-          });
-        } else {
-          actor3.rLog.warn({
-            msg: "websocket does not exist for conn",
-            actorId,
-            totalCount: connGlobalState.websockets.size
-          });
-        }
-        actor3.__removeConn(conn);
+      handlersPromise.then(({ conn, actor: actor3 }) => {
+        actor3.__connDisconnected(conn, event.wasClean, socketId);
       }).catch((error) => {
         deconstructError(
           error,
@@ -737,43 +595,47 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
     }
   };
 }
-async function handleSseConnect(c, _runConfig, actorDriver, actorId, authData) {
+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 connId = c.req.header(HEADER_CONN_ID);
+  const connToken = c.req.header(HEADER_CONN_TOKEN);
   return streamSSE(c, async (stream) => {
     let actor2;
-    let connId;
-    let connToken;
-    let connState;
     let conn;
     try {
       actor2 = await actorDriver.loadActor(actorId);
-      connId = generateConnId();
-      connToken = generateConnToken();
-      connState = await actor2.prepareConn(parameters, c.req.raw);
-      actor2.rLog.debug("sse open");
-      actorDriver.getGenericConnGlobalState(actorId).sseStreams.set(connId, stream);
+      actor2.rLog.debug({
+        msg: connId ? "sse reconnection attempt" : "sse open",
+        connId
+      });
       conn = await actor2.createConn(
-        connId,
-        connToken,
+        {
+          socketId,
+          driverState: {
+            [1 /* SSE */]: {
+              encoding,
+              stream
+            }
+          }
+        },
         parameters,
-        connState,
-        CONNECTION_DRIVER_SSE,
-        { encoding },
-        authData
+        c.req.raw,
+        connId,
+        connToken
       );
-      const abortResolver = Promise.withResolvers();
+      const abortResolver = promiseWithResolvers();
       stream.onAbort(() => {
       });
       c.req.raw.signal.addEventListener("abort", async () => {
-        const rLog = (actor2 == null ? void 0 : actor2.rLog) ?? loggerWithoutContext();
+        invariant(actor2, "actor should exist");
+        const rLog = actor2.rLog ?? loggerWithoutContext();
         try {
           rLog.debug("sse stream aborted");
-          if (connId) {
-            actorDriver.getGenericConnGlobalState(actorId).sseStreams.delete(connId);
-          }
-          if (conn && actor2) {
-            actor2.__removeConn(conn);
+          if (conn) {
+            actor2.__connDisconnected(conn, false, socketId);
           }
           abortResolver.resolve(void 0);
         } catch (error) {
@@ -781,24 +643,28 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId, authData) {
           abortResolver.resolve(void 0);
         }
       });
-      try {
-        c.executionCtx.waitUntil(abortResolver.promise);
-      } catch {
+      while (true) {
+        if (stream.closed || stream.aborted) {
+          actor2 == null ? void 0 : actor2.rLog.debug({
+            msg: "sse stream closed",
+            closed: stream.closed,
+            aborted: stream.aborted
+          });
+          break;
+        }
+        await stream.writeSSE({ event: "ping", data: "" });
+        await stream.sleep(SSE_PING_INTERVAL);
       }
-      await abortResolver.promise;
     } catch (error) {
       loggerWithoutContext().error({ msg: "error in sse connection", error });
-      if (connId !== void 0) {
-        actorDriver.getGenericConnGlobalState(actorId).sseStreams.delete(connId);
-      }
       if (conn && actor2 !== void 0) {
-        actor2.__removeConn(conn);
+        actor2.__connDisconnected(conn, false, socketId);
       }
       stream.close();
     }
   });
 }
-async function handleAction(c, _runConfig, actorDriver, actionName, actorId, authData) {
+async function handleAction(c, _runConfig, actorDriver, actionName, actorId) {
   const encoding = getRequestEncoding(c.req);
   const parameters = getRequestConnParams(c.req);
   const arrayBuffer = await c.req.arrayBuffer();
@@ -808,27 +674,26 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId, aut
     HTTP_ACTION_REQUEST_VERSIONED
   );
   const actionArgs = cbor.decode(new Uint8Array(request.args));
+  const socketId = generateConnSocketId();
   let actor2;
   let conn;
   let output;
   try {
     actor2 = await actorDriver.loadActor(actorId);
     actor2.rLog.debug({ msg: "handling action", actionName, encoding });
-    const connState = await actor2.prepareConn(parameters, c.req.raw);
     conn = await actor2.createConn(
-      generateConnId(),
-      generateConnToken(),
+      {
+        socketId,
+        driverState: { [2 /* HTTP */]: {} }
+      },
       parameters,
-      connState,
-      CONNECTION_DRIVER_HTTP,
-      {},
-      authData
+      c.req.raw
     );
     const ctx = new ActionContext(actor2.actorContext, conn);
     output = await actor2.executeAction(ctx, actionName, actionArgs);
   } finally {
     if (conn) {
-      actor2 == null ? void 0 : actor2.__removeConn(conn);
+      actor2 == null ? void 0 : actor2.__connDisconnected(conn, true, socketId);
     }
   }
   const responseData = {
@@ -862,7 +727,25 @@ async function handleConnectionMessage(c, _runConfig, actorDriver, connId, connT
   await actor2.processMessage(message, conn);
   return c.json({});
 }
-async function handleRawWebSocketHandler(req, path3, actorDriver, actorId, authData) {
+async function handleConnectionClose(c, _runConfig, actorDriver, connId, connToken, actorId) {
+  var _a;
+  const actor2 = await actorDriver.loadActor(actorId);
+  const conn = actor2.conns.get(connId);
+  if (!conn) {
+    throw new ConnNotFound(connId);
+  }
+  if (conn._token !== connToken) {
+    throw new IncorrectConnToken();
+  }
+  if (!((_a = conn.__socket) == null ? void 0 : _a.driverState) || !(1 /* SSE */ in conn.__socket.driverState)) {
+    throw new UserError(
+      "Connection close is only supported for SSE connections"
+    );
+  }
+  await conn.disconnect("Connection closed by client request");
+  return c.json({});
+}
+async function handleRawWebSocketHandler(req, path3, actorDriver, actorId) {
   const actor2 = await actorDriver.loadActor(actorId);
   return {
     onOpen: (_evt, ws) => {
@@ -997,70 +880,6 @@ function handleRouteError(error, c) {
   return c.body(output, { status: statusCode });
 }
 
-// src/inspector/utils.ts
-import crypto2 from "crypto";
-import { createMiddleware } from "hono/factory";
-
-// src/inspector/log.ts
-function inspectorLogger() {
-  return getLogger("inspector");
-}
-
-// src/inspector/utils.ts
-function compareSecrets(providedSecret, validSecret) {
-  if (providedSecret.length !== validSecret.length) {
-    return false;
-  }
-  const encoder = new TextEncoder();
-  const a = encoder.encode(providedSecret);
-  const b = encoder.encode(validSecret);
-  if (a.byteLength !== b.byteLength) {
-    return false;
-  }
-  if (!crypto2.timingSafeEqual(a, b)) {
-    return false;
-  }
-  return true;
-}
-var secureInspector = (runConfig) => createMiddleware(async (c, next) => {
-  var _a, _b, _c;
-  if (!runConfig.inspector.enabled) {
-    return c.text("Inspector is not enabled", 503);
-  }
-  const userToken = (_a = c.req.header("Authorization")) == null ? void 0 : _a.replace("Bearer ", "");
-  if (!userToken) {
-    return c.text("Unauthorized", 401);
-  }
-  const inspectorToken = (_c = (_b = runConfig.inspector).token) == null ? void 0 : _c.call(_b);
-  if (!inspectorToken) {
-    return c.text("Unauthorized", 401);
-  }
-  const isValid = compareSecrets(userToken, inspectorToken);
-  if (!isValid) {
-    return c.text("Unauthorized", 401);
-  }
-  await next();
-});
-function getInspectorUrl(runConfig) {
-  var _a, _b, _c, _d;
-  if (!((_a = runConfig == null ? void 0 : runConfig.inspector) == null ? void 0 : _a.enabled)) {
-    return "disabled";
-  }
-  const accessToken = (_c = (_b = runConfig == null ? void 0 : runConfig.inspector) == null ? void 0 : _b.token) == null ? void 0 : _c.call(_b);
-  if (!accessToken) {
-    inspectorLogger().warn(
-      "Inspector Token is not set, but Inspector is enabled. Please set it in the run configuration `inspector.token` or via `RIVETKIT_INSPECTOR_TOKEN` environment variable. Inspector will not be accessible."
-    );
-    return "disabled";
-  }
-  const url = new URL("https://inspect.rivet.dev");
-  url.searchParams.set("t", accessToken);
-  if ((_d = runConfig == null ? void 0 : runConfig.inspector) == null ? void 0 : _d.defaultEndpoint) {
-    url.searchParams.set("u", runConfig.inspector.defaultEndpoint);
-  }
-  return url.href;
-}
-
 // src/actor/router.ts
 function createActorRouter(runConfig, actorDriver) {
   const router = new Hono({ strict: false });
@@ -1073,17 +892,54 @@ function createActorRouter(runConfig, actorDriver) {
   router.get("/health", (c) => {
     return c.text("ok");
   });
+  router.post("/.test/force-disconnect", async (c) => {
+    const connId = c.req.query("conn");
+    if (!connId) {
+      return c.text("Missing conn query parameter", 400);
+    }
+    const actor2 = await actorDriver.loadActor(c.env.actorId);
+    const conn = actor2.__getConnForId(connId);
+    if (!conn) {
+      return c.text(`Connection not found: ${connId}`, 404);
+    }
+    const driverState = conn.__driverState;
+    if (driverState && 0 /* WEBSOCKET */ in driverState) {
+      const ws = driverState[0 /* WEBSOCKET */].websocket;
+      ws.raw.terminate();
+    } else if (driverState && 1 /* SSE */ in driverState) {
+      const stream = driverState[1 /* SSE */].stream;
+      stream.abort();
+    }
+    return c.json({ success: true });
+  });
   router.get(PATH_CONNECT_WEBSOCKET, async (c) => {
     var _a;
     const upgradeWebSocket = (_a = runConfig.getUpgradeWebSocket) == null ? void 0 : _a.call(runConfig);
     if (upgradeWebSocket) {
       return upgradeWebSocket(async (c2) => {
-        const encodingRaw = c2.req.header(HEADER_ENCODING);
-        const connParamsRaw = c2.req.header(HEADER_CONN_PARAMS);
-        const authDataRaw = c2.req.header(HEADER_AUTH_DATA);
+        const protocols = c2.req.header("sec-websocket-protocol");
+        let encodingRaw;
+        let connParamsRaw;
+        let connIdRaw;
+        let connTokenRaw;
+        if (protocols) {
+          const protocolList = protocols.split(",").map((p) => p.trim());
+          for (const protocol of protocolList) {
+            if (protocol.startsWith(WS_PROTOCOL_ENCODING)) {
+              encodingRaw = protocol.substring(WS_PROTOCOL_ENCODING.length);
+            } else if (protocol.startsWith(WS_PROTOCOL_CONN_PARAMS)) {
+              connParamsRaw = decodeURIComponent(
+                protocol.substring(WS_PROTOCOL_CONN_PARAMS.length)
+              );
+            } else if (protocol.startsWith(WS_PROTOCOL_CONN_ID)) {
+              connIdRaw = protocol.substring(WS_PROTOCOL_CONN_ID.length);
+            } else if (protocol.startsWith(WS_PROTOCOL_CONN_TOKEN)) {
+              connTokenRaw = protocol.substring(WS_PROTOCOL_CONN_TOKEN.length);
+            }
+          }
+        }
         const encoding = EncodingSchema.parse(encodingRaw);
         const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
-        const authData = authDataRaw ? JSON.parse(authDataRaw) : void 0;
         return await handleWebSocketConnect(
           c2.req.raw,
           runConfig,
@@ -1091,7 +947,8 @@ function createActorRouter(runConfig, actorDriver) {
           c2.env.actorId,
           encoding,
           connParams,
-          authData
+          connIdRaw,
+          connTokenRaw
         );
       })(c, noopNext());
     } else {
@@ -1102,36 +959,34 @@ function createActorRouter(runConfig, actorDriver) {
     }
   });
   router.get("/connect/sse", async (c) => {
-    const authDataRaw = c.req.header(HEADER_AUTH_DATA);
-    let authData;
-    if (authDataRaw) {
-      authData = JSON.parse(authDataRaw);
-    }
-    return handleSseConnect(c, runConfig, actorDriver, c.env.actorId, authData);
+    return handleSseConnect(c, runConfig, actorDriver, c.env.actorId);
   });
   router.post("/action/:action", async (c) => {
     const actionName = c.req.param("action");
-    const authDataRaw = c.req.header(HEADER_AUTH_DATA);
-    let authData;
-    if (authDataRaw) {
-      authData = JSON.parse(authDataRaw);
+    return handleAction(c, runConfig, actorDriver, actionName, c.env.actorId);
+  });
+  router.post("/connections/message", async (c) => {
+    const connId = c.req.header(HEADER_CONN_ID);
+    const connToken = c.req.header(HEADER_CONN_TOKEN);
+    if (!connId || !connToken) {
+      throw new Error("Missing required parameters");
     }
-    return handleAction(
+    return handleConnectionMessage(
       c,
       runConfig,
       actorDriver,
-      actionName,
-      c.env.actorId,
-      authData
+      connId,
+      connToken,
+      c.env.actorId
     );
   });
-  router.post("/connections/message", async (c) => {
+  router.post("/connections/close", async (c) => {
     const connId = c.req.header(HEADER_CONN_ID);
     const connToken = c.req.header(HEADER_CONN_TOKEN);
     if (!connId || !connToken) {
       throw new Error("Missing required parameters");
     }
-    return handleConnectionMessage(
+    return handleConnectionClose(
       c,
       runConfig,
       actorDriver,
@@ -1141,11 +996,6 @@ function createActorRouter(runConfig, actorDriver) {
     );
   });
   router.all("/raw/http/*", async (c) => {
-    const authDataRaw = c.req.header(HEADER_AUTH_DATA);
-    let authData;
-    if (authDataRaw) {
-      authData = JSON.parse(authDataRaw);
-    }
     const actor2 = await actorDriver.loadActor(c.env.actorId);
     const url = new URL(c.req.url);
     const originalPath = url.pathname.replace(/^\/raw\/http/, "") || "/";
@@ -1161,9 +1011,7 @@ function createActorRouter(runConfig, actorDriver) {
       from: c.req.url,
       to: correctedRequest.url
     });
-    const response = await actor2.handleFetch(correctedRequest, {
-      auth: authData
-    });
+    const response = await actor2.handleFetch(correctedRequest, {});
     if (!response) {
       throw new InternalError("handleFetch returned void unexpectedly");
     }
@@ -1174,12 +1022,6 @@ function createActorRouter(runConfig, actorDriver) {
     const upgradeWebSocket = (_a = runConfig.getUpgradeWebSocket) == null ? void 0 : _a.call(runConfig);
     if (upgradeWebSocket) {
       return upgradeWebSocket(async (c2) => {
-        const encodingRaw = c2.req.header(HEADER_ENCODING);
-        const connParamsRaw = c2.req.header(HEADER_CONN_PARAMS);
-        const authDataRaw = c2.req.header(HEADER_AUTH_DATA);
-        const encoding = EncodingSchema.parse(encodingRaw);
-        const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
-        const authData = authDataRaw ? JSON.parse(authDataRaw) : void 0;
         const url = new URL(c2.req.url);
         const pathWithQuery = c2.req.path + url.search;
         loggerWithoutContext().debug({
@@ -1193,8 +1035,7 @@ function createActorRouter(runConfig, actorDriver) {
           c2.req.raw,
           pathWithQuery,
           actorDriver,
-          c2.env.actorId,
-          authData
+          c2.env.actorId
         );
       })(c, noopNext());
     } else {
@@ -1204,7 +1045,7 @@ function createActorRouter(runConfig, actorDriver) {
       );
     }
   });
-  if (runConfig.inspector.enabled) {
+  if (isInspectorEnabled(runConfig, "actor")) {
     router.route(
       "/inspect",
       new Hono().use(
@@ -1212,7 +1053,7 @@ function createActorRouter(runConfig, actorDriver) {
         secureInspector(runConfig),
         async (c, next) => {
           const inspector = (await actorDriver.loadActor(c.env.actorId)).inspector;
-          invariant(inspector, "inspector not supported on this platform");
+          invariant2(inspector, "inspector not supported on this platform");
           c.set("inspector", inspector);
           return next();
         }
@@ -1570,8 +1411,9 @@ var InlineWebSocketAdapter2 = class {
 // src/drivers/engine/actor-driver.ts
 import { Runner } from "@rivetkit/engine-runner";
 import * as cbor3 from "cbor-x";
+import { streamSSE as streamSSE2 } from "hono/streaming";
 import { WSContext as WSContext2 } from "hono/ws";
-import invariant2 from "invariant";
+import invariant3 from "invariant";
 
 // src/drivers/engine/kv.ts
 var KEYS = {
@@ -1595,6 +1437,8 @@ var EngineActorDriver = class {
   #actorRouter;
   #version = 1;
   // Version for the runner protocol
+  #runnerStarted = Promise.withResolvers();
+  #runnerStopped = Promise.withResolvers();
   constructor(registryConfig, runConfig, managerDriver, inlineClient, config2) {
     this.#registryConfig = registryConfig;
     this.#runConfig = runConfig;
@@ -1606,6 +1450,7 @@ var EngineActorDriver = class {
     const runnerConfig = {
       version: this.#version,
       endpoint: config2.endpoint,
+      token: config2.token,
       pegboardEndpoint: config2.pegboardEndpoint,
       namespace: config2.namespace,
       totalSlots: config2.totalSlots,
@@ -1634,6 +1479,7 @@ var EngineActorDriver = class {
             runnerName: this.#config.runnerName
           });
         }
+        this.#runnerStarted.resolve(void 0);
       },
       onDisconnected: () => {
         logger4().warn({
@@ -1644,6 +1490,7 @@ var EngineActorDriver = class {
         hasDisconnected = true;
       },
       onShutdown: () => {
+        this.#runnerStopped.resolve(void 0);
       },
       fetch: this.#runnerFetch.bind(this),
       websocket: this.#runnerWebSocket.bind(this),
@@ -1672,13 +1519,6 @@ var EngineActorDriver = class {
     if (!handler.actor) throw new Error(`Actor ${actorId} failed to load`);
     return handler.actor;
   }
-  getGenericConnGlobalState(actorId) {
-    const handler = this.#actors.get(actorId);
-    if (!handler) {
-      throw new Error(`Actor ${actorId} not loaded`);
-    }
-    return handler.genericConnGlobalState;
-  }
   getContext(actorId) {
     return {};
   }
@@ -1722,14 +1562,13 @@ var EngineActorDriver = class {
     let handler = this.#actors.get(actorId);
     if (!handler) {
       handler = {
-        genericConnGlobalState: new GenericConnGlobalState(),
-        actorStartPromise: Promise.withResolvers(),
+        actorStartPromise: promiseWithResolvers(),
         persistedData: serializeEmptyPersistData(input)
       };
       this.#actors.set(actorId, handler);
     }
     const name = config2.name;
-    invariant2(config2.key, "actor should have a key");
+    invariant3(config2.key, "actor should have a key");
     const key = deserializeActorKey(config2.key);
     const definition = lookupInRegistry(
       this.#registryConfig,
@@ -1737,11 +1576,7 @@ var EngineActorDriver = class {
       // TODO: Remove cast
     );
     handler.actor = definition.instantiate();
-    const connDrivers = createGenericConnDrivers(
-      handler.genericConnGlobalState
-    );
     await handler.actor.start(
-      connDrivers,
       this,
       this.#inlineClient,
       actorId,
@@ -1776,12 +1611,25 @@ var EngineActorDriver = class {
     const websocket = websocketRaw;
     logger4().debug({ msg: "runner websocket", actorId, url: request.url });
     const url = new URL(request.url);
-    const encodingRaw = request.headers.get(HEADER_ENCODING);
-    const connParamsRaw = request.headers.get(HEADER_CONN_PARAMS);
-    const authDataRaw = request.headers.get(HEADER_AUTH_DATA);
+    const protocols = request.headers.get("sec-websocket-protocol");
+    if (protocols === null)
+      throw new Error(`Missing sec-websocket-protocol header`);
+    let encodingRaw;
+    let connParamsRaw;
+    if (protocols) {
+      const protocolList = protocols.split(",").map((p) => p.trim());
+      for (const protocol of protocolList) {
+        if (protocol.startsWith(WS_PROTOCOL_ENCODING)) {
+          encodingRaw = protocol.substring(WS_PROTOCOL_ENCODING.length);
+        } else if (protocol.startsWith(WS_PROTOCOL_CONN_PARAMS)) {
+          connParamsRaw = decodeURIComponent(
+            protocol.substring(WS_PROTOCOL_CONN_PARAMS.length)
+          );
+        }
+      }
+    }
     const encoding = EncodingSchema.parse(encodingRaw);
     const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
-    const authData = authDataRaw ? JSON.parse(authDataRaw) : void 0;
     let wsHandlerPromise;
     if (url.pathname === PATH_CONNECT_WEBSOCKET) {
       wsHandlerPromise = handleWebSocketConnect(
@@ -1791,15 +1639,16 @@ var EngineActorDriver = class {
         actorId,
         encoding,
         connParams,
-        authData
+        // Extract connId and connToken from protocols if needed
+        void 0,
+        void 0
       );
     } else if (url.pathname.startsWith(PATH_RAW_WEBSOCKET_PREFIX)) {
       wsHandlerPromise = handleRawWebSocketHandler(
         request,
         url.pathname + url.search,
         this,
-        actorId,
-        authData
+        actorId
       );
     } else {
       throw new Error(`Unreachable path: ${url.pathname}`);
@@ -1848,6 +1697,15 @@ var EngineActorDriver = class {
     logger4().info({ msg: "stopping engine actor driver" });
     await this.#runner.shutdown(immediate);
   }
+  async serverlessHandleStart(c) {
+    await this.#runnerStarted.promise;
+    return streamSSE2(c, async (stream) => {
+      const runnerId = this.#runner.runnerId;
+      invariant3(runnerId, "runnerId not set");
+      stream.writeSSE({ data: runnerId });
+      return this.#runnerStopped.promise;
+    });
+  }
 };
 
 // src/drivers/engine/config.ts
@@ -1857,6 +1715,7 @@ var ConfigSchema = z2.object({
   endpoint: z2.string().default(
     () => getEnvUniversal("RIVET_ENGINE") ?? "http://localhost:6420"
   ),
+  token: z2.string().optional().transform((val) => val ?? getEnvUniversal("RIVET_TOKEN")),
   pegboardEndpoint: z2.string().optional(),
   namespace: z2.string().default(() => getEnvUniversal("RIVET_NAMESPACE") ?? "default"),
   runnerName: z2.string().default(() => getEnvUniversal("RIVET_RUNNER") ?? "rivetkit"),
@@ -1910,9 +1769,6 @@ var FileSystemActorDriver = class {
       actorId
     );
   }
-  getGenericConnGlobalState(actorId) {
-    return this.#state.getActorOrError(actorId).genericConnGlobalState;
-  }
   /**
    * Get the current storage directory path
    */
@@ -1946,11 +1802,11 @@ var FileSystemActorDriver = class {
 };
 
 // src/drivers/file-system/global-state.ts
-import * as crypto4 from "crypto";
+import * as crypto3 from "crypto";
 import * as fsSync2 from "fs";
 import * as fs2 from "fs/promises";
 import * as path2 from "path";
-import invariant3 from "invariant";
+import invariant4 from "invariant";
 
 // dist/schemas/file-system-driver/v1.ts
 import * as bare from "@bare-ts/lib";
@@ -2053,20 +1909,20 @@ function logger5() {
 }
 
 // src/drivers/file-system/utils.ts
-import * as crypto3 from "crypto";
+import * as crypto2 from "crypto";
 import * as fsSync from "fs";
 import * as fs from "fs/promises";
 import * as os from "os";
 import * as path from "path";
 function generateActorId(name, key) {
   const jsonString = JSON.stringify([name, key]);
-  const hash = crypto3.createHash("sha256").update(jsonString).digest("hex").substring(0, 16);
+  const hash = crypto2.createHash("sha256").update(jsonString).digest("hex").substring(0, 16);
   return hash;
 }
 function createHashForPath(dirPath) {
   const normalizedPath = path.normalize(dirPath);
   const lastComponent = path.basename(normalizedPath);
-  const hash = crypto3.createHash("sha256").update(normalizedPath).digest("hex").substring(0, 8);
+  const hash = crypto2.createHash("sha256").update(normalizedPath).digest("hex").substring(0, 8);
   return `${lastComponent}-${hash}`;
 }
 function getStoragePath(customPath) {
@@ -2201,7 +2057,6 @@ var FileSystemGlobalState = class {
     }
     entry = {
       id: actorId,
-      genericConnGlobalState: new GenericConnGlobalState(),
       removed: false
     };
     this.#actors.set(actorId, entry);
@@ -2276,16 +2131,16 @@ var FileSystemGlobalState = class {
   }
   async sleepActor(actorId) {
     var _a;
-    invariant3(
+    invariant4(
       this.#persist,
       "cannot sleep actor with memory driver, must use file system driver"
     );
     const actor2 = this.#actors.get(actorId);
-    invariant3(actor2, `tried to sleep ${actorId}, does not exist`);
+    invariant4(actor2, `tried to sleep ${actorId}, does not exist`);
     if (actor2.loadPromise) await actor2.loadPromise.catch();
     if ((_a = actor2.startPromise) == null ? void 0 : _a.promise) await actor2.startPromise.promise.catch();
     actor2.removed = true;
-    invariant3(actor2.actor, "actor should be loaded");
+    invariant4(actor2.actor, "actor should be loaded");
     await actor2.actor._stop();
     this.#actors.delete(actorId);
   }
@@ -2297,15 +2152,15 @@ var FileSystemGlobalState = class {
       return;
     }
     const entry = this.#actors.get(actorId);
-    invariant3(entry, "actor entry does not exist");
+    invariant4(entry, "actor entry does not exist");
     await this.#performWrite(actorId, state);
   }
   async setActorAlarm(actorId, timestamp) {
     const entry = this.#actors.get(actorId);
-    invariant3(entry, "actor entry does not exist");
+    invariant4(entry, "actor entry does not exist");
     if (this.#persist) {
       const alarmPath = this.getActorAlarmPath(actorId);
-      const tempPath = `${alarmPath}.tmp.${crypto4.randomUUID()}`;
+      const tempPath = `${alarmPath}.tmp.${crypto3.randomUUID()}`;
       try {
         await ensureDirectoryExists(path2.dirname(alarmPath));
         const alarmData = {
@@ -2331,7 +2186,7 @@ var FileSystemGlobalState = class {
    */
   async #performWrite(actorId, state) {
     const dataPath = this.getActorStatePath(actorId);
-    const tempPath = `${dataPath}.tmp.${crypto4.randomUUID()}`;
+    const tempPath = `${dataPath}.tmp.${crypto3.randomUUID()}`;
     try {
       await ensureDirectoryExists(path2.dirname(dataPath));
       const bareState = {
@@ -2386,21 +2241,17 @@ var FileSystemGlobalState = class {
     }
     if (entry.startPromise) {
       await entry.startPromise.promise;
-      invariant3(entry.actor, "actor should have loaded");
+      invariant4(entry.actor, "actor should have loaded");
       return entry.actor;
     }
     if (entry.actor) {
       return entry.actor;
     }
-    entry.startPromise = Promise.withResolvers();
+    entry.startPromise = promiseWithResolvers();
     try {
       const definition = lookupInRegistry(registryConfig, entry.state.name);
       entry.actor = definition.instantiate();
-      const connDrivers = createGenericConnDrivers(
-        entry.genericConnGlobalState
-      );
       await entry.actor.start(
-        connDrivers,
         actorDriver,
         inlineClient,
         actorId,
@@ -2505,7 +2356,7 @@ var FileSystemGlobalState = class {
         const loaded = await this.loadActor(actorId);
         if (!loaded.state) throw new Error(`Actor does not exist: ${actorId}`);
         const runnerParams = this.#runnerParams;
-        invariant3(runnerParams, "missing runner params");
+        invariant4(runnerParams, "missing runner params");
         if (!loaded.actor) {
           await this.startActor(
             runnerParams.registryConfig,
@@ -2515,7 +2366,7 @@ var FileSystemGlobalState = class {
             actorId
           );
         }
-        invariant3(loaded.actor, "actor should be loaded after wake");
+        invariant4(loaded.actor, "actor should be loaded after wake");
         await loaded.actor._onAlarm();
       } catch (err) {
         logger5().error({
@@ -2572,7 +2423,7 @@ var FileSystemGlobalState = class {
 };
 
 // src/drivers/file-system/manager.ts
-import invariant4 from "invariant";
+import invariant5 from "invariant";
 
 // src/inspector/manager.ts
 import { sValidator } from "@hono/standard-validator";
@@ -2658,9 +2509,6 @@ var FileSystemManagerDriver = class {
         };
       };
       var transformActor = transformActor2;
-      if (!this.#runConfig.inspector.token()) {
-        this.#runConfig.inspector.token = () => this.#state.getOrCreateInspectorAccessToken();
-      }
       const startedAt = (/* @__PURE__ */ new Date()).toISOString();
       this.inspector = new ManagerInspector(() => {
         return {
@@ -2714,7 +2562,7 @@ var FileSystemManagerDriver = class {
       actorId
     });
   }
-  async openWebSocket(path3, actorId, encoding, params) {
+  async openWebSocket(path3, actorId, encoding, params, connId, connToken) {
     const pathOnly = path3.split("?")[0];
     const normalizedPath = pathOnly.startsWith("/") ? pathOnly : `/${pathOnly}`;
     if (normalizedPath === PATH_CONNECT_WEBSOCKET) {
@@ -2725,7 +2573,8 @@ var FileSystemManagerDriver = class {
         actorId,
         encoding,
         params,
-        void 0
+        connId,
+        connToken
       );
       return new InlineWebSocketAdapter2(wsHandler);
     } else if (normalizedPath.startsWith(PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
@@ -2733,8 +2582,7 @@ var FileSystemManagerDriver = class {
         void 0,
         path3,
         this.#actorDriver,
-        actorId,
-        void 0
+        actorId
       );
       return new InlineWebSocketAdapter2(wsHandler);
     } else {
@@ -2746,10 +2594,10 @@ var FileSystemManagerDriver = class {
       actorId
     });
   }
-  async proxyWebSocket(c, path3, actorId, encoding, connParams) {
+  async proxyWebSocket(c, path3, actorId, encoding, connParams, connId, connToken) {
     var _a, _b;
     const upgradeWebSocket = (_b = (_a = this.#runConfig).getUpgradeWebSocket) == null ? void 0 : _b.call(_a);
-    invariant4(upgradeWebSocket, "missing getUpgradeWebSocket");
+    invariant5(upgradeWebSocket, "missing getUpgradeWebSocket");
     const pathOnly = path3.split("?")[0];
     const normalizedPath = pathOnly.startsWith("/") ? pathOnly : `/${pathOnly}`;
     if (normalizedPath === PATH_CONNECT_WEBSOCKET) {
@@ -2760,7 +2608,8 @@ var FileSystemManagerDriver = class {
         actorId,
         encoding,
         connParams,
-        void 0
+        connId,
+        connToken
       );
       return upgradeWebSocket(() => wsHandler)(c, noopNext());
     } else if (normalizedPath.startsWith(PATH_RAW_WEBSOCKET_PREFIX) || normalizedPath === "/raw/websocket") {
@@ -2768,8 +2617,7 @@ var FileSystemManagerDriver = class {
         c.req.raw,
         path3,
         this.#actorDriver,
-        actorId,
-        void 0
+        actorId
       );
       return upgradeWebSocket(() => wsHandler)(c, noopNext());
     } else {
@@ -2815,7 +2663,7 @@ var FileSystemManagerDriver = class {
       input.key,
       input.input
     );
-    invariant4(actorEntry.state, "must have state");
+    invariant5(actorEntry.state, "must have state");
     return {
       actorId: actorEntry.state.actorId,
       name: actorEntry.state.name,
@@ -2846,6 +2694,9 @@ var FileSystemManagerDriver = class {
       data: this.#state.storagePath
     };
   }
+  getOrCreateInspectorAccessToken() {
+    return this.#state.getOrCreateInspectorAccessToken();
+  }
 };
 
 // src/drivers/file-system/mod.ts
@@ -2882,8 +2733,7 @@ function createMemoryDriver() {
 
 // src/drivers/default.ts
 function chooseDefaultDriver(runConfig) {
-  const engineEndpoint = runConfig.endpoint ?? getEnvUniversal("RIVET_ENGINE");
-  if (engineEndpoint && runConfig.driver) {
+  if (runConfig.endpoint && runConfig.driver) {
     throw new UserError(
       "Cannot specify both 'engine' and 'driver' in configuration"
     );
@@ -2891,12 +2741,15 @@ function chooseDefaultDriver(runConfig) {
   if (runConfig.driver) {
     return runConfig.driver;
   }
-  if (engineEndpoint) {
+  if (runConfig.endpoint) {
     loggerWithoutContext().debug({
       msg: "using rivet engine driver",
-      endpoint: engineEndpoint
+      endpoint: runConfig.endpoint
+    });
+    return createEngineDriver({
+      endpoint: runConfig.endpoint,
+      token: runConfig.token
     });
-    return createEngineDriver({ endpoint: engineEndpoint });
   }
   loggerWithoutContext().debug({ msg: "using default file system driver" });
   return createFileSystemOrMemoryDriver(true);
@@ -2905,32 +2758,37 @@ function chooseDefaultDriver(runConfig) {
 // src/manager/router.ts
 import { createRoute, OpenAPIHono } from "@hono/zod-openapi";
 import * as cbor4 from "cbor-x";
-import { Hono as Hono3 } from "hono";
+import {
+  Hono as Hono3
+} from "hono";
 import { cors as corsMiddleware } from "hono/cors";
-import { createMiddleware as createMiddleware2 } from "hono/factory";
-import invariant5 from "invariant";
-import { z as z8 } from "zod";
+import { createMiddleware } from "hono/factory";
+import invariant6 from "invariant";
+import { z as z5 } from "zod";
 
-// src/manager-api/routes/actors-create.ts
+// src/manager-api/actors.ts
 import { z as z4 } from "zod";
 
-// src/manager-api/routes/common.ts
+// src/manager-api/common.ts
 import { z as z3 } from "zod";
 var RivetIdSchema = z3.string();
-var ActorSchema = z3.object({
+
+// src/manager-api/actors.ts
+var ActorSchema = z4.object({
   actor_id: RivetIdSchema,
-  name: z3.string(),
-  key: z3.string(),
+  name: z4.string(),
+  key: z4.string(),
   namespace_id: RivetIdSchema,
-  runner_name_selector: z3.string(),
-  create_ts: z3.number(),
-  connectable_ts: z3.number().nullable().optional(),
-  destroy_ts: z3.number().nullable().optional(),
-  sleep_ts: z3.number().nullable().optional(),
-  start_ts: z3.number().nullable().optional()
+  runner_name_selector: z4.string(),
+  create_ts: z4.number(),
+  connectable_ts: z4.number().nullable().optional(),
+  destroy_ts: z4.number().nullable().optional(),
+  sleep_ts: z4.number().nullable().optional(),
+  start_ts: z4.number().nullable().optional()
+});
+var ActorsListResponseSchema = z4.object({
+  actors: z4.array(ActorSchema)
 });
-
-// src/manager-api/routes/actors-create.ts
 var ActorsCreateRequestSchema = z4.object({
   name: z4.string(),
   runner_name_selector: z4.string(),
@@ -2941,169 +2799,426 @@ var ActorsCreateRequestSchema = z4.object({
 var ActorsCreateResponseSchema = z4.object({
   actor: ActorSchema
 });
-
-// src/manager-api/routes/actors-get.ts
-import { z as z5 } from "zod";
-var ActorsGetResponseSchema = z5.object({
-  actor: ActorSchema
-});
-
-// src/manager-api/routes/actors-get-by-id.ts
-import { z as z6 } from "zod";
-var ActorsGetByIdResponseSchema = z6.object({
-  actor_id: RivetIdSchema.nullable().optional()
+var ActorsGetOrCreateRequestSchema = z4.object({
+  name: z4.string(),
+  key: z4.string(),
+  runner_name_selector: z4.string(),
+  crash_policy: z4.string(),
+  input: z4.string().nullable().optional()
 });
-
-// src/manager-api/routes/actors-get-or-create-by-id.ts
-import { z as z7 } from "zod";
-var ActorsGetOrCreateResponseSchema = z7.object({
+var ActorsGetOrCreateResponseSchema = z4.object({
   actor: ActorSchema,
-  created: z7.boolean()
-});
-var ActorsGetOrCreateByIdResponseSchema = z7.object({
-  actor_id: RivetIdSchema,
-  created: z7.boolean()
-});
-var ActorsGetOrCreateByIdRequestSchema = z7.object({
-  name: z7.string(),
-  key: z7.string(),
-  runner_name_selector: z7.string(),
-  crash_policy: z7.string(),
-  input: z7.string().nullable().optional()
+  created: z4.boolean()
 });
+var ActorsDeleteResponseSchema = z4.object({});
 
-// src/manager/router.ts
-function buildOpenApiResponses(schema, validateBody) {
-  return {
-    200: {
-      description: "Success",
-      content: validateBody ? {
-        "application/json": {
-          schema
-        }
-      } : {}
-    },
-    400: {
-      description: "User error"
-    },
-    500: {
-      description: "Internal error"
-    }
-  };
+// src/manager/gateway.ts
+async function actorGateway(runConfig, managerDriver, c, next) {
+  if (c.req.path.startsWith("/.test/")) {
+    return next();
+  }
+  if (c.req.header("upgrade") === "websocket") {
+    return await handleWebSocketGateway(runConfig, managerDriver, c);
+  }
+  return await handleHttpGateway(managerDriver, c, next);
 }
-function createManagerRouter(registryConfig, runConfig, managerDriver, validateBody) {
-  var _a, _b;
-  const router = new OpenAPIHono({ strict: false }).basePath(
-    runConfig.basePath
-  );
-  router.use("*", loggerMiddleware(logger()));
-  const cors2 = runConfig.cors ? corsMiddleware(runConfig.cors) : createMiddleware2((_c, next) => next());
-  router.use("*", cors2, async (c, next) => {
-    var _a2;
-    const target = c.req.header("x-rivet-target");
-    const actorId = c.req.header("x-rivet-actor");
-    if (target === "actor") {
-      if (!actorId) {
-        throw new MissingActorHeader();
-      }
-      logger().debug({
-        msg: "proxying request to actor",
-        actorId,
-        path: c.req.path,
-        method: c.req.method
-      });
-      if (c.req.header("upgrade") === "websocket") {
-        const upgradeWebSocket = (_a2 = runConfig.getUpgradeWebSocket) == null ? void 0 : _a2.call(runConfig);
-        if (!upgradeWebSocket) {
-          throw new WebSocketsNotEnabled();
-        }
-        const encoding = c.req.header("X-RivetKit-Encoding") || c.req.header("x-rivet-encoding") || "json";
-        const connParams = c.req.header("X-RivetKit-Conn-Params") || c.req.header("x-rivet-conn-params");
-        const authData = c.req.header("X-RivetKit-Auth-Data") || c.req.header("x-rivet-auth-data");
-        const pathWithQuery = c.req.url.includes("?") ? c.req.path + c.req.url.substring(c.req.url.indexOf("?")) : c.req.path;
-        return await managerDriver.proxyWebSocket(
-          c,
-          pathWithQuery,
-          actorId,
-          encoding,
-          // Will be validated by driver
-          connParams ? JSON.parse(connParams) : void 0,
-          authData ? JSON.parse(authData) : void 0
+async function handleWebSocketGateway(runConfig, managerDriver, c) {
+  var _a;
+  const upgradeWebSocket = (_a = runConfig.getUpgradeWebSocket) == null ? void 0 : _a.call(runConfig);
+  if (!upgradeWebSocket) {
+    throw new WebSocketsNotEnabled();
+  }
+  const protocols = c.req.header("sec-websocket-protocol");
+  let target;
+  let actorId;
+  let encodingRaw;
+  let connParamsRaw;
+  let connIdRaw;
+  let connTokenRaw;
+  if (protocols) {
+    const protocolList = protocols.split(",").map((p) => p.trim());
+    for (const protocol of protocolList) {
+      if (protocol.startsWith(WS_PROTOCOL_TARGET)) {
+        target = protocol.substring(WS_PROTOCOL_TARGET.length);
+      } else if (protocol.startsWith(WS_PROTOCOL_ACTOR)) {
+        actorId = protocol.substring(WS_PROTOCOL_ACTOR.length);
+      } else if (protocol.startsWith(WS_PROTOCOL_ENCODING)) {
+        encodingRaw = protocol.substring(WS_PROTOCOL_ENCODING.length);
+      } else if (protocol.startsWith(WS_PROTOCOL_CONN_PARAMS)) {
+        connParamsRaw = decodeURIComponent(
+          protocol.substring(WS_PROTOCOL_CONN_PARAMS.length)
         );
+      } else if (protocol.startsWith(WS_PROTOCOL_CONN_ID)) {
+        connIdRaw = protocol.substring(WS_PROTOCOL_CONN_ID.length);
+      } else if (protocol.startsWith(WS_PROTOCOL_CONN_TOKEN)) {
+        connTokenRaw = protocol.substring(WS_PROTOCOL_CONN_TOKEN.length);
       }
-      const proxyHeaders = new Headers(c.req.raw.headers);
-      proxyHeaders.delete("x-rivet-target");
-      proxyHeaders.delete("x-rivet-actor");
-      const url = new URL(c.req.url);
-      const proxyUrl = new URL(`http://actor${url.pathname}${url.search}`);
-      const proxyRequest = new Request(proxyUrl, {
-        method: c.req.raw.method,
-        headers: proxyHeaders,
-        body: c.req.raw.body,
-        signal: c.req.raw.signal
-      });
-      return await managerDriver.proxyRequest(c, proxyRequest, actorId);
     }
+  }
+  if (target !== "actor") {
+    return c.text("WebSocket upgrade requires target.actor protocol", 400);
+  }
+  if (!actorId) {
+    throw new MissingActorHeader();
+  }
+  logger().debug({
+    msg: "proxying websocket to actor",
+    actorId,
+    path: c.req.path,
+    encoding: encodingRaw
+  });
+  const encoding = encodingRaw || "json";
+  const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
+  const pathWithQuery = c.req.url.includes("?") ? c.req.path + c.req.url.substring(c.req.url.indexOf("?")) : c.req.path;
+  return await managerDriver.proxyWebSocket(
+    c,
+    pathWithQuery,
+    actorId,
+    encoding,
+    // Will be validated by driver
+    connParams,
+    connIdRaw,
+    connTokenRaw
+  );
+}
+async function handleHttpGateway(managerDriver, c, next) {
+  const target = c.req.header(HEADER_RIVET_TARGET);
+  const actorId = c.req.header(HEADER_RIVET_ACTOR);
+  if (target !== "actor") {
     return next();
+  }
+  if (!actorId) {
+    throw new MissingActorHeader();
+  }
+  logger().debug({
+    msg: "proxying request to actor",
+    actorId,
+    path: c.req.path,
+    method: c.req.method
   });
-  router.get("/", cors2, (c) => {
-    return c.text(
-      "This is a RivetKit server.\n\nLearn more at https://rivetkit.org"
-    );
+  const proxyHeaders = new Headers(c.req.raw.headers);
+  proxyHeaders.delete(HEADER_RIVET_TARGET);
+  proxyHeaders.delete(HEADER_RIVET_ACTOR);
+  const url = new URL(c.req.url);
+  const proxyUrl = new URL(`http://actor${url.pathname}${url.search}`);
+  const proxyRequest = new Request(proxyUrl, {
+    method: c.req.raw.method,
+    headers: proxyHeaders,
+    body: c.req.raw.body,
+    signal: c.req.raw.signal
   });
-  {
-    const route = createRoute({
+  return await managerDriver.proxyRequest(c, proxyRequest, actorId);
+}
+async function createTestWebSocketProxy(clientWsPromise) {
+  let clientWs = null;
+  const {
+    promise: serverWsPromise,
+    resolve: serverWsResolve,
+    reject: serverWsReject
+  } = promiseWithResolvers();
+  try {
+    logger().debug({ msg: "awaiting client websocket promise" });
+    const ws = await clientWsPromise;
+    clientWs = ws;
+    logger().debug({
+      msg: "client websocket promise resolved",
+      constructor: ws == null ? void 0 : ws.constructor.name
+    });
+    await new Promise((resolve, reject) => {
+      const onOpen = () => {
+        logger().debug({ msg: "test websocket connection to actor opened" });
+        resolve();
+      };
+      const onError = (error) => {
+        logger().error({ msg: "test websocket connection failed", error });
+        reject(
+          new Error(`Failed to open WebSocket: ${error.message || error}`)
+        );
+        serverWsReject();
+      };
+      ws.addEventListener("open", onOpen);
+      ws.addEventListener("error", onError);
+      ws.addEventListener("message", async (clientEvt) => {
+        var _a, _b;
+        const serverWs = await serverWsPromise;
+        logger().debug({
+          msg: `test websocket connection message from client`,
+          dataType: typeof clientEvt.data,
+          isBlob: clientEvt.data instanceof Blob,
+          isArrayBuffer: clientEvt.data instanceof ArrayBuffer,
+          dataConstructor: (_b = (_a = clientEvt.data) == null ? void 0 : _a.constructor) == null ? void 0 : _b.name,
+          dataStr: typeof clientEvt.data === "string" ? clientEvt.data.substring(0, 100) : void 0
+        });
+        if (serverWs.readyState === 1) {
+          if (clientEvt.data instanceof Blob) {
+            clientEvt.data.arrayBuffer().then((buffer) => {
+              logger().debug({
+                msg: "converted client blob to arraybuffer, sending to server",
+                bufferSize: buffer.byteLength
+              });
+              serverWs.send(buffer);
+            }).catch((error) => {
+              logger().error({
+                msg: "failed to convert blob to arraybuffer",
+                error
+              });
+            });
+          } else {
+            logger().debug({
+              msg: "sending client data directly to server",
+              dataType: typeof clientEvt.data,
+              dataLength: typeof clientEvt.data === "string" ? clientEvt.data.length : void 0
+            });
+            serverWs.send(clientEvt.data);
+          }
+        }
+      });
+      ws.addEventListener("close", async (clientEvt) => {
+        const serverWs = await serverWsPromise;
+        logger().debug({
+          msg: `test websocket connection closed`
+        });
+        if (serverWs.readyState !== 3) {
+          serverWs.close(clientEvt.code, clientEvt.reason);
+        }
+      });
+      ws.addEventListener("error", async () => {
+        const serverWs = await serverWsPromise;
+        logger().debug({
+          msg: `test websocket connection error`
+        });
+        if (serverWs.readyState !== 3) {
+          serverWs.close(1011, "Error in client websocket");
+        }
+      });
+    });
+  } catch (error) {
+    logger().error({
+      msg: `failed to establish client websocket connection`,
+      error
+    });
+    return {
+      onOpen: (_evt, serverWs) => {
+        serverWs.close(1011, "Failed to establish connection");
+      },
+      onMessage: () => {
+      },
+      onError: () => {
+      },
+      onClose: () => {
+      }
+    };
+  }
+  return {
+    onOpen: (_evt, serverWs) => {
+      logger().debug({
+        msg: `test websocket connection from client opened`
+      });
+      logger().debug({
+        msg: "clientWs info",
+        constructor: clientWs.constructor.name,
+        hasAddEventListener: typeof clientWs.addEventListener === "function",
+        readyState: clientWs.readyState
+      });
+      serverWsResolve(serverWs);
+    },
+    onMessage: (evt) => {
+      var _a, _b;
+      logger().debug({
+        msg: "received message from server",
+        dataType: typeof evt.data,
+        isBlob: evt.data instanceof Blob,
+        isArrayBuffer: evt.data instanceof ArrayBuffer,
+        dataConstructor: (_b = (_a = evt.data) == null ? void 0 : _a.constructor) == null ? void 0 : _b.name,
+        dataStr: typeof evt.data === "string" ? evt.data.substring(0, 100) : void 0
+      });
+      if (clientWs.readyState === 1) {
+        if (evt.data instanceof Blob) {
+          evt.data.arrayBuffer().then((buffer) => {
+            logger().debug({
+              msg: "converted blob to arraybuffer, sending",
+              bufferSize: buffer.byteLength
+            });
+            clientWs.send(buffer);
+          }).catch((error) => {
+            logger().error({
+              msg: "failed to convert blob to arraybuffer",
+              error
+            });
+          });
+        } else {
+          logger().debug({
+            msg: "sending data directly",
+            dataType: typeof evt.data,
+            dataLength: typeof evt.data === "string" ? evt.data.length : void 0
+          });
+          clientWs.send(evt.data);
+        }
+      }
+    },
+    onClose: (event, serverWs) => {
+      logger().debug({
+        msg: `server websocket closed`,
+        wasClean: event.wasClean,
+        code: event.code,
+        reason: event.reason
+      });
+      serverWs.close(1e3, "hack_force_close");
+      if (clientWs && clientWs.readyState !== clientWs.CLOSED && clientWs.readyState !== clientWs.CLOSING) {
+        clientWs.close(1e3, event.reason);
+      }
+    },
+    onError: (error) => {
+      logger().error({
+        msg: `error in server websocket`,
+        error
+      });
+      if (clientWs && clientWs.readyState !== clientWs.CLOSED && clientWs.readyState !== clientWs.CLOSING) {
+        clientWs.close(1011, "Error in server websocket");
+      }
+      serverWsReject();
+    }
+  };
+}
+
+// src/manager/router.ts
+function buildOpenApiResponses(schema) {
+  return {
+    200: {
+      description: "Success",
+      content: {
+        "application/json": {
+          schema
+        }
+      }
+    },
+    400: {
+      description: "User error"
+    },
+    500: {
+      description: "Internal error"
+    }
+  };
+}
+function createManagerRouter(registryConfig, runConfig, managerDriver, serverlessActorDriverBuilder) {
+  const router = new OpenAPIHono({ strict: false }).basePath(
+    runConfig.basePath
+  );
+  router.use("*", loggerMiddleware(logger()));
+  const cors2 = runConfig.cors ? corsMiddleware(runConfig.cors) : createMiddleware((_c, next) => next());
+  if (serverlessActorDriverBuilder) {
+    addServerlessRoutes(serverlessActorDriverBuilder, router, cors2);
+  } else {
+    addManagerRoutes(registryConfig, runConfig, managerDriver, router, cors2);
+  }
+  router.notFound(handleRouteNotFound);
+  router.onError(handleRouteError);
+  return { router, openapi: router, cors: cors2 };
+}
+function addServerlessRoutes(serverlessActorDriverBuilder, router, cors2) {
+  router.get("/", cors2, (c) => {
+    return c.text(
+      "This is a RivetKit server.\n\nLearn more at https://rivetkit.org"
+    );
+  });
+  router.get("/start", cors2, async (c) => {
+    const actorDriver = serverlessActorDriverBuilder();
+    invariant6(
+      actorDriver.serverlessHandleStart,
+      "missing serverlessHandleStart on ActorDriver"
+    );
+    return await actorDriver.serverlessHandleStart(c);
+  });
+  router.get("/health", cors2, (c) => {
+    return c.text("ok");
+  });
+}
+function addManagerRoutes(registryConfig, runConfig, managerDriver, router, cors2) {
+  var _a;
+  router.use("*", cors2, actorGateway.bind(void 0, runConfig, managerDriver));
+  router.get("/", cors2, (c) => {
+    return c.text(
+      "This is a RivetKit server.\n\nLearn more at https://rivetkit.org"
+    );
+  });
+  {
+    const route = createRoute({
       middleware: [cors2],
       method: "get",
-      path: "/actors/by-id",
+      path: "/actors",
       request: {
-        query: z8.object({
-          name: z8.string(),
-          key: z8.string()
+        query: z5.object({
+          name: z5.string(),
+          actor_ids: z5.string().optional(),
+          key: z5.string().optional()
         })
       },
-      responses: buildOpenApiResponses(
-        ActorsGetByIdResponseSchema,
-        validateBody
-      )
+      responses: buildOpenApiResponses(ActorsListResponseSchema)
     });
     router.openapi(route, async (c) => {
-      const { name, key } = c.req.valid("query");
-      const actorOutput = await managerDriver.getWithKey({
-        c,
-        name,
-        key: [key]
-        // Convert string to ActorKey array
-      });
+      const { name, actor_ids, key } = c.req.valid("query");
+      const actorIdsParsed = actor_ids ? actor_ids.split(",").map((id) => id.trim()).filter((id) => id.length > 0) : void 0;
+      const actors = [];
+      if (actorIdsParsed) {
+        if (actorIdsParsed.length > 32) {
+          return c.json(
+            {
+              error: `Too many actor IDs. Maximum is 32, got ${actorIdsParsed.length}.`
+            },
+            400
+          );
+        }
+        if (actorIdsParsed.length === 0) {
+          return c.json({
+            actors: []
+          });
+        }
+        for (const actorId of actorIdsParsed) {
+          if (name) {
+            const actorOutput = await managerDriver.getForId({
+              c,
+              name,
+              actorId
+            });
+            if (actorOutput) {
+              actors.push(actorOutput);
+            }
+          }
+        }
+      } else if (key) {
+        const actorOutput = await managerDriver.getWithKey({
+          c,
+          name,
+          key: [key]
+          // Convert string to ActorKey array
+        });
+        if (actorOutput) {
+          actors.push(actorOutput);
+        }
+      }
       return c.json({
-        actor_id: (actorOutput == null ? void 0 : actorOutput.actorId) || null
+        actors: actors.map(createApiActor)
       });
     });
   }
   {
     const route = createRoute({
-      cors: [cors2],
+      middleware: [cors2],
       method: "put",
-      path: "/actors/by-id",
+      path: "/actors",
       request: {
         body: {
-          content: validateBody ? {
+          content: {
             "application/json": {
-              schema: ActorsGetOrCreateByIdRequestSchema
+              schema: ActorsGetOrCreateRequestSchema
             }
-          } : {}
+          }
         }
       },
-      responses: buildOpenApiResponses(
-        ActorsGetOrCreateByIdResponseSchema,
-        validateBody
-      )
+      responses: buildOpenApiResponses(ActorsGetOrCreateResponseSchema)
     });
     router.openapi(route, async (c) => {
-      const body = validateBody ? await c.req.json() : await c.req.json();
-      if (validateBody) {
-        ActorsGetOrCreateByIdRequestSchema.parse(body);
-      }
+      const body = c.req.valid("json");
       const existingActor = await managerDriver.getWithKey({
         c,
         name: body.name,
@@ -3112,7 +3227,7 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, validateB
       });
       if (existingActor) {
         return c.json({
-          actor_id: existingActor.actorId,
+          actor: createApiActor(existingActor),
           created: false
         });
       }
@@ -3126,52 +3241,11 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, validateB
         // Not provided in the request schema
       });
       return c.json({
-        actor_id: newActor.actorId,
+        actor: createApiActor(newActor),
         created: true
       });
     });
   }
-  {
-    const route = createRoute({
-      middleware: [cors2],
-      method: "get",
-      path: "/actors/{actor_id}",
-      request: {
-        params: z8.object({
-          actor_id: RivetIdSchema
-        })
-      },
-      responses: buildOpenApiResponses(ActorsGetResponseSchema, validateBody)
-    });
-    router.openapi(route, async (c) => {
-      const { actor_id } = c.req.valid("param");
-      const actorOutput = await managerDriver.getForId({
-        c,
-        name: "",
-        // TODO: The API doesn't provide the name, this may need to be resolved
-        actorId: actor_id
-      });
-      if (!actorOutput) {
-        throw new ActorNotFound(actor_id);
-      }
-      const actor2 = {
-        actor_id: actorOutput.actorId,
-        name: actorOutput.name,
-        key: actorOutput.key,
-        namespace_id: "default",
-        // Assert default namespace
-        runner_name_selector: "rivetkit",
-        // Assert rivetkit runner
-        create_ts: Date.now(),
-        // Not available from driver
-        connectable_ts: null,
-        destroy_ts: null,
-        sleep_ts: null,
-        start_ts: null
-      };
-      return c.json({ actor: actor2 });
-    });
-  }
   {
     const route = createRoute({
       middleware: [cors2],
@@ -3179,23 +3253,17 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, validateB
       path: "/actors",
       request: {
         body: {
-          content: validateBody ? {
+          content: {
             "application/json": {
               schema: ActorsCreateRequestSchema
             }
-          } : {}
+          }
         }
       },
-      responses: buildOpenApiResponses(
-        ActorsCreateResponseSchema,
-        validateBody
-      )
+      responses: buildOpenApiResponses(ActorsCreateResponseSchema)
     });
     router.openapi(route, async (c) => {
-      const body = validateBody ? await c.req.json() : await c.req.json();
-      if (validateBody) {
-        ActorsCreateRequestSchema.parse(body);
-      }
+      const body = c.req.valid("json");
       const actorOutput = await managerDriver.createActor({
         c,
         name: body.name,
@@ -3205,20 +3273,7 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, validateB
         region: void 0
         // Not provided in the request schema
       });
-      const actor2 = {
-        actor_id: actorOutput.actorId,
-        name: actorOutput.name,
-        key: actorOutput.key,
-        namespace_id: "default",
-        // Assert default namespace
-        runner_name_selector: "rivetkit",
-        // Assert rivetkit runner
-        create_ts: Date.now(),
-        connectable_ts: null,
-        destroy_ts: null,
-        sleep_ts: null,
-        start_ts: null
-      };
+      const actor2 = createApiActor(actorOutput);
       return c.json({ actor: actor2 });
     });
   }
@@ -3246,29 +3301,60 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, validateB
     router.get(".test/inline-driver/connect-websocket/*", async (c) => {
       var _a2;
       const upgradeWebSocket = (_a2 = runConfig.getUpgradeWebSocket) == null ? void 0 : _a2.call(runConfig);
-      invariant5(upgradeWebSocket, "websockets not supported on this platform");
+      invariant6(upgradeWebSocket, "websockets not supported on this platform");
       return upgradeWebSocket(async (c2) => {
-        const {
-          path: path3,
-          actorId,
-          params: paramsRaw,
-          encodingKind
-        } = c2.req.query();
-        const params = paramsRaw !== void 0 ? JSON.parse(paramsRaw) : void 0;
+        const protocolHeader = c2.req.header("sec-websocket-protocol") || "";
+        const protocols = protocolHeader.split(/,\s*/);
+        let actorId = "";
+        let encoding = "bare";
+        let transport = "websocket";
+        let path3 = "";
+        let params;
+        let connId;
+        let connToken;
+        for (const protocol of protocols) {
+          if (protocol.startsWith(WS_PROTOCOL_ACTOR)) {
+            actorId = protocol.substring(WS_PROTOCOL_ACTOR.length);
+          } else if (protocol.startsWith(WS_PROTOCOL_ENCODING)) {
+            encoding = protocol.substring(
+              WS_PROTOCOL_ENCODING.length
+            );
+          } else if (protocol.startsWith(WS_PROTOCOL_TRANSPORT)) {
+            transport = protocol.substring(
+              WS_PROTOCOL_TRANSPORT.length
+            );
+          } else if (protocol.startsWith(WS_PROTOCOL_PATH)) {
+            path3 = decodeURIComponent(
+              protocol.substring(WS_PROTOCOL_PATH.length)
+            );
+          } else if (protocol.startsWith(WS_PROTOCOL_CONN_PARAMS)) {
+            const paramsRaw = decodeURIComponent(
+              protocol.substring(WS_PROTOCOL_CONN_PARAMS.length)
+            );
+            params = JSON.parse(paramsRaw);
+          } else if (protocol.startsWith(WS_PROTOCOL_CONN_ID)) {
+            connId = protocol.substring(WS_PROTOCOL_CONN_ID.length);
+          } else if (protocol.startsWith(WS_PROTOCOL_CONN_TOKEN)) {
+            connToken = protocol.substring(WS_PROTOCOL_CONN_TOKEN.length);
+          }
+        }
         logger().debug({
           msg: "received test inline driver websocket",
           actorId,
           params,
-          encodingKind,
+          encodingKind: encoding,
+          transport,
           path: path3
         });
         const clientWsPromise = managerDriver.openWebSocket(
           path3,
           actorId,
-          encodingKind,
-          params
+          encoding,
+          params,
+          connId,
+          connToken
         );
-        return await createTestWebSocketProxy(clientWsPromise, "standard");
+        return await createTestWebSocketProxy(clientWsPromise);
       })(c, noopNext());
     });
     router.all(".test/inline-driver/send-request/*", async (c) => {
@@ -3291,7 +3377,8 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, validateB
           new Request(`http://actor/${pathWithQuery}`, {
             method: c.req.method,
             headers: c.req.raw.headers,
-            body: c.req.raw.body
+            body: c.req.raw.body,
+            duplex: "half"
           })
         );
         return response;
@@ -3313,13 +3400,50 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, validateB
         );
       }
     });
+    router.post("/.test/force-disconnect", async (c) => {
+      const actorId = c.req.query("actor");
+      const connId = c.req.query("conn");
+      if (!actorId || !connId) {
+        return c.text("Missing actor or conn query parameters", 400);
+      }
+      logger().debug({
+        msg: "forcing unclean disconnect",
+        actorId,
+        connId
+      });
+      try {
+        const response = await managerDriver.sendRequest(
+          actorId,
+          new Request(`http://actor/.test/force-disconnect?conn=${connId}`, {
+            method: "POST"
+          })
+        );
+        if (!response.ok) {
+          const text = await response.text();
+          return c.text(
+            `Failed to force disconnect: ${text}`,
+            response.status
+          );
+        }
+        return c.json({ success: true });
+      } catch (error) {
+        logger().error({
+          msg: "error forcing disconnect",
+          error: stringifyError(error)
+        });
+        return c.text(`Error: ${error}`, 500);
+      }
+    });
   }
+  router.get("/health", cors2, (c) => {
+    return c.text("ok");
+  });
   (_a = managerDriver.modifyManagerRouter) == null ? void 0 : _a.call(
     managerDriver,
     registryConfig,
     router
   );
-  if ((_b = runConfig.inspector) == null ? void 0 : _b.enabled) {
+  if (isInspectorEnabled(runConfig, "manager")) {
     if (!managerDriver.inspector) {
       throw new Unsupported("inspector");
     }
@@ -3331,180 +3455,33 @@ function createManagerRouter(registryConfig, runConfig, managerDriver, validateB
       }).route("/", createManagerInspectorRouter())
     );
   }
-  router.notFound(handleRouteNotFound);
-  router.onError(handleRouteError);
-  return { router, openapi: router };
 }
-async function createTestWebSocketProxy(clientWsPromise, connectionType) {
-  let clientWs = null;
-  try {
-    logger().debug({ msg: "awaiting client websocket promise" });
-    const ws = await clientWsPromise;
-    clientWs = ws;
-    logger().debug({
-      msg: "client websocket promise resolved",
-      constructor: ws == null ? void 0 : ws.constructor.name
-    });
-    await new Promise((resolve, reject) => {
-      const onOpen = () => {
-        logger().debug({ msg: "test websocket connection opened" });
-        resolve();
-      };
-      const onError = (error) => {
-        logger().error({ msg: "test websocket connection failed", error });
-        reject(
-          new Error(`Failed to open WebSocket: ${error.message || error}`)
-        );
-      };
-      ws.addEventListener("open", onOpen);
-      ws.addEventListener("error", onError);
-    });
-  } catch (error) {
-    logger().error({
-      msg: `failed to establish client ${connectionType} websocket connection`,
-      error
-    });
-    return {
-      onOpen: (_evt, serverWs) => {
-        serverWs.close(1011, "Failed to establish connection");
-      },
-      onMessage: () => {
-      },
-      onError: () => {
-      },
-      onClose: () => {
-      }
-    };
-  }
+function createApiActor(actor2) {
   return {
-    onOpen: (_evt, serverWs) => {
-      logger().debug({
-        msg: `test ${connectionType} websocket connection opened`
-      });
-      logger().debug({
-        msg: "clientWs info",
-        constructor: clientWs.constructor.name,
-        hasAddEventListener: typeof clientWs.addEventListener === "function",
-        readyState: clientWs.readyState
-      });
-      clientWs.addEventListener("message", (clientEvt) => {
-        var _a, _b;
-        logger().debug({
-          msg: `test ${connectionType} websocket connection message from client`,
-          dataType: typeof clientEvt.data,
-          isBlob: clientEvt.data instanceof Blob,
-          isArrayBuffer: clientEvt.data instanceof ArrayBuffer,
-          dataConstructor: (_b = (_a = clientEvt.data) == null ? void 0 : _a.constructor) == null ? void 0 : _b.name,
-          dataStr: typeof clientEvt.data === "string" ? clientEvt.data.substring(0, 100) : void 0
-        });
-        if (serverWs.readyState === 1) {
-          if (clientEvt.data instanceof Blob) {
-            clientEvt.data.arrayBuffer().then((buffer) => {
-              logger().debug({
-                msg: "converted client blob to arraybuffer, sending to server",
-                bufferSize: buffer.byteLength
-              });
-              serverWs.send(buffer);
-            }).catch((error) => {
-              logger().error({
-                msg: "failed to convert blob to arraybuffer",
-                error
-              });
-            });
-          } else {
-            logger().debug({
-              msg: "sending client data directly to server",
-              dataType: typeof clientEvt.data,
-              dataLength: typeof clientEvt.data === "string" ? clientEvt.data.length : void 0
-            });
-            serverWs.send(clientEvt.data);
-          }
-        }
-      });
-      clientWs.addEventListener("close", (clientEvt) => {
-        logger().debug({
-          msg: `test ${connectionType} websocket connection closed`
-        });
-        if (serverWs.readyState !== 3) {
-          serverWs.close(clientEvt.code, clientEvt.reason);
-        }
-      });
-      clientWs.addEventListener("error", () => {
-        logger().debug({
-          msg: `test ${connectionType} websocket connection error`
-        });
-        if (serverWs.readyState !== 3) {
-          serverWs.close(1011, "Error in client websocket");
-        }
-      });
-    },
-    onMessage: (evt) => {
-      var _a, _b;
-      logger().debug({
-        msg: "received message from server",
-        dataType: typeof evt.data,
-        isBlob: evt.data instanceof Blob,
-        isArrayBuffer: evt.data instanceof ArrayBuffer,
-        dataConstructor: (_b = (_a = evt.data) == null ? void 0 : _a.constructor) == null ? void 0 : _b.name,
-        dataStr: typeof evt.data === "string" ? evt.data.substring(0, 100) : void 0
-      });
-      if (clientWs.readyState === 1) {
-        if (evt.data instanceof Blob) {
-          evt.data.arrayBuffer().then((buffer) => {
-            logger().debug({
-              msg: "converted blob to arraybuffer, sending",
-              bufferSize: buffer.byteLength
-            });
-            clientWs.send(buffer);
-          }).catch((error) => {
-            logger().error({
-              msg: "failed to convert blob to arraybuffer",
-              error
-            });
-          });
-        } else {
-          logger().debug({
-            msg: "sending data directly",
-            dataType: typeof evt.data,
-            dataLength: typeof evt.data === "string" ? evt.data.length : void 0
-          });
-          clientWs.send(evt.data);
-        }
-      }
-    },
-    onClose: (event, serverWs) => {
-      logger().debug({
-        msg: `server ${connectionType} websocket closed`,
-        wasClean: event.wasClean,
-        code: event.code,
-        reason: event.reason
-      });
-      serverWs.close(1e3, "hack_force_close");
-      if (clientWs && clientWs.readyState !== clientWs.CLOSED && clientWs.readyState !== clientWs.CLOSING) {
-        clientWs.close(1e3, event.reason);
-      }
-    },
-    onError: (error) => {
-      logger().error({
-        msg: `error in server ${connectionType} websocket`,
-        error
-      });
-      if (clientWs && clientWs.readyState !== clientWs.CLOSED && clientWs.readyState !== clientWs.CLOSING) {
-        clientWs.close(1011, "Error in server websocket");
-      }
-    }
+    actor_id: actor2.actorId,
+    name: actor2.name,
+    key: serializeActorKey(actor2.key),
+    namespace_id: "default",
+    // Assert default namespace
+    runner_name_selector: "rivetkit",
+    // Assert rivetkit runner
+    create_ts: Date.now(),
+    connectable_ts: null,
+    destroy_ts: null,
+    sleep_ts: null,
+    start_ts: null
   };
 }
 
 // src/registry/config.ts
-import { z as z9 } from "zod";
-var ActorsSchema = z9.record(
-  z9.string(),
-  z9.custom()
+import { z as z6 } from "zod";
+var ActorsSchema = z6.record(
+  z6.string(),
+  z6.custom()
 );
-var TestConfigSchema = z9.object({ enabled: z9.boolean() });
-var RegistryConfigSchema = z9.object({
-  use: z9.record(z9.string(), z9.custom()),
+var TestConfigSchema = z6.object({ enabled: z6.boolean() });
+var RegistryConfigSchema = z6.object({
+  use: z6.record(z6.string(), z6.custom()),
   // TODO: Find a better way of passing around the test config
   /**
    * Test configuration.
@@ -3576,7 +3553,7 @@ var Registry = class {
    * Runs the registry for a server.
    */
   start(inputConfig) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     const config2 = RunConfigSchema.parse(inputConfig);
     if ((_a = config2.logging) == null ? void 0 : _a.baseLogger) {
       configureBaseLogger(config2.logging.baseLogger);
@@ -3585,11 +3562,11 @@ var Registry = class {
     }
     const driver = chooseDefaultDriver(config2);
     if (driver.name === "engine") {
-      config2.inspector.enabled = false;
+      config2.inspector.enabled = { manager: false, actor: true };
       config2.disableServer = true;
     }
     if (driver.name === "cloudflare-workers") {
-      config2.inspector.enabled = false;
+      config2.inspector.enabled = { manager: false, actor: true };
       config2.disableServer = true;
       config2.disableActorDriver = true;
       config2.noWelcome = true;
@@ -3599,12 +3576,82 @@ var Registry = class {
       config2.getUpgradeWebSocket = () => upgradeWebSocket;
     }
     const managerDriver = driver.manager(this.#config, config2);
+    configureInspectorAccessToken(config2, managerDriver);
+    const client = createClientWithDriver(managerDriver, config2);
+    const driverLog = ((_c = managerDriver.extraStartupLog) == null ? void 0 : _c.call(managerDriver)) ?? {};
+    logger6().info({
+      msg: "rivetkit ready",
+      driver: driver.name,
+      definitions: Object.keys(this.#config.use).length,
+      ...driverLog
+    });
+    if (isInspectorEnabled(config2, "manager") && managerDriver.inspector) {
+      logger6().info({ msg: "inspector ready", url: getInspectorUrl(config2) });
+    }
+    if (!config2.noWelcome) {
+      const displayInfo = managerDriver.displayInformation();
+      console.log();
+      console.log(`  RivetKit ${package_default.version} (${displayInfo.name})`);
+      console.log(`  - Endpoint:     http://127.0.0.1:6420`);
+      for (const [k, v] of Object.entries(displayInfo.properties)) {
+        const padding = " ".repeat(Math.max(0, 13 - k.length));
+        console.log(`  - ${k}:${padding}${v}`);
+      }
+      if (isInspectorEnabled(config2, "manager") && managerDriver.inspector) {
+        console.log(`  - Inspector:     ${getInspectorUrl(config2)}`);
+      }
+      console.log();
+    }
+    if (!config2.disableActorDriver) {
+      const _actorDriver = driver.actor(
+        this.#config,
+        config2,
+        managerDriver,
+        client
+      );
+    }
     const { router: hono } = createManagerRouter(
       this.#config,
       config2,
       managerDriver,
-      false
+      void 0
     );
+    if (!config2.disableServer) {
+      (async () => {
+        const out = await crossPlatformServe(hono, void 0);
+        upgradeWebSocket = out.upgradeWebSocket;
+      })();
+    }
+    return {
+      client,
+      fetch: hono.fetch.bind(hono)
+    };
+  }
+  startServerless(inputConfig) {
+    var _a, _b, _c, _d, _e;
+    const config2 = RunConfigSchema.parse(inputConfig);
+    if ((_a = config2.logging) == null ? void 0 : _a.baseLogger) {
+      configureBaseLogger(config2.logging.baseLogger);
+    } else {
+      configureDefaultLogger((_b = config2.logging) == null ? void 0 : _b.level);
+    }
+    const driver = chooseDefaultDriver(config2);
+    if (driver.name === "engine") {
+      config2.inspector.enabled = false;
+      config2.disableServer = true;
+      config2.disableActorDriver = true;
+    }
+    if (driver.name === "cloudflare-workers") {
+      config2.inspector.enabled = false;
+      config2.disableServer = true;
+      config2.disableActorDriver = true;
+      config2.noWelcome = true;
+    }
+    let upgradeWebSocket;
+    if (!config2.getUpgradeWebSocket) {
+      config2.getUpgradeWebSocket = () => upgradeWebSocket;
+    }
+    const managerDriver = driver.manager(this.#config, config2);
     const client = createClientWithDriver(managerDriver, config2);
     const driverLog = ((_c = managerDriver.extraStartupLog) == null ? void 0 : _c.call(managerDriver)) ?? {};
     logger6().info({
@@ -3630,14 +3677,19 @@ var Registry = class {
       }
       console.log();
     }
+    let serverlessActorDriverBuilder = () => {
+      return driver.actor(this.#config, config2, managerDriver, client);
+    };
     if (!config2.disableActorDriver) {
-      const _actorDriver = driver.actor(
-        this.#config,
-        config2,
-        managerDriver,
-        client
-      );
+      const _actorDriver = serverlessActorDriverBuilder();
+      serverlessActorDriverBuilder = void 0;
     }
+    const { router: hono } = createManagerRouter(
+      this.#config,
+      config2,
+      managerDriver,
+      serverlessActorDriverBuilder
+    );
     if (!config2.disableServer) {
       (async () => {
         const out = await crossPlatformServe(hono, void 0);
@@ -3656,8 +3708,6 @@ function setup(input) {
 }
 
 export {
-  GenericConnGlobalState,
-  createGenericConnDrivers,
   handleWebSocketConnect,
   handleRawWebSocketHandler,
   createActorRouter,
@@ -3673,4 +3723,4 @@ export {
   setup
 };
 //! These configs configs hold anything that's not platform-specific about running actors.
-//# sourceMappingURL=chunk-W6LN7AF5.js.map
+//# sourceMappingURL=chunk-HPT3I7UU.js.map