7zip-bin-wrapper 1.0.21 → 1.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_export_all_in_one_index.cjs.map +10 -1
- package/dist/inc/fork.cjs +7 -7
- package/dist/inc/fork.cjs.map +10 -1
- package/dist/inc/handler.cjs +2 -2
- package/dist/inc/handler.cjs.map +10 -1
- package/dist/inc/outputStreams.cjs +4 -4
- package/dist/inc/outputStreams.cjs.map +10 -1
- package/dist/index.cjs +2 -2
- package/dist/index.cjs.map +10 -1
- package/docs/package-public.d.ts +101 -101
- package/package.json +12 -13
- package/src/inc/fork.ts +0 -176
- package/src/inc/handler.ts +0 -81
- package/src/inc/outputStreams.ts +0 -101
- package/src/index.ts +0 -54
- package/src/tsconfig.json +0 -13
|
@@ -1 +1,10 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"file": "_export_all_in_one_index.cjs",
|
|
4
|
+
"sourceRoot": "",
|
|
5
|
+
"sources": [
|
|
6
|
+
"../source/_export_all_in_one_index.ts"
|
|
7
|
+
],
|
|
8
|
+
"names": [],
|
|
9
|
+
"mappings": ";;;AAAA,6DAA+F;AAAvE,iHAAA,YAAY,OAAA;AAAE,mHAAA,cAAc,OAAA;AAAE,iHAAA,YAAY,OAAA;AAClE,2CAAoK;AAAjF,oGAAA,QAAQ,OAAA;AAAE,0GAAA,cAAc,OAAA;AAAE,2GAAA,eAAe,OAAA;AAAE,8GAAA,kBAAkB,OAAA;AAChJ,iDAA0C;AAAjC,yGAAA,UAAU,OAAA;AACnB,yCAA8E;AAArE,uGAAA,UAAU,OAAA;AAAE,qGAAA,QAAQ,OAAA;AAAE,wGAAA,WAAW,OAAA;AAAE,oGAAA,OAAO,OAAA;AAAE,qGAAA,QAAQ,OAAA"
|
|
10
|
+
}
|
package/dist/inc/fork.cjs
CHANGED
|
@@ -24,13 +24,13 @@ function hasQuit(cp) {
|
|
|
24
24
|
}
|
|
25
25
|
function spawnSfx(sfxFile, targetDir, extra = {}) {
|
|
26
26
|
const args = ['x', `-o${targetDir}`, '-y'];
|
|
27
|
-
const cwd = path_1.dirname(sfxFile);
|
|
28
|
-
const file = path_1.basename(sfxFile);
|
|
27
|
+
const cwd = (0, path_1.dirname)(sfxFile);
|
|
28
|
+
const file = (0, path_1.basename)(sfxFile);
|
|
29
29
|
return {
|
|
30
30
|
commandline: [file, ...args],
|
|
31
31
|
cwd,
|
|
32
32
|
execute(handleData, handleStatus) {
|
|
33
|
-
const cp = child_process_1.spawn(file, args, {
|
|
33
|
+
const cp = (0, child_process_1.spawn)(file, args, {
|
|
34
34
|
...extra,
|
|
35
35
|
cwd,
|
|
36
36
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
@@ -38,7 +38,7 @@ function spawnSfx(sfxFile, targetDir, extra = {}) {
|
|
|
38
38
|
windowsHide: true,
|
|
39
39
|
});
|
|
40
40
|
handleQuit(cp);
|
|
41
|
-
outputStreams_cjs_1.handleProgress(cp.stdout, true).on('data', (status) => {
|
|
41
|
+
(0, outputStreams_cjs_1.handleProgress)(cp.stdout, true).on('data', (status) => {
|
|
42
42
|
if (status.messageOnly) {
|
|
43
43
|
handleData(status.message);
|
|
44
44
|
}
|
|
@@ -63,7 +63,7 @@ function spawn7z(args, cli, extra = {}) {
|
|
|
63
63
|
commandline,
|
|
64
64
|
cwd: cwd.toString(),
|
|
65
65
|
execute(handleData, handleStatus) {
|
|
66
|
-
const cp = child_process_1.spawn(path7za, args, {
|
|
66
|
+
const cp = (0, child_process_1.spawn)(path7za, args, {
|
|
67
67
|
...extra,
|
|
68
68
|
stdio: [cli ? 'inherit' : 'ignore', 'pipe', 'pipe'],
|
|
69
69
|
cwd,
|
|
@@ -71,8 +71,8 @@ function spawn7z(args, cli, extra = {}) {
|
|
|
71
71
|
windowsHide: true,
|
|
72
72
|
});
|
|
73
73
|
handleQuit(cp);
|
|
74
|
-
outputStreams_cjs_1.handleOutput(cp.stdout).on('data', handleData);
|
|
75
|
-
outputStreams_cjs_1.handleProgress(cp.stderr, false).on('data', handleStatus);
|
|
74
|
+
(0, outputStreams_cjs_1.handleOutput)(cp.stdout).on('data', handleData);
|
|
75
|
+
(0, outputStreams_cjs_1.handleProgress)(cp.stderr, false).on('data', handleStatus);
|
|
76
76
|
return cp;
|
|
77
77
|
},
|
|
78
78
|
};
|
package/dist/inc/fork.cjs.map
CHANGED
|
@@ -1 +1,10 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"file": "fork.cjs",
|
|
4
|
+
"sourceRoot": "",
|
|
5
|
+
"sources": [
|
|
6
|
+
"../../src/inc/fork.ts"
|
|
7
|
+
],
|
|
8
|
+
"names": [],
|
|
9
|
+
"mappings": "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"
|
|
10
|
+
}
|
package/dist/inc/handler.cjs
CHANGED
|
@@ -47,7 +47,7 @@ class I7zHandler extends events_1.EventEmitter {
|
|
|
47
47
|
}, (status) => {
|
|
48
48
|
this.emit('progress', status);
|
|
49
49
|
});
|
|
50
|
-
this._promise = fork_cjs_1.processPromise(this.cp, this.commandline, this.cwd).catch((e) => e);
|
|
50
|
+
this._promise = (0, fork_cjs_1.processPromise)(this.cp, this.commandline, this.cwd).catch((e) => e);
|
|
51
51
|
}
|
|
52
52
|
on(event, cb) {
|
|
53
53
|
return super.on(event, cb);
|
|
@@ -63,7 +63,7 @@ class I7zHandler extends events_1.EventEmitter {
|
|
|
63
63
|
}
|
|
64
64
|
async cancel() {
|
|
65
65
|
if (this._promise) {
|
|
66
|
-
return fork_cjs_1.processQuitPromise(this.cp);
|
|
66
|
+
return (0, fork_cjs_1.processQuitPromise)(this.cp);
|
|
67
67
|
}
|
|
68
68
|
else {
|
|
69
69
|
return this.hold();
|
package/dist/inc/handler.cjs.map
CHANGED
|
@@ -1 +1,10 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"file": "handler.cjs",
|
|
4
|
+
"sourceRoot": "",
|
|
5
|
+
"sources": [
|
|
6
|
+
"../../src/inc/handler.ts"
|
|
7
|
+
],
|
|
8
|
+
"names": [],
|
|
9
|
+
"mappings": ";;;AACA,mCAAsC;AACtC,yCAAoE;AAGpE,cAAc;AACd,MAAa,UAAW,SAAQ,qBAAY;IAK3C,gBAAgB;IAChB,YAA6B,KAAa;QACzC,KAAK,EAAE,CAAC;;;;;mBADoB;;QAL7B;;;;;WAAiC;QACjC;;;;;WAAkC;QAClC;;;;;WAA0B;QAMzB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,GAAG,EAAE;YAC/B,OAAO,IAAI,CAAC,MAAM,CAAC;YACnB,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,MAAM;QACb,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO;SACP;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,yBAAc,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;IAID,EAAE,CAAC,KAAa,EAAE,EAA4B;QAC7C,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI;QACH,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;SAC1F;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5B,OAAO,IAAI,CAAC,MAAM,CAAC;SACnB;IACF,CAAC;IAED,KAAK,CAAC,MAAM;QACX,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO,IAAA,6BAAkB,EAAC,IAAI,CAAC,EAAG,CAAC,CAAC;SACpC;aAAM;YACN,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;SACnB;IACF,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;YACnB,IAAI,CAAC,MAAM,EAAE,CAAC;SACd;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE;YACrD,IAAI,CAAC,YAAY,KAAK,EAAE;gBACvB,MAAM,CAAC,CAAC;aACR;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;CACD;AA1ED,gCA0EC"
|
|
10
|
+
}
|
|
@@ -6,10 +6,10 @@ const stream_1 = require("stream");
|
|
|
6
6
|
const iconv_lite_1 = require("iconv-lite");
|
|
7
7
|
const os_1 = require("os");
|
|
8
8
|
const split2_1 = tslib_1.__importDefault(require("split2"));
|
|
9
|
-
const isWin = os_1.platform() === 'win32';
|
|
9
|
+
const isWin = (0, os_1.platform)() === 'win32';
|
|
10
10
|
/**aaa*/
|
|
11
11
|
function transformOutputEncode(source) {
|
|
12
|
-
return isWin ? source.pipe(iconv_lite_1.decodeStream('936')) : source;
|
|
12
|
+
return isWin ? source.pipe((0, iconv_lite_1.decodeStream)('936')) : source;
|
|
13
13
|
}
|
|
14
14
|
/**
|
|
15
15
|
* aaaaa
|
|
@@ -73,13 +73,13 @@ class ProgressStream extends stream_1.Transform {
|
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
function handleOutput(stream) {
|
|
76
|
-
return transformOutputEncode(stream).pipe(split2_1.default()).pipe(new FilterStream());
|
|
76
|
+
return transformOutputEncode(stream).pipe((0, split2_1.default)()).pipe(new FilterStream());
|
|
77
77
|
}
|
|
78
78
|
exports.handleOutput = handleOutput;
|
|
79
79
|
function handleProgress(stream, message) {
|
|
80
80
|
return transformOutputEncode(stream)
|
|
81
81
|
.pipe(new BackspaceNewlineStream())
|
|
82
|
-
.pipe(split2_1.default())
|
|
82
|
+
.pipe((0, split2_1.default)())
|
|
83
83
|
.pipe(new FilterStream())
|
|
84
84
|
.pipe(new ProgressStream(message));
|
|
85
85
|
}
|
|
@@ -1 +1,10 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"file": "outputStreams.cjs",
|
|
4
|
+
"sourceRoot": "",
|
|
5
|
+
"sources": [
|
|
6
|
+
"../../src/inc/outputStreams.ts"
|
|
7
|
+
],
|
|
8
|
+
"names": [],
|
|
9
|
+
"mappings": "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"
|
|
10
|
+
}
|
package/dist/index.cjs
CHANGED
|
@@ -5,14 +5,14 @@ const fork_cjs_1 = require("./inc/fork.cjs");
|
|
|
5
5
|
const handler_cjs_1 = require("./inc/handler.cjs");
|
|
6
6
|
/** @extern */
|
|
7
7
|
function extractSfx(sfxFile, targetDir, extraSpawn) {
|
|
8
|
-
return new handler_cjs_1.I7zHandler(fork_cjs_1.spawnSfx(sfxFile, targetDir, extraSpawn));
|
|
8
|
+
return new handler_cjs_1.I7zHandler((0, fork_cjs_1.spawnSfx)(sfxFile, targetDir, extraSpawn));
|
|
9
9
|
}
|
|
10
10
|
exports.extractSfx = extractSfx;
|
|
11
11
|
/**
|
|
12
12
|
* Wow such doge
|
|
13
13
|
*/
|
|
14
14
|
function _7Zip(cli, args, ex) {
|
|
15
|
-
return new handler_cjs_1.I7zHandler(fork_cjs_1.spawn7z(args, cli, ex));
|
|
15
|
+
return new handler_cjs_1.I7zHandler((0, fork_cjs_1.spawn7z)(args, cli, ex));
|
|
16
16
|
}
|
|
17
17
|
function sevenZip(...args) {
|
|
18
18
|
let ex = undefined;
|
package/dist/index.cjs.map
CHANGED
|
@@ -1 +1,10 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"file": "index.cjs",
|
|
4
|
+
"sourceRoot": "",
|
|
5
|
+
"sources": [
|
|
6
|
+
"../src/index.ts"
|
|
7
|
+
],
|
|
8
|
+
"names": [],
|
|
9
|
+
"mappings": ";;;AAAA,6CAAkE;AAClE,mDAA2C;AAE3C,cAAc;AACd,SAAgB,UAAU,CAAC,OAAe,EAAE,SAAiB,EAAE,UAA8B;IAC5F,OAAO,IAAI,wBAAU,CAAC,IAAA,mBAAQ,EAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,gCAEC;AAED;;GAEG;AACH,SAAS,KAAK,CAAC,GAAY,EAAE,IAAc,EAAE,EAAsB;IAClE,OAAO,IAAI,wBAAU,CAAC,IAAA,kBAAO,EAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/C,CAAC;AAKD,SAAgB,QAAQ,CAAC,GAAG,IAAW;IACtC,IAAI,EAAE,GAAG,SAAS,CAAC;IACnB,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;QAChC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;KAClB;IACD,OAAO,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;AAC/B,CAAC;AAND,4BAMC;AAKD,SAAgB,WAAW,CAAC,GAAG,IAAW;IACzC,IAAI,EAAE,GAAG,SAAS,CAAC;IACnB,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;QAChC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;KAClB;IACD,OAAO,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AAND,kCAMC;AAED,cAAc;AACd,SAAgB,OAAO,CAAC,OAAe,EAAE,SAAiB;IACzD,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;AAC7D,CAAC;AAFD,0BAEC;AAED,MAAM,cAAc,GAAG;IACtB,IAAI;IACJ,QAAQ;IACR,MAAM;IACN,MAAM;IACN,MAAM,EAAE,sBAAsB;CAC9B,CAAC;AAEF,cAAc;AACd,SAAgB,QAAQ,CAAC,OAAe,EAAE,SAAiB,EAAE,GAAG,WAAqB;IACpF,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;AACnF,CAAC;AAFD,4BAEC"
|
|
10
|
+
}
|
package/docs/package-public.d.ts
CHANGED
|
@@ -1,101 +1,101 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
|
|
3
|
-
import { ChildProcess } from 'child_process';
|
|
4
|
-
import { EventEmitter } from 'events';
|
|
5
|
-
import { SpawnOptions } from 'child_process';
|
|
6
|
-
import { Transform } from 'stream';
|
|
7
|
-
|
|
8
|
-
/** @extern */
|
|
9
|
-
export declare function compress(zipFile: string, sourceDir: string, ...extraSource: string[]): I7zHandler;
|
|
10
|
-
|
|
11
|
-
/** @extern */
|
|
12
|
-
export declare function extract(zipFile: string, targetDir: string): I7zHandler;
|
|
13
|
-
|
|
14
|
-
/** @extern */
|
|
15
|
-
export declare function extractSfx(sfxFile: string, targetDir: string, extraSpawn?: ExtraSpawnOptions): I7zHandler;
|
|
16
|
-
|
|
17
|
-
/** @extern */
|
|
18
|
-
export declare type ExtraSpawnOptions = Pick<SpawnOptions, 'cwd' | 'env' | 'uid' | 'gid' | 'shell'>;
|
|
19
|
-
|
|
20
|
-
declare class FilterStream extends Transform {
|
|
21
|
-
constructor();
|
|
22
|
-
_transform(chunk: Buffer | string, encoding: BufferEncoding, callback: Function): void;
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
export declare function handleOutput(stream: NodeJS.ReadableStream): FilterStream;
|
|
26
|
-
|
|
27
|
-
export declare function handleProgress(stream: NodeJS.ReadableStream, message: boolean): ProgressStream;
|
|
28
|
-
|
|
29
|
-
/** @extern */
|
|
30
|
-
export declare class I7zHandler extends EventEmitter {
|
|
31
|
-
private readonly toRun;
|
|
32
|
-
private _promise?;
|
|
33
|
-
private _timer?;
|
|
34
|
-
private cp?;
|
|
35
|
-
private _start;
|
|
36
|
-
on(event: 'progress', cb: (progress: IStatusReport) => void): this;
|
|
37
|
-
on(event: 'output', cb: (data: string) => void): this;
|
|
38
|
-
hold(): void;
|
|
39
|
-
cancel(): Promise<void>;
|
|
40
|
-
get commandline(): string[];
|
|
41
|
-
get cwd(): string;
|
|
42
|
-
promise(): Promise<void>;
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
/** @extern */
|
|
46
|
-
export declare interface IStatusReport {
|
|
47
|
-
messageOnly?: boolean;
|
|
48
|
-
progress: number;
|
|
49
|
-
message: string;
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
export declare interface IToRun {
|
|
53
|
-
commandline: string[];
|
|
54
|
-
cwd: string;
|
|
55
|
-
execute(handleData: MessageHandler, handleStatus: ProgressHandler): ChildProcess;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
export declare class LoggerStream extends Transform {
|
|
59
|
-
private pp;
|
|
60
|
-
constructor(pp: string);
|
|
61
|
-
_transform(chunk: string, encoding: BufferEncoding, callback: Function): void;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
export declare type MessageHandler = (data: string) => void;
|
|
65
|
-
|
|
66
|
-
export declare function processPromise(cp: ChildProcess, cmd: string[], cwd: string): Promise<void>;
|
|
67
|
-
|
|
68
|
-
export declare function processQuitPromise(cp: ChildProcess): Promise<void>;
|
|
69
|
-
|
|
70
|
-
/** @extern */
|
|
71
|
-
export declare interface ProgramError extends Error {
|
|
72
|
-
__cwd: string;
|
|
73
|
-
__program: string;
|
|
74
|
-
__programError: boolean;
|
|
75
|
-
signal: string;
|
|
76
|
-
status: number;
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
export declare type ProgressHandler = (status: IStatusReport) => void;
|
|
80
|
-
|
|
81
|
-
declare class ProgressStream extends Transform {
|
|
82
|
-
private readonly message;
|
|
83
|
-
constructor(message: boolean);
|
|
84
|
-
_transform(chunk: string, _encoding: BufferEncoding, callback: Function): void;
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
/** @extern */
|
|
88
|
-
export declare function sevenZip(ex: ExtraSpawnOptions, ...args: string[]): I7zHandler;
|
|
89
|
-
|
|
90
|
-
export declare function sevenZip(...args: string[]): I7zHandler;
|
|
91
|
-
|
|
92
|
-
/** @extern */
|
|
93
|
-
export declare function sevenZipCli(ex: ExtraSpawnOptions, ...args: string[]): I7zHandler;
|
|
94
|
-
|
|
95
|
-
export declare function sevenZipCli(...args: string[]): I7zHandler;
|
|
96
|
-
|
|
97
|
-
export declare function spawnSfx(sfxFile: string, targetDir: string, extra?: ExtraSpawnOptions): IToRun;
|
|
98
|
-
|
|
99
|
-
export declare function StatusCodeError(status: number, signal: string, _cwd: string, cmd: string[]): ProgramError | null;
|
|
100
|
-
|
|
101
|
-
export { }
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
|
|
3
|
+
import { ChildProcess } from 'child_process';
|
|
4
|
+
import { EventEmitter } from 'events';
|
|
5
|
+
import { SpawnOptions } from 'child_process';
|
|
6
|
+
import { Transform } from 'stream';
|
|
7
|
+
|
|
8
|
+
/** @extern */
|
|
9
|
+
export declare function compress(zipFile: string, sourceDir: string, ...extraSource: string[]): I7zHandler;
|
|
10
|
+
|
|
11
|
+
/** @extern */
|
|
12
|
+
export declare function extract(zipFile: string, targetDir: string): I7zHandler;
|
|
13
|
+
|
|
14
|
+
/** @extern */
|
|
15
|
+
export declare function extractSfx(sfxFile: string, targetDir: string, extraSpawn?: ExtraSpawnOptions): I7zHandler;
|
|
16
|
+
|
|
17
|
+
/** @extern */
|
|
18
|
+
export declare type ExtraSpawnOptions = Pick<SpawnOptions, 'cwd' | 'env' | 'uid' | 'gid' | 'shell'>;
|
|
19
|
+
|
|
20
|
+
declare class FilterStream extends Transform {
|
|
21
|
+
constructor();
|
|
22
|
+
_transform(chunk: Buffer | string, encoding: BufferEncoding, callback: Function): void;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export declare function handleOutput(stream: NodeJS.ReadableStream): FilterStream;
|
|
26
|
+
|
|
27
|
+
export declare function handleProgress(stream: NodeJS.ReadableStream, message: boolean): ProgressStream;
|
|
28
|
+
|
|
29
|
+
/** @extern */
|
|
30
|
+
export declare class I7zHandler extends EventEmitter {
|
|
31
|
+
private readonly toRun;
|
|
32
|
+
private _promise?;
|
|
33
|
+
private _timer?;
|
|
34
|
+
private cp?;
|
|
35
|
+
private _start;
|
|
36
|
+
on(event: 'progress', cb: (progress: IStatusReport) => void): this;
|
|
37
|
+
on(event: 'output', cb: (data: string) => void): this;
|
|
38
|
+
hold(): void;
|
|
39
|
+
cancel(): Promise<void>;
|
|
40
|
+
get commandline(): string[];
|
|
41
|
+
get cwd(): string;
|
|
42
|
+
promise(): Promise<void>;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** @extern */
|
|
46
|
+
export declare interface IStatusReport {
|
|
47
|
+
messageOnly?: boolean;
|
|
48
|
+
progress: number;
|
|
49
|
+
message: string;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
export declare interface IToRun {
|
|
53
|
+
commandline: string[];
|
|
54
|
+
cwd: string;
|
|
55
|
+
execute(handleData: MessageHandler, handleStatus: ProgressHandler): ChildProcess;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export declare class LoggerStream extends Transform {
|
|
59
|
+
private pp;
|
|
60
|
+
constructor(pp: string);
|
|
61
|
+
_transform(chunk: string, encoding: BufferEncoding, callback: Function): void;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export declare type MessageHandler = (data: string) => void;
|
|
65
|
+
|
|
66
|
+
export declare function processPromise(cp: ChildProcess, cmd: string[], cwd: string): Promise<void>;
|
|
67
|
+
|
|
68
|
+
export declare function processQuitPromise(cp: ChildProcess): Promise<void>;
|
|
69
|
+
|
|
70
|
+
/** @extern */
|
|
71
|
+
export declare interface ProgramError extends Error {
|
|
72
|
+
__cwd: string;
|
|
73
|
+
__program: string;
|
|
74
|
+
__programError: boolean;
|
|
75
|
+
signal: string;
|
|
76
|
+
status: number;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
export declare type ProgressHandler = (status: IStatusReport) => void;
|
|
80
|
+
|
|
81
|
+
declare class ProgressStream extends Transform {
|
|
82
|
+
private readonly message;
|
|
83
|
+
constructor(message: boolean);
|
|
84
|
+
_transform(chunk: string, _encoding: BufferEncoding, callback: Function): void;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
/** @extern */
|
|
88
|
+
export declare function sevenZip(ex: ExtraSpawnOptions, ...args: string[]): I7zHandler;
|
|
89
|
+
|
|
90
|
+
export declare function sevenZip(...args: string[]): I7zHandler;
|
|
91
|
+
|
|
92
|
+
/** @extern */
|
|
93
|
+
export declare function sevenZipCli(ex: ExtraSpawnOptions, ...args: string[]): I7zHandler;
|
|
94
|
+
|
|
95
|
+
export declare function sevenZipCli(...args: string[]): I7zHandler;
|
|
96
|
+
|
|
97
|
+
export declare function spawnSfx(sfxFile: string, targetDir: string, extra?: ExtraSpawnOptions): IToRun;
|
|
98
|
+
|
|
99
|
+
export declare function StatusCodeError(status: number, signal: string, _cwd: string, cmd: string[]): ProgramError | null;
|
|
100
|
+
|
|
101
|
+
export { }
|
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.24",
|
|
5
5
|
"author": "GongT <gongteng524702837@gmail.com>",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"bin": {
|
|
@@ -28,22 +28,21 @@
|
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"iconv-lite": "^0.6.3",
|
|
31
|
-
"source-map-support": "^0.5.
|
|
32
|
-
"split2": "^
|
|
33
|
-
"tslib": "^2.
|
|
31
|
+
"source-map-support": "^0.5.21",
|
|
32
|
+
"split2": "^4.1.0",
|
|
33
|
+
"tslib": "^2.4.0"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"7zip-bin": "^5.
|
|
37
|
-
"@build-script/builder": "
|
|
38
|
-
"@build-script/single-dog-asset": "
|
|
39
|
-
"@build-script/typescript-transformer-dual-package": "
|
|
40
|
-
"@types/node": "^
|
|
36
|
+
"7zip-bin": "^5.2.0",
|
|
37
|
+
"@build-script/builder": "workspace:^3.2.5",
|
|
38
|
+
"@build-script/single-dog-asset": "workspace:^1.0.18",
|
|
39
|
+
"@build-script/typescript-transformer-dual-package": "workspace:^1.0.26",
|
|
40
|
+
"@types/node": "^18.0.0",
|
|
41
41
|
"@types/split2": "^3.2.1",
|
|
42
42
|
"gulp": "^4.0.2",
|
|
43
|
-
"ttypescript": "^1.5.
|
|
44
|
-
"typescript": "^4.
|
|
45
|
-
"@build-script/export-all-in-one": "
|
|
46
|
-
"ts-node": "^10.1.0"
|
|
43
|
+
"ttypescript": "^1.5.13",
|
|
44
|
+
"typescript": "^4.7.4",
|
|
45
|
+
"@build-script/export-all-in-one": "workspace:^3.1.3"
|
|
47
46
|
},
|
|
48
47
|
"peerDependencies": {
|
|
49
48
|
"7zip-bin": "latest"
|
package/src/inc/fork.ts
DELETED
|
@@ -1,176 +0,0 @@
|
|
|
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';
|
|
5
|
-
|
|
6
|
-
const path7za = originalPath7za.replace(/\.asar([\/\\])/, (_m0, sp) => {
|
|
7
|
-
return '.asar.unpacked' + sp;
|
|
8
|
-
});
|
|
9
|
-
|
|
10
|
-
/** @extern */
|
|
11
|
-
export interface ProgramError extends Error {
|
|
12
|
-
__cwd: string;
|
|
13
|
-
__program: string;
|
|
14
|
-
__programError: boolean;
|
|
15
|
-
signal: string;
|
|
16
|
-
status: number;
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
const outputArgs = [
|
|
20
|
-
'-bso1', // standard output messages -> stdout
|
|
21
|
-
'-bse1', // error messages -> stdout
|
|
22
|
-
'-bsp2', // progress information -> stderr
|
|
23
|
-
];
|
|
24
|
-
|
|
25
|
-
function buildArgs(args: string[]) {
|
|
26
|
-
return outputArgs.concat(
|
|
27
|
-
args.filter((item) => {
|
|
28
|
-
return !item.startsWith('-bs');
|
|
29
|
-
})
|
|
30
|
-
);
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
/** @extern */
|
|
34
|
-
export type ExtraSpawnOptions = Pick<SpawnOptions, 'cwd' | 'env' | 'uid' | 'gid' | 'shell'>;
|
|
35
|
-
export type MessageHandler = (data: string) => void;
|
|
36
|
-
export type ProgressHandler = (status: IStatusReport) => void;
|
|
37
|
-
|
|
38
|
-
export interface IToRun {
|
|
39
|
-
commandline: string[];
|
|
40
|
-
cwd: string;
|
|
41
|
-
execute(handleData: MessageHandler, handleStatus: ProgressHandler): ChildProcess;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
const quited = Symbol('quited');
|
|
45
|
-
|
|
46
|
-
function hasQuit(cp: ChildProcess): boolean {
|
|
47
|
-
return (cp as any)[quited];
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
export function spawnSfx(sfxFile: string, targetDir: string, extra: ExtraSpawnOptions = {}): IToRun {
|
|
51
|
-
const args = ['x', `-o${targetDir}`, '-y'];
|
|
52
|
-
const cwd = dirname(sfxFile);
|
|
53
|
-
const file = basename(sfxFile);
|
|
54
|
-
|
|
55
|
-
return {
|
|
56
|
-
commandline: [file, ...args],
|
|
57
|
-
cwd,
|
|
58
|
-
execute(handleData: MessageHandler, handleStatus: ProgressHandler) {
|
|
59
|
-
const cp = spawn(file, args, {
|
|
60
|
-
...extra,
|
|
61
|
-
cwd,
|
|
62
|
-
stdio: ['ignore', 'pipe', 'pipe'],
|
|
63
|
-
detached: false,
|
|
64
|
-
windowsHide: true,
|
|
65
|
-
});
|
|
66
|
-
|
|
67
|
-
handleQuit(cp);
|
|
68
|
-
handleProgress(cp.stdout, true).on('data', (status: IStatusReport) => {
|
|
69
|
-
if (status.messageOnly) {
|
|
70
|
-
handleData(status.message);
|
|
71
|
-
} else {
|
|
72
|
-
handleStatus(status);
|
|
73
|
-
}
|
|
74
|
-
});
|
|
75
|
-
|
|
76
|
-
return cp;
|
|
77
|
-
},
|
|
78
|
-
};
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
/** @internal */
|
|
82
|
-
export function spawn7z(args: string[], cli: boolean, extra: ExtraSpawnOptions = {}): IToRun {
|
|
83
|
-
const cwd = extra.cwd || process.cwd();
|
|
84
|
-
|
|
85
|
-
if (!cli && !args.includes('-y')) {
|
|
86
|
-
args.unshift('-y');
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
args = buildArgs(args);
|
|
90
|
-
|
|
91
|
-
const commandline = [path7za, ...args];
|
|
92
|
-
return {
|
|
93
|
-
commandline,
|
|
94
|
-
cwd: cwd.toString(),
|
|
95
|
-
execute(handleData: MessageHandler, handleStatus: ProgressHandler) {
|
|
96
|
-
const cp = spawn(path7za, args, {
|
|
97
|
-
...extra,
|
|
98
|
-
stdio: [cli ? 'inherit' : 'ignore', 'pipe', 'pipe'],
|
|
99
|
-
cwd,
|
|
100
|
-
detached: false,
|
|
101
|
-
windowsHide: true,
|
|
102
|
-
});
|
|
103
|
-
handleQuit(cp);
|
|
104
|
-
handleOutput(cp.stdout).on('data', handleData);
|
|
105
|
-
handleProgress(cp.stderr, false).on('data', handleStatus);
|
|
106
|
-
|
|
107
|
-
return cp;
|
|
108
|
-
},
|
|
109
|
-
};
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
function handleQuit(cp: ChildProcess) {
|
|
113
|
-
cp.once('exit', () => {
|
|
114
|
-
Object.assign(cp, {
|
|
115
|
-
[quited]: true,
|
|
116
|
-
});
|
|
117
|
-
});
|
|
118
|
-
}
|
|
119
|
-
|
|
120
|
-
export function processPromise(cp: ChildProcess, cmd: string[], cwd: string) {
|
|
121
|
-
return new Promise<void>((resolve, reject) => {
|
|
122
|
-
cp.once('error', reject);
|
|
123
|
-
cp.once('exit', (code: number, signal: string) => {
|
|
124
|
-
const e = StatusCodeError(code, signal, cwd, cmd);
|
|
125
|
-
if (e) {
|
|
126
|
-
reject(e);
|
|
127
|
-
} else {
|
|
128
|
-
resolve();
|
|
129
|
-
}
|
|
130
|
-
});
|
|
131
|
-
});
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
function indentArgs(args: ReadonlyArray<string>) {
|
|
135
|
-
return args
|
|
136
|
-
.map((arg, index) => {
|
|
137
|
-
return ` Argument[${index}] = ${arg}`;
|
|
138
|
-
})
|
|
139
|
-
.join('\n');
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
export function StatusCodeError(status: number, signal: string, _cwd: string, cmd: string[]): ProgramError | null {
|
|
143
|
-
if (status === 0 && !signal) {
|
|
144
|
-
return null;
|
|
145
|
-
}
|
|
146
|
-
const __program = `\`${cmd.join(' ')}\`
|
|
147
|
-
Command = ${cmd[0]}
|
|
148
|
-
${indentArgs(cmd.slice(1))}
|
|
149
|
-
`;
|
|
150
|
-
return Object.assign(
|
|
151
|
-
new Error(signal ? `Program exit by signal "${signal}"` : `Program exit with code "${status}"`),
|
|
152
|
-
{
|
|
153
|
-
status,
|
|
154
|
-
signal,
|
|
155
|
-
__programError: true,
|
|
156
|
-
__program,
|
|
157
|
-
__cwd: cmd[2],
|
|
158
|
-
}
|
|
159
|
-
);
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
export function processQuitPromise(cp: ChildProcess): Promise<void> {
|
|
163
|
-
if (hasQuit(cp)) {
|
|
164
|
-
return Promise.resolve();
|
|
165
|
-
}
|
|
166
|
-
return new Promise((resolve) => {
|
|
167
|
-
const to = setTimeout(() => {
|
|
168
|
-
cp.kill('SIGKILL');
|
|
169
|
-
}, 5000);
|
|
170
|
-
cp.once('exit', (_code: number, _signal: string) => {
|
|
171
|
-
clearTimeout(to);
|
|
172
|
-
resolve();
|
|
173
|
-
});
|
|
174
|
-
cp.kill('SIGINT');
|
|
175
|
-
});
|
|
176
|
-
}
|
package/src/inc/handler.ts
DELETED
|
@@ -1,81 +0,0 @@
|
|
|
1
|
-
import { ChildProcess } from 'child_process';
|
|
2
|
-
import { EventEmitter } from 'events';
|
|
3
|
-
import { IToRun, processPromise, processQuitPromise } from './fork';
|
|
4
|
-
import { IStatusReport } from './outputStreams';
|
|
5
|
-
|
|
6
|
-
/** @extern */
|
|
7
|
-
export class I7zHandler extends EventEmitter {
|
|
8
|
-
private _promise?: Promise<void>;
|
|
9
|
-
private _timer?: NodeJS.Immediate;
|
|
10
|
-
private cp?: ChildProcess;
|
|
11
|
-
|
|
12
|
-
/** @internal */
|
|
13
|
-
constructor(private readonly toRun: IToRun) {
|
|
14
|
-
super();
|
|
15
|
-
|
|
16
|
-
this._timer = setImmediate(() => {
|
|
17
|
-
delete this._timer;
|
|
18
|
-
this._start();
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
private _start() {
|
|
23
|
-
if (this._promise) {
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
this.hold();
|
|
27
|
-
this.cp = this.toRun.execute(
|
|
28
|
-
(data) => {
|
|
29
|
-
this.emit('output', data);
|
|
30
|
-
},
|
|
31
|
-
(status) => {
|
|
32
|
-
this.emit('progress', status);
|
|
33
|
-
}
|
|
34
|
-
);
|
|
35
|
-
|
|
36
|
-
this._promise = processPromise(this.cp, this.commandline, this.cwd).catch((e) => e);
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
on(event: 'progress', cb: (progress: IStatusReport) => void): this;
|
|
40
|
-
on(event: 'output', cb: (data: string) => void): this;
|
|
41
|
-
on(event: string, cb: (...args: any[]) => void): this {
|
|
42
|
-
return super.on(event, cb);
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
hold() {
|
|
46
|
-
if (this._promise) {
|
|
47
|
-
throw new Error('You cannot hold after leaved the event loop which created this object.');
|
|
48
|
-
}
|
|
49
|
-
if (this._timer) {
|
|
50
|
-
clearImmediate(this._timer);
|
|
51
|
-
delete this._timer;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
async cancel(): Promise<void> {
|
|
56
|
-
if (this._promise) {
|
|
57
|
-
return processQuitPromise(this.cp!);
|
|
58
|
-
} else {
|
|
59
|
-
return this.hold();
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
public get commandline() {
|
|
64
|
-
return this.toRun.commandline;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
public get cwd() {
|
|
68
|
-
return this.toRun.cwd;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
promise(): Promise<void> {
|
|
72
|
-
if (!this._promise) {
|
|
73
|
-
this._start();
|
|
74
|
-
}
|
|
75
|
-
return Promise.resolve(this._promise).then((e: any) => {
|
|
76
|
-
if (e instanceof Error) {
|
|
77
|
-
throw e;
|
|
78
|
-
}
|
|
79
|
-
});
|
|
80
|
-
}
|
|
81
|
-
}
|
package/src/inc/outputStreams.ts
DELETED
|
@@ -1,101 +0,0 @@
|
|
|
1
|
-
import { Transform } from 'stream';
|
|
2
|
-
import { decodeStream } from 'iconv-lite';
|
|
3
|
-
import { platform } from 'os';
|
|
4
|
-
import split2 from 'split2';
|
|
5
|
-
|
|
6
|
-
const isWin = platform() === 'win32';
|
|
7
|
-
/**aaa*/
|
|
8
|
-
function transformOutputEncode(source: NodeJS.ReadableStream): NodeJS.ReadableStream {
|
|
9
|
-
return isWin ? source.pipe(decodeStream('936')) : source;
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
/**
|
|
13
|
-
* aaaaa
|
|
14
|
-
* @xxx
|
|
15
|
-
* bbb
|
|
16
|
-
**/
|
|
17
|
-
class BackspaceNewlineStream extends Transform {
|
|
18
|
-
_transform(chunk: Buffer, _encoding: BufferEncoding, callback: Function): void {
|
|
19
|
-
const str = chunk
|
|
20
|
-
.toString('utf8')
|
|
21
|
-
.replace(/[\x08\x0d]+/g, '\n')
|
|
22
|
-
.replace(/^ +| +$/g, '');
|
|
23
|
-
this.push(str, 'utf8');
|
|
24
|
-
callback();
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
class FilterStream extends Transform {
|
|
29
|
-
constructor() {
|
|
30
|
-
super({ objectMode: true });
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
_transform(chunk: Buffer | string, encoding: BufferEncoding, callback: Function): void {
|
|
34
|
-
if (typeof chunk !== 'string') {
|
|
35
|
-
chunk = chunk.toString(encoding);
|
|
36
|
-
}
|
|
37
|
-
chunk = chunk.trim();
|
|
38
|
-
if (chunk.length) {
|
|
39
|
-
this.push(chunk);
|
|
40
|
-
}
|
|
41
|
-
callback();
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
const matchExp = /^(\d+[%M])(?: - )?(.*)$/;
|
|
46
|
-
|
|
47
|
-
/** @extern */
|
|
48
|
-
export interface IStatusReport {
|
|
49
|
-
messageOnly?: boolean;
|
|
50
|
-
progress: number;
|
|
51
|
-
message: string;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
class ProgressStream extends Transform {
|
|
55
|
-
constructor(private readonly message: boolean) {
|
|
56
|
-
super({ objectMode: true });
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
_transform(chunk: string, _encoding: BufferEncoding, callback: Function): void {
|
|
60
|
-
const match = matchExp.exec(chunk);
|
|
61
|
-
if (match) {
|
|
62
|
-
const percent = parseInt(match[1]);
|
|
63
|
-
if (!isNaN(percent)) {
|
|
64
|
-
this.push({
|
|
65
|
-
progress: percent,
|
|
66
|
-
message: match[2] || '',
|
|
67
|
-
} as IStatusReport);
|
|
68
|
-
}
|
|
69
|
-
} else if (this.message) {
|
|
70
|
-
this.push({
|
|
71
|
-
messageOnly: true,
|
|
72
|
-
message: chunk,
|
|
73
|
-
} as IStatusReport);
|
|
74
|
-
}
|
|
75
|
-
callback();
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
export function handleOutput(stream: NodeJS.ReadableStream) {
|
|
80
|
-
return transformOutputEncode(stream).pipe(split2()).pipe(new FilterStream());
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
export function handleProgress(stream: NodeJS.ReadableStream, message: boolean) {
|
|
84
|
-
return transformOutputEncode(stream)
|
|
85
|
-
.pipe(new BackspaceNewlineStream())
|
|
86
|
-
.pipe(split2())
|
|
87
|
-
.pipe(new FilterStream())
|
|
88
|
-
.pipe(new ProgressStream(message));
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
export class LoggerStream extends Transform {
|
|
92
|
-
constructor(private pp: string) {
|
|
93
|
-
super({ objectMode: true });
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
_transform(chunk: string, encoding: BufferEncoding, callback: Function): void {
|
|
97
|
-
console.error(`${this.pp}: ${chunk}`);
|
|
98
|
-
this.push(chunk, encoding);
|
|
99
|
-
callback();
|
|
100
|
-
}
|
|
101
|
-
}
|
package/src/index.ts
DELETED
|
@@ -1,54 +0,0 @@
|
|
|
1
|
-
import { ExtraSpawnOptions, spawn7z, spawnSfx } from './inc/fork';
|
|
2
|
-
import { I7zHandler } from './inc/handler';
|
|
3
|
-
|
|
4
|
-
/** @extern */
|
|
5
|
-
export function extractSfx(sfxFile: string, targetDir: string, extraSpawn?: ExtraSpawnOptions) {
|
|
6
|
-
return new I7zHandler(spawnSfx(sfxFile, targetDir, extraSpawn));
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
/**
|
|
10
|
-
* Wow such doge
|
|
11
|
-
*/
|
|
12
|
-
function _7Zip(cli: boolean, args: string[], ex?: ExtraSpawnOptions): I7zHandler {
|
|
13
|
-
return new I7zHandler(spawn7z(args, cli, ex));
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
/** @extern */
|
|
17
|
-
export function sevenZip(ex: ExtraSpawnOptions, ...args: string[]): I7zHandler;
|
|
18
|
-
export function sevenZip(...args: string[]): I7zHandler;
|
|
19
|
-
export function sevenZip(...args: any[]) {
|
|
20
|
-
let ex = undefined;
|
|
21
|
-
if (typeof args[0] !== 'string') {
|
|
22
|
-
ex = args.shift();
|
|
23
|
-
}
|
|
24
|
-
return _7Zip(false, args, ex);
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
/** @extern */
|
|
28
|
-
export function sevenZipCli(ex: ExtraSpawnOptions, ...args: string[]): I7zHandler;
|
|
29
|
-
export function sevenZipCli(...args: string[]): I7zHandler;
|
|
30
|
-
export function sevenZipCli(...args: any[]) {
|
|
31
|
-
let ex = undefined;
|
|
32
|
-
if (typeof args[0] !== 'string') {
|
|
33
|
-
ex = args.shift();
|
|
34
|
-
}
|
|
35
|
-
return _7Zip(true, args, ex);
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
/** @extern */
|
|
39
|
-
export function extract(zipFile: string, targetDir: string) {
|
|
40
|
-
return _7Zip(false, ['x', `-o${targetDir}`, '-y', zipFile]);
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
const defaultZipArgs = [
|
|
44
|
-
'-y',
|
|
45
|
-
'-ms=on', // create solid archive (default)
|
|
46
|
-
'-mx8', // more compress
|
|
47
|
-
'-mmt', // multithread the operation (faster)
|
|
48
|
-
'-ssc', // case-sensitive mode
|
|
49
|
-
];
|
|
50
|
-
|
|
51
|
-
/** @extern */
|
|
52
|
-
export function compress(zipFile: string, sourceDir: string, ...extraSource: string[]) {
|
|
53
|
-
return _7Zip(false, ['a', ...defaultZipArgs, zipFile, sourceDir, ...extraSource]);
|
|
54
|
-
}
|
package/src/tsconfig.json
DELETED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": "../node_modules/@build-script/single-dog-asset/package/tsconfig.json",
|
|
3
|
-
"compilerOptions": {
|
|
4
|
-
"baseUrl": ".",
|
|
5
|
-
"outDir": "../dist",
|
|
6
|
-
"declaration": false,
|
|
7
|
-
"types": ["node"],
|
|
8
|
-
"rootDir": ".",
|
|
9
|
-
"typeRoots": ["../node_modules/@types", "../node_modules"],
|
|
10
|
-
"declarationMap": false
|
|
11
|
-
},
|
|
12
|
-
"exclude": ["_export_all_in_once_index.ts"]
|
|
13
|
-
}
|