alchemy 0.3.0 → 0.4.0

package/src/cloudflare/r2-rest-state-store.ts

@@ -1,7 +1,8 @@
 import type { Scope } from "../scope";
+import type { Secret } from "../secret";
+import { deserialize, serialize } from "../serde";
 import type { State, StateStore } from "../state";
 import { withExponentialBackoff } from "../util/retry";
-import { deserialize, serialize } from "../util/serde";
 import { type CloudflareApi, createCloudflareApi } from "./api";
 
 /**
@@ -23,7 +24,7 @@ export interface CloudflareR2StateStoreOptions {
   /**
    * API key to use (overrides CLOUDFLARE_API_KEY env var)
    */
-  apiKey?: string;
+  apiKey?: Secret;
 
   /**
    * Account ID to use (overrides CLOUDFLARE_ACCOUNT_ID env var)
@@ -44,7 +45,7 @@ export class R2RestStateStore implements StateStore {
   private api: CloudflareApi;
   private prefix: string;
   private bucketName: string;
-  private apiKey: string | undefined;
+  private apiKey: Secret | undefined;
   private accountId: string | undefined;
   private email: string | undefined;
   private initialized = false;
@@ -57,7 +58,7 @@ export class R2RestStateStore implements StateStore {
    */
   constructor(
     public readonly scope: Scope,
-    options: CloudflareR2StateStoreOptions,
+    options: CloudflareR2StateStoreOptions
   ) {
     // Use the scope's chain to build the prefix, similar to how FileSystemStateStore builds its directory
     const scopePath = scope.chain.join("/");
@@ -129,7 +130,7 @@ export class R2RestStateStore implements StateStore {
           errors: [{ message: response.statusText }],
         }));
         throw new Error(
-          `Error listing R2 objects: ${errorData.errors?.[0]?.message || response.statusText}`,
+          `Error listing R2 objects: ${errorData.errors?.[0]?.message || response.statusText}`
         );
       }
 
@@ -144,7 +145,7 @@ export class R2RestStateStore implements StateStore {
         objects.map((obj: any) => {
           const keyName = obj.key || obj.name;
           return this.convertKeyFromStorage(keyName.slice(this.prefix.length));
-        }),
+        })
       );
 
       // Update cursor for next page if available
@@ -176,7 +177,7 @@ export class R2RestStateStore implements StateStore {
 
     try {
       const response = await this.api.get(
-        `/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`,
+        `/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`
       );
 
       if (!response.ok) {
@@ -188,7 +189,7 @@ export class R2RestStateStore implements StateStore {
           errors: [{ message: response.statusText }],
         }));
         throw new Error(
-          `Error getting R2 object: ${errorData.errors?.[0]?.message || response.statusText}`,
+          `Error getting R2 object: ${errorData.errors?.[0]?.message || response.statusText}`
         );
       }
 
@@ -267,7 +268,7 @@ export class R2RestStateStore implements StateStore {
             headers: {
               "Content-Type": "application/json",
             },
-          },
+          }
         );
 
         if (!response.ok) {
@@ -275,7 +276,7 @@ export class R2RestStateStore implements StateStore {
             errors: [{ message: response.statusText }],
           }));
           throw new Error(
-            `Error writing to R2: ${errorData.errors?.[0]?.message || response.statusText}`,
+            `Error writing to R2: ${errorData.errors?.[0]?.message || response.statusText}`
           );
         }
 
@@ -285,7 +286,7 @@ export class R2RestStateStore implements StateStore {
       (error) =>
         error.message?.includes("503") || error.message?.includes("timeout"),
       5, // 5 retry attempts
-      1000, // Start with 1 second delay
+      1000 // Start with 1 second delay
     );
   }
 
@@ -298,7 +299,7 @@ export class R2RestStateStore implements StateStore {
     await this.ensureInitialized();
 
     const response = await this.api.delete(
-      `/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`,
+      `/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`
     );
 
     if (!response.ok && response.status !== 404) {
@@ -306,7 +307,7 @@ export class R2RestStateStore implements StateStore {
         errors: [{ message: response.statusText }],
       }));
       throw new Error(
-        `Error deleting from R2: ${errorData.errors?.[0]?.message || response.statusText}`,
+        `Error deleting from R2: ${errorData.errors?.[0]?.message || response.statusText}`
       );
     }
   }

package/src/cloudflare/static-site-router.ts

@@ -65,21 +65,27 @@ app.notFound(async (ctx) => {
 
   // Fetch from KV
   {
-    const object = await env.ASSETS.getWithMetadata(filePath);
+    const object = await env.ASSETS.getWithMetadata(filePath, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(200, filePath, object);
     }
   }
   {
     const guess = filePath + (filePath.endsWith("/") ? "" : "/") + "index.html";
-    const object = await env.ASSETS.getWithMetadata(guess);
+    const object = await env.ASSETS.getWithMetadata(guess, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(200, guess, object);
     }
   }
   {
     const guess = filePath + ".html";
-    const object = await env.ASSETS.getWithMetadata(guess);
+    const object = await env.ASSETS.getWithMetadata(guess, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(200, guess, object);
     }
@@ -87,12 +93,16 @@ app.notFound(async (ctx) => {
 
   // Handle error page
   if (env.ERROR_PAGE) {
-    const object = await env.ASSETS.getWithMetadata(env.ERROR_PAGE);
+    const object = await env.ASSETS.getWithMetadata(env.ERROR_PAGE, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(404, env.ERROR_PAGE, object);
     }
   } else {
-    const object = await env.ASSETS.getWithMetadata(env.INDEX_PAGE);
+    const object = await env.ASSETS.getWithMetadata(env.INDEX_PAGE, {
+      type: "arrayBuffer",
+    });
     if (object.value) {
       return await respond(200, env.INDEX_PAGE, object);
     }
@@ -122,7 +132,7 @@ app.notFound(async (ctx) => {
   async function respond(
     status: number,
     filePath: string,
-    object: KVNamespaceGetWithMetadataResult<any, any>,
+    object: KVNamespaceGetWithMetadataResult<any, any>
   ) {
     // build response
     const headers = new Headers();
@@ -131,8 +141,8 @@ app.notFound(async (ctx) => {
       headers.set("content-type", object.metadata.contentType);
       headers.set("cache-control", object.metadata.cacheControl);
     }
-    // TODO: do we need base64 encoded here?
-    // const response = new Response(base64ToArrayBuffer(object.value), {
+
+    // Create response with the raw data directly
     const response = new Response(object.value, {
       status,
       headers,

package/src/cloudflare/static-site.ts

@@ -96,16 +96,6 @@ export interface StaticSiteProps {
    */
   production?: boolean;
 
-  /**
-   * Custom domain for the site
-   */
-  domain?:
-    | string
-    | {
-        name: string;
-        redirects?: string[];
-      };
-
   build?: {
     /**
      * Command to run before deploying the site
@@ -176,16 +166,6 @@ export interface StaticSite extends Resource<"cloudflare::StaticSite"> {
    */
   assets: string[];
 
-  /**
-   * Custom domain for the site
-   */
-  domain?:
-    | string
-    | {
-        name: string;
-        redirects?: string[];
-      };
-
   /**
    * Whether the site is deployed to production
    */
@@ -243,13 +223,26 @@ export interface StaticSite extends Resource<"cloudflare::StaticSite"> {
  * });
  *
  * @example
- * // Create a static site with custom error page and index
- * const customSite = await StaticSite("custom-site", {
+ * // Create a static site with a custom domain using the CustomDomain resource
+ * const site = await StaticSite("custom-site", {
  *   name: "custom-site",
  *   dir: "./www",
  *   errorPage: "404.html",
- *   indexPage: "home.html",
- *   domain: "www.example.com"
+ *   indexPage: "home.html"
+ * });
+ *
+ * // Then configure the custom domain separately
+ * const domain = await CustomDomain("custom-domain", {
+ *   name: "www.example.com",
+ *   zoneId: "abcdef123456789",
+ *   workerName: site.name
+ * });
+ *
+ * @example
+ * // Create a static site with multiple domains (primary + redirects)
+ * const site = await StaticSite("multi-domain-site", {
+ *   name: "multi-domain-site",
+ *   dir: "./public"
  * });
  *
  * @see https://developers.cloudflare.com/workers/platform/sites
@@ -262,8 +255,11 @@ export const StaticSite = Resource(
   async function (
     this: Context<StaticSite>,
     id: string,
-    props: StaticSiteProps,
+    props: StaticSiteProps
   ) {
+    // Create Cloudflare API client with automatic account discovery
+    const api = await createCloudflareApi();
+
     if (this.phase === "delete") {
       // For delete operations, we'll rely on the Worker delete to clean up
       // Return empty output for deleted state
@@ -273,7 +269,7 @@ export const StaticSite = Resource(
     // Validate that a name is provided
     if (!props.name) {
       throw new Error(
-        "StaticSite name is required - must be explicitly specified",
+        "StaticSite name is required - must be explicitly specified"
       );
     }
 
@@ -302,7 +298,7 @@ export const StaticSite = Resource(
 
         // Throw a more descriptive error that includes the exit code and stderr
         throw new Error(
-          `Build command "${props.build.command}" failed with exit code ${error.code}:\n${error.stderr || error.message}`,
+          `Build command "${props.build.command}" failed with exit code ${error.code}:\n${error.stderr || error.message}`
         );
       }
     }
@@ -314,7 +310,7 @@ export const StaticSite = Resource(
       }
     } catch (error: any) {
       throw new Error(
-        `Directory "${props.dir}" does not exist: ${error.message}`,
+        `Directory "${props.dir}" does not exist: ${error.message}`
       );
     }
 
@@ -322,9 +318,6 @@ export const StaticSite = Resource(
     const siteName = props.name;
     const indexPage = props.indexPage || "index.html";
 
-    // Create Cloudflare API client with automatic account discovery
-    const api = await createCloudflareApi();
-
     // Step 1: Create or get the KV namespace for assets
     const [kv, assetManifest] = await Promise.all([
       KVNamespace("assets", {
@@ -356,7 +349,7 @@ export const StaticSite = Resource(
 
     // Create asset manifest banner for static site router
     const assetManifestBanner = `const __ASSET_MANIFEST__ = ${JSON.stringify(
-      Object.fromEntries(assetManifest.map((item) => [item.key, item.hash])),
+      Object.fromEntries(assetManifest.map((item) => [item.key, item.hash]))
     )};\n`;
 
     const bundleOptions = {
@@ -398,7 +391,7 @@ export const StaticSite = Resource(
           Object.entries(routes).map(([key, value]) => [
             `__ROUTE_${value}`,
             key,
-          ]),
+          ])
         ),
       },
     });
@@ -415,10 +408,9 @@ export const StaticSite = Resource(
       assets: assetManifest.map((item) => item.key),
       createdAt: this.output?.createdAt || now,
       updatedAt: now,
-      domain: props.domain,
       production: props.production !== false,
       url: worker.url,
       routes,
     });
-  },
+  }
 );

package/src/cloudflare/upload-asset-manifest.ts

@@ -17,7 +17,7 @@ type UploadResult = {
 export async function uploadAssetManifest(
   api: CloudflareApi,
   namespaceId: string,
-  manifest: AssetManifest,
+  manifest: AssetManifest
 ): Promise<UploadResult[]> {
   const results: UploadResult[] = [];
 
@@ -59,14 +59,16 @@ export async function uploadAssetManifest(
     const formData = new FormData();
     formData.append("metadata", JSON.stringify(metadata));
 
-    // Add file content as 'value'
-    const blob = new Blob([content]);
+    // Add file content as 'value' - Fix for binary file corruption
+    const blob = new Blob([new Uint8Array(content)], {
+      type: item.contentType,
+    });
     formData.append("value", blob);
 
     try {
       const response = await api.put(
         `/accounts/${api.accountId}/storage/kv/namespaces/${namespaceId}/values/${item.key}`,
-        formData,
+        formData
       );
 
       const result = { item, success: response.ok, status: response.status };