@datatruck/cli 0.15.0 → 0.16.0

package/migrations/001-initial.sql

@@ -11,12 +11,7 @@ CREATE TABLE "backup_session" (
 	"endDate"	TEXT,
 	"state"	TEXT,
 	"error"	TEXT,
-	"progressCurrent" INTEGER,
-	"progressTotal" INTEGER,
-	"progressPercent" INTEGER,
-	"progressStepDescription" TEXT,
-	"progressStepItem" TEXT,
-	"progressStepPercent" INTEGER,
+	"progress" TEXT,
 
 	"snapshotId"	TEXT NOT NULL,
 	"packageName"	TEXT NOT NULL,
@@ -33,12 +28,7 @@ CREATE TABLE "backup_session_task" (
 	"endDate"	TEXT,
 	"state"	TEXT,
 	"error"	TEXT,
-	"progressCurrent" INTEGER,
-	"progressTotal" INTEGER,
-	"progressPercent" INTEGER,
-	"progressStepDescription" TEXT,
-	"progressStepItem" TEXT,
-	"progressStepPercent" INTEGER,
+	"progress" TEXT,
 
 	"sessionId"	INTEGER NOT NULL,
 	"taskName"	TEXT NOT NULL
@@ -53,12 +43,7 @@ CREATE TABLE "backup_session_repository" (
 	"endDate"	TEXT,
 	"state"	TEXT,
 	"error"	TEXT,
-	"progressCurrent" INTEGER,
-	"progressTotal" INTEGER,
-	"progressPercent" INTEGER,
-	"progressStepDescription" TEXT,
-	"progressStepItem" TEXT,
-	"progressStepPercent" INTEGER,
+	"progress" TEXT,
 
 	"sessionId"	INTEGER NOT NULL,
 	"repositoryName"	TEXT NOT NULL,
@@ -74,12 +59,7 @@ CREATE TABLE "restore_session" (
 	"endDate"	TEXT,
 	"state"	TEXT,
 	"error"	TEXT,
-	"progressCurrent" INTEGER,
-	"progressTotal" INTEGER,
-	"progressPercent" INTEGER,
-	"progressStepDescription" TEXT,
-	"progressStepItem" TEXT,
-	"progressStepPercent" INTEGER,
+	"progress" TEXT,
 
 	"snapshotId"	TEXT NOT NULL,
 	"packageName"	TEXT NOT NULL -- ,
@@ -95,12 +75,7 @@ CREATE TABLE "restore_session_task" (
 	"endDate"	TEXT,
 	"state"	TEXT,
 	"error"	TEXT,
-	"progressCurrent" INTEGER,
-	"progressTotal" INTEGER,
-	"progressPercent" INTEGER,
-	"progressStepDescription" TEXT,
-	"progressStepItem" TEXT,
-	"progressStepPercent" INTEGER,
+	"progress" TEXT,
 
 	"sessionId"	INTEGER NOT NULL,
 	"taskName"	TEXT NOT NULL
@@ -115,12 +90,7 @@ CREATE TABLE "restore_session_repository" (
 	"endDate"	TEXT,
 	"state"	TEXT,
 	"error"	TEXT,
-	"progressCurrent" INTEGER,
-	"progressTotal" INTEGER,
-	"progressPercent" INTEGER,
-	"progressStepDescription" TEXT,
-	"progressStepItem" TEXT,
-	"progressStepPercent" INTEGER,
+	"progress" TEXT,
 
 	"sessionId"	INTEGER NOT NULL,
 	"repositoryName"	TEXT NOT NULL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "dependencies": {
     "ajv": "^8.11.0",
     "async": "^3.2.4",

package/util/cli-util.d.ts

@@ -5,7 +5,7 @@ export declare const showCursorCommand = "\u001B[?25h";
 export declare const clearCommand = "\r\u001B[K";
 export declare const hideCursorCommand = "\u001B[?25l";
 export declare function renderSpinner(counter: number): string;
-export declare function renderProgressBar(progress: number, size?: number): string;
+export declare function renderProgressBar(progress: number, size?: number, subprogress?: number): string;
 export declare function logVars(data: Record<string, any>): void;
 export declare function logExec(command: string, argv?: string[], env?: NodeJS.ProcessEnv, logToStderr?: boolean): void;
 export declare function resultColumn(error: Error | null | string, state?: "started" | "ended"): "❌" | " ? " | "✅";

package/util/cli-util.js

@@ -20,12 +20,27 @@ function renderSpinner(counter) {
     return exports.spinnerChars[counter % (exports.spinnerChars.length - 1)];
 }
 exports.renderSpinner = renderSpinner;
-function renderProgressBar(progress, size = 10) {
+function renderProgressBar(progress, size = 10, subprogress) {
     const completeChar = "\u2588";
     const incompleteChar = "\u2591";
     const completedSize = Math.round((progress * size) / 100);
     const restSize = Math.max(size - completedSize, 0);
-    return completeChar.repeat(completedSize) + incompleteChar.repeat(restSize);
+    let result = completeChar.repeat(completedSize) + incompleteChar.repeat(restSize);
+    if (typeof subprogress === "number") {
+        const subprogressChar = Math.round((subprogress * size) / 100);
+        if (subprogressChar === size) {
+            result =
+                result.slice(0, subprogressChar - 1) +
+                    chalk_1.default.white(result[Math.max(0, subprogressChar - 1)]);
+        }
+        else {
+            result =
+                result.slice(0, subprogressChar) +
+                    chalk_1.default.white(result[Math.max(0, subprogressChar - 1)]) +
+                    result.slice(subprogressChar + 1);
+        }
+    }
+    return (0, chalk_2.cyan)(result);
 }
 exports.renderProgressBar = renderProgressBar;
 function logVars(data) {

package/util/fs-util.js

@@ -162,7 +162,7 @@ function sessionTmpDir() {
 exports.sessionTmpDir = sessionTmpDir;
 function tmpDir(prefix, id) {
     if (!id)
-        id = (0, crypto_1.randomBytes)(8).toString("hex");
+        id = (0, crypto_1.randomUUID)().slice(0, 8);
     return (0, path_1.join)(sessionTmpDir(), `${prefix}-${id}`);
 }
 exports.tmpDir = tmpDir;

package/util/process-util.d.ts

@@ -14,6 +14,9 @@ export interface ExecSettingsInterface {
     exec?: boolean;
     pipe?: {
         stream: WriteStream | ReadStream;
+        onWriteProgress?: (data: {
+            totalBytes: number;
+        }) => void;
         onReadProgress?: (data: {
             totalBytes: number;
             currentBytes: number;

package/util/process-util.js

@@ -121,6 +121,17 @@ async function exec(command, argv = [], options = null, settings = {}) {
                     throw new Error(`stdout is not defined`);
                 if (!p.stderr)
                     throw new Error(`stderr is not defined`);
+                if (pipe.onWriteProgress) {
+                    let totalBytes = 0;
+                    p.stdout.on("data", (chunk) => {
+                        totalBytes += chunk.length;
+                        pipe.onWriteProgress({ totalBytes });
+                    });
+                    p.stderr.on("data", (chunk) => {
+                        totalBytes += chunk.length;
+                        pipe.onWriteProgress({ totalBytes });
+                    });
+                }
                 p.stdout.pipe(pipe.stream, { end: false });
                 p.stderr.pipe(pipe.stream, { end: false });
                 p.on("close", tryFinish);

package/util/progress.d.ts

@@ -0,0 +1,12 @@
+export declare type ProgressStats = {
+    percent?: number;
+    total?: number;
+    current?: number;
+    description?: string;
+    payload?: string;
+    format?: "amount" | "size";
+};
+export declare type Progress = {
+    absolute?: ProgressStats;
+    relative?: ProgressStats;
+};

package/util/progress.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/util/zip-util.js

@@ -32,7 +32,11 @@ function buildArguments(filters) {
 exports.buildArguments = buildArguments;
 let checkSSEOptionResult;
 async function checkSSEOption(command = "7z") {
-    const result = await (0, process_util_1.exec)(command);
+    const result = await (0, process_util_1.exec)(command, [], {}, {
+        stdout: {
+            save: true,
+        },
+    });
     if (typeof checkSSEOptionResult === "boolean")
         return checkSSEOptionResult;
     return (checkSSEOptionResult = result.stdout.includes(" -sse"));
@@ -138,7 +142,7 @@ async function zip(data) {
         onExitCodeError: (data, error) => (data.exitCode > 2 ? error : false),
         stdout: {
             onData: async (lines) => {
-                for (const line of lines.split(/\r?\n/)) {
+                for (const line of lines.replaceAll("\b", "").split(/\r?\n/)) {
                     const stream = parseZipLine(line);
                     if (stream) {
                         if (stream.type === "summary")