@datatruck/cli 0.39.0 → 0.39.1

package/lib/commands/RunCommand.js

@@ -31,12 +31,11 @@ class RunCommand extends CommandAbstract_1.CommandAbstract {
             console.error(`error: missing required argument 'jobName' (values: ${jobNames.join(", ")})`);
             return { exitCode: 1 };
         }
-        await (0, job_1.runJob)(job, jobName, {
+        const exitCode = await (0, job_1.runJob)(job, jobName, {
             verbose: verbose,
             configPath: config.path,
-            log: "inherit",
         });
-        return { exitCode: 0 };
+        return { exitCode };
     }
 }
 exports.RunCommand = RunCommand;

package/lib/tasks/MariadbTask.js

@@ -160,7 +160,7 @@ class MariadbTask extends TaskAbstract_1.TaskAbstract {
         const reloadFiles = async (data = {}) => {
             if (data.removeFile)
                 removeFiles.push(data.removeFile);
-            return (files = (await (0, fs_1.readDir)(snapshotPath)).filter((v) => !removeFiles.includes(v)));
+            return (files = (await (0, fs_1.safeReaddir)(snapshotPath)).filter((v) => !removeFiles.includes(v)));
         };
         await reloadFiles();
         const absolute = {

package/lib/tasks/MssqlTask.js

@@ -66,7 +66,7 @@ class MssqlTask extends TaskAbstract_1.TaskAbstract {
     async restore(data) {
         this.verbose = data.options.verbose;
         const snapshotPath = data.snapshotPath;
-        const files = await (0, fs_1.readDir)(snapshotPath);
+        const files = await (0, fs_1.safeReaddir)(snapshotPath);
         for (const file of files) {
             if (!file.endsWith(MssqlTask.SUFFIX))
                 continue;

package/lib/tasks/MysqlDumpTask.js

@@ -255,7 +255,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
                     ...params,
                     database: database.name,
                 });
-            const [files, compressed] = (0, fs_1.groupFiles)(await (0, fs_1.readDir)(snapshotPath), Object.values(suffix));
+            const [files, compressed] = (0, fs_1.groupFiles)(await (0, fs_1.safeReaddir)(snapshotPath), Object.values(suffix));
             // Database check
             if (files.some((f) => f.endsWith(suffix.database)) &&
                 !(await sql.isDatabaseEmpty(database.name)))

package/lib/tasks/SqlDumpTaskAbstract.js

@@ -168,7 +168,7 @@ class SqlDumpTaskAbstract extends TaskAbstract_1.TaskAbstract {
                 database: database.name,
             });
         }
-        const items = (await (0, fs_1.readDir)(snapshotPath))
+        const items = (await (0, fs_1.safeReaddir)(snapshotPath))
             .map(parseSqlFile)
             .filter((v) => !!v);
         // Database check

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

@@ -21,7 +21,7 @@ function createCrons(jobs, options) {
                 context: name,
                 catch: true,
                 protect: true,
-            }, () => (0, job_1.runJob)(job, name, options)));
+            }, () => (0, job_1.runCronJob)(job, name, options)));
     }
     return crons;
 }

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

@@ -34,8 +34,10 @@ export type Job = JobAction & {
     schedule?: JobSchedule;
 };
 export type JobConfig = {
-    log: DatatruckCronServerOptions["log"] | "inherit";
+    log: DatatruckCronServerOptions["log"];
     verbose: boolean;
     configPath: string;
 };
-export declare function runJob(job: Job, name: string, config: JobConfig): Promise<void>;
+export declare function getJobCliOptions(job: Job): string[];
+export declare function runJob(job: Job, name: string, config: Omit<JobConfig, "log">): Promise<number>;
+export declare function runCronJob(job: Job, name: string, config: JobConfig): Promise<void>;

package/lib/utils/datatruck/job.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runJob = void 0;
+exports.runCronJob = exports.runJob = exports.getJobCliOptions = void 0;
 const async_process_1 = require("../async-process");
 const cli_1 = require("../cli");
 const fs_1 = require("../fs");
@@ -17,26 +17,46 @@ async function createJobLog(config, name) {
         const tmpLogPath = (0, path_1.join)(dir, `${dt}_${name}.tmp.log`);
         await (0, promises_1.mkdir)(dir, { recursive: true });
         return {
-            type: "file",
             dt,
             dir,
             stream: (0, fs_2.createWriteStream)(tmpLogPath),
         };
     }
-    else if (config === "inherit") {
-        return {
-            type: "inherit",
-        };
-    }
 }
+function getJobCliOptions(job) {
+    const Command = command_1.datatruckCommands[job.action];
+    const command = new Command({ config: { packages: [], repositories: [] } }, {});
+    return (0, options_1.stringifyOptions)(command.optionsConfig, job.action === "prune"
+        ? ({ ...job.options, confirm: true })
+        : job.options);
+}
+exports.getJobCliOptions = getJobCliOptions;
 async function runJob(job, name, config) {
+    const cliOptions = getJobCliOptions(job);
+    const [node, bin] = process.argv;
+    return await async_process_1.AsyncProcess.exec(node, [
+        process.env.DTT_BIN_SCRIPT ?? process.env.pm_exec_path ?? bin,
+        "-c",
+        config.configPath,
+        job.action,
+        ...cliOptions,
+        ...(config.verbose ? ["-v"] : []),
+    ], {
+        $exitCode: false,
+        $log: { exec: config.verbose },
+        env: {
+            ...process.env,
+            JOB_NAME: name,
+        },
+        stdio: "inherit",
+    });
+}
+exports.runJob = runJob;
+async function runCronJob(job, name, config) {
     let pid = 0;
     try {
-        const Command = command_1.datatruckCommands[job.action];
-        const command = new Command({ config: { packages: [], repositories: [] } }, {});
-        const cliOptions = (0, options_1.stringifyOptions)(command.optionsConfig, job.action === "prune"
-            ? ({ ...job.options, confirm: true })
-            : job.options);
+        const log = await createJobLog(config.log, name);
+        const cliOptions = getJobCliOptions(job);
         const [node, bin] = process.argv;
         const argv = [
             process.env.DTT_BIN_SCRIPT ?? process.env.pm_exec_path ?? bin,
@@ -49,24 +69,20 @@ async function runJob(job, name, config) {
             job.action,
             ...cliOptions,
         ];
-        const log = await createJobLog(config.log, name);
-        if (log?.type === "file")
-            log.stream.write(`+ dtt ${argv.join(" ")}\n`);
+        log?.stream.write(`+ dtt ${argv.slice(1).join(" ")}\n`);
         const p = new async_process_1.AsyncProcess(node, argv, {
             $log: config.verbose,
             $exitCode: false,
             env: {
                 ...process.env,
+                JOB_NAME: name,
                 COLUMNS: "160",
                 NO_COLOR: "1",
-                JOB_NAME: name,
             },
-            ...(log?.type === "inherit" && {
-                stdio: "inherit",
-            }),
         });
         pid = p.child.pid || 0;
-        (0, cli_1.logJson)("job", `'${name}' started`, { pid });
+        if (log)
+            (0, cli_1.logJson)("job", `'${name}' started`, { pid });
         const [exitCode] = await Promise.all([
             p.waitForClose(),
             ...(log?.stream
@@ -74,21 +90,17 @@ async function runJob(job, name, config) {
                 : []),
         ]);
         let logData = {};
-        if (log?.stream) {
-            const base = (0, path_1.dirname)(log?.stream.path.toString());
+        if (log) {
+            const base = (0, path_1.dirname)(log.stream.path.toString());
             const logPath = (0, path_1.join)(base, `${log.dt}_${name}_${pid}.log`);
             await (0, fs_1.safeRename)(log?.stream.path.toString(), logPath);
             logData["log"] = logPath;
         }
-        (0, cli_1.logJson)("job", `'${name}' finished`, {
-            pid,
-            exitCode,
-            ...logData,
-        });
+        (0, cli_1.logJson)("job", `'${name}' finished`, { pid, exitCode, ...logData });
     }
     catch (error) {
         (0, cli_1.logJson)("job", `'${name}' failed`, { pid });
         console.error(error);
     }
 }
-exports.runJob = runJob;
+exports.runCronJob = runCronJob;

package/lib/utils/fs.d.ts

@@ -28,7 +28,8 @@ export declare function parsePackageFile(): {
 export declare function findFile(sourcePath: string, baseName: string, extensions: string[], errorMessage?: string): Promise<string>;
 export declare function fastFolderSizeAsync(path: string): Promise<number>;
 export declare function readPartialFile(path: string, positions: [number, number?]): Promise<string>;
-export declare function readDir(path: string, optional?: boolean): Promise<string[]>;
+export declare function safeReaddir(path: string): Promise<string[]>;
+export declare function tryReaddir(path: string): Promise<string[]>;
 export declare function forEachFile(dirPath: string, cb: (path: string, dir: boolean) => void, includeDir?: boolean): Promise<void>;
 /**
  * @experimental

package/lib/utils/fs.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.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.readTextFile = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.readPartialFile = exports.fastFolderSizeAsync = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.include = 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;
+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.readTextFile = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.tryReaddir = exports.safeReaddir = exports.readPartialFile = exports.fastFolderSizeAsync = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.include = 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 error_1 = require("./error");
@@ -58,7 +58,7 @@ async function ensureEmptyDir(path) {
 }
 exports.ensureEmptyDir = ensureEmptyDir;
 async function ensureSingleFile(path) {
-    const files = await readDir(path);
+    const files = await safeReaddir(path);
     if (files.length !== 1)
         throw new error_1.AppError(`Dir has not one file: ${files.length}`);
     const [file] = files;
@@ -171,15 +171,13 @@ async function readPartialFile(path, positions) {
     });
 }
 exports.readPartialFile = readPartialFile;
-async function readDir(path, optional) {
+async function safeReaddir(path) {
     try {
         return await (0, promises_1.readdir)(path);
     }
     catch (anyError) {
         const nodeError = anyError;
         if (nodeError.code === "ENOENT") {
-            if (optional)
-                return [];
             const error = new Error(nodeError.message);
             error.code = nodeError.code;
             error.errno = nodeError.errno;
@@ -189,9 +187,20 @@ async function readDir(path, optional) {
         throw anyError;
     }
 }
-exports.readDir = readDir;
+exports.safeReaddir = safeReaddir;
+async function tryReaddir(path) {
+    try {
+        return await safeReaddir(path);
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return [];
+        throw error;
+    }
+}
+exports.tryReaddir = tryReaddir;
 async function forEachFile(dirPath, cb, includeDir) {
-    const files = await readDir(dirPath);
+    const files = await safeReaddir(dirPath);
     for (const file of files) {
         const filePath = (0, path_1.join)(dirPath, file);
         if ((await (0, promises_1.stat)(filePath)).isDirectory()) {

package/lib/utils/git.js

@@ -23,7 +23,7 @@ class Git {
     }
     async canBeInit(repo) {
         return ((0, fs_1.isLocalDir)(repo) &&
-            (!(await (0, fs_1.existsDir)(repo)) || !(await (0, fs_1.readDir)(repo)).length));
+            (!(await (0, fs_1.existsDir)(repo)) || !(await (0, fs_1.safeReaddir)(repo)).length));
     }
     async clone(options) {
         await this.exec([

package/lib/utils/logs.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeOldLogs = exports.defaultsLogPath = exports.maxAgeToMS = void 0;
+const fs_1 = require("./fs");
 const promises_1 = require("fs/promises");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -29,7 +30,7 @@ async function removeOldLogs(path, inMaxAge) {
     const hasMaxAge = Object.values(inMaxAge).some((v) => typeof v === "number");
     if (!hasMaxAge)
         return [];
-    const files = (await (0, promises_1.readdir)(path)).filter((file) => file.endsWith(".log"));
+    const files = (await (0, fs_1.tryReaddir)(path)).filter((file) => file.endsWith(".log"));
     const now = Date.now();
     const paths = [];
     for (const file of files) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.39.0",
+  "version": "0.39.1",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {