env-runner 0.1.11 → 0.1.13

package/dist/_chunks/{base-runner.mjs → common-base-runner.mjs}

@@ -30,7 +30,9 @@ var BaseEnvRunner = class {
 	}
 	async upgrade(context) {
 		if (!this.ready || !this._address) return;
-		await proxyUpgrade(this._address, context.node.req, context.node.socket, context.node.head);
+		try {
+			await proxyUpgrade(this._address, context.node.req, context.node.socket, context.node.head);
+		} catch {}
 	}
 	onMessage(listener) {
 		this._messageListeners.add(listener);

package/dist/_chunks/{runner.d.mts → deno-process-runner.d.mts}

@@ -1,5 +1,5 @@
 import { WorkerHooks } from "./types.mjs";
-import { BaseEnvRunner, EnvRunnerData } from "./base-runner.mjs";
+import { BaseEnvRunner, EnvRunnerData } from "./common-base-runner.mjs";
 declare class DenoProcessEnvRunner extends BaseEnvRunner {
   #private;
   constructor(opts: {

package/dist/_chunks/{runner.mjs → deno-process-runner.mjs}

@@ -1,7 +1,7 @@
-import { BaseEnvRunner } from "./base-runner.mjs";
+import { BaseEnvRunner } from "./common-base-runner.mjs";
+import { fileURLToPath } from "node:url";
 import { existsSync } from "node:fs";
 import { spawn } from "node:child_process";
-import { fileURLToPath } from "node:url";
 let _defaultEntry;
 var DenoProcessEnvRunner = class extends BaseEnvRunner {
 	#process;

package/dist/_chunks/{runner2.d.mts → miniflare-runner.d.mts}

@@ -1,5 +1,5 @@
 import { WorkerHooks } from "./types.mjs";
-import { BaseEnvRunner, EnvRunnerData } from "./base-runner.mjs";
+import { BaseEnvRunner, EnvRunnerData } from "./common-base-runner.mjs";
 import { IncomingMessage } from "node:http";
 import { Socket } from "node:net";
 /** Result from a module transform (compatible with Vite's `TransformResult`). */

package/dist/_chunks/{runner2.mjs → miniflare-runner.mjs}

@@ -1,12 +1,12 @@
 import { expandVirtualInvalidation, stripVirtualTypeScript, virtualModuleFormat } from "./virtual-loader.mjs";
-import { BaseEnvRunner } from "./base-runner.mjs";
+import { BaseEnvRunner } from "./common-base-runner.mjs";
 import { init, parse } from "./libs/cjs-module-lexer.mjs";
 import { init as init$1, parse as parse$1 } from "./libs/es-module-lexer.mjs";
-import { isVirtualSpecifier } from "./worker-utils.mjs";
+import { isVirtualSpecifier } from "./common-worker-utils.mjs";
 import { createRequire } from "node:module";
 import { proxyUpgrade } from "httpxy";
-import { readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import { readFileSync } from "node:fs";
 import { basename, dirname, isAbsolute, resolve } from "node:path";
 import { resolveModulePath } from "exsolve";
 const IPC_PATH = "/__env_runner_ipc";
@@ -313,10 +313,12 @@ var MiniflareEnvRunner = class extends BaseEnvRunner {
 		}
 		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);
+		try {
+			await proxyUpgrade({
+				host: address.hostname,
+				port: Number(address.port)
+			}, context.node.req, context.node.socket, context.node.head);
+		} catch {}
 	}
 	async #prepareVirtualModules() {
 		const virtual = this._data?.virtual;

package/dist/_chunks/{runner5.d.mts → netlify-runner.d.mts}

@@ -1,6 +1,6 @@
 import { WorkerHooks } from "./types.mjs";
-import { EnvRunnerData } from "./base-runner.mjs";
-import { NodeWorkerEnvRunner } from "./runner3.mjs";
+import { EnvRunnerData } from "./common-base-runner.mjs";
+import { NodeWorkerEnvRunner } from "./node-worker-runner.mjs";
 declare class NetlifyEnvRunner extends NodeWorkerEnvRunner {
   constructor(opts: {
     name: string;

package/dist/_chunks/{runner5.mjs → netlify-runner.mjs}

@@ -1,4 +1,4 @@
-import { NodeWorkerEnvRunner } from "./runner3.mjs";
+import { NodeWorkerEnvRunner } from "./node-worker-runner.mjs";
 import { fileURLToPath } from "node:url";
 let _defaultEntry;
 var NetlifyEnvRunner = class extends NodeWorkerEnvRunner {

package/dist/_chunks/{runner3.d.mts → node-worker-runner.d.mts}

@@ -1,5 +1,5 @@
 import { WorkerHooks } from "./types.mjs";
-import { BaseEnvRunner, EnvRunnerData } from "./base-runner.mjs";
+import { BaseEnvRunner, EnvRunnerData } from "./common-base-runner.mjs";
 declare class NodeWorkerEnvRunner extends BaseEnvRunner {
   #private;
   constructor(opts: {

package/dist/_chunks/{runner3.mjs → node-worker-runner.mjs}

@@ -1,6 +1,6 @@
-import { BaseEnvRunner } from "./base-runner.mjs";
-import { existsSync } from "node:fs";
+import { BaseEnvRunner } from "./common-base-runner.mjs";
 import { fileURLToPath } from "node:url";
+import { existsSync } from "node:fs";
 import { Worker } from "node:worker_threads";
 let _defaultEntry;
 var NodeWorkerEnvRunner = class extends BaseEnvRunner {

package/dist/_chunks/{runner4.d.mts → vercel-runner.d.mts}

@@ -1,6 +1,6 @@
 import { WorkerHooks } from "./types.mjs";
-import { EnvRunnerData } from "./base-runner.mjs";
-import { NodeWorkerEnvRunner } from "./runner3.mjs";
+import { EnvRunnerData } from "./common-base-runner.mjs";
+import { NodeWorkerEnvRunner } from "./node-worker-runner.mjs";
 declare class VercelEnvRunner extends NodeWorkerEnvRunner {
   constructor(opts: {
     name: string;

package/dist/_chunks/{runner4.mjs → vercel-runner.mjs}

@@ -1,4 +1,4 @@
-import { NodeWorkerEnvRunner } from "./runner3.mjs";
+import { NodeWorkerEnvRunner } from "./node-worker-runner.mjs";
 import { fileURLToPath } from "node:url";
 import { randomBytes } from "node:crypto";
 let _warned = false;

package/dist/_chunks/virtual-loader.mjs

@@ -1,9 +1,10 @@
+import { pathToFileURL } from "node:url";
 async function resolveVirtualModules(virtual) {
 	const entries = await Promise.all(Object.entries(virtual).map(async ([key, value]) => [key, typeof value === "function" ? await value() : value]));
 	return Object.fromEntries(entries);
 }
 const VIRTUAL_SCHEME = "virtual:";
-function createVirtualHooks(virtual, versions) {
+function createVirtualHooks(virtual, versions, parentURL = _defaultParentURL()) {
 	const resolve = (specifier, context, nextResolve) => {
 		const key = _stripQuery(specifier);
 		if (Object.hasOwn(virtual, key)) {
@@ -13,6 +14,10 @@ function createVirtualHooks(virtual, versions) {
 				shortCircuit: true
 			};
 		}
+		if (context.parentURL?.startsWith(VIRTUAL_SCHEME)) return nextResolve(specifier, {
+			...context,
+			parentURL
+		});
 		return nextResolve(specifier, context);
 	};
 	const load = (url, context, nextLoad) => {
@@ -60,4 +65,7 @@ function _stripQuery(specifier) {
 	const qIndex = specifier.indexOf("?");
 	return qIndex === -1 ? specifier : specifier.slice(0, qIndex);
 }
+function _defaultParentURL() {
+	return pathToFileURL(process.cwd() + "/").href;
+}
 export { createVirtualHooks, expandVirtualInvalidation, resolveVirtualModules, stripVirtualTypeScript, virtualModuleFormat };

package/dist/index.d.mts

@@ -1,9 +1,9 @@
 import { EnvRunner, FetchHandler, NodeUpgradeContext, RPCOptions, RunnerMessageListener, RunnerRPCHooks, UpgradeContext, UpgradeHandler, WorkerAddress, WorkerHooks } from "./_chunks/types.mjs";
-import { BaseEnvRunner, EnvRunnerData, VirtualModuleSource, VirtualModules } from "./_chunks/base-runner.mjs";
-import { DenoProcessEnvRunner } from "./_chunks/runner.mjs";
-import { MiniflareEnvRunner, MiniflareEnvRunnerOptions, MiniflareExportInfo, TransformResult } from "./_chunks/runner2.mjs";
-import { VercelEnvRunner } from "./_chunks/runner4.mjs";
-import { NetlifyEnvRunner } from "./_chunks/runner5.mjs";
+import { BaseEnvRunner, EnvRunnerData, VirtualModuleSource, VirtualModules } from "./_chunks/common-base-runner.mjs";
+import { DenoProcessEnvRunner } from "./_chunks/deno-process-runner.mjs";
+import { MiniflareEnvRunner, MiniflareEnvRunnerOptions, MiniflareExportInfo, TransformResult } from "./_chunks/miniflare-runner.mjs";
+import { VercelEnvRunner } from "./_chunks/vercel-runner.mjs";
+import { NetlifyEnvRunner } from "./_chunks/netlify-runner.mjs";
 import { ServerOptions } from "srvx";
 import { Hooks } from "crossws";
 /**

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { BaseEnvRunner } from "./_chunks/base-runner.mjs";
+import { BaseEnvRunner } from "./_chunks/common-base-runner.mjs";
 import { EnvServer, RunnerManager, loadRunner } from "./_chunks/server.mjs";
-import { DenoProcessEnvRunner } from "./_chunks/runner.mjs";
-import { MiniflareEnvRunner } from "./_chunks/runner2.mjs";
-import { VercelEnvRunner } from "./_chunks/runner4.mjs";
-import { NetlifyEnvRunner } from "./_chunks/runner5.mjs";
+import { DenoProcessEnvRunner } from "./_chunks/deno-process-runner.mjs";
+import { MiniflareEnvRunner } from "./_chunks/miniflare-runner.mjs";
+import { VercelEnvRunner } from "./_chunks/vercel-runner.mjs";
+import { NetlifyEnvRunner } from "./_chunks/netlify-runner.mjs";
 export { BaseEnvRunner, DenoProcessEnvRunner, EnvServer, MiniflareEnvRunner, NetlifyEnvRunner, RunnerManager, VercelEnvRunner, loadRunner };

package/dist/runners/bun-process/runner.d.mts

@@ -1,5 +1,5 @@
 import { WorkerHooks } from "../../_chunks/types.mjs";
-import { BaseEnvRunner, EnvRunnerData } from "../../_chunks/base-runner.mjs";
+import { BaseEnvRunner, EnvRunnerData } from "../../_chunks/common-base-runner.mjs";
 declare class BunProcessEnvRunner extends BaseEnvRunner {
   #private;
   constructor(opts: {

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

@@ -1,7 +1,7 @@
-import { BaseEnvRunner } from "../../_chunks/base-runner.mjs";
+import { BaseEnvRunner } from "../../_chunks/common-base-runner.mjs";
+import { fileURLToPath } from "node:url";
 import { existsSync } from "node:fs";
 import { execSync, spawn } from "node:child_process";
-import { fileURLToPath } from "node:url";
 import { join } from "node:path";
 import { homedir } from "node:os";
 let _defaultEntry;

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

@@ -1,4 +1,4 @@
-import { handleInvalidateModule, isVirtualSpecifier, parseServerAddress, registerVirtualModules, reloadEntryModule, resolveEntry } from "../../_chunks/worker-utils.mjs";
+import { handleInvalidateModule, isVirtualSpecifier, parseServerAddress, registerVirtualModules, reloadEntryModule, resolveEntry } from "../../_chunks/common-worker-utils.mjs";
 import { serve } from "srvx";
 import { plugin } from "crossws/server";
 process.on("disconnect", () => process.exit(0));

package/dist/runners/deno-process/runner.d.mts

@@ -1,3 +1,3 @@
-import { EnvRunnerData } from "../../_chunks/base-runner.mjs";
-import { DenoProcessEnvRunner } from "../../_chunks/runner.mjs";
+import { EnvRunnerData } from "../../_chunks/common-base-runner.mjs";
+import { DenoProcessEnvRunner } from "../../_chunks/deno-process-runner.mjs";
 export { DenoProcessEnvRunner, type EnvRunnerData as DenoProcessEnvRunnerData };

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

@@ -1,2 +1,2 @@
-import { DenoProcessEnvRunner } from "../../_chunks/runner.mjs";
+import { DenoProcessEnvRunner } from "../../_chunks/deno-process-runner.mjs";
 export { DenoProcessEnvRunner };

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

@@ -1,4 +1,4 @@
-import { handleInvalidateModule, isVirtualSpecifier, parseServerAddress, registerVirtualModules, reloadEntryModule, resolveEntry } from "../../_chunks/worker-utils.mjs";
+import { handleInvalidateModule, isVirtualSpecifier, parseServerAddress, registerVirtualModules, reloadEntryModule, resolveEntry } from "../../_chunks/common-worker-utils.mjs";
 import { serve } from "srvx";
 import { plugin } from "crossws/server";
 const data = JSON.parse(process.env.ENV_RUNNER_DATA || "{}");

package/dist/runners/miniflare/runner.d.mts

@@ -1,3 +1,3 @@
-import { EnvRunnerData } from "../../_chunks/base-runner.mjs";
-import { MiniflareEnvRunner, MiniflareEnvRunnerOptions, MiniflareExportInfo, TransformResult } from "../../_chunks/runner2.mjs";
+import { EnvRunnerData } from "../../_chunks/common-base-runner.mjs";
+import { MiniflareEnvRunner, MiniflareEnvRunnerOptions, MiniflareExportInfo, TransformResult } from "../../_chunks/miniflare-runner.mjs";
 export { MiniflareEnvRunner, type EnvRunnerData as MiniflareEnvRunnerData, MiniflareEnvRunnerOptions, MiniflareExportInfo, TransformResult };

package/dist/runners/miniflare/runner.mjs

@@ -1,2 +1,2 @@
-import { MiniflareEnvRunner } from "../../_chunks/runner2.mjs";
+import { MiniflareEnvRunner } from "../../_chunks/miniflare-runner.mjs";
 export { MiniflareEnvRunner };

package/dist/runners/netlify/runner.d.mts

@@ -1,3 +1,3 @@
-import { EnvRunnerData } from "../../_chunks/base-runner.mjs";
-import { NetlifyEnvRunner } from "../../_chunks/runner5.mjs";
+import { EnvRunnerData } from "../../_chunks/common-base-runner.mjs";
+import { NetlifyEnvRunner } from "../../_chunks/netlify-runner.mjs";
 export { type EnvRunnerData, NetlifyEnvRunner };

package/dist/runners/netlify/runner.mjs

@@ -1,2 +1,2 @@
-import { NetlifyEnvRunner } from "../../_chunks/runner5.mjs";
+import { NetlifyEnvRunner } from "../../_chunks/netlify-runner.mjs";
 export { NetlifyEnvRunner };

package/dist/runners/node-process/runner.d.mts

@@ -1,5 +1,5 @@
 import { WorkerHooks } from "../../_chunks/types.mjs";
-import { BaseEnvRunner, EnvRunnerData } from "../../_chunks/base-runner.mjs";
+import { BaseEnvRunner, EnvRunnerData } from "../../_chunks/common-base-runner.mjs";
 declare class NodeProcessEnvRunner extends BaseEnvRunner {
   #private;
   constructor(opts: {

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

@@ -1,7 +1,7 @@
-import { BaseEnvRunner } from "../../_chunks/base-runner.mjs";
+import { BaseEnvRunner } from "../../_chunks/common-base-runner.mjs";
+import { fileURLToPath } from "node:url";
 import { existsSync } from "node:fs";
 import { fork } from "node:child_process";
-import { fileURLToPath } from "node:url";
 let _defaultEntry;
 var NodeProcessEnvRunner = class extends BaseEnvRunner {
 	#process;

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

@@ -1,4 +1,4 @@
-import { handleInvalidateModule, isVirtualSpecifier, parseServerAddress, registerVirtualModules, reloadEntryModule, resolveEntry } from "../../_chunks/worker-utils.mjs";
+import { handleInvalidateModule, isVirtualSpecifier, parseServerAddress, registerVirtualModules, reloadEntryModule, resolveEntry } from "../../_chunks/common-worker-utils.mjs";
 import { serve } from "srvx";
 import { plugin } from "crossws/server/node";
 process.on("disconnect", () => process.exit(0));

package/dist/runners/node-worker/runner.d.mts

@@ -1,3 +1,3 @@
-import { EnvRunnerData } from "../../_chunks/base-runner.mjs";
-import { NodeWorkerEnvRunner } from "../../_chunks/runner3.mjs";
+import { EnvRunnerData } from "../../_chunks/common-base-runner.mjs";
+import { NodeWorkerEnvRunner } from "../../_chunks/node-worker-runner.mjs";
 export { type EnvRunnerData, NodeWorkerEnvRunner };

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

@@ -1,2 +1,2 @@
-import { NodeWorkerEnvRunner } from "../../_chunks/runner3.mjs";
+import { NodeWorkerEnvRunner } from "../../_chunks/node-worker-runner.mjs";
 export { NodeWorkerEnvRunner };

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

@@ -1,4 +1,4 @@
-import { handleInvalidateModule, isVirtualSpecifier, parseServerAddress, registerVirtualModules, reloadEntryModule, resolveEntry } from "../../_chunks/worker-utils.mjs";
+import { handleInvalidateModule, isVirtualSpecifier, parseServerAddress, registerVirtualModules, reloadEntryModule, resolveEntry } from "../../_chunks/common-worker-utils.mjs";
 import { parentPort, workerData } from "node:worker_threads";
 import { serve } from "srvx";
 import { plugin } from "crossws/server/node";

package/dist/runners/self/runner.d.mts

@@ -1,5 +1,5 @@
 import { WorkerHooks } from "../../_chunks/types.mjs";
-import { BaseEnvRunner, EnvRunnerData } from "../../_chunks/base-runner.mjs";
+import { BaseEnvRunner, EnvRunnerData } from "../../_chunks/common-base-runner.mjs";
 declare class SelfEnvRunner extends BaseEnvRunner {
   #private;
   constructor(opts: {

package/dist/runners/self/runner.mjs

@@ -1,5 +1,5 @@
-import { BaseEnvRunner } from "../../_chunks/base-runner.mjs";
-import { reloadEntryModule, resolveEntry } from "../../_chunks/worker-utils.mjs";
+import { BaseEnvRunner } from "../../_chunks/common-base-runner.mjs";
+import { reloadEntryModule, resolveEntry } from "../../_chunks/common-worker-utils.mjs";
 var SelfEnvRunner = class extends BaseEnvRunner {
 	#active = false;
 	#entry;
@@ -18,11 +18,15 @@ var SelfEnvRunner = class extends BaseEnvRunner {
 	}
 	async upgrade(context) {
 		if (!this.#entry || this.closed) return;
-		if (this.#entry.websocket) {
-			await (await this.#resolveWSAdapter()).handleUpgrade(context.node.req, context.node.socket, context.node.head);
-			return;
+		try {
+			if (this.#entry.websocket) {
+				await (await this.#resolveWSAdapter()).handleUpgrade(context.node.req, context.node.socket, context.node.head);
+				return;
+			}
+			this.#entry.upgrade?.(context);
+		} catch {
+			if (!context.node.socket.destroyed) context.node.socket.destroy();
 		}
-		this.#entry.upgrade?.(context);
 	}
 	sendMessage(message) {
 		if (!this.#active) throw new Error("Self env runner should be initialized before sending messages.");

package/dist/runners/vercel/runner.d.mts

@@ -1,3 +1,3 @@
-import { EnvRunnerData } from "../../_chunks/base-runner.mjs";
-import { VercelEnvRunner } from "../../_chunks/runner4.mjs";
+import { EnvRunnerData } from "../../_chunks/common-base-runner.mjs";
+import { VercelEnvRunner } from "../../_chunks/vercel-runner.mjs";
 export { type EnvRunnerData, VercelEnvRunner };

package/dist/runners/vercel/runner.mjs

@@ -1,2 +1,2 @@
-import { VercelEnvRunner } from "../../_chunks/runner4.mjs";
+import { VercelEnvRunner } from "../../_chunks/vercel-runner.mjs";
 export { VercelEnvRunner };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "env-runner",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Generic environment runner for JavaScript runtimes.",
   "license": "MIT",
   "repository": "unjs/env-runner",

package/dist/_chunks/{worker-utils.mjs → common-worker-utils.mjs}

@@ -1,6 +1,6 @@
 import { createVirtualHooks, expandVirtualInvalidation, stripVirtualTypeScript, virtualModuleFormat } from "./virtual-loader.mjs";
-import { existsSync, readFileSync } from "node:fs";
 import { pathToFileURL } from "node:url";
+import { existsSync, readFileSync } from "node:fs";
 import { isAbsolute } from "node:path";
 async function registerVirtualModules(virtual) {
 	if (!virtual || Object.keys(virtual).length === 0) return _noop;