node-automator 1.4.26 → 1.4.27

package/commands/backup.js

@@ -8,7 +8,8 @@ const { parse, stringify, processRename } = require("../utils/file_tool");
 
 class BackupCommand extends BaseCommand {
     async execute() {
-        const { sourceFolder, backupFolder, backupCfgs, quiet } = this.selfData;
+        const { sourceFolder, backupFolder, backupCfgs, verbose } =
+            this.selfData;
 
         async function backup(bakCfg, filename) {
             const {
@@ -106,7 +107,7 @@ class BackupCommand extends BaseCommand {
                     if (bakCfg) {
                         backup(bakCfg, filename)
                             .then(() => {
-                                !(quiet || bakCfg.quiet) &&
+                                (verbose || bakCfg.verbose) &&
                                     success(`${filename} 备份成功`);
                             })
                             .catch((err) => {

package/commands/compress.js

@@ -1,25 +1,39 @@
 const _path = require("node:path");
+const fs = require("node:fs");
 const { get_fst_file, get_full_path, move } = require("../utils/file_tool");
 const { BaseCommand } = require("./base");
-const { readFileSync } = require("node:fs");
+const { default: imagemin } = require('imagemin');
+const { default: imageminPngquant } = require('imagemin-pngquant');
+const { default: imageminMozjpeg } = require('imagemin-mozjpeg');
 
 class CompressCommand extends BaseCommand {
     async execute() {
-        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();
+        const dstFile = get_full_path(data.dst, "FILE");
+        const dstDir = _path.dirname(dstFile);
+        const dstName = _path.basename(dstFile);
+        const tmpFolder = _path.join(this.shareData.AUTOMATOR_SCRATCH, "comporess");
+        if (!fs.existsSync(tmpFolder)) {
+            fs.mkdirSync(tmpFolder, { recursive: true });
         }
-        format = format.toLowerCase();
-        if (format === "jpg") {
-            format = "jpeg";
-        }
-        const options = data.options;
-        const fileContent = readFileSync(src);
-        await sharp(fileContent)[format](options).toFile(dst);
+        const quality = data.options?.quality || 80;
+        await imagemin([src], {
+            destination: tmpFolder,
+            plugins: [
+                imageminMozjpeg({ quality: quality }), // 压缩 JPG 图片
+                imageminPngquant({
+                    quality: [0.6, quality / 100],
+                })
+            ]
+        });
+        const compressedFile = _path.join(tmpFolder, _path.basename(src));
+        fs.copyFileSync(compressedFile, _path.join(dstDir, dstName));
+        fs.unlinkSync(compressedFile);
+        // const sharp = require("sharp");
+        // const options = data.options;
+        // const fileContent = readFileSync(src);
+        // await sharp(fileContent)[format](options).toFile(dst);
     }
 }
 

package/commands/loop.js

@@ -67,7 +67,8 @@ class LoopCommand extends BaseCommand {
                 if (typeof data.tip_key === "boolean") {
                     tip = `[${loop_data}]`;
                 } else {
-                    tip = `[${this.getDataByKey(data.tip_key)}]`;
+                    const tipKeys = _transform_tool.toArray(data.tip_key);
+                    tip = `[${tipKeys.map(key => this.getDataByKey(key)).join("/")}]`;
                 }
             }
             if (show_progress) {

package/commands/watch_mail.js

@@ -70,7 +70,7 @@ class WatchMailCommand extends BaseCommand {
                         } else {
                             this.shareData.mail_data = mailData;
                         }
-                        if (!data.quiet) {
+                        if (data.verbose) {
                             success("");
                             success(getPrint(mailData));
                         }

package/commands/web_socket.js

@@ -37,7 +37,7 @@ class WebSocketCommand extends BaseCommand {
         let receivedUTF8Total = 0;
         let receivedIndex = 0;
         const timeout = this.selfData.timeout || 0;
-        const quiet = this.selfData.quiet || false;
+        const quiet = !this.selfData.verbose || true;
         const _endianSuffix = little_endian ? "LE" : "BE";
 
         let rl;

package/commands/zip.js

@@ -42,20 +42,22 @@ class ZipCommand extends BaseCommand {
             let entryName = path.join(zipPath, path.basename(file));
             entryName = processRename(entryName, data.options?.rename);
             const show_src = entryName;
-            progress(index, files.length, {
-                desc: `Add ${show_src}`,
-                depth: 0,
-                align: true,
-            });
+            data.verbose &&
+                progress(index, files.length, {
+                    desc: `Add ${show_src}`,
+                    depth: 0,
+                    align: true,
+                });
             // zip.addLocalFile(file, zipPath);
             zip.addFile(entryName, fs.readFileSync(file));
         }
         clearLine();
-        progress(files.length, files.length, {
-            desc: `压缩中...`,
-            depth: 0,
-            align: true,
-        });
+        data.verbose &&
+            progress(files.length, files.length, {
+                desc: `压缩中...`,
+                depth: 0,
+                align: true,
+            });
         // or write everything to disk
         if (data.dst) {
             const dst = get_full_path(data.dst);
@@ -71,12 +73,13 @@ class ZipCommand extends BaseCommand {
             const buffer = zip.toBuffer();
             return buffer;
         }
-        progress(files.length, files.length, {
-            desc: `压缩完成!`,
-            depth: 0,
-            color: "green",
-        });
-        info("");
+        data.verbose &&
+            progress(files.length, files.length, {
+                desc: `压缩完成!`,
+                depth: 0,
+                color: "green",
+            });
+        data.verbose && info("");
     }
 }
 

package/commands/zip_folder.js

@@ -30,11 +30,12 @@ class ZipFolderCommand extends BaseCommand {
             if (!isAccept(filename)) {
                 return false;
             }
-            progress(i++, 0, {
-                desc: `${filename}`,
-                depth: 0,
-                align: true,
-            });
+            data.verbose &&
+                progress(i++, 0, {
+                    desc: `${filename}`,
+                    depth: 0,
+                    align: true,
+                });
             return true;
         });
         // or write everything to disk

package/index.js

@@ -120,7 +120,8 @@ async function MainProcess() {
     } catch (err) {
         lastError = err.message || err;
     }
-    const costTime = Date.now() - beginTime;
+    const endTime = shareData.AUTOMATOR_END_TIME || Date.now();
+    const costTime = endTime - beginTime;
     if (enableTimer) {
         clearInterval(timer);
         info("");
@@ -161,28 +162,25 @@ async function MainProcess() {
                 lastError,
         );
     }
-    if (!shareData.QUIET_MODE) {
-        // 非代码启动，需要暂停
-        if (shareData.ALERT_RESULT) {
-            const title = `${shareData.TITLE || "任务即将结束"}`;
-            await showAlert(
-                hasError ? "error" : "info",
-                hasError ? `✖ 失败, ${lastError}` : "✔ 成功!",
-                title,
-            );
-        } else {
-            const successIcon =
-                shareData.SUCCESS_ICON ||
-                `${shareData.AUTOMATOR_ROOT}/assets/success.png`;
-            const errorIcon =
-                shareData.ERROR_ICON ||
-                `${shareData.AUTOMATOR_ROOT}/assets/error.png`;
-            await showNotify({
-                title: `${shareData.TITLE || cfgs}`,
-                message: hasError ? lastError : `任务即将结束`,
-                icon: hasError ? errorIcon : successIcon,
-            });
-        }
+    if (shareData.ALERT_RESULT) {
+        const title = `${shareData.TITLE || "任务即将结束"}`;
+        await showAlert(
+            hasError ? "error" : "info",
+            hasError ? `✖ 失败, ${lastError}` : "✔ 成功!",
+            title,
+        );
+    } else if (shareData.NOTIFY_RESULT) {
+        const successIcon =
+            shareData.SUCCESS_ICON ||
+            `${shareData.AUTOMATOR_ROOT}/assets/success.png`;
+        const errorIcon =
+            shareData.ERROR_ICON ||
+            `${shareData.AUTOMATOR_ROOT}/assets/error.png`;
+        await showNotify({
+            title: `${shareData.TITLE || cfgs}`,
+            message: hasError ? lastError : `任务即将结束`,
+            icon: hasError ? errorIcon : successIcon,
+        });
     }
     // 手动调用 exit, 会导致异步的定时器事件失效
     if (shareData.EXIT_IMMEDIATELY) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-automator",
-    "version": "1.4.26",
+    "version": "1.4.27",
     "description": "Execute automation with yaml configuration(compatible with json)",
     "main": "index.js",
     "repository": {
@@ -39,6 +39,9 @@
         "html-to-text": "^8.2.0",
         "iconv-lite": "^0.6.2",
         "image-size": "^1.0.0",
+        "imagemin": "^9.0.1",
+        "imagemin-mozjpeg": "^10.0.0",
+        "imagemin-pngquant": "^10.0.0",
         "javascript-obfuscator": "^4.1.1",
         "jimp": "^0.22.12",
         "json-stable-stringify": "^1.0.1",
@@ -58,7 +61,6 @@
         "pinyin": "^4.0.0",
         "request": "^2.88.2",
         "request-progress": "^3.0.0",
-        "sharp": "^0.34.3",
         "split-file": "^2.3.0",
         "spreadsheet-column": "^1.1.1",
         "strip-json-comments": "^3.1.1",

package/utils/file_tool.js

@@ -283,8 +283,8 @@ async function copy(src, dst, base, options) {
         options,
     );
     const filesize = get_files_size(srcs);
-    !options.quiet && info("");
-    !options.quiet &&
+    options.verbose && info("");
+    options.verbose &&
         whisper(
             `复制 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} ${options.overwrite ? "[覆盖现有文件]" : "[不覆盖现有文件]"} 到 ${dsts} options: ${JSON.stringify(options)}`,
             undefined,
@@ -299,7 +299,7 @@ async function copy(src, dst, base, options) {
             ++dir_num;
             continue;
         }
-        !options.quiet &&
+        options.verbose &&
             display_tool.progress(srcIndex + 1, srcs.length, {
                 desc: `Copy ${show_src}`,
                 depth: 0,
@@ -344,8 +344,8 @@ async function copy(src, dst, base, options) {
         }
     }
 
-    !options.quiet && info("");
-    !options.quiet &&
+    options.verbose && info("");
+    options.verbose &&
         whisper(
             `复制完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`,
             undefined,
@@ -369,8 +369,8 @@ async function move(src, dst, base, options) {
         options,
     );
     const filesize = get_files_size(srcs);
-    !options.quiet && info("");
-    !options.quiet &&
+    options.verbose && info("");
+    options.verbose &&
         whisper(
             `移动 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} ${options.overwrite ? "[覆盖现有文件]" : "[不覆盖现有文件]"} 到 ${dsts} options: ${JSON.stringify(options)}`,
             undefined,
@@ -385,7 +385,7 @@ async function move(src, dst, base, options) {
             ++dir_num;
             continue;
         }
-        !options.quiet &&
+        options.verbose &&
             display_tool.progress(srcIndex + 1, srcs.length, {
                 desc: `Move ${show_src}`,
                 depth: 0,
@@ -432,8 +432,8 @@ async function move(src, dst, base, options) {
         fs.unlinkSync(src);
     }
 
-    !options.quiet && info("");
-    !options.quiet &&
+    options.verbose && info("");
+    options.verbose &&
         whisper(
             `移动完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`,
             undefined,
@@ -457,8 +457,8 @@ async function move_local(src, dst, base, options) {
         options,
     );
     const filesize = get_files_size(srcs);
-    !options.quiet && info("");
-    !options.quiet &&
+    options.verbose && info("");
+    options.verbose &&
         whisper(
             `移动 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} ${options.overwrite ? "[覆盖现有文件]" : "[不覆盖现有文件]"} 到 ${dsts} options: ${JSON.stringify(options)}`,
             undefined,
@@ -472,7 +472,7 @@ async function move_local(src, dst, base, options) {
         if (fs.lstatSync(src).isDirectory()) {
             ++dir_num;
         }
-        !options.quiet &&
+        options.verbose &&
             display_tool.progress(srcIndex + 1, srcs.length, {
                 desc: `Rename ${show_src}`,
                 depth: 0,
@@ -517,8 +517,8 @@ async function move_local(src, dst, base, options) {
         }
     }
 
-    !options.quiet && info("");
-    !options.quiet &&
+    options.verbose && info("");
+    options.verbose &&
         whisper(
             `移动完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`,
             undefined,
@@ -530,8 +530,8 @@ async function remove(src, options) {
     srcs = get_file_list(src);
     options = Object.assign({ recursive: true }, options);
     const filesize = get_files_size(srcs);
-    !options.quiet && info("");
-    !options.quiet &&
+    options.verbose && info("");
+    options.verbose &&
         whisper(
             `删除 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} options: ${JSON.stringify(options)}`,
             undefined,
@@ -543,7 +543,7 @@ async function remove(src, options) {
         const src = srcs[srcIndex];
         const show_src = src;
         try {
-            display_tool.progress(srcIndex + 1, srcs.length, {
+            options.verbose && display_tool.progress(srcIndex + 1, srcs.length, {
                 desc: `Remove ${show_src}`,
                 depth: 0,
                 color: "cyan",
@@ -565,8 +565,8 @@ async function remove(src, options) {
         }
     }
 
-    !options.quiet && info("");
-    !options.quiet &&
+    options.verbose && info("");
+    options.verbose &&
         whisper(
             `删除完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`,
             undefined,

package/utils/request_tool.js

@@ -41,7 +41,7 @@ async function doRequest(data) {
     }
     let result;
     const useCache = enable_http_cache && http_cache;
-    const quiet = data.quiet;
+    const quiet = !data.verbose;
     !quiet && info(`[${options.method}] ${url}${useCache ? "[缓存]" : ""}`);
     let hasProgress = false;
     const fileDst = get_full_path(

package/utils/selection_tool.js

@@ -338,7 +338,7 @@ async function select(content, data) {
             onKeyPress(undefined, { name: "return" });
         }
     });
-    !data.quiet && success(`已选择:${getPrint(selectedOption, true)}`);
+    data.verbose && success(`已选择:${getPrint(selectedOption, true)}`);
     return selectedOption;
 }
 
@@ -628,7 +628,7 @@ async function multiSelect(content, data) {
             onKeyPress(undefined, { name: "return" });
         }
     });
-    !data.quiet && success(`已选择:${getPrint(selectedOptions, true)}`);
+    data.verbose && success(`已选择:${getPrint(selectedOptions, true)}`);
     return selectedOptions;
 }
 

package/utils/shell_tool.js

@@ -25,7 +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 quiet = data.quiet;
+    const quiet = !data.verbose;
     const result = await new Promise((resolve, _reject) => {
         /** @type {string[]} */
         let cmd = data.cmd;
@@ -59,7 +59,7 @@ async function exec_shell(data) {
         const errors = [];
         const encoding = data.encoding || "cp936";
         const raw_output = encoding === "raw";
-        !quiet && whisper(`cmd:[${cmd}] cwd:${data.cwd} inputs:${data.inputs}`);
+        !quiet && info(`cmd:[${cmd}] cwd:${data.cwd} inputs:${data.inputs}`);
         options.stdio = [
             "pipe",
             capture_stdout ? "pipe" : process.stdout,