@datatruck/cli 0.40.1 → 0.40.3

package/lib/utils/http.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { BasicProgress } from "./progress";
 import { IncomingMessage, Server, ServerResponse } from "http";
 import { fetch, type RequestInit } from "undici";

package/lib/utils/http.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadFile = exports.downloadFile = exports.recvFile = exports.sendFile = exports.parseContentLength = exports.post = exports.fetchJson = exports.safeFetch = exports.readRequestData = exports.closeServer = exports.createHref = void 0;
+exports.safeFetch = void 0;
+exports.createHref = createHref;
+exports.closeServer = closeServer;
+exports.readRequestData = readRequestData;
+exports.fetchJson = fetchJson;
+exports.post = post;
+exports.parseContentLength = parseContentLength;
+exports.sendFile = sendFile;
+exports.recvFile = recvFile;
+exports.downloadFile = downloadFile;
+exports.uploadFile = uploadFile;
 const crypto_1 = require("./crypto");
 const math_1 = require("./math");
 const fs_1 = require("fs");
@@ -14,11 +24,9 @@ function createHref(inUrl, query) {
         url.searchParams.set(key, query[key]);
     return url.href;
 }
-exports.createHref = createHref;
 async function closeServer(server) {
     await new Promise((resolve, reject) => server.close((error) => (error ? reject(error) : resolve())));
 }
-exports.closeServer = closeServer;
 function readRequestData(req) {
     let data;
     return new Promise((resolve, reject) => {
@@ -34,7 +42,6 @@ function readRequestData(req) {
         });
     });
 }
-exports.readRequestData = readRequestData;
 const safeFetch = async (...args) => {
     const res = await (0, undici_1.fetch)(...args);
     if (res.status !== 200)
@@ -47,17 +54,14 @@ async function fetchJson(url, options = {}) {
     const data = await res.text();
     return data.length ? JSON.parse(data) : undefined;
 }
-exports.fetchJson = fetchJson;
 async function post(url, data, options = {}) {
     return await (0, exports.safeFetch)(url, { ...options, method: "POST", body: data });
 }
-exports.post = post;
 function parseContentLength(value) {
     if (!value || !/^\d+$/.test(value))
         throw new Error(`Invalid 'content-length': ${value}`);
     return Number(value);
 }
-exports.parseContentLength = parseContentLength;
 async function sendFile(req, res, path, options = {}) {
     let file;
     try {
@@ -79,7 +83,6 @@ async function sendFile(req, res, path, options = {}) {
             res.end();
     }
 }
-exports.sendFile = sendFile;
 async function recvFile(req, res, path) {
     let file;
     try {
@@ -99,7 +102,6 @@ async function recvFile(req, res, path) {
         res.end();
     }
 }
-exports.recvFile = recvFile;
 async function downloadFile(url, output, options = {}) {
     const { timeout, onProgress, ...fetchOptions } = options;
     const file = (0, fs_1.createWriteStream)(output);
@@ -157,7 +159,6 @@ async function downloadFile(url, output, options = {}) {
         throw requestError;
     return { bytes: length.total };
 }
-exports.downloadFile = downloadFile;
 async function uploadFile(url, path, options = {}) {
     const { size } = await (0, promises_1.stat)(path);
     const file = (0, fs_1.createReadStream)(path);
@@ -182,4 +183,3 @@ async function uploadFile(url, path, options = {}) {
         file.close();
     }
 }
-exports.uploadFile = uploadFile;

package/lib/utils/list.d.ts

@@ -46,7 +46,6 @@ export declare class Listr3<T extends Listr3Context> extends Listr<void, "defaul
         gargabeCollector?: GargabeCollector;
     };
     readonly resultMap: Record<string, Listr3TaskResult<T>>;
-    readonly resultList: Listr3TaskResult<T>[];
     readonly logger: List3Logger;
     protected execTimer: Timer;
     constructor($options: {
@@ -56,12 +55,13 @@ export declare class Listr3<T extends Listr3Context> extends Listr<void, "defaul
     });
     private serializeKeyIndex;
     private createResultIndex;
+    get resultList(): any[];
     result(key: keyof T, keyIndex?: KeyIndex): Listr3TaskResult<T>;
     $task<K extends keyof T>(item: Listr3Task<T, K>): ListrTask;
     $tasks<K extends keyof T>(...items: (Listr3Task<T, K> | ListrTask | false)[]): ListrTask[];
     add(tasks: ListrTask<void, ListrGetRendererClassFromValue<"default">> | ListrTask<void, ListrGetRendererClassFromValue<"default">>[]): this;
     getSummaryResult(): List3SummaryResult;
-    getResult(): (List3SummaryResult | Listr3TaskResult<T>)[];
+    getResult(): any[];
     protected release(): void;
     execAndParse(verbose: boolean | undefined): Promise<{
         result: (List3SummaryResult | Listr3TaskResult<T>)[];

package/lib/utils/list.js

@@ -18,7 +18,6 @@ exports.List3Logger = List3Logger;
 class Listr3 extends listr2_1.Listr {
     $options;
     resultMap = {};
-    resultList = [];
     logger;
     execTimer;
     constructor($options) {
@@ -56,6 +55,16 @@ class Listr3 extends listr2_1.Listr {
     createResultIndex(key, keyIndex) {
         return [key, ...this.serializeKeyIndex(keyIndex)].join(".");
     }
+    get resultList() {
+        return this.tasks
+            .flatMap((task) => [task, ...(task.subtasks || [])])
+            .map((task) => {
+            const result = task.task.task["_result"];
+            if (!result)
+                throw new Error(`Task result is not defined: ${task.title}`);
+            return result;
+        });
+    }
     result(key, keyIndex) {
         const index = this.createResultIndex(key, keyIndex);
         const result = this.resultMap[index];
@@ -76,37 +85,38 @@ class Listr3 extends listr2_1.Listr {
             error: undefined,
             data: item.data,
         };
-        this.resultList.push(this.resultMap[index]);
         const title = typeof item.title === "string" ? { initial: item.title } : item.title;
+        const task = async (_, task) => {
+            const result = this.result(item.key, item.keyIndex);
+            if (title.started)
+                task.title = title.started;
+            const timer = (0, date_1.createTimer)();
+            if (title)
+                try {
+                    const runResult = await item.run(task, result.data);
+                    if (title.completed)
+                        task.title = title.completed;
+                    return Array.isArray(runResult)
+                        ? task.newListr(runResult)
+                        : runResult;
+                }
+                catch (error) {
+                    result.error = error;
+                    if (title.failed)
+                        task.title = title.failed;
+                    throw error;
+                }
+                finally {
+                    result.elapsed = timer.elapsed();
+                }
+        };
+        task["_result"] = this.resultMap[index];
         return {
             title: title.initial,
             exitOnError: item.exitOnError,
             enabled: item.enabled,
             skip: item.skip,
-            task: async (_, task) => {
-                const result = this.result(item.key, item.keyIndex);
-                if (title.started)
-                    task.title = title.started;
-                const timer = (0, date_1.createTimer)();
-                if (title)
-                    try {
-                        const runResult = await item.run(task, result.data);
-                        if (title.completed)
-                            task.title = title.completed;
-                        return Array.isArray(runResult)
-                            ? task.newListr(runResult)
-                            : runResult;
-                    }
-                    catch (error) {
-                        result.error = error;
-                        if (title.failed)
-                            task.title = title.failed;
-                        throw error;
-                    }
-                    finally {
-                        result.elapsed = timer.elapsed();
-                    }
-            },
+            task,
         };
     }
     $tasks(...items) {

package/lib/utils/logs.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeOldLogs = exports.defaultsLogPath = exports.maxAgeToMS = void 0;
+exports.defaultsLogPath = void 0;
+exports.maxAgeToMS = maxAgeToMS;
+exports.removeOldLogs = removeOldLogs;
 const fs_1 = require("./fs");
 const promises_1 = require("fs/promises");
 const os_1 = require("os");
@@ -21,7 +23,6 @@ function maxAgeToMS(input) {
     }
     return ms;
 }
-exports.maxAgeToMS = maxAgeToMS;
 exports.defaultsLogPath = (0, os_1.platform)() === "win32"
     ? (0, path_1.join)(process.env.APPDATA ?? `${process.env.HOMEDRIVE ?? "C:"}\\ProgramData`, "datatruck\\logs")
     : "/var/logs/datatruck";
@@ -44,4 +45,3 @@ async function removeOldLogs(path, inMaxAge) {
     }
     return paths;
 }
-exports.removeOldLogs = removeOldLogs;

package/lib/utils/math.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Counter = exports.progressPercent = void 0;
+exports.Counter = void 0;
+exports.progressPercent = progressPercent;
 function progressPercent(total, current) {
     if (total === 0 && current === 0)
         return 0;
     return Number(((current / total) * 100).toFixed(2));
 }
-exports.progressPercent = progressPercent;
 class Counter {
     maxValue;
     value = 0;

package/lib/utils/mongodb.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveMongoUri = exports.toMongoUri = void 0;
+exports.toMongoUri = toMongoUri;
+exports.resolveMongoUri = resolveMongoUri;
 const fs_1 = require("./fs");
 function toMongoUri(object) {
     const url = new URL(`mongodb://${object.host}`);
@@ -13,7 +14,6 @@ function toMongoUri(object) {
     url.pathname = `/${object.database}`;
     return url.href;
 }
-exports.toMongoUri = toMongoUri;
 async function resolveMongoUri(input) {
     let object;
     if (typeof input === "string") {
@@ -36,4 +36,3 @@ async function resolveMongoUri(input) {
             : "",
     };
 }
-exports.resolveMongoUri = resolveMongoUri;

package/lib/utils/mysql.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export type MysqlCliOptions = {
     password: string | {
         path: string;

package/lib/utils/mysql.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMysqlCli = exports.assertDumpFile = void 0;
+exports.assertDumpFile = assertDumpFile;
+exports.createMysqlCli = createMysqlCli;
 const async_process_1 = require("./async-process");
 const cli_1 = require("./cli");
 const error_1 = require("./error");
@@ -39,17 +40,24 @@ async function assertDumpFile(path) {
     if (!successFooter)
         throw new error_1.AppError("No end line found (incomplete backup)");
 }
-exports.assertDumpFile = assertDumpFile;
 async function createMysqlCli(options) {
     let sqlConfigPath;
     const password = (await (0, fs_1.fetchData)(options.password, (p) => p.path)) ?? "";
-    const sql = await (0, promise_1.createConnection)({
+    const connectionOptions = {
         host: options.hostname,
         user: options.username,
         password,
         port: options.port,
         database: options.database,
-    });
+    };
+    if (options.verbose)
+        (0, cli_1.logExec)("sql.createConnection", [
+            JSON.stringify({
+                ...connectionOptions,
+                password: "********",
+            }, null, 2),
+        ]);
+    const sql = await (0, promise_1.createConnection)(connectionOptions);
     async function createSqlConfig() {
         if (sqlConfigPath)
             return sqlConfigPath;
@@ -70,19 +78,23 @@ async function createMysqlCli(options) {
         return [`--defaults-file=${await createSqlConfig()}`];
     }
     async function fetchAll(query, params) {
+        if (options.verbose)
+            (0, cli_1.logExec)("> sql.query", [query, JSON.stringify({ params }, null, 2)]);
         const [rows] = await sql.query(query, params);
+        if (options.verbose)
+            (0, cli_1.logExec)("< sql.query", [JSON.stringify(rows, null, 2)]);
         return rows;
     }
     async function fetchTableNames(database, include, exclude) {
         return (await fetchAll(`
       SELECT
-        table_name 
+        TABLE_NAME AS table_name
       FROM
-        information_schema.tables
+        information_schema.TABLES
       WHERE
-        table_schema = ?
+        TABLE_SCHEMA = ?
       ORDER BY
-        table_name
+        TABLE_NAME
   `, [database]))
             .map((r) => r.table_name)
             .filter((0, string_1.createPatternFilter)({ include, exclude }));
@@ -184,14 +196,14 @@ async function createMysqlCli(options) {
       SELECT
         COUNT(*) AS total 
       FROM
-        information_schema.tables
+        information_schema.TABLES
       WHERE
-        table_schema = ?
+        TABLE_SCHEMA = ?
     `, [database]);
         return Number(row.total) ? false : true;
     }
     async function createDatabase(database) {
-        await sql.execute(`
+        await execute(`
       CREATE DATABASE IF NOT EXISTS \`${database.name}\`
       CHARACTER SET ${database.charset ?? "utf8"}
       COLLATE ${database.charset ?? "utf8_general_ci"}
@@ -221,7 +233,7 @@ async function createMysqlCli(options) {
         try {
             await (0, fs_1.mkdirIfNotExists)(dir);
             await (0, promises_1.chmod)(dir, 0o777);
-            await sql.execute(`SELECT 1 INTO OUTFILE ${outFileVar}`);
+            await execute(`SELECT 1 INTO OUTFILE ${outFileVar}`);
             const exists = await (0, fs_1.existsFile)(outFile);
             if (!exists)
                 throw new error_1.AppError(`MySQL shared dir is not reached: ${dir}`);
@@ -234,14 +246,8 @@ async function createMysqlCli(options) {
         }
     }
     async function execute(query, params = []) {
-        if (options.verbose) {
-            (0, cli_1.logExec)(`mysql`, [
-                ...(await args()),
-                "-e",
-                `"${flatQuery(query)}"`,
-                ...(sql.config.database ? [sql.config.database] : []),
-            ]);
-        }
+        if (options.verbose)
+            (0, cli_1.logExec)("> sql.execute", [query, JSON.stringify({ params }, null, 2)]);
         await sql.execute(query, params);
     }
     async function insert(tableName, item) {
@@ -255,10 +261,14 @@ async function createMysqlCli(options) {
         await execute(`INSERT INTO ${tableName} (${columnsExpr}) VALUES (${paramsExpr})`, params);
     }
     async function changeDatabase(name) {
+        if (options.verbose)
+            (0, cli_1.logExec)("sql.changeUser", [name]);
         await sql.changeUser({ database: name });
     }
     return {
         async [Symbol.asyncDispose]() {
+            if (options.verbose)
+                (0, cli_1.logExec)("sql.end");
             await sql.end();
         },
         options,
@@ -279,4 +289,3 @@ async function createMysqlCli(options) {
         fetchVariable,
     };
 }
-exports.createMysqlCli = createMysqlCli;

package/lib/utils/object.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StrictMap = exports.groupBy = exports.getErrorProperties = exports.pickProps = exports.omitProp = exports.merge = void 0;
+exports.StrictMap = void 0;
+exports.merge = merge;
+exports.omitProp = omitProp;
+exports.pickProps = pickProps;
+exports.getErrorProperties = getErrorProperties;
+exports.groupBy = groupBy;
 function merge(target, ...sources) {
     const isObject = (o) => typeof o === "object" && o !== null;
     for (const source of sources)
@@ -12,13 +17,11 @@ function merge(target, ...sources) {
         }
     return target;
 }
-exports.merge = merge;
 function omitProp(object, name) {
     const result = { ...object };
     delete result[name];
     return result;
 }
-exports.omitProp = omitProp;
 function pickProps(object, input) {
     const result = {};
     for (const name in input) {
@@ -27,7 +30,6 @@ function pickProps(object, input) {
     }
     return result;
 }
-exports.pickProps = pickProps;
 function getErrorProperties(error) {
     const alt = {};
     for (const key of Object.getOwnPropertyNames(error)) {
@@ -35,7 +37,6 @@ function getErrorProperties(error) {
     }
     return alt;
 }
-exports.getErrorProperties = getErrorProperties;
 function groupBy(items, keyOrCb, single) {
     const keyCb = typeof keyOrCb === "function"
         ? keyOrCb
@@ -64,7 +65,6 @@ function groupBy(items, keyOrCb, single) {
         }, {});
     }
 }
-exports.groupBy = groupBy;
 class StrictMap {
     serializeKey;
     constructor(serializeKey) {

package/lib/utils/options.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringifyOptions = exports.createCommand = void 0;
+exports.createCommand = createCommand;
+exports.stringifyOptions = stringifyOptions;
 const string_1 = require("./string");
 const commander_1 = require("commander");
 function createCommand(config, action) {
@@ -66,7 +67,6 @@ function createCommand(config, action) {
         return await action(options);
     });
 }
-exports.createCommand = createCommand;
 function stringifyOptions(options, object) {
     const result = [];
     const prepend = [];
@@ -94,4 +94,3 @@ function stringifyOptions(options, object) {
     }
     return [...prepend, ...result];
 }
-exports.stringifyOptions = stringifyOptions;

package/lib/utils/process.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Readable, Writable } from "stream";
 export type ProcessEnv = {
     [name: string]: string | undefined;

package/lib/utils/process.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logProcess = exports.logStderr = exports.logStdout = void 0;
+exports.logStdout = logStdout;
+exports.logStderr = logStderr;
+exports.logProcess = logProcess;
 const cli_1 = require("./cli");
 const chalk_1 = __importDefault(require("chalk"));
 const stream_1 = require("stream");
@@ -13,11 +15,9 @@ function logStdout(input) {
         text += "\n";
     input.stderr ? process.stderr.write(text) : process.stdout.write(text);
 }
-exports.logStdout = logStdout;
 function logStderr(data, colorize) {
     process.stdout.write(colorize ? chalk_1.default.red(data) : data);
 }
-exports.logStderr = logStderr;
 async function logProcess(command, argv, options) {
     const logEnv = options.envNames?.reduce((env, key) => {
         const value = options?.env?.[key];
@@ -33,4 +33,3 @@ async function logProcess(command, argv, options) {
         ]
         : argv, logEnv, options.toStderr);
 }
-exports.logProcess = logProcess;

package/lib/utils/progress.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Timer } from "./date";
 export type BasicProgress = {
     percent: number;

package/lib/utils/progress.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderProgressStats = exports.renderProgress = exports.ProgressManager = void 0;
+exports.ProgressManager = void 0;
+exports.renderProgress = renderProgress;
+exports.renderProgressStats = renderProgressStats;
 const bytes_1 = require("./bytes");
 const cli_1 = require("./cli");
 const date_1 = require("./date");
@@ -121,7 +123,6 @@ function renderProgress(progress, bar) {
         progress.relative && renderProgressStats(progress.relative, bar),
     ].filter((v) => !!v);
 }
-exports.renderProgress = renderProgress;
 function renderProgressStats(stats, progressBar) {
     const text = [];
     if (typeof stats.percent === "number") {
@@ -160,4 +161,3 @@ function renderProgressStats(stats, progressBar) {
     const sep = (0, chalk_1.grey)(`|`);
     return text.join(` ${sep} `);
 }
-exports.renderProgressStats = renderProgressStats;

package/lib/utils/reportSteps.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runReportSteps = exports.isReportStep = void 0;
+exports.isReportStep = isReportStep;
+exports.runReportSteps = runReportSteps;
 const error_1 = require("./error");
 const http_1 = require("./http");
 function isReportStep(step) {
     return step.type === "telegram" || step.type === "ntfy";
 }
-exports.isReportStep = isReportStep;
 async function runReportSteps(input, options) {
     const steps = Array.isArray(input) ? input : [input];
     for (const step of steps) {
@@ -39,4 +39,3 @@ async function runReportSteps(input, options) {
         }
     }
 }
-exports.runReportSteps = runReportSteps;

package/lib/utils/spawnSteps.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runSpawnSteps = exports.isSpawnStep = void 0;
+exports.isSpawnStep = isSpawnStep;
+exports.runSpawnSteps = runSpawnSteps;
 const async_process_1 = require("./async-process");
 const string_1 = require("./string");
 const temp_1 = require("./temp");
@@ -27,7 +28,6 @@ async function writeNodeScript(options) {
 function isSpawnStep(step) {
     return step.type === "process" || step.type === "node";
 }
-exports.isSpawnStep = isSpawnStep;
 async function runSpawnSteps(input, options) {
     const steps = Array.isArray(input) ? input : [input];
     for (const step of steps) {
@@ -70,4 +70,3 @@ async function runSpawnSteps(input, options) {
         }
     }
 }
-exports.runSpawnSteps = runSpawnSteps;

package/lib/utils/stream.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Writable } from "stream";
 export type StdStreams = {
     stdout: Writable;

package/lib/utils/stream.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForClose = exports.createStdStreams = void 0;
+exports.createStdStreams = createStdStreams;
+exports.waitForClose = waitForClose;
 function createStdStreams(options = {}) {
     return {
         stdout: options.stdout ?? process.stdout,
         stderr: options.stderr ?? process.stderr,
     };
 }
-exports.createStdStreams = createStdStreams;
 async function waitForClose(stream) {
     return new Promise((resolve, reject) => {
         stream.on("close", resolve);
         stream.on("error", reject);
     });
 }
-exports.waitForClose = waitForClose;