alchemy 0.93.2 → 0.93.4
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 +57 -57
- package/lib/cloudflare/bucket.d.ts.map +1 -1
- package/lib/cloudflare/bucket.js +3 -1
- package/lib/cloudflare/bucket.js.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-controller.d.ts +2 -0
- package/lib/cloudflare/miniflare/miniflare-controller.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-controller.js +28 -9
- package/lib/cloudflare/miniflare/miniflare-controller.js.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.js +4 -2
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.js.map +1 -1
- package/lib/cloudflare/miniflare/tunnel.d.ts +1 -1
- package/lib/cloudflare/miniflare/tunnel.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/tunnel.js +2 -2
- package/lib/cloudflare/miniflare/tunnel.js.map +1 -1
- package/package.json +68 -68
- package/src/cloudflare/bucket.ts +1 -0
- package/src/cloudflare/miniflare/miniflare-controller.ts +28 -8
- package/src/cloudflare/miniflare/miniflare-worker-proxy.ts +5 -3
- package/src/cloudflare/miniflare/tunnel.ts +2 -2
- package/workers/tunnel-proxy.js +1 -1
package/bin/alchemy.js
CHANGED
|
@@ -37053,25 +37053,16 @@ var FileSystemStateStore = class {
|
|
|
37053
37053
|
//#endregion
|
|
37054
37054
|
//#region package.json
|
|
37055
37055
|
var name = "alchemy";
|
|
37056
|
-
var version = "0.93.
|
|
37056
|
+
var version = "0.93.4";
|
|
37057
|
+
var homepage = "https://alchemy.run";
|
|
37057
37058
|
var license = "Apache-2.0";
|
|
37058
37059
|
var author = "Sam Goodwin <sam@alchemy.run>";
|
|
37059
|
-
var homepage = "https://alchemy.run";
|
|
37060
37060
|
var repository = {
|
|
37061
37061
|
"type": "git",
|
|
37062
37062
|
"url": "git+https://github.com/alchemy-run/alchemy.git",
|
|
37063
37063
|
"directory": "alchemy"
|
|
37064
37064
|
};
|
|
37065
|
-
var type = "module";
|
|
37066
|
-
var module$1 = "./lib/index.js";
|
|
37067
37065
|
var bin = { "alchemy": "bin/alchemy.js" };
|
|
37068
|
-
var scripts = {
|
|
37069
|
-
"build": "rm -rf ./*.tsbuildinfo && rm -rf ./lib && tsc -b && tsdown",
|
|
37070
|
-
"dev": "tsdown --watch",
|
|
37071
|
-
"drizzle:generate": "bun run scripts/drizzle-generate.ts",
|
|
37072
|
-
"postbuild": "(cpy '**/*.d.ts' ../lib --cwd=src || true) && (cpy '**/*.txt' ../lib --cwd=src || true)",
|
|
37073
|
-
"publish:npm": "cp ../README.md . && bun run build && tsdown && bun publish && rm README.md"
|
|
37074
|
-
};
|
|
37075
37066
|
var files = [
|
|
37076
37067
|
"bin",
|
|
37077
37068
|
"drizzle/default",
|
|
@@ -37080,6 +37071,8 @@ var files = [
|
|
|
37080
37071
|
"templates",
|
|
37081
37072
|
"workers"
|
|
37082
37073
|
];
|
|
37074
|
+
var type = "module";
|
|
37075
|
+
var module$1 = "./lib/index.js";
|
|
37083
37076
|
var exports$1 = {
|
|
37084
37077
|
".": {
|
|
37085
37078
|
"bun": "./src/index.ts",
|
|
@@ -37227,6 +37220,13 @@ var exports$1 = {
|
|
|
37227
37220
|
"import": "./lib/vercel/index.js"
|
|
37228
37221
|
}
|
|
37229
37222
|
};
|
|
37223
|
+
var scripts = {
|
|
37224
|
+
"build": "rm -rf ./*.tsbuildinfo && rm -rf ./lib && tsc -b && tsdown",
|
|
37225
|
+
"dev": "tsdown --watch",
|
|
37226
|
+
"drizzle:generate": "bun run scripts/drizzle-generate.ts",
|
|
37227
|
+
"postbuild": "(cpy '**/*.d.ts' ../lib --cwd=src || true) && (cpy '**/*.txt' ../lib --cwd=src || true)",
|
|
37228
|
+
"publish:npm": "cp ../README.md . && bun run build && tsdown && bun publish && rm README.md"
|
|
37229
|
+
};
|
|
37230
37230
|
var dependencies = {
|
|
37231
37231
|
"@aws-sdk/credential-providers": "^3.0.0",
|
|
37232
37232
|
"@cloudflare/unenv-preset": "2.7.7",
|
|
@@ -37246,7 +37246,7 @@ var dependencies = {
|
|
|
37246
37246
|
"glob": "^10.0.0",
|
|
37247
37247
|
"jszip": "^3.0.0",
|
|
37248
37248
|
"libsodium-wrappers": "^0.8.0",
|
|
37249
|
-
"miniflare": "4.
|
|
37249
|
+
"miniflare": "4.20260424.0",
|
|
37250
37250
|
"neverthrow": "^8.2.0",
|
|
37251
37251
|
"open": "^10.1.2",
|
|
37252
37252
|
"openapi-types": "^12.1.3",
|
|
@@ -37255,48 +37255,10 @@ var dependencies = {
|
|
|
37255
37255
|
"proper-lockfile": "^4.1.2",
|
|
37256
37256
|
"signal-exit": "^4.1.0",
|
|
37257
37257
|
"unenv": "2.0.0-rc.21",
|
|
37258
|
+
"wrangler": "catalog:",
|
|
37258
37259
|
"ws": "^8.18.3",
|
|
37259
37260
|
"yaml": "^2.0.0"
|
|
37260
37261
|
};
|
|
37261
|
-
var peerDependencies = {
|
|
37262
|
-
"@astrojs/cloudflare": "^12.6.4",
|
|
37263
|
-
"@aws-sdk/client-dynamodb": "^3.0.0",
|
|
37264
|
-
"@aws-sdk/client-iam": "^3.0.0",
|
|
37265
|
-
"@aws-sdk/client-lambda": "^3.0.0",
|
|
37266
|
-
"@aws-sdk/client-s3": "^3.0.0",
|
|
37267
|
-
"@aws-sdk/client-sesv2": "^3.0.0",
|
|
37268
|
-
"@aws-sdk/client-sqs": "^3.0.0",
|
|
37269
|
-
"@aws-sdk/client-ssm": "^3.0.0",
|
|
37270
|
-
"@aws-sdk/client-sts": "^3.0.0",
|
|
37271
|
-
"@cloudflare/vite-plugin": "catalog:",
|
|
37272
|
-
"@coinbase/cdp-sdk": "^0.10.0",
|
|
37273
|
-
"@libsql/client": "^0.15.12",
|
|
37274
|
-
"@opennextjs/cloudflare": "^1.6.5",
|
|
37275
|
-
"astro": "^5.13.2",
|
|
37276
|
-
"rwsdk": "^1.0.0-beta.51",
|
|
37277
|
-
"stripe": "^18.5.0",
|
|
37278
|
-
"vite": ">=6.0.0",
|
|
37279
|
-
"wrangler": "catalog:"
|
|
37280
|
-
};
|
|
37281
|
-
var peerDependenciesMeta = {
|
|
37282
|
-
"@astrojs/cloudflare": { "optional": true },
|
|
37283
|
-
"@coinbase/cdp-sdk": { "optional": true },
|
|
37284
|
-
"@aws-sdk/client-dynamodb": { "optional": true },
|
|
37285
|
-
"@aws-sdk/client-iam": { "optional": true },
|
|
37286
|
-
"@aws-sdk/client-lambda": { "optional": true },
|
|
37287
|
-
"@aws-sdk/client-s3": { "optional": true },
|
|
37288
|
-
"@aws-sdk/client-sesv2": { "optional": true },
|
|
37289
|
-
"@aws-sdk/client-sqs": { "optional": true },
|
|
37290
|
-
"@aws-sdk/client-ssm": { "optional": true },
|
|
37291
|
-
"@aws-sdk/client-sts": { "optional": true },
|
|
37292
|
-
"@cloudflare/vite-plugin": { "optional": true },
|
|
37293
|
-
"@opennextjs/cloudflare": { "optional": true },
|
|
37294
|
-
"@libsql/client": { "optional": true },
|
|
37295
|
-
"astro": { "optional": true },
|
|
37296
|
-
"rwsdk": { "optional": true },
|
|
37297
|
-
"stripe": { "optional": true },
|
|
37298
|
-
"vite": { "optional": true }
|
|
37299
|
-
};
|
|
37300
37262
|
var devDependencies = {
|
|
37301
37263
|
"@astrojs/cloudflare": "^12.6.4",
|
|
37302
37264
|
"@aws-sdk/client-dynamodb": "^3.0.0",
|
|
@@ -37351,23 +37313,61 @@ var devDependencies = {
|
|
|
37351
37313
|
"wrangler": "^4.84.0",
|
|
37352
37314
|
"zod": "^4.0.10"
|
|
37353
37315
|
};
|
|
37316
|
+
var peerDependencies = {
|
|
37317
|
+
"@astrojs/cloudflare": "^12.6.4",
|
|
37318
|
+
"@aws-sdk/client-dynamodb": "^3.0.0",
|
|
37319
|
+
"@aws-sdk/client-iam": "^3.0.0",
|
|
37320
|
+
"@aws-sdk/client-lambda": "^3.0.0",
|
|
37321
|
+
"@aws-sdk/client-s3": "^3.0.0",
|
|
37322
|
+
"@aws-sdk/client-sesv2": "^3.0.0",
|
|
37323
|
+
"@aws-sdk/client-sqs": "^3.0.0",
|
|
37324
|
+
"@aws-sdk/client-ssm": "^3.0.0",
|
|
37325
|
+
"@aws-sdk/client-sts": "^3.0.0",
|
|
37326
|
+
"@cloudflare/vite-plugin": "catalog:",
|
|
37327
|
+
"@coinbase/cdp-sdk": "^0.10.0",
|
|
37328
|
+
"@libsql/client": "^0.15.12",
|
|
37329
|
+
"@opennextjs/cloudflare": "^1.6.5",
|
|
37330
|
+
"astro": "^5.13.2",
|
|
37331
|
+
"rwsdk": "^1.0.0-beta.51",
|
|
37332
|
+
"stripe": "^18.5.0",
|
|
37333
|
+
"vite": ">=6.0.0"
|
|
37334
|
+
};
|
|
37335
|
+
var peerDependenciesMeta = {
|
|
37336
|
+
"@astrojs/cloudflare": { "optional": true },
|
|
37337
|
+
"@coinbase/cdp-sdk": { "optional": true },
|
|
37338
|
+
"@aws-sdk/client-dynamodb": { "optional": true },
|
|
37339
|
+
"@aws-sdk/client-iam": { "optional": true },
|
|
37340
|
+
"@aws-sdk/client-lambda": { "optional": true },
|
|
37341
|
+
"@aws-sdk/client-s3": { "optional": true },
|
|
37342
|
+
"@aws-sdk/client-sesv2": { "optional": true },
|
|
37343
|
+
"@aws-sdk/client-sqs": { "optional": true },
|
|
37344
|
+
"@aws-sdk/client-ssm": { "optional": true },
|
|
37345
|
+
"@aws-sdk/client-sts": { "optional": true },
|
|
37346
|
+
"@cloudflare/vite-plugin": { "optional": true },
|
|
37347
|
+
"@opennextjs/cloudflare": { "optional": true },
|
|
37348
|
+
"@libsql/client": { "optional": true },
|
|
37349
|
+
"astro": { "optional": true },
|
|
37350
|
+
"rwsdk": { "optional": true },
|
|
37351
|
+
"stripe": { "optional": true },
|
|
37352
|
+
"vite": { "optional": true }
|
|
37353
|
+
};
|
|
37354
37354
|
var package_default = {
|
|
37355
37355
|
name,
|
|
37356
37356
|
version,
|
|
37357
|
+
homepage,
|
|
37357
37358
|
license,
|
|
37358
37359
|
author,
|
|
37359
|
-
homepage,
|
|
37360
37360
|
repository,
|
|
37361
|
-
type,
|
|
37362
|
-
module: module$1,
|
|
37363
37361
|
bin,
|
|
37364
|
-
scripts,
|
|
37365
37362
|
files,
|
|
37363
|
+
type,
|
|
37364
|
+
module: module$1,
|
|
37366
37365
|
exports: exports$1,
|
|
37366
|
+
scripts,
|
|
37367
37367
|
dependencies,
|
|
37368
|
+
devDependencies,
|
|
37368
37369
|
peerDependencies,
|
|
37369
|
-
peerDependenciesMeta
|
|
37370
|
-
devDependencies
|
|
37370
|
+
peerDependenciesMeta
|
|
37371
37371
|
};
|
|
37372
37372
|
|
|
37373
37373
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"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"}
|
package/lib/cloudflare/bucket.js
CHANGED
|
@@ -150,7 +150,9 @@ export async function R2Bucket(id, props = {}) {
|
|
|
150
150
|
? new Uint8Array(await value.arrayBuffer())
|
|
151
151
|
: value instanceof ReadableStream
|
|
152
152
|
? new Uint8Array(await streamToBuffer(value))
|
|
153
|
-
: value,
|
|
153
|
+
: value,
|
|
154
|
+
// @ts-expect-error - headers type mismatch
|
|
155
|
+
options);
|
|
154
156
|
}
|
|
155
157
|
const response = await putObject(api, {
|
|
156
158
|
bucketName: bucket.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket.js","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bucket.js","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ declare global {
|
|
|
10
10
|
export declare class MiniflareController {
|
|
11
11
|
abort: AbortController;
|
|
12
12
|
miniflare: miniflare.Miniflare | undefined;
|
|
13
|
+
miniflarePromise: PromiseWithResolvers<miniflare.Miniflare> | undefined;
|
|
13
14
|
options: Map<string, any>;
|
|
14
15
|
tunnel: Tunnel | undefined;
|
|
15
16
|
localProxies: Map<string, MiniflareWorkerProxy>;
|
|
@@ -19,6 +20,7 @@ export declare class MiniflareController {
|
|
|
19
20
|
add(input: MiniflareWorkerInput): Promise<string>;
|
|
20
21
|
private watch;
|
|
21
22
|
private update;
|
|
23
|
+
private getMiniflare;
|
|
22
24
|
private setMiniflareOptions;
|
|
23
25
|
dispose(): Promise<void>;
|
|
24
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare-controller.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAKvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,4BAA4B,EAAE,mBAAmB,GAAG,SAAS,CAAC;CACnE;AAED,qBAAa,mBAAmB;IAC9B,KAAK,kBAAyB;IAC9B,SAAS,EAAE,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;IAC3C,OAAO,mBAA8C;IACrD,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,YAAY,oCAA2C;IACvD,aAAa,0BAAiC;IAC9C,KAAK,aAAoB;IAEzB,MAAM,KAAK,SAAS,wBAGnB;IAEK,GAAG,CAAC,KAAK,EAAE,oBAAoB;YAuCvB,KAAK;YAiBL,MAAM;
|
|
1
|
+
{"version":3,"file":"miniflare-controller.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAKvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,4BAA4B,EAAE,mBAAmB,GAAG,SAAS,CAAC;CACnE;AAED,qBAAa,mBAAmB;IAC9B,KAAK,kBAAyB;IAC9B,SAAS,EAAE,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,oBAAoB,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACxE,OAAO,mBAA8C;IACrD,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,YAAY,oCAA2C;IACvD,aAAa,0BAAiC;IAC9C,KAAK,aAAoB;IAEzB,MAAM,KAAK,SAAS,wBAGnB;IAEK,GAAG,CAAC,KAAK,EAAE,oBAAoB;YAuCvB,KAAK;YAiBL,MAAM;YAgDN,YAAY;YAQZ,mBAAmB;IAgC3B,OAAO;CASd"}
|
|
@@ -12,6 +12,7 @@ import { createTunnel } from "./tunnel.js";
|
|
|
12
12
|
export class MiniflareController {
|
|
13
13
|
abort = new AbortController();
|
|
14
14
|
miniflare;
|
|
15
|
+
miniflarePromise;
|
|
15
16
|
options = new Map();
|
|
16
17
|
tunnel;
|
|
17
18
|
localProxies = new Map();
|
|
@@ -30,10 +31,10 @@ export class MiniflareController {
|
|
|
30
31
|
const first = await watcher.next();
|
|
31
32
|
assert(first.value, "First value is undefined");
|
|
32
33
|
this.options.set(input.name, first.value);
|
|
33
|
-
|
|
34
|
+
await this.update();
|
|
34
35
|
let url;
|
|
35
36
|
if (input.tunnel) {
|
|
36
|
-
this.tunnel ??= await createTunnel(
|
|
37
|
+
this.tunnel ??= await createTunnel(this.getMiniflare.bind(this));
|
|
37
38
|
url = await this.tunnel.configureWorker({
|
|
38
39
|
api: input.api,
|
|
39
40
|
name: input.name,
|
|
@@ -43,7 +44,7 @@ export class MiniflareController {
|
|
|
43
44
|
const proxy = await createMiniflareWorkerProxy({
|
|
44
45
|
port: input.port ?? (await reservePort(input.name)),
|
|
45
46
|
getWorkerName: () => input.name,
|
|
46
|
-
|
|
47
|
+
getMiniflare: this.getMiniflare.bind(this),
|
|
47
48
|
mode: "local",
|
|
48
49
|
});
|
|
49
50
|
this.localProxies.set(input.name, proxy);
|
|
@@ -86,6 +87,8 @@ export class MiniflareController {
|
|
|
86
87
|
unsafeDevRegistryDurableObjectProxy: true,
|
|
87
88
|
// This exposes other handlers like `scheduled` and `email` via HTTP.
|
|
88
89
|
unsafeTriggerHandlers: true,
|
|
90
|
+
// Enable the Local Explorer (/cdn-cgi/explorer)
|
|
91
|
+
unsafeLocalExplorer: true,
|
|
89
92
|
};
|
|
90
93
|
for (const worker of this.options.values()) {
|
|
91
94
|
options.workers.push(worker);
|
|
@@ -115,18 +118,31 @@ export class MiniflareController {
|
|
|
115
118
|
return await this.setMiniflareOptions(options);
|
|
116
119
|
});
|
|
117
120
|
}
|
|
121
|
+
async getMiniflare() {
|
|
122
|
+
if (this.miniflare) {
|
|
123
|
+
return this.miniflare;
|
|
124
|
+
}
|
|
125
|
+
this.miniflarePromise ??= Promise.withResolvers();
|
|
126
|
+
return await this.miniflarePromise.promise;
|
|
127
|
+
}
|
|
118
128
|
async setMiniflareOptions(options) {
|
|
129
|
+
this.miniflarePromise ??= Promise.withResolvers();
|
|
119
130
|
try {
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
131
|
+
// We used to call miniflare.setOptions(), but in the current version, this fails with
|
|
132
|
+
// TypeError: this.#runtimeDispatcher?.close is not a function. (In 'this.#runtimeDispatcher?.close()', 'this.#runtimeDispatcher?.close' is undefined)
|
|
133
|
+
// So instead, we dispose of the old instance and create a new one.
|
|
134
|
+
const instance = this.miniflare;
|
|
135
|
+
if (instance) {
|
|
136
|
+
this.miniflare = undefined;
|
|
137
|
+
await instance.dispose();
|
|
126
138
|
}
|
|
139
|
+
this.miniflare = new miniflare.Miniflare(options);
|
|
140
|
+
await this.miniflare.ready;
|
|
141
|
+
this.miniflarePromise.resolve(this.miniflare);
|
|
127
142
|
return this.miniflare;
|
|
128
143
|
}
|
|
129
144
|
catch (error) {
|
|
145
|
+
this.miniflarePromise.reject(error);
|
|
130
146
|
if (error instanceof miniflare.MiniflareCoreError &&
|
|
131
147
|
error.code === "ERR_MODULE_STRING_SCRIPT") {
|
|
132
148
|
throw new Error('Miniflare detected an external dependency that could not be resolved. This typically occurs when the "nodejs_compat" or "nodejs_als" compatibility flag is not enabled.');
|
|
@@ -135,6 +151,9 @@ export class MiniflareController {
|
|
|
135
151
|
throw error;
|
|
136
152
|
}
|
|
137
153
|
}
|
|
154
|
+
finally {
|
|
155
|
+
this.miniflarePromise = undefined;
|
|
156
|
+
}
|
|
138
157
|
}
|
|
139
158
|
async dispose() {
|
|
140
159
|
this.abort.abort();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare-controller.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AACvC,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,IAAI,MAAM,OAAO,CAAC;AACzB,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EACL,kBAAkB,GAEnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,0BAA0B,GAE3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,YAAY,EAAe,MAAM,aAAa,CAAC;AAMxD,MAAM,OAAO,mBAAmB;IAC9B,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9B,SAAS,CAAkC;IAC3C,OAAO,GAAG,IAAI,GAAG,EAAmC,CAAC;IACrD,MAAM,CAAqB;IAC3B,YAAY,GAAG,IAAI,GAAG,EAAgC,CAAC;IACvD,aAAa,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC9C,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC;IAEzB,MAAM,KAAK,SAAS;QAClB,OAAO,CAAC,UAAU,CAAC,4BAA4B;YAC7C,IAAI,mBAAmB,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAA2B;QACnC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAE/D,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,0BAA0B,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"miniflare-controller.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export declare function createMiniflareWorkerProxy(options: {
|
|
|
7
7
|
port: number;
|
|
8
8
|
transformRequest?: (request: RequestInfo) => void;
|
|
9
9
|
getWorkerName: (request: RequestInfo) => string;
|
|
10
|
-
|
|
10
|
+
getMiniflare: () => Promise<miniflare.Miniflare>;
|
|
11
11
|
mode: "local" | "remote";
|
|
12
12
|
}): Promise<{
|
|
13
13
|
url: URL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare-worker-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AASvC,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IAClD,aAAa,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,MAAM,CAAC;IAChD,
|
|
1
|
+
{"version":3,"file":"miniflare-worker-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AASvC,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IAClD,aAAa,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,MAAM,CAAC;IAChD,YAAY,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC1B;;;GAqGA;AA6ED,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC;IAC3B,IAAI,EAAE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAoDD,qBAAa,yBAA0B,SAAQ,KAAK;IAGhD,QAAQ,CAAC,MAAM,EAAE,MAAM;gBADvB,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,YAAY;IAKxB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC,QAAQ;IAkBxD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,yBAAyB;CAQ9D"}
|
|
@@ -47,11 +47,13 @@ export async function createMiniflareWorkerProxy(options) {
|
|
|
47
47
|
duplex: info.duplex,
|
|
48
48
|
signal,
|
|
49
49
|
});
|
|
50
|
-
|
|
50
|
+
const mf = await options.getMiniflare();
|
|
51
|
+
return await mf.dispatchFetch(request);
|
|
51
52
|
};
|
|
52
53
|
const createServerWebSocket = async (req) => {
|
|
53
54
|
// Rewrite to Miniflare entry URL
|
|
54
|
-
const
|
|
55
|
+
const mf = await options.getMiniflare();
|
|
56
|
+
const target = await mf.ready;
|
|
55
57
|
const url = new URL(req.url ?? "/", target);
|
|
56
58
|
url.protocol = url.protocol.replace("http", "ws");
|
|
57
59
|
const protocols = req.headers["sec-websocket-protocol"]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare-worker-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AACvC,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAO9C,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,OAMhD;IACC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAEpD,MAAM,CAAC,EAAE,CACP,SAAS,EACT,oBAAoB,CAAC;QACnB,GAAG;QACH,qBAAqB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,qBAAqB,CAAC,GAAG,CAAC;KAC3D,CAAC,CACH,CAAC;IAEF,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACtC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC7C,4BAA4B,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,CAAC,KAAK,YAAY,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE,CAAC;gBACpE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;YACD,MAAM,QAAQ,GAAG,yBAAyB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,UAAU,CACtE,OAAO,CAAC,IAAI,CACb,CAAC;YACF,4BAA4B,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,KAAK,EACvB,GAAyB,EACzB,GAAwB,EACK,EAAE;QAC/B,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACvC,OAAO,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,CAAC;QAEjC,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;QAE5C,2BAA2B;QAC3B,iGAAiG;QACjG,wFAAwF;QACxF,4JAA4J;QAC5J,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,KAAK,cAAc,EAAE,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,4BAA4B,CAAC;QACnD,CAAC;QAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;YAC9C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM;SACP,CAAC,CAAC;QACH,
|
|
1
|
+
{"version":3,"file":"miniflare-worker-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,5 +14,5 @@ export interface Tunnel {
|
|
|
14
14
|
*/
|
|
15
15
|
close: () => Promise<void>;
|
|
16
16
|
}
|
|
17
|
-
export declare function createTunnel(
|
|
17
|
+
export declare function createTunnel(getMiniflare: () => Promise<miniflare.Miniflare>): Promise<Tunnel>;
|
|
18
18
|
//# sourceMappingURL=tunnel.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,SAAS,MAAM,WAAW,CAAC;AAG5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAa/C,MAAM,WAAW,MAAM;IACrB;;;OAGG;IACH,eAAe,EAAE,CAAC,KAAK,EAAE;QACvB,GAAG,EAAE,aAAa,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACnB;;OAEG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,wBAAsB,YAAY,CAChC,
|
|
1
|
+
{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,SAAS,MAAM,WAAW,CAAC;AAG5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAa/C,MAAM,WAAW,MAAM;IACrB;;;OAGG;IACH,eAAe,EAAE,CAAC,KAAK,EAAE;QACvB,GAAG,EAAE,aAAa,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACnB;;OAEG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,wBAAsB,YAAY,CAChC,YAAY,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,GAC/C,OAAO,CAAC,MAAM,CAAC,CAwDjB"}
|
|
@@ -4,11 +4,11 @@ import { getInternalWorkerBundle } from "../bundle/internal-worker-bundle.js";
|
|
|
4
4
|
import { enableWorkerSubdomain, getAccountSubdomain, getWorkerSubdomain, } from "../worker-subdomain.js";
|
|
5
5
|
import { putWorker } from "../worker.js";
|
|
6
6
|
import { createMiniflareWorkerProxy, MiniflareWorkerProxyError, } from "./miniflare-worker-proxy.js";
|
|
7
|
-
export async function createTunnel(
|
|
7
|
+
export async function createTunnel(getMiniflare) {
|
|
8
8
|
const workers = new Set(); // used to avoid exposing workers that are not running with tunneling enabled
|
|
9
9
|
const proxy = await createMiniflareWorkerProxy({
|
|
10
10
|
port: await findOpenPort(9977), // alchemy auth uses 9976, so one above that
|
|
11
|
-
|
|
11
|
+
getMiniflare,
|
|
12
12
|
mode: "remote",
|
|
13
13
|
transformRequest: (request) => {
|
|
14
14
|
if (request.url.origin === remote.origin) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/tunnel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,6BAA6B,CAAC;AAiBrC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/tunnel.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,26 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "alchemy",
|
|
3
|
-
"version": "0.93.
|
|
3
|
+
"version": "0.93.4",
|
|
4
|
+
"homepage": "https://alchemy.run",
|
|
4
5
|
"license": "Apache-2.0",
|
|
5
6
|
"author": "Sam Goodwin <sam@alchemy.run>",
|
|
6
|
-
"homepage": "https://alchemy.run",
|
|
7
7
|
"repository": {
|
|
8
8
|
"type": "git",
|
|
9
9
|
"url": "git+https://github.com/alchemy-run/alchemy.git",
|
|
10
10
|
"directory": "alchemy"
|
|
11
11
|
},
|
|
12
|
-
"type": "module",
|
|
13
|
-
"module": "./lib/index.js",
|
|
14
12
|
"bin": {
|
|
15
13
|
"alchemy": "bin/alchemy.js"
|
|
16
14
|
},
|
|
17
|
-
"scripts": {
|
|
18
|
-
"build": "rm -rf ./*.tsbuildinfo && rm -rf ./lib && tsc -b && tsdown",
|
|
19
|
-
"dev": "tsdown --watch",
|
|
20
|
-
"drizzle:generate": "bun run scripts/drizzle-generate.ts",
|
|
21
|
-
"postbuild": "(cpy '**/*.d.ts' ../lib --cwd=src || true) && (cpy '**/*.txt' ../lib --cwd=src || true)",
|
|
22
|
-
"publish:npm": "cp ../README.md . && bun run build && tsdown && bun publish && rm README.md"
|
|
23
|
-
},
|
|
24
15
|
"files": [
|
|
25
16
|
"bin",
|
|
26
17
|
"drizzle/default",
|
|
@@ -29,6 +20,8 @@
|
|
|
29
20
|
"templates",
|
|
30
21
|
"workers"
|
|
31
22
|
],
|
|
23
|
+
"type": "module",
|
|
24
|
+
"module": "./lib/index.js",
|
|
32
25
|
"exports": {
|
|
33
26
|
".": {
|
|
34
27
|
"bun": "./src/index.ts",
|
|
@@ -176,6 +169,13 @@
|
|
|
176
169
|
"import": "./lib/vercel/index.js"
|
|
177
170
|
}
|
|
178
171
|
},
|
|
172
|
+
"scripts": {
|
|
173
|
+
"build": "rm -rf ./*.tsbuildinfo && rm -rf ./lib && tsc -b && tsdown",
|
|
174
|
+
"dev": "tsdown --watch",
|
|
175
|
+
"drizzle:generate": "bun run scripts/drizzle-generate.ts",
|
|
176
|
+
"postbuild": "(cpy '**/*.d.ts' ../lib --cwd=src || true) && (cpy '**/*.txt' ../lib --cwd=src || true)",
|
|
177
|
+
"publish:npm": "cp ../README.md . && bun run build && tsdown && bun publish && rm README.md"
|
|
178
|
+
},
|
|
179
179
|
"dependencies": {
|
|
180
180
|
"@aws-sdk/credential-providers": "^3.0.0",
|
|
181
181
|
"@cloudflare/unenv-preset": "2.7.7",
|
|
@@ -195,7 +195,7 @@
|
|
|
195
195
|
"glob": "^10.0.0",
|
|
196
196
|
"jszip": "^3.0.0",
|
|
197
197
|
"libsodium-wrappers": "^0.8.0",
|
|
198
|
-
"miniflare": "4.
|
|
198
|
+
"miniflare": "4.20260424.0",
|
|
199
199
|
"neverthrow": "^8.2.0",
|
|
200
200
|
"open": "^10.1.2",
|
|
201
201
|
"openapi-types": "^12.1.3",
|
|
@@ -204,9 +204,64 @@
|
|
|
204
204
|
"proper-lockfile": "^4.1.2",
|
|
205
205
|
"signal-exit": "^4.1.0",
|
|
206
206
|
"unenv": "2.0.0-rc.21",
|
|
207
|
+
"wrangler": "^4.85.0",
|
|
207
208
|
"ws": "^8.18.3",
|
|
208
209
|
"yaml": "^2.0.0"
|
|
209
210
|
},
|
|
211
|
+
"devDependencies": {
|
|
212
|
+
"@astrojs/cloudflare": "^12.6.4",
|
|
213
|
+
"@aws-sdk/client-dynamodb": "^3.0.0",
|
|
214
|
+
"@aws-sdk/client-ec2": "^3.868.0",
|
|
215
|
+
"@aws-sdk/client-iam": "^3.864.0",
|
|
216
|
+
"@aws-sdk/client-lambda": "^3.0.0",
|
|
217
|
+
"@aws-sdk/client-s3": "3.726.1",
|
|
218
|
+
"@aws-sdk/client-sesv2": "^3.0.0",
|
|
219
|
+
"@aws-sdk/client-sqs": "^3.0.0",
|
|
220
|
+
"@aws-sdk/client-ssm": "^3.0.0",
|
|
221
|
+
"@aws-sdk/client-sts": "^3.0.0",
|
|
222
|
+
"@clack/prompts": "^0.11.0",
|
|
223
|
+
"@cloudflare/containers": "^0.0.13",
|
|
224
|
+
"@cloudflare/puppeteer": "^1.0.2",
|
|
225
|
+
"@cloudflare/vite-plugin": "^1.21.2",
|
|
226
|
+
"@coinbase/cdp-sdk": "^1.38.2",
|
|
227
|
+
"@libsql/client": "^0.15.12",
|
|
228
|
+
"@octokit/rest": "^21.1.1",
|
|
229
|
+
"@sentry/cloudflare": "^9.43.0",
|
|
230
|
+
"@sveltejs/adapter-cloudflare": "^7.1.2",
|
|
231
|
+
"@types/bun": "latest",
|
|
232
|
+
"@types/debug": "^4.1.12",
|
|
233
|
+
"@types/fs-extra": "^11.0.4",
|
|
234
|
+
"@types/libsodium-wrappers": "^0.7.14",
|
|
235
|
+
"@types/node": "latest",
|
|
236
|
+
"@types/proper-lockfile": "^4.1.4",
|
|
237
|
+
"@types/ws": "^8.18.1",
|
|
238
|
+
"@workos-inc/node": "^7.69.1",
|
|
239
|
+
"arktype": "^2.1.16",
|
|
240
|
+
"astro": "^5.13.2",
|
|
241
|
+
"braintrust": "^0.0.201",
|
|
242
|
+
"capnweb": "^0.4.0",
|
|
243
|
+
"cojson-core-wasm": "^0.18.16",
|
|
244
|
+
"cpy-cli": "^7.0.0",
|
|
245
|
+
"debug": "^4.4.1",
|
|
246
|
+
"dofs": "^0.1.0",
|
|
247
|
+
"drizzle-kit": "^0.31.8",
|
|
248
|
+
"drizzle-orm": "^0.45.1",
|
|
249
|
+
"fs-extra": "^11.3.0",
|
|
250
|
+
"globby": "^14.1.0",
|
|
251
|
+
"grammy": "^1.37.0",
|
|
252
|
+
"jsonc-parse": "^1.5.5",
|
|
253
|
+
"listr2": "^8.0.0",
|
|
254
|
+
"nitropack": "^2.12.4",
|
|
255
|
+
"rwsdk": "^1.0.0-beta.51",
|
|
256
|
+
"stripe": "^18.5.0",
|
|
257
|
+
"trpc-cli": "^0.10.2",
|
|
258
|
+
"ts-morph": "^26.0.0",
|
|
259
|
+
"tsdown": "^0.14.2",
|
|
260
|
+
"typescript": "^5.8.3",
|
|
261
|
+
"undici": "^7.14.0",
|
|
262
|
+
"wrangler": "^4.84.0",
|
|
263
|
+
"zod": "^4.0.10"
|
|
264
|
+
},
|
|
210
265
|
"peerDependencies": {
|
|
211
266
|
"@astrojs/cloudflare": "^12.6.4",
|
|
212
267
|
"@aws-sdk/client-dynamodb": "^3.0.0",
|
|
@@ -224,8 +279,7 @@
|
|
|
224
279
|
"astro": "^5.13.2",
|
|
225
280
|
"rwsdk": "^1.0.0-beta.51",
|
|
226
281
|
"stripe": "^18.5.0",
|
|
227
|
-
"vite": ">=6.0.0"
|
|
228
|
-
"wrangler": "^4.83.0"
|
|
282
|
+
"vite": ">=6.0.0"
|
|
229
283
|
},
|
|
230
284
|
"peerDependenciesMeta": {
|
|
231
285
|
"@astrojs/cloudflare": {
|
|
@@ -279,59 +333,5 @@
|
|
|
279
333
|
"vite": {
|
|
280
334
|
"optional": true
|
|
281
335
|
}
|
|
282
|
-
},
|
|
283
|
-
"devDependencies": {
|
|
284
|
-
"@astrojs/cloudflare": "^12.6.4",
|
|
285
|
-
"@aws-sdk/client-dynamodb": "^3.0.0",
|
|
286
|
-
"@aws-sdk/client-ec2": "^3.868.0",
|
|
287
|
-
"@aws-sdk/client-iam": "^3.864.0",
|
|
288
|
-
"@aws-sdk/client-lambda": "^3.0.0",
|
|
289
|
-
"@aws-sdk/client-s3": "3.726.1",
|
|
290
|
-
"@aws-sdk/client-sesv2": "^3.0.0",
|
|
291
|
-
"@aws-sdk/client-sqs": "^3.0.0",
|
|
292
|
-
"@aws-sdk/client-ssm": "^3.0.0",
|
|
293
|
-
"@aws-sdk/client-sts": "^3.0.0",
|
|
294
|
-
"@clack/prompts": "^0.11.0",
|
|
295
|
-
"@cloudflare/containers": "^0.0.13",
|
|
296
|
-
"@cloudflare/puppeteer": "^1.0.2",
|
|
297
|
-
"@cloudflare/vite-plugin": "^1.21.2",
|
|
298
|
-
"@coinbase/cdp-sdk": "^1.38.2",
|
|
299
|
-
"@libsql/client": "^0.15.12",
|
|
300
|
-
"@octokit/rest": "^21.1.1",
|
|
301
|
-
"@sentry/cloudflare": "^9.43.0",
|
|
302
|
-
"@sveltejs/adapter-cloudflare": "^7.1.2",
|
|
303
|
-
"@types/bun": "latest",
|
|
304
|
-
"@types/debug": "^4.1.12",
|
|
305
|
-
"@types/fs-extra": "^11.0.4",
|
|
306
|
-
"@types/libsodium-wrappers": "^0.7.14",
|
|
307
|
-
"@types/node": "latest",
|
|
308
|
-
"@types/proper-lockfile": "^4.1.4",
|
|
309
|
-
"@types/ws": "^8.18.1",
|
|
310
|
-
"@workos-inc/node": "^7.69.1",
|
|
311
|
-
"arktype": "^2.1.16",
|
|
312
|
-
"astro": "^5.13.2",
|
|
313
|
-
"braintrust": "^0.0.201",
|
|
314
|
-
"capnweb": "^0.4.0",
|
|
315
|
-
"cojson-core-wasm": "^0.18.16",
|
|
316
|
-
"cpy-cli": "^7.0.0",
|
|
317
|
-
"debug": "^4.4.1",
|
|
318
|
-
"dofs": "^0.1.0",
|
|
319
|
-
"drizzle-kit": "^0.31.8",
|
|
320
|
-
"drizzle-orm": "^0.45.1",
|
|
321
|
-
"fs-extra": "^11.3.0",
|
|
322
|
-
"globby": "^14.1.0",
|
|
323
|
-
"grammy": "^1.37.0",
|
|
324
|
-
"jsonc-parse": "^1.5.5",
|
|
325
|
-
"listr2": "^8.0.0",
|
|
326
|
-
"nitropack": "^2.12.4",
|
|
327
|
-
"rwsdk": "^1.0.0-beta.51",
|
|
328
|
-
"stripe": "^18.5.0",
|
|
329
|
-
"trpc-cli": "^0.10.2",
|
|
330
|
-
"ts-morph": "^26.0.0",
|
|
331
|
-
"tsdown": "^0.14.2",
|
|
332
|
-
"typescript": "^5.8.3",
|
|
333
|
-
"undici": "^7.14.0",
|
|
334
|
-
"wrangler": "^4.84.0",
|
|
335
|
-
"zod": "^4.0.10"
|
|
336
336
|
}
|
|
337
337
|
}
|
package/src/cloudflare/bucket.ts
CHANGED
|
@@ -24,6 +24,7 @@ declare global {
|
|
|
24
24
|
export class MiniflareController {
|
|
25
25
|
abort = new AbortController();
|
|
26
26
|
miniflare: miniflare.Miniflare | undefined;
|
|
27
|
+
miniflarePromise: PromiseWithResolvers<miniflare.Miniflare> | undefined;
|
|
27
28
|
options = new Map<string, miniflare.WorkerOptions>();
|
|
28
29
|
tunnel: Tunnel | undefined;
|
|
29
30
|
localProxies = new Map<string, MiniflareWorkerProxy>();
|
|
@@ -45,10 +46,10 @@ export class MiniflareController {
|
|
|
45
46
|
const first = await watcher.next();
|
|
46
47
|
assert(first.value, "First value is undefined");
|
|
47
48
|
this.options.set(input.name, first.value);
|
|
48
|
-
|
|
49
|
+
await this.update();
|
|
49
50
|
let url: URL;
|
|
50
51
|
if (input.tunnel) {
|
|
51
|
-
this.tunnel ??= await createTunnel(
|
|
52
|
+
this.tunnel ??= await createTunnel(this.getMiniflare.bind(this));
|
|
52
53
|
url = await this.tunnel.configureWorker({
|
|
53
54
|
api: input.api,
|
|
54
55
|
name: input.name,
|
|
@@ -57,7 +58,7 @@ export class MiniflareController {
|
|
|
57
58
|
const proxy = await createMiniflareWorkerProxy({
|
|
58
59
|
port: input.port ?? (await reservePort(input.name)),
|
|
59
60
|
getWorkerName: () => input.name,
|
|
60
|
-
|
|
61
|
+
getMiniflare: this.getMiniflare.bind(this),
|
|
61
62
|
mode: "local",
|
|
62
63
|
});
|
|
63
64
|
this.localProxies.set(input.name, proxy);
|
|
@@ -107,6 +108,8 @@ export class MiniflareController {
|
|
|
107
108
|
unsafeDevRegistryDurableObjectProxy: true,
|
|
108
109
|
// This exposes other handlers like `scheduled` and `email` via HTTP.
|
|
109
110
|
unsafeTriggerHandlers: true,
|
|
111
|
+
// Enable the Local Explorer (/cdn-cgi/explorer)
|
|
112
|
+
unsafeLocalExplorer: true,
|
|
110
113
|
};
|
|
111
114
|
for (const worker of this.options.values()) {
|
|
112
115
|
options.workers.push(worker);
|
|
@@ -137,16 +140,31 @@ export class MiniflareController {
|
|
|
137
140
|
});
|
|
138
141
|
}
|
|
139
142
|
|
|
143
|
+
private async getMiniflare() {
|
|
144
|
+
if (this.miniflare) {
|
|
145
|
+
return this.miniflare;
|
|
146
|
+
}
|
|
147
|
+
this.miniflarePromise ??= Promise.withResolvers<miniflare.Miniflare>();
|
|
148
|
+
return await this.miniflarePromise.promise;
|
|
149
|
+
}
|
|
150
|
+
|
|
140
151
|
private async setMiniflareOptions(options: miniflare.MiniflareOptions) {
|
|
152
|
+
this.miniflarePromise ??= Promise.withResolvers<miniflare.Miniflare>();
|
|
141
153
|
try {
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
154
|
+
// We used to call miniflare.setOptions(), but in the current version, this fails with
|
|
155
|
+
// TypeError: this.#runtimeDispatcher?.close is not a function. (In 'this.#runtimeDispatcher?.close()', 'this.#runtimeDispatcher?.close' is undefined)
|
|
156
|
+
// So instead, we dispose of the old instance and create a new one.
|
|
157
|
+
const instance = this.miniflare;
|
|
158
|
+
if (instance) {
|
|
159
|
+
this.miniflare = undefined;
|
|
160
|
+
await instance.dispose();
|
|
147
161
|
}
|
|
162
|
+
this.miniflare = new miniflare.Miniflare(options);
|
|
163
|
+
await this.miniflare.ready;
|
|
164
|
+
this.miniflarePromise.resolve(this.miniflare);
|
|
148
165
|
return this.miniflare;
|
|
149
166
|
} catch (error) {
|
|
167
|
+
this.miniflarePromise.reject(error);
|
|
150
168
|
if (
|
|
151
169
|
error instanceof miniflare.MiniflareCoreError &&
|
|
152
170
|
error.code === "ERR_MODULE_STRING_SCRIPT"
|
|
@@ -157,6 +175,8 @@ export class MiniflareController {
|
|
|
157
175
|
} else {
|
|
158
176
|
throw error;
|
|
159
177
|
}
|
|
178
|
+
} finally {
|
|
179
|
+
this.miniflarePromise = undefined;
|
|
160
180
|
}
|
|
161
181
|
}
|
|
162
182
|
|
|
@@ -16,7 +16,7 @@ export async function createMiniflareWorkerProxy(options: {
|
|
|
16
16
|
port: number;
|
|
17
17
|
transformRequest?: (request: RequestInfo) => void;
|
|
18
18
|
getWorkerName: (request: RequestInfo) => string;
|
|
19
|
-
|
|
19
|
+
getMiniflare: () => Promise<miniflare.Miniflare>;
|
|
20
20
|
mode: "local" | "remote";
|
|
21
21
|
}) {
|
|
22
22
|
const server = http.createServer();
|
|
@@ -72,12 +72,14 @@ export async function createMiniflareWorkerProxy(options: {
|
|
|
72
72
|
duplex: info.duplex,
|
|
73
73
|
signal,
|
|
74
74
|
});
|
|
75
|
-
|
|
75
|
+
const mf = await options.getMiniflare();
|
|
76
|
+
return await mf.dispatchFetch(request);
|
|
76
77
|
};
|
|
77
78
|
|
|
78
79
|
const createServerWebSocket = async (req: http.IncomingMessage) => {
|
|
79
80
|
// Rewrite to Miniflare entry URL
|
|
80
|
-
const
|
|
81
|
+
const mf = await options.getMiniflare();
|
|
82
|
+
const target = await mf.ready;
|
|
81
83
|
const url = new URL(req.url ?? "/", target);
|
|
82
84
|
url.protocol = url.protocol.replace("http", "ws");
|
|
83
85
|
|
|
@@ -30,12 +30,12 @@ export interface Tunnel {
|
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
export async function createTunnel(
|
|
33
|
-
|
|
33
|
+
getMiniflare: () => Promise<miniflare.Miniflare>,
|
|
34
34
|
): Promise<Tunnel> {
|
|
35
35
|
const workers = new Set<string>(); // used to avoid exposing workers that are not running with tunneling enabled
|
|
36
36
|
const proxy = await createMiniflareWorkerProxy({
|
|
37
37
|
port: await findOpenPort(9977), // alchemy auth uses 9976, so one above that
|
|
38
|
-
|
|
38
|
+
getMiniflare,
|
|
39
39
|
mode: "remote",
|
|
40
40
|
transformRequest: (request) => {
|
|
41
41
|
if (request.url.origin === remote.origin) {
|
package/workers/tunnel-proxy.js
CHANGED
|
@@ -83,7 +83,7 @@ const renderErrorHtml = (props) => `
|
|
|
83
83
|
Alchemy</a>.</p>
|
|
84
84
|
</div>
|
|
85
85
|
<div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
|
|
86
|
-
<p class="text-sm text-slate-500">Alchemy 0.93.
|
|
86
|
+
<p class="text-sm text-slate-500">Alchemy 0.93.4</p>
|
|
87
87
|
</div>
|
|
88
88
|
</div>
|
|
89
89
|
</body>
|