node-automator 1.4.9 → 1.4.11

package/commands/backup.js

@@ -7,7 +7,8 @@ const fs = require("fs");
 const path = require("path");
 const {
     success,
-    error
+    error,
+    warn
 } = require('../utils/log_tool');
 const {
     parse,
@@ -50,6 +51,10 @@ class BackupCommand extends BaseCommand {
                     backupData = backupData[key];
                 }
             }
+            if (backupData === undefined) {
+                warn(`未找到 ${filename} 的 ${sourceKeys} 字段`)
+                return;
+            }
             if (backupFormat) {
                 backupData = await stringify(backupData, backupFormat);
             }

package/commands/compress.js

@@ -10,6 +10,7 @@ class CompressCommand extends BaseCommand {
         const dst = get_full_path(data.dst, "FILE");
         const options = data.options || {};
         let image = await Jimp.read(src);
+        image.scale(options.scale || 1);
         image.quality(options.quality || 80);
         await image.writeAsync(dst);
     }

package/commands/mgr.js

@@ -118,6 +118,7 @@ const { DeobfuscateCommand } = require('./deobfuscate');
 const { AliOssCommand } = require('./ali_oss');
 const { BackupCommand } = require('./backup');
 const { CompressCommand } = require('./compress');
+const { Word2txtCommand } = require('./word2txt');
 
 const globalData = {
     "executed_cfg": [], // 执行过的配置文件
@@ -479,6 +480,7 @@ function init() {
     register("ali_oss", AliOssCommand, false);
     register("backup", BackupCommand, false);
     register("compress", CompressCommand, false);
+    register("word2txt", Word2txtCommand, false);
 }
 
 module.exports = {

package/commands/word2txt.js

@@ -0,0 +1,42 @@
+const {
+    get_fst_file
+} = require('../utils/file_tool');
+const {
+    BaseCommand
+} = require("./base");
+const fs = require('fs');
+const mammoth = require('mammoth');
+
+class Word2txtCommand extends BaseCommand {
+    async execute() {
+        const data = this.selfData;
+        const wordFilePath = get_fst_file(data.src);
+        return new Promise((resolve, reject) => {
+            // 读取 Word 文件
+            fs.readFile(wordFilePath, (err, data) => {
+                if (err) {
+                    reject(err);
+                    return console.error("读取文件时出错:", err);
+                }
+
+                // 将 Word 文件转换为纯文本
+                mammoth.extractRawText({
+                        buffer: data
+                    })
+                    .then((result) => {
+                        const text = result.value; // 纯文本内容
+                        console.log("转换后的文本内容:", text);
+                        resolve(text);
+                    })
+                    .catch((err) => {
+                        console.error("转换过程中出错:", err);
+                        reject(err);
+                    });
+            });
+        })
+    }
+}
+
+module.exports = {
+    Word2txtCommand,
+};

package/index.js

@@ -70,11 +70,18 @@ async function getCfgs() {
 async function MainProcess() {
     const enableTimer = argv.ENABLE_TIMER;
     const timerInterval = argv.TIMER_INTERVAL;
+    const estimateTime = +argv.ESTIMATE_TIME;
     let beginTime = Date.now();
     let timer;
     if (enableTimer && timerInterval) {
         timer = setInterval(() => {
-            info(`\r[${formatTimestampMillisec(Date.now())}] 任务已运行 ${formatTimeInMillisec((Date.now() - beginTime), "hh:mm:ss")} ${clear_line_end}`, "");
+            const elapsedTime = Date.now() - beginTime;
+            if (!estimateTime) {
+                info(`\r[${formatTimestampMillisec(Date.now())}] 任务已运行 ${formatTimeInMillisec(elapsedTime, "hh:mm:ss")} ${clear_line_end}`, "");
+            } else {
+                const estimateLeft = Math.max(0, estimateTime - elapsedTime);
+                info(`\r[${formatTimestampMillisec(Date.now())}] 任务已运行 ${formatTimeInMillisec(elapsedTime, "hh:mm:ss")}, 预计剩余 ${formatTimeInMillisec(estimateLeft, "hh:mm:ss")} ${clear_line_end}`, "");
+            }
         }, timerInterval);
     }
     let lastError = null;
@@ -98,7 +105,17 @@ async function MainProcess() {
     if (enableTimer) {
         clearInterval(timer);
         info("")
-        info(`>>> 任务总耗时 ${formatTimeInMillisec((Date.now() - beginTime))} <<<`, undefined, undefined, true);
+        const costTime = Date.now() - beginTime;
+        let timeLog = `任务总耗时 ${formatTimeInMillisec(costTime, "hh:mm:ss")}`;
+        if (estimateTime) {
+            const offsetTime = costTime - estimateTime;
+            if (offsetTime > 0) {
+                timeLog += `, 比预期慢了 ${formatTimeInMillisec(offsetTime, "hh:mm:ss")}`;
+            } else {
+                timeLog += `, 比预期快了 ${formatTimeInMillisec(-offsetTime, "hh:mm:ss")}`;
+            }
+        }
+        success(`>>> ${timeLog} <<<`, undefined, undefined, true);
     }
 
     let code = lastError ? (getLastErrorCode() || 1) : 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-automator",
-  "version": "1.4.9",
+  "version": "1.4.11",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {
@@ -41,6 +41,7 @@
     "log4js": "^6.3.0",
     "luaparse": "^0.3.1",
     "mail-watcher": "^0.6.1",
+    "mammoth": "^1.8.0",
     "markdown-table": "^2.0.0",
     "mysql": "^2.18.1",
     "node-localstorage": "^2.1.6",

package/utils/interaction_tool.js

@@ -83,7 +83,7 @@ async function pause(prompt = "", countdown) {
                 }
             }
         };
-        let timeout  = 0;
+        let timeout = 0;
         if (needCountDown) {
             timeout = setInterval(() => {
                 leftTime -= 1;
@@ -181,22 +181,22 @@ function showOptions(viewOptions, filteredViewOptions, selectedIndices, focusedI
     }, 0);
     clearLine();
     info(`当前选择: ${typeof selectedIndices === "number" ? (selectedIndices == -1 ? 0 : 1) : selectedIndices.length} / ${filteredViewOptions.length}`);
-    write(`${begIndex == 0 ? "" : "▲"['magenta'] }${clear_line_end}\n`);
+    write(`${begIndex == 0 ? "" : "▲"['magenta']}${clear_line_end}\n`);
     for (let i = 0; i < numPerPage; ++i) {
-    // for (let index = begIndex; index < begIndex + numShow; index++) {
+        // for (let index = begIndex; index < begIndex + numShow; index++) {
         let index = begIndex + i;
         let viewOption = filteredViewOptions[index];
         if (viewOption == undefined) {
             write(clear_line_end + "\n");
             continue;
         }
-        let viewOptionStr = `${alignStr(viewOption.key, maxKeyLength, {alignment: alignment})} - ${viewOption.value?.toString().replace(new RegExp(LINE_EXPRESSION, "g"), "")}`;
+        let viewOptionStr = `${alignStr(viewOption.showKey, maxKeyLength, { alignment: alignment })} - ${viewOption.value?.toString().replace(new RegExp(LINE_EXPRESSION, "g"), "")}`;
         let indicator;
         let optionColor;
         let selected = selectedIndices === index || selectedIndices instanceof Array && selectedIndices.includes(index);
         let focused = focusedIndex === index;
         let filtered = filteredViewOptions && filteredViewOptions.length != filteredViewOptions.length && filteredViewOptions.includes(viewOption);
-        indicator = focused ? `${indicator_char} ` [selectColor] : "  ";
+        indicator = focused ? `${indicator_char} `[selectColor] : "  ";
         if (selected) {
             optionColor = selectColor;
         } else if (filtered) {
@@ -215,7 +215,7 @@ function showOptions(viewOptions, filteredViewOptions, selectedIndices, focusedI
         write(`${indicator}${preview[optionColor]}`);
         write('\n');
     }
-    write(`${begIndex + numShow >= filteredViewOptions.length ? "" : "▼"['magenta'] }${clear_line_end}\n`);
+    write(`${begIndex + numShow >= filteredViewOptions.length ? "" : "▼"['magenta']}${clear_line_end}\n`);
 }
 
 module.exports = {

package/utils/request_tool.js

@@ -10,7 +10,7 @@ const { hash } = require('./hash_tool');
 async function doRequest(data) {
     const request = require("request");
     const request_progress = require("request-progress");
-    
+
     let url = data.src || data?.target?.url;
     let urlObj = new URL(url);
     /** 是否启用 http 缓存 */
@@ -112,7 +112,7 @@ async function doRequest(data) {
                                 resolve(res.headers);
                             } else {
                                 resolve(result);
-                            } 
+                            }
                         }
                     }
                 });
@@ -121,14 +121,16 @@ async function doRequest(data) {
                 });
                 request_progress(
                     req.on('progress', function (state) {
-                            sizeTotal = state.size.total;
+                        sizeTotal = state.size.total;
+                        if (!quiet) {
                             hasProgress = true;
-                            !quiet && progress(state.size.transferred, state.size.total, {
-                                desc: `请求中...(elapsed: ${transform_tool.formatTimeInSec(state.time.elapsed)}, speed: ${transform_tool.formatByteSize(state.speed)}/s, ETA: ${transform_tool.formatTimeInSec(state.time.remaining)})`,
-                                format_bytes: true,
-                                color: "cyan" 
-                            }, true);
                         }
+                        !quiet && progress(state.size.transferred, state.size.total, {
+                            desc: `请求中...(elapsed: ${transform_tool.formatTimeInSec(state.time.elapsed)}, speed: ${transform_tool.formatByteSize(state.speed)}/s, ETA: ${transform_tool.formatTimeInSec(state.time.remaining)})`,
+                            format_bytes: true,
+                            color: "cyan"
+                        }, true);
+                    }
                     )
                 );
             }

package/utils/selection_tool.js

@@ -14,6 +14,7 @@ async function select(content, data) {
   info("");
   // 支持数组以及普通对象
   let optionKeys = Object.keys(content);
+  const isContentArray = Array.isArray(content);
   // 过滤
   let keyFilterRegExp =
     data.key_filter_pattern && new RegExp(data.key_filter_pattern);
@@ -34,8 +35,10 @@ async function select(content, data) {
   const options = content;
   const viewOptions = optionKeys.map((optionKey, index) => {
     let optionValue = options[optionKey];
+    const showKey = isContentArray ? (+optionKey + 1) : optionKey;
     if (data.preview_handler) {
       return {
+        showKey,
         key: optionKey,
         value: eval_code(data.preview_handler)(
           optionValue,
@@ -45,16 +48,17 @@ async function select(content, data) {
       };
     }
     return {
+      showKey,
       key: optionKey,
       value: data.preview
         ? toArray(data.preview)
-            .map((k, i) =>
-              i == -1 ? `${k}:${optionValue[k]}` : optionValue[k]
-            )
-            .join(" | ")
+          .map((k, i) =>
+            i == -1 ? `${k}:${optionValue[k]}` : optionValue[k]
+          )
+          .join(" | ")
         : typeof optionValue === "object"
-        ? JSON.stringify(optionValue)
-        : optionValue,
+          ? JSON.stringify(optionValue)
+          : optionValue,
     };
   });
   let filteredViewOptions = viewOptions;
@@ -127,7 +131,7 @@ async function select(content, data) {
       warn(err);
     }
   }
-  let numPerPage = OPTION_PAGE_SIZE;
+  let numPerPage = data.OPTION_PAGE_SIZE || OPTION_PAGE_SIZE;
   function restrictFocusedIndex() {
     if (focusedIndex < 0) {
       focusedIndex = 0;
@@ -231,7 +235,7 @@ async function select(content, data) {
           );
           focusedIndex = viewOptions.indexOf(
             filteredViewOptions[
-              Math.min(filterIdx + 1, filteredViewOptions.length - 1)
+            Math.min(filterIdx + 1, filteredViewOptions.length - 1)
             ]
           );
           restrictFocusedIndex();
@@ -284,15 +288,15 @@ async function select(content, data) {
         filteredViewOptions = !inputParts
           ? viewOptions
           : viewOptions.filter((option, i) => {
-              let valueStr = JSON.stringify(option.value);
-              return inputParts.some((part) => {
-                return (
-                  part == i ||
-                  part == option.key ||
-                  valueStr.indexOf(part) != -1
-                );
-              });
+            let valueStr = JSON.stringify(option.value);
+            return inputParts.some((part) => {
+              return (
+                part == i ||
+                part == option.key ||
+                valueStr.indexOf(part) != -1
+              );
             });
+          });
         if (filteredViewOptions.length) {
           focusedIndex = viewOptions.indexOf(filteredViewOptions[0]);
         }
@@ -316,6 +320,7 @@ async function multiSelect(content, data) {
   info("");
   // 支持数组以及普通对象
   let optionKeys = Object.keys(content);
+  const isContentArray = Array.isArray(content);
   // 过滤
   let keyFilterRegExp =
     data.key_filter_pattern && new RegExp(data.key_filter_pattern);
@@ -336,8 +341,10 @@ async function multiSelect(content, data) {
   const options = content;
   const viewOptions = optionKeys.map((optionKey, index) => {
     let optionValue = options[optionKey];
+    const showKey = isContentArray ? (1 + optionKey) : optionKey;
     if (data.preview_handler) {
       return {
+        showKey,
         key: optionKey,
         value: eval_code(data.preview_handler)(
           optionValue,
@@ -347,16 +354,17 @@ async function multiSelect(content, data) {
       };
     }
     return {
+      showKey,
       key: optionKey,
       value: data.preview
         ? toArray(data.preview)
-            .map((k, i) =>
-              i == -1 ? `${k}:${optionValue[k]}` : optionValue[k]
-            )
-            .join(" | ")
+          .map((k, i) =>
+            i == -1 ? `${k}:${optionValue[k]}` : optionValue[k]
+          )
+          .join(" | ")
         : typeof optionValue === "object"
-        ? JSON.stringify(optionValue)
-        : optionValue,
+          ? JSON.stringify(optionValue)
+          : optionValue,
     };
   });
   let filteredViewOptions = viewOptions;
@@ -365,7 +373,7 @@ async function multiSelect(content, data) {
   let focusedIndex = 0;
   let confirmEmpty = false;
   let selectedIndices = [];
-  let numPerPage = OPTION_PAGE_SIZE;
+  let numPerPage = data.OPTION_PAGE_SIZE || OPTION_PAGE_SIZE;
   function restrictFocusedIndex() {
     if (focusedIndex < 0) {
       focusedIndex = 0;
@@ -476,7 +484,7 @@ async function multiSelect(content, data) {
           );
           focusedIndex = viewOptions.indexOf(
             filteredViewOptions[
-              Math.min(filterIdx + 1, filteredViewOptions.length - 1)
+            Math.min(filterIdx + 1, filteredViewOptions.length - 1)
             ]
           );
           restrictFocusedIndex();
@@ -557,15 +565,15 @@ async function multiSelect(content, data) {
         filteredViewOptions = !inputParts
           ? viewOptions
           : viewOptions.filter((option, i) => {
-              let valueStr = JSON.stringify(option.value);
-              return inputParts.some((part) => {
-                return (
-                  part == i ||
-                  part == option.key ||
-                  valueStr.indexOf(part) != -1
-                );
-              });
+            let valueStr = JSON.stringify(option.value);
+            return inputParts.some((part) => {
+              return (
+                part == i ||
+                part == option.key ||
+                valueStr.indexOf(part) != -1
+              );
             });
+          });
         if (inputStr && filteredViewOptions.length) {
           focusedIndex = viewOptions.indexOf(filteredViewOptions[0]);
         }

package/utils/shell_tool.js

@@ -64,6 +64,7 @@ async function exec_shell(data) {
         let results = [];
         let errors = [];
         let encoding = data.encoding || "cp936";
+        let raw_output = encoding == "raw";
         !quiet && whisper(`cmd:[${cmd}] cwd:${data.cwd} inputs:${data.inputs}`);
         options.stdio = ["pipe", capture_stdout ? "pipe" : process.stdout, "pipe"];
         const child = child_process.spawn(cmd[0], cmd.slice(1), options);
@@ -71,7 +72,7 @@ async function exec_shell(data) {
             child.stdout.on("data", (chunk) => {
                 results.push(chunk);
                 if (instant_stdout) {
-                    warn(iconv.decode(chunk, encoding));
+                    warn(!raw_output ? iconv.decode(chunk, encoding) : chunk.toString());
                 }
             });
         }
@@ -98,7 +99,7 @@ async function exec_shell(data) {
         // child.on('close', code => {
         child.on('exit', code => {
             if (!data.ignore_code && code != 0) {
-                let errMsg = iconv.decode(Buffer.concat(errors), encoding);
+                let errMsg = !raw_output ? iconv.decode(Buffer.concat(errors), encoding) : Buffer.concat(errors).toString();
                 let isAcceptableErrors = errMsg && acceptableErrors.some(err => {
                     return errMsg.indexOf(err) >= 0;
                 });
@@ -107,7 +108,7 @@ async function exec_shell(data) {
                 }
             }
             if (results.length) {
-                let result = iconv.decode(Buffer.concat(results), encoding);
+                let result = !raw_output ? iconv.decode(Buffer.concat(results), encoding) : Buffer.concat(results);
                 if (data.trim) {
                     result = result.trim();
                 }