rivetkit 2.3.3 → 2.3.5-rc.1

package/dist/browser/client.js

@@ -3,7 +3,7 @@ import {
   pino,
   stdTimeFunctions
 } from "pino";
-import { z } from "zod/v4";
+import { z as z2 } from "zod/v4";
 
 // src/actor/errors.ts
 var INTERNAL_ERROR_CODE = "internal_error";
@@ -194,7 +194,7 @@ function noopNext() {
 // package.json
 var package_default = {
   name: "rivetkit",
-  version: "2.3.3",
+  version: "2.3.5-rc.1",
   description: "Lightweight libraries for building stateful actors on edge platforms",
   license: "Apache-2.0",
   keywords: [
@@ -441,440 +441,150 @@ var package_default = {
   stableVersion: "0.8.0"
 };
 
-// src/utils.ts
-var VERSION = package_default.version;
-var _userAgent;
-function httpUserAgent() {
-  if (_userAgent !== void 0) {
-    return _userAgent;
+// src/common/encoding.ts
+import { z } from "zod/v4";
+
+// src/serde.ts
+import * as cbor from "cbor-x";
+import invariant from "invariant";
+function uint8ArrayToBase64(uint8Array) {
+  if (typeof Buffer !== "undefined") {
+    return Buffer.from(uint8Array).toString("base64");
   }
-  let userAgent = `RivetKit/${VERSION}`;
-  const navigatorObj = typeof navigator !== "undefined" ? navigator : void 0;
-  if (navigatorObj?.userAgent) userAgent += ` ${navigatorObj.userAgent}`;
-  _userAgent = userAgent;
-  return userAgent;
+  let binary = "";
+  const len = uint8Array.byteLength;
+  for (let i = 0; i < len; i++) {
+    binary += String.fromCharCode(uint8Array[i]);
+  }
+  return btoa(binary);
 }
-function getEnvUniversal(key) {
-  if (typeof Deno !== "undefined") {
-    return Deno.env.get(key);
-  } else if (typeof process !== "undefined") {
-    return process.env[key];
+function contentTypeForEncoding(encoding) {
+  if (encoding === "json") {
+    return "application/json";
+  } else if (encoding === "cbor" || encoding === "bare") {
+    return "application/octet-stream";
+  } else {
+    assertUnreachable(encoding);
   }
 }
-function promiseWithResolvers(onReject) {
-  let resolve;
-  let reject;
-  const promise = new Promise((res, rej) => {
-    resolve = res;
-    reject = rej;
-  });
-  promise.catch(onReject);
-  return { promise, resolve, reject };
+function encodeCborCompat(value) {
+  return cbor.encode(encodeJsonCompatValue(value));
 }
-function bufferToArrayBuffer(buf) {
-  return buf.buffer.slice(
-    buf.byteOffset,
-    buf.byteOffset + buf.byteLength
-  );
+function decodeCborCompat(buffer) {
+  return reviveJsonCompatValue(cbor.decode(buffer));
 }
-function combineUrlPath(endpoint, path, queryParams) {
-  const baseUrl = new URL(endpoint);
-  const pathParts = path.split("?");
-  const pathOnly = pathParts[0];
-  const existingQuery = pathParts[1] || "";
-  const basePath = baseUrl.pathname.replace(/\/$/, "");
-  const cleanPath = pathOnly.startsWith("/") ? pathOnly : `/${pathOnly}`;
-  const fullPath = (basePath + cleanPath).replace(/\/\//g, "/");
-  const queryParts = [];
-  if (existingQuery) {
-    queryParts.push(existingQuery);
+function serializeWithEncoding(encoding, value, versionedDataHandler, version, zodSchema, toJson, toBare) {
+  if (encoding === "json") {
+    const jsonValue = toJson(value);
+    const validated = zodSchema.parse(jsonValue);
+    return jsonStringifyCompat(validated);
+  } else if (encoding === "cbor") {
+    const jsonValue = toJson(value);
+    const validated = zodSchema.parse(jsonValue);
+    return cbor.encode(validated);
+  } else if (encoding === "bare") {
+    if (!versionedDataHandler) {
+      throw new Error(
+        "VersionedDataHandler is required for 'bare' encoding"
+      );
+    }
+    if (version === void 0) {
+      throw new Error("version is required for 'bare' encoding");
+    }
+    const bareValue = toBare(value);
+    return versionedDataHandler.serializeWithEmbeddedVersion(
+      bareValue,
+      version
+    );
+  } else {
+    assertUnreachable(encoding);
   }
-  if (queryParams) {
-    for (const [key, value] of Object.entries(queryParams)) {
-      if (value !== void 0) {
-        queryParts.push(
-          `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
-        );
-      }
+}
+function deserializeWithEncoding(encoding, buffer, versionedDataHandler, zodSchema, fromJson, fromBare) {
+  if (encoding === "json") {
+    let parsed;
+    if (typeof buffer === "string") {
+      parsed = jsonParseCompat(buffer);
+    } else {
+      const decoder = new TextDecoder("utf-8");
+      const jsonString = decoder.decode(buffer);
+      parsed = jsonParseCompat(jsonString);
+    }
+    const validated = zodSchema.parse(parsed);
+    return fromJson(validated);
+  } else if (encoding === "cbor") {
+    invariant(
+      typeof buffer !== "string",
+      "buffer cannot be string for cbor encoding"
+    );
+    const decoded = decodeCborCompat(buffer);
+    const validated = zodSchema.parse(decoded);
+    return fromJson(validated);
+  } else if (encoding === "bare") {
+    invariant(
+      typeof buffer !== "string",
+      "buffer cannot be string for bare encoding"
+    );
+    if (!versionedDataHandler) {
+      throw new Error(
+        "VersionedDataHandler is required for 'bare' encoding"
+      );
     }
+    const bareValue = versionedDataHandler.deserializeWithEmbeddedVersion(buffer);
+    return fromBare(bareValue);
+  } else {
+    assertUnreachable(encoding);
   }
-  const fullQuery = queryParts.length > 0 ? `?${queryParts.join("&")}` : "";
-  return `${baseUrl.protocol}//${baseUrl.host}${fullPath}${fullQuery}`;
 }
 
-// src/utils/env-vars.ts
-var getRivetEngine = () => getEnvUniversal("RIVET_ENGINE");
-var getRivetEndpoint = () => getEnvUniversal("RIVET_ENDPOINT");
-var getRivetToken = () => getEnvUniversal("RIVET_TOKEN");
-var getRivetNamespace = () => getEnvUniversal("RIVET_NAMESPACE");
-var getRivetPool = () => getEnvUniversal("RIVET_POOL");
-var getLogLevel = () => getEnvUniversal("RIVET_LOG_LEVEL") ?? getEnvUniversal("LOG_LEVEL");
-var getLogTarget = () => getEnvUniversal("RIVET_LOG_TARGET") === "1";
-var getLogTimestamp = () => getEnvUniversal("RIVET_LOG_TIMESTAMP") === "1";
-var getLogMessage = () => getEnvUniversal("RIVET_LOG_MESSAGE") === "1";
-var getLogErrorStack = () => getEnvUniversal("RIVET_LOG_ERROR_STACK") === "1";
-var getNextPhase = () => getEnvUniversal("NEXT_PHASE");
-
-// src/common/log.ts
-var baseLogger;
-var configuredLogLevel;
-var loggerCache = /* @__PURE__ */ new Map();
-var LogLevelSchema = z.enum([
-  "trace",
-  "debug",
-  "info",
-  "warn",
-  "error",
-  "fatal",
-  "silent"
-]);
-function getPinoLevel(logLevel) {
-  if (logLevel) {
-    return logLevel;
+// src/common/encoding.ts
+var JSON_COMPAT_BIGINT = "$BigInt";
+var JSON_COMPAT_ARRAY_BUFFER = "$ArrayBuffer";
+var JSON_COMPAT_UINT8_ARRAY = "$Uint8Array";
+var JSON_COMPAT_UNDEFINED = "$Undefined";
+var JSON_COMPAT_SET = "$Set";
+function isTypedArray(value) {
+  return value instanceof Uint8ClampedArray || value instanceof Uint16Array || value instanceof Uint32Array || value instanceof BigUint64Array || value instanceof Int8Array || value instanceof Int16Array || value instanceof Int32Array || value instanceof BigInt64Array || value instanceof Float32Array || value instanceof Float64Array;
+}
+var EncodingSchema = z.enum(["json", "cbor", "bare"]);
+async function inputDataToBuffer(data) {
+  if (typeof data === "string") {
+    return data;
   }
-  if (configuredLogLevel) {
-    return configuredLogLevel;
+  if (data instanceof Blob) {
+    return new Uint8Array(await data.arrayBuffer());
   }
-  const raw = (getLogLevel() || "warn").toString().toLowerCase();
-  const parsed = LogLevelSchema.safeParse(raw);
-  if (parsed.success) {
-    return parsed.data;
+  if (data instanceof Uint8Array) {
+    return data;
   }
-  return "info";
+  if (data instanceof ArrayBuffer || data instanceof SharedArrayBuffer) {
+    return new Uint8Array(data);
+  }
+  throw new Error("Malformed message");
 }
-function getIncludeTarget() {
-  return getLogTarget();
+function base64EncodeUint8Array(uint8Array) {
+  let binary = "";
+  for (const value of uint8Array) {
+    binary += String.fromCharCode(value);
+  }
+  return btoa(binary);
 }
-function makeDefaultLogger(logLevel) {
-  return pino(
-    {
-      level: getPinoLevel(logLevel),
-      messageKey: "msg",
-      // Do not include pid/hostname in output
-      base: {},
-      errorKey: "error",
-      // Keep the numeric level so the logfmt sink can match Pino's levels.
-      formatters: {
-        level(_label, number) {
-          return { level: number };
-        }
-      },
-      timestamp: getLogTimestamp() ? stdTimeFunctions.epochTime : false
-    },
-    createLogfmtDestination()
-  );
+function base64EncodeArrayBuffer(arrayBuffer) {
+  return base64EncodeUint8Array(new Uint8Array(arrayBuffer));
 }
-function configureDefaultLogger(logLevel) {
-  if (logLevel) {
-    configuredLogLevel = logLevel;
+function isPlainObject(value) {
+  if (value === null || typeof value !== "object") {
+    return false;
   }
-  baseLogger = makeDefaultLogger(logLevel);
-  loggerCache.clear();
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null;
 }
-function getBaseLogger() {
-  if (!baseLogger) {
-    configureDefaultLogger();
+function encodeJsonCompatValue(input) {
+  if (input === null) {
+    return input;
   }
-  return baseLogger;
-}
-function getLogger(name = "default") {
-  const cached = loggerCache.get(name);
-  if (cached) {
-    return cached;
-  }
-  const base = getBaseLogger();
-  const child = getIncludeTarget() ? base.child({ target: name }) : base;
-  loggerCache.set(name, child);
-  return child;
-}
-var PINO_LEVEL_LABELS = {
-  10: "trace",
-  20: "debug",
-  30: "info",
-  40: "warn",
-  50: "error",
-  60: "fatal"
-};
-function createLogfmtDestination() {
-  return {
-    write(msg) {
-      const line = formatLogfmtLine(msg);
-      if (typeof process !== "undefined" && process.stdout?.write) {
-        process.stdout.write(`${line}
-`);
-      } else {
-        console.log(line);
-      }
-    }
-  };
-}
-function formatLogfmtLine(raw) {
-  let data;
-  try {
-    data = JSON.parse(raw);
-  } catch {
-    return raw.trimEnd();
-  }
-  const parts = [];
-  appendLogfmtEntry(parts, "level", formatPinoLevel(data.level));
-  if (data.time !== void 0) {
-    appendLogfmtEntry(parts, "ts", data.time);
-  }
-  for (const [key, value] of Object.entries(data)) {
-    if (key === "level" || key === "time") {
-      continue;
-    }
-    appendLogfmtEntry(parts, key, value);
-  }
-  return parts.join(" ");
-}
-function formatPinoLevel(level) {
-  if (typeof level === "number") {
-    return PINO_LEVEL_LABELS[level] ?? level.toString();
-  }
-  if (typeof level === "string") {
-    return level.toLowerCase();
-  }
-  return "info";
-}
-function appendLogfmtEntry(parts, key, value) {
-  const safeKey = key.replace(/[\s="]/g, "");
-  if (safeKey.length === 0) {
-    return;
-  }
-  parts.push(`${safeKey}=${formatLogfmtValue(value)}`);
-}
-function formatLogfmtValue(value) {
-  if (typeof value === "number" || typeof value === "boolean") {
-    return String(value);
-  }
-  if (value === null || value === void 0) {
-    return "null";
-  }
-  if (typeof value === "string") {
-    return quoteLogfmtString(value);
-  }
-  return quoteLogfmtString(JSON.stringify(value));
-}
-function quoteLogfmtString(value) {
-  if (!/[\s="]/.test(value)) {
-    return value;
-  }
-  return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n")}"`;
-}
-
-// src/devtools-loader/log.ts
-function logger() {
-  return getLogger("devtools");
-}
-
-// src/devtools-loader/index.ts
-var scriptId = "rivetkit-devtools-script";
-function injectDevtools(config) {
-  if (!window) {
-    logger().warn("devtools not available outside browser environment");
-    return;
-  }
-  if (!document.getElementById(scriptId)) {
-    const src = `${config.endpoint?.replace(/\/$/, "")}/devtools/mod.js`;
-    const script = document.createElement("script");
-    script.id = scriptId;
-    script.src = src;
-    script.async = true;
-    document.head.appendChild(script);
-  }
-  window.__rivetkit = window.__rivetkit || [];
-  window.__rivetkit.push(config);
-}
-
-// src/engine-client/mod.ts
-import invariant3 from "invariant";
-
-// src/actor/keys.ts
-var EMPTY_KEY = "/";
-var KEY_SEPARATOR = "/";
-var KEYS = {
-  PERSIST_DATA: Uint8Array.from([1]),
-  CONN_PREFIX: Uint8Array.from([2]),
-  INSPECTOR_TOKEN: Uint8Array.from([3]),
-  KV: Uint8Array.from([4]),
-  QUEUE_PREFIX: Uint8Array.from([5]),
-  LAST_PUSHED_ALARM: Uint8Array.from([6]),
-  WORKFLOW_PREFIX: Uint8Array.from([6]),
-  TRACES_PREFIX: Uint8Array.from([7])
-};
-var STORAGE_VERSION = {
-  QUEUE: 1,
-  WORKFLOW: 1,
-  TRACES: 1
-};
-var STORAGE_VERSION_BYTES = {
-  QUEUE: Uint8Array.from([STORAGE_VERSION.QUEUE]),
-  WORKFLOW: Uint8Array.from([STORAGE_VERSION.WORKFLOW]),
-  TRACES: Uint8Array.from([STORAGE_VERSION.TRACES])
-};
-var QUEUE_NAMESPACE = {
-  METADATA: Uint8Array.from([1]),
-  MESSAGES: Uint8Array.from([2])
-};
-function concatPrefix(prefix, suffix) {
-  const merged = new Uint8Array(prefix.length + suffix.length);
-  merged.set(prefix, 0);
-  merged.set(suffix, prefix.length);
-  return merged;
-}
-var QUEUE_STORAGE_PREFIX = concatPrefix(
-  KEYS.QUEUE_PREFIX,
-  STORAGE_VERSION_BYTES.QUEUE
-);
-var QUEUE_METADATA_KEY = concatPrefix(
-  QUEUE_STORAGE_PREFIX,
-  QUEUE_NAMESPACE.METADATA
-);
-var QUEUE_MESSAGES_PREFIX = concatPrefix(
-  QUEUE_STORAGE_PREFIX,
-  QUEUE_NAMESPACE.MESSAGES
-);
-var WORKFLOW_STORAGE_PREFIX = concatPrefix(
-  KEYS.WORKFLOW_PREFIX,
-  STORAGE_VERSION_BYTES.WORKFLOW
-);
-var TRACES_STORAGE_PREFIX = concatPrefix(
-  KEYS.TRACES_PREFIX,
-  STORAGE_VERSION_BYTES.TRACES
-);
-function serializeActorKey(key) {
-  if (key.length === 0) {
-    return EMPTY_KEY;
-  }
-  const escapedParts = key.map((part) => {
-    if (part === "") {
-      return "\\0";
-    }
-    let escaped = part.replace(/\\/g, "\\\\");
-    escaped = escaped.replace(/\//g, `\\${KEY_SEPARATOR}`);
-    return escaped;
-  });
-  return escapedParts.join(KEY_SEPARATOR);
-}
-function deserializeActorKey(keyString) {
-  if (keyString === void 0 || keyString === null || keyString === EMPTY_KEY) {
-    return [];
-  }
-  const parts = [];
-  let currentPart = "";
-  let escaping = false;
-  let isEmptyStringMarker = false;
-  for (let i = 0; i < keyString.length; i++) {
-    const char = keyString[i];
-    if (escaping) {
-      if (char === "0") {
-        isEmptyStringMarker = true;
-      } else {
-        currentPart += char;
-      }
-      escaping = false;
-    } else if (char === "\\") {
-      escaping = true;
-    } else if (char === KEY_SEPARATOR) {
-      if (isEmptyStringMarker) {
-        parts.push("");
-        isEmptyStringMarker = false;
-      } else {
-        parts.push(currentPart);
-      }
-      currentPart = "";
-    } else {
-      currentPart += char;
-    }
-  }
-  if (escaping) {
-    parts.push(`${currentPart}\\`);
-  } else if (isEmptyStringMarker) {
-    parts.push("");
-  } else if (currentPart !== "" || parts.length > 0) {
-    parts.push(currentPart);
-  }
-  return parts;
-}
-
-// src/common/actor-router-consts.ts
-var PATH_CONNECT = "/connect";
-var PATH_WEBSOCKET_BASE = "/websocket";
-var PATH_WEBSOCKET_PREFIX = "/websocket/";
-var HEADER_ENCODING = "x-rivet-encoding";
-var HEADER_CONN_PARAMS = "x-rivet-conn-params";
-var HEADER_RIVET_TOKEN = "x-rivet-token";
-var HEADER_RIVET_TARGET = "x-rivet-target";
-var HEADER_RIVET_ACTOR = "x-rivet-actor";
-var HEADER_RIVET_SKIP_READY_WAIT = "x-rivet-skip-ready-wait";
-var WS_PROTOCOL_STANDARD = "rivet";
-var WS_PROTOCOL_TARGET = "rivet_target.";
-var WS_PROTOCOL_ACTOR = "rivet_actor.";
-var WS_PROTOCOL_ENCODING = "rivet_encoding.";
-var WS_PROTOCOL_CONN_PARAMS = "rivet_conn_params.";
-var WS_PROTOCOL_TOKEN = "rivet_token.";
-var WS_PROTOCOL_SKIP_READY_WAIT = "rivet_skip_ready_wait";
-var WS_PROTOCOL_TEST_ACK_HOOK = "rivet_test_ack_hook.";
-
-// src/engine-client/driver.ts
-function shouldSkipReadyWait(options = {}) {
-  return options.skipReadyWait === true;
-}
-
-// src/serde.ts
-import * as cbor from "cbor-x";
-import invariant from "invariant";
-
-// src/common/encoding.ts
-import { z as z2 } from "zod/v4";
-var JSON_COMPAT_BIGINT = "$BigInt";
-var JSON_COMPAT_ARRAY_BUFFER = "$ArrayBuffer";
-var JSON_COMPAT_UINT8_ARRAY = "$Uint8Array";
-var JSON_COMPAT_UNDEFINED = "$Undefined";
-var JSON_COMPAT_SET = "$Set";
-function isTypedArray(value) {
-  return value instanceof Uint8ClampedArray || value instanceof Uint16Array || value instanceof Uint32Array || value instanceof BigUint64Array || value instanceof Int8Array || value instanceof Int16Array || value instanceof Int32Array || value instanceof BigInt64Array || value instanceof Float32Array || value instanceof Float64Array;
-}
-var EncodingSchema = z2.enum(["json", "cbor", "bare"]);
-async function inputDataToBuffer(data) {
-  if (typeof data === "string") {
-    return data;
-  }
-  if (data instanceof Blob) {
-    return new Uint8Array(await data.arrayBuffer());
-  }
-  if (data instanceof Uint8Array) {
-    return data;
-  }
-  if (data instanceof ArrayBuffer || data instanceof SharedArrayBuffer) {
-    return new Uint8Array(data);
-  }
-  throw new Error("Malformed message");
-}
-function base64EncodeUint8Array(uint8Array) {
-  let binary = "";
-  for (const value of uint8Array) {
-    binary += String.fromCharCode(value);
-  }
-  return btoa(binary);
-}
-function base64EncodeArrayBuffer(arrayBuffer) {
-  return base64EncodeUint8Array(new Uint8Array(arrayBuffer));
-}
-function isPlainObject(value) {
-  if (value === null || typeof value !== "object") {
-    return false;
-  }
-  const proto = Object.getPrototypeOf(value);
-  return proto === Object.prototype || proto === null;
-}
-function encodeJsonCompatValue(input) {
-  if (input === null) {
-    return input;
-  }
-  if (input === void 0) {
-    return [JSON_COMPAT_UNDEFINED, 0];
+  if (input === void 0) {
+    return [JSON_COMPAT_UNDEFINED, 0];
   }
   if (typeof input === "string" || typeof input === "number" || typeof input === "boolean") {
     return input;
@@ -1001,116 +711,410 @@ function base64DecodeToUint8Array(base64) {
 function base64DecodeToArrayBuffer(base64) {
   return base64DecodeToUint8Array(base64).buffer;
 }
-function jsonStringifyCompat(input) {
-  return JSON.stringify(input, (_key, value) => {
-    if (typeof value === "bigint") {
-      return [JSON_COMPAT_BIGINT, value.toString()];
-    }
-    if (value instanceof ArrayBuffer) {
-      return [JSON_COMPAT_ARRAY_BUFFER, base64EncodeArrayBuffer(value)];
-    }
-    if (value instanceof Uint8Array) {
-      return [JSON_COMPAT_UINT8_ARRAY, base64EncodeUint8Array(value)];
-    }
-    if (Array.isArray(value) && value.length === 2 && typeof value[0] === "string" && value[0].startsWith("$")) {
-      return [`$${value[0]}`, value[1]];
-    }
+function jsonStringifyCompat(input, space) {
+  return JSON.stringify(
+    input,
+    (_key, value) => {
+      if (typeof value === "bigint") {
+        return [JSON_COMPAT_BIGINT, value.toString()];
+      }
+      if (value instanceof ArrayBuffer) {
+        return [JSON_COMPAT_ARRAY_BUFFER, base64EncodeArrayBuffer(value)];
+      }
+      if (value instanceof Uint8Array) {
+        return [JSON_COMPAT_UINT8_ARRAY, base64EncodeUint8Array(value)];
+      }
+      if (Array.isArray(value) && value.length === 2 && typeof value[0] === "string" && value[0].startsWith("$")) {
+        return [`$${value[0]}`, value[1]];
+      }
+      return value;
+    },
+    space
+  );
+}
+function jsonParseCompat(input) {
+  return reviveJsonCompatValue(JSON.parse(input));
+}
+
+// src/utils.ts
+var VERSION = package_default.version;
+var _userAgent;
+function httpUserAgent() {
+  if (_userAgent !== void 0) {
+    return _userAgent;
+  }
+  let userAgent = `RivetKit/${VERSION}`;
+  const navigatorObj = typeof navigator !== "undefined" ? navigator : void 0;
+  if (navigatorObj?.userAgent) userAgent += ` ${navigatorObj.userAgent}`;
+  _userAgent = userAgent;
+  return userAgent;
+}
+function getEnvUniversal(key) {
+  if (typeof Deno !== "undefined") {
+    return Deno.env.get(key);
+  } else if (typeof process !== "undefined") {
+    return process.env[key];
+  }
+}
+function promiseWithResolvers(onReject) {
+  let resolve;
+  let reject;
+  const promise = new Promise((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  promise.catch(onReject);
+  return { promise, resolve, reject };
+}
+function bufferToArrayBuffer(buf) {
+  return buf.buffer.slice(
+    buf.byteOffset,
+    buf.byteOffset + buf.byteLength
+  );
+}
+function combineUrlPath(endpoint, path, queryParams) {
+  const baseUrl = new URL(endpoint);
+  const pathParts = path.split("?");
+  const pathOnly = pathParts[0];
+  const existingQuery = pathParts[1] || "";
+  const basePath = baseUrl.pathname.replace(/\/$/, "");
+  const cleanPath = pathOnly.startsWith("/") ? pathOnly : `/${pathOnly}`;
+  const fullPath = (basePath + cleanPath).replace(/\/\//g, "/");
+  const queryParts = [];
+  if (existingQuery) {
+    queryParts.push(existingQuery);
+  }
+  if (queryParams) {
+    for (const [key, value] of Object.entries(queryParams)) {
+      if (value !== void 0) {
+        queryParts.push(
+          `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
+        );
+      }
+    }
+  }
+  const fullQuery = queryParts.length > 0 ? `?${queryParts.join("&")}` : "";
+  return `${baseUrl.protocol}//${baseUrl.host}${fullPath}${fullQuery}`;
+}
+
+// src/utils/env-vars.ts
+var getRivetEngine = () => getEnvUniversal("RIVET_ENGINE");
+var getRivetEndpoint = () => getEnvUniversal("RIVET_ENDPOINT");
+var getRivetToken = () => getEnvUniversal("RIVET_TOKEN");
+var getRivetNamespace = () => getEnvUniversal("RIVET_NAMESPACE");
+var getRivetPool = () => getEnvUniversal("RIVET_POOL");
+var getLogLevel = () => getEnvUniversal("RIVET_LOG_LEVEL") ?? getEnvUniversal("LOG_LEVEL");
+var getLogTarget = () => getEnvUniversal("RIVET_LOG_TARGET") === "1";
+var getLogTimestamp = () => getEnvUniversal("RIVET_LOG_TIMESTAMP") === "1";
+var getLogMessage = () => getEnvUniversal("RIVET_LOG_MESSAGE") === "1";
+var getLogErrorStack = () => getEnvUniversal("RIVET_LOG_ERROR_STACK") === "1";
+var getNextPhase = () => getEnvUniversal("NEXT_PHASE");
+
+// src/common/log.ts
+var baseLogger;
+var configuredLogLevel;
+var loggerCache = /* @__PURE__ */ new Map();
+var LogLevelSchema = z2.enum([
+  "trace",
+  "debug",
+  "info",
+  "warn",
+  "error",
+  "fatal",
+  "silent"
+]);
+function getPinoLevel(logLevel) {
+  if (logLevel) {
+    return logLevel;
+  }
+  if (configuredLogLevel) {
+    return configuredLogLevel;
+  }
+  const raw = (getLogLevel() || "warn").toString().toLowerCase();
+  const parsed = LogLevelSchema.safeParse(raw);
+  if (parsed.success) {
+    return parsed.data;
+  }
+  return "info";
+}
+function getIncludeTarget() {
+  return getLogTarget();
+}
+function makeDefaultLogger(logLevel) {
+  return pino(
+    {
+      level: getPinoLevel(logLevel),
+      messageKey: "msg",
+      // Do not include pid/hostname in output
+      base: {},
+      errorKey: "error",
+      // Keep the numeric level so the logfmt sink can match Pino's levels.
+      formatters: {
+        level(_label, number) {
+          return { level: number };
+        }
+      },
+      timestamp: getLogTimestamp() ? stdTimeFunctions.epochTime : false
+    },
+    createLogfmtDestination()
+  );
+}
+function configureDefaultLogger(logLevel) {
+  if (logLevel) {
+    configuredLogLevel = logLevel;
+  }
+  baseLogger = makeDefaultLogger(logLevel);
+  loggerCache.clear();
+}
+function getBaseLogger() {
+  if (!baseLogger) {
+    configureDefaultLogger();
+  }
+  return baseLogger;
+}
+function getLogger(name = "default") {
+  const cached = loggerCache.get(name);
+  if (cached) {
+    return cached;
+  }
+  const base = getBaseLogger();
+  const child = getIncludeTarget() ? base.child({ target: name }) : base;
+  loggerCache.set(name, child);
+  return child;
+}
+var PINO_LEVEL_LABELS = {
+  10: "trace",
+  20: "debug",
+  30: "info",
+  40: "warn",
+  50: "error",
+  60: "fatal"
+};
+function createLogfmtDestination() {
+  return {
+    write(msg) {
+      const line = formatLogfmtLine(msg);
+      if (typeof process !== "undefined" && process.stdout?.write) {
+        process.stdout.write(`${line}
+`);
+      } else {
+        console.log(line);
+      }
+    }
+  };
+}
+function formatLogfmtLine(raw) {
+  let data;
+  try {
+    data = JSON.parse(raw);
+  } catch {
+    return raw.trimEnd();
+  }
+  const parts = [];
+  appendLogfmtEntry(parts, "level", formatPinoLevel(data.level));
+  if (data.time !== void 0) {
+    appendLogfmtEntry(parts, "ts", data.time);
+  }
+  for (const [key, value] of Object.entries(data)) {
+    if (key === "level" || key === "time") {
+      continue;
+    }
+    appendLogfmtEntry(parts, key, value);
+  }
+  return parts.join(" ");
+}
+function formatPinoLevel(level) {
+  if (typeof level === "number") {
+    return PINO_LEVEL_LABELS[level] ?? level.toString();
+  }
+  if (typeof level === "string") {
+    return level.toLowerCase();
+  }
+  return "info";
+}
+function appendLogfmtEntry(parts, key, value) {
+  const safeKey = key.replace(/[\s="]/g, "");
+  if (safeKey.length === 0) {
+    return;
+  }
+  parts.push(`${safeKey}=${formatLogfmtValue(value)}`);
+}
+function formatLogfmtValue(value) {
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  if (value === null || value === void 0) {
+    return "null";
+  }
+  if (typeof value === "string") {
+    return quoteLogfmtString(value);
+  }
+  return quoteLogfmtString(JSON.stringify(value));
+}
+function quoteLogfmtString(value) {
+  if (!/[\s="]/.test(value)) {
     return value;
-  });
+  }
+  return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n")}"`;
 }
-function jsonParseCompat(input) {
-  return reviveJsonCompatValue(JSON.parse(input));
+
+// src/devtools-loader/log.ts
+function logger() {
+  return getLogger("devtools");
 }
 
-// src/serde.ts
-function uint8ArrayToBase64(uint8Array) {
-  if (typeof Buffer !== "undefined") {
-    return Buffer.from(uint8Array).toString("base64");
-  }
-  let binary = "";
-  const len = uint8Array.byteLength;
-  for (let i = 0; i < len; i++) {
-    binary += String.fromCharCode(uint8Array[i]);
+// src/devtools-loader/index.ts
+var scriptId = "rivetkit-devtools-script";
+function injectDevtools(config) {
+  if (!window) {
+    logger().warn("devtools not available outside browser environment");
+    return;
   }
-  return btoa(binary);
-}
-function contentTypeForEncoding(encoding) {
-  if (encoding === "json") {
-    return "application/json";
-  } else if (encoding === "cbor" || encoding === "bare") {
-    return "application/octet-stream";
-  } else {
-    assertUnreachable(encoding);
+  if (!document.getElementById(scriptId)) {
+    const src = `${config.endpoint?.replace(/\/$/, "")}/devtools/mod.js`;
+    const script = document.createElement("script");
+    script.id = scriptId;
+    script.src = src;
+    script.async = true;
+    document.head.appendChild(script);
   }
+  window.__rivetkit = window.__rivetkit || [];
+  window.__rivetkit.push(config);
 }
-function encodeCborCompat(value) {
-  return cbor.encode(encodeJsonCompatValue(value));
-}
-function decodeCborCompat(buffer) {
-  return reviveJsonCompatValue(cbor.decode(buffer));
+
+// src/engine-client/mod.ts
+import invariant3 from "invariant";
+
+// src/actor/keys.ts
+var EMPTY_KEY = "/";
+var KEY_SEPARATOR = "/";
+var KEYS = {
+  PERSIST_DATA: Uint8Array.from([1]),
+  CONN_PREFIX: Uint8Array.from([2]),
+  INSPECTOR_TOKEN: Uint8Array.from([3]),
+  KV: Uint8Array.from([4]),
+  QUEUE_PREFIX: Uint8Array.from([5]),
+  LAST_PUSHED_ALARM: Uint8Array.from([6]),
+  WORKFLOW_PREFIX: Uint8Array.from([6]),
+  TRACES_PREFIX: Uint8Array.from([7])
+};
+var STORAGE_VERSION = {
+  QUEUE: 1,
+  WORKFLOW: 1,
+  TRACES: 1
+};
+var STORAGE_VERSION_BYTES = {
+  QUEUE: Uint8Array.from([STORAGE_VERSION.QUEUE]),
+  WORKFLOW: Uint8Array.from([STORAGE_VERSION.WORKFLOW]),
+  TRACES: Uint8Array.from([STORAGE_VERSION.TRACES])
+};
+var QUEUE_NAMESPACE = {
+  METADATA: Uint8Array.from([1]),
+  MESSAGES: Uint8Array.from([2])
+};
+function concatPrefix(prefix, suffix) {
+  const merged = new Uint8Array(prefix.length + suffix.length);
+  merged.set(prefix, 0);
+  merged.set(suffix, prefix.length);
+  return merged;
 }
-function serializeWithEncoding(encoding, value, versionedDataHandler, version, zodSchema, toJson, toBare) {
-  if (encoding === "json") {
-    const jsonValue = toJson(value);
-    const validated = zodSchema.parse(jsonValue);
-    return jsonStringifyCompat(validated);
-  } else if (encoding === "cbor") {
-    const jsonValue = toJson(value);
-    const validated = zodSchema.parse(jsonValue);
-    return cbor.encode(validated);
-  } else if (encoding === "bare") {
-    if (!versionedDataHandler) {
-      throw new Error(
-        "VersionedDataHandler is required for 'bare' encoding"
-      );
-    }
-    if (version === void 0) {
-      throw new Error("version is required for 'bare' encoding");
-    }
-    const bareValue = toBare(value);
-    return versionedDataHandler.serializeWithEmbeddedVersion(
-      bareValue,
-      version
-    );
-  } else {
-    assertUnreachable(encoding);
+var QUEUE_STORAGE_PREFIX = concatPrefix(
+  KEYS.QUEUE_PREFIX,
+  STORAGE_VERSION_BYTES.QUEUE
+);
+var QUEUE_METADATA_KEY = concatPrefix(
+  QUEUE_STORAGE_PREFIX,
+  QUEUE_NAMESPACE.METADATA
+);
+var QUEUE_MESSAGES_PREFIX = concatPrefix(
+  QUEUE_STORAGE_PREFIX,
+  QUEUE_NAMESPACE.MESSAGES
+);
+var WORKFLOW_STORAGE_PREFIX = concatPrefix(
+  KEYS.WORKFLOW_PREFIX,
+  STORAGE_VERSION_BYTES.WORKFLOW
+);
+var TRACES_STORAGE_PREFIX = concatPrefix(
+  KEYS.TRACES_PREFIX,
+  STORAGE_VERSION_BYTES.TRACES
+);
+function serializeActorKey(key) {
+  if (key.length === 0) {
+    return EMPTY_KEY;
   }
+  const escapedParts = key.map((part) => {
+    if (part === "") {
+      return "\\0";
+    }
+    let escaped = part.replace(/\\/g, "\\\\");
+    escaped = escaped.replace(/\//g, `\\${KEY_SEPARATOR}`);
+    return escaped;
+  });
+  return escapedParts.join(KEY_SEPARATOR);
 }
-function deserializeWithEncoding(encoding, buffer, versionedDataHandler, zodSchema, fromJson, fromBare) {
-  if (encoding === "json") {
-    let parsed;
-    if (typeof buffer === "string") {
-      parsed = jsonParseCompat(buffer);
+function deserializeActorKey(keyString) {
+  if (keyString === void 0 || keyString === null || keyString === EMPTY_KEY) {
+    return [];
+  }
+  const parts = [];
+  let currentPart = "";
+  let escaping = false;
+  let isEmptyStringMarker = false;
+  for (let i = 0; i < keyString.length; i++) {
+    const char = keyString[i];
+    if (escaping) {
+      if (char === "0") {
+        isEmptyStringMarker = true;
+      } else {
+        currentPart += char;
+      }
+      escaping = false;
+    } else if (char === "\\") {
+      escaping = true;
+    } else if (char === KEY_SEPARATOR) {
+      if (isEmptyStringMarker) {
+        parts.push("");
+        isEmptyStringMarker = false;
+      } else {
+        parts.push(currentPart);
+      }
+      currentPart = "";
     } else {
-      const decoder = new TextDecoder("utf-8");
-      const jsonString = decoder.decode(buffer);
-      parsed = jsonParseCompat(jsonString);
-    }
-    const validated = zodSchema.parse(parsed);
-    return fromJson(validated);
-  } else if (encoding === "cbor") {
-    invariant(
-      typeof buffer !== "string",
-      "buffer cannot be string for cbor encoding"
-    );
-    const decoded = decodeCborCompat(buffer);
-    const validated = zodSchema.parse(decoded);
-    return fromJson(validated);
-  } else if (encoding === "bare") {
-    invariant(
-      typeof buffer !== "string",
-      "buffer cannot be string for bare encoding"
-    );
-    if (!versionedDataHandler) {
-      throw new Error(
-        "VersionedDataHandler is required for 'bare' encoding"
-      );
+      currentPart += char;
     }
-    const bareValue = versionedDataHandler.deserializeWithEmbeddedVersion(buffer);
-    return fromBare(bareValue);
-  } else {
-    assertUnreachable(encoding);
   }
+  if (escaping) {
+    parts.push(`${currentPart}\\`);
+  } else if (isEmptyStringMarker) {
+    parts.push("");
+  } else if (currentPart !== "" || parts.length > 0) {
+    parts.push(currentPart);
+  }
+  return parts;
+}
+
+// src/common/actor-router-consts.ts
+var PATH_CONNECT = "/connect";
+var PATH_WEBSOCKET_BASE = "/websocket";
+var PATH_WEBSOCKET_PREFIX = "/websocket/";
+var HEADER_ENCODING = "x-rivet-encoding";
+var HEADER_CONN_PARAMS = "x-rivet-conn-params";
+var HEADER_RIVET_TOKEN = "x-rivet-token";
+var HEADER_RIVET_TARGET = "x-rivet-target";
+var HEADER_RIVET_ACTOR = "x-rivet-actor";
+var HEADER_RIVET_SKIP_READY_WAIT = "x-rivet-skip-ready-wait";
+var WS_PROTOCOL_STANDARD = "rivet";
+var WS_PROTOCOL_TARGET = "rivet_target.";
+var WS_PROTOCOL_ACTOR = "rivet_actor.";
+var WS_PROTOCOL_ENCODING = "rivet_encoding.";
+var WS_PROTOCOL_CONN_PARAMS = "rivet_conn_params.";
+var WS_PROTOCOL_TOKEN = "rivet_token.";
+var WS_PROTOCOL_SKIP_READY_WAIT = "rivet_skip_ready_wait";
+var WS_PROTOCOL_TEST_ACK_HOOK = "rivet_test_ack_hook.";
+
+// src/engine-client/driver.ts
+function shouldSkipReadyWait(options = {}) {
+  return options.skipReadyWait === true;
 }
 
 // src/engine-client/actor-http-client.ts
@@ -3925,13 +3929,6 @@ async function destroyActor(config, actorId) {
 async function getMetadata(config) {
   return apiCall(config, "GET", `/metadata`);
 }
-async function kvGet(config, actorId, key) {
-  return apiCall(
-    config,
-    "GET",
-    `/actors/${encodeURIComponent(actorId)}/kv/keys/${encodeURIComponent(key)}`
-  );
-}
 
 // src/engine-client/metadata.ts
 import pRetry from "p-retry";
@@ -4339,28 +4336,6 @@ var RemoteEngineControlClient = class {
     const args = await createWebSocketProxy(c, wsGuardUrl, protocols);
     return await upgradeWebSocket(() => args)(c, noopNext());
   }
-  async kvGet(actorId, key) {
-    await this.#metadataPromise;
-    logger3().debug({ msg: "getting kv value via engine api", key });
-    const response = await kvGet(
-      this.#config,
-      actorId,
-      new TextDecoder("utf8").decode(key)
-    );
-    return response.value;
-  }
-  async kvBatchGet(_actorId, _keys) {
-    throw new Error("kvBatchGet not supported on remote engine client");
-  }
-  async kvBatchPut(_actorId, _entries) {
-    throw new Error("kvBatchPut not supported on remote engine client");
-  }
-  async kvBatchDelete(_actorId, _keys) {
-    throw new Error("kvBatchDelete not supported on remote engine client");
-  }
-  async kvDeleteRange(_actorId, _start, _end) {
-    throw new Error("kvDeleteRange not supported on remote engine client");
-  }
   displayInformation() {
     return { properties: {} };
   }
@@ -5840,6 +5815,7 @@ var ActorConnRaw = class {
 };
 
 // src/common/database/shared.ts
+var MIGRATION_TRANSACTION_TIMEOUT_MS = 5 * 6e4;
 var AsyncMutex = class {
   #locked = false;
   #waiting = [];