env-runner 0.1.2 → 0.1.3

package/README.md

@@ -375,8 +375,19 @@ export default {
   fetch(request: Request) {
     return new Response("Hello!");
   },
+  websocket: {
+    // Optional: crossws WebSocket hooks (recommended)
+    open(peer) {
+      peer.send("Welcome!");
+    },
+    message(peer, message) {
+      peer.send(`Echo: ${message.text()}`);
+    },
+    close(peer, details) {},
+    error(peer, error) {},
+  },
   upgrade(context) {
-    // Optional: handle WebSocket upgrade requests (Node.js only)
+    // Optional: raw WebSocket upgrade handler (Node.js only)
     // context.node gives { req, socket, head }
   },
   middleware: [], // Optional srvx middleware

package/dist/_chunks/runner2.d.mts

@@ -1,5 +1,7 @@
 import { u as WorkerHooks } from "./types.mjs";
 import { n as EnvRunnerData, t as BaseEnvRunner } from "./base-runner.mjs";
+import { IncomingMessage } from "node:http";
+import { Socket } from "node:net";
 
 //#region src/runners/miniflare/runner.d.ts
 /** Result from a module transform (compatible with Vite's `TransformResult`). */
@@ -65,6 +67,13 @@ declare class MiniflareEnvRunner extends BaseEnvRunner {
   protected _hasRuntime(): boolean;
   protected _runtimeType(): string;
   protected _closeRuntime(): Promise<void>;
+  upgrade(context: {
+    node: {
+      req: IncomingMessage;
+      socket: Socket;
+      head: any;
+    };
+  }): Promise<void>;
 }
 //#endregion
 export { TransformResult as i, MiniflareEnvRunnerOptions as n, MiniflareExportInfo as r, MiniflareEnvRunner as t };

package/dist/_chunks/runner2.mjs

@@ -1,10 +1,13 @@
 import { t as BaseEnvRunner } from "./base-runner.mjs";
 import { createRequire } from "node:module";
+import { proxyUpgrade } from "httpxy";
 import { readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { dirname, resolve } from "node:path";
 //#region src/runners/miniflare/wrapper.ts
 const IPC_PATH$1 = "/__env_runner_ipc";
+/** Service binding name used for cross-request IPC (worker → runner). */
+const IPC_BINDING = "__ENV_RUNNER_IPC";
 /**
 * Generates a wrapper module that imports the user entry and adds IPC glue.
 *
@@ -15,6 +18,10 @@ const IPC_PATH$1 = "/__env_runner_ipc";
 * - Reload: `{ type: "reload" }` triggers cache-busted re-import
 * - Shutdown: `{ type: "shutdown" }` calls `ipc.onClose()`
 *
+* For outgoing messages during fetch request handling, uses a service binding
+* (`__ENV_RUNNER_IPC`) to avoid workerd's cross-request I/O restriction on
+* the WebSocket object.
+*
 * Passed as an in-memory `script` to Miniflare (no temp files needed).
 */
 function generateWrapper(entryPath, opts) {
@@ -40,10 +47,12 @@ ${staticReExport}
 ${explicitExports}
 
 const __IPC_PATH = "${IPC_PATH$1}";
+const __IPC_BINDING = "${IPC_BINDING}";
 const __entryPath = ${JSON.stringify(entryPath)};
 let __userEntry;
 let __ipcInitialized = false;
 let __serverWs;
+let __currentEnv;
 
 async function __loadEntry(env, path) {
   globalThis.__ENV_RUNNER_UNSAFE_EVAL__ = env.__ENV_RUNNER_UNSAFE_EVAL__;
@@ -57,8 +66,17 @@ async function __loadEntry(env, path) {
 }
 
 function __sendMessage(message) {
+  const payload = JSON.stringify(message);
+  const env = __currentEnv;
+  if (env && env[__IPC_BINDING]) {
+    env[__IPC_BINDING].fetch("http://localhost/__ipc", {
+      method: "POST",
+      body: payload,
+    }).catch(() => {});
+    return;
+  }
   if (__serverWs) {
-    __serverWs.send(JSON.stringify(message));
+    __serverWs.send(payload);
   }
 }
 
@@ -81,6 +99,7 @@ async function __handleWsMessage(env, data) {
         await __userEntry.ipc.onClose();
       }
       __userEntry = newEntry;
+      __crosswsAdapter = undefined;
       __ipcInitialized = false;
       if (__userEntry.ipc?.onOpen) {
         __ipcInitialized = true;
@@ -101,6 +120,19 @@ async function __handleWsMessage(env, data) {
   }
 }
 
+let __crosswsAdapter;
+
+async function __initCrossws(env, hooks) {
+  if (__crosswsAdapter) return __crosswsAdapter;
+  const importFn = env.__ENV_RUNNER_UNSAFE_EVAL__.newAsyncFunction(
+    "return await import('crossws/adapters/cloudflare')",
+    "loadCrossws"
+  );
+  const { default: cloudflareAdapter } = await importFn();
+  __crosswsAdapter = cloudflareAdapter({ hooks });
+  return __crosswsAdapter;
+}
+
 export default {
   async fetch(request, env, ctx) {
     const url = new URL(request.url);
@@ -139,11 +171,23 @@ export default {
     if (!__userEntry) {
       return new Response("Worker not initialized", { status: 503 });
     }
+
+    // Handle WebSocket upgrade via crossws cloudflare adapter
+    if (__userEntry.websocket && request.headers.get("upgrade") === "websocket") {
+      const adapter = await __initCrossws(env, __userEntry.websocket);
+      return adapter.handleUpgrade(request, env, ctx);
+    }
+
     const entryFetch = __userEntry.fetch;
     if (!entryFetch) {
       return new Response("No fetch handler exported", { status: 500 });
     }
-    ${fetchBody}
+    __currentEnv = env;
+    try {
+      ${fetchBody}
+    } finally {
+      __currentEnv = undefined;
+    }
   }
 };
 `;
@@ -285,15 +329,32 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 			this.close(error);
 		});
 	}
+	async upgrade(context) {
+		if (!this.#miniflare || this.closed) {
+			context.node.socket.destroy();
+			return;
+		}
+		const mfUrl = await this.#miniflare.unsafeGetDirectURL();
+		const address = new URL(mfUrl);
+		await proxyUpgrade({
+			host: address.hostname,
+			port: Number(address.port)
+		}, context.node.req, context.node.socket, context.node.head);
+	}
 	async #initAsync() {
 		const { Miniflare } = await import("miniflare");
 		const entryPath = this._data?.entry;
 		const userFlags = this.#miniflareOptions.compatibilityFlags || [];
+		const userDirectSockets = this.#miniflareOptions.unsafeDirectSockets || [];
 		const options = {
 			compatibilityDate: (/* @__PURE__ */ new Date()).toISOString().split("T")[0],
 			modules: true,
 			...this.#miniflareOptions,
-			compatibilityFlags: [...new Set(["nodejs_compat", ...userFlags])]
+			compatibilityFlags: [...new Set(["nodejs_compat", ...userFlags])],
+			unsafeDirectSockets: [{
+				host: "127.0.0.1",
+				port: 0
+			}, ...userDirectSockets]
 		};
 		if (entryPath && !options.script && !options.scriptPath) {
 			const resolvedEntry = resolve(entryPath);
@@ -315,6 +376,16 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 			options.scriptPath = entryDir + "/__env_runner_wrapper.mjs";
 			if (!options.modulesRoot) options.modulesRoot = "/";
 			options.unsafeEvalBinding = "__ENV_RUNNER_UNSAFE_EVAL__";
+			options.serviceBindings = {
+				...options.serviceBindings || {},
+				[IPC_BINDING]: async (request) => {
+					try {
+						const message = await request.json();
+						this._handleMessage(message);
+					} catch {}
+					return new Response(null, { status: 204 });
+				}
+			};
 			if (this.#transformRequest && !options.modulesRules) options.modulesRules = [{
 				type: "ESModule",
 				include: [

package/dist/index.d.mts

@@ -3,6 +3,7 @@ import { n as EnvRunnerData, t as BaseEnvRunner } from "./_chunks/base-runner.mj
 import { t as DenoProcessEnvRunner } from "./_chunks/runner.mjs";
 import { i as TransformResult, n as MiniflareEnvRunnerOptions, r as MiniflareExportInfo, t as MiniflareEnvRunner } from "./_chunks/runner2.mjs";
 import { ServerOptions } from "srvx";
+import { Hooks } from "crossws";
 
 //#region src/manager.d.ts
 /**
@@ -99,6 +100,7 @@ interface AppEntryIPC {
 interface AppEntry {
   fetch: ServerOptions["fetch"];
   upgrade?: (context: UpgradeContext) => void;
+  websocket?: Partial<Hooks>;
   middleware?: ServerOptions["middleware"];
   plugins?: ServerOptions["plugins"];
   ipc?: AppEntryIPC;

package/dist/runners/bun-process/worker.mjs

@@ -1,5 +1,6 @@
 import { n as reloadEntryModule, r as resolveEntry, t as parseServerAddress } from "../../_chunks/worker-utils.mjs";
 import { serve } from "srvx";
+import { plugin } from "crossws/server";
 //#region src/runners/bun-process/worker.ts
 const data = JSON.parse(process.env.ENV_RUNNER_DATA || "{}");
 let entry = await resolveEntry(data.entry);
@@ -10,7 +11,7 @@ const server = serve({
 	silent: true,
 	fetch: (request) => entry.fetch(request),
 	middleware: entry.middleware,
-	plugins: entry.plugins,
+	plugins: [...entry.plugins || [], ...entry.websocket ? [plugin(entry.websocket)] : []],
 	gracefulShutdown: false
 });
 await server.ready();

package/dist/runners/deno-process/worker.mjs

@@ -1,5 +1,6 @@
 import { n as reloadEntryModule, r as resolveEntry, t as parseServerAddress } from "../../_chunks/worker-utils.mjs";
 import { serve } from "srvx";
+import { plugin } from "crossws/server";
 //#region src/runners/deno-process/worker.ts
 const data = JSON.parse(process.env.ENV_RUNNER_DATA || "{}");
 let entry = await resolveEntry(data.entry);
@@ -10,7 +11,7 @@ const server = serve({
 	silent: true,
 	fetch: (request) => entry.fetch(request),
 	middleware: entry.middleware,
-	plugins: entry.plugins,
+	plugins: [...entry.plugins || [], ...entry.websocket ? [plugin(entry.websocket)] : []],
 	gracefulShutdown: false
 });
 await server.ready();

package/dist/runners/node-process/worker.mjs

@@ -1,5 +1,6 @@
 import { n as reloadEntryModule, r as resolveEntry, t as parseServerAddress } from "../../_chunks/worker-utils.mjs";
 import { serve } from "srvx";
+import { plugin } from "crossws/server/node";
 //#region src/runners/node-process/worker.ts
 const data = JSON.parse(process.env.ENV_RUNNER_DATA || "{}");
 let entry = await resolveEntry(data.entry);
@@ -10,7 +11,7 @@ const server = serve({
 	silent: true,
 	fetch: (request) => entry.fetch(request),
 	middleware: entry.middleware,
-	plugins: entry.plugins,
+	plugins: [...entry.plugins || [], ...entry.websocket ? [plugin(entry.websocket)] : []],
 	gracefulShutdown: false
 });
 await server.ready();

package/dist/runners/node-worker/worker.mjs

@@ -1,6 +1,7 @@
 import { n as reloadEntryModule, r as resolveEntry, t as parseServerAddress } from "../../_chunks/worker-utils.mjs";
 import { parentPort, workerData } from "node:worker_threads";
 import { serve } from "srvx";
+import { plugin } from "crossws/server/node";
 //#region src/runners/node-worker/worker.ts
 const data = workerData || {};
 let entry = await resolveEntry(data.entry);
@@ -11,7 +12,7 @@ const server = serve({
 	silent: true,
 	fetch: (request) => entry.fetch(request),
 	middleware: entry.middleware,
-	plugins: entry.plugins,
+	plugins: [...entry.plugins || [], ...entry.websocket ? [plugin(entry.websocket)] : []],
 	gracefulShutdown: false
 });
 await server.ready();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "env-runner",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Generic environment runner for JavaScript runtimes.",
   "license": "MIT",
   "repository": "unjs/env-runner",
@@ -38,6 +38,7 @@
     "typecheck": "tsgo --noEmit --skipLibCheck"
   },
   "dependencies": {
+    "crossws": "^0.4.4",
     "httpxy": "^0.3.1",
     "srvx": "^0.11.9"
   },