node-automator 1.4.16 → 1.4.18

package/README.md

@@ -10,15 +10,15 @@ $ node . ./examples/print_env.yml
 ## Npx
 > You can pass encoded configuration content instead of a file path
 ```js
-function encode(input) {
-    return btoa(unescape(encodeURIComponent(input)))
+function base64_encode(input) {
+    return Buffer.from(input).toString('base64');
 }
 var configuration = `
 - type: print
   data:
     content: Hello, I'm <<USERNAME>>
 `;
-console.log(encode(configuration));
+console.log(base64_encode(configuration));
 // output: Ci0gdHlwZTogcHJpbnQKICBkYXRhOgogICAgY29udGVudDogSGVsbG8sIEknbSA8PFVTRVJOQU1FPj4K
 ```
 > then you can use npx to run any configuration

package/commands/compress.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { get_fst_file, get_full_path, move } = require('../utils/file_tool');
 const { BaseCommand } = require("./base");
+const { readFileSync } = require('fs');
 
 class CompressCommand extends BaseCommand {
     async execute() {
@@ -8,7 +9,6 @@ class CompressCommand extends BaseCommand {
         const data = this.selfData;
         const src = get_fst_file(data.src);
         const dst = get_full_path(data.dst, "FILE");
-        const tmp = path.join(this.shareData.AUTOMATOR_SCRATCH, path.basename(src));
         let format = data.format;
         if (!format) {
             format = dst.split(".").pop();
@@ -18,9 +18,9 @@ class CompressCommand extends BaseCommand {
             format = "jpeg";
         }
         const options = data.options;
-        await sharp(src)[format](options)
-            .toFile(tmp);
-        await move(tmp, path.dirname(dst), undefined, { quiet: true, rename: path.basename(dst) });
+        const fileContent = readFileSync(src);
+        await sharp(fileContent)[format](options)
+            .toFile(dst);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-automator",
-  "version": "1.4.16",
+  "version": "1.4.18",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {

package/utils/base64_tool.js

@@ -1,13 +1,59 @@
-function decode(input) {
-    return decodeURIComponent(escape(atob(input)))
+function utf8_encode(string) {
+    string = string.replace(/\r\n/g, "\n");
+    var utftext = "";
+    for (var n = 0; n < string.length; n++) {
+        var c = string.charCodeAt(n);
+        if (c < 128) {
+            utftext += String.fromCharCode(c);
+        } else if ((c > 127) && (c < 2048)) {
+            utftext += String.fromCharCode((c >> 6) | 192);
+            utftext += String.fromCharCode((c & 63) | 128);
+        } else {
+            utftext += String.fromCharCode((c >> 12) | 224);
+            utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+            utftext += String.fromCharCode((c & 63) | 128);
+        }
+
+    }
+    return utftext;
+}
+
+function utf8_decode(utftext) {
+    var string = "";
+    var i = 0;
+    var c = 0;
+    var c2 = 0;
+    var c3 = 0;
+    while (i < utftext.length) {
+        c = utftext.charCodeAt(i);
+        if (c < 128) {
+            string += String.fromCharCode(c);
+            i++;
+        } else if ((c > 191) && (c < 224)) {
+            c2 = utftext.charCodeAt(i + 1);
+            string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+            i += 2;
+        } else {
+            c2 = utftext.charCodeAt(i + 1);
+            c3 = utftext.charCodeAt(i + 2);
+            string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+            i += 3;
+        }
+    }
+    return string;
 }
 
-function encode(input) {
-    return btoa(unescape(encodeURIComponent(input)))
+function encode(string) {
+    return btoa(utf8_encode(string));
 }
 
+function decode(string) {
+    return utf8_decode(atob(string));
+}
 
 module.exports = {
-    decode,
+    utf8_encode,
+    utf8_decode,
     encode,
+    decode,
 };

package/utils/file_tool.js

@@ -311,10 +311,6 @@ async function copy(src, dst, base, options) {
                     actual_files.push(src);
                 }
                 await new Promise(resolve => {
-                    // 如果存在，先删除
-                    if (fs.existsSync(dstFile)) {
-                        fs.unlinkSync(dstFile);
-                    }
                     // !options.overwrite ? fs.constants.COPYFILE_EXCL : 0
                     fs.copyFile(src, dstFile, 0, (err) => {
                         if (err) {
@@ -388,10 +384,6 @@ async function move(src, dst, base, options) {
                     if (!options.overwrite && fs.existsSync(dstFile)) {
                         resolve();
                     } else {
-                        // 如果存在，先删除
-                        if (fs.existsSync(dstFile)) {
-                            fs.unlinkSync(dstFile);
-                        }
                         fs.copyFile(src, dstFile, 0, (err) => {
                             if (err) {
                                 throw (err);