alchemy 0.7.1 → 0.7.3

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

@@ -99,6 +99,17 @@ export interface WorkerProps<B extends Bindings = Bindings>
    * Whether to adopt the Worker if it already exists when creating
    */
   adopt?: boolean;
+
+  /**
+   * The compatibility date for the worker
+   * @default "2024-09-09"
+   */
+  compatibilityDate?: string;
+
+  /**
+   * The compatibility flags for the worker
+   */
+  compatibilityFlags?: string[];
 }
 
 /**
@@ -456,6 +467,8 @@ class NotFoundError extends Error {
 }
 
 interface WorkerMetadata {
+  compatibility_date: string;
+  compatibility_flags?: string[];
   bindings: WorkerBindingSpec[];
   observability: {
     enabled: boolean;
@@ -490,6 +503,8 @@ async function prepareWorkerMetadata<B extends Bindings>(
 ): Promise<WorkerMetadata> {
   // Prepare metadata with bindings
   const meta: WorkerMetadata = {
+    compatibility_date: props.compatibilityDate ?? "2024-09-09",
+    compatibility_flags: props.compatibilityFlags,
     bindings: [],
     observability: {
       enabled: props.observability?.enabled !== false,
@@ -590,6 +605,12 @@ async function prepareWorkerMetadata<B extends Bindings>(
         name: bindingName,
         queue_name: binding.name,
       });
+    } else if (binding.type === "pipeline") {
+      meta.bindings.push({
+        type: "pipelines",
+        name: bindingName,
+        pipeline: binding.name,
+      });
     } else {
       // @ts-expect-error - we should never reach here
       throw new Error(`Unsupported binding type: ${binding.type}`);
@@ -699,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"
     )
   );
 }