alchemy 0.55.2 → 0.56.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 +13920 -6724
- package/lib/alchemy.d.ts.map +1 -1
- package/lib/alchemy.js +7 -0
- package/lib/alchemy.js.map +1 -1
- package/lib/cloudflare/bundle/plugin-alias.d.ts +3 -0
- package/lib/cloudflare/bundle/plugin-alias.d.ts.map +1 -0
- package/lib/cloudflare/bundle/plugin-alias.js +40 -0
- package/lib/cloudflare/bundle/plugin-alias.js.map +1 -0
- package/lib/cloudflare/bundle/plugin-hot-reload.d.ts +1 -3
- package/lib/cloudflare/bundle/plugin-hot-reload.d.ts.map +1 -1
- package/lib/cloudflare/bundle/plugin-hot-reload.js +4 -1
- package/lib/cloudflare/bundle/plugin-hot-reload.js.map +1 -1
- package/lib/cloudflare/compatibility-date.gen.d.ts +1 -1
- package/lib/cloudflare/compatibility-date.gen.js +1 -1
- package/lib/cloudflare/compatibility-presets.d.ts +1 -1
- package/lib/cloudflare/compatibility-presets.js +1 -1
- package/lib/cloudflare/compatibility-presets.js.map +1 -1
- package/lib/cloudflare/local-dev-cloudflare-shim.d.ts +3 -1
- package/lib/cloudflare/local-dev-cloudflare-shim.d.ts.map +1 -1
- package/lib/cloudflare/local-dev-cloudflare-shim.js +10 -5
- package/lib/cloudflare/local-dev-cloudflare-shim.js.map +1 -1
- package/lib/cloudflare/miniflare/build-worker-options.d.ts +22 -0
- package/lib/cloudflare/miniflare/build-worker-options.d.ts.map +1 -0
- package/lib/cloudflare/miniflare/build-worker-options.js +394 -0
- package/lib/cloudflare/miniflare/build-worker-options.js.map +1 -0
- package/lib/cloudflare/miniflare/miniflare-controller.d.ts +23 -0
- package/lib/cloudflare/miniflare/miniflare-controller.d.ts.map +1 -0
- package/lib/cloudflare/miniflare/miniflare-controller.js +110 -0
- package/lib/cloudflare/miniflare/miniflare-controller.js.map +1 -0
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.js +5 -15
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.js.map +1 -1
- package/lib/cloudflare/miniflare/remote-binding-proxy.d.ts +1 -5
- package/lib/cloudflare/miniflare/remote-binding-proxy.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/remote-binding-proxy.js +17 -22
- package/lib/cloudflare/miniflare/remote-binding-proxy.js.map +1 -1
- package/lib/cloudflare/website.js +4 -4
- package/lib/cloudflare/website.js.map +1 -1
- package/lib/cloudflare/worker-bundle.d.ts +2 -0
- package/lib/cloudflare/worker-bundle.d.ts.map +1 -1
- package/lib/cloudflare/worker-bundle.js +21 -4
- package/lib/cloudflare/worker-bundle.js.map +1 -1
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +76 -97
- package/lib/cloudflare/worker.js.map +1 -1
- package/lib/context.d.ts +11 -0
- package/lib/context.d.ts.map +1 -1
- package/lib/context.js +8 -0
- package/lib/context.js.map +1 -1
- package/lib/scope.d.ts +12 -0
- package/lib/scope.d.ts.map +1 -1
- package/lib/scope.js +25 -0
- package/lib/scope.js.map +1 -1
- package/lib/util/telemetry/client.d.ts +3 -4
- package/lib/util/telemetry/client.d.ts.map +1 -1
- package/lib/util/telemetry/client.js +19 -25
- package/lib/util/telemetry/client.js.map +1 -1
- package/lib/util/telemetry/types.d.ts +1 -1
- package/lib/util/telemetry/types.d.ts.map +1 -1
- package/package.json +3 -2
- package/src/alchemy.ts +7 -0
- package/src/cloudflare/bundle/plugin-alias.ts +49 -0
- package/src/cloudflare/bundle/plugin-hot-reload.ts +4 -3
- package/src/cloudflare/compatibility-date.gen.ts +1 -1
- package/src/cloudflare/compatibility-presets.ts +1 -1
- package/src/cloudflare/local-dev-cloudflare-shim.ts +11 -5
- package/src/cloudflare/miniflare/build-worker-options.ts +454 -0
- package/src/cloudflare/miniflare/miniflare-controller.ts +128 -0
- package/src/cloudflare/miniflare/miniflare-worker-proxy.ts +6 -15
- package/src/cloudflare/miniflare/remote-binding-proxy.ts +18 -23
- package/src/cloudflare/website.ts +4 -4
- package/src/cloudflare/worker-bundle.ts +30 -4
- package/src/cloudflare/worker.ts +90 -125
- package/src/context.ts +19 -0
- package/src/scope.ts +27 -0
- package/src/util/telemetry/client.ts +23 -33
- package/src/util/telemetry/types.ts +3 -3
- package/lib/cloudflare/miniflare/miniflare-worker-options.d.ts +0 -14
- package/lib/cloudflare/miniflare/miniflare-worker-options.d.ts.map +0 -1
- package/lib/cloudflare/miniflare/miniflare-worker-options.js +0 -468
- package/lib/cloudflare/miniflare/miniflare-worker-options.js.map +0 -1
- package/lib/cloudflare/miniflare/miniflare.d.ts +0 -40
- package/lib/cloudflare/miniflare/miniflare.d.ts.map +0 -1
- package/lib/cloudflare/miniflare/miniflare.js +0 -142
- package/lib/cloudflare/miniflare/miniflare.js.map +0 -1
- package/src/cloudflare/miniflare/miniflare-worker-options.ts +0 -599
- package/src/cloudflare/miniflare/miniflare.ts +0 -183
|
@@ -13,9 +13,7 @@ export async function createRemoteProxyWorker(input) {
|
|
|
13
13
|
main_module: script.bundle.entrypoint,
|
|
14
14
|
compatibility_date: "2025-06-16",
|
|
15
15
|
bindings: input.bindings,
|
|
16
|
-
observability: {
|
|
17
|
-
enabled: false,
|
|
18
|
-
},
|
|
16
|
+
observability: { enabled: false },
|
|
19
17
|
},
|
|
20
18
|
bundle: script.bundle,
|
|
21
19
|
session: {
|
|
@@ -25,24 +23,21 @@ export async function createRemoteProxyWorker(input) {
|
|
|
25
23
|
}),
|
|
26
24
|
import("../worker-subdomain.js").then((m) => m.getAccountSubdomain(api)),
|
|
27
25
|
]);
|
|
28
|
-
const proxyURL =
|
|
26
|
+
const proxyURL = `https://${input.name}.${subdomain}.workers.dev`;
|
|
29
27
|
const server = new HTTPServer({
|
|
30
28
|
fetch: async (req) => {
|
|
31
|
-
const
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
requestHeaders.delete("cf-connecting-ip");
|
|
39
|
-
const res = await fetch(url, {
|
|
29
|
+
const url = new URL(req.url);
|
|
30
|
+
const targetUrl = new URL(url.pathname + url.search, proxyURL);
|
|
31
|
+
const headers = new Headers(req.headers);
|
|
32
|
+
headers.set("cf-workers-preview-token", token);
|
|
33
|
+
headers.set("host", new URL(proxyURL).hostname);
|
|
34
|
+
headers.delete("cf-connecting-ip");
|
|
35
|
+
const res = await fetch(targetUrl, {
|
|
40
36
|
method: req.method,
|
|
41
|
-
headers
|
|
37
|
+
headers,
|
|
42
38
|
body: req.body,
|
|
43
39
|
redirect: "manual",
|
|
44
40
|
});
|
|
45
|
-
// Remove headers that are not supported by miniflare
|
|
46
41
|
const responseHeaders = new Headers(res.headers);
|
|
47
42
|
responseHeaders.delete("transfer-encoding");
|
|
48
43
|
responseHeaders.delete("content-encoding");
|
|
@@ -75,13 +70,13 @@ async function createWorkersPreviewToken(api, input) {
|
|
|
75
70
|
return res.preview_token;
|
|
76
71
|
}
|
|
77
72
|
async function prewarm(url, previewToken) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
"cf-workers-preview-token": previewToken,
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
|
|
73
|
+
try {
|
|
74
|
+
await fetch(url, {
|
|
75
|
+
headers: { "cf-workers-preview-token": previewToken },
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
// Ignore prewarm errors
|
|
85
80
|
}
|
|
86
81
|
}
|
|
87
82
|
async function createWorkersPreviewSession(api) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-binding-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAsB,MAAM,WAAW,CAAC;AAEpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAyBnD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,KAG7C;IACC,MAAM,GAAG,GAAG,MAAM,mBAAmB,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,sBAAsB,CAAC,CAAC;IACrE,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC3C,yBAAyB,CAAC,GAAG,EAAE;YAC7B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE;gBACR,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;gBACrC,kBAAkB,EAAE,YAAY;gBAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,aAAa,EAAE
|
|
1
|
+
{"version":3,"file":"remote-binding-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,10 +65,10 @@ export default {
|
|
|
65
65
|
},
|
|
66
66
|
};
|
|
67
67
|
if (wrangler) {
|
|
68
|
-
const
|
|
69
|
-
const
|
|
68
|
+
const wranglerAbsPath = path.resolve(cwd, wranglerJsonPath);
|
|
69
|
+
const wranglerAbsDir = path.dirname(wranglerAbsPath);
|
|
70
70
|
await WranglerJson("wrangler.jsonc", {
|
|
71
|
-
path:
|
|
71
|
+
path: path.relative(cwd, wranglerJsonPath),
|
|
72
72
|
worker: workerProps,
|
|
73
73
|
// @ts-expect-error - props.wrangler can be string | object, this is fine
|
|
74
74
|
main: props.wrangler?.main ?? props.main,
|
|
@@ -76,7 +76,7 @@ export default {
|
|
|
76
76
|
assets: {
|
|
77
77
|
binding: "ASSETS",
|
|
78
78
|
// path must be relative to the wrangler.jsonc file
|
|
79
|
-
directory: path.relative(
|
|
79
|
+
directory: path.relative(wranglerAbsDir, assetsDirPath),
|
|
80
80
|
},
|
|
81
81
|
transform: props.transform,
|
|
82
82
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export interface WorkerBundle {
|
|
|
6
6
|
modules: WorkerBundle.Module[];
|
|
7
7
|
}
|
|
8
8
|
export declare function normalizeWorkerBundle(props: {
|
|
9
|
+
id: string;
|
|
9
10
|
script: string | undefined;
|
|
10
11
|
entrypoint: string | undefined;
|
|
11
12
|
noBundle: boolean | undefined;
|
|
@@ -63,6 +64,7 @@ export declare namespace WorkerBundleSource {
|
|
|
63
64
|
private readFiles;
|
|
64
65
|
}
|
|
65
66
|
interface ESBuildProps extends WorkerBundleSource.BaseProps, Omit<esbuild.BuildOptions, "entryPoints" | "format" | "absWorkingDir" | "outdir"> {
|
|
67
|
+
id: string;
|
|
66
68
|
entrypoint: string;
|
|
67
69
|
cwd: string;
|
|
68
70
|
outdir: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-bundle.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-bundle.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import esbuild from "esbuild";
|
|
2
2
|
import { err, ok } from "neverthrow";
|
|
3
3
|
import fs from "node:fs/promises";
|
|
4
|
-
import path from "
|
|
4
|
+
import path from "pathe";
|
|
5
|
+
import { logger } from "../util/logger.js";
|
|
5
6
|
import { external, external_als } from "./bundle/externals.js";
|
|
7
|
+
import { esbuildPluginAlias } from "./bundle/plugin-alias.js";
|
|
6
8
|
import { esbuildPluginCompatWarning } from "./bundle/plugin-compat-warning.js";
|
|
7
9
|
import { createHotReloadPlugin } from "./bundle/plugin-hot-reload.js";
|
|
8
10
|
import { esbuildPluginHybridNodeCompat } from "./bundle/plugin-hybrid-node-compat.js";
|
|
@@ -34,6 +36,7 @@ export function normalizeWorkerBundle(props) {
|
|
|
34
36
|
sourcemaps: props.sourceMap !== false,
|
|
35
37
|
})
|
|
36
38
|
: new WorkerBundleSource.ESBuild({
|
|
39
|
+
id: props.id,
|
|
37
40
|
entrypoint: props.entrypoint,
|
|
38
41
|
format: props.format ?? "esm",
|
|
39
42
|
nodeCompat,
|
|
@@ -184,12 +187,26 @@ export var WorkerBundleSource;
|
|
|
184
187
|
}
|
|
185
188
|
async *watch(signal) {
|
|
186
189
|
const wasm = createWasmPlugin();
|
|
187
|
-
|
|
190
|
+
let count = 0;
|
|
191
|
+
const hotReload = createHotReloadPlugin({
|
|
192
|
+
onBuildStart: () => {
|
|
193
|
+
if (count > 0) {
|
|
194
|
+
logger.task(this.props.id, {
|
|
195
|
+
message: "Rebuilding",
|
|
196
|
+
status: "pending",
|
|
197
|
+
resource: this.props.id,
|
|
198
|
+
prefix: "dev",
|
|
199
|
+
prefixColor: "cyanBright",
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
},
|
|
203
|
+
});
|
|
188
204
|
const options = this.buildOptions([wasm.plugin, hotReload.plugin]);
|
|
189
205
|
const context = await esbuild.context(options);
|
|
190
206
|
signal.addEventListener("abort", () => context.dispose());
|
|
191
207
|
await context.watch();
|
|
192
208
|
for await (const result of hotReload.iterator) {
|
|
209
|
+
count++;
|
|
193
210
|
const { entrypoint, root, modules } = this.resolveBuildOutput(result.metafile);
|
|
194
211
|
yield {
|
|
195
212
|
entrypoint,
|
|
@@ -205,7 +222,7 @@ export var WorkerBundleSource;
|
|
|
205
222
|
});
|
|
206
223
|
}
|
|
207
224
|
buildOptions(additionalPlugins) {
|
|
208
|
-
const { entrypoint, nodeCompat, cwd, format, ...props } = this.props;
|
|
225
|
+
const { id: _, entrypoint, nodeCompat, cwd, format, ...props } = this.props;
|
|
209
226
|
return {
|
|
210
227
|
entryPoints: [entrypoint],
|
|
211
228
|
absWorkingDir: cwd,
|
|
@@ -224,13 +241,13 @@ export var WorkerBundleSource;
|
|
|
224
241
|
...props.loader,
|
|
225
242
|
},
|
|
226
243
|
plugins: [
|
|
244
|
+
esbuildPluginAlias(props.alias ?? {}, this.props.cwd),
|
|
227
245
|
nodeCompat === "v2"
|
|
228
246
|
? esbuildPluginHybridNodeCompat()
|
|
229
247
|
: esbuildPluginCompatWarning(nodeCompat ?? null),
|
|
230
248
|
...(props.plugins ?? []),
|
|
231
249
|
...additionalPlugins,
|
|
232
250
|
],
|
|
233
|
-
alias: props.alias,
|
|
234
251
|
external: [
|
|
235
252
|
...(nodeCompat === "als" ? external_als : external),
|
|
236
253
|
...(props.external ?? []),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-bundle.js","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,EAAE,EAAe,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"worker-bundle.js","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"
|
|
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
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import kleur from "kleur";
|
|
2
1
|
import { spawn } from "node:child_process";
|
|
3
2
|
import fs from "node:fs/promises";
|
|
4
3
|
import { isDeepStrictEqual } from "node:util";
|
|
@@ -6,6 +5,7 @@ import path from "pathe";
|
|
|
6
5
|
import { Resource, ResourceKind } from "../resource.js";
|
|
7
6
|
import { isSecret } from "../secret.js";
|
|
8
7
|
import { DeferredPromise } from "../util/deferred-promise.js";
|
|
8
|
+
import { exists } from "../util/exists.js";
|
|
9
9
|
import { logger } from "../util/logger.js";
|
|
10
10
|
import { withExponentialBackoff } from "../util/retry.js";
|
|
11
11
|
import { CloudflareApiError, handleApiError } from "./api-error.js";
|
|
@@ -16,12 +16,11 @@ import { ContainerApplication } from "./container.js";
|
|
|
16
16
|
import { CustomDomain } from "./custom-domain.js";
|
|
17
17
|
import { DurableObjectNamespace, isDurableObjectNamespace, } from "./durable-object-namespace.js";
|
|
18
18
|
import { isQueueEventSource } from "./event-source.js";
|
|
19
|
-
import { miniflareServer } from "./miniflare/miniflare.js";
|
|
20
19
|
import { QueueConsumer, deleteQueueConsumer, listQueueConsumersForWorker, } from "./queue-consumer.js";
|
|
21
20
|
import { isQueue } from "./queue.js";
|
|
22
21
|
import { Route } from "./route.js";
|
|
23
22
|
import { uploadAssets } from "./worker-assets.js";
|
|
24
|
-
import { WorkerBundle, normalizeWorkerBundle
|
|
23
|
+
import { WorkerBundle, normalizeWorkerBundle } from "./worker-bundle.js";
|
|
25
24
|
import { bumpMigrationTagVersion, prepareWorkerMetadata, } from "./worker-metadata.js";
|
|
26
25
|
import { WorkerSubdomain, disableWorkerSubdomain } from "./worker-subdomain.js";
|
|
27
26
|
import { createTail } from "./worker-tail.js";
|
|
@@ -29,7 +28,6 @@ import { Workflow, isWorkflow, upsertWorkflow } from "./workflow.js";
|
|
|
29
28
|
// Previous versions of `Worker` used the `Bundle` resource.
|
|
30
29
|
// This import is here to avoid errors when destroying the `Bundle` resource.
|
|
31
30
|
import "../esbuild/bundle.js";
|
|
32
|
-
import { exists } from "../util/exists.js";
|
|
33
31
|
export function isWorker(resource) {
|
|
34
32
|
return resource[ResourceKind] === "cloudflare::Worker";
|
|
35
33
|
}
|
|
@@ -52,6 +50,7 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
52
50
|
? props.namespace
|
|
53
51
|
: props.namespace?.namespaceName;
|
|
54
52
|
const bundleSourceResult = normalizeWorkerBundle({
|
|
53
|
+
id,
|
|
55
54
|
entrypoint: props.entrypoint,
|
|
56
55
|
script: props.script,
|
|
57
56
|
format: props.format,
|
|
@@ -74,7 +73,7 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
74
73
|
throw bundleSourceResult.error;
|
|
75
74
|
}
|
|
76
75
|
if (props.dev?.command) {
|
|
77
|
-
const
|
|
76
|
+
const result = await createDevCommand({
|
|
78
77
|
id,
|
|
79
78
|
command: props.dev.command,
|
|
80
79
|
cwd: props.dev.cwd || props.cwd || process.cwd(),
|
|
@@ -88,19 +87,24 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
88
87
|
: [])),
|
|
89
88
|
},
|
|
90
89
|
});
|
|
91
|
-
url =
|
|
90
|
+
url = result.url;
|
|
91
|
+
this.onCleanup(() => result.cleanup());
|
|
92
92
|
}
|
|
93
93
|
else {
|
|
94
|
-
|
|
94
|
+
const { MiniflareController } = await import("./miniflare/miniflare-controller.js");
|
|
95
|
+
const controller = MiniflareController.singleton;
|
|
96
|
+
url = await controller.add({
|
|
95
97
|
id,
|
|
96
|
-
workerName,
|
|
98
|
+
name: workerName,
|
|
97
99
|
compatibilityDate,
|
|
98
100
|
compatibilityFlags,
|
|
99
101
|
bindings: props.bindings,
|
|
102
|
+
eventSources: props.eventSources,
|
|
103
|
+
assets: props.assets,
|
|
100
104
|
bundle: bundleSourceResult.value,
|
|
101
105
|
port: props.dev?.port,
|
|
102
|
-
assets: props.assets,
|
|
103
106
|
});
|
|
107
|
+
this.onCleanup(() => controller.dispose());
|
|
104
108
|
}
|
|
105
109
|
return this({
|
|
106
110
|
type: "service",
|
|
@@ -218,7 +222,6 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
218
222
|
let putWorkerResult;
|
|
219
223
|
if (watch) {
|
|
220
224
|
const controller = new AbortController();
|
|
221
|
-
cleanups.push(() => controller.abort());
|
|
222
225
|
const promise = new DeferredPromise();
|
|
223
226
|
const runWatch = async () => {
|
|
224
227
|
for await (const bundle of bundleSource.watch(controller.signal)) {
|
|
@@ -264,14 +267,12 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
264
267
|
}
|
|
265
268
|
};
|
|
266
269
|
void runWatch(); // this is not awaited because it's an ongoing process
|
|
270
|
+
this.onCleanup(() => controller.abort());
|
|
267
271
|
putWorkerResult = await promise.value;
|
|
268
|
-
await createTail(api, id, workerName)
|
|
269
|
-
.then((tail) => {
|
|
270
|
-
cleanups.push(() => tail.close());
|
|
271
|
-
})
|
|
272
|
-
.catch((error) => {
|
|
272
|
+
const tail = await createTail(api, id, workerName).catch((error) => {
|
|
273
273
|
logger.error(`Failed to create tail for ${workerName}`, error);
|
|
274
274
|
});
|
|
275
|
+
this.onCleanup(() => tail?.close());
|
|
275
276
|
}
|
|
276
277
|
else {
|
|
277
278
|
const scriptBundle = await bundleSource.create();
|
|
@@ -366,20 +367,6 @@ const _Worker = Resource("cloudflare::Worker", {
|
|
|
366
367
|
Env: undefined,
|
|
367
368
|
});
|
|
368
369
|
});
|
|
369
|
-
const cleanups = [];
|
|
370
|
-
let exiting = false;
|
|
371
|
-
process.on("SIGINT", async () => {
|
|
372
|
-
if (cleanups.length > 0) {
|
|
373
|
-
if (!exiting) {
|
|
374
|
-
exiting = true;
|
|
375
|
-
logger.log(`\n${kleur.gray("Exiting...")}`);
|
|
376
|
-
}
|
|
377
|
-
// TODO: for some reason this runs twice...
|
|
378
|
-
// and this whole thing feels hacky anyway
|
|
379
|
-
await Promise.allSettled(cleanups.map((cleanup) => cleanup()));
|
|
380
|
-
}
|
|
381
|
-
process.exit(0);
|
|
382
|
-
});
|
|
383
370
|
const assertUnique = (inputs, key, message) => {
|
|
384
371
|
const ids = inputs.map((input) => input[key]);
|
|
385
372
|
const duplicates = ids.filter((id, index) => ids.indexOf(id) !== index);
|
|
@@ -532,39 +519,6 @@ async function provisionSubdomain(api, props) {
|
|
|
532
519
|
await disableWorkerSubdomain(api, props.scriptName);
|
|
533
520
|
}
|
|
534
521
|
}
|
|
535
|
-
async function createMiniflare(props) {
|
|
536
|
-
const sharedOptions = {
|
|
537
|
-
name: props.workerName,
|
|
538
|
-
compatibilityDate: props.compatibilityDate,
|
|
539
|
-
compatibilityFlags: props.compatibilityFlags,
|
|
540
|
-
bindings: props.bindings,
|
|
541
|
-
port: props.port,
|
|
542
|
-
assets: props.assets,
|
|
543
|
-
};
|
|
544
|
-
const startPromise = new DeferredPromise();
|
|
545
|
-
const controller = new AbortController();
|
|
546
|
-
cleanups.push(() => controller.abort());
|
|
547
|
-
const run = async () => {
|
|
548
|
-
for await (const bundle of props.bundle.watch(controller.signal)) {
|
|
549
|
-
const server = await miniflareServer.push({
|
|
550
|
-
...sharedOptions,
|
|
551
|
-
bundle,
|
|
552
|
-
});
|
|
553
|
-
if (startPromise.status === "pending") {
|
|
554
|
-
startPromise.resolve(server.url);
|
|
555
|
-
}
|
|
556
|
-
logger.task("", {
|
|
557
|
-
message: `ready at ${server.url}`,
|
|
558
|
-
status: "success",
|
|
559
|
-
resource: props.id,
|
|
560
|
-
prefix: "miniflare",
|
|
561
|
-
prefixColor: "greenBright",
|
|
562
|
-
});
|
|
563
|
-
}
|
|
564
|
-
};
|
|
565
|
-
void run();
|
|
566
|
-
return await startPromise.value;
|
|
567
|
-
}
|
|
568
522
|
async function createDevCommand(props) {
|
|
569
523
|
const persistFile = path.join(process.cwd(), ".alchemy", `${props.id}.pid`);
|
|
570
524
|
if (await exists(persistFile)) {
|
|
@@ -585,7 +539,8 @@ async function createDevCommand(props) {
|
|
|
585
539
|
}
|
|
586
540
|
const command = props.command.split(" ");
|
|
587
541
|
const [cmd, ...args] = command;
|
|
588
|
-
const
|
|
542
|
+
const promise = new DeferredPromise();
|
|
543
|
+
const childProcess = spawn(cmd, args, {
|
|
589
544
|
cwd: props.cwd,
|
|
590
545
|
shell: true,
|
|
591
546
|
env: {
|
|
@@ -597,47 +552,71 @@ async function createDevCommand(props) {
|
|
|
597
552
|
},
|
|
598
553
|
stdio: ["inherit", "pipe", "pipe"],
|
|
599
554
|
});
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
555
|
+
// Clean up the pid file when the process exits
|
|
556
|
+
childProcess.once("exit", async () => {
|
|
557
|
+
try {
|
|
558
|
+
await fs.unlink(persistFile);
|
|
559
|
+
}
|
|
560
|
+
catch {
|
|
561
|
+
// ignore
|
|
562
|
+
}
|
|
563
|
+
});
|
|
564
|
+
let urlFound = false;
|
|
565
|
+
let stdout = "";
|
|
566
|
+
let stderr = "";
|
|
567
|
+
const urlRegex = /http:\/\/(?:(?:localhost|0\.0\.0\.0|127\.0\.0\.1)|(?:\d{1,3}\.){3}\d{1,3}):\d+(?:\/)?/;
|
|
568
|
+
const parseOutput = (data) => {
|
|
569
|
+
if (!urlFound) {
|
|
570
|
+
const match = data.match(urlRegex);
|
|
571
|
+
if (match) {
|
|
572
|
+
urlFound = true;
|
|
573
|
+
promise.resolve(match[0]);
|
|
612
574
|
}
|
|
613
|
-
}
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
575
|
+
}
|
|
576
|
+
};
|
|
577
|
+
// Handle stdout - parse for URL and write through with colors preserved
|
|
578
|
+
childProcess.stdout?.on("data", (data) => {
|
|
579
|
+
parseOutput((stdout += data.toString().replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "")));
|
|
580
|
+
process.stdout.write(data);
|
|
581
|
+
});
|
|
582
|
+
childProcess.stderr?.on("data", (data) => {
|
|
583
|
+
parseOutput((stderr += data.toString().replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "")));
|
|
584
|
+
process.stderr.write(data);
|
|
585
|
+
});
|
|
586
|
+
childProcess.on("error", (error) => {
|
|
587
|
+
promise.reject(error);
|
|
588
|
+
});
|
|
589
|
+
if (childProcess.pid) {
|
|
590
|
+
await fs.mkdir(path.dirname(persistFile), { recursive: true });
|
|
591
|
+
await fs.writeFile(persistFile, childProcess.pid.toString());
|
|
592
|
+
}
|
|
593
|
+
return {
|
|
594
|
+
url: await promise.value,
|
|
595
|
+
cleanup: async () => {
|
|
627
596
|
try {
|
|
628
597
|
await fs.unlink(persistFile);
|
|
629
598
|
}
|
|
630
599
|
catch {
|
|
631
600
|
// ignore
|
|
632
601
|
}
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
602
|
+
if (!childProcess.killed) {
|
|
603
|
+
childProcess.kill("SIGTERM");
|
|
604
|
+
// Give it time to exit gracefully
|
|
605
|
+
await new Promise((resolve) => {
|
|
606
|
+
const timeout = setTimeout(() => {
|
|
607
|
+
if (!childProcess.killed) {
|
|
608
|
+
childProcess.kill("SIGKILL");
|
|
609
|
+
}
|
|
610
|
+
resolve();
|
|
611
|
+
}, 5000);
|
|
612
|
+
childProcess.once("exit", () => {
|
|
613
|
+
clearTimeout(timeout);
|
|
614
|
+
resolve();
|
|
615
|
+
});
|
|
616
|
+
});
|
|
617
|
+
}
|
|
618
|
+
},
|
|
619
|
+
};
|
|
641
620
|
}
|
|
642
621
|
async function prepareWorkerUpload(api, props) {
|
|
643
622
|
const scriptMetadata = await prepareWorkerMetadata(api, props);
|