rivetkit 2.0.38 → 2.0.39

package/dist/tsup/{chunk-FZQHTGQX.cjs → chunk-MZPYVTVG.cjs}

@@ -1,15 +1,15 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkIRTVRBJAcjs = require('./chunk-IRTVRBJA.cjs');
+var _chunkDY4H3ASEcjs = require('./chunk-DY4H3ASE.cjs');
 
 
-var _chunkLULP6HM2cjs = require('./chunk-LULP6HM2.cjs');
+var _chunkUAX5E3EUcjs = require('./chunk-UAX5E3EU.cjs');
 
 
-var _chunkIWXMFQDTcjs = require('./chunk-IWXMFQDT.cjs');
+var _chunkKMYFL3OLcjs = require('./chunk-KMYFL3OL.cjs');
 
 
-var _chunkO433HWWGcjs = require('./chunk-O433HWWG.cjs');
+var _chunkX72X7I7Tcjs = require('./chunk-X72X7I7T.cjs');
 
 // src/test/mod.ts
 var _net = require('net');
@@ -19,14 +19,14 @@ var _invariant = require('invariant'); var _invariant2 = _interopRequireDefault(
 
 // src/test/log.ts
 function logger() {
-  return _chunkO433HWWGcjs.getLogger.call(void 0, "test");
+  return _chunkX72X7I7Tcjs.getLogger.call(void 0, "test");
 }
 
 // src/test/mod.ts
 async function setupTest(c, registry) {
   var _a;
   registry.config.test = { ...registry.config.test, enabled: true };
-  const driver = await _chunkIRTVRBJAcjs.createFileSystemOrMemoryDriver.call(void 0, 
+  const driver = await _chunkDY4H3ASEcjs.createFileSystemOrMemoryDriver.call(void 0, 
     true,
     `/tmp/rivetkit-test-${crypto.randomUUID()}`
   );
@@ -39,7 +39,7 @@ async function setupTest(c, registry) {
   const parsedConfig = registry.parseConfig();
   const managerDriver = (_a = driver.manager) == null ? void 0 : _a.call(driver, parsedConfig);
   _invariant2.default.call(void 0, managerDriver, "missing manager driver");
-  const { router } = _chunkIWXMFQDTcjs.buildManagerRouter.call(void 0, 
+  const { router } = _chunkKMYFL3OLcjs.buildManagerRouter.call(void 0, 
     parsedConfig,
     managerDriver,
     () => upgradeWebSocket
@@ -62,7 +62,7 @@ async function setupTest(c, registry) {
   c.onTestFinished(async () => {
     await new Promise((resolve) => server.close(() => resolve(void 0)));
   });
-  const client = _chunkLULP6HM2cjs.createClient.call(void 0, {
+  const client = _chunkUAX5E3EUcjs.createClient.call(void 0, {
     endpoint,
     namespace: "default",
     runnerName: "default"
@@ -111,4 +111,4 @@ async function getPort() {
 
 
 exports.setupTest = setupTest; exports.getPort = getPort;
-//# sourceMappingURL=chunk-FZQHTGQX.cjs.map
+//# sourceMappingURL=chunk-MZPYVTVG.cjs.map

package/dist/tsup/{chunk-FZQHTGQX.cjs.map → chunk-MZPYVTVG.cjs.map}

@@ -1 +1 @@
-{"version":3,"sources":["/home/runner/work/rivet/rivet/rivetkit-typescript/packages/rivetkit/dist/tsup/chunk-FZQHTGQX.cjs","../../src/test/mod.ts","../../src/test/log.ts"],"names":[],"mappings":"AAAA;AACE;AACF,wDAA6B;AAC7B;AACE;AACF,wDAA6B;AAC7B;AACE;AACF,wDAA6B;AAC7B;AACE;AACF,wDAA6B;AAC7B;AACA;ACbA,0BAA6B;AAC7B,+CAAmC;AACnC,uCAAoC;AACpC,4FAAsB;ADetB;AACA;AEjBO,SAAS,MAAA,CAAA,EAAS;AACxB,EAAA,OAAO,yCAAA,MAAgB,CAAA;AACxB;AFmBA;AACA;ACNA,MAAA,SAAsB,SAAA,CACrB,CAAA,EACA,QAAA,EAC8B;AArB/B,EAAA,IAAA,EAAA;AAuBC,EAAA,QAAA,CAAS,MAAA,CAAO,KAAA,EAAO,EAAE,GAAG,QAAA,CAAS,MAAA,CAAO,IAAA,EAAM,OAAA,EAAS,KAAK,CAAA;AAGhE,EAAA,MAAM,OAAA,EAAS,MAAM,8DAAA;AAAA,IACpB,IAAA;AAAA,IACA,CAAA,mBAAA,EAAsB,MAAA,CAAO,UAAA,CAAW,CAAC,CAAA;AAAA,EAAA;AAK1C,EAAA;AACA,EAAA;AACA,EAAA;AAA4B,IAAA;AAClB,IAAA;AACI,EAAA;AAId,EAAA;AACA,EAAA;AACA,EAAA;AAKA,EAAA;AAAmB,IAAA;AAClB,IAAA;AACA,IAAA;AACM,EAAA;AAIP,EAAA;AACA,EAAA;AAIA,EAAA;AACA,EAAA;AAAyB,IAAA;AACV,IAAA;AACJ,IAAA;AACV,EAAA;AAED,EAAA;AAAA,IAAA;AACmC,IAAA;AAClC,EAAA;AAED,EAAA;AACA,EAAA;AAEA,EAAA;AAGA,EAAA;AACC,IAAA;AAAqE,EAAA;AAItE,EAAA;AAA+B,IAAA;AAC9B,IAAA;AACW,IAAA;AACC,EAAA;AAEb,EAAA;AAEA,EAAA;AACD;AAEA;AAEC,EAAA;AACA,EAAA;AACA,EAAA;AAGA,EAAA;AACA,EAAA;AAEA,EAAA;AACC,IAAA;AAEC,MAAA;AACC,QAAA;AAEA,QAAA;AACC,UAAA;AACC,YAAA;AAA0C,UAAA;AAE1C,YAAA;AAAU,UAAA;AACX,QAAA;AAGD,QAAA;AACC,UAAA;AAAc,QAAA;AAGf,QAAA;AAAkB,MAAA;AAInB,MAAA;AACC,QAAA;AAA4B,MAAA;AAG7B,MAAA;AAAO,IAAA;AAGP,MAAA;AACA,MAAA;AACC,QAAA;AAAA,MAAA;AAED,MAAA;AAAqB,IAAA;AACtB,EAAA;AAGD,EAAA;AACD;AD/BA;AACA;AACA;AACA;AACA","file":"/home/runner/work/rivet/rivet/rivetkit-typescript/packages/rivetkit/dist/tsup/chunk-FZQHTGQX.cjs","sourcesContent":[null,"import { createServer } from \"node:net\";\nimport { serve as honoServe } from \"@hono/node-server\";\nimport { createNodeWebSocket } from \"@hono/node-ws\";\nimport invariant from \"invariant\";\nimport { type TestContext, vi } from \"vitest\";\nimport { ClientConfigSchema } from \"@/client/config\";\nimport { type Client, createClient } from \"@/client/mod\";\nimport { createFileSystemOrMemoryDriver } from \"@/drivers/file-system/mod\";\nimport { createClientWithDriver, type Registry } from \"@/mod\";\nimport { RegistryConfig, RegistryConfigSchema } from \"@/registry/config\";\nimport { buildManagerRouter } from \"@/manager/router\";\nimport { logger } from \"./log\";\n\nexport interface SetupTestResult<A extends Registry<any>> {\n\tclient: Client<A>;\n}\n\n// Must use `TestContext` since global hooks do not work when running concurrently\nexport async function setupTest<A extends Registry<any>>(\n\tc: TestContext,\n\tregistry: A,\n): Promise<SetupTestResult<A>> {\n\t// Force enable test mode\n\tregistry.config.test = { ...registry.config.test, enabled: true };\n\n\t// Create driver\n\tconst driver = await createFileSystemOrMemoryDriver(\n\t\ttrue,\n\t\t`/tmp/rivetkit-test-${crypto.randomUUID()}`,\n\t);\n\n\t// Build driver config\n\t// biome-ignore lint/style/useConst: Assigned later\n\tlet upgradeWebSocket: any;\n\tregistry.config.driver = driver;\n\tregistry.config.inspector = {\n\t\tenabled: true,\n\t\ttoken: () => \"token\",\n\t};\n\n\t// Create router\n\tconst parsedConfig = registry.parseConfig();\n\tconst managerDriver = driver.manager?.(parsedConfig);\n\tinvariant(managerDriver, \"missing manager driver\");\n\t// const internalClient = createClientWithDriver(\n\t// \tmanagerDriver,\n\t// \tClientConfigSchema.parse({}),\n\t// );\n\tconst { router } = buildManagerRouter(\n\t\tparsedConfig,\n\t\tmanagerDriver,\n\t\t() => upgradeWebSocket!,\n\t);\n\n\t// Inject WebSocket\n\tconst nodeWebSocket = createNodeWebSocket({ app: router });\n\tupgradeWebSocket = nodeWebSocket.upgradeWebSocket;\n\n\t// TODO: I think this whole function is fucked, we should probably switch to calling registry.serve() directly\n\t// Start server\n\tconst port = await getPort();\n\tconst server = honoServe({\n\t\tfetch: router.fetch,\n\t\thostname: \"127.0.0.1\",\n\t\tport,\n\t});\n\tinvariant(\n\t\tnodeWebSocket.injectWebSocket !== undefined,\n\t\t\"should have injectWebSocket\",\n\t);\n\tnodeWebSocket.injectWebSocket(server);\n\tconst endpoint = `http://127.0.0.1:${port}`;\n\n\tlogger().info({ msg: \"test server listening\", port });\n\n\t// Cleanup on test finish\n\tc.onTestFinished(async () => {\n\t\tawait new Promise((resolve) => server.close(() => resolve(undefined)));\n\t});\n\n\t// Create client\n\tconst client = createClient<A>({\n\t\tendpoint,\n\t\tnamespace: \"default\",\n\t\trunnerName: \"default\",\n\t});\n\tc.onTestFinished(async () => await client.dispose());\n\n\treturn { client };\n}\n\nexport async function getPort(): Promise<number> {\n\t// Pick random port between 10000 and 65535 (avoiding well-known and registered ports)\n\tconst MIN_PORT = 10000;\n\tconst MAX_PORT = 65535;\n\tconst getRandomPort = () =>\n\t\tMath.floor(Math.random() * (MAX_PORT - MIN_PORT + 1)) + MIN_PORT;\n\n\tlet port = getRandomPort();\n\tlet maxAttempts = 10;\n\n\twhile (maxAttempts > 0) {\n\t\ttry {\n\t\t\t// Try to create a server on the port to check if it's available\n\t\t\tconst server = await new Promise<any>((resolve, reject) => {\n\t\t\t\tconst server = createServer();\n\n\t\t\t\tserver.once(\"error\", (err: Error & { code?: string }) => {\n\t\t\t\t\tif (err.code === \"EADDRINUSE\") {\n\t\t\t\t\t\treject(new Error(`Port ${port} is in use`));\n\t\t\t\t\t} else {\n\t\t\t\t\t\treject(err);\n\t\t\t\t\t}\n\t\t\t\t});\n\n\t\t\t\tserver.once(\"listening\", () => {\n\t\t\t\t\tresolve(server);\n\t\t\t\t});\n\n\t\t\t\tserver.listen(port);\n\t\t\t});\n\n\t\t\t// Close the server since we're just checking availability\n\t\t\tawait new Promise<void>((resolve) => {\n\t\t\t\tserver.close(() => resolve());\n\t\t\t});\n\n\t\t\treturn port;\n\t\t} catch (err) {\n\t\t\t// If port is in use, try a different one\n\t\t\tmaxAttempts--;\n\t\t\tif (maxAttempts <= 0) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tport = getRandomPort();\n\t\t}\n\t}\n\n\tthrow new Error(\"Could not find an available port after multiple attempts\");\n}\n","import { getLogger } from \"@/common/log\";\n\nexport function logger() {\n\treturn getLogger(\"test\");\n}\n"]}
+{"version":3,"sources":["/home/runner/work/rivet/rivet/rivetkit-typescript/packages/rivetkit/dist/tsup/chunk-MZPYVTVG.cjs","../../src/test/mod.ts","../../src/test/log.ts"],"names":[],"mappings":"AAAA;AACE;AACF,wDAA6B;AAC7B;AACE;AACF,wDAA6B;AAC7B;AACE;AACF,wDAA6B;AAC7B;AACE;AACF,wDAA6B;AAC7B;AACA;ACbA,0BAA6B;AAC7B,+CAAmC;AACnC,uCAAoC;AACpC,4FAAsB;ADetB;AACA;AEjBO,SAAS,MAAA,CAAA,EAAS;AACxB,EAAA,OAAO,yCAAA,MAAgB,CAAA;AACxB;AFmBA;AACA;ACNA,MAAA,SAAsB,SAAA,CACrB,CAAA,EACA,QAAA,EAC8B;AArB/B,EAAA,IAAA,EAAA;AAuBC,EAAA,QAAA,CAAS,MAAA,CAAO,KAAA,EAAO,EAAE,GAAG,QAAA,CAAS,MAAA,CAAO,IAAA,EAAM,OAAA,EAAS,KAAK,CAAA;AAGhE,EAAA,MAAM,OAAA,EAAS,MAAM,8DAAA;AAAA,IACpB,IAAA;AAAA,IACA,CAAA,mBAAA,EAAsB,MAAA,CAAO,UAAA,CAAW,CAAC,CAAA;AAAA,EAAA;AAK1C,EAAA;AACA,EAAA;AACA,EAAA;AAA4B,IAAA;AAClB,IAAA;AACI,EAAA;AAId,EAAA;AACA,EAAA;AACA,EAAA;AAKA,EAAA;AAAmB,IAAA;AAClB,IAAA;AACA,IAAA;AACM,EAAA;AAIP,EAAA;AACA,EAAA;AAIA,EAAA;AACA,EAAA;AAAyB,IAAA;AACV,IAAA;AACJ,IAAA;AACV,EAAA;AAED,EAAA;AAAA,IAAA;AACmC,IAAA;AAClC,EAAA;AAED,EAAA;AACA,EAAA;AAEA,EAAA;AAGA,EAAA;AACC,IAAA;AAAqE,EAAA;AAItE,EAAA;AAA+B,IAAA;AAC9B,IAAA;AACW,IAAA;AACC,EAAA;AAEb,EAAA;AAEA,EAAA;AACD;AAEA;AAEC,EAAA;AACA,EAAA;AACA,EAAA;AAGA,EAAA;AACA,EAAA;AAEA,EAAA;AACC,IAAA;AAEC,MAAA;AACC,QAAA;AAEA,QAAA;AACC,UAAA;AACC,YAAA;AAA0C,UAAA;AAE1C,YAAA;AAAU,UAAA;AACX,QAAA;AAGD,QAAA;AACC,UAAA;AAAc,QAAA;AAGf,QAAA;AAAkB,MAAA;AAInB,MAAA;AACC,QAAA;AAA4B,MAAA;AAG7B,MAAA;AAAO,IAAA;AAGP,MAAA;AACA,MAAA;AACC,QAAA;AAAA,MAAA;AAED,MAAA;AAAqB,IAAA;AACtB,EAAA;AAGD,EAAA;AACD;AD/BA;AACA;AACA;AACA;AACA","file":"/home/runner/work/rivet/rivet/rivetkit-typescript/packages/rivetkit/dist/tsup/chunk-MZPYVTVG.cjs","sourcesContent":[null,"import { createServer } from \"node:net\";\nimport { serve as honoServe } from \"@hono/node-server\";\nimport { createNodeWebSocket } from \"@hono/node-ws\";\nimport invariant from \"invariant\";\nimport { type TestContext, vi } from \"vitest\";\nimport { ClientConfigSchema } from \"@/client/config\";\nimport { type Client, createClient } from \"@/client/mod\";\nimport { createFileSystemOrMemoryDriver } from \"@/drivers/file-system/mod\";\nimport { createClientWithDriver, type Registry } from \"@/mod\";\nimport { RegistryConfig, RegistryConfigSchema } from \"@/registry/config\";\nimport { buildManagerRouter } from \"@/manager/router\";\nimport { logger } from \"./log\";\n\nexport interface SetupTestResult<A extends Registry<any>> {\n\tclient: Client<A>;\n}\n\n// Must use `TestContext` since global hooks do not work when running concurrently\nexport async function setupTest<A extends Registry<any>>(\n\tc: TestContext,\n\tregistry: A,\n): Promise<SetupTestResult<A>> {\n\t// Force enable test mode\n\tregistry.config.test = { ...registry.config.test, enabled: true };\n\n\t// Create driver\n\tconst driver = await createFileSystemOrMemoryDriver(\n\t\ttrue,\n\t\t`/tmp/rivetkit-test-${crypto.randomUUID()}`,\n\t);\n\n\t// Build driver config\n\t// biome-ignore lint/style/useConst: Assigned later\n\tlet upgradeWebSocket: any;\n\tregistry.config.driver = driver;\n\tregistry.config.inspector = {\n\t\tenabled: true,\n\t\ttoken: () => \"token\",\n\t};\n\n\t// Create router\n\tconst parsedConfig = registry.parseConfig();\n\tconst managerDriver = driver.manager?.(parsedConfig);\n\tinvariant(managerDriver, \"missing manager driver\");\n\t// const internalClient = createClientWithDriver(\n\t// \tmanagerDriver,\n\t// \tClientConfigSchema.parse({}),\n\t// );\n\tconst { router } = buildManagerRouter(\n\t\tparsedConfig,\n\t\tmanagerDriver,\n\t\t() => upgradeWebSocket!,\n\t);\n\n\t// Inject WebSocket\n\tconst nodeWebSocket = createNodeWebSocket({ app: router });\n\tupgradeWebSocket = nodeWebSocket.upgradeWebSocket;\n\n\t// TODO: I think this whole function is fucked, we should probably switch to calling registry.serve() directly\n\t// Start server\n\tconst port = await getPort();\n\tconst server = honoServe({\n\t\tfetch: router.fetch,\n\t\thostname: \"127.0.0.1\",\n\t\tport,\n\t});\n\tinvariant(\n\t\tnodeWebSocket.injectWebSocket !== undefined,\n\t\t\"should have injectWebSocket\",\n\t);\n\tnodeWebSocket.injectWebSocket(server);\n\tconst endpoint = `http://127.0.0.1:${port}`;\n\n\tlogger().info({ msg: \"test server listening\", port });\n\n\t// Cleanup on test finish\n\tc.onTestFinished(async () => {\n\t\tawait new Promise((resolve) => server.close(() => resolve(undefined)));\n\t});\n\n\t// Create client\n\tconst client = createClient<A>({\n\t\tendpoint,\n\t\tnamespace: \"default\",\n\t\trunnerName: \"default\",\n\t});\n\tc.onTestFinished(async () => await client.dispose());\n\n\treturn { client };\n}\n\nexport async function getPort(): Promise<number> {\n\t// Pick random port between 10000 and 65535 (avoiding well-known and registered ports)\n\tconst MIN_PORT = 10000;\n\tconst MAX_PORT = 65535;\n\tconst getRandomPort = () =>\n\t\tMath.floor(Math.random() * (MAX_PORT - MIN_PORT + 1)) + MIN_PORT;\n\n\tlet port = getRandomPort();\n\tlet maxAttempts = 10;\n\n\twhile (maxAttempts > 0) {\n\t\ttry {\n\t\t\t// Try to create a server on the port to check if it's available\n\t\t\tconst server = await new Promise<any>((resolve, reject) => {\n\t\t\t\tconst server = createServer();\n\n\t\t\t\tserver.once(\"error\", (err: Error & { code?: string }) => {\n\t\t\t\t\tif (err.code === \"EADDRINUSE\") {\n\t\t\t\t\t\treject(new Error(`Port ${port} is in use`));\n\t\t\t\t\t} else {\n\t\t\t\t\t\treject(err);\n\t\t\t\t\t}\n\t\t\t\t});\n\n\t\t\t\tserver.once(\"listening\", () => {\n\t\t\t\t\tresolve(server);\n\t\t\t\t});\n\n\t\t\t\tserver.listen(port);\n\t\t\t});\n\n\t\t\t// Close the server since we're just checking availability\n\t\t\tawait new Promise<void>((resolve) => {\n\t\t\t\tserver.close(() => resolve());\n\t\t\t});\n\n\t\t\treturn port;\n\t\t} catch (err) {\n\t\t\t// If port is in use, try a different one\n\t\t\tmaxAttempts--;\n\t\t\tif (maxAttempts <= 0) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tport = getRandomPort();\n\t\t}\n\t}\n\n\tthrow new Error(\"Could not find an available port after multiple attempts\");\n}\n","import { getLogger } from \"@/common/log\";\n\nexport function logger() {\n\treturn getLogger(\"test\");\n}\n"]}

package/dist/tsup/{chunk-K2RNF2ZR.js → chunk-OJZRCEIA.js}

@@ -1,15 +1,15 @@
 import {
   createFileSystemOrMemoryDriver
-} from "./chunk-UUEZVDRL.js";
+} from "./chunk-T7IPDBWH.js";
 import {
   createClient
-} from "./chunk-EEL32AJM.js";
+} from "./chunk-XU74APB4.js";
 import {
   buildManagerRouter
-} from "./chunk-MIOU6BF3.js";
+} from "./chunk-PVKUXMOA.js";
 import {
   getLogger
-} from "./chunk-4U45T5KW.js";
+} from "./chunk-CDK6DRO2.js";
 
 // src/test/mod.ts
 import { createServer } from "net";
@@ -111,4 +111,4 @@ export {
   setupTest,
   getPort
 };
-//# sourceMappingURL=chunk-K2RNF2ZR.js.map
+//# sourceMappingURL=chunk-OJZRCEIA.js.map

package/dist/tsup/{chunk-WIZ4JGP6.js → chunk-PHCD25XO.js}

@@ -1,6 +1,6 @@
 import {
   getLogger
-} from "./chunk-4U45T5KW.js";
+} from "./chunk-CDK6DRO2.js";
 
 // src/client/log.ts
 function logger() {
@@ -46,4 +46,4 @@ export {
   logger,
   importWebSocket
 };
-//# sourceMappingURL=chunk-WIZ4JGP6.js.map
+//# sourceMappingURL=chunk-PHCD25XO.js.map

package/dist/tsup/{chunk-MIOU6BF3.js → chunk-PVKUXMOA.js}

@@ -31,7 +31,7 @@ import {
   noopNext,
   promiseWithResolvers,
   stringifyError
-} from "./chunk-4U45T5KW.js";
+} from "./chunk-CDK6DRO2.js";
 import {
   ConnStateNotEnabled,
   Forbidden,
@@ -152,12 +152,215 @@ import * as cbor3 from "cbor-x";
 // src/actor/router-endpoints.ts
 import * as cbor2 from "cbor-x";
 
+// src/actor/instance/keys.ts
+var KEYS = {
+  PERSIST_DATA: Uint8Array.from([1]),
+  CONN_PREFIX: Uint8Array.from([2]),
+  // Prefix for connection keys
+  INSPECTOR_TOKEN: Uint8Array.from([3]),
+  // Inspector token key
+  KV: Uint8Array.from([4])
+  // Prefix for user-facing KV storage
+};
+function makePrefixedKey(key) {
+  const prefixed = new Uint8Array(KEYS.KV.length + key.length);
+  prefixed.set(KEYS.KV, 0);
+  prefixed.set(key, KEYS.KV.length);
+  return prefixed;
+}
+function removePrefixFromKey(prefixedKey) {
+  return prefixedKey.slice(KEYS.KV.length);
+}
+function makeConnKey(connId) {
+  const encoder = new TextEncoder();
+  const connIdBytes = encoder.encode(connId);
+  const key = new Uint8Array(KEYS.CONN_PREFIX.length + connIdBytes.length);
+  key.set(KEYS.CONN_PREFIX, 0);
+  key.set(connIdBytes, KEYS.CONN_PREFIX.length);
+  return key;
+}
+
+// src/actor/instance/kv.ts
+var textEncoder = new TextEncoder();
+var textDecoder = new TextDecoder();
+function encodeKey(key, keyType) {
+  if (key instanceof Uint8Array) {
+    return key;
+  }
+  const resolvedKeyType = keyType ?? "text";
+  if (resolvedKeyType === "binary") {
+    throw new TypeError("Expected a Uint8Array when keyType is binary");
+  }
+  return textEncoder.encode(key);
+}
+function decodeKey(key, keyType) {
+  const resolvedKeyType = keyType ?? "text";
+  switch (resolvedKeyType) {
+    case "text":
+      return textDecoder.decode(key);
+    case "binary":
+      return key;
+    default:
+      throw new TypeError("Invalid kv key type");
+  }
+}
+function resolveValueType(value) {
+  if (typeof value === "string") {
+    return "text";
+  }
+  if (value instanceof Uint8Array) {
+    return "binary";
+  }
+  if (value instanceof ArrayBuffer) {
+    return "arrayBuffer";
+  }
+  throw new TypeError("Invalid kv value");
+}
+function encodeValue(value, options) {
+  const type = (options == null ? void 0 : options.type) ?? resolveValueType(value);
+  switch (type) {
+    case "text":
+      if (typeof value !== "string") {
+        throw new TypeError("Expected a string when type is text");
+      }
+      return textEncoder.encode(value);
+    case "arrayBuffer":
+      if (!(value instanceof ArrayBuffer)) {
+        throw new TypeError("Expected an ArrayBuffer when type is arrayBuffer");
+      }
+      return new Uint8Array(value);
+    case "binary":
+      if (!(value instanceof Uint8Array)) {
+        throw new TypeError("Expected a Uint8Array when type is binary");
+      }
+      return value;
+    default:
+      throw new TypeError("Invalid kv value type");
+  }
+}
+function decodeValue(value, options) {
+  const type = (options == null ? void 0 : options.type) ?? "text";
+  switch (type) {
+    case "text":
+      return textDecoder.decode(value);
+    case "arrayBuffer": {
+      const copy = new Uint8Array(value.byteLength);
+      copy.set(value);
+      return copy.buffer;
+    }
+    case "binary":
+      return value;
+    default:
+      throw new TypeError("Invalid kv value type");
+  }
+}
+var ActorKv = class {
+  #driver;
+  #actorId;
+  constructor(driver, actorId) {
+    this.#driver = driver;
+    this.#actorId = actorId;
+  }
+  /**
+   * Get a single value by key.
+   */
+  async get(key, options) {
+    const results = await this.#driver.kvBatchGet(this.#actorId, [
+      makePrefixedKey(encodeKey(key))
+    ]);
+    const result = results[0];
+    if (!result) {
+      return null;
+    }
+    return decodeValue(result, options);
+  }
+  /**
+   * Get multiple values by keys.
+   */
+  async getBatch(keys, options) {
+    const prefixedKeys = keys.map(
+      (key) => makePrefixedKey(encodeKey(key))
+    );
+    const results = await this.#driver.kvBatchGet(
+      this.#actorId,
+      prefixedKeys
+    );
+    return results.map(
+      (result) => result ? decodeValue(result, options) : null
+    );
+  }
+  /**
+   * Put a single key-value pair.
+   */
+  async put(key, value, options) {
+    await this.#driver.kvBatchPut(this.#actorId, [
+      [makePrefixedKey(encodeKey(key)), encodeValue(value, options)]
+    ]);
+  }
+  /**
+   * Put multiple key-value pairs.
+   */
+  async putBatch(entries, options) {
+    const prefixedEntries = entries.map(
+      ([key, value]) => [
+        makePrefixedKey(encodeKey(key)),
+        encodeValue(value, options)
+      ]
+    );
+    await this.#driver.kvBatchPut(this.#actorId, prefixedEntries);
+  }
+  /**
+   * Delete a single key.
+   */
+  async delete(key) {
+    await this.#driver.kvBatchDelete(this.#actorId, [
+      makePrefixedKey(encodeKey(key))
+    ]);
+  }
+  /**
+   * Delete multiple keys.
+   */
+  async deleteBatch(keys) {
+    const prefixedKeys = keys.map(
+      (key) => makePrefixedKey(encodeKey(key))
+    );
+    await this.#driver.kvBatchDelete(this.#actorId, prefixedKeys);
+  }
+  /**
+   * List all keys with a given prefix.
+   * Returns key-value pairs where keys have the user prefix removed.
+   */
+  async list(prefix, options) {
+    const prefixedPrefix = makePrefixedKey(
+      encodeKey(prefix, options == null ? void 0 : options.keyType)
+    );
+    const results = await this.#driver.kvListPrefix(
+      this.#actorId,
+      prefixedPrefix
+    );
+    return results.map(([key, value]) => [
+      decodeKey(removePrefixFromKey(key), options == null ? void 0 : options.keyType),
+      decodeValue(value, options)
+    ]);
+  }
+};
+
 // src/actor/contexts/base/actor.ts
 var ActorContext = class {
   #actor;
+  #kv;
   constructor(actor) {
     this.#actor = actor;
   }
+  /**
+   * Gets the KV storage interface.
+   */
+  get kv() {
+    if (!this.#kv) {
+      this.#kv = new ActorKv(this.#actor.driver, this.#actor.id);
+    }
+    return this.#kv;
+  }
   /**
    * Get the actor state
    *
@@ -3338,7 +3541,7 @@ function parseWebSocketProtocols(protocols) {
       }
     }
   }
-  const encoding = EncodingSchema.parse(encodingRaw);
+  const encoding = EncodingSchema.parse(encodingRaw ?? "json");
   const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : void 0;
   return { encoding, connParams };
 }
@@ -4200,23 +4403,6 @@ function createApiActor(actor) {
 // src/driver-helpers/utils.ts
 import * as cbor7 from "cbor-x";
 
-// src/actor/instance/kv.ts
-var KEYS = {
-  PERSIST_DATA: Uint8Array.from([1]),
-  CONN_PREFIX: Uint8Array.from([2]),
-  // Prefix for connection keys
-  INSPECTOR_TOKEN: Uint8Array.from([3])
-  // Inspector token key
-};
-function makeConnKey(connId) {
-  const encoder = new TextEncoder();
-  const connIdBytes = encoder.encode(connId);
-  const key = new Uint8Array(KEYS.CONN_PREFIX.length + connIdBytes.length);
-  key.set(KEYS.CONN_PREFIX, 0);
-  key.set(connIdBytes, KEYS.CONN_PREFIX.length);
-  return key;
-}
-
 // src/schemas/actor-persist/versioned.ts
 import { createVersionedDataHandler as createVersionedDataHandler2 } from "vbare";
 
@@ -4936,6 +5122,9 @@ export {
   CONN_STATE_MANAGER_SYMBOL,
   CONN_SEND_MESSAGE_SYMBOL,
   Conn,
+  KEYS,
+  makeConnKey,
+  ActorKv,
   ActorContext,
   ActionContext,
   CURRENT_VERSION2,
@@ -4951,8 +5140,6 @@ export {
   getValueLength,
   inputDataToBuffer,
   processMessage,
-  KEYS,
-  makeConnKey,
   PATH_CONNECT,
   PATH_WEBSOCKET_BASE,
   PATH_WEBSOCKET_PREFIX,
@@ -4999,4 +5186,4 @@ export {
   buildManagerRouter,
   getInitialActorKvState
 };
-//# sourceMappingURL=chunk-MIOU6BF3.js.map
+//# sourceMappingURL=chunk-PVKUXMOA.js.map