@nu-art/commando 0.204.29 → 0.204.31

package/core/cli.d.ts

@@ -6,7 +6,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { ExecOptions } from 'child_process';
-import { Constructor, Logger } from '@nu-art/ts-common';
+import { AsyncVoidFunction, Constructor, Logger } from '@nu-art/ts-common';
 export type CliBlock<Cli extends CliWrapper> = (cli: Cli) => void;
 export type CliOptions = ExecOptions & {
     encoding: BufferEncoding | string | null;
@@ -19,6 +19,8 @@ type Options = {
     indentation: number;
 };
 export declare class BaseCLI extends Logger {
+    protected stdoutProcessors: ((stdout: string) => void)[];
+    protected stderrProcessors: ((stdout: string) => void)[];
     protected commands: string[];
     private indentation;
     protected _debug: boolean;
@@ -40,14 +42,18 @@ export declare class BaseCLI extends Logger {
      */
     readonly append: (command: string) => this;
     setUID(uuid: string): void;
+    addStdoutProcessor(processor: (stdout: string) => void): void;
+    addStderrProcessor(processor: (stderr: string) => void): void;
+    removeStdoutProcessor(processor: (stdout: string) => void): void;
+    removeStderrProcessor(processor: (stderr: string) => void): void;
 }
 export declare class CliInteractive extends BaseCLI {
     private shell;
     constructor();
     execute: () => Promise<void>;
-    endInteractive: () => void;
+    endInteractive: (cb?: AsyncVoidFunction) => void;
     kill: (signal?: NodeJS.Signals | number) => boolean;
-    gracefullyKill: () => Promise<void>;
+    gracefullyKill: (pid?: number) => Promise<void>;
 }
 export declare class Cli extends BaseCLI {
     private cliOptions;
@@ -98,14 +104,22 @@ export declare class Commando {
         stdout: string;
         stderr: string;
     }>;
+    addStdoutProcessor: (processor: (stdout: string) => void) => this;
+    addStderrProcessor: (processor: (stderr: string) => void) => this;
+    removeStdoutProcessor: (processor: (stdout: string) => void) => this;
+    removeStderrProcessor: (processor: (stderr: string) => void) => this;
     private constructor();
 }
 export declare class CommandoInteractive {
     cli: CliInteractive;
     static create<T extends Constructor<CliWrapper>[]>(...plugins: T): CommandoInteractive & Commando & import("./class-merger").MergeTypes<T>;
+    addStdoutProcessor: (processor: (stdout: string) => void) => this;
+    addStderrProcessor: (processor: (stderr: string) => void) => this;
+    removeStdoutProcessor: (processor: (stdout: string) => void) => this;
+    removeStderrProcessor: (processor: (stderr: string) => void) => this;
     setUID: (uid: string) => this;
-    close: () => this;
+    close: (cb?: AsyncVoidFunction) => this;
     kill: (signal?: NodeJS.Signals | number) => boolean;
-    gracefullyKill: () => Promise<void>;
+    gracefullyKill: (pid?: number) => Promise<void>;
 }
 export {};

package/core/cli.js

@@ -20,6 +20,8 @@ class BaseCLI extends ts_common_1.Logger {
      */
     constructor(options = defaultOptions) {
         super();
+        this.stdoutProcessors = [];
+        this.stderrProcessors = [];
         this.commands = [];
         this.indentation = 0;
         this._debug = false;
@@ -52,52 +54,74 @@ class BaseCLI extends ts_common_1.Logger {
     setUID(uuid) {
         this.setTag(uuid);
     }
+    addStdoutProcessor(processor) {
+        this.stdoutProcessors.push(processor);
+    }
+    addStderrProcessor(processor) {
+        this.stderrProcessors.push(processor);
+    }
+    removeStdoutProcessor(processor) {
+        (0, ts_common_1.removeItemFromArray)(this.stdoutProcessors, processor);
+    }
+    removeStderrProcessor(processor) {
+        (0, ts_common_1.removeItemFromArray)(this.stderrProcessors, processor);
+    }
 }
 exports.BaseCLI = BaseCLI;
 class CliInteractive extends BaseCLI {
     constructor() {
+        var _a, _b;
         super();
         this.execute = async () => {
+            var _a;
             const command = this.commands.join(this.option.newlineDelimiter);
             if (this._debug)
                 this.logDebug(`executing: `, `"""\n${command}\n"""`);
-            this.shell.stdin.write(command + this.option.newlineDelimiter, 'utf-8', (err) => {
+            (_a = this.shell.stdin) === null || _a === void 0 ? void 0 : _a.write(command + this.option.newlineDelimiter, 'utf-8', (err) => {
                 if (err)
                     this.logError(`error`, err);
             });
             this.commands = [];
         };
-        this.endInteractive = () => {
-            this.shell.stdin.end();
+        this.endInteractive = (cb) => {
+            var _a;
+            (_a = this.shell.stdin) === null || _a === void 0 ? void 0 : _a.end(cb);
         };
         this.kill = (signal) => {
             return this.shell.kill(signal);
         };
-        this.gracefullyKill = async () => {
+        this.gracefullyKill = async (pid) => {
             return new Promise((resolve, reject) => {
                 console.log('Killing process');
-                this.shell.on('exit', (code, signal) => {
-                    console.log('Process Killed');
+                this.shell.on('exit', async (code, signal) => {
+                    console.log(`Process Killed ${signal}`);
                     resolve();
                 });
-                if (!this.shell.pid)
+                if (pid) {
+                    console.log(`KILLING PID: ${pid}`);
+                    process.kill(pid, 'SIGINT');
+                }
+                else {
+                    console.log(`KILLING SHELL WITH SIGINT`);
                     this.shell.kill('SIGINT');
-                else
-                    process.kill(-this.shell.pid, 'SIGINT');
+                }
             });
         };
         this.shell = (0, node_child_process_1.spawn)('/bin/bash', {
-        // detached:true,
+            detached: true,
+            shell: true
         });
         // Handle shell output (stdout)
         const printer = (data) => {
             const message = data.toString().trim();
             if (!message.length)
                 return;
+            this.stdoutProcessors.forEach(processor => processor(message));
+            this.stderrProcessors.forEach(processor => processor(message));
             this.logInfo(`${message}`);
         };
-        this.shell.stdout.on('data', printer);
-        this.shell.stderr.on('data', printer);
+        (_a = this.shell.stdout) === null || _a === void 0 ? void 0 : _a.on('data', printer);
+        (_b = this.shell.stderr) === null || _b === void 0 ? void 0 : _b.on('data', printer);
         // Handle shell errors (stderr)
         this.shell.on('data', printer);
         // Handle shell exit
@@ -127,10 +151,14 @@ class Cli extends BaseCLI {
                     }
                     if (stderr)
                         reject(stderr);
-                    if (stdout)
-                        this.logError(stdout);
-                    if (stderr)
+                    if (stdout) {
+                        this.stdoutProcessors.forEach(processor => processor(stdout));
+                        this.logInfo(stdout);
+                    }
+                    if (stderr) {
+                        this.stderrProcessors.forEach(processor => processor(stdout));
                         this.logError(stderr);
+                    }
                     resolve({ stdout, stderr });
                 });
             });
@@ -194,6 +222,22 @@ class Commando {
             commando.cli.setUID(uid);
             return commando;
         };
+        commando.addStdoutProcessor = (processor) => {
+            cli.addStdoutProcessor(processor);
+            return commando;
+        };
+        commando.addStderrProcessor = (processor) => {
+            cli.addStderrProcessor(processor);
+            return commando;
+        };
+        commando.removeStdoutProcessor = (processor) => {
+            cli.removeStdoutProcessor(processor);
+            return commando;
+        };
+        commando.removeStderrProcessor = (processor) => {
+            cli.removeStderrProcessor(processor);
+            return commando;
+        };
         return commando;
     }
     constructor() {
@@ -213,15 +257,23 @@ class Commando {
          */
         this.executeFile = async (filePath, interpreter) => ({ stdout: '', stderr: '', });
         this.executeRemoteFile = async (pathToFile, interpreter) => ({ stdout: '', stderr: '', });
+        this.addStdoutProcessor = (processor) => this;
+        this.addStderrProcessor = (processor) => this;
+        this.removeStdoutProcessor = (processor) => this;
+        this.removeStderrProcessor = (processor) => this;
     }
 }
 exports.Commando = Commando;
 class CommandoInteractive {
     constructor() {
+        this.addStdoutProcessor = (processor) => this;
+        this.addStderrProcessor = (processor) => this;
+        this.removeStdoutProcessor = (processor) => this;
+        this.removeStderrProcessor = (processor) => this;
         this.setUID = (uid) => this;
-        this.close = () => this;
+        this.close = (cb) => this;
         this.kill = (signal) => true;
-        this.gracefullyKill = () => {
+        this.gracefullyKill = (pid) => {
             return new Promise(resolve => resolve());
         };
     }
@@ -235,15 +287,32 @@ class CommandoInteractive {
             commando.cli.setUID(uid);
             return commando;
         };
-        commando.close = () => {
+        commando.close = (cb) => {
+            commando.cli.endInteractive(cb);
             return commando;
         };
         commando.kill = (signal) => {
             return commando.cli.kill(signal);
         };
-        commando.gracefullyKill = () => {
+        commando.gracefullyKill = async (pid) => {
             console.log('Commando Inter calling gracefullyKill');
-            return commando.cli.gracefullyKill();
+            await commando.cli.gracefullyKill(pid);
+        };
+        commando.addStdoutProcessor = (processor) => {
+            cli.addStdoutProcessor(processor);
+            return commando;
+        };
+        commando.addStderrProcessor = (processor) => {
+            cli.addStderrProcessor(processor);
+            return commando;
+        };
+        commando.removeStdoutProcessor = (processor) => {
+            cli.removeStdoutProcessor(processor);
+            return commando;
+        };
+        commando.removeStderrProcessor = (processor) => {
+            cli.removeStderrProcessor(processor);
+            return commando;
         };
         return commando;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/commando",
-  "version": "0.204.29",
+  "version": "0.204.31",
   "description": "",
   "keywords": [
     "TacB0sS",