7zip-bin-wrapper 1.0.38 → 1.0.39
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/7za.js +2 -2
- package/lib/cjs/inc/fork.cjs +7 -7
- package/lib/cjs/inc/fork.cjs.map +1 -1
- package/lib/cjs/inc/handler.cjs +5 -7
- package/lib/cjs/inc/handler.cjs.map +1 -1
- package/lib/cjs/inc/outputStreams.cjs +9 -9
- package/lib/cjs/inc/outputStreams.cjs.map +1 -1
- package/lib/esm/inc/fork.d.ts +2 -2
- package/lib/esm/inc/fork.d.ts.map +1 -1
- package/lib/esm/inc/fork.js +3 -3
- package/lib/esm/inc/fork.js.map +1 -1
- package/lib/esm/inc/handler.d.ts +3 -3
- package/lib/esm/inc/handler.d.ts.map +1 -1
- package/lib/esm/inc/handler.js +4 -6
- package/lib/esm/inc/handler.js.map +1 -1
- package/lib/esm/inc/outputStreams.d.ts +1 -1
- package/lib/esm/inc/outputStreams.d.ts.map +1 -1
- package/lib/esm/inc/outputStreams.js +6 -6
- package/lib/esm/inc/outputStreams.js.map +1 -1
- package/package.json +2 -2
- package/src/inc/fork.ts +4 -4
- package/src/inc/handler.ts +7 -8
- package/src/inc/outputStreams.ts +4 -4
- package/src/tsconfig.json +2 -2
package/7za.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
3
|
const path7za = require('7zip-bin').path7za.replace(/\.asar([\/\\])/, (m0, sp) => {
|
|
4
|
-
return
|
|
4
|
+
return `.asar.unpacked${sp}`;
|
|
5
5
|
});
|
|
6
6
|
|
|
7
|
-
require('child_process').spawnSync(path7za, process.argv.slice(2), {
|
|
7
|
+
require('node:child_process').spawnSync(path7za, process.argv.slice(2), {
|
|
8
8
|
stdio: 'inherit',
|
|
9
9
|
shell: false,
|
|
10
10
|
});
|
package/lib/cjs/inc/fork.cjs
CHANGED
|
@@ -6,11 +6,11 @@ exports.processPromise = processPromise;
|
|
|
6
6
|
exports.StatusCodeError = StatusCodeError;
|
|
7
7
|
exports.processQuitPromise = processQuitPromise;
|
|
8
8
|
const _7zip_bin_1 = require("7zip-bin");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
9
|
+
const node_child_process_1 = require("node:child_process");
|
|
10
|
+
const node_path_1 = require("node:path");
|
|
11
11
|
const outputStreams_js_1 = require("./outputStreams.cjs");
|
|
12
12
|
const path7za = _7zip_bin_1.path7za.replace(/\.asar([\/\\])/, (_m0, sp) => {
|
|
13
|
-
return
|
|
13
|
+
return `.asar.unpacked${sp}`;
|
|
14
14
|
});
|
|
15
15
|
const outputArgs = [
|
|
16
16
|
'-bso1', // standard output messages -> stdout
|
|
@@ -28,13 +28,13 @@ function hasQuit(cp) {
|
|
|
28
28
|
}
|
|
29
29
|
function spawnSfx(sfxFile, targetDir, extra = {}) {
|
|
30
30
|
const args = ['x', `-o${targetDir}`, '-y'];
|
|
31
|
-
const cwd = (0,
|
|
32
|
-
const file = (0,
|
|
31
|
+
const cwd = (0, node_path_1.dirname)(sfxFile);
|
|
32
|
+
const file = (0, node_path_1.basename)(sfxFile);
|
|
33
33
|
return {
|
|
34
34
|
commandline: [file, ...args],
|
|
35
35
|
cwd,
|
|
36
36
|
execute(handleData, handleStatus) {
|
|
37
|
-
const cp = (0,
|
|
37
|
+
const cp = (0, node_child_process_1.spawn)(file, args, {
|
|
38
38
|
...extra,
|
|
39
39
|
cwd,
|
|
40
40
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
@@ -66,7 +66,7 @@ function spawn7z(args, cli, extra = {}) {
|
|
|
66
66
|
commandline,
|
|
67
67
|
cwd: cwd.toString(),
|
|
68
68
|
execute(handleData, handleStatus) {
|
|
69
|
-
const cp = (0,
|
|
69
|
+
const cp = (0, node_child_process_1.spawn)(path7za, args, {
|
|
70
70
|
...extra,
|
|
71
71
|
stdio: [cli ? 'inherit' : 'ignore', 'pipe', 'pipe'],
|
|
72
72
|
cwd,
|
package/lib/cjs/inc/fork.cjs.map
CHANGED
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/inc/fork.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;AAiDA,4BA6BC;AAGD,0BA4BC;AAUD,wCAYC;AAUD,0CAkBC;AAED,gDAcC;AA/KD,wCAAsD;AACtD,
|
|
9
|
+
"mappings": ";;AAiDA,4BA6BC;AAGD,0BA4BC;AAUD,wCAYC;AAUD,0CAkBC;AAED,gDAcC;AA/KD,wCAAsD;AACtD,2DAAiF;AACjF,yCAA8C;AAC9C,0DAAsF;AAEtF,MAAM,OAAO,GAAG,mBAAe,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;IACrE,OAAO,iBAAiB,EAAE,EAAE,CAAC;AAC9B,CAAC,CAAC,CAAC;AAWH,MAAM,UAAU,GAAG;IAClB,OAAO,EAAE,qCAAqC;IAC9C,OAAO,EAAE,2BAA2B;IACpC,OAAO,EAAE,iCAAiC;CAC1C,CAAC;AAEF,SAAS,SAAS,CAAC,IAAc;IAChC,OAAO,UAAU,CAAC,MAAM,CACvB,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AAaD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEhC,SAAS,OAAO,CAAC,EAAgB;IAChC,OAAQ,EAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,QAAQ,CAAC,OAAe,EAAE,SAAiB,EAAE,QAA2B,EAAE;IACzF,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,KAAK,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAA,mBAAO,EAAC,OAAO,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,IAAA,oBAAQ,EAAC,OAAO,CAAC,CAAC;IAE/B,OAAO;QACN,WAAW,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;QAC5B,GAAG;QACH,OAAO,CAAC,UAA0B,EAAE,YAA6B;YAChE,MAAM,EAAE,GAAG,IAAA,0BAAK,EAAC,IAAI,EAAE,IAAI,EAAE;gBAC5B,GAAG,KAAK;gBACR,GAAG;gBACH,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;gBACjC,QAAQ,EAAE,KAAK;gBACf,WAAW,EAAE,IAAI;aACjB,CAAC,CAAC;YAEH,UAAU,CAAC,EAAE,CAAC,CAAC;YACf,IAAA,iCAAc,EAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAqB,EAAE,EAAE;gBACpE,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACxB,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACP,YAAY,CAAC,MAAM,CAAC,CAAC;gBACtB,CAAC;YACF,CAAC,CAAC,CAAC;YAEH,OAAO,EAAE,CAAC;QACX,CAAC;KACD,CAAC;AACH,CAAC;AAED,gBAAgB;AAChB,SAAgB,OAAO,CAAC,IAAc,EAAE,GAAY,EAAE,QAA2B,EAAE;IAClF,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAEvC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAEvB,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,OAAO;QACN,WAAW;QACX,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;QACnB,OAAO,CAAC,UAA0B,EAAE,YAA6B;YAChE,MAAM,EAAE,GAAG,IAAA,0BAAK,EAAC,OAAO,EAAE,IAAI,EAAE;gBAC/B,GAAG,KAAK;gBACR,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;gBACnD,GAAG;gBACH,QAAQ,EAAE,KAAK;gBACf,WAAW,EAAE,IAAI;aACjB,CAAC,CAAC;YACH,UAAU,CAAC,EAAE,CAAC,CAAC;YACf,IAAA,+BAAY,EAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YAC/C,IAAA,iCAAc,EAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAE1D,OAAO,EAAE,CAAC;QACX,CAAC;KACD,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,EAAgB;IACnC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;QACpB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;YACjB,CAAC,MAAM,CAAC,EAAE,IAAI;SACd,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAAC,EAAgB,EAAE,GAAa,EAAE,GAAW;IAC1E,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACzB,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE;YAChD,MAAM,CAAC,GAAG,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YAClD,IAAI,CAAC,EAAE,CAAC;gBACP,MAAM,CAAC,CAAC,CAAC,CAAC;YACX,CAAC;iBAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACX,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,IAA2B;IAC9C,OAAO,IAAI;SACT,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACnB,OAAO,cAAc,KAAK,OAAO,GAAG,EAAE,CAAC;IACxC,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AACd,CAAC;AAED,SAAgB,eAAe,CAAC,MAAc,EAAE,MAAc,EAAE,IAAY,EAAE,GAAa;IAC1F,IAAI,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;gBACrB,GAAG,CAAC,CAAC,CAAC;EACpB,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CACzB,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CACnB,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,2BAA2B,MAAM,GAAG,CAAC,CAAC,CAAC,2BAA2B,MAAM,GAAG,CAAC,EAC/F;QACC,MAAM;QACN,MAAM;QACN,cAAc,EAAE,IAAI;QACpB,SAAS;QACT,KAAK,EAAE,GAAG,CAAC,CAAC,CAAE;KACd,CACD,CAAC;AACH,CAAC;AAED,SAAgB,kBAAkB,CAAC,EAAgB;IAClD,IAAI,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;QACjB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC9B,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1B,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpB,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,OAAe,EAAE,EAAE;YAClD,YAAY,CAAC,EAAE,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACJ,CAAC"
|
|
10
10
|
}
|
package/lib/cjs/inc/handler.cjs
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.I7zHandler = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_events_1 = require("node:events");
|
|
5
5
|
const fork_js_1 = require("./fork.cjs");
|
|
6
6
|
/** @extern */
|
|
7
|
-
class I7zHandler extends
|
|
7
|
+
class I7zHandler extends node_events_1.EventEmitter {
|
|
8
8
|
toRun;
|
|
9
9
|
_promise;
|
|
10
10
|
_timer;
|
|
@@ -14,7 +14,7 @@ class I7zHandler extends events_1.EventEmitter {
|
|
|
14
14
|
super();
|
|
15
15
|
this.toRun = toRun;
|
|
16
16
|
this._timer = setImmediate(() => {
|
|
17
|
-
|
|
17
|
+
this._timer = undefined;
|
|
18
18
|
this._start();
|
|
19
19
|
});
|
|
20
20
|
}
|
|
@@ -39,16 +39,14 @@ class I7zHandler extends events_1.EventEmitter {
|
|
|
39
39
|
}
|
|
40
40
|
if (this._timer) {
|
|
41
41
|
clearImmediate(this._timer);
|
|
42
|
-
|
|
42
|
+
this._timer = undefined;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
async cancel() {
|
|
46
46
|
if (this._promise) {
|
|
47
47
|
return (0, fork_js_1.processQuitPromise)(this.cp);
|
|
48
48
|
}
|
|
49
|
-
|
|
50
|
-
return this.hold();
|
|
51
|
-
}
|
|
49
|
+
return this.hold();
|
|
52
50
|
}
|
|
53
51
|
get commandline() {
|
|
54
52
|
return this.toRun.commandline;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/inc/handler.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;;AACA,
|
|
9
|
+
"mappings": ";;;AACA,6CAA2C;AAC3C,wCAA4E;AAG5E,cAAc;AACd,MAAa,UAAW,SAAQ,0BAAY;IAMd;IALrB,QAAQ,CAAiB;IACzB,MAAM,CAAoB;IAC1B,EAAE,CAAgB;IAE1B,gBAAgB;IAChB,YAA6B,KAAa;QACzC,KAAK,EAAE,CAAC;QADoB,UAAK,GAAL,KAAK,CAAQ;QAGzC,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,GAAG,EAAE;YAC/B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,MAAM;QACb,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAC3B,CAAC,IAAI,EAAE,EAAE;YACR,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC3B,CAAC,EACD,CAAC,MAAM,EAAE,EAAE;YACV,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC/B,CAAC,CACD,CAAC;QAEF,IAAI,CAAC,QAAQ,GAAG,IAAA,wBAAc,EAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAIQ,EAAE,CAAC,KAAa,EAAE,EAA4B;QACtD,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI;QACH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACzB,CAAC;IACF,CAAC;IAED,KAAK,CAAC,MAAM;QACX,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,IAAA,4BAAkB,EAAC,IAAI,CAAC,EAAG,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,IAAW,WAAW;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;IAC/B,CAAC;IAED,IAAW,GAAG;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,OAAO;QACN,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE;YACrD,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;gBACxB,MAAM,CAAC,CAAC;YACT,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;CACD;AAzED,gCAyEC"
|
|
10
10
|
}
|
|
@@ -4,11 +4,11 @@ exports.LoggerStream = void 0;
|
|
|
4
4
|
exports.handleOutput = handleOutput;
|
|
5
5
|
exports.handleProgress = handleProgress;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
7
|
+
const node_os_1 = require("node:os");
|
|
8
|
+
const node_stream_1 = require("node:stream");
|
|
9
9
|
const iconv_lite_1 = require("iconv-lite");
|
|
10
10
|
const split2_1 = tslib_1.__importDefault(require("split2"));
|
|
11
|
-
const isWin = (0,
|
|
11
|
+
const isWin = (0, node_os_1.platform)() === 'win32';
|
|
12
12
|
/**aaa*/
|
|
13
13
|
function transformOutputEncode(source) {
|
|
14
14
|
return isWin ? source.pipe((0, iconv_lite_1.decodeStream)('936')) : source;
|
|
@@ -18,7 +18,7 @@ function transformOutputEncode(source) {
|
|
|
18
18
|
* @xxx
|
|
19
19
|
* bbb
|
|
20
20
|
**/
|
|
21
|
-
class BackspaceNewlineStream extends
|
|
21
|
+
class BackspaceNewlineStream extends node_stream_1.Transform {
|
|
22
22
|
_transform(chunk, _encoding, callback) {
|
|
23
23
|
const str = chunk
|
|
24
24
|
.toString('utf8')
|
|
@@ -28,7 +28,7 @@ class BackspaceNewlineStream extends stream_1.Transform {
|
|
|
28
28
|
callback();
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
class FilterStream extends
|
|
31
|
+
class FilterStream extends node_stream_1.Transform {
|
|
32
32
|
constructor() {
|
|
33
33
|
super({ objectMode: true });
|
|
34
34
|
}
|
|
@@ -44,7 +44,7 @@ class FilterStream extends stream_1.Transform {
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
const matchExp = /^(\d+[%M])(?: - )?(.*)$/;
|
|
47
|
-
class ProgressStream extends
|
|
47
|
+
class ProgressStream extends node_stream_1.Transform {
|
|
48
48
|
message;
|
|
49
49
|
constructor(message) {
|
|
50
50
|
super({ objectMode: true });
|
|
@@ -53,8 +53,8 @@ class ProgressStream extends stream_1.Transform {
|
|
|
53
53
|
_transform(chunk, _encoding, callback) {
|
|
54
54
|
const match = matchExp.exec(chunk);
|
|
55
55
|
if (match) {
|
|
56
|
-
const percent = parseInt(match[1]);
|
|
57
|
-
if (!isNaN(percent)) {
|
|
56
|
+
const percent = Number.parseInt(match[1]);
|
|
57
|
+
if (!Number.isNaN(percent)) {
|
|
58
58
|
this.push({
|
|
59
59
|
progress: percent,
|
|
60
60
|
message: match[2] || '',
|
|
@@ -80,7 +80,7 @@ function handleProgress(stream, message) {
|
|
|
80
80
|
.pipe(new FilterStream())
|
|
81
81
|
.pipe(new ProgressStream(message));
|
|
82
82
|
}
|
|
83
|
-
class LoggerStream extends
|
|
83
|
+
class LoggerStream extends node_stream_1.Transform {
|
|
84
84
|
pp;
|
|
85
85
|
constructor(pp) {
|
|
86
86
|
super({ objectMode: true });
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/inc/outputStreams.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;;AA8EA,oCAEC;AAED,wCAMC;;AAxFD,
|
|
9
|
+
"mappings": ";;;AA8EA,oCAEC;AAED,wCAMC;;AAxFD,qCAAmC;AACnC,6CAAwC;AACxC,2CAA0C;AAC1C,4DAA4B;AAE5B,MAAM,KAAK,GAAG,IAAA,kBAAQ,GAAE,KAAK,OAAO,CAAC;AACrC,QAAQ;AACR,SAAS,qBAAqB,CAAC,MAA6B;IAC3D,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAY,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AAC1D,CAAC;AAED;;;;IAII;AACJ,MAAM,sBAAuB,SAAQ,uBAAS;IACpC,UAAU,CAAC,KAAa,EAAE,SAAyB,EAAE,QAAkB;QAC/E,MAAM,GAAG,GAAG,KAAK;aACf,QAAQ,CAAC,MAAM,CAAC;aAChB,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC;aAC7B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvB,QAAQ,EAAE,CAAC;IACZ,CAAC;CACD;AAED,MAAM,YAAa,SAAQ,uBAAS;IACnC;QACC,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7B,CAAC;IAEQ,UAAU,CAAC,KAAsB,EAAE,QAAwB,EAAE,QAAkB;QACvF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QACD,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC;QACD,QAAQ,EAAE,CAAC;IACZ,CAAC;CACD;AAED,MAAM,QAAQ,GAAG,yBAAyB,CAAC;AAS3C,MAAM,cAAe,SAAQ,uBAAS;IACR;IAA7B,YAA6B,OAAgB;QAC5C,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QADA,YAAO,GAAP,OAAO,CAAS;IAE7C,CAAC;IAEQ,UAAU,CAAC,KAAa,EAAE,SAAyB,EAAE,QAAkB;QAC/E,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,KAAK,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,IAAI,CAAC;oBACT,QAAQ,EAAE,OAAO;oBACjB,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;iBACN,CAAC,CAAC;YACrB,CAAC;QACF,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC;gBACT,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,KAAK;aACG,CAAC,CAAC;QACrB,CAAC;QACD,QAAQ,EAAE,CAAC;IACZ,CAAC;CACD;AAED,SAAgB,YAAY,CAAC,MAA6B;IACzD,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAA,gBAAM,GAAE,CAAC,CAAC,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,SAAgB,cAAc,CAAC,MAA6B,EAAE,OAAgB;IAC7E,OAAO,qBAAqB,CAAC,MAAM,CAAC;SAClC,IAAI,CAAC,IAAI,sBAAsB,EAAE,CAAC;SAClC,IAAI,CAAC,IAAA,gBAAM,GAAE,CAAC;SACd,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC;SACxB,IAAI,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,MAAa,YAAa,SAAQ,uBAAS;IACtB;IAApB,YAAoB,EAAU;QAC7B,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QADT,OAAE,GAAF,EAAE,CAAQ;IAE9B,CAAC;IAEQ,UAAU,CAAC,KAAa,EAAE,QAAwB,EAAE,QAAkB;QAC9E,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC3B,QAAQ,EAAE,CAAC;IACZ,CAAC;CACD;AAVD,oCAUC"
|
|
10
10
|
}
|
package/lib/esm/inc/fork.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ChildProcess, SpawnOptions } from 'child_process';
|
|
2
|
-
import { IStatusReport } from './outputStreams.js';
|
|
1
|
+
import { type ChildProcess, type SpawnOptions } from 'node:child_process';
|
|
2
|
+
import { type IStatusReport } from './outputStreams.js';
|
|
3
3
|
/** @extern */
|
|
4
4
|
export interface ProgramError extends Error {
|
|
5
5
|
__cwd: string;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/inc/fork.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AACA,OAAO,EAAE,YAAY,EAAS,YAAY,EAAE,MAAM,
|
|
9
|
+
"mappings": "AACA,OAAO,EAAE,KAAK,YAAY,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEjF,OAAO,EAAgC,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMtF,cAAc;AACd,MAAM,WAAW,YAAa,SAAQ,KAAK;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CACf;AAgBD,cAAc;AACd,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC,CAAC;AAC5F,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AACpD,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;AAE9D,MAAM,WAAW,MAAM;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,GAAG,YAAY,CAAC;CACjF;AAQD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,GAAE,iBAAsB,GAAG,MAAM,CA6BlG;AAED,gBAAgB;AAChB,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,iBAAsB,GAAG,MAAM,CA4B3F;AAUD,wBAAgB,cAAc,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,iBAY1E;AAUD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,YAAY,GAAG,IAAI,CAkBhH;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAclE"
|
|
10
10
|
}
|
package/lib/esm/inc/fork.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import _7zip_bin_0 from '7zip-bin';
|
|
2
2
|
const { path7za: originalPath7za } = _7zip_bin_0;
|
|
3
|
-
import { spawn } from 'child_process';
|
|
4
|
-
import { basename, dirname } from 'path';
|
|
3
|
+
import { spawn } from 'node:child_process';
|
|
4
|
+
import { basename, dirname } from 'node:path';
|
|
5
5
|
import { handleOutput, handleProgress } from './outputStreams.js';
|
|
6
6
|
const path7za = originalPath7za.replace(/\.asar([\/\\])/, (_m0, sp) => {
|
|
7
|
-
return
|
|
7
|
+
return `.asar.unpacked${sp}`;
|
|
8
8
|
});
|
|
9
9
|
const outputArgs = [
|
|
10
10
|
'-bso1', // standard output messages -> stdout
|
package/lib/esm/inc/fork.js.map
CHANGED
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/inc/fork.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "wBAA2C,UAAU;QAA5C,OAAO;AAChB,OAAO,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
package/lib/esm/inc/handler.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { EventEmitter } from 'events';
|
|
2
|
-
import { IToRun } from './fork.js';
|
|
3
|
-
import { IStatusReport } from './outputStreams.js';
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
2
|
+
import { type IToRun } from './fork.js';
|
|
3
|
+
import type { IStatusReport } from './outputStreams.js';
|
|
4
4
|
/** @extern */
|
|
5
5
|
export declare class I7zHandler extends EventEmitter {
|
|
6
6
|
private readonly toRun;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/inc/handler.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AACA,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
9
|
+
"mappings": "AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,KAAK,MAAM,EAAsC,MAAM,WAAW,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,cAAc;AACd,qBAAa,UAAW,SAAQ,YAAY;IAM/B,OAAO,CAAC,QAAQ,CAAC,KAAK;IALlC,OAAO,CAAC,QAAQ,CAAC,CAAgB;IACjC,OAAO,CAAC,MAAM,CAAC,CAAmB;IAClC,OAAO,CAAC,EAAE,CAAC,CAAe;IAE1B,gBAAgB;gBACa,KAAK,EAAE,MAAM;IAS1C,OAAO,CAAC,MAAM;IAiBL,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,IAAI,GAAG,IAAI;IAClE,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAK9D,IAAI;IAUE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAO7B,IAAW,WAAW,aAErB;IAED,IAAW,GAAG,WAEb;IAED,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAUxB"
|
|
10
10
|
}
|
package/lib/esm/inc/handler.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EventEmitter } from 'events';
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
2
2
|
import { processPromise, processQuitPromise } from './fork.js';
|
|
3
3
|
/** @extern */
|
|
4
4
|
export class I7zHandler extends EventEmitter {
|
|
@@ -11,7 +11,7 @@ export class I7zHandler extends EventEmitter {
|
|
|
11
11
|
super();
|
|
12
12
|
this.toRun = toRun;
|
|
13
13
|
this._timer = setImmediate(() => {
|
|
14
|
-
|
|
14
|
+
this._timer = undefined;
|
|
15
15
|
this._start();
|
|
16
16
|
});
|
|
17
17
|
}
|
|
@@ -36,16 +36,14 @@ export class I7zHandler extends EventEmitter {
|
|
|
36
36
|
}
|
|
37
37
|
if (this._timer) {
|
|
38
38
|
clearImmediate(this._timer);
|
|
39
|
-
|
|
39
|
+
this._timer = undefined;
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
async cancel() {
|
|
43
43
|
if (this._promise) {
|
|
44
44
|
return processQuitPromise(this.cp);
|
|
45
45
|
}
|
|
46
|
-
|
|
47
|
-
return this.hold();
|
|
48
|
-
}
|
|
46
|
+
return this.hold();
|
|
49
47
|
}
|
|
50
48
|
get commandline() {
|
|
51
49
|
return this.toRun.commandline;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/inc/handler.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AACA,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
9
|
+
"mappings": "AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAe,cAAc,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAG5E,cAAc;AACd,MAAM,OAAO,UAAW,SAAQ,YAAY;IAMd;IALrB,QAAQ,CAAiB;IACzB,MAAM,CAAoB;IAC1B,EAAE,CAAgB;IAE1B,gBAAgB;IAChB,YAA6B,KAAa;QACzC,KAAK,EAAE,CAAC;QADoB,UAAK,GAAL,KAAK,CAAQ;QAGzC,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,GAAG,EAAE;YAC/B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,MAAM;QACb,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAC3B,CAAC,IAAI,EAAE,EAAE;YACR,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC3B,CAAC,EACD,CAAC,MAAM,EAAE,EAAE;YACV,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC/B,CAAC,CACD,CAAC;QAEF,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAIQ,EAAE,CAAC,KAAa,EAAE,EAA4B;QACtD,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI;QACH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACzB,CAAC;IACF,CAAC;IAED,KAAK,CAAC,MAAM;QACX,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,kBAAkB,CAAC,IAAI,CAAC,EAAG,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,IAAW,WAAW;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;IAC/B,CAAC;IAED,IAAW,GAAG;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,OAAO;QACN,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE;YACrD,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;gBACxB,MAAM,CAAC,CAAC;YACT,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;CACD"
|
|
10
10
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/inc/outputStreams.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AACA,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
9
|
+
"mappings": "AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA0BxC,cAAM,YAAa,SAAQ,SAAS;;IAK1B,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAU/F;AAID,cAAc;AACd,MAAM,WAAW,aAAa;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,cAAM,cAAe,SAAQ,SAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,OAAO;IAIpC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAkBvF;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,gBAEzD;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,OAAO,EAAE,OAAO,kBAM7E;AAED,qBAAa,YAAa,SAAQ,SAAS;IAC9B,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,MAAM;IAIrB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAKtF"
|
|
10
10
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { platform } from 'os';
|
|
2
|
-
import { Transform } from 'stream';
|
|
3
|
-
import
|
|
4
|
-
const { decodeStream } =
|
|
1
|
+
import { platform } from 'node:os';
|
|
2
|
+
import { Transform } from 'node:stream';
|
|
3
|
+
import _iconv_lite_77 from 'iconv-lite';
|
|
4
|
+
const { decodeStream } = _iconv_lite_77;
|
|
5
5
|
import split2 from 'split2';
|
|
6
6
|
const isWin = platform() === 'win32';
|
|
7
7
|
/**aaa*/
|
|
@@ -48,8 +48,8 @@ class ProgressStream extends Transform {
|
|
|
48
48
|
_transform(chunk, _encoding, callback) {
|
|
49
49
|
const match = matchExp.exec(chunk);
|
|
50
50
|
if (match) {
|
|
51
|
-
const percent = parseInt(match[1]);
|
|
52
|
-
if (!isNaN(percent)) {
|
|
51
|
+
const percent = Number.parseInt(match[1]);
|
|
52
|
+
if (!Number.isNaN(percent)) {
|
|
53
53
|
this.push({
|
|
54
54
|
progress: percent,
|
|
55
55
|
message: match[2] || '',
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/inc/outputStreams.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "7zip-bin-wrapper",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.39",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "GongT <gongteng524702837@gmail.com>",
|
|
7
7
|
"main": "./lib/cjs/__create_index.generated.cjs",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@rushstack/heft": "^0.68.2",
|
|
30
30
|
"@types/node": "^22.8.6",
|
|
31
31
|
"@types/split2": "^4.2.3",
|
|
32
|
-
"@build-script/single-dog-asset": "^1.0.
|
|
32
|
+
"@build-script/single-dog-asset": "^1.0.34",
|
|
33
33
|
"@internal/local-rig": "^1.0.1"
|
|
34
34
|
},
|
|
35
35
|
"scripts": {
|
package/src/inc/fork.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { path7za as originalPath7za } from '7zip-bin';
|
|
2
|
-
import { ChildProcess, spawn, SpawnOptions } from 'child_process';
|
|
3
|
-
import { basename, dirname } from 'path';
|
|
4
|
-
import { handleOutput, handleProgress, IStatusReport } from './outputStreams.js';
|
|
2
|
+
import { type ChildProcess, spawn, type SpawnOptions } from 'node:child_process';
|
|
3
|
+
import { basename, dirname } from 'node:path';
|
|
4
|
+
import { handleOutput, handleProgress, type IStatusReport } from './outputStreams.js';
|
|
5
5
|
|
|
6
6
|
const path7za = originalPath7za.replace(/\.asar([\/\\])/, (_m0, sp) => {
|
|
7
|
-
return
|
|
7
|
+
return `.asar.unpacked${sp}`;
|
|
8
8
|
});
|
|
9
9
|
|
|
10
10
|
/** @extern */
|
package/src/inc/handler.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { ChildProcess } from 'child_process';
|
|
2
|
-
import { EventEmitter } from 'events';
|
|
3
|
-
import { IToRun, processPromise, processQuitPromise } from './fork.js';
|
|
4
|
-
import { IStatusReport } from './outputStreams.js';
|
|
1
|
+
import type { ChildProcess } from 'node:child_process';
|
|
2
|
+
import { EventEmitter } from 'node:events';
|
|
3
|
+
import { type IToRun, processPromise, processQuitPromise } from './fork.js';
|
|
4
|
+
import type { IStatusReport } from './outputStreams.js';
|
|
5
5
|
|
|
6
6
|
/** @extern */
|
|
7
7
|
export class I7zHandler extends EventEmitter {
|
|
@@ -14,7 +14,7 @@ export class I7zHandler extends EventEmitter {
|
|
|
14
14
|
super();
|
|
15
15
|
|
|
16
16
|
this._timer = setImmediate(() => {
|
|
17
|
-
|
|
17
|
+
this._timer = undefined;
|
|
18
18
|
this._start();
|
|
19
19
|
});
|
|
20
20
|
}
|
|
@@ -48,16 +48,15 @@ export class I7zHandler extends EventEmitter {
|
|
|
48
48
|
}
|
|
49
49
|
if (this._timer) {
|
|
50
50
|
clearImmediate(this._timer);
|
|
51
|
-
|
|
51
|
+
this._timer = undefined;
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
async cancel(): Promise<void> {
|
|
56
56
|
if (this._promise) {
|
|
57
57
|
return processQuitPromise(this.cp!);
|
|
58
|
-
} else {
|
|
59
|
-
return this.hold();
|
|
60
58
|
}
|
|
59
|
+
return this.hold();
|
|
61
60
|
}
|
|
62
61
|
|
|
63
62
|
public get commandline() {
|
package/src/inc/outputStreams.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { platform } from 'os';
|
|
2
|
-
import { Transform } from 'stream';
|
|
1
|
+
import { platform } from 'node:os';
|
|
2
|
+
import { Transform } from 'node:stream';
|
|
3
3
|
import { decodeStream } from 'iconv-lite';
|
|
4
4
|
import split2 from 'split2';
|
|
5
5
|
|
|
@@ -59,8 +59,8 @@ class ProgressStream extends Transform {
|
|
|
59
59
|
override _transform(chunk: string, _encoding: BufferEncoding, callback: Function): void {
|
|
60
60
|
const match = matchExp.exec(chunk);
|
|
61
61
|
if (match) {
|
|
62
|
-
const percent = parseInt(match[1]!);
|
|
63
|
-
if (!isNaN(percent)) {
|
|
62
|
+
const percent = Number.parseInt(match[1]!);
|
|
63
|
+
if (!Number.isNaN(percent)) {
|
|
64
64
|
this.push({
|
|
65
65
|
progress: percent,
|
|
66
66
|
message: match[2] || '',
|
package/src/tsconfig.json
CHANGED