diff --git a/packages/alchemy/src/Cloudflare/Workers/Worker.ts b/packages/alchemy/src/Cloudflare/Workers/Worker.ts index bdee4165899..8f39a3597e1 100644 --- a/packages/alchemy/src/Cloudflare/Workers/Worker.ts +++ b/packages/alchemy/src/Cloudflare/Workers/Worker.ts @@ -486,6 +486,10 @@ export interface WorkerProps< * One or more custom hostnames (e.g. `"app.example.com"`) to bind to this * Worker. The Cloudflare Zone is inferred from the hostname — the zone must * already exist in the account. + * + * Pass an empty array to detach every custom domain. Omitting the prop + * leaves custom domains unmanaged — attachments made outside Alchemy are + * preserved. */ domain?: string | string[]; /** diff --git a/packages/alchemy/src/Cloudflare/Workers/WorkerProvider.ts b/packages/alchemy/src/Cloudflare/Workers/WorkerProvider.ts index 57913ab195a..0b381d3d0e3 100644 --- a/packages/alchemy/src/Cloudflare/Workers/WorkerProvider.ts +++ b/packages/alchemy/src/Cloudflare/Workers/WorkerProvider.ts @@ -2,8 +2,10 @@ import * as durableObjectsApi from "@distilled.cloud/cloudflare/durable-objects" import * as workers from "@distilled.cloud/cloudflare/workers"; import * as wfp from "@distilled.cloud/cloudflare/workers-for-platforms"; import * as zones from "@distilled.cloud/cloudflare/zones"; +import * as Config from "effect/Config"; import * as Data from "effect/Data"; import * as Effect from "effect/Effect"; +import * as Option from "effect/Option"; import * as Path from "effect/Path"; import * as Predicate from "effect/Predicate"; import * as Redacted from "effect/Redacted"; @@ -19,6 +21,7 @@ import * as ProviderLayer from "../../Local/ProviderLayer.ts"; import * as Provider from "../../Provider.ts"; import { type ResourceBinding } from "../../Resource.ts"; import { Stack } from "../../Stack.ts"; +import { cachedFunction } from "../../Util/cached-function.ts"; import { sha256Object } from "../../Util/sha256.ts"; import { CloudflareEnvironment } from "../CloudflareEnvironment.ts"; import { CloudflareLogs } from "../Logs.ts"; @@ -295,6 +298,60 @@ export const normalizeStateDomains = ( return typeof hostname === "string" ? [`https://${hostname}`] : []; }); +/** + * Custom domains Alchemy is responsible for on this Worker — either declared + * on props (`domain`) or already persisted as non-`workers.dev` URLs in state. + * Used by `read` to skip `listDomains` when the surface is unmanaged (#926). + * + * @internal exported for unit testing. + */ +export const shouldObserveWorkerDomains = ( + olds: Pick | undefined, + output: Pick | undefined, +): boolean => + olds?.domain !== undefined || + normalizeStateDomains(output?.domains).some( + (url) => !url.endsWith(".workers.dev"), + ); + +/** + * Zone routes Alchemy is responsible for on this Worker. Used by `read` to + * skip account-wide zone/route fan-out when the surface is unmanaged (#926). + * + * @internal exported for unit testing. + */ +export const shouldObserveWorkerRoutes = ( + olds: Pick | undefined, + output: Pick | undefined, +): boolean => olds?.routes !== undefined || (output?.routes?.length ?? 0) > 0; + +/** + * Cron triggers Alchemy is responsible for on this Worker. Used by `read` to + * skip `getScriptSchedule` when the surface is unmanaged (#926). Effect-native + * `cron()` bindings persist into `output.crons` after the first reconcile, so + * subsequent reads still observe them. + * + * @internal exported for unit testing. + */ +export const shouldObserveWorkerCrons = ( + olds: Pick | undefined, + output: Pick | undefined, +): boolean => olds?.crons !== undefined || (output?.crons?.length ?? 0) > 0; + +/** + * Optional override for the account's stable `workers.dev` subdomain + * (`` in `https://