@nu-art/commando 0.204.33 → 0.204.35

package/core/cli.d.ts

@@ -122,4 +122,21 @@ export declare class CommandoInteractive {
     kill: (signal?: NodeJS.Signals | number) => boolean;
     gracefullyKill: (pid?: number) => Promise<void>;
 }
+type CommandoCLIListener_Callback = (stdout: string) => void;
+export declare class CommandoCLIListener {
+    private cb;
+    protected filter?: RegExp;
+    constructor(callback: CommandoCLIListener_Callback, filter?: string | RegExp);
+    private _process;
+    private stdoutPassesFilter;
+    listen: <T extends Commando | CommandoInteractive>(commando: T) => T;
+    protected process(stdout: string): void;
+}
+export declare class CommandoCLIKeyValueListener extends CommandoCLIListener {
+    private value;
+    constructor(pattern: string | RegExp);
+    private setValue;
+    protected process(stdout: string): void;
+    getValue: () => string | undefined;
+}
 export {};

package/core/cli.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandoInteractive = exports.Commando = exports.CliWrapper = exports.Cli = exports.CliInteractive = exports.BaseCLI = void 0;
+exports.CommandoCLIKeyValueListener = exports.CommandoCLIListener = exports.CommandoInteractive = exports.Commando = exports.CliWrapper = exports.Cli = exports.CliInteractive = exports.BaseCLI = void 0;
 const child_process_1 = require("child_process");
 const class_merger_1 = require("./class-merger");
 const CliError_1 = require("./CliError");
@@ -92,17 +92,13 @@ class CliInteractive extends BaseCLI {
         };
         this.gracefullyKill = async (pid) => {
             return new Promise((resolve, reject) => {
-                console.log('Killing process');
                 this.shell.on('exit', async (code, signal) => {
-                    console.log(`Process Killed ${signal}`);
                     resolve();
                 });
                 if (pid) {
-                    console.log(`KILLING PID: ${pid}`);
                     process.kill(pid, 'SIGINT');
                 }
                 else {
-                    console.log(`KILLING SHELL WITH SIGINT`);
                     this.shell.kill('SIGINT');
                 }
             });
@@ -116,9 +112,14 @@ class CliInteractive extends BaseCLI {
             const message = data.toString().trim();
             if (!message.length)
                 return;
-            this.stdoutProcessors.forEach(processor => processor(message));
-            this.stderrProcessors.forEach(processor => processor(message));
-            this.logInfo(`${message}`);
+            try {
+                this.stdoutProcessors.forEach(processor => processor(message));
+                this.stderrProcessors.forEach(processor => processor(message));
+                this.logInfo(`${message}`);
+            }
+            catch (e) {
+                this.logError(e);
+            }
         };
         (_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);
@@ -295,7 +296,6 @@ class CommandoInteractive {
             return commando.cli.kill(signal);
         };
         commando.gracefullyKill = async (pid) => {
-            console.log('Commando Inter calling gracefullyKill');
             await commando.cli.gracefullyKill(pid);
         };
         commando.addStdoutProcessor = (processor) => {
@@ -318,3 +318,58 @@ class CommandoInteractive {
     }
 }
 exports.CommandoInteractive = CommandoInteractive;
+class CommandoCLIListener {
+    constructor(callback, filter) {
+        this.stdoutPassesFilter = (stdout) => {
+            if (!this.filter)
+                return true;
+            return this.filter.test(stdout);
+        };
+        //######################### Functions #########################
+        this.listen = (commando) => {
+            const process = this._process.bind(this);
+            commando.addStdoutProcessor(process);
+            commando.addStderrProcessor(process);
+            return commando;
+        };
+        this.cb = callback;
+        if (!filter)
+            return;
+        if (typeof filter === 'string')
+            this.filter = new RegExp(filter);
+        else
+            this.filter = filter;
+    }
+    //######################### Inner Logic #########################
+    _process(stdout) {
+        if (!this.stdoutPassesFilter(stdout))
+            return;
+        this.process(stdout);
+    }
+    process(stdout) {
+        this.cb(stdout);
+    }
+}
+exports.CommandoCLIListener = CommandoCLIListener;
+class CommandoCLIKeyValueListener extends CommandoCLIListener {
+    constructor(pattern) {
+        const filter = typeof pattern === 'string' ? new RegExp(pattern) : pattern;
+        super(ts_common_1.voidFunction, filter);
+        //######################### Inner Logic #########################
+        this.setValue = (value) => {
+            this.value = value;
+        };
+        this.getValue = () => this.value;
+    }
+    //######################### Functions #########################
+    process(stdout) {
+        var _a;
+        const pattern = this.filter;
+        if (!pattern)
+            throw new ts_common_1.ThisShouldNotHappenException('Class does not have a pattern, but it should have been initialized with one');
+        const value = (_a = stdout.match(pattern)) === null || _a === void 0 ? void 0 : _a[1];
+        if (value)
+            this.setValue(value);
+    }
+}
+exports.CommandoCLIKeyValueListener = CommandoCLIKeyValueListener;

package/package.json

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