alchemy 0.47.0 → 0.48.1

package/lib/cloudflare/miniflare/miniflare-worker-options.js

@@ -162,7 +162,7 @@ function buildRemoteBinding(name, binding) {
         }
     }
 }
-export async function buildMiniflareWorkerOptions({ name: workerName, bundle, bindings, format, eventSources, compatibilityDate, compatibilityFlags, remoteProxyConnectionString, }) {
+export async function buildMiniflareWorkerOptions({ name: workerName, assets, bundle, bindings, format, eventSources, compatibilityDate, compatibilityFlags, remoteProxyConnectionString, }) {
     const options = {
         name: workerName,
         modules: await Promise.all(bundle.files.map(async (file) => ({
@@ -172,7 +172,9 @@ export async function buildMiniflareWorkerOptions({ name: workerName, bundle, bi
         }))),
         compatibilityDate,
         compatibilityFlags,
-        unsafeDirectSockets: [{ entrypoint: undefined, proxy: true }],
+        // This was true for compatibility with the dev registry, but that doesn't work anyway,
+        // and if we don't set it to false, websocket connections fail. I'm confused.
+        unsafeDirectSockets: [{ proxy: false }],
         containerEngine: {
             localDocker: {
                 socketPath: process.platform === "win32"
@@ -224,6 +226,13 @@ export async function buildMiniflareWorkerOptions({ name: workerName, bundle, bi
                 options.assets = {
                     binding: name,
                     directory: binding.path,
+                    routerConfig: {
+                        invoke_user_worker_ahead_of_assets: assets?.run_worker_first === true,
+                    },
+                    assetConfig: {
+                        html_handling: assets?.html_handling,
+                        not_found_handling: assets?.not_found_handling,
+                    },
                 };
                 break;
             }

package/lib/cloudflare/miniflare/miniflare-worker-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"miniflare-worker-options.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"miniflare-worker-options.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-options.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts

@@ -0,0 +1,20 @@
+import { WebSocketServer } from "ws";
+import { HTTPServer } from "../../util/http.ts";
+export interface MiniflareWorkerProxyOptions {
+    /**
+     * Used to proxy websocket connections to the worker.
+     * (This is a hack; used because trying to interact with `response.webSocket` doesn't work on Bun.)
+     */
+    getDirectURL: () => Promise<URL>;
+    /** Used to proxy HTTP requests to the worker. */
+    fetch: (request: Request) => Promise<Response>;
+}
+export declare class MiniflareWorkerProxy extends HTTPServer {
+    private readonly options;
+    wsServer: WebSocketServer;
+    wsReconnectAttempts: Map<string, number>;
+    constructor(options: MiniflareWorkerProxyOptions);
+    private handleUpgrade;
+    close(): Promise<void>;
+}
+//# sourceMappingURL=miniflare-worker-proxy.d.ts.map

package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"miniflare-worker-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,eAAe,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,WAAW,2BAA2B;IAC1C;;;OAGG;IACH,YAAY,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,iDAAiD;IACjD,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAChD;AAED,qBAAa,oBAAqB,SAAQ,UAAU;IAItC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,QAAQ,EAAE,eAAe,CAAC;IAC1B,mBAAmB,sBAA6B;gBAEnB,OAAO,EAAE,2BAA2B;YAanD,aAAa;IA6DrB,KAAK;CAIZ"}

package/lib/cloudflare/miniflare/miniflare-worker-proxy.js

@@ -0,0 +1,80 @@
+import { WebSocket, WebSocketServer } from "ws";
+import { HTTPServer } from "../../util/http.js";
+export class MiniflareWorkerProxy extends HTTPServer {
+    options;
+    wsServer;
+    wsReconnectAttempts = new Map();
+    constructor(options) {
+        super({
+            fetch: options.fetch,
+        });
+        this.options = options;
+        this.wsServer = new WebSocketServer({ noServer: true });
+        this.httpServer.on("upgrade", async (req, socket, head) => {
+            this.wsServer.handleUpgrade(req, socket, head, async (client) => {
+                const id = crypto.randomUUID();
+                await this.handleUpgrade(id, client, req);
+            });
+        });
+    }
+    async handleUpgrade(id, client, request) {
+        const attempt = this.wsReconnectAttempts.get(id) ?? 0;
+        this.wsReconnectAttempts.set(id, attempt + 1);
+        if (attempt > 3) {
+            client.close(1006, "Too many reconnect attempts");
+            return;
+        }
+        if (attempt > 0) {
+            const delay = attempt * 1000;
+            await new Promise((resolve) => setTimeout(resolve, delay));
+        }
+        const target = await this.options.getDirectURL();
+        const url = new URL(request.url ?? "/", target);
+        const headers = { ...request.headers };
+        // All of these headers are set by the WebSocket constructor,
+        // so if we don't delete them, the request will fail.
+        delete headers.host;
+        delete headers.connection;
+        delete headers.upgrade;
+        delete headers["sec-websocket-version"];
+        delete headers["sec-websocket-key"];
+        delete headers["sec-websocket-protocol"];
+        delete headers["sec-websocket-extensions"];
+        delete headers["sec-websocket-accept"];
+        const server = new WebSocket(url.toString(), {
+            protocol: request.headers["sec-websocket-protocol"],
+            key: request.headers["sec-websocket-key"],
+            headers,
+        });
+        server.on("open", () => {
+            // Reset the reconnect attempts when the connection is established successfully.
+            this.wsReconnectAttempts.set(id, 0);
+        });
+        server.on("message", (data, binary) => {
+            client.send(data, { binary });
+        });
+        server.on("close", async (code, reason) => {
+            if (code === 1006) {
+                // When the worker hot reloads, the websocket connection is closed with this code.
+                // Reconnecting allows the client to maintain the same connection.
+                await this.handleUpgrade(id, client, request);
+                return;
+            }
+            client.close(code, reason);
+        });
+        client.on("message", (data, binary) => {
+            server.send(data, { binary });
+        });
+        client.on("close", (code, reason) => {
+            this.wsReconnectAttempts.delete(id);
+            if (server.readyState === WebSocket.OPEN) {
+                server.close(code, reason);
+            }
+        });
+    }
+    async close() {
+        this.wsServer.close();
+        await super.close();
+    }
+}
+//# sourceMappingURL=miniflare-worker-proxy.js.map

package/lib/cloudflare/miniflare/miniflare-worker-proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"miniflare-worker-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAYhD,MAAM,OAAO,oBAAqB,SAAQ,UAAU;IAIrB;IAH7B,QAAQ,CAAkB;IAC1B,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEhD,YAA6B,OAAoC;QAC/D,KAAK,CAAC;YACJ,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC;QAHwB,YAAO,GAAP,OAAO,CAA6B;QAI/D,IAAI,CAAC,QAAQ,GAAG,IAAI,eAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;YACxD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;gBAC9D,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;gBAC/B,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,aAAa,CACzB,EAAU,EACV,MAAiB,EACjB,OAA6B;QAE7B,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;QAC9C,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,6BAA6B,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QACD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,MAAM,KAAK,GAAG,OAAO,GAAG,IAAI,CAAC;YAC7B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QACjD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACvC,6DAA6D;QAC7D,qDAAqD;QACrD,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC,UAAU,CAAC;QAC1B,OAAO,OAAO,CAAC,OAAO,CAAC;QACvB,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC;QACxC,OAAO,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACpC,OAAO,OAAO,CAAC,wBAAwB,CAAC,CAAC;QACzC,OAAO,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC3C,OAAO,OAAO,CAAC,sBAAsB,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;YAC3C,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC;YACnD,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;YACzC,OAAO;SACR,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACrB,gFAAgF;YAChF,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACpC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;YACxC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,kFAAkF;gBAClF,kEAAkE;gBAClE,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC9C,OAAO;YACT,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACpC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAClC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;gBACzC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF"}

package/lib/cloudflare/miniflare/miniflare.d.ts

@@ -1,26 +1,26 @@
 import { type Miniflare, type WorkerOptions } from "miniflare";
-import { HTTPServer } from "../../util/http-server.ts";
 import { type PromiseWithResolvers } from "../../util/promise-with-resolvers.ts";
 import { type MiniflareWorkerOptions } from "./miniflare-worker-options.ts";
+import { MiniflareWorkerProxy } from "./miniflare-worker-proxy.ts";
 import { type RemoteBindingProxy } from "./remote-binding-proxy.ts";
 declare class MiniflareServer {
     miniflare?: Miniflare;
     workers: Map<string, WorkerOptions>;
-    servers: Map<string, HTTPServer>;
+    workerProxies: Map<string, MiniflareWorkerProxy>;
     remoteBindingProxies: Map<string, RemoteBindingProxy>;
     stream: WritableStream<{
         worker: MiniflareWorkerOptions;
-        promise: PromiseWithResolvers<HTTPServer>;
+        promise: PromiseWithResolvers<MiniflareWorkerProxy>;
     }>;
     writer: WritableStreamDefaultWriter<{
         worker: MiniflareWorkerOptions;
-        promise: PromiseWithResolvers<HTTPServer>;
+        promise: PromiseWithResolvers<MiniflareWorkerProxy>;
     }>;
-    push(worker: MiniflareWorkerOptions): Promise<HTTPServer>;
+    push(worker: MiniflareWorkerOptions): Promise<MiniflareWorkerProxy>;
     close(): Promise<void>;
     private set;
     private dispose;
-    private maybeCreateMixedModeProxy;
+    private maybeCreateRemoteProxy;
     private createRequestHandler;
     private miniflareOptions;
 }

package/lib/cloudflare/miniflare/miniflare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"miniflare.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EAGd,KAAK,aAAa,EACnB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,2BAA2B,CAAC;AAEnC,cAAM,eAAe;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,OAAO,6BAAoC;IAC3C,OAAO,0BAAiC;IACxC,oBAAoB,kCAAyC;IAE7D,MAAM;gBACI,sBAAsB;iBACrB,oBAAoB,CAAC,UAAU,CAAC;OAaxC;IACH,MAAM;gBAfI,sBAAsB;iBACrB,oBAAoB,CAAC,UAAU,CAAC;OAcV;IAE3B,IAAI,CAAC,MAAM,EAAE,sBAAsB;IASnC,KAAK;YAIG,GAAG;YA2CH,OAAO;YAaP,yBAAyB;IAuBvC,OAAO,CAAC,oBAAoB;YAwCd,gBAAgB;CAgB/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"}
+{"version":3,"file":"miniflare.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EAGd,KAAK,aAAa,EACnB,MAAM,WAAW,CAAC;AAInB,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;IACtB,OAAO,6BAAoC;IAC3C,aAAa,oCAA2C;IACxD,oBAAoB,kCAAyC;IAE7D,MAAM;gBACI,sBAAsB;iBACrB,oBAAoB,CAAC,oBAAoB,CAAC;OAalD;IACH,MAAM;gBAfI,sBAAsB;iBACrB,oBAAoB,CAAC,oBAAoB,CAAC;OAcpB;IAE3B,IAAI,CAAC,MAAM,EAAE,sBAAsB;IASnC,KAAK;YAIG,GAAG;YAgDH,OAAO;YAeP,sBAAsB;IAyBpC,OAAO,CAAC,oBAAoB;YAwCd,gBAAgB;CAgB/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"}

package/lib/cloudflare/miniflare/miniflare.js

@@ -1,15 +1,15 @@
 import { MiniflareCoreError, } from "miniflare";
 import path from "node:path";
 import { findOpenPort } from "../../util/find-open-port.js";
-import { HTTPServer } from "../../util/http-server.js";
 import { logger } from "../../util/logger.js";
 import { promiseWithResolvers, } from "../../util/promise-with-resolvers.js";
 import { buildMiniflareWorkerOptions, buildRemoteBindings, } from "./miniflare-worker-options.js";
+import { MiniflareWorkerProxy } from "./miniflare-worker-proxy.js";
 import { createRemoteProxyWorker, } from "./remote-binding-proxy.js";
 class MiniflareServer {
     miniflare;
     workers = new Map();
-    servers = new Map();
+    workerProxies = new Map();
     remoteBindingProxies = new Map();
     stream = new WritableStream({
         write: async ({ worker, promise }) => {
@@ -40,7 +40,7 @@ class MiniflareServer {
     async set(worker) {
         this.workers.set(worker.name, await buildMiniflareWorkerOptions({
             ...worker,
-            remoteProxyConnectionString: await this.maybeCreateMixedModeProxy(worker),
+            remoteProxyConnectionString: await this.maybeCreateRemoteProxy(worker),
         }));
         if (this.miniflare) {
             await withErrorRewrite(this.miniflare.setOptions(await this.miniflareOptions()));
@@ -59,29 +59,35 @@ class MiniflareServer {
             this.miniflare = new Miniflare(await this.miniflareOptions());
             await withErrorRewrite(this.miniflare.ready);
         }
-        const existing = this.servers.get(worker.name);
+        const existing = this.workerProxies.get(worker.name);
         if (existing) {
             return existing;
         }
-        const server = new HTTPServer({
-            port: worker.port ?? (await findOpenPort()),
+        const server = new MiniflareWorkerProxy({
+            getDirectURL: async () => {
+                const url = await this.miniflare?.unsafeGetDirectURL(worker.name);
+                if (!url) {
+                    throw new Error(`Worker "${worker.name}" is not running`);
+                }
+                return url;
+            },
             fetch: this.createRequestHandler(worker.name),
         });
-        this.servers.set(worker.name, server);
-        await server.ready;
+        this.workerProxies.set(worker.name, server);
+        await server.listen(worker.port ?? (await findOpenPort()));
         return server;
     }
     async dispose() {
         await Promise.all([
             this.miniflare?.dispose(),
-            ...Array.from(this.servers.values()).map((server) => server.stop()),
-            ...Array.from(this.remoteBindingProxies.values()).map((proxy) => proxy.server.stop()),
+            ...Array.from(this.workerProxies.values()).map((server) => server.close()),
+            ...Array.from(this.remoteBindingProxies.values()).map((proxy) => proxy.server.close()),
         ]);
         this.miniflare = undefined;
         this.workers.clear();
-        this.servers.clear();
+        this.workerProxies.clear();
     }
-    async maybeCreateMixedModeProxy(worker) {
+    async maybeCreateRemoteProxy(worker) {
         const bindings = buildRemoteBindings(worker);
         if (bindings.length === 0) {
             return undefined;
@@ -90,6 +96,9 @@ class MiniflareServer {
         if (existing?.bindings.every((b) => bindings.find((b2) => b2.name === b.name && b2.type === b.type))) {
             return existing.connectionString;
         }
+        else if (existing) {
+            await existing.server.close();
+        }
         const proxy = await createRemoteProxyWorker({
             name: `mixed-mode-proxy-${crypto.randomUUID()}`,
             bindings,
@@ -105,18 +114,18 @@ class MiniflareServer {
                         status: 503,
                     });
                 }
-                const miniflare = await this.miniflare?.getWorker(name);
-                if (!miniflare) {
+                const worker = await this.miniflare?.getWorker(name);
+                if (!worker) {
                     return new Response(`[Alchemy] Cannot find worker "${name}". Please try again.`, {
                         status: 503,
                     });
                 }
-                const res = await miniflare.fetch(req.url, {
+                const res = await worker.fetch(req.url, {
                     method: req.method,
                     headers: req.headers,
                     body: req.body,
-                    redirect: "manual",
                     duplex: "half",
+                    redirect: "manual",
                 });
                 return res;
             }

package/lib/cloudflare/miniflare/miniflare.js.map

@@ -1 +1 @@
-{"version":3,"file":"miniflare.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"miniflare.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/miniflare/remote-binding-proxy.d.ts

@@ -1,17 +1,17 @@
 import type { RemoteProxyConnectionString } from "miniflare";
-import { HTTPServer } from "../../util/http-server.ts";
+import { HTTPServer } from "../../util/http.ts";
 import type { WorkerBindingSpec } from "../bindings.ts";
+export interface RemoteBindingProxy {
+    server: HTTPServer;
+    bindings: WorkerBindingSpec[];
+    connectionString: RemoteProxyConnectionString;
+}
 export declare function createRemoteProxyWorker(input: {
     name: string;
     bindings: WorkerBindingSpec[];
-}): Promise<RemoteBindingProxy>;
-export declare class RemoteBindingProxy {
-    readonly url: string;
-    readonly token: string;
-    readonly bindings: WorkerBindingSpec[];
+}): Promise<{
     server: HTTPServer;
-    constructor(url: string, token: string, bindings: WorkerBindingSpec[]);
-    get connectionString(): RemoteProxyConnectionString;
-    fetch(req: Request): Promise<Response>;
-}
+    bindings: WorkerBindingSpec[];
+    connectionString: RemoteProxyConnectionString;
+}>;
 //# sourceMappingURL=remote-binding-proxy.d.ts.map

package/lib/cloudflare/miniflare/remote-binding-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-binding-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAoBxD,wBAAsB,uBAAuB,CAAC,KAAK,EAAE;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B,+BA2BA;AAED,qBAAa,kBAAkB;IAI3B,QAAQ,CAAC,GAAG,EAAE,MAAM;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IACtB,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,EAAE;IALxC,MAAM,EAAE,UAAU,CAAC;gBAGR,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,iBAAiB,EAAE;IAOxC,IAAI,gBAAgB,IAKb,2BAA2B,CACjC;IAEK,KAAK,CAAC,GAAG,EAAE,OAAO;CA4BzB"}
+{"version":3,"file":"remote-binding-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAoBxD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,gBAAgB,EAAE,2BAA2B,CAAC;CAC/C;AAED,wBAAsB,uBAAuB,CAAC,KAAK,EAAE;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;;;sBA0D4C,2BAA2B;GAEvE"}

package/lib/cloudflare/miniflare/remote-binding-proxy.js

@@ -1,4 +1,4 @@
-import { HTTPServer } from "../../util/http-server.js";
+import { HTTPServer } from "../../util/http.js";
 import { extractCloudflareResult } from "../api-response.js";
 import { createCloudflareApi } from "../api.js";
 import { getInternalWorkerBundle } from "../bundle/internal-worker-bundle.js";
@@ -24,49 +24,39 @@ export async function createRemoteProxyWorker(input) {
         }),
         import("../worker-subdomain.js").then((m) => m.getAccountSubdomain(api)),
     ]);
-    return new RemoteBindingProxy(`https://${input.name}.${subdomain}.workers.dev`, token, input.bindings);
-}
-export class RemoteBindingProxy {
-    url;
-    token;
-    bindings;
-    server;
-    constructor(url, token, bindings) {
-        this.url = url;
-        this.token = token;
-        this.bindings = bindings;
-        this.server = new HTTPServer({
-            fetch: this.fetch.bind(this),
-        });
-    }
-    get connectionString() {
-        const hostname = this.server.hostname === "::" ? "localhost" : this.server.hostname;
-        return new URL(`http://${hostname}:${this.server.port}`);
-    }
-    async fetch(req) {
-        const origin = new URL(req.url);
-        const url = new URL(origin.pathname, this.url);
-        url.search = origin.search;
-        url.hash = origin.hash;
-        const headers = new Headers(req.headers);
-        headers.set("cf-workers-preview-token", this.token);
-        headers.set("host", new URL(this.url).hostname);
-        headers.delete("cf-connecting-ip");
-        const res = await fetch(url, {
-            method: req.method,
-            headers,
-            body: req.body,
-            redirect: "manual",
-        });
-        // Remove headers that are not supported by miniflare
-        const responseHeaders = new Headers(res.headers);
-        responseHeaders.delete("transfer-encoding");
-        responseHeaders.delete("content-encoding");
-        return new Response(res.body, {
-            status: res.status,
-            headers: responseHeaders,
-        });
-    }
+    const proxyURL = new URL(`https://${input.name}.${subdomain}.workers.dev`);
+    const server = new HTTPServer({
+        fetch: async (req) => {
+            const origin = new URL(req.url);
+            const url = new URL(origin.pathname, proxyURL.toString());
+            url.search = origin.search;
+            url.hash = origin.hash;
+            const requestHeaders = new Headers(req.headers);
+            requestHeaders.set("cf-workers-preview-token", token);
+            requestHeaders.set("host", proxyURL.hostname);
+            requestHeaders.delete("cf-connecting-ip");
+            const res = await fetch(url, {
+                method: req.method,
+                headers: requestHeaders,
+                body: req.body,
+                redirect: "manual",
+            });
+            // Remove headers that are not supported by miniflare
+            const responseHeaders = new Headers(res.headers);
+            responseHeaders.delete("transfer-encoding");
+            responseHeaders.delete("content-encoding");
+            return new Response(res.body, {
+                status: res.status,
+                headers: responseHeaders,
+            });
+        },
+    });
+    await server.listen();
+    return {
+        server,
+        bindings: input.bindings,
+        connectionString: new URL(server.url),
+    };
 }
 async function createWorkersPreviewToken(api, input) {
     const session = await createWorkersPreviewSession(api);

package/lib/cloudflare/miniflare/remote-binding-proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-binding-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote-binding-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/nuxt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nuxt.d.ts","sourceRoot":"","sources":["../../src/cloudflare/nuxt.ts"],"names":[],"mappings":"AACA,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;;;GAGG;AACH,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,QAAQ,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;CAAG;AAEzE;;;;GAIG;AACH,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC5D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,IAAI,CAAC,CAAC,SAAS,QAAQ,EAC3C,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAgBlB"}
+{"version":3,"file":"nuxt.d.ts","sourceRoot":"","sources":["../../src/cloudflare/nuxt.ts"],"names":[],"mappings":"AACA,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;;;GAGG;AACH,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,QAAQ,CAAE,SAAQ,YAAY,CAAC,CAAC,CAAC;CAAG;AAEzE;;;;GAIG;AACH,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC5D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,IAAI,CAAC,CAAC,SAAS,QAAQ,EAC3C,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAmBlB"}

package/lib/cloudflare/nuxt.js

@@ -42,6 +42,9 @@ export async function Nuxt(id, props) {
         compatibilityFlags: ["nodejs_compat", ...(props?.compatibilityFlags ?? [])],
         // Enable wrangler by default, common for Nuxt/Cloudflare deployments
         wrangler: props?.wrangler ?? true,
+        dev: props?.dev ?? {
+            command: "nuxt dev",
+        },
     });
 }
 //# sourceMappingURL=nuxt.js.map

package/lib/cloudflare/nuxt.js.map

@@ -1 +1 @@
-{"version":3,"file":"nuxt.js","sourceRoot":"","sources":["../../src/cloudflare/nuxt.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,OAAO,EAAqB,MAAM,cAAc,CAAC;AAkB1D;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,EAAU,EACV,KAA6B;IAE7B,0DAA0D;IAC1D,OAAO,OAAO,CAAC,EAAE,EAAE;QACjB,GAAG,KAAK;QACR,QAAQ,EAAE,KAAK,EAAE,QAAQ,IAAI,IAAI;QACjC,4DAA4D;QAC5D,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,eAAe;QAC1C,mDAAmD;QACnD,IAAI,EAAE,KAAK,EAAE,IAAI,IAAI,4BAA4B;QACjD,+DAA+D;QAC/D,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;QACvD,+DAA+D;QAC/D,kBAAkB,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,KAAK,EAAE,kBAAkB,IAAI,EAAE,CAAC,CAAC;QAC3E,qEAAqE;QACrE,QAAQ,EAAE,KAAK,EAAE,QAAQ,IAAI,IAAI;KAClC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"nuxt.js","sourceRoot":"","sources":["../../src/cloudflare/nuxt.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,OAAO,EAAqB,MAAM,cAAc,CAAC;AAkB1D;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,EAAU,EACV,KAA6B;IAE7B,0DAA0D;IAC1D,OAAO,OAAO,CAAC,EAAE,EAAE;QACjB,GAAG,KAAK;QACR,QAAQ,EAAE,KAAK,EAAE,QAAQ,IAAI,IAAI;QACjC,4DAA4D;QAC5D,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,eAAe;QAC1C,mDAAmD;QACnD,IAAI,EAAE,KAAK,EAAE,IAAI,IAAI,4BAA4B;QACjD,+DAA+D;QAC/D,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;QACvD,+DAA+D;QAC/D,kBAAkB,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,KAAK,EAAE,kBAAkB,IAAI,EAAE,CAAC,CAAC;QAC3E,qEAAqE;QACrE,QAAQ,EAAE,KAAK,EAAE,QAAQ,IAAI,IAAI;QACjC,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI;YACjB,OAAO,EAAE,UAAU;SACpB;KACF,CAAC,CAAC;AACL,CAAC"}

package/lib/cloudflare/oauth.js

@@ -7,7 +7,7 @@ import os from "node:os";
 import path from "node:path";
 import open from "open";
 import xdgAppPaths from "xdg-app-paths";
-import { HTTPServer } from "../util/http-server.js";
+import { HTTPServer } from "../util/http.js";
 import { memoize } from "../util/memoize.js";
 import { detached, ensure, fetchJSON, HTTPError, singleFlight, } from "../util/neverthrow.js";
 const CLIENT_ID = "54d11594-84e4-41aa-b438-e81b8fa78ee7";
@@ -108,7 +108,6 @@ export const wranglerLogin = (scopes = DEFAULT_SCOPES, log = console.log) => {
         return Response.redirect(`${ALCHEMY_BASE_URL}/auth/${type}`);
     };
     const server = new HTTPServer({
-        port: 8976,
         fetch: async (request) => {
             const url = new URL(request.url);
             if (url.pathname !== "/oauth/callback") {
@@ -149,6 +148,7 @@ export const wranglerLogin = (scopes = DEFAULT_SCOPES, log = console.log) => {
             return renderResponse("success");
         },
     });
+    server.listen(8976);
     const timeout = setTimeout(() => {
         err(new OAuthError({
             error: "timeout",
@@ -158,7 +158,7 @@ export const wranglerLogin = (scopes = DEFAULT_SCOPES, log = console.log) => {
     }, 1000 * 60 * 5);
     return ensure(result, () => {
         clearTimeout(timeout);
-        void server.stop();
+        void server.close();
     });
 };
 const generateAuthorizationURL = (scopes) => {