@push.rocks/smartshell 3.0.4 → 3.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.d.ts +1 -1
- package/dist_ts/00_commitinfo_data.js +4 -4
- package/dist_ts/smartshell.classes.shelllog.d.ts +0 -1
- package/dist_ts/smartshell.classes.smartshell.d.ts +6 -3
- package/dist_ts/smartshell.classes.smartshell.js +41 -30
- package/dist_ts/smartshell.plugins.d.ts +0 -2
- package/dist_ts/smartshell.plugins.js +1 -4
- package/npmextra.json +17 -3
- package/package.json +21 -14
- package/readme.hints.md +1 -0
- package/readme.md +142 -27
- package/ts/00_commitinfo_data.ts +3 -3
- package/ts/smartshell.classes.smartshell.ts +57 -35
- package/ts/smartshell.plugins.ts +0 -5
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* autocreated commitinfo by @
|
|
2
|
+
* autocreated commitinfo by @push.rocks/commitinfo
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartshell',
|
|
6
|
-
version: '3.0.
|
|
7
|
-
description: 'shell
|
|
6
|
+
version: '3.0.6',
|
|
7
|
+
description: 'A library for executing shell commands using promises.'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHdEQUF3RDtDQUN0RSxDQUFBIn0=
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" resolution-mode="require"/>
|
|
2
1
|
import * as plugins from './smartshell.plugins.js';
|
|
3
2
|
import { ShellEnv } from './smartshell.classes.shellenv.js';
|
|
4
3
|
import type { IShellEnvContructorOptions } from './smartshell.classes.shellenv.js';
|
|
@@ -10,8 +9,10 @@ export interface IExecResult {
|
|
|
10
9
|
export interface IExecResultStreaming {
|
|
11
10
|
childProcess: cp.ChildProcess;
|
|
12
11
|
finalPromise: Promise<IExecResult>;
|
|
13
|
-
kill: () => void
|
|
14
|
-
terminate: () => void
|
|
12
|
+
kill: () => Promise<void>;
|
|
13
|
+
terminate: () => Promise<void>;
|
|
14
|
+
keyboardInterrupt: () => Promise<void>;
|
|
15
|
+
customSignal: (signalArg: plugins.smartexit.TProcessSignal) => Promise<void>;
|
|
15
16
|
}
|
|
16
17
|
export declare class Smartshell {
|
|
17
18
|
shellEnv: ShellEnv;
|
|
@@ -21,6 +22,8 @@ export declare class Smartshell {
|
|
|
21
22
|
* executes a given command async
|
|
22
23
|
*/
|
|
23
24
|
private _exec;
|
|
25
|
+
private _execInteractive;
|
|
26
|
+
private _execCommand;
|
|
24
27
|
exec(commandString: string): Promise<IExecResult>;
|
|
25
28
|
execSilent(commandString: string): Promise<IExecResult>;
|
|
26
29
|
execStrict(commandString: string): Promise<IExecResult>;
|
|
@@ -12,30 +12,33 @@ export class Smartshell {
|
|
|
12
12
|
*/
|
|
13
13
|
async _exec(options) {
|
|
14
14
|
if (options.interactive) {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
stdio: 'inherit',
|
|
22
|
-
shell: true,
|
|
23
|
-
detached: true
|
|
24
|
-
});
|
|
25
|
-
this.smartexit.addProcess(shell);
|
|
26
|
-
shell.on('close', (code) => {
|
|
27
|
-
console.log(`interactive shell terminated with code ${code}`);
|
|
28
|
-
this.smartexit.removeProcess(shell);
|
|
29
|
-
done.resolve();
|
|
30
|
-
});
|
|
31
|
-
await done.promise;
|
|
15
|
+
return await this._execInteractive(options);
|
|
16
|
+
}
|
|
17
|
+
return await this._execCommand(options);
|
|
18
|
+
}
|
|
19
|
+
async _execInteractive(options) {
|
|
20
|
+
if (process.env.CI) {
|
|
32
21
|
return;
|
|
33
22
|
}
|
|
23
|
+
const done = plugins.smartpromise.defer();
|
|
24
|
+
const shell = cp.spawn(options.commandString, {
|
|
25
|
+
stdio: 'inherit',
|
|
26
|
+
shell: true,
|
|
27
|
+
detached: true
|
|
28
|
+
});
|
|
29
|
+
this.smartexit.addProcess(shell);
|
|
30
|
+
shell.on('close', (code) => {
|
|
31
|
+
console.log(`interactive shell terminated with code ${code}`);
|
|
32
|
+
this.smartexit.removeProcess(shell);
|
|
33
|
+
done.resolve();
|
|
34
|
+
});
|
|
35
|
+
await done.promise;
|
|
36
|
+
}
|
|
37
|
+
async _execCommand(options) {
|
|
34
38
|
const done = plugins.smartpromise.defer();
|
|
35
39
|
const childProcessEnded = plugins.smartpromise.defer();
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const spawnlogInstance = new ShellLog();
|
|
40
|
+
const commandToExecute = this.shellEnv.createEnvExecString(options.commandString);
|
|
41
|
+
const shellLogInstance = new ShellLog();
|
|
39
42
|
const execChildProcess = cp.spawn(commandToExecute, [], {
|
|
40
43
|
shell: true,
|
|
41
44
|
cwd: process.cwd(),
|
|
@@ -45,15 +48,15 @@ export class Smartshell {
|
|
|
45
48
|
this.smartexit.addProcess(execChildProcess);
|
|
46
49
|
execChildProcess.stdout.on('data', (data) => {
|
|
47
50
|
if (!options.silent) {
|
|
48
|
-
|
|
51
|
+
shellLogInstance.writeToConsole(data);
|
|
49
52
|
}
|
|
50
|
-
|
|
53
|
+
shellLogInstance.addToBuffer(data);
|
|
51
54
|
});
|
|
52
55
|
execChildProcess.stderr.on('data', (data) => {
|
|
53
56
|
if (!options.silent) {
|
|
54
|
-
|
|
57
|
+
shellLogInstance.writeToConsole(data);
|
|
55
58
|
}
|
|
56
|
-
|
|
59
|
+
shellLogInstance.addToBuffer(data);
|
|
57
60
|
});
|
|
58
61
|
execChildProcess.on('exit', (code, signal) => {
|
|
59
62
|
this.smartexit.removeProcess(execChildProcess);
|
|
@@ -62,7 +65,7 @@ export class Smartshell {
|
|
|
62
65
|
}
|
|
63
66
|
const execResult = {
|
|
64
67
|
exitCode: code,
|
|
65
|
-
stdout:
|
|
68
|
+
stdout: shellLogInstance.logStore.toString(),
|
|
66
69
|
};
|
|
67
70
|
if (!options.streaming) {
|
|
68
71
|
done.resolve(execResult);
|
|
@@ -73,13 +76,21 @@ export class Smartshell {
|
|
|
73
76
|
done.resolve({
|
|
74
77
|
childProcess: execChildProcess,
|
|
75
78
|
finalPromise: childProcessEnded.promise,
|
|
76
|
-
kill: () => {
|
|
79
|
+
kill: async () => {
|
|
77
80
|
console.log(`running tree kill with SIGKILL on process ${execChildProcess.pid}`);
|
|
78
|
-
plugins.
|
|
81
|
+
await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGKILL');
|
|
79
82
|
},
|
|
80
|
-
terminate: () => {
|
|
83
|
+
terminate: async () => {
|
|
81
84
|
console.log(`running tree kill with SIGTERM on process ${execChildProcess.pid}`);
|
|
82
|
-
plugins.
|
|
85
|
+
await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGTERM');
|
|
86
|
+
},
|
|
87
|
+
keyboardInterrupt: async () => {
|
|
88
|
+
console.log(`running tree kill with SIGINT on process ${execChildProcess.pid}`);
|
|
89
|
+
await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGINT');
|
|
90
|
+
},
|
|
91
|
+
customSignal: async (signalArg) => {
|
|
92
|
+
console.log(`running tree kill with custom signal ${signalArg} on process ${execChildProcess.pid}`);
|
|
93
|
+
await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, signalArg);
|
|
83
94
|
},
|
|
84
95
|
});
|
|
85
96
|
}
|
|
@@ -124,4 +135,4 @@ export class Smartshell {
|
|
|
124
135
|
return this.execAndWaitForLine(commandString, regexArg, true);
|
|
125
136
|
}
|
|
126
137
|
}
|
|
127
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5jbGFzc2VzLnNtYXJ0c2hlbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNoZWxsLmNsYXNzZXMuc21hcnRzaGVsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHlCQUF5QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUU1RCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFNUQsT0FBTyxLQUFLLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFpQnBDLE1BQU0sT0FBTyxVQUFVO0lBSXJCLFlBQVksVUFBc0M7UUFGM0MsY0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUduRCxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksUUFBUSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRDs7T0FFRztJQUNLLEtBQUssQ0FBQyxLQUFLLENBQUMsT0FNbkI7UUFDQyxJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixPQUFPLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzlDLENBQUM7UUFFRCxPQUFPLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBRU8sS0FBSyxDQUFDLGdCQUFnQixDQUFDLE9BRzlCO1FBQ0MsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ25CLE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUUxQyxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxhQUFhLEVBQUU7WUFDNUMsS0FBSyxFQUFF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
|
|
@@ -3,7 +3,4 @@ import * as smartexit from '@push.rocks/smartexit';
|
|
|
3
3
|
import * as smartpromise from '@push.rocks/smartpromise';
|
|
4
4
|
import which from 'which';
|
|
5
5
|
export { smartdelay, smartexit, smartpromise, which };
|
|
6
|
-
|
|
7
|
-
import treeKill from 'tree-kill';
|
|
8
|
-
export { treeKill };
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzaGVsbC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUUxQixPQUFPLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLENBQUM7QUFFdEQsY0FBYztBQUNkLE9BQU8sUUFBUSxNQUFNLFdBQVcsQ0FBQztBQUVqQyxPQUFPLEVBQUUsUUFBUSxFQUFFLENBQUMifQ==
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzaGVsbC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUUxQixPQUFPLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLENBQUMifQ==
|
package/npmextra.json
CHANGED
|
@@ -7,12 +7,26 @@
|
|
|
7
7
|
"gitzone": {
|
|
8
8
|
"projectType": "npm",
|
|
9
9
|
"module": {
|
|
10
|
-
"githost": "
|
|
10
|
+
"githost": "code.foss.global",
|
|
11
11
|
"gitscope": "push.rocks",
|
|
12
12
|
"gitrepo": "smartshell",
|
|
13
|
-
"description": "shell
|
|
13
|
+
"description": "A library for executing shell commands using promises.",
|
|
14
14
|
"npmPackagename": "@push.rocks/smartshell",
|
|
15
|
-
"license": "MIT"
|
|
15
|
+
"license": "MIT",
|
|
16
|
+
"keywords": [
|
|
17
|
+
"shell commands",
|
|
18
|
+
"promises",
|
|
19
|
+
"asynchronous execution",
|
|
20
|
+
"child processes",
|
|
21
|
+
"environment management",
|
|
22
|
+
"command streaming",
|
|
23
|
+
"interactive commands",
|
|
24
|
+
"process management",
|
|
25
|
+
"typescript"
|
|
26
|
+
]
|
|
16
27
|
}
|
|
28
|
+
},
|
|
29
|
+
"tsdoc": {
|
|
30
|
+
"legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
|
|
17
31
|
}
|
|
18
32
|
}
|
package/package.json
CHANGED
|
@@ -1,37 +1,44 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartshell",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "3.0.
|
|
5
|
-
"description": "shell
|
|
4
|
+
"version": "3.0.6",
|
|
5
|
+
"description": "A library for executing shell commands using promises.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
7
7
|
"typings": "dist_ts/index.d.ts",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|
|
11
|
-
"url": "
|
|
11
|
+
"url": "https://code.foss.global/push.rocks/smartshell.git"
|
|
12
12
|
},
|
|
13
13
|
"keywords": [
|
|
14
|
-
"shell",
|
|
15
|
-
"
|
|
14
|
+
"shell commands",
|
|
15
|
+
"promises",
|
|
16
|
+
"asynchronous execution",
|
|
17
|
+
"child processes",
|
|
18
|
+
"environment management",
|
|
19
|
+
"command streaming",
|
|
20
|
+
"interactive commands",
|
|
21
|
+
"process management",
|
|
22
|
+
"typescript"
|
|
16
23
|
],
|
|
17
24
|
"author": "Lossless GmbH",
|
|
18
25
|
"license": "MIT",
|
|
19
26
|
"bugs": {
|
|
20
27
|
"url": "https://gitlab.com/pushrocks/smartshell/issues"
|
|
21
28
|
},
|
|
22
|
-
"homepage": "https://
|
|
29
|
+
"homepage": "https://code.foss.global/push.rocks/smartshell",
|
|
23
30
|
"devDependencies": {
|
|
24
|
-
"@git.zone/tsbuild": "^2.1.
|
|
25
|
-
"@git.zone/tsrun": "^1.2.
|
|
26
|
-
"@git.zone/tstest": "^1.0.
|
|
27
|
-
"@push.rocks/tapbundle": "^5.0.
|
|
28
|
-
"@types/node": "^
|
|
31
|
+
"@git.zone/tsbuild": "^2.1.84",
|
|
32
|
+
"@git.zone/tsrun": "^1.2.49",
|
|
33
|
+
"@git.zone/tstest": "^1.0.90",
|
|
34
|
+
"@push.rocks/tapbundle": "^5.0.24",
|
|
35
|
+
"@types/node": "^22.5.5"
|
|
29
36
|
},
|
|
30
37
|
"dependencies": {
|
|
31
38
|
"@push.rocks/smartdelay": "^3.0.1",
|
|
32
|
-
"@push.rocks/smartexit": "^1.0.
|
|
33
|
-
"@push.rocks/smartpromise": "^4.0.
|
|
34
|
-
"@types/which": "^3.0.
|
|
39
|
+
"@push.rocks/smartexit": "^1.0.23",
|
|
40
|
+
"@push.rocks/smartpromise": "^4.0.4",
|
|
41
|
+
"@types/which": "^3.0.4",
|
|
35
42
|
"tree-kill": "^1.2.2",
|
|
36
43
|
"which": "^4.0.0"
|
|
37
44
|
},
|
package/readme.hints.md
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
|
package/readme.md
CHANGED
|
@@ -1,37 +1,152 @@
|
|
|
1
1
|
# @push.rocks/smartshell
|
|
2
2
|
shell actions designed as promises
|
|
3
3
|
|
|
4
|
-
##
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
TypeScript
|
|
19
|
-
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
|
20
|
-
Code Style | [](https://lossless.cloud)
|
|
21
|
-
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
|
22
|
-
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
|
23
|
-
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
|
4
|
+
## Install
|
|
5
|
+
|
|
6
|
+
To install `@push.rocks/smartshell`, use npm:
|
|
7
|
+
|
|
8
|
+
```sh
|
|
9
|
+
npm install @push.rocks/smartshell --save
|
|
10
|
+
```
|
|
11
|
+
|
|
12
|
+
Or if you prefer using Yarn:
|
|
13
|
+
|
|
14
|
+
```sh
|
|
15
|
+
yarn add @push.rocks/smartshell
|
|
16
|
+
```
|
|
17
|
+
|
|
18
|
+
Ensure that you have TypeScript and the related dependencies installed as well since `@push.rocks/smartshell` is designed to work with TypeScript.
|
|
24
19
|
|
|
25
20
|
## Usage
|
|
26
21
|
|
|
27
|
-
|
|
22
|
+
The `@push.rocks/smartshell` package simplifies running shell commands within Node.js applications by wrapping these commands within promises. This approach enhances the readability and maintainability of code that relies on shell execution, making it particularly useful in automation scripts, build processes, and any scenario where interaction with the system shell is required.
|
|
23
|
+
|
|
24
|
+
### Getting Started with `@push.rocks/smartshell`
|
|
25
|
+
|
|
26
|
+
First, ensure that you import `Smartshell` from `@push.rocks/smartshell` using ESM syntax in your TypeScript file:
|
|
27
|
+
|
|
28
|
+
```typescript
|
|
29
|
+
import { Smartshell } from '@push.rocks/smartshell';
|
|
30
|
+
```
|
|
31
|
+
|
|
32
|
+
### Creating a Smartshell Instance
|
|
33
|
+
|
|
34
|
+
Before executing any shell command, you need to create an instance of `Smartshell`. The constructor accepts configuration options such as the shell executor (`bash` or `sh`), and optionally, paths to source files and directories to include in the shell’s environment.
|
|
35
|
+
|
|
36
|
+
```typescript
|
|
37
|
+
const smartShellInstance = new Smartshell({
|
|
38
|
+
executor: 'bash', // or 'sh'
|
|
39
|
+
});
|
|
40
|
+
```
|
|
41
|
+
|
|
42
|
+
### Executing Commands
|
|
43
|
+
|
|
44
|
+
#### Basic Execution
|
|
45
|
+
|
|
46
|
+
To execute a shell command, use the `exec` method. This method returns a promise that resolves with an execution result object containing `exitCode` and `stdout`.
|
|
47
|
+
|
|
48
|
+
```typescript
|
|
49
|
+
(async () => {
|
|
50
|
+
const result = await smartShellInstance.exec('echo "Hello, SmartShell"');
|
|
51
|
+
console.log(result.stdout); // Outputs: Hello, SmartShell
|
|
52
|
+
})();
|
|
53
|
+
```
|
|
54
|
+
|
|
55
|
+
#### Silent Execution
|
|
56
|
+
|
|
57
|
+
If you prefer not to display the output in the console, use `execSilent`:
|
|
58
|
+
|
|
59
|
+
```typescript
|
|
60
|
+
(async () => {
|
|
61
|
+
const result = await smartShellInstance.execSilent('ls');
|
|
62
|
+
console.log(result.stdout); // Outputs the list of files and directories
|
|
63
|
+
})();
|
|
64
|
+
```
|
|
65
|
+
|
|
66
|
+
#### Strict Execution
|
|
67
|
+
|
|
68
|
+
For scenarios where an execution error should immediately throw an exception, use `execStrict`:
|
|
69
|
+
|
|
70
|
+
```typescript
|
|
71
|
+
(async () => {
|
|
72
|
+
try {
|
|
73
|
+
const result = await smartShellInstance.execStrict('exit 1');
|
|
74
|
+
} catch (error) {
|
|
75
|
+
console.error('Command execution failed');
|
|
76
|
+
}
|
|
77
|
+
})();
|
|
78
|
+
```
|
|
79
|
+
|
|
80
|
+
#### Streaming Output
|
|
81
|
+
|
|
82
|
+
Some commands benefit from streaming output as they execute, especially long-running tasks. For these cases, use `execStreaming`:
|
|
83
|
+
|
|
84
|
+
```typescript
|
|
85
|
+
(async () => {
|
|
86
|
+
const execStreamingResult = await smartShellInstance.execStreaming('tail -f /var/log/system.log');
|
|
87
|
+
|
|
88
|
+
execStreamingResult.childProcess.stdout.on('data', (data) => {
|
|
89
|
+
console.log(data.toString());
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
// Remember to handle the process termination as necessary.
|
|
93
|
+
})();
|
|
94
|
+
```
|
|
95
|
+
|
|
96
|
+
### Advanced Usage
|
|
97
|
+
|
|
98
|
+
#### Executing With Custom Environment Variables
|
|
99
|
+
|
|
100
|
+
`smartshell` allows for the execution of commands within a modified environment, facilitating the use of custom variables or altered PATH values:
|
|
101
|
+
|
|
102
|
+
```typescript
|
|
103
|
+
(async () => {
|
|
104
|
+
smartShellInstance.shellEnv.addSourceFiles(['/path/to/envFile']);
|
|
105
|
+
smartShellInstance.shellEnv.pathDirArray.push('/custom/bin');
|
|
106
|
+
|
|
107
|
+
const result = await smartShellInstance.exec('echo $CUSTOM_VAR');
|
|
108
|
+
console.log(result.stdout); // Outputs the value of CUSTOM_VAR
|
|
109
|
+
})();
|
|
110
|
+
```
|
|
111
|
+
|
|
112
|
+
### Interactive Mode
|
|
113
|
+
|
|
114
|
+
For commands that require interactive terminal input (not typically recommended for automated scripts), you can use `execInteractive`:
|
|
115
|
+
|
|
116
|
+
```typescript
|
|
117
|
+
(async () => {
|
|
118
|
+
await smartShellInstance.execInteractive('npm init');
|
|
119
|
+
})();
|
|
120
|
+
```
|
|
121
|
+
|
|
122
|
+
### Waiting for Specific Output
|
|
123
|
+
|
|
124
|
+
To wait for a specific line before proceeding, you might use `execAndWaitForLine`. This is useful for waiting on a process to log a certain message:
|
|
125
|
+
|
|
126
|
+
```typescript
|
|
127
|
+
(async () => {
|
|
128
|
+
await smartShellInstance.execAndWaitForLine('npm run watch', /Compilation complete./);
|
|
129
|
+
console.log('The watch process has finished compiling.');
|
|
130
|
+
})();
|
|
131
|
+
```
|
|
132
|
+
|
|
133
|
+
Given the vast array of features offered by `@push.rocks/smartshell`, integrating shell operations into your TypeScript applications becomes both straightforward and powerful. By harnessing promises and async/await syntax, `smartshell` effectively streamlines shell interactions, making your code cleaner and more intuitive.
|
|
134
|
+
|
|
135
|
+
## License and Legal Information
|
|
136
|
+
|
|
137
|
+
This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository.
|
|
138
|
+
|
|
139
|
+
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
|
140
|
+
|
|
141
|
+
### Trademarks
|
|
142
|
+
|
|
143
|
+
This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
|
|
28
144
|
|
|
29
|
-
|
|
145
|
+
### Company Information
|
|
30
146
|
|
|
31
|
-
|
|
147
|
+
Task Venture Capital GmbH
|
|
148
|
+
Registered at District court Bremen HRB 35230 HB, Germany
|
|
32
149
|
|
|
33
|
-
For
|
|
150
|
+
For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
|
|
34
151
|
|
|
35
|
-
|
|
36
|
-
> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
|
|
37
|
-
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
|
|
152
|
+
By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* autocreated commitinfo by @
|
|
2
|
+
* autocreated commitinfo by @push.rocks/commitinfo
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartshell',
|
|
6
|
-
version: '3.0.
|
|
7
|
-
description: 'shell
|
|
6
|
+
version: '3.0.6',
|
|
7
|
+
description: 'A library for executing shell commands using promises.'
|
|
8
8
|
}
|
|
@@ -14,8 +14,10 @@ export interface IExecResult {
|
|
|
14
14
|
export interface IExecResultStreaming {
|
|
15
15
|
childProcess: cp.ChildProcess;
|
|
16
16
|
finalPromise: Promise<IExecResult>;
|
|
17
|
-
kill: () => void
|
|
18
|
-
terminate: () => void
|
|
17
|
+
kill: () => Promise<void>;
|
|
18
|
+
terminate: () => Promise<void>;
|
|
19
|
+
keyboardInterrupt: () => Promise<void>;
|
|
20
|
+
customSignal: (signalArg: plugins.smartexit.TProcessSignal) => Promise<void>;
|
|
19
21
|
}
|
|
20
22
|
|
|
21
23
|
export class Smartshell {
|
|
@@ -37,39 +39,51 @@ export class Smartshell {
|
|
|
37
39
|
interactive?: boolean;
|
|
38
40
|
}): Promise<IExecResult | IExecResultStreaming | void> {
|
|
39
41
|
if (options.interactive) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
}
|
|
42
|
+
return await this._execInteractive(options);
|
|
43
|
+
}
|
|
43
44
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
// Notice that stdio is set to 'inherit'
|
|
47
|
-
const shell = cp.spawn(options.commandString, {
|
|
48
|
-
stdio: 'inherit',
|
|
49
|
-
shell: true,
|
|
50
|
-
detached: true
|
|
51
|
-
});
|
|
45
|
+
return await this._execCommand(options);
|
|
46
|
+
}
|
|
52
47
|
|
|
53
|
-
|
|
48
|
+
private async _execInteractive(options: {
|
|
49
|
+
commandString: string;
|
|
50
|
+
interactive?: boolean;
|
|
51
|
+
}): Promise<void> {
|
|
52
|
+
if (process.env.CI) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
54
55
|
|
|
55
|
-
|
|
56
|
-
console.log(`interactive shell terminated with code ${code}`);
|
|
57
|
-
this.smartexit.removeProcess(shell);
|
|
58
|
-
done.resolve();
|
|
59
|
-
});
|
|
56
|
+
const done = plugins.smartpromise.defer();
|
|
60
57
|
|
|
61
|
-
|
|
58
|
+
const shell = cp.spawn(options.commandString, {
|
|
59
|
+
stdio: 'inherit',
|
|
60
|
+
shell: true,
|
|
61
|
+
detached: true
|
|
62
|
+
});
|
|
62
63
|
|
|
63
|
-
|
|
64
|
-
|
|
64
|
+
this.smartexit.addProcess(shell);
|
|
65
|
+
|
|
66
|
+
shell.on('close', (code) => {
|
|
67
|
+
console.log(`interactive shell terminated with code ${code}`);
|
|
68
|
+
this.smartexit.removeProcess(shell);
|
|
69
|
+
done.resolve();
|
|
70
|
+
});
|
|
65
71
|
|
|
72
|
+
await done.promise;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
private async _execCommand(options: {
|
|
76
|
+
commandString: string;
|
|
77
|
+
silent?: boolean;
|
|
78
|
+
strict?: boolean;
|
|
79
|
+
streaming?: boolean;
|
|
80
|
+
}): Promise<IExecResult | IExecResultStreaming> {
|
|
66
81
|
const done = plugins.smartpromise.defer<IExecResult | IExecResultStreaming>();
|
|
67
82
|
const childProcessEnded = plugins.smartpromise.defer<IExecResult>();
|
|
68
83
|
|
|
69
|
-
|
|
70
|
-
commandToExecute = this.shellEnv.createEnvExecString(options.commandString);
|
|
84
|
+
const commandToExecute = this.shellEnv.createEnvExecString(options.commandString);
|
|
71
85
|
|
|
72
|
-
const
|
|
86
|
+
const shellLogInstance = new ShellLog();
|
|
73
87
|
const execChildProcess = cp.spawn(commandToExecute, [], {
|
|
74
88
|
shell: true,
|
|
75
89
|
cwd: process.cwd(),
|
|
@@ -81,16 +95,16 @@ export class Smartshell {
|
|
|
81
95
|
|
|
82
96
|
execChildProcess.stdout.on('data', (data) => {
|
|
83
97
|
if (!options.silent) {
|
|
84
|
-
|
|
98
|
+
shellLogInstance.writeToConsole(data);
|
|
85
99
|
}
|
|
86
|
-
|
|
100
|
+
shellLogInstance.addToBuffer(data);
|
|
87
101
|
});
|
|
88
102
|
|
|
89
103
|
execChildProcess.stderr.on('data', (data) => {
|
|
90
104
|
if (!options.silent) {
|
|
91
|
-
|
|
105
|
+
shellLogInstance.writeToConsole(data);
|
|
92
106
|
}
|
|
93
|
-
|
|
107
|
+
shellLogInstance.addToBuffer(data);
|
|
94
108
|
});
|
|
95
109
|
|
|
96
110
|
execChildProcess.on('exit', (code, signal) => {
|
|
@@ -101,7 +115,7 @@ export class Smartshell {
|
|
|
101
115
|
|
|
102
116
|
const execResult = {
|
|
103
117
|
exitCode: code,
|
|
104
|
-
stdout:
|
|
118
|
+
stdout: shellLogInstance.logStore.toString(),
|
|
105
119
|
};
|
|
106
120
|
|
|
107
121
|
if (!options.streaming) {
|
|
@@ -114,13 +128,21 @@ export class Smartshell {
|
|
|
114
128
|
done.resolve({
|
|
115
129
|
childProcess: execChildProcess,
|
|
116
130
|
finalPromise: childProcessEnded.promise,
|
|
117
|
-
kill: () => {
|
|
131
|
+
kill: async () => {
|
|
118
132
|
console.log(`running tree kill with SIGKILL on process ${execChildProcess.pid}`);
|
|
119
|
-
plugins.
|
|
133
|
+
await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGKILL');
|
|
120
134
|
},
|
|
121
|
-
terminate: () => {
|
|
135
|
+
terminate: async () => {
|
|
122
136
|
console.log(`running tree kill with SIGTERM on process ${execChildProcess.pid}`);
|
|
123
|
-
plugins.
|
|
137
|
+
await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGTERM');
|
|
138
|
+
},
|
|
139
|
+
keyboardInterrupt: async () => {
|
|
140
|
+
console.log(`running tree kill with SIGINT on process ${execChildProcess.pid}`);
|
|
141
|
+
await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGINT');
|
|
142
|
+
},
|
|
143
|
+
customSignal: async (signalArg: plugins.smartexit.TProcessSignal) => {
|
|
144
|
+
console.log(`running tree kill with custom signal ${signalArg} on process ${execChildProcess.pid}`);
|
|
145
|
+
await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, signalArg);
|
|
124
146
|
},
|
|
125
147
|
});
|
|
126
148
|
}
|
|
@@ -181,4 +203,4 @@ export class Smartshell {
|
|
|
181
203
|
public async execAndWaitForLineSilent(commandString: string, regexArg: RegExp) {
|
|
182
204
|
return this.execAndWaitForLine(commandString, regexArg, true);
|
|
183
205
|
}
|
|
184
|
-
}
|
|
206
|
+
}
|
package/ts/smartshell.plugins.ts
CHANGED