@datatruck/cli 0.31.0 → 0.32.1

package/Action/BackupAction.d.ts

@@ -25,10 +25,6 @@ type Context = {
     snapshot: {
         id: string;
     };
-    prune: {
-        total: number;
-        pruned: number;
-    };
     task: {
         taskName: string;
         packageName: string;
@@ -43,6 +39,11 @@ type Context = {
         repositoryName: string;
         mirrorRepositoryName: string;
     };
+    prune: {
+        packageName: string;
+        total: number;
+        pruned: number;
+    };
     report: {
         type: string;
     };

package/Action/BackupAction.js

@@ -15,6 +15,7 @@ const list_1 = require("../utils/list");
 const progress_1 = require("../utils/progress");
 const steps_1 = require("../utils/steps");
 const temp_1 = require("../utils/temp");
+const PruneAction_1 = require("./PruneAction");
 const assert_1 = require("assert");
 const chalk_1 = __importDefault(require("chalk"));
 const crypto_1 = require("crypto");
@@ -102,7 +103,7 @@ class BackupAction {
         const renderData = (item, color, result = []) => {
             const g = (v) => (color ? `${chalk_1.default.gray(`(${v})`)}` : `(${v})`);
             return item.key === "prune"
-                ? `${item.data.pruned}/${item.data.total}`
+                ? `${item.data.packageName} ${g(`${item.data.pruned}/${item.data.total}`)}`
                 : item.key === "snapshot"
                     ? item.data.id
                     : item.key === "task"
@@ -117,7 +118,14 @@ class BackupAction {
                                         backups: result.filter((r) => !r.error && r.key === "backup")
                                             .length,
                                         copies: result.filter((r) => !r.error && r.key === "copy").length,
-                                    })
+                                        prunes: result
+                                            .filter((r) => !r.error && r.key === "prune")
+                                            .reduce((result, item) => {
+                                            if (item.key === "prune")
+                                                result += item.data.pruned;
+                                            return result;
+                                        }, 0),
+                                    }, color)
                                     : item.key === "report"
                                         ? item.data.type
                                         : "";
@@ -285,7 +293,34 @@ class BackupAction {
                                         onProgress: (p) => pm.update(p, (t) => (task.output = t)),
                                     });
                                 },
-                            })));
+                            })), !!this.options.prune &&
+                                l.$task({
+                                    title: {
+                                        initial: `Prune: ${pkg.name}`,
+                                        started: `Pruning: ${pkg.name}`,
+                                        completed: `Pruned: ${pkg.name}`,
+                                        failed: `Prune failed: ${pkg.name}`,
+                                    },
+                                    exitOnError: false,
+                                    key: "prune",
+                                    keyIndex: [pkg.name],
+                                    data: {
+                                        pruned: 0,
+                                        total: 0,
+                                        packageName: pkg.name,
+                                    },
+                                    run: async (_, data) => {
+                                        const prune = new PruneAction_1.PruneAction(this.config, {
+                                            repositoryNames: this.options.repositoryNames,
+                                            repositoryTypes: this.options.repositoryTypes,
+                                            packageNames: [pkg.name],
+                                            groupBy: ["packageName", "repositoryName"],
+                                        });
+                                        const result = await prune.exec();
+                                        data.total = result.total;
+                                        data.pruned = result.prune;
+                                    },
+                                }));
                         }),
                         ...(this.config.reports || []).map((report, index) => {
                             const reportIndex = index + 1;
@@ -312,14 +347,10 @@ class BackupAction {
                                         return task.skip(`Report send skipped: ${reportIndex}`);
                                     const text = this.dataFormat(result).format(report.format ?? "list");
                                     await (0, steps_1.runSteps)(report.run, {
-                                        verbose: this.options.verbose,
-                                        process: { vars: { DTT_REPORT: text } },
-                                        telegram: { vars: { TEXT: text } },
-                                        node: {
-                                            vars: {
-                                                dtt: { report: text, result },
-                                            },
+                                        vars: {
+                                            dtt: { title: "DTT Backup", text, result, success },
                                         },
+                                        verbose: this.options.verbose,
                                     });
                                 },
                             });

package/Action/ConfigAction.d.ts

@@ -11,6 +11,7 @@ export declare class ConfigAction<TRequired extends boolean = true> {
     static validate(config: ConfigType): void;
     static check(config: ConfigType): void;
     static normalize(config: ConfigType): ConfigType;
+    static parseFile(path: string): Promise<ConfigType>;
     static fromGlobalOptionsWithPath(globalOptions: GlobalOptions<true>): Promise<{
         path: string;
         data: ConfigType;

package/Action/ConfigAction.js

@@ -63,6 +63,12 @@ class ConfigAction {
         });
         return config;
     }
+    static async parseFile(path) {
+        const config = await (0, fs_1.parseFile)(path, "config");
+        ConfigAction.validate(config);
+        ConfigAction.check(config);
+        return ConfigAction.normalize(config);
+    }
     static async fromGlobalOptionsWithPath(globalOptions) {
         if (typeof globalOptions.config !== "string")
             return {
@@ -81,13 +87,8 @@ class ConfigAction {
     }
     async exec() {
         const path = await (0, fs_1.findFile)(this.options.path, "datatruck.config", fs_1.parseFileExtensions, "Config path not found");
-        const config = await (0, fs_1.parseFile)(path, "config");
-        ConfigAction.validate(config);
-        ConfigAction.check(config);
-        return {
-            path,
-            data: ConfigAction.normalize(config),
-        };
+        const data = await ConfigAction.parseFile(path);
+        return { path, data };
     }
 }
 exports.ConfigAction = ConfigAction;

package/Action/CopyAction.js

@@ -40,7 +40,7 @@ class CopyAction {
                             errors: item.data.errors,
                             copied: items.filter((i) => i.key === "copy" && !i.error && !i.data.skipped).length,
                             skipped: items.filter((i) => i.key === "copy" && !i.error && i.data.skipped).length,
-                        })
+                        }, color)
                         : "";
         };
         return new DataFormat_1.DataFormat({

package/Action/RestoreAction.js

@@ -114,7 +114,7 @@ class RestoreAction {
                                 errors: item.data.errors,
                                 restores: result.filter((r) => !r.error && r.key === "restore")
                                     .length,
-                            })
+                            }, color)
                             : "";
         };
         return new DataFormat_1.DataFormat({

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @datatruck/cli
 
+## 0.32.1
+
+### Patch Changes
+
+- [`a479805`](https://github.com/swordev/datatruck/commit/a479805dd5c206d53eb5610f3f9db8cebe3e697a) Thanks [@juanrgm](https://github.com/juanrgm)! - Fix `prune` option in the `backup` command
+
+## 0.32.0
+
+### Minor Changes
+
+- [`7d755ba`](https://github.com/swordev/datatruck/commit/7d755bac0edf7aea719446f6bfcee5bea0fe9a90) Thanks [@juanrgm](https://github.com/juanrgm)! - Reload repository server config
+
+- [`9dba106`](https://github.com/swordev/datatruck/commit/9dba106865da2d4327282d65deecee5a03e49b49) Thanks [@juanrgm](https://github.com/juanrgm)! - Update to Node.js 20
+
+- [`113ee82`](https://github.com/swordev/datatruck/commit/113ee8258951028d54b798eaaa813982222c20e8) Thanks [@juanrgm](https://github.com/juanrgm)! - Add `ntfy` step
+
+### Patch Changes
+
+- [`c24eea2`](https://github.com/swordev/datatruck/commit/c24eea21b41d78451d5eabd65923daa26dcad78a) Thanks [@juanrgm](https://github.com/juanrgm)! - Simplify step configs
+
 ## 0.31.0
 
 ### Minor Changes

package/Command/StartServerCommand.js

@@ -17,6 +17,7 @@ class StartServerCommand extends CommandAbstract_1.CommandAbstract {
         if (repositoryOptions.enabled ?? true) {
             const server = (0, repository_server_1.createDatatruckRepositoryServer)(repositoryOptions, {
                 log,
+                configPath: this.configPath,
             });
             const port = repositoryOptions.listen?.port ?? 8888;
             const address = repositoryOptions.listen?.address ?? "127.0.0.1";
@@ -39,6 +40,8 @@ class StartServerCommand extends CommandAbstract_1.CommandAbstract {
             server.start();
             console.info(`Cron server started`);
         }
+        process.on("SIGINT", () => process.exit(1));
+        process.on("SIGTERM", () => process.exit(1));
         await new Promise(() => setInterval(() => { }, 60000));
         return 0;
     }

package/Task/ScriptTask.d.ts

@@ -20,22 +20,13 @@ export declare enum ScriptTaskDefinitionEnum {
     step = "step",
     processStepConfig = "processStepConfig",
     nodeStepConfig = "nodeStepConfig",
-    telegramMessageStepConfig = "telegramMessageStepConfig"
+    telegramMessageStepConfig = "telegramMessageStepConfig",
+    ntfyStepConfig = "ntfyStepConfig"
 }
 export declare const scriptTaskName = "script";
 export declare const scriptTaskDefinition: JSONSchema7;
 export declare class ScriptTask extends TaskAbstract<ScriptTaskConfigType> {
     protected verbose?: boolean;
-    protected getVars(data: TaskBackupData | TaskRestoreData): {
-        process: {
-            DTT_SNAPSHOT_ID: string;
-            DTT_SNAPSHOT_DATE: string;
-            DTT_PACKAGE_NAME: string;
-            DTT_PACKAGE_PATH: string | undefined;
-            DTT_SNAPSHOT_PATH: string | undefined;
-        };
-        node: NodeVars;
-    };
     backup(data: TaskBackupData): Promise<{
         snapshotPath: string;
     }>;

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/config.schema.json

@@ -1346,7 +1346,8 @@
           "enum": [
             "process",
             "node",
-            "telegram-message"
+            "telegram-message",
+            "ntfy"
           ]
         },
         "config": {}
@@ -1408,6 +1409,25 @@
             }
           },
           "else": false
+        },
+        {
+          "if": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "const": "ntfy"
+              }
+            }
+          },
+          "then": {
+            "type": "object",
+            "properties": {
+              "config": {
+                "$ref": "#/definitions/script-task_ntfyStepConfig"
+              }
+            }
+          },
+          "else": false
         }
       ]
     },
@@ -1482,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,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.31.0",
+  "version": "0.32.1",
   "dependencies": {
     "@supercharge/promise-pool": "^3.1.0",
     "ajv": "^8.12.0",
@@ -14,11 +14,11 @@
     "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;
 }> = {

package/utils/cli.js

@@ -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;

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,
         },
     });
 }

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

@@ -31,7 +31,8 @@ export declare const headerKey: {
     user: string;
     password: string;
 };
-export declare function createDatatruckRepositoryServer(options: Omit<DatatruckRepositoryServerOptions, "listen">, config?: {
+export declare function createDatatruckRepositoryServer(inOptions: Omit<DatatruckRepositoryServerOptions, "listen">, config?: {
     log?: boolean;
+    configPath?: string;
 }): import("node:http").Server<typeof IncomingMessage, typeof import("node:http").ServerResponse>;
 export {};

package/utils/datatruck/repository-server.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDatatruckRepositoryServer = exports.headerKey = void 0;
+const ConfigAction_1 = require("../../Action/ConfigAction");
 const http_1 = require("../http");
 const virtual_fs_1 = require("../virtual-fs");
 const fs_1 = require("fs");
@@ -55,7 +56,7 @@ const getRemoteAddress = (req, options) => {
             : req.headers[options.trustProxy.remoteAddressHeader]?.toString()
         : undefined) ?? req.socket.remoteAddress);
 };
-function createDatatruckRepositoryServer(options, config = {}) {
+function createDatatruckRepositoryServer(inOptions, config = {}) {
     return (0, http_2.createServer)(async (req, res) => {
         try {
             if (req.url === "/" || req.url === "/favicon.ico")
@@ -65,6 +66,10 @@ function createDatatruckRepositoryServer(options, config = {}) {
                 res.statusCode = 404;
                 return res.end();
             }
+            const fileOptions = config.configPath
+                ? (await ConfigAction_1.ConfigAction.parseFile(config.configPath)).server?.repository
+                : undefined;
+            const options = fileOptions ?? inOptions;
             const backend = findRepositoryBackend(req, repository, options);
             if (!backend) {
                 res.statusCode = 401;

package/utils/fs.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.asFile = exports.groupFiles = exports.ensureFreeDiskSpace = exports.checkFreeDiskSpace = exports.fetchDiskStats = exports.initEmptyDir = exports.tryRm = exports.safeRename = exports.fetchData = exports.countFileLines = exports.createWriteStreamPool = exports.createFileScanner = exports.createProgress = exports.cpy = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.waitForClose = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.readPartialFile = exports.fastFolderSizeAsync = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.writeJSONFile = exports.existsFile = exports.existsDir = exports.safeStat = exports.ensureExistsDir = exports.ensureSingleFile = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isLocalDir = exports.isEmptyDir = exports.isWSLSystem = void 0;
+const pkg_1 = require("../pkg");
 const bytes_1 = require("./bytes");
 const math_1 = require("./math");
-const path_1 = require("./path");
 const string_1 = require("./string");
 const temp_1 = require("./temp");
 const async_1 = require("async");
@@ -16,8 +16,8 @@ const fs_1 = require("fs");
 const fs_2 = require("fs");
 const promises_1 = require("fs/promises");
 const os_1 = require("os");
+const path_1 = require("path");
 const path_2 = require("path");
-const path_3 = require("path");
 const readline_1 = require("readline");
 const util_1 = require("util");
 exports.isWSLSystem = (0, os_1.release)().includes("microsoft-standard-WSL");
@@ -59,12 +59,12 @@ async function ensureSingleFile(path) {
     if (files.length !== 1)
         throw new Error(`Dir has not one file: ${files.length}`);
     const [file] = files;
-    return (0, path_2.join)(path, file);
+    return (0, path_1.join)(path, file);
 }
 exports.ensureSingleFile = ensureSingleFile;
 async function ensureExistsDir(path) {
     if (!(await existsDir(path)))
-        throw new Error(`Dir is not crated: ${path}`);
+        throw new Error(`Dir is not created: ${path}`);
 }
 exports.ensureExistsDir = ensureExistsDir;
 async function safeStat(path) {
@@ -88,10 +88,11 @@ async function writeJSONFile(path, json) {
 exports.writeJSONFile = writeJSONFile;
 exports.parseFileExtensions = ["json", "js", "ts", "yaml", "yml"];
 async function parseFile(path, jsKey) {
-    if (!(0, path_3.isAbsolute)(path))
-        path = (0, path_2.join)(process.cwd(), path);
+    if (!(0, path_2.isAbsolute)(path))
+        path = (0, path_1.join)(process.cwd(), path);
+    const $require = require;
     if (path.endsWith(".ts"))
-        require("ts-node").register();
+        $require("ts-node").register();
     if (path.endsWith(".yaml") || path.endsWith("yml")) {
         const contents = await (0, promises_1.readFile)(path);
         return require("yaml").parse(contents.toString());
@@ -107,7 +108,7 @@ async function parseFile(path, jsKey) {
 }
 exports.parseFile = parseFile;
 function parsePackageFile() {
-    return require(`${path_1.rootPath}/package.json`);
+    return pkg_1.pkg;
 }
 exports.parsePackageFile = parsePackageFile;
 async function findFile(sourcePath, baseName, extensions, errorMessage = "Path not found") {
@@ -115,7 +116,7 @@ async function findFile(sourcePath, baseName, extensions, errorMessage = "Path n
     let path;
     if (info.isDirectory()) {
         for (const ext of extensions) {
-            const extPath = (0, path_2.join)(sourcePath, baseName) + "." + ext;
+            const extPath = (0, path_1.join)(sourcePath, baseName) + "." + ext;
             if (await existsFile(extPath)) {
                 path = extPath;
                 break;
@@ -183,7 +184,7 @@ exports.readDir = readDir;
 async function forEachFile(dirPath, cb, includeDir) {
     const files = await readDir(dirPath);
     for (const file of files) {
-        const filePath = (0, path_2.join)(dirPath, file);
+        const filePath = (0, path_1.join)(dirPath, file);
         if ((await (0, promises_1.stat)(filePath)).isDirectory()) {
             if (includeDir)
                 cb(filePath, true);
@@ -206,12 +207,12 @@ function fastglobToGitIgnore(patterns, baseDir) {
 exports.fastglobToGitIgnore = fastglobToGitIgnore;
 async function writeGitIgnoreList(options) {
     const { outDir } = options;
-    const path = (0, path_2.join)(outDir, `.gitignore`);
+    const path = (0, path_1.join)(outDir, `.gitignore`);
     const stream = (0, fs_2.createWriteStream)(path);
     const dirs = new Set();
     stream.write("*\n");
     for await (const value of options.paths) {
-        const dir = (0, path_2.dirname)(value.toString());
+        const dir = (0, path_1.dirname)(value.toString());
         if (dir !== ".") {
             let parentPath;
             for (const value of dir.split("/")) {
@@ -290,9 +291,9 @@ async function cpy(options) {
     const task = async (rawEntryPath, basePath) => {
         [rawEntryPath] = rawEntryPath.split(":");
         const isDir = rawEntryPath.endsWith("/");
-        const entryPath = (0, path_2.normalize)(rawEntryPath);
-        const entrySourcePath = (0, path_2.resolve)((0, path_2.join)(basePath, rawEntryPath));
-        const entryTargetPath = (0, path_2.resolve)((0, path_2.join)(options.outPath, rawEntryPath));
+        const entryPath = (0, path_1.normalize)(rawEntryPath);
+        const entrySourcePath = (0, path_1.resolve)((0, path_1.join)(basePath, rawEntryPath));
+        const entryTargetPath = (0, path_1.resolve)((0, path_1.join)(options.outPath, rawEntryPath));
         const onPathResult = await options?.onPath?.({
             isDir,
             entryPath,
@@ -307,7 +308,7 @@ async function cpy(options) {
             await makeRecursiveDir(entryTargetPath);
         }
         else {
-            const dir = (0, path_2.dirname)(entryTargetPath);
+            const dir = (0, path_1.dirname)(entryTargetPath);
             await makeRecursiveDir(dir);
             await options.onProgress?.({
                 current: stats.files,
@@ -447,7 +448,7 @@ function createWriteStreamPool(options) {
         const item = {
             key,
             lines: 0,
-            stream: (0, fs_2.createWriteStream)((0, path_2.join)(options.path, options.onStreamPath ? options.onStreamPath(key) : key)),
+            stream: (0, fs_2.createWriteStream)((0, path_1.join)(options.path, options.onStreamPath ? options.onStreamPath(key) : key)),
             finished: false,
         };
         item.stream
@@ -612,7 +613,7 @@ exports.groupFiles = groupFiles;
 async function asFile(input) {
     if (typeof input === "string") {
         const dir = await (0, temp_1.mkTmpDir)("text-as-file");
-        const path = (0, path_2.join)(dir, "contents.txt");
+        const path = (0, path_1.join)(dir, "contents.txt");
         await (0, promises_1.writeFile)(path, input);
         return [
             path,

package/utils/steps.d.ts

@@ -14,6 +14,11 @@ export type TelegramMessageStepConfig = {
     chatId: number;
     text?: string;
 };
+export type NtfyStepConfig = {
+    token: string;
+    topic?: string;
+    text?: string;
+};
 export type Step = {
     type: "process";
     config: ProcessStepConfig;
@@ -23,20 +28,15 @@ export type Step = {
 } | {
     type: "telegram-message";
     config: TelegramMessageStepConfig;
+} | {
+    type: "ntfy";
+    config: NtfyStepConfig;
 };
 export type StepOptions = {
     env?: Record<string, string | undefined>;
-    process?: {
-        vars?: Record<string, string | undefined>;
-    };
-    node?: {
-        vars?: Record<string, any>;
-        tempDir?: () => Promise<string>;
-    };
-    telegram?: {
-        vars?: Record<string, string>;
-    };
+    vars?: Record<string, any>;
     cwd?: string;
+    tempDir?: () => Promise<string>;
     onLine?: (p: string) => any;
     verbose?: boolean;
 };

package/utils/steps.js

@@ -9,9 +9,10 @@ const promises_1 = require("fs/promises");
 const path_1 = require("path");
 async function runSteps(input, options) {
     const steps = Array.isArray(input) ? input : [input];
+    const vars = options?.vars || {};
     for (const step of steps) {
         if (step.type === "process") {
-            await (0, process_1.exec)(step.config.command, (step.config.args || []).map((v) => (0, string_1.render)(v, options.process?.vars || {})), {
+            await (0, process_1.exec)(step.config.command, (step.config.args || []).map((v) => (0, string_1.render)(v, vars)), {
                 cwd: options.cwd,
                 env: {
                     ...process.env,
@@ -30,19 +31,19 @@ async function runSteps(input, options) {
         }
         else if (step.type === "node") {
             let tempDir;
-            if (options.node?.tempDir) {
-                tempDir = await options.node.tempDir();
+            if (options?.tempDir) {
+                tempDir = await options.tempDir();
             }
             else {
                 tempDir = await (0, temp_1.mkTmpDir)("node-step");
             }
             const scriptPath = (0, path_1.join)(tempDir, "script.js");
-            const vars = {
+            const nodeVars = {
                 ...step.config.vars,
-                ...options.node?.vars,
+                ...vars,
             };
-            const varKeys = Object.keys(vars);
-            const varJson = JSON.stringify(vars);
+            const varKeys = Object.keys(nodeVars);
+            const varJson = JSON.stringify(nodeVars);
             const code = Array.isArray(step.config.code)
                 ? [...step.config.code].join(";\n")
                 : step.config.code;
@@ -67,7 +68,7 @@ async function runSteps(input, options) {
         else if (step.type === "telegram-message") {
             await (0, http_1.post)(`https://api.telegram.org/bot${step.config.bot}/sendMessage`, JSON.stringify({
                 chat_id: step.config.chatId.toString(),
-                text: (0, string_1.render)(step.config.text ?? `{TEXT}`, options.telegram?.vars || {}),
+                text: (0, string_1.render)(step.config.text ?? `{dtt.text}`, vars),
                 disable_notification: true,
             }), {
                 headers: {
@@ -75,6 +76,19 @@ async function runSteps(input, options) {
                 },
             });
         }
+        else if (step.type === "ntfy") {
+            const topic = [step.config.token, step.config.topic]
+                .filter(Boolean)
+                .join("-");
+            if (topic.length < 32)
+                throw new Error(`Topic is less than 32 characters: ${topic}`);
+            await (0, http_1.post)(`https://ntfy.sh/${topic}`, (0, string_1.render)(step.config.text ?? `{dtt.text}`, vars), {
+                headers: {
+                    Title: (0, string_1.render)("{dtt.title}", vars),
+                    Priority: vars.success ? "default" : "high",
+                },
+            });
+        }
         else {
             throw new Error(`Invalid step type: ${step.type}`);
         }

package/utils/string.js

@@ -8,17 +8,33 @@ function snakeCase(value, char = "_") {
 }
 exports.snakeCase = snakeCase;
 function render(subject, vars) {
-    return subject.replace(/{([\w/]*)}/g, function (match, name) {
+    return subject.replace(/{([\w\./]*)}/g, function (match, name) {
         if (!name.length) {
             return "{";
         }
         else if (name === "/") {
             return "}";
         }
-        const value = vars[name];
-        if (typeof value === "undefined")
-            throw new AppError_1.AppError(`Variable is not defined: '${subject}' (${name})`);
-        return value;
+        let ref = vars;
+        for (const key of name.split(".")) {
+            if (!!ref && typeof ref === "object") {
+                ref = ref[key];
+            }
+            else {
+                ref = undefined;
+                break;
+            }
+        }
+        if (typeof ref !== "string" &&
+            typeof ref !== "number" &&
+            typeof ref !== "boolean")
+            throw new Error(`Variable is not valid: ${name}`, {
+                cause: {
+                    vars,
+                    value: ref,
+                },
+            });
+        return ref.toString();
     });
 }
 exports.render = render;