alchemy 0.70.2 → 0.71.1

package/src/cloudflare/miniflare/build-worker-options.ts

@@ -1,4 +1,5 @@
 import * as miniflare from "miniflare";
+import path from "pathe";
 import { assertNever } from "../../util/assert-never.ts";
 import type { HTTPServer } from "../../util/http.ts";
 import { logger } from "../../util/logger.ts";
@@ -26,6 +27,7 @@ export interface MiniflareWorkerInput {
   bundle: WorkerBundleSource;
   port: number | undefined;
   tunnel: boolean | undefined;
+  cwd: string;
 }
 
 type RemoteOnlyBindingType =
@@ -78,11 +80,6 @@ export const buildWorkerOptions = async (
         proxy: true,
       },
     ],
-    containerEngine: {
-      localDocker: {
-        socketPath: await getDockerSocketPath(),
-      },
-    },
     // This exposes the worker as a route that can be accessed by setting the MF-Route-Override header.
     routes: [input.name],
   };
@@ -119,7 +116,7 @@ export const buildWorkerOptions = async (
       case "assets": {
         options.assets = {
           binding: key,
-          directory: binding.path,
+          directory: path.resolve(input.cwd, binding.path),
           assetConfig: {
             html_handling: input.assets?.html_handling,
             not_found_handling: input.assets?.not_found_handling,
@@ -144,6 +141,11 @@ export const buildWorkerOptions = async (
             imageName: binding.image.imageRef,
           },
         };
+        options.containerEngine = {
+          localDocker: {
+            socketPath: await getDockerSocketPath(),
+          },
+        };
         break;
       }
       case "d1": {
@@ -268,6 +270,10 @@ export const buildWorkerOptions = async (
             type: "r2_bucket",
             name: key,
             bucket_name: binding.name,
+            jurisdiction:
+              binding.jurisdiction === "default"
+                ? undefined
+                : binding.jurisdiction,
             raw: true,
           });
         } else {
@@ -308,6 +314,10 @@ export const buildWorkerOptions = async (
         };
         break;
       }
+      case "worker_loader": {
+        (options.workerLoaders ??= {})[key] = {};
+        break;
+      }
       case "workflow": {
         (options.workflows ??= {})[key] = {
           name: binding.workflowName,
@@ -329,11 +339,13 @@ export const buildWorkerOptions = async (
       );
     }
     if (isQueueEventSource(eventSource)) {
+      const dlq = eventSource.settings?.deadLetterQueue;
       (options.queueConsumers ??= {})[queue.name] = {
         maxBatchSize: eventSource.settings?.batchSize,
         maxBatchTimeout: eventSource.settings?.maxWaitTimeMs,
         maxRetries: eventSource.settings?.maxRetries,
         retryDelay: eventSource.settings?.retryDelay,
+        deadLetterQueue: typeof dlq === "string" ? dlq : dlq?.name,
       };
     } else {
       (options.queueConsumers ??= {})[eventSource.name] = {};

package/src/cloudflare/miniflare/remote-binding-proxy.ts

@@ -82,6 +82,8 @@ export async function createRemoteProxyWorker(input: {
         headers,
         body: req.body,
         redirect: "manual",
+        // @ts-expect-error - caused by @cloudflare/workers-types
+        duplex: req.body ? "half" : undefined,
       });
 
       const responseHeaders = new Headers(res.headers);

package/src/cloudflare/queue-consumer.ts

@@ -318,7 +318,7 @@ export async function createQueueConsumer(
         typeof props.settings.deadLetterQueue === "string"
           ? props.settings.deadLetterQueue
           : props.settings.deadLetterQueue.name;
-      createPayload.settings.dead_letter_queue = dlqName;
+      createPayload.dead_letter_queue = dlqName;
     }
   }
 
@@ -405,7 +405,7 @@ async function updateQueueConsumer(
         typeof props.settings.deadLetterQueue === "string"
           ? props.settings.deadLetterQueue
           : props.settings.deadLetterQueue.name;
-      updatePayload.settings.dead_letter_queue = dlqName;
+      updatePayload.dead_letter_queue = dlqName;
     }
   }
 

package/src/cloudflare/worker-loader.ts

@@ -0,0 +1,12 @@
+/**
+ * A binding for dynamic worker loaders.
+ *
+ */
+export type WorkerLoader = {
+  type: "worker_loader";
+};
+export function WorkerLoader(): WorkerLoader {
+  return {
+    type: "worker_loader",
+  };
+}

package/src/cloudflare/worker-metadata.ts

@@ -568,6 +568,11 @@ export async function prepareWorkerMetadata(
         name: bindingName,
         namespace: binding.namespaceName,
       });
+    } else if (binding.type === "worker_loader") {
+      meta.bindings.push({
+        type: "worker_loader",
+        name: bindingName,
+      });
     } else if (binding.type === "secret_key") {
       meta.bindings.push({
         type: "secret_key",

package/src/cloudflare/worker-subdomain.ts

@@ -111,7 +111,7 @@ export async function enableWorkerSubdomain(
         ),
       ),
     (error) => error instanceof CloudflareApiError && error.status === 404,
-    10,
+    20,
     1000,
   );
 }

package/src/cloudflare/worker.ts

@@ -982,9 +982,11 @@ const _Worker = Resource(
           bundle,
           port: props.dev?.port,
           tunnel: props.dev?.tunnel ?? this.scope.tunnel,
+          cwd: props.cwd ?? process.cwd(),
         });
         this.onCleanup(() => controller.dispose());
       }
+
       await provisionResources(
         {
           ...props,
@@ -1240,12 +1242,18 @@ async function provisionResources<B extends Bindings>(
     containers: options.containers,
     domains: props.domains?.map((domain) => {
       if (typeof domain === "string") {
+        if (domain === "") {
+          throw new Error("Domain names cannot be empty strings");
+        }
         return {
           name: domain,
           zoneId: undefined,
           adopt: props.adopt,
         };
       }
+      if (domain.domainName === "") {
+        throw new Error("Domain names cannot be empty strings");
+      }
       return {
         name: domain.domainName,
         zoneId: domain.zoneId,

package/src/cloudflare/wrangler.json.ts

@@ -4,7 +4,6 @@ import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { Scope } from "../scope.ts";
 import { isSecret } from "../secret.ts";
-import { unencryptSecrets } from "./util/filter-env-bindings.ts";
 import { assertNever } from "../util/assert-never.ts";
 import type { Bindings, WorkerBindingRateLimit } from "./bindings.ts";
 import type { R2BucketJurisdiction } from "./bucket.ts";
@@ -12,6 +11,7 @@ import type { DurableObjectNamespace } from "./durable-object-namespace.ts";
 import type { EventSource } from "./event-source.ts";
 import { isQueueEventSource } from "./event-source.ts";
 import { isQueue } from "./queue.ts";
+import { unencryptSecrets } from "./util/filter-env-bindings.ts";
 import { isWorker, type Worker, type WorkerProps } from "./worker.ts";
 
 type WranglerJsonRateLimit = Omit<WorkerBindingRateLimit, "type"> & {
@@ -301,7 +301,7 @@ export interface WranglerJsonSpec {
    */
   ai?: {
     binding: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   };
 
   /**
@@ -309,7 +309,7 @@ export interface WranglerJsonSpec {
    */
   browser?: {
     binding: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   };
 
   /**
@@ -317,7 +317,7 @@ export interface WranglerJsonSpec {
    */
   images?: {
     binding: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   };
 
   /**
@@ -330,7 +330,7 @@ export interface WranglerJsonSpec {
      * The ID of the KV namespace used during `wrangler dev`
      */
     preview_id?: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -355,7 +355,7 @@ export interface WranglerJsonSpec {
      * The preview name of this R2 bucket at the edge.
      */
     preview_bucket_name?: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -376,6 +376,10 @@ export interface WranglerJsonSpec {
     entrypoint?: string;
   }[];
 
+  worker_loaders?: {
+    binding: string;
+  }[];
+
   /**
    * Workflow bindings
    */
@@ -392,7 +396,7 @@ export interface WranglerJsonSpec {
   vectorize?: {
     binding: string;
     index_name: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -412,7 +416,7 @@ export interface WranglerJsonSpec {
      * The ID of the D1 database used during `wrangler dev`
      */
     preview_database_id?: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -495,7 +499,7 @@ export interface WranglerJsonSpec {
   dispatch_namespaces?: {
     binding: string;
     namespace: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[];
 
   /**
@@ -555,7 +559,7 @@ function processBindings(
     binding: string;
     id: string;
     preview_id: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[] = [];
   const durableObjects: {
     name: string;
@@ -588,7 +592,7 @@ function processBindings(
     database_name: string;
     migrations_dir?: string;
     preview_database_id: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[] = [];
   const queues: {
     producers: { queue: string; binding: string }[];
@@ -604,7 +608,7 @@ function processBindings(
   const vectorizeIndexes: {
     binding: string;
     index_name: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[] = [];
   const analyticsEngineDatasets: { binding: string; dataset: string }[] = [];
   const hyperdrive: {
@@ -621,12 +625,15 @@ function processBindings(
   const dispatchNamespaces: {
     binding: string;
     namespace: string;
-    experimental_remote?: boolean;
+    remote?: boolean;
   }[] = [];
   const unsafeBindings: WranglerJsonRateLimit[] = [];
   const containers: {
     class_name: string;
   }[] = [];
+  const workerLoaders: {
+    binding: string;
+  }[] = [];
 
   for (const eventSource of eventSources ?? []) {
     if (isQueueEventSource(eventSource)) {
@@ -686,9 +693,7 @@ function processBindings(
         binding: bindingName,
         id: id,
         preview_id: id,
-        ...("dev" in binding && binding.dev?.remote
-          ? { experimental_remote: true }
-          : {}),
+        ...("dev" in binding && binding.dev?.remote ? { remote: true } : {}),
       });
     } else if (
       typeof binding === "object" &&
@@ -718,7 +723,7 @@ function processBindings(
         preview_bucket_name: name,
         jurisdiction:
           binding.jurisdiction === "default" ? undefined : binding.jurisdiction,
-        ...(binding.dev?.remote ? { experimental_remote: true } : {}),
+        ...(binding.dev?.remote ? { remote: true } : {}),
       });
     } else if (binding.type === "secret") {
       // Secret binding
@@ -746,7 +751,7 @@ function processBindings(
         database_name: binding.name,
         migrations_dir: binding.migrationsDir,
         preview_database_id: id,
-        ...(binding.dev?.remote ? { experimental_remote: true } : {}),
+        ...(binding.dev?.remote ? { remote: true } : {}),
       });
     } else if (binding.type === "queue") {
       const id =
@@ -762,7 +767,7 @@ function processBindings(
         binding: bindingName,
         index_name: binding.name,
         // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
-        experimental_remote: true,
+        remote: true,
       });
     } else if (binding.type === "browser") {
       if (spec.browser) {
@@ -771,7 +776,7 @@ function processBindings(
       spec.browser = {
         binding: bindingName,
         // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
-        experimental_remote: true,
+        remote: true,
       };
     } else if (binding.type === "ai") {
       if (spec.ai) {
@@ -780,7 +785,7 @@ function processBindings(
       spec.ai = {
         binding: bindingName,
         // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
-        experimental_remote: true,
+        remote: true,
       };
     } else if (binding.type === "images") {
       if (spec.images) {
@@ -789,7 +794,7 @@ function processBindings(
       spec.images = {
         binding: bindingName,
         // https://developers.cloudflare.com/workers/development-testing/#recommended-remote-bindings
-        experimental_remote: true,
+        remote: true,
       };
     } else if (binding.type === "analytics_engine") {
       analyticsEngineDatasets.push({
@@ -830,7 +835,7 @@ function processBindings(
       dispatchNamespaces.push({
         binding: bindingName,
         namespace: binding.namespaceName,
-        experimental_remote: true,
+        remote: true,
       });
     } else if (binding.type === "ratelimit") {
       unsafeBindings.push({
@@ -850,6 +855,10 @@ function processBindings(
       containers.push({
         class_name: binding.className,
       });
+    } else if (binding.type === "worker_loader") {
+      workerLoaders.push({
+        binding: bindingName,
+      });
     } else {
       console.log("binding", binding);
       // biome-ignore lint/correctness/noVoidTypeReturn: it returns never
@@ -930,4 +939,8 @@ function processBindings(
       bindings: unsafeBindings,
     };
   }
+
+  if (workerLoaders.length > 0) {
+    spec.worker_loaders = workerLoaders;
+  }
 }

package/src/cloudflare/zone.ts

@@ -414,7 +414,7 @@ export const Zone = Resource(
 
     // Add a small delay to ensure settings are propagated
     // TODO(michael): do we need this?
-    // https://github.com/sam-goodwin/alchemy/issues/681
+    // https://github.com/alchemy-run/alchemy/issues/681
     await new Promise((resolve) => setTimeout(resolve, 2000));
 
     // Update Bot Management configuration if provided

package/src/destroy.ts

@@ -14,6 +14,7 @@ import { isScope, type PendingDeletions, Scope } from "./scope.ts";
 import type { State } from "./state.ts";
 import { formatFQN } from "./util/cli.ts";
 import { logger } from "./util/logger.ts";
+import { createAndSendEvent } from "./util/telemetry.ts";
 
 export function isDestroyedSignal(error: any): error is DestroyedSignal {
   return error instanceof Error && (error as any).kind === "DestroyedSignal";
@@ -109,6 +110,7 @@ export async function destroy(
     logger.warn(`Resource "${instance[ResourceFQN]}" has no scope`);
   }
   const quiet = options?.quiet ?? scope.quiet;
+  const start = performance.now();
 
   try {
     if (!quiet && !options?.noop) {
@@ -122,6 +124,15 @@ export async function destroy(
       });
     }
 
+    await createAndSendEvent({
+      event: "resource.start",
+      resource: instance[ResourceKind],
+      status: "deleting",
+      phase: "destroy",
+      duration: performance.now() - start,
+      replaced: !!options?.replace,
+    });
+
     let state: State;
     let props: ResourceProps | undefined;
     if (options?.replace) {
@@ -224,7 +235,28 @@ export async function destroy(
         status: "success",
       });
     }
+
+    await createAndSendEvent({
+      event: "resource.success",
+      resource: instance[ResourceKind],
+      status: "deleted",
+      phase: "destroy",
+      duration: performance.now() - start,
+      replaced: !!options?.replace,
+    });
   } catch (error) {
+    let errorToSend = error instanceof Error ? error : new Error(String(error));
+    await createAndSendEvent(
+      {
+        event: "resource.error",
+        resource: instance[ResourceKind],
+        duration: performance.now() - start,
+        phase: "destroy",
+        status: "deleting",
+        replaced: !!options?.replace,
+      },
+      errorToSend,
+    );
     logger.error(error);
     throw error;
   }

package/src/docker/image.ts

@@ -190,7 +190,7 @@ export const Image = Resource(
 
       // Add build arguments
       for (const [key, value] of Object.entries(buildOptions)) {
-        buildArgs.push("--build-arg", `${key}="${value}"`);
+        buildArgs.push("--build-arg", `${key}=${value}`);
       }
 
       buildArgs.push("-f", dockerfile);

package/src/github/comment.ts

@@ -173,17 +173,17 @@ export const GitHubComment = Resource(
     props: GitHubCommentProps,
   ): Promise<GitHubComment> {
     // Create authenticated Octokit client - will automatically handle token resolution
-    const octokit = await createGitHubClient({
-      token: props.token?.unencrypted,
-    });
-
-    // Verify authentication and permissions
-    if (!this.quiet) {
-      await verifyGitHubAuth(octokit, props.owner, props.repository);
-    }
 
     if (this.phase === "delete") {
       if (this.output?.commentId && props.allowDelete) {
+        const octokit = await createGitHubClient({
+          token: props.token?.unencrypted,
+        });
+
+        // Verify authentication and permissions
+        if (!this.quiet) {
+          await verifyGitHubAuth(octokit, props.owner, props.repository);
+        }
         try {
           // Delete the comment
           await octokit.rest.issues.deleteComment({
@@ -209,6 +209,15 @@ export const GitHubComment = Resource(
       return this.destroy();
     }
 
+    const octokit = await createGitHubClient({
+      token: props.token?.unencrypted,
+    });
+
+    // Verify authentication and permissions
+    if (!this.quiet) {
+      await verifyGitHubAuth(octokit, props.owner, props.repository);
+    }
+
     try {
       if (this.phase === "update" && this.output?.commentId) {
         // Update existing comment

package/src/resource.ts

@@ -179,7 +179,7 @@ export function Resource<
         const error = new Error(
           `Resource ${resourceID} already exists in the stack and is of a different type: '${otherResource?.[ResourceKind]}' !== '${type}'`,
         );
-        createAndSendEvent(
+        await createAndSendEvent(
           {
             event: "resource.error",
             resource: type,

package/src/scope.ts

@@ -30,6 +30,7 @@ import { logger } from "./util/logger.ts";
 import { AsyncMutex } from "./util/mutex.ts";
 import { ALCHEMY_ROOT } from "./util/root-dir.ts";
 import { createAndSendEvent } from "./util/telemetry.ts";
+import { validateResourceID } from "./util/validate-resource-id.ts";
 
 export class RootScopeStateAttemptError extends Error {
   constructor() {
@@ -115,6 +116,11 @@ export interface ScopeOptions extends ProviderCredentials {
    * `undefined` if the program was not run with `--app`
    */
   isSelected?: boolean;
+  /**
+   * @internal
+   * The timestamp when the scope was started.
+   */
+  startedAt?: DOMHighResTimeStamp;
 }
 
 /**
@@ -208,6 +214,7 @@ export class Scope {
   public readonly dotAlchemy: string;
   public readonly isSelected: boolean | undefined;
   public readonly profile: string | undefined;
+  public readonly startedAt: DOMHighResTimeStamp;
 
   // Provider credentials for scope-level credential overrides
   public readonly providerCredentials: ProviderCredentials;
@@ -215,7 +222,6 @@ export class Scope {
   private isErrored = false;
   private isSkipped = false;
   private finalized = false;
-  private startedAt = performance.now();
   private deferred: (() => Promise<any>)[] = [];
   private cleanups: (() => Promise<void>)[] = [];
 
@@ -248,6 +254,7 @@ export class Scope {
       isSelected,
       noTrack,
       profile,
+      startedAt,
       ...providerCredentials
     } = options;
 
@@ -256,7 +263,7 @@ export class Scope {
     this.parent = parent ?? Scope.getScope();
     this.rootDir = rootDir ?? this.parent?.rootDir ?? ALCHEMY_ROOT;
     this.isSelected = isSelected ?? this.parent?.isSelected;
-
+    this.startedAt = startedAt ?? this.parent?.startedAt ?? performance.now();
     this.dotAlchemy =
       dotAlchemy ??
       this.parent?.dotAlchemy ??
@@ -265,21 +272,17 @@ export class Scope {
     // Store provider credentials (TypeScript ensures no conflicts with core options)
     this.providerCredentials = providerCredentials as ProviderCredentials;
 
-    const isChild = this.parent !== undefined;
-    if (this.scopeName?.includes(":") && isChild) {
-      // TODO(sam): relax this constraint once we move to SQLite3 store
-      throw new Error(
-        `Scope name "${this.scopeName}" cannot contain double colons`,
-      );
-    }
-
     this.stage = stage ?? this.parent?.stage ?? DEFAULT_STAGE;
     this.profile = profile ?? this.parent?.profile;
     this.parent?.children.set(this.scopeName!, this);
     this.quiet = quiet ?? this.parent?.quiet ?? false;
-    if (this.parent && !this.scopeName) {
-      throw new Error("Scope name is required when creating a child scope");
+    if (this.parent) {
+      if (!this.scopeName) {
+        throw new Error("Scope name is required when creating a child scope");
+      }
+      validateResourceID(this.scopeName, "Scope");
     }
+
     this.password = password ?? this.parent?.password;
     this.noTrack = noTrack ?? this.parent?.noTrack ?? false;
     const resolvedPhase = phase ?? this.parent?.phase;
@@ -308,7 +311,7 @@ export class Scope {
       destroyStrategy ?? this.parent?.destroyStrategy ?? "sequential";
     if (this.local) {
       this.logger.warnOnce(
-        "Development mode is in beta. Please report any issues to https://github.com/sam-goodwin/alchemy/issues.",
+        "Development mode is in beta. Please report any issues to https://github.com/alchemy-run/alchemy/issues.",
       );
     }
 
@@ -518,10 +521,15 @@ export class Scope {
       this.parent === undefined ||
       this?.parent?.scopeName === this.root.scopeName;
     if (this.phase === "read") {
-      createAndSendEvent({
-        event: "alchemy.success",
-        duration: performance.now() - this.startedAt,
-      });
+      if (this.parent == null) {
+        await createAndSendEvent(
+          {
+            event: this.isErrored ? "alchemy.error" : "alchemy.success",
+            duration: performance.now() - this.startedAt,
+          },
+          this.isErrored ? new Error("Scope failed") : undefined,
+        );
+      }
       return;
     }
     if (this.finalized && !shouldForce) {
@@ -569,18 +577,17 @@ export class Scope {
         force: shouldForce,
         noop: options?.noop,
       });
-      createAndSendEvent({
-        event: "alchemy.success",
-        duration: performance.now() - this.startedAt,
-      });
     } else if (this.isErrored) {
       this.logger.warn("Scope is in error, skipping finalize");
-      createAndSendEvent(
+    }
+
+    if (this.parent == null) {
+      await createAndSendEvent(
         {
-          event: "alchemy.error",
+          event: this.isErrored ? "alchemy.error" : "alchemy.success",
           duration: performance.now() - this.startedAt,
         },
-        new Error("Scope failed"),
+        this.isErrored ? new Error("Scope failed") : undefined,
       );
     }
 
@@ -599,7 +606,7 @@ export class Scope {
         throw e;
       })) ?? [];
 
-    //todo(michael): remove once we deprecate doss; see: https://github.com/sam-goodwin/alchemy/issues/585
+    //todo(michael): remove once we deprecate doss; see: https://github.com/alchemy-run/alchemy/issues/585
     let hasCorruptedResources = false;
     if (pendingDeletions) {
       for (const { resource, oldProps } of pendingDeletions) {

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

@@ -30,7 +30,7 @@ export class InstrumentedStateStore<T extends StateStore>
       error = err;
       throw err;
     } finally {
-      createAndSendEvent(
+      await createAndSendEvent(
         {
           event,
           stateStore: this.stateStoreClass,