@push.rocks/smartshell 3.3.5 → 3.3.7

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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartshell',
6
- version: '3.3.2',
6
+ version: '3.3.7',
7
7
  description: 'A library for executing shell commands using promises.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHdEQUF3RDtDQUN0RSxDQUFBIn0=
@@ -12,6 +12,10 @@ export declare class ShellEnv {
12
12
  * constructor for the shellenv
13
13
  */
14
14
  constructor(optionsArg: IShellEnvContructorOptions);
15
+ /**
16
+ * Detect if running under Windows Subsystem for Linux
17
+ */
18
+ private static _isWSL;
15
19
  /**
16
20
  * imports path into the shell from env if available and returns it with
17
21
  */
@@ -15,6 +15,14 @@ export class ShellEnv {
15
15
  this.pathDirArray = this.pathDirArray.concat(optionsArg.pathDirectories);
16
16
  }
17
17
  }
18
+ /**
19
+ * Detect if running under Windows Subsystem for Linux
20
+ */
21
+ static _isWSL() {
22
+ return !!(process.env.WSL_DISTRO_NAME ||
23
+ process.env.WSLENV ||
24
+ (process.platform === 'linux' && process.env.PATH?.includes('/mnt/c/')));
25
+ }
18
26
  /**
19
27
  * imports path into the shell from env if available and returns it with
20
28
  */
@@ -25,17 +33,14 @@ export class ShellEnv {
25
33
  if (process.env.SMARTSHELL_PATH) {
26
34
  commandPaths = commandPaths.concat(process.env.SMARTSHELL_PATH.split(':'));
27
35
  }
28
- // lets filter for unwanted paths
29
- // Windows WSL
30
- commandPaths = commandPaths.filter((commandPathArg) => {
31
- const filterResult = !commandPathArg.startsWith('/mnt/c/') &&
32
- !commandPathArg.startsWith('Files/1E') &&
33
- !commandPathArg.includes(' ');
34
- if (!filterResult) {
35
- // console.log(`${commandPathArg} will be filtered!`);
36
- }
37
- return filterResult;
38
- });
36
+ // Only filter out WSL-specific paths when actually running under WSL
37
+ if (ShellEnv._isWSL()) {
38
+ commandPaths = commandPaths.filter((commandPathArg) => {
39
+ return (!commandPathArg.startsWith('/mnt/c/') &&
40
+ !commandPathArg.startsWith('Files/1E') &&
41
+ !commandPathArg.includes(' '));
42
+ });
43
+ }
39
44
  commandResult = `PATH=${commandPaths.join(':')} && ${commandStringArg}`;
40
45
  return commandResult;
41
46
  }
@@ -67,16 +72,14 @@ export class ShellEnv {
67
72
  pathString += `:${pathDir}`;
68
73
  }
69
74
  pathString += ` && `;
70
- switch (this.executor) {
71
- case 'bash':
72
- commandResult = `bash -c '${pathString}${sourceString}${commandArg}'`;
73
- break;
74
- case 'sh':
75
- commandResult = `${pathString}${sourceString}${commandArg}`;
76
- break;
77
- }
75
+ // For both bash and sh executors, build the command string directly.
76
+ // The shell nesting is handled by spawn() using the appropriate shell binary.
77
+ // Previously bash executor wrapped in `bash -c '...'` which caused triple
78
+ // shell nesting (Node spawn sh -> bash -c -> command). Now spawn() uses
79
+ // shell: '/bin/bash' directly, so we don't need the extra wrapping.
80
+ commandResult = `${pathString}${sourceString}${commandArg}`;
78
81
  commandResult = this._setPath(commandResult);
79
82
  return commandResult;
80
83
  }
81
84
  }
82
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zaGVsbGVudi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NsYXNzZXMuc2hlbGxlbnYudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUUEsTUFBTSxPQUFPLFFBQVE7SUFLbkI7O09BRUc7SUFDSCxZQUFZLFVBQXNDO1FBTmxELG9CQUFlLEdBQWEsRUFBRSxDQUFDO1FBQy9CLGlCQUFZLEdBQWEsRUFBRSxDQUFDO1FBTTFCLElBQUksQ0FBQyxRQUFRLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztRQUVwQyxrQkFBa0I7UUFDbEIsSUFBSSxVQUFVLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDL0IsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDakYsQ0FBQztRQUVELHNCQUFzQjtRQUN0QixJQUFJLFVBQVUsQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUMvQixJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUMzRSxDQUFDO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0ssUUFBUSxDQUFDLGdCQUF3QjtRQUN2QyxJQUFJLGFBQWEsR0FBRyxnQkFBZ0IsQ0FBQztRQUNyQyxJQUFJLFlBQVksR0FBYSxFQUFFLENBQUM7UUFDaEMsWUFBWSxHQUFHLFlBQVksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDaEUsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ2hDLFlBQVksR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQzdFLENBQUM7UUFFRCxpQ0FBaUM7UUFDakMsY0FBYztRQUNkLFlBQVksR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUMsY0FBYyxFQUFFLEVBQUU7WUFDcEQsTUFBTSxZQUFZLEdBQ2hCLENBQUMsY0FBYyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7Z0JBQ3JDLENBQUMsY0FBYyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7Z0JBQ3RDLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNoQyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7Z0JBQ2xCLHNEQUFzRDtZQUN4RCxDQUFDO1lBQ0QsT0FBTyxZQUFZLENBQUM7UUFDdEIsQ0FBQyxDQUFDLENBQUM7UUFFSCxhQUFhLEdBQUcsUUFBUSxZQUFZLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLGdCQUFnQixFQUFFLENBQUM7UUFDeEUsT0FBTyxhQUFhLENBQUM7SUFDdkIsQ0FBQztJQUVEOzs7T0FHRztJQUNILGNBQWMsQ0FBQyxvQkFBOEI7UUFDM0MsS0FBSyxJQUFJLGNBQWMsSUFBSSxvQkFBb0IsRUFBRSxDQUFDO1lBQ2hELElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQzVDLENBQUM7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxnQkFBZ0I7UUFDZCxJQUFJLENBQUMsZUFBZSxHQUFHLEVBQUUsQ0FBQztJQUM1QixDQUFDO0lBRU0sbUJBQW1CLENBQUMsVUFBa0I7UUFDM0MsSUFBSSxhQUFhLEdBQUcsRUFBRSxDQUFDO1FBQ3ZCLElBQUksWUFBWSxHQUFHLEVBQUUsQ0FBQztRQUV0Qix5QkFBeUI7UUFDekIsS0FBSyxNQUFNLGNBQWMsSUFBSSxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDbEQsWUFBWSxHQUFHLFlBQVksR0FBRyxVQUFVLGNBQWMsTUFBTSxDQUFDO1FBQy9ELENBQUM7UUFFRCwyQkFBMkI7UUFDM0IsSUFBSSxVQUFVLEdBQUcsWUFBWSxDQUFDO1FBQzlCLEtBQUssTUFBTSxPQUFPLElBQUksSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQ3hDLFVBQVUsSUFBSSxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQzlCLENBQUM7UUFDRCxVQUFVLElBQUksTUFBTSxDQUFDO1FBRXJCLFFBQVEsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ3RCLEtBQUssTUFBTTtnQkFDVCxhQUFhLEdBQUcsWUFBWSxVQUFVLEdBQUcsWUFBWSxHQUFHLFVBQVUsR0FBRyxDQUFDO2dCQUN0RSxNQUFNO1lBQ1IsS0FBSyxJQUFJO2dCQUNQLGFBQWEsR0FBRyxHQUFHLFVBQVUsR0FBRyxZQUFZLEdBQUcsVUFBVSxFQUFFLENBQUM7Z0JBQzVELE1BQU07UUFDVixDQUFDO1FBQ0QsYUFBYSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDN0MsT0FBTyxhQUFhLENBQUM7SUFDdkIsQ0FBQztDQUNGIn0=
85
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zaGVsbGVudi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NsYXNzZXMuc2hlbGxlbnYudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUUEsTUFBTSxPQUFPLFFBQVE7SUFLbkI7O09BRUc7SUFDSCxZQUFZLFVBQXNDO1FBTmxELG9CQUFlLEdBQWEsRUFBRSxDQUFDO1FBQy9CLGlCQUFZLEdBQWEsRUFBRSxDQUFDO1FBTTFCLElBQUksQ0FBQyxRQUFRLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztRQUVwQyxrQkFBa0I7UUFDbEIsSUFBSSxVQUFVLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDL0IsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDakYsQ0FBQztRQUVELHNCQUFzQjtRQUN0QixJQUFJLFVBQVUsQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUMvQixJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUMzRSxDQUFDO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0ssTUFBTSxDQUFDLE1BQU07UUFDbkIsT0FBTyxDQUFDLENBQUMsQ0FDUCxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWU7WUFDM0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNO1lBQ2xCLENBQUMsT0FBTyxDQUFDLFFBQVEsS0FBSyxPQUFPLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQ3hFLENBQUM7SUFDSixDQUFDO0lBRUQ7O09BRUc7SUFDSyxRQUFRLENBQUMsZ0JBQXdCO1FBQ3ZDLElBQUksYUFBYSxHQUFHLGdCQUFnQixDQUFDO1FBQ3JDLElBQUksWUFBWSxHQUFhLEVBQUUsQ0FBQztRQUNoQyxZQUFZLEdBQUcsWUFBWSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNoRSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDaEMsWUFBWSxHQUFHLFlBQVksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDN0UsQ0FBQztRQUVELHFFQUFxRTtRQUNyRSxJQUFJLFFBQVEsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO1lBQ3RCLFlBQVksR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUMsY0FBYyxFQUFFLEVBQUU7Z0JBQ3BELE9BQU8sQ0FDTCxDQUFDLGNBQWMsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO29CQUNyQyxDQUFDLGNBQWMsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO29CQUN0QyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQzlCLENBQUM7WUFDSixDQUFDLENBQUMsQ0FBQztRQUNMLENBQUM7UUFFRCxhQUFhLEdBQUcsUUFBUSxZQUFZLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLGdCQUFnQixFQUFFLENBQUM7UUFDeEUsT0FBTyxhQUFhLENBQUM7SUFDdkIsQ0FBQztJQUVEOzs7T0FHRztJQUNILGNBQWMsQ0FBQyxvQkFBOEI7UUFDM0MsS0FBSyxJQUFJLGNBQWMsSUFBSSxvQkFBb0IsRUFBRSxDQUFDO1lBQ2hELElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQzVDLENBQUM7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxnQkFBZ0I7UUFDZCxJQUFJLENBQUMsZUFBZSxHQUFHLEVBQUUsQ0FBQztJQUM1QixDQUFDO0lBRU0sbUJBQW1CLENBQUMsVUFBa0I7UUFDM0MsSUFBSSxhQUFhLEdBQUcsRUFBRSxDQUFDO1FBQ3ZCLElBQUksWUFBWSxHQUFHLEVBQUUsQ0FBQztRQUV0Qix5QkFBeUI7UUFDekIsS0FBSyxNQUFNLGNBQWMsSUFBSSxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDbEQsWUFBWSxHQUFHLFlBQVksR0FBRyxVQUFVLGNBQWMsTUFBTSxDQUFDO1FBQy9ELENBQUM7UUFFRCwyQkFBMkI7UUFDM0IsSUFBSSxVQUFVLEdBQUcsWUFBWSxDQUFDO1FBQzlCLEtBQUssTUFBTSxPQUFPLElBQUksSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQ3hDLFVBQVUsSUFBSSxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQzlCLENBQUM7UUFDRCxVQUFVLElBQUksTUFBTSxDQUFDO1FBRXJCLHFFQUFxRTtRQUNyRSw4RUFBOEU7UUFDOUUsMEVBQTBFO1FBQzFFLHdFQUF3RTtRQUN4RSxvRUFBb0U7UUFDcEUsYUFBYSxHQUFHLEdBQUcsVUFBVSxHQUFHLFlBQVksR0FBRyxVQUFVLEVBQUUsQ0FBQztRQUM1RCxhQUFhLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUM3QyxPQUFPLGFBQWEsQ0FBQztJQUN2QixDQUFDO0NBQ0YifQ==
@@ -3,7 +3,21 @@
3
3
  * making sure the process doesn't run out of memory
4
4
  */
5
5
  export declare class ShellLog {
6
- logStore: Buffer<ArrayBuffer>;
6
+ private chunks;
7
+ private totalLength;
8
+ /**
9
+ * Get the accumulated log as a single Buffer.
10
+ * Concatenation happens lazily only when accessed.
11
+ */
12
+ get logStore(): Buffer;
13
+ /**
14
+ * Set the log store directly (used for truncation).
15
+ */
16
+ set logStore(value: Buffer);
17
+ /**
18
+ * Get the current total length of buffered data without concatenating.
19
+ */
20
+ get logLength(): number;
7
21
  /**
8
22
  * log data to console
9
23
  * @param dataArg
@@ -5,7 +5,38 @@ import * as plugins from './plugins.js';
5
5
  */
6
6
  export class ShellLog {
7
7
  constructor() {
8
- this.logStore = Buffer.from('');
8
+ this.chunks = [];
9
+ this.totalLength = 0;
10
+ }
11
+ /**
12
+ * Get the accumulated log as a single Buffer.
13
+ * Concatenation happens lazily only when accessed.
14
+ */
15
+ get logStore() {
16
+ if (this.chunks.length === 0) {
17
+ return Buffer.alloc(0);
18
+ }
19
+ if (this.chunks.length === 1) {
20
+ return this.chunks[0];
21
+ }
22
+ // Flatten chunks into a single buffer
23
+ const combined = Buffer.concat(this.chunks, this.totalLength);
24
+ // Replace chunks array with the single combined buffer for future access
25
+ this.chunks = [combined];
26
+ return combined;
27
+ }
28
+ /**
29
+ * Set the log store directly (used for truncation).
30
+ */
31
+ set logStore(value) {
32
+ this.chunks = [value];
33
+ this.totalLength = value.length;
34
+ }
35
+ /**
36
+ * Get the current total length of buffered data without concatenating.
37
+ */
38
+ get logLength() {
39
+ return this.totalLength;
9
40
  }
10
41
  /**
11
42
  * log data to console
@@ -21,17 +52,13 @@ export class ShellLog {
21
52
  */
22
53
  addToBuffer(dataArg) {
23
54
  // make sure we have the data as Buffer
24
- const dataBuffer = (() => {
25
- if (!Buffer.isBuffer(dataArg)) {
26
- return Buffer.from(dataArg);
27
- }
28
- return dataArg;
29
- })();
30
- this.logStore = Buffer.concat([this.logStore, dataBuffer]);
55
+ const dataBuffer = Buffer.isBuffer(dataArg) ? dataArg : Buffer.from(dataArg);
56
+ this.chunks.push(dataBuffer);
57
+ this.totalLength += dataBuffer.length;
31
58
  }
32
59
  logAndAdd(dataArg) {
33
60
  this.writeToConsole(dataArg);
34
61
  this.addToBuffer(dataArg);
35
62
  }
36
63
  }
37
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zaGVsbGxvZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NsYXNzZXMuc2hlbGxsb2cudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFFeEM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFFBQVE7SUFBckI7UUFDUyxhQUFRLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQThCcEMsQ0FBQztJQTVCQzs7O09BR0c7SUFDSSxjQUFjLENBQUMsT0FBd0I7UUFDNUMsdUNBQXVDO1FBQ3ZDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2hDLENBQUM7SUFFRDs7O09BR0c7SUFDSSxXQUFXLENBQUMsT0FBd0I7UUFDekMsdUNBQXVDO1FBQ3ZDLE1BQU0sVUFBVSxHQUFXLENBQUMsR0FBRyxFQUFFO1lBQy9CLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7Z0JBQzlCLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUM5QixDQUFDO1lBQ0QsT0FBTyxPQUFPLENBQUM7UUFDakIsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNMLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUM3RCxDQUFDO0lBRU0sU0FBUyxDQUFDLE9BQXdCO1FBQ3ZDLElBQUksQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDN0IsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUM1QixDQUFDO0NBQ0YifQ==
64
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zaGVsbGxvZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NsYXNzZXMuc2hlbGxsb2cudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFFeEM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFFBQVE7SUFBckI7UUFDVSxXQUFNLEdBQWEsRUFBRSxDQUFDO1FBQ3RCLGdCQUFXLEdBQUcsQ0FBQyxDQUFDO0lBMkQxQixDQUFDO0lBekRDOzs7T0FHRztJQUNILElBQVcsUUFBUTtRQUNqQixJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQzdCLE9BQU8sTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN6QixDQUFDO1FBQ0QsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUM3QixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEIsQ0FBQztRQUNELHNDQUFzQztRQUN0QyxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQzlELHlFQUF5RTtRQUN6RSxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDekIsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBVyxRQUFRLENBQUMsS0FBYTtRQUMvQixJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDdEIsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDO0lBQ2xDLENBQUM7SUFFRDs7T0FFRztJQUNILElBQVcsU0FBUztRQUNsQixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUM7SUFDMUIsQ0FBQztJQUVEOzs7T0FHRztJQUNJLGNBQWMsQ0FBQyxPQUF3QjtRQUM1Qyx1Q0FBdUM7UUFDdkMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDaEMsQ0FBQztJQUVEOzs7T0FHRztJQUNJLFdBQVcsQ0FBQyxPQUF3QjtRQUN6Qyx1Q0FBdUM7UUFDdkMsTUFBTSxVQUFVLEdBQVcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3JGLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQzdCLElBQUksQ0FBQyxXQUFXLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQztJQUN4QyxDQUFDO0lBRU0sU0FBUyxDQUFDLE9BQXdCO1FBQ3ZDLElBQUksQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDN0IsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUM1QixDQUFDO0NBQ0YifQ==
@@ -110,7 +110,7 @@ export class Smartshell {
110
110
  }
111
111
  if (!bufferExceeded) {
112
112
  shellLogInstance.addToBuffer(data);
113
- if (shellLogInstance.logStore.length > maxBuffer) {
113
+ if (shellLogInstance.logLength > maxBuffer) {
114
114
  bufferExceeded = true;
115
115
  shellLogInstance.logStore = Buffer.from('[Output truncated - exceeded maxBuffer]');
116
116
  }
@@ -127,7 +127,7 @@ export class Smartshell {
127
127
  }
128
128
  if (!bufferExceeded) {
129
129
  shellLogInstance.addToBuffer(data);
130
- if (shellLogInstance.logStore.length > maxBuffer) {
130
+ if (shellLogInstance.logLength > maxBuffer) {
131
131
  bufferExceeded = true;
132
132
  shellLogInstance.logStore = Buffer.from('[Output truncated - exceeded maxBuffer]');
133
133
  }
@@ -170,7 +170,7 @@ export class Smartshell {
170
170
  resolve(execResult);
171
171
  }
172
172
  };
173
- execChildProcess.once('exit', handleExit);
173
+ execChildProcess.once('close', handleExit);
174
174
  execChildProcess.once('error', (error) => {
175
175
  if (timeoutHandle) {
176
176
  clearTimeout(timeoutHandle);
@@ -253,8 +253,12 @@ export class Smartshell {
253
253
  if (options.usePty) {
254
254
  return await this._execCommandPty(options, commandToExecute, shellLogInstance);
255
255
  }
256
+ // Use the executor's shell binary directly to avoid triple shell nesting.
257
+ // Previously: Node spawn(shell:true) → /bin/sh → bash -c → command (3 layers)
258
+ // Now: Node spawn(shell:bash) → command (1 layer)
259
+ const shellBinary = this.shellEnv.executor === 'bash' ? '/bin/bash' : true;
256
260
  const execChildProcess = cp.spawn(commandToExecute, [], {
257
- shell: true,
261
+ shell: shellBinary,
258
262
  cwd: process.cwd(),
259
263
  env: options.env || process.env,
260
264
  detached: true, // Own process group — immune to terminal SIGINT, managed by smartexit
@@ -312,7 +316,7 @@ export class Smartshell {
312
316
  }
313
317
  if (!bufferExceeded) {
314
318
  shellLogInstance.addToBuffer(data);
315
- if (shellLogInstance.logStore.length > maxBuffer) {
319
+ if (shellLogInstance.logLength > maxBuffer) {
316
320
  bufferExceeded = true;
317
321
  shellLogInstance.logStore = Buffer.from('[Output truncated - exceeded maxBuffer]');
318
322
  }
@@ -329,7 +333,7 @@ export class Smartshell {
329
333
  }
330
334
  if (!bufferExceeded) {
331
335
  shellLogInstance.addToBuffer(data);
332
- if (shellLogInstance.logStore.length > maxBuffer) {
336
+ if (shellLogInstance.logLength > maxBuffer) {
333
337
  bufferExceeded = true;
334
338
  shellLogInstance.logStore = Buffer.from('[Output truncated - exceeded maxBuffer]');
335
339
  }
@@ -372,7 +376,7 @@ export class Smartshell {
372
376
  resolve(execResult);
373
377
  }
374
378
  };
375
- execChildProcess.once('exit', handleExit);
379
+ execChildProcess.once('close', handleExit);
376
380
  execChildProcess.once('error', (error) => {
377
381
  if (timeoutHandle) {
378
382
  clearTimeout(timeoutHandle);
@@ -717,4 +721,4 @@ export class Smartshell {
717
721
  return await childProcessEnded;
718
722
  }
719
723
  }
720
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.smartshell.js","sourceRoot":"","sources":["../ts/classes.smartshell.ts"],"names":[],"mappings":"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"}
724
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.smartshell.js","sourceRoot":"","sources":["../ts/classes.smartshell.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@push.rocks/smartshell",
3
3
  "private": false,
4
- "version": "3.3.5",
4
+ "version": "3.3.7",
5
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",
@@ -33,18 +33,17 @@
33
33
  },
34
34
  "homepage": "https://code.foss.global/push.rocks/smartshell",
35
35
  "devDependencies": {
36
- "@git.zone/tsbuild": "^2.7.3",
37
- "@git.zone/tsrun": "^1.6.2",
38
- "@git.zone/tstest": "^2.8.3",
39
- "@types/node": "^22.19.13"
36
+ "@git.zone/tsbuild": "^4.1.2",
37
+ "@git.zone/tsrun": "^2.0.1",
38
+ "@git.zone/tstest": "^3.2.0",
39
+ "@types/node": "^25.3.3"
40
40
  },
41
41
  "dependencies": {
42
42
  "@push.rocks/smartdelay": "^3.0.5",
43
- "@push.rocks/smartexit": "^2.0.1",
43
+ "@push.rocks/smartexit": "^2.0.3",
44
44
  "@push.rocks/smartpromise": "^4.2.3",
45
45
  "@types/which": "^3.0.4",
46
- "tree-kill": "^1.2.2",
47
- "which": "^5.0.0"
46
+ "which": "^6.0.1"
48
47
  },
49
48
  "files": [
50
49
  "ts/**/*",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartshell',
6
- version: '3.3.2',
6
+ version: '3.3.7',
7
7
  description: 'A library for executing shell commands using promises.'
8
8
  }
@@ -28,6 +28,17 @@ export class ShellEnv {
28
28
  }
29
29
  }
30
30
 
31
+ /**
32
+ * Detect if running under Windows Subsystem for Linux
33
+ */
34
+ private static _isWSL(): boolean {
35
+ return !!(
36
+ process.env.WSL_DISTRO_NAME ||
37
+ process.env.WSLENV ||
38
+ (process.platform === 'linux' && process.env.PATH?.includes('/mnt/c/'))
39
+ );
40
+ }
41
+
31
42
  /**
32
43
  * imports path into the shell from env if available and returns it with
33
44
  */
@@ -39,18 +50,16 @@ export class ShellEnv {
39
50
  commandPaths = commandPaths.concat(process.env.SMARTSHELL_PATH.split(':'));
40
51
  }
41
52
 
42
- // lets filter for unwanted paths
43
- // Windows WSL
44
- commandPaths = commandPaths.filter((commandPathArg) => {
45
- const filterResult =
46
- !commandPathArg.startsWith('/mnt/c/') &&
47
- !commandPathArg.startsWith('Files/1E') &&
48
- !commandPathArg.includes(' ');
49
- if (!filterResult) {
50
- // console.log(`${commandPathArg} will be filtered!`);
51
- }
52
- return filterResult;
53
- });
53
+ // Only filter out WSL-specific paths when actually running under WSL
54
+ if (ShellEnv._isWSL()) {
55
+ commandPaths = commandPaths.filter((commandPathArg) => {
56
+ return (
57
+ !commandPathArg.startsWith('/mnt/c/') &&
58
+ !commandPathArg.startsWith('Files/1E') &&
59
+ !commandPathArg.includes(' ')
60
+ );
61
+ });
62
+ }
54
63
 
55
64
  commandResult = `PATH=${commandPaths.join(':')} && ${commandStringArg}`;
56
65
  return commandResult;
@@ -89,14 +98,12 @@ export class ShellEnv {
89
98
  }
90
99
  pathString += ` && `;
91
100
 
92
- switch (this.executor) {
93
- case 'bash':
94
- commandResult = `bash -c '${pathString}${sourceString}${commandArg}'`;
95
- break;
96
- case 'sh':
97
- commandResult = `${pathString}${sourceString}${commandArg}`;
98
- break;
99
- }
101
+ // For both bash and sh executors, build the command string directly.
102
+ // The shell nesting is handled by spawn() using the appropriate shell binary.
103
+ // Previously bash executor wrapped in `bash -c '...'` which caused triple
104
+ // shell nesting (Node spawn sh -> bash -c -> command). Now spawn() uses
105
+ // shell: '/bin/bash' directly, so we don't need the extra wrapping.
106
+ commandResult = `${pathString}${sourceString}${commandArg}`;
100
107
  commandResult = this._setPath(commandResult);
101
108
  return commandResult;
102
109
  }
@@ -5,7 +5,41 @@ import * as plugins from './plugins.js';
5
5
  * making sure the process doesn't run out of memory
6
6
  */
7
7
  export class ShellLog {
8
- public logStore = Buffer.from('');
8
+ private chunks: Buffer[] = [];
9
+ private totalLength = 0;
10
+
11
+ /**
12
+ * Get the accumulated log as a single Buffer.
13
+ * Concatenation happens lazily only when accessed.
14
+ */
15
+ public get logStore(): Buffer {
16
+ if (this.chunks.length === 0) {
17
+ return Buffer.alloc(0);
18
+ }
19
+ if (this.chunks.length === 1) {
20
+ return this.chunks[0];
21
+ }
22
+ // Flatten chunks into a single buffer
23
+ const combined = Buffer.concat(this.chunks, this.totalLength);
24
+ // Replace chunks array with the single combined buffer for future access
25
+ this.chunks = [combined];
26
+ return combined;
27
+ }
28
+
29
+ /**
30
+ * Set the log store directly (used for truncation).
31
+ */
32
+ public set logStore(value: Buffer) {
33
+ this.chunks = [value];
34
+ this.totalLength = value.length;
35
+ }
36
+
37
+ /**
38
+ * Get the current total length of buffered data without concatenating.
39
+ */
40
+ public get logLength(): number {
41
+ return this.totalLength;
42
+ }
9
43
 
10
44
  /**
11
45
  * log data to console
@@ -22,13 +56,9 @@ export class ShellLog {
22
56
  */
23
57
  public addToBuffer(dataArg: string | Buffer): void {
24
58
  // make sure we have the data as Buffer
25
- const dataBuffer: Buffer = (() => {
26
- if (!Buffer.isBuffer(dataArg)) {
27
- return Buffer.from(dataArg);
28
- }
29
- return dataArg;
30
- })();
31
- this.logStore = Buffer.concat([this.logStore, dataBuffer]);
59
+ const dataBuffer: Buffer = Buffer.isBuffer(dataArg) ? dataArg : Buffer.from(dataArg);
60
+ this.chunks.push(dataBuffer);
61
+ this.totalLength += dataBuffer.length;
32
62
  }
33
63
 
34
64
  public logAndAdd(dataArg: string | Buffer): void {
@@ -182,7 +182,7 @@ export class Smartshell {
182
182
 
183
183
  if (!bufferExceeded) {
184
184
  shellLogInstance.addToBuffer(data);
185
- if (shellLogInstance.logStore.length > maxBuffer) {
185
+ if (shellLogInstance.logLength > maxBuffer) {
186
186
  bufferExceeded = true;
187
187
  shellLogInstance.logStore = Buffer.from('[Output truncated - exceeded maxBuffer]');
188
188
  }
@@ -203,7 +203,7 @@ export class Smartshell {
203
203
 
204
204
  if (!bufferExceeded) {
205
205
  shellLogInstance.addToBuffer(data);
206
- if (shellLogInstance.logStore.length > maxBuffer) {
206
+ if (shellLogInstance.logLength > maxBuffer) {
207
207
  bufferExceeded = true;
208
208
  shellLogInstance.logStore = Buffer.from('[Output truncated - exceeded maxBuffer]');
209
209
  }
@@ -249,7 +249,7 @@ export class Smartshell {
249
249
  }
250
250
  };
251
251
 
252
- execChildProcess.once('exit', handleExit);
252
+ execChildProcess.once('close', handleExit);
253
253
  execChildProcess.once('error', (error) => {
254
254
  if (timeoutHandle) {
255
255
  clearTimeout(timeoutHandle);
@@ -338,8 +338,12 @@ export class Smartshell {
338
338
  return await this._execCommandPty(options, commandToExecute, shellLogInstance);
339
339
  }
340
340
 
341
+ // Use the executor's shell binary directly to avoid triple shell nesting.
342
+ // Previously: Node spawn(shell:true) → /bin/sh → bash -c → command (3 layers)
343
+ // Now: Node spawn(shell:bash) → command (1 layer)
344
+ const shellBinary = this.shellEnv.executor === 'bash' ? '/bin/bash' : true;
341
345
  const execChildProcess = cp.spawn(commandToExecute, [], {
342
- shell: true,
346
+ shell: shellBinary,
343
347
  cwd: process.cwd(),
344
348
  env: options.env || process.env,
345
349
  detached: true, // Own process group — immune to terminal SIGINT, managed by smartexit
@@ -405,7 +409,7 @@ export class Smartshell {
405
409
 
406
410
  if (!bufferExceeded) {
407
411
  shellLogInstance.addToBuffer(data);
408
- if (shellLogInstance.logStore.length > maxBuffer) {
412
+ if (shellLogInstance.logLength > maxBuffer) {
409
413
  bufferExceeded = true;
410
414
  shellLogInstance.logStore = Buffer.from('[Output truncated - exceeded maxBuffer]');
411
415
  }
@@ -426,7 +430,7 @@ export class Smartshell {
426
430
 
427
431
  if (!bufferExceeded) {
428
432
  shellLogInstance.addToBuffer(data);
429
- if (shellLogInstance.logStore.length > maxBuffer) {
433
+ if (shellLogInstance.logLength > maxBuffer) {
430
434
  bufferExceeded = true;
431
435
  shellLogInstance.logStore = Buffer.from('[Output truncated - exceeded maxBuffer]');
432
436
  }
@@ -472,7 +476,7 @@ export class Smartshell {
472
476
  }
473
477
  };
474
478
 
475
- execChildProcess.once('exit', handleExit);
479
+ execChildProcess.once('close', handleExit);
476
480
  execChildProcess.once('error', (error) => {
477
481
  if (timeoutHandle) {
478
482
  clearTimeout(timeoutHandle);
@@ -1,29 +0,0 @@
1
- export type TExecutor = 'sh' | 'bash';
2
- export interface IShellEnvContructorOptions {
3
- executor: TExecutor;
4
- sourceFilePaths?: string[];
5
- pathDirectories?: string[];
6
- }
7
- export declare class ShellEnv {
8
- executor: TExecutor;
9
- sourceFileArray: string[];
10
- pathDirArray: string[];
11
- /**
12
- * constructor for the shellenv
13
- */
14
- constructor(optionsArg: IShellEnvContructorOptions);
15
- /**
16
- * imports path into the shell from env if available and returns it with
17
- */
18
- private _setPath;
19
- /**
20
- * add files that are going to be sourced when running a command
21
- * @param sourceFilePathsArray
22
- */
23
- addSourceFiles(sourceFilePathsArray: string[]): void;
24
- /**
25
- * cleans the source files array
26
- */
27
- cleanSourceFiles(): void;
28
- createEnvExecString(commandArg: string): string;
29
- }
@@ -1,82 +0,0 @@
1
- export class ShellEnv {
2
- /**
3
- * constructor for the shellenv
4
- */
5
- constructor(optionsArg) {
6
- this.sourceFileArray = [];
7
- this.pathDirArray = [];
8
- this.executor = optionsArg.executor;
9
- // add sourcefiles
10
- if (optionsArg.sourceFilePaths) {
11
- this.sourceFileArray = this.sourceFileArray.concat(optionsArg.sourceFilePaths);
12
- }
13
- // add pathDirectories
14
- if (optionsArg.pathDirectories) {
15
- this.pathDirArray = this.pathDirArray.concat(optionsArg.pathDirectories);
16
- }
17
- }
18
- /**
19
- * imports path into the shell from env if available and returns it with
20
- */
21
- _setPath(commandStringArg) {
22
- let commandResult = commandStringArg;
23
- let commandPaths = [];
24
- commandPaths = commandPaths.concat(process.env.PATH.split(':'));
25
- if (process.env.SMARTSHELL_PATH) {
26
- commandPaths = commandPaths.concat(process.env.SMARTSHELL_PATH.split(':'));
27
- }
28
- // lets filter for unwanted paths
29
- // Windows WSL
30
- commandPaths = commandPaths.filter((commandPathArg) => {
31
- const filterResult = !commandPathArg.startsWith('/mnt/c/') &&
32
- !commandPathArg.startsWith('Files/1E') &&
33
- !commandPathArg.includes(' ');
34
- if (!filterResult) {
35
- // console.log(`${commandPathArg} will be filtered!`);
36
- }
37
- return filterResult;
38
- });
39
- commandResult = `PATH=${commandPaths.join(':')} && ${commandStringArg}`;
40
- return commandResult;
41
- }
42
- /**
43
- * add files that are going to be sourced when running a command
44
- * @param sourceFilePathsArray
45
- */
46
- addSourceFiles(sourceFilePathsArray) {
47
- for (let sourceFilePath of sourceFilePathsArray) {
48
- this.sourceFileArray.push(sourceFilePath);
49
- }
50
- }
51
- /**
52
- * cleans the source files array
53
- */
54
- cleanSourceFiles() {
55
- this.sourceFileArray = [];
56
- }
57
- createEnvExecString(commandArg) {
58
- let commandResult = '';
59
- let sourceString = '';
60
- // deal with sourcestring
61
- for (const sourceFilePath of this.sourceFileArray) {
62
- sourceString = sourceString + `source ${sourceFilePath} && `;
63
- }
64
- // deal with available path
65
- let pathString = 'PATH=$PATH';
66
- for (const pathDir of this.pathDirArray) {
67
- pathString += `:${pathDir}`;
68
- }
69
- pathString += ` && `;
70
- switch (this.executor) {
71
- case 'bash':
72
- commandResult = `bash -c '${pathString}${sourceString}${commandArg}'`;
73
- break;
74
- case 'sh':
75
- commandResult = `${pathString}${sourceString}${commandArg}`;
76
- break;
77
- }
78
- commandResult = this._setPath(commandResult);
79
- return commandResult;
80
- }
81
- }
82
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5jbGFzc2VzLnNoZWxsZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzaGVsbC5jbGFzc2VzLnNoZWxsZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLE1BQU0sT0FBTyxRQUFRO0lBS25COztPQUVHO0lBQ0gsWUFBWSxVQUFzQztRQU5sRCxvQkFBZSxHQUFhLEVBQUUsQ0FBQztRQUMvQixpQkFBWSxHQUFhLEVBQUUsQ0FBQztRQU0xQixJQUFJLENBQUMsUUFBUSxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUM7UUFFcEMsa0JBQWtCO1FBQ2xCLElBQUksVUFBVSxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQy9CLElBQUksQ0FBQyxlQUFlLEdBQUcsSUFBSSxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2pGLENBQUM7UUFFRCxzQkFBc0I7UUFDdEIsSUFBSSxVQUFVLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDL0IsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDM0UsQ0FBQztJQUNILENBQUM7SUFFRDs7T0FFRztJQUNLLFFBQVEsQ0FBQyxnQkFBd0I7UUFDdkMsSUFBSSxhQUFhLEdBQUcsZ0JBQWdCLENBQUM7UUFDckMsSUFBSSxZQUFZLEdBQWEsRUFBRSxDQUFDO1FBQ2hDLFlBQVksR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ2hFLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUNoQyxZQUFZLEdBQUcsWUFBWSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUM3RSxDQUFDO1FBRUQsaUNBQWlDO1FBQ2pDLGNBQWM7UUFDZCxZQUFZLEdBQUcsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDLGNBQWMsRUFBRSxFQUFFO1lBQ3BELE1BQU0sWUFBWSxHQUNoQixDQUFDLGNBQWMsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO2dCQUNyQyxDQUFDLGNBQWMsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO2dCQUN0QyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDaEMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO2dCQUNsQixzREFBc0Q7WUFDeEQsQ0FBQztZQUNELE9BQU8sWUFBWSxDQUFDO1FBQ3RCLENBQUMsQ0FBQyxDQUFDO1FBRUgsYUFBYSxHQUFHLFFBQVEsWUFBWSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxnQkFBZ0IsRUFBRSxDQUFDO1FBQ3hFLE9BQU8sYUFBYSxDQUFDO0lBQ3ZCLENBQUM7SUFFRDs7O09BR0c7SUFDSCxjQUFjLENBQUMsb0JBQThCO1FBQzNDLEtBQUssSUFBSSxjQUFjLElBQUksb0JBQW9CLEVBQUUsQ0FBQztZQUNoRCxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUM1QyxDQUFDO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0gsZ0JBQWdCO1FBQ2QsSUFBSSxDQUFDLGVBQWUsR0FBRyxFQUFFLENBQUM7SUFDNUIsQ0FBQztJQUVNLG1CQUFtQixDQUFDLFVBQWtCO1FBQzNDLElBQUksYUFBYSxHQUFHLEVBQUUsQ0FBQztRQUN2QixJQUFJLFlBQVksR0FBRyxFQUFFLENBQUM7UUFFdEIseUJBQXlCO1FBQ3pCLEtBQUssTUFBTSxjQUFjLElBQUksSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ2xELFlBQVksR0FBRyxZQUFZLEdBQUcsVUFBVSxjQUFjLE1BQU0sQ0FBQztRQUMvRCxDQUFDO1FBRUQsMkJBQTJCO1FBQzNCLElBQUksVUFBVSxHQUFHLFlBQVksQ0FBQztRQUM5QixLQUFLLE1BQU0sT0FBTyxJQUFJLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUN4QyxVQUFVLElBQUksSUFBSSxPQUFPLEVBQUUsQ0FBQztRQUM5QixDQUFDO1FBQ0QsVUFBVSxJQUFJLE1BQU0sQ0FBQztRQUVyQixRQUFRLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUN0QixLQUFLLE1BQU07Z0JBQ1QsYUFBYSxHQUFHLFlBQVksVUFBVSxHQUFHLFlBQVksR0FBRyxVQUFVLEdBQUcsQ0FBQztnQkFDdEUsTUFBTTtZQUNSLEtBQUssSUFBSTtnQkFDUCxhQUFhLEdBQUcsR0FBRyxVQUFVLEdBQUcsWUFBWSxHQUFHLFVBQVUsRUFBRSxDQUFDO2dCQUM1RCxNQUFNO1FBQ1YsQ0FBQztRQUNELGFBQWEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQzdDLE9BQU8sYUFBYSxDQUFDO0lBQ3ZCLENBQUM7Q0FDRiJ9
@@ -1,18 +0,0 @@
1
- /**
2
- * a log handler for spawned logs
3
- * making sure the process doesn't run out of memory
4
- */
5
- export declare class ShellLog {
6
- logStore: Buffer;
7
- /**
8
- * log data to console
9
- * @param dataArg
10
- */
11
- writeToConsole(dataArg: string | Buffer): void;
12
- /**
13
- * add data to Buffer for later consumption
14
- * @param dataArg
15
- */
16
- addToBuffer(dataArg: string | Buffer): void;
17
- logAndAdd(dataArg: string | Buffer): void;
18
- }
@@ -1,37 +0,0 @@
1
- import * as plugins from './smartshell.plugins.js';
2
- /**
3
- * a log handler for spawned logs
4
- * making sure the process doesn't run out of memory
5
- */
6
- export class ShellLog {
7
- constructor() {
8
- this.logStore = Buffer.from('');
9
- }
10
- /**
11
- * log data to console
12
- * @param dataArg
13
- */
14
- writeToConsole(dataArg) {
15
- // make sure we have the data as string
16
- process.stdout.write(dataArg);
17
- }
18
- /**
19
- * add data to Buffer for later consumption
20
- * @param dataArg
21
- */
22
- addToBuffer(dataArg) {
23
- // make sure we have the data as Buffer
24
- const dataBuffer = (() => {
25
- if (!Buffer.isBuffer(dataArg)) {
26
- return Buffer.from(dataArg);
27
- }
28
- return dataArg;
29
- })();
30
- this.logStore = Buffer.concat([this.logStore, dataBuffer]);
31
- }
32
- logAndAdd(dataArg) {
33
- this.writeToConsole(dataArg);
34
- this.addToBuffer(dataArg);
35
- }
36
- }
37
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5jbGFzc2VzLnNoZWxsbG9nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzaGVsbC5jbGFzc2VzLnNoZWxsbG9nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0seUJBQXlCLENBQUM7QUFFbkQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFFBQVE7SUFBckI7UUFDUyxhQUFRLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQThCcEMsQ0FBQztJQTVCQzs7O09BR0c7SUFDSSxjQUFjLENBQUMsT0FBd0I7UUFDNUMsdUNBQXVDO1FBQ3ZDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2hDLENBQUM7SUFFRDs7O09BR0c7SUFDSSxXQUFXLENBQUMsT0FBd0I7UUFDekMsdUNBQXVDO1FBQ3ZDLE1BQU0sVUFBVSxHQUFXLENBQUMsR0FBRyxFQUFFO1lBQy9CLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7Z0JBQzlCLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUM5QixDQUFDO1lBQ0QsT0FBTyxPQUFPLENBQUM7UUFDakIsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNMLElBQUksQ0FBQyxRQUFRLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUM3RCxDQUFDO0lBRU0sU0FBUyxDQUFDLE9BQXdCO1FBQ3ZDLElBQUksQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDN0IsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUM1QixDQUFDO0NBQ0YifQ==
@@ -1,36 +0,0 @@
1
- import * as plugins from './smartshell.plugins.js';
2
- import { ShellEnv } from './smartshell.classes.shellenv.js';
3
- import type { IShellEnvContructorOptions } from './smartshell.classes.shellenv.js';
4
- import * as cp from 'child_process';
5
- export interface IExecResult {
6
- exitCode: number;
7
- stdout: string;
8
- }
9
- export interface IExecResultStreaming {
10
- childProcess: cp.ChildProcess;
11
- finalPromise: Promise<IExecResult>;
12
- kill: () => Promise<void>;
13
- terminate: () => Promise<void>;
14
- keyboardInterrupt: () => Promise<void>;
15
- customSignal: (signalArg: plugins.smartexit.TProcessSignal) => Promise<void>;
16
- }
17
- export declare class Smartshell {
18
- shellEnv: ShellEnv;
19
- smartexit: plugins.smartexit.SmartExit;
20
- constructor(optionsArg: IShellEnvContructorOptions);
21
- /**
22
- * executes a given command async
23
- */
24
- private _exec;
25
- private _execInteractive;
26
- private _execCommand;
27
- exec(commandString: string): Promise<IExecResult>;
28
- execSilent(commandString: string): Promise<IExecResult>;
29
- execStrict(commandString: string): Promise<IExecResult>;
30
- execStrictSilent(commandString: string): Promise<IExecResult>;
31
- execStreaming(commandString: string, silent?: boolean): Promise<IExecResultStreaming>;
32
- execStreamingSilent(commandString: string): Promise<IExecResultStreaming>;
33
- execInteractive(commandString: string): Promise<void>;
34
- execAndWaitForLine(commandString: string, regexArg: RegExp, silentArg?: boolean): Promise<unknown>;
35
- execAndWaitForLineSilent(commandString: string, regexArg: RegExp): Promise<unknown>;
36
- }
@@ -1,138 +0,0 @@
1
- import * as plugins from './smartshell.plugins.js';
2
- import { ShellEnv } from './smartshell.classes.shellenv.js';
3
- import { ShellLog } from './smartshell.classes.shelllog.js';
4
- import * as cp from 'child_process';
5
- export class Smartshell {
6
- constructor(optionsArg) {
7
- this.smartexit = new plugins.smartexit.SmartExit();
8
- this.shellEnv = new ShellEnv(optionsArg);
9
- }
10
- /**
11
- * executes a given command async
12
- */
13
- async _exec(options) {
14
- if (options.interactive) {
15
- return await this._execInteractive(options);
16
- }
17
- return await this._execCommand(options);
18
- }
19
- async _execInteractive(options) {
20
- if (process.env.CI) {
21
- return;
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) {
38
- const done = plugins.smartpromise.defer();
39
- const childProcessEnded = plugins.smartpromise.defer();
40
- const commandToExecute = this.shellEnv.createEnvExecString(options.commandString);
41
- const shellLogInstance = new ShellLog();
42
- const execChildProcess = cp.spawn(commandToExecute, [], {
43
- shell: true,
44
- cwd: process.cwd(),
45
- env: process.env,
46
- detached: false,
47
- });
48
- this.smartexit.addProcess(execChildProcess);
49
- execChildProcess.stdout.on('data', (data) => {
50
- if (!options.silent) {
51
- shellLogInstance.writeToConsole(data);
52
- }
53
- shellLogInstance.addToBuffer(data);
54
- });
55
- execChildProcess.stderr.on('data', (data) => {
56
- if (!options.silent) {
57
- shellLogInstance.writeToConsole(data);
58
- }
59
- shellLogInstance.addToBuffer(data);
60
- });
61
- execChildProcess.on('exit', (code, signal) => {
62
- this.smartexit.removeProcess(execChildProcess);
63
- if (options.strict && code === 1) {
64
- done.reject();
65
- }
66
- const execResult = {
67
- exitCode: code,
68
- stdout: shellLogInstance.logStore.toString(),
69
- };
70
- if (!options.streaming) {
71
- done.resolve(execResult);
72
- }
73
- childProcessEnded.resolve(execResult);
74
- });
75
- if (options.streaming) {
76
- done.resolve({
77
- childProcess: execChildProcess,
78
- finalPromise: childProcessEnded.promise,
79
- kill: async () => {
80
- console.log(`running tree kill with SIGKILL on process ${execChildProcess.pid}`);
81
- await plugins.smartexit.SmartExit.killTreeByPid(execChildProcess.pid, 'SIGKILL');
82
- },
83
- terminate: async () => {
84
- console.log(`running tree kill with SIGTERM on process ${execChildProcess.pid}`);
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);
94
- },
95
- });
96
- }
97
- return await done.promise;
98
- }
99
- async exec(commandString) {
100
- return (await this._exec({ commandString }));
101
- }
102
- async execSilent(commandString) {
103
- return (await this._exec({ commandString, silent: true }));
104
- }
105
- async execStrict(commandString) {
106
- return (await this._exec({ commandString, strict: true }));
107
- }
108
- async execStrictSilent(commandString) {
109
- return (await this._exec({ commandString, silent: true, strict: true }));
110
- }
111
- async execStreaming(commandString, silent = false) {
112
- return (await this._exec({ commandString, silent, streaming: true }));
113
- }
114
- async execStreamingSilent(commandString) {
115
- return (await this._exec({
116
- commandString,
117
- silent: true,
118
- streaming: true,
119
- }));
120
- }
121
- async execInteractive(commandString) {
122
- await this._exec({ commandString, interactive: true });
123
- }
124
- async execAndWaitForLine(commandString, regexArg, silentArg = false) {
125
- let done = plugins.smartpromise.defer();
126
- let execStreamingResult = await this.execStreaming(commandString, silentArg);
127
- execStreamingResult.childProcess.stdout.on('data', (stdOutChunk) => {
128
- if (regexArg.test(stdOutChunk)) {
129
- done.resolve();
130
- }
131
- });
132
- return done.promise;
133
- }
134
- async execAndWaitForLineSilent(commandString, regexArg) {
135
- return this.execAndWaitForLine(commandString, regexArg, true);
136
- }
137
- }
138
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5jbGFzc2VzLnNtYXJ0c2hlbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNoZWxsLmNsYXNzZXMuc21hcnRzaGVsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHlCQUF5QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUU1RCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFNUQsT0FBTyxLQUFLLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFpQnBDLE1BQU0sT0FBTyxVQUFVO0lBSXJCLFlBQVksVUFBc0M7UUFGM0MsY0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUduRCxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksUUFBUSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRDs7T0FFRztJQUNLLEtBQUssQ0FBQyxLQUFLLENBQUMsT0FNbkI7UUFDQyxJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixPQUFPLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzlDLENBQUM7UUFFRCxPQUFPLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBRU8sS0FBSyxDQUFDLGdCQUFnQixDQUFDLE9BRzlCO1FBQ0MsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ25CLE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUUxQyxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxhQUFhLEVBQUU7WUFDNUMsS0FBSyxFQUFF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
@@ -1,5 +0,0 @@
1
- import * as smartdelay from '@push.rocks/smartdelay';
2
- import * as smartexit from '@push.rocks/smartexit';
3
- import * as smartpromise from '@push.rocks/smartpromise';
4
- import which from 'which';
5
- export { smartdelay, smartexit, smartpromise, which };
@@ -1,6 +0,0 @@
1
- import * as smartdelay from '@push.rocks/smartdelay';
2
- import * as smartexit from '@push.rocks/smartexit';
3
- import * as smartpromise from '@push.rocks/smartpromise';
4
- import which from 'which';
5
- export { smartdelay, smartexit, smartpromise, which };
6
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzaGVsbC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUUxQixPQUFPLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLENBQUMifQ==