alchemy 0.83.3 → 0.84.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/bin/alchemy.js +1 -1
- package/lib/cloudflare/kv-namespace.d.ts.map +1 -1
- package/lib/cloudflare/kv-namespace.js +2 -2
- package/lib/cloudflare/kv-namespace.js.map +1 -1
- package/lib/cloudflare/worker-stub.d.ts.map +1 -1
- package/lib/cloudflare/worker-stub.js +8 -10
- package/lib/cloudflare/worker-stub.js.map +1 -1
- package/lib/cloudflare/worker-subdomain.d.ts +11 -8
- package/lib/cloudflare/worker-subdomain.d.ts.map +1 -1
- package/lib/cloudflare/worker-subdomain.js +16 -25
- package/lib/cloudflare/worker-subdomain.js.map +1 -1
- package/lib/cloudflare/worker.d.ts +7 -0
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +50 -24
- package/lib/cloudflare/worker.js.map +1 -1
- package/package.json +1 -1
- package/src/cloudflare/kv-namespace.ts +6 -2
- package/src/cloudflare/worker-stub.ts +9 -11
- package/src/cloudflare/worker-subdomain.ts +29 -34
- package/src/cloudflare/worker.ts +161 -98
- package/workers/tunnel-proxy.js +1 -1
package/bin/alchemy.js
CHANGED
|
@@ -37097,7 +37097,7 @@ function envPaths(name$1, { suffix = "nodejs" } = {}) {
|
|
|
37097
37097
|
//#endregion
|
|
37098
37098
|
//#region package.json
|
|
37099
37099
|
var name = "alchemy";
|
|
37100
|
-
var version = "0.
|
|
37100
|
+
var version = "0.84.0";
|
|
37101
37101
|
var license = "Apache-2.0";
|
|
37102
37102
|
var author = "Sam Goodwin <sam@alchemy.run>";
|
|
37103
37103
|
var homepage = "https://alchemy.run";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kv-namespace.d.ts","sourceRoot":"","sources":["../../src/cloudflare/kv-namespace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"kv-namespace.d.ts","sourceRoot":"","sources":["../../src/cloudflare/kv-namespace.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAIlB;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC5D;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,GAAG,CAAC,EAAE;QACJ;;;WAGG;QACH,MAAM,CAAC,EAAE,OAAO,CAAC;QAEjB;;;WAGG;QACH,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAEvB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,IAAI,WAAW,CAEpE;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,KAAK,CAAC,GAAG;IACnE,IAAI,EAAE,cAAc,CAAC;IACrB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,GAAG,EAAE;QACH;;WAEG;QACH,EAAE,EAAE,MAAM,CAAC;QAEX;;WAEG;QACH,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC;CACH,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,gBAAqB,GAC3B,OAAO,CAAC,WAAW,CAAC,CAQtB;AAiFD,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,gBAAgB,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;CACf,GACA,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAsCrD;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,aAAa,EAClB,WAAW,EAAE,MAAM,iBAUpB;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,aAAa,EAClB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,gBAAgB,iBAiDxB;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAChD,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,iBA8BA;AAYD;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAiDpD;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,aAAa,EAClB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,iBAUd"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as mf from "miniflare";
|
|
1
2
|
import { Resource, ResourceKind } from "../resource.js";
|
|
2
3
|
import { Scope } from "../scope.js";
|
|
3
4
|
import { withExponentialBackoff } from "../util/retry.js";
|
|
@@ -5,7 +6,6 @@ import { CloudflareApiError, handleApiError } from "./api-error.js";
|
|
|
5
6
|
import { extractCloudflareResult, } from "./api-response.js";
|
|
6
7
|
import { createCloudflareApi, } from "./api.js";
|
|
7
8
|
import { deleteMiniflareBinding } from "./miniflare/delete.js";
|
|
8
|
-
import * as mf from "miniflare";
|
|
9
9
|
import { getDefaultPersistPath } from "./miniflare/paths.js";
|
|
10
10
|
export function isKVNamespace(resource) {
|
|
11
11
|
return resource?.[ResourceKind] === "cloudflare::KVNamespace";
|
|
@@ -104,7 +104,7 @@ const _KVNamespace = Resource("cloudflare::KVNamespace", async function (id, pro
|
|
|
104
104
|
}
|
|
105
105
|
if (this.phase === "delete") {
|
|
106
106
|
if (this.output.dev?.id) {
|
|
107
|
-
await deleteMiniflareBinding(this.scope, "kv", this.output.dev.id);
|
|
107
|
+
await deleteMiniflareBinding(this.scope, "kv", this.output.dev.id).catch(() => { });
|
|
108
108
|
}
|
|
109
109
|
if (this.output.namespaceId && props.delete !== false) {
|
|
110
110
|
await deleteKVNamespace(api, this.output.namespaceId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kv-namespace.js","sourceRoot":"","sources":["../../src/cloudflare/kv-namespace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"kv-namespace.js","sourceRoot":"","sources":["../../src/cloudflare/kv-namespace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-stub.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-stub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAGlB;;GAEG;AACH,MAAM,WAAW,eAAe,CAC9B,GAAG,SAAS,GAAG,CAAC,uBAAuB,GAAG,GAAG,CAAC,uBAAuB,CACrE,SAAQ,oBAAoB;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd;;;;OAIG;IACH,GAAG,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;CACjD;AAED;;GAEG;AACH,MAAM,WAAW,UAAU,CACzB,GAAG,SAAS,GAAG,CAAC,uBAAuB,GAAG,GAAG,CAAC,uBAAuB;IAErE,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,IAAI,UAAU,CAElE;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,UAAU,mFACrB,GAAG,SAAS,GAAG,CAAC,uBAAuB,sCACjC,OAAO,CAAC,UAAU,CAAC,OAAO,MAAM,SAAS,eAAe,CAAC,GAAG,CAAC,KAAG,OAAO,CAC7E,UAAU,CAAC,GAAG,CAAC,CAChB,
|
|
1
|
+
{"version":3,"file":"worker-stub.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-stub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAGlB;;GAEG;AACH,MAAM,WAAW,eAAe,CAC9B,GAAG,SAAS,GAAG,CAAC,uBAAuB,GAAG,GAAG,CAAC,uBAAuB,CACrE,SAAQ,oBAAoB;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd;;;;OAIG;IACH,GAAG,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;CACjD;AAED;;GAEG;AACH,MAAM,WAAW,UAAU,CACzB,GAAG,SAAS,GAAG,CAAC,uBAAuB,GAAG,GAAG,CAAC,uBAAuB;IAErE,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,IAAI,UAAU,CAElE;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,UAAU,mFACrB,GAAG,SAAS,GAAG,CAAC,uBAAuB,sCACjC,OAAO,CAAC,UAAU,CAAC,OAAO,MAAM,SAAS,eAAe,CAAC,GAAG,CAAC,KAAG,OAAO,CAC7E,UAAU,CAAC,GAAG,CAAC,CAChB,CA4BC,CAAC;AAEH,wBAAsB,MAAM,CAC1B,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAYlB;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAmEf"}
|
|
@@ -2,7 +2,7 @@ import { Resource, ResourceKind } from "../resource.js";
|
|
|
2
2
|
import { handleApiError } from "./api-error.js";
|
|
3
3
|
import { extractCloudflareResult } from "./api-response.js";
|
|
4
4
|
import { createCloudflareApi, } from "./api.js";
|
|
5
|
-
import {
|
|
5
|
+
import { createWorkerUrl, enableWorkerSubdomain } from "./worker-subdomain.js";
|
|
6
6
|
export function isWorkerStub(resource) {
|
|
7
7
|
return resource?.[ResourceKind] === "cloudflare::WorkerStub";
|
|
8
8
|
}
|
|
@@ -37,23 +37,21 @@ export const WorkerStub = Resource("cloudflare::WorkerStub", async function (_id
|
|
|
37
37
|
// We don't actually delete the worker, just mark the resource as destroyed
|
|
38
38
|
return this.destroy();
|
|
39
39
|
}
|
|
40
|
+
const scriptName = props.name;
|
|
40
41
|
// If worker doesn't exist and we're in create phase, create an empty one
|
|
41
|
-
if (!(await exists(api,
|
|
42
|
-
await createEmptyWorker(api,
|
|
42
|
+
if (!(await exists(api, scriptName)) && this.phase === "create") {
|
|
43
|
+
await createEmptyWorker(api, scriptName);
|
|
43
44
|
}
|
|
44
45
|
// Configure URL if requested (defaults to true)
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
scriptName: props.name,
|
|
49
|
-
})
|
|
50
|
-
: undefined;
|
|
46
|
+
if (props.url !== false) {
|
|
47
|
+
await enableWorkerSubdomain(api, scriptName);
|
|
48
|
+
}
|
|
51
49
|
// Return the worker stub info
|
|
52
50
|
return {
|
|
53
51
|
type: "service",
|
|
54
52
|
__rpc__: props.rpc,
|
|
55
53
|
...props,
|
|
56
|
-
url:
|
|
54
|
+
url: await createWorkerUrl(api, scriptName),
|
|
57
55
|
};
|
|
58
56
|
});
|
|
59
57
|
export async function exists(api, workerName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-stub.js","sourceRoot":"","sources":["../../src/cloudflare/worker-stub.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EACL,mBAAmB,GAGpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-stub.js","sourceRoot":"","sources":["../../src/cloudflare/worker-stub.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,14 @@ interface WorkerSubdomainProps extends CloudflareApiOptions {
|
|
|
11
11
|
* @default undefined
|
|
12
12
|
*/
|
|
13
13
|
previewVersionId?: string;
|
|
14
|
+
/**
|
|
15
|
+
* Whether to enable previews for the subdomain.
|
|
16
|
+
*
|
|
17
|
+
* Must be `false` when the worker has Durable Object bindings.
|
|
18
|
+
*
|
|
19
|
+
* @default true
|
|
20
|
+
*/
|
|
21
|
+
previewsEnabled?: boolean;
|
|
14
22
|
/**
|
|
15
23
|
* Prevents the subdomain from being deleted when the worker is deleted.
|
|
16
24
|
*
|
|
@@ -27,16 +35,10 @@ interface WorkerSubdomainProps extends CloudflareApiOptions {
|
|
|
27
35
|
dev?: boolean;
|
|
28
36
|
}
|
|
29
37
|
export interface WorkerSubdomain {
|
|
30
|
-
/**
|
|
31
|
-
* The `workers.dev` URL for the worker or preview version.
|
|
32
|
-
*/
|
|
33
|
-
url: string;
|
|
34
38
|
}
|
|
35
|
-
export declare const WorkerSubdomain: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<WorkerSubdomain>, _id: string, props: WorkerSubdomainProps) => Promise<{
|
|
36
|
-
url: string;
|
|
37
|
-
}>);
|
|
39
|
+
export declare const WorkerSubdomain: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<WorkerSubdomain>, _id: string, props: WorkerSubdomainProps) => Promise<{}>);
|
|
38
40
|
export declare function disableWorkerSubdomain(api: CloudflareApi, scriptName: string): Promise<void>;
|
|
39
|
-
export declare function enableWorkerSubdomain(api: CloudflareApi, scriptName: string): Promise<void>;
|
|
41
|
+
export declare function enableWorkerSubdomain(api: CloudflareApi, scriptName: string, previewsEnabled?: boolean): Promise<void>;
|
|
40
42
|
export declare function computeWorkerDevDomain(api: CloudflareApi, scriptName: string): Promise<string>;
|
|
41
43
|
export declare function getWorkerSubdomain(api: CloudflareApi, scriptName: string): Promise<SubdomainResponse>;
|
|
42
44
|
interface SubdomainResponse {
|
|
@@ -44,5 +46,6 @@ interface SubdomainResponse {
|
|
|
44
46
|
previews_enabled: boolean;
|
|
45
47
|
}
|
|
46
48
|
export declare const getAccountSubdomain: (api: CloudflareApi) => Promise<string>;
|
|
49
|
+
export declare function createWorkerUrl(api: CloudflareApi, scriptName: string, previewVersionId?: string): Promise<string>;
|
|
47
50
|
export {};
|
|
48
51
|
//# sourceMappingURL=worker-subdomain.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-subdomain.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-subdomain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAM7C,OAAO,
|
|
1
|
+
{"version":3,"file":"worker-subdomain.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-subdomain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAM7C,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEzE,UAAU,oBAAqB,SAAQ,oBAAoB;IACzD;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,eAAe;CAAG;AAEnC,eAAO,MAAM,eAAe,yFAGlB,OAAO,CAAC,eAAe,CAAC,OACzB,MAAM,SACJ,oBAAoB,iBAO9B,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,iBAgBnB;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,EAClB,eAAe,GAAE,OAAc,iBAkBhC;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,mBAGnB;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,8BAanB;AAED,UAAU,iBAAiB;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,eAAO,MAAM,mBAAmB,yCAS/B,CAAC;AAEF,wBAAsB,eAAe,CACnC,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,MAAM,mBAW1B"}
|
|
@@ -3,33 +3,12 @@ import { memoize } from "../util/memoize.js";
|
|
|
3
3
|
import { withExponentialBackoff } from "../util/retry.js";
|
|
4
4
|
import { CloudflareApiError } from "./api-error.js";
|
|
5
5
|
import { extractCloudflareResult } from "./api-response.js";
|
|
6
|
-
import {
|
|
6
|
+
import {} from "./api.js";
|
|
7
7
|
export const WorkerSubdomain = Resource("cloudflare::WorkerSubdomain", async function (_id, props) {
|
|
8
|
-
if (this.scope.local && props.dev) {
|
|
9
|
-
return {
|
|
10
|
-
url: this.output?.url ?? "https://unavailable.alchemy.run",
|
|
11
|
-
};
|
|
12
|
-
}
|
|
13
|
-
const api = await createCloudflareApi(props);
|
|
14
8
|
if (this.phase === "delete") {
|
|
15
|
-
if (!props.retain) {
|
|
16
|
-
await disableWorkerSubdomain(api, props.scriptName);
|
|
17
|
-
}
|
|
18
9
|
return this.destroy();
|
|
19
10
|
}
|
|
20
|
-
|
|
21
|
-
const subdomain = await getAccountSubdomain(api);
|
|
22
|
-
const base = `${subdomain}.workers.dev`;
|
|
23
|
-
let url;
|
|
24
|
-
if (props.previewVersionId) {
|
|
25
|
-
url = `https://${props.previewVersionId.substring(0, 8)}-${props.scriptName}.${base}`;
|
|
26
|
-
}
|
|
27
|
-
else {
|
|
28
|
-
url = `https://${props.scriptName}.${base}`;
|
|
29
|
-
}
|
|
30
|
-
return {
|
|
31
|
-
url,
|
|
32
|
-
};
|
|
11
|
+
return {};
|
|
33
12
|
});
|
|
34
13
|
export async function disableWorkerSubdomain(api, scriptName) {
|
|
35
14
|
await extractCloudflareResult(`disable subdomain for "${scriptName}"`, api.post(`/accounts/${api.accountId}/workers/scripts/${scriptName}/subdomain`, {
|
|
@@ -41,10 +20,10 @@ export async function disableWorkerSubdomain(api, scriptName) {
|
|
|
41
20
|
throw error;
|
|
42
21
|
});
|
|
43
22
|
}
|
|
44
|
-
export async function enableWorkerSubdomain(api, scriptName) {
|
|
23
|
+
export async function enableWorkerSubdomain(api, scriptName, previewsEnabled = true) {
|
|
45
24
|
await withExponentialBackoff(() => extractCloudflareResult(`enable subdomain for "${scriptName}"`, api.post(`/accounts/${api.accountId}/workers/scripts/${scriptName}/subdomain`, {
|
|
46
25
|
enabled: true,
|
|
47
|
-
previews_enabled:
|
|
26
|
+
previews_enabled: previewsEnabled,
|
|
48
27
|
})), (error) => error instanceof CloudflareApiError && error.status === 404, 20, 1000);
|
|
49
28
|
}
|
|
50
29
|
export async function computeWorkerDevDomain(api, scriptName) {
|
|
@@ -62,4 +41,16 @@ export const getAccountSubdomain = memoize(async (api) => {
|
|
|
62
41
|
const result = await extractCloudflareResult(`get subdomain for account ${api.accountId}`, api.get(`/accounts/${api.accountId}/workers/subdomain`));
|
|
63
42
|
return result.subdomain;
|
|
64
43
|
}, (api) => api.accountId);
|
|
44
|
+
export async function createWorkerUrl(api, scriptName, previewVersionId) {
|
|
45
|
+
const subdomain = await getAccountSubdomain(api);
|
|
46
|
+
const base = `${subdomain}.workers.dev`;
|
|
47
|
+
let url;
|
|
48
|
+
if (previewVersionId) {
|
|
49
|
+
url = `https://${previewVersionId.substring(0, 8)}-${scriptName}.${base}`;
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
url = `https://${scriptName}.${base}`;
|
|
53
|
+
}
|
|
54
|
+
return url;
|
|
55
|
+
}
|
|
65
56
|
//# sourceMappingURL=worker-subdomain.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-subdomain.js","sourceRoot":"","sources":["../../src/cloudflare/worker-subdomain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,
|
|
1
|
+
{"version":3,"file":"worker-subdomain.js","sourceRoot":"","sources":["../../src/cloudflare/worker-subdomain.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,6 +97,13 @@ export interface BaseWorkerProps<B extends Bindings | undefined = undefined, RPC
|
|
|
97
97
|
* @default false
|
|
98
98
|
*/
|
|
99
99
|
url?: boolean;
|
|
100
|
+
/**
|
|
101
|
+
* Whether to enable preview subdomains for this worker
|
|
102
|
+
*
|
|
103
|
+
* If true, the worker will be available at {name}-preview.{subdomain}.workers.dev
|
|
104
|
+
* @default false if durable objects are used, otherwise true
|
|
105
|
+
*/
|
|
106
|
+
previewSubdomains?: boolean;
|
|
100
107
|
/**
|
|
101
108
|
* Specify the observability behavior of the Worker.
|
|
102
109
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAKvC,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAE1B,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EACV,QAAQ,EACR,IAAI,EAGL,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAKjE,OAAO,EAAE,KAAK,WAAW,EAAsB,MAAM,mBAAmB,CAAC;AASzE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,OAAO,EACL,YAAY,EAGb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,KAAK,oBAAoB,EAI1B,MAAM,sBAAsB,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
|
@@ -19,7 +19,7 @@ import { Route } from "./route.js";
|
|
|
19
19
|
import { uploadAssets } from "./worker-assets.js";
|
|
20
20
|
import { WorkerBundle, normalizeWorkerBundle, } from "./worker-bundle.js";
|
|
21
21
|
import { bumpMigrationTagVersion, getWorkerSettings, prepareWorkerMetadata, } from "./worker-metadata.js";
|
|
22
|
-
import {
|
|
22
|
+
import { createWorkerUrl, disableWorkerSubdomain, enableWorkerSubdomain, } from "./worker-subdomain.js";
|
|
23
23
|
import { createTail } from "./worker-tail.js";
|
|
24
24
|
import { Workflow, deleteWorkflow, isWorkflow, upsertWorkflow, } from "./workflow.js";
|
|
25
25
|
// Previous versions of `Worker` used the `Bundle` resource.
|
|
@@ -131,6 +131,7 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
131
131
|
durableObjects,
|
|
132
132
|
};
|
|
133
133
|
})();
|
|
134
|
+
const scriptName = options.name;
|
|
134
135
|
if (this.phase === "delete") {
|
|
135
136
|
// Heuristic: we must detect the case where this is the Worker wrapped in the old Website nested scope and not delete it
|
|
136
137
|
// we must not delete it because what we're actually doing is migrating to a flat worker
|
|
@@ -204,6 +205,7 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
204
205
|
local: true,
|
|
205
206
|
dispatchNamespace: options.dispatchNamespace,
|
|
206
207
|
containers: options.containers,
|
|
208
|
+
hasDurableObjects: options.durableObjects.length > 0,
|
|
207
209
|
});
|
|
208
210
|
return {
|
|
209
211
|
...props,
|
|
@@ -303,15 +305,41 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
303
305
|
this.onCleanup(() => tail?.close());
|
|
304
306
|
}
|
|
305
307
|
else {
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
});
|
|
308
|
+
// cloudflare has awkward sequencing requirements for modifying subdomains
|
|
309
|
+
// because conflicts with Durable Objects and preview_enabled is stateful
|
|
310
|
+
// to solve this, we try and do both in parallel and push them through
|
|
311
|
+
const bruteForce = (operation) => withExponentialBackoff(operation, (error) => {
|
|
312
|
+
operation;
|
|
313
|
+
return (error instanceof CloudflareApiError &&
|
|
314
|
+
error.status === 400 &&
|
|
315
|
+
error.message.includes("Cannot use Durable Objects with Preview URLs"));
|
|
316
|
+
}, 10, 100, 1000);
|
|
317
|
+
const scriptBundle = await bundle.create();
|
|
318
|
+
const [_, _result] = await Promise.all([
|
|
319
|
+
bruteForce(updateSubdomain),
|
|
320
|
+
bruteForce(() => putWorker(api, {
|
|
321
|
+
...props,
|
|
322
|
+
workerName: options.name,
|
|
323
|
+
scriptBundle,
|
|
324
|
+
dispatchNamespace: options.dispatchNamespace,
|
|
325
|
+
compatibilityDate: options.compatibilityDate,
|
|
326
|
+
compatibilityFlags: options.compatibilityFlags,
|
|
327
|
+
assetUploadResult: assets,
|
|
328
|
+
})),
|
|
329
|
+
]);
|
|
330
|
+
result = _result;
|
|
331
|
+
}
|
|
332
|
+
async function updateSubdomain() {
|
|
333
|
+
if (options.dispatchNamespace) {
|
|
334
|
+
return;
|
|
335
|
+
}
|
|
336
|
+
if (props.url === false) {
|
|
337
|
+
await disableWorkerSubdomain(api, scriptName);
|
|
338
|
+
}
|
|
339
|
+
else {
|
|
340
|
+
const previewsEnabled = options.durableObjects.length === 0;
|
|
341
|
+
await enableWorkerSubdomain(api, scriptName, props.previewSubdomains ?? previewsEnabled);
|
|
342
|
+
}
|
|
315
343
|
}
|
|
316
344
|
if (props.crons) {
|
|
317
345
|
await api.put(`/accounts/${api.accountId}/workers/scripts/${options.name}/schedules`, props.crons?.map((cron) => ({ cron })) ?? []);
|
|
@@ -321,7 +349,7 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
321
349
|
className: workflow.className,
|
|
322
350
|
scriptName: workflow.scriptName ?? options.name,
|
|
323
351
|
})));
|
|
324
|
-
const { domains, routes
|
|
352
|
+
const { domains, routes } = await provisionResources({
|
|
325
353
|
...props,
|
|
326
354
|
adopt,
|
|
327
355
|
}, {
|
|
@@ -329,6 +357,7 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
329
357
|
local: false,
|
|
330
358
|
dispatchNamespace: options.dispatchNamespace,
|
|
331
359
|
containers: options.containers,
|
|
360
|
+
hasDurableObjects: options.durableObjects.length > 0,
|
|
332
361
|
result,
|
|
333
362
|
api,
|
|
334
363
|
});
|
|
@@ -349,7 +378,9 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
349
378
|
createdAt: this.output?.createdAt ?? now,
|
|
350
379
|
updatedAt: now,
|
|
351
380
|
eventSources: props.eventSources,
|
|
352
|
-
url:
|
|
381
|
+
url: props.url !== false
|
|
382
|
+
? await createWorkerUrl(api, scriptName, props.version ? result?.id : undefined)
|
|
383
|
+
: undefined,
|
|
353
384
|
assets: props.assets,
|
|
354
385
|
crons: props.crons,
|
|
355
386
|
tailConsumers: props.tailConsumers,
|
|
@@ -459,7 +490,7 @@ async function provisionResources(props, options) {
|
|
|
459
490
|
if (input.domains) {
|
|
460
491
|
assertUnique(input.domains, "name", "Custom Domain");
|
|
461
492
|
}
|
|
462
|
-
const [containers, domains, eventSources, routes
|
|
493
|
+
const [containers, domains, eventSources, routes] = await Promise.all([
|
|
463
494
|
input.containers
|
|
464
495
|
? Promise.all(input.containers.map(async (container) => {
|
|
465
496
|
return await ContainerApplication(container.id, {
|
|
@@ -508,17 +539,8 @@ async function provisionResources(props, options) {
|
|
|
508
539
|
});
|
|
509
540
|
}))
|
|
510
541
|
: undefined,
|
|
511
|
-
(props.url ?? !options.dispatchNamespace)
|
|
512
|
-
? WorkerSubdomain("url", {
|
|
513
|
-
scriptName: options.name,
|
|
514
|
-
previewVersionId: props.version ? options.result?.id : undefined,
|
|
515
|
-
retain: !!props.version,
|
|
516
|
-
dev: options.local,
|
|
517
|
-
...input.api,
|
|
518
|
-
})
|
|
519
|
-
: undefined,
|
|
520
542
|
]);
|
|
521
|
-
return { containers, domains, routes, eventSources
|
|
543
|
+
return { containers, domains, routes, eventSources };
|
|
522
544
|
async function getContainerNamespaceId(container) {
|
|
523
545
|
if (options.local) {
|
|
524
546
|
return container.id;
|
|
@@ -689,7 +711,11 @@ export async function putWorker(api, props) {
|
|
|
689
711
|
// this is a transient error that cloudflare throws randomly
|
|
690
712
|
(err instanceof CloudflareApiError &&
|
|
691
713
|
err.status === 400 &&
|
|
692
|
-
err.message.match(/binding.*failed to generate/)),
|
|
714
|
+
err.message.match(/binding.*failed to generate/)),
|
|
715
|
+
// (err.status === 400 &&
|
|
716
|
+
// err.message.includes("100331") &&
|
|
717
|
+
// err.message.includes("Cannot use Durable Objects with Preview URLs")),
|
|
718
|
+
10, 100);
|
|
693
719
|
}
|
|
694
720
|
const workerExists = async (api, options) => {
|
|
695
721
|
const res = await api.get(options.dispatchNamespace
|
|
@@ -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/package.json
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as mf from "miniflare";
|
|
1
2
|
import type { Context } from "../context.ts";
|
|
2
3
|
import { Resource, ResourceKind } from "../resource.ts";
|
|
3
4
|
import { Scope } from "../scope.ts";
|
|
@@ -13,7 +14,6 @@ import {
|
|
|
13
14
|
type CloudflareApiOptions,
|
|
14
15
|
} from "./api.ts";
|
|
15
16
|
import { deleteMiniflareBinding } from "./miniflare/delete.ts";
|
|
16
|
-
import * as mf from "miniflare";
|
|
17
17
|
import { getDefaultPersistPath } from "./miniflare/paths.ts";
|
|
18
18
|
|
|
19
19
|
/**
|
|
@@ -248,7 +248,11 @@ const _KVNamespace = Resource(
|
|
|
248
248
|
|
|
249
249
|
if (this.phase === "delete") {
|
|
250
250
|
if (this.output.dev?.id) {
|
|
251
|
-
await deleteMiniflareBinding(
|
|
251
|
+
await deleteMiniflareBinding(
|
|
252
|
+
this.scope,
|
|
253
|
+
"kv",
|
|
254
|
+
this.output.dev.id,
|
|
255
|
+
).catch(() => {});
|
|
252
256
|
}
|
|
253
257
|
if (this.output.namespaceId && props.delete !== false) {
|
|
254
258
|
await deleteKVNamespace(api, this.output.namespaceId);
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
type CloudflareApi,
|
|
10
10
|
type CloudflareApiOptions,
|
|
11
11
|
} from "./api.ts";
|
|
12
|
-
import {
|
|
12
|
+
import { createWorkerUrl, enableWorkerSubdomain } from "./worker-subdomain.ts";
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
15
|
* Properties for creating a Worker stub
|
|
@@ -105,26 +105,24 @@ export const WorkerStub = Resource("cloudflare::WorkerStub", async function <
|
|
|
105
105
|
return this.destroy();
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
+
const scriptName = props.name;
|
|
109
|
+
|
|
108
110
|
// If worker doesn't exist and we're in create phase, create an empty one
|
|
109
|
-
if (!(await exists(api,
|
|
110
|
-
await createEmptyWorker(api,
|
|
111
|
+
if (!(await exists(api, scriptName)) && this.phase === "create") {
|
|
112
|
+
await createEmptyWorker(api, scriptName);
|
|
111
113
|
}
|
|
112
114
|
|
|
113
115
|
// Configure URL if requested (defaults to true)
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
...props,
|
|
118
|
-
scriptName: props.name,
|
|
119
|
-
})
|
|
120
|
-
: undefined;
|
|
116
|
+
if (props.url !== false) {
|
|
117
|
+
await enableWorkerSubdomain(api, scriptName);
|
|
118
|
+
}
|
|
121
119
|
|
|
122
120
|
// Return the worker stub info
|
|
123
121
|
return {
|
|
124
122
|
type: "service",
|
|
125
123
|
__rpc__: props.rpc as unknown as RPC,
|
|
126
124
|
...props,
|
|
127
|
-
url:
|
|
125
|
+
url: await createWorkerUrl(api, scriptName),
|
|
128
126
|
} as WorkerStub<RPC>;
|
|
129
127
|
});
|
|
130
128
|
|
|
@@ -4,11 +4,7 @@ import { memoize } from "../util/memoize.ts";
|
|
|
4
4
|
import { withExponentialBackoff } from "../util/retry.ts";
|
|
5
5
|
import { CloudflareApiError } from "./api-error.ts";
|
|
6
6
|
import { extractCloudflareResult } from "./api-response.ts";
|
|
7
|
-
import {
|
|
8
|
-
createCloudflareApi,
|
|
9
|
-
type CloudflareApi,
|
|
10
|
-
type CloudflareApiOptions,
|
|
11
|
-
} from "./api.ts";
|
|
7
|
+
import { type CloudflareApi, type CloudflareApiOptions } from "./api.ts";
|
|
12
8
|
|
|
13
9
|
interface WorkerSubdomainProps extends CloudflareApiOptions {
|
|
14
10
|
/**
|
|
@@ -21,6 +17,14 @@ interface WorkerSubdomainProps extends CloudflareApiOptions {
|
|
|
21
17
|
* @default undefined
|
|
22
18
|
*/
|
|
23
19
|
previewVersionId?: string;
|
|
20
|
+
/**
|
|
21
|
+
* Whether to enable previews for the subdomain.
|
|
22
|
+
*
|
|
23
|
+
* Must be `false` when the worker has Durable Object bindings.
|
|
24
|
+
*
|
|
25
|
+
* @default true
|
|
26
|
+
*/
|
|
27
|
+
previewsEnabled?: boolean;
|
|
24
28
|
/**
|
|
25
29
|
* Prevents the subdomain from being deleted when the worker is deleted.
|
|
26
30
|
*
|
|
@@ -37,12 +41,7 @@ interface WorkerSubdomainProps extends CloudflareApiOptions {
|
|
|
37
41
|
dev?: boolean;
|
|
38
42
|
}
|
|
39
43
|
|
|
40
|
-
export interface WorkerSubdomain {
|
|
41
|
-
/**
|
|
42
|
-
* The `workers.dev` URL for the worker or preview version.
|
|
43
|
-
*/
|
|
44
|
-
url: string;
|
|
45
|
-
}
|
|
44
|
+
export interface WorkerSubdomain {}
|
|
46
45
|
|
|
47
46
|
export const WorkerSubdomain = Resource(
|
|
48
47
|
"cloudflare::WorkerSubdomain",
|
|
@@ -51,31 +50,10 @@ export const WorkerSubdomain = Resource(
|
|
|
51
50
|
_id: string,
|
|
52
51
|
props: WorkerSubdomainProps,
|
|
53
52
|
) {
|
|
54
|
-
if (this.scope.local && props.dev) {
|
|
55
|
-
return {
|
|
56
|
-
url: this.output?.url ?? "https://unavailable.alchemy.run",
|
|
57
|
-
};
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
const api = await createCloudflareApi(props);
|
|
61
53
|
if (this.phase === "delete") {
|
|
62
|
-
if (!props.retain) {
|
|
63
|
-
await disableWorkerSubdomain(api, props.scriptName);
|
|
64
|
-
}
|
|
65
54
|
return this.destroy();
|
|
66
55
|
}
|
|
67
|
-
|
|
68
|
-
const subdomain = await getAccountSubdomain(api);
|
|
69
|
-
const base = `${subdomain}.workers.dev`;
|
|
70
|
-
let url: string;
|
|
71
|
-
if (props.previewVersionId) {
|
|
72
|
-
url = `https://${props.previewVersionId.substring(0, 8)}-${props.scriptName}.${base}`;
|
|
73
|
-
} else {
|
|
74
|
-
url = `https://${props.scriptName}.${base}`;
|
|
75
|
-
}
|
|
76
|
-
return {
|
|
77
|
-
url,
|
|
78
|
-
};
|
|
56
|
+
return {};
|
|
79
57
|
},
|
|
80
58
|
);
|
|
81
59
|
|
|
@@ -102,6 +80,7 @@ export async function disableWorkerSubdomain(
|
|
|
102
80
|
export async function enableWorkerSubdomain(
|
|
103
81
|
api: CloudflareApi,
|
|
104
82
|
scriptName: string,
|
|
83
|
+
previewsEnabled: boolean = true,
|
|
105
84
|
) {
|
|
106
85
|
await withExponentialBackoff(
|
|
107
86
|
() =>
|
|
@@ -111,7 +90,7 @@ export async function enableWorkerSubdomain(
|
|
|
111
90
|
`/accounts/${api.accountId}/workers/scripts/${scriptName}/subdomain`,
|
|
112
91
|
{
|
|
113
92
|
enabled: true,
|
|
114
|
-
previews_enabled:
|
|
93
|
+
previews_enabled: previewsEnabled,
|
|
115
94
|
},
|
|
116
95
|
),
|
|
117
96
|
),
|
|
@@ -160,3 +139,19 @@ export const getAccountSubdomain = memoize(
|
|
|
160
139
|
},
|
|
161
140
|
(api) => api.accountId,
|
|
162
141
|
);
|
|
142
|
+
|
|
143
|
+
export async function createWorkerUrl(
|
|
144
|
+
api: CloudflareApi,
|
|
145
|
+
scriptName: string,
|
|
146
|
+
previewVersionId?: string,
|
|
147
|
+
) {
|
|
148
|
+
const subdomain = await getAccountSubdomain(api);
|
|
149
|
+
const base = `${subdomain}.workers.dev`;
|
|
150
|
+
let url: string;
|
|
151
|
+
if (previewVersionId) {
|
|
152
|
+
url = `https://${previewVersionId.substring(0, 8)}-${scriptName}.${base}`;
|
|
153
|
+
} else {
|
|
154
|
+
url = `https://${scriptName}.${base}`;
|
|
155
|
+
}
|
|
156
|
+
return url;
|
|
157
|
+
}
|
package/src/cloudflare/worker.ts
CHANGED
|
@@ -54,7 +54,11 @@ import {
|
|
|
54
54
|
getWorkerSettings,
|
|
55
55
|
prepareWorkerMetadata,
|
|
56
56
|
} from "./worker-metadata.ts";
|
|
57
|
-
import {
|
|
57
|
+
import {
|
|
58
|
+
createWorkerUrl,
|
|
59
|
+
disableWorkerSubdomain,
|
|
60
|
+
enableWorkerSubdomain,
|
|
61
|
+
} from "./worker-subdomain.ts";
|
|
58
62
|
import { createTail } from "./worker-tail.ts";
|
|
59
63
|
import {
|
|
60
64
|
Workflow,
|
|
@@ -176,6 +180,14 @@ export interface BaseWorkerProps<
|
|
|
176
180
|
*/
|
|
177
181
|
url?: boolean;
|
|
178
182
|
|
|
183
|
+
/**
|
|
184
|
+
* Whether to enable preview subdomains for this worker
|
|
185
|
+
*
|
|
186
|
+
* If true, the worker will be available at {name}-preview.{subdomain}.workers.dev
|
|
187
|
+
* @default false if durable objects are used, otherwise true
|
|
188
|
+
*/
|
|
189
|
+
previewSubdomains?: boolean;
|
|
190
|
+
|
|
179
191
|
/**
|
|
180
192
|
* Specify the observability behavior of the Worker.
|
|
181
193
|
*
|
|
@@ -1062,6 +1074,7 @@ const _Worker = Resource(
|
|
|
1062
1074
|
durableObjects,
|
|
1063
1075
|
};
|
|
1064
1076
|
})();
|
|
1077
|
+
const scriptName = options.name;
|
|
1065
1078
|
|
|
1066
1079
|
if (this.phase === "delete") {
|
|
1067
1080
|
// Heuristic: we must detect the case where this is the Worker wrapped in the old Website nested scope and not delete it
|
|
@@ -1142,6 +1155,7 @@ const _Worker = Resource(
|
|
|
1142
1155
|
local: true,
|
|
1143
1156
|
dispatchNamespace: options.dispatchNamespace,
|
|
1144
1157
|
containers: options.containers,
|
|
1158
|
+
hasDurableObjects: options.durableObjects.length > 0,
|
|
1145
1159
|
},
|
|
1146
1160
|
);
|
|
1147
1161
|
return {
|
|
@@ -1224,6 +1238,7 @@ const _Worker = Resource(
|
|
|
1224
1238
|
namespace: options.dispatchNamespace,
|
|
1225
1239
|
})
|
|
1226
1240
|
: undefined;
|
|
1241
|
+
|
|
1227
1242
|
let result: PutWorkerResult;
|
|
1228
1243
|
|
|
1229
1244
|
if (this.scope.watch) {
|
|
@@ -1245,15 +1260,58 @@ const _Worker = Resource(
|
|
|
1245
1260
|
});
|
|
1246
1261
|
this.onCleanup(() => tail?.close());
|
|
1247
1262
|
} else {
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1254
|
-
|
|
1255
|
-
|
|
1256
|
-
|
|
1263
|
+
// cloudflare has awkward sequencing requirements for modifying subdomains
|
|
1264
|
+
// because conflicts with Durable Objects and preview_enabled is stateful
|
|
1265
|
+
// to solve this, we try and do both in parallel and push them through
|
|
1266
|
+
const bruteForce = <T>(operation: () => Promise<T>) =>
|
|
1267
|
+
withExponentialBackoff(
|
|
1268
|
+
operation,
|
|
1269
|
+
(error) => {
|
|
1270
|
+
operation;
|
|
1271
|
+
return (
|
|
1272
|
+
error instanceof CloudflareApiError &&
|
|
1273
|
+
error.status === 400 &&
|
|
1274
|
+
error.message.includes(
|
|
1275
|
+
"Cannot use Durable Objects with Preview URLs",
|
|
1276
|
+
)
|
|
1277
|
+
);
|
|
1278
|
+
},
|
|
1279
|
+
10,
|
|
1280
|
+
100,
|
|
1281
|
+
1000,
|
|
1282
|
+
);
|
|
1283
|
+
const scriptBundle = await bundle.create();
|
|
1284
|
+
const [_, _result] = await Promise.all([
|
|
1285
|
+
bruteForce(updateSubdomain),
|
|
1286
|
+
bruteForce(() =>
|
|
1287
|
+
putWorker(api, {
|
|
1288
|
+
...props,
|
|
1289
|
+
workerName: options.name,
|
|
1290
|
+
scriptBundle,
|
|
1291
|
+
dispatchNamespace: options.dispatchNamespace,
|
|
1292
|
+
compatibilityDate: options.compatibilityDate,
|
|
1293
|
+
compatibilityFlags: options.compatibilityFlags,
|
|
1294
|
+
assetUploadResult: assets,
|
|
1295
|
+
}),
|
|
1296
|
+
),
|
|
1297
|
+
]);
|
|
1298
|
+
result = _result;
|
|
1299
|
+
}
|
|
1300
|
+
|
|
1301
|
+
async function updateSubdomain() {
|
|
1302
|
+
if (options.dispatchNamespace) {
|
|
1303
|
+
return;
|
|
1304
|
+
}
|
|
1305
|
+
if (props.url === false) {
|
|
1306
|
+
await disableWorkerSubdomain(api, scriptName);
|
|
1307
|
+
} else {
|
|
1308
|
+
const previewsEnabled = options.durableObjects.length === 0;
|
|
1309
|
+
await enableWorkerSubdomain(
|
|
1310
|
+
api,
|
|
1311
|
+
scriptName,
|
|
1312
|
+
props.previewSubdomains ?? previewsEnabled,
|
|
1313
|
+
);
|
|
1314
|
+
}
|
|
1257
1315
|
}
|
|
1258
1316
|
|
|
1259
1317
|
if (props.crons) {
|
|
@@ -1273,7 +1331,7 @@ const _Worker = Resource(
|
|
|
1273
1331
|
),
|
|
1274
1332
|
);
|
|
1275
1333
|
|
|
1276
|
-
const { domains, routes
|
|
1334
|
+
const { domains, routes } = await provisionResources(
|
|
1277
1335
|
{
|
|
1278
1336
|
...props,
|
|
1279
1337
|
adopt,
|
|
@@ -1283,6 +1341,7 @@ const _Worker = Resource(
|
|
|
1283
1341
|
local: false,
|
|
1284
1342
|
dispatchNamespace: options.dispatchNamespace,
|
|
1285
1343
|
containers: options.containers,
|
|
1344
|
+
hasDurableObjects: options.durableObjects.length > 0,
|
|
1286
1345
|
result,
|
|
1287
1346
|
api,
|
|
1288
1347
|
},
|
|
@@ -1305,7 +1364,14 @@ const _Worker = Resource(
|
|
|
1305
1364
|
createdAt: this.output?.createdAt ?? now,
|
|
1306
1365
|
updatedAt: now,
|
|
1307
1366
|
eventSources: props.eventSources,
|
|
1308
|
-
url:
|
|
1367
|
+
url:
|
|
1368
|
+
props.url !== false
|
|
1369
|
+
? await createWorkerUrl(
|
|
1370
|
+
api,
|
|
1371
|
+
scriptName,
|
|
1372
|
+
props.version ? result?.id : undefined,
|
|
1373
|
+
)
|
|
1374
|
+
: undefined,
|
|
1309
1375
|
assets: props.assets,
|
|
1310
1376
|
crons: props.crons,
|
|
1311
1377
|
tailConsumers: props.tailConsumers,
|
|
@@ -1359,27 +1425,31 @@ const assertUnique = <T, Key extends keyof T>(
|
|
|
1359
1425
|
}
|
|
1360
1426
|
};
|
|
1361
1427
|
|
|
1428
|
+
type ProvisionOptions =
|
|
1429
|
+
| {
|
|
1430
|
+
name: string;
|
|
1431
|
+
local: true;
|
|
1432
|
+
dispatchNamespace: string | undefined;
|
|
1433
|
+
containers: Container[] | undefined;
|
|
1434
|
+
hasDurableObjects: boolean;
|
|
1435
|
+
result?: undefined;
|
|
1436
|
+
api?: undefined;
|
|
1437
|
+
}
|
|
1438
|
+
| {
|
|
1439
|
+
name: string;
|
|
1440
|
+
local: false;
|
|
1441
|
+
dispatchNamespace: string | undefined;
|
|
1442
|
+
containers: Container[] | undefined;
|
|
1443
|
+
hasDurableObjects: boolean;
|
|
1444
|
+
result: PutWorkerResult;
|
|
1445
|
+
api: CloudflareApi;
|
|
1446
|
+
};
|
|
1447
|
+
|
|
1362
1448
|
async function provisionResources<B extends Bindings>(
|
|
1363
1449
|
props: WorkerProps<B> & {
|
|
1364
1450
|
adopt: boolean;
|
|
1365
1451
|
},
|
|
1366
|
-
options:
|
|
1367
|
-
| {
|
|
1368
|
-
name: string;
|
|
1369
|
-
local: true;
|
|
1370
|
-
dispatchNamespace: string | undefined;
|
|
1371
|
-
containers: Container[] | undefined;
|
|
1372
|
-
result?: undefined;
|
|
1373
|
-
api?: undefined;
|
|
1374
|
-
}
|
|
1375
|
-
| {
|
|
1376
|
-
name: string;
|
|
1377
|
-
local: false;
|
|
1378
|
-
dispatchNamespace: string | undefined;
|
|
1379
|
-
containers: Container[] | undefined;
|
|
1380
|
-
result: PutWorkerResult;
|
|
1381
|
-
api: CloudflareApi;
|
|
1382
|
-
},
|
|
1452
|
+
options: ProvisionOptions,
|
|
1383
1453
|
) {
|
|
1384
1454
|
let metadataPromise: ReturnType<typeof getVersionMetadata> | undefined;
|
|
1385
1455
|
|
|
@@ -1452,76 +1522,66 @@ async function provisionResources<B extends Bindings>(
|
|
|
1452
1522
|
assertUnique(input.domains, "name", "Custom Domain");
|
|
1453
1523
|
}
|
|
1454
1524
|
|
|
1455
|
-
const [containers, domains, eventSources, routes
|
|
1456
|
-
|
|
1457
|
-
|
|
1458
|
-
|
|
1459
|
-
|
|
1460
|
-
|
|
1461
|
-
|
|
1462
|
-
|
|
1463
|
-
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1467
|
-
|
|
1468
|
-
|
|
1469
|
-
|
|
1470
|
-
|
|
1471
|
-
|
|
1472
|
-
|
|
1473
|
-
|
|
1474
|
-
|
|
1475
|
-
|
|
1476
|
-
|
|
1477
|
-
|
|
1478
|
-
|
|
1479
|
-
|
|
1480
|
-
|
|
1481
|
-
|
|
1482
|
-
|
|
1483
|
-
|
|
1484
|
-
|
|
1485
|
-
|
|
1486
|
-
|
|
1487
|
-
|
|
1488
|
-
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
|
|
1493
|
-
|
|
1494
|
-
|
|
1495
|
-
|
|
1496
|
-
|
|
1497
|
-
|
|
1498
|
-
|
|
1499
|
-
|
|
1500
|
-
|
|
1501
|
-
|
|
1502
|
-
|
|
1503
|
-
|
|
1504
|
-
|
|
1505
|
-
|
|
1506
|
-
|
|
1507
|
-
|
|
1508
|
-
|
|
1509
|
-
|
|
1510
|
-
|
|
1511
|
-
|
|
1512
|
-
|
|
1513
|
-
(props.url ?? !options.dispatchNamespace)
|
|
1514
|
-
? WorkerSubdomain("url", {
|
|
1515
|
-
scriptName: options.name,
|
|
1516
|
-
previewVersionId: props.version ? options.result?.id : undefined,
|
|
1517
|
-
retain: !!props.version,
|
|
1518
|
-
dev: options.local,
|
|
1519
|
-
...input.api,
|
|
1520
|
-
})
|
|
1521
|
-
: undefined,
|
|
1522
|
-
]);
|
|
1525
|
+
const [containers, domains, eventSources, routes] = await Promise.all([
|
|
1526
|
+
input.containers
|
|
1527
|
+
? Promise.all(
|
|
1528
|
+
input.containers.map(async (container) => {
|
|
1529
|
+
return await ContainerApplication(container.id, {
|
|
1530
|
+
...container,
|
|
1531
|
+
durableObjects: {
|
|
1532
|
+
namespaceId: await getContainerNamespaceId(container),
|
|
1533
|
+
},
|
|
1534
|
+
dev: options.local,
|
|
1535
|
+
...input.api,
|
|
1536
|
+
});
|
|
1537
|
+
}),
|
|
1538
|
+
)
|
|
1539
|
+
: undefined,
|
|
1540
|
+
input.domains
|
|
1541
|
+
? Promise.all(
|
|
1542
|
+
input.domains.map(async (domain) => {
|
|
1543
|
+
return await CustomDomain(domain.name, {
|
|
1544
|
+
name: domain.name,
|
|
1545
|
+
zoneId: domain.zoneId,
|
|
1546
|
+
adopt: domain.adopt,
|
|
1547
|
+
workerName: options.name,
|
|
1548
|
+
dev: options.local,
|
|
1549
|
+
...input.api,
|
|
1550
|
+
});
|
|
1551
|
+
}),
|
|
1552
|
+
)
|
|
1553
|
+
: undefined,
|
|
1554
|
+
input.eventSources
|
|
1555
|
+
? Promise.all(
|
|
1556
|
+
input.eventSources.map(async (eventSource) => {
|
|
1557
|
+
return await QueueConsumer(`${eventSource.queue.id}-consumer`, {
|
|
1558
|
+
queue: eventSource.queue,
|
|
1559
|
+
scriptName: options.name,
|
|
1560
|
+
settings: eventSource.settings,
|
|
1561
|
+
adopt: props.adopt,
|
|
1562
|
+
dev: options.local,
|
|
1563
|
+
...input.api,
|
|
1564
|
+
});
|
|
1565
|
+
}),
|
|
1566
|
+
)
|
|
1567
|
+
: undefined,
|
|
1568
|
+
input.routes
|
|
1569
|
+
? Promise.all(
|
|
1570
|
+
input.routes.map(async (route) => {
|
|
1571
|
+
return await Route(route.pattern, {
|
|
1572
|
+
pattern: route.pattern,
|
|
1573
|
+
script: options.name,
|
|
1574
|
+
zoneId: route.zoneId,
|
|
1575
|
+
adopt: route.adopt,
|
|
1576
|
+
dev: options.local,
|
|
1577
|
+
...input.api,
|
|
1578
|
+
});
|
|
1579
|
+
}),
|
|
1580
|
+
)
|
|
1581
|
+
: undefined,
|
|
1582
|
+
]);
|
|
1523
1583
|
|
|
1524
|
-
return { containers, domains, routes, eventSources
|
|
1584
|
+
return { containers, domains, routes, eventSources };
|
|
1525
1585
|
|
|
1526
1586
|
async function getContainerNamespaceId(container: Container) {
|
|
1527
1587
|
if (options.local) {
|
|
@@ -1774,6 +1834,9 @@ export async function putWorker(
|
|
|
1774
1834
|
(err instanceof CloudflareApiError &&
|
|
1775
1835
|
err.status === 400 &&
|
|
1776
1836
|
err.message.match(/binding.*failed to generate/)),
|
|
1837
|
+
// (err.status === 400 &&
|
|
1838
|
+
// err.message.includes("100331") &&
|
|
1839
|
+
// err.message.includes("Cannot use Durable Objects with Preview URLs")),
|
|
1777
1840
|
10,
|
|
1778
1841
|
100,
|
|
1779
1842
|
);
|
package/workers/tunnel-proxy.js
CHANGED
|
@@ -83,7 +83,7 @@ const renderErrorHtml = (props) => `
|
|
|
83
83
|
Alchemy</a>.</p>
|
|
84
84
|
</div>
|
|
85
85
|
<div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
|
|
86
|
-
<p class="text-sm text-slate-500">Alchemy 0.
|
|
86
|
+
<p class="text-sm text-slate-500">Alchemy 0.84.0</p>
|
|
87
87
|
</div>
|
|
88
88
|
</div>
|
|
89
89
|
</body>
|