@datatruck/cli 0.40.4 → 0.41.1

package/config.schema.json

@@ -1113,6 +1113,9 @@
                       "type": "boolean"
                     }
                   ]
+                },
+                "insecureTls": {
+                  "type": "boolean"
                 }
               },
               "additionalProperties": false,
@@ -1249,15 +1252,15 @@
         "path": {
           "type": "string"
         },
-        "username": {
-          "type": "string"
-        },
         "host": {
           "type": "string"
         },
         "port": {
           "type": "number"
         },
+        "username": {
+          "type": "string"
+        },
         "protocol": {
           "enum": [
             "http",

package/lib/actions/RestoreAction.js

@@ -109,7 +109,7 @@ class RestoreAction {
                 package: pkg,
                 snapshot,
             });
-            snapshotPath = taskResult?.snapshotPath;
+            snapshotPath = taskResult?.snapshotPath ?? snapshotPath;
         }
         (0, assert_1.ok)(snapshotPath);
         await (0, repository_1.initSnapshotPath)(snapshotPath, this.config.minFreeDiskSpace);

package/lib/cli.js

@@ -17,6 +17,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const commander_1 = require("commander");
 const fs_2 = require("fs");
 const path_1 = require("path");
+const util_1 = require("util");
 function getGlobalOptions() {
     const result = program.opts();
     const parseBool = (v) => v === "true" ? true : v === "false" ? false : v;
@@ -49,21 +50,21 @@ function createCommandAction(Constructor) {
         if (errors?.length) {
             console.error();
             errors.forEach((error, index) => {
-                console.error(chalk_1.default.red(`${index + 1}. ` + (error.stack ?? error.message)));
+                console.error(chalk_1.default.red(`${index + 1}. ` + (0, util_1.format)(error)));
                 if (errors[index + 1])
                     console.error();
             });
         }
         if (error) {
             if (globalOptions.verbose) {
-                console.error(chalk_1.default.red(error.stack));
+                console.error(chalk_1.default.red((0, util_1.format)(error)));
             }
             else {
                 if (error instanceof error_1.AppError) {
                     console.error(chalk_1.default.red(error.message));
                 }
                 else {
-                    console.error(chalk_1.default.red(error.stack));
+                    console.error(chalk_1.default.red((0, util_1.format)(error)));
                 }
             }
         }
@@ -97,7 +98,7 @@ function parseArgs(args) {
             process.stdout.write(cli_1.showCursorCommand);
             console.info(`\nClosing... (reason: ${eventName})`);
             if (error instanceof Error)
-                console.error(error.stack);
+                console.error((0, util_1.format)(error));
         }
         if (!verbose)
             try {

package/lib/repositories/DatatruckRepository.d.ts

@@ -11,6 +11,7 @@ export type MetaData = Omit<SnapshotTagObject, "shortId" | "size"> & {
 export type DatatruckRepositoryConfig = {
     backend: string;
     compress?: boolean | CompressOptions;
+    insecureTls?: boolean;
 };
 type PackObject = {
     name?: string;

package/lib/repositories/DatatruckRepository.js

@@ -46,15 +46,15 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return this.config.backend;
     }
     fetchDiskStats(config) {
-        const fs = (0, client_1.createFs)(config.backend, this.verbose);
+        const fs = (0, client_1.createFs)(config, this.verbose);
         return fs.fetchDiskStats(".");
     }
     async init(data) {
-        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
+        const fs = (0, client_1.createFs)(this.config, this.verbose);
         await fs.mkdir(".");
     }
     async prune(data) {
-        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
+        const fs = (0, client_1.createFs)(this.config, this.verbose);
         const snapshotName = DatatruckRepository.createSnapshotName(data.snapshot, {
             name: data.snapshot.packageName,
         });
@@ -64,7 +64,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
             await fs.rmAll(snapshotName);
     }
     async fetchSnapshots(data) {
-        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
+        const fs = (0, client_1.createFs)(this.config, this.verbose);
         if (!(await fs.existsDir(".")))
             throw new error_1.AppError(`Repository (${this.repository.name}) out path does not exist: ${fs.resolvePath(".")}`);
         const snapshots = [];
@@ -110,7 +110,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return snapshots;
     }
     async backup(data) {
-        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
+        const fs = (0, client_1.createFs)(this.config, this.verbose);
         const snapshotName = DatatruckRepository.createSnapshotName(data.snapshot, data.package);
         const outPath = fs.isLocal()
             ? fs.resolvePath(snapshotName)
@@ -231,8 +231,8 @@ 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 sourceFs = (0, client_1.createFs)(this.config, this.verbose);
+        const targetFs = (0, client_1.createFs)(data.mirrorRepositoryConfig, this.verbose);
         const snapshotName = DatatruckRepository.createSnapshotName(data.snapshot, data.package);
         if (data.options.verbose)
             (0, cli_1.logExec)(`Copying backup files to ${data.mirrorRepositoryConfig.backend}`);
@@ -302,7 +302,7 @@ class DatatruckRepository extends RepositoryAbstract_1.RepositoryAbstract {
         return { bytes };
     }
     async restore(data) {
-        const fs = (0, client_1.createFs)(this.config.backend, this.verbose);
+        const fs = (0, client_1.createFs)(this.config, this.verbose);
         const relRestorePath = data.snapshotPath;
         (0, assert_1.ok)(relRestorePath);
         const restorePath = (0, path_1.resolve)(relRestorePath);

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

@@ -1,16 +1,19 @@
 import { DiskStats } from "../fs";
 import { BasicProgress } from "../progress";
 import { AbstractFs, FsOptions } from "../virtual-fs";
+import { Agent } from "undici";
 export declare class RemoteFs extends AbstractFs {
     readonly options: FsOptions & {
         verbose?: boolean;
     };
     protected url: string;
     protected headers: Record<string, string>;
+    protected agent: Agent | undefined;
     constructor(options: FsOptions & {
         verbose?: boolean;
     });
     isLocal(): boolean;
+    private getCurlArgs;
     protected fetchJson(name: string, params: any[]): Promise<any>;
     protected post(name: string, params: any[], data: string): Promise<import("undici").Response>;
     existsDir(path: string): Promise<boolean>;
@@ -32,4 +35,7 @@ export declare class RemoteFs extends AbstractFs {
     }>;
 }
 export declare function isRemoteBackend(backend: string): boolean;
-export declare function createFs(backend: string, verbose: boolean | undefined): AbstractFs;
+export declare function createFs(options: {
+    backend: string;
+    insecureTls?: boolean;
+}, verbose: boolean | undefined): AbstractFs;

package/lib/utils/datatruck/client.js

@@ -7,10 +7,12 @@ const cli_1 = require("../cli");
 const http_1 = require("../http");
 const virtual_fs_1 = require("../virtual-fs");
 const repository_server_1 = require("./repository-server");
+const undici_1 = require("undici");
 class RemoteFs extends virtual_fs_1.AbstractFs {
     options;
     url;
     headers;
+    agent;
     constructor(options) {
         super(options);
         this.options = options;
@@ -24,24 +26,50 @@ class RemoteFs extends virtual_fs_1.AbstractFs {
         this.url = url.href;
         if (this.url.endsWith("/"))
             this.url = this.url.slice(0, -1);
+        if (options.insecureTls)
+            this.agent = new undici_1.Agent({
+                connect: {
+                    rejectUnauthorized: false,
+                },
+            });
     }
     isLocal() {
         return false;
     }
+    getCurlArgs(headers = {}) {
+        const args = Object.entries({ ...headers, ...this.headers }).flatMap(([k, v]) => ["-H", `"${k}: ${v}"`]);
+        if (this.options.insecureTls)
+            args.push("-k");
+        args.push("-v");
+        return args;
+    }
     async fetchJson(name, params) {
         const url = (0, http_1.createHref)(`${this.url}/${name}`, {
             params: JSON.stringify(params),
         });
+        if (this.options.verbose)
+            (0, cli_1.logExec)("curl", [...this.getCurlArgs(), `"${url}"`]);
         return await (0, http_1.fetchJson)(url, {
             headers: this.headers,
+            dispatcher: this.agent,
         });
     }
     async post(name, params, data) {
         const url = (0, http_1.createHref)(`${this.url}/${name}`, {
             params: JSON.stringify(params),
         });
+        if (this.options.verbose)
+            (0, cli_1.logExec)("curl", [
+                ...this.getCurlArgs({ "Content-Type": "application/json" }),
+                "--request",
+                "POST",
+                "--data",
+                `"${data}"`,
+                `"${url}"`,
+            ]);
         return await (0, http_1.post)(url, data, {
             headers: this.headers,
+            dispatcher: this.agent,
         });
     }
     async existsDir(path) {
@@ -82,9 +110,17 @@ class RemoteFs extends virtual_fs_1.AbstractFs {
         const url = (0, http_1.createHref)(`${this.url}/upload`, {
             params: JSON.stringify([target]),
         });
+        if (this.options.verbose)
+            (0, cli_1.logExec)("curl", [
+                ...this.getCurlArgs(),
+                "-F",
+                `data=@${source}`,
+                `"${url}"`,
+            ]);
         return await (0, http_1.uploadFile)(url, source, {
             headers: this.headers,
             checksum: true,
+            dispatcher: this.agent,
         });
     }
     async download(source, target, options = {}) {
@@ -93,9 +129,12 @@ class RemoteFs extends virtual_fs_1.AbstractFs {
         const url = (0, http_1.createHref)(`${this.url}/download`, {
             params: JSON.stringify([source]),
         });
+        if (this.options.verbose)
+            (0, cli_1.logExec)("curl", [...this.getCurlArgs(), `"${url}"`, ">", target]);
         return await (0, http_1.downloadFile)(url, target, {
             ...options,
             headers: this.headers,
+            dispatcher: this.agent,
         });
     }
 }
@@ -103,8 +142,12 @@ exports.RemoteFs = RemoteFs;
 function isRemoteBackend(backend) {
     return backend.startsWith("http:") || backend.startsWith("https:");
 }
-function createFs(backend, verbose) {
-    return isRemoteBackend(backend)
-        ? new RemoteFs({ backend, verbose })
-        : new virtual_fs_1.LocalFs({ backend });
+function createFs(options, verbose) {
+    return isRemoteBackend(options.backend)
+        ? new RemoteFs({
+            backend: options.backend,
+            insecureTls: options.insecureTls,
+            verbose,
+        })
+        : new virtual_fs_1.LocalFs({ backend: options.backend });
 }

package/lib/utils/datatruck/config.js

@@ -75,7 +75,7 @@ function filterRepositoryByEnabled(repository, action) {
     if (typeof enabled === "boolean")
         return enabled;
     const defaults = enabled["defaults"] ?? true;
-    return action ? enabled[action] ?? defaults : true;
+    return action ? (enabled[action] ?? defaults) : true;
 }
 function filterPackages(config, options) {
     const filterRepo = (0, string_1.createPatternFilter)(options.repositoryNames);

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

@@ -14,7 +14,7 @@ function createCrons(jobs, options) {
     for (const name in jobs) {
         const job = jobs[name];
         if (job.schedule)
-            crons.push((0, croner_1.Cron)(typeof job.schedule === "string"
+            crons.push(new croner_1.Cron(typeof job.schedule === "string"
                 ? job.schedule
                 : (0, cron_1.formatCronScheduleObject)(job.schedule), {
                 paused: true,

package/lib/utils/datatruck/job.js

@@ -60,7 +60,7 @@ async function runJob(job, name, config) {
 async function runCronJob(job, name, config) {
     let pid = 0;
     try {
-        const log = config.log?.enabled ?? true
+        const log = (config.log?.enabled ?? true)
             ? await createJobLog(config.log, name)
             : undefined;
         const cliOptions = getJobCliOptions(job);

package/lib/utils/fs.d.ts

@@ -36,7 +36,7 @@ export declare function writeGitIgnoreList(options: {
     paths: NodeJS.ReadableStream | string[];
     outDir: string;
 }): Promise<string>;
-export declare function copyFileWithStreams(source: string, target: string): Promise<unknown>;
+export declare function copyFileWithStreams(source: string, target: string): Promise<void>;
 export declare function updateFileStats(path: string, fileInfo: Stats): Promise<void>;
 export declare function isNotFoundError(error: unknown): boolean;
 export declare function readTextFile(path: string): Promise<string>;

package/lib/utils/fs.js

@@ -279,7 +279,7 @@ async function copyFileWithStreams(source, target) {
     const r = (0, fs_1.createReadStream)(source);
     const w = (0, fs_2.createWriteStream)(target);
     try {
-        return await new Promise((resolve, reject) => {
+        await new Promise((resolve, reject) => {
             r.on("error", reject);
             w.on("error", reject);
             w.on("finish", resolve);

package/lib/utils/http.js

@@ -67,7 +67,7 @@ async function sendFile(req, res, path, options = {}) {
     try {
         file = (0, fs_1.createReadStream)(path);
         const fileStat = await (0, promises_1.stat)(path);
-        res.setHeader(options.contentLength ?? true ? "Content-Length" : "x-content-length", fileStat.size);
+        res.setHeader((options.contentLength ?? true) ? "Content-Length" : "x-content-length", fileStat.size);
         if (options.checksum)
             res.setHeader("x-checksum", await (0, crypto_1.calcFileHash)(path, "sha1"));
         file.pipe(res);

package/lib/utils/mongodb.js

@@ -32,7 +32,7 @@ async function resolveMongoUri(input) {
     return {
         ...object,
         password: object.password !== undefined
-            ? (await (0, fs_1.fetchData)(object.password, (p) => p.path)) ?? ""
+            ? ((await (0, fs_1.fetchData)(object.password, (p) => p.path)) ?? "")
             : "",
     };
 }

package/lib/utils/options.js

@@ -26,7 +26,9 @@ function createCommand(config, action) {
         }
         else if (typeof flag === "string") {
             const flags = [
-                option.shortFlag ? `-${option.shortFlag},` : "",
+                option.shortFlag
+                    ? `${"-".repeat(option.shortFlag.length > 1 ? 2 : 1)}${option.shortFlag},`
+                    : "",
                 `--${name}`,
                 option.value !== "boolean"
                     ? option.value === "array"

package/lib/utils/progress.js

@@ -30,7 +30,7 @@ class ProgressManager {
             ? this.tty
                 ? `interval:${300}`
                 : "interval"
-            : options.mode ?? "interval";
+            : (options.mode ?? "interval");
         this.intervalMs = 1000;
         if (typeof mode === "string" && mode.startsWith("interval:")) {
             const [, ms] = mode.split(":");

package/lib/utils/tar.js

@@ -156,8 +156,8 @@ function normalizeTarPath(path) {
 }
 async function extractTar(options) {
     let total = options.onEntry
-        ? options.total ??
-            (await listTar({ input: options.input, verbose: options.verbose }))
+        ? (options.total ??
+            (await listTar({ input: options.input, verbose: options.verbose })))
         : undefined;
     if (!(await (0, fs_1.existsDir)(options.output))) {
         if (options.verbose)

package/lib/utils/virtual-fs.d.ts

@@ -3,6 +3,7 @@ import { BasicProgress } from "./progress";
 export declare function resolvePath(path: string): string;
 export type FsOptions = {
     backend: string;
+    insecureTls?: boolean;
 };
 export declare abstract class AbstractFs {
     readonly options: FsOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.40.4",
+  "version": "0.41.1",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {
@@ -30,23 +30,23 @@
     "ajv": "^8.17.1",
     "async": "^3.2.6",
     "chalk": "^4.1.2",
-    "commander": "^12.1.0",
-    "croner": "^8.1.2",
+    "commander": "^14.0.0",
+    "croner": "^9.1.0",
     "dayjs": "^1.11.13",
-    "fast-folder-size": "^2.2.0",
-    "fast-glob": "^3.3.2",
-    "listr2": "^8.2.5",
+    "fast-folder-size": "^2.4.0",
+    "fast-glob": "^3.3.3",
+    "listr2": "^9.0.1",
     "micromatch": "^4.0.8",
-    "mongodb": "^6.9.0",
-    "mysql2": "^3.11.3",
+    "mongodb": "^6.18.0",
+    "mysql2": "^3.14.3",
     "tty-table": "^4.2.3",
-    "undici": "^6.19.8",
-    "yaml": "^2.5.1"
+    "undici": "^7.14.0",
+    "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@types/async": "^3.2.24",
+    "@types/async": "^3.2.25",
     "@types/micromatch": "^4.0.9",
-    "mongodb-memory-server": "^10.0.1"
+    "mongodb-memory-server": "^10.2.0"
   },
   "optionalDependencies": {
     "ts-node": "^10.9.2"