@datatruck/cli 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @datatruck/cli
 
+## 0.3.2
+
+### Patch Changes
+
+- [`8957c3b`](https://github.com/swordev/datatruck/commit/8957c3b5846606db8b825fef357445210f2a3ac3) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix restic progress parser
+
+* [`2989718`](https://github.com/swordev/datatruck/commit/29897185e3d6659359d51ab2212351005137f86c) Thanks [@juanrgm](https://github.com/juanrgm)! - Show closing reason
+
+- [`b9e0843`](https://github.com/swordev/datatruck/commit/b9e0843c7970944cfd30a7d2a543f515adfa60e4) Thanks [@juanrgm](https://github.com/juanrgm)! - Show restic progress in megabytes
+
 ## 0.3.1
 
 ### Patch Changes

package/Repository/ResticRepository.js

@@ -210,8 +210,10 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             onStream: async (streamData) => {
                 if (streamData.message_type === "status") {
                     await data.onProgress({
-                        total: streamData.total_bytes,
-                        current: streamData.bytes_done ?? 0,
+                        total: Number((streamData.total_bytes / 1024 / 1024).toFixed(2)),
+                        current: streamData.bytes_done
+                            ? Number((streamData.bytes_done / 1024 / 1024).toFixed(2))
+                            : 0,
                         percent: Number((streamData.percent_done * 100).toFixed(2)),
                         step: streamData.current_files?.join(", ") ?? "-",
                     });

package/cli.js

@@ -84,10 +84,12 @@ exports.buildArgs = buildArgs;
 function parseArgs(args) {
     program.parse(args);
     const verbose = getGlobalOptions().verbose;
-    (0, process_util_1.onExit)((eventName) => {
+    (0, process_util_1.onExit)((eventName, error) => {
         if (eventName !== "exit") {
             process.stdout.write(cli_util_1.showCursorCommand);
-            console.log("\nClosing...");
+            console.log(`\nClosing... (reason: ${eventName})`);
+            if (error instanceof Error)
+                console.error((0, chalk_1.red)(error.stack));
         }
         if (!verbose)
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "dependencies": {
     "ajv": "^8.11.0",
     "chalk": "^4.1.2",

package/util/ResticUtil.js

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

package/util/process-util.d.ts

@@ -46,5 +46,5 @@ export declare type ExecResultType = {
 };
 export declare function exec(command: string, argv?: string[], options?: SpawnOptions | null, settings?: ExecSettingsInterface): Promise<ExecResultType>;
 declare type EventNameType = "exit" | "SIGINT" | "SIGUSR1" | "SIGUSR2" | "SIGTERM" | "uncaughtException";
-export declare function onExit(cb: (eventName: EventNameType) => void): void;
+export declare function onExit(cb: (eventName: EventNameType, ...args: any[]) => void): void;
 export {};

package/util/process-util.js

@@ -175,7 +175,7 @@ const eventNames = [
 ];
 function onExit(cb) {
     for (const eventName of eventNames) {
-        process.on(eventName, cb.bind(null, eventName));
+        process.on(eventName, (...args) => cb(eventName, ...args));
     }
 }
 exports.onExit = onExit;