node-automator 1.4.4 → 1.4.6

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

@@ -1,24 +1,17 @@
 const { get_fst_file, get_full_path } = require('../utils/file_tool');
 const { log, getPrint } = require('../utils/log_tool');
 const { BaseCommand } = require("./base");
-const sharp = require("sharp");
+const Jimp = require("jimp");
 
 class CompressCommand extends BaseCommand {
     async execute() {
         const data = this.selfData;
         const src = get_fst_file(data.src);
         const dst = get_full_path(data.dst, "FILE");
-        let format = data.format;
-        if (!format) {
-            format = dst.split(".").pop();
-        }
-        format = format.toLowerCase();
-        if (format === "jpg") {
-            format = "jpeg";
-        }
-        const options = data.options;
-        await sharp(src)[format](options)
-        .toFile(dst);
+        const options = data.options || {};
+        let image = await Jimp.read(src);
+        image.quality(options.quality || 80);
+        await image.writeAsync(dst);
     }
 }
 

package/commands/image_crop.js

@@ -1,19 +1,16 @@
 const { get_fst_file, get_full_path } = require('../utils/file_tool');
 const { BaseCommand } = require("./base");
-const sharp = require("sharp");
+const Jimp = require("jimp");
 
 class ImageCropCommand extends BaseCommand {
     async execute() {
         const data = this.selfData;
         const src = get_fst_file(data.src);
+        const image = await Jimp.read(src);
         const {x, y, w, h} = data.region;
-        const dst = get_full_path(data.dst, "FILE");
-        await sharp(src).extract({
-            left: x,
-            top: y,
-            width: w,
-            height: h,
-        }).toFile(dst);
+        const croped = image.crop(x, y, w, h);
+        const dst = get_full_path(data.dst);
+        await croped.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-automator",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {
@@ -34,12 +34,14 @@
     "html-to-text": "^8.2.0",
     "iconv-lite": "^0.6.2",
     "image-size": "^1.0.0",
+    "jimp": "^0.22.12",
     "json-stable-stringify": "^1.0.1",
     "jwt-js": "^0.5.0",
     "keypress": "^0.2.1",
     "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",
@@ -49,7 +51,6 @@
     "persist-path": "^1.0.2",
     "request": "^2.88.2",
     "request-progress": "^3.0.0",
-    "sharp": "^0.33.5",
     "spreadsheet-column": "^1.1.1",
     "strip-json-comments": "^3.1.1",
     "temp": "^0.9.4",

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();
                 }