alchemy 0.5.0 → 0.5.2

package/lib/apply.js

@@ -48,14 +48,6 @@ export async function apply(resource, props, options) {
                 }
                 return state.output;
             }
-            const diff = await import("diff");
-            const yaml = await import("yaml");
-            const old = yaml.stringify(oldProps);
-            const news = yaml.stringify(newProps);
-            const patch = diff.createPatch(resource.ID, old, news);
-            // console.log(patch);
-            // if (resource.ID === "what-is-alchemy") {
-            // }
         }
         const phase = state.status === "creating" ? "create" : "update";
         state.status = phase === "create" ? "creating" : "updating";

package/lib/cloudflare/api.js

@@ -1,3 +1,4 @@
+import { withExponentialBackoff } from "../util/retry";
 import { getCloudflareHeaders } from "./auth";
 /**
  * Custom error class for Cloudflare API errors
@@ -151,11 +152,21 @@ export class CloudflareApi {
             delete combinedHeaders["Content-Type"];
         }
         const url = `${this.baseUrl}${path}`;
-        // Make the request
-        return fetch(url, {
+        // Use withExponentialBackoff for automatic retry on network errors
+        return withExponentialBackoff(() => fetch(url, {
             ...init,
             headers: combinedHeaders,
-        });
+        }), (error) => {
+            // Only retry on network-related errors
+            const errorMsg = error.message || "";
+            const isNetworkError = errorMsg.includes("socket connection was closed") ||
+                errorMsg.includes("ECONNRESET") ||
+                errorMsg.includes("ETIMEDOUT") ||
+                errorMsg.includes("ECONNREFUSED");
+            return isNetworkError;
+        }, 5, // Maximum 5 attempts (1 initial + 4 retries)
+        1000 // Start with 1s delay, will exponentially increase
+        );
     }
     /**
      * Helper for GET requests

package/lib/cloudflare/bucket.d.ts

@@ -28,11 +28,17 @@ export interface BucketProps extends CloudflareApiOptions {
      */
     allowPublicAccess?: boolean;
     /**
-     * Whether to delete the bucket and its contents during resource deletion
+     * Whether to delete the bucket.
      * If set to false, the bucket will remain but the resource will be removed from state
-     * Default: true
+     *
+     * @default true
      */
     delete?: boolean;
+    /**
+     * Whether to empty the bucket and delete all objects during resource deletion
+     * @default false
+     */
+    empty?: boolean;
 }
 /**
  * Output returned after R2 Bucket creation/update
@@ -85,6 +91,14 @@ export interface R2Bucket extends Resource<"cloudflare::R2Bucket">, BucketProps
  *   jurisdiction: "fedramp"
  * });
  *
+ * @example
+ * // Create a bucket that will be automatically emptied when deleted
+ * // This will delete all objects in the bucket before deleting the bucket itself
+ * const temporaryBucket = await R2Bucket("temp-storage", {
+ *   name: "temp-storage",
+ *   empty: true  // All objects will be deleted when this resource is destroyed
+ * });
+ *
  * @see https://developers.cloudflare.com/r2/buckets/
  */
 export declare const R2Bucket: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<R2Bucket>, id: string, props: BucketProps) => Promise<R2Bucket>);

package/lib/cloudflare/bucket.js

@@ -35,19 +35,28 @@ import { CloudflareAccountId, CloudflareApi, CloudflareApiError, createCloudflar
  *   jurisdiction: "fedramp"
  * });
  *
+ * @example
+ * // Create a bucket that will be automatically emptied when deleted
+ * // This will delete all objects in the bucket before deleting the bucket itself
+ * const temporaryBucket = await R2Bucket("temp-storage", {
+ *   name: "temp-storage",
+ *   empty: true  // All objects will be deleted when this resource is destroyed
+ * });
+ *
  * @see https://developers.cloudflare.com/r2/buckets/
  */
 export const R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props) {
-    const [api, r2Client] = await Promise.all([
-        createCloudflareApi(props),
-        createR2Client(props),
-    ]);
+    const api = await createCloudflareApi(props);
     const bucketName = props.name || this.id;
     if (this.phase === "delete") {
         console.log("Deleting R2 bucket:", bucketName);
         if (props.delete !== false) {
-            // Empty the bucket first by deleting all objects
-            await emptyBucket(r2Client, bucketName, props.jurisdiction);
+            if (props.empty) {
+                console.log("Emptying R2 bucket:", bucketName);
+                const r2Client = await createR2Client(props);
+                // Empty the bucket first by deleting all objects
+                await emptyBucket(r2Client, bucketName, props.jurisdiction);
+            }
             // Delete R2 bucket
             console.log("Deleting R2 bucket:", bucketName);
             await deleteBucket(api, bucketName, props);

package/lib/cloudflare/worker.js

@@ -557,6 +557,7 @@ async function uploadAssets(api, workerName, assets) {
     // Process each bucket of files
     for (const bucket of buckets) {
         const formData = new FormData();
+        let totalBytes = 0;
         // Add each file in the bucket to the form
         for (const fileHash of bucket) {
             // Find the file with this hash
@@ -575,8 +576,10 @@ async function uploadAssets(api, workerName, assets) {
             const blob = new Blob([base64Content], {
                 type: getContentType(file.filePath),
             });
+            totalBytes += blob.size;
             formData.append(fileHash, blob, fileHash);
         }
+        console.log(`Uploading ${totalBytes} bytes of assets`);
         // Upload this batch of files
         const uploadResponse = await api.post(`/accounts/${api.accountId}/workers/assets/upload?base64=true`, formData, {
             headers: {

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 export type * from "./context";
 export * from "./resource";
+export type * from "./scope";
 export * from "./secret";
 export * from "./state";
 export * from "./util/ignore";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "type": "module",
   "module": "./lib/index.js",
   "scripts": {

package/src/apply.ts

@@ -70,15 +70,6 @@ export async function apply<Out extends Resource>(
         }
         return state.output as Awaited<Out>;
       }
-
-      const diff = await import("diff");
-      const yaml = await import("yaml");
-      const old = yaml.stringify(oldProps);
-      const news = yaml.stringify(newProps);
-      const patch = diff.createPatch(resource.ID, old, news);
-      // console.log(patch);
-      // if (resource.ID === "what-is-alchemy") {
-      // }
     }
 
     const phase = state.status === "creating" ? "create" : "update";

package/src/cloudflare/api.ts

@@ -1,4 +1,5 @@
 import type { Secret } from "../secret";
+import { withExponentialBackoff } from "../util/retry";
 import { type CloudflareAuthOptions, getCloudflareHeaders } from "./auth";
 
 /**
@@ -240,11 +241,27 @@ export class CloudflareApi {
 
     const url = `${this.baseUrl}${path}`;
 
-    // Make the request
-    return fetch(url, {
-      ...init,
-      headers: combinedHeaders,
-    });
+    // Use withExponentialBackoff for automatic retry on network errors
+    return withExponentialBackoff(
+      () =>
+        fetch(url, {
+          ...init,
+          headers: combinedHeaders,
+        }),
+      (error) => {
+        // Only retry on network-related errors
+        const errorMsg = (error as Error).message || "";
+        const isNetworkError =
+          errorMsg.includes("socket connection was closed") ||
+          errorMsg.includes("ECONNRESET") ||
+          errorMsg.includes("ETIMEDOUT") ||
+          errorMsg.includes("ECONNREFUSED");
+
+        return isNetworkError;
+      },
+      5, // Maximum 5 attempts (1 initial + 4 retries)
+      1000 // Start with 1s delay, will exponentially increase
+    );
   }
 
   /**

package/src/cloudflare/bucket.ts

@@ -40,11 +40,18 @@ export interface BucketProps extends CloudflareApiOptions {
   allowPublicAccess?: boolean;
 
   /**
-   * Whether to delete the bucket and its contents during resource deletion
+   * Whether to delete the bucket.
    * If set to false, the bucket will remain but the resource will be removed from state
-   * Default: true
+   *
+   * @default true
    */
   delete?: boolean;
+
+  /**
+   * Whether to empty the bucket and delete all objects during resource deletion
+   * @default false
+   */
+  empty?: boolean;
 }
 
 /**
@@ -103,6 +110,14 @@ export interface R2Bucket
  *   jurisdiction: "fedramp"
  * });
  *
+ * @example
+ * // Create a bucket that will be automatically emptied when deleted
+ * // This will delete all objects in the bucket before deleting the bucket itself
+ * const temporaryBucket = await R2Bucket("temp-storage", {
+ *   name: "temp-storage",
+ *   empty: true  // All objects will be deleted when this resource is destroyed
+ * });
+ *
  * @see https://developers.cloudflare.com/r2/buckets/
  */
 export const R2Bucket = Resource(
@@ -112,18 +127,18 @@ export const R2Bucket = Resource(
     id: string,
     props: BucketProps
   ): Promise<R2Bucket> {
-    const [api, r2Client] = await Promise.all([
-      createCloudflareApi(props),
-      createR2Client(props),
-    ]);
-
+    const api = await createCloudflareApi(props);
     const bucketName = props.name || this.id;
 
     if (this.phase === "delete") {
       console.log("Deleting R2 bucket:", bucketName);
       if (props.delete !== false) {
-        // Empty the bucket first by deleting all objects
-        await emptyBucket(r2Client, bucketName, props.jurisdiction);
+        if (props.empty) {
+          console.log("Emptying R2 bucket:", bucketName);
+          const r2Client = await createR2Client(props);
+          // Empty the bucket first by deleting all objects
+          await emptyBucket(r2Client, bucketName, props.jurisdiction);
+        }
 
         // Delete R2 bucket
         console.log("Deleting R2 bucket:", bucketName);

package/src/cloudflare/worker.ts

@@ -978,6 +978,8 @@ async function uploadAssets(
   for (const bucket of buckets) {
     const formData = new FormData();
 
+    let totalBytes = 0;
+
     // Add each file in the bucket to the form
     for (const fileHash of bucket) {
       // Find the file with this hash
@@ -1000,9 +1002,12 @@ async function uploadAssets(
       const blob = new Blob([base64Content], {
         type: getContentType(file.filePath),
       });
+      totalBytes += blob.size;
       formData.append(fileHash, blob, fileHash);
     }
 
+    console.log(`Uploading ${totalBytes} bytes of assets`);
+
     // Upload this batch of files
     const uploadResponse = await api.post(
       `/accounts/${api.accountId}/workers/assets/upload?base64=true`,

package/src/index.ts

@@ -1,5 +1,6 @@
 export type * from "./context";
 export * from "./resource";
+export type * from "./scope";
 export * from "./secret";
 export * from "./state";
 export * from "./util/ignore";