env-runner 0.1.5 → 0.1.6

package/README.md

@@ -56,13 +56,13 @@ const envServer = new EnvServer({
   watchPaths: ["./src"],
 });
 
-envServer.onReady = (_runner, address) => {
+envServer.onReady((_runner, address) => {
   console.log(`Worker ready on ${address?.host}:${address?.port}`);
-};
+});
 
-envServer.onReload = () => {
+envServer.onReload(() => {
   console.log("Reloaded!");
-};
+});
 
 await envServer.start();
 
@@ -81,9 +81,9 @@ import { RunnerManager, NodeProcessEnvRunner } from "env-runner";
 
 const manager = new RunnerManager();
 
-manager.onReady = (_runner, address) => {
+manager.onReady((_runner, address) => {
   console.log("Ready:", address);
-};
+});
 
 // Load initial runner
 const runner = new NodeProcessEnvRunner({

package/dist/THIRD-PARTY-LICENSES.md

@@ -21,32 +21,3 @@ Repository: https://github.com/nodejs/cjs-module-lexer
 > The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 > 
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----------------------------------------
-
-## std-env
-
-License: MIT
-Repository: https://github.com/unjs/std-env
-
-> MIT License
-> 
-> Copyright (c) Pooya Parsa <pooya@pi0.io>
-> 
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
-> 
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
-> 
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-> SOFTWARE.

package/dist/_chunks/base-runner.d.mts

@@ -41,7 +41,6 @@ declare abstract class BaseEnvRunner implements EnvRunner {
   close(cause?: unknown): Promise<void>;
   protected _handleMessage(message: any): void;
   protected _closeSocket(): Promise<void>;
-  protected _requestGracefulShutdown(sendShutdown: () => void, listenForExit: (resolve: () => void) => void, hasExited: () => boolean): Promise<void>;
   protected abstract _hasRuntime(): boolean;
   protected abstract _closeRuntime(): Promise<void>;
   protected abstract _runtimeType(): string;

package/dist/_chunks/base-runner.mjs

@@ -1,4 +1,3 @@
-import { n as v, t as m } from "./libs/std-env.mjs";
 import { rm } from "node:fs/promises";
 import { proxyFetch, proxyUpgrade } from "httpxy";
 //#region src/common/base-runner.ts
@@ -125,20 +124,6 @@ var BaseEnvRunner = class {
 		if (socketPath && socketPath[0] !== "\0" && !socketPath.startsWith(String.raw`\\.\\pipe`)) await rm(socketPath).catch(() => {});
 		this._address = void 0;
 	}
-	async _requestGracefulShutdown(sendShutdown, listenForExit, hasExited) {
-		sendShutdown();
-		if (!hasExited() && !v && !m) await new Promise((resolve) => {
-			const gracefulShutdownTimeoutMs = Number.parseInt(process.env.ENV_RUNNER_SHUTDOWN_TIMEOUT || "", 10) || 5e3;
-			const timeout = setTimeout(() => {
-				console.warn(`force closing node env runner ${this._runtimeType()}...`);
-				resolve();
-			}, gracefulShutdownTimeoutMs);
-			listenForExit(() => {
-				clearTimeout(timeout);
-				resolve();
-			});
-		});
-	}
 };
 //#endregion
 export { BaseEnvRunner as t };

package/dist/_chunks/libs/cjs-module-lexer.mjs

@@ -1,4 +1,4 @@
-//#region node_modules/.deno/cjs-module-lexer@2.2.0/node_modules/cjs-module-lexer/dist/lexer.mjs
+//#region node_modules/.pnpm/cjs-module-lexer@2.2.0/node_modules/cjs-module-lexer/dist/lexer.mjs
 let A;
 const B = 1 === new Uint8Array(new Uint16Array([1]).buffer)[0];
 function parse(E, g = "@") {

package/dist/_chunks/runner.mjs

@@ -26,13 +26,6 @@ var DenoProcessEnvRunner = class extends BaseEnvRunner {
 	}
 	async _closeRuntime() {
 		if (!this.#process) return;
-		if (this.#process._exitCode == null) await this._requestGracefulShutdown(() => {
-			try {
-				this.#process.send({ event: "shutdown" });
-			} catch {}
-		}, (resolve) => {
-			this.#process?.exited.then(() => resolve());
-		}, () => this.#process?._exitCode != null);
 		this.#process.removeAllListeners?.();
 		try {
 			this.#process.kill();

package/dist/_chunks/server.mjs

@@ -10,6 +10,8 @@ var RunnerManager = class {
 	_messageListeners = /* @__PURE__ */ new Set();
 	_closed = false;
 	_reloading = false;
+	_closeListeners = /* @__PURE__ */ new Set();
+	_readyListeners = /* @__PURE__ */ new Set();
 	constructor(runner) {
 		if (runner) this._attach(runner);
 	}
@@ -106,12 +108,22 @@ var RunnerManager = class {
 		this._detach();
 		if (runner) await runner.close();
 	}
-	onClose;
-	onReady;
+	onClose(listener) {
+		this._closeListeners.add(listener);
+	}
+	offClose(listener) {
+		this._closeListeners.delete(listener);
+	}
+	onReady(listener) {
+		this._readyListeners.add(listener);
+	}
+	offReady(listener) {
+		this._readyListeners.delete(listener);
+	}
 	_internalListener = (message) => {
 		if (message?.address) {
 			this._flushQueue();
-			this.onReady?.(this, message.address);
+			for (const fn of this._readyListeners) fn(this, message.address);
 		}
 	};
 	_attach(runner) {
@@ -123,7 +135,7 @@ var RunnerManager = class {
 			await originalClose();
 			if (this._runner === runner) {
 				this._runner = void 0;
-				this.onClose?.(this);
+				for (const fn of this._closeListeners) fn(this);
 			}
 		};
 		if (runner.ready) this._flushQueue();
@@ -174,9 +186,16 @@ var EnvServer = class extends RunnerManager {
 	_opts;
 	_watchers = [];
 	_reloadTimeout;
+	_reloadListeners = /* @__PURE__ */ new Set();
 	runner = null;
-	/** Called when the runner is reloaded due to a file change. */
-	onReload;
+	/** Register a listener called when the runner is reloaded due to a file change. */
+	onReload(listener) {
+		this._reloadListeners.add(listener);
+	}
+	/** Remove a previously registered reload listener. */
+	offReload(listener) {
+		this._reloadListeners.delete(listener);
+	}
 	constructor(opts) {
 		super();
 		this._opts = opts;
@@ -223,7 +242,7 @@ var EnvServer = class extends RunnerManager {
 			try {
 				this.runner = await this._createRunner();
 				await this.reload(this.runner);
-				this.onReload?.();
+				for (const fn of this._reloadListeners) fn();
 			} catch (error) {
 				console.error("Failed to reload runner:", error);
 			}

package/dist/_chunks/types.d.mts

@@ -54,7 +54,7 @@ interface RPCOptions {
   timeout?: number;
 }
 /** Core runner interface combining lifecycle hooks, RPC, and request proxying. */
-interface EnvRunner extends WorkerHooks, RunnerRPCHooks {
+interface EnvRunner extends RunnerRPCHooks {
   /** Whether the worker is ready to accept requests. */
   readonly ready: boolean;
   /** Whether the runner has been closed. */

package/dist/cli.mjs

@@ -40,12 +40,12 @@ const envServer = new EnvServer({
 	entry: resolve(entry),
 	watch: values.watch
 });
-envServer.onReady = (_runner, address) => {
+envServer.onReady((_runner, address) => {
 	console.log(`\x1B[2m➜ Worker ready on ${address?.host}:${address?.port || address?.socketPath}\x1B[0m`);
-};
-envServer.onReload = () => {
+});
+envServer.onReload(() => {
 	console.log(`\x1B[2m↻ Reloading...\x1B[0m`);
-};
+});
 await envServer.start();
 const server = serve({
 	port: values.port,

package/dist/index.d.mts

@@ -16,6 +16,8 @@ declare class RunnerManager implements EnvRunner {
   private _messageListeners;
   private _closed;
   private _reloading;
+  private _closeListeners;
+  private _readyListeners;
   constructor(runner?: EnvRunner);
   get ready(): boolean;
   get closed(): boolean;
@@ -32,8 +34,10 @@ declare class RunnerManager implements EnvRunner {
   }): Promise<T>;
   reloadModule(timeout?: number): Promise<void>;
   close(): Promise<void>;
-  onClose?: (runner: EnvRunner, cause?: unknown) => void;
-  onReady?: (runner: EnvRunner, address?: WorkerAddress) => void;
+  onClose(listener: (runner: EnvRunner, cause?: unknown) => void): void;
+  offClose(listener: (runner: EnvRunner, cause?: unknown) => void): void;
+  onReady(listener: (runner: EnvRunner, address?: WorkerAddress) => void): void;
+  offReady(listener: (runner: EnvRunner, address?: WorkerAddress) => void): void;
   private _internalListener;
   private _attach;
   private _detach;
@@ -75,9 +79,12 @@ declare class EnvServer extends RunnerManager {
   private _opts;
   private _watchers;
   private _reloadTimeout;
+  private _reloadListeners;
   runner: Awaited<ReturnType<typeof loadRunner>> | null;
-  /** Called when the runner is reloaded due to a file change. */
-  onReload?: () => void;
+  /** Register a listener called when the runner is reloaded due to a file change. */
+  onReload(listener: () => void): void;
+  /** Remove a previously registered reload listener. */
+  offReload(listener: () => void): void;
   constructor(opts: EnvServerOptions);
   /** Start the server by loading and attaching the runner. */
   start(): Promise<this>;

package/dist/index.mjs

@@ -1,4 +1,3 @@
-import "./_chunks/libs/std-env.mjs";
 import { t as BaseEnvRunner } from "./_chunks/base-runner.mjs";
 import { n as loadRunner, r as RunnerManager, t as EnvServer } from "./_chunks/server.mjs";
 import { t as DenoProcessEnvRunner } from "./_chunks/runner.mjs";

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

@@ -1,4 +1,3 @@
-import "../../_chunks/libs/std-env.mjs";
 import { t as BaseEnvRunner } from "../../_chunks/base-runner.mjs";
 import { existsSync } from "node:fs";
 import { execSync, spawn } from "node:child_process";
@@ -41,13 +40,6 @@ var BunProcessEnvRunner = class extends BaseEnvRunner {
 	}
 	async _closeRuntime() {
 		if (!this.#process) return;
-		if (this.#process._exitCode == null) await this._requestGracefulShutdown(() => {
-			try {
-				this.#process.send({ event: "shutdown" });
-			} catch {}
-		}, (resolve) => {
-			this.#process?.exited.then(() => resolve());
-		}, () => this.#process?._exitCode != null);
 		this.#process.removeAllListeners?.();
 		try {
 			this.#process.kill();

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

@@ -1,4 +1,3 @@
-import "../../_chunks/libs/std-env.mjs";
 import "../../_chunks/base-runner.mjs";
 import { t as DenoProcessEnvRunner } from "../../_chunks/runner.mjs";
 export { DenoProcessEnvRunner };

package/dist/runners/miniflare/runner.mjs

@@ -1,4 +1,3 @@
-import "../../_chunks/libs/std-env.mjs";
 import "../../_chunks/base-runner.mjs";
 import "../../_chunks/libs/cjs-module-lexer.mjs";
 import { t as MiniflareEnvRunner } from "../../_chunks/runner2.mjs";

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

@@ -1,4 +1,3 @@
-import "../../_chunks/libs/std-env.mjs";
 import { t as BaseEnvRunner } from "../../_chunks/base-runner.mjs";
 import { existsSync } from "node:fs";
 import { fork } from "node:child_process";
@@ -27,11 +26,6 @@ var NodeProcessEnvRunner = class extends BaseEnvRunner {
 	}
 	async _closeRuntime() {
 		if (!this.#process) return;
-		await this._requestGracefulShutdown(() => this.#process.send({ event: "shutdown" }), (resolve) => {
-			this.#process?.on("message", (message) => {
-				if (message.event === "exit") resolve();
-			});
-		}, () => this.#process?._exitCode != null);
 		this.#process.removeAllListeners();
 		this.#process.kill();
 		this.#process = void 0;

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

@@ -1,4 +1,3 @@
-import "../../_chunks/libs/std-env.mjs";
 import { t as BaseEnvRunner } from "../../_chunks/base-runner.mjs";
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -27,11 +26,6 @@ var NodeWorkerEnvRunner = class extends BaseEnvRunner {
 	}
 	async _closeRuntime() {
 		if (!this.#worker) return;
-		await this._requestGracefulShutdown(() => this.#worker.postMessage({ event: "shutdown" }), (resolve) => {
-			this.#worker?.on("message", (message) => {
-				if (message.event === "exit") resolve();
-			});
-		}, () => Boolean(this.#worker?._exitCode));
 		this.#worker.removeAllListeners();
 		await this.#worker.terminate().catch((error) => {
 			console.error(error);

package/dist/runners/self/runner.mjs

@@ -1,4 +1,3 @@
-import "../../_chunks/libs/std-env.mjs";
 import { t as BaseEnvRunner } from "../../_chunks/base-runner.mjs";
 import { n as reloadEntryModule, r as resolveEntry } from "../../_chunks/worker-utils.mjs";
 //#region src/runners/self/runner.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "env-runner",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Generic environment runner for JavaScript runtimes.",
   "license": "MIT",
   "repository": "unjs/env-runner",
@@ -54,7 +54,6 @@
     "obuild": "latest",
     "oxfmt": "latest",
     "oxlint": "latest",
-    "std-env": "4.0.0-rc.1",
     "typescript": "latest",
     "vitest": "latest"
   },

package/dist/_chunks/libs/std-env.mjs

@@ -1,171 +0,0 @@
-//#region node_modules/.pnpm/std-env@4.0.0-rc.1/node_modules/std-env/dist/index.mjs
-const e = globalThis.process?.env || Object.create(null), t = globalThis.process || { env: e }, n = t !== void 0 && t.env && t.env.NODE_ENV || void 0, r = [
-	[`claude`, [`CLAUDECODE`, `CLAUDE_CODE`]],
-	[`replit`, [`REPL_ID`]],
-	[`gemini`, [`GEMINI_CLI`]],
-	[`codex`, [`CODEX_SANDBOX`, `CODEX_THREAD_ID`]],
-	[`opencode`, [`OPENCODE`]],
-	[`pi`, [i(`PATH`, /\.pi[\\/]agent/)]],
-	[`auggie`, [`AUGMENT_AGENT`]],
-	[`goose`, [`GOOSE_PROVIDER`]],
-	[`devin`, [i(`EDITOR`, /devin/)]],
-	[`cursor`, [`CURSOR_AGENT`]],
-	[`kiro`, [i(`TERM_PROGRAM`, /kiro/)]]
-];
-function i(t, n) {
-	return () => {
-		let r = e[t];
-		return r ? n.test(r) : !1;
-	};
-}
-function a() {
-	let t = e.AI_AGENT;
-	if (t) return { name: t.toLowerCase() };
-	for (let [t, n] of r) for (let r of n) if (typeof r == `string` ? e[r] : r()) return { name: t };
-	return {};
-}
-const o = a();
-o.name;
-o.name;
-const l = [
-	[`APPVEYOR`],
-	[
-		`AWS_AMPLIFY`,
-		`AWS_APP_ID`,
-		{ ci: !0 }
-	],
-	[`AZURE_PIPELINES`, `SYSTEM_TEAMFOUNDATIONCOLLECTIONURI`],
-	[`AZURE_STATIC`, `INPUT_AZURE_STATIC_WEB_APPS_API_TOKEN`],
-	[`APPCIRCLE`, `AC_APPCIRCLE`],
-	[`BAMBOO`, `bamboo_planKey`],
-	[`BITBUCKET`, `BITBUCKET_COMMIT`],
-	[`BITRISE`, `BITRISE_IO`],
-	[`BUDDY`, `BUDDY_WORKSPACE_ID`],
-	[`BUILDKITE`],
-	[`CIRCLE`, `CIRCLECI`],
-	[`CIRRUS`, `CIRRUS_CI`],
-	[
-		`CLOUDFLARE_PAGES`,
-		`CF_PAGES`,
-		{ ci: !0 }
-	],
-	[
-		`CLOUDFLARE_WORKERS`,
-		`WORKERS_CI`,
-		{ ci: !0 }
-	],
-	[`GOOGLE_CLOUDRUN`, `K_SERVICE`],
-	[`GOOGLE_CLOUDRUN_JOB`, `CLOUD_RUN_JOB`],
-	[`CODEBUILD`, `CODEBUILD_BUILD_ARN`],
-	[`CODEFRESH`, `CF_BUILD_ID`],
-	[`DRONE`],
-	[`DRONE`, `DRONE_BUILD_EVENT`],
-	[`DSARI`],
-	[`GITHUB_ACTIONS`],
-	[`GITLAB`, `GITLAB_CI`],
-	[`GITLAB`, `CI_MERGE_REQUEST_ID`],
-	[`GOCD`, `GO_PIPELINE_LABEL`],
-	[`LAYERCI`],
-	[`JENKINS`, `JENKINS_URL`],
-	[`HUDSON`, `HUDSON_URL`],
-	[`MAGNUM`],
-	[`NETLIFY`],
-	[
-		`NETLIFY`,
-		`NETLIFY_LOCAL`,
-		{ ci: !1 }
-	],
-	[`NEVERCODE`],
-	[`RENDER`],
-	[`SAIL`, `SAILCI`],
-	[`SEMAPHORE`],
-	[`SCREWDRIVER`],
-	[`SHIPPABLE`],
-	[`SOLANO`, `TDDIUM`],
-	[`STRIDER`],
-	[`TEAMCITY`, `TEAMCITY_VERSION`],
-	[`TRAVIS`],
-	[`VERCEL`, `NOW_BUILDER`],
-	[
-		`VERCEL`,
-		`VERCEL`,
-		{ ci: !1 }
-	],
-	[
-		`VERCEL`,
-		`VERCEL_ENV`,
-		{ ci: !1 }
-	],
-	[`APPCENTER`, `APPCENTER_BUILD_ID`],
-	[
-		`CODESANDBOX`,
-		`CODESANDBOX_SSE`,
-		{ ci: !1 }
-	],
-	[
-		`CODESANDBOX`,
-		`CODESANDBOX_HOST`,
-		{ ci: !1 }
-	],
-	[`STACKBLITZ`],
-	[`STORMKIT`],
-	[`CLEAVR`],
-	[`ZEABUR`],
-	[
-		`CODESPHERE`,
-		`CODESPHERE_APP_ID`,
-		{ ci: !0 }
-	],
-	[`RAILWAY`, `RAILWAY_PROJECT_ID`],
-	[`RAILWAY`, `RAILWAY_SERVICE_ID`],
-	[`DENO-DEPLOY`, `DENO_DEPLOY`],
-	[`DENO-DEPLOY`, `DENO_DEPLOYMENT_ID`],
-	[
-		`FIREBASE_APP_HOSTING`,
-		`FIREBASE_APP_HOSTING`,
-		{ ci: !0 }
-	]
-];
-function u() {
-	for (let t of l) if (e[t[1] || t[0]]) return {
-		name: t[0].toLowerCase(),
-		...t[2]
-	};
-	return e.SHELL === `/bin/jsh` && t.versions?.webcontainer ? {
-		name: `stackblitz`,
-		ci: !1
-	} : {
-		name: ``,
-		ci: !1
-	};
-}
-const d = u();
-d.name;
-const p = t.platform || ``, m = !!e.CI || d.ci !== !1, h = !!t.stdout?.isTTY;
-e.DEBUG;
-const v = n === `test` || !!e.TEST;
-n === `production` || e.MODE;
-n === `dev` || n === `development` || e.MODE;
-e.MINIMAL;
-const S = /^win/i.test(p);
-/^linux/i.test(p);
-/^darwin/i.test(p);
-!e.NO_COLOR && (e.FORCE_COLOR || (h || S) && e.TERM);
-const E = (t.versions?.node || ``).replace(/^v/, ``) || null;
-Number(E?.split(`.`)[0]);
-const O = !!t?.versions?.node, k = `Bun` in globalThis, A = `Deno` in globalThis, j = `fastly` in globalThis, M = `Netlify` in globalThis, N = `EdgeRuntime` in globalThis, P = globalThis.navigator?.userAgent === `Cloudflare-Workers`, F = [
-	[M, `netlify`],
-	[N, `edge-light`],
-	[P, `workerd`],
-	[j, `fastly`],
-	[A, `deno`],
-	[k, `bun`],
-	[O, `node`]
-];
-function I() {
-	let e = F.find((e) => e[0]);
-	if (e) return { name: e[1] };
-}
-I()?.name;
-//#endregion
-export { v as n, m as t };