utiller 1.0.62 → 1.0.75

package/lib/pooller/index.js

@@ -84,23 +84,23 @@ var InfinitePool = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "taskSleepInterval", _configerer.configerer.POOLLER_TASK_OF_INTERVAL_DEFAULT);
     (0, _defineProperty2["default"])(this, "enableOfTaskTimeout", _configerer.configerer.POOLLER_ENABLE_TIMEOUT);
     (0, _defineProperty2["default"])(this, "timeOfTaskTimeout", _configerer.configerer.POOLLER_TASK_TIMEOUT_DEFAULT);
-    (0, _defineProperty2["default"])(this, "taskFailHandler", undefined);
+    (0, _defineProperty2["default"])(this, "handlerOfAssignTaskFail", undefined);
     (0, _defineProperty2["default"])(this, "maxWorker", void 0);
     (0, _defineProperty2["default"])(this, "ignoreFirstRun", false);
-    (0, _defineProperty2["default"])(this, "paramQueue", []);
-    (0, _defineProperty2["default"])(this, "assignedTaskQueue", {});
-    (0, _defineProperty2["default"])(this, "executingTaskInQueue", []);
+    (0, _defineProperty2["default"])(this, "queueOfWaitingParam", []);
+    (0, _defineProperty2["default"])(this, "queueOfAssignTask", {});
+    (0, _defineProperty2["default"])(this, "queueOfExecutingTask", []);
     (0, _defineProperty2["default"])(this, "isQueuePolling", false);
     (0, _defineProperty2["default"])(this, "initialTaskCompleted", false);
-    (0, _defineProperty2["default"])(this, "mHashNTaskMap", {});
-    (0, _defineProperty2["default"])(this, "hashCallbackMapOfWaiting4Result", {});
-    (0, _defineProperty2["default"])(this, "poolId", "");
+    (0, _defineProperty2["default"])(this, "mapOfHashNTask", {});
+    (0, _defineProperty2["default"])(this, "mapOfHashNCallbackWrapper", {});
+    (0, _defineProperty2["default"])(this, "nameOfCurrentPool", "");
     (0, _defineProperty2["default"])(this, "setPoolId", function () {
-      var id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _this.poolId;
-      _this.poolId = id;
+      var id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _this.nameOfCurrentPool;
+      _this.nameOfCurrentPool = id;
     });
     (0, _defineProperty2["default"])(this, "getPoolId", function () {
-      return _this.poolId;
+      return _this.nameOfCurrentPool;
     });
     (0, _defineProperty2["default"])(this, "stopInBackground", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       return _regenerator["default"].wrap(function _callee$(_context) {
@@ -110,8 +110,8 @@ var InfinitePool = /*#__PURE__*/function () {
               _this.terminate();
 
             case 1:
-              if (!(_lodash["default"].size(_this.executingTaskInQueue) > 0)) {
-                _context.next = 7;
+              if (!(_lodash["default"].size(_this.queueOfExecutingTask) > 0)) {
+                _context.next = 8;
                 break;
               }
 
@@ -119,16 +119,17 @@ var InfinitePool = /*#__PURE__*/function () {
               return _index2.utiller.syncDelay(500);
 
             case 4:
-              // Util.appendInfo(this.getPoollerLogFormat(`咬在 stopInBackground 出不來, executingTaskInQueue:${_.size(this.executingTaskInQueue)}`))
+              _this.printLogMessage("784512, \u54AC\u5728 stopInBackground \u51FA\u4E0D\u4F86,".concat(_this.getLogMessageOfExecutingTaskQueueCount()));
+
               _this.showState();
 
               _context.next = 1;
               break;
 
-            case 7:
+            case 8:
               return _context.abrupt("return", true);
 
-            case 8:
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -140,7 +141,7 @@ var InfinitePool = /*#__PURE__*/function () {
     });
     (0, _defineProperty2["default"])(this, "getTaskQueueCount", function () {
       var size = 0;
-      if (_this.state === _configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS) return _this.paramQueue.length;
+      if (_this.state === _configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS) return _this.queueOfWaitingParam.length;
 
       var _iterator = _createForOfIteratorHelper(_configerer.configerer.POOLLER_PRIORITY),
           _step;
@@ -148,7 +149,7 @@ var InfinitePool = /*#__PURE__*/function () {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var prior = _step.value;
-          size += _this.assignedTaskQueue[prior].length;
+          size += _this.queueOfAssignTask[prior].length;
         }
       } catch (err) {
         _iterator.e(err);
@@ -175,7 +176,7 @@ var InfinitePool = /*#__PURE__*/function () {
 
         _this.appendHashTaskMap(taskInfo);
 
-        _this.assignedTaskQueue[priority].push(taskInfo);
+        _this.queueOfAssignTask[priority].push(taskInfo);
 
         return hash;
       } else {
@@ -185,12 +186,13 @@ var InfinitePool = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "updateExecuteTaskState", function (hash) {
       var self = _this;
 
-      var task = _lodash["default"].find(_this.executingTaskInQueue, function (each) {
+      var task = _lodash["default"].find(_this.queueOfExecutingTask, function (each) {
         return _lodash["default"].isEqual(each.hash, hash);
       });
 
       if (task) {
-        // Util.appendInfo(self.getPoollerLogFormat(`客端委託的task: ${hash},更改狀態為'ING'`));
+        _this.printLogMessage("847875153, \u5BA2\u7AEF\u59D4\u8A17\u7684\u4EFB\u52D9: ".concat(hash, ",\u66F4\u6539\u72C0\u614B\u70BA 'ING'"));
+
         task.state = "ING";
       }
     });
@@ -200,7 +202,7 @@ var InfinitePool = /*#__PURE__*/function () {
         var timeoutHash = "";
         var assignedTaskResult;
         var assignedTaskError;
-        var param = self.paramQueue.shift();
+        var param = self.queueOfWaitingParam.shift();
         var isAssignedTaskCompleted = true;
         /** 用來判斷task 有沒有走到 catch裡面, 不然resolve了但return undefined, task會不知所措 */
 
@@ -208,6 +210,8 @@ var InfinitePool = /*#__PURE__*/function () {
           if (self.enableOfTaskTimeout) {
             timeoutHash = setTimeout(function () {
               try {
+                _this.printLogMessage("982532, taskWrapper\u57F7\u884C\u4E2D,\u767C\u751Ftimout: ".concat(self.timeOfTaskTimeout, " ms"));
+
                 throw new _exceptioner["default"](4010, self.getPoollerLogFormat("TASK HASH:".concat(hashOfTask, " IS TIMEOUT ").concat(self.timeOfTaskTimeout, " ms ").concat(param ? ",PARAMS IS ".concat(JSON.stringify(param)) : "")));
               } catch (error) {
                 reject(error);
@@ -215,52 +219,54 @@ var InfinitePool = /*#__PURE__*/function () {
             }, self.timeOfTaskTimeout);
           }
           /** 客端委託的task的是從這裡開始 */
-          // Util.appendInfo(self.getPoollerLogFormat(`客端委託的task開始執行 ${hashOfTask}`));
 
 
+          _this.printLogMessage("984135, \u5BA2\u7AEF\u59D4\u8A17\u7684task\u958B\u59CB\u57F7\u884C ".concat(hashOfTask));
+
           self.updateExecuteTaskState(hashOfTask);
           assignedTask(param).then(function (result) {
-            // console.log(self.getPoollerLogFormat('task get result'));
+            _this.printLogMessage("984545, \u5BA2\u7AEF\u59D4\u8A17\u7684\u4EFB\u52D9,resolve\u56DE\u61C9: ".concat(result));
+
             assignedTaskResult = result;
             isAssignedTaskCompleted = true;
           })["catch"](function (error) {
-            // console.error(self.getPoollerLogFormat('委託任務發生錯誤'), error);
+            _this.printLogMessage("989652, \u5BA2\u7AEF\u59D4\u8A17\u7684\u4EFB\u52D9,reject\u56DE\u61C9: ".concat(error.message), true, error);
+
             assignedTaskError = error;
             isAssignedTaskCompleted = false;
           })["finally"](function () {
-            clearTimeout(timeoutHash); // console.info(self.getPoollerLogFormat(self.getPoollerLogFormat('inner finally')));
-
+            clearTimeout(timeoutHash);
             resolve();
+
+            _this.printLogMessage("98942, taskWrapper()\u88E1\u9762\u7B2C\u4E00\u500Bpromise(\u70BA\u4E86timeout\u8A2D\u8A08)\u5B8C\u6210\u4E86");
           });
         }).then(function (result) {
-          /** 再沒有timeout的狀況下,執行了委託的任務(委託任務可能成功也可能進到catch) */
+          /** 能走到這裡,代表沒有timeout的狀況下,執行了委託的任務 */
           if (!isAssignedTaskCompleted) {
             throw assignedTaskError;
           } else {
-            return "".concat(hashOfTask, " completed");
+            return "".concat(_this.getLogMessageOfTaskHash(hashOfTask), " completed");
           }
         })["catch"](function (error) {
-          // console.error(self.getPoollerLogFormat(self.getPoollerLogFormat('outer error')), error);
-
-          /** 如果發生timeout  或是 assign task 掉進去catch 都會跑到這裡 */
+          /** 如果發生timeout  或是 客端任務掉進去catch都會跑到這裡 */
           isAssignedTaskCompleted = false;
           assignedTaskError = error;
           /** 如果是Wait4ResultTask模式, 要把catch | result 回到callbackWrapper */
 
           if (!self.isWait4ResultTask(hashOfTask)) {
-            if (self.taskFailHandler !== undefined) {
-              self.taskFailHandler(assignedTaskError);
+            if (self.handlerOfAssignTaskFail !== undefined) {
+              self.handlerOfAssignTaskFail(assignedTaskError);
             } else throw assignedTaskError;
           }
         })["finally"](function () {
-          // console.info(self.getPoollerLogFormat(self.getPoollerLogFormat('outer finally')));
           var result = {
             assignedTaskCompleted: isAssignedTaskCompleted,
             resolve: assignedTaskResult,
             reject: assignedTaskError
-          }; // Util.appendInfo('客端委託的task執行完回傳的內容', result, hashOfTask)
-
+          };
           self.removeResolveOrRejectPromiseByHash(hashOfTask, result);
+
+          _this.printLogMessage("98943213, ".concat(_this.getTaskInfoByHash(hashOfTask), " taskWrapper()\u88E1\u9762\u7B2C2\u500Bpromise\u5B8C\u6210\u4E86"), result);
         });
       };
     });
@@ -289,7 +295,7 @@ var InfinitePool = /*#__PURE__*/function () {
       return hashes;
     });
     (0, _defineProperty2["default"])(this, "removeTaskMapByHash", function (hash) {
-      delete _this.mHashNTaskMap[hash];
+      delete _this.mapOfHashNTask[hash];
     });
     (0, _defineProperty2["default"])(this, "beforeRun", function () {
       _this.isQueuePolling = true;
@@ -344,18 +350,20 @@ var InfinitePool = /*#__PURE__*/function () {
 
             case 14:
               if (!_this.ruleOfInfiniteRun()) {
-                _context2.next = 19;
+                _context2.next = 20;
                 break;
               }
 
-              _context2.next = 17;
+              _this.printLogMessage("415123, runInInfinite() \u6B63\u5728\u7121\u9650Loop\u4E2D,".concat(_this.getLogMessageOfExecutingTaskQueueCount()));
+
+              _context2.next = 18;
               return (0, _classPrivateFieldGet2["default"])(_this, _run).call(_this);
 
-            case 17:
+            case 18:
               _context2.next = 14;
               break;
 
-            case 19:
+            case 20:
             case "end":
               return _context2.stop();
           }
@@ -366,7 +374,7 @@ var InfinitePool = /*#__PURE__*/function () {
       return _this.isRunning() || !_this.isExecutingTaskQueueEmpty();
     });
     (0, _defineProperty2["default"])(this, "isExecutingTaskQueueEmpty", function () {
-      return _lodash["default"].size(_this.executingTaskInQueue) === 0;
+      return _lodash["default"].size(_this.queueOfExecutingTask) === 0;
     });
     (0, _defineProperty2["default"])(this, "appendParamInToQueue", function () {
       for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -376,7 +384,7 @@ var InfinitePool = /*#__PURE__*/function () {
       for (var _i = 0, _params = params; _i < _params.length; _i++) {
         var param = _params[_i];
 
-        _this.paramQueue.push(param);
+        _this.queueOfWaitingParam.push(param);
       }
     });
     (0, _defineProperty2["default"])(this, "runByParams", /*#__PURE__*/function () {
@@ -419,7 +427,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 _this.beforeRun();
 
               case 9:
-                if (!(_this.ruleOfInfiniteRun() && !_lodash["default"].isEmpty(_this.paramQueue))) {
+                if (!(_this.ruleOfInfiniteRun() && !_lodash["default"].isEmpty(_this.queueOfWaitingParam))) {
                   _context3.next = 14;
                   break;
                 }
@@ -469,26 +477,25 @@ var InfinitePool = /*#__PURE__*/function () {
               _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_EACH_TASK);
 
             case 5:
-              if (!_this.isRunning()) {
+              if (!_this.ruleOfInfiniteRun()) {
                 _context4.next = 11;
                 break;
               }
 
+              _context4.next = 8;
+              return (0, _classPrivateFieldGet2["default"])(_this, _run).call(_this, _this.id);
+
+            case 8:
               if (_this.getTaskQueueCount() <= 0) {
                 _this.terminate();
-              }
 
-              _context4.next = 9;
-              return (0, _classPrivateFieldGet2["default"])(_this, _run).call(_this, _this.id);
+                _this.printLogMessage("788121, runByEachTask() \u56E0\u70BA taskOfWaitingQueue \u6E05\u7A7A\u800C\u505C\u6B62");
+              }
 
-            case 9:
               _context4.next = 5;
               break;
 
             case 11:
-              _this.terminate();
-
-            case 12:
             case "end":
               return _context4.stop();
           }
@@ -572,7 +579,7 @@ var InfinitePool = /*#__PURE__*/function () {
 
                 _this.terminate();
 
-                _index2.utiller.appendInfo("".concat(_this.getPoollerLogFormat("background instance terminated"), " "));
+                _this.printLogMessage("7812123, runInBackGround() \u8D70\u5230finally");
 
                 return _context6.finish(8);
 
@@ -585,30 +592,39 @@ var InfinitePool = /*#__PURE__*/function () {
       })), 1);
     });
     (0, _defineProperty2["default"])(this, "getPoollerLogFormat", function (msg) {
-      return "POOLLER ID: ".concat(_this.getPoolId()).concat(_lodash["default"].isEmpty(msg) ? "" : " , ").concat(msg);
+      return "POOLLER NAME: ".concat(_this.getPoolId()).concat(_lodash["default"].isEmpty(msg) ? "" : " , ").concat(msg);
     });
     (0, _defineProperty2["default"])(this, "setTaskFailHandler", function () {
       var listener = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function (error) {
         return console.log(error.message);
       };
-      _this.taskFailHandler = listener;
+      _this.handlerOfAssignTaskFail = listener;
     });
     (0, _defineProperty2["default"])(this, "appendTaskToExecuteQueue", function (hash, promise) {
-      _this.executingTaskInQueue.push({
+      var task = {
         state: "NOT",
         hash: hash,
         task: promise
-      }); // Util.appendInfo(`\n\n新增了一個任務${hash} 進入executingTaskQueue ==>`, this.executingTaskInQueue)
+      };
+
+      _this.printLogMessage("4484451, \u589E\u52A0\u4E86\u4E00\u500BassignedTask ".concat(_this.getLogMessageOfTaskHash(hash), " \u5230 QueueOfExecutingTask ,").concat(_this.getLogMessageOfExecutingTaskQueueCount), false, task);
 
+      _this.queueOfExecutingTask.push(task);
+    });
+    (0, _defineProperty2["default"])(this, "getLogMessageOfExecutingTaskQueueCount", function () {
+      return "ExecutingTaskQueueCount: ".concat(_lodash["default"].size(_this.queueOfExecutingTask));
+    });
+    (0, _defineProperty2["default"])(this, "getLogMessageOfTaskHash", function (hash) {
+      return "TASK HASH: ".concat(hash);
     });
     (0, _defineProperty2["default"])(this, "showState", function () {
       _index2.utiller.appendInfo(_this.getPoollerLogFormat("workerCount: ".concat(_this.maxWorker)));
 
       _index2.utiller.appendInfo(_this.getPoollerLogFormat("taskQueue(\u9084\u5728\u6392\u968A\u7684Task): ".concat(_this.getTaskQueueCount())));
 
-      _index2.utiller.appendInfo(_this.getPoollerLogFormat("executingTaskInQueue(\u6B63\u5728\u57F7\u884C\u7684AsyncTask, \u8D85\u904EworkerCount\u5C31\u662Fbug): ".concat(_this.executingTaskInQueue.length)));
+      _index2.utiller.appendInfo(_this.getPoollerLogFormat("QueueOfExecutingTask(\u6B63\u5728\u57F7\u884C\u7684AsyncTask, \u8D85\u904EworkerCount\u5C31\u662Fbug): ".concat(_lodash["default"].size(_this.queueOfExecutingTask))));
 
-      _index2.utiller.appendInfo(_this.getPoollerLogFormat("mHashNTaskMap(\u9084\u6C92\u57F7\u884C\u5230\u7684AsyncTask reference\u7684\u66AB\u5B58\u5340): ".concat(_lodash["default"].size(_this.mHashNTaskMap))));
+      _index2.utiller.appendInfo(_this.getPoollerLogFormat("mapOfHashNTask(\u9084\u6C92\u57F7\u884C\u5230\u7684AsyncTask reference\u7684\u66AB\u5B58\u5340): ".concat(_lodash["default"].size(_this.mapOfHashNTask))));
     });
 
     _run.set(this, {
@@ -628,13 +644,13 @@ var InfinitePool = /*#__PURE__*/function () {
                         while (1) {
                           switch (_context7.prev = _context7.next) {
                             case 0:
-                              tasks = self.executingTaskInQueue.filter(function (each) {
+                              tasks = self.queueOfExecutingTask.filter(function (each) {
                                 return _lodash["default"].isEqual(each.state, "NOT");
                               }).map(function (each) {
                                 var task = each.task;
                                 return task();
                               });
-                              /** Util.appendInfo(`\n\n正要執行的隊列`,self.executingTaskInQueue) */
+                              /** Util.appendInfo(`\n\n正要執行的隊列`,self.queueOfExecutingTask) */
 
                               _context7.next = 3;
                               return Promise.race(tasks);
@@ -662,28 +678,31 @@ var InfinitePool = /*#__PURE__*/function () {
 
                 case 5:
                   if (_this.isExecutingTaskQueueEmpty()) {
-                    _context8.next = 11;
+                    _context8.next = 13;
                     break;
                   }
 
-                  _context8.next = 8;
+                  /** 當pool已經被要求停止時, executeQueue裡面還有未做完的任務*/
+                  _this.printLogMessage("4512211, \u958B\u59CB\u4EFB\u52D9(taskWrapper): ".concat(_this.getLogMessageOfExecutingTaskQueueCount()));
+
+                  _context8.next = 9;
                   return execute();
 
-                case 8:
+                case 9:
                   task = _context8.sent;
-                  _context8.next = 11;
+
+                  _this.printLogMessage("4512213 \u5B8C\u7562\u4EFB\u52D9(taskWrapper:".concat(task, "), ").concat(_this.getLogMessageOfExecutingTaskQueueCount()));
+
+                  _context8.next = 14;
                   break;
 
-                case 11:
-                  if (_this.executingTaskInQueue.length > _this.maxWorker) {
-                    _index2.utiller.appendError("\u4E00\u5B9A\u662F\u6539\u58DE\u4E86\uFF01\uFF01\uFF01\uFF01 ".concat(_this.getPoollerLogFormat("executing queue ".concat(_this.executingTaskInQueue.length, " !!"))));
-                  }
-                  /** 只要完成run 就要把sleepTimeCount歸零
-                   * this.currentSleepCounts = 0;
-                   */
+                case 13:
+                  _index2.utiller.appendInfo(_this.getPoollerLogFormat("4574152 \u4E0D\u61C9\u8A72\u8D70\u5230\u9019\u88CF,\u4F46\u662F minor issue"));
 
+                case 14:
+                  if (_this.queueOfExecutingTask.length > _this.maxWorker) _this.printLogMessage("4512214 \u4E00\u5B9A\u662F\u6539\u58DE\u4E86!!!!!!!!!!, ".concat(_this.getLogMessageOfExecutingTaskQueueCount, " "), true);
 
-                case 12:
+                case 15:
                 case "end":
                   return _context8.stop();
               }
@@ -707,15 +726,15 @@ var InfinitePool = /*#__PURE__*/function () {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
           var prior = _step3.value;
 
-          if (_this.assignedTaskQueue[prior].length > 0) {
+          if (_this.queueOfAssignTask[prior].length > 0) {
             switch (_this.state) {
               case _configerer.configerer.POOLLER_STATE.RUN_BY_EACH_TASK:
-                return _this.assignedTaskQueue[prior].shift();
+                return _this.queueOfAssignTask[prior].shift();
 
               case _configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS:
               case _configerer.configerer.POOLLER_STATE.RUN_BY_TIMES:
               case _configerer.configerer.POOLLER_STATE.RUN_INFINITE:
-                var taskInfo = _this.assignedTaskQueue[prior].shift();
+                var taskInfo = _this.queueOfAssignTask[prior].shift();
 
                 _this.add(taskInfo.task);
 
@@ -735,18 +754,19 @@ var InfinitePool = /*#__PURE__*/function () {
       if (!_lodash["default"].isEqual(_this.state, _configerer.configerer.POOLLER_STATE.RUN_BY_EACH_TASK)) throw new _exceptioner["default"](4007);
     });
     (0, _defineProperty2["default"])(this, "removeResolveOrRejectPromiseByHash", function (hash, result) {
-      var callbackWrapper = _this.hashCallbackMapOfWaiting4Result[hash];
+      var callbackWrapper = _this.mapOfHashNCallbackWrapper[hash];
 
       if (callbackWrapper !== undefined) {
         callbackWrapper(result);
-        delete _this.hashCallbackMapOfWaiting4Result[hash];
+        delete _this.mapOfHashNCallbackWrapper[hash];
       }
 
       _this.removePromiseFromExecutingQueue(hash);
     });
     (0, _defineProperty2["default"])(this, "removePromiseFromExecutingQueue", function (hash) {
-      // Util.appendInfo(`executingTaskQueue 拿掉了完成的任務 ${hash}, executingTaskInQueue:${_.size(this.executingTaskInQueue)}`)
-      _lodash["default"].remove(_this.executingTaskInQueue, function (each) {
+      _this.printLogMessage("QueueOfExecutingTask \u62FF\u6389\u4E86\u5B8C\u6210\u7684\u4EFB\u52D9 ".concat(_this.getLogMessageOfTaskHash(hash)));
+
+      _lodash["default"].remove(_this.queueOfExecutingTask, function (each) {
         return _lodash["default"].isEqual(hash, each.hash);
       });
     });
@@ -776,7 +796,7 @@ var InfinitePool = /*#__PURE__*/function () {
     try {
       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
         var prior = _step4.value;
-        this.assignedTaskQueue[prior] = [];
+        this.queueOfAssignTask[prior] = [];
       }
     } catch (err) {
       _iterator4.e(err);
@@ -802,15 +822,26 @@ var InfinitePool = /*#__PURE__*/function () {
   }, {
     key: "clearCache",
     value: function clearCache() {
-      this.executingTaskInQueue.length = 0;
-      this.mHashNTaskMap = {};
-      this.assignedTaskQueue = {};
+      this.queueOfExecutingTask.length = 0;
+      this.mapOfHashNTask = {};
+      this.queueOfAssignTask = {};
     }
   }, {
     key: "terminate",
     value: function terminate() {
       this.isQueuePolling = false;
     }
+  }, {
+    key: "printLogMessage",
+    value: function printLogMessage(message) {
+      var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+      for (var _len5 = arguments.length, infos = new Array(_len5 > 2 ? _len5 - 2 : 0), _key5 = 2; _key5 < _len5; _key5++) {
+        infos[_key5 - 2] = arguments[_key5];
+      }
+
+      _index2.utiller.printLogMessage.apply(_index2.utiller, [this.getPoollerLogFormat(message), error].concat(infos));
+    }
     /** return true if task completed, after 15 secs, force leave
      *  TODO:應該要設計成當terminate後, 監聽executingTaskInQueue為零時,回傳結束 */
 
@@ -902,25 +933,22 @@ var InfinitePool = /*#__PURE__*/function () {
   }, {
     key: "registerHash4Result",
     value: function registerHash4Result(hash, callback) {
-      this.hashCallbackMapOfWaiting4Result[hash] = callback;
+      this.mapOfHashNCallbackWrapper[hash] = callback;
     }
   }, {
     key: "appendHashTaskMap",
     value: function appendHashTaskMap(taskInfo) {
-      this.mHashNTaskMap[taskInfo.hash] = taskInfo;
+      this.mapOfHashNTask[taskInfo.hash] = taskInfo;
     }
   }, {
     key: "getTaskInfoByHash",
     value: function getTaskInfoByHash(hash) {
-      return this.mHashNTaskMap[hash];
+      return this.mapOfHashNTask[hash];
     }
     /**
      * remove task in queue by its hash, hash was created when add to queue
-     *
      * method will return true when succeed delete
-     *
      * 放到executing queue, 就沒辦法刪除了
-     *
      **/
 
   }, {
@@ -936,10 +964,10 @@ var InfinitePool = /*#__PURE__*/function () {
           for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
             var prior = _step5.value;
 
-            var _index = _lodash["default"].indexOf(this.assignedTaskQueue[prior], taskInfo);
+            var _index = _lodash["default"].indexOf(this.queueOfAssignTask[prior], taskInfo);
 
             if (_index > 0) {
-              this.assignedTaskQueue[prior].splice(_index, 1);
+              this.queueOfAssignTask[prior].splice(_index, 1);
               this.removeTaskMapByHash(hash);
               return true;
             }
@@ -1001,7 +1029,12 @@ var InfinitePool = /*#__PURE__*/function () {
   }, {
     key: "isExecutingQueueFull",
     value: function isExecutingQueueFull() {
-      return _lodash["default"].size(this.executingTaskInQueue) >= this.maxWorker;
+      return _lodash["default"].size(this.queueOfExecutingTask) >= this.maxWorker;
+    }
+  }, {
+    key: "isTaskQueueEmpty",
+    value: function isTaskQueueEmpty() {
+      return this.getTaskQueueCount() === 0;
     }
     /** 依照config 把委託任務放置到Queue裡面 */
 
@@ -1017,7 +1050,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 initialTaskShouldNotRun = this.ignoreFirstRun && !this.isFirstTaskCompleted();
 
                 if (!(initialTaskShouldNotRun || this.isFirstTaskCompleted() && this.isExecutingQueueFull() && this.enableOfTaskSleepByInterval)) {
-                  _context10.next = 5;
+                  _context10.next = 6;
                   break;
                 }
 
@@ -1026,21 +1059,36 @@ var InfinitePool = /*#__PURE__*/function () {
 
               case 4:
                 restInInterval = _context10.sent;
+                this.printLogMessage("4484121, \u8D70\u5230\u4E00\u5761\u7761\u89BA\u5340 enableOfTaskSleepByInterval:".concat(this.enableOfTaskSleepByInterval, " || ").concat(restInInterval, " ms"));
 
-              case 5:
-                /** 當pool isRunning才可以把任務加進去 */
-                while (this.isRunning() && !this.isExecutingQueueFull()) {
-                  taskInfo = this.getTaskInfoDependOnPriority();
-
-                  if (taskInfo) {
-                    // Util.appendInfo(`加了一個任務到executingQueue裡面 ${taskInfo.hash}`)
-                    promise = this.taskWrapper(taskInfo.task, taskInfo.hash);
-                    this.removeTaskMapByHash(taskInfo.hash);
-                    this.appendTaskToExecuteQueue(taskInfo.hash, promise);
-                  }
+              case 6:
+                if (!(this.isRunning() && !this.isExecutingQueueFull())) {
+                  _context10.next = 18;
+                  break;
                 }
 
-              case 6:
+                taskInfo = this.getTaskInfoDependOnPriority();
+
+                if (!taskInfo) {
+                  _context10.next = 14;
+                  break;
+                }
+
+                promise = this.taskWrapper(taskInfo.task, taskInfo.hash);
+                this.removeTaskMapByHash(taskInfo.hash);
+                this.appendTaskToExecuteQueue(taskInfo.hash, promise);
+                _context10.next = 15;
+                break;
+
+              case 14:
+                return _context10.abrupt("break", 18);
+
+              case 15:
+                this.printLogMessage("848451 \u662F\u4E0D\u662F\u5728\u9019\u88E1\u7121\u9650\u8FF4\u5708\u8DD1\u8DD1\u8DD1", true);
+                _context10.next = 6;
+                break;
+
+              case 18:
               case "end":
                 return _context10.stop();
             }
@@ -1059,11 +1107,21 @@ var InfinitePool = /*#__PURE__*/function () {
     value:
     /** 如果有function 就代表是一個需要回傳result的task, task在線等的意思*/
     function isWait4ResultTask(hash) {
-      return this.hashCallbackMapOfWaiting4Result[hash] !== undefined;
+      return this.mapOfHashNCallbackWrapper[hash] !== undefined;
     }
   }, {
     key: "exampleOfWait4ResultAndRunInBackground",
     value:
+    /** following function are examples **/
+
+    /** following function are examples **/
+
+    /** following function are examples **/
+
+    /** following function are examples **/
+
+    /** following function are examples **/
+
     /** following function are examples **/
     function () {
       var _exampleOfWait4ResultAndRunInBackground = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {

package/lib/utiller/index.js

@@ -167,6 +167,23 @@ var Utiller = /*#__PURE__*/function () {
   }
 
   (0, _createClass2["default"])(Utiller, [{
+    key: "printLogMessage",
+    value: function printLogMessage(message) {
+      var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+      if (!this.isProductionEnvironment()) {
+        for (var _len2 = arguments.length, infos = new Array(_len2 > 2 ? _len2 - 2 : 0), _key3 = 2; _key3 < _len2; _key3++) {
+          infos[_key3 - 2] = arguments[_key3];
+        }
+
+        if (error) {
+          this.appendError.apply(this, [message].concat(infos));
+        } else {
+          this.appendInfo.apply(this, [message].concat(infos));
+        }
+      }
+    }
+  }, {
     key: "init",
     value: function init() {// this.enrichZhTw();
     }
@@ -283,8 +300,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "isOrEquals",
     value: function isOrEquals(target) {
-      for (var _len2 = arguments.length, several = new Array(_len2 > 1 ? _len2 - 1 : 0), _key3 = 1; _key3 < _len2; _key3++) {
-        several[_key3 - 1] = arguments[_key3];
+      for (var _len3 = arguments.length, several = new Array(_len3 > 1 ? _len3 - 1 : 0), _key4 = 1; _key4 < _len3; _key4++) {
+        several[_key4 - 1] = arguments[_key4];
       }
 
       for (var _i = 0, _several = several; _i < _several.length; _i++) {
@@ -297,8 +314,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "isAndEquals",
     value: function isAndEquals() {
-      for (var _len3 = arguments.length, predicates = new Array(_len3), _key4 = 0; _key4 < _len3; _key4++) {
-        predicates[_key4] = arguments[_key4];
+      for (var _len4 = arguments.length, predicates = new Array(_len4), _key5 = 0; _key5 < _len4; _key5++) {
+        predicates[_key5] = arguments[_key5];
       }
 
       for (var _i2 = 0, _predicates = predicates; _i2 < _predicates.length; _i2++) {
@@ -314,8 +331,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "or",
     value: function or() {
-      for (var _len4 = arguments.length, booleans = new Array(_len4), _key5 = 0; _key5 < _len4; _key5++) {
-        booleans[_key5] = arguments[_key5];
+      for (var _len5 = arguments.length, booleans = new Array(_len5), _key6 = 0; _key6 < _len5; _key6++) {
+        booleans[_key6] = arguments[_key6];
       }
 
       for (var _i3 = 0, _booleans = booleans; _i3 < _booleans.length; _i3++) {
@@ -328,8 +345,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "and",
     value: function and() {
-      for (var _len5 = arguments.length, booleans = new Array(_len5), _key6 = 0; _key6 < _len5; _key6++) {
-        booleans[_key6] = arguments[_key6];
+      for (var _len6 = arguments.length, booleans = new Array(_len6), _key7 = 0; _key7 < _len6; _key7++) {
+        booleans[_key7] = arguments[_key7];
       }
 
       for (var _i4 = 0, _booleans2 = booleans; _i4 < _booleans2.length; _i4++) {
@@ -344,8 +361,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getExistOne",
     value: function getExistOne() {
-      for (var _len6 = arguments.length, candidates = new Array(_len6), _key7 = 0; _key7 < _len6; _key7++) {
-        candidates[_key7] = arguments[_key7];
+      for (var _len7 = arguments.length, candidates = new Array(_len7), _key8 = 0; _key8 < _len7; _key8++) {
+        candidates[_key8] = arguments[_key8];
       }
 
       for (var _i5 = 0, _candidates = candidates; _i5 < _candidates.length; _i5++) {
@@ -365,8 +382,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "isAndWith",
     value: function isAndWith(self, predicate) {
-      for (var _len7 = arguments.length, several = new Array(_len7 > 2 ? _len7 - 2 : 0), _key8 = 2; _key8 < _len7; _key8++) {
-        several[_key8 - 2] = arguments[_key8];
+      for (var _len8 = arguments.length, several = new Array(_len8 > 2 ? _len8 - 2 : 0), _key9 = 2; _key9 < _len8; _key9++) {
+        several[_key9 - 2] = arguments[_key9];
       }
 
       for (var _i6 = 0, _several2 = several; _i6 < _several2.length; _i6++) {
@@ -649,8 +666,8 @@ var Utiller = /*#__PURE__*/function () {
       var string = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
       var after = string;
 
-      for (var _len8 = arguments.length, patterns = new Array(_len8 > 1 ? _len8 - 1 : 0), _key9 = 1; _key9 < _len8; _key9++) {
-        patterns[_key9 - 1] = arguments[_key9];
+      for (var _len9 = arguments.length, patterns = new Array(_len9 > 1 ? _len9 - 1 : 0), _key10 = 1; _key10 < _len9; _key10++) {
+        patterns[_key10 - 1] = arguments[_key10];
       }
 
       for (var _i7 = 0, _patterns = patterns; _i7 < _patterns.length; _i7++) {
@@ -815,8 +832,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getAttrValueInSequence",
     value: function getAttrValueInSequence(info) {
-      for (var _len9 = arguments.length, attrs = new Array(_len9 > 1 ? _len9 - 1 : 0), _key10 = 1; _key10 < _len9; _key10++) {
-        attrs[_key10 - 1] = arguments[_key10];
+      for (var _len10 = arguments.length, attrs = new Array(_len10 > 1 ? _len10 - 1 : 0), _key11 = 1; _key11 < _len10; _key11++) {
+        attrs[_key11 - 1] = arguments[_key11];
       }
 
       for (var _i8 = 0, _attrs = attrs; _i8 < _attrs.length; _i8++) {
@@ -945,8 +962,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function getNormalizedStringNotStartWith(string) {
       var _this2 = this;
 
-      for (var _len10 = arguments.length, predicate = new Array(_len10 > 1 ? _len10 - 1 : 0), _key11 = 1; _key11 < _len10; _key11++) {
-        predicate[_key11 - 1] = arguments[_key11];
+      for (var _len11 = arguments.length, predicate = new Array(_len11 > 1 ? _len11 - 1 : 0), _key12 = 1; _key12 < _len11; _key12++) {
+        predicate[_key12 - 1] = arguments[_key12];
       }
 
       string = this.toCDB(string);
@@ -964,8 +981,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function getNormalizedStringNotEndWith(string) {
       var _this3 = this;
 
-      for (var _len11 = arguments.length, predicate = new Array(_len11 > 1 ? _len11 - 1 : 0), _key12 = 1; _key12 < _len11; _key12++) {
-        predicate[_key12 - 1] = arguments[_key12];
+      for (var _len12 = arguments.length, predicate = new Array(_len12 > 1 ? _len12 - 1 : 0), _key13 = 1; _key13 < _len12; _key13++) {
+        predicate[_key13 - 1] = arguments[_key13];
       }
 
       string = this.toCDB(string);
@@ -1147,8 +1164,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "camel",
     value: function camel() {
-      for (var _len12 = arguments.length, words = new Array(_len12), _key13 = 0; _key13 < _len12; _key13++) {
-        words[_key13] = arguments[_key13];
+      for (var _len13 = arguments.length, words = new Array(_len13), _key14 = 0; _key14 < _len13; _key14++) {
+        words[_key14] = arguments[_key14];
       }
 
       return _lodash["default"].camelCase(words.join("_"));
@@ -1543,8 +1560,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function toObjectMap(array) {
       var newbies = [];
 
-      for (var _len13 = arguments.length, rules = new Array(_len13 > 1 ? _len13 - 1 : 0), _key14 = 1; _key14 < _len13; _key14++) {
-        rules[_key14 - 1] = arguments[_key14];
+      for (var _len14 = arguments.length, rules = new Array(_len14 > 1 ? _len14 - 1 : 0), _key15 = 1; _key15 < _len14; _key15++) {
+        rules[_key15 - 1] = arguments[_key15];
       }
 
       var _iterator8 = _createForOfIteratorHelper(array),
@@ -1595,8 +1612,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "exeAll",
     value: function exeAll(collection) {
-      for (var _len14 = arguments.length, funcs = new Array(_len14 > 1 ? _len14 - 1 : 0), _key15 = 1; _key15 < _len14; _key15++) {
-        funcs[_key15 - 1] = arguments[_key15];
+      for (var _len15 = arguments.length, funcs = new Array(_len15 > 1 ? _len15 - 1 : 0), _key16 = 1; _key16 < _len15; _key16++) {
+        funcs[_key16 - 1] = arguments[_key16];
       }
 
       if (_lodash["default"].isArray(collection)) {

package/lib/utiller/nodeutiller.js

@@ -1029,34 +1029,34 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
   }, {
     key: "appendInfo",
     value: function appendInfo() {
-      for (var _len6 = arguments.length, data = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
-        data[_key6] = arguments[_key6];
+      for (var _len6 = arguments.length, messages = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+        messages[_key6] = arguments[_key6];
       }
 
-      return this.appendLog(_configerer.configerer.PATH_INFO_LOG, data, false);
+      return this.appendLog(_configerer.configerer.PATH_INFO_LOG, messages, false);
     }
   }, {
     key: "appendError",
     value: function appendError() {
-      for (var _len7 = arguments.length, data = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
-        data[_key7] = arguments[_key7];
+      for (var _len7 = arguments.length, messages = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
+        messages[_key7] = arguments[_key7];
       }
 
-      return this.appendLog(_configerer.configerer.PATH_ERROR_LOG, data, true);
+      return this.appendLog(_configerer.configerer.PATH_ERROR_LOG, messages, true);
     }
   }, {
     key: "appendLog",
-    value: function appendLog(path, datas) {
-      var isError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    value: function appendLog(path, messages) {
+      var error = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
 
       if (!this.isProductionEnvironment()) {
         var _console, _console2;
 
-        isError ? (_console = console).error.apply(_console, (0, _toConsumableArray2["default"])(datas)) : (_console2 = console).log.apply(_console2, (0, _toConsumableArray2["default"])(datas));
+        error ? (_console = console).error.apply(_console, (0, _toConsumableArray2["default"])(messages)) : (_console2 = console).log.apply(_console2, (0, _toConsumableArray2["default"])(messages));
       }
 
-      var persistlog = "".concat(this.getCurrentTimeFormat(), " ").concat(isError ? "ERROR" : "LOG", " : ").concat(this.getLogString(datas));
-      this.appendFile(path, persistlog);
+      var messageOfSpecificLog = "".concat(this.getCurrentTimeFormat(), " ").concat(error ? "ERROR" : "LOG", " : ").concat(this.getLogString(messages));
+      this.appendFile(path, messageOfSpecificLog);
     }
   }, {
     key: "getLogString",
@@ -1192,7 +1192,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
             switch (_context11.prev = _context11.next) {
               case 0:
                 path = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : "./";
-                deployToNPMServer = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : true;
+                deployToNPMServer = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : false;
                 packagejsons = this.findFilePathByExtension(path, ["json"], "node_modules", "release");
                 packagejsons = _lodash["default"].filter(packagejsons, function (each) {
                   return _lodash["default"].isEqual(each.fileName, "package");
@@ -1208,7 +1208,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                 _iterator8 = _createForOfIteratorHelper(packagejsons);
                 _context11.prev = 7;
                 _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
-                  var path, tempFolderPath, release, indexFileName, templatePath, pathOfPackageJson, _yield$_this8$upgrade, name, version;
+                  var path, tempFolderPath, release, pathOfPackageJson, indexFileName, templatePath, _yield$_this8$upgrade, name, version;
 
                   return _regenerator["default"].wrap(function _loop$(_context10) {
                     while (1) {
@@ -1239,7 +1239,8 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           return _this8.executeCommandLine("cd ".concat(path, " && npx babel ./temp --out-dir ./release/lib"));
 
                         case 8:
-                          _context10.prev = 8;
+                          pathOfPackageJson = _path5["default"].join(path, "package.json");
+                          _context10.prev = 9;
                           indexFileName = "sample.npm.module.index.js";
                           /** 複製公版的index.js */
 
@@ -1252,27 +1253,17 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           if (_this8.isPathExist(templatePath)) {
                             _this8.copyFromFolderToDestFolder(templatePath, _this8.persistByPath(_path5["default"].join(release, "template")));
                           }
-                          /** 升級package.json的版號 */
-
+                          /** 把package.json 放進去 */
 
-                          pathOfPackageJson = _path5["default"].join(path, "package.json");
-                          _context10.next = 16;
-                          return _this8.upgradePackageJsonVersion(pathOfPackageJson);
 
-                        case 16:
-                          _yield$_this8$upgrade = _context10.sent;
-                          name = _yield$_this8$upgrade.name;
-                          version = _yield$_this8$upgrade.version;
-
-                          /** 把package.json 放進去 */
                           _this8.copySingleFile(pathOfPackageJson, _path5["default"].join(release, "package.json"), undefined, true);
                           /** 安裝一個沒有devDependency 的node_module */
 
 
-                          _context10.next = 22;
+                          _context10.next = 17;
                           return _this8.executeCommandLine("\ncd ".concat(release, " && yarn install --production"));
 
-                        case 22:
+                        case 17:
                           _this8.appendInfo("build ".concat(path, " succeed"));
                           /** 部署到 local server*/
 
@@ -1282,6 +1273,13 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                             break;
                           }
 
+                          _context10.next = 21;
+                          return _this8.upgradePackageJsonVersion(pathOfPackageJson);
+
+                        case 21:
+                          _yield$_this8$upgrade = _context10.sent;
+                          name = _yield$_this8$upgrade.name;
+                          version = _yield$_this8$upgrade.version;
                           _context10.next = 26;
                           return _this8.executeCommandLine("cd ".concat(release, " &&  npm publish"));
 
@@ -1295,7 +1293,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
                         case 30:
                           _context10.prev = 30;
-                          _context10.t0 = _context10["catch"](8);
+                          _context10.t0 = _context10["catch"](9);
                           _context10.next = 34;
                           return _this8.deleteSelfByPath(release, true);
 
@@ -1315,7 +1313,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           return _context10.stop();
                       }
                     }
-                  }, _loop, null, [[8, 30, 35, 39]]);
+                  }, _loop, null, [[9, 30, 35, 39]]);
                 });
 
                 _iterator8.s();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utiller",
-  "version": "1.0.62",
+  "version": "1.0.75",
   "description": "",
   "main": "index.js",
   "scripts": {

package/template/sample.package.json

@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "configerer": "^1.0.11",
-    "utiller": "^1.0.60",
+    "utiller": "^1.0.74",
     "linepayer": "^1.0.4",
     "databazer": "^1.0.9",
     "lodash": "^4.17.20",

package/template/sample.index.js

@@ -1,21 +0,0 @@
-/** "use strict"
- *  developer:david
- *  email:freshingmoon0725@gmail.com
- * */
-
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-
-var _index = require("./release/lib");
-
-Object.keys(_index).forEach(function (key) {
-    if (key === "default" || key === "__esModule") return;
-    if (key in exports && exports[key] === _index[key]) return;
-    Object.defineProperty(exports, key, {
-        enumerable: true,
-        get: function get() {
-            return _index[key];
-        }
-    });
-});