node-automator 1.4.28 → 1.4.30

package/commands/compress.js

@@ -10,34 +10,52 @@ const Jimp = require("jimp");
 class CompressCommand extends BaseCommand {
     async execute() {
         const data = this.selfData;
-        const src = get_fst_file(data.src);
-        const dstFile = get_full_path(data.dst, "FILE");
-        fs.copyFileSync(src, dstFile);
-        const dstDir = _path.dirname(dstFile);
-        if (!fs.existsSync(dstDir)) {
-            fs.mkdirSync(dstDir, { recursive: true });
-        }
-        if (data.resize) {
-            const { w, h, scale } = data.resize;
-            const result = await Jimp.read(dstFile);
-            if (w && h) {
-                result.resize(w, h);
+        const options = { quality: 80, ...data.options };
+        if (data.mode === "sharp") {
+            const sharp = require("sharp");
+            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 fileContent = fs.readFileSync(src);
+            await sharp(fileContent)[format](options).toFile(dst);
+        } else {
+            const src = get_fst_file(data.src);
+            const dstFile = get_full_path(data.dst, "FILE");
+            fs.copyFileSync(src, dstFile);
+            const dstDir = _path.dirname(dstFile);
+            if (!fs.existsSync(dstDir)) {
+                fs.mkdirSync(dstDir, { recursive: true });
             }
-            if (scale) {
-                result.scale(scale);
+            if (data.resize) {
+                const { w, h, scale } = data.resize;
+                const result = await Jimp.read(dstFile);
+                if (w && h) {
+                    result.resize(w, h);
+                }
+                if (scale && scale != 1) {
+                    result.scale(scale);
+                }
+                await result.writeAsync(dstFile);
             }
-            await result.writeAsync(dstFile);
+            const quality = options?.quality || 80;
+            await imagemin([dstFile], {
+                destination: dstDir,
+                plugins: [
+                    imageminMozjpeg({ quality: quality }), // 压缩 JPG 图片
+                    imageminPngquant({
+                        quality: [quality / 100, quality / 100],
+                    }),
+                ],
+            });
         }
-        const quality = data.options?.quality || 80;
-        await imagemin([dstFile], {
-            destination: dstDir,
-            plugins: [
-                imageminMozjpeg({ quality: quality }), // 压缩 JPG 图片
-                imageminPngquant({
-                    quality: [quality / 100, quality / 100],
-                }),
-            ],
-        });
     }
 }
 

package/commands/mgr.js

@@ -137,6 +137,7 @@ const { MergeFileCommand } = require("./merge_file");
 const { ZipFolderCommand } = require("./zip_folder");
 const { EncryptCommand } = require('./encrypt');
 const { DecryptCommand } = require('./decrypt');
+const { TinifyCommand } = require('./tinify');
 
 const globalData = {
     executed_cfg: [], // 执行过的配置文件
@@ -525,6 +526,7 @@ function init() {
     register("zip_folder", ZipFolderCommand, false);
     register("encrypt", EncryptCommand, false);
     register("decrypt", DecryptCommand, false);
+    register("tinify", TinifyCommand, false);
 }
 
 module.exports = {

package/commands/tinify.js

@@ -0,0 +1,49 @@
+const { BaseCommand } = require("./base");
+const tinify = require("tinify");
+const Jimp = require("jimp");
+const { get_fst_file, get_full_path } = require('../utils/file_tool');
+const { dirname } = require('node:path');
+const fs = require('node:fs');
+
+class TinifyCommand extends BaseCommand {
+    async execute() {
+        const data = this.selfData;
+        tinify.key = data.api_key;
+        const src = get_fst_file(data.src);
+        const dstFile = get_full_path(data.dst, "FILE");
+        fs.copyFileSync(src, dstFile);
+        const dstDir = dirname(dstFile);
+        if (!fs.existsSync(dstDir)) {
+            fs.mkdirSync(dstDir, { recursive: true });
+        }
+        let tinifyData = tinify.fromFile(src);
+        if (data.resize) {
+            const { w, h, scale } = data.resize;
+            if (w && h) {
+                tinifyData = tinifyData.resize({
+                    method: "fit",
+                    width: w,
+                    height: h,
+                });
+            }
+            if (scale && scale != 1) {
+                const result = await Jimp.read(dstFile);
+                const width = result.getWidth();
+                tinifyData = tinifyData.scale({
+                    method: "scale",
+                    width: width * scale,
+                });
+            }
+        }
+        await tinifyData.toFile(dstFile);
+        const compressionCount = tinify.compressionCount;
+        return {
+            compressionCount,
+        };
+    }
+
+}
+
+module.exports = {
+    TinifyCommand,
+};

package/index.js

@@ -94,6 +94,7 @@ async function MainProcess() {
                 progress(elapsedTime, estimateTime, {
                     desc: "预计耗时",
                     format_time: true,
+                    color: _estimateLeft > 0 ? "reset" : "red",
                 });
             }
         }, timerInterval);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-automator",
-    "version": "1.4.28",
+    "version": "1.4.30",
     "description": "Execute automation with yaml configuration(compatible with json)",
     "main": "index.js",
     "repository": {
@@ -61,10 +61,12 @@
         "pinyin": "^4.0.0",
         "request": "^2.88.2",
         "request-progress": "^3.0.0",
+        "sharp": "^0.34.5",
         "split-file": "^2.3.0",
         "spreadsheet-column": "^1.1.1",
         "strip-json-comments": "^3.1.1",
         "temp": "^0.9.4",
+        "tinify": "^1.8.2",
         "typescript-plus": "^3.1.5",
         "websocket": "^1.0.34",
         "xlsx": "^0.17.0",

package/utils/shell_tool.js

@@ -25,6 +25,7 @@ async function exec_shell(data) {
     const instant_stdout = data.instant_stdout;
     const capture_stdout = isStdOut() || data.capture_stdout;
     const acceptableErrors = data.acceptableErrors || [];
+    const acceptableCodes = data.acceptableCodes || [0];
     const quiet = !data.verbose;
     const result = await new Promise((resolve, _reject) => {
         /** @type {string[]} */
@@ -100,7 +101,7 @@ async function exec_shell(data) {
         });
         // child.on('close', code => {
         child.on("exit", (code) => {
-            if (!data.ignore_code && code !== 0) {
+            if (!data.ignore_code && !acceptableCodes.includes(code)) {
                 const errMsg = !raw_output
                     ? iconv.decode(Buffer.concat(errors), encoding)
                     : Buffer.concat(errors).toString();