utiller 1.0.77 → 1.0.78

package/lib/pooller/index.js

@@ -37,8 +37,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-var _run = new WeakMap();
-
 /**
 *
 Pooller 有以下特點:
@@ -50,6 +48,10 @@ Pooller 有以下特點:
 6.可以設定taskFailHandler, 這樣遇到錯誤就不會停掉poollers
 *
 */
+var SPECIFICITY_DEBUG = false;
+
+var _run = new WeakMap();
+
 var InfinitePool = /*#__PURE__*/function () {
   /** 用來處理Task的延遲,假設要偷網頁東西, 不能太頻繁, 要偽裝成手動只能透過這方式, 如果是multi thread, 延遲是針對worker滿載後,再加進去的那一個 */
 
@@ -59,6 +61,8 @@ var InfinitePool = /*#__PURE__*/function () {
 
   /** 用於 runByParam */
 
+  /** runByTimes 的次數 */
+
   /** 裡面放 {high:[], low:[], medium }
    * taskQueue就是指裡面有多少Task!
    * 通常Infinite模式,裡面只會有一個asyncTask
@@ -88,6 +92,7 @@ var InfinitePool = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "maxWorker", void 0);
     (0, _defineProperty2["default"])(this, "ignoreFirstRun", false);
     (0, _defineProperty2["default"])(this, "queueOfWaitingParam", []);
+    (0, _defineProperty2["default"])(this, "countsOfRunByTimes", -1);
     (0, _defineProperty2["default"])(this, "queueOfAssignTask", {});
     (0, _defineProperty2["default"])(this, "queueOfExecutingTask", []);
     (0, _defineProperty2["default"])(this, "isQueuePolling", false);
@@ -139,7 +144,7 @@ var InfinitePool = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "isRunning", function () {
       return _this.isQueuePolling;
     });
-    (0, _defineProperty2["default"])(this, "getTaskQueueCount", function () {
+    (0, _defineProperty2["default"])(this, "getCountOfAssignTaskInQueue", function () {
       var size = 0;
       if (_this.state === _configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS) return _this.queueOfWaitingParam.length;
 
@@ -196,13 +201,12 @@ var InfinitePool = /*#__PURE__*/function () {
         task.state = "ING";
       }
     });
-    (0, _defineProperty2["default"])(this, "taskWrapper", function (assignedTask, hashOfTask) {
+    (0, _defineProperty2["default"])(this, "taskWrapper", function (assignedTask, hashOfTask, param) {
       return function () {
         var self = _this;
         var timeoutHash = "";
         var assignedTaskResult;
         var assignedTaskError;
-        var param = self.queueOfWaitingParam.shift();
         var isAssignedTaskCompleted = true;
         /** 用來判斷task 有沒有走到 catch裡面, 不然resolve了但return undefined, task會不知所措 */
 
@@ -354,7 +358,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 break;
               }
 
-              _this.printLogMessage("415123, runInInfinite() \u6B63\u5728\u7121\u9650Loop\u4E2D,".concat(_this.getLogMessageOfExecutingTaskQueueCount()));
+              _this.printLogMessage("415123, runInInfinite() \u6B63\u5728\u7121\u9650Loop\u4E2D, ".concat(_this.getLogMessageOfExecutingTaskQueueCount()));
 
               _context2.next = 18;
               return (0, _classPrivateFieldGet2["default"])(_this, _run).call(_this);
@@ -427,7 +431,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 _this.beforeRun();
 
               case 9:
-                if (!(_this.ruleOfInfiniteRun() && !_lodash["default"].isEmpty(_this.queueOfWaitingParam))) {
+                if (!(_this.ruleOfInfiniteRun() && _lodash["default"].size(_this.queueOfWaitingParam) > 0)) {
                   _context3.next = 14;
                   break;
                 }
@@ -454,9 +458,10 @@ var InfinitePool = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "runByEachTaskInBackGround", function () {
       if (_this.atomicBgInstance !== undefined) clearTimeout(_this.atomicBgInstance);
       _this.atomicBgInstance = _this.runInBackGround(_this.runByEachTask);
-      /** 因為偷懶, 所以回傳整個instance, 這樣程式碼就只要寫一行
-       *  const pool = new InfinitePool(1).runByEachTaskInBackGround();
-       * */
+      /**
+       * 因為偷懶, 所以回傳整個instance, 這樣程式碼就只要寫一行
+       * const pool = new InfinitePool(1).runByEachTaskInBackGround();
+       */
 
       return _this;
     });
@@ -486,7 +491,7 @@ var InfinitePool = /*#__PURE__*/function () {
               return (0, _classPrivateFieldGet2["default"])(_this, _run).call(_this, _this.id);
 
             case 8:
-              if (_this.getTaskQueueCount() <= 0) {
+              if (_this.getCountOfAssignTaskInQueue() <= 0) {
                 _this.terminate();
 
                 _this.printLogMessage("788121, runByEachTask() \u56E0\u70BA taskOfWaitingQueue \u6E05\u7A7A\u800C\u505C\u6B62");
@@ -503,13 +508,15 @@ var InfinitePool = /*#__PURE__*/function () {
       }, _callee4);
     })));
     (0, _defineProperty2["default"])(this, "runByTimes", /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(functionOfAsyncTask, times) {
-        var index;
+      var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(functionOfAsyncTask) {
+        var times,
+            _args5 = arguments;
         return _regenerator["default"].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                _this.maxWorker = 1;
+                times = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : 1;
+                _this.countsOfRunByTimes = times;
 
                 _this.add(functionOfAsyncTask);
 
@@ -517,11 +524,9 @@ var InfinitePool = /*#__PURE__*/function () {
 
                 _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_TIMES);
 
-                index = 0;
-
               case 5:
-                if (!(index < times)) {
-                  _context5.next = 11;
+                if (!(_this.ruleOfInfiniteRun() && _this.countsOfRunByTimes > 0)) {
+                  _context5.next = 10;
                   break;
                 }
 
@@ -529,11 +534,10 @@ var InfinitePool = /*#__PURE__*/function () {
                 return (0, _classPrivateFieldGet2["default"])(_this, _run).call(_this);
 
               case 8:
-                index++;
                 _context5.next = 5;
                 break;
 
-              case 11:
+              case 10:
               case "end":
                 return _context5.stop();
             }
@@ -541,7 +545,7 @@ var InfinitePool = /*#__PURE__*/function () {
         }, _callee5);
       }));
 
-      return function (_x2, _x3) {
+      return function (_x2) {
         return _ref5.apply(this, arguments);
       };
     }());
@@ -600,7 +604,29 @@ var InfinitePool = /*#__PURE__*/function () {
       };
       _this.handlerOfAssignTaskFail = listener;
     });
+    (0, _defineProperty2["default"])(this, "rulesOfAppendToExecutingTask", function () {
+      switch (_this.state) {
+        case _configerer.configerer.POOLLER_STATE.RUN_BY_EACH_TASK:
+          return _this.isRunning() && !_this.isExecutingQueueFull() && _this.getCountOfAssignTaskInQueue() > 0;
+
+        case _configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS:
+          return _this.isRunning() && !_this.isExecutingQueueFull() && _lodash["default"].size(_this.queueOfWaitingParam) > 0;
+
+        case _configerer.configerer.POOLLER_STATE.RUN_BY_TIMES:
+          return _this.isRunning() && !_this.isExecutingQueueFull() && _this.countsOfRunByTimes > 0;
+
+        case _configerer.configerer.POOLLER_STATE.RUN_INFINITE:
+          return _this.isRunning() && !_this.isExecutingQueueFull();
+
+        default:
+          throw new _exceptioner["default"](4005, "this.state ==> ".concat(_this.state));
+      }
+    });
     (0, _defineProperty2["default"])(this, "appendTaskToExecuteQueue", function (hash, promise) {
+      if (_lodash["default"].isEqual(_this.state, _configerer.configerer.POOLLER_STATE.RUN_BY_TIMES)) {
+        _this.countsOfRunByTimes = _this.countsOfRunByTimes - 1;
+      }
+
       var task = {
         state: "NOT",
         hash: hash,
@@ -620,7 +646,7 @@ var InfinitePool = /*#__PURE__*/function () {
     (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("taskQueue(\u9084\u5728\u6392\u968A\u7684Task): ".concat(_this.getCountOfAssignTaskInQueue())));
 
       _index2.utiller.appendInfo(_this.getPoollerLogFormat("QueueOfExecutingTask(\u6B63\u5728\u57F7\u884C\u7684AsyncTask, \u8D85\u904EworkerCount\u5C31\u662Fbug): ".concat(_lodash["default"].size(_this.queueOfExecutingTask))));
 
@@ -840,7 +866,7 @@ var InfinitePool = /*#__PURE__*/function () {
         infos[_key5 - 2] = arguments[_key5];
       }
 
-      _index2.utiller.printLogMessage.apply(_index2.utiller, [this.getPoollerLogFormat(message), error].concat(infos));
+      if (SPECIFICITY_DEBUG) _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為零時,回傳結束 */
@@ -924,7 +950,7 @@ var InfinitePool = /*#__PURE__*/function () {
         }, _callee9, this);
       }));
 
-      function addTaskAndWait4Result(_x4) {
+      function addTaskAndWait4Result(_x3) {
         return _addTaskAndWait4Result.apply(this, arguments);
       }
 
@@ -1034,7 +1060,7 @@ var InfinitePool = /*#__PURE__*/function () {
   }, {
     key: "isTaskQueueEmpty",
     value: function isTaskQueueEmpty() {
-      return this.getTaskQueueCount() === 0;
+      return this.getCountOfAssignTaskInQueue() === 0;
     }
     /** 依照config 把委託任務放置到Queue裡面 */
 
@@ -1062,7 +1088,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 this.printLogMessage("4484121, \u8D70\u5230\u4E00\u5761\u7761\u89BA\u5340 enableOfTaskSleepByInterval:".concat(this.enableOfTaskSleepByInterval, " || ").concat(restInInterval, " ms"));
 
               case 6:
-                if (!(this.isRunning() && !this.isExecutingQueueFull())) {
+                if (!this.rulesOfAppendToExecutingTask()) {
                   _context10.next = 18;
                   break;
                 }
@@ -1074,17 +1100,18 @@ var InfinitePool = /*#__PURE__*/function () {
                   break;
                 }
 
-                promise = this.taskWrapper(taskInfo.task, taskInfo.hash);
+                promise = this.taskWrapper(taskInfo.task, taskInfo.hash, this.queueOfWaitingParam.shift());
                 this.removeTaskMapByHash(taskInfo.hash);
                 this.appendTaskToExecuteQueue(taskInfo.hash, promise);
-                _context10.next = 15;
+                _context10.next = 16;
                 break;
 
               case 14:
+                /** 沒有taskInfo, 也許有未知的isssue,保險起見break */
+                this.printLogMessage("848451  \u4E5F\u8A31\u6709\u672A\u77E5\u7684isssue,\u4FDD\u96AA\u8D77\u898Bbreak,\u662F\u4E0D\u662F\u5728\u9019\u88E1\u7121\u9650\u8FF4\u5708\u8DD1\u8DD1\u8DD1", true);
                 return _context10.abrupt("break", 18);
 
-              case 15:
-                this.printLogMessage("848451 \u662F\u4E0D\u662F\u5728\u9019\u88E1\u7121\u9650\u8FF4\u5708\u8DD1\u8DD1\u8DD1", true);
+              case 16:
                 _context10.next = 6;
                 break;
 
@@ -1102,6 +1129,8 @@ var InfinitePool = /*#__PURE__*/function () {
 
       return syncTaskDispatcher;
     }()
+    /** 把assignedTask 加入到 QueueOfExecutingTask 的規則*/
+
   }, {
     key: "isWait4ResultTask",
     value:
@@ -1375,9 +1404,10 @@ var InfinitePool = /*#__PURE__*/function () {
           while (1) {
             switch (_context20.prev = _context20.next) {
               case 0:
-                pool = new InfinitePool(2);
+                pool = new InfinitePool(5);
                 pool.runByParamInBackground( /*#__PURE__*/function () {
                   var _ref11 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee19(param) {
+                    var ms;
                     return _regenerator["default"].wrap(function _callee19$(_context19) {
                       while (1) {
                         switch (_context19.prev = _context19.next) {
@@ -1386,9 +1416,10 @@ var InfinitePool = /*#__PURE__*/function () {
                             return _index2.utiller.syncDelayRandom();
 
                           case 2:
-                            console.log("param", param);
+                            ms = _context19.sent;
+                            console.log("wait ".concat(ms, " ms"), "param", param);
 
-                          case 3:
+                          case 4:
                           case "end":
                             return _context19.stop();
                         }
@@ -1396,7 +1427,7 @@ var InfinitePool = /*#__PURE__*/function () {
                     }, _callee19);
                   }));
 
-                  return function (_x5) {
+                  return function (_x4) {
                     return _ref11.apply(this, arguments);
                   };
                 }(), "david", "susan", "golden", "weber", "kevin");
@@ -1439,9 +1470,10 @@ var InfinitePool = /*#__PURE__*/function () {
           while (1) {
             switch (_context22.prev = _context22.next) {
               case 0:
-                pool = new InfinitePool(1);
+                pool = new InfinitePool(6);
                 count = 0;
                 pool.runByTimesInBackground( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee21() {
+                  var ms;
                   return _regenerator["default"].wrap(function _callee21$(_context21) {
                     while (1) {
                       switch (_context21.prev = _context21.next) {
@@ -1450,16 +1482,17 @@ var InfinitePool = /*#__PURE__*/function () {
                           return _index2.utiller.syncDelayRandom();
 
                         case 2:
+                          ms = _context21.sent;
                           count++;
-                          console.log("count:", count);
+                          console.log("wait for time: ".concat(ms, " ms, count:").concat(count));
 
-                        case 4:
+                        case 5:
                         case "end":
                           return _context21.stop();
                       }
                     }
                   }, _callee21);
-                })), 10);
+                })), 20);
 
               case 3:
                 if (!pool.isRunning()) {
@@ -1500,7 +1533,7 @@ var InfinitePool = /*#__PURE__*/function () {
             switch (_context24.prev = _context24.next) {
               case 0:
                 oneToTen = _lodash["default"].range(1, 10);
-                pool = new InfinitePool(2);
+                pool = new InfinitePool(5);
                 _context24.next = 4;
                 return pool.runByParams.apply(pool, [/*#__PURE__*/function () {
                   var _ref13 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee23(param) {
@@ -1524,7 +1557,7 @@ var InfinitePool = /*#__PURE__*/function () {
                     }, _callee23);
                   }));
 
-                  return function (_x6) {
+                  return function (_x5) {
                     return _ref13.apply(this, arguments);
                   };
                 }()].concat((0, _toConsumableArray2["default"])(oneToTen)));
@@ -1555,7 +1588,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 pool = new InfinitePool(1);
                 time = 0;
                 _context26.next = 4;
-                return pool.runByTimes(20, /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee25() {
+                return pool.runByTimes( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee25() {
                   return _regenerator["default"].wrap(function _callee25$(_context25) {
                     while (1) {
                       switch (_context25.prev = _context25.next) {
@@ -1573,7 +1606,7 @@ var InfinitePool = /*#__PURE__*/function () {
                       }
                     }
                   }, _callee25);
-                })));
+                })), 20);
 
               case 4:
               case "end":

package/lib/utiller/nodeutiller.js

@@ -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, pathOfPackageJson, indexFileName, templatePath, _yield$_this8$upgrade, name, version;
+                  var path, tempFolderPath, release, pathOfPackageJson, indexFileName, templatePath, _yield$_this8$upgrade, moduleName, version;
 
                   return _regenerator["default"].wrap(function _loop$(_context10) {
                     while (1) {
@@ -1264,10 +1264,10 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
                         case 17:
                           _yield$_this8$upgrade = _context10.sent;
-                          name = _yield$_this8$upgrade.name;
+                          moduleName = _yield$_this8$upgrade.moduleName;
                           version = _yield$_this8$upgrade.version;
                           _context10.next = 22;
-                          return _this8.updateVersionOfTemplate(name, version);
+                          return _this8.updateVersionOfTemplate(moduleName, version);
 
                         case 22:
                           /** 把package.json release放進去 */
@@ -1634,7 +1634,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
               case 8:
                 return _context16.abrupt("return", {
                   version: json.version,
-                  name: json.name
+                  moduleName: json.name
                 });
 
               case 11:

package/package.json

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

package/template/sample.package.json

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