@datatruck/cli 0.32.3 → 0.34.0

package/lib/index.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseArgs = exports.SnapshotsAction = exports.RestoreAction = exports.PruneAction = exports.InitAction = exports.CopyAction = exports.ConfigAction = exports.CleanCacheAction = exports.BackupAction = void 0;
-var BackupAction_1 = require("./Action/BackupAction");
+var BackupAction_1 = require("./actions/BackupAction");
 Object.defineProperty(exports, "BackupAction", { enumerable: true, get: function () { return BackupAction_1.BackupAction; } });
-var CleanCacheAction_1 = require("./Action/CleanCacheAction");
+var CleanCacheAction_1 = require("./actions/CleanCacheAction");
 Object.defineProperty(exports, "CleanCacheAction", { enumerable: true, get: function () { return CleanCacheAction_1.CleanCacheAction; } });
-var ConfigAction_1 = require("./Action/ConfigAction");
+var ConfigAction_1 = require("./actions/ConfigAction");
 Object.defineProperty(exports, "ConfigAction", { enumerable: true, get: function () { return ConfigAction_1.ConfigAction; } });
-var CopyAction_1 = require("./Action/CopyAction");
+var CopyAction_1 = require("./actions/CopyAction");
 Object.defineProperty(exports, "CopyAction", { enumerable: true, get: function () { return CopyAction_1.CopyAction; } });
-var InitAction_1 = require("./Action/InitAction");
+var InitAction_1 = require("./actions/InitAction");
 Object.defineProperty(exports, "InitAction", { enumerable: true, get: function () { return InitAction_1.InitAction; } });
-var PruneAction_1 = require("./Action/PruneAction");
+var PruneAction_1 = require("./actions/PruneAction");
 Object.defineProperty(exports, "PruneAction", { enumerable: true, get: function () { return PruneAction_1.PruneAction; } });
-var RestoreAction_1 = require("./Action/RestoreAction");
+var RestoreAction_1 = require("./actions/RestoreAction");
 Object.defineProperty(exports, "RestoreAction", { enumerable: true, get: function () { return RestoreAction_1.RestoreAction; } });
-var SnapshotsAction_1 = require("./Action/SnapshotsAction");
+var SnapshotsAction_1 = require("./actions/SnapshotsAction");
 Object.defineProperty(exports, "SnapshotsAction", { enumerable: true, get: function () { return SnapshotsAction_1.SnapshotsAction; } });
 var cli_1 = require("./cli");
 Object.defineProperty(exports, "parseArgs", { enumerable: true, get: function () { return cli_1.parseArgs; } });

package/lib/{Repository → repositories}/DatatruckRepository.d.ts

@@ -50,8 +50,12 @@ export declare class DatatruckRepository extends RepositoryAbstract<DatatruckRep
     init(data: RepoInitData): Promise<void>;
     prune(data: RepoPruneData): Promise<void>;
     fetchSnapshots(data: RepoFetchSnapshotsData): Promise<Snapshot[]>;
-    backup(data: RepoBackupData<DatatruckPackageRepositoryConfig>): Promise<void>;
-    copy(data: RepoCopyData<DatatruckRepositoryConfig>): Promise<void>;
+    backup(data: RepoBackupData<DatatruckPackageRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
+    copy(data: RepoCopyData<DatatruckRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
     restore(data: RepoRestoreData<DatatruckPackageRepositoryConfig>): Promise<void>;
 }
 export {};

package/lib/{Repository → repositories}/DatatruckRepository.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatatruckRepository = exports.datatruckRepositoryName = void 0;
-const AppError_1 = require("../Error/AppError");
 const cli_1 = require("../utils/cli");
 const crypto_1 = require("../utils/crypto");
 const client_1 = require("../utils/datatruck/client");
+const error_1 = require("../utils/datatruck/error");
 const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
@@ -203,6 +203,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }
         scanner.end();
         // Meta
+        const size = Object.values(tarStats).reduce((total, { size }) => total + size, 0);
         const metaPath = `${snapshotName}/meta.json`;
         const nodePkg = (0, fs_1.parsePackageFile)();
         const meta = {
@@ -212,12 +213,15 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             package: data.package.name,
             task: data.package.task?.name,
             version: nodePkg.version,
-            size: Object.values(tarStats).reduce((total, { size }) => total + size, 0),
+            size,
             tarStats,
         };
         if (data.options.verbose)
             (0, cli_1.logExec)(`Writing metadata into ${fs.resolvePath(metaPath)}`);
         await fs.writeFile(`${snapshotName}/meta.json`, JSON.stringify(meta));
+        return {
+            bytes: size,
+        };
     }
     async copy(data) {
         const sourceFs = (0, client_1.createFs)(this.config.backend);
@@ -236,6 +240,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await targetFs.ensureEmptyDir(tmpSnapshotName);
         const entries = await sourceFs.readdir(snapshotName);
         const total = entries.length;
+        let bytes = 0;
         let current = 0;
         for (const entry of entries) {
             const absolute = {
@@ -250,7 +255,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             const sourceEntry = `${snapshotName}/${entry}`;
             const targetEntry = `${tmpSnapshotName}/${entry}`;
             if (targetFs.isLocal()) {
-                await sourceFs.download(sourceEntry, targetFs.resolvePath(targetEntry), {
+                const downloaded = await sourceFs.download(sourceEntry, targetFs.resolvePath(targetEntry), {
                     onProgress: (progress) => data.onProgress({
                         absolute,
                         relative: {
@@ -260,12 +265,13 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                         },
                     }),
                 });
+                bytes += downloaded.bytes;
             }
             else {
                 const tempDir = await (0, temp_1.mkTmpDir)(exports.datatruckRepositoryName, "repo", "remote-copy", entry);
                 const tempFile = (0, path_1.join)(tempDir, entry);
                 try {
-                    await sourceFs.download(sourceEntry, tempFile, {
+                    const downloaded = await sourceFs.download(sourceEntry, tempFile, {
                         onProgress: (progress) => data.onProgress({
                             absolute,
                             relative: {
@@ -275,6 +281,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                             },
                         }),
                     });
+                    bytes += downloaded.bytes;
                     await targetFs.upload(tempFile, targetEntry);
                 }
                 finally {
@@ -283,6 +290,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             }
         }
         await targetFs.rename(tmpSnapshotName, snapshotName);
+        return { bytes };
     }
     async restore(data) {
         const fs = (0, client_1.createFs)(this.config.backend);
@@ -295,7 +303,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
         });
         if (!snapshot)
-            throw new AppError_1.AppError("Snapshot not found");
+            throw new error_1.AppError("Snapshot not found");
         const snapshotName = DatatruckRepository.buildSnapshotName(snapshot, data.package);
         const meta = await DatatruckRepository.parseMetaData(await fs.readFile(`${snapshotName}/meta.json`));
         const progress = (0, fs_1.createProgress)({ onProgress: data.onProgress });

package/lib/{Repository → repositories}/GitRepository.d.ts

@@ -22,7 +22,11 @@ export declare class GitRepository extends RepositoryAbstract<GitRepositoryConfi
     init(data: RepoInitData): Promise<void>;
     prune(data: RepoPruneData): Promise<void>;
     fetchSnapshots(data: RepoFetchSnapshotsData): Promise<Snapshot[]>;
-    backup(data: RepoBackupData<GitPackageRepositoryConfig>): Promise<void>;
-    copy(data: RepoCopyData<GitRepositoryConfig>): Promise<void>;
+    backup(data: RepoBackupData<GitPackageRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
+    copy(data: RepoCopyData<GitRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
     restore(data: RepoRestoreData<GitPackageRepositoryConfig>): Promise<void>;
 }

package/lib/{Repository → repositories}/GitRepository.js

@@ -187,6 +187,8 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         if (await git.haveChanges())
             await git.exec(["commit", "-m", data.snapshot.id]);
         const nodePkg = (0, fs_1.parsePackageFile)();
+        const size = (await (0, fs_1.fastFolderSizeAsync)(tmpPath)) -
+            (await (0, fs_1.fastFolderSizeAsync)((0, path_1.join)(tmpPath, ".git")));
         const meta = GitRepository.buildSnapshotTag({
             id: data.snapshot.id,
             shortId: data.snapshot.id.slice(0, 8),
@@ -195,16 +197,19 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             package: data.package.name,
             task: data.package.task?.name,
             version: nodePkg.version,
-            size: ((await (0, fs_1.fastFolderSizeAsync)(tmpPath)) -
-                (await (0, fs_1.fastFolderSizeAsync)((0, path_1.join)(tmpPath, ".git")))).toString(),
+            size: size.toString(),
         });
         await git.addTag(meta.name, meta.message);
         await git.push({ branchName });
         await git.pushTags();
         await (0, promises_1.rm)(tmpPath, { recursive: true });
+        return {
+            bytes: size,
+        };
     }
-    copy(data) {
+    async copy(data) {
         throw new Error("Method not implemented.");
+        return { bytes: 0 };
     }
     async restore(data) {
         const restorePath = data.snapshotPath;

package/lib/{Repository → repositories}/RepositoryAbstract.d.ts

@@ -1,9 +1,7 @@
-import type { BackupActionOptions } from "../Action/BackupAction";
-import type { InitActionOptions } from "../Action/InitAction";
-import type { RestoreActionOptions } from "../Action/RestoreAction";
-import type { ExtendedSnapshot, SnapshotsActionOptions } from "../Action/SnapshotsAction";
-import type { PackageConfig } from "../Config/PackageConfig";
-import type { RepositoryConfig } from "../Config/RepositoryConfig";
+import type { BackupActionOptions } from "../actions/BackupAction";
+import type { RestoreActionOptions } from "../actions/RestoreAction";
+import type { ExtendedSnapshot, SnapshotsActionOptions } from "../actions/SnapshotsAction";
+import type { PackageConfig, RepositoryConfig } from "../utils/datatruck/config-type";
 import { type DiskStats } from "../utils/fs";
 import type { Progress } from "../utils/progress";
 export type PreSnapshot = {
@@ -18,7 +16,9 @@ export type Snapshot = PreSnapshot & {
     size: number;
 };
 export type RepoInitData = {
-    options: InitActionOptions;
+    options: {
+        verbose?: boolean;
+    };
 };
 export type RepoFetchSnapshotsData = {
     options: Pick<SnapshotsActionOptions, "ids" | "packageNames" | "packageTaskNames" | "verbose" | "tags">;
@@ -83,7 +83,11 @@ export declare abstract class RepositoryAbstract<TConfig> {
     abstract init(data: RepoInitData): Promise<void>;
     abstract prune(data: RepoPruneData): Promise<void>;
     abstract fetchSnapshots(data: RepoFetchSnapshotsData): Promise<Snapshot[]>;
-    abstract copy(data: RepoCopyData<TConfig>): Promise<void>;
-    abstract backup(data: RepoBackupData<unknown>): Promise<void>;
+    abstract copy(data: RepoCopyData<TConfig>): Promise<{
+        bytes: number;
+    }>;
+    abstract backup(data: RepoBackupData<unknown>): Promise<{
+        bytes: number;
+    }>;
     abstract restore(data: RepoRestoreData<unknown>): Promise<void>;
 }

package/lib/{Repository → repositories}/ResticRepository.d.ts

@@ -33,7 +33,11 @@ export declare class ResticRepository extends RepositoryAbstract<ResticRepositor
     init(data: RepoInitData): Promise<void>;
     fetchSnapshots(data: RepoFetchSnapshotsData): Promise<Snapshot[]>;
     prune(data: RepoPruneData): Promise<void>;
-    backup(data: RepoBackupData<ResticPackageRepositoryConfig>): Promise<void>;
-    copy(data: RepoCopyData<ResticRepositoryConfig>): Promise<void>;
+    backup(data: RepoBackupData<ResticPackageRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
+    copy(data: RepoCopyData<ResticRepositoryConfig>): Promise<{
+        bytes: number;
+    }>;
     restore(data: RepoRestoreData<ResticPackageRepositoryConfig>): Promise<void>;
 }

package/lib/{Repository → repositories}/ResticRepository.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResticRepository = exports.resticRepositoryName = void 0;
-const AppError_1 = require("../Error/AppError");
 const Restic_1 = require("../utils/Restic");
 const cli_1 = require("../utils/cli");
+const error_1 = require("../utils/datatruck/error");
 const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
@@ -175,7 +175,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             });
         }
         if (data.options.tags?.some((tag) => tag.startsWith(ResticRepository.refPrefix)))
-            throw new AppError_1.AppError(`Tag prefix is not allowed`);
+            throw new error_1.AppError(`Tag prefix is not allowed`);
         const packageTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.PACKAGE, data.package.name);
         data.onProgress({
             relative: {
@@ -204,10 +204,6 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             allowEmptySnapshot: true,
             excludeFile: gitignorePath ? [gitignorePath] : undefined,
             parent: lastSnapshot?.id,
-            // https://github.com/restic/restic/pull/3200
-            ...((await restic.checkBackupSetPathSupport()) && {
-                setPaths: [`/datatruck/${data.package.name}`],
-            }),
             tags: [
                 ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.ID, data.snapshot.id),
                 ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID, data.snapshot.id.slice(0, 8)),
@@ -255,9 +251,9 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
         });
         if (typeof resticSnapshotId !== "string")
-            throw new AppError_1.AppError(`Restic snapshot id is is not defined`);
+            throw new error_1.AppError(`Restic snapshot id is is not defined`);
         if (typeof resticTotalBytes !== "number")
-            throw new AppError_1.AppError(`Restic snapshot total bytes is not defined`);
+            throw new error_1.AppError(`Restic snapshot total bytes is not defined`);
         const sizeTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SIZE, resticTotalBytes.toString());
         await restic.exec(["tag", "--add", sizeTag, resticSnapshotId]);
         data.onProgress({
@@ -267,6 +263,9 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 percent: 100,
             },
         });
+        return {
+            bytes: resticTotalBytes,
+        };
     }
     async copy(data) {
         const config = data.mirrorRepositoryConfig;
@@ -274,10 +273,11 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             options: {
                 ids: [data.snapshot.id],
                 packageNames: [data.package.name],
+                verbose: data.options.verbose,
             },
         });
         if (!snapshot)
-            throw new AppError_1.AppError(`Snapshot not found`);
+            throw new error_1.AppError(`Snapshot not found`);
         const restic = new Restic_1.Restic({
             env: {
                 ...(await this.buildEnv()),
@@ -288,9 +288,16 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
             log: data.options.verbose,
         });
+        let bytes = 0;
         await restic.copy({
             id: snapshot.originalId,
+            onStream(data) {
+                if (data.message_type === "status") {
+                    bytes = data.total_bytes;
+                }
+            },
         });
+        return { bytes };
     }
     async restore(data) {
         const restorePath = data.snapshotPath;
@@ -305,7 +312,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             },
         });
         if (!snapshot)
-            throw new AppError_1.AppError(`Snapshot not found`);
+            throw new error_1.AppError(`Snapshot not found`);
         await restic.restore({
             id: snapshot.originalId,
             target: restorePath,

package/lib/{Task → tasks}/MssqlTask.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MssqlTask = exports.mssqlTaskName = void 0;
-const AppError_1 = require("../Error/AppError");
 const config_1 = require("../utils/datatruck/config");
+const error_1 = require("../utils/datatruck/error");
 const fs_1 = require("../utils/fs");
 const process_1 = require("../utils/process");
 const temp_1 = require("../utils/temp");
@@ -88,7 +88,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
             const databasePath = (0, path_1.join)(snapshotPath, file);
             const exists = await this.fetchDatabaseNames(databaseName);
             if (exists.length)
-                throw new AppError_1.AppError(`Target database already exists: ${databaseName}`);
+                throw new error_1.AppError(`Target database already exists: ${databaseName}`);
             await this.exec(`RESTORE DATABASE [${databaseName}] FROM disk='${databasePath}'`);
         }
     }

package/lib/{Task → tasks}/MysqlDumpTask.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlDumpTask = exports.mysqlDumpTaskName = void 0;
-const AppError_1 = require("../Error/AppError");
 const async_1 = require("../utils/async");
 const cli_1 = require("../utils/cli");
 const config_1 = require("../utils/datatruck/config");
+const error_1 = require("../utils/datatruck/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const mysql_1 = require("../utils/mysql");
@@ -88,7 +88,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
                             const successCsvDump = files.length === 2 &&
                                 files.every((file) => file === schemaFile || file === dataFile);
                             if (!successCsvDump)
-                                throw new AppError_1.AppError(`Invalid csv dump files: ${files.join(", ")}`);
+                                throw new error_1.AppError(`Invalid csv dump files: ${files.join(", ")}`);
                             const schemaPath = (0, path_1.join)(snapshotPath, `${tableName}${suffix.tableSchema}`);
                             await (0, fs_1.safeRename)((0, path_1.join)(tableSharedPath, schemaFile), schemaPath);
                             await compressAndClean?.(schemaPath);
@@ -200,7 +200,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
         // Database check
         if (files.some((f) => f.endsWith(suffix.database)) &&
             !(await sql.isDatabaseEmpty(database.name)))
-            throw new AppError_1.AppError(`Target database is not empty: ${database.name}`);
+            throw new error_1.AppError(`Target database is not empty: ${database.name}`);
         // Table check
         const restoreTables = [
             ...new Set(...files
@@ -210,7 +210,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
         const serverTables = await sql.fetchTableNames(database.name);
         const errorTables = restoreTables.filter((v) => serverTables.includes(v));
         if (errorTables.length)
-            throw new AppError_1.AppError(`Target table already exists: ${errorTables.join(", ")}`);
+            throw new error_1.AppError(`Target table already exists: ${errorTables.join(", ")}`);
         // Data check
         const dataFiles = files.filter((f) => f.endsWith(suffix.tableData));
         const sharedDir = dataFiles.length

package/lib/{Task → tasks}/ScriptTask.d.ts

@@ -1,5 +1,5 @@
-import { PackageConfig } from "../Config/PackageConfig";
-import { PreSnapshot } from "../Repository/RepositoryAbstract";
+import { PreSnapshot } from "../repositories/RepositoryAbstract";
+import type { PackageConfig } from "../utils/datatruck/config-type";
 import { ProcessEnv } from "../utils/process";
 import { SpawnStep } from "../utils/spawnSteps";
 import { TaskBackupData, TaskPrepareRestoreData, TaskRestoreData, TaskAbstract } from "./TaskAbstract";

package/lib/{Task → tasks}/SqlDumpTaskAbstract.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDumpTaskAbstract = void 0;
-const AppError_1 = require("../Error/AppError");
 const cli_1 = require("../utils/cli");
 const config_1 = require("../utils/datatruck/config");
+const error_1 = require("../utils/datatruck/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
 const temp_1 = require("../utils/temp");
@@ -23,7 +23,7 @@ function serializeSqlFile(input) {
         return `${input.table}.table.sql`;
     }
     else {
-        throw new AppError_1.AppError(`Invalid sql file input: ${JSON.stringify(input)}`);
+        throw new error_1.AppError(`Invalid sql file input: ${JSON.stringify(input)}`);
     }
 }
 function parseSqlFile(fileName) {
@@ -177,7 +177,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         // Database check
         const databaseItems = items.filter((v) => v.database);
         if (databaseItems.length && !(await this.onDatabaseIsEmpty(database.name)))
-            throw new AppError_1.AppError(`Target database is not empty: ${database.name}`);
+            throw new error_1.AppError(`Target database is not empty: ${database.name}`);
         // Table check
         const restoreTables = items
             .filter((v) => v.table)
@@ -185,7 +185,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         const serverTables = await this.onFetchTableNames(database.name);
         const errorTables = restoreTables.filter((v) => serverTables.includes(v));
         if (errorTables.length) {
-            throw new AppError_1.AppError(`Target table already exists: ${errorTables.join(", ")}`);
+            throw new error_1.AppError(`Target table already exists: ${errorTables.join(", ")}`);
         }
         await this.onCreateDatabase(database);
         if (this.verbose)

package/lib/{Task → tasks}/TaskAbstract.d.ts

@@ -1,7 +1,7 @@
-import { BackupActionOptions } from "../Action/BackupAction";
-import { RestoreActionOptions } from "../Action/RestoreAction";
-import { PackageConfig } from "../Config/PackageConfig";
-import { PreSnapshot } from "../Repository/RepositoryAbstract";
+import { BackupActionOptions } from "../actions/BackupAction";
+import { RestoreActionOptions } from "../actions/RestoreAction";
+import { PreSnapshot } from "../repositories/RepositoryAbstract";
+import type { PackageConfig } from "../utils/datatruck/config-type";
 import { Progress } from "../utils/progress";
 type TaskCommonData = {
     package: PackageConfig;

package/lib/utils/DataFormat.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataFormat = exports.dataFormats = void 0;
-const AppError_1 = require("../Error/AppError");
+const error_1 = require("./datatruck/error");
 const stream_1 = require("./stream");
 const tty_table_1 = __importDefault(require("tty-table"));
 const util_1 = require("util");
@@ -84,12 +84,12 @@ class DataFormat {
             const tpl = options?.tpl || {};
             if (!(name in tpl)) {
                 const tplNames = Object.keys(tpl).join(", ");
-                throw new AppError_1.AppError(`Template name not found: ${name} (valid names: ${tplNames})`);
+                throw new error_1.AppError(`Template name not found: ${name} (valid names: ${tplNames})`);
             }
             return tpl[name]();
         }
         else {
-            throw new AppError_1.AppError(`Invalid output format: ${format}`);
+            throw new error_1.AppError(`Invalid output format: ${format}`);
         }
     }
 }

package/lib/utils/Restic.d.ts

@@ -68,6 +68,7 @@ export declare class Restic {
         paths?: string[];
         latest?: number;
         json?: boolean;
+        snapshotIds?: string[];
     }): Promise<{
         time: string;
         tree: string;
@@ -79,7 +80,6 @@ export declare class Restic {
         id: string;
         short_id: string;
     }[]>;
-    checkBackupSetPathSupport(): Promise<boolean>;
     backup(options: {
         cwd?: string;
         tags?: string[];
@@ -94,7 +94,7 @@ export declare class Restic {
     }): Promise<ExecResult>;
     copy(options: {
         id: string;
-        onStream?: (data: ResticBackupStream) => Promise<void>;
+        onStream?: (data: ResticBackupStream) => void;
     }): Promise<ExecResult>;
     restore(options: {
         id: string;

package/lib/utils/Restic.js

@@ -6,6 +6,7 @@ const process_1 = require("./process");
 const string_1 = require("./string");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
+const emptySnapshotTag = "empty-snapshot";
 class Restic {
     options;
     constructor(options) {
@@ -95,19 +96,12 @@ class Restic {
             ...(options.json ? ["--json"] : []),
             ...(options.paths?.flatMap((path) => ["--path", path]) ?? []),
             ...(options.latest ? ["--latest", options.latest.toString()] : []),
+            ...(options.snapshotIds || []),
         ], {
             stdout: { save: true },
         });
         return JSON.parse(result.stdout);
     }
-    async checkBackupSetPathSupport() {
-        /*const result = await this.exec(["backup", "--set-path"], {
-          onExitCodeError: () => false,
-          stderr: { save: true },
-        });
-        return result.stderr.includes("flag needs an argument");*/
-        return false;
-    }
     async backup(options) {
         const exec = async () => await this.exec([
             "backup",
@@ -151,9 +145,10 @@ class Restic {
                 error.message.includes("unable to save snapshot: snapshot is empty")) {
                 if (options.createEmptyDir) {
                     const emptyPath = await options.createEmptyDir();
-                    await (0, promises_1.writeFile)(`${emptyPath}/.empty`, "");
+                    await (0, promises_1.writeFile)(`${emptyPath}/.${emptySnapshotTag}`, "");
                     return await this.backup({
                         ...options,
+                        tags: [...(options.tags || []), emptySnapshotTag],
                         cwd: emptyPath,
                         allowEmptySnapshot: false,
                         paths: ["."],
@@ -197,10 +192,14 @@ class Restic {
                     progressTimeout = setTimeout(progressRutine, progressInterval);
             }
         }
+        const snapshots = await this.snapshots({
+            snapshotIds: [options.id],
+            json: true,
+        });
         if (typeof progressInterval === "number")
             progressRutine();
         try {
-            return await this.exec(["restore", "--json", options.id, "--target", options.target], {
+            const result = await this.exec(["restore", "--json", options.id, "--target", options.target], {
                 stderr: {
                     toExitCode: true,
                 },
@@ -214,6 +213,9 @@ class Restic {
                     }),
                 },
             });
+            if (snapshots.at(0)?.tags?.includes(emptySnapshotTag))
+                await (0, promises_1.rm)((0, path_1.join)(options.target, `.${emptySnapshotTag}`));
+            return result;
         }
         finally {
             clearTimeout(progressTimeout);

package/lib/utils/cli.d.ts

@@ -1,11 +1,17 @@
 /// <reference types="node" />
+import { Listr3TaskResultEnd } from "./list";
 export declare const showCursorCommand = "\u001B[?25h";
 export declare function renderProgressBar(progress: number, size?: number, subprogress?: number): string;
 export declare function logExec(command: string, argv?: string[], env?: NodeJS.ProcessEnv, logToStderr?: boolean): void;
 export declare function renderResult(error: Error | null | string | boolean | undefined, color?: boolean): string;
 export declare function renderError(error: Error | null | string | undefined, verbose?: number): string;
+export declare function renderListTaskItem<T extends Record<string, any>>(item: Listr3TaskResultEnd<T>, color: boolean | undefined, config: {
+    [K in Listr3TaskResultEnd<T>["key"]]: (data: Extract<Listr3TaskResultEnd<T>, {
+        key: K;
+    }>["data"]) => string | number | string[] | Record<string, string | number>;
+}): string;
 export declare function renderObject(object: Record<string, any>, color?: boolean): string;
-export type OptionsType<T1, T2 extends {
+export type OptionsConfig<T1, T2 extends {
     [K in keyof T1]: unknown;
 }> = {
     [K in keyof Required<T1>]: {
@@ -18,8 +24,8 @@ export type OptionsType<T1, T2 extends {
 };
 export declare function parseOptions<T1, T2 extends {
     [K in keyof T1]: unknown;
-}>(object: T1, options: OptionsType<T1, T2>): T2;
+}>(object: T1, options: OptionsConfig<T1, T2>): T2;
 export declare function stringifyOptions<T1, T2 extends {
     [K in keyof T1]: unknown;
-}>(options: OptionsType<T1, T2>, object: any): string[];
+}>(options: OptionsConfig<T1, T2>, object: any): string[];
 export declare function confirm(message: string): Promise<unknown>;

package/lib/utils/cli.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirm = exports.stringifyOptions = exports.parseOptions = exports.renderObject = exports.renderError = exports.renderResult = exports.logExec = exports.renderProgressBar = exports.showCursorCommand = void 0;
+exports.confirm = exports.stringifyOptions = exports.parseOptions = exports.renderObject = exports.renderListTaskItem = exports.renderError = exports.renderResult = exports.logExec = exports.renderProgressBar = exports.showCursorCommand = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const chalk_2 = require("chalk");
 const readline_1 = require("readline");
@@ -75,6 +75,22 @@ function renderError(error, verbose) {
     return chalk_1.default.red(message.trim());
 }
 exports.renderError = renderError;
+function renderListTaskItem(item, color, config) {
+    const result = config[item.key]?.(item.data);
+    if (typeof result === "string" || typeof result === "number") {
+        return result.toString();
+    }
+    else if (Array.isArray(result)) {
+        return result.join(" ");
+    }
+    else if (typeof result === "object" && !!result) {
+        return renderObject(result, color);
+    }
+    else {
+        return "";
+    }
+}
+exports.renderListTaskItem = renderListTaskItem;
 function renderObject(object, color) {
     const values = [];
     for (const key in object)

package/lib/utils/cron.d.ts

@@ -0,0 +1,11 @@
+export type CronScheduleUnit = number | {
+    each: number;
+};
+export type CronScheduleObject = {
+    minute?: CronScheduleUnit;
+    hour?: CronScheduleUnit;
+    day?: CronScheduleUnit;
+    month?: CronScheduleUnit;
+    weekDay?: CronScheduleUnit;
+};
+export declare function formatCronScheduleObject(object: CronScheduleObject): string;