@datatruck/cli 0.12.1 → 0.13.0

package/Command/BackupCommand.js

@@ -67,6 +67,8 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
             altDrivers: [
                 new ConsoleSessionDriver_1.ConsoleSessionDriver({
                     verbose: verbose > 0,
+                    progress: this.globalOptions.progress,
+                    progressInterval: this.globalOptions.progressInterval,
                 }),
             ],
         });

package/Command/CommandAbstract.d.ts

@@ -6,6 +6,8 @@ export declare type GlobalOptionsType<TResolved = false> = {
     config: string | ConfigType;
     outputFormat?: FormatType;
     verbose?: number;
+    progress?: "auto" | "plain" | "tty";
+    progressInterval?: number;
 };
 export declare type CommandConstructorType<TUnresolvedOptions, TOptions extends SimilarObject<TUnresolvedOptions>> = {
     new (globalOptions: GlobalOptionsType<true>, options: TOptions): CommandAbstract<TUnresolvedOptions, TOptions>;

package/Command/RestoreCommand.js

@@ -67,6 +67,8 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             altDrivers: [
                 new ConsoleSessionDriver_1.ConsoleSessionDriver({
                     verbose: verbose > 0,
+                    progress: this.globalOptions.progress,
+                    progressInterval: this.globalOptions.progressInterval,
                 }),
             ],
             verbose: verbose > 1,

package/Command/SnapshotsCommand.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapshotsCommand = void 0;
 const ConfigAction_1 = require("../Action/ConfigAction");
@@ -6,6 +9,7 @@ const SnapshotsAction_1 = require("../Action/SnapshotsAction");
 const DataFormat_1 = require("../util/DataFormat");
 const string_util_1 = require("../util/string-util");
 const CommandAbstract_1 = require("./CommandAbstract");
+const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
 class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
         const groupByValues = ["packageName", "repositoryName", "repositoryType"];
@@ -120,6 +124,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                     "Date",
                     "Package",
                     "Task",
+                    "Size",
                     "Repository",
                     "Repository type",
                 ],
@@ -128,6 +133,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                     item.date.replace("T", " ").replace("Z", ""),
                     item.packageName,
                     item.packageTaskName || "",
+                    (0, pretty_bytes_1.default)(item.size),
                     item.repositoryName,
                     item.repositoryType,
                 ],

package/Config/PackageRepositoryConfig.d.ts

@@ -1,5 +1,5 @@
+import { DatatruckPackageRepositoryConfigType, datatruckRepositoryName } from "../Repository/DatatruckRepository";
 import { GitPackageRepositoryConfigType, gitRepositoryName } from "../Repository/GitRepository";
-import { LocalPackageRepositoryConfigType, localRepositoryName } from "../Repository/LocalRepository";
 import { ResticPackageRepositoryConfigType, resticRepositoryName } from "../Repository/ResticRepository";
 import type { JSONSchema7 } from "json-schema";
 export declare const packageRepositoryConfigDefinition: JSONSchema7;
@@ -9,8 +9,8 @@ export declare type PackageRepositoryConfigType = {
     type: typeof resticRepositoryName;
     config: ResticPackageRepositoryConfigType;
 } | {
-    type: typeof localRepositoryName;
-    config: LocalPackageRepositoryConfigType;
+    type: typeof datatruckRepositoryName;
+    config: DatatruckPackageRepositoryConfigType;
 } | {
     type: typeof gitRepositoryName;
     config: GitPackageRepositoryConfigType;

package/Config/PackageRepositoryConfig.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageRepositoryConfigDefinition = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
+const DatatruckRepository_1 = require("../Repository/DatatruckRepository");
 const GitRepository_1 = require("../Repository/GitRepository");
-const LocalRepository_1 = require("../Repository/LocalRepository");
 const ResticRepository_1 = require("../Repository/ResticRepository");
 const types = {
     [ResticRepository_1.resticRepositoryName]: DefinitionEnum_1.DefinitionEnum.resticPackageRepository,
-    [LocalRepository_1.localRepositoryName]: DefinitionEnum_1.DefinitionEnum.localPackageRepository,
+    [DatatruckRepository_1.datatruckRepositoryName]: DefinitionEnum_1.DefinitionEnum.datatruckPackageRepository,
     [GitRepository_1.gitRepositoryName]: DefinitionEnum_1.DefinitionEnum.gitPackageRepository,
 };
 exports.packageRepositoryConfigDefinition = {

package/Config/RepositoryConfig.d.ts

@@ -1,5 +1,5 @@
+import { DatatruckRepositoryConfigType, datatruckRepositoryName } from "../Repository/DatatruckRepository";
 import { GitRepositoryConfigType, gitRepositoryName } from "../Repository/GitRepository";
-import { LocalRepositoryConfigType, localRepositoryName } from "../Repository/LocalRepository";
 import { ResticRepositoryConfigType, resticRepositoryName } from "../Repository/ResticRepository";
 import type { JSONSchema7 } from "json-schema";
 export declare const repositoryConfigDefinition: JSONSchema7;
@@ -15,8 +15,8 @@ export declare type RepositoryConfigType = {
     type: typeof resticRepositoryName;
     config: ResticRepositoryConfigType;
 } | {
-    type: typeof localRepositoryName;
-    config: LocalRepositoryConfigType;
+    type: typeof datatruckRepositoryName;
+    config: DatatruckRepositoryConfigType;
 } | {
     type: typeof gitRepositoryName;
     config: GitRepositoryConfigType;

package/Config/RepositoryConfig.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repositoryConfigDefinition = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
+const DatatruckRepository_1 = require("../Repository/DatatruckRepository");
 const GitRepository_1 = require("../Repository/GitRepository");
-const LocalRepository_1 = require("../Repository/LocalRepository");
 const ResticRepository_1 = require("../Repository/ResticRepository");
 const types = {
     [ResticRepository_1.resticRepositoryName]: DefinitionEnum_1.DefinitionEnum.resticRepository,
-    [LocalRepository_1.localRepositoryName]: DefinitionEnum_1.DefinitionEnum.localRepository,
+    [DatatruckRepository_1.datatruckRepositoryName]: DefinitionEnum_1.DefinitionEnum.datatruckRepository,
     [GitRepository_1.gitRepositoryName]: DefinitionEnum_1.DefinitionEnum.gitRepository,
 };
 exports.repositoryConfigDefinition = {

package/Factory/RepositoryFactory.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RepositoryFactory = void 0;
 const AppError_1 = require("../Error/AppError");
+const DatatruckRepository_1 = require("../Repository/DatatruckRepository");
 const GitRepository_1 = require("../Repository/GitRepository");
-const LocalRepository_1 = require("../Repository/LocalRepository");
 const ResticRepository_1 = require("../Repository/ResticRepository");
 function RepositoryFactory(repository) {
     const type = repository.type;
@@ -13,8 +13,8 @@ function RepositoryFactory(repository) {
     else if (type === ResticRepository_1.resticRepositoryName) {
         return new ResticRepository_1.ResticRepository(repository);
     }
-    else if (type === LocalRepository_1.localRepositoryName) {
-        return new LocalRepository_1.LocalRepository(repository);
+    else if (type === DatatruckRepository_1.datatruckRepositoryName) {
+        return new DatatruckRepository_1.DatatruckRepository(repository);
     }
     else {
         throw new AppError_1.AppError(`Invalid repository type: ${type}`);

package/JsonSchema/DefinitionEnum.d.ts

@@ -6,8 +6,8 @@ export declare enum DefinitionEnum {
     task = "task",
     resticRepository = "restic-repository",
     resticPackageRepository = "restic-package-repository",
-    localRepository = "local-repository",
-    localPackageRepository = "local-package-repository",
+    datatruckRepository = "datatruck-repository",
+    datatruckPackageRepository = "datatruck-package-repository",
     gitRepository = "git-repository",
     gitPackageRepository = "git-package-repository",
     gitTask = "git-task",

package/JsonSchema/DefinitionEnum.js

@@ -10,8 +10,8 @@ var DefinitionEnum;
     DefinitionEnum["task"] = "task";
     DefinitionEnum["resticRepository"] = "restic-repository";
     DefinitionEnum["resticPackageRepository"] = "restic-package-repository";
-    DefinitionEnum["localRepository"] = "local-repository";
-    DefinitionEnum["localPackageRepository"] = "local-package-repository";
+    DefinitionEnum["datatruckRepository"] = "datatruck-repository";
+    DefinitionEnum["datatruckPackageRepository"] = "datatruck-package-repository";
     DefinitionEnum["gitRepository"] = "git-repository";
     DefinitionEnum["gitPackageRepository"] = "git-package-repository";
     DefinitionEnum["gitTask"] = "git-task";

package/JsonSchema/JsonSchema.js

@@ -7,8 +7,8 @@ const PackageRepositoryConfig_1 = require("../Config/PackageRepositoryConfig");
 const PrunePolicyConfig_1 = require("../Config/PrunePolicyConfig");
 const RepositoryConfig_1 = require("../Config/RepositoryConfig");
 const TaskConfig_1 = require("../Config/TaskConfig");
+const DatatruckRepository_1 = require("../Repository/DatatruckRepository");
 const GitRepository_1 = require("../Repository/GitRepository");
-const LocalRepository_1 = require("../Repository/LocalRepository");
 const ResticRepository_1 = require("../Repository/ResticRepository");
 const GitTask_1 = require("../Task/GitTask");
 const MariadbTask_1 = require("../Task/MariadbTask");
@@ -31,8 +31,8 @@ exports.definitions = {
     [DefinitionEnum_1.DefinitionEnum.task]: TaskConfig_1.taskConfigDefinition,
     [DefinitionEnum_1.DefinitionEnum.gitRepository]: GitRepository_1.gitRepositoryDefinition,
     [DefinitionEnum_1.DefinitionEnum.gitPackageRepository]: GitRepository_1.gitPackageRepositoryDefinition,
-    [DefinitionEnum_1.DefinitionEnum.localRepository]: LocalRepository_1.localRepositoryDefinition,
-    [DefinitionEnum_1.DefinitionEnum.localPackageRepository]: LocalRepository_1.localPackageRepositoryDefinition,
+    [DefinitionEnum_1.DefinitionEnum.datatruckRepository]: DatatruckRepository_1.datatruckRepositoryDefinition,
+    [DefinitionEnum_1.DefinitionEnum.datatruckPackageRepository]: DatatruckRepository_1.datatruckPackageRepositoryDefinition,
     [DefinitionEnum_1.DefinitionEnum.resticRepository]: ResticRepository_1.resticRepositoryDefinition,
     [DefinitionEnum_1.DefinitionEnum.resticPackageRepository]: ResticRepository_1.resticPackageRepositoryDefinition,
     [DefinitionEnum_1.DefinitionEnum.gitTask]: GitTask_1.gitTaskDefinition,

package/Repository/{LocalRepository.d.ts → DatatruckRepository.d.ts}

@@ -7,8 +7,9 @@ export declare type MetaDataType = {
     task: string | undefined;
     tags: string[];
     version: string;
+    size: number;
 };
-export declare type LocalRepositoryConfigType = {
+export declare type DatatruckRepositoryConfigType = {
     outPath: string;
     compress?: boolean;
     /**
@@ -23,13 +24,13 @@ declare type CompressObjectType = {
         onePackByResult?: boolean;
     }[];
 };
-export declare type LocalPackageRepositoryConfigType = {
+export declare type DatatruckPackageRepositoryConfigType = {
     compress?: CompressObjectType | boolean;
 };
-export declare const localRepositoryName = "local";
-export declare const localRepositoryDefinition: JSONSchema7;
-export declare const localPackageRepositoryDefinition: JSONSchema7;
-export declare class LocalRepository extends RepositoryAbstract<LocalRepositoryConfigType> {
+export declare const datatruckRepositoryName = "datatruck";
+export declare const datatruckRepositoryDefinition: JSONSchema7;
+export declare const datatruckPackageRepositoryDefinition: JSONSchema7;
+export declare class DatatruckRepository extends RepositoryAbstract<DatatruckRepositoryConfigType> {
     static zipBasenameTpl: string;
     static buildSnapshotName(data: {
         snapshotId: string;
@@ -50,8 +51,8 @@ export declare class LocalRepository extends RepositoryAbstract<LocalRepositoryC
     onPrune(data: PruneDataType): Promise<void>;
     onSnapshots(data: SnapshotsDataType): Promise<SnapshotResultType[]>;
     private normalizeCompressConfig;
-    onBackup(data: BackupDataType<LocalPackageRepositoryConfigType>): Promise<void>;
-    onCopyBackup(data: CopyBackupType<LocalRepositoryConfigType>): Promise<void>;
-    onRestore(data: RestoreDataType<LocalPackageRepositoryConfigType>): Promise<void>;
+    onBackup(data: BackupDataType<DatatruckPackageRepositoryConfigType>): Promise<void>;
+    onCopyBackup(data: CopyBackupType<DatatruckRepositoryConfigType>): Promise<void>;
+    onRestore(data: RestoreDataType<DatatruckPackageRepositoryConfigType>): Promise<void>;
 }
 export {};

package/Repository/{LocalRepository.js → DatatruckRepository.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.LocalRepository = exports.localPackageRepositoryDefinition = exports.localRepositoryDefinition = exports.localRepositoryName = void 0;
+exports.DatatruckRepository = exports.datatruckPackageRepositoryDefinition = exports.datatruckRepositoryDefinition = exports.datatruckRepositoryName = void 0;
 const AppError_1 = require("../Error/AppError");
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
 const cli_util_1 = require("../util/cli-util");
@@ -20,8 +20,8 @@ const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 const readline_1 = require("readline");
-exports.localRepositoryName = "local";
-exports.localRepositoryDefinition = {
+exports.datatruckRepositoryName = "datatruck";
+exports.datatruckRepositoryDefinition = {
     type: "object",
     required: ["outPath"],
     additionalProperties: false,
@@ -30,7 +30,7 @@ exports.localRepositoryDefinition = {
         compress: { type: "boolean" },
     },
 };
-exports.localPackageRepositoryDefinition = {
+exports.datatruckPackageRepositoryDefinition = {
     type: "object",
     additionalProperties: false,
     properties: {
@@ -66,7 +66,7 @@ exports.localPackageRepositoryDefinition = {
         },
     },
 };
-class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
+class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
     static buildSnapshotName(data) {
         const date = data.snapshotDate.replace(/:/g, "-");
         const pkgName = encodeURIComponent(data.packageName).replace(/%40/g, "@");
@@ -103,7 +103,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await (0, fs_util_1.mkdirIfNotExists)(this.config.outPath);
     }
     async onPrune(data) {
-        const snapshotName = LocalRepository.buildSnapshotName({
+        const snapshotName = DatatruckRepository.buildSnapshotName({
             snapshotId: data.snapshot.id,
             snapshotDate: data.snapshot.date,
             packageName: data.snapshot.packageName,
@@ -127,7 +127,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const packagePatterns = (0, string_util_1.makePathPatterns)(data.options.packageNames);
         const taskPatterns = (0, string_util_1.makePathPatterns)(data.options.packageTaskNames);
         for (const snapshotName of snapshotNames) {
-            const snapshotNameData = LocalRepository.parseSnapshotName(snapshotName);
+            const snapshotNameData = DatatruckRepository.parseSnapshotName(snapshotName);
             if (!snapshotNameData)
                 continue;
             if (packagePatterns &&
@@ -137,7 +137,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 !data.options.ids.some((id) => snapshotNameData.snapshotShortId.startsWith(id.slice(0, 8))))
                 continue;
             const metaPath = (0, path_1.join)(this.config.outPath, snapshotName);
-            const meta = await LocalRepository.parseMetaData(metaPath);
+            const meta = await DatatruckRepository.parseMetaData(metaPath);
             if (taskPatterns && !(0, string_util_1.checkMatch)(meta.task, taskPatterns))
                 continue;
             if (data.options.ids &&
@@ -153,6 +153,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 packageName: meta.package,
                 packageTaskName: meta.task,
                 tags: meta.tags,
+                size: meta.size || 0,
             });
         }
         return snapshots;
@@ -174,7 +175,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return compress;
     }
     async onBackup(data) {
-        const snapshotName = LocalRepository.buildSnapshotName({
+        const snapshotName = DatatruckRepository.buildSnapshotName({
             snapshotId: data.snapshot.id,
             snapshotDate: data.snapshot.date,
             packageName: data.package.name,
@@ -294,13 +295,14 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
             package: data.package.name,
             task: data.package.task?.name,
             version: nodePkg.version,
+            size: await (0, fs_util_1.fastFolderSizeAsync)(outPath),
         };
         if (data.options.verbose)
             (0, cli_util_1.logExec)(`Writing metadata into ${metaPath}`);
-        await (0, promises_1.writeFile)(metaPath, LocalRepository.stringifyMetaData(meta));
+        await (0, promises_1.writeFile)(metaPath, DatatruckRepository.stringifyMetaData(meta));
     }
     async onCopyBackup(data) {
-        const snapshotName = LocalRepository.buildSnapshotName({
+        const snapshotName = DatatruckRepository.buildSnapshotName({
             snapshotId: data.snapshot.id,
             snapshotDate: data.snapshot.date,
             packageName: data.package.name,
@@ -332,7 +334,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
         if (!snapshot)
             throw new AppError_1.AppError("Snapshot not found");
-        const snapshotName = LocalRepository.buildSnapshotName({
+        const snapshotName = DatatruckRepository.buildSnapshotName({
             snapshotId: data.snapshot.id,
             snapshotDate: data.snapshot.date,
             packageName: data.package.name,
@@ -384,5 +386,5 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
     }
 }
-exports.LocalRepository = LocalRepository;
-LocalRepository.zipBasenameTpl = `.*.dd.zip`;
+exports.DatatruckRepository = DatatruckRepository;
+DatatruckRepository.zipBasenameTpl = `.*.dd.zip`;

package/Repository/GitRepository.js

@@ -136,6 +136,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 packageName: parsedTag.package,
                 packageTaskName: parsedTag.task,
                 tags: parsedTag.tags,
+                size: Number(parsedTag.size) || 0,
             });
             return result;
         }, [])
@@ -207,6 +208,8 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             package: data.package.name,
             task: data.package.task?.name,
             version: nodePkg.version,
+            size: ((await (0, fs_util_1.fastFolderSizeAsync)(tmpPath)) -
+                (await (0, fs_util_1.fastFolderSizeAsync)((0, path_1.join)(tmpPath, ".git")))).toString(),
         });
         await git.addTag(meta.name, meta.message);
         await git.push({ branchName });

package/Repository/RepositoryAbstract.d.ts

@@ -13,6 +13,7 @@ export declare type SnapshotResultType = SnapshotType & {
     packageName: string;
     packageTaskName: string | undefined;
     tags: string[];
+    size: number;
 };
 export declare type ProgressDataType = {
     total?: number;
@@ -63,7 +64,8 @@ export declare enum SnapshotTagEnum {
     PACKAGE = "package",
     TASK = "task",
     TAGS = "tags",
-    VERSION = "version"
+    VERSION = "version",
+    SIZE = "size"
 }
 export declare type SnapshotTagObjectType = {
     [SnapshotTagEnum.ID]: string;
@@ -73,6 +75,7 @@ export declare type SnapshotTagObjectType = {
     [SnapshotTagEnum.TASK]: string | undefined;
     [SnapshotTagEnum.TAGS]: string[];
     [SnapshotTagEnum.VERSION]: string;
+    [SnapshotTagEnum.SIZE]: string;
 };
 export declare abstract class RepositoryAbstract<TConfig> {
     readonly repository: RepositoryConfigType;

package/Repository/RepositoryAbstract.js

@@ -10,6 +10,7 @@ var SnapshotTagEnum;
     SnapshotTagEnum["TASK"] = "task";
     SnapshotTagEnum["TAGS"] = "tags";
     SnapshotTagEnum["VERSION"] = "version";
+    SnapshotTagEnum["SIZE"] = "size";
 })(SnapshotTagEnum = exports.SnapshotTagEnum || (exports.SnapshotTagEnum = {}));
 class RepositoryAbstract {
     constructor(repository) {

package/Repository/ResticRepository.js

@@ -9,6 +9,7 @@ const ResticUtil_1 = require("../util/ResticUtil");
 const cli_util_1 = require("../util/cli-util");
 const paths_util_1 = require("../util/datatruck/paths-util");
 const fs_util_1 = require("../util/fs-util");
+const math_util_1 = require("../util/math-util");
 const string_util_1 = require("../util/string-util");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
@@ -164,6 +165,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 date: tag.date,
                 id: tag.id,
                 tags: itemTags,
+                size: Number(tag.size) || 0,
             });
             return items;
         }, []);
@@ -245,6 +247,8 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await data.onProgress({
             step: "Executing backup action...",
         });
+        let resticSnapshotId;
+        let resticTotalBytes;
         await restic.backup({
             cwd: sourcePath,
             paths: ["."],
@@ -281,7 +285,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                         totalFilesChanges++;
                     }
                     await data.onProgress((lastProgress = {
-                        total: Math.max(lastProgress?.total || 0, streamData.total_files),
+                        total: Math.max(lastProgress?.total || 0, streamData.total_files || 0),
                         current: Math.max(lastProgress?.current || 0, streamData.files_done ?? 0),
                         percent: showProgressBar
                             ? Number((streamData.percent_done * 100).toFixed(2))
@@ -289,8 +293,18 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                         step: streamData.current_files?.join(", ") ?? "-",
                     }));
                 }
+                else if (streamData.message_type === "summary") {
+                    resticSnapshotId = streamData.snapshot_id;
+                    resticTotalBytes = streamData.total_bytes_processed;
+                }
             },
         });
+        if (typeof resticSnapshotId !== "string")
+            throw new AppError_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`);
+        const sizeTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SIZE, resticTotalBytes.toString());
+        await restic.exec(["tag", "--add", sizeTag, resticSnapshotId]);
         await data.onProgress({
             total: lastProgress?.total || 0,
             current: lastProgress?.total || 0,
@@ -339,6 +353,16 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         await restic.restore({
             id: snapshot.originalId,
             target: restorePath,
+            onStream: async (streamData) => {
+                if (streamData.message_type === "restore-status") {
+                    const current = Math.min(streamData.total_bytes, snapshot.size);
+                    await data.onProgress({
+                        total: snapshot.size,
+                        current,
+                        percent: (0, math_util_1.progressPercent)(snapshot.size, current),
+                    });
+                }
+            },
         });
     }
 }

package/SessionDriver/ConsoleSessionDriver.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { WriteDataType, ReadResultType, SessionDriverAbstract } from "./SessionDriverAbstract";
+import { WriteDataType, ReadResultType, SessionDriverAbstract, SessionDriverOptions } from "./SessionDriverAbstract";
 declare type BadgeType = {
     name: string;
     value: string;
@@ -18,9 +18,14 @@ declare type MessageType = {
     progressStep?: string | null;
     progressStepPercent?: number | null;
 };
-export declare class ConsoleSessionDriver extends SessionDriverAbstract {
+declare type ConsoleSessionDriverOptions = SessionDriverOptions & {
+    progress?: "auto" | "tty" | "plain";
+    progressInterval?: number;
+};
+export declare class ConsoleSessionDriver extends SessionDriverAbstract<ConsoleSessionDriverOptions> {
     protected lastMessage: MessageType | undefined;
     protected lastMessageText: string | undefined;
+    protected lastProgressDate: number | undefined;
     protected prints: number;
     protected renderInterval: NodeJS.Timeout;
     protected rendering?: boolean;
@@ -30,6 +35,7 @@ export declare class ConsoleSessionDriver extends SessionDriverAbstract {
         start: () => number;
         elapsed: (formatted?: boolean | undefined) => string | number;
     };
+    protected tty: boolean;
     onInit(): Promise<void>;
     onEnd(data?: Record<string, any>): Promise<void>;
     onRead(): Promise<ReadResultType[]>;

package/SessionDriver/ConsoleSessionDriver.js

@@ -16,6 +16,11 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
         this.chron = (0, date_util_1.createChron)();
     }
     async onInit() {
+        this.tty = this.options.verbose
+            ? false
+            : this.options.progress === "auto"
+                ? process.stdout.isTTY
+                : this.options.progress === "tty";
         this.chron.start();
         this.renderInterval = setInterval(() => {
             if (this.lastMessage)
@@ -24,7 +29,7 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
     }
     async onEnd(data) {
         clearInterval(this.renderInterval);
-        if (!this.options.verbose)
+        if (this.tty)
             process.stdout.write(cli_util_1.showCursorCommand);
         (0, cli_util_1.logVars)({
             ...data,
@@ -36,10 +41,10 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
     }
     printMessage(message, endMessage) {
         const text = this.renderMessage(message);
-        if (this.options.verbose && this.lastMessageText === text) {
+        if (!this.tty && this.lastMessageText === text) {
             return;
         }
-        if (this.options.verbose) {
+        if (!this.tty) {
             process.stdout.write(`${this.renderSpinner(text)}\n`);
         }
         else {
@@ -58,7 +63,7 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
         this.lastMessageText = text;
     }
     renderSpinner(text) {
-        return text.replace("{spinner}", (0, chalk_1.grey)(this.options.verbose ? "?" : (0, cli_util_1.renderSpinner)(this.prints)));
+        return text.replace("{spinner}", (0, chalk_1.grey)(this.tty ? (0, cli_util_1.renderSpinner)(this.prints) : "?"));
     }
     renderMessage(message) {
         const badges = renderBadges([
@@ -66,7 +71,6 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
             ...(message.errorBadge ? [message.errorBadge] : []),
         ]);
         const padding = "   ".repeat(message.level ?? 0);
-        const haveProgressBar = typeof message.progressPercent === "number";
         const sessionId = message.sessionId.toString().padStart(2, "0");
         const parts = [
             `${padding}${message.textPrefix} [${(0, chalk_1.grey)(sessionId)}] ${message.text}`,
@@ -89,6 +93,13 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
     async onWrite(data) {
         if (data.action === SessionDriverAbstract_1.ActionEnum.Init)
             return;
+        if (data.action === SessionDriverAbstract_1.ActionEnum.Progress && this.options.progressInterval) {
+            const skip = this.lastProgressDate &&
+                Date.now() - this.lastProgressDate < this.options.progressInterval;
+            if (skip)
+                return;
+            this.lastProgressDate = Date.now();
+        }
         const message = {
             sessionId: "sessionId" in data.data ? data.data.sessionId : data.data.id,
             badges: [],
@@ -113,9 +124,7 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
             if (data.data.error)
                 message.errorBadge = {
                     name: "error",
-                    value: this.options.verbose
-                        ? data.data.error
-                        : data.data.error.split("\n")[0],
+                    value: this.tty ? data.data.error.split("\n")[0] : data.data.error,
                     color: chalk_1.red,
                 };
         }
@@ -159,8 +168,7 @@ class ConsoleSessionDriver extends SessionDriverAbstract_1.SessionDriverAbstract
         if (isHeader && data.action === SessionDriverAbstract_1.ActionEnum.End) {
             return;
         }
-        const endMessage = !this.options.verbose &&
-            (!hasProgress || data.action === SessionDriverAbstract_1.ActionEnum.End || isHeader);
+        const endMessage = this.tty && (!hasProgress || data.action === SessionDriverAbstract_1.ActionEnum.End || isHeader);
         this.printMessage(message, endMessage);
         if (endMessage)
             process.stdout.write("\n");

package/SessionDriver/SessionDriverAbstract.d.ts

@@ -64,13 +64,12 @@ export declare type ReadResultType = {
     repositoryType: string;
     error: string | null;
 };
-export declare abstract class SessionDriverAbstract {
-    readonly options: {
-        verbose?: boolean;
-    };
-    constructor(options: {
-        verbose?: boolean;
-    });
+export declare type SessionDriverOptions = {
+    verbose?: boolean;
+};
+export declare abstract class SessionDriverAbstract<TOptions extends SessionDriverOptions = SessionDriverOptions> {
+    readonly options: TOptions;
+    constructor(options: TOptions);
     onInit(): Promise<void>;
     abstract onWrite(data: WriteDataType): Promise<void>;
     onEnd(data?: Record<string, any>): Promise<void>;

package/cli.js

@@ -80,6 +80,8 @@ program.description(description);
 program.usage("dtt");
 program.option("-v,--verbose", "Verbose", (_, previous) => previous + 1, 0);
 program.option("-c,--config <path>", "Config path", process.env["DATATRUCK_CONFIG"] ?? (cwd.endsWith(path_1.sep) ? cwd : `${cwd}${path_1.sep}`));
+program.option("--progress <value>", "Progress type (auto, plain, tty)", "auto");
+program.option("--progress-interval <ms>", "Progress interval");
 program.option("-o,--output-format <format>", "Output format (json, pjson, yaml, table, custom=$, tpl=name)", "table");
 makeCommand(CommandFactory_1.CommandEnum.config).alias("c");
 makeCommand(CommandFactory_1.CommandEnum.init).alias("i");

package/config.schema.json

@@ -81,7 +81,7 @@
             "type": "object",
             "properties": {
               "type": {
-                "const": "local"
+                "const": "datatruck"
               }
             }
           },
@@ -89,7 +89,7 @@
             "type": "object",
             "properties": {
               "config": {
-                "$ref": "#/definitions/local-repository"
+                "$ref": "#/definitions/datatruck-repository"
               }
             }
           },
@@ -248,7 +248,7 @@
             "type": "object",
             "properties": {
               "type": {
-                "const": "local"
+                "const": "datatruck"
               }
             }
           },
@@ -256,7 +256,7 @@
             "type": "object",
             "properties": {
               "config": {
-                "$ref": "#/definitions/local-package-repository"
+                "$ref": "#/definitions/datatruck-package-repository"
               }
             }
           },
@@ -438,7 +438,7 @@
       "additionalProperties": false,
       "properties": {}
     },
-    "local-repository": {
+    "datatruck-repository": {
       "type": "object",
       "required": [
         "outPath"
@@ -453,7 +453,7 @@
         }
       }
     },
-    "local-package-repository": {
+    "datatruck-package-repository": {
       "type": "object",
       "additionalProperties": false,
       "properties": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "dependencies": {
     "ajv": "^8.11.0",
     "async": "^3.2.4",
@@ -8,8 +8,10 @@
     "cli-table3": "^0.6.2",
     "commander": "^9.4.0",
     "dayjs": "^1.11.5",
+    "fast-folder-size": "^1.7.1",
     "fast-glob": "^3.2.11",
     "micromatch": "^4.0.5",
+    "pretty-bytes": "^5.6.0",
     "sqlite": "^4.1.2",
     "sqlite3": "^5.0.11"
   },

package/util/ResticUtil.d.ts

@@ -10,13 +10,16 @@ export declare type RepositoryType = {
 } & Omit<UriType, "password">;
 export declare type BackupStreamType = {
     message_type: "status";
-    seconds_elapsed: number;
+    seconds_elapsed?: number;
     percent_done: number;
-    total_files: number;
+    total_files?: number;
     files_done?: number;
     total_bytes: number;
     bytes_done?: number;
     current_files?: string[];
+} | {
+    message_type: "restore-status";
+    total_bytes: number;
 } | {
     message_type: "summary";
     files_new: number;
@@ -95,6 +98,10 @@ export declare class ResticUtil {
     restore(options: {
         id: string;
         target: string;
+        /**
+         * @default 30_000
+         */
+        progressInterval?: number | false;
         onStream?: (data: BackupStreamType) => Promise<void>;
     }): Promise<ExecResultType>;
 }

package/util/ResticUtil.js

@@ -29,7 +29,7 @@ class ResticUtil {
     async exec(args, settings, options) {
         return await (0, process_util_1.exec)("restic", args, {
             stdio: ["ignore", "pipe", "pipe"],
-            env: { ...this.options.env },
+            env: { ...process.env, ...this.options.env },
             cwd: options?.cwd,
         }, {
             stderr: { toExitCode: true },
@@ -40,7 +40,11 @@ class ResticUtil {
                     stderr: true,
                     colorize: true,
                     allToStderr: true,
-                    envNames: ["RESTIC_REPOSITORY", "RESTIC_PASSWORD_FILE"],
+                    envNames: [
+                        "RESTIC_REPOSITORY",
+                        "RESTIC_PASSWORD_FILE",
+                        "RESTIC_PASSWORD",
+                    ],
                 }
                 : {},
             ...(settings ?? {}),
@@ -96,11 +100,12 @@ class ResticUtil {
         return JSON.parse(result.stdout);
     }
     async checkBackupSetPathSupport() {
-        const result = await this.exec(["backup", "--set-path"], {
-            onExitCodeError: () => false,
-            stderr: { save: true },
+        /*const result = await this.exec(["backup", "--set-path"], {
+          onExitCodeError: () => false,
+          stderr: { save: true },
         });
-        return result.stderr.includes("flag needs an argument");
+        return result.stderr.includes("flag needs an argument");*/
+        return false;
     }
     async backup(options) {
         const exec = async () => await this.exec([
@@ -174,20 +179,42 @@ class ResticUtil {
         });
     }
     async restore(options) {
-        return await this.exec(["restore", "--json", options.id, "--target", options.target], {
-            stderr: {
-                toExitCode: true,
-            },
-            stdout: {
-                ...(options.onStream && {
-                    onData: async (data) => {
-                        if (data.startsWith("{") && data.endsWith("}")) {
-                            await options.onStream?.(JSON.parse(data));
-                        }
-                    },
-                }),
-            },
-        });
+        let progressTimeout;
+        const progressInterval = options.progressInterval ?? 30000;
+        async function progressRutine() {
+            try {
+                const total_bytes = await (0, fs_util_1.fastFolderSizeAsync)(options.target);
+                options.onStream?.({
+                    message_type: "restore-status",
+                    total_bytes,
+                });
+            }
+            finally {
+                if (typeof progressInterval === "number")
+                    progressTimeout = setTimeout(progressRutine, progressInterval);
+            }
+        }
+        if (typeof progressInterval === "number")
+            progressRutine();
+        try {
+            return await this.exec(["restore", "--json", options.id, "--target", options.target], {
+                stderr: {
+                    toExitCode: true,
+                },
+                stdout: {
+                    ...(options.onStream && {
+                        onData: async (data) => {
+                            if (data.startsWith("{") && data.endsWith("}")) {
+                                await options.onStream?.(JSON.parse(data));
+                            }
+                        },
+                    }),
+                },
+            });
+        }
+        finally {
+            clearTimeout(progressTimeout);
+        }
     }
 }
 exports.ResticUtil = ResticUtil;

package/util/datatruck/config-util.d.ts

@@ -31,17 +31,17 @@ export declare const pkgPathParams: {
     [name in "temp" | Exclude<keyof ResolvePackagePathParamsType, "path">]: string;
 };
 export declare const pkgIncludeParams: {
-    snapshotDate: string;
     packageName: string;
     temp: string;
     snapshotId: string;
+    snapshotDate: string;
     action: string;
 };
 export declare const pkgExcludeParams: {
-    snapshotDate: string;
     packageName: string;
     temp: string;
     snapshotId: string;
+    snapshotDate: string;
     action: string;
 };
 export declare const pkgRestorePathParams: {
@@ -52,32 +52,32 @@ export declare const dbNameParams: {
 };
 export declare const params: {
     pkgPath: {
-        snapshotDate: string;
         packageName: string;
         temp: string;
         snapshotId: string;
+        snapshotDate: string;
         action: string;
     };
     pkgRestorePath: {
-        snapshotDate: string;
         packageName: string;
         path: string;
         temp: string;
         snapshotId: string;
+        snapshotDate: string;
         action: string;
     };
     pkgInclude: {
-        snapshotDate: string;
         packageName: string;
         temp: string;
         snapshotId: string;
+        snapshotDate: string;
         action: string;
     };
     pkgExclude: {
-        snapshotDate: string;
         packageName: string;
         temp: string;
         snapshotId: string;
+        snapshotDate: string;
         action: string;
     };
     dbName: {

package/util/fs-util.d.ts

@@ -23,6 +23,7 @@ export declare function existsFile(path: string): Promise<boolean>;
 export declare function parentTmpDir(): string;
 export declare function sessionTmpDir(): string;
 export declare function tmpDir(prefix: string, id?: string): string;
+export declare function fastFolderSizeAsync(path: string): Promise<number>;
 export declare function mkTmpDir(prefix: string, id?: string): Promise<string>;
 export declare function readPartialFile(path: string, positions: [number, number?]): Promise<string>;
 export declare function checkFile(path: string): Promise<boolean>;

package/util/fs-util.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cpy = exports.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = exports.isWSLSystem = void 0;
+exports.cpy = exports.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.checkDir = exports.checkFile = exports.readPartialFile = exports.mkTmpDir = exports.fastFolderSizeAsync = exports.tmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.existsFile = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.readdirIfExists = exports.writeJSONFile = exports.existsDir = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isDirEmpty = exports.isLocalDir = exports.isWSLSystem = void 0;
 const globalData_1 = __importDefault(require("../globalData"));
 const path_util_1 = require("./path-util");
 const async_1 = require("async");
 const crypto_1 = require("crypto");
+const fast_folder_size_1 = __importDefault(require("fast-folder-size"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const fs_1 = require("fs");
 const fs_2 = require("fs");
@@ -17,6 +18,7 @@ const os_1 = require("os");
 const path_1 = require("path");
 const path_2 = require("path");
 const readline_1 = require("readline");
+const util_1 = require("util");
 exports.isWSLSystem = (0, os_1.release)().includes("microsoft-standard-WSL");
 function isLocalDir(path) {
     return /^[\/\.]|([A-Z]:)/i.test(path);
@@ -130,6 +132,10 @@ function tmpDir(prefix, id) {
     return (0, path_1.join)(sessionTmpDir(), `${prefix}-${id}`);
 }
 exports.tmpDir = tmpDir;
+async function fastFolderSizeAsync(path) {
+    return (await (0, util_1.promisify)(fast_folder_size_1.default)(path)) || 0;
+}
+exports.fastFolderSizeAsync = fastFolderSizeAsync;
 async function mkTmpDir(prefix, id) {
     const path = tmpDir(prefix, id);
     await (0, promises_1.mkdir)(path, { recursive: true });

package/util/process-util.js

@@ -34,7 +34,9 @@ async function exec(command, argv = [], options = null, settings = {}) {
     return new Promise(async (resolve, reject) => {
         if (log.exec) {
             const logEnv = log.envNames?.reduce((env, key) => {
-                env[key] = options?.env?.[key] ?? "";
+                const value = options?.env?.[key];
+                if (typeof value !== "undefined")
+                    env[key] = value;
                 return env;
             }, {});
             (0, cli_util_1.logExec)(command, pipe