alchemy 0.7.2 → 0.7.3

package/lib/cloudflare/r2-rest-state-store.js

@@ -1,6 +1,7 @@
 import { deserialize, serialize } from "../serde";
 import { withExponentialBackoff } from "../util/retry";
 import { createCloudflareApi, } from "./api";
+import { CloudflareApiError, handleApiError } from "./api-error";
 /**
  * State store implementation using Cloudflare R2 API
  * Uses R2 for immediate consistency compared to KV's eventual consistency
@@ -69,17 +70,12 @@ export class R2RestStateStore {
             const response = await withExponentialBackoff(async () => {
                 const response = await this.api.get(listPath);
                 if (!response.ok) {
-                    const errorData = await response.json().catch(() => ({
-                        errors: [{ message: response.statusText }],
-                    }));
-                    throw new Error(`Error listing R2 objects: ${errorData.errors?.[0]?.message || response.statusText}`);
+                    await handleApiError(response, "list", "bucket", this.bucketName);
                 }
                 return response;
             }, 
             // Retry on transient errors
-            (error) => error.message?.includes("502") ||
-                error.message?.includes("503") ||
-                error.message?.includes("timeout"), 5, // 5 retry attempts
+            isRetryableError, 5, // 5 retry attempts
             1000 // Start with 1 second delay
             );
             const data = (await response.json());
@@ -117,21 +113,13 @@ export class R2RestStateStore {
         try {
             const response = await withExponentialBackoff(async () => {
                 const response = await this.api.get(`/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`);
-                if (!response.ok) {
-                    if (response.status === 404) {
-                        return response;
-                    }
-                    const errorData = await response.json().catch(() => ({
-                        errors: [{ message: response.statusText }],
-                    }));
-                    throw new Error(`Error getting R2 object: ${errorData.errors?.[0]?.message || response.statusText}`);
+                if (!response.ok && response.status !== 404) {
+                    await handleApiError(response, "get", "object", key);
                 }
                 return response;
             }, 
             // Retry on transient errors
-            (error) => error.message?.includes("502") ||
-                error.message?.includes("503") ||
-                error.message?.includes("timeout"), 5, // 5 retry attempts
+            isRetryableError, 5, // 5 retry attempts
             1000 // Start with 1 second delay
             );
             if (response.status === 404) {
@@ -202,15 +190,12 @@ export class R2RestStateStore {
                 },
             });
             if (!response.ok) {
-                const errorData = await response.json().catch(() => ({
-                    errors: [{ message: response.statusText }],
-                }));
-                throw new Error(`Error writing to R2: ${errorData.errors?.[0]?.message || response.statusText}`);
+                await handleApiError(response, "put", "object", objectKey);
             }
             return response;
         }, 
         // Retry on transient errors
-        (error) => error.message?.includes("503") || error.message?.includes("timeout"), 5, // 5 retry attempts
+        isRetryableError, 5, // 5 retry attempts
         1000 // Start with 1 second delay
         );
     }
@@ -224,17 +209,10 @@ export class R2RestStateStore {
         await withExponentialBackoff(async () => {
             const response = await this.api.delete(`/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`);
             if (!response.ok && response.status !== 404) {
-                const errorData = await response.json().catch(() => ({
-                    errors: [{ message: response.statusText }],
-                }));
-                throw new Error(`Error deleting from R2: ${errorData.errors?.[0]?.message || response.statusText}`);
+                await handleApiError(response, "delete", "object", key);
             }
             return response;
-        }, 
-        // Retry on transient errors
-        (error) => error.message?.includes("502") ||
-            error.message?.includes("503") ||
-            error.message?.includes("timeout"), 5, // 5 retry attempts
+        }, isRetryableError, 5, // 5 retry attempts
         1000 // Start with 1 second delay
         );
     }
@@ -275,3 +253,13 @@ export class R2RestStateStore {
         }
     }
 }
+function isRetryableError(error) {
+    if (error instanceof CloudflareApiError) {
+        return (error.status === 500 ||
+            error.status === 502 ||
+            error.status === 503 ||
+            error.message.includes("timeout") ||
+            error.message.includes("internal error"));
+    }
+    return false;
+}

package/lib/cloudflare/worker.js

@@ -431,6 +431,10 @@ async function bundleWorkerScript(props) {
         minify: true,
         options: {
             keepNames: true, // Important for Durable Object classes
+            loader: {
+                ".sql": "text",
+                ".json": "json",
+            },
         },
     };
     // Merge with user-provided options

package/package.json

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

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

@@ -7,6 +7,7 @@ import {
   type CloudflareApiOptions,
   createCloudflareApi,
 } from "./api";
+import { CloudflareApiError, handleApiError } from "./api-error";
 
 /**
  * Options for CloudflareR2StateStore
@@ -106,21 +107,13 @@ export class R2RestStateStore implements StateStore {
           const response = await this.api.get(listPath);
 
           if (!response.ok) {
-            const errorData: any = await response.json().catch(() => ({
-              errors: [{ message: response.statusText }],
-            }));
-            throw new Error(
-              `Error listing R2 objects: ${errorData.errors?.[0]?.message || response.statusText}`
-            );
+            await handleApiError(response, "list", "bucket", this.bucketName);
           }
 
           return response;
         },
         // Retry on transient errors
-        (error) =>
-          error.message?.includes("502") ||
-          error.message?.includes("503") ||
-          error.message?.includes("timeout"),
+        isRetryableError,
         5, // 5 retry attempts
         1000 // Start with 1 second delay
       );
@@ -173,26 +166,14 @@ export class R2RestStateStore implements StateStore {
             `/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`
           );
 
-          if (!response.ok) {
-            if (response.status === 404) {
-              return response;
-            }
-
-            const errorData: any = await response.json().catch(() => ({
-              errors: [{ message: response.statusText }],
-            }));
-            throw new Error(
-              `Error getting R2 object: ${errorData.errors?.[0]?.message || response.statusText}`
-            );
+          if (!response.ok && response.status !== 404) {
+            await handleApiError(response, "get", "object", key);
           }
 
           return response;
         },
         // Retry on transient errors
-        (error) =>
-          error.message?.includes("502") ||
-          error.message?.includes("503") ||
-          error.message?.includes("timeout"),
+        isRetryableError,
         5, // 5 retry attempts
         1000 // Start with 1 second delay
       );
@@ -280,19 +261,12 @@ export class R2RestStateStore implements StateStore {
         );
 
         if (!response.ok) {
-          const errorData: any = await response.json().catch(() => ({
-            errors: [{ message: response.statusText }],
-          }));
-          throw new Error(
-            `Error writing to R2: ${errorData.errors?.[0]?.message || response.statusText}`
-          );
+          await handleApiError(response, "put", "object", objectKey);
         }
-
         return response;
       },
       // Retry on transient errors
-      (error) =>
-        error.message?.includes("503") || error.message?.includes("timeout"),
+      isRetryableError,
       5, // 5 retry attempts
       1000 // Start with 1 second delay
     );
@@ -313,21 +287,12 @@ export class R2RestStateStore implements StateStore {
         );
 
         if (!response.ok && response.status !== 404) {
-          const errorData: any = await response.json().catch(() => ({
-            errors: [{ message: response.statusText }],
-          }));
-          throw new Error(
-            `Error deleting from R2: ${errorData.errors?.[0]?.message || response.statusText}`
-          );
+          await handleApiError(response, "delete", "object", key);
         }
 
         return response;
       },
-      // Retry on transient errors
-      (error) =>
-        error.message?.includes("502") ||
-        error.message?.includes("503") ||
-        error.message?.includes("timeout"),
+      isRetryableError,
       5, // 5 retry attempts
       1000 // Start with 1 second delay
     );
@@ -373,3 +338,16 @@ export class R2RestStateStore implements StateStore {
     }
   }
 }
+
+function isRetryableError(error: any): boolean {
+  if (error instanceof CloudflareApiError) {
+    return (
+      error.status === 500 ||
+      error.status === 502 ||
+      error.status === 503 ||
+      error.message.includes("timeout") ||
+      error.message.includes("internal error")
+    );
+  }
+  return false;
+}

package/src/cloudflare/worker.ts

@@ -720,6 +720,10 @@ async function bundleWorkerScript<B extends Bindings>(props: WorkerProps) {
     minify: true,
     options: {
       keepNames: true, // Important for Durable Object classes
+      loader: {
+        ".sql": "text",
+        ".json": "json",
+      },
     },
   };
 

package/src/esbuild/bundle.ts

@@ -116,7 +116,7 @@ export const Bundle = Resource(
   async function (
     this: Context<Bundle>,
     id: string,
-    props: BundleProps,
+    props: BundleProps
   ): Promise<Bundle> {
     // Determine output path
     const outputPath = getOutputPath(props);
@@ -145,7 +145,7 @@ export const Bundle = Resource(
       path: outputPath,
       hash,
     });
-  },
+  }
 );
 
 export async function bundle(props: BundleProps) {
@@ -172,7 +172,7 @@ function getOutputPath(props: BundleProps) {
     props.outfile ||
     path.join(
       props.outdir || "dist",
-      path.basename(props.entryPoint, path.extname(props.entryPoint)) + ".js",
+      path.basename(props.entryPoint, path.extname(props.entryPoint)) + ".js"
     )
   );
 }