@datatruck/cli 0.41.11 → 0.41.13

package/lib/repositories/ResticRepository.d.ts

@@ -15,10 +15,23 @@ export declare class ResticRepository extends RepositoryAbstract<ResticRepositor
         RESTIC_PASSWORD_FILE?: string;
         RESTIC_REPOSITORY: string;
     };
+    createEnv(config: ResticRepositoryConfig): Promise<{
+        RESTIC_REPOSITORY: string;
+        RESTIC_PASSWORD: string;
+    } | {
+        RESTIC_REPOSITORY: string;
+        RESTIC_PASSWORD_FILE: string;
+    }>;
     buildEnv(): Promise<{
         RESTIC_PASSWORD?: string;
         RESTIC_PASSWORD_FILE?: string;
         RESTIC_REPOSITORY: string;
+    } | {
+        RESTIC_REPOSITORY: string;
+        RESTIC_PASSWORD: string;
+    } | {
+        RESTIC_REPOSITORY: string;
+        RESTIC_PASSWORD_FILE: string;
     }>;
     static createSnapshotTag(name: SnapshotTagEnum, value: string): string;
     static createSnapshotTags(object: Omit<SnapshotTagObject, "size">): string[];

package/lib/repositories/ResticRepository.js

@@ -22,15 +22,18 @@ exports.resticRepositoryName = "restic";
 class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
     static refPrefix = "dt-";
     env;
+    async createEnv(config) {
+        return {
+            ...(typeof config.password === "string"
+                ? { RESTIC_PASSWORD: config.password }
+                : { RESTIC_PASSWORD_FILE: (0, path_1.resolve)(config.password.path) }),
+            RESTIC_REPOSITORY: await restic_1.Restic.formatRepository(config.repository),
+        };
+    }
     async buildEnv() {
         if (this.env)
             return this.env;
-        return (this.env = {
-            ...(typeof this.config.password === "string"
-                ? { RESTIC_PASSWORD: this.config.password }
-                : { RESTIC_PASSWORD_FILE: (0, path_1.resolve)(this.config.password.path) }),
-            RESTIC_REPOSITORY: await restic_1.Restic.formatRepository(this.config.repository),
-        });
+        return (this.env = await this.createEnv(this.config));
     }
     static createSnapshotTag(name, value) {
         return `${ResticRepository.refPrefix}${name}:${value}`;
@@ -106,7 +109,12 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
         const result = await restic.snapshots({
             tags: [
-                ...(data.options.ids?.map((id) => ResticRepository.createSnapshotTag(id.length === 8 ? RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID : RepositoryAbstract_1.SnapshotTagEnum.ID, id)) ?? []),
+                ...(data.options.ids?.flatMap((id) => id.length === 8
+                    ? [
+                        ResticRepository.createSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.ID, id),
+                        ResticRepository.createSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID, id),
+                    ]
+                    : ResticRepository.createSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.ID, id)) ?? []),
             ],
         });
         const filterPkg = (0, config_1.createPkgFilter)(data.options.packageNames);
@@ -204,7 +212,10 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
         });
         const [lastSnapshot] = await restic.snapshots({
-            tags: [packageTag],
+            tags: [
+                packageTag,
+                `${ResticRepository.refPrefix}pkg:${data.package.name}`,
+            ],
             latest: 1,
         });
         const nodePkg = (0, fs_1.parsePackageFile)();
@@ -285,7 +296,6 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         };
     }
     async copy(data) {
-        const config = data.mirrorRepositoryConfig;
         const [snapshot] = await this.fetchSnapshots({
             options: {
                 ids: [data.snapshot.id],
@@ -296,14 +306,14 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         if (!snapshot)
             throw new error_1.AppError(`Snapshot not found`);
         const restic = new restic_1.Restic({
-            env: await this.buildEnv(),
+            env: await this.createEnv(data.mirrorRepositoryConfig),
             log: data.options.verbose,
         });
         let bytes = 0;
         await restic.copy({
             ids: [snapshot.originalId],
-            fromRepo: await restic_1.Restic.formatRepository(config.repository),
-            fromRepoPassword: config.password,
+            fromRepo: await restic_1.Restic.formatRepository(this.config.repository),
+            fromRepoPassword: this.config.password,
             onStream(data) {
                 if (data.message_type === "status") {
                     bytes = data.total_bytes;

package/lib/utils/async-process.js

@@ -148,7 +148,10 @@ class AsyncProcess {
         this.log = resolveLogOptions($log);
         this.controller = $controller || new AbortController();
         if (this.log?.exec)
-            (0, process_1.logProcess)(command, argv || [], this.log.exec === true ? {} : this.log.exec);
+            (0, process_1.logProcess)(command, argv || [], {
+                env: options.env,
+                ...this.log,
+            });
         if (typeof options.cwd === "string")
             ensureDir(options.cwd);
         this.child = (0, child_process_1.spawn)(command, argv?.map(String) || [], otherOptions ?? {});

package/lib/utils/bytes.js

@@ -7,9 +7,9 @@ const sizeRegex = new RegExp(`^(\\d+(?:\\.\\d+)?)\\s*(${units.join("|")})$`, "i"
 function formatBytes(inBytes, sign = false) {
     let u = 0;
     let n = Math.abs(inBytes);
-    if (n < 0n)
+    if (n < 0)
         throw new Error(`Invalid bytes: ${n.toString()}`);
-    while (n >= 1024n && ++u)
+    while (n >= 1024 && ++u)
         n = n / 1024;
     const result = Number(n).toFixed(n < 10 && u > 0 ? 1 : 0) + units[u];
     return inBytes < 0 ? `-${result}` : `${sign ? "+" : ""}${result}`;

package/lib/utils/restic.js

@@ -259,16 +259,18 @@ class Restic {
             ], {
                 env: {},
             });
-            if (options.onStream) {
-                await copy.stdout.parseLines((line) => {
-                    if (line.startsWith("{") && line.endsWith("}")) {
-                        options.onStream?.(JSON.parse(line));
-                    }
-                });
-            }
-            else {
-                await copy.waitForClose();
-            }
+            let snapshotError;
+            await copy.stdout.parseLines((line) => {
+                if (line.startsWith("{") && line.endsWith("}")) {
+                    options.onStream?.(JSON.parse(line));
+                    // https://github.com/restic/restic/issues/5071
+                }
+                else if (line.includes("failed to load snapshot")) {
+                    snapshotError = line;
+                }
+            });
+            if (typeof snapshotError === "string")
+                throw new Error(`Failed to load snapshot: ${snapshotError}`);
         }
         catch (e_1) {
             env_1.error = e_1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.41.11",
+  "version": "0.41.13",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {