alchemy 0.63.1 → 0.65.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 +7664 -5857
- package/bin/commands/init.ts +130 -9
- package/bin/constants.ts +4 -0
- package/bin/services/cdp-manager/cdp-proxy.ts +69 -0
- package/bin/services/cdp-manager/server.ts +173 -0
- package/bin/services/execute-alchemy.ts +83 -4
- package/bin/types.ts +1 -0
- package/lib/alchemy.d.ts +4 -0
- package/lib/alchemy.d.ts.map +1 -1
- package/lib/alchemy.js +10 -4
- package/lib/alchemy.js.map +1 -1
- package/lib/apply.d.ts +3 -0
- package/lib/apply.d.ts.map +1 -1
- package/lib/apply.js +11 -1
- package/lib/apply.js.map +1 -1
- package/lib/cloudflare/bindings.d.ts +3 -1
- package/lib/cloudflare/bindings.d.ts.map +1 -1
- package/lib/cloudflare/bucket.d.ts +2 -1
- package/lib/cloudflare/bucket.d.ts.map +1 -1
- package/lib/cloudflare/bucket.js.map +1 -1
- package/lib/cloudflare/bundle/cloudflare-internal.d.ts +6 -0
- package/lib/cloudflare/bundle/cloudflare-internal.d.ts.map +1 -0
- package/lib/cloudflare/bundle/cloudflare-internal.js +39 -0
- package/lib/cloudflare/bundle/cloudflare-internal.js.map +1 -0
- package/lib/cloudflare/bundle/nodejs-builtin-modules.d.ts +2 -0
- package/lib/cloudflare/bundle/nodejs-builtin-modules.d.ts.map +1 -0
- package/lib/cloudflare/bundle/nodejs-builtin-modules.js +9 -0
- package/lib/cloudflare/bundle/nodejs-builtin-modules.js.map +1 -0
- package/lib/cloudflare/bundle/plugin-als-external.d.ts +6 -0
- package/lib/cloudflare/bundle/plugin-als-external.d.ts.map +1 -0
- package/lib/cloudflare/bundle/plugin-als-external.js +12 -0
- package/lib/cloudflare/bundle/plugin-als-external.js.map +1 -0
- package/lib/cloudflare/bundle/plugin-hybrid-node-compat.d.ts +4 -1
- package/lib/cloudflare/bundle/plugin-hybrid-node-compat.d.ts.map +1 -1
- package/lib/cloudflare/bundle/plugin-hybrid-node-compat.js +23 -23
- package/lib/cloudflare/bundle/plugin-hybrid-node-compat.js.map +1 -1
- package/lib/cloudflare/bundle/plugin-node-compat.d.ts +11 -0
- package/lib/cloudflare/bundle/plugin-node-compat.d.ts.map +1 -0
- package/lib/cloudflare/bundle/plugin-node-compat.js +93 -0
- package/lib/cloudflare/bundle/plugin-node-compat.js.map +1 -0
- package/lib/cloudflare/bundle/plugin-wasm.d.ts.map +1 -1
- package/lib/cloudflare/bundle/plugin-wasm.js +20 -11
- package/lib/cloudflare/bundle/plugin-wasm.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/d1-local-migrations.js.map +1 -1
- package/lib/cloudflare/durable-object-namespace.d.ts +1 -0
- package/lib/cloudflare/durable-object-namespace.d.ts.map +1 -1
- package/lib/cloudflare/durable-object-namespace.js.map +1 -1
- package/lib/cloudflare/hyperdrive.d.ts +7 -2
- package/lib/cloudflare/hyperdrive.d.ts.map +1 -1
- package/lib/cloudflare/hyperdrive.js +39 -57
- package/lib/cloudflare/hyperdrive.js.map +1 -1
- package/lib/cloudflare/index.d.ts +1 -0
- package/lib/cloudflare/index.d.ts.map +1 -1
- package/lib/cloudflare/index.js +1 -0
- package/lib/cloudflare/index.js.map +1 -1
- package/lib/cloudflare/next.d.ts +13 -0
- package/lib/cloudflare/next.d.ts.map +1 -0
- package/lib/cloudflare/next.js +91 -0
- package/lib/cloudflare/next.js.map +1 -0
- package/lib/cloudflare/website.d.ts.map +1 -1
- package/lib/cloudflare/website.js +80 -82
- package/lib/cloudflare/website.js.map +1 -1
- package/lib/cloudflare/worker-assets.d.ts +3 -3
- package/lib/cloudflare/worker-assets.d.ts.map +1 -1
- package/lib/cloudflare/worker-assets.js +22 -47
- package/lib/cloudflare/worker-assets.js.map +1 -1
- package/lib/cloudflare/worker-bundle.d.ts +6 -0
- package/lib/cloudflare/worker-bundle.d.ts.map +1 -1
- package/lib/cloudflare/worker-bundle.js +34 -10
- package/lib/cloudflare/worker-bundle.js.map +1 -1
- package/lib/cloudflare/worker-metadata.d.ts.map +1 -1
- package/lib/cloudflare/worker-metadata.js +1 -0
- package/lib/cloudflare/worker-metadata.js.map +1 -1
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +24 -6
- package/lib/cloudflare/worker.js.map +1 -1
- package/lib/cloudflare/wrangler.json.d.ts +4 -6
- package/lib/cloudflare/wrangler.json.d.ts.map +1 -1
- package/lib/cloudflare/wrangler.json.js +20 -15
- package/lib/cloudflare/wrangler.json.js.map +1 -1
- package/lib/context.d.ts +3 -1
- package/lib/context.d.ts.map +1 -1
- package/lib/context.js +2 -2
- package/lib/context.js.map +1 -1
- package/lib/destroy.d.ts +8 -0
- package/lib/destroy.d.ts.map +1 -1
- package/lib/destroy.js +20 -4
- package/lib/destroy.js.map +1 -1
- package/lib/planetscale/api/client.gen.d.ts +1750 -0
- package/lib/planetscale/api/client.gen.d.ts.map +1 -0
- package/lib/planetscale/api/client.gen.js +2401 -0
- package/lib/planetscale/api/client.gen.js.map +1 -0
- package/lib/planetscale/api/index.d.ts +3 -0
- package/lib/planetscale/api/index.d.ts.map +1 -0
- package/lib/planetscale/api/index.js +4 -0
- package/lib/planetscale/api/index.js.map +1 -0
- package/lib/planetscale/api/types.gen.d.ts +12156 -0
- package/lib/planetscale/api/types.gen.d.ts.map +1 -0
- package/lib/planetscale/api/types.gen.js +2 -0
- package/lib/planetscale/api/types.gen.js.map +1 -0
- package/lib/planetscale/branch.d.ts +5 -8
- package/lib/planetscale/branch.d.ts.map +1 -1
- package/lib/planetscale/branch.js +122 -97
- package/lib/planetscale/branch.js.map +1 -1
- package/lib/planetscale/database.d.ts +24 -11
- package/lib/planetscale/database.d.ts.map +1 -1
- package/lib/planetscale/database.js +163 -118
- package/lib/planetscale/database.js.map +1 -1
- package/lib/planetscale/index.d.ts +2 -1
- package/lib/planetscale/index.d.ts.map +1 -1
- package/lib/planetscale/index.js +2 -1
- package/lib/planetscale/index.js.map +1 -1
- package/lib/planetscale/password.d.ts +7 -8
- package/lib/planetscale/password.d.ts.map +1 -1
- package/lib/planetscale/password.js +74 -57
- package/lib/planetscale/password.js.map +1 -1
- package/lib/planetscale/role.d.ts +126 -0
- package/lib/planetscale/role.d.ts.map +1 -0
- package/lib/planetscale/role.js +144 -0
- package/lib/planetscale/role.js.map +1 -0
- package/lib/planetscale/utils.d.ts +23 -7
- package/lib/planetscale/utils.d.ts.map +1 -1
- package/lib/planetscale/utils.js +169 -75
- package/lib/planetscale/utils.js.map +1 -1
- package/lib/scope.d.ts +5 -1
- package/lib/scope.d.ts.map +1 -1
- package/lib/scope.js +11 -3
- package/lib/scope.js.map +1 -1
- package/lib/secret.d.ts +0 -3
- package/lib/secret.d.ts.map +1 -1
- package/lib/secret.js +0 -2
- package/lib/secret.js.map +1 -1
- package/lib/state/cloudflare-state-store.js +3 -3
- package/lib/state/cloudflare-state-store.js.map +1 -1
- package/lib/test/bun.d.ts +2 -2
- package/lib/test/bun.d.ts.map +1 -1
- package/lib/test/vitest.d.ts +2 -2
- package/lib/test/vitest.d.ts.map +1 -1
- package/lib/test/vitest.js +4 -4
- package/lib/test/vitest.js.map +1 -1
- package/lib/util/content-type.js +2 -2
- package/lib/util/content-type.js.map +1 -1
- package/lib/util/dedent.d.ts +3 -14
- package/lib/util/dedent.d.ts.map +1 -1
- package/lib/util/dedent.js +33 -45
- package/lib/util/dedent.js.map +1 -1
- package/lib/util/memoize.d.ts.map +1 -1
- package/lib/util/memoize.js +11 -1
- package/lib/util/memoize.js.map +1 -1
- package/package.json +8 -3
- package/src/alchemy.ts +14 -6
- package/src/apply.ts +13 -1
- package/src/cloudflare/bindings.ts +3 -1
- package/src/cloudflare/bucket.ts +3 -1
- package/src/cloudflare/bundle/cloudflare-internal.ts +42 -0
- package/src/cloudflare/bundle/nodejs-builtin-modules.ts +14 -0
- package/src/cloudflare/bundle/plugin-als-external.ts +13 -0
- package/src/cloudflare/bundle/plugin-hybrid-node-compat.ts +29 -28
- package/src/cloudflare/bundle/plugin-node-compat.ts +114 -0
- package/src/cloudflare/bundle/plugin-wasm.ts +34 -14
- package/src/cloudflare/compatibility-date.gen.ts +1 -1
- package/src/cloudflare/d1-local-migrations.ts +2 -2
- package/src/cloudflare/durable-object-namespace.ts +1 -0
- package/src/cloudflare/hyperdrive.ts +136 -95
- package/src/cloudflare/index.ts +1 -0
- package/src/cloudflare/next.ts +123 -0
- package/src/cloudflare/website.ts +88 -89
- package/src/cloudflare/worker-assets.ts +43 -105
- package/src/cloudflare/worker-bundle.ts +46 -9
- package/src/cloudflare/worker-metadata.ts +2 -0
- package/src/cloudflare/worker.ts +35 -7
- package/src/cloudflare/wrangler.json.ts +114 -113
- package/src/context.ts +5 -3
- package/src/destroy.ts +26 -8
- package/src/planetscale/api/client.gen.ts +2882 -0
- package/src/planetscale/api/index.ts +4 -0
- package/src/planetscale/api/types.gen.ts +13041 -0
- package/src/planetscale/branch.ts +170 -162
- package/src/planetscale/database.ts +263 -243
- package/src/planetscale/index.ts +2 -1
- package/src/planetscale/password.ts +89 -86
- package/src/planetscale/role.ts +278 -0
- package/src/planetscale/utils.ts +289 -128
- package/src/scope.ts +12 -3
- package/src/secret.ts +0 -4
- package/src/state/cloudflare-state-store.ts +4 -4
- package/src/test/bun.ts +2 -2
- package/src/test/vitest.ts +6 -6
- package/src/util/content-type.ts +2 -2
- package/src/util/dedent.ts +34 -50
- package/src/util/memoize.ts +13 -1
- package/templates/astro/alchemy.run.ts +1 -3
- package/templates/hono/alchemy.run.ts +0 -1
- package/templates/nextjs/README.md +85 -0
- package/templates/nextjs/_env +1 -0
- package/templates/nextjs/_env.example +1 -0
- package/templates/nextjs/_gitignore +46 -0
- package/templates/nextjs/alchemy.run.ts +16 -0
- package/templates/nextjs/eslint.config.mjs +16 -0
- package/templates/nextjs/next-env.d.ts +5 -0
- package/templates/nextjs/next.config.ts +10 -0
- package/templates/nextjs/open-next.config.ts +5 -0
- package/templates/nextjs/package.json +31 -0
- package/templates/nextjs/src/app/api/hello/route.ts +19 -0
- package/templates/nextjs/src/app/favicon.ico +0 -0
- package/templates/nextjs/src/app/globals.css +72 -0
- package/templates/nextjs/src/app/layout.tsx +19 -0
- package/templates/nextjs/src/app/page.tsx +55 -0
- package/templates/nextjs/tsconfig.json +33 -0
- package/templates/nextjs/types/env.d.ts +14 -0
- package/templates/nuxt/alchemy.run.ts +1 -3
- package/templates/react-router/alchemy.run.ts +1 -3
- package/templates/rwsdk/alchemy.run.ts +0 -2
- package/templates/sveltekit/alchemy.run.ts +1 -3
- package/templates/tanstack-start/alchemy.run.ts +1 -3
- package/templates/typescript/alchemy.run.ts +0 -1
- package/templates/vite/alchemy.run.ts +0 -1
- package/workers/cloudflare-state-store.js +58 -58
- package/lib/cloudflare/bundle/externals.d.ts +0 -3
- package/lib/cloudflare/bundle/externals.d.ts.map +0 -1
- package/lib/cloudflare/bundle/externals.js +0 -35
- package/lib/cloudflare/bundle/externals.js.map +0 -1
- package/lib/cloudflare/bundle/plugin-compat-warning.d.ts +0 -10
- package/lib/cloudflare/bundle/plugin-compat-warning.d.ts.map +0 -1
- package/lib/cloudflare/bundle/plugin-compat-warning.js +0 -67
- package/lib/cloudflare/bundle/plugin-compat-warning.js.map +0 -1
- package/lib/planetscale/api.d.ts +0 -53
- package/lib/planetscale/api.d.ts.map +0 -1
- package/lib/planetscale/api.js +0 -84
- package/lib/planetscale/api.js.map +0 -1
- package/src/cloudflare/bundle/externals.ts +0 -36
- package/src/cloudflare/bundle/plugin-compat-warning.ts +0 -94
- package/src/planetscale/api.ts +0 -115
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import assert from "node:assert";
|
|
2
2
|
import fs from "node:fs/promises";
|
|
3
3
|
import path from "node:path";
|
|
4
|
-
import { alchemy } from "../alchemy.js";
|
|
5
4
|
import { Exec } from "../os/index.js";
|
|
6
5
|
import { Scope } from "../scope.js";
|
|
7
6
|
import { isSecret } from "../secret.js";
|
|
@@ -83,92 +82,91 @@ export async function Website(id, props) {
|
|
|
83
82
|
},
|
|
84
83
|
entrypoint: path.relative(paths.cwd, paths.entrypoint),
|
|
85
84
|
};
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
85
|
+
if (!workerProps.entrypoint) {
|
|
86
|
+
await fs.mkdir(path.dirname(paths.entrypoint), { recursive: true });
|
|
87
|
+
const content = script ??
|
|
88
|
+
dedent `
|
|
89
|
+
export default {
|
|
90
|
+
async fetch(request, env) {
|
|
91
|
+
return new Response("Not Found", { status: 404 });
|
|
92
|
+
},
|
|
93
|
+
};`;
|
|
94
|
+
await fs.writeFile(paths.entrypoint, content);
|
|
95
|
+
}
|
|
96
|
+
await writeMiniflareSymlink(paths.cwd);
|
|
97
|
+
await WranglerJson({
|
|
98
|
+
path: path.relative(paths.cwd, paths.wrangler.path),
|
|
99
|
+
worker,
|
|
100
|
+
assets: {
|
|
101
|
+
binding: "ASSETS",
|
|
102
|
+
directory: path.relative(paths.cwd, paths.assets),
|
|
103
|
+
},
|
|
104
|
+
main: path.relative(paths.cwd, paths.wrangler.main),
|
|
105
|
+
secrets,
|
|
106
|
+
transform: {
|
|
107
|
+
wrangler: props.wrangler?.transform,
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
const scope = Scope.current;
|
|
111
|
+
if (build && !scope.local) {
|
|
112
|
+
await Exec(`${id}-build`, {
|
|
113
|
+
cwd: path.relative(process.cwd(), paths.cwd),
|
|
114
|
+
command: build.command,
|
|
115
|
+
env: {
|
|
116
|
+
...env,
|
|
117
|
+
...(typeof build === "object" ? build.env : {}),
|
|
118
|
+
NODE_ENV: "production",
|
|
110
119
|
},
|
|
120
|
+
memoize: typeof build === "object" ? build.memoize : undefined,
|
|
111
121
|
});
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
const match = line
|
|
132
|
-
.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "")
|
|
133
|
-
.match(URL_REGEX);
|
|
134
|
-
if (match) {
|
|
135
|
-
return match[0];
|
|
122
|
+
}
|
|
123
|
+
let url;
|
|
124
|
+
if (dev && scope.local) {
|
|
125
|
+
url = await scope.spawn(name, {
|
|
126
|
+
cmd: typeof dev === "string" ? dev : dev.command,
|
|
127
|
+
cwd: paths.cwd,
|
|
128
|
+
extract: (line) => {
|
|
129
|
+
const URL_REGEX = /http:\/\/(localhost|0\.0\.0\.0|127\.0\.0\.1|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}):\d+\/?/;
|
|
130
|
+
const match = line
|
|
131
|
+
.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "")
|
|
132
|
+
.match(URL_REGEX);
|
|
133
|
+
if (match) {
|
|
134
|
+
return match[0];
|
|
135
|
+
}
|
|
136
|
+
},
|
|
137
|
+
env: {
|
|
138
|
+
...Object.fromEntries(Object.entries(env ?? {}).flatMap(([key, value]) => {
|
|
139
|
+
if (isSecret(value)) {
|
|
140
|
+
return [[key, value.unencrypted]];
|
|
136
141
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
...Object.fromEntries(Object.entries(env ?? {}).flatMap(([key, value]) => {
|
|
140
|
-
if (isSecret(value)) {
|
|
141
|
-
return [[key, value.unencrypted]];
|
|
142
|
-
}
|
|
143
|
-
if (typeof value === "string") {
|
|
144
|
-
return [[key, value]];
|
|
145
|
-
}
|
|
146
|
-
return [];
|
|
147
|
-
})),
|
|
148
|
-
...(typeof dev === "object" ? dev.env : {}),
|
|
149
|
-
FORCE_COLOR: "1",
|
|
150
|
-
...process.env,
|
|
151
|
-
// NOTE: we must set this to ensure the user does not accidentally set `NODE_ENV=production`
|
|
152
|
-
// which breaks `vite dev` (it won't, for example, re-write `process.env.TSS_APP_BASE` in the `.js` client side bundle)
|
|
153
|
-
NODE_ENV: "development",
|
|
154
|
-
},
|
|
155
|
-
});
|
|
156
|
-
}
|
|
157
|
-
return (await Worker("worker", {
|
|
158
|
-
...worker,
|
|
159
|
-
bindings: {
|
|
160
|
-
...worker.bindings,
|
|
161
|
-
...(!scope.local
|
|
162
|
-
? {
|
|
163
|
-
ASSETS: await Assets("assets", {
|
|
164
|
-
path: path.relative(process.cwd(), paths.assets),
|
|
165
|
-
}),
|
|
142
|
+
if (typeof value === "string") {
|
|
143
|
+
return [[key, value]];
|
|
166
144
|
}
|
|
167
|
-
|
|
145
|
+
return [];
|
|
146
|
+
})),
|
|
147
|
+
...(typeof dev === "object" ? dev.env : {}),
|
|
148
|
+
FORCE_COLOR: "1",
|
|
149
|
+
...process.env,
|
|
150
|
+
// NOTE: we must set this to ensure the user does not accidentally set `NODE_ENV=production`
|
|
151
|
+
// which breaks `vite dev` (it won't, for example, re-write `process.env.TSS_APP_BASE` in the `.js` client side bundle)
|
|
152
|
+
NODE_ENV: "development",
|
|
168
153
|
},
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
return (await Worker(id, {
|
|
157
|
+
...worker,
|
|
158
|
+
bindings: {
|
|
159
|
+
...worker.bindings,
|
|
160
|
+
...(!scope.local
|
|
161
|
+
? {
|
|
162
|
+
ASSETS: await Assets("assets", {
|
|
163
|
+
path: path.relative(process.cwd(), paths.assets),
|
|
164
|
+
}),
|
|
165
|
+
}
|
|
166
|
+
: {}),
|
|
167
|
+
},
|
|
168
|
+
dev: url ? { url } : undefined,
|
|
169
|
+
}));
|
|
172
170
|
}
|
|
173
171
|
async function writeMiniflareSymlink(cwd) {
|
|
174
172
|
const target = path.resolve(DEFAULT_PERSIST_PATH);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { CloudflareApi } from "./api.ts";
|
|
2
|
-
import type { Assets } from "./assets.ts";
|
|
2
|
+
import type { AssetFile, Assets } from "./assets.ts";
|
|
3
3
|
import type { AssetsConfig, WorkerProps } from "./worker.ts";
|
|
4
4
|
export interface AssetUploadResult {
|
|
5
5
|
completionToken: string;
|
|
@@ -35,11 +35,11 @@ export declare function createAssetConfig(config?: AssetsConfig): AssetsConfig;
|
|
|
35
35
|
* Prepares the asset manifest for the assets upload session
|
|
36
36
|
*
|
|
37
37
|
* @param assets Assets resource containing files to upload
|
|
38
|
-
* @returns Asset manifest and
|
|
38
|
+
* @returns Asset manifest and files by hash
|
|
39
39
|
*/
|
|
40
40
|
export declare function prepareAssetManifest(assets: Assets): Promise<{
|
|
41
41
|
manifest: Record<string, FileMetadata>;
|
|
42
|
-
|
|
42
|
+
filesByHash: Map<string, AssetFile>;
|
|
43
43
|
}>;
|
|
44
44
|
/**
|
|
45
45
|
* Calculate the SHA-256 hash and size of a file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-assets.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-assets.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-assets.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-assets.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE7D,MAAM,WAAW,iBAAiB;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,YAAY,CAAC;CAC5B;AAED;;GAEG;AACH,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,aAAa,EAClB,EACE,UAAU,EACV,MAAM,EACN,WAAW,EACX,SAAS,GACV,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GACA,OAAO,CAAC,iBAAiB,CAAC,CAoD5B;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,YAAY,CA4BrE;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM;;;GAYxD;AAqCD;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAmBzC"}
|
|
@@ -2,8 +2,8 @@ import crypto from "node:crypto";
|
|
|
2
2
|
import fs from "node:fs/promises";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { AsyncQueue } from "../util/async-queue.js";
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
5
|
+
import { withExponentialBackoff } from "../util/retry.js";
|
|
6
|
+
import { extractCloudflareResult } from "./api-response.js";
|
|
7
7
|
/**
|
|
8
8
|
* Uploads assets to Cloudflare and returns a completion token
|
|
9
9
|
*
|
|
@@ -16,38 +16,24 @@ import { CloudflareApiError } from "./api-error.js";
|
|
|
16
16
|
export async function uploadAssets(api, { workerName, assets, assetConfig, namespace, }) {
|
|
17
17
|
// Process the assets configuration once at the beginning
|
|
18
18
|
const processedConfig = createAssetConfig(assetConfig);
|
|
19
|
-
const { manifest,
|
|
19
|
+
const { manifest, filesByHash } = await prepareAssetManifest(assets);
|
|
20
20
|
// Start the upload session
|
|
21
|
-
const
|
|
21
|
+
const uploadSession = await extractCloudflareResult(`create assets upload session for worker "${workerName}"`, api.post(namespace
|
|
22
22
|
? `/accounts/${api.accountId}/workers/dispatch/namespaces/${namespace}/scripts/${workerName}/assets-upload-session`
|
|
23
|
-
: `/accounts/${api.accountId}/workers/scripts/${workerName}/assets-upload-session`,
|
|
24
|
-
headers: { "Content-Type": "application/json" },
|
|
25
|
-
});
|
|
26
|
-
if (!uploadSessionResponse.ok) {
|
|
27
|
-
throw new Error(`Failed to start assets upload session: ${uploadSessionResponse.status} ${uploadSessionResponse.statusText} - ${await uploadSessionResponse.text()}`);
|
|
28
|
-
}
|
|
29
|
-
const sessionData = (await uploadSessionResponse.json());
|
|
30
|
-
if (!sessionData?.success) {
|
|
31
|
-
if (sessionData?.errors) {
|
|
32
|
-
throw new CloudflareApiError(`Failed to start assets upload session:\n${sessionData.errors
|
|
33
|
-
.map((error) => `- ${error.code}: ${error.message}`)
|
|
34
|
-
.join("\n")}`, uploadSessionResponse);
|
|
35
|
-
}
|
|
36
|
-
throw new CloudflareApiError(`Failed to start assets upload session: ${uploadSessionResponse.statusText}`, uploadSessionResponse);
|
|
37
|
-
}
|
|
23
|
+
: `/accounts/${api.accountId}/workers/scripts/${workerName}/assets-upload-session`, { manifest }));
|
|
38
24
|
// If there are no buckets, assets are already uploaded or empty
|
|
39
|
-
if (!
|
|
25
|
+
if (!uploadSession.buckets || uploadSession.buckets.length === 0) {
|
|
40
26
|
return {
|
|
41
|
-
completionToken:
|
|
27
|
+
completionToken: uploadSession.jwt,
|
|
42
28
|
assetConfig: processedConfig,
|
|
43
29
|
};
|
|
44
30
|
}
|
|
45
31
|
// Upload the files in batches as specified by the API
|
|
46
|
-
let completionToken =
|
|
47
|
-
const buckets =
|
|
32
|
+
let completionToken = uploadSession.jwt;
|
|
33
|
+
const buckets = uploadSession.buckets;
|
|
48
34
|
const queue = new AsyncQueue(3);
|
|
49
35
|
await Promise.all(buckets.map((bucket) => queue.add(async () => {
|
|
50
|
-
const jwt = await uploadBucket(api,
|
|
36
|
+
const jwt = await withExponentialBackoff(async () => await uploadBucket(api, uploadSession.jwt, bucket, filesByHash), () => true);
|
|
51
37
|
if (jwt) {
|
|
52
38
|
completionToken = jwt;
|
|
53
39
|
}
|
|
@@ -88,49 +74,38 @@ export function createAssetConfig(config) {
|
|
|
88
74
|
* Prepares the asset manifest for the assets upload session
|
|
89
75
|
*
|
|
90
76
|
* @param assets Assets resource containing files to upload
|
|
91
|
-
* @returns Asset manifest and
|
|
77
|
+
* @returns Asset manifest and files by hash
|
|
92
78
|
*/
|
|
93
79
|
export async function prepareAssetManifest(assets) {
|
|
94
80
|
const manifest = {};
|
|
95
|
-
const
|
|
81
|
+
const filesByHash = new Map();
|
|
96
82
|
await Promise.all(assets.files.map(async (file) => {
|
|
97
83
|
const { hash, size } = await calculateFileMetadata(file.filePath);
|
|
98
84
|
const key = file.path.startsWith("/") ? file.path : `/${file.path}`;
|
|
99
85
|
manifest[key] = { hash, size };
|
|
100
|
-
|
|
86
|
+
filesByHash.set(hash, file);
|
|
101
87
|
}));
|
|
102
|
-
return { manifest,
|
|
88
|
+
return { manifest, filesByHash };
|
|
103
89
|
}
|
|
104
|
-
async function uploadBucket(api, jwt, bucket,
|
|
90
|
+
async function uploadBucket(api, jwt, bucket, filesByHash) {
|
|
105
91
|
const formData = new FormData();
|
|
106
92
|
await Promise.all(bucket.map(async (fileHash) => {
|
|
107
|
-
const
|
|
108
|
-
if (!
|
|
93
|
+
const file = filesByHash.get(fileHash);
|
|
94
|
+
if (!file) {
|
|
109
95
|
throw new Error(`Could not find file with hash ${fileHash}`);
|
|
110
96
|
}
|
|
111
|
-
const fileContent = await fs.readFile(filePath);
|
|
97
|
+
const fileContent = await fs.readFile(file.filePath);
|
|
112
98
|
const blob = new Blob([fileContent.toString("base64")], {
|
|
113
|
-
type:
|
|
99
|
+
type: file.contentType,
|
|
114
100
|
});
|
|
115
101
|
formData.append(fileHash, blob, fileHash);
|
|
116
102
|
}));
|
|
117
|
-
const
|
|
103
|
+
const uploadResult = await extractCloudflareResult("upload asset files", api.post(`/accounts/${api.accountId}/workers/assets/upload?base64=true`, formData, {
|
|
118
104
|
headers: {
|
|
119
105
|
Authorization: `Bearer ${jwt}`,
|
|
120
|
-
"Content-Type": "multipart/form-data",
|
|
121
106
|
},
|
|
122
|
-
});
|
|
123
|
-
|
|
124
|
-
throw new Error(`Failed to upload asset files: ${uploadResponse.status} ${uploadResponse.statusText}`);
|
|
125
|
-
}
|
|
126
|
-
const uploadData = (await uploadResponse.json());
|
|
127
|
-
if (!uploadData.success) {
|
|
128
|
-
const error = uploadData.errors[0];
|
|
129
|
-
const message = error.message;
|
|
130
|
-
const code = error.code;
|
|
131
|
-
throw new Error(`Failed to upload asset files: ${message} (Code: ${code})`);
|
|
132
|
-
}
|
|
133
|
-
return uploadData.result.jwt;
|
|
107
|
+
}));
|
|
108
|
+
return uploadResult.jwt;
|
|
134
109
|
}
|
|
135
110
|
/**
|
|
136
111
|
* Calculate the SHA-256 hash and size of a file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-assets.js","sourceRoot":"","sources":["../../src/cloudflare/worker-assets.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"worker-assets.js","sourceRoot":"","sources":["../../src/cloudflare/worker-assets.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,6 +68,8 @@ export declare namespace WorkerBundleSource {
|
|
|
68
68
|
entrypoint: string;
|
|
69
69
|
cwd: string;
|
|
70
70
|
outdir: string;
|
|
71
|
+
compatibilityDate: string;
|
|
72
|
+
compatibilityFlags: string[];
|
|
71
73
|
}
|
|
72
74
|
class ESBuild implements WorkerBundleSource {
|
|
73
75
|
private props;
|
|
@@ -76,6 +78,10 @@ export declare namespace WorkerBundleSource {
|
|
|
76
78
|
watch(signal: AbortSignal): AsyncIterable<WorkerBundle>;
|
|
77
79
|
delete(): Promise<void>;
|
|
78
80
|
private buildOptions;
|
|
81
|
+
/**
|
|
82
|
+
* Returns the list of ESBuild plugins to use for a given compat mode.
|
|
83
|
+
*/
|
|
84
|
+
private getNodeJSCompatPlugins;
|
|
79
85
|
private formatBuildOutput;
|
|
80
86
|
}
|
|
81
87
|
}
|
|
@@ -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;AAE9B,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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"}
|
|
@@ -4,11 +4,12 @@ import { err, ok } from "neverthrow";
|
|
|
4
4
|
import fs from "node:fs/promises";
|
|
5
5
|
import path from "pathe";
|
|
6
6
|
import { logger } from "../util/logger.js";
|
|
7
|
-
import {
|
|
7
|
+
import { cloudflareInternalPlugin } from "./bundle/cloudflare-internal.js";
|
|
8
8
|
import { esbuildPluginAlias } from "./bundle/plugin-alias.js";
|
|
9
|
-
import {
|
|
9
|
+
import { esbuildPluginAsyncLocalStorage } from "./bundle/plugin-als-external.js";
|
|
10
10
|
import { createHotReloadPlugin } from "./bundle/plugin-hot-reload.js";
|
|
11
11
|
import { esbuildPluginHybridNodeCompat } from "./bundle/plugin-hybrid-node-compat.js";
|
|
12
|
+
import { esbuildPluginNodeCompatImports } from "./bundle/plugin-node-compat.js";
|
|
12
13
|
import { createWasmPlugin } from "./bundle/plugin-wasm.js";
|
|
13
14
|
import { validateNodeCompat } from "./bundle/validate-node-compat.js";
|
|
14
15
|
export function normalizeWorkerBundle(props) {
|
|
@@ -44,6 +45,8 @@ export function normalizeWorkerBundle(props) {
|
|
|
44
45
|
cwd: props.cwd,
|
|
45
46
|
outdir: props.outdir,
|
|
46
47
|
sourcemap: props.sourceMap !== false ? true : undefined,
|
|
48
|
+
compatibilityDate: props.compatibilityDate,
|
|
49
|
+
compatibilityFlags: props.compatibilityFlags,
|
|
47
50
|
...props.bundle,
|
|
48
51
|
}));
|
|
49
52
|
});
|
|
@@ -226,7 +229,7 @@ export var WorkerBundleSource;
|
|
|
226
229
|
});
|
|
227
230
|
}
|
|
228
231
|
buildOptions(additionalPlugins) {
|
|
229
|
-
const { id: _, entrypoint, nodeCompat, cwd, format, ...props } = this.props;
|
|
232
|
+
const { id: _, entrypoint, nodeCompat, cwd, format, compatibilityDate: _compatibilityDate, compatibilityFlags: _compatibilityFlags, ...props } = this.props;
|
|
230
233
|
return {
|
|
231
234
|
entryPoints: [entrypoint],
|
|
232
235
|
absWorkingDir: cwd,
|
|
@@ -253,18 +256,39 @@ export var WorkerBundleSource;
|
|
|
253
256
|
conditions: props.conditions ?? ["workerd", "worker", "browser"],
|
|
254
257
|
plugins: [
|
|
255
258
|
esbuildPluginAlias(props.alias ?? {}, this.props.cwd),
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
:
|
|
259
|
+
cloudflareInternalPlugin,
|
|
260
|
+
...this.getNodeJSCompatPlugins({
|
|
261
|
+
mode: nodeCompat,
|
|
262
|
+
compatibilityDate: this.props.compatibilityDate,
|
|
263
|
+
compatibilityFlags: this.props.compatibilityFlags,
|
|
264
|
+
}),
|
|
259
265
|
...(props.plugins ?? []),
|
|
260
266
|
...additionalPlugins,
|
|
261
267
|
],
|
|
262
|
-
external: [
|
|
263
|
-
...(nodeCompat === "als" ? external_als : external),
|
|
264
|
-
...(props.external ?? []),
|
|
265
|
-
],
|
|
268
|
+
external: [...(props.external ?? [])],
|
|
266
269
|
};
|
|
267
270
|
}
|
|
271
|
+
/**
|
|
272
|
+
* Returns the list of ESBuild plugins to use for a given compat mode.
|
|
273
|
+
*/
|
|
274
|
+
getNodeJSCompatPlugins({ mode, compatibilityDate, compatibilityFlags, }) {
|
|
275
|
+
switch (mode) {
|
|
276
|
+
case "als":
|
|
277
|
+
return [
|
|
278
|
+
esbuildPluginAsyncLocalStorage,
|
|
279
|
+
esbuildPluginNodeCompatImports(mode),
|
|
280
|
+
];
|
|
281
|
+
case "v2":
|
|
282
|
+
return [
|
|
283
|
+
esbuildPluginHybridNodeCompat({
|
|
284
|
+
compatibilityDate,
|
|
285
|
+
compatibilityFlags,
|
|
286
|
+
}),
|
|
287
|
+
];
|
|
288
|
+
case null:
|
|
289
|
+
return [esbuildPluginNodeCompatImports(mode)];
|
|
290
|
+
}
|
|
291
|
+
}
|
|
268
292
|
async formatBuildOutput(metafile) {
|
|
269
293
|
const outdir = path.resolve(this.props.cwd, this.props.outdir);
|
|
270
294
|
await fs.writeFile(path.join(outdir, "metafile.json"), JSON.stringify(metafile, null, 2));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-bundle.js","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"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"}
|
|
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-metadata.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-metadata.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"worker-metadata.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -207,6 +207,7 @@ export async function prepareWorkerMetadata(api, props) {
|
|
|
207
207
|
type: "r2_bucket",
|
|
208
208
|
name: bindingName,
|
|
209
209
|
bucket_name: binding.name,
|
|
210
|
+
jurisdiction: binding.jurisdiction === "default" ? undefined : binding.jurisdiction,
|
|
210
211
|
});
|
|
211
212
|
}
|
|
212
213
|
else if (binding.type === "secrets_store_secret") {
|