utiller 1.0.78 → 1.0.79

package/lib/exceptioner/ERRORs.js

@@ -97,7 +97,7 @@ var ERRORs = {
     message: "assign task timeout happen"
   },
   4011: {
-    message: "\u4E0D\u80FD\u8D70\u5230\u9019\u88E1, \u76EE\u524D\u88AB\u52D5\u5F0F\u7684\u6A5F\u5236\u53EA\u652F\u63F4runByEachTask"
+    message: "\u4E0D\u80FD\u8D70\u5230\u9019\u88E1, \u76EE\u524D\u88AB\u52D5\u5F0F\u7684\u6A5F\u5236\u53EA\u652F\u63F4runByEachTask, runByParams"
   },
   8001: {
     message: "append file fail"

package/lib/pooller/index.js

@@ -83,6 +83,7 @@ var InfinitePool = /*#__PURE__*/function () {
     var maxWorkers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _configerer.configerer.POOLLER_WORKER_DEFAULT;
     var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _index2.utiller.getRandomValue(0, 100000000000);
     (0, _classCallCheck2["default"])(this, InfinitePool);
+    (0, _defineProperty2["default"])(this, "isRunInBackgroundMode", false);
     (0, _defineProperty2["default"])(this, "state", _configerer.configerer.POOLLER_STATE.RUN_BY_EACH_TASK);
     (0, _defineProperty2["default"])(this, "enableOfTaskSleepByInterval", _configerer.configerer.POOLLER_ENABLE_TASK_SLEEP_BY_INTERVAL);
     (0, _defineProperty2["default"])(this, "taskSleepInterval", _configerer.configerer.POOLLER_TASK_OF_INTERVAL_DEFAULT);
@@ -146,7 +147,6 @@ var InfinitePool = /*#__PURE__*/function () {
     });
     (0, _defineProperty2["default"])(this, "getCountOfAssignTaskInQueue", function () {
       var size = 0;
-      if (_this.state === _configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS) return _this.queueOfWaitingParam.length;
 
       var _iterator = _createForOfIteratorHelper(_configerer.configerer.POOLLER_PRIORITY),
           _step;
@@ -381,69 +381,69 @@ var InfinitePool = /*#__PURE__*/function () {
       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++) {
-        params[_key] = arguments[_key];
-      }
+      var _this$queueOfWaitingP;
 
-      for (var _i = 0, _params = params; _i < _params.length; _i++) {
-        var param = _params[_i];
+      _this.triggerBgInstance();
 
-        _this.queueOfWaitingParam.push(param);
-      }
+      (_this$queueOfWaitingP = _this.queueOfWaitingParam).push.apply(_this$queueOfWaitingP, arguments);
     });
     (0, _defineProperty2["default"])(this, "runByParams", /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(functionOfAsyncTask) {
-        var _len2,
+        var _len,
             params,
-            _key2,
+            _key,
             _args3 = arguments;
 
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                for (_len2 = _args3.length, params = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-                  params[_key2 - 1] = _args3[_key2];
+                for (_len = _args3.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                  params[_key - 1] = _args3[_key];
+                }
+
+                if (functionOfAsyncTask === undefined) {
+                  functionOfAsyncTask = _this.queueOfAssignTask["low"].shift().task;
                 }
 
                 if (_lodash["default"].isFunction(functionOfAsyncTask)) {
-                  _context3.next = 3;
+                  _context3.next = 4;
                   break;
                 }
 
                 throw new _exceptioner["default"](4006, "runByParams error, typeof task can't be ".concat((0, _typeof2["default"])(functionOfAsyncTask)));
 
-              case 3:
+              case 4:
                 if (_lodash["default"].isArray(params)) {
-                  _context3.next = 5;
+                  _context3.next = 6;
                   break;
                 }
 
                 throw new _exceptioner["default"](4006, "runByParams error, typeof params can't be ".concat((0, _typeof2["default"])(params)));
 
-              case 5:
-                _this.appendParamInToQueue.apply(_this, params);
+              case 6:
+                _this.beforeRun();
 
                 _this.add(functionOfAsyncTask);
 
-                _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS);
+                _this.appendParamInToQueue.apply(_this, params);
 
-                _this.beforeRun();
+                _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS);
 
-              case 9:
+              case 10:
                 if (!(_this.ruleOfInfiniteRun() && _lodash["default"].size(_this.queueOfWaitingParam) > 0)) {
-                  _context3.next = 14;
+                  _context3.next = 15;
                   break;
                 }
 
-                _context3.next = 12;
+                _context3.next = 13;
                 return (0, _classPrivateFieldGet2["default"])(_this, _run).call(_this);
 
-              case 12:
-                _context3.next = 9;
+              case 13:
+                _context3.next = 10;
                 break;
 
-              case 14:
+              case 15:
               case "end":
                 return _context3.stop();
             }
@@ -455,16 +455,6 @@ var InfinitePool = /*#__PURE__*/function () {
         return _ref3.apply(this, arguments);
       };
     }());
-    (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();
-       */
-
-      return _this;
-    });
     (0, _defineProperty2["default"])(this, "runByEachTask", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
       var tasks,
           _args4 = arguments;
@@ -550,10 +540,12 @@ var InfinitePool = /*#__PURE__*/function () {
       };
     }());
     (0, _defineProperty2["default"])(this, "runInBackGround", function (asyncfunc) {
-      for (var _len3 = arguments.length, params = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-        params[_key3 - 1] = arguments[_key3];
+      for (var _len2 = arguments.length, params = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        params[_key2 - 1] = arguments[_key2];
       }
 
+      _this.isRunInBackgroundMode = true;
+
       if (!(typeof asyncfunc === "function")) {
         throw new _exceptioner["default"](4002, "_asyncfunc can't be ".concat((0, _typeof2["default"])(asyncfunc)));
       }
@@ -723,7 +715,7 @@ var InfinitePool = /*#__PURE__*/function () {
                   break;
 
                 case 13:
-                  _index2.utiller.appendInfo(_this.getPoollerLogFormat("4574152 \u4E0D\u61C9\u8A72\u8D70\u5230\u9019\u88CF,\u4F46\u662F minor issue"));
+                  _this.printLogMessage("4574152 \u4E0D\u61C9\u8A72\u8D70\u5230\u9019\u88CF,\u4F46\u662F minor issue", true);
 
                 case 14:
                   if (_this.queueOfExecutingTask.length > _this.maxWorker) _this.printLogMessage("4512214 \u4E00\u5B9A\u662F\u6539\u58DE\u4E86!!!!!!!!!!, ".concat(_this.getLogMessageOfExecutingTaskQueueCount, " "), true);
@@ -799,17 +791,37 @@ var InfinitePool = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "runInfiniteInBackground", function (functionOfAsyncTask, interval) {
       _this.runInBackGround(_this.runInInfinite, functionOfAsyncTask, interval);
     });
-    (0, _defineProperty2["default"])(this, "runByParamInBackground", function (functionOfAsyncTask) {
-      for (var _len4 = arguments.length, params = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-        params[_key4 - 1] = arguments[_key4];
+    (0, _defineProperty2["default"])(this, "runByParamInBackGround", function (functionOfAsyncTask) {
+      for (var _len3 = arguments.length, params = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+        params[_key3 - 1] = arguments[_key3];
       }
 
-      _this.runInBackGround.apply(_this, [_this.runByParams, functionOfAsyncTask].concat(params));
+      return _this.invokeInstanceOfBackground.apply(_this, [_this.runByParams, functionOfAsyncTask].concat(params));
+    });
+    (0, _defineProperty2["default"])(this, "runByTimesInBackGround", function (functionOfAsyncTask, times) {
+      _this.runInBackGround(_this.runByTimes, functionOfAsyncTask, times);
 
       return _this;
     });
-    (0, _defineProperty2["default"])(this, "runByTimesInBackground", function (functionOfAsyncTask, times) {
-      _this.runInBackGround(_this.runByTimes, functionOfAsyncTask, times);
+    (0, _defineProperty2["default"])(this, "runByEachTaskInBackGround", function () {
+      for (var _len4 = arguments.length, params = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+        params[_key4] = arguments[_key4];
+      }
+
+      return _this.invokeInstanceOfBackground.apply(_this, [_this.runByEachTask].concat(params));
+    });
+    (0, _defineProperty2["default"])(this, "invokeInstanceOfBackground", function (state) {
+      if (_this.atomicBgInstance !== undefined) clearTimeout(_this.atomicBgInstance);
+
+      for (var _len5 = arguments.length, params = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
+        params[_key5 - 1] = arguments[_key5];
+      }
+
+      _this.atomicBgInstance = _this.runInBackGround.apply(_this, [state].concat(params));
+      /**
+       * 因為偷懶, 所以回傳整個instance, 這樣程式碼就只要寫一行
+       * const pool = new InfinitePool(1).runByEachTaskInBackGround();
+       */
 
       return _this;
     });
@@ -862,8 +874,8 @@ var InfinitePool = /*#__PURE__*/function () {
     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];
+      for (var _len6 = arguments.length, infos = new Array(_len6 > 2 ? _len6 - 2 : 0), _key6 = 2; _key6 < _len6; _key6++) {
+        infos[_key6 - 2] = arguments[_key6];
       }
 
       if (SPECIFICITY_DEBUG) _index2.utiller.printLogMessage.apply(_index2.utiller, [this.getPoollerLogFormat(message), error].concat(infos));
@@ -927,7 +939,7 @@ var InfinitePool = /*#__PURE__*/function () {
               case 0:
                 priority = _args9.length > 1 && _args9[1] !== undefined ? _args9[1] : "low";
                 taskName = _args9.length > 2 && _args9[2] !== undefined ? _args9[2] : "noName";
-                this.trigger();
+                this.triggerBgInstance();
                 return _context9.abrupt("return", new Promise(function (resolve, reject) {
                   var callbackWrapper = function callbackWrapper(result) {
                     if (result.assignedTaskCompleted) {
@@ -1038,9 +1050,9 @@ var InfinitePool = /*#__PURE__*/function () {
     /** 加上一個 被動式啟動, 不然一直while() run, 可能有效能上的問題,現階端只支援RUN_BY_TASK */
 
   }, {
-    key: "trigger",
-    value: function trigger() {
-      if (this.isQueuePolling) {
+    key: "triggerBgInstance",
+    value: function triggerBgInstance() {
+      if (!this.isRunInBackgroundMode || this.isQueuePolling) {
         return;
       }
 
@@ -1048,6 +1060,9 @@ var InfinitePool = /*#__PURE__*/function () {
         /** 因為不這樣做, 就會產生 race condition, 會產生出3個runInBackGround instance */
         this.runByEachTaskInBackGround();
         return;
+      } else if (this.state === _configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS) {
+        this.runByParamInBackGround();
+        return;
       }
 
       throw new _exceptioner["default"](4011, "this.state is ==> ".concat(_index2.utiller.getItsKeyByValue(_configerer.configerer.POOLLER_STATE, this.state)));
@@ -1139,7 +1154,7 @@ var InfinitePool = /*#__PURE__*/function () {
       return this.mapOfHashNCallbackWrapper[hash] !== undefined;
     }
   }, {
-    key: "exampleOfWait4ResultAndRunInBackground",
+    key: "exampleOfRunByTaskWait4ResultAndRunInBackground",
     value:
     /** following function are examples **/
 
@@ -1147,13 +1162,9 @@ var InfinitePool = /*#__PURE__*/function () {
 
     /** 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() {
+      var _exampleOfRunByTaskWait4ResultAndRunInBackground = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
         var pool, asyncTask, startTimoutTask;
         return _regenerator["default"].wrap(function _callee13$(_context13) {
           while (1) {
@@ -1231,11 +1242,10 @@ var InfinitePool = /*#__PURE__*/function () {
                   break;
                 }
 
-                _index2.utiller.appendInfo("system is running");
-
+                console.log("system is running");
                 pool.showState();
                 _context13.next = 15;
-                return _index2.utiller.syncDelay(5000);
+                return _index2.utiller.syncDelay(1000);
 
               case 15:
                 _context13.next = 10;
@@ -1249,11 +1259,11 @@ var InfinitePool = /*#__PURE__*/function () {
         }, _callee13);
       }));
 
-      function exampleOfWait4ResultAndRunInBackground() {
-        return _exampleOfWait4ResultAndRunInBackground.apply(this, arguments);
+      function exampleOfRunByTaskWait4ResultAndRunInBackground() {
+        return _exampleOfRunByTaskWait4ResultAndRunInBackground.apply(this, arguments);
       }
 
-      return exampleOfWait4ResultAndRunInBackground;
+      return exampleOfRunByTaskWait4ResultAndRunInBackground;
     }()
   }, {
     key: "exampleOfRunInBackgroundInfinite",
@@ -1405,7 +1415,7 @@ var InfinitePool = /*#__PURE__*/function () {
             switch (_context20.prev = _context20.next) {
               case 0:
                 pool = new InfinitePool(5);
-                pool.runByParamInBackground( /*#__PURE__*/function () {
+                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) {
@@ -1431,23 +1441,26 @@ var InfinitePool = /*#__PURE__*/function () {
                     return _ref11.apply(this, arguments);
                   };
                 }(), "david", "susan", "golden", "weber", "kevin");
+                setTimeout(function () {
+                  pool.appendParamInToQueue("apple", "Rui");
+                }, 12000);
 
-              case 2:
+              case 3:
                 if (!pool.isRunning()) {
-                  _context20.next = 8;
+                  _context20.next = 9;
                   break;
                 }
 
                 _index2.utiller.appendInfo("system is running");
 
-                _context20.next = 6;
+                _context20.next = 7;
                 return _index2.utiller.syncDelay(3000);
 
-              case 6:
-                _context20.next = 2;
+              case 7:
+                _context20.next = 3;
                 break;
 
-              case 8:
+              case 9:
               case "end":
                 return _context20.stop();
             }
@@ -1472,7 +1485,7 @@ var InfinitePool = /*#__PURE__*/function () {
               case 0:
                 pool = new InfinitePool(6);
                 count = 0;
-                pool.runByTimesInBackground( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee21() {
+                pool.runByTimesInBackGround( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee21() {
                   var ms;
                   return _regenerator["default"].wrap(function _callee21$(_context21) {
                     while (1) {

package/package.json

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

package/template/sample.package.json

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