@rivetkit/cloudflare-workers 2.0.33 → 2.0.34-rc.2

package/dist/mod.d.cts

@@ -1,7 +1,7 @@
-import { Client, Registry, RunConfig, ActorKey } from 'rivetkit';
+import { Client, Registry, ActorKey } from 'rivetkit';
 export { Client } from 'rivetkit';
 import { DurableObject } from 'cloudflare:workers';
-import * as rivetkit_log from 'rivetkit/log';
+import { GetUpgradeWebSocket } from 'rivetkit/utils';
 import { z } from 'zod';
 
 interface DriverContext {
@@ -9,64 +9,9 @@ interface DriverContext {
 }
 
 declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
-    maxIncomingMessageSize: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    maxOutgoingMessageSize: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    inspector: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        enabled: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodObject<{
-            actor: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-            manager: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        }, z.core.$strip>]>>>;
-        token: z.ZodDefault<z.ZodOptional<z.ZodCustom<() => string, () => string>>>;
-        defaultEndpoint: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>>>;
-    disableDefaultServer: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    defaultServerPort: z.ZodDefault<z.ZodNumber>;
-    runEngine: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    runEngineVersion: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    overrideServerAddress: z.ZodOptional<z.ZodString>;
-    disableActorDriver: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    runnerKind: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
-        serverless: "serverless";
-        normal: "normal";
-    }>>>;
-    basePath: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    noWelcome: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    logging: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        baseLogger: z.ZodOptional<z.ZodCustom<rivetkit_log.Logger, rivetkit_log.Logger>>;
-        level: z.ZodOptional<z.ZodEnum<{
-            error: "error";
-            trace: "trace";
-            fatal: "fatal";
-            warn: "warn";
-            info: "info";
-            debug: "debug";
-            silent: "silent";
-        }>>;
-    }, z.core.$strip>>>;
-    autoConfigureServerless: z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodObject<{
-        url: z.ZodOptional<z.ZodString>;
-        headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-        maxRunners: z.ZodOptional<z.ZodNumber>;
-        minRunners: z.ZodOptional<z.ZodNumber>;
-        requestLifespan: z.ZodOptional<z.ZodNumber>;
-        runnersMargin: z.ZodOptional<z.ZodNumber>;
-        slotsPerRunner: z.ZodOptional<z.ZodNumber>;
-        metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-    }, z.core.$strip>]>>;
-    runnerKey: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
-    totalSlots: z.ZodDefault<z.ZodNumber>;
-    endpoint: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
-    token: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
-    namespace: z.ZodDefault<z.ZodString>;
-    runnerName: z.ZodDefault<z.ZodString>;
-    encoding: z.ZodDefault<z.ZodEnum<{
-        json: "json";
-        cbor: "cbor";
-        bare: "bare";
-    }>>;
-    headers: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
-    disableMetadataLookup: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     managerPath: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    runnerKey: z.ZodOptional<z.ZodString>;
+    noWelcome: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     fetch: z.ZodOptional<z.ZodCustom<ExportedHandlerFetchHandler<{
         RIVET: Client<any>;
     }, unknown>, ExportedHandlerFetchHandler<{
@@ -98,14 +43,14 @@ interface HandlerOutput {
  *
  * If you want to expose a public manager API, either:
  *
- * - Use `createHandler` to expose the Rivet API on `/rivet`
+ * - Use `createHandler` to expose the Rivet API on `/api/rivet`
  * - Forward Rivet API requests to `InlineOutput::fetch`
  */
 declare function createInlineClient<R extends Registry<any>>(registry: R, inputConfig?: InputConfig): InlineOutput<R>;
 /**
  * Creates a handler to be exported from a Cloudflare Worker.
  *
- * This will automatically expose the Rivet manager API on `/rivet`.
+ * This will automatically expose the Rivet manager API on `/api/rivet`.
  *
  * This includes a `fetch` handler and `ActorHandler` Durable Object.
  */
@@ -119,6 +64,7 @@ interface ActorHandlerInterface extends DurableObject {
         key: ActorKey;
         destroying: boolean;
     } | undefined>;
+    managerKvGet(key: Uint8Array): Promise<Uint8Array | null>;
 }
 interface ActorInitRequest {
     name: string;
@@ -137,6 +83,6 @@ type ActorInitResponse = {
     };
 };
 type DurableObjectConstructor = new (...args: ConstructorParameters<typeof DurableObject<Bindings>>) => DurableObject<Bindings>;
-declare function createActorDurableObject(registry: Registry<any>, rootRunConfig: RunConfig): DurableObjectConstructor;
+declare function createActorDurableObject(registry: Registry<any>, getUpgradeWebSocket: GetUpgradeWebSocket): DurableObjectConstructor;
 
 export { type Bindings, type InputConfig as Config, type DriverContext, type HandlerOutput, type InlineOutput, createActorDurableObject, createHandler, createInlineClient };

package/dist/mod.d.ts

@@ -1,7 +1,7 @@
-import { Client, Registry, RunConfig, ActorKey } from 'rivetkit';
+import { Client, Registry, ActorKey } from 'rivetkit';
 export { Client } from 'rivetkit';
 import { DurableObject } from 'cloudflare:workers';
-import * as rivetkit_log from 'rivetkit/log';
+import { GetUpgradeWebSocket } from 'rivetkit/utils';
 import { z } from 'zod';
 
 interface DriverContext {
@@ -9,64 +9,9 @@ interface DriverContext {
 }
 
 declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
-    maxIncomingMessageSize: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    maxOutgoingMessageSize: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    inspector: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        enabled: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodObject<{
-            actor: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-            manager: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        }, z.core.$strip>]>>>;
-        token: z.ZodDefault<z.ZodOptional<z.ZodCustom<() => string, () => string>>>;
-        defaultEndpoint: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>>>;
-    disableDefaultServer: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    defaultServerPort: z.ZodDefault<z.ZodNumber>;
-    runEngine: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    runEngineVersion: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    overrideServerAddress: z.ZodOptional<z.ZodString>;
-    disableActorDriver: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    runnerKind: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
-        serverless: "serverless";
-        normal: "normal";
-    }>>>;
-    basePath: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    noWelcome: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    logging: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        baseLogger: z.ZodOptional<z.ZodCustom<rivetkit_log.Logger, rivetkit_log.Logger>>;
-        level: z.ZodOptional<z.ZodEnum<{
-            error: "error";
-            trace: "trace";
-            fatal: "fatal";
-            warn: "warn";
-            info: "info";
-            debug: "debug";
-            silent: "silent";
-        }>>;
-    }, z.core.$strip>>>;
-    autoConfigureServerless: z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodObject<{
-        url: z.ZodOptional<z.ZodString>;
-        headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-        maxRunners: z.ZodOptional<z.ZodNumber>;
-        minRunners: z.ZodOptional<z.ZodNumber>;
-        requestLifespan: z.ZodOptional<z.ZodNumber>;
-        runnersMargin: z.ZodOptional<z.ZodNumber>;
-        slotsPerRunner: z.ZodOptional<z.ZodNumber>;
-        metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-    }, z.core.$strip>]>>;
-    runnerKey: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
-    totalSlots: z.ZodDefault<z.ZodNumber>;
-    endpoint: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
-    token: z.ZodPipe<z.ZodOptional<z.ZodString>, z.ZodTransform<string | undefined, string | undefined>>;
-    namespace: z.ZodDefault<z.ZodString>;
-    runnerName: z.ZodDefault<z.ZodString>;
-    encoding: z.ZodDefault<z.ZodEnum<{
-        json: "json";
-        cbor: "cbor";
-        bare: "bare";
-    }>>;
-    headers: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
-    disableMetadataLookup: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     managerPath: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    runnerKey: z.ZodOptional<z.ZodString>;
+    noWelcome: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     fetch: z.ZodOptional<z.ZodCustom<ExportedHandlerFetchHandler<{
         RIVET: Client<any>;
     }, unknown>, ExportedHandlerFetchHandler<{
@@ -98,14 +43,14 @@ interface HandlerOutput {
  *
  * If you want to expose a public manager API, either:
  *
- * - Use `createHandler` to expose the Rivet API on `/rivet`
+ * - Use `createHandler` to expose the Rivet API on `/api/rivet`
  * - Forward Rivet API requests to `InlineOutput::fetch`
  */
 declare function createInlineClient<R extends Registry<any>>(registry: R, inputConfig?: InputConfig): InlineOutput<R>;
 /**
  * Creates a handler to be exported from a Cloudflare Worker.
  *
- * This will automatically expose the Rivet manager API on `/rivet`.
+ * This will automatically expose the Rivet manager API on `/api/rivet`.
  *
  * This includes a `fetch` handler and `ActorHandler` Durable Object.
  */
@@ -119,6 +64,7 @@ interface ActorHandlerInterface extends DurableObject {
         key: ActorKey;
         destroying: boolean;
     } | undefined>;
+    managerKvGet(key: Uint8Array): Promise<Uint8Array | null>;
 }
 interface ActorInitRequest {
     name: string;
@@ -137,6 +83,6 @@ type ActorInitResponse = {
     };
 };
 type DurableObjectConstructor = new (...args: ConstructorParameters<typeof DurableObject<Bindings>>) => DurableObject<Bindings>;
-declare function createActorDurableObject(registry: Registry<any>, rootRunConfig: RunConfig): DurableObjectConstructor;
+declare function createActorDurableObject(registry: Registry<any>, getUpgradeWebSocket: GetUpgradeWebSocket): DurableObjectConstructor;
 
 export { type Bindings, type InputConfig as Config, type DriverContext, type HandlerOutput, type InlineOutput, createActorDurableObject, createHandler, createInlineClient };

package/dist/mod.js

@@ -1,7 +1,7 @@
 // src/actor-handler-do.ts
 import { DurableObject, env as env2 } from "cloudflare:workers";
 import invariant2 from "invariant";
-import { createActorRouter, createClientWithDriver } from "rivetkit";
+import { createActorRouter, createClientWithDriver as createClientWithDriver2 } from "rivetkit";
 import { getInitialActorKvState } from "rivetkit/driver-helpers";
 
 // src/actor-driver.ts
@@ -9,23 +9,6 @@ import invariant from "invariant";
 import { lookupInRegistry } from "rivetkit";
 import { promiseWithResolvers } from "rivetkit/utils";
 
-// src/actor-id.ts
-function buildActorId(doId, generation) {
-  return `${doId}:${generation}`;
-}
-function parseActorId(actorId) {
-  const parts = actorId.split(":");
-  if (parts.length !== 2) {
-    throw new Error(`Invalid actor ID format: ${actorId}`);
-  }
-  const [doId, generationStr] = parts;
-  const generation = parseInt(generationStr, 10);
-  if (Number.isNaN(generation)) {
-    throw new Error(`Invalid generation number in actor ID: ${actorId}`);
-  }
-  return [doId, generation];
-}
-
 // src/actor-kv.ts
 function kvGet(sql, key) {
   const cursor = sql.exec(
@@ -89,13 +72,18 @@ var GLOBAL_KV_KEYS = {
 
 // src/handler.ts
 import { env } from "cloudflare:workers";
+import { createClientWithDriver } from "rivetkit";
+import { buildManagerRouter } from "rivetkit/driver-helpers";
 
 // src/config.ts
-import { RunConfigSchema } from "rivetkit/driver-helpers";
 import { z } from "zod";
-var ConfigSchemaBase = RunConfigSchema.removeDefault().omit({ driver: true, getUpgradeWebSocket: true }).extend({
+var ConfigSchemaBase = z.object({
   /** Path that the Rivet manager API will be mounted. */
-  managerPath: z.string().optional().default("/rivet"),
+  managerPath: z.string().optional().default("/api/rivet"),
+  /** Runner key for authentication. */
+  runnerKey: z.string().optional(),
+  /** Disable the welcome message. */
+  noWelcome: z.boolean().optional().default(false),
   fetch: z.custom().optional()
 });
 var ConfigSchema = ConfigSchemaBase.default(
@@ -104,7 +92,6 @@ var ConfigSchema = ConfigSchemaBase.default(
 
 // src/manager-driver.ts
 import {
-  generateRandomString,
   WS_PROTOCOL_ACTOR,
   WS_PROTOCOL_CONN_PARAMS,
   WS_PROTOCOL_ENCODING,
@@ -118,6 +105,23 @@ import {
 } from "rivetkit/errors";
 import { assertUnreachable } from "rivetkit/utils";
 
+// src/actor-id.ts
+function buildActorId(doId, generation) {
+  return `${doId}:${generation}`;
+}
+function parseActorId(actorId) {
+  const parts = actorId.split(":");
+  if (parts.length !== 2) {
+    throw new Error(`Invalid actor ID format: ${actorId}`);
+  }
+  const [doId, generationStr] = parts;
+  const generation = parseInt(generationStr, 10);
+  if (Number.isNaN(generation)) {
+    throw new Error(`Invalid generation number in actor ID: ${actorId}`);
+  }
+  return [doId, generation];
+}
+
 // src/log.ts
 import { getLogger } from "rivetkit/log";
 function logger() {
@@ -229,6 +233,7 @@ Response: ${await response.text()}`
     return webSocket;
   }
   async proxyRequest(c, actorRequest, actorId) {
+    const env3 = getCloudflareAmbientEnv();
     const [doId] = parseActorId(actorId);
     logger().debug({
       msg: "forwarding request to durable object",
@@ -237,8 +242,8 @@ Response: ${await response.text()}`
       method: actorRequest.method,
       url: actorRequest.url
     });
-    const id = c.env.ACTOR_DO.idFromString(doId);
-    const stub = c.env.ACTOR_DO.get(id);
+    const id = env3.ACTOR_DO.idFromString(doId);
+    const stub = env3.ACTOR_DO.get(id);
     return await stub.fetch(actorRequest);
   }
   async proxyWebSocket(c, path, actorId, encoding, params) {
@@ -283,13 +288,15 @@ Response: ${await response.text()}`
       "sec-websocket-protocol",
       protocols.join(", ")
     );
+    const env3 = getCloudflareAmbientEnv();
     const [doId] = parseActorId(actorId);
-    const id = c.env.ACTOR_DO.idFromString(doId);
-    const stub = c.env.ACTOR_DO.get(id);
+    const id = env3.ACTOR_DO.idFromString(doId);
+    const stub = env3.ACTOR_DO.get(id);
     return await stub.fetch(actorRequest);
   }
   async getForId({
     c,
+    name,
     actorId
   }) {
     const env3 = getCloudflareAmbientEnv();
@@ -434,12 +441,20 @@ Response: ${await response.text()}`
   }
   displayInformation() {
     return {
-      name: "Cloudflare Workers",
-      properties: {}
+      properties: {
+        Driver: "Cloudflare Workers"
+      }
     };
   }
-  getOrCreateInspectorAccessToken() {
-    return generateRandomString();
+  setGetUpgradeWebSocket() {
+  }
+  async kvGet(actorId, key) {
+    const env3 = getCloudflareAmbientEnv();
+    const [doId] = parseActorId(actorId);
+    const id = env3.ACTOR_DO.idFromString(doId);
+    const stub = env3.ACTOR_DO.get(id);
+    const value = await stub.managerKvGet(key);
+    return value !== null ? new TextDecoder().decode(value) : null;
   }
 };
 
@@ -515,19 +530,25 @@ function getCloudflareAmbientEnv() {
 function createInlineClient(registry, inputConfig) {
   inputConfig = { ...inputConfig, runnerKey: "" };
   const config = ConfigSchema.parse(inputConfig);
-  const runConfig = {
-    ...config,
-    driver: {
-      name: "cloudflare-workers",
-      manager: () => new CloudflareActorsManagerDriver(),
-      // HACK: We can't build the actor driver until we're inside the Durable Object
-      actor: void 0
-    },
-    getUpgradeWebSocket: () => upgradeWebSocket
+  const ActorHandler = createActorDurableObject(
+    registry,
+    () => upgradeWebSocket
+  );
+  registry.config.noWelcome = true;
+  registry.config.inspector = {
+    enabled: false,
+    token: () => ""
   };
-  const ActorHandler = createActorDurableObject(registry, runConfig);
-  const { client, fetch } = registry.start(runConfig);
-  return { client, fetch, config, ActorHandler };
+  registry.config.managerBasePath = "/";
+  const parsedConfig = registry.parseConfig();
+  const managerDriver = new CloudflareActorsManagerDriver();
+  const { router } = buildManagerRouter(
+    parsedConfig,
+    managerDriver,
+    () => upgradeWebSocket
+  );
+  const client = createClientWithDriver(managerDriver);
+  return { client, fetch: router.fetch.bind(router), config, ActorHandler };
 }
 function createHandler(registry, inputConfig) {
   const { client, fetch, config, ActorHandler } = createInlineClient(
@@ -550,7 +571,7 @@ function createHandler(registry, inputConfig) {
         return config.fetch(request, env3, ctx);
       } else {
         return new Response(
-          "This is a RivetKit server.\n\nLearn more at https://rivetkit.org\n",
+          "This is a RivetKit server.\n\nLearn more at https://rivet.dev\n",
           { status: 200 }
         );
       }
@@ -608,13 +629,11 @@ var ActorGlobalState = class {
 };
 var CloudflareActorsActorDriver = class {
   #registryConfig;
-  #runConfig;
   #managerDriver;
   #inlineClient;
   #globalState;
-  constructor(registryConfig, runConfig, managerDriver, inlineClient, globalState) {
+  constructor(registryConfig, managerDriver, inlineClient, globalState) {
     this.#registryConfig = registryConfig;
-    this.#runConfig = runConfig;
     this.#managerDriver = managerDriver;
     this.#inlineClient = inlineClient;
     this.#globalState = globalState;
@@ -746,10 +765,9 @@ var CloudflareActorsActorDriver = class {
   }
 };
 function createCloudflareActorsActorDriverBuilder(globalState) {
-  return (registryConfig, runConfig, managerDriver, inlineClient) => {
+  return (config, managerDriver, inlineClient) => {
     return new CloudflareActorsActorDriver(
-      registryConfig,
-      runConfig,
+      config,
       managerDriver,
       inlineClient,
       globalState
@@ -758,9 +776,9 @@ function createCloudflareActorsActorDriverBuilder(globalState) {
 }
 
 // src/actor-handler-do.ts
-function createActorDurableObject(registry, rootRunConfig) {
+function createActorDurableObject(registry, getUpgradeWebSocket) {
   const globalState = new CloudflareDurableObjectGlobalState();
-  const runConfig = Object.assign({}, rootRunConfig, { role: "runner" });
+  const parsedConfig = registry.parseConfig();
   return class ActorHandler extends DurableObject {
     /**
      * This holds a strong reference to ActorGlobalState.
@@ -794,7 +812,7 @@ function createActorDurableObject(registry, rootRunConfig) {
       }
     }
     async #loadActor() {
-      var _a;
+      var _a, _b;
       invariant2(this.#state, "State should be initialized");
       if (!this.#state.initialized) {
         const cursor = this.ctx.storage.sql.exec(
@@ -835,26 +853,19 @@ function createActorDurableObject(registry, rootRunConfig) {
       if (!this.#state.initialized) throw new Error("Not initialized");
       const actorId = this.ctx.id.toString();
       globalState.setDOState(actorId, { ctx: this.ctx, env: env2 });
-      invariant2(runConfig.driver, "runConfig.driver");
-      runConfig.driver.actor = createCloudflareActorsActorDriverBuilder(globalState);
-      const managerDriver = runConfig.driver.manager(
-        registry.config,
-        runConfig
-      );
-      const inlineClient = createClientWithDriver(
-        managerDriver,
-        runConfig
-      );
-      const actorDriver = runConfig.driver.actor(
-        registry.config,
-        runConfig,
+      const managerDriver = new CloudflareActorsManagerDriver();
+      const inlineClient = createClientWithDriver2(managerDriver);
+      const actorDriverBuilder = createCloudflareActorsActorDriverBuilder(globalState);
+      const actorDriver = actorDriverBuilder(
+        parsedConfig,
         managerDriver,
         inlineClient
       );
       const actorRouter = createActorRouter(
-        runConfig,
+        parsedConfig,
         actorDriver,
-        false
+        getUpgradeWebSocket,
+        ((_b = registry.config.test) == null ? void 0 : _b.enabled) ?? false
       );
       this.#state.actor = {
         actorRouter,
@@ -907,6 +918,10 @@ function createActorDurableObject(registry, rootRunConfig) {
       });
       return void 0;
     }
+    /** RPC called by ManagerDriver.kvGet to read from KV. */
+    async managerKvGet(key) {
+      return kvGet(this.ctx.storage.sql, key);
+    }
     /** RPC called by the manager to create a DO. Can optionally allow existing actors. */
     async create(req) {
       const checkCursor = this.ctx.storage.sql.exec(