node-automator 1.4.22 → 1.4.24

package/commands/mgr.js

@@ -122,6 +122,7 @@ const { Word2txtCommand } = require('./word2txt');
 const { ObfuscateCommand } = require('./obfuscate');
 const { SplitFileCommand } = require('./split_file');
 const { MergeFileCommand } = require('./merge_file');
+const { ZipFolderCommand } = require('./zip_folder');
 
 const globalData = {
     "executed_cfg": [], // 执行过的配置文件
@@ -487,6 +488,7 @@ function init() {
     register("obfuscate", ObfuscateCommand, false);
     register("split_file", SplitFileCommand, false);
     register("merge_file", MergeFileCommand, false);
+    register("zip_folder", ZipFolderCommand, false);
 }
 
 module.exports = {

package/commands/zip_folder.js

@@ -0,0 +1,56 @@
+const { BaseCommand } = require("./base");
+const path = require("path");
+const { get_fst_file, get_full_path } = require("../utils/file_tool");
+const { info } = require("../utils/log_tool");
+const { progress } = require("../utils/display_tool");
+const { eval_code } = require("./share_data");
+
+class ZipFolderCommand extends BaseCommand {
+  async execute() {
+    const AdmZip = require("adm-zip");
+    let data = this.selfData;
+    let folder = get_fst_file(data.src);
+    const isAccept = data.filter
+      ? eval_code(data.filter)
+      : (filename) => {
+          // 排除以 . 开头的文件、目录
+          if (filename.split(path.sep).some((part) => part.startsWith("."))) {
+            return false;
+          }
+          return true;
+        };
+    // creating archives
+    var zip = new AdmZip();
+    let i = 0;
+    zip.addLocalFolder(folder, "", (filename) => {
+      if (!isAccept(filename)) {
+        return false;
+      }
+      progress(i++, 0, {
+        desc: `${filename}`,
+        depth: 0,
+        align: true,
+      });
+      return true;
+    });
+    // or write everything to disk
+    if (data.dst) {
+      let dst = get_full_path(data.dst);
+      await new Promise((resolve) => {
+        zip.writeZip(dst, (err) => {
+          if (err) {
+            throw err;
+          }
+          resolve();
+        });
+      });
+    } else {
+      let buffer = zip.toBuffer();
+      return buffer;
+    }
+  }
+}
+
+module.exports = {
+  ZipFolderCommand,
+};

package/index.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 // 控制台文本颜色
 const path = require("path");
-require("colors");
 const {
     argv,
 } = require('yargs');
@@ -12,10 +11,10 @@ require('dotenv').config({
 
 // 禁用其他打印
 console.yzplog = console.log;
-console.log = () => {};
-console.warn = () => {};
-console.info = () => {};
-console.error = () => {};
+console.log = () => { };
+console.warn = () => { };
+console.info = () => { };
+console.error = () => { };
 
 const mgr = require("./commands/mgr");
 const {
@@ -43,6 +42,8 @@ const {
 } = require("./commands/share_data");
 const { decode } = require('./utils/base64_tool');
 const { formatTimeInMillisec, formatTimestampMillisec } = require('./utils/transform_tool');
+const { hash } = require('./utils/hash_tool');
+const { getCache, setCache } = require('./utils/cache_tool');
 
 process.on('exit', (code) => {
     if (!code) {
@@ -68,9 +69,14 @@ async function getCfgs() {
     });
 }
 async function MainProcess() {
+    let lastError = null;
+    const cfgs = await getCfgs();
+    const cfgHash = hash(cfgs).toString();
     const enableTimer = argv.ENABLE_TIMER;
-    const timerInterval = argv.TIMER_INTERVAL;
-    const estimateTime = +argv.ESTIMATE_TIME;
+    const timerInterval = argv.TIMER_INTERVAL || 1000;
+    const CACHE_KEY_ESTIMATE_TIME = `ESTIMATE_TIME_${cfgHash}`;
+    const estimateTime = +argv.ESTIMATE_TIME || +(await getCache(CACHE_KEY_ESTIMATE_TIME)) || 0;
+    console.yzplog(`estimateTime ${estimateTime}`)
     let beginTime = Date.now();
     let timer;
     if (enableTimer && timerInterval) {
@@ -84,8 +90,6 @@ async function MainProcess() {
             }
         }, timerInterval);
     }
-    let lastError = null;
-    const cfgs = await getCfgs();
     try {
         if (cfgs.indexOf(".") != -1) {
             await mgr.exec([{
@@ -102,21 +106,22 @@ async function MainProcess() {
     } catch (err) {
         lastError = err.message || err;
     }
+    const costTime = Date.now() - beginTime;
     if (enableTimer) {
         clearInterval(timer);
         info("")
-        const costTime = Date.now() - beginTime;
         let timeLog = `任务总耗时 ${formatTimeInMillisec(costTime, "hh:mm:ss")}`;
         if (estimateTime) {
             const offsetTime = costTime - estimateTime;
             if (offsetTime > 0) {
-                timeLog += `, 比预期慢了 ${formatTimeInMillisec(offsetTime, "hh:mm:ss")}`;
+                timeLog += `, 比预期慢了 ${formatTimeInMillisec(offsetTime, "hh:mm:ss SSS")}`;
             } else {
-                timeLog += `, 比预期快了 ${formatTimeInMillisec(-offsetTime, "hh:mm:ss")}`;
+                timeLog += `, 比预期快了 ${formatTimeInMillisec(-offsetTime, "hh:mm:ss SSS")}`;
             }
         }
         success(`>>> ${timeLog} <<<`, undefined, undefined, true);
     }
+    await setCache(CACHE_KEY_ESTIMATE_TIME, costTime);
 
     let code = lastError ? (getLastErrorCode() || 1) : 0;
     let extname = path.extname(argv.$0);

package/package.json

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

package/utils/display_tool.js

@@ -3,6 +3,7 @@ const { stdout_columns, clear_line_end, shareData } = require("../commands/share
 const { clearLine } = require("./interaction_tool");
 const { omit, omit_offset, write } = require("./log_tool");
 const { alignNumber, formatByteSize, alignStr, Alignment } = require("./transform_tool");
+require("colors");
 
 const color_cfg = [
     "cyan",

package/utils/log_tool.js

@@ -1,5 +1,6 @@
 const { stdout_columns } = require("../commands/share_data");
 const { json_compacted, formatTimestampMillisec } = require('./transform_tool');
+require("colors");
 
 const colors = [
 	"gray",

package/utils/request_tool.js

@@ -37,7 +37,7 @@ async function doRequest(data) {
     let result;
     let useCache = enable_http_cache && http_cache;
     let quiet = data.quiet;
-    !quiet && info(useCache ? "[缓存]" : `[${options.method}] ${url} `);
+    !quiet && info(`[${options.method}] ${url}` + (useCache ? "[缓存]" : ""));
     let hasProgress = false;
     let fileDst = get_full_path(data.dst || shareData.AUTOMATOR_SCRATCH + "/request_tool/" + cache_name, "FILE");
     if (useCache) {