@datatruck/cli 0.17.1 → 0.18.0

package/Task/MariadbTask.js

@@ -2,15 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MariadbTask = exports.mariadbTaskDefinition = exports.mariadbTaskName = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const cli_util_1 = require("../util/cli-util");
-const fs_util_1 = require("../util/fs-util");
-const math_util_1 = require("../util/math-util");
-const process_util_1 = require("../util/process-util");
+const cli_1 = require("../utils/cli");
+const fs_1 = require("../utils/fs");
+const math_1 = require("../utils/math");
+const process_1 = require("../utils/process");
+const zip_1 = require("../utils/zip");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
+const fs_2 = require("fs");
 const promises_1 = require("fs/promises");
+const os_1 = require("os");
 const path_1 = require("path");
-const posix_1 = require("path/posix");
 exports.mariadbTaskName = "mariadb";
 exports.mariadbTaskDefinition = {
     type: "object",
@@ -39,8 +41,65 @@ exports.mariadbTaskDefinition = {
         excludeTables: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.stringListUtil),
         includeDatabases: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.stringListUtil),
         excludeDatabases: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.stringListUtil),
+        parallel: {
+            anyOf: [{ type: "integer", minimum: 1 }, { enum: ["auto"] }],
+        },
+        compress: {
+            anyOf: [
+                {
+                    type: "object",
+                    additionalProperties: false,
+                    properties: {
+                        command: { type: "string" },
+                        args: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.stringListUtil),
+                    },
+                },
+                {
+                    type: "object",
+                    additionalProperties: false,
+                    properties: {
+                        type: { enum: ["gzip", "pigz"] },
+                        args: (0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.stringListUtil),
+                    },
+                },
+            ],
+        },
     },
 };
+function normalizeConfig(input) {
+    let parallel = input.parallel ?? "auto";
+    let cores = (0, os_1.cpus)().length;
+    if (parallel === "auto") {
+        parallel = input.compress ? Math.round(cores / 2) : cores;
+        cores = Math.max(1, cores - parallel);
+    }
+    let compress;
+    if (input.compress && "type" in input.compress) {
+        if (input.compress.type === "pigz") {
+            compress = { command: "pigz", args: [] };
+            if (!input.compress.args?.includes("-p")) {
+                compress.args.push("-p", cores.toString());
+            }
+        }
+        else if (input.compress.type === "gzip") {
+            compress = { command: "gzip" };
+        }
+    }
+    else {
+        compress = input.compress;
+    }
+    return { parallel, compress };
+}
+const parseLineRegex = /^(?:\[(?<step>\d+)\] )?(?<dateTime>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})?\s+(?<text>.+)\s*$/;
+function parseLine(line) {
+    const result = parseLineRegex.exec(line);
+    if (result) {
+        return result.groups;
+    }
+    else {
+        return { text: line };
+    }
+}
 class MariadbTask extends TaskAbstract_1.TaskAbstract {
     get command() {
         return this.config.command ?? "mariabackup";
@@ -58,18 +117,25 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
         const targetPath = data.targetPath;
         (0, assert_1.ok)(typeof sourcePath === "string");
         (0, assert_1.ok)(typeof targetPath === "string");
+        const { parallel, compress } = normalizeConfig(config);
         const args = [
             `--backup`,
             `--datadir=${sourcePath}`,
-            `--target-dir=${targetPath}`,
             `--host=${config.hostname}`,
             `--user=${config.username}`,
+            `--parallel=${parallel}`,
             `--password=${typeof config.password === "string"
                 ? config.password
                 : config.password
                     ? (await (0, promises_1.readFile)(config.password.path)).toString()
                     : ""}`,
         ];
+        if (compress) {
+            args.push(`--stream=xbstream`);
+        }
+        else {
+            args.push(`--target-dir=${targetPath}`);
+        }
         if (config.includeDatabases)
             args.push(`--databases=${config.includeDatabases.join(" ")}`);
         if (config.excludeDatabases)
@@ -80,76 +146,192 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
             args.push(`--tables-exclude=^(${config.excludeTables.join("|")})$`);
         let total = 0;
         let current = 0;
-        await (0, fs_util_1.forEachFile)(sourcePath, () => {
+        await (0, fs_1.forEachFile)(sourcePath, () => {
             total++;
         });
-        let childProcess;
-        const onData = async (strLines) => {
-            const paths = [];
-            const pathRegex = /\[\d{1,}\] \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} Copying (.+) to/;
-            const lines = strLines.split(/\r?\n/);
-            let fatalError = false;
-            for (const line of lines) {
-                if (line.includes("[ERROR] InnoDB: Unsupported redo log format.") ||
-                    line.includes("Error: cannot read redo log header")) {
-                    fatalError = true;
-                }
-                else {
-                    const matches = pathRegex.exec(line);
-                    if (matches) {
-                        current++;
-                        paths.push(matches[1]);
-                    }
-                }
-            }
-            if (fatalError) {
-                childProcess.kill();
+        let p1;
+        let lastLineText;
+        const pathRegex = /((Copying|Streaming) .+) to/;
+        const onData = async (line) => {
+            const { text } = parseLine(line);
+            lastLineText = text;
+            if (line.includes("[ERROR] InnoDB: Unsupported redo log format.") ||
+                line.includes("Error: cannot read redo log header")) {
+                p1.kill();
             }
-            else if (paths.length) {
-                const path = (0, posix_1.normalize)(paths[0]);
+            else {
+                const matches = pathRegex.exec(text);
+                if (matches)
+                    current++;
                 await data.onProgress({
                     relative: {
-                        description: "Copying file",
-                        payload: path,
+                        payload: matches ? matches[1] : text,
                     },
                     absolute: {
                         current,
-                        percent: (0, math_util_1.progressPercent)(total, current),
+                        percent: (0, math_1.progressPercent)(total, current),
                         total,
                     },
                 });
             }
         };
-        await (0, process_util_1.exec)(command, args, undefined, {
-            log: this.verbose,
-            onSpawn: (p) => {
-                childProcess = p;
-            },
-            stdout: {
-                onData,
-            },
-            stderr: {
-                onData,
-            },
-        });
-        await (0, process_util_1.exec)(command, [`--prepare`, `--target-dir=${targetPath}`], undefined, {
-            log: this.verbose,
-            stderr: { onData: () => { } },
-        });
+        const stats = { xbFiles: total };
+        await (0, promises_1.writeFile)((0, path_1.join)(targetPath, "stats.dtt.json"), JSON.stringify(stats));
+        if (compress) {
+            const p0 = (0, fs_2.createWriteStream)((0, path_1.join)(targetPath, "db.xb.gz"));
+            p1 = (0, process_1.createProcess)(command, args, {
+                $log: {
+                    exec: this.verbose,
+                    stderr: this.verbose,
+                },
+                $stderr: {
+                    parseLines: true,
+                    onData,
+                },
+                $onExitCode: (code) => `Exit code: ${code} - ${lastLineText}`,
+            });
+            const p2 = (0, process_1.createProcess)(compress.command, compress.args);
+            p1.stdout.pipe(p2.stdin, { end: true });
+            p2.stdout.pipe(p0, { end: true });
+            await Promise.all([p1, p2, (0, fs_1.waitForClose)(p0)]);
+        }
+        else {
+            p1 = (0, process_1.createProcess)(command, args, {
+                $log: this.verbose,
+                $stdout: {
+                    parseLines: true,
+                    onData,
+                },
+                $stderr: {
+                    parseLines: true,
+                    onData,
+                },
+                $onExitCode: (code) => `Exit code: ${code} - ${lastLineText}`,
+            });
+            await p1;
+            await (0, process_1.exec)(command, [`--prepare`, `--target-dir=${targetPath}`], undefined, {
+                log: this.verbose,
+                stderr: { onData: () => { } },
+            });
+        }
     }
     async onRestore(data) {
         this.verbose = data.options.verbose;
         const restorePath = data.package.restorePath;
         (0, assert_1.ok)(typeof restorePath === "string");
-        await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        const files = await (0, fs_util_1.readDir)(restorePath);
-        for (const file of files) {
-            if (file.startsWith("ib_logfile")) {
-                const filePath = (0, path_1.join)(restorePath, file);
-                if (this.verbose)
-                    (0, cli_util_1.logExec)("rm", [filePath]);
-                await (0, promises_1.rm)(filePath);
-            }
+        await (0, fs_1.mkdirIfNotExists)(restorePath);
+        const removeFiles = [];
+        let files = [];
+        const reloadFiles = async (data = {}) => {
+            if (data.removeFile)
+                removeFiles.push(data.removeFile);
+            return (files = (await (0, fs_1.readDir)(restorePath)).filter((v) => !removeFiles.includes(v)));
+        };
+        await reloadFiles();
+        const absolute = {
+            format: "amount",
+            total: 3,
+            current: 0,
+            description: undefined,
+            payload: undefined,
+            percent: undefined,
+        };
+        // Stats
+        const statsFile = files.find((file) => file === "stats.dtt.json");
+        let stats;
+        if (statsFile) {
+            const statsFilePath = (0, path_1.join)(restorePath, statsFile);
+            const statsBuffer = await (0, promises_1.readFile)(statsFilePath);
+            stats = JSON.parse(statsBuffer.toString());
+            await reloadFiles({ removeFile: statsFile });
+        }
+        const zipFile = files.find((file) => file.endsWith(".gz"));
+        absolute.current++;
+        absolute.percent = (0, math_1.progressPercent)(absolute.total, absolute.current);
+        // Extract
+        if (files.length === 1 && zipFile) {
+            absolute.description = "Extracting";
+            absolute.payload = zipFile;
+            await data.onProgress({
+                absolute,
+            });
+            await (0, zip_1.unzip)({
+                input: (0, path_1.join)(restorePath, zipFile),
+                output: restorePath,
+                verbose: this.verbose,
+                async onProgress(item) {
+                    await data.onProgress({
+                        absolute,
+                        relative: {
+                            payload: item.path,
+                            format: "amount",
+                            percent: item.percent,
+                        },
+                    });
+                },
+            });
+            await reloadFiles({ removeFile: zipFile });
+        }
+        // Extract stream
+        const xbFile = files.find((file) => file.endsWith(".xb"));
+        absolute.current++;
+        absolute.percent = (0, math_1.progressPercent)(absolute.total, absolute.current);
+        if (files.length === 1 && xbFile) {
+            const xbFilePath = (0, path_1.join)(restorePath, xbFile);
+            const xbStream = (0, fs_2.createReadStream)(xbFilePath);
+            removeFiles.push(xbFile);
+            absolute.description = "Extracting stream";
+            absolute.payload = xbFile;
+            await data.onProgress({
+                absolute,
+            });
+            let currentXbFiles = 0;
+            const { parallel } = normalizeConfig({ parallel: this.config.parallel });
+            const p1 = (0, process_1.createProcess)("mbstream", ["-x", "-C", restorePath, "-v", "-p", parallel], {
+                $log: this.verbose,
+                $stderr: {
+                    parseLines: true,
+                    async onData(line) {
+                        const { text: path } = parseLine(line);
+                        await data.onProgress({
+                            absolute,
+                            relative: {
+                                payload: path,
+                                format: "amount",
+                                current: ++currentXbFiles,
+                                total: stats?.xbFiles,
+                                percent: stats?.xbFiles
+                                    ? (0, math_1.progressPercent)(stats.xbFiles, currentXbFiles)
+                                    : undefined,
+                            },
+                        });
+                    },
+                },
+            });
+            xbStream.pipe(p1.stdin, { end: true });
+            await Promise.all([(0, fs_1.waitForClose)(xbStream), p1]);
+        }
+        // Prepare
+        absolute.current++;
+        absolute.percent = (0, math_1.progressPercent)(absolute.total, absolute.current);
+        if (files.length === 1 && xbFile) {
+            absolute.description = "Preparing";
+            await data.onProgress({
+                absolute,
+            });
+            await (0, process_1.exec)(this.command, [`--prepare`, `--target-dir=${restorePath}`], undefined, {
+                log: this.verbose,
+                stderr: { onData: () => { } },
+            });
+        }
+        await reloadFiles();
+        removeFiles.push(...files.filter((file) => file.startsWith("ib_logfile")));
+        // Remove files
+        for (const file of removeFiles) {
+            const filePath = (0, path_1.join)(restorePath, file);
+            if (this.verbose)
+                (0, cli_1.logExec)("rm", [filePath]);
+            await (0, promises_1.rm)(filePath);
         }
     }
 }

package/Task/MssqlTask.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MssqlTask = exports.mssqlTaskDefinition = exports.mssqlTaskName = void 0;
 const AppError_1 = require("../Error/AppError");
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const config_util_1 = require("../util/datatruck/config-util");
-const fs_util_1 = require("../util/fs-util");
-const process_util_1 = require("../util/process-util");
+const config_1 = require("../utils/datatruck/config");
+const fs_1 = require("../utils/fs");
+const process_1 = require("../utils/process");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
@@ -29,7 +29,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
         return this.config.command ?? "sqlcmd";
     }
     async exec(query) {
-        const result = await (0, process_util_1.exec)(this.command, [
+        const result = await (0, process_1.exec)(this.command, [
             ...(this.config.hostname ? ["-S", this.config.hostname] : []),
             ...(this.config.username ? ["-U", this.config.username] : []),
             ...(this.config.passwordFile
@@ -73,7 +73,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
             (0, micromatch_1.isMatch)(databaseName, this.config.includeDatabases)) &&
             (!this.config.excludeDatabases ||
                 !(0, micromatch_1.isMatch)(databaseName, this.config.excludeDatabases)));
-        await (0, fs_util_1.mkdirIfNotExists)(targetPath);
+        await (0, fs_1.mkdirIfNotExists)(targetPath);
         for (const databaseName of databaseNames) {
             const databasePath = (0, path_1.join)(targetPath, `${databaseName}${MssqlTask.SUFFIX}`);
             await this.exec(`BACKUP DATABASE [${databaseName}] TO DISK='${databasePath}' WITH FORMAT`);
@@ -83,14 +83,14 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
         this.verbose = data.options.verbose;
         const restorePath = data.package.restorePath;
         (0, assert_1.ok)(typeof restorePath === "string");
-        await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        const files = await (0, fs_util_1.readDir)(restorePath);
+        await (0, fs_1.mkdirIfNotExists)(restorePath);
+        const files = await (0, fs_1.readDir)(restorePath);
         for (const file of files) {
             if (!file.endsWith(MssqlTask.SUFFIX))
                 continue;
             let databaseName = file.slice(0, MssqlTask.SUFFIX.length * -1);
             if (this.config.targetDatabase)
-                databaseName = (0, config_util_1.resolveDatabaseName)(this.config.targetDatabase, {
+                databaseName = (0, config_1.resolveDatabaseName)(this.config.targetDatabase, {
                     action: "restore",
                     database: databaseName,
                     packageName: data.package.name,

package/Task/MysqlDumpTask.d.ts

@@ -7,7 +7,7 @@ export declare class MysqlDumpTask extends SqlDumpTaskAbstract<MysqlDumpTaskConf
     buildConnectionArgs(database?: boolean): Promise<string[]>;
     onDatabaseIsEmpty(name: string): Promise<boolean>;
     onCreateDatabase(database: TargetDatabaseType): Promise<void>;
-    onExecQuery(query: string): Promise<import("../util/process-util").ExecResultType>;
+    onExecQuery(query: string): Promise<import("../utils/process").ExecResultType>;
     onFetchTableNames(database: string): Promise<string[]>;
     onExportTables(tableNames: string[], output: string, onProgress: (progress: {
         totalBytes: number;

package/Task/MysqlDumpTask.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlDumpTask = exports.mysqlDumpTaskDefinition = exports.mysqlDumpTaskName = void 0;
 const AppError_1 = require("../Error/AppError");
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const fs_util_1 = require("../util/fs-util");
-const process_util_1 = require("../util/process-util");
+const fs_1 = require("../utils/fs");
+const process_1 = require("../utils/process");
 const SqlDumpTaskAbstract_1 = require("./SqlDumpTaskAbstract");
-const fs_1 = require("fs");
 const fs_2 = require("fs");
+const fs_3 = require("fs");
 exports.mysqlDumpTaskName = "mysql-dump";
 exports.mysqlDumpTaskDefinition = {
     allOf: [(0, DefinitionEnum_1.makeRef)(DefinitionEnum_1.DefinitionEnum.sqlDumpTask)],
@@ -43,7 +43,7 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         await this.onExecQuery(query);
     }
     async onExecQuery(query) {
-        return await (0, process_util_1.exec)("mysql", [
+        return await (0, process_1.exec)("mysql", [
             ...(await this.buildConnectionArgs()),
             "-e",
             query.replace(/\s{1,}/g, " "),
@@ -71,13 +71,13 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
 	`);
     }
     async onExportTables(tableNames, output, onProgress) {
-        const stream = (0, fs_1.createWriteStream)(output);
+        const stream = (0, fs_2.createWriteStream)(output);
         await Promise.all([
             new Promise((resolve, reject) => {
                 stream.on("close", resolve);
                 stream.on("error", reject);
             }),
-            await (0, process_util_1.exec)("mysqldump", [
+            await (0, process_1.exec)("mysqldump", [
                 ...(await this.buildConnectionArgs()),
                 "--lock-tables=false",
                 "--skip-add-drop-table=false",
@@ -97,8 +97,8 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
                 },
             }),
         ]);
-        const headerContents = await (0, fs_util_1.readPartialFile)(output, [0, 100]);
-        const footerContents = await (0, fs_util_1.readPartialFile)(output, [-100]);
+        const headerContents = await (0, fs_1.readPartialFile)(output, [0, 100]);
+        const footerContents = await (0, fs_1.readPartialFile)(output, [-100]);
         const successHeader = headerContents.split(/\r?\n/).some((line) => {
             const firstLine = line.trim().toLowerCase();
             return (firstLine.startsWith("-- mysql dump") ||
@@ -113,13 +113,13 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
             throw new AppError_1.AppError("No end line found (incomplete backup)");
     }
     async onExportStoredPrograms(output) {
-        const stream = (0, fs_1.createWriteStream)(output);
+        const stream = (0, fs_2.createWriteStream)(output);
         await Promise.all([
             new Promise((resolve, reject) => {
                 stream.on("close", resolve);
                 stream.on("error", reject);
             }),
-            await (0, process_util_1.exec)("mysqldump", [
+            await (0, process_1.exec)("mysqldump", [
                 ...(await this.buildConnectionArgs()),
                 "--lock-tables=false",
                 "--routines",
@@ -143,12 +143,12 @@ class MysqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         ]);
     }
     async onImport(path, database) {
-        await (0, process_util_1.exec)("mysql", [...(await this.buildConnectionArgs(false)), database], null, {
+        await (0, process_1.exec)("mysql", [...(await this.buildConnectionArgs(false)), database], null, {
             pipe: {
-                stream: (0, fs_2.createReadStream)(path),
+                stream: (0, fs_3.createReadStream)(path),
                 onReadProgress: (data) => {
                     if (this.verbose)
-                        (0, process_util_1.logExecStdout)({
+                        (0, process_1.logExecStdout)({
                             data: JSON.stringify(data),
                             colorize: true,
                             stderr: true,

package/Task/PostgresqlDumpTask.d.ts

@@ -7,7 +7,7 @@ export declare class PostgresqlDumpTask extends SqlDumpTaskAbstract<PostgresqlDu
     buildConnectionArgs(database?: string): Promise<string[]>;
     onDatabaseIsEmpty(name: string): Promise<boolean>;
     onCreateDatabase(database: TargetDatabaseType): Promise<void>;
-    onExecQuery(query: string): Promise<import("../util/process-util").ExecResultType>;
+    onExecQuery(query: string): Promise<import("../utils/process").ExecResultType>;
     onFetchTableNames(database: string): Promise<string[]>;
     onExportTables(tableNames: string[], output: string, onProgress: (progress: {
         totalBytes: number;

package/Task/PostgresqlDumpTask.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresqlDumpTask = exports.postgresqlDumpTaskDefinition = exports.postgresqlDumpTaskName = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const process_util_1 = require("../util/process-util");
+const process_1 = require("../utils/process");
 const SqlDumpTaskAbstract_1 = require("./SqlDumpTaskAbstract");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -45,7 +45,7 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         await this.onExecQuery(query);
     }
     async onExecQuery(query) {
-        return await (0, process_util_1.exec)("psql", [
+        return await (0, process_1.exec)("psql", [
             ...(await this.buildConnectionArgs()),
             "-t",
             "-c",
@@ -80,7 +80,7 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
                 stream.on("close", resolve);
                 stream.on("error", reject);
             }),
-            (0, process_util_1.exec)("pg_dump", [
+            (0, process_1.exec)("pg_dump", [
                 ...(await this.buildConnectionArgs()),
                 ...(tableNames?.flatMap((v) => ["-t", v]) ?? []),
             ], null, {
@@ -96,7 +96,7 @@ class PostgresqlDumpTask extends SqlDumpTaskAbstract_1.SqlDumpTaskAbstract {
         throw new Error(`Method not implemented: onExportStoredPrograms`);
     }
     async onImport(path, database) {
-        await (0, process_util_1.exec)("psql", [...(await this.buildConnectionArgs(database)), "-f", (0, path_1.normalize)(path)], undefined, {
+        await (0, process_1.exec)("psql", [...(await this.buildConnectionArgs(database)), "-f", (0, path_1.normalize)(path)], undefined, {
             log: this.verbose,
         });
     }

package/Task/ScriptTask.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScriptTask = exports.scriptTaskDefinition = exports.scriptTaskName = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
-const fs_util_1 = require("../util/fs-util");
-const process_util_1 = require("../util/process-util");
-const string_util_1 = require("../util/string-util");
+const fs_1 = require("../utils/fs");
+const process_1 = require("../utils/process");
+const string_1 = require("../utils/string");
 const TaskAbstract_1 = require("./TaskAbstract");
 const assert_1 = require("assert");
 const promises_1 = require("fs/promises");
@@ -110,7 +110,7 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
         const steps = Array.isArray(input) ? input : [input];
         for (const step of steps) {
             if (step.type === "process") {
-                await (0, process_util_1.exec)(step.config.command, (step.config.args || []).map((v) => (0, string_util_1.render)(v, options.vars)), {
+                await (0, process_1.exec)(step.config.command, (step.config.args || []).map((v) => (0, string_1.render)(v, options.vars)), {
                     env: {
                         ...process.env,
                         ...options.vars,
@@ -127,7 +127,7 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
                 await (0, promises_1.writeFile)(scriptPath, Array.isArray(step.config.code)
                     ? step.config.code.join("\n")
                     : step.config.code);
-                await (0, process_util_1.exec)("node", [scriptPath], {
+                await (0, process_1.exec)("node", [scriptPath], {
                     env: {
                         ...process.env,
                         ...options.vars,
@@ -168,8 +168,8 @@ class ScriptTask extends TaskAbstract_1.TaskAbstract {
         const targetPath = data.targetPath;
         (0, assert_1.ok)(typeof restorePath === "string");
         (0, assert_1.ok)(typeof targetPath === "string");
-        await (0, fs_util_1.mkdirIfNotExists)(restorePath);
-        await (0, fs_util_1.ensureEmptyDir)(restorePath);
+        await (0, fs_1.mkdirIfNotExists)(restorePath);
+        await (0, fs_1.ensureEmptyDir)(restorePath);
         await this.processSteps(config.restoreSteps, {
             env: config.env,
             vars: this.getVars(data),

package/Task/SqlDumpTaskAbstract.d.ts

@@ -1,4 +1,4 @@
-import { exec } from "../util/process-util";
+import { exec } from "../utils/process";
 import { BackupDataType, RestoreDataType, TaskAbstract } from "./TaskAbstract";
 import { JSONSchema7 } from "json-schema";
 export type TargetDatabaseType = {