@push.rocks/smartshell 3.2.2 → 3.2.4

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartshell',
-  version: '3.2.2',
+  version: '3.2.4',
   description: 'A library for executing shell commands using promises.'
 }

package/ts/classes.smartshell.ts

@@ -2,7 +2,6 @@ import * as plugins from './plugins.js';
 import { ShellEnv } from './classes.shellenv.js';
 import type { IShellEnvContructorOptions, TExecutor } from './classes.shellenv.js';
 import { ShellLog } from './classes.shelllog.js';
-
 import * as cp from 'child_process';
 
 // -- interfaces --
@@ -17,7 +16,15 @@ export interface IExecResultStreaming {
   kill: () => Promise<void>;
   terminate: () => Promise<void>;
   keyboardInterrupt: () => Promise<void>;
-  customSignal: (signalArg: plugins.smartexit.TProcessSignal) => Promise<void>;
+  customSignal: (signal: plugins.smartexit.TProcessSignal) => Promise<void>;
+}
+
+interface IExecOptions {
+  commandString: string;
+  silent?: boolean;
+  strict?: boolean;
+  streaming?: boolean;
+  interactive?: boolean;
 }
 
 export class Smartshell {
@@ -29,61 +36,48 @@ export class Smartshell {
   }
 
   /**
-   * executes a given command async
+   * Executes a given command asynchronously.
    */
-  private async _exec(options: {
-    commandString: string;
-    silent?: boolean;
-    strict?: boolean;
-    streaming?: boolean;
-    interactive?: boolean;
-  }): Promise<IExecResult | IExecResultStreaming | void> {
+  private async _exec(options: IExecOptions): Promise<IExecResult | IExecResultStreaming | void> {
     if (options.interactive) {
-      return await this._execInteractive(options);
+      return await this._execInteractive({ commandString: options.commandString });
     }
-
     return await this._execCommand(options);
   }
 
-  private async _execInteractive(options: {
-    commandString: string;
-    interactive?: boolean;
-  }): Promise<void> {
+  /**
+   * Executes an interactive command.
+   */
+  private async _execInteractive(options: Pick<IExecOptions, 'commandString'>): Promise<void> {
+    // Skip interactive execution in CI environments.
     if (process.env.CI) {
       return;
     }
 
-    const done = plugins.smartpromise.defer();
-
-    const shell = cp.spawn(options.commandString, {
-      stdio: 'inherit',
-      shell: true,
-      detached: true
-    });
+    return new Promise<void>((resolve) => {
+      const shell = cp.spawn(options.commandString, {
+        stdio: 'inherit',
+        shell: true,
+        detached: true,
+      });
 
-    this.smartexit.addProcess(shell);
+      this.smartexit.addProcess(shell);
 
-    shell.on('close', (code) => {
-      console.log(`interactive shell terminated with code ${code}`);
-      this.smartexit.removeProcess(shell);
-      done.resolve();
+      shell.on('close', (code) => {
+        console.log(`Interactive shell terminated with code ${code}`);
+        this.smartexit.removeProcess(shell);
+        resolve();
+      });
     });
-
-    await done.promise;
   }
 
-  private async _execCommand(options: {
-    commandString: string;
-    silent?: boolean;
-    strict?: boolean;
-    streaming?: boolean;
-  }): Promise<IExecResult | IExecResultStreaming> {
-    const done = plugins.smartpromise.defer<IExecResult | IExecResultStreaming>();
-    const childProcessEnded = plugins.smartpromise.defer<IExecResult>();
-
+  /**
+   * Executes a command and returns either a non-streaming result or a streaming interface.
+   */
+  private async _execCommand(options: IExecOptions): Promise<IExecResult | IExecResultStreaming> {
     const commandToExecute = this.shellEnv.createEnvExecString(options.commandString);
-
     const shellLogInstance = new ShellLog();
+
     const execChildProcess = cp.spawn(commandToExecute, [], {
       shell: true,
       cwd: process.cwd(),
@@ -93,6 +87,7 @@ export class Smartshell {
 
     this.smartexit.addProcess(execChildProcess);
 
+    // Capture stdout and stderr output.
     execChildProcess.stdout.on('data', (data) => {
       if (!options.silent) {
         shellLogInstance.writeToConsole(data);
@@ -107,47 +102,55 @@ export class Smartshell {
       shellLogInstance.addToBuffer(data);
     });
 
-    execChildProcess.on('exit', (code, signal) => {
-      this.smartexit.removeProcess(execChildProcess);
-      if (options.strict && code === 1) {
-        done.reject();
-      }
-
-      const execResult = {
-        exitCode: code,
-        stdout: shellLogInstance.logStore.toString(),
-      };
+    // Wrap child process termination into a Promise.
+    const childProcessEnded: Promise<IExecResult> = new Promise((resolve, reject) => {
+      execChildProcess.on('exit', (code, signal) => {
+        this.smartexit.removeProcess(execChildProcess);
+
+        const execResult: IExecResult = {
+          exitCode: typeof code === 'number' ? code : (signal ? 1 : 0),
+          stdout: shellLogInstance.logStore.toString(),
+        };
+
+        if (options.strict && code !== 0) {
+          reject(new Error(`Command "${options.commandString}" exited with code ${code}`));
+        } else {
+          resolve(execResult);
+        }
+      });
 
-      if (!options.streaming) {
-        done.resolve(execResult);
-      }
-      childProcessEnded.resolve(execResult);
+      execChildProcess.on('error', (error) => {
+        this.smartexit.removeProcess(execChildProcess);
+        reject(error);
+      });
     });
 
+    // If streaming mode is enabled, return a streaming interface immediately.
     if (options.streaming) {
-      done.resolve({
+      return {
         childProcess: execChildProcess,
-        finalPromise: childProcessEnded.promise,
+        finalPromise: childProcessEnded,
         kill: async () => {
-          console.log(`running tree kill with SIGKILL on process ${execChildProcess.pid}`);
+          console.log(`Running tree kill with SIGKILL on process ${execChildProcess.pid}`);
           await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGKILL');
         },
         terminate: async () => {
-          console.log(`running tree kill with SIGTERM on process ${execChildProcess.pid}`);
+          console.log(`Running tree kill with SIGTERM on process ${execChildProcess.pid}`);
           await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGTERM');
         },
         keyboardInterrupt: async () => {
-          console.log(`running tree kill with SIGINT on process ${execChildProcess.pid}`);
+          console.log(`Running tree kill with SIGINT on process ${execChildProcess.pid}`);
           await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGINT');
         },
-        customSignal: async (signalArg: plugins.smartexit.TProcessSignal) => {
-          console.log(`running tree kill with custom signal ${signalArg} on process ${execChildProcess.pid}`);
-          await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, signalArg);
+        customSignal: async (signal: plugins.smartexit.TProcessSignal) => {
+          console.log(`Running tree kill with custom signal ${signal} on process ${execChildProcess.pid}`);
+          await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, signal);
         },
-      });
+      } as IExecResultStreaming;
     }
 
-    return await done.promise;
+    // For non-streaming mode, wait for the process to complete.
+    return await childProcessEnded;
   }
 
   public async exec(commandString: string): Promise<IExecResult> {
@@ -166,41 +169,35 @@ export class Smartshell {
     return (await this._exec({ commandString, silent: true, strict: true })) as IExecResult;
   }
 
-  public async execStreaming(
-    commandString: string,
-    silent: boolean = false
-  ): Promise<IExecResultStreaming> {
+  public async execStreaming(commandString: string, silent: boolean = false): Promise<IExecResultStreaming> {
     return (await this._exec({ commandString, silent, streaming: true })) as IExecResultStreaming;
   }
 
   public async execStreamingSilent(commandString: string): Promise<IExecResultStreaming> {
-    return (await this._exec({
-      commandString,
-      silent: true,
-      streaming: true,
-    })) as IExecResultStreaming;
+    return (await this._exec({ commandString, silent: true, streaming: true })) as IExecResultStreaming;
   }
 
-  public async execInteractive(commandString: string) {
+  public async execInteractive(commandString: string): Promise<void> {
     await this._exec({ commandString, interactive: true });
   }
 
   public async execAndWaitForLine(
     commandString: string,
-    regexArg: RegExp,
-    silentArg: boolean = false
-  ) {
-    let done = plugins.smartpromise.defer();
-    let execStreamingResult = await this.execStreaming(commandString, silentArg);
-    execStreamingResult.childProcess.stdout.on('data', (stdOutChunk: string) => {
-      if (regexArg.test(stdOutChunk)) {
-        done.resolve();
-      }
+    regex: RegExp,
+    silent: boolean = false
+  ): Promise<void> {
+    const execStreamingResult = await this.execStreaming(commandString, silent);
+    return new Promise<void>((resolve) => {
+      execStreamingResult.childProcess.stdout.on('data', (chunk: Buffer | string) => {
+        const data = typeof chunk === 'string' ? chunk : chunk.toString();
+        if (regex.test(data)) {
+          resolve();
+        }
+      });
     });
-    return done.promise;
   }
 
-  public async execAndWaitForLineSilent(commandString: string, regexArg: RegExp) {
-    return this.execAndWaitForLine(commandString, regexArg, true);
+  public async execAndWaitForLineSilent(commandString: string, regex: RegExp): Promise<void> {
+    return this.execAndWaitForLine(commandString, regex, true);
   }
 }