alchemy 0.66.0 → 0.67.0

package/src/cloudflare/worker.ts

@@ -15,6 +15,7 @@ import {
 import type { Assets } from "./assets.ts";
 import type {
   Bindings,
+  Self,
   WorkerBindingDurableObjectNamespace,
   WorkerBindingSpec,
 } from "./bindings.ts";
@@ -58,6 +59,8 @@ import { Workflow, isWorkflow, upsertWorkflow } from "./workflow.ts";
 // Previous versions of `Worker` used the `Bundle` resource.
 // This import is here to avoid errors when destroying the `Bundle` resource.
 import "../esbuild/bundle.ts";
+import { Scope } from "../scope.ts";
+import type { WorkerRef } from "./worker-ref.ts";
 
 /**
  * Configuration options for static assets
@@ -330,11 +333,19 @@ export interface BaseWorkerProps<
          * @default false
          */
         remote?: boolean;
+        /**
+         * Whether to expose the worker via a Cloudflare Tunnel.
+         *
+         * @default false
+         */
+        tunnel?: boolean;
         url?: undefined;
       }
     | {
         url: string;
         remote?: undefined;
+        tunnel?: undefined;
+        port?: undefined;
       };
 
   /**
@@ -699,6 +710,25 @@ export function Worker<const B extends Bindings>(
   return _Worker(id, props as WorkerProps<B>);
 }
 
+Worker.experimentalEntrypoint = <RPC extends Rpc.WorkerEntrypointBranded>(
+  worker: Worker | WorkerRef | Self,
+  entrypoint: string,
+) => {
+  if (Scope.getScope()?.local) {
+    logger.warn(
+      "Worker.experimentalEntrypoint is not supported in local development. See: https://github.com/cloudflare/workers-sdk/issues/10681",
+    );
+  }
+  return {
+    ...worker,
+    // we rename the entrypoint in order to prevent collisions with entrypoint on Worker
+    __entrypoint__: entrypoint,
+  } as (Worker | WorkerRef) & {
+    __entrypoint__?: string;
+    __rpc__?: RPC;
+  };
+};
+
 const _Worker = Resource(
   "cloudflare::Worker",
   {
@@ -854,7 +884,8 @@ const _Worker = Resource(
           eventSources: props.eventSources,
           assets: props.assets,
           bundle,
-          port: (props.dev as { port?: number } | undefined)?.port,
+          port: props.dev?.port,
+          tunnel: props.dev?.tunnel ?? this.scope.tunnel,
         });
         this.onCleanup(() => controller.dispose());
       }

package/src/cloudflare/wrangler.json.ts

@@ -5,11 +5,7 @@ import { Resource } from "../resource.ts";
 import { Scope } from "../scope.ts";
 import { isSecret } from "../secret.ts";
 import { assertNever } from "../util/assert-never.ts";
-import {
-  Self,
-  type Bindings,
-  type WorkerBindingRateLimit,
-} from "./bindings.ts";
+import type { Bindings, WorkerBindingRateLimit } from "./bindings.ts";
 import type { R2BucketJurisdiction } from "./bucket.ts";
 import type { DurableObjectNamespace } from "./durable-object-namespace.ts";
 import type { EventSource } from "./event-source.ts";
@@ -371,6 +367,7 @@ export interface WranglerJsonSpec {
     binding: string;
     service: string;
     environment?: string;
+    entrypoint?: string;
   }[];
 
   /**
@@ -534,8 +531,12 @@ function processBindings(
     preview_bucket_name: string;
     jurisdiction?: R2BucketJurisdiction;
   }[] = [];
-  const services: { binding: string; service: string; environment?: string }[] =
-    [];
+  const services: {
+    binding: string;
+    service: string;
+    environment?: string;
+    entrypoint?: string;
+  }[] = [];
   const secrets: string[] = [];
   const workflows: {
     name: string;
@@ -625,17 +626,20 @@ function processBindings(
     } else if (writeSecrets && isSecret(binding)) {
       spec.vars ??= {};
       spec.vars[bindingName] = binding as any;
-    } else if (binding === Self) {
+    } else if (binding.type === "cloudflare::Worker::Self") {
       // Self(service) binding
       services.push({
         binding: bindingName,
         service: workerName,
+        entrypoint: binding.__entrypoint__,
       });
     } else if (binding.type === "service") {
       // Service binding
       services.push({
         binding: bindingName,
         service: "name" in binding ? binding.name : binding.service,
+        entrypoint:
+          "__entrypoint__" in binding ? binding.__entrypoint__ : undefined,
       });
     } else if (binding.type === "kv_namespace") {
       // KV Namespace binding
@@ -759,8 +763,6 @@ function processBindings(
         binding: bindingName,
         dataset: binding.dataset,
       });
-    } else if (binding.type === "ai_gateway") {
-      // no-op
     } else if (binding.type === "version_metadata") {
       if (spec.version_metadata) {
         throw new Error(
@@ -775,7 +777,7 @@ function processBindings(
         binding: bindingName,
         id: binding.hyperdriveId,
         localConnectionString: writeSecrets
-          ? binding.dev.origin.unencrypted
+          ? binding.dev?.origin.unencrypted
           : undefined,
       });
     } else if (binding.type === "pipeline") {

package/src/llms.cloudflare.txt

@@ -269,7 +269,7 @@ const worker = await Worker("my-worker", {
 ### 2. Enable Development Compatibility
 ```typescript
 // Generate wrangler.json for local development
-await WranglerJson("wrangler.json", {
+await WranglerJson({
   worker,
 });
 ```

package/src/scope.ts

@@ -57,6 +57,12 @@ export interface ScopeOptions extends ProviderCredentials {
    * @default - `true` if ran with `alchemy dev`, `alchemy watch`, `bun --watch ./alchemy.run.ts`
    */
   watch?: boolean;
+  /**
+   * Whether to create a tunnel for supported resources.
+   *
+   * @default false
+   */
+  tunnel?: boolean;
   /**
    * Apply updates to resources even if there are no changes.
    *
@@ -186,6 +192,7 @@ export class Scope {
   public readonly phase: Phase;
   public readonly local: boolean;
   public readonly watch: boolean;
+  public readonly tunnel: boolean;
   public readonly force: boolean;
   public readonly adopt: boolean;
   public readonly destroyStrategy: DestroyStrategy;
@@ -225,6 +232,7 @@ export class Scope {
       phase,
       local,
       watch,
+      tunnel,
       force,
       destroyStrategy,
       telemetryClient,
@@ -284,6 +292,7 @@ export class Scope {
 
     this.local = local ?? this.parent?.local ?? false;
     this.watch = watch ?? this.parent?.watch ?? false;
+    this.tunnel = tunnel ?? this.parent?.tunnel ?? false;
     this.force = force ?? this.parent?.force ?? false;
     this.adopt = adopt ?? this.parent?.adopt ?? false;
     this.destroyStrategy =
@@ -327,7 +336,9 @@ export class Scope {
   >(
     // TODO(sam): validate uniqueness? Ensure a flat .logs/${id}.log dir? Or nest in scope dirs?
     id: string,
-    options: Omit<IdempotentSpawnOptions, "log" | "stateFile">,
+    options: Omit<IdempotentSpawnOptions, "log" | "stateFile"> & {
+      extract?: E;
+    },
   ): Promise<E extends undefined ? undefined : string> {
     const logsDir = path.join(this.dotAlchemy, "logs");
     const pidsDir = path.join(this.dotAlchemy, "pids");

package/src/util/idempotent-spawn.ts

@@ -161,7 +161,7 @@ export async function idempotentSpawn({
     {
       write,
       chunkSize = 64 * 1024,
-      // tickMs = 100,
+      tickMs = 100,
     }: {
       stateKey: string;
       write: (buf: Buffer) => boolean;
@@ -229,15 +229,14 @@ export async function idempotentSpawn({
       await drain();
     });
 
-    // TODO(sam): do we need this?
-    // const tick = setInterval(() => {
-    //   drain().catch(() => {});
-    // }, tickMs);
+    const tick = setInterval(() => {
+      drain().catch(() => {});
+    }, tickMs);
 
     return async function stop() {
       closed = true;
       watcher.close();
-      // clearInterval(tick);
+      clearInterval(tick);
       await fh.close().catch(() => {});
       await persist();
     };

package/templates/rwsdk/.cursor/rules/alchemy_cloudflare.mdc

@@ -274,7 +274,7 @@ const worker = await Worker("my-worker", {
 ### 2. Enable Development Compatibility
 ```typescript
 // Generate wrangler.json for local development
-await WranglerJson("wrangler.json", {
+await WranglerJson({
   worker,
 });
 ```

package/templates/rwsdk/package.json

@@ -27,8 +27,8 @@
     "worker:run": "rw-scripts worker-run"
   },
   "dependencies": {
-    "@prisma/adapter-d1": "~6.8.2",
-    "@prisma/client": "~6.8.2",
+    "@prisma/adapter-d1": "~6.16.1",
+    "@prisma/client": "~6.16.1",
     "@simplewebauthn/browser": "^13.1.0",
     "@simplewebauthn/server": "^13.1.1",
     "rwsdk": "^0.1.35"
@@ -39,7 +39,7 @@
     "@types/node": "^22.14.0",
     "@types/react": "^19.1.2",
     "@types/react-dom": "^19.1.2",
-    "prisma": "~6.8.2",
+    "prisma": "~6.16.1",
     "typescript": "^5.8.3",
     "vibe-rules": "^0.2.31",
     "alchemy": "workspace:*",

package/workers/tunnel-proxy.js

@@ -0,0 +1,110 @@
+// workers/tunnel-proxy.ts
+var tunnel_proxy_default = {
+  async fetch(request, env) {
+    const url = new URL(request.url);
+    url.host = env.TUNNEL_HOST;
+    const headers = new Headers(request.headers);
+    headers.set("alchemy-worker-name", env.WORKER_NAME);
+    const response = await fetch(url, {
+      method: request.method,
+      headers,
+      body: request.body,
+      redirect: "manual"
+    });
+    if (response.status === 530) {
+      const error = await extractResponseError(response);
+      const headers2 = new Headers(response.headers);
+      headers2.set("Content-Type", "text/html");
+      return new Response(
+        renderErrorHtml({
+          name: env.WORKER_NAME,
+          error,
+          rayId: response.headers.get("cf-ray") ?? "Unknown"
+        }),
+        {
+          status: 530,
+          headers: headers2
+        }
+      );
+    }
+    return response;
+  }
+};
+var extractResponseError = async (response) => {
+  const error = response.headers.get("Alchemy-Error");
+  if (error) {
+    return error;
+  }
+  let code;
+  let message;
+  const { promise, resolve } = Promise.withResolvers();
+  const rewriter = new HTMLRewriter();
+  rewriter.on("h1", {
+    text(text) {
+      if (code) return;
+      const match = text.text.match(/(\d+)/);
+      if (match) {
+        code = match[1];
+      }
+    }
+  });
+  rewriter.on("h2", {
+    text(text) {
+      if (message) return;
+      message = text.text;
+    }
+  });
+  rewriter.onDocument({
+    end() {
+      resolve([code, message].filter(Boolean).join(": ") || "Unknown");
+    }
+  });
+  await rewriter.transform(response).text();
+  return promise;
+};
+var renderErrorHtml = (props) => `
+  <!DOCTYPE html>
+  <html lang="en">
+  
+  <head>
+    <title>Alchemy | Tunnel Error</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="shortcut icon" href="https://alchemy.run/potion.png" type="image/png" />
+    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"><\/script>
+  </head>
+  
+  <body class="font-sans bg-slate-100 text-slate-950">
+    <div class="flex flex-col items-center justify-center h-screen">
+      <div class="border-t-3 border-red-600 px-5 py-7 bg-white gap-3 flex flex-col w-full max-w-lg">
+        <h1 class="text-2xl font-semibold">530: Tunnel Error</h1>
+        <p class="text-slate-800">The worker "${props.name}" could not be reached.</p>
+        <p class="text-slate-800">Please ensure that <code
+            class="bg-slate-100 text-slate-800 p-1 rounded-md text-sm">alchemy dev</code>
+          is running and tunnel mode is enabled for the worker.</p>
+        <div class="flex flex-col gap-2 border-l-2 border-slate-300 pl-3 my-1.5">
+          <div class="text-sm flex flex-col gap-1">
+            <div class="text-slate-500">Error:</div>
+            <div class="text-slate-800 font-mono">${props.error}</div>
+          </div>
+          <div class="text-sm flex flex-col gap-1">
+            <div class="text-slate-500">Ray ID:</div>
+            <div class="text-slate-800 font-mono">${props.rayId}</div>
+          </div>
+        </div>
+        <p class="text-slate-800"><a href="https://alchemy.run/docs/guides/cloudflare-tunnel"
+            class="text-slate-800 underline underline-offset-2 hover:no-underline" target="_blank">Learn more about tunnel
+            mode in
+            Alchemy</a>.</p>
+      </div>
+      <div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
+        <p class="text-sm text-slate-500">Alchemy ${"0.67.0"}</p>
+      </div>
+    </div>
+  </body>
+  
+  </html>
+  `;
+export {
+  tunnel_proxy_default as default
+};

package/workers/tunnel-proxy.ts

@@ -0,0 +1,121 @@
+/// <reference types="@cloudflare/workers-types" />
+
+interface Env {
+  WORKER_NAME: string;
+  TUNNEL_HOST: string;
+}
+
+declare const ALCHEMY_VERSION: string; // injected during `bun run build:workers`
+
+export default {
+  async fetch(request: Request, env: Env) {
+    const url = new URL(request.url);
+    url.host = env.TUNNEL_HOST;
+    const headers = new Headers(request.headers);
+    headers.set("alchemy-worker-name", env.WORKER_NAME);
+    const response = await fetch(url, {
+      method: request.method,
+      headers,
+      body: request.body,
+      redirect: "manual",
+    });
+    if (response.status === 530) {
+      const error = await extractResponseError(response);
+      const headers = new Headers(response.headers);
+      headers.set("Content-Type", "text/html");
+      return new Response(
+        renderErrorHtml({
+          name: env.WORKER_NAME,
+          error,
+          rayId: response.headers.get("cf-ray") ?? "Unknown",
+        }),
+        {
+          status: 530,
+          headers,
+        },
+      );
+    }
+    return response;
+  },
+} as ExportedHandler<Env>;
+
+const extractResponseError = async (response: Response) => {
+  const error = response.headers.get("Alchemy-Error");
+  if (error) {
+    return error;
+  }
+  let code: string | undefined;
+  let message: string | undefined;
+  const { promise, resolve } = Promise.withResolvers<string>();
+  const rewriter = new HTMLRewriter();
+  rewriter.on("h1", {
+    text(text) {
+      if (code) return;
+      const match = text.text.match(/(\d+)/);
+      if (match) {
+        code = match[1];
+      }
+    },
+  });
+  rewriter.on("h2", {
+    text(text) {
+      if (message) return;
+      message = text.text;
+    },
+  });
+  rewriter.onDocument({
+    end() {
+      resolve([code, message].filter(Boolean).join(": ") || "Unknown");
+    },
+  });
+  await rewriter.transform(response).text(); // consume response body so rewriter runs
+  return promise;
+};
+
+const renderErrorHtml = (props: {
+  name: string;
+  error: string;
+  rayId: string;
+}) => `
+  <!DOCTYPE html>
+  <html lang="en">
+  
+  <head>
+    <title>Alchemy | Tunnel Error</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="shortcut icon" href="https://alchemy.run/potion.png" type="image/png" />
+    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+  </head>
+  
+  <body class="font-sans bg-slate-100 text-slate-950">
+    <div class="flex flex-col items-center justify-center h-screen">
+      <div class="border-t-3 border-red-600 px-5 py-7 bg-white gap-3 flex flex-col w-full max-w-lg">
+        <h1 class="text-2xl font-semibold">530: Tunnel Error</h1>
+        <p class="text-slate-800">The worker "${props.name}" could not be reached.</p>
+        <p class="text-slate-800">Please ensure that <code
+            class="bg-slate-100 text-slate-800 p-1 rounded-md text-sm">alchemy dev</code>
+          is running and tunnel mode is enabled for the worker.</p>
+        <div class="flex flex-col gap-2 border-l-2 border-slate-300 pl-3 my-1.5">
+          <div class="text-sm flex flex-col gap-1">
+            <div class="text-slate-500">Error:</div>
+            <div class="text-slate-800 font-mono">${props.error}</div>
+          </div>
+          <div class="text-sm flex flex-col gap-1">
+            <div class="text-slate-500">Ray ID:</div>
+            <div class="text-slate-800 font-mono">${props.rayId}</div>
+          </div>
+        </div>
+        <p class="text-slate-800"><a href="https://alchemy.run/docs/guides/cloudflare-tunnel"
+            class="text-slate-800 underline underline-offset-2 hover:no-underline" target="_blank">Learn more about tunnel
+            mode in
+            Alchemy</a>.</p>
+      </div>
+      <div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
+        <p class="text-sm text-slate-500">Alchemy ${ALCHEMY_VERSION}</p>
+      </div>
+    </div>
+  </body>
+  
+  </html>
+  `;