@rivetkit/cloudflare-workers 2.0.3 → 2.0.5

package/dist/mod.d.cts

@@ -1,12 +1,11 @@
-import * as hono_types from 'hono/types';
+import * as rivetkit from 'rivetkit';
+import { Client, ActorKey, Registry } from 'rivetkit';
+export { Client } from 'rivetkit';
+import * as rivetkit_log from 'rivetkit/log';
 import * as hono from 'hono';
-import { Hono } from 'hono';
-import * as rivetkit_utils from 'rivetkit/utils';
 import * as rivetkit_driver_helpers from 'rivetkit/driver-helpers';
-import * as rivetkit from 'rivetkit';
-import { ActorKey, Registry } from 'rivetkit';
+import * as rivetkit_utils from 'rivetkit/utils';
 import { z } from 'zod';
-import { Client } from 'rivetkit/client';
 import { DurableObject } from 'cloudflare:workers';
 
 interface DriverContext {
@@ -14,6 +13,23 @@ interface DriverContext {
 }
 
 declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
+    api: z.ZodDefault<z.ZodObject<{
+        host: z.ZodDefault<z.ZodString>;
+        port: z.ZodDefault<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        host: string;
+        port: number;
+    }, {
+        host?: string | undefined;
+        port?: number | undefined;
+    }>>;
+    endpoint: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    namespace: z.ZodDefault<z.ZodString>;
+    runnerName: z.ZodDefault<z.ZodString>;
+    encoding: z.ZodDefault<z.ZodEnum<["json", "cbor", "bare"]>>;
+    transport: z.ZodDefault<z.ZodEnum<["websocket", "sse"]>>;
+    getUpgradeWebSocket: z.ZodOptional<z.ZodType<() => rivetkit_utils.UpgradeWebSocket, z.ZodTypeDef, () => rivetkit_utils.UpgradeWebSocket>>;
+} & {
     driver: z.ZodOptional<z.ZodObject<{
         name: z.ZodString;
         manager: z.ZodType<(registryConfig: rivetkit.RegistryConfig, runConfig: rivetkit.RunConfig) => rivetkit_driver_helpers.ManagerDriver, z.ZodTypeDef, (registryConfig: rivetkit.RegistryConfig, runConfig: rivetkit.RunConfig) => rivetkit_driver_helpers.ManagerDriver>;
@@ -27,9 +43,6 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         name: string;
         manager: (registryConfig: rivetkit.RegistryConfig, runConfig: rivetkit.RunConfig) => rivetkit_driver_helpers.ManagerDriver;
     }>>;
-    engine: z.ZodOptional<z.ZodString>;
-    getUpgradeWebSocket: z.ZodOptional<z.ZodType<() => rivetkit_utils.UpgradeWebSocket, z.ZodTypeDef, () => rivetkit_utils.UpgradeWebSocket>>;
-    role: z.ZodDefault<z.ZodOptional<z.ZodEnum<["all", "server", "runner"]>>>;
     cors: z.ZodOptional<z.ZodType<{
         origin: string | string[] | ((origin: string, c: hono.Context) => string | undefined | null);
         allowMethods?: string[] | ((origin: string, c: hono.Context) => string[]);
@@ -90,11 +103,38 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         token?: ((...args: unknown[]) => string) | undefined;
         defaultEndpoint?: string | undefined;
     }>>>;
+    disableServer: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    disableActorDriver: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     basePath: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-}, "driver" | "getUpgradeWebSocket"> & {
-    app: z.ZodOptional<z.ZodType<Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">, z.ZodTypeDef, Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">>>;
+    noWelcome: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    logging: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        baseLogger: z.ZodOptional<z.ZodType<rivetkit_log.Logger, z.ZodTypeDef, rivetkit_log.Logger>>;
+        level: z.ZodOptional<z.ZodEnum<["trace", "debug", "info", "warn", "error", "fatal", "silent"]>>;
+    }, "strip", z.ZodTypeAny, {
+        level?: "error" | "trace" | "fatal" | "warn" | "info" | "debug" | "silent" | undefined;
+        baseLogger?: rivetkit_log.Logger | undefined;
+    }, {
+        level?: "error" | "trace" | "fatal" | "warn" | "info" | "debug" | "silent" | undefined;
+        baseLogger?: rivetkit_log.Logger | undefined;
+    }>>>;
+}, "getUpgradeWebSocket" | "driver"> & {
+    /** Path that the Rivet manager API will be mounted. */
+    managerPath: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    fetch: z.ZodOptional<z.ZodType<ExportedHandlerFetchHandler<{
+        RIVET: Client<any>;
+    }, unknown>, z.ZodTypeDef, ExportedHandlerFetchHandler<{
+        RIVET: Client<any>;
+    }, unknown>>>;
 }, "strip", z.ZodTypeAny, {
-    role: "all" | "server" | "runner";
+    api: {
+        host: string;
+        port: number;
+    };
+    endpoint: string | null;
+    namespace: string;
+    runnerName: string;
+    encoding: "json" | "cbor" | "bare";
+    transport: "websocket" | "sse";
     maxIncomingMessageSize: number;
     inspector: {
         enabled: boolean;
@@ -109,8 +149,15 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         token: (...args: unknown[]) => string;
         defaultEndpoint?: string | undefined;
     };
+    disableServer: boolean;
+    disableActorDriver: boolean;
     basePath: string;
-    engine?: string | undefined;
+    noWelcome: boolean;
+    logging: {
+        level?: "error" | "trace" | "fatal" | "warn" | "info" | "debug" | "silent" | undefined;
+        baseLogger?: rivetkit_log.Logger | undefined;
+    };
+    managerPath: string;
     cors?: {
         origin: string | string[] | ((origin: string, c: hono.Context) => string | undefined | null);
         allowMethods?: string[] | ((origin: string, c: hono.Context) => string[]);
@@ -119,10 +166,19 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         credentials?: boolean;
         exposeHeaders?: string[];
     } | undefined;
-    app?: Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/"> | undefined;
+    fetch?: ExportedHandlerFetchHandler<{
+        RIVET: Client<any>;
+    }, unknown> | undefined;
 }, {
-    engine?: string | undefined;
-    role?: "all" | "server" | "runner" | undefined;
+    api?: {
+        host?: string | undefined;
+        port?: number | undefined;
+    } | undefined;
+    endpoint?: string | null | undefined;
+    namespace?: string | undefined;
+    runnerName?: string | undefined;
+    encoding?: "json" | "cbor" | "bare" | undefined;
+    transport?: "websocket" | "sse" | undefined;
     cors?: {
         origin: string | string[] | ((origin: string, c: hono.Context) => string | undefined | null);
         allowMethods?: string[] | ((origin: string, c: hono.Context) => string[]);
@@ -145,8 +201,18 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         token?: ((...args: unknown[]) => string) | undefined;
         defaultEndpoint?: string | undefined;
     } | undefined;
+    disableServer?: boolean | undefined;
+    disableActorDriver?: boolean | undefined;
     basePath?: string | undefined;
-    app?: Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/"> | undefined;
+    noWelcome?: boolean | undefined;
+    logging?: {
+        level?: "error" | "trace" | "fatal" | "warn" | "info" | "debug" | "silent" | undefined;
+        baseLogger?: rivetkit_log.Logger | undefined;
+    } | undefined;
+    managerPath?: string | undefined;
+    fetch?: ExportedHandlerFetchHandler<{
+        RIVET: Client<any>;
+    }, unknown> | undefined;
 }>>;
 type InputConfig = z.input<typeof ConfigSchema>;
 
@@ -169,11 +235,6 @@ interface Handler {
     handler: ExportedHandler<Bindings>;
     ActorHandler: DurableObjectConstructor;
 }
-interface SetupOutput<A extends Registry<any>> {
-    client: Client<A>;
-    createHandler: (hono?: Hono) => Handler;
-}
-declare function createServerHandler<R extends Registry<any>>(registry: R, inputConfig?: InputConfig): Handler;
-declare function createServer<R extends Registry<any>>(registry: R, inputConfig?: InputConfig): SetupOutput<R>;
+declare function createHandler<R extends Registry<any>>(registry: R, inputConfig?: InputConfig): Handler;
 
-export { type Bindings, type InputConfig as Config, type DriverContext, createServer, createServerHandler };
+export { type Bindings, type InputConfig as Config, type DriverContext, createHandler };

package/dist/mod.d.ts

@@ -1,12 +1,11 @@
-import * as hono_types from 'hono/types';
+import * as rivetkit from 'rivetkit';
+import { Client, ActorKey, Registry } from 'rivetkit';
+export { Client } from 'rivetkit';
+import * as rivetkit_log from 'rivetkit/log';
 import * as hono from 'hono';
-import { Hono } from 'hono';
-import * as rivetkit_utils from 'rivetkit/utils';
 import * as rivetkit_driver_helpers from 'rivetkit/driver-helpers';
-import * as rivetkit from 'rivetkit';
-import { ActorKey, Registry } from 'rivetkit';
+import * as rivetkit_utils from 'rivetkit/utils';
 import { z } from 'zod';
-import { Client } from 'rivetkit/client';
 import { DurableObject } from 'cloudflare:workers';
 
 interface DriverContext {
@@ -14,6 +13,23 @@ interface DriverContext {
 }
 
 declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
+    api: z.ZodDefault<z.ZodObject<{
+        host: z.ZodDefault<z.ZodString>;
+        port: z.ZodDefault<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        host: string;
+        port: number;
+    }, {
+        host?: string | undefined;
+        port?: number | undefined;
+    }>>;
+    endpoint: z.ZodDefault<z.ZodNullable<z.ZodString>>;
+    namespace: z.ZodDefault<z.ZodString>;
+    runnerName: z.ZodDefault<z.ZodString>;
+    encoding: z.ZodDefault<z.ZodEnum<["json", "cbor", "bare"]>>;
+    transport: z.ZodDefault<z.ZodEnum<["websocket", "sse"]>>;
+    getUpgradeWebSocket: z.ZodOptional<z.ZodType<() => rivetkit_utils.UpgradeWebSocket, z.ZodTypeDef, () => rivetkit_utils.UpgradeWebSocket>>;
+} & {
     driver: z.ZodOptional<z.ZodObject<{
         name: z.ZodString;
         manager: z.ZodType<(registryConfig: rivetkit.RegistryConfig, runConfig: rivetkit.RunConfig) => rivetkit_driver_helpers.ManagerDriver, z.ZodTypeDef, (registryConfig: rivetkit.RegistryConfig, runConfig: rivetkit.RunConfig) => rivetkit_driver_helpers.ManagerDriver>;
@@ -27,9 +43,6 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         name: string;
         manager: (registryConfig: rivetkit.RegistryConfig, runConfig: rivetkit.RunConfig) => rivetkit_driver_helpers.ManagerDriver;
     }>>;
-    engine: z.ZodOptional<z.ZodString>;
-    getUpgradeWebSocket: z.ZodOptional<z.ZodType<() => rivetkit_utils.UpgradeWebSocket, z.ZodTypeDef, () => rivetkit_utils.UpgradeWebSocket>>;
-    role: z.ZodDefault<z.ZodOptional<z.ZodEnum<["all", "server", "runner"]>>>;
     cors: z.ZodOptional<z.ZodType<{
         origin: string | string[] | ((origin: string, c: hono.Context) => string | undefined | null);
         allowMethods?: string[] | ((origin: string, c: hono.Context) => string[]);
@@ -90,11 +103,38 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         token?: ((...args: unknown[]) => string) | undefined;
         defaultEndpoint?: string | undefined;
     }>>>;
+    disableServer: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    disableActorDriver: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     basePath: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-}, "driver" | "getUpgradeWebSocket"> & {
-    app: z.ZodOptional<z.ZodType<Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">, z.ZodTypeDef, Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">>>;
+    noWelcome: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    logging: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        baseLogger: z.ZodOptional<z.ZodType<rivetkit_log.Logger, z.ZodTypeDef, rivetkit_log.Logger>>;
+        level: z.ZodOptional<z.ZodEnum<["trace", "debug", "info", "warn", "error", "fatal", "silent"]>>;
+    }, "strip", z.ZodTypeAny, {
+        level?: "error" | "trace" | "fatal" | "warn" | "info" | "debug" | "silent" | undefined;
+        baseLogger?: rivetkit_log.Logger | undefined;
+    }, {
+        level?: "error" | "trace" | "fatal" | "warn" | "info" | "debug" | "silent" | undefined;
+        baseLogger?: rivetkit_log.Logger | undefined;
+    }>>>;
+}, "getUpgradeWebSocket" | "driver"> & {
+    /** Path that the Rivet manager API will be mounted. */
+    managerPath: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    fetch: z.ZodOptional<z.ZodType<ExportedHandlerFetchHandler<{
+        RIVET: Client<any>;
+    }, unknown>, z.ZodTypeDef, ExportedHandlerFetchHandler<{
+        RIVET: Client<any>;
+    }, unknown>>>;
 }, "strip", z.ZodTypeAny, {
-    role: "all" | "server" | "runner";
+    api: {
+        host: string;
+        port: number;
+    };
+    endpoint: string | null;
+    namespace: string;
+    runnerName: string;
+    encoding: "json" | "cbor" | "bare";
+    transport: "websocket" | "sse";
     maxIncomingMessageSize: number;
     inspector: {
         enabled: boolean;
@@ -109,8 +149,15 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         token: (...args: unknown[]) => string;
         defaultEndpoint?: string | undefined;
     };
+    disableServer: boolean;
+    disableActorDriver: boolean;
     basePath: string;
-    engine?: string | undefined;
+    noWelcome: boolean;
+    logging: {
+        level?: "error" | "trace" | "fatal" | "warn" | "info" | "debug" | "silent" | undefined;
+        baseLogger?: rivetkit_log.Logger | undefined;
+    };
+    managerPath: string;
     cors?: {
         origin: string | string[] | ((origin: string, c: hono.Context) => string | undefined | null);
         allowMethods?: string[] | ((origin: string, c: hono.Context) => string[]);
@@ -119,10 +166,19 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         credentials?: boolean;
         exposeHeaders?: string[];
     } | undefined;
-    app?: Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/"> | undefined;
+    fetch?: ExportedHandlerFetchHandler<{
+        RIVET: Client<any>;
+    }, unknown> | undefined;
 }, {
-    engine?: string | undefined;
-    role?: "all" | "server" | "runner" | undefined;
+    api?: {
+        host?: string | undefined;
+        port?: number | undefined;
+    } | undefined;
+    endpoint?: string | null | undefined;
+    namespace?: string | undefined;
+    runnerName?: string | undefined;
+    encoding?: "json" | "cbor" | "bare" | undefined;
+    transport?: "websocket" | "sse" | undefined;
     cors?: {
         origin: string | string[] | ((origin: string, c: hono.Context) => string | undefined | null);
         allowMethods?: string[] | ((origin: string, c: hono.Context) => string[]);
@@ -145,8 +201,18 @@ declare const ConfigSchema: z.ZodDefault<z.ZodObject<Omit<{
         token?: ((...args: unknown[]) => string) | undefined;
         defaultEndpoint?: string | undefined;
     } | undefined;
+    disableServer?: boolean | undefined;
+    disableActorDriver?: boolean | undefined;
     basePath?: string | undefined;
-    app?: Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/"> | undefined;
+    noWelcome?: boolean | undefined;
+    logging?: {
+        level?: "error" | "trace" | "fatal" | "warn" | "info" | "debug" | "silent" | undefined;
+        baseLogger?: rivetkit_log.Logger | undefined;
+    } | undefined;
+    managerPath?: string | undefined;
+    fetch?: ExportedHandlerFetchHandler<{
+        RIVET: Client<any>;
+    }, unknown> | undefined;
 }>>;
 type InputConfig = z.input<typeof ConfigSchema>;
 
@@ -169,11 +235,6 @@ interface Handler {
     handler: ExportedHandler<Bindings>;
     ActorHandler: DurableObjectConstructor;
 }
-interface SetupOutput<A extends Registry<any>> {
-    client: Client<A>;
-    createHandler: (hono?: Hono) => Handler;
-}
-declare function createServerHandler<R extends Registry<any>>(registry: R, inputConfig?: InputConfig): Handler;
-declare function createServer<R extends Registry<any>>(registry: R, inputConfig?: InputConfig): SetupOutput<R>;
+declare function createHandler<R extends Registry<any>>(registry: R, inputConfig?: InputConfig): Handler;
 
-export { type Bindings, type InputConfig as Config, type DriverContext, createServer, createServerHandler };
+export { type Bindings, type InputConfig as Config, type DriverContext, createHandler };

package/dist/mod.js

@@ -1,15 +1,10 @@
 // src/handler.ts
 import { env as env2 } from "cloudflare:workers";
-import { Hono } from "hono";
 
 // src/actor-handler-do.ts
 import { DurableObject, env } from "cloudflare:workers";
 import invariant2 from "invariant";
-import {
-  createActorRouter,
-  createClientWithDriver,
-  createInlineClientDriver
-} from "rivetkit";
+import { createActorRouter, createClientWithDriver } from "rivetkit";
 import { serializeEmptyPersistData } from "rivetkit/driver-helpers";
 
 // src/actor-driver.ts
@@ -132,9 +127,8 @@ function createCloudflareActorsActorDriverBuilder(globalState) {
 
 // src/log.ts
 import { getLogger } from "rivetkit/log";
-var LOGGER_NAME = "driver-cloudflare-workers";
 function logger() {
-  return getLogger(LOGGER_NAME);
+  return getLogger("driver-cloudflare-workers");
 }
 
 // src/actor-handler-do.ts
@@ -166,7 +160,7 @@ function createActorDurableObject(registry, rootRunConfig) {
             if (!name) throw new Error("missing actor name");
             const key = res.get(KEYS.KEY);
             if (!key) throw new Error("missing actor key");
-            logger().debug("already initialized", { name, key });
+            logger().debug({ msg: "already initialized", name, key });
             this.#initialized = { name, key };
             this.#initializedPromise.resolve();
           } else {
@@ -186,9 +180,7 @@ function createActorDurableObject(registry, rootRunConfig) {
         registry.config,
         runConfig
       );
-      const inlineClient = createClientWithDriver(
-        createInlineClientDriver(managerDriver)
-      );
+      const inlineClient = createClientWithDriver(managerDriver);
       const actorDriver = runConfig.driver.actor(
         registry.config,
         runConfig,
@@ -213,7 +205,7 @@ function createActorDurableObject(registry, rootRunConfig) {
         name: req.name,
         key: req.key
       };
-      logger().debug("initialized actor", { key: req.key });
+      logger().debug({ msg: "initialized actor", key: req.key });
       await this.#loadActor();
     }
     async fetch(request) {
@@ -231,9 +223,7 @@ function createActorDurableObject(registry, rootRunConfig) {
         registry.config,
         runConfig
       );
-      const inlineClient = createClientWithDriver(
-        createInlineClientDriver(managerDriver)
-      );
+      const inlineClient = createClientWithDriver(managerDriver);
       const actorDriver = runConfig.driver.actor(
         registry.config,
         runConfig,
@@ -250,15 +240,16 @@ function createActorDurableObject(registry, rootRunConfig) {
 import { RunConfigSchema } from "rivetkit/driver-helpers";
 import { z } from "zod";
 var ConfigSchema = RunConfigSchema.removeDefault().omit({ driver: true, getUpgradeWebSocket: true }).extend({
-  app: z.custom().optional()
+  /** Path that the Rivet manager API will be mounted. */
+  managerPath: z.string().optional().default("/rivet"),
+  fetch: z.custom().optional()
 }).default({});
 
 // src/manager-driver.ts
 import {
   HEADER_AUTH_DATA,
   HEADER_CONN_PARAMS,
-  HEADER_ENCODING,
-  HEADER_EXPOSE_INTERNAL_ERROR
+  HEADER_ENCODING
 } from "rivetkit/driver-helpers";
 import { ActorAlreadyExists, InternalError } from "rivetkit/errors";
 
@@ -310,7 +301,8 @@ var STANDARD_WEBSOCKET_HEADERS = [
 var CloudflareActorsManagerDriver = class {
   async sendRequest(actorId, actorRequest) {
     const env3 = getCloudflareAmbientEnv();
-    logger().debug("sending request to durable object", {
+    logger().debug({
+      msg: "sending request to durable object",
       actorId,
       method: actorRequest.method,
       url: actorRequest.url
@@ -321,13 +313,16 @@ var CloudflareActorsManagerDriver = class {
   }
   async openWebSocket(path, actorId, encoding, params) {
     const env3 = getCloudflareAmbientEnv();
-    logger().debug("opening websocket to durable object", { actorId, path });
+    logger().debug({
+      msg: "opening websocket to durable object",
+      actorId,
+      path
+    });
     const id = env3.ACTOR_DO.idFromString(actorId);
     const stub = env3.ACTOR_DO.get(id);
     const headers = {
       Upgrade: "websocket",
       Connection: "Upgrade",
-      [HEADER_EXPOSE_INTERNAL_ERROR]: "true",
       [HEADER_ENCODING]: encoding
     };
     if (params) {
@@ -335,10 +330,7 @@ var CloudflareActorsManagerDriver = class {
     }
     headers["sec-websocket-protocol"] = "rivetkit";
     const url = `http://actor${path}`;
-    logger().debug("rewriting websocket url", {
-      from: path,
-      to: url
-    });
+    logger().debug({ msg: "rewriting websocket url", from: path, to: url });
     const response = await stub.fetch(url, {
       headers
     });
@@ -348,7 +340,8 @@ var CloudflareActorsManagerDriver = class {
         "missing websocket connection in response from DO"
       );
     }
-    logger().debug("durable object websocket connection open", {
+    logger().debug({
+      msg: "durable object websocket connection open",
       actorId
     });
     webSocket.accept();
@@ -361,7 +354,8 @@ var CloudflareActorsManagerDriver = class {
     return webSocket;
   }
   async proxyRequest(c, actorRequest, actorId) {
-    logger().debug("forwarding request to durable object", {
+    logger().debug({
+      msg: "forwarding request to durable object",
       actorId,
       method: actorRequest.method,
       url: actorRequest.url
@@ -371,7 +365,8 @@ var CloudflareActorsManagerDriver = class {
     return await stub.fetch(actorRequest);
   }
   async proxyWebSocket(c, path, actorId, encoding, params, authData) {
-    logger().debug("forwarding websocket to durable object", {
+    logger().debug({
+      msg: "forwarding websocket to durable object",
       actorId,
       path
     });
@@ -383,7 +378,8 @@ var CloudflareActorsManagerDriver = class {
     }
     const newUrl = new URL(`http://actor${path}`);
     const actorRequest = new Request(newUrl, c.req.raw);
-    logger().debug("rewriting websocket url", {
+    logger().debug({
+      msg: "rewriting websocket url",
       from: c.req.url,
       to: actorRequest.url
     });
@@ -394,7 +390,6 @@ var CloudflareActorsManagerDriver = class {
         actorRequest.headers.delete(k);
       }
     }
-    actorRequest.headers.set(HEADER_EXPOSE_INTERNAL_ERROR, "true");
     actorRequest.headers.set(HEADER_ENCODING, encoding);
     if (params) {
       actorRequest.headers.set(HEADER_CONN_PARAMS, JSON.stringify(params));
@@ -429,21 +424,23 @@ var CloudflareActorsManagerDriver = class {
     key
   }) {
     const env3 = getCloudflareAmbientEnv();
-    logger().debug("getWithKey: searching for actor", { name, key });
+    logger().debug({ msg: "getWithKey: searching for actor", name, key });
     const nameKeyString = serializeNameAndKey(name, key);
     const actorId = env3.ACTOR_DO.idFromName(nameKeyString).toString();
     const actorData = await env3.ACTOR_KV.get(KEYS2.ACTOR.metadata(actorId), {
       type: "json"
     });
     if (!actorData) {
-      logger().debug("getWithKey: no actor found with matching name and key", {
+      logger().debug({
+        msg: "getWithKey: no actor found with matching name and key",
         name,
         key,
         actorId
       });
       return void 0;
     }
-    logger().debug("getWithKey: found actor with matching name and key", {
+    logger().debug({
+      msg: "getWithKey: found actor with matching name and key",
       actorId,
       name,
       key
@@ -505,6 +502,12 @@ var CloudflareActorsManagerDriver = class {
       key: actorData.key
     };
   }
+  displayInformation() {
+    return {
+      name: "Cloudflare Workers",
+      properties: {}
+    };
+  }
 };
 
 // src/websocket.ts
@@ -575,16 +578,10 @@ var upgradeWebSocket = defineWebSocketHelper(async (c, events) => {
 function getCloudflareAmbientEnv() {
   return env2;
 }
-function createServerHandler(registry, inputConfig) {
-  const { createHandler } = createServer(registry, inputConfig);
-  return createHandler();
-}
-function createServer(registry, inputConfig) {
+function createHandler(registry, inputConfig) {
   const config = ConfigSchema.parse(inputConfig);
   const runConfig = {
     ...config,
-    // The worker acts as a server and doesn't run actors
-    role: "server",
     driver: {
       name: "cloudflare-workers",
       manager: () => new CloudflareActorsManagerDriver(),
@@ -594,25 +591,30 @@ function createServer(registry, inputConfig) {
     getUpgradeWebSocket: () => upgradeWebSocket
   };
   const ActorHandler2 = createActorDurableObject(registry, runConfig);
-  const serverOutput = registry.createServer(runConfig);
-  return {
-    client: serverOutput.client,
-    createHandler: (hono) => {
-      const app = hono ?? new Hono();
-      if (!hono) {
-        app.route("/registry", serverOutput.hono);
+  const serverOutput = registry.start(runConfig);
+  const handler = {
+    fetch: (request, cfEnv, ctx) => {
+      const url = new URL(request.url);
+      const env3 = Object.assign({ RIVET: serverOutput.client }, cfEnv);
+      if (url.pathname.startsWith(config.managerPath)) {
+        const strippedPath = url.pathname.substring(config.managerPath.length);
+        url.pathname = strippedPath;
+        const modifiedRequest = new Request(url.toString(), request);
+        return serverOutput.fetch(modifiedRequest, env3, ctx);
+      }
+      if (config.fetch) {
+        return config.fetch(request, env3, ctx);
+      } else {
+        return new Response(
+          "This is a RivetKit server.\n\nLearn more at https://rivetkit.org\n",
+          { status: 200 }
+        );
       }
-      const handler = {
-        fetch: (request, env3, ctx) => {
-          return app.fetch(request, env3, ctx);
-        }
-      };
-      return { handler, ActorHandler: ActorHandler2 };
     }
   };
+  return { handler, ActorHandler: ActorHandler2 };
 }
 export {
-  createServer,
-  createServerHandler
+  createHandler
 };
 //# sourceMappingURL=mod.js.map