alchemy 0.90.1 → 0.92.1

package/src/cloudflare/website.ts

@@ -18,10 +18,10 @@ import { computeWorkerDevDomain } from "./worker-subdomain.ts";
 import { type AssetsConfig, Worker, type WorkerProps } from "./worker.ts";
 import { WranglerJson, type WranglerJsonSpec } from "./wrangler.json.ts";
 
-export interface WebsiteProps<B extends Bindings> extends Omit<
-  WorkerProps<B>,
-  "assets" | "dev"
-> {
+export interface WebsiteProps<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> extends Omit<WorkerProps<B, RPC>, "assets" | "dev"> {
   /**
    * Configuration for the build command
    *
@@ -149,14 +149,15 @@ export interface WebsiteProps<B extends Bindings> extends Omit<
   memoize?: boolean | { patterns: string[] };
 }
 
-export type Website<B extends Bindings> = B extends { ASSETS: any }
-  ? never
-  : Worker<B & { ASSETS: Assets }>;
+export type Website<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> = B extends { ASSETS: any } ? never : Worker<B & { ASSETS: Assets }, RPC>;
 
-export async function Website<B extends Bindings>(
-  id: string,
-  props: WebsiteProps<B>,
-) {
+export async function Website<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+>(id: string, props: WebsiteProps<B, RPC>) {
   const {
     name = Scope.current.createPhysicalName(id).toLowerCase(),
     build: buildProps,
@@ -377,7 +378,7 @@ export async function Website<B extends Bindings>(
         : {}),
     },
     dev: url ? { url } : undefined,
-  })) as Website<B>;
+  })) as Website<B, RPC>;
 }
 
 export const spreadBuildProps = (

package/src/cloudflare/worker-metadata.ts

@@ -492,6 +492,14 @@ export async function prepareWorkerMetadata(
         jurisdiction:
           binding.jurisdiction === "default" ? undefined : binding.jurisdiction,
       });
+    } else if (binding.type === "send_email") {
+      meta.bindings.push({
+        type: "send_email",
+        name: bindingName,
+        destination_address: binding.destinationAddress,
+        allowed_destination_addresses: binding.allowedDestinationAddresses,
+        allowed_sender_addresses: binding.allowedSenderAddresses,
+      });
     } else if (binding.type === "secrets_store_secret") {
       meta.bindings.push({
         type: "secrets_store_secret",

package/src/cloudflare/worker.ts

@@ -6,7 +6,11 @@ import type { type } from "../type.ts";
 import { DeferredPromise } from "../util/deferred-promise.ts";
 import { logger } from "../util/logger.ts";
 import { withExponentialBackoff } from "../util/retry.ts";
-import { CloudflareApiError, handleApiError } from "./api-error.ts";
+import {
+  CloudflareApiError,
+  handleApiError,
+  isCloudflareApiError,
+} from "./api-error.ts";
 import {
   type CloudflareApi,
   type CloudflareApiOptions,
@@ -207,6 +211,14 @@ export interface BaseWorkerProps<
    */
   logpush?: boolean;
 
+  /**
+   * Whether to delete the worker when removed from Alchemy.
+   * If set to false, the worker will remain but the resource will be removed from state.
+   *
+   * @default true
+   */
+  delete?: boolean;
+
   /**
    * Whether to adopt the Worker if it already exists when creating
    */
@@ -939,6 +951,14 @@ export type Worker<
  * // The worker will have a preview URL for testing:
  * console.log(`Preview URL: ${previewWorker.url}`);
  * // Output: Preview URL: https://pr-123-my-worker.subdomain.workers.dev
+ *
+ * @example
+ * // Prevent deletion of the worker when removed from Alchemy:
+ * const worker = await Worker("critical-api", {
+ *   name: "critical-api",
+ *   entrypoint: "./src/api.ts",
+ *   delete: false
+ * });
  */
 export function Worker<
   const B extends Bindings,
@@ -1104,7 +1124,7 @@ const _Worker = Resource(
         durableObjects: options.durableObjects,
         workflows: options.workflows,
       });
-      if (this.output?.dev?.hasRemote !== false) {
+      if (props.delete !== false && this.output?.dev?.hasRemote !== false) {
         const api = await createCloudflareApi(props);
         if (props.version) {
           //* if the worker exists we deploy an empty version so we can destroy
@@ -1544,6 +1564,7 @@ async function provisionResources<B extends Bindings>(
               durableObjects: {
                 namespaceId: await getContainerNamespaceId(container),
               },
+              delete: props.delete,
               dev: options.local,
               ...input.api,
             });
@@ -1557,6 +1578,7 @@ async function provisionResources<B extends Bindings>(
               name: domain.name,
               zoneId: domain.zoneId,
               adopt: domain.adopt,
+              delete: props.delete,
               workerName: options.name,
               dev: options.local,
               ...input.api,
@@ -1579,6 +1601,7 @@ async function provisionResources<B extends Bindings>(
               scriptName: options.name,
               settings: eventSource.settings,
               adopt: props.adopt,
+              delete: props.delete,
               dev: options.local,
               ...input.api,
             });
@@ -1593,6 +1616,7 @@ async function provisionResources<B extends Bindings>(
               script: options.name,
               zoneId: route.zoneId,
               adopt: route.adopt,
+              delete: props.delete,
               dev: options.local,
               ...input.api,
             });
@@ -1843,6 +1867,16 @@ export async function putWorker(
             });
           }
         }
+        if (
+          isCloudflareApiError(error, { code: 11001 }) &&
+          !props.eventSources?.length
+        ) {
+          // Error code 11001 means that the worker has event sources, but no `queue` handler is defined.
+          // Normally, queue consumers are removed automatically since we're using the `QueueConsumer` resource,
+          // but if no `queue` handler is defined, we need to remove them for Cloudflare to let us deploy.
+          await deleteQueueConsumers(api, workerName);
+          return await putWorker(api, props);
+        }
         throw error;
       }
     },

package/src/cloudflare/wrangler.json.ts

@@ -263,6 +263,7 @@ async function processBindings(
   const durableObjects: WranglerJsonConfig["durable_objects"]["bindings"] = [];
   const r2Buckets: WranglerJsonConfig["r2_buckets"] = [];
   const services: WranglerJsonConfig["services"] = [];
+  const sendEmailBindings: WranglerJsonConfig["send_email"] = [];
   const secrets: string[] = [];
   const workflows: WranglerJsonConfig["workflows"] = [];
   const d1Databases: WranglerJsonConfig["d1_databases"] = [];
@@ -389,6 +390,14 @@ async function processBindings(
           binding.jurisdiction === "default" ? undefined : binding.jurisdiction,
         ...(binding.dev?.remote ? { remote: true } : {}),
       });
+    } else if (binding.type === "send_email") {
+      sendEmailBindings.push({
+        name: bindingName,
+        destination_address: binding.destinationAddress,
+        allowed_destination_addresses: binding.allowedDestinationAddresses,
+        allowed_sender_addresses: binding.allowedSenderAddresses,
+        ...(binding.dev?.remote ? { remote: true } : {}),
+      });
     } else if (binding.type === "secret") {
       // Secret binding
       secrets.push(bindingName);
@@ -569,6 +578,14 @@ async function processBindings(
     spec.services = services;
   }
 
+  if (sendEmailBindings.length > 0) {
+    (
+      spec as WranglerJsonSpec & {
+        send_email?: typeof sendEmailBindings;
+      }
+    ).send_email = sendEmailBindings;
+  }
+
   if (d1Databases.length > 0) {
     spec.d1_databases = d1Databases;
   }