rivetkit 2.0.3 → 2.0.5

package/dist/tsup/{chunk-6WKQDDUD.cjs → chunk-IRMBWX36.cjs}

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } var _class; var _class2;
 
-var _chunk2CRLFV6Zcjs = require('./chunk-2CRLFV6Z.cjs');
+var _chunk5YTI25C3cjs = require('./chunk-5YTI25C3.cjs');
 
 
 
 
 
-var _chunkOGAPU3UGcjs = require('./chunk-OGAPU3UG.cjs');
+var _chunkWADSS5X4cjs = require('./chunk-WADSS5X4.cjs');
 
 
 
@@ -17,9 +17,7 @@ var _chunkOGAPU3UGcjs = require('./chunk-OGAPU3UG.cjs');
 
 
 
-
-
-var _chunkGIR3AFFIcjs = require('./chunk-GIR3AFFI.cjs');
+var _chunk5QGQK44Lcjs = require('./chunk-5QGQK44L.cjs');
 
 // src/actor/connection.ts
 var _cborx = require('cbor-x'); var cbor2 = _interopRequireWildcard(_cborx); var cbor = _interopRequireWildcard(_cborx); var cbor4 = _interopRequireWildcard(_cborx); var cbor3 = _interopRequireWildcard(_cborx);
@@ -125,6 +123,7 @@ function write1(bc, x) {
 }
 function readError(bc) {
   return {
+    group: bare.readString(bc),
     code: bare.readString(bc),
     message: bare.readString(bc),
     metadata: read0(bc),
@@ -132,6 +131,7 @@ function readError(bc) {
   };
 }
 function writeError(bc, x) {
+  bare.writeString(bc, x.group);
   bare.writeString(bc, x.code);
   bare.writeString(bc, x.message);
   write0(bc, x.metadata);
@@ -347,12 +347,14 @@ function decodeHttpActionResponse(bytes) {
 }
 function readHttpResponseError(bc) {
   return {
+    group: bare.readString(bc),
     code: bare.readString(bc),
     message: bare.readString(bc),
     metadata: read0(bc)
   };
 }
 function writeHttpResponseError(bc, x) {
+  bare.writeString(bc, x.group);
   bare.writeString(bc, x.code);
   bare.writeString(bc, x.message);
   write0(bc, x.metadata);
@@ -444,16 +446,6 @@ var HTTP_RESOLVE_RESPONSE_VERSIONED = createVersionedDataHandler({
   deserializeVersion: (bytes) => decodeHttpResolveResponse(bytes)
 });
 
-// src/actor/log.ts
-var RUNTIME_LOGGER_NAME = "actor-runtime";
-var ACTOR_LOGGER_NAME = "actor";
-function logger() {
-  return _chunk2CRLFV6Zcjs.getLogger.call(void 0, RUNTIME_LOGGER_NAME);
-}
-function instanceLogger() {
-  return _chunk2CRLFV6Zcjs.getLogger.call(void 0, ACTOR_LOGGER_NAME);
-}
-
 // src/actor/protocol/serde.ts
 var _zod = require('zod');
 
@@ -466,7 +458,7 @@ function encodingIsBinary(encoding) {
   } else if (encoding === "cbor" || encoding === "bare") {
     return true;
   } else {
-    _chunkOGAPU3UGcjs.assertUnreachable.call(void 0, encoding);
+    _chunkWADSS5X4cjs.assertUnreachable.call(void 0, encoding);
   }
 }
 function contentTypeForEncoding(encoding) {
@@ -475,16 +467,7 @@ function contentTypeForEncoding(encoding) {
   } else if (encoding === "cbor" || encoding === "bare") {
     return "application/octet-stream";
   } else {
-    _chunkOGAPU3UGcjs.assertUnreachable.call(void 0, encoding);
-  }
-}
-function wsBinaryTypeForEncoding(encoding) {
-  if (encoding === "json") {
-    return "blob";
-  } else if (encoding === "cbor" || encoding === "bare") {
-    return "arraybuffer";
-  } else {
-    _chunkOGAPU3UGcjs.assertUnreachable.call(void 0, encoding);
+    _chunkWADSS5X4cjs.assertUnreachable.call(void 0, encoding);
   }
 }
 function serializeWithEncoding(encoding, value, versionedDataHandler) {
@@ -493,9 +476,12 @@ function serializeWithEncoding(encoding, value, versionedDataHandler) {
   } else if (encoding === "cbor") {
     return cbor.encode(value);
   } else if (encoding === "bare") {
+    if (!versionedDataHandler) {
+      throw new Error("VersionedDataHandler is required for 'bare' encoding");
+    }
     return versionedDataHandler.serializeWithEmbeddedVersion(value);
   } else {
-    _chunkOGAPU3UGcjs.assertUnreachable.call(void 0, encoding);
+    _chunkWADSS5X4cjs.assertUnreachable.call(void 0, encoding);
   }
 }
 function deserializeWithEncoding(encoding, buffer, versionedDataHandler) {
@@ -518,16 +504,28 @@ function deserializeWithEncoding(encoding, buffer, versionedDataHandler) {
       typeof buffer !== "string",
       "buffer cannot be string for bare encoding"
     );
+    if (!versionedDataHandler) {
+      throw new Error("VersionedDataHandler is required for 'bare' encoding");
+    }
     return versionedDataHandler.deserializeWithEmbeddedVersion(buffer);
   } else {
-    _chunkOGAPU3UGcjs.assertUnreachable.call(void 0, encoding);
+    _chunkWADSS5X4cjs.assertUnreachable.call(void 0, encoding);
   }
 }
 
+// src/actor/log.ts
+function loggerWithoutContext() {
+  return _chunk5YTI25C3cjs.getLogger.call(void 0, "actor-runtime");
+}
+
 // src/actor/utils.ts
 function assertUnreachable2(x) {
-  logger().error("unreachable", { value: `${x}`, stack: new Error().stack });
-  throw new (0, _chunkGIR3AFFIcjs.Unreachable)(x);
+  loggerWithoutContext().error({
+    msg: "unreachable",
+    value: `${x}`,
+    stack: new Error().stack
+  });
+  throw new (0, _chunk5QGQK44Lcjs.Unreachable)(x);
 }
 var DeadlineError = class extends Error {
   constructor() {
@@ -652,9 +650,6 @@ var Conn = (_class = class {
   get params() {
     return this.__persist.params;
   }
-  get auth() {
-    return this.__persist.authData;
-  }
   get driver() {
     return this.__persist.connDriver;
   }
@@ -719,7 +714,7 @@ var Conn = (_class = class {
   }
   #validateStateEnabled() {
     if (!this.#stateEnabled) {
-      throw new (0, _chunkGIR3AFFIcjs.ConnStateNotEnabled)();
+      throw new (0, _chunk5QGQK44Lcjs.ConnStateNotEnabled)();
     }
   }
   /**
@@ -744,7 +739,7 @@ var Conn = (_class = class {
    *
    * @param eventName - The name of the event.
    * @param args - The arguments for the event.
-   * @see {@link https://rivet.gg/docs/events|Events Documentation}
+   * @see {@link https://rivet.dev/docs/events|Events Documentation}
    */
   send(eventName, ...args) {
     this.#actor.inspector.emitter.emit("eventFired", {
@@ -760,7 +755,7 @@ var Conn = (_class = class {
             tag: "Event",
             val: {
               name: eventName,
-              args: _chunkOGAPU3UGcjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
+              args: _chunkWADSS5X4cjs.bufferToArrayBuffer.call(void 0, cbor2.encode(args))
             }
           }
         },
@@ -793,7 +788,8 @@ var Conn = (_class = class {
     const isConnectionClosed = readyState === 3 /* CLOSED */ || readyState === 2 /* CLOSING */ || readyState === void 0;
     const newLastSeen = Date.now();
     const newStatus = isConnectionClosed ? "reconnecting" : "connected";
-    logger().debug("liveness probe for connection", {
+    this.#actor.rLog.debug({
+      msg: "liveness probe for connection",
       connId: this.id,
       actorId: this.#actor.id,
       readyState,
@@ -933,9 +929,8 @@ var ActionContext = class {
 };
 
 // src/manager/log.ts
-var LOGGER_NAME = "actor-manager";
-function logger2() {
-  return _chunk2CRLFV6Zcjs.getLogger.call(void 0, LOGGER_NAME);
+function logger() {
+  return _chunk5YTI25C3cjs.getLogger.call(void 0, "actor-manager");
 }
 
 // src/manager/hono-websocket-adapter.ts
@@ -983,7 +978,8 @@ var HonoWebSocketAdapter = (_class2 = class {
       throw new Error("WebSocket is not open");
     }
     try {
-      logger2().debug("bridge sending data", {
+      logger().debug({
+        msg: "bridge sending data",
         dataType: typeof data,
         isString: typeof data === "string",
         isArrayBuffer: data instanceof ArrayBuffer,
@@ -1009,18 +1005,22 @@ var HonoWebSocketAdapter = (_class2 = class {
         data.arrayBuffer().then((buffer) => {
           this.#ws.send(buffer);
         }).catch((error) => {
-          logger2().error("failed to convert blob to arraybuffer", { error });
+          logger().error({
+            msg: "failed to convert blob to arraybuffer",
+            error
+          });
           this.#fireEvent("error", { type: "error", target: this, error });
         });
       } else {
-        logger2().warn("unsupported data type, converting to string", {
+        logger().warn({
+          msg: "unsupported data type, converting to string",
           dataType: typeof data,
           data
         });
         this.#ws.send(String(data));
       }
     } catch (error) {
-      logger2().error("error sending websocket data", { error });
+      logger().error({ msg: "error sending websocket data", error });
       this.#fireEvent("error", { type: "error", target: this, error });
       throw error;
     }
@@ -1043,7 +1043,7 @@ var HonoWebSocketAdapter = (_class2 = class {
         wasClean: code === 1e3
       });
     } catch (error) {
-      logger2().error("error closing websocket", { error });
+      logger().error({ msg: "error closing websocket", error });
       this.#readyState = this.CLOSED;
       this.#fireEvent("close", {
         type: "close",
@@ -1073,7 +1073,10 @@ var HonoWebSocketAdapter = (_class2 = class {
         try {
           listener(event);
         } catch (error) {
-          logger2().error(`error in ${event.type} event listener`, { error });
+          logger().error({
+            msg: `error in ${event.type} event listener`,
+            error
+          });
         }
       }
     }
@@ -1091,7 +1094,8 @@ var HonoWebSocketAdapter = (_class2 = class {
     } else {
       messageData = String(data);
     }
-    logger2().debug("bridge handling message", {
+    logger().debug({
+      msg: "bridge handling message",
       dataType: typeof messageData,
       isArrayBuffer: messageData instanceof ArrayBuffer,
       dataStr: typeof messageData === "string" ? messageData : "<binary>"
@@ -1132,7 +1136,7 @@ var HonoWebSocketAdapter = (_class2 = class {
         try {
           listener(event);
         } catch (error) {
-          logger2().error(`error in ${type} event listener`, { error });
+          logger().error({ msg: `error in ${type} event listener`, error });
         }
       }
     }
@@ -1142,7 +1146,7 @@ var HonoWebSocketAdapter = (_class2 = class {
           try {
             this.#onopen(event);
           } catch (error) {
-            logger2().error("error in onopen handler", { error });
+            logger().error({ msg: "error in onopen handler", error });
           }
         }
         break;
@@ -1151,7 +1155,7 @@ var HonoWebSocketAdapter = (_class2 = class {
           try {
             this.#onclose(event);
           } catch (error) {
-            logger2().error("error in onclose handler", { error });
+            logger().error({ msg: "error in onclose handler", error });
           }
         }
         break;
@@ -1160,7 +1164,7 @@ var HonoWebSocketAdapter = (_class2 = class {
           try {
             this.#onerror(event);
           } catch (error) {
-            logger2().error("error in onerror handler", { error });
+            logger().error({ msg: "error in onerror handler", error });
           }
         }
         break;
@@ -1169,7 +1173,7 @@ var HonoWebSocketAdapter = (_class2 = class {
           try {
             this.#onmessage(event);
           } catch (error) {
-            logger2().error("error in onmessage handler", { error });
+            logger().error({ msg: "error in onmessage handler", error });
           }
         }
         break;
@@ -1218,7 +1222,7 @@ function getValueLength(value) {
   } else if (value instanceof ArrayBuffer || value instanceof SharedArrayBuffer || value instanceof Uint8Array) {
     return value.byteLength;
   } else {
-    _chunkOGAPU3UGcjs.assertUnreachable.call(void 0, value);
+    _chunkWADSS5X4cjs.assertUnreachable.call(void 0, value);
   }
 }
 async function inputDataToBuffer(data) {
@@ -1232,15 +1236,18 @@ async function inputDataToBuffer(data) {
   } else if (data instanceof ArrayBuffer || data instanceof SharedArrayBuffer) {
     return new Uint8Array(data);
   } else {
-    throw new (0, _chunkGIR3AFFIcjs.MalformedMessage)();
+    throw new (0, _chunk5QGQK44Lcjs.MalformedMessage)();
   }
 }
 async function parseMessage(value, opts) {
   const length = getValueLength(value);
   if (length > opts.maxIncomingMessageSize) {
-    throw new (0, _chunkGIR3AFFIcjs.MessageTooLong)();
+    throw new (0, _chunk5QGQK44Lcjs.MessageTooLong)();
+  }
+  let buffer = await inputDataToBuffer(value);
+  if (buffer instanceof Buffer) {
+    buffer = new Uint8Array(buffer);
   }
-  const buffer = await inputDataToBuffer(value);
   return deserializeWithEncoding(opts.encoding, buffer, TO_SERVER_VERSIONED);
 }
 async function processMessage(message, actor, conn, handler) {
@@ -1249,13 +1256,14 @@ async function processMessage(message, actor, conn, handler) {
   try {
     if (message.body.tag === "ActionRequest") {
       if (handler.onExecuteAction === void 0) {
-        throw new (0, _chunkGIR3AFFIcjs.Unsupported)("Action");
+        throw new (0, _chunk5QGQK44Lcjs.Unsupported)("Action");
       }
       const { id, name, args: argsRaw } = message.body.val;
       actionId = id;
       actionName = name;
       const args = cbor3.decode(new Uint8Array(argsRaw));
-      logger().debug("processing action request", {
+      actor.rLog.debug({
+        msg: "processing action request",
         actionId: id,
         actionName: name
       });
@@ -1264,7 +1272,8 @@ async function processMessage(message, actor, conn, handler) {
         conn
       );
       const output = await handler.onExecuteAction(ctx, name, args);
-      logger().debug("sending action response", {
+      actor.rLog.debug({
+        msg: "sending action response",
         actionId: id,
         actionName: name,
         outputType: typeof output,
@@ -1277,20 +1286,21 @@ async function processMessage(message, actor, conn, handler) {
               tag: "ActionResponse",
               val: {
                 id,
-                output: _chunkOGAPU3UGcjs.bufferToArrayBuffer.call(void 0, cbor3.encode(output))
+                output: _chunkWADSS5X4cjs.bufferToArrayBuffer.call(void 0, cbor3.encode(output))
               }
             }
           },
           TO_CLIENT_VERSIONED
         )
       );
-      logger().debug("action response sent", { id, name });
+      actor.rLog.debug({ msg: "action response sent", id, name });
     } else if (message.body.tag === "SubscriptionRequest") {
       if (handler.onSubscribe === void 0 || handler.onUnsubscribe === void 0) {
-        throw new (0, _chunkGIR3AFFIcjs.Unsupported)("Subscriptions");
+        throw new (0, _chunk5QGQK44Lcjs.Unsupported)("Subscriptions");
       }
       const { eventName, subscribe } = message.body.val;
-      logger().debug("processing subscription request", {
+      actor.rLog.debug({
+        msg: "processing subscription request",
         eventName,
         subscribe
       });
@@ -1299,20 +1309,26 @@ async function processMessage(message, actor, conn, handler) {
       } else {
         await handler.onUnsubscribe(eventName, conn);
       }
-      logger().debug("subscription request completed", {
+      actor.rLog.debug({
+        msg: "subscription request completed",
         eventName,
         subscribe
       });
     } else {
-      _chunkOGAPU3UGcjs.assertUnreachable.call(void 0, message.body);
+      _chunkWADSS5X4cjs.assertUnreachable.call(void 0, message.body);
     }
   } catch (error) {
-    const { code, message: message2, metadata } = _chunkOGAPU3UGcjs.deconstructError.call(void 0, error, logger(), {
-      connectionId: conn.id,
-      actionId,
-      actionName
-    });
-    logger().debug("sending error response", {
+    const { group, code, message: message2, metadata } = _chunkWADSS5X4cjs.deconstructError.call(void 0, 
+      error,
+      actor.rLog,
+      {
+        connectionId: conn.id,
+        actionId,
+        actionName
+      }
+    );
+    actor.rLog.debug({
+      msg: "sending error response",
       actionId,
       actionName,
       code,
@@ -1324,9 +1340,10 @@ async function processMessage(message, actor, conn, handler) {
           body: {
             tag: "Error",
             val: {
+              group,
               code,
               message: message2,
-              metadata: _chunkOGAPU3UGcjs.bufferToArrayBuffer.call(void 0, cbor3.encode(metadata)),
+              metadata: _chunkWADSS5X4cjs.bufferToArrayBuffer.call(void 0, cbor3.encode(metadata)),
               actionId: _nullishCoalesce(actionId, () => ( null))
             }
           }
@@ -1334,7 +1351,7 @@ async function processMessage(message, actor, conn, handler) {
         TO_CLIENT_VERSIONED
       )
     );
-    logger().debug("error response sent", { actionId, actionName });
+    actor.rLog.debug({ msg: "error response sent", actionId, actionName });
   }
 }
 
@@ -1352,9 +1369,9 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
   } catch (error) {
     return {
       onOpen: (_evt, ws) => {
-        const { code } = _chunkOGAPU3UGcjs.deconstructError.call(void 0, 
+        const { code } = _chunkWADSS5X4cjs.deconstructError.call(void 0, 
           error,
-          logger(),
+          actor.rLog,
           {
             wsEvent: "open"
           },
@@ -1373,7 +1390,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
   }
   return {
     onOpen: (_evt, ws) => {
-      logger().debug("websocket open");
+      actor.rLog.debug("websocket open");
       (async () => {
         try {
           const connId = generateConnId();
@@ -1381,7 +1398,8 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
           const connState = await actor.prepareConn(parameters, req);
           const connGlobalState = actorDriver.getGenericConnGlobalState(actorId);
           connGlobalState.websockets.set(connId, ws);
-          logger().debug("registered websocket for conn", {
+          actor.rLog.debug({
+            msg: "registered websocket for conn",
             actorId,
             totalCount: connGlobalState.websockets.size
           });
@@ -1397,9 +1415,9 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
           handlersResolve({ conn, actor, connId });
         } catch (error) {
           handlersReject(error);
-          const { code } = _chunkOGAPU3UGcjs.deconstructError.call(void 0, 
+          const { code } = _chunkWADSS5X4cjs.deconstructError.call(void 0, 
             error,
-            logger(),
+            actor.rLog,
             {
               wsEvent: "open"
             },
@@ -1411,16 +1429,16 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
     },
     onMessage: (evt, ws) => {
       handlersPromise.then(({ conn, actor: actor2 }) => {
-        logger().debug("received message");
+        actor2.rLog.debug({ msg: "received message" });
         const value = evt.data.valueOf();
         parseMessage(value, {
           encoding,
           maxIncomingMessageSize: runConfig.maxIncomingMessageSize
         }).then((message) => {
           actor2.processMessage(message, conn).catch((error) => {
-            const { code } = _chunkOGAPU3UGcjs.deconstructError.call(void 0, 
+            const { code } = _chunkWADSS5X4cjs.deconstructError.call(void 0, 
               error,
-              logger(),
+              actor2.rLog,
               {
                 wsEvent: "message"
               },
@@ -1429,9 +1447,9 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
             ws.close(1011, code);
           });
         }).catch((error) => {
-          const { code } = _chunkOGAPU3UGcjs.deconstructError.call(void 0, 
+          const { code } = _chunkWADSS5X4cjs.deconstructError.call(void 0, 
             error,
-            logger(),
+            actor2.rLog,
             {
               wsEvent: "message"
             },
@@ -1440,9 +1458,9 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
           ws.close(1011, code);
         });
       }).catch((error) => {
-        const { code } = _chunkOGAPU3UGcjs.deconstructError.call(void 0, 
+        const { code } = _chunkWADSS5X4cjs.deconstructError.call(void 0, 
           error,
-          logger(),
+          actor.rLog,
           {
             wsEvent: "message"
           },
@@ -1453,13 +1471,15 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
     },
     onClose: (event, ws) => {
       if (event.wasClean) {
-        logger().info("websocket closed", {
+        actor.rLog.info({
+          msg: "websocket closed",
           code: event.code,
           reason: event.reason,
           wasClean: event.wasClean
         });
       } else {
-        logger().warn("websocket closed", {
+        actor.rLog.warn({
+          msg: "websocket closed",
           code: event.code,
           reason: event.reason,
           wasClean: event.wasClean
@@ -1470,20 +1490,22 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
         const connGlobalState = actorDriver.getGenericConnGlobalState(actorId);
         const didDelete = connGlobalState.websockets.delete(connId);
         if (didDelete) {
-          logger().info("removing websocket for conn", {
+          actor2.rLog.info({
+            msg: "removing websocket for conn",
             totalCount: connGlobalState.websockets.size
           });
         } else {
-          logger().warn("websocket does not exist for conn", {
+          actor2.rLog.warn({
+            msg: "websocket does not exist for conn",
             actorId,
             totalCount: connGlobalState.websockets.size
           });
         }
         actor2.__removeConn(conn);
       }).catch((error) => {
-        _chunkOGAPU3UGcjs.deconstructError.call(void 0, 
+        _chunkWADSS5X4cjs.deconstructError.call(void 0, 
           error,
-          logger(),
+          actor.rLog,
           { wsEvent: "close" },
           exposeInternalError
         );
@@ -1491,11 +1513,11 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
     },
     onError: (_error) => {
       try {
-        logger().warn("websocket error");
+        actor.rLog.warn({ msg: "websocket error" });
       } catch (error) {
-        _chunkOGAPU3UGcjs.deconstructError.call(void 0, 
+        _chunkWADSS5X4cjs.deconstructError.call(void 0, 
           error,
-          logger(),
+          actor.rLog,
           { wsEvent: "error" },
           exposeInternalError
         );
@@ -1517,7 +1539,7 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId, authData) {
       connId = generateConnId();
       connToken = generateConnToken();
       connState = await actor.prepareConn(parameters, c.req.raw);
-      logger().debug("sse open");
+      actor.rLog.debug("sse open");
       actorDriver.getGenericConnGlobalState(actorId).sseStreams.set(connId, stream);
       conn = await actor.createConn(
         connId,
@@ -1529,9 +1551,12 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId, authData) {
         authData
       );
       const abortResolver = Promise.withResolvers();
-      stream.onAbort(async () => {
+      stream.onAbort(() => {
+      });
+      c.req.raw.signal.addEventListener("abort", async () => {
+        const rLog = _nullishCoalesce((actor == null ? void 0 : actor.rLog), () => ( loggerWithoutContext()));
         try {
-          logger().debug("sse stream aborted");
+          rLog.debug("sse stream aborted");
           if (connId) {
             actorDriver.getGenericConnGlobalState(actorId).sseStreams.delete(connId);
           }
@@ -1540,7 +1565,7 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId, authData) {
           }
           abortResolver.resolve(void 0);
         } catch (error) {
-          logger().error("error closing sse connection", { error });
+          rLog.error({ msg: "error closing sse connection", error });
           abortResolver.resolve(void 0);
         }
       });
@@ -1550,7 +1575,7 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId, authData) {
       }
       await abortResolver.promise;
     } catch (error) {
-      logger().error("error in sse connection", { error });
+      loggerWithoutContext().error({ msg: "error in sse connection", error });
       if (connId !== void 0) {
         actorDriver.getGenericConnGlobalState(actorId).sseStreams.delete(connId);
       }
@@ -1564,7 +1589,6 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId, authData) {
 async function handleAction(c, _runConfig, actorDriver, actionName, actorId, authData) {
   const encoding = getRequestEncoding(c.req);
   const parameters = getRequestConnParams(c.req);
-  logger().debug("handling action", { actionName, encoding });
   const arrayBuffer = await c.req.arrayBuffer();
   const request = deserializeWithEncoding(
     encoding,
@@ -1577,6 +1601,7 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId, aut
   let output;
   try {
     actor = await actorDriver.loadActor(actorId);
+    actor.rLog.debug({ msg: "handling action", actionName, encoding });
     const connState = await actor.prepareConn(parameters, c.req.raw);
     conn = await actor.createConn(
       generateConnId(),
@@ -1595,7 +1620,7 @@ async function handleAction(c, _runConfig, actorDriver, actionName, actorId, aut
     }
   }
   const responseData = {
-    output: _chunkOGAPU3UGcjs.bufferToArrayBuffer.call(void 0, cbor4.encode(output))
+    output: _chunkWADSS5X4cjs.bufferToArrayBuffer.call(void 0, cbor4.encode(output))
   };
   const serialized = serializeWithEncoding(
     encoding,
@@ -1617,10 +1642,10 @@ async function handleConnectionMessage(c, _runConfig, actorDriver, connId, connT
   const actor = await actorDriver.loadActor(actorId);
   const conn = actor.conns.get(connId);
   if (!conn) {
-    throw new (0, _chunkGIR3AFFIcjs.ConnNotFound)(connId);
+    throw new (0, _chunk5QGQK44Lcjs.ConnNotFound)(connId);
   }
   if (conn._token !== connToken) {
-    throw new (0, _chunkGIR3AFFIcjs.IncorrectConnToken)();
+    throw new (0, _chunk5QGQK44Lcjs.IncorrectConnToken)();
   }
   await actor.processMessage(message, conn);
   return c.json({});
@@ -1632,8 +1657,8 @@ async function handleRawWebSocketHandler(req, path, actorDriver, actorId, authDa
       const adapter = new HonoWebSocketAdapter(ws);
       ws.__adapter = adapter;
       const url = new URL(path, "http://actor");
-      const pathname = url.pathname.replace(/^\/raw\/websocket/, "") || "/";
-      const normalizedPath = pathname + url.search;
+      const pathname = url.pathname.replace(/^\/raw\/websocket\/?/, "") || "/";
+      const normalizedPath = (pathname.startsWith("/") ? pathname : "/" + pathname) + url.search;
       let newRequest;
       if (req) {
         newRequest = new Request(`http://actor${normalizedPath}`, req);
@@ -1642,13 +1667,16 @@ async function handleRawWebSocketHandler(req, path, actorDriver, actorId, authDa
           method: "GET"
         });
       }
-      logger().debug("rewriting websocket url", {
+      actor.rLog.debug({
+        msg: "rewriting websocket url",
         from: path,
-        to: newRequest.url
+        to: newRequest.url,
+        pathname: url.pathname,
+        search: url.search,
+        normalizedPath
       });
       actor.handleWebSocket(adapter, {
-        request: newRequest,
-        auth: authData
+        request: newRequest
       });
     },
     onMessage: (event, ws) => {
@@ -1674,38 +1702,19 @@ async function handleRawWebSocketHandler(req, path, actorDriver, actorId, authDa
 function getRequestEncoding(req) {
   const encodingParam = req.header(HEADER_ENCODING);
   if (!encodingParam) {
-    throw new (0, _chunkGIR3AFFIcjs.InvalidEncoding)("undefined");
+    throw new (0, _chunk5QGQK44Lcjs.InvalidEncoding)("undefined");
   }
   const result = EncodingSchema.safeParse(encodingParam);
   if (!result.success) {
-    throw new (0, _chunkGIR3AFFIcjs.InvalidEncoding)(encodingParam);
+    throw new (0, _chunk5QGQK44Lcjs.InvalidEncoding)(encodingParam);
   }
   return result.data;
 }
-function getRequestExposeInternalError(req) {
-  const param = req.headers.get(HEADER_EXPOSE_INTERNAL_ERROR);
-  if (!param) {
-    return false;
-  }
-  return param === "true";
-}
-function getRequestQuery(c) {
-  const queryParam = c.req.header(HEADER_ACTOR_QUERY);
-  if (!queryParam) {
-    logger().error("missing query parameter");
-    throw new (0, _chunkGIR3AFFIcjs.InvalidRequest)("missing query");
-  }
-  try {
-    const parsed = JSON.parse(queryParam);
-    return parsed;
-  } catch (error) {
-    logger().error("invalid query json", { error });
-    throw new (0, _chunkGIR3AFFIcjs.InvalidQueryJSON)(error);
-  }
+function getRequestExposeInternalError(_req) {
+  return false;
 }
 var HEADER_ACTOR_QUERY = "X-RivetKit-Query";
 var HEADER_ENCODING = "X-RivetKit-Encoding";
-var HEADER_EXPOSE_INTERNAL_ERROR = "X-RivetKit-Expose-Internal-Error";
 var HEADER_CONN_PARAMS = "X-RivetKit-Conn-Params";
 var HEADER_AUTH_DATA = "X-RivetKit-Auth-Data";
 var HEADER_ACTOR_ID = "X-RivetKit-Actor";
@@ -1729,8 +1738,8 @@ function getRequestConnParams(req) {
   try {
     return JSON.parse(paramsParam);
   } catch (err) {
-    throw new (0, _chunkGIR3AFFIcjs.InvalidParams)(
-      `Invalid params JSON: ${_chunkOGAPU3UGcjs.stringifyError.call(void 0, err)}`
+    throw new (0, _chunk5QGQK44Lcjs.InvalidParams)(
+      `Invalid params JSON: ${_chunkWADSS5X4cjs.stringifyError.call(void 0, err)}`
     );
   }
 }
@@ -1781,10 +1790,5 @@ function getRequestConnParams(req) {
 
 
 
-
-
-
-
-
-exports.createVersionedDataHandler = createVersionedDataHandler; exports.TO_SERVER_VERSIONED = TO_SERVER_VERSIONED; exports.TO_CLIENT_VERSIONED = TO_CLIENT_VERSIONED; exports.HTTP_ACTION_REQUEST_VERSIONED = HTTP_ACTION_REQUEST_VERSIONED; exports.HTTP_ACTION_RESPONSE_VERSIONED = HTTP_ACTION_RESPONSE_VERSIONED; exports.HTTP_RESPONSE_ERROR_VERSIONED = HTTP_RESPONSE_ERROR_VERSIONED; exports.HTTP_RESOLVE_REQUEST_VERSIONED = HTTP_RESOLVE_REQUEST_VERSIONED; exports.HTTP_RESOLVE_RESPONSE_VERSIONED = HTTP_RESOLVE_RESPONSE_VERSIONED; exports.logger = logger; exports.instanceLogger = instanceLogger; exports.encodingIsBinary = encodingIsBinary; exports.contentTypeForEncoding = contentTypeForEncoding; exports.wsBinaryTypeForEncoding = wsBinaryTypeForEncoding; exports.serializeWithEncoding = serializeWithEncoding; exports.deserializeWithEncoding = deserializeWithEncoding; exports.assertUnreachable = assertUnreachable2; exports.DeadlineError = DeadlineError; exports.deadline = deadline; exports.generateRandomString = generateRandomString; exports.EncodingSchema = EncodingSchema; exports.CachedSerializer = CachedSerializer; exports.encodeDataToString = encodeDataToString; exports.jsonStringifyCompat = jsonStringifyCompat; 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.CONNECTION_CHECK_LIVENESS_SYMBOL = CONNECTION_CHECK_LIVENESS_SYMBOL; exports.Conn = Conn; exports.logger2 = logger2; exports.inputDataToBuffer = inputDataToBuffer; exports.processMessage = processMessage; exports.handleWebSocketConnect = handleWebSocketConnect; exports.handleSseConnect = handleSseConnect; exports.handleAction = handleAction; exports.handleConnectionMessage = handleConnectionMessage; exports.handleRawWebSocketHandler = handleRawWebSocketHandler; exports.getRequestEncoding = getRequestEncoding; exports.getRequestExposeInternalError = getRequestExposeInternalError; exports.getRequestQuery = getRequestQuery; exports.HEADER_ACTOR_QUERY = HEADER_ACTOR_QUERY; exports.HEADER_ENCODING = HEADER_ENCODING; exports.HEADER_EXPOSE_INTERNAL_ERROR = HEADER_EXPOSE_INTERNAL_ERROR; exports.HEADER_CONN_PARAMS = HEADER_CONN_PARAMS; exports.HEADER_AUTH_DATA = HEADER_AUTH_DATA; exports.HEADER_ACTOR_ID = HEADER_ACTOR_ID; exports.HEADER_CONN_ID = HEADER_CONN_ID; exports.HEADER_CONN_TOKEN = HEADER_CONN_TOKEN; exports.ALLOWED_PUBLIC_HEADERS = ALLOWED_PUBLIC_HEADERS;
-//# sourceMappingURL=chunk-6WKQDDUD.cjs.map
+exports.createVersionedDataHandler = createVersionedDataHandler; exports.TO_SERVER_VERSIONED = TO_SERVER_VERSIONED; exports.TO_CLIENT_VERSIONED = TO_CLIENT_VERSIONED; exports.HTTP_ACTION_REQUEST_VERSIONED = HTTP_ACTION_REQUEST_VERSIONED; exports.HTTP_ACTION_RESPONSE_VERSIONED = HTTP_ACTION_RESPONSE_VERSIONED; exports.HTTP_RESPONSE_ERROR_VERSIONED = HTTP_RESPONSE_ERROR_VERSIONED; exports.encodingIsBinary = encodingIsBinary; exports.contentTypeForEncoding = contentTypeForEncoding; exports.serializeWithEncoding = serializeWithEncoding; exports.deserializeWithEncoding = deserializeWithEncoding; exports.loggerWithoutContext = loggerWithoutContext; exports.assertUnreachable = assertUnreachable2; exports.DeadlineError = DeadlineError; exports.deadline = deadline; exports.generateRandomString = generateRandomString; exports.EncodingSchema = EncodingSchema; exports.CachedSerializer = CachedSerializer; exports.encodeDataToString = encodeDataToString; exports.jsonStringifyCompat = jsonStringifyCompat; 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.CONNECTION_CHECK_LIVENESS_SYMBOL = CONNECTION_CHECK_LIVENESS_SYMBOL; exports.Conn = Conn; exports.logger = logger; exports.TransportSchema = TransportSchema; exports.inputDataToBuffer = inputDataToBuffer; exports.processMessage = processMessage; exports.handleWebSocketConnect = handleWebSocketConnect; exports.handleSseConnect = handleSseConnect; exports.handleAction = handleAction; exports.handleConnectionMessage = handleConnectionMessage; exports.handleRawWebSocketHandler = handleRawWebSocketHandler; exports.getRequestEncoding = getRequestEncoding; exports.getRequestExposeInternalError = getRequestExposeInternalError; exports.HEADER_ACTOR_QUERY = HEADER_ACTOR_QUERY; exports.HEADER_ENCODING = HEADER_ENCODING; exports.HEADER_CONN_PARAMS = HEADER_CONN_PARAMS; exports.HEADER_AUTH_DATA = HEADER_AUTH_DATA; exports.HEADER_ACTOR_ID = HEADER_ACTOR_ID; exports.HEADER_CONN_ID = HEADER_CONN_ID; exports.HEADER_CONN_TOKEN = HEADER_CONN_TOKEN; exports.ALLOWED_PUBLIC_HEADERS = ALLOWED_PUBLIC_HEADERS;
+//# sourceMappingURL=chunk-IRMBWX36.cjs.map