single-file-cli 2.0.83 → 2.1.1

package/lib/deno-polyfill.js

@@ -29,11 +29,6 @@ import * as path from "path";
 
 const DENO_RUNTIME_DETECTED = typeof Deno !== "undefined";
 
-const NPM_MODULES = {
-	"ws": "ws",
-	"simple-cdp": "simple-cdp",
-};
-
 const NODE_MODULES = {
 	"fs": "node:fs/promises",
 	"os": "node:os",
@@ -68,7 +63,9 @@ const Command = DENO_RUNTIME_DETECTED ? Deno.Command : class Command {
 	}
 	async spawn() {
 		const childProcess = await import(NODE_MODULES["child_process"]);
-		const child = childProcess.spawn(this.path, this.options.args);
+		const stdio = [this.options.stdin, this.options.stdout, this.options.stderr]
+			.map(config => config == "null" ? "ignore" : config == "piped" ? "pipe" : "inherit");
+		const child = childProcess.spawn(this.path, this.options.args, { stdio });
 
 		await new Promise((resolve, reject) => {
 			child.on("spawn", () => resolve());
@@ -81,14 +78,8 @@ const Command = DENO_RUNTIME_DETECTED ? Deno.Command : class Command {
 			});
 		});
 		return {
-			status: new Promise((resolve, reject) => {
-				child.on("exit", code => {
-					if (code === 0 || code === 143 || code === 130 || code === null) {
-						resolve();
-					} else {
-						reject(new Error(`Process exited with code ${code}`));
-					}
-				});
+			status: new Promise(resolve => {
+				child.on("exit", (code, signal) => resolve({ success: code === 0, code, signal }));
 			}),
 			kill() {
 				child.kill();
@@ -122,22 +113,21 @@ const DenoAPI = {
 const pathAPI = {
 	dirname,
 	toFileUrl,
+	fromFileUrl,
 	SEPARATOR: DENO_RUNTIME_DETECTED ? path.SEPARATOR : path.sep
 };
 
 const isDeno = DENO_RUNTIME_DETECTED;
 
-await initGlobalThisProperties();
+// the connection to the browser relies on the WebSocket of the runtime, which
+// Node.js provides since 22.4.0 and can still be turned off with
+// --no-experimental-websocket
+if (typeof globalThis.WebSocket !== "function") {
+	throw new Error("WebSocket is not available, Node.js 22.4.0 or later is required");
+}
 
 export { DenoAPI as Deno, pathAPI as path, isDeno };
 
-async function initGlobalThisProperties() {
-	if (!DENO_RUNTIME_DETECTED) {
-		const { WebSocket } = await import(getNPMModule("ws"));
-		globalThis.WebSocket = WebSocket;
-	}
-}
-
 async function readFile(path) {
 	if (DENO_RUNTIME_DETECTED) {
 		return Deno.readFile(path);
@@ -219,21 +209,21 @@ async function remove(path, options = {}) {
 }
 
 function exit(code) {
+	if (code == "SIGINT") {
+		code = 130;
+	} else if (code == "SIGTERM") {
+		code = 143;
+	}
 	if (DENO_RUNTIME_DETECTED) {
 		Deno.exit(code);
 	} else {
-		if (code == "SIGINT") {
-			code = 130;
-		} else if (code == "SIGTERM") {
-			code = 143;
-		}
 		process.exit(code);
 	}
 }
 
 function addSignalListener(signal, listener) {
 	if (DENO_RUNTIME_DETECTED) {
-		Deno.addSignalListener(signal, listener);
+		Deno.addSignalListener(signal, () => listener(signal));
 	} else {
 		process.once(signal, listener);
 	}
@@ -261,6 +251,11 @@ async function toFileUrl(filePath) {
 	}
 }
 
-function getNPMModule(module) {
-	return NPM_MODULES[module];
+async function fromFileUrl(fileUrl) {
+	if (DENO_RUNTIME_DETECTED) {
+		return path.fromFileUrl(fileUrl);
+	} else {
+		const url = await import(NODE_MODULES["url"]);
+		return url.fileURLToPath(fileUrl);
+	}
 }