@datatruck/cli 0.30.1 → 0.32.0

package/Task/ScriptTask.js

@@ -15,11 +15,13 @@ var ScriptTaskDefinitionEnum;
     ScriptTaskDefinitionEnum["processStepConfig"] = "processStepConfig";
     ScriptTaskDefinitionEnum["nodeStepConfig"] = "nodeStepConfig";
     ScriptTaskDefinitionEnum["telegramMessageStepConfig"] = "telegramMessageStepConfig";
+    ScriptTaskDefinitionEnum["ntfyStepConfig"] = "ntfyStepConfig";
 })(ScriptTaskDefinitionEnum || (exports.ScriptTaskDefinitionEnum = ScriptTaskDefinitionEnum = {}));
 const stepTypes = {
     process: ScriptTaskDefinitionEnum.processStepConfig,
     node: ScriptTaskDefinitionEnum.nodeStepConfig,
     "telegram-message": ScriptTaskDefinitionEnum.telegramMessageStepConfig,
+    ntfy: ScriptTaskDefinitionEnum.ntfyStepConfig,
 };
 exports.scriptTaskName = "script";
 exports.scriptTaskDefinition = {
@@ -85,6 +87,15 @@ exports.scriptTaskDefinition = {
                 text: { type: "string" },
             },
         },
+        ntfyStepConfig: {
+            type: "object",
+            required: ["token"],
+            properties: {
+                token: { type: "string" },
+                topic: { type: "string" },
+                text: { type: "string" },
+            },
+        },
     },
     type: "object",
     additionalProperties: false,
@@ -108,41 +119,22 @@ exports.scriptTaskDefinition = {
 };
 class ScriptTask extends TaskAbstract_1.TaskAbstract {
     verbose;
-    getVars(data) {
-        return {
-            process: {
-                DTT_SNAPSHOT_ID: data.snapshot.id,
-                DTT_SNAPSHOT_DATE: data.snapshot.date,
-                DTT_PACKAGE_NAME: data.package.name,
-                DTT_PACKAGE_PATH: data.package.path,
-                DTT_SNAPSHOT_PATH: data.snapshotPath,
-            },
-            node: {
-                dtt: {
-                    snapshot: data.snapshot,
-                    package: data.package,
-                    snapshotPath: data.snapshotPath,
-                },
-            },
-        };
-    }
     async backup(data) {
         const config = this.config;
         const snapshotPath = data.package.path ??
             (await (0, temp_1.mkTmpDir)(exports.scriptTaskName, "task", "backup", "snapshot"));
-        const vars = this.getVars({
-            ...data,
-            snapshotPath,
-        });
         await (0, steps_1.runSteps)(config.backupSteps, {
             env: config.env,
+            vars: {
+                dtt: {
+                    snapshot: data.snapshot,
+                    snapshotPath: snapshotPath,
+                    package: data.package,
+                },
+            },
             cwd: snapshotPath,
             verbose: data.options.verbose,
-            process: { vars: vars.process },
-            node: {
-                tempDir: () => (0, temp_1.mkTmpDir)(exports.scriptTaskName, "task", "backup", "nodeStep"),
-                vars: vars.node,
-            },
+            tempDir: () => (0, temp_1.mkTmpDir)(exports.scriptTaskName, "task", "backup", "nodeStep"),
         });
         return { snapshotPath };
     }
@@ -154,15 +146,17 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
     }
     async restore(data) {
         const config = this.config;
-        const vars = this.getVars(data);
         await (0, steps_1.runSteps)(config.restoreSteps, {
             env: config.env,
-            verbose: data.options.verbose,
-            process: { vars: vars.process },
-            node: {
-                tempDir: () => (0, temp_1.mkTmpDir)(exports.scriptTaskName, "task", "restore", "nodeStep"),
-                vars: vars.node,
+            vars: {
+                dtt: {
+                    snapshot: data.snapshot,
+                    snapshotPath: data.snapshotPath,
+                    package: data.package,
+                },
             },
+            verbose: data.options.verbose,
+            tempDir: () => (0, temp_1.mkTmpDir)(exports.scriptTaskName, "task", "restore", "nodeStep"),
         });
     }
 }

package/cli.js

@@ -59,7 +59,7 @@ function makeCommandAction(command) {
             exitCode = await (0, CommandFactory_1.CommandFactory)(command, {
                 ...globalOptions,
                 config: config.data,
-            }, options).onExec();
+            }, options, {}, globalOptions.config).onExec();
         }
         catch (e) {
             const error = e;

package/config.schema.json

@@ -1048,67 +1048,217 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "path": {
-              "type": "string"
-            },
             "log": {
               "type": "boolean"
             },
-            "users": {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "additionalProperties": false,
-                "properties": {
-                  "name": {
-                    "type": "string"
-                  },
-                  "password": {
-                    "type": "string"
-                  }
-                }
-              }
-            },
-            "listen": {
+            "repository": {
               "type": "object",
               "additionalProperties": false,
               "properties": {
-                "port": {
-                  "type": "integer"
-                },
-                "address": {
-                  "type": "string"
-                }
-              }
-            },
-            "trustProxy": {
-              "anyOf": [
-                {
+                "enabled": {
                   "type": "boolean"
                 },
-                {
+                "listen": {
                   "type": "object",
                   "additionalProperties": false,
-                  "required": [
-                    "remoteAddressHeader"
-                  ],
                   "properties": {
-                    "remoteAddressHeader": {
+                    "port": {
+                      "type": "integer"
+                    },
+                    "address": {
                       "type": "string"
                     }
                   }
+                },
+                "trustProxy": {
+                  "anyOf": [
+                    {
+                      "type": "boolean"
+                    },
+                    {
+                      "type": "object",
+                      "additionalProperties": false,
+                      "required": [
+                        "remoteAddressHeader"
+                      ],
+                      "properties": {
+                        "remoteAddressHeader": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  ]
+                },
+                "allowlist": {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "properties": {
+                    "enabled": {
+                      "type": "boolean"
+                    },
+                    "remoteAddresses": {
+                      "$ref": "#/definitions/stringlist-util"
+                    }
+                  }
+                },
+                "backends": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "required": [
+                      "name",
+                      "path"
+                    ],
+                    "properties": {
+                      "name": {
+                        "type": "string"
+                      },
+                      "path": {
+                        "type": "string"
+                      },
+                      "users": {
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "additionalProperties": false,
+                          "required": [
+                            "name",
+                            "password"
+                          ],
+                          "properties": {
+                            "enabled": {
+                              "type": "boolean"
+                            },
+                            "name": {
+                              "type": "string"
+                            },
+                            "password": {
+                              "type": "string"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
                 }
-              ]
+              }
             },
-            "allowlist": {
+            "cron": {
               "type": "object",
               "additionalProperties": false,
               "properties": {
                 "enabled": {
                   "type": "boolean"
                 },
-                "remoteAddresses": {
-                  "$ref": "#/definitions/stringlist-util"
+                "actions": {
+                  "type": "array",
+                  "items": {
+                    "allOf": [
+                      {
+                        "type": "object",
+                        "required": [
+                          "schedule"
+                        ],
+                        "properties": {
+                          "schedule": {
+                            "type": "string"
+                          }
+                        }
+                      },
+                      {
+                        "anyOf": [
+                          {
+                            "if": {
+                              "type": "object",
+                              "properties": {
+                                "type": {
+                                  "const": "backup"
+                                }
+                              }
+                            },
+                            "then": {
+                              "type": "object",
+                              "properties": {
+                                "options": {
+                                  "type": "object",
+                                  "additionalProperties": false,
+                                  "properties": {
+                                    "package": {
+                                      "type": "string"
+                                    },
+                                    "packageTask": {
+                                      "type": "string"
+                                    },
+                                    "repository": {
+                                      "type": "string"
+                                    },
+                                    "repositoryType": {
+                                      "enum": [
+                                        "restic",
+                                        "datatruck",
+                                        "git"
+                                      ]
+                                    },
+                                    "tag": {
+                                      "type": "string"
+                                    },
+                                    "date": {
+                                      "type": "string"
+                                    },
+                                    "prune": {
+                                      "type": "boolean"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "else": false
+                          },
+                          {
+                            "if": {
+                              "type": "object",
+                              "properties": {
+                                "type": {
+                                  "const": "copy"
+                                }
+                              }
+                            },
+                            "then": {
+                              "type": "object",
+                              "properties": {
+                                "options": {
+                                  "type": "object",
+                                  "additionalProperties": false,
+                                  "properties": {
+                                    "id": {
+                                      "type": "string"
+                                    },
+                                    "last": {
+                                      "type": "integer"
+                                    },
+                                    "package": {
+                                      "type": "string"
+                                    },
+                                    "packageTask": {
+                                      "type": "string"
+                                    },
+                                    "repository": {
+                                      "type": "string"
+                                    },
+                                    "repository2": {
+                                      "type": "string"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "else": false
+                          }
+                        ]
+                      }
+                    ]
+                  }
                 }
               }
             }
@@ -1196,7 +1346,8 @@
           "enum": [
             "process",
             "node",
-            "telegram-message"
+            "telegram-message",
+            "ntfy"
           ]
         },
         "config": {}
@@ -1258,6 +1409,25 @@
             }
           },
           "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "const": "ntfy"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/script-task_ntfyStepConfig"
+              }
+            }
+          },
+          "else": false
         }
       ]
     },
@@ -1332,6 +1502,23 @@
           "type": "string"
         }
       }
+    },
+    "script-task_ntfyStepConfig": {
+      "type": "object",
+      "required": [
+        "token"
+      ],
+      "properties": {
+        "token": {
+          "type": "string"
+        },
+        "topic": {
+          "type": "string"
+        },
+        "text": {
+          "type": "string"
+        }
+      }
     }
   },
   "$ref": "#/definitions/config"

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.30.1",
+  "version": "0.32.0",
   "dependencies": {
     "@supercharge/promise-pool": "^3.1.0",
     "ajv": "^8.12.0",
     "async": "^3.2.4",
     "chalk": "^4.1.2",
     "commander": "^11.0.0",
+    "croner": "^7.0.4",
     "dayjs": "^1.11.10",
     "fast-folder-size": "^2.2.0",
     "fast-glob": "^3.3.1",
     "listr2": "^7.0.1",
     "micromatch": "^4.0.5",
     "mysql2": "^3.6.1",
-    "tty-table": "^4.2.2"
+    "tty-table": "^4.2.2",
+    "yaml": "^2.3.2"
   },
   "optionalDependencies": {
-    "ts-node": "^10.9.1",
-    "yaml": "^2.3.2"
+    "ts-node": "^10.9.1"
   },
   "engine": {
     "node": ">=16.0.0"

package/pkg.d.ts

@@ -0,0 +1,6 @@
+declare const pkg: {
+    name: string;
+    version: string;
+    description: string;
+};
+export { pkg };

package/pkg.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pkg = void 0;
+// @ts-ignore
+const package_json_1 = __importDefault(require("./../package.json"));
+const pkg = package_json_1.default;
+exports.pkg = pkg;

package/utils/cli.d.ts

@@ -4,7 +4,7 @@ export declare function renderProgressBar(progress: number, size?: number, subpr
 export declare function logExec(command: string, argv?: string[], env?: NodeJS.ProcessEnv, logToStderr?: boolean): void;
 export declare function renderResult(error: Error | null | string | boolean | undefined, color?: boolean): string;
 export declare function renderError(error: Error | null | string | undefined, verbose?: number): string;
-export declare function renderObject(object: Record<string, any>): string;
+export declare function renderObject(object: Record<string, any>, color?: boolean): string;
 export type OptionsType<T1, T2 extends {
     [K in keyof T1]: unknown;
 }> = {
@@ -19,4 +19,7 @@ export type OptionsType<T1, T2 extends {
 export declare function parseOptions<T1, T2 extends {
     [K in keyof T1]: unknown;
 }>(object: T1, options: OptionsType<T1, T2>): T2;
+export declare function stringifyOptions<T1, T2 extends {
+    [K in keyof T1]: unknown;
+}>(options: OptionsType<T1, T2>, object: any): string[];
 export declare function confirm(message: string): Promise<unknown>;

package/utils/cli.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirm = exports.parseOptions = exports.renderObject = exports.renderError = exports.renderResult = exports.logExec = exports.renderProgressBar = exports.showCursorCommand = void 0;
+exports.confirm = exports.stringifyOptions = exports.parseOptions = exports.renderObject = exports.renderError = exports.renderResult = exports.logExec = exports.renderProgressBar = exports.showCursorCommand = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const chalk_2 = require("chalk");
 const readline_1 = require("readline");
@@ -75,10 +75,10 @@ function renderError(error, verbose) {
     return chalk_1.default.red(message.trim());
 }
 exports.renderError = renderError;
-function renderObject(object) {
+function renderObject(object, color) {
     const values = [];
     for (const key in object)
-        values.push(`${key}: ${(0, chalk_2.grey)(object[key])}`);
+        values.push(`${key}: ${color ? (0, chalk_2.grey)(object[key]) : object[key]}`);
     return values.join(` `);
 }
 exports.renderObject = renderObject;
@@ -96,6 +96,26 @@ function parseOptions(object, options) {
     return result;
 }
 exports.parseOptions = parseOptions;
+function stringifyOptions(options, object) {
+    const result = [];
+    for (const key in options) {
+        const fullOpt = options[key].option;
+        const [opt] = fullOpt.split(",");
+        const isNegative = fullOpt.startsWith("--no");
+        const isBool = !fullOpt.includes("<") && !fullOpt.includes("[");
+        const defaultsValue = isNegative ? true : options[key].defaults;
+        const value = object?.[key] ?? defaultsValue;
+        if (isBool) {
+            if (object[key])
+                result.push(opt);
+        }
+        else if (value !== undefined) {
+            result.push(opt, `${value}`);
+        }
+    }
+    return result;
+}
+exports.stringifyOptions = stringifyOptions;
 function confirm(message) {
     const rl = (0, readline_1.createInterface)({
         input: process.stdin,

package/utils/datatruck/client.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFs = exports.isRemoteBackend = exports.RemoteFs = void 0;
 const http_1 = require("../http");
 const virtual_fs_1 = require("../virtual-fs");
-const server_1 = require("./server");
+const repository_server_1 = require("./repository-server");
 class RemoteFs extends virtual_fs_1.AbstractFs {
     options;
     url;
@@ -13,8 +13,8 @@ class RemoteFs extends virtual_fs_1.AbstractFs {
         this.options = options;
         const url = new URL(options.backend);
         this.headers = {
-            [server_1.headerKey.user]: url.username,
-            [server_1.headerKey.password]: url.password,
+            [repository_server_1.headerKey.user]: url.username,
+            [repository_server_1.headerKey.password]: url.password,
         };
         url.username = "";
         url.password = "";

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

@@ -0,0 +1,23 @@
+import { BackupCommandOptions } from "../../Command/BackupCommand";
+import { CopyCommandOptionsType } from "../../Command/CopyCommand";
+export type CronAction = {
+    schedule: string;
+    name: "backup";
+    options: BackupCommandOptions;
+} | {
+    schedule: string;
+    name: "copy";
+    options: CopyCommandOptionsType;
+};
+export type DatatruckCronServerOptions = {
+    enabled?: boolean;
+    actions?: CronAction[];
+};
+export declare function createCronServer(options: DatatruckCronServerOptions, config: {
+    log: boolean;
+    verbose: boolean;
+    configPath: string;
+}): {
+    start: () => void;
+    stop: () => void;
+};

package/utils/datatruck/cron-server.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCronServer = void 0;
+const CommandFactory_1 = require("../../Factory/CommandFactory");
+const cli_1 = require("../cli");
+const process_1 = require("../process");
+const croner_1 = require("croner");
+function createJobs(actions, currentJobs = [], worker) {
+    const jobs = [];
+    for (const action of actions) {
+        const index = actions.indexOf(action);
+        const context = JSON.stringify({
+            index: actions.indexOf(action),
+            data: action,
+        });
+        const job = currentJobs.at(index);
+        if (!job || job.options.context !== context) {
+            job?.stop();
+            jobs.push((0, croner_1.Cron)(action.schedule, {
+                paused: true,
+                context: JSON.stringify(action),
+                catch: true,
+                protect: true,
+            }, () => worker(action, index)));
+        }
+    }
+    return jobs;
+}
+function createCronServer(options, config) {
+    const worker = async (action, index) => {
+        if (config.log)
+            console.info(`> [job] ${index} - ${action.name}`);
+        try {
+            const Command = (0, CommandFactory_1.CommandConstructorFactory)(action.name);
+            const command = new Command({ config: { packages: [], repositories: [] } }, {});
+            const cliOptions = (0, cli_1.stringifyOptions)(command.onOptions(), action.options);
+            const [node, bin] = process.argv;
+            await (0, process_1.exec)(node, [bin, "-c", config.configPath, action.name, ...cliOptions], {}, { log: config.verbose });
+            if (config.log)
+                console.info(`< [job] ${index} - ${action.name}`);
+        }
+        catch (error) {
+            if (config.log)
+                console.error(`< [job] ${index} - ${action.name}`, error);
+        }
+    };
+    const jobs = createJobs(options.actions || [], [], worker);
+    return {
+        start: () => {
+            for (const job of jobs)
+                job.resume();
+        },
+        stop: () => {
+            for (const job of jobs)
+                job.stop();
+        },
+    };
+}
+exports.createCronServer = createCronServer;

package/utils/datatruck/paths.js

@@ -10,7 +10,7 @@ async function parsePaths(values, options) {
         }
         else {
             await (0, steps_1.runSteps)(value, {
-                node: { tempDir: options.tempDir },
+                tempDir: options.tempDir,
                 verbose: options.verbose,
                 onLine: (path) => paths.push(path),
             });
@@ -24,11 +24,9 @@ async function parseBackupPaths(paths, options) {
         cwd: options.path,
         verbose: options.verbose,
         vars: {
-            dtt: {
-                package: options.package,
-                snapshot: options.snapshot,
-                path: options.path,
-            },
+            package: options.package,
+            snapshot: options.snapshot,
+            path: options.path,
         },
     });
 }