rivetkit 2.0.3 → 2.0.4

package/dist/tsup/{chunk-4NSUQZ2H.js → chunk-HLLF4B4Q.js}

@@ -1,25 +1,23 @@
 import {
   getLogger
-} from "./chunk-XFSS33EQ.js";
+} from "./chunk-LV2S3OU3.js";
 import {
   assertUnreachable,
   bufferToArrayBuffer,
   deconstructError,
   stringifyError
-} from "./chunk-3H7O2A7I.js";
+} from "./chunk-PQY7KKTL.js";
 import {
   ConnNotFound,
   ConnStateNotEnabled,
   IncorrectConnToken,
   InvalidEncoding,
   InvalidParams,
-  InvalidQueryJSON,
-  InvalidRequest,
   MalformedMessage,
   MessageTooLong,
   Unreachable,
   Unsupported
-} from "./chunk-INGJP237.js";
+} from "./chunk-NFU2BBT5.js";
 
 // src/actor/connection.ts
 import * as cbor2 from "cbor-x";
@@ -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 getLogger(RUNTIME_LOGGER_NAME);
-}
-function instanceLogger() {
-  return getLogger(ACTOR_LOGGER_NAME);
-}
-
 // src/actor/protocol/serde.ts
 import { z } from "zod";
 
@@ -478,21 +470,15 @@ function contentTypeForEncoding(encoding) {
     assertUnreachable(encoding);
   }
 }
-function wsBinaryTypeForEncoding(encoding) {
-  if (encoding === "json") {
-    return "blob";
-  } else if (encoding === "cbor" || encoding === "bare") {
-    return "arraybuffer";
-  } else {
-    assertUnreachable(encoding);
-  }
-}
 function serializeWithEncoding(encoding, value, versionedDataHandler) {
   if (encoding === "json") {
     return jsonStringifyCompat(value);
   } 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 {
     assertUnreachable(encoding);
@@ -518,15 +504,27 @@ 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 {
     assertUnreachable(encoding);
   }
 }
 
+// src/actor/log.ts
+function loggerWithoutContext() {
+  return getLogger("actor-runtime");
+}
+
 // src/actor/utils.ts
 function assertUnreachable2(x) {
-  logger().error("unreachable", { value: `${x}`, stack: new Error().stack });
+  loggerWithoutContext().error({
+    msg: "unreachable",
+    value: `${x}`,
+    stack: new Error().stack
+  });
   throw new Unreachable(x);
 }
 var DeadlineError = class extends Error {
@@ -652,9 +650,6 @@ var Conn = class {
   get params() {
     return this.__persist.params;
   }
-  get auth() {
-    return this.__persist.authData;
-  }
   get driver() {
     return this.__persist.connDriver;
   }
@@ -744,7 +739,7 @@ var Conn = 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", {
@@ -793,7 +788,8 @@ var Conn = 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 getLogger(LOGGER_NAME);
+function logger() {
+  return getLogger("actor-manager");
 }
 
 // src/manager/hono-websocket-adapter.ts
@@ -983,7 +978,8 @@ var HonoWebSocketAdapter = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = class {
           try {
             this.#onmessage(event);
           } catch (error) {
-            logger2().error("error in onmessage handler", { error });
+            logger().error({ msg: "error in onmessage handler", error });
           }
         }
         break;
@@ -1240,7 +1244,10 @@ async function parseMessage(value, opts) {
   if (length > opts.maxIncomingMessageSize) {
     throw new MessageTooLong();
   }
-  const buffer = await inputDataToBuffer(value);
+  let buffer = await inputDataToBuffer(value);
+  if (buffer instanceof Buffer) {
+    buffer = new Uint8Array(buffer);
+  }
   return deserializeWithEncoding(opts.encoding, buffer, TO_SERVER_VERSIONED);
 }
 async function processMessage(message, actor, conn, handler) {
@@ -1255,7 +1262,8 @@ async function processMessage(message, actor, conn, handler) {
       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,
@@ -1284,13 +1293,14 @@ async function processMessage(message, actor, conn, handler) {
           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 Unsupported("Subscriptions");
       }
       const { eventName, subscribe } = message.body.val;
-      logger().debug("processing subscription request", {
+      actor.rLog.debug({
+        msg: "processing subscription request",
         eventName,
         subscribe
       });
@@ -1299,7 +1309,8 @@ 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
       });
@@ -1307,12 +1318,17 @@ async function processMessage(message, actor, conn, handler) {
       assertUnreachable(message.body);
     }
   } catch (error) {
-    const { code, message: message2, metadata } = deconstructError(error, logger(), {
-      connectionId: conn.id,
-      actionId,
-      actionName
-    });
-    logger().debug("sending error response", {
+    const { group, code, message: message2, metadata } = deconstructError(
+      error,
+      actor.rLog,
+      {
+        connectionId: conn.id,
+        actionId,
+        actionName
+      }
+    );
+    actor.rLog.debug({
+      msg: "sending error response",
       actionId,
       actionName,
       code,
@@ -1324,6 +1340,7 @@ async function processMessage(message, actor, conn, handler) {
           body: {
             tag: "Error",
             val: {
+              group,
               code,
               message: message2,
               metadata: bufferToArrayBuffer(cbor3.encode(metadata)),
@@ -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 });
   }
 }
 
@@ -1354,7 +1371,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       onOpen: (_evt, ws) => {
         const { code } = deconstructError(
           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
           });
@@ -1399,7 +1417,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
           handlersReject(error);
           const { code } = deconstructError(
             error,
-            logger(),
+            actor.rLog,
             {
               wsEvent: "open"
             },
@@ -1411,7 +1429,7 @@ 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,
@@ -1420,7 +1438,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
           actor2.processMessage(message, conn).catch((error) => {
             const { code } = deconstructError(
               error,
-              logger(),
+              actor2.rLog,
               {
                 wsEvent: "message"
               },
@@ -1431,7 +1449,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
         }).catch((error) => {
           const { code } = deconstructError(
             error,
-            logger(),
+            actor2.rLog,
             {
               wsEvent: "message"
             },
@@ -1442,7 +1460,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       }).catch((error) => {
         const { code } = deconstructError(
           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,11 +1490,13 @@ 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
           });
@@ -1483,7 +1505,7 @@ async function handleWebSocketConnect(req, runConfig, actorDriver, actorId, enco
       }).catch((error) => {
         deconstructError(
           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) {
         deconstructError(
           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,
@@ -1530,8 +1552,9 @@ async function handleSseConnect(c, _runConfig, actorDriver, actorId, authData) {
       );
       const abortResolver = Promise.withResolvers();
       stream.onAbort(async () => {
+        const rLog = (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 +1563,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 +1573,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 +1587,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 +1599,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(),
@@ -1632,8 +1655,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 +1665,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) => {
@@ -1682,30 +1708,11 @@ function getRequestEncoding(req) {
   }
   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 InvalidRequest("missing query");
-  }
-  try {
-    const parsed = JSON.parse(queryParam);
-    return parsed;
-  } catch (error) {
-    logger().error("invalid query json", { error });
-    throw new 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";
@@ -1742,15 +1749,11 @@ export {
   HTTP_ACTION_REQUEST_VERSIONED,
   HTTP_ACTION_RESPONSE_VERSIONED,
   HTTP_RESPONSE_ERROR_VERSIONED,
-  HTTP_RESOLVE_REQUEST_VERSIONED,
-  HTTP_RESOLVE_RESPONSE_VERSIONED,
-  logger,
-  instanceLogger,
   encodingIsBinary,
   contentTypeForEncoding,
-  wsBinaryTypeForEncoding,
   serializeWithEncoding,
   deserializeWithEncoding,
+  loggerWithoutContext,
   assertUnreachable2 as assertUnreachable,
   DeadlineError,
   deadline,
@@ -1766,7 +1769,8 @@ export {
   CONNECTION_DRIVER_HTTP,
   CONNECTION_CHECK_LIVENESS_SYMBOL,
   Conn,
-  logger2,
+  logger,
+  TransportSchema,
   inputDataToBuffer,
   processMessage,
   handleWebSocketConnect,
@@ -1776,10 +1780,8 @@ export {
   handleRawWebSocketHandler,
   getRequestEncoding,
   getRequestExposeInternalError,
-  getRequestQuery,
   HEADER_ACTOR_QUERY,
   HEADER_ENCODING,
-  HEADER_EXPOSE_INTERNAL_ERROR,
   HEADER_CONN_PARAMS,
   HEADER_AUTH_DATA,
   HEADER_ACTOR_ID,
@@ -1787,4 +1789,4 @@ export {
   HEADER_CONN_TOKEN,
   ALLOWED_PUBLIC_HEADERS
 };
-//# sourceMappingURL=chunk-4NSUQZ2H.js.map
+//# sourceMappingURL=chunk-HLLF4B4Q.js.map