@j-o-r/sh 1.1.7 → 1.1.9

package/lib/SH.js

@@ -31,7 +31,7 @@ import SHDispatch from './SHDispatch.js';
 import Test from './Test.js'
 
 /**
-* @typedef {Object.<string, string | string[]>} ArgsObject
+* @typedef {Object.<string, string>} ArgsObject
 * @property {string} [key: string] - Any string key maps to a string value
 * @property {string[]} _ - Array of strings, unnamed parameters
 * @description Parsed parameters result.
@@ -111,8 +111,6 @@ const SH = new Proxy(function(pieces, ...args) {
 /**
 * Create a async/sync context in new execution callstack
 * @param {function} callback - async/sync function
-* @param {ResolveCallback} [resolve] - optional resolve/result callback
-* @param {RejectCallback} [reject] - optional reject/error callback
 * @example
 * const p = within(async () => {
 *		const res = await Promise.all([
@@ -124,24 +122,8 @@ const SH = new Proxy(function(pieces, ...args) {
 *   return 'res';
 * });
 */
-const within = (callback, resolve, reject) => {
-	// optional, custom resolve/reject functions from an outside promise/function
-	const RCB = jsType(resolve) === 'Function';
-	const ECB = jsType(reject) === 'Function';
-	(async () => {
-		try {
-			const res = await Promise.resolve(callback());
-			if (RCB) {
-				resolve(res);
-			}
-		} catch (e) {
-			if (ECB) {
-				reject(e)
-			} else {
-				throw (e);
-			}
-		}
-	})()
+const within = async (callback) => {
+	return await callback();
 }
 
 /**
@@ -259,34 +241,6 @@ function* expBackoff(max = '60s', rand = '100ms') {
 /**
 * Parses command-line arguments into an object.
 *
-* The function recognizes arguments that start with two dashes (`--`) as keys,
-* and the subsequent value (if not another key) as the corresponding value.
-* If a key does not have a value, it defaults to `true`.
-* All unrecognized arguments are collected in an array under the `_` property.
-*
-* @param {string[]} args - An array of command-line arguments.
-* @returns {ArgsObject} An object where:
-*   - Each key corresponds to an argument that starts with `--`,
-*   - The value is either the next argument or `true` if no value is provided,
-*   - The `_` property contains an array of unbound arguments.
-*/
-const parseArgsOld = (args) => {
-	const result = { _: [] }; // Initialize result with an empty array for unbound values
-	for (let i = 0; i < args.length; i++) {
-		if (args[i].startsWith('--')) {
-			const key = args[i].substring(2);
-			const value = args[i + 1] && !args[i + 1].startsWith('--') ? args[i + 1] : true;
-			result[key] = value;
-			if (value !== true) i++; // Skip the next element as it is a value
-		} else {
-			result._.push(args[i]); // Add unbound value to the array
-		}
-	}
-	return result;
-}
-/**
-* Parses command-line arguments into an object.
-*
 * The function recognizes arguments that start with two dashes (`--`) or one dash (`-`) as keys,
 * and the subsequent value (if not another key) as the corresponding value.
 * If a key does not have a value, it defaults to `true`.
@@ -325,6 +279,7 @@ const parseArgs = (args) => {
 			result._.push(args[i]);
 		}
 	}
+	// @ts-ignore
 	return result;
 };
 

package/lib/SHDispatch.js

@@ -8,15 +8,18 @@ import SHExec from './SHExecute.js';
  * @property {Buffer|null} stdout - The standard output of the child process.
  * @property {Buffer|null} stderr - The standard error of the child process.
  */
-/**
- * Default options for the execution environment.
- *
+ /**
  * @typedef {Object} SHOptions
- * @property {string} [cwd] - The current working directory.
- * @property {NodeJS.ProcessEnv} [env] - The environment variables.
- * @property {string} [shell] - The shell to use for execution.
- * @property {StdioOptions|StdioOption} [stdio] - The stdio configuration.
- * @property {number} [timeout] - default 20000: a timeout error is triggerd when a process execution time is exceeded, 0 is no timeout
+ * @property {string} [cwd] - Current working directory of the child process.
+ * @property {Object} [env] - Environment key-value pairs.
+ * @property {Array|string} [argv0] - Explicitly set the value of `argv[0]` sent to the child process.
+ * @property {boolean} [detached=false] - If true, the child will be a process group leader.
+ * @property {number} [uid] - Sets the user identity of the process.
+ * @property {number} [gid] - Sets the group identity of the process.
+ * @property {StdioOptions|StdioOption} [stdio='pipe'] - Child's stdio configuration.
+ * @property {boolean|string} [shell="bash"] - If true, runs command inside a shell.
+ * @property {number} [timeout=0] - In milliseconds, specifies when to terminate the child process.
+ * @property {string|Buffer|URL} [input] - The input to write to stdin.
  */
 /**
  * @typedef {('pipe' | 'ignore' | 'inherit' | number)} StdioOption
@@ -49,22 +52,24 @@ import SHExec from './SHExecute.js';
 * @returns {SHOptions}
 */
 const mergeOptions = (predefined, options) => {
-	const keys = Object.keys(predefined);
-	const mergedObj = keys.reduce((acc, key) => {
-		acc[key] = options[key] !== undefined ? options[key] : predefined[key];
-		return acc;
-	}, {});
+	const mergedObj = { ...predefined };
+
+	for (const key in options) {
+		if (options[key] !== undefined) {
+			mergedObj[key] = options[key];
+		}
+	}
+
 	return mergedObj;
 }
 
-
 /** @type {SHOptions} */
 const defaultOptions = {
 	cwd: process.cwd(),
 	env: process.env,
 	shell: 'bash',
 	stdio: ['inherit', 'pipe', 'pipe'],
-	timeout: 10000 // when 0 there is no timeout
+	timeout: 0 // when 0 there is no timeout
 };
 
 
@@ -107,6 +112,7 @@ class SHDispatch {
 		this.#options = mergeOptions(defaultOptions, options)
 		return this;
 	}
+
 	/** 
 	* @param {string} [payload]
 	* @returns {Promise<string>}
@@ -117,7 +123,7 @@ class SHDispatch {
 	}
 
 	/** 
-	* Works for screen takeovers like editors
+	* Works for terminal screen takeovers like editors
 	* @param {string} [payload]
 	* @returns {import('child_process').SpawnSyncReturns}
 	*/

package/lib/SHExecute.js

@@ -93,13 +93,9 @@ class SHExecute {
 	* @retuns {Promise<string>}
 	*/
 	run(payload) {
-		let to = 0;
 		if (payload && typeof payload !== 'string') {
 			throw new Error('Argument is not a string');
 		}
-		if (this.#options.timeout) {
-			to = this.#options.timeout;
-		}
 		/** @type {import('node:child_process').SpawnOptions} */
 		const options = this.#options;
 		// pipe need to be set on stdin when posting a payload
@@ -117,21 +113,14 @@ class SHExecute {
 			this.#proc.stdin.end(payload);
 		}
 		return new Promise((resolve, reject) => {
-			let timeout;
-			if (to > 0) {
-				timeout = setTimeout(async () => {
-					this.#proc.kill();
-					reject(new Error(`Process timed out: ${this.#command}`));
-				}, to); // options.timeout
-			}
 			this.#proc.on('close', (code) => {
-				if (timeout) clearTimeout(timeout);
 				if (this.#forcedKill) {
 					// Resolve without content
 					resolve();
 					return;
 				}
-				if (code === 0) {
+				// Detached does not closes with an exitcode
+				if (code === 0 || code === null || typeof (code) === 'undefined') {
 					resolve(this.#stdout.trim());
 				} else {
 					reject(new Error(`${code}: ${this.#command} "${this.#stderr.trim()}"`));

package/package.json

@@ -2,7 +2,7 @@
   "name": "@j-o-r/sh",
   "author": "Jorrit Duin <j-o-r@duin.work>",
   "type": "module",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Execute shell commands on Linux-based systems from javascript",
   "main": "lib/SH.js",
   "types": "types/SH.d.ts",
@@ -50,4 +50,4 @@
     "process-promise",
     "process-output"
   ]
-}
+}

package/types/SH.d.ts

@@ -1,5 +1,5 @@
 export type ArgsObject = {
-    [x: string]: string | string[];
+    [x: string]: string;
 };
 export type RejectCallback = Function;
 export type ResolveCallback = Function;
@@ -54,8 +54,6 @@ export function readIn(): Promise<string>;
 /**
 * Create a async/sync context in new execution callstack
 * @param {function} callback - async/sync function
-* @param {ResolveCallback} [resolve] - optional resolve/result callback
-* @param {RejectCallback} [reject] - optional reject/error callback
 * @example
 * const p = within(async () => {
 *		const res = await Promise.all([
@@ -67,7 +65,7 @@ export function readIn(): Promise<string>;
 *   return 'res';
 * });
 */
-export function within(callback: Function, resolve?: ResolveCallback, reject?: RejectCallback): void;
+export function within(callback: Function): Promise<any>;
 /**
  * Generates an exponential backoff time with a random jitter.
  *
@@ -94,7 +92,7 @@ export function expBackoff(max?: string, rand?: string): Generator<number, void,
 */
 export function parseArgs(args?: string[]): ArgsObject;
 /**
-* @typedef {Object.<string, string | string[]>} ArgsObject
+* @typedef {Object.<string, string>} ArgsObject
 * @property {string} [key: string] - Any string key maps to a string value
 * @property {string[]} _ - Array of strings, unnamed parameters
 * @description Parsed parameters result.

package/types/SHDispatch.d.ts

@@ -25,30 +25,47 @@ export type SpawnSyncResponse = {
      */
     stderr: Buffer | null;
 };
-/**
- * Default options for the execution environment.
- */
 export type SHOptions = {
     /**
-     * - The current working directory.
+     * - Current working directory of the child process.
      */
     cwd?: string | undefined;
     /**
-     * - The environment variables.
+     * - Environment key-value pairs.
      */
-    env?: NodeJS.ProcessEnv | undefined;
+    env?: Object | undefined;
     /**
-     * - The shell to use for execution.
+     * - Explicitly set the value of `argv[0]` sent to the child process.
      */
-    shell?: string | undefined;
+    argv0?: string | any[] | undefined;
     /**
-     * - The stdio configuration.
+     * - If true, the child will be a process group leader.
+     */
+    detached?: boolean | undefined;
+    /**
+     * - Sets the user identity of the process.
+     */
+    uid?: number | undefined;
+    /**
+     * - Sets the group identity of the process.
+     */
+    gid?: number | undefined;
+    /**
+     * - Child's stdio configuration.
      */
     stdio?: number | "pipe" | "ignore" | "inherit" | StdioOption[] | undefined;
     /**
-     * - default 20000: a timeout error is triggerd when a process execution time is exceeded, 0 is no timeout
+     * - If true, runs command inside a shell.
+     */
+    shell?: string | boolean | undefined;
+    /**
+     * - In milliseconds, specifies when to terminate the child process.
      */
     timeout?: number | undefined;
+    /**
+     * - The input to write to stdin.
+     */
+    input?: string | Buffer<ArrayBufferLike> | URL | undefined;
 };
 export type StdioOption = ("pipe" | "ignore" | "inherit" | number);
 export type StdioOptions = Array<StdioOption> | StdioOption;
@@ -69,7 +86,7 @@ declare class SHDispatch {
     */
     run(payload?: string): Promise<string>;
     /**
-    * Works for screen takeovers like editors
+    * Works for terminal screen takeovers like editors
     * @param {string} [payload]
     * @returns {import('child_process').SpawnSyncReturns}
     */