nano-spawn-compat 2.0.2 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nano-spawn-compat",
-	"version": "2.0.2",
+	"version": "2.0.4",
 	"description": "Tiny process execution for humans — a better child_process",
 	"license": "MIT",
 	"repository": "leonsilicon/nano-spawn-compat",

package/source/result.js

@@ -1,5 +1,5 @@
 import process from 'node:process';
-import {once, on} from './once.js';
+import {once} from './once.js';
 
 export const getResult = async (nodeChildProcess, {input}, context) => {
 	const instance = await nodeChildProcess;
@@ -12,7 +12,7 @@ export const getResult = async (nodeChildProcess, {input}, context) => {
 	try {
 		await Promise.race([
 			onClose,
-			...instance.stdio.filter(Boolean).map(stream => onStreamError(stream)),
+			...[instance.stdin, instance.stdout, instance.stderr].filter(Boolean).map(stream => onStreamError(stream)),
 		]);
 		checkFailure(context, getErrorOutput(instance));
 		return getOutputs(context);
@@ -22,14 +22,14 @@ export const getResult = async (nodeChildProcess, {input}, context) => {
 	}
 };
 
-const onStreamError = async stream => {
-	for await (const [error] of on(stream, 'error')) {
-		// Ignore errors that are due to closing errors when the subprocesses exit normally, or due to piping
-		if (!['ERR_STREAM_PREMATURE_CLOSE', 'EPIPE'].includes(error?.code)) {
-			throw error;
-		}
-	}
-};
+const onStreamError = stream =>
+	new Promise((_resolve, reject) => {
+		stream.on('error', error => {
+			if (!['ERR_STREAM_PREMATURE_CLOSE', 'EPIPE'].includes(error?.code)) {
+				reject(error);
+			}
+		});
+	});
 
 const checkFailure = ({command}, {exitCode, signalName}) => {
 	if (signalName !== undefined) {

package/source/spawn.js

@@ -1,5 +1,4 @@
 import {spawn} from 'node:child_process';
-import {once} from './once.js';
 import {applyForceShell} from './windows.js';
 import {getResultError} from './result.js';
 
@@ -25,7 +24,9 @@ export const spawnSubprocess = async (file, commandArguments, options, context)
 		// This prevents that.
 		instance.once('error', () => {});
 
-		await once(instance, 'spawn');
+		/*
+		The spawn event isn't emitted.
+		await once(instance, 'spawn'); */
 		return instance;
 	} catch (error) {
 		throw getResultError(error, {}, context);
@@ -45,14 +46,11 @@ const concatenateShell = (file, commandArguments, options) => options.shell && c
 	: [file, commandArguments, options];
 
 const bufferOutput = (stream, {state}, streamName) => {
-	if (stream) {
-		stream.setEncoding('utf8');
-		if (!state.isIterating[streamName]) {
-			state.isIterating[streamName] = false;
-			stream.on('data', chunk => {
-				state[streamName] += chunk;
-				state.output += chunk;
-			});
-		}
+	if (stream && !state.isIterating[streamName]) {
+		state.isIterating[streamName] = false;
+		stream.on('data', chunk => {
+			state[streamName] += chunk;
+			state.output += chunk;
+		});
 	}
 };