node-automator 1.4.2 → 1.4.4

package/commands/compress.js

@@ -0,0 +1,27 @@
+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");
+
+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);
+    }
+}
+
+module.exports = {
+    CompressCommand,
+};

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, setLastExecFile } = require("../utils/log_tool");
+const { whisper, info, warn, success, vital, setLastExecFile, getLastError } = require("../utils/log_tool");
 const { parse } = require('../utils/parse_tool');
 const { doRequest } = require('../utils/request_tool');
 const { toArray } = require("../utils/transform_tool");
@@ -8,7 +8,6 @@ const { BaseCommand } = require("./base");
 class ExecFromFileCommand extends BaseCommand {
     async execute() {
         let data = this.selfData;
-        let content = this.content;
         let srcs = toArray(data.src);
         for (let i = 0; i < srcs.length; i++) {
             let src = srcs[i];
@@ -28,7 +27,11 @@ class ExecFromFileCommand extends BaseCommand {
             setLastExecFile(src);
             let cfg;
             if (isRemote) {
-                cfg = await parse(await doRequest({src, quiet: true}), "yml");
+                let content = await doRequest({src, quiet: true});
+                if (getLastError()) {
+                    return;
+                }
+                cfg = await parse(content, "yml");
             } else {
                 cfg = await read_cfg(src, data.type);
             }

package/commands/image_crop.js

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

package/commands/mgr.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-automator",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {
@@ -34,7 +34,6 @@
     "html-to-text": "^8.2.0",
     "iconv-lite": "^0.6.2",
     "image-size": "^1.0.0",
-    "jimp": "^0.22.10",
     "json-stable-stringify": "^1.0.1",
     "jwt-js": "^0.5.0",
     "keypress": "^0.2.1",
@@ -50,6 +49,7 @@
     "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",