node-automator 1.4.30 → 1.4.32

package/biome.json

@@ -1,63 +1,64 @@
 {
-    "$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
-    "vcs": {
-        "enabled": false,
-        "clientKind": "git",
-        "useIgnoreFile": false
-    },
-    "files": {
-        "ignoreUnknown": false
-    },
-    "formatter": {
-        "enabled": true,
-        "indentStyle": "space",
-        "indentWidth": 4
-    },
-    "linter": {
-        "enabled": true,
-        "rules": {
-            "recommended": true,
-            "complexity": {
-                "noStaticOnlyClass": "off"
-            },
-            "suspicious": {
-                "noDuplicateClassMembers": "warn",
-                "useIterableCallbackReturn": "warn",
-                "noCompareNegZero": "warn",
-                "noDuplicateElseIf": "warn",
-                "noSelfCompare": "warn",
-                "noFallthroughSwitchClause": "warn",
-                "noDebugger": "warn",
-                "noShadowRestrictedNames": "warn",
-                "noImplicitAnyLet": "warn",
-                "noAssignInExpressions": "warn",
-                "noEmptyInterface": "off",
-                "noDuplicateObjectKeys": "warn",
-                "noDoubleEquals": "warn",
-                "noRedeclare": "warn"
-            },
-            "correctness": {
-                "noPrecisionLoss": "warn",
-                "noSwitchDeclarations": "warn",
-                "noConstantCondition": "warn",
-                "noUnreachable": "warn",
-                "noInvalidUseBeforeDeclaration": "warn",
-                "noInnerDeclarations": "warn",
-                "noSelfAssign": "warn"
-            }
-        }
-    },
-    "javascript": {
-        "formatter": {
-            "quoteStyle": "double"
-        }
-    },
-    "assist": {
-        "enabled": true,
-        "actions": {
-            "source": {
-                "organizeImports": "on"
-            }
-        }
-    }
+	"$schema": "https://gitee.com/TsubasaYeung/public_resource/raw/master/schemas/biome/2.2.4/schema.json",
+	"vcs": {
+		"enabled": false,
+		"clientKind": "git",
+		"useIgnoreFile": false
+	},
+	"files": {
+		"ignoreUnknown": false
+	},
+	"formatter": {
+		"enabled": true,
+		"indentStyle": "space",
+		"indentWidth": 4
+	},
+	"linter": {
+		"enabled": true,
+		"rules": {
+			"recommended": true,
+			"complexity": {
+				"noStaticOnlyClass": "off"
+			},
+			"suspicious": {
+				"noPrototypeBuiltins": "off",
+				"noDuplicateClassMembers": "warn",
+				"useIterableCallbackReturn": "warn",
+				"noCompareNegZero": "warn",
+				"noDuplicateElseIf": "warn",
+				"noSelfCompare": "warn",
+				"noFallthroughSwitchClause": "warn",
+				"noDebugger": "warn",
+				"noShadowRestrictedNames": "warn",
+				"noImplicitAnyLet": "warn",
+				"noAssignInExpressions": "warn",
+				"noEmptyInterface": "off",
+				"noDuplicateObjectKeys": "warn",
+				"noDoubleEquals": "warn",
+				"noRedeclare": "warn"
+			},
+			"correctness": {
+				"noPrecisionLoss": "warn",
+				"noSwitchDeclarations": "warn",
+				"noConstantCondition": "warn",
+				"noUnreachable": "warn",
+				"noInvalidUseBeforeDeclaration": "warn",
+				"noInnerDeclarations": "warn",
+				"noSelfAssign": "warn"
+			}
+		}
+	},
+	"javascript": {
+		"formatter": {
+			"quoteStyle": "double"
+		}
+	},
+	"assist": {
+		"enabled": true,
+		"actions": {
+			"source": {
+				"organizeImports": "on"
+			}
+		}
+	}
 }

package/commands/ali_oss.js

@@ -1,13 +1,12 @@
 const {
     get_file_list,
-    get_full_path,
-    format_bytes,
 } = require("../utils/file_tool");
-const { success, getPrint, info, warn, whisper } = require("../utils/log_tool");
+const { get_full_path } = require('../utils/transform_tool');
+const { info, warn, whisper } = require("../utils/log_tool");
 const { BaseCommand } = require("./base");
 const path = require("node:path");
 const { progress } = require("../utils/display_tool");
-const { createWriteStream, readFileSync } = require("node:fs");
+const { readFileSync } = require("node:fs");
 const { getCache, setCache } = require("../utils/cache_tool");
 const crypto = require("node:crypto");
 const { queueAsync } = require("../utils/func_tool");
@@ -138,12 +137,12 @@ class AliOssCommand extends BaseCommand {
                                 srcs = srcs.filter((src) => {
                                     const cachedValue =
                                         cachedFiles[
-                                            path
-                                                .join(
-                                                    dst_folder,
-                                                    path.relative(base, src),
-                                                )
-                                                .replace(/\\/g, "/")
+                                        path
+                                            .join(
+                                                dst_folder,
+                                                path.relative(base, src),
+                                            )
+                                            .replace(/\\/g, "/")
                                         ];
                                     switch (strategy) {
                                         case "lazy": {

package/commands/backup.js

@@ -5,9 +5,10 @@ const fs = require("node:fs");
 const path = require("node:path");
 const { success, error, warn } = require("../utils/log_tool");
 const { parse, stringify, processRename } = require("../utils/file_tool");
-const { eval_code, get_full_path } = require("./share_data");
+const { eval_code } = require("./share_data");
 const { formatByteSize } = require("../utils/transform_tool");
 const { debounce, throttle } = require("../utils/func_tool");
+const { get_full_path } = require('../utils/transform_tool');
 
 class BackupCommand extends BaseCommand {
     async execute() {
@@ -42,10 +43,10 @@ class BackupCommand extends BaseCommand {
             );
             const backName = backupFilenameGenerator
                 ? eval_code(backupFilenameGenerator)({
-                      filepath,
-                      fileSize,
-                      fileSizeFormatted,
-                  })
+                    filepath,
+                    fileSize,
+                    fileSizeFormatted,
+                })
                 : backupFilename || filename;
             let backupPath = path.join(backupFolder, backName);
             let backupData;

package/commands/base.js

@@ -5,7 +5,8 @@ const {
     flatten,
     removeDuplicate,
 } = require("../utils/transform_tool");
-const { parse, get_full_path, write_with_type } = require("../utils/file_tool");
+const { parse, write_with_type } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 
 const { eval_code } = require("./share_data");
 
@@ -33,7 +34,7 @@ class BaseCommand {
         return true;
     }
 
-    async didExecute() {}
+    async didExecute() { }
 
     async checkValid(commandCfg) {
         const conditionCode = commandCfg.when;
@@ -324,7 +325,7 @@ class BaseCommand {
         return ret;
     }
 
-    async execute() {}
+    async execute() { }
 
     /**
      * 转交给另外一个类型的命令处理
@@ -349,6 +350,10 @@ class BaseCommand {
         return false;
     }
 
+    getRequireContentOptions() {
+        return {};
+    }
+
     getDataByKey() {
         return getDataByKey.apply(this, arguments);
     }

package/commands/border.js

@@ -0,0 +1,179 @@
+const { get_fst_file } = require("../utils/file_tool");
+const { BaseCommand } = require("./base");
+const sharp = require("sharp");
+const { eval_code } = require("./share_data");
+
+class BorderCommand extends BaseCommand {
+    async execute() {
+        const selfData = this.selfData;
+        const defaultBorderChecker = (pixel) => {
+            return true;
+        };
+        const {
+            src,
+            borderChecker: borderCheckerStr,
+            tolerance = 0,
+        } = selfData;
+        const borderChecker = borderCheckerStr
+            ? eval_code(borderCheckerStr)
+            : defaultBorderChecker;
+        const inputPath = get_fst_file(src);
+
+        // 读取图片并获取原始信息
+        const image = sharp(inputPath);
+        // 确保图片有alpha通道
+        const processedImage = image.ensureAlpha();
+        const { data, info } = await processedImage
+            .raw()
+            .toBuffer({ resolveWithObject: true });
+
+        // 检测裁剪边界
+        const bounds = this.detectTrimBounds(
+            data,
+            info.width,
+            info.height,
+            4,
+            // info.channels,
+            borderChecker,
+            tolerance,
+        );
+        return {
+            x: bounds.left,
+            y: bounds.top,
+            w: bounds.width,
+            h: bounds.height,
+        };
+    }
+
+    /**
+     * 检查两个颜色是否在容差范围内匹配
+     * @param {Array<number>} color1 颜色1
+     * @param {Array<number>} color2 颜色2
+     * @returns {boolean} 是否匹配
+     */
+    isColorMatch(color1, color2, tolerance) {
+        if (color1[3] <= tolerance && color2[3] <= tolerance) {
+            return true;
+        }
+        for (let i = 0; i < 3; i++) {
+            if (Math.abs(color1[i] - color2[i]) > tolerance) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    detectTrimBounds(
+        pixelData,
+        width,
+        height,
+        channels,
+        borderChecker,
+        tolerance,
+    ) {
+        let left = 0;
+        let right = width - 1;
+        let top = 0;
+        let bottom = height - 1;
+
+        // 提取像素检查逻辑
+        const checkPixel = (x, y, refPixel) => {
+            const idx = (y * width + x) * channels;
+            const pixel = [
+                pixelData[idx],
+                pixelData[idx + 1],
+                pixelData[idx + 2],
+                channels === 4 ? pixelData[idx + 3] : 255,
+            ];
+
+            if (!borderChecker(pixel)) {
+                return { hasContent: true, pixel };
+            }
+
+            if (refPixel && !this.isColorMatch(refPixel, pixel, tolerance)) {
+                return { hasContent: true, pixel };
+            }
+
+            return { hasContent: false, pixel };
+        };
+
+        // 检测左边框
+        left = this.detectBoundary({
+            width, height,
+            startX: 0, startY: 0,
+            xIncrement: 1, yIncrement: 1,
+            isVertical: true,
+            checkPixel
+        });
+
+        // 检测右边框
+        right = this.detectBoundary({
+            width, height,
+            startX: width - 1, startY: 0,
+            xIncrement: -1, yIncrement: 1,
+            isVertical: true,
+            checkPixel
+        });
+
+        // 检测上边框
+        top = this.detectBoundary({
+            width, height,
+            startX: 0, startY: 0,
+            xIncrement: 1, yIncrement: 1,
+            isVertical: false,
+            checkPixel
+        });
+
+        // 检测下边框
+        bottom = this.detectBoundary({
+            width, height,
+            startX: 0, startY: height - 1,
+            xIncrement: 1, yIncrement: -1,
+            isVertical: false,
+            checkPixel
+        });
+
+        return {
+            left,
+            top,
+            width: right - left + 1,
+            height: bottom - top + 1,
+        };
+    }
+
+    // 单独提取的检测函数
+    detectBoundary({ width, height, startX, startY, xIncrement, yIncrement, isVertical, checkPixel }) {
+        let refPixel = null;
+        const maxX = isVertical ? width : height;
+        const maxY = isVertical ? height : width;
+
+        for (let i = 0; i < maxX; i++) {
+            let hasContent = false;
+
+            for (let j = 0; j < maxY; j++) {
+                const x = isVertical ? startX + xIncrement * i : j;
+                const y = isVertical ? j : startY + yIncrement * i;
+
+                const result = checkPixel(x, y, refPixel);
+                if (result.hasContent) {
+                    hasContent = true;
+                    break;
+                }
+
+                if (refPixel == null) {
+                    refPixel = result.pixel;
+                }
+            }
+
+            if (hasContent) {
+                return isVertical ? startX + xIncrement * i : startY + yIncrement * i;
+            }
+        }
+
+        return isVertical ? startX + xIncrement * (maxX - 1) : startY + yIncrement * (maxY - 1);
+    }
+}
+
+module.exports = {
+    BorderCommand,
+};

package/commands/compress.js

@@ -1,16 +1,21 @@
 const _path = require("node:path");
 const fs = require("node:fs");
-const { get_fst_file, get_full_path, move } = require("../utils/file_tool");
+const { get_fst_file } = require("../utils/file_tool");
 const { BaseCommand } = require("./base");
 const { default: imagemin } = require("imagemin");
 const { default: imageminPngquant } = require("imagemin-pngquant");
 const { default: imageminMozjpeg } = require("imagemin-mozjpeg");
 const Jimp = require("jimp");
+const { get_full_path, format_bytes } = require('../utils/transform_tool');
 
 class CompressCommand extends BaseCommand {
     async execute() {
         const data = this.selfData;
         const options = { quality: 80, ...data.options };
+        // 获取压缩前的文件大小
+        const src = get_fst_file(data.src);
+        const srcStat = fs.statSync(src);
+        const srcSize = srcStat.size;
         if (data.mode === "sharp") {
             const sharp = require("sharp");
             const data = this.selfData;
@@ -25,7 +30,11 @@ class CompressCommand extends BaseCommand {
                 format = "jpeg";
             }
             const fileContent = fs.readFileSync(src);
-            await sharp(fileContent)[format](options).toFile(dst);
+            let tmp = await sharp(fileContent)[format](options);
+            if (data.trim) {
+                tmp = tmp.trim();
+            }
+            await tmp.toFile(dst);
         } else {
             const src = get_fst_file(data.src);
             const dstFile = get_full_path(data.dst, "FILE");
@@ -56,6 +65,25 @@ class CompressCommand extends BaseCommand {
                 ],
             });
         }
+        const dst = get_full_path(data.dst, "FILE");
+        const dstStat = fs.statSync(dst);
+        const dstSize = dstStat.size;
+        const sizeChanged = dstSize - srcSize;
+        const srcSizeFormated = format_bytes(srcSize);
+        const dstSizeFormated = format_bytes(dstSize);
+        const sizeRatioChanged = (1 - dstSize / srcSize);
+        const sizeRatioChangedFormated = `${(sizeRatioChanged * 100 * -1).toFixed(2)}%`;
+        const sizeChangedFormated = format_bytes(sizeChanged);
+        return {
+            srcSize,
+            srcSizeFormated,
+            dstSize,
+            dstSizeFormated,
+            sizeRatioChanged,
+            sizeRatioChangedFormated,
+            sizeChanged,
+            sizeChangedFormated,
+        }
     }
 }
 

package/commands/decrypt.js

@@ -1,15 +1,18 @@
+const { readFileSync } = require('node:fs');
 const { BaseCommand } = require("./base");
 const crypto = require('node:crypto');
+const { get_fst_file } = require('../utils/file_tool');
 
 class DecryptCommand extends BaseCommand {
     async execute() {
+        const data = this.selfData;
         const content = this.content;
-        const { password, salt, algorithm = 'aes-256-cbc', keylen = 32 } = this.selfData;
-        const key = crypto.scryptSync(password, salt, keylen);
-        // 从 Buffer 中提取 IV（前 16 字节）和密文
-        const iv = content.slice(0, 16);
+        const { password, algorithm = 'aes-256-cbc', keyLen = 32, ivLen = 16, saltLen = 16 } = data;
+        const salt = content.subarray(0, saltLen);
+        const iv = content.subarray(saltLen, saltLen + ivLen);
+        const key = crypto.scryptSync(password, salt, keyLen);
         const decipher = crypto.createDecipheriv(algorithm, key, iv);
-        let decrypted = decipher.update(content.slice(16)); // Buffer
+        let decrypted = decipher.update(content.subarray(saltLen + ivLen)); // 使用 .subarray()
         decrypted = Buffer.concat([decrypted, decipher.final()]);
         return decrypted;
     }
@@ -17,6 +20,12 @@ class DecryptCommand extends BaseCommand {
     getRequireContent() {
         return true;
     }
+
+    getRequireContentOptions() {
+        return {
+            raw: true
+        };
+    }
 }
 
 module.exports = {

package/commands/encrypt.js

@@ -4,12 +4,14 @@ const crypto = require('node:crypto');
 class EncryptCommand extends BaseCommand {
     async execute() {
         const content = this.content;
-        const { password, salt, algorithm = 'aes-256-cbc', keylen = 32 } = this.selfData;
-        const key = crypto.scryptSync(password, salt, keylen);
-        const iv = crypto.randomBytes(16);
+        const { password, algorithm = 'aes-256-cbc', keyLen = 32, ivLen = 16, saltLen = 16 } = this.selfData;
+        const salt = crypto.randomBytes(saltLen);
+        const iv = crypto.randomBytes(ivLen);
+        const key = crypto.scryptSync(password, salt, keyLen);
         const cipher = crypto.createCipheriv(algorithm, key, iv);
         // 直接输出二进制 Buffer
         const encrypted = Buffer.concat([
+            salt, // 将盐值放在密文前面，方便解密时使用
             iv, // 将 IV 放在密文前面，方便解密时使用
             cipher.update(content), // 不指定输出编码 = 返回 Buffer
             cipher.final() // 返回 Buffer
@@ -20,6 +22,12 @@ class EncryptCommand extends BaseCommand {
     getRequireContent() {
         return true;
     }
+
+    getRequireContentOptions() {
+        return {
+            raw: true
+        };
+    }
 }
 
 module.exports = {

package/commands/env_optional.js

@@ -35,7 +35,11 @@ class EnvOptionalCommand extends BaseCommand {
                         break;
                     }
                     case "object": {
-                        updatedData[k] = await parse(envVal, "yaml");
+                        if (typeof envVal === "string") {
+                            updatedData[k] = await parse(envVal, "yaml");
+                        } else {
+                            updatedData[k] = envVal;
+                        }
                         break;
                     }
                     default: {

package/commands/exec_from_file.js

@@ -17,6 +17,7 @@ class ExecFromFileCommand extends BaseCommand {
     async execute() {
         const data = this.selfData;
         const srcs = toArray(data.src);
+        const quiet = data.quiet || false;
         for (let i = 0; i < srcs.length; i++) {
             let src = srcs[i];
             const isRemote = /^https?:\/\//.test(src);
@@ -27,11 +28,12 @@ class ExecFromFileCommand extends BaseCommand {
                 throw `配置文件未找到 ${srcs[i]}`;
             }
             if (!data.force && this.globalData.executed_cfg.includes(src)) {
-                info(`不执行重复配置 ${src}`);
+                !quiet && info(`不执行重复配置 ${src}`);
                 continue;
             }
-            info(`执行配置文件 ${src}`);
+            !quiet && info(`执行配置文件 ${src}`);
             this.globalData.executed_cfg.push(src);
+            this.shareData.AUTOMATOR_EXEC_FROM_FILE = src;
             setLastExecFile(src);
             let cfg;
             if (isRemote) {

package/commands/files_git.js

@@ -0,0 +1,35 @@
+const { BaseCommand } = require("./base");
+const walk = require('ignore-walk');
+const { join } = require('node:path');
+const { get_full_path } = require('../utils/transform_tool');
+
+class FilesGitCommand extends BaseCommand {
+    async execute() {
+        const data = this.selfData;
+        const path = get_full_path(data.src);
+        const ignoreFiles = data.ignoreFiles ?? ['.gitignore'];
+        const includeEmpty = data.includeEmpty ?? false;
+        const includeDotGit = data.includeDotGit ?? false;
+        const follow = data.follow ?? false;
+        const full = data.full ?? true;
+        let files = walk.sync({
+            path, // root dir to start in. defaults to process.cwd()
+            ignoreFiles, // list of filenames. defaults to ['.ignore']
+            includeEmpty, // true to include empty dirs, default false
+            follow // true to follow symlink dirs, default false
+        });
+        if (!includeDotGit) {
+            files = files.filter(v => v !== '.git' && !v.startsWith('.git/'));
+        }
+        if (full) {
+            files = files.map(v => {
+                return join(path, v)
+            })
+        }
+        return files;
+    }
+}
+
+module.exports = {
+    FilesGitCommand,
+};

package/commands/fontmin.js

@@ -0,0 +1,32 @@
+const { basename, dirname } = require('node:path');
+const { get_fst_file } = require('../utils/file_tool');
+const { BaseCommand } = require("./base");
+const { get_full_path } = require('../utils/transform_tool');
+const Fontmin = require("fontmin").default;
+
+class FontminCommand extends BaseCommand {
+    async execute() {
+        const result = await new Promise((resolve, reject) => {
+            const data = this.selfData;
+            const src = get_fst_file(data.src);
+            const options = { hinting: false, ...data.options };
+            const fontmin = new Fontmin()
+                .use(Fontmin.glyph({
+                    text: options.text,
+                    ...options
+                }))
+            fontmin.src(src).run((err, files) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(files[0].contents);
+                }
+            });
+        })
+        return result;
+    }
+}
+
+module.exports = {
+    FontminCommand,
+};

package/commands/ftp.js

@@ -2,7 +2,8 @@ const { BaseCommand } = require("./base");
 
 const fs = require("node:fs");
 const path = require("node:path");
-const { get_full_path, get_file_list } = require("../utils/file_tool");
+const { get_file_list } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const { info } = require("../utils/log_tool");
 const { progress } = require("../utils/display_tool");
 

package/commands/image_crop.js

@@ -1,4 +1,5 @@
-const { get_fst_file, get_full_path } = require("../utils/file_tool");
+const { get_fst_file } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const { BaseCommand } = require("./base");
 const Jimp = require("jimp");