@datatruck/cli 0.13.0 → 0.15.0

package/util/zip-util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unzip = exports.zip = exports.buildArguments = void 0;
+exports.unzip = exports.zip = exports.listZip = exports.checkSSEOption = exports.buildArguments = void 0;
 const process_util_1 = require("./process-util");
 const path_1 = require("path");
 function buildArguments(filters) {
@@ -30,45 +30,101 @@ function buildArguments(filters) {
     return args;
 }
 exports.buildArguments = buildArguments;
-function parseZipStream(chunk, buffer, cb) {
-    const lines = chunk.replaceAll("\b", "").trim().split(/\r?\n/);
-    for (const line of lines) {
-        let matches = null;
-        if ((matches = /^(\d+)% (\d+ )?\+/.exec(line))) {
-            const path = line.slice(line.indexOf("+") + 1).trim();
-            const progress = Number(matches[1]);
-            if (!buffer.currentPaths)
-                buffer.currentPaths = 0;
-            if (path !== buffer.lastPath)
-                buffer.currentPaths++;
-            buffer.lastPath = path;
-            cb({
-                type: "progress",
-                data: { progress, path, files: buffer.currentPaths },
-            });
+let checkSSEOptionResult;
+async function checkSSEOption(command = "7z") {
+    const result = await (0, process_util_1.exec)(command);
+    if (typeof checkSSEOptionResult === "boolean")
+        return checkSSEOptionResult;
+    return (checkSSEOptionResult = result.stdout.includes(" -sse"));
+}
+exports.checkSSEOption = checkSSEOption;
+const listZipLineEqChar = " = ";
+function parseListZipLine(line, buffer) {
+    if (buffer.started) {
+        if (line === "") {
+            if (buffer.opened) {
+                const { stream } = buffer;
+                buffer.stream = {};
+                buffer.opened = false;
+                return stream;
+            }
         }
-        else if (line.startsWith("Add new data to archive:")) {
-            const [, folders] = /(\d+) folders?/i.exec(line) || [, 0];
-            const [, files] = /(\d+) files?/i.exec(line) || [, 0];
-            cb({
-                type: "summary",
-                data: {
-                    folders: Number(folders),
-                    files: Number(files),
-                },
-            });
+        else {
+            const separator = line.indexOf(listZipLineEqChar);
+            const key = line.slice(0, separator);
+            const value = line.slice(separator + listZipLineEqChar.length);
+            buffer.opened = true;
+            buffer.stream[key] = value;
         }
     }
+    else if (line.startsWith("----------")) {
+        buffer.started = true;
+        buffer.stream = {};
+    }
+}
+async function listZip(data) {
+    const buffer = {};
+    await (0, process_util_1.exec)(data.command ?? "7z", ["l", data.path, "-slt"], {}, {
+        log: {
+            exec: data.verbose ?? false,
+            stderr: data.verbose ?? false,
+            stdout: false,
+        },
+        onExitCodeError: (data, error) => (data.exitCode > 2 ? error : false),
+        stdout: {
+            parseLines: true,
+            onData: async (line) => {
+                const stream = parseListZipLine(line, buffer);
+                if (stream) {
+                    await data.onStream?.(stream);
+                }
+            },
+        },
+    });
+}
+exports.listZip = listZip;
+function parseZipLine(line) {
+    let matches = null;
+    line = line.trim();
+    if (!line.length)
+        return;
+    if ((matches = /^(\d+)% (\d+ )?\+/.exec(line))) {
+        const path = line.slice(line.indexOf("+") + 1).trim();
+        const progress = Number(matches[1]);
+        const files = matches[2] ? Number(matches[2]) : 1;
+        return {
+            type: "progress",
+            data: { progress, path, files },
+        };
+    }
+    else if (line.startsWith("Add new data to archive:")) {
+        const [, folders] = /(\d+) folders?/i.exec(line) || [, 0];
+        const [, files] = /(\d+) files?/i.exec(line) || [, 0];
+        return {
+            type: "summary",
+            data: {
+                folders: Number(folders),
+                files: Number(files),
+            },
+        };
+    }
 }
 async function zip(data) {
-    let result = {
+    let summary = {
         folders: 0,
         files: 0,
     };
-    let buffer = {};
+    await data.onProgress?.({
+        current: 0,
+        percent: 0,
+        total: 0,
+        type: "start",
+    });
     await (0, process_util_1.exec)(data.command ?? "7z", [
         "a",
-        "-mmt1",
+        // https://sourceforge.net/p/sevenzip/bugs/2099/,
+        // https://github.com/mcmilk/7-Zip/commit/87ba6f01ba3c5b2ce3186bddfe3d7d880639193c#diff-779d6b1bfa6196b288478f78ca96c4d4c6d7ac6cf8be15a28a20dabc9137ca36L515
+        ...((await checkSSEOption(data.command)) ? [] : ["-mmt1"]),
         "-bsp1",
         ...(data.deleteOnZip ? ["-sdel"] : []),
         (0, path_1.normalize)(data.output),
@@ -79,41 +135,61 @@ async function zip(data) {
         cwd: data.path,
     }, {
         log: data.verbose ?? false,
-        stderr: {
-            toExitCode: true,
-        },
+        onExitCodeError: (data, error) => (data.exitCode > 2 ? error : false),
         stdout: {
-            onData: (chunk) => {
-                parseZipStream(chunk, buffer, (stream) => {
-                    data.onStream?.(stream);
-                    if (stream.type === "summary")
-                        result = stream.data;
-                });
+            onData: async (lines) => {
+                for (const line of lines.split(/\r?\n/)) {
+                    const stream = parseZipLine(line);
+                    if (stream) {
+                        if (stream.type === "summary")
+                            summary = stream.data;
+                        if (stream.type === "progress") {
+                            const current = Math.max(0, stream.data.files - 1);
+                            await data.onProgress?.({
+                                total: summary.files,
+                                current,
+                                path: stream.data.path,
+                                percent: stream.data.progress,
+                            });
+                        }
+                        await data.onStream?.(stream);
+                    }
+                }
             },
         },
     });
-    return result;
+    await data.onProgress?.({
+        total: summary.files,
+        current: summary.files,
+        percent: 100,
+        type: "end",
+    });
+    return summary;
 }
 exports.zip = zip;
-function parseUnzipStream(chunk, cb) {
-    const lines = chunk.trim().split(/\r?\n/g);
-    for (const line of lines) {
-        let matches = null;
-        if ((matches = /^(\d+)% (\d+) \-/.exec(line))) {
-            const progress = Number(matches[1]);
-            const files = Number(matches[2]);
-            const path = line.slice(line.indexOf("-") + 1).trim();
-            cb({
-                type: "progress",
-                data: { progress, path, files },
-            });
-        }
+function parseUnzipLine(line) {
+    let matches = null;
+    if ((matches = /^\s*(\d+)% (\d+) \-/.exec(line))) {
+        const progress = Number(matches[1]);
+        const files = Number(matches[2]);
+        const path = line.slice(line.indexOf("-") + 1).trim();
+        return {
+            type: "progress",
+            data: { percent: progress, path, files },
+        };
     }
 }
 async function unzip(data) {
-    return await (0, process_util_1.exec)(data.command ?? "7z", [
+    let summary = {
+        files: 0,
+    };
+    await data.onProgress?.({
+        current: summary.files,
+        percent: 0,
+        type: "start",
+    });
+    const result = await (0, process_util_1.exec)(data.command ?? "7z", [
         "x",
-        "-mmt1",
         "-bsp1",
         (0, path_1.normalize)(data.input),
         ...buildArguments(data.files ?? []),
@@ -123,13 +199,34 @@ async function unzip(data) {
         log: data.verbose ?? false,
         stderr: { toExitCode: true },
         stdout: {
-            ...(data.onStream && {
-                onData: (chunk) => {
-                    if (data.onStream)
-                        parseUnzipStream(chunk, data.onStream);
+            ...((data.onStream || data.onProgress) && {
+                parseLines: true,
+                onData: async (line) => {
+                    const stream = parseUnzipLine(line);
+                    if (stream) {
+                        if (stream.type === "progress") {
+                            const current = Math.max(0, stream.data.files - 1);
+                            summary.files = stream.data.files;
+                            await data.onProgress?.({
+                                current,
+                                percent: stream.data.percent,
+                                path: stream.data.path,
+                            });
+                        }
+                        await data.onStream?.(stream);
+                    }
                 },
             }),
         },
     });
+    await data.onProgress?.({
+        current: summary.files,
+        percent: 100,
+        type: "end",
+    });
+    return {
+        ...result,
+        ...summary,
+    };
 }
 exports.unzip = unzip;