@datatruck/cli 0.41.10 → 0.41.12

package/lib/repositories/ResticRepository.d.ts

@@ -1,4 +1,4 @@
-import { ResticRepositoryUri } from "../utils/restic";
+import { ResticRepositoryUri, ResticSnapshot } from "../utils/restic";
 import { RepositoryAbstract, RepoBackupData, RepoInitData, RepoRestoreData, RepoFetchSnapshotsData, Snapshot, SnapshotTagObject, SnapshotTagEnum, RepoPruneData, RepoCopyData } from "./RepositoryAbstract";
 export type ResticRepositoryConfig = {
     password: string | {
@@ -26,7 +26,7 @@ export declare class ResticRepository extends RepositoryAbstract<ResticRepositor
         name: SnapshotTagEnum;
         value: string;
     } | null;
-    static parseSnapshotTags(tags: string[]): SnapshotTagObject;
+    static parseSnapshotTags(tags: string[], snapshot: ResticSnapshot): SnapshotTagObject;
     getSource(): string;
     fetchDiskStats(config: ResticRepositoryConfig): Promise<import("../utils/fs").DiskStats | undefined>;
     init(data: RepoInitData): Promise<void>;

package/lib/repositories/ResticRepository.js

@@ -14,6 +14,7 @@ const restic_1 = require("../utils/restic");
 const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
+const dayjs_1 = __importDefault(require("dayjs"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
@@ -49,16 +50,21 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
     static parseSnapshotTag(tag) {
         for (const metaName in RepositoryAbstract_1.SnapshotTagEnum) {
             const name = RepositoryAbstract_1.SnapshotTagEnum[metaName];
-            const prefix = `${ResticRepository.refPrefix}${name}:`;
-            if (tag.startsWith(prefix))
-                return {
-                    name: name,
-                    value: tag.slice(prefix.length),
-                };
+            const tagNames = [name];
+            if (name === RepositoryAbstract_1.SnapshotTagEnum.PACKAGE)
+                tagNames.push("pkg");
+            for (const tagName of tagNames) {
+                const prefix = `${ResticRepository.refPrefix}${tagName}:`;
+                if (tag.startsWith(prefix))
+                    return {
+                        name: name,
+                        value: tag.slice(prefix.length),
+                    };
+            }
         }
         return null;
     }
-    static parseSnapshotTags(tags) {
+    static parseSnapshotTags(tags, snapshot) {
         const result = {
             tags: [],
         };
@@ -71,6 +77,9 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 result.tags.push(tag);
             }
         }
+        result[RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID] ??= result[RepositoryAbstract_1.SnapshotTagEnum.ID].slice(0, 8);
+        result[RepositoryAbstract_1.SnapshotTagEnum.HOSTNAME] ??= snapshot.hostname;
+        result[RepositoryAbstract_1.SnapshotTagEnum.DATE] ??= (0, dayjs_1.default)(snapshot.time).format("YYYY-MM-DDTHH:mm:ss.SSS[Z]");
         return result;
     }
     getSource() {
@@ -97,13 +106,18 @@ 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);
         const filterTask = (0, config_1.createTaskFilter)(data.options.packageTaskNames);
         return result.reduce((items, item) => {
-            const tag = ResticRepository.parseSnapshotTags(item.tags ?? []);
+            const tag = ResticRepository.parseSnapshotTags(item.tags ?? [], item);
             if (!tag.id)
                 return items;
             if (!filterPkg(tag.package))
@@ -195,7 +209,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)();

package/lib/utils/fs.js

@@ -616,7 +616,7 @@ async function checkFreeDiskSpace(stat, inSize) {
     const humanSize = typeof inSize === "number" ? (0, bytes_1.formatBytes)(inSize) : inSize;
     const size = typeof inSize === "number" ? inSize : (0, bytes_1.parseSize)(inSize);
     if (stat.free < size)
-        throw new Error(`Free disk space is less than ${humanSize}: ${(0, bytes_1.formatBytes)(stat.free)}/${(0, bytes_1.formatBytes)(stat.total)}`);
+        throw new Error(`Free disk space is less than ${humanSize}: ${(0, bytes_1.formatBytes)(stat.total - stat.free)}/${(0, bytes_1.formatBytes)(stat.total)}`);
 }
 async function ensureFreeDiskSpace(input, inSize) {
     if (Array.isArray(input)) {

package/lib/utils/restic.d.ts

@@ -9,6 +9,17 @@ export type ResticRepositoryUri = {
     };
     backend: "local" | "rest" | "sftp" | "s3" | "azure" | "gs" | "rclone";
 } & Omit<Uri, "password">;
+export type ResticSnapshot = {
+    time: string;
+    tree: string;
+    paths: string[];
+    tags?: string[];
+    hostname: string;
+    username: string;
+    excludes: string[];
+    id: string;
+    short_id: string;
+};
 export type ResticBackupStream = {
     message_type: "status";
     seconds_elapsed?: number;
@@ -94,17 +105,7 @@ export declare class Restic {
         json?: boolean;
         group?: ("path" | "tags" | "host")[];
         args?: string[];
-    }): Promise<{
-        time: string;
-        tree: string;
-        paths: string[];
-        tags?: string[];
-        hostname: string;
-        username: string;
-        excludes: string[];
-        id: string;
-        short_id: string;
-    }[]>;
+    }): Promise<ResticSnapshot[]>;
     backup(options: {
         cwd?: string;
         tags?: string[];

package/package.json

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