alchemy 0.51.1 → 0.51.2
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/cloudflare/miniflare/miniflare-worker-options.js +2 -2
- package/lib/cloudflare/miniflare/miniflare-worker-options.js.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts +14 -14
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.js +123 -66
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.js.map +1 -1
- package/lib/cloudflare/miniflare/miniflare.d.ts +12 -7
- package/lib/cloudflare/miniflare/miniflare.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare.js +17 -55
- package/lib/cloudflare/miniflare/miniflare.js.map +1 -1
- package/lib/scope.d.ts.map +1 -1
- package/lib/scope.js +4 -3
- package/lib/scope.js.map +1 -1
- package/lib/state/instrumented-state-store.d.ts +19 -0
- package/lib/state/instrumented-state-store.d.ts.map +1 -0
- package/lib/state/instrumented-state-store.js +59 -0
- package/lib/state/instrumented-state-store.js.map +1 -0
- package/lib/util/telemetry/client.d.ts.map +1 -1
- package/lib/util/telemetry/client.js +14 -12
- package/lib/util/telemetry/client.js.map +1 -1
- package/lib/util/telemetry/types.d.ts +8 -3
- package/lib/util/telemetry/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/cloudflare/miniflare/miniflare-worker-options.ts +2 -2
- package/src/cloudflare/miniflare/miniflare-worker-proxy.ts +148 -77
- package/src/cloudflare/miniflare/miniflare.ts +23 -79
- package/src/scope.ts +7 -3
- package/src/state/instrumented-state-store.ts +97 -0
- package/src/util/telemetry/client.ts +14 -12
- package/src/util/telemetry/types.ts +18 -2
|
@@ -172,8 +172,8 @@ export async function buildMiniflareWorkerOptions({ name: workerName, assets, bu
|
|
|
172
172
|
}))),
|
|
173
173
|
compatibilityDate,
|
|
174
174
|
compatibilityFlags,
|
|
175
|
-
//
|
|
176
|
-
//
|
|
175
|
+
// TODO: Setting `proxy: true` here causes the following error when connecting via a websocket:
|
|
176
|
+
// workerd/io/worker.c++:2164: info: uncaught exception; source = Uncaught (in promise); stack = TypeError: Invalid URL string.
|
|
177
177
|
unsafeDirectSockets: [{ proxy: false }],
|
|
178
178
|
containerEngine: {
|
|
179
179
|
localDocker: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare-worker-options.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-options.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"miniflare-worker-options.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
* (This is a hack; used because trying to interact with `response.webSocket` doesn't work on Bun.)
|
|
7
|
-
*/
|
|
8
|
-
getDirectURL: () => Promise<URL>;
|
|
9
|
-
/** Used to proxy HTTP requests to the worker. */
|
|
10
|
-
fetch: (request: Request) => Promise<Response>;
|
|
1
|
+
import * as miniflare from "miniflare";
|
|
2
|
+
interface MiniflareWorkerProxyOptions {
|
|
3
|
+
name: string;
|
|
4
|
+
port: number;
|
|
5
|
+
miniflare: miniflare.Miniflare;
|
|
11
6
|
}
|
|
12
|
-
export declare class MiniflareWorkerProxy
|
|
7
|
+
export declare class MiniflareWorkerProxy {
|
|
13
8
|
private readonly options;
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
private server;
|
|
10
|
+
private wss;
|
|
16
11
|
constructor(options: MiniflareWorkerProxyOptions);
|
|
17
|
-
|
|
12
|
+
get ready(): Promise<void> | Promise<any[]>;
|
|
13
|
+
get url(): string;
|
|
18
14
|
close(): Promise<void>;
|
|
15
|
+
private handleUpgrade;
|
|
16
|
+
private createServerWebSocket;
|
|
17
|
+
private handleRequest;
|
|
19
18
|
}
|
|
19
|
+
export {};
|
|
20
20
|
//# sourceMappingURL=miniflare-worker-proxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare-worker-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"
|
|
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;AAQvC,UAAU,2BAA2B;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC;CAChC;AAED,qBAAa,oBAAoB;IAInB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,GAAG,CAA2C;gBAEzB,OAAO,EAAE,2BAA2B;IAUjE,IAAI,KAAK,mCAKR;IAED,IAAI,GAAG,WAEN;IAEK,KAAK;YAOG,aAAa;YA2Bb,qBAAqB;YA6BrB,aAAa;CAwB5B"}
|
|
@@ -1,80 +1,137 @@
|
|
|
1
|
+
import * as miniflare from "miniflare";
|
|
2
|
+
import { once } from "node:events";
|
|
3
|
+
import http from "node:http";
|
|
4
|
+
import { Readable } from "node:stream";
|
|
1
5
|
import { WebSocket, WebSocketServer } from "ws";
|
|
2
|
-
import {
|
|
3
|
-
export class MiniflareWorkerProxy
|
|
6
|
+
import { logger } from "../../util/logger.js";
|
|
7
|
+
export class MiniflareWorkerProxy {
|
|
4
8
|
options;
|
|
5
|
-
|
|
6
|
-
|
|
9
|
+
server = http.createServer();
|
|
10
|
+
wss = new WebSocketServer({ noServer: true });
|
|
7
11
|
constructor(options) {
|
|
8
|
-
super({
|
|
9
|
-
fetch: options.fetch,
|
|
10
|
-
});
|
|
11
12
|
this.options = options;
|
|
12
|
-
this.
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
});
|
|
13
|
+
this.server.on("upgrade", async (req, socket, head) => {
|
|
14
|
+
await this.handleUpgrade(req, socket, head);
|
|
15
|
+
});
|
|
16
|
+
this.server.on("request", async (req, res) => {
|
|
17
|
+
await this.handleRequest(req, res);
|
|
18
18
|
});
|
|
19
|
+
this.server.listen(this.options.port);
|
|
19
20
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
if (attempt > 3) {
|
|
24
|
-
client.close(1006, "Too many reconnect attempts");
|
|
25
|
-
return;
|
|
21
|
+
get ready() {
|
|
22
|
+
if (!this.server.listening) {
|
|
23
|
+
return once(this.server, "listening");
|
|
26
24
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
return Promise.resolve();
|
|
26
|
+
}
|
|
27
|
+
get url() {
|
|
28
|
+
return `http://localhost:${this.options.port}`;
|
|
29
|
+
}
|
|
30
|
+
async close() {
|
|
31
|
+
await Promise.all([
|
|
32
|
+
new Promise((resolve) => this.wss.close(resolve)),
|
|
33
|
+
new Promise((resolve) => this.server.close(resolve)),
|
|
34
|
+
]);
|
|
35
|
+
}
|
|
36
|
+
async handleUpgrade(req, socket, head) {
|
|
37
|
+
const server = await this.createServerWebSocket(req);
|
|
38
|
+
if (!server) {
|
|
39
|
+
socket.destroy();
|
|
40
|
+
return;
|
|
30
41
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
delete headers.host;
|
|
37
|
-
delete headers.connection;
|
|
38
|
-
delete headers.upgrade;
|
|
39
|
-
delete headers["sec-websocket-version"];
|
|
40
|
-
delete headers["sec-websocket-key"];
|
|
41
|
-
delete headers["sec-websocket-protocol"];
|
|
42
|
-
delete headers["sec-websocket-extensions"];
|
|
43
|
-
delete headers["sec-websocket-accept"];
|
|
44
|
-
const server = new WebSocket(url.toString(), {
|
|
45
|
-
protocol: request.headers["sec-websocket-protocol"],
|
|
46
|
-
key: request.headers["sec-websocket-key"],
|
|
47
|
-
headers,
|
|
48
|
-
});
|
|
49
|
-
server.on("open", () => {
|
|
50
|
-
// Reset the reconnect attempts when the connection is established successfully.
|
|
51
|
-
this.wsReconnectAttempts.set(id, 0);
|
|
52
|
-
});
|
|
53
|
-
server.on("message", (data, binary) => {
|
|
54
|
-
client.send(data, { binary });
|
|
55
|
-
});
|
|
56
|
-
server.on("close", async (code, reason) => {
|
|
57
|
-
if (code === 1006) {
|
|
58
|
-
// When the worker hot reloads, the websocket connection is closed with this code.
|
|
59
|
-
// Reconnecting allows the client to maintain the same connection.
|
|
60
|
-
await this.handleUpgrade(id, client, request);
|
|
61
|
-
return;
|
|
62
|
-
}
|
|
63
|
-
client.close(code, reason);
|
|
64
|
-
});
|
|
65
|
-
client.on("message", (data, binary) => {
|
|
66
|
-
server.send(data, { binary });
|
|
67
|
-
});
|
|
68
|
-
client.on("close", (code, reason) => {
|
|
69
|
-
this.wsReconnectAttempts.delete(id);
|
|
70
|
-
if (server.readyState === WebSocket.OPEN) {
|
|
42
|
+
this.wss.handleUpgrade(req, socket, head, (client) => {
|
|
43
|
+
client.on("message", (event, binary) => {
|
|
44
|
+
server.send(event, { binary });
|
|
45
|
+
});
|
|
46
|
+
client.on("close", (code, reason) => {
|
|
71
47
|
server.close(code, reason);
|
|
72
|
-
}
|
|
48
|
+
});
|
|
49
|
+
server.on("message", (event, binary) => {
|
|
50
|
+
client.send(event, { binary });
|
|
51
|
+
});
|
|
52
|
+
server.on("close", (code, reason) => {
|
|
53
|
+
client.close(code, reason);
|
|
54
|
+
});
|
|
55
|
+
this.wss.emit("connection", client, req);
|
|
73
56
|
});
|
|
74
57
|
}
|
|
75
|
-
async
|
|
76
|
-
this.
|
|
77
|
-
|
|
58
|
+
async createServerWebSocket(req) {
|
|
59
|
+
const target = await this.options.miniflare.unsafeGetDirectURL(this.options.name);
|
|
60
|
+
if (!target) {
|
|
61
|
+
logger.error(`[Alchemy] Websocket connection failed: The worker "${this.options.name}" is not running.`);
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
const url = new URL(req.url ?? "/", target);
|
|
65
|
+
url.protocol = url.protocol.replace("http", "ws");
|
|
66
|
+
const protocols = req.headers["sec-websocket-protocol"]
|
|
67
|
+
?.split(",")
|
|
68
|
+
.map((p) => p.trim());
|
|
69
|
+
const server = new WebSocket(url, protocols);
|
|
70
|
+
const controller = new AbortController();
|
|
71
|
+
return await Promise.race([
|
|
72
|
+
once(server, "open", { signal: controller.signal }).then(() => server),
|
|
73
|
+
once(server, "close", { signal: controller.signal }).then((args) => {
|
|
74
|
+
const [code, reason] = args;
|
|
75
|
+
logger.error(`[Alchemy] Websocket connection failed for worker "${this.options.name}": ${code} ${reason}`);
|
|
76
|
+
return null;
|
|
77
|
+
}),
|
|
78
|
+
]).finally(() => controller.abort());
|
|
79
|
+
}
|
|
80
|
+
async handleRequest(req, res) {
|
|
81
|
+
const worker = await this.options.miniflare.getWorker(this.options.name);
|
|
82
|
+
if (!worker) {
|
|
83
|
+
res.statusCode = 503;
|
|
84
|
+
res.end(`[Alchemy] The worker "${this.options.name}" is not running.`);
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
try {
|
|
88
|
+
const response = await worker.fetch(toMiniflareRequest(req));
|
|
89
|
+
writeMiniflareResponseToNode(response, res);
|
|
90
|
+
}
|
|
91
|
+
catch (rawError) {
|
|
92
|
+
const message = rawError instanceof Error
|
|
93
|
+
? (rawError.stack ?? rawError.message)
|
|
94
|
+
: String(rawError);
|
|
95
|
+
res.statusCode = 500;
|
|
96
|
+
res.end(`[Alchemy] The worker "${this.options.name}" threw an error:\n\n${message}`);
|
|
97
|
+
}
|
|
78
98
|
}
|
|
79
99
|
}
|
|
100
|
+
const toMiniflareRequest = (req) => {
|
|
101
|
+
const method = req.method ?? "GET";
|
|
102
|
+
const url = new URL(req.url ?? "/", `http://${req.headers.host}`);
|
|
103
|
+
const headers = new miniflare.Headers();
|
|
104
|
+
for (const [key, value] of Object.entries(req.headers)) {
|
|
105
|
+
if (Array.isArray(value)) {
|
|
106
|
+
for (const v of value) {
|
|
107
|
+
headers.append(key, v);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
else if (value) {
|
|
111
|
+
headers.set(key, value);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
const body = ["GET", "HEAD", "OPTIONS"].includes(method) || !req.readable
|
|
115
|
+
? undefined
|
|
116
|
+
: Readable.toWeb(req);
|
|
117
|
+
return new miniflare.Request(url, {
|
|
118
|
+
method,
|
|
119
|
+
headers,
|
|
120
|
+
body,
|
|
121
|
+
redirect: "manual",
|
|
122
|
+
duplex: body ? "half" : undefined,
|
|
123
|
+
});
|
|
124
|
+
};
|
|
125
|
+
const writeMiniflareResponseToNode = (res, out) => {
|
|
126
|
+
out.statusCode = res.status;
|
|
127
|
+
res.headers.forEach((value, key) => {
|
|
128
|
+
out.setHeader(key, value);
|
|
129
|
+
});
|
|
130
|
+
if (res.body) {
|
|
131
|
+
Readable.fromWeb(res.body).pipe(out, { end: true });
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
out.end();
|
|
135
|
+
}
|
|
136
|
+
};
|
|
80
137
|
//# sourceMappingURL=miniflare-worker-proxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare-worker-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"miniflare-worker-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,32 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as miniflare from "miniflare";
|
|
2
2
|
import { type PromiseWithResolvers } from "../../util/promise-with-resolvers.ts";
|
|
3
3
|
import { type MiniflareWorkerOptions } from "./miniflare-worker-options.ts";
|
|
4
4
|
import { MiniflareWorkerProxy } from "./miniflare-worker-proxy.ts";
|
|
5
5
|
import { type RemoteBindingProxy } from "./remote-binding-proxy.ts";
|
|
6
6
|
declare class MiniflareServer {
|
|
7
|
-
miniflare?: Miniflare;
|
|
8
|
-
workers: Map<string, WorkerOptions>;
|
|
7
|
+
miniflare?: miniflare.Miniflare;
|
|
8
|
+
workers: Map<string, miniflare.WorkerOptions>;
|
|
9
9
|
workerProxies: Map<string, MiniflareWorkerProxy>;
|
|
10
10
|
remoteBindingProxies: Map<string, RemoteBindingProxy>;
|
|
11
11
|
stream: WritableStream<{
|
|
12
12
|
worker: MiniflareWorkerOptions;
|
|
13
|
-
promise: PromiseWithResolvers<
|
|
13
|
+
promise: PromiseWithResolvers<{
|
|
14
|
+
url: string;
|
|
15
|
+
}>;
|
|
14
16
|
}>;
|
|
15
17
|
writer: WritableStreamDefaultWriter<{
|
|
16
18
|
worker: MiniflareWorkerOptions;
|
|
17
|
-
promise: PromiseWithResolvers<
|
|
19
|
+
promise: PromiseWithResolvers<{
|
|
20
|
+
url: string;
|
|
21
|
+
}>;
|
|
22
|
+
}>;
|
|
23
|
+
push(worker: MiniflareWorkerOptions): Promise<{
|
|
24
|
+
url: string;
|
|
18
25
|
}>;
|
|
19
|
-
push(worker: MiniflareWorkerOptions): Promise<MiniflareWorkerProxy>;
|
|
20
26
|
close(): Promise<void>;
|
|
21
27
|
private set;
|
|
22
28
|
private dispose;
|
|
23
29
|
private maybeCreateRemoteProxy;
|
|
24
|
-
private createRequestHandler;
|
|
25
30
|
private miniflareOptions;
|
|
26
31
|
}
|
|
27
32
|
export declare class ExternalDependencyError extends Error {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"miniflare.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAGvC,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,2BAA2B,CAAC;AAEnC,cAAM,eAAe;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC;IAChC,OAAO,uCAA8C;IACrD,aAAa,oCAA2C;IACxD,oBAAoB,kCAAyC;IAE7D,MAAM;gBACI,sBAAsB;iBACrB,oBAAoB,CAAC;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;OAa7C;IACH,MAAM;gBAfI,sBAAsB;iBACrB,oBAAoB,CAAC;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;OAcf;IAE3B,IAAI,CAAC,MAAM,EAAE,sBAAsB;aACK,MAAM;;IAQ9C,KAAK;YAIG,GAAG;YAqCH,OAAO;YAeP,sBAAsB;YAyBtB,gBAAgB;CAkB/B;AAED,qBAAa,uBAAwB,SAAQ,KAAK;;CAMjD;AAiBD,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,yBAAyB,EAAE,eAAe,GAAG,SAAS,CAAC;CAC5D;AAED,eAAO,MAAM,eAAe,iBAK1B,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as miniflare from "miniflare";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { findOpenPort } from "../../util/find-open-port.js";
|
|
4
|
-
import { logger } from "../../util/logger.js";
|
|
5
4
|
import { promiseWithResolvers, } from "../../util/promise-with-resolvers.js";
|
|
6
5
|
import { buildMiniflareWorkerOptions, buildRemoteBindings, } from "./miniflare-worker-options.js";
|
|
7
6
|
import { MiniflareWorkerProxy } from "./miniflare-worker-proxy.js";
|
|
@@ -46,9 +45,6 @@ class MiniflareServer {
|
|
|
46
45
|
await withErrorRewrite(this.miniflare.setOptions(await this.miniflareOptions()));
|
|
47
46
|
}
|
|
48
47
|
else {
|
|
49
|
-
const { Miniflare } = await import("miniflare").catch(() => {
|
|
50
|
-
throw new Error("Miniflare is not installed, but is required in local mode for Workers. Please run `npm install miniflare`.");
|
|
51
|
-
});
|
|
52
48
|
// Miniflare intercepts SIGINT and exits with 130, which is not a failure.
|
|
53
49
|
// No one likes to see a non-zero exit code when they Ctrl+C, so here's our workaround.
|
|
54
50
|
process.on("exit", (code) => {
|
|
@@ -56,26 +52,21 @@ class MiniflareServer {
|
|
|
56
52
|
process.exit(0);
|
|
57
53
|
}
|
|
58
54
|
});
|
|
59
|
-
this.miniflare = new Miniflare(await this.miniflareOptions());
|
|
55
|
+
this.miniflare = new miniflare.Miniflare(await this.miniflareOptions());
|
|
60
56
|
await withErrorRewrite(this.miniflare.ready);
|
|
61
57
|
}
|
|
62
|
-
const
|
|
63
|
-
if (
|
|
64
|
-
return
|
|
58
|
+
const existingProxy = this.workerProxies.get(worker.name);
|
|
59
|
+
if (existingProxy) {
|
|
60
|
+
return existingProxy;
|
|
65
61
|
}
|
|
66
|
-
const
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
throw new Error(`Worker "${worker.name}" is not running`);
|
|
71
|
-
}
|
|
72
|
-
return url;
|
|
73
|
-
},
|
|
74
|
-
fetch: this.createRequestHandler(worker.name),
|
|
62
|
+
const newProxy = new MiniflareWorkerProxy({
|
|
63
|
+
name: worker.name,
|
|
64
|
+
port: worker.port ?? (await findOpenPort()),
|
|
65
|
+
miniflare: this.miniflare,
|
|
75
66
|
});
|
|
76
|
-
this.workerProxies.set(worker.name,
|
|
77
|
-
await
|
|
78
|
-
return
|
|
67
|
+
this.workerProxies.set(worker.name, newProxy);
|
|
68
|
+
await newProxy.ready;
|
|
69
|
+
return newProxy;
|
|
79
70
|
}
|
|
80
71
|
async dispose() {
|
|
81
72
|
await Promise.all([
|
|
@@ -106,43 +97,11 @@ class MiniflareServer {
|
|
|
106
97
|
this.remoteBindingProxies.set(worker.name, proxy);
|
|
107
98
|
return proxy.connectionString;
|
|
108
99
|
}
|
|
109
|
-
createRequestHandler(name) {
|
|
110
|
-
return async (req) => {
|
|
111
|
-
try {
|
|
112
|
-
if (!this.miniflare) {
|
|
113
|
-
return new Response("[Alchemy] Miniflare is not initialized. Please try again.", {
|
|
114
|
-
status: 503,
|
|
115
|
-
});
|
|
116
|
-
}
|
|
117
|
-
const worker = await this.miniflare?.getWorker(name);
|
|
118
|
-
if (!worker) {
|
|
119
|
-
return new Response(`[Alchemy] Cannot find worker "${name}". Please try again.`, {
|
|
120
|
-
status: 503,
|
|
121
|
-
});
|
|
122
|
-
}
|
|
123
|
-
const res = await worker.fetch(req.url, {
|
|
124
|
-
method: req.method,
|
|
125
|
-
headers: req.headers,
|
|
126
|
-
body: req.body,
|
|
127
|
-
duplex: "half",
|
|
128
|
-
redirect: "manual",
|
|
129
|
-
});
|
|
130
|
-
return res;
|
|
131
|
-
}
|
|
132
|
-
catch (error) {
|
|
133
|
-
logger.error(error);
|
|
134
|
-
return new Response(`[Alchemy] Internal server error: ${String(error)}`, {
|
|
135
|
-
status: 500,
|
|
136
|
-
});
|
|
137
|
-
}
|
|
138
|
-
};
|
|
139
|
-
}
|
|
140
100
|
async miniflareOptions() {
|
|
141
|
-
const { getDefaultDevRegistryPath } = await import("miniflare");
|
|
142
101
|
return {
|
|
143
102
|
workers: Array.from(this.workers.values()),
|
|
144
103
|
defaultPersistRoot: path.join(process.cwd(), ".alchemy/miniflare"),
|
|
145
|
-
unsafeDevRegistryPath: getDefaultDevRegistryPath(),
|
|
104
|
+
unsafeDevRegistryPath: miniflare.getDefaultDevRegistryPath(),
|
|
146
105
|
analyticsEngineDatasetsPersist: true,
|
|
147
106
|
cachePersist: true,
|
|
148
107
|
d1Persist: true,
|
|
@@ -151,6 +110,9 @@ class MiniflareServer {
|
|
|
151
110
|
r2Persist: true,
|
|
152
111
|
secretsStorePersist: true,
|
|
153
112
|
workflowsPersist: true,
|
|
113
|
+
log: process.env.DEBUG
|
|
114
|
+
? new miniflare.Log(miniflare.LogLevel.DEBUG)
|
|
115
|
+
: undefined,
|
|
154
116
|
};
|
|
155
117
|
}
|
|
156
118
|
}
|
|
@@ -164,7 +126,7 @@ async function withErrorRewrite(promise) {
|
|
|
164
126
|
return await promise;
|
|
165
127
|
}
|
|
166
128
|
catch (error) {
|
|
167
|
-
if (error instanceof MiniflareCoreError &&
|
|
129
|
+
if (error instanceof miniflare.MiniflareCoreError &&
|
|
168
130
|
error.code === "ERR_MODULE_STRING_SCRIPT") {
|
|
169
131
|
throw new ExternalDependencyError();
|
|
170
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"miniflare.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare.ts"],"names":[],"mappings":"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"}
|
package/lib/scope.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../src/scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAuB,eAAe,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAEL,UAAU,EAIV,KAAK,eAAe,EACpB,KAAK,QAAQ,EACb,KAAK,aAAa,EACnB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAS,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../src/scope.ts"],"names":[],"mappings":"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"}
|
package/lib/scope.js
CHANGED
|
@@ -4,6 +4,7 @@ import { destroy, destroyAll, DestroyStrategy } from "./destroy.js";
|
|
|
4
4
|
import { ResourceFQN, ResourceID, ResourceKind, ResourceScope, ResourceSeq, } from "./resource.js";
|
|
5
5
|
import { D1StateStore } from "./state/d1-state-store.js";
|
|
6
6
|
import { FileSystemStateStore } from "./state/file-system-state-store.js";
|
|
7
|
+
import { InstrumentedStateStore } from "./state/instrumented-state-store.js";
|
|
7
8
|
import { createDummyLogger, createLoggerInstance, } from "./util/cli.js";
|
|
8
9
|
import { logger } from "./util/logger.js";
|
|
9
10
|
import { AsyncMutex } from "./util/mutex.js";
|
|
@@ -113,12 +114,12 @@ export class Scope {
|
|
|
113
114
|
}
|
|
114
115
|
this.stateStore =
|
|
115
116
|
options.stateStore ?? this.parent?.stateStore ?? defaultStateStore;
|
|
116
|
-
this.
|
|
117
|
+
this.telemetryClient =
|
|
118
|
+
options.telemetryClient ?? this.parent?.telemetryClient;
|
|
119
|
+
this.state = new InstrumentedStateStore(this.stateStore(this), this.telemetryClient);
|
|
117
120
|
if (!options.telemetryClient && !this.parent?.telemetryClient) {
|
|
118
121
|
throw new Error("Telemetry client is required");
|
|
119
122
|
}
|
|
120
|
-
this.telemetryClient =
|
|
121
|
-
options.telemetryClient ?? this.parent?.telemetryClient;
|
|
122
123
|
this.dataMutex = new AsyncMutex();
|
|
123
124
|
}
|
|
124
125
|
/**
|