node-automator 1.4.23 → 1.4.25

package/index.js

@@ -11,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 {
@@ -42,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) {
@@ -67,9 +69,13 @@ 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;
     let beginTime = Date.now();
     let timer;
     if (enableTimer && timerInterval) {
@@ -83,8 +89,6 @@ async function MainProcess() {
             }
         }, timerInterval);
     }
-    let lastError = null;
-    const cfgs = await getCfgs();
     try {
         if (cfgs.indexOf(".") != -1) {
             await mgr.exec([{
@@ -101,21 +105,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.23",
+  "version": "1.4.25",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {

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) {