alchemy 0.77.0 → 0.77.2

package/src/cloudflare/d1-database.ts

@@ -8,6 +8,7 @@ import {
   type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.ts";
+import { withJurisdiction } from "./bucket.ts";
 import { cloneD1Database } from "./d1-clone.ts";
 import { applyLocalD1Migrations } from "./d1-local-migrations.ts";
 import { applyMigrations, listMigrationsFiles } from "./d1-migrations.ts";
@@ -15,6 +16,8 @@ import { deleteMiniflareBinding } from "./miniflare/delete.ts";
 
 const DEFAULT_MIGRATIONS_TABLE = "d1_migrations";
 
+export type D1DatabaseJurisdiction = "default" | "eu" | "fedramp";
+
 type PrimaryLocationHint =
   | "wnam"
   | "enam"
@@ -115,6 +118,12 @@ export interface D1DatabaseProps extends CloudflareApiOptions {
      */
     force?: boolean;
   };
+
+  /**
+   * Optional jurisdiction for the bucket
+   * Determines the regulatory jurisdiction the bucket data falls under
+   */
+  jurisdiction?: D1DatabaseJurisdiction;
 }
 
 export function isD1Database(resource: any): resource is D1Database {
@@ -157,6 +166,11 @@ export type D1Database = Pick<
      */
     remote: boolean;
   };
+
+  /**
+   * The jurisdiction of the database
+   */
+  jurisdiction: D1DatabaseJurisdiction;
 };
 
 /**
@@ -260,10 +274,11 @@ const _D1Database = Resource(
   async function (
     this: Context<D1Database>,
     id: string,
-    props: D1DatabaseProps = {},
+    props: D1DatabaseProps,
   ): Promise<D1Database> {
     const databaseName =
       props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+    const jurisdiction = props.jurisdiction ?? "default";
 
     if (this.phase === "update" && this.output?.name !== databaseName) {
       this.replace();
@@ -294,6 +309,7 @@ const _D1Database = Resource(
         migrationsDir: props.migrationsDir,
         migrationsTable: props.migrationsTable ?? DEFAULT_MIGRATIONS_TABLE,
         dev,
+        jurisdiction,
       };
     }
 
@@ -304,7 +320,7 @@ const _D1Database = Resource(
         await deleteMiniflareBinding(this.scope, "d1", this.output.dev.id);
       }
       if (props.delete !== false && this.output?.id) {
-        await deleteDatabase(api, this.output.id);
+        await deleteDatabase(api, this.output.id, props);
       }
       // Return void (a deleted database has no content)
       return this.destroy();
@@ -328,7 +344,7 @@ const _D1Database = Resource(
 
         // If clone property is provided, perform cloning after database creation
         if (props.clone && dbData.result.uuid) {
-          await cloneDb(api, props.clone, dbData.result.uuid);
+          await cloneDb(api, props.clone, dbData.result.uuid, jurisdiction);
         }
       } catch (error) {
         // Check if this is a "database already exists" error and adopt is enabled
@@ -339,7 +355,7 @@ const _D1Database = Resource(
         ) {
           logger.log(`Database ${databaseName} already exists, adopting it`);
           // Find the existing database by name
-          const databases = await listDatabases(api, databaseName);
+          const databases = await listDatabases(api, databaseName, props);
           const existingDb = databases.find((db) => db.name === databaseName);
 
           if (!existingDb) {
@@ -349,7 +365,7 @@ const _D1Database = Resource(
           }
 
           // Get the database details using its ID
-          dbData = await getDatabase(api, existingDb.id);
+          dbData = await getDatabase(api, existingDb.id, props);
 
           // Update the database with the provided properties
           if (props.readReplication) {
@@ -413,6 +429,7 @@ const _D1Database = Resource(
       dev,
       migrationsDir: props.migrationsDir,
       migrationsTable: props.migrationsTable ?? DEFAULT_MIGRATIONS_TABLE,
+      jurisdiction,
     };
   },
 );
@@ -454,6 +471,9 @@ export async function createDatabase(
   const createResponse = await api.post(
     `/accounts/${api.accountId}/d1/database`,
     createPayload,
+    {
+      headers: withJurisdiction(props),
+    },
   );
 
   if (!createResponse.ok) {
@@ -474,6 +494,7 @@ export async function createDatabase(
 export async function getDatabase(
   api: CloudflareApi,
   databaseId?: string,
+  props: D1DatabaseProps = {},
 ): Promise<CloudflareD1Response> {
   if (!databaseId) {
     throw new Error("Database ID is required");
@@ -481,6 +502,9 @@ export async function getDatabase(
 
   const response = await api.get(
     `/accounts/${api.accountId}/d1/database/${databaseId}`,
+    {
+      headers: withJurisdiction(props),
+    },
   );
 
   if (!response.ok) {
@@ -496,6 +520,7 @@ export async function getDatabase(
 export async function deleteDatabase(
   api: CloudflareApi,
   databaseId?: string,
+  props: D1DatabaseProps = {},
 ): Promise<void> {
   if (!databaseId) {
     logger.log("No database ID provided, skipping delete");
@@ -505,6 +530,9 @@ export async function deleteDatabase(
   // Delete D1 database
   const deleteResponse = await api.delete(
     `/accounts/${api.accountId}/d1/database/${databaseId}`,
+    {
+      headers: withJurisdiction(props),
+    },
   );
 
   if (!deleteResponse.ok && deleteResponse.status !== 404) {
@@ -524,12 +552,16 @@ export async function deleteDatabase(
 export async function listDatabases(
   api: CloudflareApi,
   name?: string,
+  props: D1DatabaseProps = {},
 ): Promise<{ name: string; id: string }[]> {
   // Construct query string if name is provided
   const queryParams = name ? `?name=${encodeURIComponent(name)}` : "";
 
   const response = await api.get(
     `/accounts/${api.accountId}/d1/database${queryParams}`,
+    {
+      headers: withJurisdiction(props),
+    },
   );
 
   if (!response.ok) {
@@ -582,6 +614,9 @@ export async function updateDatabase(
   const updateResponse = await api.patch(
     `/accounts/${api.accountId}/d1/database/${databaseId}`,
     updatePayload,
+    {
+      headers: withJurisdiction(props),
+    },
   );
 
   if (!updateResponse.ok) {
@@ -608,6 +643,7 @@ async function cloneDb(
   api: CloudflareApi,
   sourceDb: D1Database | { id: string } | { name: string },
   targetDbId: string,
+  jurisdiction: D1DatabaseJurisdiction,
 ): Promise<void> {
   let sourceId: string;
 
@@ -617,7 +653,9 @@ async function cloneDb(
     sourceId = sourceDb.id;
   } else if ("name" in sourceDb && sourceDb.name) {
     // Look up ID by name
-    const databases = await listDatabases(api, sourceDb.name);
+    const databases = await listDatabases(api, sourceDb.name, {
+      jurisdiction,
+    });
     const foundDb = databases.find((db) => db.name === sourceDb.name);
 
     if (!foundDb) {

package/src/docker/api.ts

@@ -177,6 +177,13 @@ export class DockerApi {
     return this.exec(["pull", image]);
   }
 
+  async tagImage(
+    source: string,
+    target: string,
+  ): Promise<{ stdout: string; stderr: string }> {
+    return this.exec(["tag", source, target]);
+  }
+
   /**
    * Build Docker image
    *

package/src/docker/image.ts

@@ -5,6 +5,7 @@ import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import type { Secret } from "../secret.ts";
 import { DockerApi } from "./api.ts";
+import type { RemoteImage } from "./remote-image.ts";
 
 /**
  * Options for building a Docker image
@@ -40,9 +41,28 @@ export interface DockerBuildOptions {
   target?: string;
 
   /**
-   * List of images to use for cache
+   * Use an external cache source for a build
+   *
+   * @see https://docs.docker.com/reference/cli/docker/buildx/build/#cache-from
+   *
    */
   cacheFrom?: string[];
+
+  /**
+   * Export build cache to an external cache destination
+   *
+   * @see https://docs.docker.com/reference/cli/docker/buildx/build/#cache-to
+   *
+   */
+  cacheTo?: string[];
+
+  /**
+   * Additional options to pass to the Docker build command. This serves as an escape hatch for any additional options that are not supported by the other properties.
+   *
+   * @see https://docs.docker.com/reference/cli/docker/buildx/build/#options
+   *
+   */
+  options?: string[];
 }
 
 export interface ImageRegistry {
@@ -54,22 +74,12 @@ export interface ImageRegistry {
 /**
  * Properties for creating a Docker image
  */
-export interface ImageProps {
-  /**
-   * Repository name for the image (e.g., "username/image")
-   */
-  name?: string;
-
+export type ImageProps = {
   /**
    * Tag for the image (e.g., "latest")
    */
   tag?: string;
 
-  /**
-   * Build configuration
-   */
-  build?: DockerBuildOptions;
-
   /**
    * Registry credentials
    */
@@ -79,12 +89,36 @@ export interface ImageProps {
    * Whether to skip pushing the image to registry
    */
   skipPush?: boolean;
-}
+} & (
+  | {
+      /**
+       * Image name or reference (e.g., "nginx:alpine")
+       */
+      image: string | Image | RemoteImage;
+      build?: never;
+      name?: never;
+    }
+  | {
+      /**
+       * Repository name for the image (e.g., "username/image")
+       *
+       * @default - the id
+       */
+      name?: string;
+      /**
+       * Build configuration
+       */
+      build: DockerBuildOptions;
+
+      image?: never;
+    }
+);
 
 /**
  * Docker Image resource
  */
-export interface Image extends ImageProps {
+export interface Image {
+  kind: "Image";
   /**
    * Image name
    */
@@ -109,6 +143,15 @@ export interface Image extends ImageProps {
    * Time when the image was built
    */
   builtAt: number;
+  /**
+   * Tag for the image
+   */
+  tag: string;
+
+  /**
+   * Build configuration
+   */
+  build: DockerBuildOptions | undefined;
 }
 
 /**
@@ -142,12 +185,32 @@ export const Image = Resource(
       // No action needed for delete as Docker images aren't automatically removed
       // This is intentional as other resources might depend on the same image
       return this.destroy();
-    } else {
-      // Normalize properties
-      const tag = props.tag || "latest";
-      const name = props.name || id;
-      const imageRef = `${name}:${tag}`;
+    }
 
+    const tag = props.tag || "latest";
+    const name =
+      props.name ||
+      (typeof props.image === "string"
+        ? props.image
+        : props.image?.name
+      )?.split(":")[0] ||
+      id;
+    const imageRef = `${name}:${tag}`;
+    let imageId: string | undefined;
+    if (props.image) {
+      const image =
+        typeof props.image === "string" ? props.image : props.image.imageRef;
+
+      const kind =
+        typeof props.image === "object" && props.image.kind === "Image"
+          ? "local"
+          : "remote";
+      if (kind === "remote") {
+        await api.pullImage(image);
+      }
+      await api.tagImage(image, imageRef);
+      // TODO: Extract image ID from pull output if available
+    } else {
       let context: string;
       let dockerfile: string;
       if (props.build?.dockerfile && props.build?.context) {
@@ -170,7 +233,7 @@ export const Image = Resource(
       const buildOptions: Record<string, string> = props.build?.args || {};
 
       // Add platform if specified
-      let buildArgs = ["build", "-t", imageRef];
+      const buildArgs = ["build", "-t", imageRef];
 
       if (props.build?.platform) {
         buildArgs.push("--platform", props.build.platform);
@@ -188,11 +251,23 @@ export const Image = Resource(
         }
       }
 
+      // Add cache destinations if specified
+      if (props.build?.cacheTo && props.build.cacheTo.length > 0) {
+        for (const cacheTarget of props.build.cacheTo) {
+          buildArgs.push("--cache-to", cacheTarget);
+        }
+      }
+
       // Add build arguments
       for (const [key, value] of Object.entries(buildOptions)) {
         buildArgs.push("--build-arg", `${key}=${value}`);
       }
 
+      // Add build options if specified
+      if (props.build?.options && props.build.options.length > 0) {
+        buildArgs.push(...props.build.options);
+      }
+
       buildArgs.push("-f", dockerfile);
 
       // Add context path
@@ -203,77 +278,77 @@ export const Image = Resource(
 
       // Extract image ID from build output if available
       const imageIdMatch = /Successfully built ([a-f0-9]+)/.exec(stdout);
-      const imageId = imageIdMatch ? imageIdMatch[1] : undefined;
-
-      // Handle push if required
-      let repoDigest: string | undefined;
-      let finalImageRef = imageRef;
-      if (props.registry && !props.skipPush) {
-        const { server, username, password } = props.registry;
-
-        // Ensure the registry server does not have trailing slash
-        const registryHost = server.replace(/\/$/, "");
-
-        // Determine if the built image already includes a registry host (e.g. ghcr.io/user/repo)
-        const firstSegment = imageRef.split("/")[0];
-        const hasRegistryPrefix = firstSegment.includes(".");
-
-        // Compose the target image reference that will be pushed
-        const targetImage = hasRegistryPrefix
-          ? imageRef // already fully-qualified
-          : `${registryHost}/${imageRef}`;
-
-        try {
-          // Create a temporary directory that will act as an isolated Docker config
-          // (credentials) directory. This prevents race-conditions when multiple
-          // concurrent tests perform `docker login` / `logout` by ensuring each
-          // Image operation has its own credential store.
-          const tempConfigDir = await fs.mkdtemp(
-            path.join(os.tmpdir(), "docker-config-"),
-          );
-          const api = new DockerApi({ configDir: tempConfigDir });
-
-          // Authenticate to registry using the isolated config directory
-          await api.login(registryHost, username, password.unencrypted);
-
-          // Tag local image with fully qualified name if necessary
-          if (targetImage !== imageRef) {
-            await api.exec(["tag", imageRef, targetImage]);
-          }
-
-          // Push the image
-          const { stdout: pushOut } = await api.exec(["push", targetImage]);
-
-          // Attempt to extract the repo digest from push output
-          const digestMatch = /digest:\s+([a-z0-9]+:[a-f0-9]{64})/.exec(
-            pushOut,
-          );
-          if (digestMatch) {
-            const digestHash = digestMatch[1];
-            // Strip tag (anything after last :) to build image@digest reference
-            const [repoWithoutTag] =
-              targetImage.split(":").length > 2
-                ? [targetImage] // unlikely but safety
-                : [targetImage.substring(0, targetImage.lastIndexOf(":"))];
-            repoDigest = `${repoWithoutTag}@${digestHash}`;
-          }
-
-          // Update the final image reference to point at the pushed image
-          finalImageRef = targetImage;
-        } finally {
-          // Clean up credentials from the isolated config
-          await api.logout(registryHost);
+      imageId = imageIdMatch ? imageIdMatch[1] : undefined;
+    }
+
+    // Handle push if required
+    let repoDigest: string | undefined;
+    let finalImageRef = imageRef;
+    if (props.registry && !props.skipPush) {
+      const { server, username, password } = props.registry;
+
+      // Ensure the registry server does not have trailing slash
+      const registryHost = server.replace(/\/$/, "");
+
+      // Determine if the built image already includes a registry host (e.g. ghcr.io/user/repo)
+      const firstSegment = imageRef.split("/")[0];
+      const hasRegistryPrefix = firstSegment.includes(".");
+
+      // Compose the target image reference that will be pushed
+      const targetImage = hasRegistryPrefix
+        ? imageRef // already fully-qualified
+        : `${registryHost}/${imageRef}`;
+
+      try {
+        // Create a temporary directory that will act as an isolated Docker config
+        // (credentials) directory. This prevents race-conditions when multiple
+        // concurrent tests perform `docker login` / `logout` by ensuring each
+        // Image operation has its own credential store.
+        const tempConfigDir = await fs.mkdtemp(
+          path.join(os.tmpdir(), "docker-config-"),
+        );
+        const api = new DockerApi({ configDir: tempConfigDir });
+
+        // Authenticate to registry using the isolated config directory
+        await api.login(registryHost, username, password.unencrypted);
+
+        // Tag local image with fully qualified name if necessary
+        if (targetImage !== imageRef) {
+          await api.exec(["tag", imageRef, targetImage]);
         }
-      }
 
-      return {
-        ...props,
-        name,
-        imageRef: finalImageRef,
-        imageId,
-        repoDigest,
-        builtAt: Date.now(),
-      };
+        // Push the image
+        const { stdout: pushOut } = await api.exec(["push", targetImage]);
+
+        // Attempt to extract the repo digest from push output
+        const digestMatch = /digest:\s+([a-z0-9]+:[a-f0-9]{64})/.exec(pushOut);
+        if (digestMatch) {
+          const digestHash = digestMatch[1];
+          // Strip tag (anything after last :) to build image@digest reference
+          const [repoWithoutTag] =
+            targetImage.split(":").length > 2
+              ? [targetImage] // unlikely but safety
+              : [targetImage.substring(0, targetImage.lastIndexOf(":"))];
+          repoDigest = `${repoWithoutTag}@${digestHash}`;
+        }
+
+        // Update the final image reference to point at the pushed image
+        finalImageRef = targetImage;
+      } finally {
+        // Clean up credentials from the isolated config
+        await api.logout(registryHost);
+      }
     }
+    return {
+      kind: "Image",
+      ...props,
+      tag,
+      name,
+      imageRef: finalImageRef,
+      imageId,
+      repoDigest,
+      builtAt: Date.now(),
+      build: props.build,
+    };
   },
 );

package/src/docker/remote-image.ts

@@ -26,6 +26,7 @@ export interface RemoteImageProps {
  * Docker Remote Image resource
  */
 export interface RemoteImage extends RemoteImageProps {
+  kind: "RemoteImage";
   /**
    * Full image reference (name:tag)
    */
@@ -71,8 +72,10 @@ export const RemoteImage = Resource(
       await api.pullImage(imageRef);
 
       return {
+        kind: "RemoteImage",
         ...props,
         imageRef,
+        tag,
         createdAt: Date.now(),
       };
     }

package/src/util/safe-fetch.ts

@@ -31,7 +31,7 @@ export async function safeFetch(
   throw latestErr;
 }
 
-function isTransientNetworkError(err: any) {
+export function isTransientNetworkError(err: any) {
   return (
     err?.code === "UND_ERR_SOCKET" ||
     err?.code === "ECONNRESET" ||

package/src/util/telemetry.ts

@@ -12,6 +12,7 @@ import { Scope } from "../scope.ts";
 import { parseOption } from "./cli-args.ts";
 import { logger } from "./logger.ts";
 import { memoize } from "./memoize.ts";
+import { isTransientNetworkError } from "./safe-fetch.ts";
 
 const ALCHEMY_DIR = path.join(os.homedir(), ".alchemy");
 const ID_PATH = path.join(ALCHEMY_DIR, "id");
@@ -299,25 +300,44 @@ export async function createAndSendEvent(
   if (await isTelemetryDisabled()) {
     return;
   }
-  try {
-    const eventData = {
-      ...data,
-      ...("duration" in data
-        ? { duration: Math.round(data.duration * 1000) }
-        : {}),
-      ...(await collectData()),
-      ...serializeError(error),
-    };
-    await fetchNoResponse(TELEMETRY_API_URL, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(eventData),
-    });
-  } catch (error) {
-    if (!SUPPRESS_TELEMETRY_ERRORS) {
-      logger.warn("Failed to send telemetry event:", error);
+
+  const maxRetries = 3;
+
+  let telemetryErrors = [];
+
+  for (let attempt = 0; attempt < maxRetries; attempt++) {
+    try {
+      const eventData = {
+        ...data,
+        ...("duration" in data
+          ? { duration: Math.round(data.duration * 1000) }
+          : {}),
+        ...(await collectData()),
+        ...serializeError(error),
+        telemetryErrors: JSON.stringify(
+          telemetryErrors.map((e) => serializeError(e)),
+        ),
+      };
+      await fetchNoResponse(TELEMETRY_API_URL, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(eventData),
+      });
+      return;
+    } catch (error: any) {
+      telemetryErrors.push(error);
+
+      const shouldRetry =
+        isTransientNetworkError(error) || isTransientNetworkError(error.cause);
+
+      if (!shouldRetry || attempt === maxRetries - 1) {
+        if (!SUPPRESS_TELEMETRY_ERRORS) {
+          logger.warn("Failed to send telemetry event:", error);
+        }
+        return;
+      }
     }
   }
 }