@idlebox/node 1.4.3 → 1.4.4
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/lib/cjs/asyncLoad.cjs +4 -1
- package/lib/cjs/asyncLoad.cjs.map +1 -1
- package/lib/cjs/child_process/error.cjs +8 -8
- package/lib/cjs/child_process/error.cjs.map +1 -1
- package/lib/cjs/child_process/execa.cjs +4 -4
- package/lib/cjs/child_process/execa.cjs.map +1 -1
- package/lib/cjs/child_process/lateError.cjs.map +1 -1
- package/lib/cjs/child_process/respawn.cjs +10 -14
- package/lib/cjs/child_process/respawn.cjs.map +1 -1
- package/lib/cjs/cli-io/output.cjs +1 -1
- package/lib/cjs/cli-io/output.cjs.map +1 -1
- package/lib/cjs/crypto/md5.cjs +2 -2
- package/lib/cjs/crypto/md5.cjs.map +1 -1
- package/lib/cjs/crypto/sha256.cjs +2 -5
- package/lib/cjs/crypto/sha256.cjs.map +1 -1
- package/lib/cjs/environment/findBinary.cjs +3 -3
- package/lib/cjs/environment/findBinary.cjs.map +1 -1
- package/lib/cjs/environment/npmConfig.cjs +4 -6
- package/lib/cjs/environment/npmConfig.cjs.map +1 -1
- package/lib/cjs/environment/pathEnvironment.cjs +3 -3
- package/lib/cjs/environment/pathEnvironment.cjs.map +1 -1
- package/lib/cjs/fs/commandExists.cjs +4 -6
- package/lib/cjs/fs/commandExists.cjs.map +1 -1
- package/lib/cjs/fs/emptyDir.cjs +3 -3
- package/lib/cjs/fs/emptyDir.cjs.map +1 -1
- package/lib/cjs/fs/exists.cjs +4 -6
- package/lib/cjs/fs/exists.cjs.map +1 -1
- package/lib/cjs/fs/tempFolder.cjs +10 -10
- package/lib/cjs/fs/tempFolder.cjs.map +1 -1
- package/lib/cjs/fs/weiteChanged.cjs +8 -8
- package/lib/cjs/fs/weiteChanged.cjs.map +1 -1
- package/lib/cjs/log/terminal.cjs.map +1 -1
- package/lib/cjs/path-resolve/findPackageRoot.cjs +6 -8
- package/lib/cjs/path-resolve/findPackageRoot.cjs.map +1 -1
- package/lib/cjs/path-resolve/getAllUp.cjs +2 -2
- package/lib/cjs/path-resolve/getAllUp.cjs.map +1 -1
- package/lib/cjs/path-resolve/lrelative.cjs +5 -5
- package/lib/cjs/path-resolve/lrelative.cjs.map +1 -1
- package/lib/cjs/path-resolve/nodeResolvePathArray.cjs +3 -3
- package/lib/cjs/path-resolve/nodeResolvePathArray.cjs.map +1 -1
- package/lib/cjs/path-resolve/resolvePath.cjs +10 -12
- package/lib/cjs/path-resolve/resolvePath.cjs.map +1 -1
- package/lib/cjs/stream/blackHoleStream.cjs +2 -2
- package/lib/cjs/stream/blackHoleStream.cjs.map +1 -1
- package/lib/cjs/stream/collectingStream.cjs +14 -16
- package/lib/cjs/stream/collectingStream.cjs.map +1 -1
- package/lib/cjs/stream/drainStream.cjs.map +1 -1
- package/lib/cjs/stream/loggerStream.cjs +7 -7
- package/lib/cjs/stream/loggerStream.cjs.map +1 -1
- package/lib/cjs/stream/streamPromise.cjs +8 -10
- package/lib/cjs/stream/streamPromise.cjs.map +1 -1
- package/lib/esm/asyncLoad.d.ts +1 -1
- package/lib/esm/asyncLoad.d.ts.map +1 -1
- package/lib/esm/asyncLoad.js +4 -1
- package/lib/esm/asyncLoad.js.map +1 -1
- package/lib/esm/child_process/error.js +8 -8
- package/lib/esm/child_process/error.js.map +1 -1
- package/lib/esm/child_process/execa.d.ts.map +1 -1
- package/lib/esm/child_process/execa.js +4 -4
- package/lib/esm/child_process/execa.js.map +1 -1
- package/lib/esm/child_process/lateError.d.ts +1 -1
- package/lib/esm/child_process/lateError.d.ts.map +1 -1
- package/lib/esm/child_process/lateError.js.map +1 -1
- package/lib/esm/child_process/respawn.d.ts.map +1 -1
- package/lib/esm/child_process/respawn.js +7 -11
- package/lib/esm/child_process/respawn.js.map +1 -1
- package/lib/esm/cli-io/output.js +1 -1
- package/lib/esm/cli-io/output.js.map +1 -1
- package/lib/esm/crypto/md5.js +1 -1
- package/lib/esm/crypto/md5.js.map +1 -1
- package/lib/esm/crypto/sha256.d.ts.map +1 -1
- package/lib/esm/crypto/sha256.js +2 -5
- package/lib/esm/crypto/sha256.js.map +1 -1
- package/lib/esm/environment/findBinary.js +2 -2
- package/lib/esm/environment/findBinary.js.map +1 -1
- package/lib/esm/environment/npmConfig.d.ts.map +1 -1
- package/lib/esm/environment/npmConfig.js +3 -5
- package/lib/esm/environment/npmConfig.js.map +1 -1
- package/lib/esm/environment/pathEnvironment.js +1 -1
- package/lib/esm/environment/pathEnvironment.js.map +1 -1
- package/lib/esm/events/dumpEventEmitter.d.ts +1 -1
- package/lib/esm/events/dumpEventEmitter.d.ts.map +1 -1
- package/lib/esm/fs/commandExists.d.ts.map +1 -1
- package/lib/esm/fs/commandExists.js +2 -4
- package/lib/esm/fs/commandExists.js.map +1 -1
- package/lib/esm/fs/emptyDir.js +2 -2
- package/lib/esm/fs/emptyDir.js.map +1 -1
- package/lib/esm/fs/exists.d.ts +2 -2
- package/lib/esm/fs/exists.d.ts.map +1 -1
- package/lib/esm/fs/exists.js +3 -5
- package/lib/esm/fs/exists.js.map +1 -1
- package/lib/esm/fs/tempFolder.d.ts +1 -1
- package/lib/esm/fs/tempFolder.d.ts.map +1 -1
- package/lib/esm/fs/tempFolder.js +4 -4
- package/lib/esm/fs/tempFolder.js.map +1 -1
- package/lib/esm/fs/weiteChanged.js +2 -2
- package/lib/esm/fs/weiteChanged.js.map +1 -1
- package/lib/esm/log/terminal.d.ts +1 -1
- package/lib/esm/log/terminal.d.ts.map +1 -1
- package/lib/esm/log/terminal.js.map +1 -1
- package/lib/esm/path-resolve/findPackageRoot.d.ts.map +1 -1
- package/lib/esm/path-resolve/findPackageRoot.js +4 -6
- package/lib/esm/path-resolve/findPackageRoot.js.map +1 -1
- package/lib/esm/path-resolve/getAllUp.d.ts.map +1 -1
- package/lib/esm/path-resolve/getAllUp.js +2 -2
- package/lib/esm/path-resolve/getAllUp.js.map +1 -1
- package/lib/esm/path-resolve/lrelative.js +3 -3
- package/lib/esm/path-resolve/lrelative.js.map +1 -1
- package/lib/esm/path-resolve/nodeResolvePathArray.js +1 -1
- package/lib/esm/path-resolve/nodeResolvePathArray.js.map +1 -1
- package/lib/esm/path-resolve/resolvePath.d.ts +3 -9
- package/lib/esm/path-resolve/resolvePath.d.ts.map +1 -1
- package/lib/esm/path-resolve/resolvePath.js +3 -5
- package/lib/esm/path-resolve/resolvePath.js.map +1 -1
- package/lib/esm/stream/blackHoleStream.d.ts +1 -1
- package/lib/esm/stream/blackHoleStream.d.ts.map +1 -1
- package/lib/esm/stream/blackHoleStream.js +1 -1
- package/lib/esm/stream/blackHoleStream.js.map +1 -1
- package/lib/esm/stream/collectingStream.d.ts +1 -1
- package/lib/esm/stream/collectingStream.d.ts.map +1 -1
- package/lib/esm/stream/collectingStream.js +13 -15
- package/lib/esm/stream/collectingStream.js.map +1 -1
- package/lib/esm/stream/disposableStream.d.ts +2 -2
- package/lib/esm/stream/disposableStream.d.ts.map +1 -1
- package/lib/esm/stream/drainStream.d.ts.map +1 -1
- package/lib/esm/stream/drainStream.js.map +1 -1
- package/lib/esm/stream/loggerStream.d.ts +1 -1
- package/lib/esm/stream/loggerStream.d.ts.map +1 -1
- package/lib/esm/stream/loggerStream.js +5 -5
- package/lib/esm/stream/loggerStream.js.map +1 -1
- package/lib/esm/stream/streamPromise.d.ts.map +1 -1
- package/lib/esm/stream/streamPromise.js +8 -10
- package/lib/esm/stream/streamPromise.js.map +1 -1
- package/package.json +3 -3
- package/src/asyncLoad.ts +6 -3
- package/src/child_process/error.ts +8 -8
- package/src/child_process/execa.ts +5 -4
- package/src/child_process/lateError.ts +1 -1
- package/src/child_process/respawn.ts +8 -10
- package/src/cli-io/output.ts +1 -1
- package/src/crypto/md5.ts +1 -1
- package/src/crypto/sha256.ts +2 -5
- package/src/environment/findBinary.ts +2 -2
- package/src/environment/npmConfig.ts +3 -4
- package/src/environment/pathEnvironment.ts +1 -1
- package/src/error/cache.generated.json +3970 -4281
- package/src/error/nodejs-error-code.generator.ts +7 -7
- package/src/error/types.ts +1 -1
- package/src/events/dumpEventEmitter.ts +1 -1
- package/src/fs/commandExists.ts +2 -3
- package/src/fs/emptyDir.ts +2 -2
- package/src/fs/exists.ts +4 -5
- package/src/fs/tempFolder.ts +5 -5
- package/src/fs/weiteChanged.ts +2 -2
- package/src/log/terminal.ts +1 -1
- package/src/path-resolve/findPackageRoot.ts +4 -5
- package/src/path-resolve/getAllUp.ts +3 -3
- package/src/path-resolve/lrelative.ts +3 -3
- package/src/path-resolve/nodeResolvePathArray.ts +1 -1
- package/src/path-resolve/resolvePath.ts +6 -13
- package/src/stream/blackHoleStream.ts +1 -1
- package/src/stream/collectingStream.ts +13 -14
- package/src/stream/disposableStream.ts +2 -2
- package/src/stream/drainStream.ts +1 -6
- package/src/stream/loggerStream.ts +13 -7
- package/src/stream/streamPromise.ts +8 -11
- package/src/tsconfig.json +2 -2
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/path-resolve/resolvePath.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAMA,MAAM,
|
|
9
|
+
"mappings": "AAMA,MAAM,MAAM,mBAAmB,GAAG,CAAC,GAAG,YAAY,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;AAExE,MAAM,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,MAAM,CAAC;AAEpE,eAAO,MAAM,WAAW,EAAE,mBAA8D,CAAC;AAMzF,MAAM,MAAM,qBAAqB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;AAE7D,eAAO,MAAM,aAAa,EAAE,qBAAoE,CAAC;AAMjG,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,UAKtC;AAMD,eAAO,MAAM,YAAY,EAAE,gBAA6D,CAAC"
|
|
10
10
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isWindows } from '@idlebox/common';
|
|
2
|
-
import { tmpdir } from 'os';
|
|
3
|
-
import { normalize, relative, resolve } from 'path';
|
|
2
|
+
import { tmpdir } from 'node:os';
|
|
3
|
+
import { normalize, relative, resolve } from 'node:path';
|
|
4
4
|
const winSlash = /\\/g;
|
|
5
5
|
export const resolvePath = isWindows ? resolveWindowsPath : resolve;
|
|
6
6
|
function resolveWindowsPath(...pathSegments) {
|
|
@@ -14,9 +14,7 @@ export function osTempDir(name) {
|
|
|
14
14
|
if (name) {
|
|
15
15
|
return resolvePath(tmpdir(), name);
|
|
16
16
|
}
|
|
17
|
-
|
|
18
|
-
return resolvePath(tmpdir());
|
|
19
|
-
}
|
|
17
|
+
return resolvePath(tmpdir());
|
|
20
18
|
}
|
|
21
19
|
function relativeWindowsPath(from, to) {
|
|
22
20
|
return relative(normalize(from), normalize(to)).replace(winSlash, '/');
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/path-resolve/resolvePath.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzD,MAAM,QAAQ,GAAG,KAAK,CAAC;AAMvB,MAAM,CAAC,MAAM,WAAW,GAAwB,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC;AAEzF,SAAS,kBAAkB,CAAC,GAAG,YAAsB;IACpD,OAAO,OAAO,CAAC,GAAG,YAAY,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACxD,CAAC;AAID,MAAM,CAAC,MAAM,aAAa,GAA0B,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC;AAEjG,SAAS,oBAAoB,CAAC,IAAY;IACzC,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAa;IACtC,IAAI,IAAI,EAAE,CAAC;QACV,OAAO,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY,EAAE,EAAU;IACpD,OAAO,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAqB,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,CAAC"
|
|
10
10
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/blackHoleStream.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,qBAAa,eAAgB,SAAQ,QAAQ;IACnC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;CAGlG"
|
|
10
10
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/blackHoleStream.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,OAAO,eAAgB,SAAQ,QAAQ;IACnC,MAAM,CAAC,MAAc,EAAE,SAAiB,EAAE,QAAwC;QAC1F,QAAQ,EAAE,CAAC;IACZ,CAAC;CACD"
|
|
10
10
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Writable } from
|
|
1
|
+
import { Writable } from 'node:stream';
|
|
2
2
|
export declare function streamToBuffer(stream: NodeJS.ReadableStream, raw: false): Promise<string>;
|
|
3
3
|
export declare function streamToBuffer(stream: NodeJS.ReadableStream, raw: true): Promise<Buffer>;
|
|
4
4
|
export declare class RawCollectingStream extends Writable {
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/collectingStream.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3F,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAQ1F,qBAAa,mBAAoB,SAAQ,QAAQ;IAChD,OAAO,CAAC,MAAM,CAAC,CAAiC;IAChD,OAAO,CAAC,QAAQ,CAAC,CAAkB;gBAEvB,YAAY,CAAC,EAAE,MAAM,CAAC,cAAc;IAUvC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAKjG,SAAS,IAAI,MAAM;IAInB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAS1B;AAED,qBAAa,gBAAiB,SAAQ,QAAQ;IAC7C,OAAO,CAAC,MAAM,CAAC,CAAM;IACrB,OAAO,CAAC,QAAQ,CAAC,CAAkB;gBAEvB,YAAY,CAAC,EAAE,MAAM,CAAC,cAAc;IAUvC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAUxG,SAAS;IAIT,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAS1B"
|
|
10
10
|
}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import { Writable } from
|
|
2
|
-
import { streamPromise } from
|
|
1
|
+
import { Writable } from 'node:stream';
|
|
2
|
+
import { streamPromise } from './streamPromise.js';
|
|
3
3
|
export function streamToBuffer(stream, raw) {
|
|
4
4
|
if (raw) {
|
|
5
5
|
return new RawCollectingStream(stream).promise();
|
|
6
6
|
}
|
|
7
|
-
|
|
8
|
-
return new CollectingStream(stream).promise();
|
|
9
|
-
}
|
|
7
|
+
return new CollectingStream(stream).promise();
|
|
10
8
|
}
|
|
11
9
|
export class RawCollectingStream extends Writable {
|
|
12
10
|
buffer = Buffer.allocUnsafe(0);
|
|
@@ -15,8 +13,8 @@ export class RawCollectingStream extends Writable {
|
|
|
15
13
|
super();
|
|
16
14
|
if (sourceStream) {
|
|
17
15
|
sourceStream.pipe(this);
|
|
18
|
-
sourceStream.on(
|
|
19
|
-
this.emit(
|
|
16
|
+
sourceStream.on('error', (e) => {
|
|
17
|
+
this.emit('error', e);
|
|
20
18
|
});
|
|
21
19
|
}
|
|
22
20
|
}
|
|
@@ -32,29 +30,29 @@ export class RawCollectingStream extends Writable {
|
|
|
32
30
|
? this._promise
|
|
33
31
|
: (this._promise = streamPromise(this).then(() => {
|
|
34
32
|
const buffer = this.buffer;
|
|
35
|
-
|
|
33
|
+
this.buffer = undefined;
|
|
36
34
|
return buffer;
|
|
37
35
|
}));
|
|
38
36
|
}
|
|
39
37
|
}
|
|
40
38
|
export class CollectingStream extends Writable {
|
|
41
|
-
buffer =
|
|
39
|
+
buffer = '';
|
|
42
40
|
_promise;
|
|
43
41
|
constructor(sourceStream) {
|
|
44
42
|
super();
|
|
45
43
|
if (sourceStream) {
|
|
46
44
|
sourceStream.pipe(this);
|
|
47
|
-
sourceStream.on(
|
|
48
|
-
this.emit(
|
|
45
|
+
sourceStream.on('error', (e) => {
|
|
46
|
+
this.emit('error', e);
|
|
49
47
|
});
|
|
50
48
|
}
|
|
51
49
|
}
|
|
52
50
|
_write(chunk, encoding, callback) {
|
|
53
51
|
if (!encoding) {
|
|
54
|
-
encoding =
|
|
52
|
+
encoding = 'utf8';
|
|
55
53
|
}
|
|
56
|
-
else if (encoding ===
|
|
57
|
-
encoding =
|
|
54
|
+
else if (encoding === 'buffer' || encoding === 'binary') {
|
|
55
|
+
encoding = 'utf8';
|
|
58
56
|
}
|
|
59
57
|
this.buffer += chunk.toString(encoding);
|
|
60
58
|
callback();
|
|
@@ -67,7 +65,7 @@ export class CollectingStream extends Writable {
|
|
|
67
65
|
? this._promise
|
|
68
66
|
: (this._promise = streamPromise(this).then(() => {
|
|
69
67
|
const buffer = this.buffer;
|
|
70
|
-
|
|
68
|
+
this.buffer = undefined;
|
|
71
69
|
return buffer;
|
|
72
70
|
}));
|
|
73
71
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/collectingStream.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Readable, Writable } from 'stream';
|
|
2
|
-
import { IDisposable } from '@idlebox/common';
|
|
1
|
+
import type { Readable, Writable } from 'node:stream';
|
|
2
|
+
import type { IDisposable } from '@idlebox/common';
|
|
3
3
|
export declare function disposableStream<T extends Writable | Readable>(stream: T): T & IDisposable;
|
|
4
4
|
//# sourceMappingURL=disposableStream.d.ts.map
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/disposableStream.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,
|
|
9
|
+
"mappings": "AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,CAoB1F"
|
|
10
10
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/drainStream.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,wBAAgB,WAAW,
|
|
9
|
+
"mappings": "AAAA,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,SAAI,EAAE,KAAK,SAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAa9G"
|
|
10
10
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/drainStream.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,MAAM,UAAU,WAAW,
|
|
9
|
+
"mappings": "AAAA,MAAM,UAAU,WAAW,CAAC,MAA6B,EAAE,IAAY,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC;IAC5F,yFAAyF;IACzF,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK,CAAC,CAAC;IACtD,IAAI,GAAG,GAAG,KAAK,CAAC;IAChB,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9C,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YAClC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACvB,OAAO,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC"
|
|
10
10
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/loggerStream.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAEpE,qBAAa,YAAa,SAAQ,SAAS;IAIzC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAHvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAGd,KAAK,EAAE,WAAW,EACnC,MAAM,CAAC,EAAE,MAAM;IAMP,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAetF;AAMD,qBAAa,mBAAoB,SAAQ,SAAS;IAIhD,OAAO,CAAC,QAAQ,CAAC,KAAK;IAHvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAGd,KAAK,EAAE,WAAW,EACnC,MAAM,CAAC,EAAE,MAAM;IAMP,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAmBtF"
|
|
10
10
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { Transform } from 'stream';
|
|
1
|
+
import { Transform } from 'node:stream';
|
|
2
2
|
export class LoggerStream extends Transform {
|
|
3
3
|
logFn;
|
|
4
4
|
prefix;
|
|
5
5
|
constructor(logFn, prefix) {
|
|
6
6
|
super();
|
|
7
7
|
this.logFn = logFn;
|
|
8
|
-
this.prefix = prefix ? prefix
|
|
8
|
+
this.prefix = prefix ? `${prefix} %s` : '%s';
|
|
9
9
|
}
|
|
10
10
|
_transform(chunk, encoding, callback) {
|
|
11
11
|
if (encoding === 'buffer' || encoding === 'binary') {
|
|
@@ -24,7 +24,7 @@ export class LoggerStream extends Transform {
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
function pad2(s) {
|
|
27
|
-
return s.length === 1 ?
|
|
27
|
+
return s.length === 1 ? `0${s}` : s;
|
|
28
28
|
}
|
|
29
29
|
export class HexDumpLoggerStream extends Transform {
|
|
30
30
|
logFn;
|
|
@@ -32,7 +32,7 @@ export class HexDumpLoggerStream extends Transform {
|
|
|
32
32
|
constructor(logFn, prefix) {
|
|
33
33
|
super();
|
|
34
34
|
this.logFn = logFn;
|
|
35
|
-
this.prefix = prefix ? prefix
|
|
35
|
+
this.prefix = prefix ? `${prefix} ` : '';
|
|
36
36
|
}
|
|
37
37
|
_transform(chunk, encoding, callback) {
|
|
38
38
|
let itr = 0;
|
|
@@ -45,7 +45,7 @@ export class HexDumpLoggerStream extends Transform {
|
|
|
45
45
|
.map((e) => pad2(e.toString(16)).toUpperCase())
|
|
46
46
|
.join(' ');
|
|
47
47
|
itr += 16;
|
|
48
|
-
this.logFn(this.prefix + l
|
|
48
|
+
this.logFn(`${this.prefix + l} ${r}`);
|
|
49
49
|
}
|
|
50
50
|
this.push(chunk, encoding);
|
|
51
51
|
callback();
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/loggerStream.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC,MAAM,OAAO,YAAa,SAAQ,SAAS;IAIxB;IAHD,MAAM,CAAS;IAEhC,YACkB,KAAkB,EACnC,MAAe;QAEf,KAAK,EAAE,CAAC;QAHS,UAAK,GAAL,KAAK,CAAa;QAInC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;IAEQ,UAAU,CAAC,KAAa,EAAE,QAAwB,EAAE,QAAkB;QAC9E,IAAK,QAAgB,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC7D,QAAQ,GAAG,SAAgB,CAAC;QAC7B,CAAC;QACD,KAAK;aACH,QAAQ,CAAC,QAAQ,CAAC;aAClB,KAAK,CAAC,KAAK,CAAC;aACZ,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;gBACd,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC3B,QAAQ,EAAE,CAAC;IACZ,CAAC;CACD;AAED,SAAS,IAAI,CAAC,CAAS;IACtB,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,OAAO,mBAAoB,SAAQ,SAAS;IAI/B;IAHD,MAAM,CAAS;IAEhC,YACkB,KAAkB,EACnC,MAAe;QAEf,KAAK,EAAE,CAAC;QAHS,UAAK,GAAL,KAAK,CAAa;QAInC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1C,CAAC;IAEQ,UAAU,CAAC,KAAa,EAAE,QAAwB,EAAE,QAAkB;QAC9E,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,OAAO,KAAK,CAAC,MAAM,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;iBAC9C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC9C,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,GAAG,IAAI,EAAE,CAAC;YAEV,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;iBAC9C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC9C,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,GAAG,IAAI,EAAE,CAAC;YAEV,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC3B,QAAQ,EAAE,CAAC;IACZ,CAAC;CACD"
|
|
10
10
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/streamPromise.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
9
|
+
"mappings": "AAAA;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAWlG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,OAG5E"
|
|
10
10
|
}
|
|
@@ -6,18 +6,16 @@ export function streamPromise(stream) {
|
|
|
6
6
|
if (streamHasEnd(stream)) {
|
|
7
7
|
return Promise.resolve();
|
|
8
8
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
});
|
|
17
|
-
}
|
|
9
|
+
return new Promise((resolve, reject) => {
|
|
10
|
+
const r = stream;
|
|
11
|
+
r.once('end', () => resolve());
|
|
12
|
+
r.once('finish', () => resolve());
|
|
13
|
+
r.once('close', () => resolve());
|
|
14
|
+
r.once('error', reject);
|
|
15
|
+
});
|
|
18
16
|
}
|
|
19
17
|
export function streamHasEnd(S) {
|
|
20
18
|
const stream = S;
|
|
21
|
-
return
|
|
19
|
+
return stream._writableState?.ended || stream._readableState?.ended;
|
|
22
20
|
}
|
|
23
21
|
//# sourceMappingURL=streamPromise.js.map
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/stream/streamPromise.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,MAAqD;IAClF,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;
|
|
9
|
+
"mappings": "AAAA;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,MAAqD;IAClF,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,CAAC,GAAG,MAA6B,CAAC;QACxC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/B,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAClC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QACjC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,CAAgD;IAC5E,MAAM,MAAM,GAAG,CAAQ,CAAC;IACxB,OAAO,MAAM,CAAC,cAAc,EAAE,KAAK,IAAI,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC;AACrE,CAAC"
|
|
10
10
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@idlebox/node",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.4.
|
|
4
|
+
"version": "1.4.4",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "./lib/cjs/__create_index.generated.cjs",
|
|
7
7
|
"module": "./lib/esm/__create_index.generated.js",
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"execa": "^9.4.0",
|
|
21
21
|
"source-map-support": "^0.5.21",
|
|
22
|
-
"@
|
|
23
|
-
"@
|
|
22
|
+
"@gongt/fix-esm": "^1.1.2",
|
|
23
|
+
"@idlebox/common": "^1.4.3"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@rushstack/heft": "^0.68.2",
|
package/src/asyncLoad.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { prettyPrintError } from '@idlebox/common';
|
|
2
2
|
|
|
3
|
-
export type AsyncMainFunction = () => Promise<
|
|
3
|
+
export type AsyncMainFunction = () => Promise<undefined | number> | Promise<void>;
|
|
4
4
|
|
|
5
5
|
export class ExitError extends Error {
|
|
6
6
|
constructor(
|
|
7
7
|
message: string,
|
|
8
|
-
public readonly code: number = 1
|
|
8
|
+
public readonly code: number = 1
|
|
9
9
|
) {
|
|
10
10
|
super(message);
|
|
11
11
|
}
|
|
@@ -23,7 +23,10 @@ export function runMain(main: AsyncMainFunction, onExit?: OnExit) {
|
|
|
23
23
|
Promise.resolve()
|
|
24
24
|
.then(async () => {
|
|
25
25
|
try {
|
|
26
|
-
await main();
|
|
26
|
+
const v = await main();
|
|
27
|
+
if (typeof v === 'number') {
|
|
28
|
+
process.exitCode = v;
|
|
29
|
+
}
|
|
27
30
|
await onExit?.();
|
|
28
31
|
} catch (e: any) {
|
|
29
32
|
await onExit?.(e);
|
|
@@ -22,7 +22,7 @@ export function checkChildProcessResult(result: IChildProcessStatus): void {
|
|
|
22
22
|
|
|
23
23
|
if (result.error) {
|
|
24
24
|
const msg: string = result.error.message || (result.error as any);
|
|
25
|
-
const e = new Error(title
|
|
25
|
+
const e = new Error(`${title}failed to start: ${msg.replace(/^Error: /, '')}`);
|
|
26
26
|
if (result.error.stack) {
|
|
27
27
|
const stack = result.error.stack.split(/\n/);
|
|
28
28
|
stack.splice(0, 1, e.message);
|
|
@@ -39,29 +39,29 @@ export function checkChildProcessResult(result: IChildProcessStatus): void {
|
|
|
39
39
|
let signal = result.signalCode || result.signal;
|
|
40
40
|
|
|
41
41
|
if (result.timedOut) {
|
|
42
|
-
throw new Error(title
|
|
42
|
+
throw new Error(`${title}timed out (killed)`);
|
|
43
43
|
}
|
|
44
44
|
if (result.killed && !signal) {
|
|
45
|
-
throw new Error(title
|
|
45
|
+
throw new Error(`${title}killed by unknown reason`);
|
|
46
46
|
}
|
|
47
47
|
if (result.timedOut) {
|
|
48
|
-
throw new Error(title
|
|
48
|
+
throw new Error(`${title}execution timed out`);
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
if (signal) {
|
|
52
52
|
if (result.signalDescription) {
|
|
53
53
|
signal += `: ${result.signalDescription}`;
|
|
54
54
|
}
|
|
55
|
-
throw new Error(title
|
|
55
|
+
throw new Error(`${title}killed by signal ${signal}`);
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
if (code !== undefined && code > 0) {
|
|
59
|
-
throw new Error(title
|
|
59
|
+
throw new Error(`${title}exit with code ${code}`);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
if (result.failed) {
|
|
63
|
-
throw new Error(title
|
|
63
|
+
throw new Error(`${title}process failed to spawn`);
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
-
throw new Error(title
|
|
66
|
+
throw new Error(`${title}status unknown`);
|
|
67
67
|
}
|
|
@@ -23,16 +23,17 @@ function sanitizeEnv(env?: ProcessEnv, addonPath?: string[]) {
|
|
|
23
23
|
}
|
|
24
24
|
if (isWindows) {
|
|
25
25
|
(env as any).Path = env.PATH.replace(/:/g, sepList);
|
|
26
|
-
|
|
26
|
+
env.PATH = undefined as any;
|
|
27
27
|
}
|
|
28
28
|
return env;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
function handleError<T extends SyncResult<SyncOptions> | AsyncResult<AsyncOptions>>(result: T): T {
|
|
32
32
|
if (result.exitCode !== 0) {
|
|
33
|
-
throw new Error(
|
|
34
|
-
}
|
|
35
|
-
|
|
33
|
+
throw new Error(`command exit with code ${result.exitCode}`);
|
|
34
|
+
}
|
|
35
|
+
if (result.signal) {
|
|
36
|
+
throw new Error(`command killed by signal ${result.signal}`);
|
|
36
37
|
}
|
|
37
38
|
return result;
|
|
38
39
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { spawnSync } from 'child_process';
|
|
2
|
-
import { createRequire } from 'module';
|
|
3
|
-
import { platform } from 'os';
|
|
1
|
+
import { spawnSync } from 'node:child_process';
|
|
2
|
+
import { createRequire } from 'node:module';
|
|
3
|
+
import { platform } from 'node:os';
|
|
4
4
|
import { findBinary } from '../environment/findBinary.js';
|
|
5
5
|
import { spawnGetOutputSync } from './execa.js';
|
|
6
6
|
|
|
7
7
|
const unshareArgs = ['--pid', '--cgroup', '--fork', '--mount-proc', '--propagation=slave'];
|
|
8
8
|
|
|
9
|
-
if (platform() === 'linux' && process.getuid
|
|
9
|
+
if (platform() === 'linux' && process.getuid?.() !== 0) {
|
|
10
10
|
unshareArgs.push('--map-root-user');
|
|
11
11
|
}
|
|
12
12
|
|
|
@@ -52,9 +52,8 @@ export function respawnInScope(mainFunc: Function): unknown | never {
|
|
|
52
52
|
spawnRecreateEventHandlers();
|
|
53
53
|
mainFunc();
|
|
54
54
|
return undefined;
|
|
55
|
-
} else {
|
|
56
|
-
execLinux(process.argv);
|
|
57
55
|
}
|
|
56
|
+
execLinux(process.argv);
|
|
58
57
|
}
|
|
59
58
|
|
|
60
59
|
let unshare: string;
|
|
@@ -81,9 +80,8 @@ function supportScope() {
|
|
|
81
80
|
}
|
|
82
81
|
|
|
83
82
|
return true;
|
|
84
|
-
} else {
|
|
85
|
-
return false;
|
|
86
83
|
}
|
|
84
|
+
return false;
|
|
87
85
|
}
|
|
88
86
|
|
|
89
87
|
function spawnSimulate(cmd: string, args: string[]): never {
|
|
@@ -105,13 +103,13 @@ function spawnSimulate(cmd: string, args: string[]): never {
|
|
|
105
103
|
}
|
|
106
104
|
|
|
107
105
|
function execLinux(cmds: string[]): never {
|
|
108
|
-
const args = [...unshareArgs,
|
|
106
|
+
const args = [...unshareArgs, `--wd=${process.cwd()}`, ...cmds];
|
|
109
107
|
|
|
110
108
|
try {
|
|
111
109
|
process.env.NEVER_UNSHARE = 'true';
|
|
112
110
|
const require = createRequire(
|
|
113
111
|
// @ts-ignore
|
|
114
|
-
import.meta.url
|
|
112
|
+
import.meta.url
|
|
115
113
|
);
|
|
116
114
|
const kexec = require('kexec');
|
|
117
115
|
|
package/src/cli-io/output.ts
CHANGED
package/src/crypto/md5.ts
CHANGED
package/src/crypto/sha256.ts
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
import { createHash } from 'crypto';
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
2
|
|
|
3
3
|
export function sha256(data: Uint8Array) {
|
|
4
|
-
return createHash('sha256')
|
|
5
|
-
.update(data)
|
|
6
|
-
.digest()
|
|
7
|
-
.toString('hex');
|
|
4
|
+
return createHash('sha256').update(data).digest().toString('hex');
|
|
8
5
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolve } from 'path';
|
|
1
|
+
import { resolve } from 'node:path';
|
|
2
2
|
import { existsSync } from '../fs/exists.js';
|
|
3
3
|
import { PathEnvironment } from './pathEnvironment.js';
|
|
4
4
|
|
|
@@ -8,7 +8,7 @@ export function findBinary(
|
|
|
8
8
|
cwd = process.cwd()
|
|
9
9
|
) {
|
|
10
10
|
for (const path of pathvar.values()) {
|
|
11
|
-
if (existsSync(path
|
|
11
|
+
if (existsSync(`${path}/${what}`)) {
|
|
12
12
|
return resolve(cwd, path, what);
|
|
13
13
|
}
|
|
14
14
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { linux_case } from '@idlebox/common';
|
|
2
|
-
import { dirname } from 'path';
|
|
2
|
+
import { dirname } from 'node:path';
|
|
3
3
|
import { spawnGetOutput } from '../child_process/execa.js';
|
|
4
4
|
|
|
5
5
|
export async function getNpmConfigValue(field: string): Promise<string> {
|
|
6
|
-
const env_name =
|
|
6
|
+
const env_name = `npm_config_${linux_case(field)}`;
|
|
7
7
|
if (typeof process.env[env_name] === 'string') {
|
|
8
8
|
return process.env[env_name]!;
|
|
9
9
|
}
|
|
@@ -16,8 +16,7 @@ export async function getNpmConfigValue(field: string): Promise<string> {
|
|
|
16
16
|
.then((e) => {
|
|
17
17
|
if (e === 'undefined') {
|
|
18
18
|
return '';
|
|
19
|
-
} else {
|
|
20
|
-
return '';
|
|
21
19
|
}
|
|
20
|
+
return '';
|
|
22
21
|
});
|
|
23
22
|
}
|