@datatruck/cli 0.9.0 → 0.11.1

package/Action/BackupAction.d.ts

@@ -25,6 +25,7 @@ export declare class BackupAction<TRequired extends boolean = true> {
     protected init(session: BackupSessionManager): Promise<[SnapshotType, PackageConfigType[]]>;
     protected execTask(session: BackupSessionManager, pkg: PackageConfigType, task: TaskConfigType, snapshot: SnapshotType, targetPath: string | undefined): Promise<boolean>;
     protected execRepository(session: BackupSessionManager, pkg: PackageConfigType, repo: RepositoryConfigType, snapshot: SnapshotType, targetPath: string | undefined): Promise<boolean>;
+    protected execCopyRepository(session: BackupSessionManager, pkg: PackageConfigType, repo: RepositoryConfigType, mirrorRepo: RepositoryConfigType, snapshot: SnapshotType): Promise<boolean>;
     protected getError(pkg: PackageConfigType): AppError | null;
     exec(session: BackupSessionManager): Promise<{
         total: number;

package/Action/BackupAction.js

@@ -144,6 +144,50 @@ class BackupAction {
         });
         return error ? false : true;
     }
+    async execCopyRepository(session, pkg, repo, mirrorRepo, snapshot) {
+        const repositoryId = session.findRepositoryId({
+            packageName: pkg.name,
+            repositoryName: mirrorRepo.name,
+        });
+        await session.startRepository({
+            id: repositoryId,
+        });
+        let error;
+        if (this.taskErrors[pkg.name]?.length) {
+            error = new AppError_1.AppError("Task failed");
+        }
+        else {
+            try {
+                const repoInstance = (0, RepositoryFactory_1.RepositoryFactory)(repo);
+                await repoInstance.onCopyBackup({
+                    options: this.options,
+                    package: pkg,
+                    snapshot,
+                    mirrorRepositoryConfig: mirrorRepo.config,
+                    onProgress: async (data) => {
+                        await session.progressRepository({
+                            id: repositoryId,
+                            progressCurrent: data.current,
+                            progressPercent: data.percent,
+                            progressStep: data.step,
+                            progressStepPercent: data.stepPercent,
+                            progressTotal: data.total,
+                        });
+                    },
+                });
+            }
+            catch (_) {
+                if (!this.repoErrors[pkg.name])
+                    this.repoErrors[pkg.name] = [];
+                this.repoErrors[pkg.name].push((error = _));
+            }
+        }
+        await session.endRepository({
+            id: repositoryId,
+            error: error?.stack,
+        });
+        return error ? false : true;
+    }
     getError(pkg) {
         const taskErrors = this.taskErrors[pkg.name]?.length;
         const repoErrors = this.repoErrors[pkg.name]?.length;
@@ -182,10 +226,33 @@ class BackupAction {
                 });
                 await this.execTask(session, pkg, pkg.task, snapshot, (targetPath = result?.targetPath));
             }
-            for (const repoName of pkg.repositoryNames ?? []) {
+            const mirrorRepoMap = {};
+            const allMirrorRepoNames = [];
+            const repoNames = pkg.repositoryNames ?? [];
+            for (const repoName of repoNames) {
+                const repo = (0, config_util_1.findRepositoryOrFail)(this.config, repoName);
+                if (repo.mirrorRepoNames)
+                    mirrorRepoMap[repoName] = repo.mirrorRepoNames.filter((mirrorRepoName) => {
+                        allMirrorRepoNames.push(mirrorRepoName);
+                        return repoNames.includes(mirrorRepoName);
+                    });
+            }
+            for (const repoName of repoNames) {
+                if (allMirrorRepoNames.includes(repoName))
+                    continue;
                 const repo = (0, config_util_1.findRepositoryOrFail)(this.config, repoName);
                 await this.execRepository(session, pkg, repo, snapshot, targetPath);
             }
+            for (const repoName of repoNames) {
+                const repo = (0, config_util_1.findRepositoryOrFail)(this.config, repoName);
+                const mirrorRepoNames = mirrorRepoMap[repoName];
+                if (mirrorRepoNames) {
+                    for (const mirrorRepoName of mirrorRepoNames) {
+                        const mirrorRepo = (0, config_util_1.findRepositoryOrFail)(this.config, mirrorRepoName);
+                        await this.execCopyRepository(session, pkg, repo, mirrorRepo, snapshot);
+                    }
+                }
+            }
             const error = this.getError(pkg);
             if (error)
                 errors++;

package/Action/ConfigAction.js

@@ -22,11 +22,27 @@ class ConfigAction {
     }
     static check(config) {
         const repositoryNames = [];
+        const mirrorRepoNames = [];
+        const repos = {};
         for (const repo of config.repositories) {
+            repos[repo.name] = repo;
             if (repositoryNames.includes(repo.name))
                 throw new AppError_1.AppError(`Duplicated repository name: ${repo.name}`);
             repositoryNames.push(repo.name);
         }
+        for (const repo of config.repositories) {
+            if (repo.mirrorRepoNames) {
+                for (const mirrorRepoName of repo.mirrorRepoNames) {
+                    if (!repos[mirrorRepoName])
+                        throw new AppError_1.AppError(`Mirror repository name not found: ${mirrorRepoName}`);
+                    if (repos[mirrorRepoName].type !== repo.type)
+                        throw new AppError_1.AppError(`Mirror repository type is incompatible: ${mirrorRepoName}`);
+                    if (mirrorRepoNames.includes(mirrorRepoName))
+                        throw new AppError_1.AppError(`Mirror repository is already used`);
+                    mirrorRepoNames.push(mirrorRepoName);
+                }
+            }
+        }
         const packageNames = [];
         for (const pkg of config.packages) {
             if (packageNames.includes(pkg.name))

package/Command/BackupSessionsCommand.js

@@ -51,8 +51,9 @@ class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
             }),
             verbose: verbose > 1,
         });
+        const items = await action.exec(manager);
         const dataFormat = new DataFormat_1.DataFormat({
-            items: await action.exec(manager),
+            items,
             table: {
                 labels: [
                     "   ",
@@ -77,7 +78,13 @@ class BackupSessionsCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
         if (this.globalOptions.outputFormat)
-            console.log(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat, {
+                tpl: {
+                    sids: () => items.map((i) => i.snapshotId).join(),
+                    ssids: () => items.map((i) => i.snapshotId.slice(0, 8)).join(),
+                    pkgNames: () => items.map((i) => i.packageName).join(),
+                },
+            }));
         return 0;
     }
 }

package/Command/ConfigCommand.d.ts

@@ -8,7 +8,7 @@ export declare type ConfigCommandOptionsType<TResolved = false> = {
     repositoryType?: If<TResolved, RepositoryConfigType["type"][]>;
 };
 export declare type ConfigCommandLogType = {
-    package: string;
+    packageName: string;
     repositoryNames: string[];
     taskName: string | undefined;
 }[];

package/Command/ConfigCommand.js

@@ -40,7 +40,7 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
             repositoryTypes: this.options.repositoryType,
         });
         const summaryConfig = packages.flatMap((pkg) => ({
-            package: pkg.name,
+            packageName: pkg.name,
             repositoryNames: pkg.repositoryNames ?? [],
             taskName: pkg.task?.name,
         }));
@@ -49,14 +49,18 @@ class ConfigCommand extends CommandAbstract_1.CommandAbstract {
             table: {
                 labels: ["Package", "Repository", "Task"],
                 handler: (item) => [
-                    item.package,
+                    item.packageName,
                     item.repositoryNames.join(", "),
                     item.taskName ?? "",
                 ],
             },
         });
         if (this.globalOptions.outputFormat)
-            console.log(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat, {
+                tpl: {
+                    pkgNames: () => summaryConfig.map((i) => i.packageName).join(),
+                },
+            }));
         return 0;
     }
 }

package/Command/InitCommand.js

@@ -56,7 +56,7 @@ class InitCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
         if (this.globalOptions.outputFormat)
-            console.log(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat));
         return 0;
     }
 }

package/Command/PruneCommand.js

@@ -144,7 +144,7 @@ class PruneCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
         if (this.globalOptions.outputFormat)
-            console.log(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat));
         if (!this.options.confirm && !this.options.dryRun) {
             const answer = await (0, cli_util_1.confirm)(`Delete ${pruneResult.prune}/${pruneResult.total} snapshots?`);
             if (answer)

package/Command/RestoreSessionsCommand.js

@@ -50,8 +50,9 @@ class RestoreSessionsCommand extends CommandAbstract_1.CommandAbstract {
                 verbose: verbose > 1,
             }),
         });
+        const items = await action.exec(manager);
         const dataFormat = new DataFormat_1.DataFormat({
-            items: await action.exec(manager),
+            items,
             table: {
                 labels: [
                     "   ",
@@ -76,7 +77,13 @@ class RestoreSessionsCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
         if (this.globalOptions.outputFormat)
-            console.log(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat, {
+                tpl: {
+                    sids: () => items.map((i) => i.snapshotId).join(),
+                    ssids: () => items.map((i) => i.snapshotId.slice(0, 8)).join(),
+                    pkgNames: () => items.map((i) => i.packageName).join(),
+                },
+            }));
         return 0;
     }
 }

package/Command/SnapshotsCommand.js

@@ -106,8 +106,9 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             verbose: verbose > 0,
             tags: this.options.tag,
         });
+        const items = await snapshots.exec();
         const dataFormat = new DataFormat_1.DataFormat({
-            items: await snapshots.exec(),
+            items,
             table: {
                 labels: [
                     "Id.",
@@ -128,7 +129,13 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
             },
         });
         if (this.globalOptions.outputFormat)
-            console.log(dataFormat.format(this.globalOptions.outputFormat));
+            console.info(dataFormat.format(this.globalOptions.outputFormat, {
+                tpl: {
+                    sids: () => items.map((i) => i.id).join(),
+                    ssids: () => items.map((i) => i.shortId).join(),
+                    pkgNames: () => items.map((i) => i.packageName).join(),
+                },
+            }));
         return 0;
     }
 }

package/Config/RepositoryConfig.d.ts

@@ -7,6 +7,7 @@ export declare type RepositoryConfigTypeType = RepositoryConfigType["type"];
 export declare type RepositoryConfigEnabledActionType = "backup" | "init" | "prune" | "restore" | "snapshots";
 export declare type RepositoryConfigType = {
     name: string;
+    mirrorRepoNames?: string[];
     enabled?: boolean | {
         [K in "defaults" | RepositoryConfigEnabledActionType]?: boolean;
     };

package/Config/RepositoryConfig.js

@@ -17,6 +17,7 @@ exports.repositoryConfigDefinition = {
     properties: {
         type: { type: "string" },
         name: { type: "string" },
+        mirrorRepoNames: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.stringListUtil),
         enabled: {
             anyOf: [
                 {

package/Factory/CommandFactory.js

@@ -35,11 +35,11 @@ exports.exec = exec;
 function makeParseLog(type) {
     const data = [];
     const consoleLog = console.log;
-    console.log = (...items) => {
+    console.log = console.info = (...items) => {
         data.push(...items);
     };
     return function parseLog() {
-        console.log = consoleLog;
+        console.log = console.info = consoleLog;
         return JSON.parse(data.flat().join("\n"));
     };
 }

package/Repository/GitRepository.d.ts

@@ -1,4 +1,4 @@
-import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, SnapshotTagEnum, SnapshotTagObjectType, PruneDataType } from "./RepositoryAbstract";
+import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, SnapshotTagEnum, SnapshotTagObjectType, PruneDataType, CopyBackupType } from "./RepositoryAbstract";
 import { JSONSchema7 } from "json-schema";
 export declare type GitRepositoryConfigType = {
     repo: string;
@@ -25,5 +25,6 @@ export declare class GitRepository extends RepositoryAbstract<GitRepositoryConfi
     onPrune(data: PruneDataType): Promise<void>;
     onSnapshots(data: SnapshotsDataType): Promise<SnapshotResultType[]>;
     onBackup(data: BackupDataType<GitPackageRepositoryConfigType>): Promise<void>;
+    onCopyBackup(data: CopyBackupType<GitRepositoryConfigType>): Promise<void>;
     onRestore(data: RestoreDataType<GitPackageRepositoryConfigType>): Promise<void>;
 }

package/Repository/GitRepository.js

@@ -215,6 +215,9 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             recursive: true,
         });
     }
+    onCopyBackup(data) {
+        throw new Error("Method not implemented.");
+    }
     async onRestore(data) {
         const restorePath = data.targetPath ?? data.package.restorePath;
         (0, assert_1.ok)(restorePath);

package/Repository/LocalRepository.d.ts

@@ -1,4 +1,4 @@
-import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, PruneDataType } from "./RepositoryAbstract";
+import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, PruneDataType, CopyBackupType } from "./RepositoryAbstract";
 import type { JSONSchema7 } from "json-schema";
 export declare type MetaDataType = {
     id: string;
@@ -51,6 +51,7 @@ export declare class LocalRepository extends RepositoryAbstract<LocalRepositoryC
     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>;
 }
 export {};

package/Repository/LocalRepository.js

@@ -122,7 +122,7 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
     async onSnapshots(data) {
         if (!(await (0, fs_util_1.checkDir)(this.config.outPath)))
             throw new Error(`Repository (${this.repository.name}) out path does not exist: ${this.config.outPath}`);
-        const snapshotNames = await (0, promises_1.readdir)(this.config.outPath);
+        const snapshotNames = await (0, fs_util_1.readDir)(this.config.outPath);
         const snapshots = [];
         const packagePatterns = (0, string_util_1.makePathPatterns)(data.options.packageNames);
         const taskPatterns = (0, string_util_1.makePathPatterns)(data.options.packageTaskNames);
@@ -299,6 +299,28 @@ class LocalRepository extends RepositoryAbstract_1.RepositoryAbstract {
             (0, cli_util_1.logExec)(`Writing metadata into ${metaPath}`);
         await (0, promises_1.writeFile)(metaPath, LocalRepository.stringifyMetaData(meta));
     }
+    async onCopyBackup(data) {
+        const snapshotName = LocalRepository.buildSnapshotName({
+            snapshotId: data.snapshot.id,
+            snapshotDate: data.snapshot.date,
+            packageName: data.package.name,
+        });
+        const sourcePath = (0, path_1.resolve)((0, path_1.join)(this.config.outPath, snapshotName));
+        const targetPath = (0, path_1.resolve)((0, path_1.join)(data.mirrorRepositoryConfig.outPath, snapshotName));
+        const sourceMetaPath = `${sourcePath}.json`;
+        const targetMetaPath = `${targetPath}.json`;
+        if (data.options.verbose)
+            (0, cli_util_1.logExec)(`Copying files to ${targetPath}`);
+        await (0, promises_1.mkdir)(targetPath);
+        await (0, fs_util_1.cpy)({
+            input: {
+                type: "glob",
+                sourcePath,
+            },
+            targetPath,
+        });
+        await (0, promises_1.copyFile)(sourceMetaPath, targetMetaPath);
+    }
     async onRestore(data) {
         const relRestorePath = data.targetPath ?? data.package.restorePath;
         (0, assert_1.ok)(relRestorePath);

package/Repository/RepositoryAbstract.d.ts

@@ -27,6 +27,13 @@ export declare type InitDataType = {
 export declare type SnapshotsDataType = {
     options: Pick<SnapshotsActionOptionsType, "ids" | "packageNames" | "packageTaskNames" | "verbose" | "tags">;
 };
+export declare type CopyBackupType<TRepositoryConfig> = {
+    options: BackupActionOptionsType;
+    snapshot: SnapshotType;
+    package: PackageConfigType;
+    mirrorRepositoryConfig: TRepositoryConfig;
+    onProgress: (data: ProgressDataType) => Promise<void>;
+};
 export declare type BackupDataType<TPackageConfig> = {
     options: BackupActionOptionsType;
     snapshot: SnapshotType;
@@ -75,6 +82,7 @@ export declare abstract class RepositoryAbstract<TConfig> {
     abstract onInit(data: InitDataType): Promise<void>;
     abstract onPrune(data: PruneDataType): Promise<void>;
     abstract onSnapshots(data: SnapshotsDataType): Promise<SnapshotResultType[]>;
+    abstract onCopyBackup(data: CopyBackupType<TConfig>): Promise<void>;
     abstract onBackup(data: BackupDataType<unknown>): Promise<void>;
     abstract onRestore(data: RestoreDataType<unknown>): Promise<void>;
 }

package/Repository/ResticRepository.d.ts

@@ -1,5 +1,5 @@
 import { RepositoryType } from "../util/ResticUtil";
-import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, SnapshotTagObjectType, SnapshotTagEnum, PruneDataType } from "./RepositoryAbstract";
+import { RepositoryAbstract, BackupDataType, InitDataType, RestoreDataType, SnapshotsDataType, SnapshotResultType, SnapshotTagObjectType, SnapshotTagEnum, PruneDataType, CopyBackupType } from "./RepositoryAbstract";
 import { JSONSchema7 } from "json-schema";
 export declare type ResticRepositoryConfigType = {
     password: string | {
@@ -36,5 +36,6 @@ export declare class ResticRepository extends RepositoryAbstract<ResticRepositor
     onSnapshots(data: SnapshotsDataType): Promise<SnapshotResultType[]>;
     onPrune(data: PruneDataType): Promise<void>;
     onBackup(data: BackupDataType<ResticPackageRepositoryConfigType>): Promise<void>;
+    onCopyBackup(data: CopyBackupType<ResticRepositoryConfigType>): Promise<void>;
     onRestore(data: RestoreDataType<ResticPackageRepositoryConfigType>): Promise<void>;
 }

package/Repository/ResticRepository.js

@@ -271,6 +271,30 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             percent: 100,
         });
     }
+    async onCopyBackup(data) {
+        const config = data.mirrorRepositoryConfig;
+        const [snapshot] = await this.onSnapshots({
+            options: {
+                ids: [data.snapshot.id],
+                packageNames: [data.package.name],
+            },
+        });
+        if (!snapshot)
+            throw new AppError_1.AppError(`Snapshot not found`);
+        const restic = new ResticUtil_1.ResticUtil({
+            env: {
+                ...(await this.buildEnv()),
+                ...(typeof config.password === "string"
+                    ? { RESTIC_PASSWORD2: config.password }
+                    : { RESTIC_PASSWORD_FILE2: (0, path_1.resolve)(config.password.path) }),
+                RESTIC_REPOSITORY2: await ResticUtil_1.ResticUtil.formatRepository(config.repository),
+            },
+            log: data.options.verbose,
+        });
+        await restic.copy({
+            id: snapshot.originalId,
+        });
+    }
     async onRestore(data) {
         const restorePath = data.targetPath ?? data.package.restorePath;
         (0, assert_1.ok)(restorePath);

package/Task/MariadbTask.js

@@ -137,7 +137,7 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
         const restorePath = data.package.restorePath;
         (0, assert_1.ok)(typeof restorePath === "string");
         await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        const files = await (0, promises_1.readdir)(restorePath);
+        const files = await (0, fs_util_1.readDir)(restorePath);
         for (const file of files) {
             if (file.startsWith("ib_logfile")) {
                 const filePath = (0, path_1.join)(restorePath, file);

package/Task/MssqlTask.js

@@ -84,7 +84,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
         const restorePath = data.package.restorePath;
         (0, assert_1.ok)(typeof restorePath === "string");
         await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        const files = await (0, promises_1.readdir)(restorePath);
+        const files = await (0, fs_util_1.readDir)(restorePath);
         for (const file of files) {
             if (!file.endsWith(MssqlTask.SUFFIX))
                 continue;

package/Task/SqlDumpTaskAbstract.js

@@ -160,7 +160,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                 database: database.name,
             });
         }
-        const items = (await (0, promises_1.readdir)(restorePath))
+        const items = (await (0, fs_util_1.readDir)(restorePath))
             .map(parseSqlFile)
             .filter((v) => !!v);
         // Database check

package/cli.js

@@ -78,9 +78,10 @@ const cwd = process.cwd();
 program.name(subname);
 program.version(version);
 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("-o,--output-format <format>", "Output format (json, pjson, yaml, table, custom=$)", "table");
+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");
 makeCommand(CommandFactory_1.CommandEnum.snapshots).alias("s");
@@ -104,7 +105,7 @@ function parseArgs(args) {
     (0, process_util_1.onExit)((eventName, error) => {
         if (eventName !== "exit") {
             process.stdout.write(cli_util_1.showCursorCommand);
-            console.log(`\nClosing... (reason: ${eventName})`);
+            console.info(`\nClosing... (reason: ${eventName})`);
             if (error instanceof Error)
                 console.error((0, chalk_1.red)(error.stack));
         }

package/config.schema.json

@@ -20,6 +20,9 @@
         "name": {
           "type": "string"
         },
+        "mirrorRepoNames": {
+          "$ref": "#/definitions/stringlist-util"
+        },
         "enabled": {
           "anyOf": [
             {

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.9.0",
+  "version": "0.11.1",
   "dependencies": {
     "ajv": "^8.11.0",
     "async": "^3.2.4",
     "chalk": "^4.1.2",
     "cli-table3": "^0.6.2",
-    "commander": "^9.3.0",
-    "dayjs": "^1.11.3",
+    "commander": "^9.4.0",
+    "dayjs": "^1.11.5",
     "fast-glob": "^3.2.11",
     "micromatch": "^4.0.5",
-    "sqlite": "^4.1.1",
-    "sqlite3": "^5.0.8"
+    "sqlite": "^4.1.2",
+    "sqlite3": "^5.0.11"
   },
   "optionalDependencies": {
-    "ts-node": "^10.8.2",
+    "ts-node": "^10.9.1",
     "yaml": "^2.1.1"
   },
   "engine": {

package/util/DataFormat.d.ts

@@ -1,4 +1,4 @@
-export declare type FormatType = "json" | "pjson" | "table" | "yaml" | "custom";
+export declare type FormatType = "json" | "pjson" | "table" | "yaml" | "custom" | "tpl";
 export declare class DataFormat<TItem extends Record<string, unknown>> {
     readonly options: {
         items: TItem[];
@@ -20,5 +20,7 @@ export declare class DataFormat<TItem extends Record<string, unknown>> {
     protected formatToPrettyJson(): string;
     protected formatToYaml(): any;
     protected formatToTable(): string;
-    format(format: FormatType): any;
+    format(format: FormatType, options?: {
+        tpl?: Record<string, () => string>;
+    }): any;
 }

package/util/DataFormat.js

@@ -8,6 +8,7 @@ const AppError_1 = require("../Error/AppError");
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const util_1 = require("util");
 const customPrefix = "custom=";
+const tplPrefix = "tpl=";
 class DataFormat {
     constructor(options) {
         this.options = options;
@@ -34,7 +35,7 @@ class DataFormat {
             table.push(this.options.table.handler(item));
         return table.toString();
     }
-    format(format) {
+    format(format, options) {
         if (format === "table") {
             return this.formatToTable();
         }
@@ -51,6 +52,15 @@ class DataFormat {
             const code = format.slice(customPrefix.length);
             return runCustomCode(this.options.items, code);
         }
+        else if (format.startsWith(tplPrefix)) {
+            const name = format.slice(tplPrefix.length);
+            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})`);
+            }
+            return tpl[name]();
+        }
         else {
             throw new AppError_1.AppError(`Invalid output format: ${format}`);
         }

package/util/GitUtil.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitUtil = void 0;
 const fs_util_1 = require("./fs-util");
 const process_util_1 = require("./process-util");
-const promises_1 = require("fs/promises");
 class GitUtil {
     constructor(options) {
         this.options = options;
@@ -16,7 +15,7 @@ class GitUtil {
     }
     async canBeInit(repo) {
         return ((0, fs_util_1.isLocalDir)(repo) &&
-            (!(await (0, fs_util_1.checkDir)(repo)) || !(await (0, promises_1.readdir)(repo)).length));
+            (!(await (0, fs_util_1.checkDir)(repo)) || !(await (0, fs_util_1.readDir)(repo)).length));
     }
     async clone(options) {
         return await this.exec([

package/util/ResticUtil.d.ts

@@ -86,6 +86,10 @@ export declare class ResticUtil {
         allowEmptySnapshot?: boolean;
         onStream?: (data: BackupStreamType) => void;
     }): Promise<ExecResultType>;
+    copy(options: {
+        id: string;
+        onStream?: (data: BackupStreamType) => Promise<void>;
+    }): Promise<ExecResultType>;
     restore(options: {
         id: string;
         target: string;

package/util/ResticUtil.js

@@ -154,6 +154,22 @@ class ResticUtil {
             throw error;
         }
     }
+    async copy(options) {
+        return await this.exec(["copy", "--json", options.id], {
+            stderr: {
+                toExitCode: true,
+            },
+            stdout: {
+                ...(options.onStream && {
+                    onData: async (data) => {
+                        if (data.startsWith("{") && data.endsWith("}")) {
+                            await options.onStream?.(JSON.parse(data));
+                        }
+                    },
+                }),
+            },
+        });
+    }
     async restore(options) {
         return await this.exec(["restore", "--json", options.id, "--target", options.target], {
             stderr: {

package/util/cli-util.js

@@ -32,11 +32,11 @@ function logVars(data) {
     let first = true;
     for (const key in data) {
         if (first) {
-            console.log();
+            console.info();
             first = false;
         }
         const value = data[key];
-        console.log(`${chalk_1.default.cyan(key)}${chalk_1.default.grey(":")} ${chalk_1.default.white(value ?? "")}`);
+        console.info(`${chalk_1.default.cyan(key)}${chalk_1.default.grey(":")} ${chalk_1.default.white(value ?? "")}`);
     }
 }
 exports.logVars = logVars;

package/util/fs-util.d.ts

@@ -1,6 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
+import { Stats } from "fs";
 import { Interface } from "readline";
+export declare const isWSLSystem: boolean;
 export declare function isLocalDir(path: string): boolean;
 export declare function isDirEmpty(path: string): Promise<boolean>;
 export declare function mkdirIfNotExists(path: string): Promise<string>;
@@ -24,6 +27,7 @@ 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>;
 export declare function checkDir(path: string): Promise<boolean>;
+export declare function readDir(path: string): Promise<string[]>;
 export declare function forEachFile(dirPath: string, cb: (path: string, dir: boolean) => void, includeDir?: boolean): Promise<void>;
 export declare function writeGitIgnoreList(options: {
     paths: NodeJS.ReadableStream | string[];
@@ -46,6 +50,8 @@ export declare function writePathLists(options: {
         multipleStats: Record<string, number>;
     };
 }>;
+export declare function copyFileWithStreams(source: string, target: string): Promise<unknown>;
+export declare function updateFileStats(path: string, fileInfo: Stats): Promise<void>;
 export declare function cpy(options: {
     input: {
         type: "glob";

package/util/fs-util.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.cpy = exports.writePathLists = exports.writeGitIgnoreList = exports.forEachFile = 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 = void 0;
+exports.cpy = exports.updateFileStats = exports.copyFileWithStreams = exports.writePathLists = exports.writeGitIgnoreList = 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;
 const globalData_1 = __importDefault(require("../globalData"));
 const path_util_1 = require("./path-util");
 const async_1 = require("async");
@@ -13,15 +13,17 @@ const fs_1 = require("fs");
 const fs_2 = require("fs");
 const promises_1 = require("fs/promises");
 const micromatch_1 = require("micromatch");
+const os_1 = require("os");
 const path_1 = require("path");
 const path_2 = require("path");
 const readline_1 = require("readline");
+exports.isWSLSystem = (0, os_1.release)().includes("microsoft-standard-WSL");
 function isLocalDir(path) {
     return /^[\/\.]|([A-Z]:)/i.test(path);
 }
 exports.isLocalDir = isLocalDir;
 async function isDirEmpty(path) {
-    const files = await (0, promises_1.readdir)(path);
+    const files = await readDir(path);
     return !files.length;
 }
 exports.isDirEmpty = isDirEmpty;
@@ -57,7 +59,7 @@ exports.writeJSONFile = writeJSONFile;
 async function readdirIfExists(path) {
     if (!(await existsDir(path)))
         return [];
-    return await (0, promises_1.readdir)(path);
+    return await readDir(path);
 }
 exports.readdirIfExists = readdirIfExists;
 exports.parseFileExtensions = ["json", "js", "ts", "yaml", "yml"];
@@ -179,8 +181,25 @@ async function checkDir(path) {
     }
 }
 exports.checkDir = checkDir;
+async function readDir(path) {
+    try {
+        return await (0, promises_1.readdir)(path);
+    }
+    catch (anyError) {
+        const nodeError = anyError;
+        if (nodeError.code === "ENOENT") {
+            const error = new Error(nodeError.message);
+            error.code = nodeError.code;
+            error.errno = nodeError.errno;
+            error.path = nodeError.path;
+            throw error;
+        }
+        throw anyError;
+    }
+}
+exports.readDir = readDir;
 async function forEachFile(dirPath, cb, includeDir) {
-    const files = await (0, promises_1.readdir)(dirPath);
+    const files = await readDir(dirPath);
     for (const file of files) {
         const filePath = (0, path_1.join)(dirPath, file);
         if ((await (0, promises_1.stat)(filePath)).isDirectory()) {
@@ -315,6 +334,30 @@ async function writePathLists(options) {
     };
 }
 exports.writePathLists = writePathLists;
+async function copyFileWithStreams(source, target) {
+    const r = (0, fs_1.createReadStream)(source);
+    const w = (0, fs_2.createWriteStream)(target);
+    try {
+        return await new Promise((resolve, reject) => {
+            r.on("error", reject);
+            w.on("error", reject);
+            w.on("finish", resolve);
+            r.pipe(w);
+        });
+    }
+    catch (error) {
+        r.destroy();
+        w.end();
+        throw error;
+    }
+}
+exports.copyFileWithStreams = copyFileWithStreams;
+async function updateFileStats(path, fileInfo) {
+    await (0, promises_1.utimes)(path, fileInfo.atime, fileInfo.mtime);
+    await (0, promises_1.chmod)(path, fileInfo.mode);
+    await (0, promises_1.chown)(path, fileInfo.uid, fileInfo.gid);
+}
+exports.updateFileStats = updateFileStats;
 async function cpy(options) {
     const stats = { paths: 0, files: 0, dirs: 0 };
     const dirs = new Set();
@@ -350,7 +393,19 @@ async function cpy(options) {
             const dir = (0, path_1.dirname)(entryTargetPath);
             await makeRecursiveDir(dir);
             stats.files++;
-            await (0, promises_1.cp)(entrySourcePath, entryTargetPath);
+            // https://github.com/nodejs/node/issues/44261
+            if (exports.isWSLSystem) {
+                const fileInfo = await (0, promises_1.stat)(entrySourcePath);
+                const isWritable = (fileInfo.mode & 0o200) === 0o200;
+                if (!isWritable) {
+                    await copyFileWithStreams(entrySourcePath, entryTargetPath);
+                    await updateFileStats(entryTargetPath, fileInfo);
+                    return;
+                }
+            }
+            await (0, promises_1.cp)(entrySourcePath, entryTargetPath, {
+                preserveTimestamps: true,
+            });
         }
     };
     const { input } = options;