alchemy 0.65.1 → 0.67.0

package/src/stripe/price.ts

@@ -4,41 +4,60 @@ import { Resource } from "../resource.ts";
 import type { Secret } from "../secret.ts";
 import { logger } from "../util/logger.ts";
 import { createStripeClient, handleStripeDeleteError } from "./client.ts";
+import type { Meter } from "./meter.ts";
 
 /**
  * Properties for price recurring configuration
  */
-export interface PriceRecurring {
-  /**
-   * Specifies billing frequency. Either 'day', 'week', 'month' or 'year'.
-   */
-  interval: Stripe.PriceCreateParams.Recurring.Interval;
-
-  /**
-   * The number of intervals between subscription billings. For example, interval=month and interval_count=3 bills every 3 months.
-   */
-  intervalCount?: number;
-
-  /**
-   * Configures how the quantity per period should be determined, can be either 'metered' or 'licensed'.
-   * 'licensed' will automatically bill the quantity set for a plan when adding it to a subscription,
-   * 'metered' will aggregate the total usage based on usage records.
-   */
-  usageType?: Stripe.PriceCreateParams.Recurring.UsageType;
-
-  /**
-   * Specifies a usage aggregation strategy for prices of `usage_type=metered`. Allowed values are `sum` for summing up all usage during a period,
-   * `last_during_period` for picking the last usage record reported within a period,
-   * `last_ever` for picking the last usage record ever (across period bounds) or `max` which picks the usage record with the maximum reported usage during a period.
-   */
-  aggregateUsage?: Stripe.PriceCreateParams.Recurring.AggregateUsage;
-
-  /**
-   * The ID of the billing meter this price is associated with.
-   * Only applicable when usageType = 'metered'.
-   */
-  meter?: string;
-}
+export type PriceRecurring =
+  // If usageType is 'metered', meter is required
+  | {
+      /**
+       * Specifies billing frequency. Either 'day', 'week', 'month' or 'year'.
+       */
+      interval: Stripe.PriceCreateParams.Recurring.Interval;
+
+      /**
+       * The number of intervals between subscription billings. For example, interval=month and interval_count=3 bills every 3 months.
+       */
+      intervalCount?: number;
+
+      /**
+       * Configures how the quantity per period should be determined, can be either 'metered' or 'licensed'.
+       * 'metered' will aggregate the total usage based on usage records.
+       */
+      usageType: "metered";
+
+      /**
+       * The ID of the billing meter this price is associated with.
+       * Required when usageType = 'metered'.
+       */
+      meter: string | Meter;
+    }
+  // If usageType is 'licensed' or not provided, meter is not allowed
+  | {
+      /**
+       * Specifies billing frequency. Either 'day', 'week', 'month' or 'year'.
+       */
+      interval: Stripe.PriceCreateParams.Recurring.Interval;
+
+      /**
+       * The number of intervals between subscription billings. For example, interval=month and interval_count=3 bills every 3 months.
+       */
+      intervalCount?: number;
+
+      /**
+       * Configures how the quantity per period should be determined, can be either 'metered' or 'licensed'.
+       * 'licensed' will automatically bill the quantity set for a plan when adding it to a subscription.
+       */
+      usageType?: "licensed" | undefined;
+
+      /**
+       * The ID of the billing meter this price is associated with.
+       * Not applicable when usageType is not 'metered'.
+       */
+      meter?: never;
+    };
 
 type TaxBehavior = Stripe.PriceCreateParams.TaxBehavior;
 type BillingScheme = Stripe.PriceCreateParams.BillingScheme;
@@ -262,19 +281,6 @@ export interface Price extends Resource<"stripe::Price">, PriceProps {
  * });
  *
  * @example
- * // Create a metered price for usage-based billing
- * const meteredPrice = await Price("storage", {
- *   currency: "usd",
- *   unitAmount: 25, // $0.25 per GB
- *   product: "prod_xyz",
- *   recurring: {
- *     interval: "month",
- *     usageType: "metered",
- *     aggregateUsage: "sum"
- *   }
- * });
- *
- * @example
  * // Create a graduated tiered price with usage-based billing
  * const tieredPrice = await Price("api-usage", {
  *   currency: "usd",
@@ -428,22 +434,21 @@ export const Price = Resource(
             interval: props.recurring.interval,
             interval_count: props.recurring.intervalCount,
             usage_type: props.recurring.usageType,
-            aggregate_usage: props.recurring.aggregateUsage,
           };
 
           // Add meter to recurring if present (only for metered usage type)
-          if (props.recurring.meter) {
-            if (props.recurring.usageType !== "metered") {
-              throw new Error(
-                "Meter can only be set for prices with recurring.usageType = 'metered'",
-              );
-            }
-            // Extend the recurring params with meter
+          if (
+            props.recurring.usageType === "metered" &&
+            props.recurring.meter
+          ) {
             (
               createParams.recurring as Stripe.PriceCreateParams.Recurring & {
                 meter: string;
               }
-            ).meter = props.recurring.meter;
+            ).meter =
+              typeof props.recurring.meter === "string"
+                ? props.recurring.meter
+                : props.recurring.meter.id;
           }
         }
 
@@ -514,8 +519,6 @@ export const Price = Resource(
             intervalCount: price.recurring.interval_count,
             usageType: price.recurring
               .usage_type as Stripe.PriceCreateParams.Recurring.UsageType,
-            aggregateUsage: price.recurring
-              .aggregate_usage as Stripe.PriceCreateParams.Recurring.AggregateUsage,
             meter: (
               price.recurring as Stripe.Price.Recurring & { meter?: string }
             ).meter,
@@ -552,7 +555,7 @@ export const Price = Resource(
         active: price.active,
         billingScheme: price.billing_scheme as BillingScheme,
         nickname: price.nickname || undefined,
-        recurring: recurring,
+        recurring: recurring as PriceRecurring,
         metadata: price.metadata || undefined,
         taxBehavior: price.tax_behavior as TaxBehavior,
         createdAt: price.created,

package/src/test/vitest.ts

@@ -112,7 +112,10 @@ export function test(
         return new D1StateStore(scope);
       default:
         return new SQLiteStateStore(scope, {
-          filename: `.alchemy/${path.relative(process.cwd(), meta.filename)}.sqlite`,
+          filename: path.join(
+            scope.dotAlchemy,
+            `${path.relative(process.cwd(), meta.filename)}.sqlite`,
+          ),
         });
     }
   };

package/src/util/assert-never.ts

@@ -1,3 +1,3 @@
 export function assertNever(value: never, message?: string): never {
-  throw new Error(message ?? `Unexpected value: ${value}`);
+  throw new Error(message ?? `Unexpected value: ${JSON.stringify(value)}`);
 }

package/src/util/cli.ts

@@ -55,16 +55,16 @@ interface AlchemyInfo {
   appName: string;
 }
 
-let loggerApi: LoggerApi | null = null;
+let loggers: {
+  [appName: string]: LoggerApi;
+} = {};
+
 export const createLoggerInstance = (
   alchemyInfo: AlchemyInfo,
   customLogger?: LoggerApi,
 ) => {
-  if (loggerApi) return loggerApi;
-
-  // Use custom logger if provided, otherwise use the basic fallback logger
-  loggerApi = customLogger ?? createFallbackLogger(alchemyInfo);
-  return loggerApi;
+  return (loggers[alchemyInfo.appName] ??=
+    customLogger ?? createFallbackLogger(alchemyInfo));
 };
 
 export const createDummyLogger = (): LoggerApi => {
@@ -79,13 +79,15 @@ export const createDummyLogger = (): LoggerApi => {
 };
 
 export const createFallbackLogger = (alchemyInfo: AlchemyInfo): LoggerApi => {
-  console.log(dedent`
-    ${colorize("Alchemy", "cyanBright")} (v${packageJson.version})
-    App: ${alchemyInfo.appName}
-    Phase: ${alchemyInfo.phase}
-    Stage: ${alchemyInfo.stage}
-    
-  `);
+  if (alchemyInfo.phase !== "read") {
+    console.log(dedent`
+      ${colorize("Alchemy", "cyanBright")} (v${packageJson.version})
+      App: ${alchemyInfo.appName}
+      Phase: ${alchemyInfo.phase}
+      Stage: ${alchemyInfo.stage}
+      
+    `);
+  }
 
   return {
     log: console.log,

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/src/util/root-dir.ts

@@ -0,0 +1 @@
+export const ALCHEMY_ROOT = process.env.ALCHEMY_ROOT ?? process.cwd();

package/templates/nextjs/alchemy.run.ts

@@ -5,12 +5,12 @@ import { Nextjs } from "alchemy/cloudflare";
 
 const app = await alchemy("{projectName}");
 
-export const website = await Nextjs("website", {
+export const worker = await Nextjs("website", {
   name: `${app.name}-${app.stage}-website`,
 });
 
 console.log({
-  url: website.url,
+  url: worker.url,
 });
 
 await app.finalize();

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/cloudflare-state-store.js

@@ -5397,7 +5397,7 @@ var migrations_default = {
 
 // src/util/assert-never.ts
 function assertNever(value, message) {
-  throw new Error(message ?? `Unexpected value: ${value}`);
+  throw new Error(message ?? `Unexpected value: ${JSON.stringify(value)}`);
 }
 
 // src/state/schema.ts

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>
+  `;