@datatruck/cli 0.35.1 → 0.36.1

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/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

@@ -16,6 +16,7 @@ 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) {
@@ -36,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

@@ -20,7 +20,7 @@ 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, "@")
@@ -55,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)
@@ -103,6 +103,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
                 packageName: meta.package,
                 packageTaskName: meta.task,
                 tags: meta.tags,
+                hostname: meta.hostname ?? "",
                 size: meta.size || 0,
             });
         }
@@ -110,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");
@@ -213,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,
@@ -231,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`;
@@ -311,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

@@ -24,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;
@@ -111,7 +111,7 @@ class GitRepository extends RepositoryAbstract_1.RepositoryAbstract {
         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;
@@ -129,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;
@@ -196,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,
@@ -220,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

@@ -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];
@@ -86,7 +98,7 @@ class ResticRepository extends RepositoryAbstract_1.RepositoryAbstract {
         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);
@@ -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/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,9 +31,17 @@ 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 });
+            await async_process_1.AsyncProcess.exec(node, [
+                process.env.pm_exec_path ?? bin,
+                "-c",
+                config.configPath,
+                action.name,
+                ...cliOptions,
+            ], { $log: config.verbose });
             if (config.log)
                 console.info(`< [job] ${index} - ${action.name}`);
         }

package/package.json

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