@datatruck/cli 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @datatruck/cli
 
+## 0.6.1
+
+### Patch Changes
+
+- [`0ba6229`](https://github.com/swordev/datatruck/commit/0ba6229348c109a59783e72242ab7c0e61f25e36) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix progress bar in restic repository
+
 ## 0.6.0
 
 ### Minor Changes

package/Repository/ResticRepository.js

@@ -210,6 +210,8 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
         const nodePkg = (0, fs_util_1.parsePackageFile)();
         let lastProgress;
+        let totalFilesChanges = 0;
+        const totalFilesChangesLimit = 10;
         await data.onProgress({
             step: "Executing backup action...",
         });
@@ -233,10 +235,22 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             ],
             onStream: async (streamData) => {
                 if (streamData.message_type === "status") {
+                    let showProgressBar = false;
+                    if (totalFilesChanges > totalFilesChangesLimit) {
+                        showProgressBar = true;
+                    }
+                    else if (lastProgress?.total !== streamData.total_files) {
+                        totalFilesChanges = 0;
+                    }
+                    else {
+                        totalFilesChanges++;
+                    }
                     await data.onProgress((lastProgress = {
-                        total: streamData.total_files,
-                        current: streamData.files_done ?? 0,
-                        percent: Number((streamData.percent_done * 100).toFixed(2)),
+                        total: Math.max(lastProgress?.total || 0, streamData.total_files),
+                        current: Math.max(lastProgress?.current || 0, streamData.files_done ?? 0),
+                        percent: showProgressBar
+                            ? Number((streamData.percent_done * 100).toFixed(2))
+                            : 0,
                         step: streamData.current_files?.join(", ") ?? "-",
                     }));
                 }

package/Task/MariadbTask.js

@@ -129,7 +129,7 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
         });
         await (0, process_util_1.exec)(command, [`--prepare`, `--target-dir=${targetPath}`], undefined, {
             log: this.verbose,
-            stderr: { onData: async () => { } },
+            stderr: { onData: () => { } },
         });
     }
     async onRestore(data) {

package/package.json

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

package/util/ResticUtil.d.ts

@@ -84,7 +84,7 @@ export declare class ResticUtil {
         excludeFile?: string[];
         parent?: string;
         allowEmptySnapshot?: boolean;
-        onStream?: (data: BackupStreamType) => Promise<void>;
+        onStream?: (data: BackupStreamType) => void;
     }): Promise<ExecResultType>;
     restore(options: {
         id: string;

package/util/ResticUtil.js

@@ -115,7 +115,7 @@ class ResticUtil {
             },
             stdout: {
                 ...(options.onStream && {
-                    onData: async (data) => {
+                    onData: (data) => {
                         for (const rawLine of data.split("\n")) {
                             const line = rawLine.trim();
                             if (line.startsWith("{") && line.endsWith("}")) {
@@ -125,7 +125,7 @@ class ResticUtil {
                                 }
                                 catch (error) { }
                                 if (parsedLine)
-                                    await options.onStream?.(parsedLine);
+                                    options.onStream?.(parsedLine);
                             }
                         }
                     },

package/util/process-util.d.ts

@@ -23,11 +23,11 @@ export interface ExecSettingsInterface {
     onSpawn?: (p: ChildProcess) => void;
     stdout?: {
         save?: boolean;
-        onData?: (data: string) => Promise<void>;
+        onData?: (data: string) => void;
     };
     stderr?: {
         save?: boolean;
-        onData?: (data: string) => Promise<void>;
+        onData?: (data: string) => void;
         toExitCode?: boolean;
     };
     onExitCodeError?: (data: ExecResultType, error: Error) => Error | false;

package/util/process-util.js

@@ -127,7 +127,7 @@ async function exec(command, argv = [], options = null, settings = {}) {
         if (log.stdout || settings.stdout) {
             if (!p.stdout)
                 throw new Error(`stdout is not defined`);
-            p.stdout.on("data", async (data) => {
+            p.stdout.on("data", (data) => {
                 if (log.stdout)
                     logExecStdout({
                         data: data.toString(),
@@ -137,13 +137,13 @@ async function exec(command, argv = [], options = null, settings = {}) {
                 if (settings.stdout?.save)
                     spawnData.stdout += data.toString();
                 if (settings.stdout?.onData)
-                    await settings.stdout.onData(data.toString());
+                    settings.stdout.onData(data.toString());
             });
         }
         if (log.stderr || settings.stderr) {
             if (!p.stderr)
                 throw new Error(`stderr is not defined`);
-            p.stderr.on("data", async (data) => {
+            p.stderr.on("data", (data) => {
                 if (log.stderr)
                     logExecStdout({
                         data: data.toString(),
@@ -153,7 +153,7 @@ async function exec(command, argv = [], options = null, settings = {}) {
                 if (settings.stderr?.save || settings.stderr?.toExitCode)
                     spawnData.stderr += data.toString();
                 if (settings.stderr?.onData)
-                    await settings.stderr.onData(data.toString());
+                    settings.stderr.onData(data.toString());
             });
         }
         p.on("error", (error) => (spawnError = error)).on("close", (exitCode) => {

package/util/zip-util.d.ts

@@ -26,7 +26,7 @@ export interface ZipDataType {
     includeList?: string;
     excludeList?: string;
     verbose?: boolean;
-    onStream?: (data: ZipStreamDataType) => Promise<void>;
+    onStream?: (data: ZipStreamDataType) => void;
 }
 export interface UnzipDataType {
     command?: string;
@@ -34,7 +34,7 @@ export interface UnzipDataType {
     files?: (ZipDataFilterType | string)[];
     output: string;
     verbose?: boolean;
-    onStream?: (data: UnzipStreamDataType) => Promise<void>;
+    onStream?: (data: UnzipStreamDataType) => void;
 }
 export declare type UnzipStreamDataType = {
     type: "progress";

package/util/zip-util.js

@@ -30,7 +30,7 @@ function buildArguments(filters) {
     return args;
 }
 exports.buildArguments = buildArguments;
-async function parseZipStream(chunk, buffer, cb) {
+function parseZipStream(chunk, buffer, cb) {
     const lines = chunk.trim().split(/\r?\n/g);
     for (const line of lines) {
         let matches = null;
@@ -42,7 +42,7 @@ async function parseZipStream(chunk, buffer, cb) {
             if (path !== buffer.lastPath)
                 buffer.currentPaths++;
             buffer.lastPath = path;
-            await cb({
+            cb({
                 type: "progress",
                 data: { progress, path, files: buffer.currentPaths },
             });
@@ -50,7 +50,7 @@ async function parseZipStream(chunk, buffer, cb) {
         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];
-            await cb({
+            cb({
                 type: "summary",
                 data: {
                     folders: Number(folders),
@@ -83,9 +83,9 @@ async function zip(data) {
             toExitCode: true,
         },
         stdout: {
-            onData: async (chunk) => {
-                parseZipStream(chunk, buffer, async (stream) => {
-                    await data.onStream?.(stream);
+            onData: (chunk) => {
+                parseZipStream(chunk, buffer, (stream) => {
+                    data.onStream?.(stream);
                     if (stream.type === "summary")
                         result = stream.data;
                 });
@@ -95,7 +95,7 @@ async function zip(data) {
     return result;
 }
 exports.zip = zip;
-async function parseUnzipStream(chunk, cb) {
+function parseUnzipStream(chunk, cb) {
     const lines = chunk.trim().split(/\r?\n/g);
     for (const line of lines) {
         let matches = null;
@@ -103,7 +103,7 @@ async function parseUnzipStream(chunk, cb) {
             const progress = Number(matches[1]);
             const files = Number(matches[2]);
             const path = line.slice(line.indexOf("-") + 1).trim();
-            await cb({
+            cb({
                 type: "progress",
                 data: { progress, path, files },
             });
@@ -124,7 +124,7 @@ async function unzip(data) {
         stderr: { toExitCode: true },
         stdout: {
             ...(data.onStream && {
-                onData: async (chunk) => {
+                onData: (chunk) => {
                     if (data.onStream)
                         parseUnzipStream(chunk, data.onStream);
                 },