alchemy 0.74.2 → 0.75.1

package/src/cloudflare/nuxt/plugin.ts

@@ -3,7 +3,6 @@ import {
   getDefaultConfigPath,
   getDefaultPersistPath,
   validateConfigPath,
-  validatePersistPath,
 } from "../miniflare/paths.ts";
 
 const alchemy = (
@@ -15,9 +14,7 @@ const alchemy = (
       configPath: validateConfigPath(
         options.dev?.configPath ?? getDefaultConfigPath(),
       ),
-      persistDir: validatePersistPath(
-        options.dev?.persistDir ?? getDefaultPersistPath(),
-      ),
+      persistDir: options.dev?.persistDir ?? getDefaultPersistPath(),
       ...options.dev,
     },
     ...options,

package/src/cloudflare/react-router/plugin.ts

@@ -1,6 +1,6 @@
 import type { PluginConfig } from "@cloudflare/vite-plugin";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
+import { dirname } from "pathe";
 import { getDefaultConfigPath } from "../miniflare/paths.ts";
 import alchemyVite from "../vite/plugin.ts";
 

package/src/cloudflare/react-router/react-router.ts

@@ -1,4 +1,4 @@
-import path from "node:path";
+import path from "pathe";
 import { getPackageManagerRunner } from "../../util/detect-package-manager.ts";
 import type { Assets } from "../assets.ts";
 import type { Bindings } from "../bindings.ts";

package/src/cloudflare/redwood/redwood.ts

@@ -1,4 +1,4 @@
-import path from "node:path";
+import path from "pathe";
 import type { Assets } from "../assets.ts";
 import type { Bindings } from "../bindings.ts";
 import { Vite, type ViteProps } from "../vite/vite.ts";

package/src/cloudflare/sveltekit/sveltekit.ts

@@ -1,4 +1,4 @@
-import { join } from "node:path";
+import { join } from "pathe";
 import type { Assets } from "../assets.ts";
 import type { Bindings } from "../bindings.ts";
 import { Vite, type ViteProps } from "../vite/vite.ts";

package/src/cloudflare/tanstack-start/tanstack-start.ts

@@ -1,4 +1,4 @@
-import path from "node:path";
+import path from "pathe";
 import { exists } from "../../util/exists.ts";
 import type { Assets } from "../assets.ts";
 import type { Bindings } from "../bindings.ts";

package/src/cloudflare/tunnel.ts

@@ -494,6 +494,9 @@ export const Tunnel = Resource(
     const name =
       props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
 
+    // Track if we're replacing the tunnel (don't fetch token in this case)
+    let isReplacing = false;
+
     if (this.phase === "update" && this.output.name !== name) {
       console.log("replacing tunnel", this.output.name, name);
       this.replace(true);
@@ -563,7 +566,6 @@ export const Tunnel = Resource(
           (error.message.includes("already have a tunnel with this name") ||
             error.message.includes("already exists"))
         ) {
-          console.log(error);
           logger.log(`Tunnel '${name}' already exists, adopting it`);
 
           // Find the existing tunnel by name
@@ -596,6 +598,12 @@ export const Tunnel = Resource(
       }
     }
 
+    // Ensure tunnel token is available (unless we're replacing)
+    // Sometimes Cloudflare doesn't return the token in the initial response
+    if (!isReplacing && !tunnelData.token) {
+      tunnelData.token = await getTunnelToken(api, tunnelData.id);
+    }
+
     // Handle DNS records for ingress hostnames
     let dnsRecords = this.output?.dnsRecords || {};
 
@@ -918,3 +926,30 @@ export async function findTunnelByName(
   // No matching tunnel found
   return null;
 }
+
+/**
+ * Get tunnel token
+ */
+async function getTunnelToken(
+  api: CloudflareApi,
+  tunnelId: string,
+): Promise<string> {
+  const response = await api.get(
+    `/accounts/${api.accountId}/cfd_tunnel/${tunnelId}/token`,
+  );
+
+  if (!response.ok) {
+    logger.error(
+      `Failed to fetch token for tunnel ${tunnelId}: ${response.status} ${response.statusText}`,
+    );
+    await handleApiError(response, "get token", "tunnel", tunnelId);
+  }
+
+  const data = (await response.json()) as CloudflareApiResponse<string>;
+  if (!data.result) {
+    logger.warn(`Could not retrieve token for tunnel ${tunnelId}`);
+  } else {
+    logger.log(`Successfully fetched token for tunnel ${tunnelId}`);
+  }
+  return data.result;
+}

package/src/cloudflare/vite/plugin.ts

@@ -1,21 +1,19 @@
 import { cloudflare, type PluginConfig } from "@cloudflare/vite-plugin";
-import path from "node:path";
+import path from "pathe";
 import type { PluginOption } from "vite";
 import {
   getDefaultConfigPath,
   getDefaultPersistPath,
   validateConfigPath,
-  validatePersistPath,
 } from "../miniflare/paths.ts";
 
 const alchemy = (config?: PluginConfig): PluginOption => {
   const persistState = config?.persistState ?? {
-    path: validatePersistPath(
+    path:
       typeof config?.persistState === "object"
         ? config.persistState.path
         : // persist path should default to the /.alchemy/miniflare/v3
           getDefaultPersistPath(),
-    ),
   };
   if (typeof persistState === "object" && persistState.path.endsWith("v3")) {
     persistState.path = path.dirname(persistState.path);

package/src/cloudflare/website.ts

@@ -1,6 +1,6 @@
 import assert from "node:assert";
 import fs from "node:fs/promises";
-import path from "node:path";
+import path from "pathe";
 import { Exec } from "../os/index.ts";
 import { Scope } from "../scope.ts";
 import { dedent } from "../util/dedent.ts";
@@ -9,7 +9,6 @@ import { Assets } from "./assets.ts";
 import type { Bindings } from "./bindings.ts";
 import { DEFAULT_COMPATIBILITY_DATE } from "./compatibility-date.gen.ts";
 import { unionCompatibilityFlags } from "./compatibility-presets.ts";
-import { writeMiniflareSymlink } from "./miniflare/symlink-miniflare-state.ts";
 import {
   extractStringAndSecretBindings,
   unencryptSecrets,
@@ -263,10 +262,6 @@ export async function Website<B extends Bindings>(
     await fs.writeFile(paths.entrypoint, content);
   }
 
-  if (Scope.current.local) {
-    await writeMiniflareSymlink(Scope.current.rootDir, paths.cwd);
-  }
-
   await WranglerJson({
     path: path.relative(paths.cwd, paths.wrangler.path),
     worker,

package/src/cloudflare/worker-assets.ts

@@ -30,12 +30,7 @@ interface FileMetadata {
  */
 export async function uploadAssets(
   api: CloudflareApi,
-  {
-    workerName,
-    assets,
-    assetConfig,
-    namespace,
-  }: {
+  { workerName, assets, assetConfig, namespace }: {
     workerName: string;
     assets: Assets;
     assetConfig?: WorkerProps["assets"];

package/src/cloudflare/worker-metadata.ts

@@ -239,9 +239,11 @@ export async function prepareWorkerMetadata(
     };
   },
 ): Promise<WorkerMetadata> {
-  const oldSettings = await (props.unstable_cacheWorkerSettings
-    ? getWorkerSettingsWithCache
-    : getWorkerSettings)(api, props.workerName);
+  const oldSettings = await (
+    props.unstable_cacheWorkerSettings
+      ? getWorkerSettingsWithCache
+      : getWorkerSettings
+  )(api, props.workerName);
   const oldTags: string[] | undefined = Array.from(
     new Set([
       ...(oldSettings?.default_environment?.script?.tags ?? []),

package/src/cloudflare/worker-tail.ts

@@ -110,7 +110,9 @@ class TailClient {
         const status = event.response?.status ?? 500;
         // TODO: make this look nicer
         logger.log(
-          `${prefix} ${pc.gray(event.request.method)} ${url.pathname} ${pc.dim(">")} ${status >= 200 && status < 300 ? pc.green(status) : pc.red(status)} ${pc.gray(`(cpu: ${Math.round(data.cpuTime)}ms, wall: ${Math.round(data.wallTime)}ms)`)}`,
+          `${prefix} ${pc.gray(event.request.method)} ${url.pathname} ${pc.dim(">")} ${
+            status >= 200 && status < 300 ? pc.green(status) : pc.red(status)
+          } ${pc.gray(`(cpu: ${Math.round(data.cpuTime)}ms, wall: ${Math.round(data.wallTime)}ms)`)}`,
         );
       }
       for (const log of data.logs) {

package/src/cloudflare/worker.ts

@@ -34,6 +34,7 @@ import {
 } from "./durable-object-namespace.ts";
 import { type EventSource, isQueueEventSource } from "./event-source.ts";
 import { deleteMiniflareWorkerData } from "./miniflare/delete.ts";
+import { MiniflareController } from "./miniflare/miniflare-controller.ts";
 import {
   QueueConsumer,
   deleteQueueConsumer,
@@ -966,9 +967,6 @@ const _Worker = Resource(
       if (props.dev?.url) {
         url = props.dev.url;
       } else {
-        const { MiniflareController } = await import(
-          "./miniflare/miniflare-controller.js"
-        );
         const controller = MiniflareController.singleton;
         url = await controller.add({
           api,

package/src/cloudflare/wrangler.json.ts

@@ -1,5 +1,5 @@
 import fs from "node:fs/promises";
-import path from "node:path";
+import path from "pathe";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { Scope } from "../scope.ts";
@@ -861,7 +861,6 @@ function processBindings(
       });
     } else {
       console.log("binding", binding);
-      // biome-ignore lint/correctness/noVoidTypeReturn: it returns never
       return assertNever(binding);
     }
   }

package/src/coinbase/evm-account.ts

@@ -207,7 +207,9 @@ export const EvmAccount = Resource(
             );
 
             console.log(
-              `💧 Requested ${toFund.length} new faucet fund${toFund.length === 1 ? "" : "s"} for ${this.output.address}`,
+              `💧 Requested ${toFund.length} new faucet fund${
+                toFund.length === 1 ? "" : "s"
+              } for ${this.output.address}`,
             );
           }
         } catch (error: any) {

package/src/coinbase/evm-smart-account.ts

@@ -234,7 +234,9 @@ export const EvmSmartAccount = Resource(
             );
 
             console.log(
-              `💧 Requested ${toFund.length} new faucet fund${toFund.length === 1 ? "" : "s"} for smart account ${this.output.address}`,
+              `💧 Requested ${toFund.length} new faucet fund${
+                toFund.length === 1 ? "" : "s"
+              } for smart account ${this.output.address}`,
             );
           }
         } catch (error: any) {

package/src/coinbase/faucet.ts

@@ -8,9 +8,9 @@
  *   bun node_modules/alchemy/src/coinbase/faucet.ts backend/dev  # Fund specific scope
  */
 
-import { readFile, access } from "node:fs/promises";
-import { join } from "node:path";
 import { glob } from "glob";
+import { access, readFile } from "node:fs/promises";
+import { join } from "pathe";
 import { createCdpClient } from "./client.ts";
 import type { EvmAccount } from "./evm-account.ts";
 import type { EvmSmartAccount } from "./evm-smart-account.ts";

package/src/docker/api.ts

@@ -2,7 +2,7 @@ import { execa } from "execa";
 import { Buffer } from "node:buffer";
 import { spawn } from "node:child_process";
 import fs from "node:fs/promises";
-import path from "node:path";
+import path from "pathe";
 import type { Duration, HealthcheckConfig } from "./container.ts";
 
 /**
@@ -159,7 +159,9 @@ export class DockerApi {
       return true;
     } catch (error) {
       console.log(
-        `Docker daemon not running: ${error instanceof Error ? error.message : String(error)}`,
+        `Docker daemon not running: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
       );
       return false;
     }

package/src/docker/image.ts

@@ -1,6 +1,6 @@
 import fs from "node:fs/promises";
 import os from "node:os";
-import path from "node:path";
+import path from "pathe";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import type { Secret } from "../secret.ts";

package/src/esbuild/bundle.ts

@@ -1,7 +1,7 @@
 import type esbuild from "esbuild";
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
-import path from "node:path";
+import path from "pathe";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { logger } from "../util/logger.ts";

package/src/fs/file.ts

@@ -1,5 +1,5 @@
 import fs from "node:fs";
-import path from "node:path";
+import path from "pathe";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { ignore } from "../util/ignore.ts";

package/src/github/secret.ts

@@ -190,7 +190,11 @@ export const GitHubSecret = Resource(
         // If secret type changed, we need to delete the old one first
         if (secretTypeChanged) {
           logger.log(
-            `Secret type changed from ${wasEnvironmentSecret ? "environment" : "repository"} to ${isEnvironmentSecret ? "environment" : "repository"} secret. Deleting the old secret first.`,
+            `Secret type changed from ${
+              wasEnvironmentSecret ? "environment" : "repository"
+            } to ${
+              isEnvironmentSecret ? "environment" : "repository"
+            } secret. Deleting the old secret first.`,
           );
 
           try {

package/src/llms.ts

@@ -1,5 +1,5 @@
 import fs from "node:fs/promises";
-import path from "node:path";
+import path from "pathe";
 
 export interface AlchemyRule {
   name: string;

package/src/neon/api/sdk.gen.ts

@@ -338,9 +338,7 @@ export type Options<
 class _HeyApiClient {
   protected _client: Client = client;
 
-  constructor(args?: {
-    client?: Client;
-  }) {
+  constructor(args?: { client?: Client }) {
     if (args?.client) {
       this._client = args.client;
     }

package/src/os/exec.ts

@@ -1,6 +1,6 @@
 import { spawn, type SpawnOptions } from "node:child_process";
 import { createHash } from "node:crypto";
-import { join } from "node:path";
+import { join } from "pathe";
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import type { Secret } from "../secret.ts";
@@ -356,7 +356,9 @@ export async function exec(
       } else {
         reject(
           new Error(
-            `Command failed with exit code ${code}${stderr ? `: ${stderr}` : ""}`,
+            `Command failed with exit code ${code}${
+              stderr ? `: ${stderr}` : ""
+            }`,
           ),
         );
       }

package/src/planetscale/api/sdk.gen.ts

@@ -355,9 +355,7 @@ export type Options<
 class _HeyApiClient {
   protected _client: Client = client;
 
-  constructor(args?: {
-    client?: Client;
-  }) {
+  constructor(args?: { client?: Client }) {
     if (args?.client) {
       this._client = args.client;
     }

package/src/prisma-postgres/api/sdk.gen.ts

@@ -86,9 +86,7 @@ export type Options<
 class _HeyApiClient {
   protected _client: Client = client;
 
-  constructor(args?: {
-    client?: Client;
-  }) {
+  constructor(args?: { client?: Client }) {
     if (args?.client) {
       this._client = args.client;
     }

package/src/scope.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-import path from "node:path";
 import util from "node:util";
+import path from "pathe";
 import pc from "picocolors";
 import type { Phase } from "./alchemy.ts";
 import { destroy, destroyAll, DestroyStrategy } from "./destroy.ts";
@@ -173,8 +173,8 @@ export class Scope {
 
   public static readonly KIND = "alchemy::Scope" as const;
 
-  public static storage = (globalThis.__ALCHEMY_STORAGE__ ??=
-    new AsyncLocalStorage<Scope>());
+  public static storage = globalThis.__ALCHEMY_STORAGE__ ??=
+    new AsyncLocalStorage<Scope>();
 
   public static getScope(): Scope | undefined {
     return Scope.storage.getStore();

package/src/sentry/client-key.ts

@@ -340,11 +340,7 @@ async function findClientKeyByName(
  */
 async function getClientKeyName(
   api: SentryApi,
-  {
-    organization,
-    project,
-    keyId,
-  }: {
+  { organization, project, keyId }: {
     organization: string;
     project: string;
     keyId: string;

package/src/state/file-system-state-store.ts

@@ -1,5 +1,5 @@
 import fs from "node:fs";
-import path from "node:path";
+import path from "pathe";
 import { ResourceScope } from "../resource.ts";
 import type { Scope } from "../scope.ts";
 import { deserialize, serialize } from "../serde.ts";

package/src/state/migrations.ts

@@ -1,4 +1,4 @@
-import path from "node:path";
+import path from "pathe";
 
 export const MIGRATIONS_DIRECTORY = path.join(
   import.meta.dirname,

package/src/state/sqlite-state-store.ts

@@ -1,6 +1,6 @@
 import type { Config as LibSQLConfig } from "@libsql/client";
 import fs from "node:fs/promises";
-import path from "node:path";
+import path from "pathe";
 import type { Scope } from "../scope.ts";
 import { exists } from "../util/exists.ts";
 import { memoize } from "../util/memoize.ts";

package/src/stripe/file.ts

@@ -121,21 +121,21 @@ export interface File {
  * @example
  * // Upload a dispute evidence file
  * const disputeEvidence = await File("dispute-evidence", {
- *   file: fs.readFileSync("./evidence.pdf"),
+ *   file: await fs.promises.readFile("./evidence.pdf"),
  *   purpose: "dispute_evidence"
  * });
  *
  * @example
  * // Upload an identity document
  * const identityDocument = await File("identity-doc", {
- *   file: fs.readFileSync("./passport.jpg"),
+ *   file: await fs.promises.readFile("./passport.jpg"),
  *   purpose: "identity_document"
  * });
  *
  * @example
  * // Upload a business logo with file link
  * const businessLogo = await File("business-logo", {
- *   file: fs.readFileSync("./logo.png"),
+ *   file: await fs.promises.readFile("./logo.png"),
  *   purpose: "business_logo",
  *   fileLink: {
  *     create: true,

package/src/test/bun.ts

@@ -1,7 +1,7 @@
 /// <reference types="bun" />
 
 import { afterAll, beforeAll, it } from "bun:test";
-import path from "node:path";
+import path from "pathe";
 import { alchemy } from "../alchemy.ts";
 import { Scope } from "../scope.ts";
 import type { TestOptions } from "./options.ts";
@@ -98,7 +98,9 @@ export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
   // Create local test scope based on filename
   const scope = new Scope({
     parent: undefined,
-    scopeName: `${defaultOptions.prefix ? `${defaultOptions.prefix}-` : ""}${path.basename(meta.filename)}`,
+    scopeName: `${
+      defaultOptions.prefix ? `${defaultOptions.prefix}-` : ""
+    }${path.basename(meta.filename)}`,
     // parent: globalTestScope,
     stateStore: defaultOptions?.stateStore,
     phase: "up",

package/src/test/prune.ts

@@ -1,8 +1,8 @@
 import * as esbuild from "esbuild";
 import { glob } from "glob";
 import { exec, spawn } from "node:child_process";
-import path from "node:path";
 import { promisify } from "node:util";
+import path from "pathe";
 
 const execAsync = promisify(exec);
 

package/src/test/vitest.ts

@@ -1,4 +1,4 @@
-import path from "node:path";
+import path from "pathe";
 import { afterAll, beforeAll, it } from "vitest";
 import { alchemy } from "../alchemy.ts";
 import { Scope } from "../scope.ts";
@@ -128,7 +128,9 @@ export function test(
 
   const scope = new Scope({
     parent: undefined,
-    scopeName: `${defaultOptions.prefix ? `${defaultOptions.prefix}-` : ""}${path.basename(meta.filename)}`,
+    scopeName: `${
+      defaultOptions.prefix ? `${defaultOptions.prefix}-` : ""
+    }${path.basename(meta.filename)}`,
     stateStore: defaultOptions?.stateStore,
     phase: "up",
     noTrack: true,