alchemy 0.66.0 → 0.67.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 +10 -4
- package/bin/services/find-workspace-root.ts +1 -1
- package/lib/alchemy.d.ts +6 -0
- package/lib/alchemy.d.ts.map +1 -1
- package/lib/alchemy.js +1 -0
- package/lib/alchemy.js.map +1 -1
- package/lib/cloudflare/bindings.d.ts +17 -5
- package/lib/cloudflare/bindings.d.ts.map +1 -1
- package/lib/cloudflare/bindings.js +3 -1
- package/lib/cloudflare/bindings.js.map +1 -1
- package/lib/cloudflare/bound.d.ts +4 -3
- package/lib/cloudflare/bound.d.ts.map +1 -1
- package/lib/cloudflare/bundle/internal-worker-bundle.d.ts +1 -1
- package/lib/cloudflare/bundle/internal-worker-bundle.d.ts.map +1 -1
- package/lib/cloudflare/bundle/internal-worker-bundle.js.map +1 -1
- package/lib/cloudflare/hyperdrive-ref.d.ts +23 -0
- package/lib/cloudflare/hyperdrive-ref.d.ts.map +1 -0
- package/lib/cloudflare/hyperdrive-ref.js +52 -0
- package/lib/cloudflare/hyperdrive-ref.js.map +1 -0
- package/lib/cloudflare/index.d.ts +2 -0
- package/lib/cloudflare/index.d.ts.map +1 -1
- package/lib/cloudflare/index.js +2 -0
- package/lib/cloudflare/index.js.map +1 -1
- package/lib/cloudflare/miniflare/build-worker-options.d.ts +2 -1
- package/lib/cloudflare/miniflare/build-worker-options.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/build-worker-options.js +11 -6
- package/lib/cloudflare/miniflare/build-worker-options.js.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-controller.d.ts +3 -1
- package/lib/cloudflare/miniflare/miniflare-controller.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-controller.js +24 -9
- package/lib/cloudflare/miniflare/miniflare-controller.js.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts +24 -13
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.js +95 -79
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.js.map +1 -1
- package/lib/cloudflare/miniflare/tunnel.d.ts +18 -0
- package/lib/cloudflare/miniflare/tunnel.d.ts.map +1 -0
- package/lib/cloudflare/miniflare/tunnel.js +79 -0
- package/lib/cloudflare/miniflare/tunnel.js.map +1 -0
- package/lib/cloudflare/next.d.ts.map +1 -1
- package/lib/cloudflare/next.js +3 -0
- package/lib/cloudflare/next.js.map +1 -1
- package/lib/cloudflare/quick-tunnel.d.ts +1 -1
- package/lib/cloudflare/secret-ref.d.ts +38 -0
- package/lib/cloudflare/secret-ref.d.ts.map +1 -0
- package/lib/cloudflare/secret-ref.js +38 -0
- package/lib/cloudflare/secret-ref.js.map +1 -0
- package/lib/cloudflare/worker-metadata.d.ts +1 -1
- package/lib/cloudflare/worker-metadata.d.ts.map +1 -1
- package/lib/cloudflare/worker-metadata.js +7 -9
- package/lib/cloudflare/worker-metadata.js.map +1 -1
- package/lib/cloudflare/worker.d.ts +16 -1
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +12 -0
- package/lib/cloudflare/worker.js.map +1 -1
- package/lib/cloudflare/wrangler.json.d.ts +2 -1
- package/lib/cloudflare/wrangler.json.d.ts.map +1 -1
- package/lib/cloudflare/wrangler.json.js +4 -6
- package/lib/cloudflare/wrangler.json.js.map +1 -1
- package/lib/llms.cloudflare.txt +1 -1
- package/lib/scope.d.ts +10 -1
- package/lib/scope.d.ts.map +1 -1
- package/lib/scope.js +3 -1
- package/lib/scope.js.map +1 -1
- package/lib/util/idempotent-spawn.d.ts.map +1 -1
- package/lib/util/idempotent-spawn.js +5 -8
- package/lib/util/idempotent-spawn.js.map +1 -1
- package/package.json +1 -1
- package/src/alchemy.ts +7 -0
- package/src/cloudflare/bindings.ts +21 -4
- package/src/cloudflare/bound.ts +50 -52
- package/src/cloudflare/bundle/internal-worker-bundle.ts +2 -1
- package/src/cloudflare/hyperdrive-ref.ts +98 -0
- package/src/cloudflare/index.ts +2 -0
- package/src/cloudflare/miniflare/build-worker-options.ts +21 -12
- package/src/cloudflare/miniflare/miniflare-controller.ts +27 -12
- package/src/cloudflare/miniflare/miniflare-worker-proxy.ts +122 -102
- package/src/cloudflare/miniflare/tunnel.ts +116 -0
- package/src/cloudflare/next.ts +3 -0
- package/src/cloudflare/secret-ref.ts +56 -0
- package/src/cloudflare/worker-metadata.ts +14 -12
- package/src/cloudflare/worker.ts +32 -1
- package/src/cloudflare/wrangler.json.ts +13 -11
- package/src/llms.cloudflare.txt +1 -1
- package/src/scope.ts +12 -1
- package/src/util/idempotent-spawn.ts +5 -6
- package/templates/rwsdk/.cursor/rules/alchemy_cloudflare.mdc +1 -1
- package/templates/rwsdk/package.json +3 -3
- package/workers/tunnel-proxy.js +110 -0
- package/workers/tunnel-proxy.ts +121 -0
|
@@ -2,7 +2,8 @@ import * as miniflare from "miniflare";
|
|
|
2
2
|
import type { HTTPServer } from "../../util/http.ts";
|
|
3
3
|
import { AsyncMutex } from "../../util/mutex.ts";
|
|
4
4
|
import { type MiniflareWorkerInput } from "./build-worker-options.ts";
|
|
5
|
-
import { MiniflareWorkerProxy } from "./miniflare-worker-proxy.ts";
|
|
5
|
+
import { type MiniflareWorkerProxy } from "./miniflare-worker-proxy.ts";
|
|
6
|
+
import { type Tunnel } from "./tunnel.ts";
|
|
6
7
|
declare global {
|
|
7
8
|
var ALCHEMY_MINIFLARE_CONTROLLER: MiniflareController | undefined;
|
|
8
9
|
}
|
|
@@ -10,6 +11,7 @@ export declare class MiniflareController {
|
|
|
10
11
|
abort: AbortController;
|
|
11
12
|
miniflare: miniflare.Miniflare | undefined;
|
|
12
13
|
options: Map<string, miniflare.WorkerOptions>;
|
|
14
|
+
tunnel: Tunnel | undefined;
|
|
13
15
|
localProxies: Map<string, MiniflareWorkerProxy>;
|
|
14
16
|
remoteProxies: Map<string, HTTPServer>;
|
|
15
17
|
mutex: AsyncMutex;
|
|
@@ -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,
|
|
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,uCAA8C;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;YAsCvB,KAAK;YAiBL,MAAM;YA4CN,mBAAmB;IAuB3B,OAAO;CASd"}
|
|
@@ -6,12 +6,14 @@ import { findOpenPort } from "../../util/find-open-port.js";
|
|
|
6
6
|
import { logger } from "../../util/logger.js";
|
|
7
7
|
import { AsyncMutex } from "../../util/mutex.js";
|
|
8
8
|
import { buildWorkerOptions, } from "./build-worker-options.js";
|
|
9
|
-
import {
|
|
9
|
+
import { createMiniflareWorkerProxy, } from "./miniflare-worker-proxy.js";
|
|
10
10
|
import { getDefaultPersistPath } from "./paths.js";
|
|
11
|
+
import { createTunnel } from "./tunnel.js";
|
|
11
12
|
export class MiniflareController {
|
|
12
13
|
abort = new AbortController();
|
|
13
14
|
miniflare;
|
|
14
15
|
options = new Map();
|
|
16
|
+
tunnel;
|
|
15
17
|
localProxies = new Map();
|
|
16
18
|
remoteProxies = new Map();
|
|
17
19
|
mutex = new AsyncMutex();
|
|
@@ -29,21 +31,33 @@ export class MiniflareController {
|
|
|
29
31
|
assert(first.value, "First value is undefined");
|
|
30
32
|
this.options.set(input.name, first.value);
|
|
31
33
|
const miniflare = await this.update();
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
34
|
+
let url;
|
|
35
|
+
if (input.tunnel) {
|
|
36
|
+
this.tunnel ??= await createTunnel(miniflare);
|
|
37
|
+
url = await this.tunnel.configureWorker({
|
|
38
|
+
api: input.api,
|
|
39
|
+
name: input.name,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
const proxy = await createMiniflareWorkerProxy({
|
|
44
|
+
port: input.port ?? (await findOpenPort()),
|
|
45
|
+
getWorkerName: () => input.name,
|
|
46
|
+
miniflare,
|
|
47
|
+
mode: "local",
|
|
48
|
+
});
|
|
49
|
+
this.localProxies.set(input.name, proxy);
|
|
50
|
+
url = proxy.url;
|
|
51
|
+
}
|
|
38
52
|
void this.watch(input.id, watcher);
|
|
39
53
|
logger.task(input.id, {
|
|
40
|
-
message: `Ready at ${
|
|
54
|
+
message: `Ready at ${url}`,
|
|
41
55
|
status: "success",
|
|
42
56
|
resource: input.id,
|
|
43
57
|
prefix: "dev",
|
|
44
58
|
prefixColor: "cyanBright",
|
|
45
59
|
});
|
|
46
|
-
return
|
|
60
|
+
return url.toString();
|
|
47
61
|
}
|
|
48
62
|
async watch(id, watcher) {
|
|
49
63
|
for await (const options of watcher) {
|
|
@@ -124,6 +138,7 @@ export class MiniflareController {
|
|
|
124
138
|
this.abort.abort();
|
|
125
139
|
await Promise.all([
|
|
126
140
|
this.miniflare?.dispose(),
|
|
141
|
+
this.tunnel?.close(),
|
|
127
142
|
...this.localProxies.values().map((proxy) => proxy.close()),
|
|
128
143
|
...this.remoteProxies.values().map((proxy) => proxy.close()),
|
|
129
144
|
]);
|
|
@@ -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,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,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,
|
|
1
|
+
{"version":3,"file":"miniflare-controller.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,31 @@
|
|
|
1
1
|
import * as miniflare from "miniflare";
|
|
2
|
-
interface
|
|
3
|
-
|
|
2
|
+
export interface MiniflareWorkerProxy {
|
|
3
|
+
url: URL;
|
|
4
|
+
close: () => Promise<void>;
|
|
5
|
+
}
|
|
6
|
+
export declare function createMiniflareWorkerProxy(options: {
|
|
4
7
|
port: number;
|
|
8
|
+
transformRequest?: (request: RequestInfo) => void;
|
|
9
|
+
getWorkerName: (request: miniflare.Request) => string;
|
|
5
10
|
miniflare: miniflare.Miniflare;
|
|
11
|
+
mode: "local" | "remote";
|
|
12
|
+
}): Promise<{
|
|
13
|
+
url: URL;
|
|
14
|
+
close: () => Promise<void>;
|
|
15
|
+
}>;
|
|
16
|
+
interface RequestInfo {
|
|
17
|
+
method: string;
|
|
18
|
+
url: URL;
|
|
19
|
+
headers: miniflare.Headers;
|
|
20
|
+
body: miniflare.BodyInit | undefined;
|
|
21
|
+
redirect: "manual";
|
|
22
|
+
duplex: "half" | undefined;
|
|
6
23
|
}
|
|
7
|
-
export declare class
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
get ready(): Promise<void> | Promise<any[]>;
|
|
13
|
-
get url(): string;
|
|
14
|
-
close(): Promise<void>;
|
|
15
|
-
private handleUpgrade;
|
|
16
|
-
private createServerWebSocket;
|
|
17
|
-
private handleRequest;
|
|
24
|
+
export declare class MiniflareWorkerProxyError extends Error {
|
|
25
|
+
readonly status: number;
|
|
26
|
+
constructor(message: string, status: number, options?: ErrorOptions);
|
|
27
|
+
toResponse(mode: "local" | "remote"): miniflare.Response;
|
|
28
|
+
static fromUnknown(error: unknown): MiniflareWorkerProxyError;
|
|
18
29
|
}
|
|
19
30
|
export {};
|
|
20
31
|
//# 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":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;
|
|
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;AAMvC,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,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC;IACtD,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC;IAC/B,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC1B;;;GAyEA;AAED,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;AA8CD,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"}
|
|
@@ -3,95 +3,79 @@ import { once } from "node:events";
|
|
|
3
3
|
import http from "node:http";
|
|
4
4
|
import { Readable } from "node:stream";
|
|
5
5
|
import { WebSocket, WebSocketServer } from "ws";
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
server
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
this.server.listen(this.options.port);
|
|
20
|
-
}
|
|
21
|
-
get ready() {
|
|
22
|
-
if (!this.server.listening) {
|
|
23
|
-
return once(this.server, "listening");
|
|
6
|
+
export async function createMiniflareWorkerProxy(options) {
|
|
7
|
+
const server = http.createServer();
|
|
8
|
+
const wss = new WebSocketServer({ noServer: true });
|
|
9
|
+
server.on("upgrade", async (req, socket, head) => {
|
|
10
|
+
try {
|
|
11
|
+
const server = await createServerWebSocket(req);
|
|
12
|
+
wss.handleUpgrade(req, socket, head, (client) => {
|
|
13
|
+
client.on("message", (event, binary) => server.send(event, { binary }));
|
|
14
|
+
client.on("close", (code, reason) => server.close(code, reason));
|
|
15
|
+
server.on("message", (event, binary) => client.send(event, { binary }));
|
|
16
|
+
server.on("close", (code, reason) => client.close(code, reason));
|
|
17
|
+
wss.emit("connection", client, req);
|
|
18
|
+
});
|
|
24
19
|
}
|
|
25
|
-
|
|
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) {
|
|
20
|
+
catch (error) {
|
|
21
|
+
console.error(error);
|
|
39
22
|
socket.destroy();
|
|
40
|
-
return;
|
|
41
23
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
async createServerWebSocket(req) {
|
|
51
|
-
const target = await this.options.miniflare.unsafeGetDirectURL(this.options.name);
|
|
52
|
-
if (!target) {
|
|
53
|
-
logger.error(`[Alchemy] Websocket connection failed: The worker "${this.options.name}" is not running.`);
|
|
54
|
-
return null;
|
|
24
|
+
});
|
|
25
|
+
server.on("request", async (req, res) => {
|
|
26
|
+
try {
|
|
27
|
+
const request = toMiniflareRequest(req);
|
|
28
|
+
const name = options.getWorkerName(request);
|
|
29
|
+
const worker = await options.miniflare.getWorker(name);
|
|
30
|
+
const response = await worker.fetch(request);
|
|
31
|
+
writeMiniflareResponseToNode(response, res);
|
|
55
32
|
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
console.error(error);
|
|
35
|
+
const response = MiniflareWorkerProxyError.fromUnknown(error).toResponse(options.mode);
|
|
36
|
+
writeMiniflareResponseToNode(response, res);
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
const toMiniflareRequest = (req) => {
|
|
40
|
+
const info = parseIncomingMessage(req);
|
|
41
|
+
options.transformRequest?.(info);
|
|
42
|
+
return new miniflare.Request(info.url, {
|
|
43
|
+
method: info.method,
|
|
44
|
+
headers: info.headers,
|
|
45
|
+
body: info.body,
|
|
46
|
+
redirect: info.redirect,
|
|
47
|
+
duplex: info.duplex,
|
|
48
|
+
});
|
|
49
|
+
};
|
|
50
|
+
const createServerWebSocket = async (req) => {
|
|
51
|
+
const name = options.getWorkerName(toMiniflareRequest(req));
|
|
52
|
+
const target = await options.miniflare.unsafeGetDirectURL(name);
|
|
56
53
|
const url = new URL(req.url ?? "/", target);
|
|
57
54
|
url.protocol = url.protocol.replace("http", "ws");
|
|
58
55
|
const protocols = req.headers["sec-websocket-protocol"]
|
|
59
56
|
?.split(",")
|
|
60
57
|
.map((p) => p.trim());
|
|
61
58
|
const server = new WebSocket(url, protocols);
|
|
62
|
-
|
|
63
|
-
return
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
return;
|
|
78
|
-
}
|
|
79
|
-
try {
|
|
80
|
-
const response = await worker.fetch(toMiniflareRequest(req));
|
|
81
|
-
writeMiniflareResponseToNode(response, res);
|
|
82
|
-
}
|
|
83
|
-
catch (rawError) {
|
|
84
|
-
const message = rawError instanceof Error
|
|
85
|
-
? (rawError.stack ?? rawError.message)
|
|
86
|
-
: String(rawError);
|
|
87
|
-
res.statusCode = 500;
|
|
88
|
-
res.end(`[Alchemy] The worker "${this.options.name}" threw an error:\n\n${message}`);
|
|
89
|
-
}
|
|
90
|
-
}
|
|
59
|
+
await once(server, "open");
|
|
60
|
+
return server;
|
|
61
|
+
};
|
|
62
|
+
server.listen(options.port);
|
|
63
|
+
await once(server, "listening");
|
|
64
|
+
const url = new URL(`http://localhost:${options.port}`);
|
|
65
|
+
return {
|
|
66
|
+
url,
|
|
67
|
+
close: async () => {
|
|
68
|
+
await Promise.all([
|
|
69
|
+
new Promise((resolve) => server.close(resolve)),
|
|
70
|
+
new Promise((resolve) => wss.close(resolve)),
|
|
71
|
+
]);
|
|
72
|
+
},
|
|
73
|
+
};
|
|
91
74
|
}
|
|
92
|
-
const
|
|
75
|
+
const parseIncomingMessage = (req) => {
|
|
93
76
|
const method = req.method ?? "GET";
|
|
94
|
-
const
|
|
77
|
+
const protocol = req.headers["x-forwarded-proto"] ?? "http";
|
|
78
|
+
const url = new URL(req.url ?? "/", `${protocol}://${req.headers.host}`);
|
|
95
79
|
const headers = new miniflare.Headers();
|
|
96
80
|
for (const [key, value] of Object.entries(req.headers)) {
|
|
97
81
|
if (Array.isArray(value)) {
|
|
@@ -106,13 +90,14 @@ const toMiniflareRequest = (req) => {
|
|
|
106
90
|
const body = ["GET", "HEAD", "OPTIONS"].includes(method) || !req.readable
|
|
107
91
|
? undefined
|
|
108
92
|
: Readable.toWeb(req);
|
|
109
|
-
return
|
|
93
|
+
return {
|
|
110
94
|
method,
|
|
95
|
+
url,
|
|
111
96
|
headers,
|
|
112
97
|
body,
|
|
113
98
|
redirect: "manual",
|
|
114
99
|
duplex: body ? "half" : undefined,
|
|
115
|
-
}
|
|
100
|
+
};
|
|
116
101
|
};
|
|
117
102
|
const writeMiniflareResponseToNode = (res, out) => {
|
|
118
103
|
out.statusCode = res.status;
|
|
@@ -126,4 +111,35 @@ const writeMiniflareResponseToNode = (res, out) => {
|
|
|
126
111
|
out.end();
|
|
127
112
|
}
|
|
128
113
|
};
|
|
114
|
+
export class MiniflareWorkerProxyError extends Error {
|
|
115
|
+
status;
|
|
116
|
+
constructor(message, status, options) {
|
|
117
|
+
super(message, options);
|
|
118
|
+
this.status = status;
|
|
119
|
+
}
|
|
120
|
+
toResponse(mode) {
|
|
121
|
+
let text = `[Alchemy] ${this.message}`;
|
|
122
|
+
if (mode === "local" && this.cause) {
|
|
123
|
+
const cause = this.cause instanceof Error
|
|
124
|
+
? (this.cause.stack ?? this.cause.message)
|
|
125
|
+
: String(this.cause);
|
|
126
|
+
text += `\n\n${cause}`;
|
|
127
|
+
}
|
|
128
|
+
return new miniflare.Response(text, {
|
|
129
|
+
status: this.status,
|
|
130
|
+
headers: {
|
|
131
|
+
"Content-Type": "text/plain",
|
|
132
|
+
"Alchemy-Error": this.message,
|
|
133
|
+
},
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
static fromUnknown(error) {
|
|
137
|
+
if (error instanceof MiniflareWorkerProxyError) {
|
|
138
|
+
return error;
|
|
139
|
+
}
|
|
140
|
+
return new MiniflareWorkerProxyError("An unknown error occurred.", 500, {
|
|
141
|
+
cause: error,
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
}
|
|
129
145
|
//# 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":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"miniflare-worker-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type * as miniflare from "miniflare";
|
|
2
|
+
import type { CloudflareApi } from "../api.ts";
|
|
3
|
+
export interface Tunnel {
|
|
4
|
+
/**
|
|
5
|
+
* Enables tunneling for a local worker.
|
|
6
|
+
* Returns a `workers.dev` URL that can be used to access the worker.
|
|
7
|
+
*/
|
|
8
|
+
configureWorker: (input: {
|
|
9
|
+
api: CloudflareApi;
|
|
10
|
+
name: string;
|
|
11
|
+
}) => Promise<URL>;
|
|
12
|
+
/**
|
|
13
|
+
* Closes the tunnel.
|
|
14
|
+
*/
|
|
15
|
+
close: () => Promise<void>;
|
|
16
|
+
}
|
|
17
|
+
export declare function createTunnel(miniflare: miniflare.Miniflare): Promise<Tunnel>;
|
|
18
|
+
//# sourceMappingURL=tunnel.d.ts.map
|
|
@@ -0,0 +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,SAAS,EAAE,SAAS,CAAC,SAAS,GAC7B,OAAO,CAAC,MAAM,CAAC,CAwDjB"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { Scope } from "../../scope.js";
|
|
2
|
+
import { findOpenPort } from "../../util/find-open-port.js";
|
|
3
|
+
import { getInternalWorkerBundle } from "../bundle/internal-worker-bundle.js";
|
|
4
|
+
import { enableWorkerSubdomain, getAccountSubdomain, getWorkerSubdomain, } from "../worker-subdomain.js";
|
|
5
|
+
import { putWorker } from "../worker.js";
|
|
6
|
+
import { createMiniflareWorkerProxy, MiniflareWorkerProxyError, } from "./miniflare-worker-proxy.js";
|
|
7
|
+
export async function createTunnel(miniflare) {
|
|
8
|
+
const workers = new Set(); // used to avoid exposing workers that are not running with tunneling enabled
|
|
9
|
+
const proxy = await createMiniflareWorkerProxy({
|
|
10
|
+
port: await findOpenPort(9977), // alchemy auth uses 9976, so one above that
|
|
11
|
+
miniflare,
|
|
12
|
+
mode: "remote",
|
|
13
|
+
transformRequest: (request) => {
|
|
14
|
+
if (request.url.origin === remote.origin) {
|
|
15
|
+
request.url.protocol = proxy.url.protocol;
|
|
16
|
+
request.url.host = proxy.url.host;
|
|
17
|
+
request.url.port = proxy.url.port;
|
|
18
|
+
request.headers.set("host", proxy.url.host);
|
|
19
|
+
}
|
|
20
|
+
},
|
|
21
|
+
getWorkerName: (request) => {
|
|
22
|
+
const name = request.headers.get("alchemy-worker-name");
|
|
23
|
+
if (!name) {
|
|
24
|
+
throw new MiniflareWorkerProxyError("Worker name is missing from request headers. This indicates a bug in Alchemy.", 530);
|
|
25
|
+
}
|
|
26
|
+
if (!workers.has(name)) {
|
|
27
|
+
throw new MiniflareWorkerProxyError(`The worker "${name}" is not running with tunneling enabled.`, 530);
|
|
28
|
+
}
|
|
29
|
+
return name;
|
|
30
|
+
},
|
|
31
|
+
});
|
|
32
|
+
const remoteUrlString = await Scope.current.spawn("tunnel", {
|
|
33
|
+
processName: `cloudflared-${proxy.url.port}`,
|
|
34
|
+
cmd: `cloudflared tunnel --url ${proxy.url.toString()}`,
|
|
35
|
+
quiet: !process.env.DEBUG,
|
|
36
|
+
extract: (line) => {
|
|
37
|
+
const match = line.match(/https:\/\/([^\s]+)\.trycloudflare\.com/);
|
|
38
|
+
if (match) {
|
|
39
|
+
return `https://${match[1]}.trycloudflare.com`;
|
|
40
|
+
}
|
|
41
|
+
},
|
|
42
|
+
});
|
|
43
|
+
const remote = new URL(remoteUrlString);
|
|
44
|
+
return {
|
|
45
|
+
configureWorker: async (input) => {
|
|
46
|
+
workers.add(input.name);
|
|
47
|
+
return await createTunnelProxyWorker({
|
|
48
|
+
api: input.api,
|
|
49
|
+
name: input.name,
|
|
50
|
+
host: remote.host,
|
|
51
|
+
});
|
|
52
|
+
},
|
|
53
|
+
close: async () => {
|
|
54
|
+
await proxy.close();
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
async function createTunnelProxyWorker(input) {
|
|
59
|
+
const script = await getInternalWorkerBundle("tunnel-proxy");
|
|
60
|
+
const [accountSubdomain, workerSubdomainStatus] = await Promise.all([
|
|
61
|
+
getAccountSubdomain(input.api),
|
|
62
|
+
getWorkerSubdomain(input.api, input.name),
|
|
63
|
+
putWorker(input.api, {
|
|
64
|
+
workerName: input.name,
|
|
65
|
+
scriptBundle: script.bundle,
|
|
66
|
+
compatibilityDate: "2025-09-01",
|
|
67
|
+
compatibilityFlags: [],
|
|
68
|
+
bindings: {
|
|
69
|
+
WORKER_NAME: input.name,
|
|
70
|
+
TUNNEL_HOST: input.host,
|
|
71
|
+
},
|
|
72
|
+
}),
|
|
73
|
+
]);
|
|
74
|
+
if (!workerSubdomainStatus.enabled) {
|
|
75
|
+
await enableWorkerSubdomain(input.api, input.name);
|
|
76
|
+
}
|
|
77
|
+
return new URL(`https://${input.name}.${accountSubdomain}.workers.dev`);
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=tunnel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/tunnel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../../src/cloudflare/next.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,QAAQ,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;CAAG;AAE3E,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC9D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC,wBAAsB,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,QAAQ,EACnD,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,WAAW,CAAC,CAAC,CAAM,GACzB,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../../src/cloudflare/next.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,QAAQ,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;CAAG;AAE3E,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC9D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC,wBAAsB,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,QAAQ,EACnD,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,WAAW,CAAC,CAAC,CAAM,GACzB,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAgDpB"}
|
package/lib/cloudflare/next.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next.js","sourceRoot":"","sources":["../../src/cloudflare/next.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EAAE,OAAO,EAAqB,MAAM,cAAc,CAAC;AAS1D,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,EAAU,EACV,QAAwB,EAAE;IAE1B,MAAM,MAAM,GAAG,MAAM,uBAAuB,EAAE,CAAC;IAC/C,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,gBAAgB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnE,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CACT;YACE,EAAE,CAAC,IAAI,CACL,OAAO,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,CAC1F;YACD,6EAA6E;SAC9E,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,OAAO,CAAC,EAAE,EAAE;QACvB,GAAG,KAAK;QACR,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,sBAAsB;QACtD,QAAQ,EAAE;YACR,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,SAAS;YAClB,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;SAC1B;QACD,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE;YACnC,OAAO,EAAE,GAAG,MAAM,8BAA8B;YAChD,GAAG,EAAE;gBACH,UAAU,EAAE,YAAY;aACzB;SACF,CAAC;QACF,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG,EAAE;YAC/B,OAAO,EAAE,GAAG,MAAM,WAAW;YAC7B,GAAG,EAAE;gBACH,UAAU,EAAE,aAAa;aAC1B;SACF,CAAC;QAEF,iEAAiE;QACjE,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;QAEjC,GAAG,EAAE,KAAK;QACV,kBAAkB,EAAE;YAClB,eAAe;YACf,8BAA8B;YAC9B,GAAG,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC;SACpC;QACD,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,mBAAmB;KAC5C,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAAE,GAAY,EAAE,EAAE;IAC7D,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC;IAEzB,wEAAwE;IACxE,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,OAAO,UAAU,KAAK,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAC1D,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAClE,yCAAyC;YACzC,iBAAiB,CAAC,OAAO,CACvB,GAAG,gBAAgB;iBAChB,KAAK,CAAC,IAAI,CAAC;iBACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAC1D,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,0DAA0D;QAC5D,CAAC;QACD,IAAI,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;YAChD,MAAM;QACR,CAAC;QACD,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAE/B,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACvB,KAAiC,EACjC,QAGC,EAC2B,EAAE;IAC9B,OAAO;QACL,OAAO,EACL,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC;QAC1E,GAAG,EAAE;YACH,GAAG,QAAQ,CAAC,GAAG;YACf,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD;QACD,OAAO,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS;KAChE,CAAC;AACJ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"next.js","sourceRoot":"","sources":["../../src/cloudflare/next.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { type CloudflareApiOptions } from "./api.ts";
|
|
2
|
+
import { SecretsStore } from "./secrets-store.ts";
|
|
3
|
+
/**
|
|
4
|
+
* Properties for referencing an existing Secret in a Secrets Store (without managing its value)
|
|
5
|
+
*/
|
|
6
|
+
export interface SecretRefProps extends CloudflareApiOptions {
|
|
7
|
+
name: string;
|
|
8
|
+
store?: SecretsStore;
|
|
9
|
+
}
|
|
10
|
+
export type SecretRef = {
|
|
11
|
+
type: "secrets_store_secret";
|
|
12
|
+
name: string;
|
|
13
|
+
storeId: string;
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* SecretRef references an existing secret by name in a Secrets Store.
|
|
17
|
+
*
|
|
18
|
+
* It does not create or update the secret value – use {@link Secret} for that.
|
|
19
|
+
*
|
|
20
|
+
* Behavior:
|
|
21
|
+
* - Resolves the target secrets store ID (defaults to Cloudflare's `default_secrets_store`, creating/adopting if needed)
|
|
22
|
+
* - Exposes a binding of type `secrets_store_secret` usable in Worker bindings
|
|
23
|
+
* - Update with a different name will trigger resource replacement
|
|
24
|
+
* - Delete is a no-op in Cloudflare (resource removed from state only)
|
|
25
|
+
*
|
|
26
|
+
* @example
|
|
27
|
+
* // Reference an existing secret in the default store and bind to a Worker
|
|
28
|
+
* const apiKeyRef = await SecretRef("api-key-ref", { name: "API_KEY" });
|
|
29
|
+
* const worker = await Worker("my-worker", {
|
|
30
|
+
* entrypoint: "./src/worker.ts",
|
|
31
|
+
* url: true,
|
|
32
|
+
* bindings: {
|
|
33
|
+
* API_KEY: apiKeyRef,
|
|
34
|
+
* },
|
|
35
|
+
* });
|
|
36
|
+
*/
|
|
37
|
+
export declare function SecretRef(props: SecretRefProps): Promise<SecretRef>;
|
|
38
|
+
//# sourceMappingURL=secret-ref.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secret-ref.d.ts","sourceRoot":"","sources":["../../src/cloudflare/secret-ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAA0B,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,cAAe,SAAQ,oBAAoB;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,sBAAsB,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAgBzE"}
|