node-automator 1.3.12 → 1.3.13

package/commands/exec_from_file.js

@@ -1,5 +1,5 @@
 const { get_file_list, read_cfg, get_fst_file } = require("../utils/file_tool");
-const { whisper, info, warn, success, vital } = require("../utils/log_tool");
+const { whisper, info, warn, success, vital, setLastExecFile } = require("../utils/log_tool");
 const { toArray } = require("../utils/transform_tool");
 const { BaseCommand } = require("./base");
 
@@ -20,6 +20,7 @@ class ExecFromFileCommand extends BaseCommand {
             }
             info(`执行配置文件 ${src}`);
             this.globalData.executed_cfg.push(src);
+            setLastExecFile(src);
             let cfg = await read_cfg(src, data.type);
             await this.exec(cfg, this.depth + 1);
         }

package/commands/mgr.js

@@ -2,7 +2,7 @@ const { progress } = require("../utils/display_tool");
 const { eval_code } = require("./share_data");
 const { read_plain } = require("../utils/file_tool");
 const { pause } = require("../utils/interaction_tool");
-const { whisper, getPrint, resetError, getLastError, warn, log, error, setLastError } = require("../utils/log_tool");
+const { whisper, getPrint, resetError, getLastError, warn, log, error, setLastError, setLastCommand } = require("../utils/log_tool");
 const { AbortCommand } = require("./abort");
 const { BaseCommand, PROCESS_STATE } = require("./base");
 const { BreakCommand } = require("./break");
@@ -248,11 +248,13 @@ async function _execSingle(commandCfg, depth, progressData) {
         };
     }
     let rawCfg = JSON.stringify(commandCfg, undefined, 4);
+    setLastCommand(rawCfg);
     // 深度拷贝
     commandCfg = JSON.parse(rawCfg);
     // 提前format
     if (!commandCfg.raw) {
         formatData(commandCfg);
+        setLastCommand(rawCfg, commandCfg);
     }
     if (commandCfg.side_effect && shareData.DRY_RUN) {
         warn(`[DRY_RUN] ${commandCfg.title || commandCfg.type}`);
@@ -318,7 +320,7 @@ async function _execSingle(commandCfg, depth, progressData) {
         }
         if (content == null) {
             if (!commandCfg.ignore_error) {
-                throw `无content可供使用 ${rawCfg}`;
+                throw `无content可供使用`;
             }
         }
     }
@@ -344,7 +346,7 @@ async function _execSingle(commandCfg, depth, progressData) {
         if (commandCfg.ignore_error) {
             resetError(commandCfg.ignore_error);
         } else {
-            throw getLastError() + " " + rawCfg;
+            throw getLastError();
         }
     }
     if (commandCfg.newline) {

package/index.js

@@ -27,6 +27,8 @@ const {
     error,
     getLastErrorCode,
     error2,
+    getLastCommand,
+    getLastExecFile,
 } = require("./utils/log_tool");
 const {
     showAlert,
@@ -87,7 +89,8 @@ async function MainProcess() {
     let hasError = code != 0;
     info("");
     if (hasError) {
-        error2(lastError);
+        var [lastCommand, lastCommandFormated] = getLastCommand();
+        error2("File:\n" + getLastExecFile() + "\nRaw:\n" + lastCommand + "\nFormated:\n" + JSON.stringify(lastCommandFormated, null, 4) + "\n" + lastError);
     }
     if (shareData.VERBOSE) {
         // 非代码启动，需要暂停

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-automator",
-  "version": "1.3.12",
+  "version": "1.3.13",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {

package/utils/log_tool.js

@@ -153,6 +153,26 @@ function resetError(extraError) {
     lastErrorCode = null;
 }
 
+let lastCommand = null;
+let lastCommandFormated = 0;
+function setLastCommand(raw, formated) {
+	lastCommand = raw;
+	lastCommandFormated = formated;
+}
+
+function getLastCommand() {
+	return [lastCommand, lastCommandFormated];
+}
+
+let lastExecFile = null;
+function setLastExecFile(file) {
+	lastExecFile = file;
+}
+
+function getLastExecFile() {
+	return lastExecFile;
+}
+
 function setLogLevel(level) {
 	logLevel = level;
 }
@@ -187,4 +207,8 @@ module.exports = {
 	omit_offset,
 	setLogLevel,
 	LogLevel,
+	setLastCommand,
+	getLastCommand,
+	setLastExecFile,
+	getLastExecFile,
 };