@nu-art/commando 0.204.30 → 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;
@@ -51,9 +51,9 @@ 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: (pid?: number) => Promise<unknown>;
+    gracefullyKill: (pid?: number) => Promise<void>;
 }
 export declare class Cli extends BaseCLI {
     private cliOptions;
@@ -118,7 +118,7 @@ export declare class CommandoInteractive {
     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: (pid?: number) => Promise<void>;
 }

package/core/cli.js

@@ -83,9 +83,9 @@ class CliInteractive extends BaseCLI {
             });
             this.commands = [];
         };
-        this.endInteractive = () => {
+        this.endInteractive = (cb) => {
             var _a;
-            (_a = this.shell.stdin) === null || _a === void 0 ? void 0 : _a.end();
+            (_a = this.shell.stdin) === null || _a === void 0 ? void 0 : _a.end(cb);
         };
         this.kill = (signal) => {
             return this.shell.kill(signal);
@@ -95,7 +95,6 @@ class CliInteractive extends BaseCLI {
                 console.log('Killing process');
                 this.shell.on('exit', async (code, signal) => {
                     console.log(`Process Killed ${signal}`);
-                    await (0, ts_common_1.sleep)(5000);
                     resolve();
                 });
                 if (pid) {
@@ -106,7 +105,7 @@ class CliInteractive extends BaseCLI {
                     console.log(`KILLING SHELL WITH SIGINT`);
                     this.shell.kill('SIGINT');
                 }
-            }).then(() => (0, ts_common_1.sleep)(10000));
+            });
         };
         this.shell = (0, node_child_process_1.spawn)('/bin/bash', {
             detached: true,
@@ -272,7 +271,7 @@ class CommandoInteractive {
         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 = (pid) => {
             return new Promise(resolve => resolve());
@@ -288,7 +287,8 @@ class CommandoInteractive {
             commando.cli.setUID(uid);
             return commando;
         };
-        commando.close = () => {
+        commando.close = (cb) => {
+            commando.cli.endInteractive(cb);
             return commando;
         };
         commando.kill = (signal) => {

package/package.json

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