@datatruck/cli 0.35.0 → 0.36.0

package/config.schema.json

@@ -2073,7 +2073,7 @@
               "const": "prune"
             },
             "options": {
-              "$ref": "#/definitions/PruneCommandOptions"
+              "$ref": "#/definitions/Omit<PruneCommandOptions,\"confirm\">"
             }
           },
           "required": [
@@ -2084,62 +2084,59 @@
         }
       ]
     },
-    "PruneCommandOptions": {
-      "additionalProperties": false,
+    "Omit<PruneCommandOptions,\"confirm\">": {
       "type": "object",
       "properties": {
-        "keepLast": {
-          "type": "number"
+        "repository": {
+          "type": "string"
         },
-        "keepMinutely": {
+        "repositoryType": {
+          "type": "string"
+        },
+        "id": {
+          "type": "string"
+        },
+        "groupBy": {
+          "type": "string"
+        },
+        "dryRun": {
+          "type": "boolean"
+        },
+        "keepDaily": {
           "type": "number"
         },
         "keepHourly": {
           "type": "number"
         },
-        "keepDaily": {
+        "keepMinutely": {
           "type": "number"
         },
-        "keepWeekly": {
+        "keepLast": {
           "type": "number"
         },
         "keepMonthly": {
           "type": "number"
         },
-        "keepYearly": {
+        "keepWeekly": {
           "type": "number"
         },
-        "id": {
-          "type": "string"
-        },
-        "longId": {
-          "type": "boolean"
+        "keepYearly": {
+          "type": "number"
         },
         "package": {
           "type": "string"
         },
-        "repository": {
-          "type": "string"
-        },
-        "repositoryType": {
-          "type": "string"
-        },
         "tag": {
           "type": "string"
         },
-        "groupBy": {
-          "type": "string"
-        },
-        "dryRun": {
+        "longId": {
           "type": "boolean"
         },
         "showAll": {
           "type": "boolean"
-        },
-        "confirm": {
-          "type": "boolean"
         }
-      }
+      },
+      "additionalProperties": false
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"

package/lib/actions/BackupAction.js

@@ -123,6 +123,7 @@ class BackupAction {
         return await repo.backup({
             options: this.options,
             snapshot: data.snapshot,
+            hostname: this.config.hostname ?? (0, os_1.hostname)(),
             package: pkg,
             packageConfig,
             onProgress: data.onProgress,

package/lib/actions/CopyAction.js

@@ -164,6 +164,7 @@ class CopyAction {
             if (this.config.minFreeDiskSpace)
                 await mirrorRepo.ensureFreeDiskSpace(mirrorConfig.config, this.config.minFreeDiskSpace);
             return await mirrorRepo.backup({
+                hostname: snapshot.hostname,
                 options: {
                     verbose: this.options.verbose,
                     tags: snapshot.tags,

package/lib/actions/InitAction.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InitAction = void 0;
 const config_1 = require("../utils/datatruck/config");
 const repository_1 = require("../utils/datatruck/repository");
+const string_1 = require("../utils/string");
 class InitAction {
     config;
     options;
@@ -12,14 +13,14 @@ class InitAction {
     }
     async exec() {
         const result = [];
+        const filterRepo = (0, string_1.createPatternFilter)(this.options.repositoryNames);
+        const filterRepoType = (0, string_1.createPatternFilter)(this.options.repositoryTypes);
         for (const repoConfig of this.config.repositories) {
             if (!(0, config_1.filterRepositoryByEnabled)(repoConfig, "init"))
                 continue;
-            if (this.options.repositoryNames &&
-                !this.options.repositoryNames.includes(repoConfig.name))
+            if (!filterRepo(repoConfig.name))
                 continue;
-            if (this.options.repositoryTypes &&
-                !this.options.repositoryTypes.includes(repoConfig.type))
+            if (!filterRepoType(repoConfig.type))
                 continue;
             const repo = (0, repository_1.createRepo)(repoConfig, this.options.verbose);
             let initError = null;

package/lib/actions/RestoreAction.js

@@ -59,6 +59,7 @@ const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const list_1 = require("../utils/list");
 const progress_1 = require("../utils/progress");
+const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const SnapshotsAction_1 = require("./SnapshotsAction");
 const assert_1 = require("assert");
@@ -74,12 +75,12 @@ class RestoreAction {
     }
     async findSnapshots() {
         const result = [];
+        const filterRepo = (0, string_1.createPatternFilter)(this.options.repositoryNames);
+        const filterRepoType = (0, string_1.createPatternFilter)(this.options.repositoryTypes);
         for (const repository of this.config.repositories) {
-            if (this.options.repositoryNames &&
-                !this.options.repositoryNames.includes(repository.name))
+            if (!filterRepo(repository.name))
                 continue;
-            if (this.options.repositoryTypes &&
-                !this.options.repositoryTypes.includes(repository.type))
+            if (!filterRepoType(repository.type))
                 continue;
             const snapshotsAction = new SnapshotsAction_1.SnapshotsAction(this.config, {
                 repositoryNames: [repository.name],

package/lib/actions/SnapshotsAction.d.ts

@@ -4,6 +4,7 @@ import { IfRequireKeys } from "../utils/ts";
 export type SnapshotGroupByType = keyof Pick<ExtendedSnapshot, "packageName" | "repositoryName" | "repositoryType">;
 export type SnapshotsActionOptions = {
     ids?: string[];
+    hostnames?: string[];
     repositoryNames?: string[];
     packageNames?: string[];
     packageTaskNames?: string[];

package/lib/actions/SnapshotsAction.js

@@ -4,6 +4,7 @@ exports.SnapshotsAction = void 0;
 const config_1 = require("../utils/datatruck/config");
 const repository_1 = require("../utils/datatruck/repository");
 const snapshot_1 = require("../utils/datatruck/snapshot");
+const string_1 = require("../utils/string");
 class SnapshotsAction {
     config;
     options;
@@ -15,14 +16,15 @@ class SnapshotsAction {
         if (!sourceAction)
             sourceAction = "snapshots";
         let result = [];
+        const filterHost = (0, string_1.createPatternFilter)(this.options.hostnames);
+        const filterRepo = (0, string_1.createPatternFilter)(this.options.repositoryNames);
+        const filterRepoType = (0, string_1.createPatternFilter)(this.options.repositoryTypes);
         for (const repoConfig of this.config.repositories) {
             if (!(0, config_1.filterRepositoryByEnabled)(repoConfig, sourceAction))
                 continue;
-            if (this.options.repositoryNames &&
-                !this.options.repositoryNames.includes(repoConfig.name))
+            if (!filterRepo(repoConfig.name))
                 continue;
-            if (this.options.repositoryTypes &&
-                !this.options.repositoryTypes.includes(repoConfig.type))
+            if (!filterRepoType(repoConfig.type))
                 continue;
             const repo = await (0, repository_1.createAndInitRepo)(repoConfig, this.options.verbose);
             const configPackageNames = this.config.packages.map((pkg) => pkg.name);
@@ -35,12 +37,14 @@ class SnapshotsAction {
                     packageNames,
                 },
             });
-            const extentedItems = snapshots.map((ss) => ({
+            let extentedItems = snapshots.map((ss) => ({
                 ...ss,
                 shortId: ss.id.slice(0, 8),
                 repositoryName: repoConfig.name,
                 repositoryType: repoConfig.type,
             }));
+            if (this.options.hostnames)
+                extentedItems = extentedItems.filter((s) => filterHost(s.hostname));
             result.push(...extentedItems);
         }
         result = result.sort((a, b) => b.date.localeCompare(a.date));

package/lib/commands/RestoreCommand.d.ts

@@ -28,6 +28,7 @@ export declare class RestoreCommand extends CommandAbstract<RestoreCommandOption
                 packageName: string;
                 packageTaskName: string | undefined;
                 tags: string[];
+                hostname: string;
                 size: number;
             } & {
                 repositoryName: string;

package/lib/commands/SnapshotsCommand.d.ts

@@ -4,6 +4,7 @@ import { If } from "../utils/ts";
 import { CommandAbstract } from "./CommandAbstract";
 export type SnapshotsCommandOptions<TResolved = false> = {
     id?: If<TResolved, string[]>;
+    host?: If<TResolved, string[]>;
     package?: If<TResolved, string[]>;
     packageTask?: If<TResolved, string[]>;
     packageConfig?: boolean;

package/lib/commands/SnapshotsCommand.js

@@ -30,6 +30,11 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                 description: "Filter by identifiers",
                 parser: string_1.parseStringList,
             },
+            host: {
+                option: "-h,--host <names>",
+                description: "Filter by hostnames",
+                parser: string_1.parseStringList,
+            },
             last: {
                 option: "-l,--last <number>",
                 description: "Filter by last snapshots",
@@ -101,6 +106,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
         const config = await ConfigAction_1.ConfigAction.fromGlobalOptions(this.globalOptions);
         const snapshots = new SnapshotsAction_1.SnapshotsAction(config, {
             ids: this.options.id,
+            hostnames: this.options.host,
             packageNames: this.options.package,
             packageTaskNames: this.options.packageTask,
             packageConfig: this.options.packageConfig,
@@ -125,6 +131,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                 headers: [
                     { value: "Id.", width: (this.options.longId ? 32 : 8) + 2 },
                     { value: "Date", width: 23 + 2 },
+                    { value: "Host" },
                     { value: "Package" },
                     { value: "Task" },
                     { value: "Size" },
@@ -134,6 +141,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                 rows: () => result.map((item) => [
                     this.options.longId ? item.id : item.id.slice(0, 8),
                     item.date.replace("T", " ").replace("Z", ""),
+                    item.hostname,
                     item.packageName,
                     item.packageTaskName || "",
                     (0, bytes_1.formatBytes)(item.size),

package/lib/repositories/DatatruckRepository.d.ts

@@ -1,12 +1,6 @@
 import { CompressOptions } from "../utils/tar";
-import { RepositoryAbstract, RepoBackupData, RepoInitData, RepoRestoreData, RepoFetchSnapshotsData, Snapshot, RepoPruneData, RepoCopyData } from "./RepositoryAbstract";
-export type MetaData = {
-    id: string;
-    date: string;
-    package: string;
-    task: string | undefined;
-    tags: string[];
-    version: string;
+import { RepositoryAbstract, RepoBackupData, RepoInitData, RepoRestoreData, RepoFetchSnapshotsData, Snapshot, RepoPruneData, RepoCopyData, SnapshotTagObject } from "./RepositoryAbstract";
+export type MetaData = Omit<SnapshotTagObject, "shortId" | "size"> & {
     size: number;
     tarStats?: Record<string, {
         files: number;
@@ -32,7 +26,7 @@ export type DatatruckPackageRepositoryConfig = {
 export declare const datatruckRepositoryName = "datatruck";
 export declare class DatatruckRepository extends RepositoryAbstract<DatatruckRepositoryConfig> {
     static zipBasenameTpl: string;
-    static buildSnapshotName(snapshot: {
+    static createSnapshotName(snapshot: {
         id: string;
         date: string;
     }, pkg: {

package/lib/repositories/DatatruckRepository.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatatruckRepository = exports.datatruckRepositoryName = void 0;
+const async_1 = require("../utils/async");
 const cli_1 = require("../utils/cli");
 const crypto_1 = require("../utils/crypto");
 const client_1 = require("../utils/datatruck/client");
+const config_1 = require("../utils/datatruck/config");
 const paths_1 = require("../utils/datatruck/paths");
 const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
@@ -14,12 +16,11 @@ const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.datatruckRepositoryName = "datatruck";
 class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
     static zipBasenameTpl = `.*.dd.tar.gz`;
-    static buildSnapshotName(snapshot, pkg) {
+    static createSnapshotName(snapshot, pkg) {
         const date = snapshot.date.replace(/:/g, "-");
         const pkgName = encodeURIComponent(pkg.name)
             .replace(/%40/g, "@")
@@ -54,7 +55,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
     }
     async prune(data) {
         const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
-        const snapshotName = DatatruckRepository.buildSnapshotName(data.snapshot, {
+        const snapshotName = DatatruckRepository.createSnapshotName(data.snapshot, {
             name: data.snapshot.packageName,
         });
         if (data.options.verbose)
@@ -68,23 +69,26 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             throw new error_1.AppError(`Repository (${this.repository.name}) out path does not exist: ${fs.resolvePath(".")}`);
         const snapshots = [];
         const snapshotNames = await fs.readdir(".");
-        const packagePatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
-        const taskPatterns = (0, string_1.makePathPatterns)(data.options.packageTaskNames);
-        for (const snapshotName of snapshotNames) {
-            const snapshotNameData = DatatruckRepository.parseSnapshotName(snapshotName);
-            if (!snapshotNameData)
-                continue;
-            if (packagePatterns &&
-                !(0, micromatch_1.isMatch)(snapshotNameData.packageName, packagePatterns))
-                continue;
-            if (data.options.ids &&
-                !data.options.ids.some((id) => snapshotNameData.snapshotShortId.startsWith(id.slice(0, 8))))
-                continue;
-            const metaData = await fs.readFileIfExists(`${snapshotName}/meta.json`);
+        const filterPkg = (0, config_1.createPkgFilter)(data.options.packageNames);
+        const filterTask = (0, config_1.createTaskFilter)(data.options.packageTaskNames);
+        const filterId = (shortId) => !data.options.ids ||
+            data.options.ids.some((id) => shortId.startsWith(id.slice(0, 8)));
+        const preSnapshots = snapshotNames
+            .filter((snapshotName) => {
+            const data = DatatruckRepository.parseSnapshotName(snapshotName);
+            return (data && filterPkg(data.packageName) && filterId(data.snapshotShortId));
+        })
+            .map((name) => ({ name }));
+        await (0, async_1.runParallel)({
+            items: preSnapshots,
+            concurrency: 5,
+            async onItem({ item }) {
+                item.metaData = await fs.readFileIfExists(`${item.name}/meta.json`);
+            },
+        });
+        for (const { name, metaData } of preSnapshots) {
             const meta = !!metaData && (await DatatruckRepository.parseMetaData(metaData));
-            if (!meta)
-                continue;
-            if (taskPatterns && !(0, string_1.checkMatch)(meta.task, taskPatterns))
+            if (!meta || !filterTask(meta.task))
                 continue;
             if (data.options.ids &&
                 !data.options.ids.some((id) => meta.id.startsWith(id)))
@@ -93,12 +97,13 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 !data.options.tags.some((value) => data.options.tags?.includes(value)))
                 continue;
             snapshots.push({
-                originalId: snapshotName,
+                originalId: name,
                 id: meta.id,
                 date: meta.date,
                 packageName: meta.package,
                 packageTaskName: meta.task,
                 tags: meta.tags,
+                hostname: meta.hostname ?? "",
                 size: meta.size || 0,
             });
         }
@@ -106,7 +111,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
     }
     async backup(data) {
         const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
-        const snapshotName = DatatruckRepository.buildSnapshotName(data.snapshot, data.package);
+        const snapshotName = DatatruckRepository.createSnapshotName(data.snapshot, data.package);
         const outPath = fs.isLocal()
             ? fs.resolvePath(snapshotName)
             : await (0, temp_1.mkTmpDir)(exports.datatruckRepositoryName, "repo", "backup", "fs-remote");
@@ -209,6 +214,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         const nodePkg = (0, fs_1.parsePackageFile)();
         const meta = {
             id: data.snapshot.id,
+            hostname: data.hostname,
             date: data.snapshot.date,
             tags: data.options.tags ?? [],
             package: data.package.name,
@@ -227,7 +233,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
     async copy(data) {
         const sourceFs = (0, client_1.createFs)(this.config.backend, this.verbose);
         const targetFs = (0, client_1.createFs)(data.mirrorRepositoryConfig.backend, this.verbose);
-        const snapshotName = DatatruckRepository.buildSnapshotName(data.snapshot, data.package);
+        const snapshotName = DatatruckRepository.createSnapshotName(data.snapshot, data.package);
         if (data.options.verbose)
             (0, cli_1.logExec)(`Copying backup files to ${data.mirrorRepositoryConfig.backend}`);
         const tmpSnapshotName = `${snapshotName}_tmp`;
@@ -307,7 +313,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         });
         if (!snapshot)
             throw new error_1.AppError("Snapshot not found");
-        const snapshotName = DatatruckRepository.buildSnapshotName(snapshot, data.package);
+        const snapshotName = DatatruckRepository.createSnapshotName(snapshot, data.package);
         const meta = await DatatruckRepository.parseMetaData(await fs.readFile(`${snapshotName}/meta.json`));
         const progress = (0, fs_1.createProgress)({ onProgress: data.onProgress });
         progress.update("Scanning files");

package/lib/repositories/GitRepository.d.ts

@@ -9,15 +9,13 @@ export declare class GitRepository extends RepositoryAbstract<GitRepositoryConfi
     static refPrefix: string;
     getSource(): string;
     fetchDiskStats(config: GitRepositoryConfig): Promise<import("../utils/fs").DiskStats | undefined>;
-    static buildSnapshotTagName(tag: Pick<SnapshotTagObject, SnapshotTagEnum.PACKAGE | SnapshotTagEnum.ID>): string;
-    static buildSnapshotTag(tag: SnapshotTagObject): {
+    static createSnapshotTagName(tag: Pick<SnapshotTagObject, SnapshotTagEnum.PACKAGE | SnapshotTagEnum.ID>): string;
+    static createSnapshotTags(tags: SnapshotTagObject): {
         name: string;
         message: string;
     };
     static isSnapshotTag(name: string): boolean;
-    static parseSnapshotTag(name: string, message: string): (Omit<SnapshotTagObject, "tags"> & {
-        tags: string[];
-    }) | null;
+    static parseSnapshotTags(name: string, message: string): SnapshotTagObject | null;
     static buildBranchName(packageName: string): string;
     init(data: RepoInitData): Promise<void>;
     prune(data: RepoPruneData): Promise<void>;

package/lib/repositories/GitRepository.js

@@ -5,15 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitRepository = exports.gitRepositoryName = void 0;
 const cli_1 = require("../utils/cli");
+const config_1 = require("../utils/datatruck/config");
 const paths_1 = require("../utils/datatruck/paths");
 const fs_1 = require("../utils/fs");
 const git_1 = require("../utils/git");
-const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.gitRepositoryName = "git";
 class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
@@ -25,19 +24,19 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         if ((0, fs_1.isLocalDir)(config.repo))
             return await (0, fs_1.fetchDiskStats)(config.repo);
     }
-    static buildSnapshotTagName(tag) {
+    static createSnapshotTagName(tag) {
         return `${GitRepository.refPrefix}/${tag.package}/${tag.id}`;
     }
-    static buildSnapshotTag(tag) {
+    static createSnapshotTags(tags) {
         return {
-            name: GitRepository.buildSnapshotTagName(tag),
-            message: JSON.stringify(tag),
+            name: GitRepository.createSnapshotTagName(tags),
+            message: JSON.stringify(tags),
         };
     }
     static isSnapshotTag(name) {
         return name.startsWith(`${GitRepository.refPrefix}/`);
     }
-    static parseSnapshotTag(name, message) {
+    static parseSnapshotTags(name, message) {
         if (GitRepository.isSnapshotTag(name))
             return JSON.parse(message);
         return null;
@@ -104,21 +103,21 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
             dir: await (0, temp_1.mkTmpDir)(exports.gitRepositoryName, "repo", "snapshots"),
             log: data.options.verbose,
         });
-        const pkgPatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
-        const pkgTaskPatterns = (0, string_1.makePathPatterns)(data.options.packageTaskNames);
         await git.clone({ repo: this.config.repo });
         const tagNames = data.options.ids?.map((id) => `${GitRepository.refPrefix}/*/${id}*`) || [`${GitRepository.refPrefix}/*`];
         const tags = await git.getTags(tagNames);
+        const filterPkg = (0, config_1.createPkgFilter)(data.options.packageNames);
+        const filterTask = (0, config_1.createTaskFilter)(data.options.packageTaskNames);
         return tags
             .reduce((result, tag) => {
             const parsedTag = tag.message
-                ? GitRepository.parseSnapshotTag(tag.name, tag.message)
+                ? GitRepository.parseSnapshotTags(tag.name, tag.message)
                 : null;
             if (!parsedTag)
                 return result;
-            if (pkgPatterns && !(0, micromatch_1.isMatch)(parsedTag.package, pkgPatterns))
+            if (!filterPkg(parsedTag.package))
                 return result;
-            if (pkgTaskPatterns && !(0, string_1.checkMatch)(parsedTag.task, pkgTaskPatterns))
+            if (!filterTask(parsedTag.task))
                 return result;
             if (data.options.tags &&
                 !parsedTag.tags.some((value) => data.options.tags?.includes(value)))
@@ -130,6 +129,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 packageName: parsedTag.package,
                 packageTaskName: parsedTag.task,
                 tags: parsedTag.tags,
+                hostname: parsedTag.hostname ?? "",
                 size: Number(parsedTag.size) || 0,
             });
             return result;
@@ -197,8 +197,9 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         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({
+        const meta = GitRepository.createSnapshotTags({
             id: data.snapshot.id,
+            hostname: data.hostname,
             shortId: data.snapshot.id.slice(0, 8),
             tags: data.options.tags ?? [],
             date: data.snapshot.date,
@@ -221,7 +222,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
     }
     async restore(data) {
         const restorePath = data.snapshotPath;
-        const tagName = GitRepository.buildSnapshotTagName({
+        const tagName = GitRepository.createSnapshotTagName({
             id: data.snapshot.id,
             package: data.package.name,
         });

package/lib/repositories/RepositoryAbstract.d.ts

@@ -13,6 +13,7 @@ export type Snapshot = PreSnapshot & {
     packageName: string;
     packageTaskName: string | undefined;
     tags: string[];
+    hostname: string;
     size: number;
 };
 export type RepoInitData = {
@@ -33,6 +34,7 @@ export type RepoCopyData<TRepositoryConfig> = {
 export type RepoBackupData<TPackageConfig> = {
     options: BackupActionOptions;
     snapshot: PreSnapshot;
+    hostname: string;
     package: Omit<PackageConfig, "path"> & {
         path: string;
     };
@@ -61,7 +63,8 @@ export declare enum SnapshotTagEnum {
     TASK = "task",
     TAGS = "tags",
     VERSION = "version",
-    SIZE = "size"
+    SIZE = "size",
+    HOSTNAME = "hostname"
 }
 export type SnapshotTagObject = {
     [SnapshotTagEnum.ID]: string;
@@ -72,6 +75,7 @@ export type SnapshotTagObject = {
     [SnapshotTagEnum.TAGS]: string[];
     [SnapshotTagEnum.VERSION]: string;
     [SnapshotTagEnum.SIZE]: string;
+    [SnapshotTagEnum.HOSTNAME]: string;
 };
 export declare abstract class RepositoryAbstract<TConfig> {
     readonly repository: RepositoryConfig;

package/lib/repositories/RepositoryAbstract.js

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

package/lib/repositories/ResticRepository.d.ts

@@ -20,14 +20,13 @@ export declare class ResticRepository extends RepositoryAbstract<ResticRepositor
         RESTIC_PASSWORD_FILE?: string | undefined;
         RESTIC_REPOSITORY: string;
     }>;
-    static buildSnapshotTag(name: SnapshotTagEnum, value: string): string;
+    static createSnapshotTag(name: SnapshotTagEnum, value: string): string;
+    static createSnapshotTags(object: Omit<SnapshotTagObject, "size">): string[];
     static parseSnapshotTag(tag: string): {
         name: SnapshotTagEnum;
         value: string;
     } | null;
-    static parseSnapshotTags(tags: string[]): SnapshotTagObject & {
-        tags: string[];
-    };
+    static parseSnapshotTags(tags: string[]): SnapshotTagObject;
     getSource(): string;
     fetchDiskStats(config: ResticRepositoryConfig): Promise<import("../utils/fs").DiskStats | undefined>;
     init(data: RepoInitData): Promise<void>;

package/lib/repositories/ResticRepository.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResticRepository = exports.resticRepositoryName = void 0;
 const cli_1 = require("../utils/cli");
+const config_1 = require("../utils/datatruck/config");
 const paths_1 = require("../utils/datatruck/paths");
 const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
@@ -15,7 +16,6 @@ const temp_1 = require("../utils/temp");
 const RepositoryAbstract_1 = require("./RepositoryAbstract");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.resticRepositoryName = "restic";
 class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
@@ -31,9 +31,21 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             RESTIC_REPOSITORY: await restic_1.Restic.formatRepository(this.config.repository),
         });
     }
-    static buildSnapshotTag(name, value) {
+    static createSnapshotTag(name, value) {
         return `${ResticRepository.refPrefix}${name}:${value}`;
     }
+    static createSnapshotTags(object) {
+        const { tags: inTags, ...otherTags } = object;
+        const tags = [...inTags];
+        for (const key in otherTags) {
+            const value = object[key];
+            if (value !== undefined) {
+                const tag = ResticRepository.createSnapshotTag(key, value);
+                tags.push(tag);
+            }
+        }
+        return tags;
+    }
     static parseSnapshotTag(tag) {
         for (const metaName in RepositoryAbstract_1.SnapshotTagEnum) {
             const name = RepositoryAbstract_1.SnapshotTagEnum[metaName];
@@ -83,21 +95,21 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             env: await this.buildEnv(),
             log: data.options.verbose,
         });
-        const packagePatterns = (0, string_1.makePathPatterns)(data.options.packageNames);
-        const taskNamePatterns = (0, string_1.makePathPatterns)(data.options.packageTaskNames);
         const result = await restic.snapshots({
             json: true,
             tags: [
-                ...(data.options.ids?.map((id) => ResticRepository.buildSnapshotTag(id.length === 8 ? RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID : RepositoryAbstract_1.SnapshotTagEnum.ID, id)) ?? []),
+                ...(data.options.ids?.map((id) => ResticRepository.createSnapshotTag(id.length === 8 ? RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID : RepositoryAbstract_1.SnapshotTagEnum.ID, id)) ?? []),
             ],
         });
+        const filterPkg = (0, config_1.createPkgFilter)(data.options.packageNames);
+        const filterTask = (0, config_1.createTaskFilter)(data.options.packageTaskNames);
         return result.reduce((items, item) => {
             const tag = ResticRepository.parseSnapshotTags(item.tags ?? []);
             if (!tag.id)
                 return items;
-            if (packagePatterns && !(0, micromatch_1.isMatch)(tag.package, packagePatterns))
+            if (!filterPkg(tag.package))
                 return items;
-            if (taskNamePatterns && !(0, string_1.checkMatch)(tag.task, taskNamePatterns))
+            if (!filterTask(tag.task))
                 return items;
             const itemTags = tag.tags ?? [];
             if (data.options.tags && !itemTags.some((t) => itemTags.includes(t)))
@@ -109,6 +121,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 date: tag.date,
                 id: tag.id,
                 tags: itemTags,
+                hostname: tag.hostname ?? "",
                 size: Number(tag.size) || 0,
             });
             return items;
@@ -176,7 +189,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         }
         if (data.options.tags?.some((tag) => tag.startsWith(ResticRepository.refPrefix)))
             throw new error_1.AppError(`Tag prefix is not allowed`);
-        const packageTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.PACKAGE, data.package.name);
+        const packageTag = ResticRepository.createSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.PACKAGE, data.package.name);
         data.onProgress({
             relative: {
                 description: "Fetching last snapshot",
@@ -204,19 +217,16 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             allowEmptySnapshot: true,
             excludeFile: gitignorePath ? [gitignorePath] : undefined,
             parent: lastSnapshot?.id,
-            tags: [
-                ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.ID, data.snapshot.id),
-                ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SHORT_ID, data.snapshot.id.slice(0, 8)),
-                ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.DATE, data.snapshot.date),
-                ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.VERSION, nodePkg.version),
-                packageTag,
-                ...(data.package.task?.name
-                    ? [
-                        ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.TASK, data.package.task?.name),
-                    ]
-                    : []),
-                ...(data.options.tags ?? []),
-            ],
+            tags: ResticRepository.createSnapshotTags({
+                id: data.snapshot.id,
+                hostname: data.hostname,
+                shortId: data.snapshot.id.slice(0, 8),
+                date: data.snapshot.date,
+                version: nodePkg.version,
+                package: data.package.name,
+                task: data.package.task?.name,
+                tags: data.options.tags || [],
+            }),
             createEmptyDir: async () => await (0, temp_1.mkTmpDir)(exports.resticRepositoryName, "repo", "backup", "empty-dir"),
             onStream: async (streamData) => {
                 if (streamData.message_type === "status") {
@@ -254,7 +264,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
             throw new error_1.AppError(`Restic snapshot id is is not defined`);
         if (typeof resticTotalBytes !== "number")
             throw new error_1.AppError(`Restic snapshot total bytes is not defined`);
-        const sizeTag = ResticRepository.buildSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SIZE, resticTotalBytes.toString());
+        const sizeTag = ResticRepository.createSnapshotTag(RepositoryAbstract_1.SnapshotTagEnum.SIZE, resticTotalBytes.toString());
         await restic.exec(["tag", "--add", sizeTag, resticSnapshotId]);
         data.onProgress({
             absolute: {

package/lib/tasks/MssqlTask.js

@@ -5,10 +5,10 @@ const async_process_1 = require("../utils/async-process");
 const config_1 = require("../utils/datatruck/config");
 const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
+const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const TaskAbstract_1 = require("./TaskAbstract");
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 exports.mssqlTaskName = "mssql";
 class MssqlTask extends TaskAbstract_1.TaskAbstract {
@@ -53,10 +53,10 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
         if (data.package.path)
             throw new error_1.AppError(`'package.path' is required: ${data.package.path}`);
         const snapshotPath = await (0, temp_1.mkTmpDir)(exports.mssqlTaskName, "task", "backup", "snapshot");
-        const databaseNames = (await this.fetchDatabaseNames()).filter((databaseName) => (!this.config.includeDatabases ||
-            (0, micromatch_1.isMatch)(databaseName, this.config.includeDatabases)) &&
-            (!this.config.excludeDatabases ||
-                !(0, micromatch_1.isMatch)(databaseName, this.config.excludeDatabases)));
+        const databaseNames = (await this.fetchDatabaseNames()).filter((0, string_1.createPatternFilter)({
+            include: this.config.includeDatabases,
+            exclude: this.config.excludeDatabases,
+        }));
         for (const databaseName of databaseNames) {
             const databasePath = (0, path_1.join)(snapshotPath, `${databaseName}${MssqlTask.SUFFIX}`);
             await this.exec(`BACKUP DATABASE [${databaseName}] TO DISK='${databasePath}' WITH FORMAT`);

package/lib/tasks/SqlDumpTaskAbstract.js

@@ -6,11 +6,11 @@ const config_1 = require("../utils/datatruck/config");
 const error_1 = require("../utils/error");
 const fs_1 = require("../utils/fs");
 const math_1 = require("../utils/math");
+const string_1 = require("../utils/string");
 const temp_1 = require("../utils/temp");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
-const micromatch_1 = require("micromatch");
 const path_1 = require("path");
 function serializeSqlFile(input) {
     if (input.database && input.table) {
@@ -71,13 +71,10 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
         await (0, fs_1.ensureEmptyDir)(snapshotPath);
         const config = this.config;
         const allTableNames = await this.onFetchTableNames(this.config.database);
-        const tableNames = allTableNames.filter((tableName) => {
-            if (config.includeTables && !(0, micromatch_1.isMatch)(tableName, config.includeTables))
-                return false;
-            if (config.excludeTables && (0, micromatch_1.isMatch)(tableName, config.excludeTables))
-                return false;
-            return true;
-        });
+        const tableNames = allTableNames.filter((0, string_1.createPatternFilter)({
+            include: config.includeTables,
+            exclude: config.excludeTables,
+        }));
         (0, assert_1.ok)(typeof snapshotPath === "string");
         if (!(await (0, fs_1.existsDir)(snapshotPath)))
             await (0, promises_1.mkdir)(snapshotPath, { recursive: true });

package/lib/utils/async.d.ts

@@ -3,7 +3,7 @@ type ItemBuffer<T> = Map<T, AbortController>;
 export declare function runParallel<T>(options: {
     items: T[];
     concurrency: number;
-    onChange: (data: {
+    onChange?: (data: {
         buffer: ItemBuffer<T>;
         processed: number;
         proccesing: number;

package/lib/utils/async.js

@@ -12,7 +12,7 @@ async function runParallel(options) {
         const controller = new AbortController();
         buffer.set(item, controller);
         try {
-            await options.onChange({
+            await options.onChange?.({
                 processed,
                 proccesing: buffer.size,
                 buffer,
@@ -37,7 +37,7 @@ async function runParallel(options) {
             buffer.delete(item);
             processed++;
             await options.onFinished?.();
-            await options.onChange({
+            await options.onChange?.({
                 processed,
                 proccesing: buffer.size,
                 buffer,

package/lib/utils/datatruck/config.d.ts

@@ -1,3 +1,4 @@
+import { Filter } from "../string";
 import type { Config } from "./config-type";
 import type { PackageConfig, RepositoryConfigEnabledAction, RepositoryConfig } from "./config-type";
 export declare function findRepositoryOrFail(config: Config, repositoryName: string): RepositoryConfig;
@@ -99,4 +100,6 @@ export declare const params: {
         database: string;
     };
 };
+export declare function createPkgFilter(patterns: string[] | undefined): Filter;
+export declare function createTaskFilter(patterns: string[] | undefined): Filter<string | undefined>;
 export {};

package/lib/utils/datatruck/config.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.params = exports.dbNameParams = exports.pkgRestorePathParams = exports.pkgExcludeParams = exports.pkgIncludeParams = exports.pkgPathParams = exports.resolvePackages = exports.resolvePackage = exports.resolveDatabaseName = exports.resolvePackagePath = exports.filterPackages = exports.filterRepositoryByEnabled = exports.ensureSameRepositoryType = exports.sortReposByType = exports.filterRepository = exports.findPackageRepositoryConfig = exports.findPackageOrFail = exports.findRepositoryOrFail = void 0;
+exports.createTaskFilter = exports.createPkgFilter = exports.params = exports.dbNameParams = exports.pkgRestorePathParams = exports.pkgExcludeParams = exports.pkgIncludeParams = exports.pkgPathParams = exports.resolvePackages = exports.resolvePackage = exports.resolveDatabaseName = exports.resolvePackagePath = exports.filterPackages = exports.filterRepositoryByEnabled = exports.ensureSameRepositoryType = exports.sortReposByType = exports.filterRepository = exports.findPackageRepositoryConfig = exports.findPackageOrFail = exports.findRepositoryOrFail = void 0;
 const error_1 = require("../error");
 const string_1 = require("../string");
 const temp_1 = require("../temp");
-const micromatch_1 = require("micromatch");
 function findRepositoryOrFail(config, repositoryName) {
     const repo = config.repositories.find((v) => v.name === repositoryName);
     if (!repo)
@@ -72,28 +71,26 @@ function filterRepositoryByEnabled(repository, action) {
 }
 exports.filterRepositoryByEnabled = filterRepositoryByEnabled;
 function filterPackages(config, options) {
-    const packagePatterns = (0, string_1.makePathPatterns)(options.packageNames);
-    const taskNamePatterns = (0, string_1.makePathPatterns)(options.packageTaskNames);
+    const filterRepo = (0, string_1.createPatternFilter)(options.repositoryNames);
+    const filterRepoType = (0, string_1.createPatternFilter)(options.repositoryTypes);
+    const filterTask = createTaskFilter(options.packageTaskNames);
+    const filterPkg = createPkgFilter(options.packageNames);
     return config.packages
         .map((pkg) => {
         pkg = Object.assign({}, pkg);
         pkg.repositoryNames = (pkg.repositoryNames ?? []).filter((name) => {
             const repo = findRepositoryOrFail(config, name);
-            if (!filterRepositoryByEnabled(repo, options?.sourceAction))
-                return false;
-            return ((!options.repositoryNames ||
-                options.repositoryNames.includes(name)) &&
-                (!options.repositoryTypes ||
-                    options.repositoryTypes.includes(repo.type)));
+            return (filterRepositoryByEnabled(repo, options?.sourceAction) &&
+                filterRepo(name) &&
+                filterRepoType(repo.type));
         });
         return pkg;
     })
         .filter((pkg) => {
-        if (taskNamePatterns && !(0, string_1.checkMatch)(pkg.task?.name, taskNamePatterns))
-            return false;
         return ((typeof pkg.enabled !== "boolean" || pkg.enabled) &&
             !!pkg.repositoryNames?.length &&
-            (!packagePatterns || (0, micromatch_1.isMatch)(pkg.name, packagePatterns)));
+            filterTask(pkg.task?.name) &&
+            filterPkg(pkg.name));
     });
 }
 exports.filterPackages = filterPackages;
@@ -166,3 +163,22 @@ exports.params = {
     pkgExclude: exports.pkgExcludeParams,
     dbName: exports.dbNameParams,
 };
+function createPkgFilter(patterns) {
+    if (patterns === undefined)
+        return () => true;
+    const map = (v) => (v[0] === "@" && !v.includes("/") ? `${v}/**` : v);
+    const { include, exclude } = (0, string_1.splitPatterns)(patterns, map);
+    return (subject) => (0, string_1.match)(subject, include, exclude);
+}
+exports.createPkgFilter = createPkgFilter;
+function createTaskFilter(patterns) {
+    if (patterns === undefined)
+        return () => true;
+    const { include, exclude } = (0, string_1.splitPatterns)(patterns);
+    return (subject) => {
+        if (!subject?.length)
+            subject = "<empty>";
+        return (0, string_1.match)(subject, include, exclude);
+    };
+}
+exports.createTaskFilter = createTaskFilter;

package/lib/utils/datatruck/cron-server.d.ts

@@ -28,7 +28,7 @@ export type CronAction = {
     options: CopyCommandOptions;
 } | {
     name: "prune";
-    options: PruneCommandOptions;
+    options: Omit<PruneCommandOptions, "confirm">;
 });
 export type DatatruckCronServerOptions = {
     enabled?: boolean;

package/lib/utils/datatruck/cron-server.js

@@ -31,7 +31,9 @@ function createCronServer(options, config) {
         try {
             const Command = command_1.datatruckCommandMap[action.name];
             const command = new Command({ config: { packages: [], repositories: [] } }, {});
-            const cliOptions = (0, cli_1.stringifyOptions)(command.optionsConfig(), action.options);
+            const cliOptions = (0, cli_1.stringifyOptions)(command.optionsConfig(), action.name === "prune"
+                ? ({ ...action.options, confirm: true })
+                : action.options);
             const [node, bin] = process.argv;
             await async_process_1.AsyncProcess.exec(node, [bin, "-c", config.configPath, action.name, ...cliOptions], { $log: config.verbose });
             if (config.log)

package/lib/utils/mysql.js

@@ -85,7 +85,7 @@ async function createMysqlCli(options) {
         table_name
   `, [database]))
             .map((r) => r.table_name)
-            .filter((0, string_1.createMatchFilter)(include, exclude));
+            .filter((0, string_1.createPatternFilter)({ include, exclude }));
     }
     async function dump(input) {
         const process = new async_process_1.AsyncProcess("mysqldump", [

package/lib/utils/string.d.ts

@@ -11,11 +11,18 @@ export type Uri = {
     path?: string;
 };
 export declare function formatUri(input: Uri, hidePassword?: boolean): string;
-export declare function makePathPatterns(values: string[] | undefined): string[] | undefined;
+export declare function splitPatterns(patterns: string[], map?: (pattern: string) => string): {
+    include: string[] | undefined;
+    exclude: string[] | undefined;
+};
 export declare function match(path: string, include?: string[], exclude?: string[]): boolean;
+export type Filter<V = string> = (subject: V) => boolean;
+export declare function createPatternFilter(patterns: string[] | undefined): Filter;
+export declare function createPatternFilter(patterns: {
+    include?: string[];
+    exclude?: string[];
+} | undefined): Filter;
 export declare function endsWith(input: string, patterns: string[]): boolean;
-export declare function createMatchFilter(include?: string[], exclude?: string[]): (input: string) => boolean;
-export declare function checkMatch(subject: string | undefined, patterns: string[]): boolean;
 export declare function undefIfEmpty(input: string): string | undefined;
 export declare function compareJsons(a: any, b: any): boolean;
 export {};

package/lib/utils/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareJsons = exports.undefIfEmpty = exports.checkMatch = exports.createMatchFilter = exports.endsWith = exports.match = exports.makePathPatterns = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = void 0;
+exports.compareJsons = exports.undefIfEmpty = exports.endsWith = exports.createPatternFilter = exports.match = exports.splitPatterns = exports.formatUri = exports.parseStringList = exports.render = exports.snakeCase = void 0;
 const error_1 = require("./error");
 const micromatch_1 = require("micromatch");
 function snakeCase(value, char = "_") {
@@ -71,36 +71,44 @@ function formatUri(input, hidePassword) {
     return uri;
 }
 exports.formatUri = formatUri;
-function makePathPatterns(values) {
-    return values?.flatMap((v) => {
-        if (v === "*" || v === "**" || v === "<empty>" || v === "!<empty>") {
-            return [v];
+function splitPatterns(patterns, map) {
+    const include = [];
+    const exclude = [];
+    for (const pattern of patterns) {
+        if (pattern.startsWith("!")) {
+            const includePattern = pattern.slice(1);
+            exclude.push(map ? map(includePattern) : includePattern);
         }
         else {
-            return [v, `${v}/**`];
+            include.push(map ? map(pattern) : pattern);
         }
-    });
+    }
+    return {
+        include: include.length ? include : undefined,
+        exclude: exclude.length ? exclude : undefined,
+    };
 }
-exports.makePathPatterns = makePathPatterns;
+exports.splitPatterns = splitPatterns;
 function match(path, include, exclude) {
     return ((!include || (0, micromatch_1.isMatch)(path, include, { dot: true })) &&
         (!exclude || !(0, micromatch_1.isMatch)(path, exclude, { dot: true })));
 }
 exports.match = match;
+function createPatternFilter(patterns) {
+    if (patterns === undefined) {
+        return () => true;
+    }
+    else if (Array.isArray(patterns)) {
+        patterns = splitPatterns(patterns);
+    }
+    const { include, exclude } = patterns;
+    return (input) => match(input, include, exclude);
+}
+exports.createPatternFilter = createPatternFilter;
 function endsWith(input, patterns) {
     return patterns.some((pattern) => input.endsWith(pattern));
 }
 exports.endsWith = endsWith;
-function createMatchFilter(include, exclude) {
-    return (input) => match(input, include, exclude);
-}
-exports.createMatchFilter = createMatchFilter;
-function checkMatch(subject, patterns) {
-    if (!subject?.length)
-        subject = "<empty>";
-    return (0, micromatch_1.isMatch)(subject, patterns);
-}
-exports.checkMatch = checkMatch;
 function undefIfEmpty(input) {
     return input.length ? input : undefined;
 }

package/package.json

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