alchemy 0.13.0 → 0.14.1
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/apply.d.ts.map +1 -1
- package/lib/apply.js +0 -1
- package/lib/apply.js.map +1 -1
- package/lib/aws/function.js +9 -1
- package/lib/aws/function.js.map +1 -1
- package/lib/cloudflare/api.d.ts +5 -5
- package/lib/cloudflare/api.d.ts.map +1 -1
- package/lib/cloudflare/api.js +51 -10
- package/lib/cloudflare/api.js.map +1 -1
- package/lib/cloudflare/auth.d.ts +24 -55
- package/lib/cloudflare/auth.d.ts.map +1 -1
- package/lib/cloudflare/auth.js +15 -72
- package/lib/cloudflare/auth.js.map +1 -1
- package/lib/cloudflare/bundle/alias-plugin.d.ts +6 -0
- package/lib/cloudflare/bundle/alias-plugin.d.ts.map +1 -0
- package/lib/cloudflare/bundle/alias-plugin.js +36 -0
- package/lib/cloudflare/bundle/alias-plugin.js.map +1 -0
- package/lib/cloudflare/bundle/build-failures.d.ts +12 -0
- package/lib/cloudflare/bundle/build-failures.d.ts.map +1 -0
- package/lib/cloudflare/bundle/build-failures.js +45 -0
- package/lib/cloudflare/bundle/build-failures.js.map +1 -0
- package/lib/cloudflare/bundle/bundle-worker.d.ts +7 -0
- package/lib/cloudflare/bundle/bundle-worker.d.ts.map +1 -0
- package/lib/cloudflare/bundle/bundle-worker.js +69 -0
- package/lib/cloudflare/bundle/bundle-worker.js.map +1 -0
- package/lib/cloudflare/bundle/external.d.ts +1 -0
- package/lib/cloudflare/bundle/external.d.ts.map +1 -1
- package/lib/cloudflare/bundle/external.js +8 -1
- package/lib/cloudflare/bundle/external.js.map +1 -1
- package/lib/cloudflare/bundle/local-dev-cloudflare-shim.d.ts +1 -1
- package/lib/cloudflare/bundle/local-dev-cloudflare-shim.d.ts.map +1 -1
- package/lib/cloudflare/bundle/local-dev-cloudflare-shim.js +6 -6
- package/lib/cloudflare/bundle/local-dev-cloudflare-shim.js.map +1 -1
- package/lib/cloudflare/bundle/nodejs-compat-mode.d.ts +17 -0
- package/lib/cloudflare/bundle/nodejs-compat-mode.d.ts.map +1 -0
- package/lib/cloudflare/bundle/nodejs-compat-mode.js +27 -0
- package/lib/cloudflare/bundle/nodejs-compat-mode.js.map +1 -0
- package/lib/cloudflare/bundle/nodejs-compat.d.ts +11 -0
- package/lib/cloudflare/bundle/nodejs-compat.d.ts.map +1 -0
- package/lib/cloudflare/bundle/{hybrid-nodejs-compat.js → nodejs-compat.js} +6 -5
- package/lib/cloudflare/bundle/nodejs-compat.js.map +1 -0
- package/lib/cloudflare/queue-consumer.d.ts.map +1 -1
- package/lib/cloudflare/queue-consumer.js +0 -4
- package/lib/cloudflare/queue-consumer.js.map +1 -1
- package/lib/cloudflare/user.d.ts +51 -0
- package/lib/cloudflare/user.d.ts.map +1 -0
- package/lib/cloudflare/user.js +62 -0
- package/lib/cloudflare/user.js.map +1 -0
- package/lib/cloudflare/worker.d.ts +18 -3
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +7 -44
- package/lib/cloudflare/worker.js.map +1 -1
- package/lib/esbuild/bundle.d.ts.map +1 -1
- package/lib/esbuild/bundle.js +0 -1
- package/lib/esbuild/bundle.js.map +1 -1
- package/lib/test/bun.d.ts.map +1 -1
- package/lib/test/bun.js +2 -8
- package/lib/test/bun.js.map +1 -1
- package/package.json +4 -1
- package/src/apply.ts +0 -1
- package/src/aws/function.ts +11 -2
- package/src/cloudflare/api.ts +63 -14
- package/src/cloudflare/auth.ts +43 -158
- package/src/cloudflare/bundle/alias-plugin.ts +48 -0
- package/src/cloudflare/bundle/build-failures.ts +55 -0
- package/src/cloudflare/bundle/bundle-worker.ts +89 -0
- package/src/cloudflare/bundle/external.ts +9 -1
- package/src/cloudflare/bundle/local-dev-cloudflare-shim.ts +7 -6
- package/src/cloudflare/bundle/nodejs-compat-mode.ts +49 -0
- package/src/cloudflare/bundle/{hybrid-nodejs-compat.ts → nodejs-compat.ts} +6 -5
- package/src/cloudflare/queue-consumer.ts +1 -7
- package/src/cloudflare/user.ts +142 -0
- package/src/cloudflare/worker.ts +26 -51
- package/src/esbuild/bundle.ts +0 -1
- package/src/test/bun.ts +2 -7
- package/lib/cloudflare/account-id.d.ts +0 -6
- package/lib/cloudflare/account-id.d.ts.map +0 -1
- package/lib/cloudflare/account-id.js +0 -6
- package/lib/cloudflare/account-id.js.map +0 -1
- package/lib/cloudflare/bundle/hybrid-nodejs-compat.d.ts +0 -8
- package/lib/cloudflare/bundle/hybrid-nodejs-compat.d.ts.map +0 -1
- package/lib/cloudflare/bundle/hybrid-nodejs-compat.js.map +0 -1
- package/src/cloudflare/account-id.ts +0 -12
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { builtinModules } from "node:module";
|
|
2
|
+
/**
|
|
3
|
+
* RegExp matching against esbuild's error text when it is unable to resolve
|
|
4
|
+
* a Node built-in module. If we detect this when node_compat is disabled,
|
|
5
|
+
* we'll rewrite the error to suggest enabling it.
|
|
6
|
+
*/
|
|
7
|
+
const nodeBuiltinResolveErrorText = new RegExp('^Could not resolve "(' +
|
|
8
|
+
builtinModules.join("|") +
|
|
9
|
+
"|" +
|
|
10
|
+
builtinModules.map((module) => `node:${module}`).join("|") +
|
|
11
|
+
')"$');
|
|
12
|
+
/**
|
|
13
|
+
* Rewrites esbuild BuildFailures for failing to resolve Node built-in modules
|
|
14
|
+
* to suggest enabling Node compat as opposed to `platform: "node"`.
|
|
15
|
+
*/
|
|
16
|
+
export function rewriteNodeCompatBuildFailure(errors, compatMode = null) {
|
|
17
|
+
for (const error of errors) {
|
|
18
|
+
const match = nodeBuiltinResolveErrorText.exec(error.text);
|
|
19
|
+
if (match !== null) {
|
|
20
|
+
let text = `The package "${match[1]}" wasn't found on the file system but is built into node.\n`;
|
|
21
|
+
if (compatMode === null || compatMode === "als") {
|
|
22
|
+
text += `- Add the "nodejs_compat" compatibility flag to your project.\n`;
|
|
23
|
+
}
|
|
24
|
+
else if (compatMode === "v1" && !match[1].startsWith("node:")) {
|
|
25
|
+
text += `- Make sure to prefix the module name with "node:" or update your compatibility_date to 2024-09-23 or later.\n`;
|
|
26
|
+
}
|
|
27
|
+
error.notes = [
|
|
28
|
+
{
|
|
29
|
+
location: null,
|
|
30
|
+
text,
|
|
31
|
+
},
|
|
32
|
+
];
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Returns true if the passed value looks like an esbuild BuildFailure object
|
|
38
|
+
*/
|
|
39
|
+
export function isBuildFailure(err) {
|
|
40
|
+
return (typeof err === "object" &&
|
|
41
|
+
err !== null &&
|
|
42
|
+
"errors" in err &&
|
|
43
|
+
"warnings" in err);
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=build-failures.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"build-failures.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/build-failures.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C;;;;GAIG;AACH,MAAM,2BAA2B,GAAG,IAAI,MAAM,CAC5C,uBAAuB;IACrB,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;IACxB,GAAG;IACH,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;IAC1D,KAAK,CACR,CAAC;AACF;;;GAGG;AACH,MAAM,UAAU,6BAA6B,CAC3C,MAAyB,EACzB,aAA+B,IAAI;IAEnC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,IAAI,IAAI,GAAG,gBAAgB,KAAK,CAAC,CAAC,CAAC,6DAA6D,CAAC;YAEjG,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;gBAChD,IAAI,IAAI,iEAAiE,CAAC;YAC5E,CAAC;iBAAM,IAAI,UAAU,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChE,IAAI,IAAI,gHAAgH,CAAC;YAC3H,CAAC;YAED,KAAK,CAAC,KAAK,GAAG;gBACZ;oBACE,QAAQ,EAAE,IAAI;oBACd,IAAI;iBACL;aACF,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,GAAY;IACzC,OAAO,CACL,OAAO,GAAG,KAAK,QAAQ;QACvB,GAAG,KAAK,IAAI;QACZ,QAAQ,IAAI,GAAG;QACf,UAAU,IAAI,GAAG,CAClB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { Bindings } from "../bindings.js";
|
|
2
|
+
import type { WorkerProps } from "../worker.js";
|
|
3
|
+
export declare function bundleWorkerScript<B extends Bindings>(props: WorkerProps<B> & {
|
|
4
|
+
compatibilityDate: string;
|
|
5
|
+
compatibilityFlags: string[];
|
|
6
|
+
}): Promise<string>;
|
|
7
|
+
//# sourceMappingURL=bundle-worker.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bundle-worker.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/bundle/bundle-worker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAUhD,wBAAsB,kBAAkB,CAAC,CAAC,SAAS,QAAQ,EACzD,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,mBAuEF"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import fs from "node:fs/promises";
|
|
2
|
+
import { Bundle } from "../../esbuild/bundle.js";
|
|
3
|
+
import { createAliasPlugin } from "./alias-plugin.js";
|
|
4
|
+
import { isBuildFailure, rewriteNodeCompatBuildFailure, } from "./build-failures.js";
|
|
5
|
+
import { external, external_als } from "./external.js";
|
|
6
|
+
import { getNodeJSCompatMode } from "./nodejs-compat-mode.js";
|
|
7
|
+
import { nodeJsCompatPlugin } from "./nodejs-compat.js";
|
|
8
|
+
export async function bundleWorkerScript(props) {
|
|
9
|
+
const projectRoot = props.projectRoot ?? process.cwd();
|
|
10
|
+
const nodeJsCompatMode = getNodeJSCompatMode(props.compatibilityDate, props.compatibilityFlags);
|
|
11
|
+
if (nodeJsCompatMode === "v1") {
|
|
12
|
+
throw new Error("You must set your compatibilty date >= 2024-09-23 when using 'nodejs_compat' compatibility flag");
|
|
13
|
+
}
|
|
14
|
+
try {
|
|
15
|
+
const bundle = await Bundle("bundle", {
|
|
16
|
+
entryPoint: props.entrypoint,
|
|
17
|
+
format: props.format === "cjs" ? "cjs" : "esm", // Use the specified format or default to ESM
|
|
18
|
+
target: "esnext",
|
|
19
|
+
platform: "node",
|
|
20
|
+
minify: false,
|
|
21
|
+
...(props.bundle || {}),
|
|
22
|
+
conditions: ["workerd", "worker", "browser"],
|
|
23
|
+
options: {
|
|
24
|
+
absWorkingDir: projectRoot,
|
|
25
|
+
...(props.bundle?.options || {}),
|
|
26
|
+
keepNames: true, // Important for Durable Object classes
|
|
27
|
+
loader: {
|
|
28
|
+
".sql": "text",
|
|
29
|
+
".json": "json",
|
|
30
|
+
},
|
|
31
|
+
plugins: [
|
|
32
|
+
...(nodeJsCompatMode === "v2" ? [await nodeJsCompatPlugin()] : []),
|
|
33
|
+
...(props.bundle?.alias
|
|
34
|
+
? [
|
|
35
|
+
createAliasPlugin({
|
|
36
|
+
alias: props.bundle?.alias,
|
|
37
|
+
projectRoot,
|
|
38
|
+
}),
|
|
39
|
+
]
|
|
40
|
+
: []),
|
|
41
|
+
],
|
|
42
|
+
},
|
|
43
|
+
external: [
|
|
44
|
+
...(nodeJsCompatMode === "als" ? external_als : external),
|
|
45
|
+
...(props.bundle?.external ?? []),
|
|
46
|
+
...(props.bundle?.options?.external ?? []),
|
|
47
|
+
],
|
|
48
|
+
});
|
|
49
|
+
if (bundle.content) {
|
|
50
|
+
return bundle.content;
|
|
51
|
+
}
|
|
52
|
+
if (bundle.path) {
|
|
53
|
+
return await fs.readFile(bundle.path, "utf-8");
|
|
54
|
+
}
|
|
55
|
+
throw new Error("Failed to create bundle");
|
|
56
|
+
}
|
|
57
|
+
catch (e) {
|
|
58
|
+
if (e.message?.includes("No such module 'node:")) {
|
|
59
|
+
throw new Error(`${e.message}.\nMake sure to set 'nodejs_compat' compatibility flag and compatibilityDate > 2024-09-23`, { cause: e });
|
|
60
|
+
}
|
|
61
|
+
if (isBuildFailure(e)) {
|
|
62
|
+
rewriteNodeCompatBuildFailure(e.errors, nodeJsCompatMode);
|
|
63
|
+
throw e;
|
|
64
|
+
}
|
|
65
|
+
console.error("Error reading bundle:", e);
|
|
66
|
+
throw new Error("Error reading bundle");
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=bundle-worker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bundle-worker.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/bundle-worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/bundle/external.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"external.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/bundle/external.ts"],"names":[],"mappings":"AA2BA,eAAO,MAAM,QAAQ,UAKpB,CAAC;AAEF,eAAO,MAAM,YAAY,UAKxB,CAAC"}
|
|
@@ -5,13 +5,14 @@ const nodejs_compat = [
|
|
|
5
5
|
"node:buffer",
|
|
6
6
|
"node:console",
|
|
7
7
|
"node:crypto",
|
|
8
|
+
"node:debug",
|
|
8
9
|
"node:diagnostics_channel",
|
|
9
10
|
"node:dns",
|
|
10
11
|
"node:events",
|
|
11
12
|
"node:inspector",
|
|
12
13
|
"node:net",
|
|
13
14
|
"node:path",
|
|
14
|
-
"node:perf_hooks",
|
|
15
|
+
"node:perf_hooks", // partially supported
|
|
15
16
|
"node:process",
|
|
16
17
|
"node:querystring",
|
|
17
18
|
"node:stream",
|
|
@@ -29,4 +30,10 @@ export const external = [
|
|
|
29
30
|
"cloudflare:workers",
|
|
30
31
|
// "cloudflare:*",
|
|
31
32
|
];
|
|
33
|
+
export const external_als = [
|
|
34
|
+
//
|
|
35
|
+
"node:async_hooks",
|
|
36
|
+
"async_hooks",
|
|
37
|
+
"cloudflare:*",
|
|
38
|
+
];
|
|
32
39
|
//# sourceMappingURL=external.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/external.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,MAAM,aAAa,GAAG;IACpB,kBAAkB;IAClB,aAAa;IACb,aAAa;IACb,cAAc;IACd,aAAa;IACb,0BAA0B;IAC1B,UAAU;IACV,aAAa;IACb,gBAAgB;IAChB,UAAU;IACV,WAAW;IACX,iBAAiB;
|
|
1
|
+
{"version":3,"file":"external.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/external.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,MAAM,aAAa,GAAG;IACpB,kBAAkB;IAClB,aAAa;IACb,aAAa;IACb,cAAc;IACd,aAAa;IACb,YAAY;IACZ,0BAA0B;IAC1B,UAAU;IACV,aAAa;IACb,gBAAgB;IAChB,UAAU;IACV,WAAW;IACX,iBAAiB,EAAE,sBAAsB;IACzC,cAAc;IACd,kBAAkB;IAClB,aAAa;IACb,qBAAqB;IACrB,aAAa;IACb,UAAU,EAAE,sBAAsB;IAClC,UAAU;IACV,WAAW;IACX,WAAW;IACX,YAAY;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,GAAG,aAAa;IAChB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,oBAAoB;IACpB,kBAAkB;CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,EAAE;IACF,kBAAkB;IAClB,aAAa;IACb,cAAc;CACf,CAAC"}
|
|
@@ -8,6 +8,6 @@ export declare function cloudflareWorkersDevEnvironmentShim(): {
|
|
|
8
8
|
readonly apply: "serve";
|
|
9
9
|
readonly enforce: "pre";
|
|
10
10
|
readonly resolveId: (id: string) => "cloudflare:workers" | undefined;
|
|
11
|
-
readonly load: (id: string) =>
|
|
11
|
+
readonly load: (id: string) => string | undefined;
|
|
12
12
|
};
|
|
13
13
|
//# sourceMappingURL=local-dev-cloudflare-shim.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-dev-cloudflare-shim.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/bundle/local-dev-cloudflare-shim.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"local-dev-cloudflare-shim.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/bundle/local-dev-cloudflare-shim.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,mCAAmC;;;;6BAKjC,MAAM;wBAGX,MAAM;EASlB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { dedent } from "../../util/dedent.js";
|
|
1
2
|
/**
|
|
2
3
|
* TanStackStart server functions and middleware run in Node.js intead of Miniflare when using `vite dev`.
|
|
3
4
|
*
|
|
@@ -14,12 +15,11 @@ export function cloudflareWorkersDevEnvironmentShim() {
|
|
|
14
15
|
},
|
|
15
16
|
load(id) {
|
|
16
17
|
if (id === "cloudflare:workers")
|
|
17
|
-
return `
|
|
18
|
-
import { getPlatformProxy } from "wrangler";
|
|
19
|
-
// TODO: should we export default cloudflare; ??
|
|
20
|
-
const cloudflare = await getPlatformProxy();
|
|
21
|
-
export const env = cloudflare.env
|
|
22
|
-
`;
|
|
18
|
+
return dedent `
|
|
19
|
+
import { getPlatformProxy } from "wrangler";
|
|
20
|
+
// TODO: should we export default cloudflare; ??
|
|
21
|
+
const cloudflare = await getPlatformProxy();
|
|
22
|
+
export const env = cloudflare.env;`;
|
|
23
23
|
},
|
|
24
24
|
};
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-dev-cloudflare-shim.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/local-dev-cloudflare-shim.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,mCAAmC;IACjD,OAAO;QACL,IAAI,EAAE,6BAA6B;QACnC,KAAK,EAAE,OAAO,EAAE,WAAW;QAC3B,OAAO,EAAE,KAAK;QACd,SAAS,CAAC,EAAU;YAClB,IAAI,EAAE,KAAK,oBAAoB;gBAAE,OAAO,EAAE,CAAC,CAAC,0BAA0B;QACxE,CAAC;QACD,IAAI,CAAC,EAAU;YACb,IAAI,EAAE,KAAK,oBAAoB;gBAC7B,OAAO
|
|
1
|
+
{"version":3,"file":"local-dev-cloudflare-shim.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/local-dev-cloudflare-shim.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C;;;;GAIG;AACH,MAAM,UAAU,mCAAmC;IACjD,OAAO;QACL,IAAI,EAAE,6BAA6B;QACnC,KAAK,EAAE,OAAO,EAAE,WAAW;QAC3B,OAAO,EAAE,KAAK;QACd,SAAS,CAAC,EAAU;YAClB,IAAI,EAAE,KAAK,oBAAoB;gBAAE,OAAO,EAAE,CAAC,CAAC,0BAA0B;QACxE,CAAC;QACD,IAAI,CAAC,EAAU;YACb,IAAI,EAAE,KAAK,oBAAoB;gBAC7B,OAAO,MAAM,CAAA;;;;6CAIwB,CAAC;QAC1C,CAAC;KACO,CAAC;AACb,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { NodeJSCompatMode } from "miniflare";
|
|
2
|
+
/**
|
|
3
|
+
* Computes and validates the Node.js compatibility mode we are running.
|
|
4
|
+
*
|
|
5
|
+
* NOTES:
|
|
6
|
+
* - The v2 mode is configured via `nodejs_compat_v2` compat flag or via `nodejs_compat` plus a compatibility date of Sept 23rd. 2024 or later.
|
|
7
|
+
* - See `EnvironmentInheritable` for `noBundle`.
|
|
8
|
+
*
|
|
9
|
+
* @param compatibilityDateStr The compatibility date
|
|
10
|
+
* @param compatibilityFlags The compatibility flags
|
|
11
|
+
* @param noBundle Whether to skip internal build steps and directly deploy script
|
|
12
|
+
*
|
|
13
|
+
*/
|
|
14
|
+
export declare function getNodeJSCompatMode(compatibilityDateStr: string, compatibilityFlags: string[], props?: {
|
|
15
|
+
noBundle?: boolean;
|
|
16
|
+
}): NodeJSCompatMode;
|
|
17
|
+
//# sourceMappingURL=nodejs-compat-mode.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodejs-compat-mode.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/bundle/nodejs-compat-mode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAGlD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CACjC,oBAAoB,EAAE,MAAM,EAC5B,kBAAkB,EAAE,MAAM,EAAE,EAC5B,KAAK,CAAC,EAAE;IACN,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GACA,gBAAgB,CA2BlB"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { getNodeCompat } from "miniflare";
|
|
2
|
+
/**
|
|
3
|
+
* Computes and validates the Node.js compatibility mode we are running.
|
|
4
|
+
*
|
|
5
|
+
* NOTES:
|
|
6
|
+
* - The v2 mode is configured via `nodejs_compat_v2` compat flag or via `nodejs_compat` plus a compatibility date of Sept 23rd. 2024 or later.
|
|
7
|
+
* - See `EnvironmentInheritable` for `noBundle`.
|
|
8
|
+
*
|
|
9
|
+
* @param compatibilityDateStr The compatibility date
|
|
10
|
+
* @param compatibilityFlags The compatibility flags
|
|
11
|
+
* @param noBundle Whether to skip internal build steps and directly deploy script
|
|
12
|
+
*
|
|
13
|
+
*/
|
|
14
|
+
export function getNodeJSCompatMode(compatibilityDateStr, compatibilityFlags, props) {
|
|
15
|
+
const { mode, hasNodejsCompatFlag, hasNodejsCompatV2Flag, hasExperimentalNodejsCompatV2Flag, } = getNodeCompat(compatibilityDateStr, compatibilityFlags);
|
|
16
|
+
if (hasExperimentalNodejsCompatV2Flag) {
|
|
17
|
+
throw new Error("The `experimental:` prefix on `nodejs_compat_v2` is no longer valid. Please remove it and try again.");
|
|
18
|
+
}
|
|
19
|
+
if (hasNodejsCompatFlag && hasNodejsCompatV2Flag) {
|
|
20
|
+
throw new Error("The `nodejs_compat` and `nodejs_compat_v2` compatibility flags cannot be used in together. Please select just one.");
|
|
21
|
+
}
|
|
22
|
+
if (props?.noBundle && hasNodejsCompatV2Flag) {
|
|
23
|
+
console.warn("`nodejs_compat_v2` compatibility flag and `--no-bundle` can't be used together. If you want to polyfill Node.js built-ins and disable Wrangler's bundling, please polyfill as part of your own bundling process.");
|
|
24
|
+
}
|
|
25
|
+
return mode;
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=nodejs-compat-mode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodejs-compat-mode.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/nodejs-compat-mode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,mBAAmB,CACjC,oBAA4B,EAC5B,kBAA4B,EAC5B,KAEC;IAED,MAAM,EACJ,IAAI,EACJ,mBAAmB,EACnB,qBAAqB,EACrB,iCAAiC,GAClC,GAAG,aAAa,CAAC,oBAAoB,EAAE,kBAAkB,CAAC,CAAC;IAE5D,IAAI,iCAAiC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CACb,sGAAsG,CACvG,CAAC;IACJ,CAAC;IAED,IAAI,mBAAmB,IAAI,qBAAqB,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CACb,oHAAoH,CACrH,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,EAAE,QAAQ,IAAI,qBAAqB,EAAE,CAAC;QAC7C,OAAO,CAAC,IAAI,CACV,kNAAkN,CACnN,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copied from https://github.com/cloudflare/workers-sdk/blob/main/packages/wrangler/src/deployment-bundle/esbuild-plugins/hybrid-nodejs-compat.ts#L17
|
|
3
|
+
*/
|
|
4
|
+
import type { Plugin } from "esbuild";
|
|
5
|
+
/**
|
|
6
|
+
* ESBuild plugin to apply the unenv preset.
|
|
7
|
+
*
|
|
8
|
+
* @returns ESBuild plugin
|
|
9
|
+
*/
|
|
10
|
+
export declare function nodeJsCompatPlugin(): Promise<Plugin>;
|
|
11
|
+
//# sourceMappingURL=nodejs-compat.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodejs-compat.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/bundle/nodejs-compat.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,SAAS,CAAC;AASnD;;;;GAIG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAkB1D"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copied from https://github.com/cloudflare/workers-sdk/blob/main/packages/wrangler/src/deployment-bundle/esbuild-plugins/hybrid-nodejs-compat.ts#L17
|
|
3
|
+
*/
|
|
1
4
|
import assert from "node:assert";
|
|
2
5
|
import { builtinModules } from "node:module";
|
|
3
6
|
import nodePath from "node:path";
|
|
4
7
|
import { dedent } from "../../util/dedent.js";
|
|
5
|
-
/**
|
|
6
|
-
* Copied from https://github.com/cloudflare/workers-sdk/blob/main/packages/wrangler/src/deployment-bundle/esbuild-plugins/hybrid-nodejs-compat.ts#L17
|
|
7
|
-
*/
|
|
8
8
|
const REQUIRED_NODE_BUILT_IN_NAMESPACE = "node-built-in-modules";
|
|
9
9
|
const REQUIRED_UNENV_ALIAS_NAMESPACE = "required-unenv-alias";
|
|
10
10
|
/**
|
|
@@ -12,7 +12,7 @@ const REQUIRED_UNENV_ALIAS_NAMESPACE = "required-unenv-alias";
|
|
|
12
12
|
*
|
|
13
13
|
* @returns ESBuild plugin
|
|
14
14
|
*/
|
|
15
|
-
export async function
|
|
15
|
+
export async function nodeJsCompatPlugin() {
|
|
16
16
|
// `unenv` and `@cloudflare/unenv-preset` only publish esm
|
|
17
17
|
const { defineEnv } = await import("unenv");
|
|
18
18
|
const { cloudflare } = await import("@cloudflare/unenv-preset");
|
|
@@ -167,6 +167,7 @@ function handleNodeJSGlobals(build, inject, polyfill) {
|
|
|
167
167
|
injectsByModule.set(module, []);
|
|
168
168
|
virtualModulePathToSpecifier.set(prefix + module.replaceAll("/", "-"), module);
|
|
169
169
|
}
|
|
170
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
170
171
|
injectsByModule.get(module).push({ injectedName, exportName, importName });
|
|
171
172
|
}
|
|
172
173
|
build.initialOptions.inject = [
|
|
@@ -192,4 +193,4 @@ function handleNodeJSGlobals(build, inject, polyfill) {
|
|
|
192
193
|
};
|
|
193
194
|
});
|
|
194
195
|
}
|
|
195
|
-
//# sourceMappingURL=
|
|
196
|
+
//# sourceMappingURL=nodejs-compat.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodejs-compat.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/nodejs-compat.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,MAAM,gCAAgC,GAAG,uBAAuB,CAAC;AACjE,MAAM,8BAA8B,GAAG,sBAAsB,CAAC;AAE9D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,0DAA0D;IAC1D,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAChE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;QACtD,OAAO,EAAE,CAAC,UAAU,CAAC;QACrB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC,GAAG,CAAC;IAEP,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,KAAK,CAAC,KAAK;YACT,0BAA0B,CAAC,KAAK,CAAC,CAAC;YAClC,kCAAkC,CAAC,KAAK,CAAC,CAAC;YAC1C,0BAA0B,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;YACnD,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAAC,aAAa,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAEhF;;;;;GAKG;AACH,SAAS,0BAA0B,CAAC,KAAkB;IACpD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;IACxB,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACnC,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QACtD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE;QACf,IAAI,KAAK,CAAC,cAAc,CAAC,MAAM,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAC7D,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,CAClD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;iBACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;iBACpB,IAAI,EAAE,CACV,CAAC;YACF,OAAO;gBACL,MAAM,EAAE;oBACN;wBACE,IAAI,EAAE,MAAM,CAAA;gDACwB,QAAQ;;;;;aAK3C;qBACF;iBACF;aACF,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,kCAAkC,CAAC,KAAkB;IAC5D,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QACtD,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACjC,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,SAAS,EAAE,gCAAgC;aAC5C,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,MAAM,CACV,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,gCAAgC,EAAE,EAC7D,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACX,OAAO;YACL,QAAQ,EAAE,MAAM,CAAA;sCACc,IAAI;yCACD;YACjC,MAAM,EAAE,IAAI;SACb,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,0BAA0B,CACjC,KAAkB,EAClB,KAA6B,EAC7B,QAA2B;IAE3B,6CAA6C;IAC7C,MAAM,aAAa,GAA2B,EAAE,CAAC;IACjD,KAAK,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC;YACH,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,kFAAkF;QACpF,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,MAAM,CAC/B,KAAK,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAC9C,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QACnD,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,qHAAqH;QACrH,oGAAoG;QACpG,IACE,IAAI,CAAC,IAAI,KAAK,cAAc;YAC5B,CAAC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC;gBACvC,eAAe,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EAC5C,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,SAAS,EAAE,8BAA8B;aAC1C,CAAC;QACJ,CAAC;QAED,6EAA6E;QAC7E,OAAO;YACL,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;YAC9B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC;SAC7C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,MAAM,CACV,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,8BAA8B,EAAE,EAC3D,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACX,OAAO;YACL,QAAQ,EAAE,MAAM,CAAA;oCACY,IAAI;;;;;;mBAMrB;YACX,MAAM,EAAE,IAAI;SACb,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAC1B,KAAkB,EAClB,MAAkD,EAClD,QAA2B;IAE3B,MAAM,uBAAuB,GAAG,sCAAsC,CAAC;IACvE,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO;IAC7B,iBAAiB;IACjB,MAAM,CAAC,IAAI,CAAC,OAAO,EACnB,iCAAiC,CAClC,CAAC;IAEF;;;;;OAKG;IACH,MAAM,eAAe,GAAG,IAAI,GAAG,EAG5B,CAAC;IAEJ,sHAAsH;IACtH,MAAM,4BAA4B,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE/D,KAAK,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACrE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;YACrE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC,eAAe,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAElD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChC,4BAA4B,CAAC,GAAG,CAC9B,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EACpC,MAAM,CACP,CAAC;QACJ,CAAC;QACD,qEAAqE;QACrE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG;QAC5B,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,IAAI,EAAE,CAAC;QACtC,6BAA6B;QAC7B,GAAG,4BAA4B,CAAC,IAAI,EAAE;QACtC,gDAAgD;QAChD,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAC3C,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAClE,IAAI;KACL,CAAC,CAAC,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QAC7D,MAAM,MAAM,GAAG,4BAA4B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,EAAE,YAAY,IAAI,qCAAqC,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,EAAE,YAAY,MAAM,mBAAmB,CAAC,CAAC;QAEvD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,CACzD,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,OAAO,UAAU,EAAE,CAC1E,CAAC;QAEF,OAAO;YACL,QAAQ,EAAE,MAAM,CAAA;mBACH,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,MAAM;UAC7C,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,cAAc,YAAY,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;SAC9G,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-consumer.d.ts","sourceRoot":"","sources":["../../src/cloudflare/queue-consumer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,
|
|
1
|
+
{"version":3,"file":"queue-consumer.d.ts","sourceRoot":"","sources":["../../src/cloudflare/queue-consumer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,oBAAoB;IAC9D;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IAEjC;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,aACf,SAAQ,QAAQ,CAAC,2BAA2B,CAAC,EAC3C,kBAAkB;IACpB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,aAAa,yFAGhB,OAAO,CAAC,aAAa,CAAC,MACxB,MAAM,SACH,kBAAkB,KACxB,OAAO,CAAC,aAAa,CAAC,CAsD1B,CAAC;AAEF;;GAEG;AACH,UAAU,+BAA+B;IACvC,MAAM,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE;YACT,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,eAAe,CAAC,EAAE,MAAM,CAAC;YACzB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;YAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;SACtB,CAAC;QACF,IAAI,EAAE,QAAQ,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,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;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,+BAA+B,CAAC,CA+C1C;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAcf;AA4DD,MAAM,WAAW,0BAA0B;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,qBAAqB,CAAC;CAClC;AACD;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAqDvC"}
|
|
@@ -49,16 +49,12 @@ export const QueueConsumer = Resource("cloudflare::QueueConsumer", async functio
|
|
|
49
49
|
}
|
|
50
50
|
let consumerData;
|
|
51
51
|
if (this.phase === "create") {
|
|
52
|
-
console.log(`Creating Queue Consumer for queue ${queueId}`);
|
|
53
52
|
consumerData = await createQueueConsumer(api, queueId, props);
|
|
54
53
|
}
|
|
55
54
|
else if (this.output?.id) {
|
|
56
|
-
console.log(`Updating Queue Consumer ${this.output.id}`);
|
|
57
55
|
consumerData = await updateQueueConsumer(api, queueId, this.output.id, props);
|
|
58
56
|
}
|
|
59
57
|
else {
|
|
60
|
-
// If no ID exists, fall back to creating a new consumer
|
|
61
|
-
console.log(`No existing Consumer ID found, creating new Queue Consumer for queue ${queueId}`);
|
|
62
58
|
consumerData = await createQueueConsumer(api, queueId, props);
|
|
63
59
|
}
|
|
64
60
|
return this({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-consumer.js","sourceRoot":"","sources":["../../src/cloudflare/queue-consumer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,
|
|
1
|
+
{"version":3,"file":"queue-consumer.js","sourceRoot":"","sources":["../../src/cloudflare/queue-consumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import type { Secret } from "../secret.js";
|
|
2
|
+
import { type CloudflareAuthOptions } from "./auth.js";
|
|
3
|
+
export interface CloudflareAccount {
|
|
4
|
+
name: string;
|
|
5
|
+
id: string;
|
|
6
|
+
type: "standard" | "zero_rating" | "full_control";
|
|
7
|
+
settings: {
|
|
8
|
+
enforce_twofactor: boolean;
|
|
9
|
+
api_access_enabled: null;
|
|
10
|
+
access_approval_expiry: null;
|
|
11
|
+
abuse_contact_email: null;
|
|
12
|
+
};
|
|
13
|
+
legacy_flags: {
|
|
14
|
+
enterprise_zone_quota: {
|
|
15
|
+
maximum: number;
|
|
16
|
+
current: number;
|
|
17
|
+
available: number;
|
|
18
|
+
};
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
export interface CloudflareUserInfo {
|
|
22
|
+
apiToken?: Secret;
|
|
23
|
+
apiKey?: Secret;
|
|
24
|
+
email: string;
|
|
25
|
+
username: string;
|
|
26
|
+
accounts: CloudflareAccount[];
|
|
27
|
+
organizations: CloudflareOrganization[];
|
|
28
|
+
tokenPermissions: string[] | undefined;
|
|
29
|
+
first_name: string | null;
|
|
30
|
+
last_name: string | null;
|
|
31
|
+
telephone: string | null;
|
|
32
|
+
country: string | null;
|
|
33
|
+
zipcode: string | null;
|
|
34
|
+
two_factor_authentication_enabled: boolean;
|
|
35
|
+
two_factor_authentication_locked: boolean;
|
|
36
|
+
has_pro_zones: boolean;
|
|
37
|
+
has_business_zones: boolean;
|
|
38
|
+
has_enterprise_zones: boolean;
|
|
39
|
+
suspended: boolean;
|
|
40
|
+
betas: string[];
|
|
41
|
+
}
|
|
42
|
+
export interface CloudflareOrganization {
|
|
43
|
+
id: string;
|
|
44
|
+
name: string;
|
|
45
|
+
status: string;
|
|
46
|
+
permissions: string[];
|
|
47
|
+
roles: string[];
|
|
48
|
+
}
|
|
49
|
+
export declare function getCloudflareUserInfo(options: CloudflareAuthOptions): Promise<CloudflareUserInfo>;
|
|
50
|
+
export declare function getUserEmailFromApiKey(apiKey: string): Promise<string>;
|
|
51
|
+
//# sourceMappingURL=user.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/cloudflare/user.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,WAAW,CAAC;AAEnB,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,cAAc,CAAC;IAClD,QAAQ,EAAE;QACR,iBAAiB,EAAE,OAAO,CAAC;QAC3B,kBAAkB,EAAE,IAAI,CAAC;QACzB,sBAAsB,EAAE,IAAI,CAAC;QAC7B,mBAAmB,EAAE,IAAI,CAAC;KAC3B,CAAC;IACF,YAAY,EAAE;QACZ,qBAAqB,EAAE;YACrB,OAAO,EAAE,MAAM,CAAC;YAChB,OAAO,EAAE,MAAM,CAAC;YAChB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,aAAa,EAAE,sBAAsB,EAAE,CAAC;IACxC,gBAAgB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACvC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,iCAAiC,EAAE,OAAO,CAAC;IAC3C,gCAAgC,EAAE,OAAO,CAAC;IAC1C,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAID,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CAiC7B;AAID,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA4C5E"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { handleApiError } from "../neon/api-error.js";
|
|
2
|
+
import { getCloudflareAuthHeaders, } from "./auth.js";
|
|
3
|
+
const userInfoCache = {};
|
|
4
|
+
export async function getCloudflareUserInfo(options) {
|
|
5
|
+
const cacheKey = JSON.stringify({
|
|
6
|
+
apiKey: options.apiKey?.unencrypted,
|
|
7
|
+
apiToken: options.apiToken?.unencrypted,
|
|
8
|
+
email: options.email,
|
|
9
|
+
});
|
|
10
|
+
if (userInfoCache[cacheKey]) {
|
|
11
|
+
return userInfoCache[cacheKey];
|
|
12
|
+
}
|
|
13
|
+
const headers = await getCloudflareAuthHeaders(options);
|
|
14
|
+
const user = await fetch("https://api.cloudflare.com/client/v4/user", {
|
|
15
|
+
headers,
|
|
16
|
+
});
|
|
17
|
+
if (!user.ok) {
|
|
18
|
+
if (user.status === 403) {
|
|
19
|
+
throw new Error("Cloudflare authentication required. Did you forget to login with `wrangler login` or set CLOUDFLARE_API_TOKEN, CLOUDFLARE_API_KEY, or CLOUDFLARE_EMAIL, or CLOUDFLARE_API_KEY?");
|
|
20
|
+
}
|
|
21
|
+
await handleApiError(user, "get", "user", "user");
|
|
22
|
+
}
|
|
23
|
+
const accounts = await fetch("https://api.cloudflare.com/client/v4/accounts", {
|
|
24
|
+
headers,
|
|
25
|
+
});
|
|
26
|
+
const userInfo = {
|
|
27
|
+
...(await user.json()).result,
|
|
28
|
+
accounts: (await accounts.json()).result,
|
|
29
|
+
};
|
|
30
|
+
userInfoCache[cacheKey] = userInfo;
|
|
31
|
+
return userInfo;
|
|
32
|
+
}
|
|
33
|
+
const emailCache = {};
|
|
34
|
+
export async function getUserEmailFromApiKey(apiKey) {
|
|
35
|
+
if (emailCache[apiKey]) {
|
|
36
|
+
return emailCache[apiKey];
|
|
37
|
+
}
|
|
38
|
+
try {
|
|
39
|
+
const baseUrl = "https://api.cloudflare.com/client/v4";
|
|
40
|
+
// Call the /user endpoint to get user information
|
|
41
|
+
const response = await fetch(`${baseUrl}/user`, {
|
|
42
|
+
headers: {
|
|
43
|
+
"Content-Type": "application/json",
|
|
44
|
+
"X-Auth-Key": apiKey,
|
|
45
|
+
},
|
|
46
|
+
});
|
|
47
|
+
if (!response.ok) {
|
|
48
|
+
throw new Error(`Failed to get user information: ${response.status} ${response.statusText}`);
|
|
49
|
+
}
|
|
50
|
+
const data = (await response.json());
|
|
51
|
+
if (!data.success || !data.result || !data.result.email) {
|
|
52
|
+
throw new Error("Cloudflare API did not return valid user information");
|
|
53
|
+
}
|
|
54
|
+
emailCache[apiKey] = data.result.email;
|
|
55
|
+
return data.result.email;
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
console.error("Error retrieving email from Cloudflare API:", error);
|
|
59
|
+
throw new Error("Failed to automatically discover email for API Key authentication");
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=user.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/cloudflare/user.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Context } from "../context.js";
|
|
2
|
-
import {
|
|
2
|
+
import type { BundleProps } from "../esbuild/bundle.js";
|
|
3
3
|
import { Resource } from "../resource.js";
|
|
4
4
|
import { type CloudflareApiOptions } from "./api.js";
|
|
5
5
|
import type { Bindings } from "./bindings.js";
|
|
@@ -51,19 +51,28 @@ export interface WorkerProps<B extends Bindings = Bindings> extends CloudflareAp
|
|
|
51
51
|
script?: string;
|
|
52
52
|
/**
|
|
53
53
|
* Path to the entry point file
|
|
54
|
+
*
|
|
54
55
|
* Will be bundled using esbuild
|
|
56
|
+
*
|
|
55
57
|
* One of script, entryPoint, or bundle must be provided
|
|
56
58
|
*/
|
|
57
59
|
entrypoint?: string;
|
|
60
|
+
/**
|
|
61
|
+
* The project root directory used to resolve aliases.
|
|
62
|
+
*
|
|
63
|
+
* @default process.cwd()
|
|
64
|
+
*/
|
|
65
|
+
projectRoot?: string;
|
|
58
66
|
/**
|
|
59
67
|
* Bundle options when using entryPoint
|
|
68
|
+
*
|
|
60
69
|
* Ignored if bundle is provided
|
|
61
70
|
*/
|
|
62
71
|
bundle?: Omit<BundleProps, "entryPoint">;
|
|
63
72
|
/**
|
|
64
73
|
* Module format for the worker script
|
|
65
|
-
* 'esm' - ECMAScript modules (default)
|
|
66
|
-
* 'cjs' - CommonJS modules
|
|
74
|
+
* - 'esm' - ECMAScript modules (default)
|
|
75
|
+
* - 'cjs' - CommonJS modules
|
|
67
76
|
* @default 'esm'
|
|
68
77
|
*/
|
|
69
78
|
format?: "esm" | "cjs";
|
|
@@ -79,6 +88,7 @@ export interface WorkerProps<B extends Bindings = Bindings> extends CloudflareAp
|
|
|
79
88
|
bindings?: B;
|
|
80
89
|
/**
|
|
81
90
|
* Environment variables to attach to the worker
|
|
91
|
+
*
|
|
82
92
|
* These will be converted to plain_text bindings
|
|
83
93
|
*/
|
|
84
94
|
env?: {
|
|
@@ -86,12 +96,14 @@ export interface WorkerProps<B extends Bindings = Bindings> extends CloudflareAp
|
|
|
86
96
|
};
|
|
87
97
|
/**
|
|
88
98
|
* Whether to enable a workers.dev URL for this worker
|
|
99
|
+
*
|
|
89
100
|
* If true, the worker will be available at {name}.{subdomain}.workers.dev
|
|
90
101
|
* @default false
|
|
91
102
|
*/
|
|
92
103
|
url?: boolean;
|
|
93
104
|
/**
|
|
94
105
|
* Observability configuration for the worker
|
|
106
|
+
*
|
|
95
107
|
* Controls whether worker logs are enabled
|
|
96
108
|
* @default { enabled: true }
|
|
97
109
|
*/
|
|
@@ -125,7 +137,9 @@ export interface WorkerProps<B extends Bindings = Bindings> extends CloudflareAp
|
|
|
125
137
|
assets?: AssetsConfig;
|
|
126
138
|
/**
|
|
127
139
|
* Cron expressions for the trigger.
|
|
140
|
+
*
|
|
128
141
|
* Uses standard cron syntax (e.g. "0 0 * * *" for daily at midnight)
|
|
142
|
+
*
|
|
129
143
|
* To clear all cron triggers, pass an empty array.
|
|
130
144
|
*
|
|
131
145
|
* @see https://developers.cloudflare.com/workers/configuration/cron-triggers/#examples
|
|
@@ -133,6 +147,7 @@ export interface WorkerProps<B extends Bindings = Bindings> extends CloudflareAp
|
|
|
133
147
|
crons?: string[];
|
|
134
148
|
/**
|
|
135
149
|
* Event sources that this worker will consume.
|
|
150
|
+
*
|
|
136
151
|
* Can include queues, streams, or other event sources.
|
|
137
152
|
*/
|
|
138
153
|
eventSources?: EventSource[];
|