@push.rocks/smartarchive 4.0.18 → 4.0.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/bzip2/bititerator.js +1 -1
- package/dist_ts/bzip2/bzip2.js +1 -1
- package/dist_ts/bzip2/index.js +4 -1
- package/dist_ts/classes.archiveanalyzer.js +6 -1
- package/dist_ts/classes.gziptools.js +1 -1
- package/dist_ts/classes.smartarchive.d.ts +4 -2
- package/dist_ts/classes.smartarchive.js +18 -6
- package/dist_ts/classes.tartools.js +1 -1
- package/dist_ts/classes.ziptools.d.ts +24 -0
- package/dist_ts/classes.ziptools.js +66 -0
- package/dist_ts/plugins.d.ts +4 -1
- package/dist_ts/plugins.js +3 -2
- package/package.json +18 -17
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/bzip2/index.ts +3 -0
- package/ts/classes.archiveanalyzer.ts +5 -0
- package/ts/classes.smartarchive.ts +48 -34
- package/ts/classes.ziptools.ts +77 -0
- package/ts/plugins.ts +2 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartarchive',
|
|
6
|
-
version: '4.0.
|
|
6
|
+
version: '4.0.20',
|
|
7
7
|
description: 'work with archives'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSwwQkFBMEI7SUFDaEMsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLG9CQUFvQjtDQUNsQyxDQUFBIn0=
|
|
@@ -40,4 +40,4 @@ export function bitIterator(nextBuffer) {
|
|
|
40
40
|
return f;
|
|
41
41
|
}
|
|
42
42
|
;
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYml0aXRlcmF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9iemlwMi9iaXRpdGVyYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxJQUFJLE9BQU8sR0FBRyxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFFbEUsc0NBQXNDO0FBQ3RDLG1DQUFtQztBQUNuQyxNQUFNLFVBQVUsV0FBVyxDQUFDLFVBQXdCO0lBQ2hELElBQUksR0FBRyxHQUFHLENBQUMsRUFBRSxJQUFJLEdBQUcsQ0FBQyxDQUFDO0lBQ3RCLElBQUksS0FBSyxHQUFHLFVBQVUsRUFBRSxDQUFDO0lBQ3pCLElBQUksQ0FBQyxHQUFHLFVBQVMsQ0FBQztRQUNkLElBQUksQ0FBQyxLQUFLLElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBRSx5QkFBeUI7WUFDcEQsR0FBRyxHQUFHLENBQUMsQ0FBQTtZQUNQLElBQUksRUFBRSxDQUFDO1lBQ1AsT0FBTztRQUNYLENBQUM7UUFDRCxJQUFJLE1BQU0sR0FBRyxDQUFDLENBQUM7UUFDZixPQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNWLElBQUksSUFBSSxJQUFJLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDdkIsSUFBSSxHQUFHLENBQUMsQ0FBQztnQkFDVCxLQUFLLEdBQUcsVUFBVSxFQUFFLENBQUM7WUFDekIsQ0FBQztZQUNELElBQUksSUFBSSxHQUFHLENBQUMsR0FBRyxHQUFHLENBQUM7WUFDbkIsSUFBSSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDO2dCQUNsQixhQUFhO2dCQUNiLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNsQixJQUFJLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQztnQkFDWixNQUFNLEtBQUssSUFBSSxDQUFDO2dCQUNoQixNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztnQkFDMUMsR0FBRyxHQUFHLENBQUMsQ0FBQztnQkFDUixDQUFDLElBQUksSUFBSSxDQUFDO1lBQ2QsQ0FBQztpQkFBTSxDQUFDO2dCQUNKLE1BQU0sS0FBSyxDQUFDLENBQUM7Z0JBQ2IsTUFBTSxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDM0UsR0FBRyxJQUFJLENBQUMsQ0FBQztnQkFDVCxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ1YsQ0FBQztRQUNMLENBQUM7UUFDRCxPQUFPLE1BQU0sQ0FBQztJQUNsQixDQUFDLENBQUM7SUFDRixhQUFhO0lBQ2IsQ0FBQyxDQUFDLFNBQVMsR0FBRyxDQUFDLENBQUM7SUFDaEIsT0FBTyxDQUFDLENBQUM7QUFDYixDQUFDO0FBQUEsQ0FBQyJ9
|
package/dist_ts/bzip2/bzip2.js
CHANGED
|
@@ -350,4 +350,4 @@ export class Bzip2 {
|
|
|
350
350
|
}
|
|
351
351
|
}
|
|
352
352
|
;
|
|
353
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bzip2.js","sourceRoot":"","sources":["../../ts/bzip2/bzip2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,UAAW,SAAQ,KAAK;IAKnC,YAAY,UAAkB;QAC5B,KAAK,EAAE,CAAC;QALH,SAAI,GAAW,YAAY,CAAC;QAE5B,UAAK,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC;QAIjC,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;IAC5B,CAAC;CACF;AAED,IAAI,UAAU,GAAG;IACf,KAAK,EAAE,UAAS,OAAO,IAAG,MAAM,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA,CAAC;CAC1D,CAAC;AAEF,MAAM,OAAO,KAAK;IAAlB;QACS,eAAU,GAAG,UAAU,CAAC;QACxB,aAAQ,GACf;YACC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UA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"}
|
|
353
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bzip2.js","sourceRoot":"","sources":["../../ts/bzip2/bzip2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,UAAW,SAAQ,KAAK;IAKnC,YAAY,UAAkB;QAC5B,KAAK,EAAE,CAAC;QALH,SAAI,GAAW,YAAY,CAAC;QAE5B,UAAK,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC;QAIjC,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;IAC5B,CAAC;CACF;AAED,IAAI,UAAU,GAAG;IACf,KAAK,EAAE,UAAS,OAAO,IAAG,MAAM,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA,CAAC;CAC1D,CAAC;AAEF,MAAM,OAAO,KAAK;IAAlB;QACS,eAAU,GAAG,UAAU,CAAC;QACxB,aAAQ,GACf;YACC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU;YAC9C,UAAU,EAAE,UA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"}
|
package/dist_ts/bzip2/index.js
CHANGED
|
@@ -78,6 +78,9 @@ export function unbzip2Stream() {
|
|
|
78
78
|
//console.error(x,'last compressing with', hasBytes, 'bytes in buffer');
|
|
79
79
|
while (!broken && bitReader && hasBytes > bitReader.bytesRead) {
|
|
80
80
|
const result = await decompressAndPush();
|
|
81
|
+
if (!result) {
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
81
84
|
await streamTools.push(result);
|
|
82
85
|
}
|
|
83
86
|
if (!broken) {
|
|
@@ -87,4 +90,4 @@ export function unbzip2Stream() {
|
|
|
87
90
|
},
|
|
88
91
|
});
|
|
89
92
|
}
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9iemlwMi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQztBQUV6QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ25DLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvQyxNQUFNLFVBQVUsYUFBYTtJQUMzQixNQUFNLGFBQWEsR0FBRyxJQUFJLEtBQUssRUFBRSxDQUFDO0lBQ2xDLElBQUksV0FBVyxHQUFHLEVBQUUsQ0FBQztJQUNyQixJQUFJLFFBQVEsR0FBRyxDQUFDLENBQUM7SUFDakIsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDO0lBQ2xCLElBQUksTUFBTSxHQUFHLEtBQUssQ0FBQztJQUNuQixJQUFJLElBQUksR0FBRyxLQUFLLENBQUM7SUFDakIsSUFBSSxTQUFTLEdBQUcsSUFBSSxDQUFDO0lBQ3JCLElBQUksU0FBUyxHQUFHLElBQUksQ0FBQztJQUVyQixTQUFTLGVBQWU7UUFDdEIsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ2YsU0FBUyxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDNUMsU0FBUyxHQUFHLENBQUMsQ0FBQztRQUNoQixDQUFDO2FBQU0sQ0FBQztZQUNOLElBQUksT0FBTyxHQUFHLE1BQU0sR0FBRyxTQUFTLENBQUM7WUFDakMsSUFBSSxHQUFHLEdBQUcsSUFBSSxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7WUFFbEMsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO1lBQ2YsSUFBSSxDQUFDLEdBQUcsVUFBVSxDQUFDO2dCQUNqQixLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2hCLENBQUMsQ0FBQztZQUVGLFNBQVMsR0FBRyxhQUFhLENBQUMsVUFBVSxDQUFDLFNBQVMs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
|
|
@@ -19,6 +19,8 @@ export class ArchiveAnalyzer {
|
|
|
19
19
|
switch (mimeTypeArg) {
|
|
20
20
|
case 'application/gzip':
|
|
21
21
|
return this.smartArchiveRef.gzipTools.getDecompressionStream();
|
|
22
|
+
case 'application/zip':
|
|
23
|
+
return this.smartArchiveRef.zipTools.getDecompressionStream();
|
|
22
24
|
case 'application/x-bzip2':
|
|
23
25
|
return await this.smartArchiveRef.bzip2Tools.getDecompressionStream(); // replace with your own bzip2 decompression stream
|
|
24
26
|
case 'application/x-tar':
|
|
@@ -38,6 +40,9 @@ export class ArchiveAnalyzer {
|
|
|
38
40
|
firstRun = false;
|
|
39
41
|
const fileType = await plugins.fileType.fileTypeFromBuffer(chunkArg);
|
|
40
42
|
const decompressionStream = await this.getDecompressionStream(fileType?.mime);
|
|
43
|
+
/**
|
|
44
|
+
* analyzed stream emits once with this object
|
|
45
|
+
*/
|
|
41
46
|
const result = {
|
|
42
47
|
fileType,
|
|
43
48
|
isArchive: await this.mimeTypeIsArchive(fileType?.mime),
|
|
@@ -57,4 +62,4 @@ export class ArchiveAnalyzer {
|
|
|
57
62
|
return analyzerstream;
|
|
58
63
|
}
|
|
59
64
|
}
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5hcmNoaXZlYW5hbHl6ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLmFyY2hpdmVhbmFseXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQVN4QyxNQUFNLE9BQU8sZUFBZTtJQUcxQixZQUFZLGtCQUFnQztRQUMxQyxJQUFJLENBQUMsZUFBZSxHQUFHLGtCQUFrQixDQUFDO0lBQzVDLENBQUM7SUFFTyxLQUFLLENBQUMsaUJBQWlCLENBQUMsUUFBZ0I7UUFDOUMsTUFBTSxnQkFBZ0IsR0FBZ0IsSUFBSSxHQUFHLENBQUM7WUFDNUMsaUJBQWlCO1lBQ2pCLDhCQUE4QjtZQUM5QixtQkFBbUI7WUFDbkIsa0JBQWtCO1lBQ2xCLDZCQUE2QjtZQUM3QixxQkFBcUI7WUFDckIsb0NBQW9DO1NBQ3JDLENBQUMsQ0FBQztRQUVILE9BQU8sZ0JBQWdCLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFHTyxLQUFLLENBQUMsc0JBQXNCLENBQ2xDLFdBQW9EO1FBRXBELFFBQVEsV0FBVyxFQUFFLENBQUM7WUFDcEIsS0FBSyxrQkFBa0I7Z0JBQ3JCLE9BQU8sSUFBSSxDQUFDLGVBQWUsQ0FBQyxTQUFTLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztZQUNqRSxLQUFLLGlCQUFpQjtnQkFDcEIsT0FBTyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO1lBQ2hFLEtBQUsscUJBQXFCO2dCQUN4QixPQUFPLE1BQU0sSUFBSSxDQUFDLGVBQWUsQ0FBQyxVQUFVLENBQUMsc0JBQXNCLEVBQUUsQ0FBQyxDQUFDLG1EQUFtRDtZQUM1SCxLQUFLLG1CQUFtQjtnQkFDdEIsT0FBTyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDLENBQUMsaURBQWlEO1lBQ2xIO2dCQUNFLHdEQUF3RDtnQkFDeEQsT0FBTyxPQUFPLENBQUMsV0FBVyxDQUFDLGlCQUFpQixFQUFFLENBQUM7UUFDbkQsQ0FBQztJQUNILENBQUM7SUFFTSxpQkFBaUI7UUFDdEIsSUFBSSxRQUFRLEdBQUcsSUFBSSxDQUFDO1FBQ3BCLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztRQUM3RCxNQUFNLGNBQWMsR0FBRyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUEwQjtZQUNsRixrQkFBa0IsRUFBRSxJQUFJO1lBQ3hCLGFBQWEsRUFBRSxLQUFLLEVBQUUsUUFBZ0IsRUFBRSxXQUFXLEVBQUUsRUFBRTtnQkFDckQsSUFBSSxRQUFRLEVBQUUsQ0FBQztvQkFDYixRQUFRLEdBQUcsS0FBSyxDQUFDO29CQUNqQixNQUFNLFFBQVEsR0FBRyxNQUFNLE9BQU8sQ0FBQyxRQUFRLENBQUMsa0JBQWtCLENBQUMsUUFBUSxDQUFDLENBQUM7b0JBQ3JFLE1BQU0sbUJBQW1CLEdBQUcsTUFBTSxJQUFJLENBQUMsc0JBQXNCLENBQUMsUUFBUSxFQUFFLElBQVcsQ0FBQyxDQUFDO29CQUNyRjs7dUJBRUc7b0JBQ0gsTUFBTSxNQUFNLEdBQW9CO3dCQUM5QixRQUFRO3dCQUNSLFNBQVMsRUFBRSxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDO3dCQUN2RCxZQUFZO3dCQUNaLG1CQUFtQjtxQkFDcEIsQ0FBQztvQkFDRixNQUFNLFdBQVcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ2pDLENBQUM7Z0JBQ0QsTUFBTSxZQUFZLENBQUMsaUJBQWlCLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQy9DLE9BQU8sSUFBSSxDQUFDO1lBQ2QsQ0FBQztZQUNELGFBQWEsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEVBQUU7Z0JBQzdCLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ3hCLE9BQU8sSUFBSSxDQUFDO1lBQ2QsQ0FBQztTQUNGLENBQUMsQ0FBQztRQUNILE9BQU8sY0FBYyxDQUFDO0lBQ3hCLENBQUM7Q0FDRiJ9
|
|
@@ -48,4 +48,4 @@ export class GzipTools {
|
|
|
48
48
|
return new DecompressGunzipTransform();
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5nemlwdG9vbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLmd6aXB0b29scy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQTtBQUV2QyxpRUFBaUU7QUFDakUsTUFBTSxPQUFPLHVCQUF3QixTQUFRLE9BQU8sQ0FBQyxNQUFNLENBQUMsU0FBUztJQUNuRTtRQUNFLEtBQUssRUFBRSxDQUFDO0lBQ1YsQ0FBQztJQUVELFVBQVUsQ0FBQyxLQUFhLEVBQUUsUUFBd0IsRUFBRSxRQUEwQztRQUM1RixPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxHQUFHLEVBQUUsWUFBWSxFQUFFLEVBQUU7WUFDakQsSUFBSSxHQUFHLEVBQUUsQ0FBQztnQkFDUixRQUFRLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDaEIsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQ3hCLFFBQVEsRUFBRSxDQUFDO1lBQ2IsQ0FBQztRQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBRUQsK0VBQStFO0FBQy9FLHdGQUF3RjtBQUN4RixNQUFNLE9BQU8seUJBQTBCLFNBQVEsT0FBTyxDQUFDLE1BQU0sQ0FBQyxTQUFTO0lBQ3JFO1FBQ0UsS0FBSyxFQUFFLENBQUM7SUFDVixDQUFDO0lBRUQsVUFBVSxDQUFDLEtBQWEsRUFBRSxRQUF3QixFQUFFLFFBQTBDO1FBQzVGLHVEQUF1RDtRQUN2RCxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxHQUFHLEVBQUUsWUFBWSxFQUFFLEVBQUU7WUFDakQsSUFBSSxHQUFHLEVBQUUsQ0FBQztnQkFDUiwwRUFBMEU7Z0JBQzFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNoQixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sNkVBQTZFO2dCQUM3RSxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO2dCQUN4QixRQUFRLEVBQUUsQ0FBQztZQUNiLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQUdELE1BQU0sT0FBTyxTQUFTO0lBR3BCLFlBQVksa0JBQWdDO1FBQzFDLElBQUksQ0FBQyxlQUFlLEdBQUcsa0JBQWtCLENBQUM7SUFDNUMsQ0FBQztJQUVNLG9CQUFvQjtRQUN6QixPQUFPLElBQUksdUJBQXVCLEVBQUUsQ0FBQztJQUN2QyxDQUFDO0lBRU0sc0JBQXNCO1FBQzNCLE9BQU8sSUFBSSx5QkFBeUIsRUFBRSxDQUFDO0lBQ3pDLENBQUM7Q0FDRiJ9
|
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import * as plugins from './plugins.js';
|
|
3
|
+
import { Bzip2Tools } from './classes.bzip2tools.js';
|
|
3
4
|
import { GzipTools } from './classes.gziptools.js';
|
|
4
5
|
import { TarTools } from './classes.tartools.js';
|
|
5
|
-
import {
|
|
6
|
+
import { ZipTools } from './classes.ziptools.js';
|
|
6
7
|
import { ArchiveAnalyzer } from './classes.archiveanalyzer.js';
|
|
7
8
|
export declare class SmartArchive {
|
|
8
9
|
static fromArchiveUrl(urlArg: string): Promise<SmartArchive>;
|
|
9
10
|
static fromArchiveFile(filePathArg: string): Promise<SmartArchive>;
|
|
10
11
|
static fromArchiveStream(streamArg: plugins.stream.Readable | plugins.stream.Duplex | plugins.stream.Transform): Promise<SmartArchive>;
|
|
11
|
-
tarTools: TarTools;
|
|
12
12
|
gzipTools: GzipTools;
|
|
13
13
|
bzip2Tools: Bzip2Tools;
|
|
14
|
+
tarTools: TarTools;
|
|
15
|
+
zipTools: ZipTools;
|
|
14
16
|
archiveAnalyzer: ArchiveAnalyzer;
|
|
15
17
|
sourceUrl: string;
|
|
16
18
|
sourceFilePath: string;
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import * as paths from './paths.js';
|
|
3
|
+
import { Bzip2Tools } from './classes.bzip2tools.js';
|
|
3
4
|
import { GzipTools } from './classes.gziptools.js';
|
|
4
5
|
import { TarTools } from './classes.tartools.js';
|
|
5
|
-
import {
|
|
6
|
+
import { ZipTools } from './classes.ziptools.js';
|
|
6
7
|
import { ArchiveAnalyzer } from './classes.archiveanalyzer.js';
|
|
7
8
|
export class SmartArchive {
|
|
8
9
|
// STATIC
|
|
@@ -23,9 +24,10 @@ export class SmartArchive {
|
|
|
23
24
|
}
|
|
24
25
|
constructor() {
|
|
25
26
|
// INSTANCE
|
|
26
|
-
this.tarTools = new TarTools(this);
|
|
27
27
|
this.gzipTools = new GzipTools(this);
|
|
28
28
|
this.bzip2Tools = new Bzip2Tools(this);
|
|
29
|
+
this.tarTools = new TarTools(this);
|
|
30
|
+
this.zipTools = new ZipTools(this);
|
|
29
31
|
this.archiveAnalyzer = new ArchiveAnalyzer(this);
|
|
30
32
|
this.singleFileMode = false;
|
|
31
33
|
this.addedDirectories = [];
|
|
@@ -65,7 +67,7 @@ export class SmartArchive {
|
|
|
65
67
|
const streamFile = chunkArg;
|
|
66
68
|
const readStream = await streamFile.createReadStream();
|
|
67
69
|
await plugins.smartfile.fs.ensureDir(targetDir);
|
|
68
|
-
const writePath = plugins.path.join(targetDir,
|
|
70
|
+
const writePath = plugins.path.join(targetDir, streamFile.relativeFilePath || fileNameArg);
|
|
69
71
|
await plugins.smartfile.fs.ensureDir(plugins.path.dirname(writePath));
|
|
70
72
|
const writeStream = plugins.smartfile.fsStream.createWriteStream(writePath);
|
|
71
73
|
readStream.pipe(writeStream);
|
|
@@ -76,7 +78,7 @@ export class SmartArchive {
|
|
|
76
78
|
},
|
|
77
79
|
finalFunction: async () => {
|
|
78
80
|
done.resolve();
|
|
79
|
-
}
|
|
81
|
+
},
|
|
80
82
|
}));
|
|
81
83
|
return done.promise;
|
|
82
84
|
}
|
|
@@ -103,6 +105,16 @@ export class SmartArchive {
|
|
|
103
105
|
});
|
|
104
106
|
analyzedResultChunk.resultStream.pipe(analyzedResultChunk.decompressionStream);
|
|
105
107
|
}
|
|
108
|
+
else if (analyzedResultChunk.fileType?.mime === 'application/zip') {
|
|
109
|
+
analyzedResultChunk.resultStream
|
|
110
|
+
.pipe(analyzedResultChunk.decompressionStream)
|
|
111
|
+
.pipe(new plugins.smartstream.SmartDuplex({
|
|
112
|
+
objectMode: true,
|
|
113
|
+
writeFunction: async (streamFileArg, streamtools) => {
|
|
114
|
+
streamFileIntake.push(streamFileArg);
|
|
115
|
+
},
|
|
116
|
+
}));
|
|
117
|
+
}
|
|
106
118
|
else if (analyzedResultChunk.isArchive && analyzedResultChunk.decompressionStream) {
|
|
107
119
|
analyzedResultChunk.resultStream
|
|
108
120
|
.pipe(analyzedResultChunk.decompressionStream)
|
|
@@ -115,10 +127,10 @@ export class SmartArchive {
|
|
|
115
127
|
streamFileIntake.signalEnd();
|
|
116
128
|
}
|
|
117
129
|
}, {
|
|
118
|
-
objectMode: true
|
|
130
|
+
objectMode: true,
|
|
119
131
|
});
|
|
120
132
|
archiveStream.pipe(createAnalyzedStream()).pipe(createUnpackStream());
|
|
121
133
|
return streamFileIntake;
|
|
122
134
|
}
|
|
123
135
|
}
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zbWFydGFyY2hpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLnNtYXJ0YXJjaGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssS0FBSyxNQUFNLFlBQVksQ0FBQztBQUVwQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNqRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFakQsT0FBTyxFQUFFLGVBQWUsRUFBd0IsTUFBTSw4QkFBOEIsQ0FBQztBQUlyRixNQUFNLE9BQU8sWUFBWTtJQUN2QixTQUFTO0lBQ0YsTUFBTSxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsTUFBYztRQUMvQyxNQUFNLG9CQUFvQixHQUFHLElBQUksWUFBWSxFQUFFLENBQUM7UUFDaEQsb0JBQW9CLENBQUMsU0FBUyxHQUFHLE1BQU0sQ0FBQztRQUN4QyxPQUFPLG9CQUFvQixDQUFDO0lBQzlCLENBQUM7SUFFTSxNQUFNLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxXQUFtQjtRQUNyRCxNQUFNLG9CQUFvQixHQUFHLElBQUksWUFBWSxFQUFFLENBQUM7UUFDaEQsb0JBQW9CLENBQUMsY0FBYyxHQUFHLFdBQVcsQ0FBQztRQUNsRCxPQUFPLG9CQUFvQixDQUFDO0lBQzlCLENBQUM7SUFFTSxNQUFNLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUNuQyxTQUFxRjtRQUVyRixNQUFNLG9CQUFvQixHQUFHLElBQUksWUFBWSxFQUFFLENBQUM7UUFDaEQsb0JBQW9CLENBQUMsWUFBWSxHQUFHLFNBQVMsQ0FBQztRQUM5QyxPQUFPLG9CQUFv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
|
|
@@ -27,4 +27,4 @@ export class TarTools {
|
|
|
27
27
|
return plugins.tarStream.extract();
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy50YXJ0b29scy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NsYXNzZXMudGFydG9vbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFFeEMsTUFBTSxPQUFPLFFBQVE7SUFHbkIsWUFBWSxrQkFBZ0M7UUFDMUMsSUFBSSxDQUFDLGVBQWUsR0FBRyxrQkFBa0IsQ0FBQztJQUM1QyxDQUFDO0lBRUQsVUFBVTtJQUNILGFBQWEsQ0FBQyxJQUE0QixFQUFFLFFBQWdCLEVBQUUsT0FBd0I7UUFDM0YsT0FBTyxJQUFJLE9BQU8sQ0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtZQUMzQyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsR0FBVSxFQUFFLEVBQUU7Z0JBQ2hGLElBQUksR0FBRyxFQUFFLENBQUM7b0JBQ1IsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNkLENBQUM7cUJBQU0sQ0FBQztvQkFDTixPQUFPLEVBQUUsQ0FBQztnQkFDWixDQUFDO1lBQ0gsQ0FBQyxDQUFDLENBQUM7WUFFSCxLQUFLLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3JCLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNkLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVNLEtBQUssQ0FBQyxhQUFhO1FBQ3hCLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDdEMsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsYUFBYTtJQUNiLHNCQUFzQjtRQUNwQixPQUFPLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDckMsQ0FBQztDQUNGIn0=
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
+
import type { SmartArchive } from './classes.smartarchive.js';
|
|
4
|
+
import * as plugins from './plugins.js';
|
|
5
|
+
declare class DecompressZipTransform extends plugins.smartstream.SmartDuplex<ArrayBufferLike> {
|
|
6
|
+
private streamtools;
|
|
7
|
+
private unzipper;
|
|
8
|
+
constructor();
|
|
9
|
+
}
|
|
10
|
+
export declare class CompressZipTransform extends plugins.stream.Transform {
|
|
11
|
+
files: {
|
|
12
|
+
[fileName: string]: Uint8Array;
|
|
13
|
+
};
|
|
14
|
+
constructor();
|
|
15
|
+
_transform(chunk: Buffer, encoding: BufferEncoding, callback: plugins.stream.TransformCallback): void;
|
|
16
|
+
_flush(callback: plugins.stream.TransformCallback): void;
|
|
17
|
+
}
|
|
18
|
+
export declare class ZipTools {
|
|
19
|
+
smartArchiveRef: SmartArchive;
|
|
20
|
+
constructor(smartArchiveRefArg: SmartArchive);
|
|
21
|
+
getCompressionStream(): CompressZipTransform;
|
|
22
|
+
getDecompressionStream(): DecompressZipTransform;
|
|
23
|
+
}
|
|
24
|
+
export {};
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
class DecompressZipTransform extends plugins.smartstream.SmartDuplex {
|
|
3
|
+
constructor() {
|
|
4
|
+
super({
|
|
5
|
+
objectMode: true,
|
|
6
|
+
writeFunction: async (chunkArg, streamtoolsArg) => {
|
|
7
|
+
this.streamtools ? null : this.streamtools = streamtoolsArg;
|
|
8
|
+
this.unzipper.push(chunkArg, false);
|
|
9
|
+
},
|
|
10
|
+
finalFunction: async () => {
|
|
11
|
+
this.unzipper.push(Buffer.from(''), true);
|
|
12
|
+
await plugins.smartdelay.delayFor(0);
|
|
13
|
+
this.streamtools.push(null);
|
|
14
|
+
}
|
|
15
|
+
});
|
|
16
|
+
this.unzipper = new plugins.fflate.Unzip(async (fileArg) => {
|
|
17
|
+
let resultBuffer;
|
|
18
|
+
fileArg.ondata = async (dataArg, dat, final) => {
|
|
19
|
+
resultBuffer ? resultBuffer = Buffer.concat([resultBuffer, Buffer.from(dat)])
|
|
20
|
+
: resultBuffer = Buffer.from(dat);
|
|
21
|
+
if (final) {
|
|
22
|
+
const streamFile = plugins.smartfile.StreamFile.fromBuffer(resultBuffer);
|
|
23
|
+
streamFile.relativeFilePath = fileArg.name;
|
|
24
|
+
this.streamtools.push(fileArg);
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
fileArg.start();
|
|
28
|
+
});
|
|
29
|
+
this.unzipper.register(plugins.fflate.UnzipInflate);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
// This class wraps fflate's zip in a Node.js Transform stream for compression
|
|
33
|
+
export class CompressZipTransform extends plugins.stream.Transform {
|
|
34
|
+
constructor() {
|
|
35
|
+
super();
|
|
36
|
+
this.files = {};
|
|
37
|
+
}
|
|
38
|
+
_transform(chunk, encoding, callback) {
|
|
39
|
+
// Simple example: storing chunks in memory before finalizing ZIP in _flush
|
|
40
|
+
this.files['file.txt'] = new Uint8Array(chunk);
|
|
41
|
+
callback();
|
|
42
|
+
}
|
|
43
|
+
_flush(callback) {
|
|
44
|
+
plugins.fflate.zip(this.files, (err, zipped) => {
|
|
45
|
+
if (err) {
|
|
46
|
+
callback(err);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
this.push(Buffer.from(zipped));
|
|
50
|
+
callback();
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
export class ZipTools {
|
|
56
|
+
constructor(smartArchiveRefArg) {
|
|
57
|
+
this.smartArchiveRef = smartArchiveRefArg;
|
|
58
|
+
}
|
|
59
|
+
getCompressionStream() {
|
|
60
|
+
return new CompressZipTransform();
|
|
61
|
+
}
|
|
62
|
+
getDecompressionStream() {
|
|
63
|
+
return new DecompressZipTransform();
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy56aXB0b29scy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NsYXNzZXMuemlwdG9vbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFFeEMsTUFBTSxzQkFBdUIsU0FBUSxPQUFPLENBQUMsV0FBVyxDQUFDLFdBQTRCO0lBZW5GO1FBQ0UsS0FBSyxDQUFDO1lBQ0osVUFBVSxFQUFFLElBQUk7WUFDaEIsYUFBYSxFQUFFLEtBQUssRUFBRSxRQUFnQixFQUFFLGNBQWMsRUFBRSxFQUFFO2dCQUN4RCxJQUFJLENBQUMsV0FBVyxDQUFBLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLEdBQUcsY0FBYyxDQUFDO2dCQUMzRCxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDdEMsQ0FBQztZQUNELGFBQWEsRUFBRSxLQUFLLElBQUksRUFBRTtnQkFDeEIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztnQkFDMUMsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDckMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDOUIsQ0FBQztTQUNGLENBQUMsQ0FBQztRQXpCRyxhQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7WUFDNUQsSUFBSSxZQUFvQixDQUFDO1lBQ3pCLE9BQU8sQ0FBQyxNQUFNLEdBQUcsS0FBSyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLEVBQUU7Z0JBQzdDLFlBQVksQ0FBQSxDQUFDLENBQUMsWUFBWSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxZQUFZLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUMxRSxDQUFDLENBQUMsWUFBWSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ3BDLElBQUksS0FBSyxFQUFFLENBQUM7b0JBQ1YsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxDQUFDO29CQUN6RSxVQUFVLENBQUMsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztvQkFDM0MsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ2pDLENBQUM7WUFDSCxDQUFDLENBQUE7WUFDRCxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDbEIsQ0FBQyxDQUFDLENBQUM7UUFjRCxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ3RELENBQUM7Q0FDRjtBQUVELDhFQUE4RTtBQUM5RSxNQUFNLE9BQU8sb0JBQXFCLFNBQVEsT0FBTyxDQUFDLE1BQU0sQ0FBQyxTQUFTO0lBR2hFO1FBQ0UsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztJQUNsQixDQUFDO0lBRUQsVUFBVSxDQUFDLEtBQWEsRUFBRSxRQUF3QixFQUFFLFFBQTBDO1FBQzVGLDJFQUEyRTtRQUMzRSxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFHLElBQUksVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQy9DLFFBQVEsRUFBRSxDQUFDO0lBQ2IsQ0FBQztJQUVELE1BQU0sQ0FBQyxRQUEwQztRQUMvQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxFQUFFO1lBQzdDLElBQUksR0FBRyxFQUFFLENBQUM7Z0JBQ1IsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2hCLENBQUM7aUJBQU0sQ0FBQztnQkFDTixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDL0IsUUFBUSxFQUFFLENBQUM7WUFDYixDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sUUFBUTtJQUduQixZQUFZLGtCQUFnQztRQUMxQyxJQUFJLENBQUMsZUFBZSxHQUFHLGtCQUFrQixDQUFDO0lBQzVDLENBQUM7SUFFTSxvQkFBb0I7UUFDekIsT0FBTyxJQUFJLG9CQUFvQixFQUFFLENBQUM7SUFDcEMsQ0FBQztJQUVNLHNCQUFzQjtRQUMzQixPQUFPLElBQUksc0JBQXNCLEVBQUUsQ0FBQztJQUN0QyxDQUFDO0NBQ0YifQ==
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
1
3
|
import * as path from 'path';
|
|
2
4
|
import * as stream from 'stream';
|
|
3
5
|
export { path, stream };
|
|
4
6
|
import * as smartfile from '@push.rocks/smartfile';
|
|
7
|
+
import * as smartdelay from '@push.rocks/smartdelay';
|
|
5
8
|
import * as smartpath from '@push.rocks/smartpath';
|
|
6
9
|
import * as smartpromise from '@push.rocks/smartpromise';
|
|
7
10
|
import * as smartrequest from '@push.rocks/smartrequest';
|
|
@@ -9,7 +12,7 @@ import * as smartunique from '@push.rocks/smartunique';
|
|
|
9
12
|
import * as smartstream from '@push.rocks/smartstream';
|
|
10
13
|
import * as smartrx from '@push.rocks/smartrx';
|
|
11
14
|
import * as smarturl from '@push.rocks/smarturl';
|
|
12
|
-
export { smartfile, smartpath, smartpromise, smartrequest, smartunique, smartstream, smartrx, smarturl };
|
|
15
|
+
export { smartfile, smartdelay, smartpath, smartpromise, smartrequest, smartunique, smartstream, smartrx, smarturl };
|
|
13
16
|
import * as fileType from 'file-type';
|
|
14
17
|
import * as fflate from 'fflate';
|
|
15
18
|
import tarStream from 'tar-stream';
|
package/dist_ts/plugins.js
CHANGED
|
@@ -4,6 +4,7 @@ import * as stream from 'stream';
|
|
|
4
4
|
export { path, stream };
|
|
5
5
|
// @pushrocks scope
|
|
6
6
|
import * as smartfile from '@push.rocks/smartfile';
|
|
7
|
+
import * as smartdelay from '@push.rocks/smartdelay';
|
|
7
8
|
import * as smartpath from '@push.rocks/smartpath';
|
|
8
9
|
import * as smartpromise from '@push.rocks/smartpromise';
|
|
9
10
|
import * as smartrequest from '@push.rocks/smartrequest';
|
|
@@ -11,10 +12,10 @@ import * as smartunique from '@push.rocks/smartunique';
|
|
|
11
12
|
import * as smartstream from '@push.rocks/smartstream';
|
|
12
13
|
import * as smartrx from '@push.rocks/smartrx';
|
|
13
14
|
import * as smarturl from '@push.rocks/smarturl';
|
|
14
|
-
export { smartfile, smartpath, smartpromise, smartrequest, smartunique, smartstream, smartrx, smarturl };
|
|
15
|
+
export { smartfile, smartdelay, smartpath, smartpromise, smartrequest, smartunique, smartstream, smartrx, smarturl };
|
|
15
16
|
// third party scope
|
|
16
17
|
import * as fileType from 'file-type';
|
|
17
18
|
import * as fflate from 'fflate';
|
|
18
19
|
import tarStream from 'tar-stream';
|
|
19
20
|
export { fileType, fflate, tarStream };
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBRWpDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFFeEIsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQUMvQyxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBRWpELE9BQU8sRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxDQUFDO0FBRXJILG9CQUFvQjtBQUNwQixPQUFPLEtBQUssUUFBUSxNQUFNLFdBQVcsQ0FBQztBQUN0QyxPQUFPLEtBQUssTUFBTSxNQUFNLFFBQVEsQ0FBQztBQUNqQyxPQUFPLFNBQVMsTUFBTSxZQUFZLENBQUM7QUFFbkMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,15 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartarchive",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.20",
|
|
4
4
|
"description": "work with archives",
|
|
5
5
|
"main": "dist_ts/index.js",
|
|
6
6
|
"typings": "dist_ts/index.d.ts",
|
|
7
7
|
"type": "module",
|
|
8
|
-
"scripts": {
|
|
9
|
-
"test": "(tstest test/ --web)",
|
|
10
|
-
"build": "tsbuild --web --allowimplicitany",
|
|
11
|
-
"buildDocs": "tsdoc"
|
|
12
|
-
},
|
|
13
8
|
"repository": {
|
|
14
9
|
"type": "git",
|
|
15
10
|
"url": "git+https://github.com/pushrocks/smartarchive.git"
|
|
@@ -21,25 +16,26 @@
|
|
|
21
16
|
},
|
|
22
17
|
"homepage": "https://github.com/pushrocks/smartarchive#readme",
|
|
23
18
|
"dependencies": {
|
|
24
|
-
"@push.rocks/
|
|
19
|
+
"@push.rocks/smartdelay": "^3.0.5",
|
|
20
|
+
"@push.rocks/smartfile": "^11.0.4",
|
|
25
21
|
"@push.rocks/smartpath": "^5.0.11",
|
|
26
22
|
"@push.rocks/smartpromise": "^4.0.3",
|
|
27
23
|
"@push.rocks/smartrequest": "^2.0.21",
|
|
28
24
|
"@push.rocks/smartrx": "^3.0.7",
|
|
29
|
-
"@push.rocks/smartstream": "^3.0.
|
|
30
|
-
"@push.rocks/smartunique": "^3.0.
|
|
25
|
+
"@push.rocks/smartstream": "^3.0.34",
|
|
26
|
+
"@push.rocks/smartunique": "^3.0.8",
|
|
31
27
|
"@push.rocks/smarturl": "^3.0.7",
|
|
32
28
|
"@types/tar-stream": "^3.1.3",
|
|
33
|
-
"fflate": "^0.8.
|
|
34
|
-
"file-type": "^
|
|
35
|
-
"tar-stream": "^3.1.
|
|
29
|
+
"fflate": "^0.8.2",
|
|
30
|
+
"file-type": "^19.0.0",
|
|
31
|
+
"tar-stream": "^3.1.7",
|
|
36
32
|
"through": "^2.3.8"
|
|
37
33
|
},
|
|
38
34
|
"devDependencies": {
|
|
39
|
-
"@git.zone/tsbuild": "^2.1.
|
|
35
|
+
"@git.zone/tsbuild": "^2.1.72",
|
|
40
36
|
"@git.zone/tsrun": "^1.2.44",
|
|
41
|
-
"@git.zone/tstest": "^1.0.
|
|
42
|
-
"@push.rocks/tapbundle": "^5.0.
|
|
37
|
+
"@git.zone/tstest": "^1.0.88",
|
|
38
|
+
"@push.rocks/tapbundle": "^5.0.17"
|
|
43
39
|
},
|
|
44
40
|
"private": false,
|
|
45
41
|
"files": [
|
|
@@ -56,5 +52,10 @@
|
|
|
56
52
|
],
|
|
57
53
|
"browserslist": [
|
|
58
54
|
"last 1 chrome versions"
|
|
59
|
-
]
|
|
60
|
-
|
|
55
|
+
],
|
|
56
|
+
"scripts": {
|
|
57
|
+
"test": "(tstest test/ --web)",
|
|
58
|
+
"build": "tsbuild --web --allowimplicitany",
|
|
59
|
+
"buildDocs": "tsdoc"
|
|
60
|
+
}
|
|
61
|
+
}
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/bzip2/index.ts
CHANGED
|
@@ -80,6 +80,9 @@ export function unbzip2Stream() {
|
|
|
80
80
|
//console.error(x,'last compressing with', hasBytes, 'bytes in buffer');
|
|
81
81
|
while (!broken && bitReader && hasBytes > bitReader.bytesRead) {
|
|
82
82
|
const result = await decompressAndPush();
|
|
83
|
+
if (!result) {
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
83
86
|
await streamTools.push(result);
|
|
84
87
|
}
|
|
85
88
|
if (!broken) {
|
|
@@ -36,6 +36,8 @@ export class ArchiveAnalyzer {
|
|
|
36
36
|
switch (mimeTypeArg) {
|
|
37
37
|
case 'application/gzip':
|
|
38
38
|
return this.smartArchiveRef.gzipTools.getDecompressionStream();
|
|
39
|
+
case 'application/zip':
|
|
40
|
+
return this.smartArchiveRef.zipTools.getDecompressionStream();
|
|
39
41
|
case 'application/x-bzip2':
|
|
40
42
|
return await this.smartArchiveRef.bzip2Tools.getDecompressionStream(); // replace with your own bzip2 decompression stream
|
|
41
43
|
case 'application/x-tar':
|
|
@@ -56,6 +58,9 @@ export class ArchiveAnalyzer {
|
|
|
56
58
|
firstRun = false;
|
|
57
59
|
const fileType = await plugins.fileType.fileTypeFromBuffer(chunkArg);
|
|
58
60
|
const decompressionStream = await this.getDecompressionStream(fileType?.mime as any);
|
|
61
|
+
/**
|
|
62
|
+
* analyzed stream emits once with this object
|
|
63
|
+
*/
|
|
59
64
|
const result: IAnalyzedResult = {
|
|
60
65
|
fileType,
|
|
61
66
|
isArchive: await this.mimeTypeIsArchive(fileType?.mime),
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import * as paths from './paths.js';
|
|
3
3
|
|
|
4
|
+
import { Bzip2Tools } from './classes.bzip2tools.js';
|
|
4
5
|
import { GzipTools } from './classes.gziptools.js';
|
|
5
6
|
import { TarTools } from './classes.tartools.js';
|
|
6
|
-
import {
|
|
7
|
+
import { ZipTools } from './classes.ziptools.js';
|
|
7
8
|
|
|
8
9
|
import { ArchiveAnalyzer, type IAnalyzedResult } from './classes.archiveanalyzer.js';
|
|
9
10
|
|
|
@@ -32,9 +33,10 @@ export class SmartArchive {
|
|
|
32
33
|
}
|
|
33
34
|
|
|
34
35
|
// INSTANCE
|
|
35
|
-
public tarTools = new TarTools(this);
|
|
36
36
|
public gzipTools = new GzipTools(this);
|
|
37
37
|
public bzip2Tools = new Bzip2Tools(this);
|
|
38
|
+
public tarTools = new TarTools(this);
|
|
39
|
+
public zipTools = new ZipTools(this);
|
|
38
40
|
public archiveAnalyzer = new ArchiveAnalyzer(this);
|
|
39
41
|
|
|
40
42
|
public sourceUrl: string;
|
|
@@ -77,27 +79,32 @@ export class SmartArchive {
|
|
|
77
79
|
public async exportToFs(targetDir: string, fileNameArg?: string): Promise<void> {
|
|
78
80
|
const done = plugins.smartpromise.defer<void>();
|
|
79
81
|
const streamFileStream = await this.exportToStreamOfStreamFiles();
|
|
80
|
-
streamFileStream.pipe(
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
82
|
+
streamFileStream.pipe(
|
|
83
|
+
new plugins.smartstream.SmartDuplex({
|
|
84
|
+
objectMode: true,
|
|
85
|
+
writeFunction: async (chunkArg: plugins.smartfile.StreamFile, streamtools) => {
|
|
86
|
+
const done = plugins.smartpromise.defer<void>();
|
|
87
|
+
console.log(chunkArg.relativeFilePath ? chunkArg.relativeFilePath : 'no relative path');
|
|
88
|
+
const streamFile = chunkArg;
|
|
89
|
+
const readStream = await streamFile.createReadStream();
|
|
90
|
+
await plugins.smartfile.fs.ensureDir(targetDir);
|
|
91
|
+
const writePath = plugins.path.join(
|
|
92
|
+
targetDir,
|
|
93
|
+
streamFile.relativeFilePath || fileNameArg
|
|
94
|
+
);
|
|
95
|
+
await plugins.smartfile.fs.ensureDir(plugins.path.dirname(writePath));
|
|
96
|
+
const writeStream = plugins.smartfile.fsStream.createWriteStream(writePath);
|
|
97
|
+
readStream.pipe(writeStream);
|
|
98
|
+
writeStream.on('finish', () => {
|
|
99
|
+
done.resolve();
|
|
100
|
+
});
|
|
101
|
+
await done.promise;
|
|
102
|
+
},
|
|
103
|
+
finalFunction: async () => {
|
|
93
104
|
done.resolve();
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
finalFunction: async () => {
|
|
98
|
-
done.resolve();
|
|
99
|
-
}
|
|
100
|
-
}));
|
|
105
|
+
},
|
|
106
|
+
})
|
|
107
|
+
);
|
|
101
108
|
return done.promise;
|
|
102
109
|
}
|
|
103
110
|
|
|
@@ -114,21 +121,27 @@ export class SmartArchive {
|
|
|
114
121
|
async (analyzedResultChunk) => {
|
|
115
122
|
if (analyzedResultChunk.fileType?.mime === 'application/x-tar') {
|
|
116
123
|
const tarStream = analyzedResultChunk.decompressionStream as plugins.tarStream.Extract;
|
|
117
|
-
tarStream.on(
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
);
|
|
124
|
+
tarStream.on('entry', async (header, stream, next) => {
|
|
125
|
+
const streamfile = plugins.smartfile.StreamFile.fromStream(stream, header.name);
|
|
126
|
+
streamFileIntake.push(streamfile);
|
|
127
|
+
stream.on('end', function () {
|
|
128
|
+
next(); // ready for next entry
|
|
129
|
+
});
|
|
130
|
+
});
|
|
127
131
|
tarStream.on('finish', function () {
|
|
128
132
|
console.log('finished');
|
|
129
133
|
streamFileIntake.signalEnd();
|
|
130
134
|
});
|
|
131
135
|
analyzedResultChunk.resultStream.pipe(analyzedResultChunk.decompressionStream);
|
|
136
|
+
} else if (analyzedResultChunk.fileType?.mime === 'application/zip') {
|
|
137
|
+
analyzedResultChunk.resultStream
|
|
138
|
+
.pipe(analyzedResultChunk.decompressionStream)
|
|
139
|
+
.pipe(new plugins.smartstream.SmartDuplex({
|
|
140
|
+
objectMode: true,
|
|
141
|
+
writeFunction: async (streamFileArg: plugins.smartfile.StreamFile, streamtools) => {
|
|
142
|
+
streamFileIntake.push(streamFileArg);
|
|
143
|
+
},
|
|
144
|
+
}));
|
|
132
145
|
} else if (analyzedResultChunk.isArchive && analyzedResultChunk.decompressionStream) {
|
|
133
146
|
analyzedResultChunk.resultStream
|
|
134
147
|
.pipe(analyzedResultChunk.decompressionStream)
|
|
@@ -142,8 +155,9 @@ export class SmartArchive {
|
|
|
142
155
|
streamFileIntake.push(streamFile);
|
|
143
156
|
streamFileIntake.signalEnd();
|
|
144
157
|
}
|
|
145
|
-
},
|
|
146
|
-
|
|
158
|
+
},
|
|
159
|
+
{
|
|
160
|
+
objectMode: true,
|
|
147
161
|
}
|
|
148
162
|
);
|
|
149
163
|
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import type { SmartArchive } from './classes.smartarchive.js';
|
|
2
|
+
import * as plugins from './plugins.js';
|
|
3
|
+
|
|
4
|
+
class DecompressZipTransform extends plugins.smartstream.SmartDuplex<ArrayBufferLike> {
|
|
5
|
+
private streamtools: plugins.smartstream.IStreamTools;
|
|
6
|
+
private unzipper = new plugins.fflate.Unzip(async (fileArg) => {
|
|
7
|
+
let resultBuffer: Buffer;
|
|
8
|
+
fileArg.ondata = async (dataArg, dat, final) => {
|
|
9
|
+
resultBuffer? resultBuffer = Buffer.concat([resultBuffer, Buffer.from(dat)])
|
|
10
|
+
: resultBuffer = Buffer.from(dat);
|
|
11
|
+
if (final) {
|
|
12
|
+
const streamFile = plugins.smartfile.StreamFile.fromBuffer(resultBuffer);
|
|
13
|
+
streamFile.relativeFilePath = fileArg.name;
|
|
14
|
+
this.streamtools.push(fileArg);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
fileArg.start();
|
|
18
|
+
});
|
|
19
|
+
constructor() {
|
|
20
|
+
super({
|
|
21
|
+
objectMode: true,
|
|
22
|
+
writeFunction: async (chunkArg: Buffer, streamtoolsArg) => {
|
|
23
|
+
this.streamtools? null : this.streamtools = streamtoolsArg;
|
|
24
|
+
this.unzipper.push(chunkArg, false);
|
|
25
|
+
},
|
|
26
|
+
finalFunction: async () => {
|
|
27
|
+
this.unzipper.push(Buffer.from(''), true);
|
|
28
|
+
await plugins.smartdelay.delayFor(0);
|
|
29
|
+
this.streamtools.push(null);
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
this.unzipper.register(plugins.fflate.UnzipInflate);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
// This class wraps fflate's zip in a Node.js Transform stream for compression
|
|
37
|
+
export class CompressZipTransform extends plugins.stream.Transform {
|
|
38
|
+
files: { [fileName: string]: Uint8Array };
|
|
39
|
+
|
|
40
|
+
constructor() {
|
|
41
|
+
super();
|
|
42
|
+
this.files = {};
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
_transform(chunk: Buffer, encoding: BufferEncoding, callback: plugins.stream.TransformCallback) {
|
|
46
|
+
// Simple example: storing chunks in memory before finalizing ZIP in _flush
|
|
47
|
+
this.files['file.txt'] = new Uint8Array(chunk);
|
|
48
|
+
callback();
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
_flush(callback: plugins.stream.TransformCallback) {
|
|
52
|
+
plugins.fflate.zip(this.files, (err, zipped) => {
|
|
53
|
+
if (err) {
|
|
54
|
+
callback(err);
|
|
55
|
+
} else {
|
|
56
|
+
this.push(Buffer.from(zipped));
|
|
57
|
+
callback();
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
export class ZipTools {
|
|
64
|
+
smartArchiveRef: SmartArchive;
|
|
65
|
+
|
|
66
|
+
constructor(smartArchiveRefArg: SmartArchive) {
|
|
67
|
+
this.smartArchiveRef = smartArchiveRefArg;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
public getCompressionStream() {
|
|
71
|
+
return new CompressZipTransform();
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
public getDecompressionStream() {
|
|
75
|
+
return new DecompressZipTransform();
|
|
76
|
+
}
|
|
77
|
+
}
|
package/ts/plugins.ts
CHANGED
|
@@ -6,6 +6,7 @@ export { path, stream };
|
|
|
6
6
|
|
|
7
7
|
// @pushrocks scope
|
|
8
8
|
import * as smartfile from '@push.rocks/smartfile';
|
|
9
|
+
import * as smartdelay from '@push.rocks/smartdelay';
|
|
9
10
|
import * as smartpath from '@push.rocks/smartpath';
|
|
10
11
|
import * as smartpromise from '@push.rocks/smartpromise';
|
|
11
12
|
import * as smartrequest from '@push.rocks/smartrequest';
|
|
@@ -14,7 +15,7 @@ import * as smartstream from '@push.rocks/smartstream';
|
|
|
14
15
|
import * as smartrx from '@push.rocks/smartrx';
|
|
15
16
|
import * as smarturl from '@push.rocks/smarturl';
|
|
16
17
|
|
|
17
|
-
export { smartfile, smartpath, smartpromise, smartrequest, smartunique, smartstream, smartrx, smarturl };
|
|
18
|
+
export { smartfile, smartdelay, smartpath, smartpromise, smartrequest, smartunique, smartstream, smartrx, smarturl };
|
|
18
19
|
|
|
19
20
|
// third party scope
|
|
20
21
|
import * as fileType from 'file-type';
|