alchemy 0.38.1 → 0.39.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cloudflare/custom-domain.d.ts +19 -1
- package/lib/cloudflare/custom-domain.d.ts.map +1 -1
- package/lib/cloudflare/custom-domain.js +21 -22
- package/lib/cloudflare/custom-domain.js.map +1 -1
- package/lib/cloudflare/route.d.ts +8 -0
- package/lib/cloudflare/route.d.ts.map +1 -1
- package/lib/cloudflare/route.js +6 -11
- package/lib/cloudflare/route.js.map +1 -1
- package/lib/cloudflare/worker.d.ts +44 -7
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +38 -12
- package/lib/cloudflare/worker.js.map +1 -1
- package/lib/cloudflare/zone.d.ts +4 -7
- package/lib/cloudflare/zone.d.ts.map +1 -1
- package/lib/cloudflare/zone.js +4 -8
- package/lib/cloudflare/zone.js.map +1 -1
- package/lib/util/safe-fetch.d.ts.map +1 -1
- package/lib/util/safe-fetch.js +1 -1
- package/lib/util/safe-fetch.js.map +1 -1
- package/package.json +1 -1
- package/src/cloudflare/custom-domain.ts +37 -40
- package/src/cloudflare/route.ts +10 -13
- package/src/cloudflare/worker.ts +125 -36
- package/src/cloudflare/zone.ts +8 -9
- package/src/util/safe-fetch.ts +1 -1
|
@@ -11,8 +11,10 @@ export interface CustomDomainProps extends CloudflareApiOptions {
|
|
|
11
11
|
name: string;
|
|
12
12
|
/**
|
|
13
13
|
* Cloudflare Zone ID for the domain
|
|
14
|
+
*
|
|
15
|
+
* @default - inferred from the domain name
|
|
14
16
|
*/
|
|
15
|
-
zoneId
|
|
17
|
+
zoneId?: string;
|
|
16
18
|
/**
|
|
17
19
|
* Name of the worker to bind to the domain
|
|
18
20
|
*/
|
|
@@ -22,6 +24,13 @@ export interface CustomDomainProps extends CloudflareApiOptions {
|
|
|
22
24
|
* @default "production"
|
|
23
25
|
*/
|
|
24
26
|
environment?: string;
|
|
27
|
+
/**
|
|
28
|
+
* If true, adopt an existing custom domain binding during creation.
|
|
29
|
+
* If false and the domain already exists, creation will fail.
|
|
30
|
+
* This only applies during the create phase.
|
|
31
|
+
* @default false
|
|
32
|
+
*/
|
|
33
|
+
adopt?: boolean;
|
|
25
34
|
}
|
|
26
35
|
/**
|
|
27
36
|
* Output returned after CustomDomain creation/update
|
|
@@ -57,6 +66,15 @@ export interface CustomDomain extends Resource<"cloudflare::CustomDomain">, Cust
|
|
|
57
66
|
* workerName: apiWorker.name // Use the name from the Worker resource
|
|
58
67
|
* });
|
|
59
68
|
*
|
|
69
|
+
* @example
|
|
70
|
+
* // Adopt an existing domain binding during creation
|
|
71
|
+
* const existingDomain = await CustomDomain("api-domain", {
|
|
72
|
+
* name: "api.example.com",
|
|
73
|
+
* zoneId: "YOUR_ZONE_ID",
|
|
74
|
+
* workerName: "my-api-worker",
|
|
75
|
+
* adopt: true // If domain already exists, adopt it instead of failing
|
|
76
|
+
* });
|
|
77
|
+
*
|
|
60
78
|
* @see https://developers.cloudflare.com/api/resources/workers/subresources/domains/
|
|
61
79
|
*/
|
|
62
80
|
export declare const CustomDomain: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<CustomDomain>, logicalId: string, props: CustomDomainProps) => Promise<CustomDomain>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-domain.d.ts","sourceRoot":"","sources":["../../src/cloudflare/custom-domain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"custom-domain.d.ts","sourceRoot":"","sources":["../../src/cloudflare/custom-domain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAGlB;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB;IAC7D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAcD;;GAEG;AACH,MAAM,WAAW,YACf,SAAQ,QAAQ,CAAC,0BAA0B,CAAC,EAC1C,iBAAiB;IACnB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,YAAY,yFAGf,OAAO,CAAC,YAAY,CAAC,aAChB,MAAM,SACV,iBAAiB,KACvB,OAAO,CAAC,YAAY,CAAC,CAczB,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { Resource } from "../resource.js";
|
|
|
2
2
|
import { logger } from "../util/logger.js";
|
|
3
3
|
import { handleApiError } from "./api-error.js";
|
|
4
4
|
import { createCloudflareApi, } from "./api.js";
|
|
5
|
+
import { inferZoneIdFromPattern } from "./route.js";
|
|
5
6
|
/**
|
|
6
7
|
* Configure custom domain for a Cloudflare Worker using the Cloudflare Custom Domains API
|
|
7
8
|
* This attaches a worker to a specific hostname within a zone.
|
|
@@ -19,28 +20,30 @@ import { createCloudflareApi, } from "./api.js";
|
|
|
19
20
|
* workerName: apiWorker.name // Use the name from the Worker resource
|
|
20
21
|
* });
|
|
21
22
|
*
|
|
23
|
+
* @example
|
|
24
|
+
* // Adopt an existing domain binding during creation
|
|
25
|
+
* const existingDomain = await CustomDomain("api-domain", {
|
|
26
|
+
* name: "api.example.com",
|
|
27
|
+
* zoneId: "YOUR_ZONE_ID",
|
|
28
|
+
* workerName: "my-api-worker",
|
|
29
|
+
* adopt: true // If domain already exists, adopt it instead of failing
|
|
30
|
+
* });
|
|
31
|
+
*
|
|
22
32
|
* @see https://developers.cloudflare.com/api/resources/workers/subresources/domains/
|
|
23
33
|
*/
|
|
24
34
|
export const CustomDomain = Resource("cloudflare::CustomDomain", async function (logicalId, // Changed param name from id to logicalId for clarity
|
|
25
35
|
props) {
|
|
26
36
|
// Create Cloudflare API client with automatic account discovery
|
|
27
37
|
const api = await createCloudflareApi(props);
|
|
28
|
-
// Validate required properties
|
|
29
|
-
if (!props.name) {
|
|
30
|
-
throw new Error("Domain name (props.name) is required");
|
|
31
|
-
}
|
|
32
|
-
if (!props.zoneId) {
|
|
33
|
-
throw new Error("Zone ID (props.zoneId) is required");
|
|
34
|
-
}
|
|
35
|
-
if (!props.workerName) {
|
|
36
|
-
throw new Error("Worker name (props.workerName) is required");
|
|
37
|
-
}
|
|
38
38
|
if (this.phase === "delete") {
|
|
39
39
|
await deleteCustomDomain(this, api, logicalId, props);
|
|
40
40
|
return this.destroy();
|
|
41
41
|
}
|
|
42
42
|
// Create or Update phase
|
|
43
|
-
return await ensureCustomDomain(this, api, logicalId,
|
|
43
|
+
return await ensureCustomDomain(this, api, logicalId, {
|
|
44
|
+
...props,
|
|
45
|
+
zoneId: props.zoneId ?? (await inferZoneIdFromPattern(api, props.name)),
|
|
46
|
+
});
|
|
44
47
|
});
|
|
45
48
|
// Helper function to delete the custom domain binding
|
|
46
49
|
async function deleteCustomDomain(context, api, logicalId, props) {
|
|
@@ -50,9 +53,7 @@ async function deleteCustomDomain(context, api, logicalId, props) {
|
|
|
50
53
|
logger.warn(`Cannot delete CustomDomain ${logicalId} (${domainHostname}): Missing domain ID in state. Assuming already deleted.`);
|
|
51
54
|
return; // Exit early if no ID
|
|
52
55
|
}
|
|
53
|
-
logger.log(`Deleting CustomDomain binding ${domainIdToDelete} for ${domainHostname}`);
|
|
54
56
|
const response = await api.delete(`/accounts/${api.accountId}/workers/domains/${domainIdToDelete}`);
|
|
55
|
-
logger.log(`Delete result for ${domainIdToDelete} (${domainHostname}):`, response.status, response.statusText);
|
|
56
57
|
// 404 is acceptable during deletion for idempotency
|
|
57
58
|
if (!response.ok && response.status !== 404) {
|
|
58
59
|
await handleApiError(response, "deleting", "custom domain binding", domainIdToDelete);
|
|
@@ -65,7 +66,6 @@ async function ensureCustomDomain(context, api, _logicalId, props) {
|
|
|
65
66
|
const environment = props.environment || "production";
|
|
66
67
|
const domainHostname = props.name;
|
|
67
68
|
// Check if domain binding already exists for this account
|
|
68
|
-
logger.log(`Checking existing domain bindings for account ${api.accountId}`);
|
|
69
69
|
const listResponse = await api.get(`/accounts/${api.accountId}/workers/domains`);
|
|
70
70
|
if (!listResponse.ok) {
|
|
71
71
|
// Fix: Added the 4th argument (resource identifier/context)
|
|
@@ -81,9 +81,13 @@ async function ensureCustomDomain(context, api, _logicalId, props) {
|
|
|
81
81
|
const existingBinding = listData.result.find((b) => b.hostname === domainHostname && b.zone_id === props.zoneId);
|
|
82
82
|
let currentDomainId = existingBinding?.id;
|
|
83
83
|
const bindingExists = !!existingBinding;
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
84
|
+
// Handle the case where domain already exists during create phase
|
|
85
|
+
if (context.phase === "create" && bindingExists) {
|
|
86
|
+
if (!props.adopt) {
|
|
87
|
+
throw new Error(`CustomDomain for ${domainHostname} already exists in zone ${props.zoneId}. ` +
|
|
88
|
+
"Set adopt: true to take control of the existing domain binding.");
|
|
89
|
+
}
|
|
90
|
+
}
|
|
87
91
|
// Determine if we need to update (binding exists but has different service or environment)
|
|
88
92
|
const needsUpdate = bindingExists &&
|
|
89
93
|
(existingBinding.service !== props.workerName ||
|
|
@@ -94,7 +98,6 @@ async function ensureCustomDomain(context, api, _logicalId, props) {
|
|
|
94
98
|
// Cloudflare's PUT /accounts/{account_id}/workers/domains acts as an upsert
|
|
95
99
|
if (!bindingExists || needsUpdate) {
|
|
96
100
|
operationPerformed = bindingExists ? "update" : "create";
|
|
97
|
-
logger.log(`${operationPerformed === "update" ? "Updating" : "Creating"} domain binding: ${domainHostname} (Zone: ${props.zoneId}) → ${props.workerName}:${environment}`);
|
|
98
101
|
const putPayload = {
|
|
99
102
|
zone_id: props.zoneId,
|
|
100
103
|
hostname: domainHostname,
|
|
@@ -113,10 +116,6 @@ async function ensureCustomDomain(context, api, _logicalId, props) {
|
|
|
113
116
|
}
|
|
114
117
|
resultantBinding = putResult.result;
|
|
115
118
|
currentDomainId = resultantBinding.id; // Update ID from the PUT response
|
|
116
|
-
logger.log(`Successfully ${operationPerformed}d binding, new ID: ${currentDomainId}`);
|
|
117
|
-
}
|
|
118
|
-
else {
|
|
119
|
-
logger.log(`Domain binding already exists and is up to date: ${domainHostname} (ID: ${currentDomainId}) → ${props.workerName}:${environment}`);
|
|
120
119
|
}
|
|
121
120
|
// Ensure we have the final binding details
|
|
122
121
|
if (!resultantBinding || !currentDomainId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-domain.js","sourceRoot":"","sources":["../../src/cloudflare/custom-domain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,mBAAmB,GAGpB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"custom-domain.js","sourceRoot":"","sources":["../../src/cloudflare/custom-domain.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,5 +130,13 @@ export declare function getRoute(api: CloudflareApi, zoneId: string, routeId: st
|
|
|
130
130
|
* List all routes for a zone
|
|
131
131
|
*/
|
|
132
132
|
export declare function listRoutes(api: CloudflareApi, zoneId: string): Promise<CloudflareRouteResponse>;
|
|
133
|
+
/**
|
|
134
|
+
* Infer zone ID from a route pattern using Cloudflare API
|
|
135
|
+
* This implements similar logic to wrangler's zone inference
|
|
136
|
+
* @param pattern The route pattern
|
|
137
|
+
* @param apiOptions API options for Cloudflare API calls
|
|
138
|
+
* @returns Promise resolving to zone ID or null if not found
|
|
139
|
+
*/
|
|
140
|
+
export declare function inferZoneIdFromPattern(api: CloudflareApi, pattern: string): Promise<string>;
|
|
133
141
|
export {};
|
|
134
142
|
//# sourceMappingURL=route.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/cloudflare/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAExB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,KAAM,SAAQ,QAAQ,CAAC,mBAAmB,CAAC,EAAE,UAAU;IACtE;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,eAAO,MAAM,KAAK,yFAGR,OAAO,CAAC,KAAK,CAAC,OACf,MAAM,SACJ,UAAU,KAChB,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/cloudflare/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAExB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,KAAM,SAAQ,QAAQ,CAAC,mBAAmB,CAAC,EAAE,UAAU;IACtE;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,eAAO,MAAM,KAAK,yFAGR,OAAO,CAAC,KAAK,CAAC,OACf,MAAM,SACJ,UAAU,KAChB,OAAO,CAAC,KAAK,CAAC,CAoGlB,CAAC;AAEF,UAAU,uBAAuB;IAC/B,MAAM,EAAE;QACN,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjD,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAwED;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,uBAAuB,CAAC,CAWlC;AAED;;GAEG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,uBAAuB,CAAC,CAWlC;AA4DD;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CA0BjB"}
|
package/lib/cloudflare/route.js
CHANGED
|
@@ -69,13 +69,7 @@ export const Route = Resource("cloudflare::Route", async function (_id, props) {
|
|
|
69
69
|
// Get or infer zone ID (only needed for create/update phases)
|
|
70
70
|
let zoneId = props.zoneId;
|
|
71
71
|
if (!zoneId) {
|
|
72
|
-
const inferredZoneId = await inferZoneIdFromPattern(props.pattern
|
|
73
|
-
accountId: props.accountId,
|
|
74
|
-
apiKey: props.apiKey,
|
|
75
|
-
apiToken: props.apiToken,
|
|
76
|
-
baseUrl: props.baseUrl,
|
|
77
|
-
email: props.email,
|
|
78
|
-
});
|
|
72
|
+
const inferredZoneId = await inferZoneIdFromPattern(api, props.pattern);
|
|
79
73
|
if (!inferredZoneId) {
|
|
80
74
|
throw new Error(`Could not infer zone ID for route pattern "${props.pattern}". ` +
|
|
81
75
|
"Please ensure the domain is managed by Cloudflare or specify an explicit zoneId.");
|
|
@@ -217,12 +211,12 @@ function extractDomainFromPattern(pattern) {
|
|
|
217
211
|
* @param apiOptions API options for Cloudflare API calls
|
|
218
212
|
* @returns Promise resolving to zone ID or null if not found
|
|
219
213
|
*/
|
|
220
|
-
async function inferZoneIdFromPattern(
|
|
214
|
+
export async function inferZoneIdFromPattern(api, pattern) {
|
|
221
215
|
const domain = extractDomainFromPattern(pattern);
|
|
222
216
|
// Handle wildcard domains by removing the wildcard part
|
|
223
217
|
const cleanDomain = domain.replace(/^\*\./, "");
|
|
224
218
|
// Try to find zone for the exact domain first
|
|
225
|
-
let zone = await getZoneByDomain(
|
|
219
|
+
let zone = await getZoneByDomain(api, cleanDomain);
|
|
226
220
|
if (zone) {
|
|
227
221
|
return zone.id;
|
|
228
222
|
}
|
|
@@ -230,11 +224,12 @@ async function inferZoneIdFromPattern(pattern, apiOptions) {
|
|
|
230
224
|
const domainParts = cleanDomain.split(".");
|
|
231
225
|
for (let i = 1; i < domainParts.length - 1; i++) {
|
|
232
226
|
const parentDomain = domainParts.slice(i).join(".");
|
|
233
|
-
zone = await getZoneByDomain(
|
|
227
|
+
zone = await getZoneByDomain(api, parentDomain);
|
|
234
228
|
if (zone) {
|
|
235
229
|
return zone.id;
|
|
236
230
|
}
|
|
237
231
|
}
|
|
238
|
-
|
|
232
|
+
throw new Error(`Could not infer zone ID for route pattern "${pattern}". ` +
|
|
233
|
+
"Please ensure the domain is managed by Cloudflare or specify an explicit zoneId.");
|
|
239
234
|
}
|
|
240
235
|
//# sourceMappingURL=route.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../src/cloudflare/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EACL,mBAAmB,GAGpB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAmE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,QAAQ,CAC3B,mBAAmB,EACnB,KAAK,WAEH,GAAW,EACX,KAAiB;IAEjB,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAE7C,0EAA0E;IAC1E,MAAM,UAAU,GACd,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;IAEtE,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAE7C,mEAAmE;QACnE,yEAAyE;QACzE,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YAC3C,MAAM,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,+CAA+C;QAC/C,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,8DAA8D;IAC9D,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC1B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,cAAc,GAAG,MAAM,sBAAsB,CAAC,
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../src/cloudflare/route.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { type CloudflareApi, type CloudflareApiOptions } from "./api.ts";
|
|
|
6
6
|
import { type Bindings, type WorkerBindingService } from "./bindings.ts";
|
|
7
7
|
import type { Bound } from "./bound.ts";
|
|
8
8
|
import { type NoBundleResult } from "./bundle/bundle-worker.ts";
|
|
9
|
+
import { CustomDomain } from "./custom-domain.ts";
|
|
9
10
|
import type { DispatchNamespaceResource } from "./dispatch-namespace.ts";
|
|
10
11
|
import { type EventSource, type QueueEventSource } from "./event-source.ts";
|
|
11
12
|
import { type QueueResource } from "./queue.ts";
|
|
@@ -139,8 +140,16 @@ export interface BaseWorkerProps<B extends Bindings | undefined = undefined, RPC
|
|
|
139
140
|
* Routes to create for this worker.
|
|
140
141
|
*
|
|
141
142
|
* Each route maps a URL pattern to this worker script.
|
|
142
|
-
|
|
143
|
-
|
|
143
|
+
*
|
|
144
|
+
* @example
|
|
145
|
+
* await Worker("my-worker", {
|
|
146
|
+
* routes: [
|
|
147
|
+
* "sub.example.com/*",
|
|
148
|
+
* { pattern: "sub.example.com/*", zoneId: "1234567890" },
|
|
149
|
+
* ],
|
|
150
|
+
* });
|
|
151
|
+
*/
|
|
152
|
+
routes?: Array<string | {
|
|
144
153
|
/**
|
|
145
154
|
* URL pattern for the route
|
|
146
155
|
* @example "sub.example.com/*"
|
|
@@ -150,16 +159,40 @@ export interface BaseWorkerProps<B extends Bindings | undefined = undefined, RPC
|
|
|
150
159
|
* Zone ID for the route. If not provided, will be automatically inferred from the route pattern.
|
|
151
160
|
*/
|
|
152
161
|
zoneId?: string;
|
|
153
|
-
/**
|
|
154
|
-
* Whether this is a custom domain route
|
|
155
|
-
*/
|
|
156
|
-
customDomain?: boolean;
|
|
157
162
|
/**
|
|
158
163
|
* Whether to adopt an existing route with the same pattern if it exists
|
|
159
164
|
* @default false
|
|
160
165
|
*/
|
|
161
166
|
adopt?: boolean;
|
|
162
167
|
}>;
|
|
168
|
+
/**
|
|
169
|
+
* Custom domains to bind to the worker
|
|
170
|
+
*
|
|
171
|
+
* @example
|
|
172
|
+
* await Worker("my-worker", {
|
|
173
|
+
* domains: [
|
|
174
|
+
* "example.com",
|
|
175
|
+
* { name: "example.com", zoneId: "1234567890" },
|
|
176
|
+
* ],
|
|
177
|
+
* });
|
|
178
|
+
*/
|
|
179
|
+
domains?: (string | {
|
|
180
|
+
/**
|
|
181
|
+
* The domain name to bind to the worker
|
|
182
|
+
*/
|
|
183
|
+
domainName: string;
|
|
184
|
+
/**
|
|
185
|
+
* Zone ID for the domain.
|
|
186
|
+
*
|
|
187
|
+
* @default - If not provided, will be automatically inferred from the domain name.
|
|
188
|
+
*/
|
|
189
|
+
zoneId?: string;
|
|
190
|
+
/**
|
|
191
|
+
* Whether to adopt an existing domain if it exists
|
|
192
|
+
* @default false
|
|
193
|
+
*/
|
|
194
|
+
adopt?: boolean;
|
|
195
|
+
})[];
|
|
163
196
|
/**
|
|
164
197
|
* The RPC class to use for the worker.
|
|
165
198
|
*
|
|
@@ -248,7 +281,7 @@ export declare function isWorker(resource: Resource): resource is Worker<any>;
|
|
|
248
281
|
/**
|
|
249
282
|
* Output returned after Worker creation/update
|
|
250
283
|
*/
|
|
251
|
-
export type Worker<B extends Bindings | undefined = Bindings | undefined, RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded> = Resource<"cloudflare::Worker"> & Omit<WorkerProps<B>, "url" | "script" | "routes"> & globalThis.Service & {
|
|
284
|
+
export type Worker<B extends Bindings | undefined = Bindings | undefined, RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded> = Resource<"cloudflare::Worker"> & Omit<WorkerProps<B>, "url" | "script" | "routes" | "domains"> & globalThis.Service & {
|
|
252
285
|
/** @internal phantom property */
|
|
253
286
|
__rpc__?: RPC;
|
|
254
287
|
type: "service";
|
|
@@ -287,6 +320,10 @@ export type Worker<B extends Bindings | undefined = Bindings | undefined, RPC ex
|
|
|
287
320
|
* The routes that were created for this worker
|
|
288
321
|
*/
|
|
289
322
|
routes?: Route[];
|
|
323
|
+
/**
|
|
324
|
+
* The custom domains that were created for this worker
|
|
325
|
+
*/
|
|
326
|
+
domains?: CustomDomain[];
|
|
290
327
|
Env: B extends Bindings ? {
|
|
291
328
|
[bindingName in keyof B]: Bound<B[bindingName]>;
|
|
292
329
|
} : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAsB,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAO5E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAKvC,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAE1B,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,KAAK,QAAQ,EAEb,KAAK,oBAAoB,EAC1B,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"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"}
|
package/lib/cloudflare/worker.js
CHANGED
|
@@ -15,6 +15,7 @@ import { createCloudflareApi, } from "./api.js";
|
|
|
15
15
|
import { Json, } from "./bindings.js";
|
|
16
16
|
import { isBucket } from "./bucket.js";
|
|
17
17
|
import { bundleWorkerScript, } from "./bundle/bundle-worker.js";
|
|
18
|
+
import { CustomDomain } from "./custom-domain.js";
|
|
18
19
|
import { isD1Database } from "./d1-database.js";
|
|
19
20
|
import { DurableObjectNamespace, isDurableObjectNamespace, } from "./durable-object-namespace.js";
|
|
20
21
|
import { isQueueEventSource, } from "./event-source.js";
|
|
@@ -362,22 +363,45 @@ export const _Worker = Resource("cloudflare::Worker", {
|
|
|
362
363
|
}
|
|
363
364
|
}
|
|
364
365
|
const { workerUrl, now } = await uploadWorkerScript(props);
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
if (props.routes && props.routes.length > 0) {
|
|
368
|
-
// Validate for duplicate patterns
|
|
369
|
-
const patterns = props.routes.map((route) => route.pattern);
|
|
370
|
-
const duplicates = patterns.filter((pattern, index) => patterns.indexOf(pattern) !== index);
|
|
366
|
+
function ensureNoDuplicates(name, items) {
|
|
367
|
+
const duplicates = items.filter((pattern, index) => items.indexOf(pattern) !== index);
|
|
371
368
|
if (duplicates.length > 0) {
|
|
372
|
-
throw new Error(`Duplicate
|
|
369
|
+
throw new Error(`Duplicate ${name} found: ${duplicates.join(", ")}`);
|
|
373
370
|
}
|
|
371
|
+
}
|
|
372
|
+
let createdDomains;
|
|
373
|
+
if (props.domains?.length) {
|
|
374
|
+
ensureNoDuplicates("Custom Domain", props.domains.map((domain) => typeof domain === "string" ? domain : domain.domainName));
|
|
375
|
+
createdDomains = await Promise.all(props.domains.map(async (customDomain) => {
|
|
376
|
+
const domainName = typeof customDomain === "string"
|
|
377
|
+
? customDomain
|
|
378
|
+
: customDomain.domainName;
|
|
379
|
+
return await CustomDomain(domainName, {
|
|
380
|
+
workerName,
|
|
381
|
+
name: domainName,
|
|
382
|
+
zoneId: typeof customDomain === "string"
|
|
383
|
+
? undefined
|
|
384
|
+
: customDomain.zoneId,
|
|
385
|
+
adopt: typeof customDomain === "string"
|
|
386
|
+
? false
|
|
387
|
+
: (customDomain.adopt ?? props.adopt),
|
|
388
|
+
});
|
|
389
|
+
}));
|
|
390
|
+
}
|
|
391
|
+
// Create routes if provided and capture their outputs
|
|
392
|
+
let createdRoutes;
|
|
393
|
+
if (props.routes && props.routes.length > 0) {
|
|
394
|
+
ensureNoDuplicates("Route", props.routes.map((route) => typeof route === "string" ? route : route.pattern));
|
|
374
395
|
// Create Route resources for each route and capture their outputs
|
|
375
396
|
createdRoutes = await Promise.all(props.routes.map(async (routeConfig) => {
|
|
376
|
-
|
|
377
|
-
|
|
397
|
+
const pattern = typeof routeConfig === "string" ? routeConfig : routeConfig.pattern;
|
|
398
|
+
return await Route(pattern, {
|
|
399
|
+
pattern,
|
|
378
400
|
script: workerName,
|
|
379
|
-
zoneId: routeConfig.zoneId, // Route resource will handle inference if not provided
|
|
380
|
-
adopt: routeConfig
|
|
401
|
+
zoneId: typeof routeConfig === "string" ? undefined : routeConfig.zoneId, // Route resource will handle inference if not provided
|
|
402
|
+
adopt: typeof routeConfig === "string"
|
|
403
|
+
? false
|
|
404
|
+
: (routeConfig.adopt ?? props.adopt),
|
|
381
405
|
accountId: props.accountId,
|
|
382
406
|
apiKey: props.apiKey,
|
|
383
407
|
apiToken: props.apiToken,
|
|
@@ -427,7 +451,9 @@ export const _Worker = Resource("cloudflare::Worker", {
|
|
|
427
451
|
// Include cron triggers in the output
|
|
428
452
|
crons: props.crons,
|
|
429
453
|
// Include the created routes in the output
|
|
430
|
-
routes: createdRoutes
|
|
454
|
+
routes: createdRoutes,
|
|
455
|
+
// Include the created domains in the output
|
|
456
|
+
domains: createdDomains,
|
|
431
457
|
// Include the dispatch namespace in the output
|
|
432
458
|
namespace: props.namespace,
|
|
433
459
|
// Include version information in the output
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"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"}
|
package/lib/cloudflare/zone.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Context } from "../context.ts";
|
|
2
2
|
import { Resource } from "../resource.ts";
|
|
3
|
-
import { type CloudflareApiOptions } from "./api.ts";
|
|
3
|
+
import { type CloudflareApi, type CloudflareApiOptions } from "./api.ts";
|
|
4
4
|
import type { AlwaysUseHTTPSValue, AutomaticHTTPSRewritesValue, BrotliValue, DevelopmentModeValue, EarlyHintsValue, EmailObfuscationValue, HTTP2Value, HTTP3Value, HotlinkProtectionValue, IPv6Value, MinTLSVersionValue, SSLValue, TLS13Value, WebSocketsValue, ZeroRTTValue } from "./zone-settings.ts";
|
|
5
5
|
/**
|
|
6
6
|
* Properties for creating or updating a Zone
|
|
@@ -264,7 +264,7 @@ export declare const Zone: (((this: any, id: string, props?: {}) => never) & (ne
|
|
|
264
264
|
*
|
|
265
265
|
* @example
|
|
266
266
|
* // Look up a zone by domain name
|
|
267
|
-
* const zone = await getZoneByDomain("example.com");
|
|
267
|
+
* const zone = await getZoneByDomain(api, "example.com");
|
|
268
268
|
* if (zone) {
|
|
269
269
|
* console.log(`Zone ID: ${zone.id}`);
|
|
270
270
|
* console.log(`Nameservers: ${zone.nameservers.join(", ")}`);
|
|
@@ -272,12 +272,9 @@ export declare const Zone: (((this: any, id: string, props?: {}) => never) & (ne
|
|
|
272
272
|
*
|
|
273
273
|
* @example
|
|
274
274
|
* // Look up a zone with custom API options
|
|
275
|
-
* const zone = await getZoneByDomain("example.com"
|
|
276
|
-
* apiToken: myApiToken,
|
|
277
|
-
* accountId: "my-account-id"
|
|
278
|
-
* });
|
|
275
|
+
* const zone = await getZoneByDomain(api, "example.com");
|
|
279
276
|
*/
|
|
280
|
-
export declare function getZoneByDomain(
|
|
277
|
+
export declare function getZoneByDomain(api: CloudflareApi, domainName: string): Promise<ZoneData | null>;
|
|
281
278
|
/**
|
|
282
279
|
* Cloudflare Zone response format
|
|
283
280
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zone.d.ts","sourceRoot":"","sources":["../../src/cloudflare/zone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,
|
|
1
|
+
{"version":3,"file":"zone.d.ts","sourceRoot":"","sources":["../../src/cloudflare/zone.ts"],"names":[],"mappings":"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"}
|
package/lib/cloudflare/zone.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Resource } from "../resource.js";
|
|
2
2
|
import { logger } from "../util/logger.js";
|
|
3
3
|
import { handleApiError } from "./api-error.js";
|
|
4
|
-
import { createCloudflareApi } from "./api.js";
|
|
4
|
+
import { createCloudflareApi, } from "./api.js";
|
|
5
5
|
/**
|
|
6
6
|
* A Cloudflare Zone represents a domain and its configuration settings on Cloudflare.
|
|
7
7
|
* Zones allow you to manage DNS, SSL/TLS, caching, security and other settings for a domain.
|
|
@@ -244,7 +244,7 @@ async function getZoneSettings(api, zoneId) {
|
|
|
244
244
|
*
|
|
245
245
|
* @example
|
|
246
246
|
* // Look up a zone by domain name
|
|
247
|
-
* const zone = await getZoneByDomain("example.com");
|
|
247
|
+
* const zone = await getZoneByDomain(api, "example.com");
|
|
248
248
|
* if (zone) {
|
|
249
249
|
* console.log(`Zone ID: ${zone.id}`);
|
|
250
250
|
* console.log(`Nameservers: ${zone.nameservers.join(", ")}`);
|
|
@@ -252,13 +252,9 @@ async function getZoneSettings(api, zoneId) {
|
|
|
252
252
|
*
|
|
253
253
|
* @example
|
|
254
254
|
* // Look up a zone with custom API options
|
|
255
|
-
* const zone = await getZoneByDomain("example.com"
|
|
256
|
-
* apiToken: myApiToken,
|
|
257
|
-
* accountId: "my-account-id"
|
|
258
|
-
* });
|
|
255
|
+
* const zone = await getZoneByDomain(api, "example.com");
|
|
259
256
|
*/
|
|
260
|
-
export async function getZoneByDomain(
|
|
261
|
-
const api = await createCloudflareApi(options);
|
|
257
|
+
export async function getZoneByDomain(api, domainName) {
|
|
262
258
|
const response = await api.get(`/zones?name=${encodeURIComponent(domainName)}`);
|
|
263
259
|
if (!response.ok) {
|
|
264
260
|
throw new Error(`Error fetching zone for '${domainName}': ${response.statusText}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zone.js","sourceRoot":"","sources":["../../src/cloudflare/zone.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"zone.js","sourceRoot":"","sources":["../../src/cloudflare/zone.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,mBAAmB,GAGpB,MAAM,UAAU,CAAC;AA0PlB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,QAAQ,CAC1B,kBAAkB,EAClB,KAAK,WAEH,GAAW,EACX,KAAgB;IAEhB,gEAAgE;IAChE,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAE7C,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC9C,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YAEpE,IAAI,CAAC,cAAc,CAAC,EAAE,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACxD,MAAM,cAAc,CAClB,cAAc,EACd,QAAQ,EACR,MAAM,EACN,IAAI,CAAC,MAAM,CAAC,EAAE,CACf,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,8BAA8B,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;QAC/C,uCAAuC;QACvC,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3D,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,uBAAuB,KAAK,CAAC,IAAI,MAAM,QAAQ,CAAC,UAAU,EAAE,CAC7D,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAI,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAgC;aACrE,MAAM,CAAC;QAEV,mCAAmC;QACnC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC9D,sDAAsD;YACtD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,IAAI,CAAC;YACV,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC9B,WAAW,EAAE,QAAQ,CAAC,YAAY;YAClC,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB;YACnD,SAAS,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;YAClD,UAAU,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;YACpD,WAAW,EAAE,QAAQ,CAAC,YAAY;gBAChC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;gBAC3C,CAAC,CAAC,IAAI;YACR,QAAQ,EAAE,MAAM,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;SAClD,CAAC,CAAC;IACL,CAAC;IACD,kBAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;QACxC,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,MAAM;QAC1B,UAAU,EAAE,KAAK,CAAC,SAAS,KAAK,KAAK;QACrC,OAAO,EAAE;YACP,EAAE,EAAE,GAAG,CAAC,SAAS;SAClB;KACF,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,QAAQ,CAAC;IACb,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC/D,wCAAwC;YACxC,MAAM,CAAC,IAAI,CACT,SAAS,KAAK,CAAC,IAAI,qDAAqD,CACzE,CAAC;YACF,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,eAAe,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YAE/D,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CACb,iCAAiC,KAAK,CAAC,IAAI,MAAM,WAAW,CAAC,UAAU,EAAE,CAC1E,CAAC;YACJ,CAAC;YAED,MAAM,KAAK,GACT,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,CAC1B,CAAC,MAAM,CAAC;YACT,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CACb,SAAS,KAAK,CAAC,IAAI,8DAA8D,CAClF,CAAC;YACJ,CAAC;YACD,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CACb,wBAAwB,KAAK,CAAC,IAAI,MAAM,QAAQ,CAAC,UAAU,KAAK,IAAI,EAAE,CACvE,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,QAAQ,GAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAgC,CAAC,MAAM,CAAC;IACrE,CAAC;IAED,mCAAmC;IACnC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,MAAM,kBAAkB,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3D,sDAAsD;QACtD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,IAAI,CAAC;QACV,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC9B,WAAW,EAAE,QAAQ,CAAC,YAAY;QAClC,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB;QACnD,SAAS,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;QAClD,UAAU,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;QACpD,WAAW,EAAE,QAAQ,CAAC,YAAY;YAChC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;YAC3C,CAAC,CAAC,IAAI;QACR,QAAQ,EAAE,MAAM,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;KAClD,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF;;GAEG;AACH,KAAK,UAAU,kBAAkB,CAC/B,GAAQ,EACR,MAAc,EACd,QAA+B;IAE/B,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,MAAM,WAAW,GAAG;QAClB,GAAG,EAAE,KAAK;QACV,cAAc,EAAE,kBAAkB;QAClC,sBAAsB,EAAE,0BAA0B;QAClD,KAAK,EAAE,SAAS;QAChB,UAAU,EAAE,aAAa;QACzB,gBAAgB,EAAE,mBAAmB;QACrC,eAAe,EAAE,mBAAmB;QACpC,eAAe,EAAE,kBAAkB;QACnC,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,MAAM;QACZ,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,oBAAoB;QACvC,aAAa,EAAE,iBAAiB;KACjC,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;SACrB,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC3C,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC1B,MAAM,SAAS,GAAG,WAAW,CAAC,GAA4B,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,KAAK,CAC9B,UAAU,MAAM,aAAa,SAAS,EAAE,EACxC;YACE,KAAK;SACqB,CAC7B,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAChE,MAAM,CAAC,IAAI,CAAC,qBAAqB,GAAG,mBAAmB,CAAC,CAAC;gBACzD,OAAO;YACT,CAAC;YACD,MAAM,IAAI,KAAK,CACb,iCAAiC,GAAG,KAAK,QAAQ,CAAC,UAAU,EAAE,CAC/D,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CACL,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,eAAe,CAC5B,GAAQ,EACR,MAAc;IAEd,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,UAAU,MAAM,WAAW,CAAC,CAAC;IAEpE,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CACb,kCAAkC,gBAAgB,CAAC,MAAM,IAAI,gBAAgB,CAAC,UAAU,EAAE,CAC3F,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GACV,CAAC,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAkC,CAAC;IACnE,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;IAEnC,2CAA2C;IAC3C,MAAM,UAAU,GAAG,CAAI,EAAU,EAAE,YAAe,EAAK,EAAE;QACvD,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3D,OAAQ,OAAO,EAAE,KAAW,IAAI,YAAY,CAAC;IAC/C,CAAC,CAAC;IAEF,OAAO;QACL,GAAG,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC;QAC7B,cAAc,EAAE,UAAU,CAAC,kBAAkB,EAAE,KAAK,CAAC;QACrD,sBAAsB,EAAE,UAAU,CAAC,0BAA0B,EAAE,KAAK,CAAC;QACrE,KAAK,EAAE,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC;QACnC,UAAU,EAAE,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC;QAC5C,gBAAgB,EAAE,UAAU,CAAC,mBAAmB,EAAE,KAAK,CAAC;QACxD,eAAe,EAAE,UAAU,CAAC,mBAAmB,EAAE,KAAK,CAAC;QACvD,eAAe,EAAE,UAAU,CAAC,kBAAkB,EAAE,KAAK,CAAC;QACtD,KAAK,EAAE,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC;QAChC,KAAK,EAAE,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC;QAChC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC;QAC9B,UAAU,EAAE,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC;QAC1C,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC;QAClC,iBAAiB,EAAE,UAAU,CAAC,oBAAoB,EAAE,KAAK,CAAC;QAC1D,aAAa,EAAE,UAAU,CAAC,iBAAiB,EAAE,KAAK,CAAC;KACpD,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAkB,EAClB,UAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B,eAAe,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAChD,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,4BAA4B,UAAU,MAAM,QAAQ,CAAC,UAAU,EAAE,CAClE,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAI,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAkC;SACpE,MAAM,CAAC;IAEV,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAE1B,oBAAoB;IACpB,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEzD,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC9B,WAAW,EAAE,QAAQ,CAAC,YAAY;QAClC,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB;QACnD,SAAS,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;QAClD,UAAU,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;QACpD,WAAW,EAAE,QAAQ,CAAC,YAAY;YAChC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;YAC3C,CAAC,CAAC,IAAI;QACR,QAAQ;KACT,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safe-fetch.d.ts","sourceRoot":"","sources":["../../src/util/safe-fetch.ts"],"names":[],"mappings":"AAGA,wBAAsB,SAAS,CAC7B,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC3B,OAAO,GAAE,WAAgB,EACzB,OAAO,
|
|
1
|
+
{"version":3,"file":"safe-fetch.d.ts","sourceRoot":"","sources":["../../src/util/safe-fetch.ts"],"names":[],"mappings":"AAGA,wBAAsB,SAAS,CAC7B,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC3B,OAAO,GAAE,WAAgB,EACzB,OAAO,SAAK,qBA4Bb"}
|
package/lib/util/safe-fetch.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safe-fetch.js","sourceRoot":"","sources":["../../src/util/safe-fetch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAA2B,EAC3B,UAAuB,EAAE,EACzB,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"safe-fetch.js","sourceRoot":"","sources":["../../src/util/safe-fetch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAA2B,EAC3B,UAAuB,EAAE,EACzB,OAAO,GAAG,EAAE;IAEZ,IAAI,SAAc,CAAC;IACnB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC;QACpD,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,GAAG,EAAE;gBACtB,GAAG,OAAO;gBACV,oEAAoE;gBACpE,UAAU,EAAE,MAAM,UAAU,EAAE;aAChB,CAAC,CAAC;QACpB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACtB,SAAS,GAAG,GAAG,CAAC;YAChB,MAAM,WAAW,GACf,GAAG,EAAE,IAAI,KAAK,gBAAgB;gBAC9B,GAAG,EAAE,IAAI,KAAK,YAAY;gBAC1B,GAAG,EAAE,IAAI,KAAK,yBAAyB;gBACvC,GAAG,EAAE,IAAI,KAAK,YAAY,CAAC;YAE7B,IAAI,CAAC,WAAW,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;gBACxC,MAAM,GAAG,CAAC;YACZ,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,SAAS,OAAO,IAAI,OAAO,QAAQ,GAAG,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAChF,CAAC;IACH,CAAC;IACD,MAAM,SAAS,CAAC;AAClB,CAAC;AAED,IAAI,KAIS,CAAC;AAEd,KAAK,UAAU,UAAU;IACvB,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,KAAK,CAAC,KAAK,CAAC;IACrB,CAAC;IACD,IAAI,CAAC;QACH,uCAAuC;QACvC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,gEAAgE;YAChE,KAAK,GAAG;gBACN,KAAK,EAAE,IAAI,KAAK,CAAC;oBACf,UAAU,EAAE,CAAC,EAAE,gDAAgD;oBAC/D,2DAA2D;iBAC5D,CAAC;aACH,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IACD,OAAO,KAAK,CAAC,KAAK,CAAC;AACrB,CAAC"}
|
package/package.json
CHANGED
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
type CloudflareApi,
|
|
8
8
|
type CloudflareApiOptions,
|
|
9
9
|
} from "./api.ts";
|
|
10
|
+
import { inferZoneIdFromPattern } from "./route.ts";
|
|
10
11
|
|
|
11
12
|
/**
|
|
12
13
|
* Properties for creating or updating a CustomDomain
|
|
@@ -19,8 +20,10 @@ export interface CustomDomainProps extends CloudflareApiOptions {
|
|
|
19
20
|
|
|
20
21
|
/**
|
|
21
22
|
* Cloudflare Zone ID for the domain
|
|
23
|
+
*
|
|
24
|
+
* @default - inferred from the domain name
|
|
22
25
|
*/
|
|
23
|
-
zoneId
|
|
26
|
+
zoneId?: string;
|
|
24
27
|
|
|
25
28
|
/**
|
|
26
29
|
* Name of the worker to bind to the domain
|
|
@@ -32,6 +35,14 @@ export interface CustomDomainProps extends CloudflareApiOptions {
|
|
|
32
35
|
* @default "production"
|
|
33
36
|
*/
|
|
34
37
|
environment?: string;
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* If true, adopt an existing custom domain binding during creation.
|
|
41
|
+
* If false and the domain already exists, creation will fail.
|
|
42
|
+
* This only applies during the create phase.
|
|
43
|
+
* @default false
|
|
44
|
+
*/
|
|
45
|
+
adopt?: boolean;
|
|
35
46
|
}
|
|
36
47
|
|
|
37
48
|
/**
|
|
@@ -85,6 +96,15 @@ export interface CustomDomain
|
|
|
85
96
|
* workerName: apiWorker.name // Use the name from the Worker resource
|
|
86
97
|
* });
|
|
87
98
|
*
|
|
99
|
+
* @example
|
|
100
|
+
* // Adopt an existing domain binding during creation
|
|
101
|
+
* const existingDomain = await CustomDomain("api-domain", {
|
|
102
|
+
* name: "api.example.com",
|
|
103
|
+
* zoneId: "YOUR_ZONE_ID",
|
|
104
|
+
* workerName: "my-api-worker",
|
|
105
|
+
* adopt: true // If domain already exists, adopt it instead of failing
|
|
106
|
+
* });
|
|
107
|
+
*
|
|
88
108
|
* @see https://developers.cloudflare.com/api/resources/workers/subresources/domains/
|
|
89
109
|
*/
|
|
90
110
|
export const CustomDomain = Resource(
|
|
@@ -97,23 +117,15 @@ export const CustomDomain = Resource(
|
|
|
97
117
|
// Create Cloudflare API client with automatic account discovery
|
|
98
118
|
const api = await createCloudflareApi(props);
|
|
99
119
|
|
|
100
|
-
// Validate required properties
|
|
101
|
-
if (!props.name) {
|
|
102
|
-
throw new Error("Domain name (props.name) is required");
|
|
103
|
-
}
|
|
104
|
-
if (!props.zoneId) {
|
|
105
|
-
throw new Error("Zone ID (props.zoneId) is required");
|
|
106
|
-
}
|
|
107
|
-
if (!props.workerName) {
|
|
108
|
-
throw new Error("Worker name (props.workerName) is required");
|
|
109
|
-
}
|
|
110
|
-
|
|
111
120
|
if (this.phase === "delete") {
|
|
112
121
|
await deleteCustomDomain(this, api, logicalId, props);
|
|
113
122
|
return this.destroy();
|
|
114
123
|
}
|
|
115
124
|
// Create or Update phase
|
|
116
|
-
return await ensureCustomDomain(this, api, logicalId,
|
|
125
|
+
return await ensureCustomDomain(this, api, logicalId, {
|
|
126
|
+
...props,
|
|
127
|
+
zoneId: props.zoneId ?? (await inferZoneIdFromPattern(api, props.name)),
|
|
128
|
+
});
|
|
117
129
|
},
|
|
118
130
|
);
|
|
119
131
|
|
|
@@ -134,19 +146,10 @@ async function deleteCustomDomain(
|
|
|
134
146
|
return; // Exit early if no ID
|
|
135
147
|
}
|
|
136
148
|
|
|
137
|
-
logger.log(
|
|
138
|
-
`Deleting CustomDomain binding ${domainIdToDelete} for ${domainHostname}`,
|
|
139
|
-
);
|
|
140
149
|
const response = await api.delete(
|
|
141
150
|
`/accounts/${api.accountId}/workers/domains/${domainIdToDelete}`,
|
|
142
151
|
);
|
|
143
152
|
|
|
144
|
-
logger.log(
|
|
145
|
-
`Delete result for ${domainIdToDelete} (${domainHostname}):`,
|
|
146
|
-
response.status,
|
|
147
|
-
response.statusText,
|
|
148
|
-
);
|
|
149
|
-
|
|
150
153
|
// 404 is acceptable during deletion for idempotency
|
|
151
154
|
if (!response.ok && response.status !== 404) {
|
|
152
155
|
await handleApiError(
|
|
@@ -167,13 +170,14 @@ async function ensureCustomDomain(
|
|
|
167
170
|
context: Context<CustomDomain>,
|
|
168
171
|
api: CloudflareApi,
|
|
169
172
|
_logicalId: string,
|
|
170
|
-
props: CustomDomainProps
|
|
173
|
+
props: CustomDomainProps & {
|
|
174
|
+
zoneId: string;
|
|
175
|
+
},
|
|
171
176
|
): Promise<CustomDomain> {
|
|
172
177
|
const environment = props.environment || "production";
|
|
173
178
|
const domainHostname = props.name;
|
|
174
179
|
|
|
175
180
|
// Check if domain binding already exists for this account
|
|
176
|
-
logger.log(`Checking existing domain bindings for account ${api.accountId}`);
|
|
177
181
|
const listResponse = await api.get(
|
|
178
182
|
`/accounts/${api.accountId}/workers/domains`,
|
|
179
183
|
);
|
|
@@ -211,12 +215,15 @@ async function ensureCustomDomain(
|
|
|
211
215
|
let currentDomainId = existingBinding?.id;
|
|
212
216
|
const bindingExists = !!existingBinding;
|
|
213
217
|
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
218
|
+
// Handle the case where domain already exists during create phase
|
|
219
|
+
if (context.phase === "create" && bindingExists) {
|
|
220
|
+
if (!props.adopt) {
|
|
221
|
+
throw new Error(
|
|
222
|
+
`CustomDomain for ${domainHostname} already exists in zone ${props.zoneId}. ` +
|
|
223
|
+
"Set adopt: true to take control of the existing domain binding.",
|
|
224
|
+
);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
220
227
|
|
|
221
228
|
// Determine if we need to update (binding exists but has different service or environment)
|
|
222
229
|
const needsUpdate =
|
|
@@ -231,9 +238,6 @@ async function ensureCustomDomain(
|
|
|
231
238
|
// Cloudflare's PUT /accounts/{account_id}/workers/domains acts as an upsert
|
|
232
239
|
if (!bindingExists || needsUpdate) {
|
|
233
240
|
operationPerformed = bindingExists ? "update" : "create";
|
|
234
|
-
logger.log(
|
|
235
|
-
`${operationPerformed === "update" ? "Updating" : "Creating"} domain binding: ${domainHostname} (Zone: ${props.zoneId}) → ${props.workerName}:${environment}`,
|
|
236
|
-
);
|
|
237
241
|
|
|
238
242
|
const putPayload = {
|
|
239
243
|
zone_id: props.zoneId,
|
|
@@ -273,13 +277,6 @@ async function ensureCustomDomain(
|
|
|
273
277
|
|
|
274
278
|
resultantBinding = putResult.result;
|
|
275
279
|
currentDomainId = resultantBinding.id; // Update ID from the PUT response
|
|
276
|
-
logger.log(
|
|
277
|
-
`Successfully ${operationPerformed}d binding, new ID: ${currentDomainId}`,
|
|
278
|
-
);
|
|
279
|
-
} else {
|
|
280
|
-
logger.log(
|
|
281
|
-
`Domain binding already exists and is up to date: ${domainHostname} (ID: ${currentDomainId}) → ${props.workerName}:${environment}`,
|
|
282
|
-
);
|
|
283
280
|
}
|
|
284
281
|
|
|
285
282
|
// Ensure we have the final binding details
|
package/src/cloudflare/route.ts
CHANGED
|
@@ -153,13 +153,7 @@ export const Route = Resource(
|
|
|
153
153
|
// Get or infer zone ID (only needed for create/update phases)
|
|
154
154
|
let zoneId = props.zoneId;
|
|
155
155
|
if (!zoneId) {
|
|
156
|
-
const inferredZoneId = await inferZoneIdFromPattern(props.pattern
|
|
157
|
-
accountId: props.accountId,
|
|
158
|
-
apiKey: props.apiKey,
|
|
159
|
-
apiToken: props.apiToken,
|
|
160
|
-
baseUrl: props.baseUrl,
|
|
161
|
-
email: props.email,
|
|
162
|
-
});
|
|
156
|
+
const inferredZoneId = await inferZoneIdFromPattern(api, props.pattern);
|
|
163
157
|
|
|
164
158
|
if (!inferredZoneId) {
|
|
165
159
|
throw new Error(
|
|
@@ -423,17 +417,17 @@ function extractDomainFromPattern(pattern: string): string {
|
|
|
423
417
|
* @param apiOptions API options for Cloudflare API calls
|
|
424
418
|
* @returns Promise resolving to zone ID or null if not found
|
|
425
419
|
*/
|
|
426
|
-
async function inferZoneIdFromPattern(
|
|
420
|
+
export async function inferZoneIdFromPattern(
|
|
421
|
+
api: CloudflareApi,
|
|
427
422
|
pattern: string,
|
|
428
|
-
|
|
429
|
-
): Promise<string | null> {
|
|
423
|
+
): Promise<string> {
|
|
430
424
|
const domain = extractDomainFromPattern(pattern);
|
|
431
425
|
|
|
432
426
|
// Handle wildcard domains by removing the wildcard part
|
|
433
427
|
const cleanDomain = domain.replace(/^\*\./, "");
|
|
434
428
|
|
|
435
429
|
// Try to find zone for the exact domain first
|
|
436
|
-
let zone = await getZoneByDomain(
|
|
430
|
+
let zone = await getZoneByDomain(api, cleanDomain);
|
|
437
431
|
if (zone) {
|
|
438
432
|
return zone.id;
|
|
439
433
|
}
|
|
@@ -442,11 +436,14 @@ async function inferZoneIdFromPattern(
|
|
|
442
436
|
const domainParts = cleanDomain.split(".");
|
|
443
437
|
for (let i = 1; i < domainParts.length - 1; i++) {
|
|
444
438
|
const parentDomain = domainParts.slice(i).join(".");
|
|
445
|
-
zone = await getZoneByDomain(
|
|
439
|
+
zone = await getZoneByDomain(api, parentDomain);
|
|
446
440
|
if (zone) {
|
|
447
441
|
return zone.id;
|
|
448
442
|
}
|
|
449
443
|
}
|
|
450
444
|
|
|
451
|
-
|
|
445
|
+
throw new Error(
|
|
446
|
+
`Could not infer zone ID for route pattern "${pattern}". ` +
|
|
447
|
+
"Please ensure the domain is managed by Cloudflare or specify an explicit zoneId.",
|
|
448
|
+
);
|
|
452
449
|
}
|
package/src/cloudflare/worker.ts
CHANGED
|
@@ -32,6 +32,7 @@ import {
|
|
|
32
32
|
type NoBundleResult,
|
|
33
33
|
bundleWorkerScript,
|
|
34
34
|
} from "./bundle/bundle-worker.ts";
|
|
35
|
+
import { CustomDomain } from "./custom-domain.ts";
|
|
35
36
|
import { isD1Database } from "./d1-database.ts";
|
|
36
37
|
import type { DispatchNamespaceResource } from "./dispatch-namespace.ts";
|
|
37
38
|
import {
|
|
@@ -214,27 +215,66 @@ export interface BaseWorkerProps<
|
|
|
214
215
|
* Routes to create for this worker.
|
|
215
216
|
*
|
|
216
217
|
* Each route maps a URL pattern to this worker script.
|
|
218
|
+
*
|
|
219
|
+
* @example
|
|
220
|
+
* await Worker("my-worker", {
|
|
221
|
+
* routes: [
|
|
222
|
+
* "sub.example.com/*",
|
|
223
|
+
* { pattern: "sub.example.com/*", zoneId: "1234567890" },
|
|
224
|
+
* ],
|
|
225
|
+
* });
|
|
217
226
|
*/
|
|
218
|
-
routes?: Array<
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
227
|
+
routes?: Array<
|
|
228
|
+
| string
|
|
229
|
+
| {
|
|
230
|
+
/**
|
|
231
|
+
* URL pattern for the route
|
|
232
|
+
* @example "sub.example.com/*"
|
|
233
|
+
*/
|
|
234
|
+
pattern: string;
|
|
235
|
+
/**
|
|
236
|
+
* Zone ID for the route. If not provided, will be automatically inferred from the route pattern.
|
|
237
|
+
*/
|
|
238
|
+
zoneId?: string;
|
|
239
|
+
/**
|
|
240
|
+
* Whether to adopt an existing route with the same pattern if it exists
|
|
241
|
+
* @default false
|
|
242
|
+
*/
|
|
243
|
+
adopt?: boolean;
|
|
244
|
+
}
|
|
245
|
+
>;
|
|
246
|
+
|
|
247
|
+
/**
|
|
248
|
+
* Custom domains to bind to the worker
|
|
249
|
+
*
|
|
250
|
+
* @example
|
|
251
|
+
* await Worker("my-worker", {
|
|
252
|
+
* domains: [
|
|
253
|
+
* "example.com",
|
|
254
|
+
* { name: "example.com", zoneId: "1234567890" },
|
|
255
|
+
* ],
|
|
256
|
+
* });
|
|
257
|
+
*/
|
|
258
|
+
domains?: (
|
|
259
|
+
| string
|
|
260
|
+
| {
|
|
261
|
+
/**
|
|
262
|
+
* The domain name to bind to the worker
|
|
263
|
+
*/
|
|
264
|
+
domainName: string;
|
|
265
|
+
/**
|
|
266
|
+
* Zone ID for the domain.
|
|
267
|
+
*
|
|
268
|
+
* @default - If not provided, will be automatically inferred from the domain name.
|
|
269
|
+
*/
|
|
270
|
+
zoneId?: string;
|
|
271
|
+
/**
|
|
272
|
+
* Whether to adopt an existing domain if it exists
|
|
273
|
+
* @default false
|
|
274
|
+
*/
|
|
275
|
+
adopt?: boolean;
|
|
276
|
+
}
|
|
277
|
+
)[];
|
|
238
278
|
|
|
239
279
|
/**
|
|
240
280
|
* The RPC class to use for the worker.
|
|
@@ -367,7 +407,7 @@ export type Worker<
|
|
|
367
407
|
B extends Bindings | undefined = Bindings | undefined,
|
|
368
408
|
RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
|
|
369
409
|
> = Resource<"cloudflare::Worker"> &
|
|
370
|
-
Omit<WorkerProps<B>, "url" | "script" | "routes"> &
|
|
410
|
+
Omit<WorkerProps<B>, "url" | "script" | "routes" | "domains"> &
|
|
371
411
|
globalThis.Service & {
|
|
372
412
|
/** @internal phantom property */
|
|
373
413
|
__rpc__?: RPC;
|
|
@@ -417,6 +457,11 @@ export type Worker<
|
|
|
417
457
|
*/
|
|
418
458
|
routes?: Route[];
|
|
419
459
|
|
|
460
|
+
/**
|
|
461
|
+
* The custom domains that were created for this worker
|
|
462
|
+
*/
|
|
463
|
+
domains?: CustomDomain[];
|
|
464
|
+
|
|
420
465
|
// phantom property (for typeof myWorker.Env)
|
|
421
466
|
Env: B extends Bindings
|
|
422
467
|
? {
|
|
@@ -1069,28 +1114,70 @@ export const _Worker = Resource(
|
|
|
1069
1114
|
|
|
1070
1115
|
const { workerUrl, now } = await uploadWorkerScript(props);
|
|
1071
1116
|
|
|
1072
|
-
|
|
1073
|
-
|
|
1074
|
-
|
|
1075
|
-
// Validate for duplicate patterns
|
|
1076
|
-
const patterns = props.routes.map((route) => route.pattern);
|
|
1077
|
-
const duplicates = patterns.filter(
|
|
1078
|
-
(pattern, index) => patterns.indexOf(pattern) !== index,
|
|
1117
|
+
function ensureNoDuplicates(name: string, items: string[]) {
|
|
1118
|
+
const duplicates = items.filter(
|
|
1119
|
+
(pattern, index) => items.indexOf(pattern) !== index,
|
|
1079
1120
|
);
|
|
1080
1121
|
if (duplicates.length > 0) {
|
|
1081
|
-
throw new Error(
|
|
1082
|
-
`Duplicate route patterns found: ${duplicates.join(", ")}`,
|
|
1083
|
-
);
|
|
1122
|
+
throw new Error(`Duplicate ${name} found: ${duplicates.join(", ")}`);
|
|
1084
1123
|
}
|
|
1124
|
+
}
|
|
1125
|
+
|
|
1126
|
+
let createdDomains: CustomDomain[] | undefined;
|
|
1127
|
+
if (props.domains?.length) {
|
|
1128
|
+
ensureNoDuplicates(
|
|
1129
|
+
"Custom Domain",
|
|
1130
|
+
props.domains.map((domain) =>
|
|
1131
|
+
typeof domain === "string" ? domain : domain.domainName,
|
|
1132
|
+
),
|
|
1133
|
+
);
|
|
1134
|
+
|
|
1135
|
+
createdDomains = await Promise.all(
|
|
1136
|
+
props.domains.map(async (customDomain) => {
|
|
1137
|
+
const domainName =
|
|
1138
|
+
typeof customDomain === "string"
|
|
1139
|
+
? customDomain
|
|
1140
|
+
: customDomain.domainName;
|
|
1141
|
+
return await CustomDomain(domainName, {
|
|
1142
|
+
workerName,
|
|
1143
|
+
name: domainName,
|
|
1144
|
+
zoneId:
|
|
1145
|
+
typeof customDomain === "string"
|
|
1146
|
+
? undefined
|
|
1147
|
+
: customDomain.zoneId,
|
|
1148
|
+
adopt:
|
|
1149
|
+
typeof customDomain === "string"
|
|
1150
|
+
? false
|
|
1151
|
+
: (customDomain.adopt ?? props.adopt),
|
|
1152
|
+
});
|
|
1153
|
+
}),
|
|
1154
|
+
);
|
|
1155
|
+
}
|
|
1156
|
+
|
|
1157
|
+
// Create routes if provided and capture their outputs
|
|
1158
|
+
let createdRoutes: Route[] | undefined;
|
|
1159
|
+
if (props.routes && props.routes.length > 0) {
|
|
1160
|
+
ensureNoDuplicates(
|
|
1161
|
+
"Route",
|
|
1162
|
+
props.routes.map((route) =>
|
|
1163
|
+
typeof route === "string" ? route : route.pattern,
|
|
1164
|
+
),
|
|
1165
|
+
);
|
|
1085
1166
|
|
|
1086
1167
|
// Create Route resources for each route and capture their outputs
|
|
1087
1168
|
createdRoutes = await Promise.all(
|
|
1088
1169
|
props.routes.map(async (routeConfig) => {
|
|
1089
|
-
|
|
1090
|
-
|
|
1170
|
+
const pattern =
|
|
1171
|
+
typeof routeConfig === "string" ? routeConfig : routeConfig.pattern;
|
|
1172
|
+
return await Route(pattern, {
|
|
1173
|
+
pattern,
|
|
1091
1174
|
script: workerName,
|
|
1092
|
-
zoneId:
|
|
1093
|
-
|
|
1175
|
+
zoneId:
|
|
1176
|
+
typeof routeConfig === "string" ? undefined : routeConfig.zoneId, // Route resource will handle inference if not provided
|
|
1177
|
+
adopt:
|
|
1178
|
+
typeof routeConfig === "string"
|
|
1179
|
+
? false
|
|
1180
|
+
: (routeConfig.adopt ?? props.adopt),
|
|
1094
1181
|
accountId: props.accountId,
|
|
1095
1182
|
apiKey: props.apiKey,
|
|
1096
1183
|
apiToken: props.apiToken,
|
|
@@ -1147,7 +1234,9 @@ export const _Worker = Resource(
|
|
|
1147
1234
|
// Include cron triggers in the output
|
|
1148
1235
|
crons: props.crons,
|
|
1149
1236
|
// Include the created routes in the output
|
|
1150
|
-
routes: createdRoutes
|
|
1237
|
+
routes: createdRoutes,
|
|
1238
|
+
// Include the created domains in the output
|
|
1239
|
+
domains: createdDomains,
|
|
1151
1240
|
// Include the dispatch namespace in the output
|
|
1152
1241
|
namespace: props.namespace,
|
|
1153
1242
|
// Include version information in the output
|
package/src/cloudflare/zone.ts
CHANGED
|
@@ -2,7 +2,11 @@ import type { Context } from "../context.ts";
|
|
|
2
2
|
import { Resource } from "../resource.ts";
|
|
3
3
|
import { logger } from "../util/logger.ts";
|
|
4
4
|
import { handleApiError } from "./api-error.ts";
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
createCloudflareApi,
|
|
7
|
+
type CloudflareApi,
|
|
8
|
+
type CloudflareApiOptions,
|
|
9
|
+
} from "./api.ts";
|
|
6
10
|
import type {
|
|
7
11
|
AlwaysUseHTTPSValue,
|
|
8
12
|
AutomaticHTTPSRewritesValue,
|
|
@@ -554,7 +558,7 @@ async function getZoneSettings(
|
|
|
554
558
|
*
|
|
555
559
|
* @example
|
|
556
560
|
* // Look up a zone by domain name
|
|
557
|
-
* const zone = await getZoneByDomain("example.com");
|
|
561
|
+
* const zone = await getZoneByDomain(api, "example.com");
|
|
558
562
|
* if (zone) {
|
|
559
563
|
* console.log(`Zone ID: ${zone.id}`);
|
|
560
564
|
* console.log(`Nameservers: ${zone.nameservers.join(", ")}`);
|
|
@@ -562,17 +566,12 @@ async function getZoneSettings(
|
|
|
562
566
|
*
|
|
563
567
|
* @example
|
|
564
568
|
* // Look up a zone with custom API options
|
|
565
|
-
* const zone = await getZoneByDomain("example.com"
|
|
566
|
-
* apiToken: myApiToken,
|
|
567
|
-
* accountId: "my-account-id"
|
|
568
|
-
* });
|
|
569
|
+
* const zone = await getZoneByDomain(api, "example.com");
|
|
569
570
|
*/
|
|
570
571
|
export async function getZoneByDomain(
|
|
572
|
+
api: CloudflareApi,
|
|
571
573
|
domainName: string,
|
|
572
|
-
options: Partial<CloudflareApiOptions> = {},
|
|
573
574
|
): Promise<ZoneData | null> {
|
|
574
|
-
const api = await createCloudflareApi(options);
|
|
575
|
-
|
|
576
575
|
const response = await api.get(
|
|
577
576
|
`/zones?name=${encodeURIComponent(domainName)}`,
|
|
578
577
|
);
|
package/src/util/safe-fetch.ts
CHANGED