rivetkit 2.0.6 → 2.0.7

package/dist/tsup/{chunk-UFWAK3X2.cjs → chunk-NUA6LOOJ.cjs}

@@ -3,11 +3,11 @@
 
 
 
-var _chunkDIAYNQTEcjs = require('./chunk-DIAYNQTE.cjs');
+var _chunkOSK2VSJFcjs = require('./chunk-OSK2VSJF.cjs');
 
 
 
-var _chunkKG3C7MKRcjs = require('./chunk-KG3C7MKR.cjs');
+var _chunkVAF63BEIcjs = require('./chunk-VAF63BEI.cjs');
 
 
 
@@ -17,7 +17,7 @@ var _chunkKG3C7MKRcjs = require('./chunk-KG3C7MKR.cjs');
 
 
 
-var _chunkNTCUGYSDcjs = require('./chunk-NTCUGYSD.cjs');
+var _chunk7OOBMCQIcjs = require('./chunk-7OOBMCQI.cjs');
 
 
 
@@ -36,12 +36,10 @@ var _chunkNTCUGYSDcjs = require('./chunk-NTCUGYSD.cjs');
 
 
 
-var _chunkTCUI5JFEcjs = require('./chunk-TCUI5JFE.cjs');
 
 
 
 
-var _chunkMRRT2CZDcjs = require('./chunk-MRRT2CZD.cjs');
 
 
 
@@ -50,10 +48,25 @@ var _chunkMRRT2CZDcjs = require('./chunk-MRRT2CZD.cjs');
 
 
 
+var _chunkNDCVQZBScjs = require('./chunk-NDCVQZBS.cjs');
 
 
 
-var _chunk5JBFVV4Ccjs = require('./chunk-5JBFVV4C.cjs');
+
+var _chunkETDWYT2Pcjs = require('./chunk-ETDWYT2P.cjs');
+
+
+
+
+
+
+
+
+
+
+
+
+var _chunkLXAVET4Acjs = require('./chunk-LXAVET4A.cjs');
 
 
 
@@ -69,44 +82,134 @@ var _chunk5JBFVV4Ccjs = require('./chunk-5JBFVV4C.cjs');
 
 var _chunk5QGQK44Lcjs = require('./chunk-5QGQK44L.cjs');
 
-// src/actor/connection.ts
+// src/actor/conn.ts
 var _cborx = require('cbor-x'); var cbor = _interopRequireWildcard(_cborx); var cbor2 = _interopRequireWildcard(_cborx); var cbor5 = _interopRequireWildcard(_cborx); var cbor4 = _interopRequireWildcard(_cborx); var cbor3 = _interopRequireWildcard(_cborx); var cbor6 = _interopRequireWildcard(_cborx);
+
+// src/actor/conn-drivers.ts
+var WEBSOCKET_DRIVER = {
+  sendMessage: (actor, _conn, state, message) => {
+    const serialized = message.serialize(state.encoding);
+    actor.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));
+        actor.rLog.debug({
+          msg: "converted SharedArrayBuffer to ArrayBuffer",
+          byteLength: arrayBuffer.byteLength
+        });
+        state.websocket.send(arrayBuffer);
+      } else {
+        actor.rLog.debug({
+          msg: "sending ArrayBuffer",
+          byteLength: buffer.byteLength
+        });
+        state.websocket.send(buffer);
+      }
+    } else {
+      actor.rLog.debug({
+        msg: "sending string data",
+        length: serialized.length
+      });
+      state.websocket.send(serialized);
+    }
+  },
+  disconnect: async (_actor, _conn, state, reason) => {
+    state.websocket.close(1e3, reason);
+    await state.closePromise.promise;
+  },
+  getConnectionReadyState: (_actor, _conn, state) => {
+    return state.websocket.readyState;
+  }
+};
+var SSE_DRIVER = {
+  sendMessage: (_actor, _conn, state, message) => {
+    state.stream.writeSSE({
+      data: _chunkNDCVQZBScjs.encodeDataToString.call(void 0, message.serialize(state.encoding))
+    });
+  },
+  disconnect: async (_actor, _conn, state, _reason) => {
+    state.stream.close();
+  },
+  getConnectionReadyState: (_actor, _conn, state) => {
+    if (state.stream.aborted || state.stream.closed) {
+      return 3 /* CLOSED */;
+    }
+    return 1 /* OPEN */;
+  }
+};
+var HTTP_DRIVER = {
+  getConnectionReadyState(_actor, _conn) {
+    return 1 /* OPEN */;
+  },
+  disconnect: async () => {
+  }
+};
+var CONN_DRIVERS = {
+  [0 /* WEBSOCKET */]: WEBSOCKET_DRIVER,
+  [1 /* SSE */]: SSE_DRIVER,
+  [2 /* HTTP */]: HTTP_DRIVER
+};
+function getConnDriverKindFromState(state) {
+  if (0 /* WEBSOCKET */ in state) return 0 /* WEBSOCKET */;
+  else if (1 /* SSE */ in state) return 1 /* SSE */;
+  else if (2 /* HTTP */ in state) return 2 /* HTTP */;
+  else _chunkLXAVET4Acjs.assertUnreachable.call(void 0, state);
+}
+
+// src/actor/conn.ts
 function generateConnId() {
   return crypto.randomUUID();
 }
 function generateConnToken() {
-  return _chunkTCUI5JFEcjs.generateSecureToken.call(void 0, 32);
+  return _chunkNDCVQZBScjs.generateSecureToken.call(void 0, 32);
+}
+function generateConnSocketId() {
+  return crypto.randomUUID();
 }
-var CONNECTION_DRIVER_WEBSOCKET = "webSocket";
-var CONNECTION_DRIVER_SSE = "sse";
-var CONNECTION_DRIVER_HTTP = "http";
-var CONNECTION_CHECK_LIVENESS_SYMBOL = Symbol("checkLiveness");
 var Conn = (_class = class {
   __init() {this.subscriptions = /* @__PURE__ */ new Set()}
-  #stateEnabled;
   // TODO: Remove this cyclical reference
   #actor;
-  #status = "connected";
   /**
    * The proxied state that notifies of changes automatically.
    *
    * Any data that should be stored indefinitely should be held within this object.
    */
   
+  get __driverState() {
+    var _a;
+    return (_a = this.__socket) == null ? void 0 : _a.driverState;
+  }
   /**
-   * Driver used to manage realtime connection communication.
+   * Socket connected to this connection.
    *
-   * @protected
+   * If undefined, then nothing is connected to this.
    */
-  #driver;
+  
+  get __status() {
+    if (this.__socket) {
+      return "connected";
+    } else {
+      return "reconnecting";
+    }
+  }
   get params() {
     return this.__persist.params;
   }
-  get driver() {
-    return this.__persist.connDriver;
-  }
-  get _stateEnabled() {
-    return this.#stateEnabled;
+  get __stateEnabled() {
+    return this.#actor.connStateEnabled;
   }
   /**
    * Gets the current state of the connection.
@@ -143,7 +246,7 @@ var Conn = (_class = class {
    * Status of the connection.
    */
   get status() {
-    return this.#status;
+    return this.__status;
   }
   /**
    * Timestamp of the last time the connection was seen, i.e. the last time the connection was active and checked for liveness.
@@ -158,14 +261,12 @@ var Conn = (_class = class {
    *
    * @protected
    */
-  constructor(actor, persist, driver, stateEnabled) {;_class.prototype.__init.call(this);
+  constructor(actor, persist) {;_class.prototype.__init.call(this);
     this.#actor = actor;
     this.__persist = persist;
-    this.#driver = driver;
-    this.#stateEnabled = stateEnabled;
   }
   #validateStateEnabled() {
-    if (!this.#stateEnabled) {
+    if (!this.__stateEnabled) {
       throw new (0, _chunk5QGQK44Lcjs.ConnStateNotEnabled)();
     }
   }
@@ -177,14 +278,28 @@ var Conn = (_class = class {
    * @protected
    */
   _sendMessage(message) {
-    var _a, _b;
-    (_b = (_a = this.#driver).sendMessage) == null ? void 0 : _b.call(
-      _a,
-      this.#actor,
-      this,
-      this.__persist.connDriverState,
-      message
-    );
+    if (this.__driverState) {
+      const driverKind = getConnDriverKindFromState(this.__driverState);
+      const driver = CONN_DRIVERS[driverKind];
+      if (driver.sendMessage) {
+        driver.sendMessage(
+          this.#actor,
+          this,
+          this.__driverState[driverKind],
+          message
+        );
+      } else {
+        this.#actor.rLog.debug({
+          msg: "conn driver does not support sending messages",
+          conn: this.id
+        });
+      }
+    } else {
+      this.#actor.rLog.warn({
+        msg: "missing connection driver state for send message",
+        conn: this.id
+      });
+    }
   }
   /**
    * Sends an event with arguments to the client.
@@ -201,17 +316,17 @@ var Conn = (_class = class {
       connId: this.id
     });
     this._sendMessage(
-      new (0, _chunkTCUI5JFEcjs.CachedSerializer)(
+      new (0, _chunkNDCVQZBScjs.CachedSerializer)(
         {
           body: {
             tag: "Event",
             val: {
               name: eventName,
-              args: _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, cbor.encode(args))
+              args: _chunkLXAVET4Acjs.bufferToArrayBuffer.call(void 0, cbor.encode(args))
             }
           }
         },
-        _chunkNTCUGYSDcjs.TO_CLIENT_VERSIONED
+        _chunk7OOBMCQIcjs.TO_CLIENT_VERSIONED
       )
     );
   }
@@ -221,43 +336,30 @@ var Conn = (_class = class {
    * @param reason - The reason for disconnection.
    */
   async disconnect(reason) {
-    this.#status = "reconnecting";
-    await this.#driver.disconnect(
-      this.#actor,
-      this,
-      this.__persist.connDriverState,
-      reason
-    );
-  }
-  /**
-   * This method checks the connection's liveness by querying the driver for its ready state.
-   * If the connection is not closed, it updates the last liveness timestamp and returns `true`.
-   * Otherwise, it returns `false`.
-   * @internal
-   */
-  [CONNECTION_CHECK_LIVENESS_SYMBOL]() {
-    const readyState = this.#driver.getConnectionReadyState(this.#actor, this);
-    const isConnectionClosed = readyState === 3 /* CLOSED */ || readyState === 2 /* CLOSING */ || readyState === void 0;
-    const newLastSeen = Date.now();
-    const newStatus = isConnectionClosed ? "reconnecting" : "connected";
-    this.#actor.rLog.debug({
-      msg: "liveness probe for connection",
-      connId: this.id,
-      actorId: this.#actor.id,
-      readyState,
-      status: this.#status,
-      newStatus,
-      lastSeen: this.__persist.lastSeen,
-      currentTs: newLastSeen
-    });
-    if (!isConnectionClosed) {
-      this.__persist.lastSeen = newLastSeen;
+    if (this.__socket && this.__driverState) {
+      const driverKind = getConnDriverKindFromState(this.__driverState);
+      const driver = CONN_DRIVERS[driverKind];
+      if (driver.disconnect) {
+        driver.disconnect(
+          this.#actor,
+          this,
+          this.__driverState[driverKind],
+          reason
+        );
+      } else {
+        this.#actor.rLog.debug({
+          msg: "no disconnect handler for conn driver",
+          conn: this.id
+        });
+      }
+      this.#actor.__connDisconnected(this, true, this.__socket.socketId);
+    } else {
+      this.#actor.rLog.warn({
+        msg: "missing connection driver state for disconnect",
+        conn: this.id
+      });
     }
-    this.#status = newStatus;
-    return {
-      status: this.#status,
-      lastSeen: this.__persist.lastSeen
-    };
+    this.__socket = void 0;
   }
 }, _class);
 
@@ -291,7 +393,7 @@ function createActorInspectorRouter() {
     "/state",
     _standardvalidator.sValidator.call(void 0, 
       "json",
-      _v42.default.object({ patch: _chunkDIAYNQTEcjs.PatchSchema }).or(_v42.default.object({ replace: _v42.default.any() }))
+      _v42.default.object({ patch: _chunkOSK2VSJFcjs.PatchSchema }).or(_v42.default.object({ replace: _v42.default.any() }))
     ),
     async (c) => {
       if (!await c.var.inspector.accessors.isStateEnabled()) {
@@ -335,7 +437,7 @@ function createActorInspectorRouter() {
             id: String(id++)
           });
         });
-        const { promise } = Promise.withResolvers();
+        const { promise } = _chunkLXAVET4Acjs.promiseWithResolvers.call(void 0, );
         return promise;
       },
       async () => {
@@ -360,7 +462,7 @@ function createActorInspectorRouter() {
             id: String(id++)
           });
         });
-        const { promise } = Promise.withResolvers();
+        const { promise } = _chunkLXAVET4Acjs.promiseWithResolvers.call(void 0, );
         return promise;
       },
       async () => {
@@ -386,7 +488,7 @@ function createActorInspectorRouter() {
             id: String(id++)
           });
         });
-        const { promise } = Promise.withResolvers();
+        const { promise } = _chunkLXAVET4Acjs.promiseWithResolvers.call(void 0, );
         return promise;
       },
       async () => {
@@ -402,20 +504,20 @@ function createActorInspectorRouter() {
     }
     const db = await c.var.inspector.accessors.getDb();
     const rows = await db.execute(`PRAGMA table_list`);
-    const tables = _chunkDIAYNQTEcjs.TablesSchema.parse(rows).filter(
+    const tables = _chunkOSK2VSJFcjs.TablesSchema.parse(rows).filter(
       (table) => table.schema !== "temp" && !table.name.startsWith("sqlite_")
     );
     const tablesInfo = await Promise.all(
       tables.map((table) => db.execute(`PRAGMA table_info(${table.name})`))
     );
-    const columns = tablesInfo.map((def) => _chunkDIAYNQTEcjs.ColumnsSchema.parse(def));
+    const columns = tablesInfo.map((def) => _chunkOSK2VSJFcjs.ColumnsSchema.parse(def));
     const foreignKeysList = await Promise.all(
       tables.map(
         (table) => db.execute(`PRAGMA foreign_key_list(${table.name})`)
       )
     );
     const foreignKeys = foreignKeysList.map(
-      (def) => _chunkDIAYNQTEcjs.ForeignKeysSchema.parse(def)
+      (def) => _chunkOSK2VSJFcjs.ForeignKeysSchema.parse(def)
     );
     const countInfo = await Promise.all(
       tables.map(
@@ -695,15 +797,14 @@ var ActorInstance = class {
   #persist;
   /** Raw state without the proxy wrapper */
   #persistRaw;
-  #persistWriteQueue = new (0, _chunk5JBFVV4Ccjs.SinglePromiseQueue)();
-  #alarmWriteQueue = new (0, _chunk5JBFVV4Ccjs.SinglePromiseQueue)();
+  #persistWriteQueue = new (0, _chunkLXAVET4Acjs.SinglePromiseQueue)();
+  #alarmWriteQueue = new (0, _chunkLXAVET4Acjs.SinglePromiseQueue)();
   #lastSaveTime = 0;
   #pendingSaveTimeout;
   #vars;
   #backgroundPromises = [];
   #abortController = new AbortController();
   #config;
-  #connectionDrivers;
   #actorDriver;
   #inlineClient;
   #actorId;
@@ -741,9 +842,9 @@ var ActorInstance = class {
       getConnections: async () => {
         return Array.from(this.#connections.entries()).map(([id, conn]) => ({
           id,
-          stateEnabled: conn._stateEnabled,
+          stateEnabled: conn.__stateEnabled,
           params: conn.params,
-          state: conn._stateEnabled ? conn.state : void 0
+          state: conn.__stateEnabled ? conn.state : void 0
         }));
       },
       setState: async (state) => {
@@ -776,23 +877,22 @@ var ActorInstance = class {
     this.#config = config;
     this.actorContext = new ActorContext(this);
   }
-  async start(connectionDrivers, actorDriver, inlineClient, actorId, name, key, region) {
+  async start(actorDriver, inlineClient, actorId, name, key, region) {
     var _a, _b;
     const logParams = {
       actor: name,
       key: serializeActorKey(key),
       actorId
     };
-    this.#log = _chunkMRRT2CZDcjs.getBaseLogger.call(void 0, ).child(
-      Object.assign(_chunkMRRT2CZDcjs.getIncludeTarget.call(void 0, ) ? { target: "actor" } : {}, logParams)
+    this.#log = _chunkETDWYT2Pcjs.getBaseLogger.call(void 0, ).child(
+      Object.assign(_chunkETDWYT2Pcjs.getIncludeTarget.call(void 0, ) ? { target: "actor" } : {}, logParams)
     );
-    this.#rLog = _chunkMRRT2CZDcjs.getBaseLogger.call(void 0, ).child(
+    this.#rLog = _chunkETDWYT2Pcjs.getBaseLogger.call(void 0, ).child(
       Object.assign(
-        _chunkMRRT2CZDcjs.getIncludeTarget.call(void 0, ) ? { target: "actor-runtime" } : {},
+        _chunkETDWYT2Pcjs.getIncludeTarget.call(void 0, ) ? { target: "actor-runtime" } : {},
         logParams
       )
     );
-    this.#connectionDrivers = connectionDrivers;
     this.#actorDriver = actorDriver;
     this.#inlineClient = inlineClient;
     this.#actorId = actorId;
@@ -809,7 +909,7 @@ var ActorInstance = class {
           this.#actorDriver.getContext(this.#actorId)
         );
         if (dataOrPromise instanceof Promise) {
-          vars = await _chunkTCUI5JFEcjs.deadline.call(void 0, 
+          vars = await _chunkNDCVQZBScjs.deadline.call(void 0, 
             dataOrPromise,
             this.#config.options.createVarsTimeout
           );
@@ -936,7 +1036,7 @@ var ActorInstance = class {
         } catch (error) {
           this.actorContext.log.error({
             msg: "error while running event",
-            error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error),
+            error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error),
             event: event.eventId,
             timestamp: event.timestamp,
             action: event.kind.generic.actionName
@@ -945,7 +1045,7 @@ var ActorInstance = class {
       } catch (error) {
         this.actorContext.log.error({
           msg: "internal error while running event",
-          error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error),
+          error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error),
           ...event
         });
       }
@@ -958,7 +1058,7 @@ var ActorInstance = class {
       kind: {
         generic: {
           actionName: action,
-          args: _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
+          args: _chunkLXAVET4Acjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
         }
       }
     });
@@ -971,7 +1071,7 @@ var ActorInstance = class {
       throw new (0, _chunk5QGQK44Lcjs.StateNotEnabled)();
     }
   }
-  get #connStateEnabled() {
+  get connStateEnabled() {
     return "createConnState" in this.#config || "connState" in this.#config;
   }
   get #varsEnabled() {
@@ -1012,7 +1112,7 @@ var ActorInstance = class {
           const bareData = this.#convertToBarePersisted(this.#persistRaw);
           await this.#actorDriver.writePersistedData(
             this.#actorId,
-            _chunkNTCUGYSDcjs.PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(bareData)
+            _chunk7OOBMCQIcjs.PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(bareData)
           );
           this.#rLog.debug({ msg: "persist saved" });
         });
@@ -1036,7 +1136,7 @@ var ActorInstance = class {
     this.#persistRaw = target;
     if (target === null || typeof target !== "object") {
       let invalidPath = "";
-      if (!_chunk5JBFVV4Ccjs.isCborSerializable.call(void 0, 
+      if (!_chunkLXAVET4Acjs.isCborSerializable.call(void 0, 
         target,
         (path) => {
           invalidPath = path;
@@ -1058,7 +1158,7 @@ var ActorInstance = class {
           return;
         }
         let invalidPath = "";
-        if (!_chunk5JBFVV4Ccjs.isCborSerializable.call(void 0, 
+        if (!_chunkLXAVET4Acjs.isCborSerializable.call(void 0, 
           value,
           (invalidPathPart) => {
             invalidPath = invalidPathPart;
@@ -1081,7 +1181,7 @@ var ActorInstance = class {
           } catch (error) {
             this.#rLog.error({
               msg: "error in `_onStateChange`",
-              error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+              error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
             });
           } finally {
             this.#isInOnStateChange = false;
@@ -1099,7 +1199,7 @@ var ActorInstance = class {
       persistDataBuffer !== void 0,
       "persist data has not been set, it should be set when initialized"
     );
-    const bareData = _chunkNTCUGYSDcjs.PERSISTED_ACTOR_VERSIONED.deserializeWithEmbeddedVersion(
+    const bareData = _chunk7OOBMCQIcjs.PERSISTED_ACTOR_VERSIONED.deserializeWithEmbeddedVersion(
       persistDataBuffer
     );
     const persistData = this.#convertFromBarePersisted(bareData);
@@ -1110,13 +1210,7 @@ var ActorInstance = class {
       });
       this.#setPersist(persistData);
       for (const connPersist of this.#persist.connections) {
-        const driver = this.__getConnDriver(connPersist.connDriver);
-        const conn = new Conn(
-          this,
-          connPersist,
-          driver,
-          this.#connStateEnabled
-        );
+        const conn = new Conn(this, connPersist);
         this.#connections.set(conn.id, conn);
         for (const sub of connPersist.subscriptions) {
           this.#addSubscription(sub.eventName, conn, true);
@@ -1147,7 +1241,7 @@ var ActorInstance = class {
       const bareData2 = this.#convertToBarePersisted(persistData);
       await this.#actorDriver.writePersistedData(
         this.#actorId,
-        _chunkNTCUGYSDcjs.PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(bareData2)
+        _chunk7OOBMCQIcjs.PERSISTED_ACTOR_VERSIONED.serializeWithEmbeddedVersion(bareData2)
       );
       this.#setPersist(persistData);
       if (this.#config.onCreate) {
@@ -1159,13 +1253,36 @@ var ActorInstance = class {
     return this.#connections.get(id);
   }
   /**
-   * Removes a connection and cleans up its resources.
+   * Connection disconnected.
+   *
+   * If a clean diconnect, will be removed immediately.
+   *
+   * If not a clean disconnect, will keep the connection alive for a given interval to wait for reconnect.
    */
-  __removeConn(conn) {
-    if (!conn) {
-      this.#rLog.warn({ msg: "`conn` does not exist" });
+  __connDisconnected(conn, wasClean, socketId) {
+    if (socketId && conn.__socket && socketId !== conn.__socket.socketId) {
+      this.rLog.debug({
+        msg: "ignoring stale disconnect event",
+        connId: conn.id,
+        eventSocketId: socketId,
+        currentSocketId: conn.__socket.socketId
+      });
       return;
     }
+    if (wasClean) {
+      this.#removeConn(conn);
+    } else {
+      if (!conn.__driverState) {
+        this.rLog.warn("called conn disconnected without driver state");
+      }
+      conn.__persist.lastSeen = Date.now();
+      conn.__socket = void 0;
+    }
+  }
+  /**
+   * Removes a connection and cleans up its resources.
+   */
+  #removeConn(conn) {
     const connIdx = this.#persist.connections.findIndex(
       (c) => c.connId === conn.id
     );
@@ -1190,20 +1307,80 @@ var ActorInstance = class {
           result.catch((error) => {
             this.#rLog.error({
               msg: "error in `onDisconnect`",
-              error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+              error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
             });
           });
         }
       } catch (error) {
         this.#rLog.error({
           msg: "error in `onDisconnect`",
-          error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+          error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
         });
       }
     }
     this.#resetSleepTimer();
   }
-  async prepareConn(params, request) {
+  /**
+   * Called to create a new connection or reconnect an existing one.
+   */
+  async createConn(socket, params, request, connectionId, connectionToken) {
+    this.#assertReady();
+    if (connectionId && connectionToken) {
+      this.rLog.debug({
+        msg: "checking for existing connection",
+        connectionId
+      });
+      const existingConn = this.#connections.get(connectionId);
+      if (existingConn && existingConn._token === connectionToken) {
+        this.rLog.debug({
+          msg: "reconnecting existing connection",
+          connectionId
+        });
+        if (existingConn.__driverState) {
+          const driverKind = getConnDriverKindFromState(
+            existingConn.__driverState
+          );
+          const driver = CONN_DRIVERS[driverKind];
+          if (driver.disconnect) {
+            driver.disconnect(
+              this,
+              existingConn,
+              existingConn.__driverState[driverKind],
+              "Reconnecting with new driver state"
+            );
+          }
+        }
+        existingConn.__socket = socket;
+        existingConn.__persist.lastSeen = Date.now();
+        this.#resetSleepTimer();
+        this.inspector.emitter.emit("connectionUpdated");
+        existingConn._sendMessage(
+          new (0, _chunkNDCVQZBScjs.CachedSerializer)(
+            {
+              body: {
+                tag: "Init",
+                val: {
+                  actorId: this.id,
+                  connectionId: existingConn.id,
+                  connectionToken: existingConn._token
+                }
+              }
+            },
+            _chunk7OOBMCQIcjs.TO_CLIENT_VERSIONED
+          )
+        );
+        return existingConn;
+      }
+      this.rLog.debug({
+        msg: "connection not found or token mismatch, creating new connection",
+        connectionId
+      });
+    }
+    const newConnId = generateConnId();
+    const newConnToken = generateConnToken();
+    if (this.#connections.has(newConnId)) {
+      throw new Error(`Connection already exists: ${newConnId}`);
+    }
     let connState;
     const onBeforeConnectOpts = {
       request
@@ -1215,7 +1392,7 @@ var ActorInstance = class {
         params
       );
     }
-    if (this.#connStateEnabled) {
+    if (this.connStateEnabled) {
       if ("createConnState" in this.#config) {
         const dataOrPromise = this.#config.createConnState(
           this.actorContext,
@@ -1223,7 +1400,7 @@ var ActorInstance = class {
           params
         );
         if (dataOrPromise instanceof Promise) {
-          connState = await _chunkTCUI5JFEcjs.deadline.call(void 0, 
+          connState = await _chunkNDCVQZBScjs.deadline.call(void 0, 
             dataOrPromise,
             this.#config.options.createConnStateTimeout
           );
@@ -1238,39 +1415,16 @@ var ActorInstance = class {
         );
       }
     }
-    return connState;
-  }
-  __getConnDriver(driverId) {
-    const driver = this.#connectionDrivers[driverId];
-    if (!driver) throw new Error(`No connection driver: ${driverId}`);
-    return driver;
-  }
-  /**
-   * Called after establishing a connection handshake.
-   */
-  async createConn(connectionId, connectionToken, params, state, driverId, driverState, authData) {
-    this.#assertReady();
-    if (this.#connections.has(connectionId)) {
-      throw new Error(`Connection already exists: ${connectionId}`);
-    }
-    const driver = this.__getConnDriver(driverId);
     const persist = {
-      connId: connectionId,
-      token: connectionToken,
-      connDriver: driverId,
-      connDriverState: driverState,
+      connId: newConnId,
+      token: newConnToken,
       params,
-      state,
-      authData,
+      state: connState,
       lastSeen: Date.now(),
       subscriptions: []
     };
-    const conn = new Conn(
-      this,
-      persist,
-      driver,
-      this.#connStateEnabled
-    );
+    const conn = new Conn(this, persist);
+    conn.__socket = socket;
     this.#connections.set(conn.id, conn);
     this.#resetSleepTimer();
     this.#persist.connections.push(persist);
@@ -1279,7 +1433,7 @@ var ActorInstance = class {
       try {
         const result = this.#config.onConnect(this.actorContext, conn);
         if (result instanceof Promise) {
-          _chunkTCUI5JFEcjs.deadline.call(void 0, result, this.#config.options.onConnectTimeout).catch(
+          _chunkNDCVQZBScjs.deadline.call(void 0, result, this.#config.options.onConnectTimeout).catch(
             (error) => {
               this.#rLog.error({
                 msg: "error in `onConnect`, closing socket",
@@ -1292,14 +1446,14 @@ var ActorInstance = class {
       } catch (error) {
         this.#rLog.error({
           msg: "error in `onConnect`",
-          error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+          error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
         });
         conn == null ? void 0 : conn.disconnect("`onConnect` failed");
       }
     }
     this.inspector.emitter.emit("connectionUpdated");
     conn._sendMessage(
-      new (0, _chunkTCUI5JFEcjs.CachedSerializer)(
+      new (0, _chunkNDCVQZBScjs.CachedSerializer)(
         {
           body: {
             tag: "Init",
@@ -1310,14 +1464,14 @@ var ActorInstance = class {
             }
           }
         },
-        _chunkNTCUGYSDcjs.TO_CLIENT_VERSIONED
+        _chunk7OOBMCQIcjs.TO_CLIENT_VERSIONED
       )
     );
     return conn;
   }
   // MARK: Messages
   async processMessage(message, conn) {
-    await _chunkNTCUGYSDcjs.processMessage.call(void 0, message, this, conn, {
+    await _chunk7OOBMCQIcjs.processMessage.call(void 0, message, this, conn, {
       onExecuteAction: async (ctx, name, args) => {
         this.inspector.emitter.emit("eventFired", {
           type: "action",
@@ -1411,11 +1565,10 @@ var ActorInstance = class {
   #checkConnectionsLiveness() {
     this.#rLog.debug({ msg: "checking connections liveness" });
     for (const conn of this.#connections.values()) {
-      const liveness = conn[CONNECTION_CHECK_LIVENESS_SYMBOL]();
-      if (liveness.status === "connected") {
+      if (conn.__status === "connected") {
         this.#rLog.debug({ msg: "connection is alive", connId: conn.id });
       } else {
-        const lastSeen = liveness.lastSeen;
+        const lastSeen = conn.__persist.lastSeen;
         const sinceLastSeen = Date.now() - lastSeen;
         if (sinceLastSeen < this.#config.options.connectionLivenessTimeout) {
           this.#rLog.debug({
@@ -1431,7 +1584,7 @@ var ActorInstance = class {
           connId: conn.id,
           lastSeen
         });
-        this.__removeConn(conn);
+        this.#removeConn(conn);
       }
     }
   }
@@ -1487,7 +1640,7 @@ var ActorInstance = class {
           msg: "awaiting async action",
           actionName
         });
-        output = await _chunkTCUI5JFEcjs.deadline.call(void 0, 
+        output = await _chunkNDCVQZBScjs.deadline.call(void 0, 
           outputOrPromise,
           this.#config.options.actionTimeout
         );
@@ -1522,7 +1675,7 @@ var ActorInstance = class {
         } catch (error) {
           this.#rLog.error({
             msg: "error in `onBeforeActionResponse`",
-            error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+            error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
           });
         }
       }
@@ -1534,13 +1687,13 @@ var ActorInstance = class {
       });
       return output;
     } catch (error) {
-      if (error instanceof _chunkTCUI5JFEcjs.DeadlineError) {
+      if (error instanceof _chunkNDCVQZBScjs.DeadlineError) {
         throw new (0, _chunk5QGQK44Lcjs.ActionTimedOut)();
       }
       this.#rLog.error({
         msg: "action error",
         actionName,
-        error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+        error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
       });
       throw error;
     } finally {
@@ -1574,7 +1727,7 @@ var ActorInstance = class {
       }
       return response;
     } catch (error) {
-      this.#rLog.error({ msg: "onFetch error", error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error) });
+      this.#rLog.error({ msg: "onFetch error", error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error) });
       throw error;
     } finally {
       this.#activeRawFetchCount = Math.max(0, this.#activeRawFetchCount - 1);
@@ -1615,7 +1768,7 @@ var ActorInstance = class {
     } catch (error) {
       this.#rLog.error({
         msg: "onWebSocket error",
-        error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+        error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
       });
       throw error;
     } finally {
@@ -1710,17 +1863,17 @@ var ActorInstance = class {
     });
     const subscriptions = this.#subscriptionIndex.get(name);
     if (!subscriptions) return;
-    const toClientSerializer = new (0, _chunkTCUI5JFEcjs.CachedSerializer)(
+    const toClientSerializer = new (0, _chunkNDCVQZBScjs.CachedSerializer)(
       {
         body: {
           tag: "Event",
           val: {
             name,
-            args: _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
+            args: _chunkLXAVET4Acjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
           }
         }
       },
-      _chunkNTCUGYSDcjs.TO_CLIENT_VERSIONED
+      _chunk7OOBMCQIcjs.TO_CLIENT_VERSIONED
     );
     for (const connection of subscriptions) {
       connection._sendMessage(toClientSerializer);
@@ -1741,7 +1894,7 @@ var ActorInstance = class {
     }).catch((error) => {
       this.#rLog.error({
         msg: "wait until promise failed",
-        error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+        error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
       });
     });
     this.#backgroundPromises.push(nonfailablePromise);
@@ -1761,7 +1914,7 @@ var ActorInstance = class {
         await this.#savePersistInner();
       } else {
         if (!this.#onPersistSavedPromise) {
-          this.#onPersistSavedPromise = Promise.withResolvers();
+          this.#onPersistSavedPromise = _chunkLXAVET4Acjs.promiseWithResolvers.call(void 0, );
         }
         this.#savePersistThrottled();
         await this.#onPersistSavedPromise.promise;
@@ -1797,7 +1950,7 @@ var ActorInstance = class {
         this._sleep().catch((error) => {
           this.#rLog.error({
             msg: "error during sleep",
-            error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+            error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
           });
         });
       }, this.#config.options.sleepTimeout);
@@ -1849,16 +2002,16 @@ var ActorInstance = class {
         this.#rLog.debug({ msg: "calling onStop" });
         const result = this.#config.onStop(this.actorContext);
         if (result instanceof Promise) {
-          await _chunkTCUI5JFEcjs.deadline.call(void 0, result, this.#config.options.onStopTimeout);
+          await _chunkNDCVQZBScjs.deadline.call(void 0, result, this.#config.options.onStopTimeout);
         }
         this.#rLog.debug({ msg: "onStop completed" });
       } catch (error) {
-        if (error instanceof _chunkTCUI5JFEcjs.DeadlineError) {
+        if (error instanceof _chunkNDCVQZBScjs.DeadlineError) {
           this.#rLog.error({ msg: "onStop timed out" });
         } else {
           this.#rLog.error({
             msg: "error in onStop",
-            error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+            error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
           });
         }
       }
@@ -1919,18 +2072,14 @@ var ActorInstance = class {
   // MARK: BARE Conversion Helpers
   #convertToBarePersisted(persist) {
     return {
-      input: persist.input !== void 0 ? _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, cbor2.encode(persist.input)) : null,
+      input: persist.input !== void 0 ? _chunkLXAVET4Acjs.bufferToArrayBuffer.call(void 0, cbor2.encode(persist.input)) : null,
       hasInitialized: persist.hasInitiated,
-      state: _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, cbor2.encode(persist.state)),
+      state: _chunkLXAVET4Acjs.bufferToArrayBuffer.call(void 0, cbor2.encode(persist.state)),
       connections: persist.connections.map((conn) => ({
         id: conn.connId,
         token: conn.token,
-        driver: conn.connDriver,
-        driverState: _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, 
-          cbor2.encode(conn.connDriverState || {})
-        ),
-        parameters: _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, cbor2.encode(conn.params || {})),
-        state: _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, cbor2.encode(conn.state || {})),
+        parameters: _chunkLXAVET4Acjs.bufferToArrayBuffer.call(void 0, cbor2.encode(conn.params || {})),
+        state: _chunkLXAVET4Acjs.bufferToArrayBuffer.call(void 0, cbor2.encode(conn.state || {})),
         subscriptions: conn.subscriptions.map((sub) => ({
           eventName: sub.eventName
         })),
@@ -1957,8 +2106,6 @@ var ActorInstance = class {
       connections: bareData.connections.map((conn) => ({
         connId: conn.id,
         token: conn.token,
-        connDriver: conn.driver,
-        connDriverState: cbor2.decode(new Uint8Array(conn.driverState)),
         params: cbor2.decode(new Uint8Array(conn.parameters)),
         state: cbor2.decode(new Uint8Array(conn.state)),
         subscriptions: conn.subscriptions.map((sub) => ({
@@ -2050,7 +2197,7 @@ async function importEventSource() {
     try {
       const es = await Promise.resolve().then(() => _interopRequireWildcard(require("eventsource")));
       _EventSource = es.EventSource;
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).debug("using eventsource from npm");
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug("using eventsource from npm");
     } catch (err) {
       _EventSource = class MockEventSource {
         constructor() {
@@ -2059,7 +2206,7 @@ async function importEventSource() {
           );
         }
       };
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).debug("using mock eventsource");
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug("using mock eventsource");
     }
     return _EventSource;
   })();
@@ -2068,7 +2215,7 @@ async function importEventSource() {
 
 // src/client/actor-query.ts
 async function queryActor(c, query, managerDriver) {
-  _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "querying actor", query: JSON.stringify(query) });
+  _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "querying actor", query: JSON.stringify(query) });
   let actorOutput;
   if ("getForId" in query) {
     const output = await managerDriver.getForId({
@@ -2115,7 +2262,7 @@ async function queryActor(c, query, managerDriver) {
   } else {
     throw new (0, _chunk5QGQK44Lcjs.InvalidRequest)("Invalid query format");
   }
-  _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "actor query result", actorId: actorOutput.actorId });
+  _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "actor query result", actorId: actorOutput.actorId });
   return { actorId: actorOutput.actorId };
 }
 
@@ -2165,13 +2312,13 @@ async function rawHttpFetch(driver, actorQuery, params, input, init) {
   }
   try {
     const { actorId } = await queryActor(void 0, actorQuery, driver);
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "found actor for raw http", actorId });
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "found actor for raw http", actorId });
     _invariant2.default.call(void 0, actorId, "Missing actor ID");
     const normalizedPath = path.startsWith("/") ? path.slice(1) : path;
     const url = new URL(`http://actor/raw/http/${normalizedPath}`);
     const proxyRequestHeaders = new Headers(mergedInit.headers);
     if (params) {
-      proxyRequestHeaders.set(_chunkTCUI5JFEcjs.HEADER_CONN_PARAMS, JSON.stringify(params));
+      proxyRequestHeaders.set(_chunkNDCVQZBScjs.HEADER_CONN_PARAMS, JSON.stringify(params));
     }
     const proxyRequest = new Request(url, {
       ...mergedInit,
@@ -2179,9 +2326,9 @@ async function rawHttpFetch(driver, actorQuery, params, input, init) {
     });
     return driver.sendRequest(actorId, proxyRequest);
   } catch (err) {
-    const { group, code, message, metadata } = _chunk5JBFVV4Ccjs.deconstructError.call(void 0, 
+    const { group, code, message, metadata } = _chunkLXAVET4Acjs.deconstructError.call(void 0, 
       err,
-      _chunkKG3C7MKRcjs.logger.call(void 0, ),
+      _chunkVAF63BEIcjs.logger.call(void 0, ),
       {},
       true
     );
@@ -2191,7 +2338,7 @@ async function rawHttpFetch(driver, actorQuery, params, input, init) {
 async function rawWebSocket(driver, actorQuery, params, path, protocols) {
   const encoding = "bare";
   const { actorId } = await queryActor(void 0, actorQuery, driver);
-  _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "found actor for action", actorId });
+  _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "found actor for action", actorId });
   _invariant2.default.call(void 0, actorId, "Missing actor ID");
   let pathPortion = "";
   let queryPortion = "";
@@ -2207,8 +2354,8 @@ async function rawWebSocket(driver, actorQuery, params, path, protocols) {
       pathPortion = pathPortion.slice(1);
     }
   }
-  const fullPath = `${_chunkTCUI5JFEcjs.PATH_RAW_WEBSOCKET_PREFIX}${pathPortion}${queryPortion}`;
-  _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+  const fullPath = `${_chunkNDCVQZBScjs.PATH_RAW_WEBSOCKET_PREFIX}${pathPortion}${queryPortion}`;
+  _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
     msg: "opening websocket",
     actorId,
     encoding,
@@ -2234,10 +2381,10 @@ function messageLength(message) {
   if (typeof message === "string") {
     return message.length;
   }
-  _chunk5JBFVV4Ccjs.assertUnreachable.call(void 0, message);
+  _chunkLXAVET4Acjs.assertUnreachable.call(void 0, message);
 }
 async function sendHttpRequest(opts) {
-  _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+  _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
     msg: "sending http request",
     url: opts.url,
     encoding: opts.encoding
@@ -2246,8 +2393,8 @@ async function sendHttpRequest(opts) {
   let bodyData;
   if (opts.method === "POST" || opts.method === "PUT") {
     _invariant2.default.call(void 0, opts.body !== void 0, "missing body");
-    contentType = _chunkTCUI5JFEcjs.contentTypeForEncoding.call(void 0, opts.encoding);
-    bodyData = _chunkTCUI5JFEcjs.serializeWithEncoding.call(void 0, 
+    contentType = _chunkNDCVQZBScjs.contentTypeForEncoding.call(void 0, opts.encoding);
+    bodyData = _chunkNDCVQZBScjs.serializeWithEncoding.call(void 0, 
       opts.encoding,
       opts.body,
       opts.requestVersionedDataHandler
@@ -2263,7 +2410,7 @@ async function sendHttpRequest(opts) {
           ...contentType ? {
             "Content-Type": contentType
           } : {},
-          "User-Agent": _chunk5JBFVV4Ccjs.httpUserAgent.call(void 0, )
+          "User-Agent": _chunkLXAVET4Acjs.httpUserAgent.call(void 0, )
         },
         body: bodyData,
         credentials: "include",
@@ -2279,10 +2426,10 @@ async function sendHttpRequest(opts) {
     const bufferResponse = await response.arrayBuffer();
     let responseData;
     try {
-      responseData = _chunkTCUI5JFEcjs.deserializeWithEncoding.call(void 0, 
+      responseData = _chunkNDCVQZBScjs.deserializeWithEncoding.call(void 0, 
         opts.encoding,
         new Uint8Array(bufferResponse),
-        _chunkNTCUGYSDcjs.HTTP_RESPONSE_ERROR_VERSIONED
+        _chunk7OOBMCQIcjs.HTTP_RESPONSE_ERROR_VERSIONED
       );
     } catch (error) {
       const textResponse = new TextDecoder("utf-8", { fatal: false }).decode(
@@ -2305,7 +2452,7 @@ ${textResponse}`
   }
   try {
     const buffer = new Uint8Array(await response.arrayBuffer());
-    return _chunkTCUI5JFEcjs.deserializeWithEncoding.call(void 0, 
+    return _chunkNDCVQZBScjs.deserializeWithEncoding.call(void 0, 
       opts.encoding,
       buffer,
       opts.responseVersionedDataHandler
@@ -2352,9 +2499,9 @@ var ActorHandleRaw = class {
         this.#actorQuery,
         this.#driver
       );
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "found actor for action", actorId });
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "found actor for action", actorId });
       _invariant2.default.call(void 0, actorId, "Missing actor ID");
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
         msg: "handling action",
         name: opts.name,
         encoding: this.#encoding
@@ -2363,23 +2510,23 @@ var ActorHandleRaw = class {
         url: `http://actor/action/${encodeURIComponent(opts.name)}`,
         method: "POST",
         headers: {
-          [_chunkTCUI5JFEcjs.HEADER_ENCODING]: this.#encoding,
-          ...this.#params !== void 0 ? { [_chunkTCUI5JFEcjs.HEADER_CONN_PARAMS]: JSON.stringify(this.#params) } : {}
+          [_chunkNDCVQZBScjs.HEADER_ENCODING]: this.#encoding,
+          ...this.#params !== void 0 ? { [_chunkNDCVQZBScjs.HEADER_CONN_PARAMS]: JSON.stringify(this.#params) } : {}
         },
         body: {
-          args: _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, cbor4.encode(opts.args))
+          args: _chunkLXAVET4Acjs.bufferToArrayBuffer.call(void 0, cbor4.encode(opts.args))
         },
         encoding: this.#encoding,
         customFetch: this.#driver.sendRequest.bind(this.#driver, actorId),
         signal: opts == null ? void 0 : opts.signal,
-        requestVersionedDataHandler: _chunkNTCUGYSDcjs.HTTP_ACTION_REQUEST_VERSIONED,
-        responseVersionedDataHandler: _chunkNTCUGYSDcjs.HTTP_ACTION_RESPONSE_VERSIONED
+        requestVersionedDataHandler: _chunk7OOBMCQIcjs.HTTP_ACTION_REQUEST_VERSIONED,
+        responseVersionedDataHandler: _chunk7OOBMCQIcjs.HTTP_ACTION_RESPONSE_VERSIONED
       });
       return cbor4.decode(new Uint8Array(responseData.output));
     } catch (err) {
-      const { group, code, message, metadata } = _chunk5JBFVV4Ccjs.deconstructError.call(void 0, 
+      const { group, code, message, metadata } = _chunkLXAVET4Acjs.deconstructError.call(void 0, 
         err,
-        _chunkKG3C7MKRcjs.logger.call(void 0, ),
+        _chunkVAF63BEIcjs.logger.call(void 0, ),
         {},
         true
       );
@@ -2393,7 +2540,7 @@ var ActorHandleRaw = class {
    * @returns {ActorConn<AD>} A connection to the actor.
    */
   connect() {
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
       msg: "establishing connection from handle",
       query: this.#actorQuery
     });
@@ -2453,7 +2600,7 @@ var ActorHandleRaw = class {
       } else if ("getOrCreateForKey" in this.#actorQuery) {
         name = this.#actorQuery.getOrCreateForKey.name;
       } else {
-        _chunkTCUI5JFEcjs.assertUnreachable.call(void 0, this.#actorQuery);
+        _chunkNDCVQZBScjs.assertUnreachable.call(void 0, this.#actorQuery);
       }
       const { actorId } = await queryActor(
         void 0,
@@ -2467,7 +2614,7 @@ var ActorHandleRaw = class {
     } else if ("create" in this.#actorQuery) {
       _invariant2.default.call(void 0, false, "actorQuery cannot be create");
     } else {
-      _chunkTCUI5JFEcjs.assertUnreachable.call(void 0, this.#actorQuery);
+      _chunkNDCVQZBScjs.assertUnreachable.call(void 0, this.#actorQuery);
     }
   }
 };
@@ -2504,7 +2651,7 @@ var ClientRaw = (_class4 = class {
    * @returns {ActorHandle<AD>} - A handle to the actor.
    */
   getForId(name, actorId, opts) {
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
       msg: "get handle to actor with id",
       name,
       actorId,
@@ -2530,7 +2677,7 @@ var ClientRaw = (_class4 = class {
    */
   get(name, key, opts) {
     const keyArray = typeof key === "string" ? [key] : key || [];
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
       msg: "get handle to actor",
       name,
       key: keyArray,
@@ -2556,7 +2703,7 @@ var ClientRaw = (_class4 = class {
    */
   getOrCreate(name, key, opts) {
     const keyArray = typeof key === "string" ? [key] : key || [];
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
       msg: "get or create handle to actor",
       name,
       key: keyArray,
@@ -2594,7 +2741,7 @@ var ClientRaw = (_class4 = class {
         key: keyArray
       }
     };
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
       msg: "create actor handle",
       name,
       key: keyArray,
@@ -2602,7 +2749,7 @@ var ClientRaw = (_class4 = class {
       create: createQuery.create
     });
     const { actorId } = await queryActor(void 0, createQuery, this.#driver);
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
       msg: "created actor with ID",
       name,
       key: keyArray,
@@ -2639,11 +2786,11 @@ var ClientRaw = (_class4 = class {
    */
   async dispose() {
     if (this.#disposed) {
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).warn({ msg: "client already disconnected" });
+      _chunkVAF63BEIcjs.logger.call(void 0, ).warn({ msg: "client already disconnected" });
       return;
     }
     this.#disposed = true;
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "disposing client" });
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "disposing client" });
     const disposePromises = [];
     for (const conn of this[ACTOR_CONNS_SYMBOL].values()) {
       disposePromises.push(conn.dispose());
@@ -2699,7 +2846,7 @@ function createActorProxy(handle) {
         return Reflect.get(target, prop, receiver);
       }
       if (prop === "constructor" || prop in target) {
-        const value = Reflect.get(target, prop, receiver);
+        const value = Reflect.get(target, prop, target);
         if (typeof value === "function") {
           return value.bind(target);
         }
@@ -2757,7 +2904,7 @@ var ActorConnRaw = class {
   #abortController = new AbortController();
   /** If attempting to connect. Helpful for knowing if in a retry loop when reconnecting. */
   #connecting = false;
-  // These will only be set on SSE driver
+  // Connection info, used for reconnection and HTTP requests
   #actorId;
   #connectionId;
   #connectionToken;
@@ -2808,10 +2955,10 @@ var ActorConnRaw = class {
    * @returns {Promise<Response>} - A promise that resolves to the response of the action function.
    */
   async action(opts) {
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "action", name: opts.name, args: opts.args });
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "action", name: opts.name, args: opts.args });
     const actionId = this.#actionIdCounter;
     this.#actionIdCounter += 1;
-    const { promise, resolve, reject } = Promise.withResolvers();
+    const { promise, resolve, reject } = _chunkLXAVET4Acjs.promiseWithResolvers.call(void 0, );
     this.#actionsInFlight.set(actionId, { name: opts.name, resolve, reject });
     this.#sendMessage({
       body: {
@@ -2819,7 +2966,7 @@ var ActorConnRaw = class {
         val: {
           id: BigInt(actionId),
           name: opts.name,
-          args: _chunk5JBFVV4Ccjs.bufferToArrayBuffer.call(void 0, cbor5.encode(opts.args))
+          args: _chunkLXAVET4Acjs.bufferToArrayBuffer.call(void 0, cbor5.encode(opts.args))
         }
       }
     });
@@ -2848,10 +2995,10 @@ var ActorConnRaw = class {
         minTimeout: 250,
         maxTimeout: 3e4,
         onFailedAttempt: (error) => {
-          _chunkKG3C7MKRcjs.logger.call(void 0, ).warn({
+          _chunkVAF63BEIcjs.logger.call(void 0, ).warn({
             msg: "failed to reconnect",
             attempt: error.attemptNumber,
-            error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+            error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
           });
         },
         // Cancel retry if aborted
@@ -2859,7 +3006,7 @@ var ActorConnRaw = class {
       });
     } catch (err) {
       if (err.name === "AbortError") {
-        _chunkKG3C7MKRcjs.logger.call(void 0, ).info({ msg: "connection retry aborted" });
+        _chunkVAF63BEIcjs.logger.call(void 0, ).info({ msg: "connection retry aborted" });
         return;
       } else {
         throw err;
@@ -2871,13 +3018,13 @@ var ActorConnRaw = class {
     try {
       if (this.#onOpenPromise)
         throw new Error("#onOpenPromise already defined");
-      this.#onOpenPromise = Promise.withResolvers();
+      this.#onOpenPromise = _chunkLXAVET4Acjs.promiseWithResolvers.call(void 0, );
       if (this.#client[TRANSPORT_SYMBOL] === "websocket") {
         await this.#connectWebSocket();
       } else if (this.#client[TRANSPORT_SYMBOL] === "sse") {
         await this.#connectSse();
       } else {
-        _chunk5JBFVV4Ccjs.assertUnreachable.call(void 0, this.#client[TRANSPORT_SYMBOL]);
+        _chunkLXAVET4Acjs.assertUnreachable.call(void 0, this.#client[TRANSPORT_SYMBOL]);
       }
       await this.#onOpenPromise.promise;
     } finally {
@@ -2890,15 +3037,34 @@ var ActorConnRaw = class {
       this.#actorQuery,
       this.#driver
     );
+    const isReconnection = this.#connectionId && this.#connectionToken;
+    if (isReconnection) {
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
+        msg: "attempting websocket reconnection",
+        connectionId: this.#connectionId
+      });
+    }
     const ws = await this.#driver.openWebSocket(
-      _chunkTCUI5JFEcjs.PATH_CONNECT_WEBSOCKET,
+      _chunkNDCVQZBScjs.PATH_CONNECT_WEBSOCKET,
       actorId,
       this.#encoding,
-      this.#params
+      this.#params,
+      // Pass connection ID and token for reconnection if available
+      isReconnection ? this.#connectionId : void 0,
+      isReconnection ? this.#connectionToken : void 0
     );
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
+      msg: "transport set to new websocket",
+      connectionId: this.#connectionId,
+      readyState: ws.readyState,
+      messageQueueLength: this.#messageQueue.length
+    });
     this.#transport = { websocket: ws };
     ws.addEventListener("open", () => {
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "websocket open" });
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
+        msg: "client websocket open",
+        connectionId: this.#connectionId
+      });
     });
     ws.addEventListener("message", async (ev) => {
       this.#handleOnMessage(ev.data);
@@ -2917,13 +3083,14 @@ var ActorConnRaw = class {
       this.#actorQuery,
       this.#driver
     );
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "found actor for sse connection", actorId });
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "found actor for sse connection", actorId });
     _invariant2.default.call(void 0, actorId, "Missing actor ID");
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
       msg: "opening sse connection",
       actorId,
       encoding: this.#encoding
     });
+    const isReconnection = this.#connectionId && this.#connectionToken;
     const eventSource = new EventSource("http://actor/connect/sse", {
       fetch: (input, init) => {
         return this.#driver.sendRequest(
@@ -2932,9 +3099,13 @@ var ActorConnRaw = class {
             ...init,
             headers: {
               ...init == null ? void 0 : init.headers,
-              "User-Agent": _chunk5JBFVV4Ccjs.httpUserAgent.call(void 0, ),
-              [_chunkTCUI5JFEcjs.HEADER_ENCODING]: this.#encoding,
-              ...this.#params !== void 0 ? { [_chunkTCUI5JFEcjs.HEADER_CONN_PARAMS]: JSON.stringify(this.#params) } : {}
+              "User-Agent": _chunkLXAVET4Acjs.httpUserAgent.call(void 0, ),
+              [_chunkNDCVQZBScjs.HEADER_ENCODING]: this.#encoding,
+              ...this.#params !== void 0 ? { [_chunkNDCVQZBScjs.HEADER_CONN_PARAMS]: JSON.stringify(this.#params) } : {},
+              ...isReconnection ? {
+                [_chunkNDCVQZBScjs.HEADER_CONN_ID]: this.#connectionId,
+                [_chunkNDCVQZBScjs.HEADER_CONN_TOKEN]: this.#connectionToken
+              } : {}
             }
           })
         );
@@ -2942,6 +3113,7 @@ var ActorConnRaw = class {
     });
     this.#transport = { sse: eventSource };
     eventSource.addEventListener("message", (ev) => {
+      if (ev.type === "ping") return;
       this.#handleOnMessage(ev.data);
     });
     eventSource.addEventListener("error", (ev) => {
@@ -2950,44 +3122,49 @@ var ActorConnRaw = class {
   }
   /** Called by the onopen event from drivers. */
   #handleOnOpen() {
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
       msg: "socket open",
-      messageQueueLength: this.#messageQueue.length
+      messageQueueLength: this.#messageQueue.length,
+      connectionId: this.#connectionId
     });
     if (this.#onOpenPromise) {
       this.#onOpenPromise.resolve(void 0);
     } else {
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).warn({ msg: "#onOpenPromise is undefined" });
+      _chunkVAF63BEIcjs.logger.call(void 0, ).warn({ msg: "#onOpenPromise is undefined" });
     }
     for (const eventName of this.#eventSubscriptions.keys()) {
       this.#sendSubscription(eventName, true);
     }
     const queue = this.#messageQueue;
     this.#messageQueue = [];
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
+      msg: "flushing message queue",
+      queueLength: queue.length
+    });
     for (const msg of queue) {
       this.#sendMessage(msg);
     }
   }
   /** Called by the onmessage event from drivers. */
   async #handleOnMessage(data) {
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).trace({
+    _chunkVAF63BEIcjs.logger.call(void 0, ).trace({
       msg: "received message",
       dataType: typeof data,
       isBlob: data instanceof Blob,
       isArrayBuffer: data instanceof ArrayBuffer
     });
     const response = await this.#parseMessage(data);
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).trace(
-      _chunk5JBFVV4Ccjs.getEnvUniversal.call(void 0, "_RIVETKIT_LOG_MESSAGE") ? {
+    _chunkVAF63BEIcjs.logger.call(void 0, ).trace(
+      _chunkLXAVET4Acjs.getEnvUniversal.call(void 0, "_RIVETKIT_LOG_MESSAGE") ? {
         msg: "parsed message",
-        message: _chunkTCUI5JFEcjs.jsonStringifyCompat.call(void 0, response).substring(0, 100) + "..."
+        message: _chunkNDCVQZBScjs.jsonStringifyCompat.call(void 0, response).substring(0, 100) + "..."
       } : { msg: "parsed message" }
     );
     if (response.body.tag === "Init") {
       this.#actorId = response.body.val.actorId;
       this.#connectionId = response.body.val.connectionId;
       this.#connectionToken = response.body.val.connectionToken;
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).trace({
+      _chunkVAF63BEIcjs.logger.call(void 0, ).trace({
         msg: "received init message",
         actorId: this.#actorId,
         connectionId: this.#connectionId
@@ -2997,7 +3174,7 @@ var ActorConnRaw = class {
       const { group, code, message, metadata, actionId } = response.body.val;
       if (actionId) {
         const inFlight = this.#takeActionInFlight(Number(actionId));
-        _chunkKG3C7MKRcjs.logger.call(void 0, ).warn({
+        _chunkVAF63BEIcjs.logger.call(void 0, ).warn({
           msg: "action error",
           actionId,
           actionName: inFlight == null ? void 0 : inFlight.name,
@@ -3008,7 +3185,7 @@ var ActorConnRaw = class {
         });
         inFlight.reject(new ActorError(group, code, message, metadata));
       } else {
-        _chunkKG3C7MKRcjs.logger.call(void 0, ).warn({
+        _chunkVAF63BEIcjs.logger.call(void 0, ).warn({
           msg: "connection error",
           group,
           code,
@@ -3032,22 +3209,22 @@ var ActorConnRaw = class {
       }
     } else if (response.body.tag === "ActionResponse") {
       const { id: actionId } = response.body.val;
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).trace({
+      _chunkVAF63BEIcjs.logger.call(void 0, ).trace({
         msg: "received action response",
         actionId
       });
       const inFlight = this.#takeActionInFlight(Number(actionId));
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).trace({
+      _chunkVAF63BEIcjs.logger.call(void 0, ).trace({
         msg: "resolving action promise",
         actionId,
         actionName: inFlight == null ? void 0 : inFlight.name
       });
       inFlight.resolve(response.body.val);
     } else if (response.body.tag === "Event") {
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).trace({ msg: "received event", name: response.body.val.name });
+      _chunkVAF63BEIcjs.logger.call(void 0, ).trace({ msg: "received event", name: response.body.val.name });
       this.#dispatchEvent(response.body.val);
     } else {
-      _chunk5JBFVV4Ccjs.assertUnreachable.call(void 0, response.body);
+      _chunkLXAVET4Acjs.assertUnreachable.call(void 0, response.body);
     }
   }
   /** Called by the onclose event from drivers. */
@@ -3056,30 +3233,45 @@ var ActorConnRaw = class {
       this.#onOpenPromise.reject(new Error("Closed"));
     }
     const closeEvent = event;
-    if (closeEvent.wasClean) {
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).info({
-        msg: "socket closed",
-        code: closeEvent.code,
-        reason: closeEvent.reason,
-        wasClean: closeEvent.wasClean
-      });
-    } else {
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).warn({
-        msg: "socket closed",
-        code: closeEvent.code,
-        reason: closeEvent.reason,
-        wasClean: closeEvent.wasClean
+    const wasClean = closeEvent.wasClean;
+    _chunkVAF63BEIcjs.logger.call(void 0, ).info({
+      msg: "socket closed",
+      code: closeEvent.code,
+      reason: closeEvent.reason,
+      wasClean,
+      connectionId: this.#connectionId,
+      messageQueueLength: this.#messageQueue.length,
+      actionsInFlight: this.#actionsInFlight.size
+    });
+    if (this.#actionsInFlight.size > 0) {
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
+        msg: "rejecting in-flight actions after disconnect",
+        count: this.#actionsInFlight.size,
+        connectionId: this.#connectionId,
+        wasClean
       });
+      const disconnectError = new Error(
+        wasClean ? "Connection closed" : "Connection lost"
+      );
+      for (const actionInfo of this.#actionsInFlight.values()) {
+        actionInfo.reject(disconnectError);
+      }
+      this.#actionsInFlight.clear();
     }
     this.#transport = void 0;
     if (!this.#disposed && !this.#connecting) {
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
+        msg: "triggering reconnect",
+        connectionId: this.#connectionId,
+        messageQueueLength: this.#messageQueue.length
+      });
       this.#connectWithRetry();
     }
   }
   /** Called by the onerror event from drivers. */
   #handleOnError() {
     if (this.#disposed) return;
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).warn("socket error");
+    _chunkVAF63BEIcjs.logger.call(void 0, ).warn("socket error");
   }
   #takeActionInFlight(id) {
     const inFlight = this.#actionsInFlight.get(id);
@@ -3109,9 +3301,9 @@ var ActorConnRaw = class {
       try {
         handler(error);
       } catch (err) {
-        _chunkKG3C7MKRcjs.logger.call(void 0, ).error({
+        _chunkVAF63BEIcjs.logger.call(void 0, ).error({
           msg: "error in connection error handler",
-          error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, err)
+          error: _chunkLXAVET4Acjs.stringifyError.call(void 0, err)
         });
       }
     }
@@ -3176,33 +3368,49 @@ var ActorConnRaw = class {
     };
   }
   #sendMessage(message, opts) {
+    var _a, _b;
     if (this.#disposed) {
       throw new ActorConnDisposed();
     }
     let queueMessage = false;
     if (!this.#transport) {
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "no transport, queueing message" });
       queueMessage = true;
     } else if ("websocket" in this.#transport) {
-      if (this.#transport.websocket.readyState === 1) {
+      const readyState = this.#transport.websocket.readyState;
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
+        msg: "websocket send attempt",
+        readyState,
+        readyStateString: readyState === 0 ? "CONNECTING" : readyState === 1 ? "OPEN" : readyState === 2 ? "CLOSING" : "CLOSED",
+        connectionId: this.#connectionId,
+        messageType: message.body.tag,
+        actionName: (_a = message.body.val) == null ? void 0 : _a.name
+      });
+      if (readyState === 1) {
         try {
-          const messageSerialized = _chunkTCUI5JFEcjs.serializeWithEncoding.call(void 0, 
+          const messageSerialized = _chunkNDCVQZBScjs.serializeWithEncoding.call(void 0, 
             this.#encoding,
             message,
-            _chunkNTCUGYSDcjs.TO_SERVER_VERSIONED
+            _chunk7OOBMCQIcjs.TO_SERVER_VERSIONED
           );
           this.#transport.websocket.send(messageSerialized);
-          _chunkKG3C7MKRcjs.logger.call(void 0, ).trace({
+          _chunkVAF63BEIcjs.logger.call(void 0, ).trace({
             msg: "sent websocket message",
             len: messageLength(messageSerialized)
           });
         } catch (error) {
-          _chunkKG3C7MKRcjs.logger.call(void 0, ).warn({
+          _chunkVAF63BEIcjs.logger.call(void 0, ).warn({
             msg: "failed to send message, added to queue",
-            error
+            error,
+            connectionId: this.#connectionId
           });
           queueMessage = true;
         }
       } else {
+        _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
+          msg: "websocket not open, queueing message",
+          readyState
+        });
         queueMessage = true;
       }
     } else if ("sse" in this.#transport) {
@@ -3212,24 +3420,30 @@ var ActorConnRaw = class {
         queueMessage = true;
       }
     } else {
-      _chunk5JBFVV4Ccjs.assertUnreachable.call(void 0, this.#transport);
+      _chunkLXAVET4Acjs.assertUnreachable.call(void 0, this.#transport);
     }
     if (!(opts == null ? void 0 : opts.ephemeral) && queueMessage) {
       this.#messageQueue.push(message);
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "queued connection message" });
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
+        msg: "queued connection message",
+        queueLength: this.#messageQueue.length,
+        connectionId: this.#connectionId,
+        messageType: message.body.tag,
+        actionName: (_b = message.body.val) == null ? void 0 : _b.name
+      });
     }
   }
   async #sendHttpMessage(message, opts) {
     try {
       if (!this.#actorId || !this.#connectionId || !this.#connectionToken)
         throw new InternalError2("Missing connection ID or token.");
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).trace(
-        _chunk5JBFVV4Ccjs.getEnvUniversal.call(void 0, "_RIVETKIT_LOG_MESSAGE") ? {
+      _chunkVAF63BEIcjs.logger.call(void 0, ).trace(
+        _chunkLXAVET4Acjs.getEnvUniversal.call(void 0, "_RIVETKIT_LOG_MESSAGE") ? {
           msg: "sent http message",
-          message: `${_chunkTCUI5JFEcjs.jsonStringifyCompat.call(void 0, message).substring(0, 100)}...`
+          message: `${_chunkNDCVQZBScjs.jsonStringifyCompat.call(void 0, message).substring(0, 100)}...`
         } : { msg: "sent http message" }
       );
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({
+      _chunkVAF63BEIcjs.logger.call(void 0, ).debug({
         msg: "sending http message",
         actorId: this.#actorId,
         connectionId: this.#connectionId
@@ -3238,19 +3452,19 @@ var ActorConnRaw = class {
         url: "http://actor/connections/message",
         method: "POST",
         headers: {
-          [_chunkTCUI5JFEcjs.HEADER_ENCODING]: this.#encoding,
-          [_chunkTCUI5JFEcjs.HEADER_CONN_ID]: this.#connectionId,
-          [_chunkTCUI5JFEcjs.HEADER_CONN_TOKEN]: this.#connectionToken
+          [_chunkNDCVQZBScjs.HEADER_ENCODING]: this.#encoding,
+          [_chunkNDCVQZBScjs.HEADER_CONN_ID]: this.#connectionId,
+          [_chunkNDCVQZBScjs.HEADER_CONN_TOKEN]: this.#connectionToken
         },
         body: message,
         encoding: this.#encoding,
         skipParseResponse: true,
         customFetch: this.#driver.sendRequest.bind(this.#driver, this.#actorId),
-        requestVersionedDataHandler: _chunkNTCUGYSDcjs.TO_SERVER_VERSIONED,
-        responseVersionedDataHandler: _chunkNTCUGYSDcjs.TO_CLIENT_VERSIONED
+        requestVersionedDataHandler: _chunk7OOBMCQIcjs.TO_SERVER_VERSIONED,
+        responseVersionedDataHandler: _chunk7OOBMCQIcjs.TO_CLIENT_VERSIONED
       });
     } catch (error) {
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).warn({ msg: "failed to send message, added to queue", error });
+      _chunkVAF63BEIcjs.logger.call(void 0, ).warn({ msg: "failed to send message, added to queue", error });
       if (!(opts == null ? void 0 : opts.ephemeral)) {
         this.#messageQueue.unshift(message);
       }
@@ -3258,7 +3472,7 @@ var ActorConnRaw = class {
   }
   async #parseMessage(data) {
     _invariant2.default.call(void 0, this.#transport, "transport must be defined");
-    if (_chunkTCUI5JFEcjs.encodingIsBinary.call(void 0, this.#encoding) && "sse" in this.#transport) {
+    if (_chunkNDCVQZBScjs.encodingIsBinary.call(void 0, this.#encoding) && "sse" in this.#transport) {
       if (typeof data === "string") {
         const binaryString = atob(data);
         data = new Uint8Array(
@@ -3270,8 +3484,22 @@ var ActorConnRaw = class {
         );
       }
     }
-    const buffer = await _chunkNTCUGYSDcjs.inputDataToBuffer.call(void 0, data);
-    return _chunkTCUI5JFEcjs.deserializeWithEncoding.call(void 0, this.#encoding, buffer, _chunkNTCUGYSDcjs.TO_CLIENT_VERSIONED);
+    const buffer = await _chunk7OOBMCQIcjs.inputDataToBuffer.call(void 0, data);
+    return _chunkNDCVQZBScjs.deserializeWithEncoding.call(void 0, this.#encoding, buffer, _chunk7OOBMCQIcjs.TO_CLIENT_VERSIONED);
+  }
+  /**
+   * Get the actor ID (for testing purposes).
+   * @internal
+   */
+  get actorId() {
+    return this.#actorId;
+  }
+  /**
+   * Get the connection ID (for testing purposes).
+   * @internal
+   */
+  get connectionId() {
+    return this.#connectionId;
   }
   /**
    * Disconnects from the actor.
@@ -3280,11 +3508,11 @@ var ActorConnRaw = class {
    */
   async dispose() {
     if (this.#disposed) {
-      _chunkKG3C7MKRcjs.logger.call(void 0, ).warn({ msg: "connection already disconnected" });
+      _chunkVAF63BEIcjs.logger.call(void 0, ).warn({ msg: "connection already disconnected" });
       return;
     }
     this.#disposed = true;
-    _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "disposing actor conn" });
+    _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "disposing actor conn" });
     clearInterval(this.#keepNodeAliveInterval);
     this.#abortController.abort();
     this.#client[ACTOR_CONNS_SYMBOL].delete(this);
@@ -3292,20 +3520,42 @@ var ActorConnRaw = class {
     } else if ("websocket" in this.#transport) {
       const ws = this.#transport.websocket;
       if (ws.readyState === 2 || ws.readyState === 3) {
-        _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "ws already closed or closing" });
+        _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "ws already closed or closing" });
       } else {
-        const { promise, resolve } = Promise.withResolvers();
+        const { promise, resolve } = _chunkLXAVET4Acjs.promiseWithResolvers.call(void 0, );
         ws.addEventListener("close", () => {
-          _chunkKG3C7MKRcjs.logger.call(void 0, ).debug({ msg: "ws closed" });
+          _chunkVAF63BEIcjs.logger.call(void 0, ).debug({ msg: "ws closed" });
           resolve(void 0);
         });
         ws.close();
         await promise;
       }
     } else if ("sse" in this.#transport) {
+      if (this.#connectionId && this.#connectionToken) {
+        try {
+          await sendHttpRequest({
+            url: "http://actor/connections/close",
+            method: "POST",
+            headers: {
+              [_chunkNDCVQZBScjs.HEADER_CONN_ID]: this.#connectionId,
+              [_chunkNDCVQZBScjs.HEADER_CONN_TOKEN]: this.#connectionToken
+            },
+            encoding: this.#encoding,
+            skipParseResponse: true,
+            customFetch: this.#driver.sendRequest.bind(
+              this.#driver,
+              this.#actorId
+            ),
+            requestVersionedDataHandler: _chunk7OOBMCQIcjs.TO_SERVER_VERSIONED,
+            responseVersionedDataHandler: _chunk7OOBMCQIcjs.TO_CLIENT_VERSIONED
+          });
+        } catch (error) {
+          _chunkVAF63BEIcjs.logger.call(void 0, ).warn({ msg: "failed to send close request", error });
+        }
+      }
       this.#transport.sse.close();
     } else {
-      _chunk5JBFVV4Ccjs.assertUnreachable.call(void 0, this.#transport);
+      _chunkLXAVET4Acjs.assertUnreachable.call(void 0, this.#transport);
     }
     this.#transport = void 0;
   }
@@ -3331,7 +3581,7 @@ var ActorConnRaw = class {
 
 // src/remote-manager-driver/log.ts
 function logger2() {
-  return _chunkMRRT2CZDcjs.getLogger.call(void 0, "remote-manager-driver");
+  return _chunkETDWYT2Pcjs.getLogger.call(void 0, "remote-manager-driver");
 }
 
 // src/remote-manager-driver/api-utils.ts
@@ -3348,14 +3598,20 @@ function getEndpoint(config) {
 }
 async function apiCall(config, method, path, body) {
   const endpoint = getEndpoint(config);
-  const url = _chunk5JBFVV4Ccjs.combineUrlPath.call(void 0, endpoint, path, {
+  const url = _chunkLXAVET4Acjs.combineUrlPath.call(void 0, endpoint, path, {
     namespace: config.namespace
   });
   logger2().debug({ msg: "making api call", method, url });
+  const headers = {
+    ...config.headers
+  };
+  if (config.token) {
+    headers.Authorization = `Bearer ${config.token}`;
+  }
   return await sendHttpRequest({
     method,
     url,
-    headers: {},
+    headers,
     body,
     encoding: "json",
     skipParseResponse: false,
@@ -3368,20 +3624,23 @@ async function apiCall(config, method, path, body) {
 async function sendHttpRequestToActor(runConfig, actorId, actorRequest) {
   const url = new URL(actorRequest.url);
   const endpoint = getEndpoint(runConfig);
-  const guardUrl = _chunk5JBFVV4Ccjs.combineUrlPath.call(void 0, endpoint, url.pathname + url.search);
+  const guardUrl = _chunkLXAVET4Acjs.combineUrlPath.call(void 0, endpoint, url.pathname + url.search);
   let bodyToSend = null;
-  const guardHeaders = buildGuardHeadersForHttp(actorRequest, actorId);
-  if (actorRequest.body && actorRequest.method !== "GET" && actorRequest.method !== "HEAD") {
+  const guardHeaders = buildGuardHeadersForHttp(
+    runConfig,
+    actorRequest,
+    actorId
+  );
+  if (actorRequest.method !== "GET" && actorRequest.method !== "HEAD") {
     if (actorRequest.bodyUsed) {
       throw new Error("Request body has already been consumed");
     }
-    const clonedRequest = actorRequest.clone();
-    bodyToSend = await clonedRequest.arrayBuffer();
-    guardHeaders.delete("transfer-encoding");
-    guardHeaders.set(
-      "content-length",
-      String(bodyToSend.byteLength)
-    );
+    const reqBody = await actorRequest.arrayBuffer();
+    if (reqBody.byteLength !== 0) {
+      bodyToSend = reqBody;
+      guardHeaders.delete("transfer-encoding");
+      guardHeaders.set("content-length", String(bodyToSend.byteLength));
+    }
   }
   const guardRequest = new Request(guardUrl, {
     method: actorRequest.method,
@@ -3394,71 +3653,92 @@ async function sendHttpRequestToActor(runConfig, actorId, actorRequest) {
 function mutableResponse(fetchRes) {
   return new Response(fetchRes.body, fetchRes);
 }
-function buildGuardHeadersForHttp(actorRequest, actorId) {
+function buildGuardHeadersForHttp(runConfig, actorRequest, actorId) {
   const headers = new Headers();
   for (const [key, value] of actorRequest.headers.entries()) {
     headers.set(key, value);
   }
-  headers.set("x-rivet-target", "actor");
-  headers.set("x-rivet-actor", actorId);
-  headers.set("x-rivet-port", "main");
+  for (const [key, value] of Object.entries(runConfig.headers)) {
+    headers.set(key, value);
+  }
+  headers.set(_chunkNDCVQZBScjs.HEADER_RIVET_TARGET, "actor");
+  headers.set(_chunkNDCVQZBScjs.HEADER_RIVET_ACTOR, actorId);
+  if (runConfig.token) {
+    headers.set(_chunkNDCVQZBScjs.HEADER_RIVET_TOKEN, runConfig.token);
+  }
   return headers;
 }
 
 // src/remote-manager-driver/actor-websocket-client.ts
-async function openWebSocketToActor(runConfig, path, actorId, encoding, params) {
-  const WebSocket2 = await _chunkKG3C7MKRcjs.importWebSocket.call(void 0, );
+async function openWebSocketToActor(runConfig, path, actorId, encoding, params, connId, connToken) {
+  const WebSocket2 = await _chunkVAF63BEIcjs.importWebSocket.call(void 0, );
   const endpoint = getEndpoint(runConfig);
-  const guardUrl = _chunk5JBFVV4Ccjs.combineUrlPath.call(void 0, endpoint, path);
+  const guardUrl = _chunkLXAVET4Acjs.combineUrlPath.call(void 0, endpoint, path);
   logger2().debug({
     msg: "opening websocket to actor via guard",
     actorId,
     path,
     guardUrl
   });
-  const ws = new WebSocket2(guardUrl, {
-    headers: buildGuardHeadersForWebSocket(actorId, encoding, params)
-  });
+  const ws = new WebSocket2(
+    guardUrl,
+    buildWebSocketProtocols(
+      runConfig,
+      actorId,
+      encoding,
+      params,
+      connId,
+      connToken
+    )
+  );
   ws.binaryType = "arraybuffer";
   logger2().debug({ msg: "websocket connection opened", actorId });
   return ws;
 }
-function buildGuardHeadersForWebSocket(actorId, encoding, params, authData) {
-  const headers = {};
-  headers["x-rivet-target"] = "actor";
-  headers["x-rivet-actor"] = actorId;
-  headers["x-rivet-port"] = "main";
-  headers[_chunkTCUI5JFEcjs.HEADER_ENCODING] = encoding;
+function buildWebSocketProtocols(runConfig, actorId, encoding, params, connId, connToken) {
+  const protocols = [];
+  protocols.push(_chunkNDCVQZBScjs.WS_PROTOCOL_STANDARD);
+  protocols.push(`${_chunkNDCVQZBScjs.WS_PROTOCOL_TARGET}actor`);
+  protocols.push(`${_chunkNDCVQZBScjs.WS_PROTOCOL_ACTOR}${actorId}`);
+  protocols.push(`${_chunkNDCVQZBScjs.WS_PROTOCOL_ENCODING}${encoding}`);
+  if (runConfig.token) {
+    protocols.push(`${_chunkNDCVQZBScjs.WS_PROTOCOL_TOKEN}${runConfig.token}`);
+  }
   if (params) {
-    headers[_chunkTCUI5JFEcjs.HEADER_CONN_PARAMS] = JSON.stringify(params);
+    protocols.push(
+      `${_chunkNDCVQZBScjs.WS_PROTOCOL_CONN_PARAMS}${encodeURIComponent(JSON.stringify(params))}`
+    );
   }
-  if (authData) {
-    headers[_chunkTCUI5JFEcjs.HEADER_AUTH_DATA] = JSON.stringify(authData);
+  if (connId) {
+    protocols.push(`${_chunkNDCVQZBScjs.WS_PROTOCOL_CONN_ID}${connId}`);
   }
-  return headers;
+  if (connToken) {
+    protocols.push(`${_chunkNDCVQZBScjs.WS_PROTOCOL_CONN_TOKEN}${connToken}`);
+  }
+  return protocols;
 }
 
 // src/remote-manager-driver/api-endpoints.ts
-async function getActor(config, actorId) {
+async function getActor(config, name, actorId) {
   return apiCall(
     config,
     "GET",
-    `/actors/${encodeURIComponent(actorId)}`
+    `/actors?name=${name}&actor_ids=${encodeURIComponent(actorId)}`
   );
 }
-async function getActorById(config, name, key) {
+async function getActorByKey(config, name, key) {
   const serializedKey = serializeActorKey(key);
   return apiCall(
     config,
     "GET",
-    `/actors/by-id?name=${encodeURIComponent(name)}&key=${encodeURIComponent(serializedKey)}`
+    `/actors?name=${encodeURIComponent(name)}&key=${encodeURIComponent(serializedKey)}`
   );
 }
-async function getOrCreateActorById(config, request) {
+async function getOrCreateActor(config, request) {
   return apiCall(
     config,
     "PUT",
-    `/actors/by-id`,
+    `/actors`,
     request
   );
 }
@@ -3479,13 +3759,8 @@ async function destroyActor(config, actorId) {
 }
 
 // src/remote-manager-driver/ws-proxy.ts
-async function createWebSocketProxy(c, targetUrl, headers) {
-  const WebSocket2 = await _chunkKG3C7MKRcjs.importWebSocket.call(void 0, );
-  for (const [k, v] of c.req.raw.headers.entries()) {
-    if (!k.startsWith("sec-") && k !== "connection" && k !== "upgrade") {
-      headers[k] = v;
-    }
-  }
+async function createWebSocketProxy(c, targetUrl, protocols) {
+  const WebSocket2 = await _chunkVAF63BEIcjs.importWebSocket.call(void 0, );
   const state = {};
   return {
     onOpen: async (event, clientWs) => {
@@ -3498,7 +3773,7 @@ async function createWebSocketProxy(c, targetUrl, headers) {
         });
         return;
       }
-      const targetWs = new WebSocket2(targetUrl, { headers });
+      const targetWs = new WebSocket2(targetUrl, protocols);
       state.targetWs = targetWs;
       state.connectPromise = new Promise((resolve, reject) => {
         targetWs.addEventListener("open", () => {
@@ -3545,7 +3820,7 @@ async function createWebSocketProxy(c, targetUrl, headers) {
         logger2().error({
           msg: "target websocket error",
           targetUrl,
-          error: _chunk5JBFVV4Ccjs.stringifyError.call(void 0, error)
+          error: _chunkLXAVET4Acjs.stringifyError.call(void 0, error)
         });
         closeWebSocketIfOpen(clientWs, 1011, "Target WebSocket error");
       });
@@ -3620,31 +3895,26 @@ var RemoteManagerDriver = class {
     name,
     actorId
   }) {
-    try {
-      const response = await getActor(this.#config, actorId);
-      if (response.actor.name !== name) {
-        logger2().debug({
-          msg: "actor name mismatch from api",
-          actorId,
-          apiName: response.actor.name,
-          requestedName: name
-        });
-        return void 0;
-      }
-      const keyRaw = response.actor.key;
-      _invariant2.default.call(void 0, keyRaw, `actor ${actorId} should have key`);
-      const key = deserializeActorKey(keyRaw);
-      return {
+    const response = await getActor(this.#config, name, actorId);
+    const actor = response.actors[0];
+    if (!actor) return void 0;
+    if (actor.name !== name) {
+      logger2().debug({
+        msg: "actor name mismatch from api",
         actorId,
-        name,
-        key
-      };
-    } catch (error) {
-      if (error instanceof EngineApiError && error.group === "actor" && error.code === "not_found") {
-        return void 0;
-      }
-      throw error;
+        apiName: actor.name,
+        requestedName: name
+      });
+      return void 0;
     }
+    const keyRaw = actor.key;
+    _invariant2.default.call(void 0, keyRaw, `actor ${actorId} should have key`);
+    const key = deserializeActorKey(keyRaw);
+    return {
+      actorId,
+      name,
+      key
+    };
   }
   async getWithKey({
     c,
@@ -3653,11 +3923,10 @@ var RemoteManagerDriver = class {
   }) {
     logger2().debug({ msg: "getWithKey: searching for actor", name, key });
     try {
-      const response = await getActorById(this.#config, name, key);
-      if (!response.actor_id) {
-        return void 0;
-      }
-      const actorId = response.actor_id;
+      const response = await getActorByKey(this.#config, name, key);
+      const actor = response.actors[0];
+      if (!actor) return void 0;
+      const actorId = actor.actor_id;
       logger2().debug({
         msg: "getWithKey: found actor via api",
         actorId,
@@ -3683,20 +3952,20 @@ var RemoteManagerDriver = class {
       name,
       key
     });
-    const response = await getOrCreateActorById(this.#config, {
+    const { actor, created } = await getOrCreateActor(this.#config, {
       name,
       key: serializeActorKey(key),
       runner_name_selector: this.#config.runnerName,
-      input: input ? cbor6.encode(actorInput).toString("base64") : void 0,
+      input: actorInput ? cbor6.encode(actorInput).toString("base64") : void 0,
       crash_policy: "sleep"
     });
-    const actorId = response.actor_id;
+    const actorId = actor.actor_id;
     logger2().info({
       msg: "getOrCreateWithKey: actor ready",
       actorId,
       name,
       key,
-      created: response.created
+      created
     });
     return {
       actorId,
@@ -3734,24 +4003,26 @@ var RemoteManagerDriver = class {
   async sendRequest(actorId, actorRequest) {
     return await sendHttpRequestToActor(this.#config, actorId, actorRequest);
   }
-  async openWebSocket(path, actorId, encoding, params) {
+  async openWebSocket(path, actorId, encoding, params, connId, connToken) {
     return await openWebSocketToActor(
       this.#config,
       path,
       actorId,
       encoding,
-      params
+      params,
+      connId,
+      connToken
     );
   }
   async proxyRequest(_c, actorRequest, actorId) {
     return await sendHttpRequestToActor(this.#config, actorId, actorRequest);
   }
-  async proxyWebSocket(c, path, actorId, encoding, params, authData) {
+  async proxyWebSocket(c, path, actorId, encoding, params, connId, connToken) {
     var _a, _b;
     const upgradeWebSocket = (_b = (_a = this.#config).getUpgradeWebSocket) == null ? void 0 : _b.call(_a);
     _invariant2.default.call(void 0, upgradeWebSocket, "missing getUpgradeWebSocket");
     const endpoint = getEndpoint(this.#config);
-    const guardUrl = _chunk5JBFVV4Ccjs.combineUrlPath.call(void 0, endpoint, path);
+    const guardUrl = _chunkLXAVET4Acjs.combineUrlPath.call(void 0, endpoint, path);
     const wsGuardUrl = guardUrl.replace("http://", "ws://");
     logger2().debug({
       msg: "forwarding websocket to actor via guard",
@@ -3759,18 +4030,23 @@ var RemoteManagerDriver = class {
       path,
       guardUrl
     });
-    const headers = buildGuardHeadersForWebSocket(
+    const protocols = buildWebSocketProtocols(
+      this.#config,
       actorId,
       encoding,
       params,
-      authData
+      connId,
+      connToken
     );
-    const args = await createWebSocketProxy(c, wsGuardUrl, headers);
-    return await upgradeWebSocket(() => args)(c, _chunk5JBFVV4Ccjs.noopNext.call(void 0, ));
+    const args = await createWebSocketProxy(c, wsGuardUrl, protocols);
+    return await upgradeWebSocket(() => args)(c, _chunkLXAVET4Acjs.noopNext.call(void 0, ));
   }
   displayInformation() {
     return { name: "Remote", properties: {} };
   }
+  getOrCreateInspectorAccessToken() {
+    return _chunkNDCVQZBScjs.generateRandomString.call(void 0, );
+  }
 };
 
 
@@ -3791,6 +4067,5 @@ var RemoteManagerDriver = class {
 
 
 
-
-exports.generateConnId = generateConnId; exports.generateConnToken = generateConnToken; exports.CONNECTION_DRIVER_WEBSOCKET = CONNECTION_DRIVER_WEBSOCKET; exports.CONNECTION_DRIVER_SSE = CONNECTION_DRIVER_SSE; exports.CONNECTION_DRIVER_HTTP = CONNECTION_DRIVER_HTTP; exports.createActorInspectorRouter = createActorInspectorRouter; exports.deserializeActorKey = deserializeActorKey; exports.ActorDefinition = ActorDefinition; exports.lookupInRegistry = lookupInRegistry; exports.ActorClientError = ActorClientError; exports.InternalError = InternalError2; exports.ManagerError = ManagerError; exports.MalformedResponseMessage = MalformedResponseMessage; exports.ActorError = ActorError; exports.ActorConnRaw = ActorConnRaw; exports.ActorHandleRaw = ActorHandleRaw; exports.createClientWithDriver = createClientWithDriver; exports.RemoteManagerDriver = RemoteManagerDriver;
-//# sourceMappingURL=chunk-UFWAK3X2.cjs.map
+exports.generateConnId = generateConnId; exports.generateConnToken = generateConnToken; exports.generateConnSocketId = generateConnSocketId; exports.createActorInspectorRouter = createActorInspectorRouter; exports.serializeActorKey = serializeActorKey; exports.deserializeActorKey = deserializeActorKey; exports.ActorDefinition = ActorDefinition; exports.lookupInRegistry = lookupInRegistry; exports.ActorClientError = ActorClientError; exports.InternalError = InternalError2; exports.ManagerError = ManagerError; exports.MalformedResponseMessage = MalformedResponseMessage; exports.ActorError = ActorError; exports.ActorConnRaw = ActorConnRaw; exports.ActorHandleRaw = ActorHandleRaw; exports.createClientWithDriver = createClientWithDriver; exports.RemoteManagerDriver = RemoteManagerDriver;
+//# sourceMappingURL=chunk-NUA6LOOJ.cjs.map