utiller 1.0.129 → 1.0.132

package/lib/pooller/index.js

@@ -48,7 +48,7 @@ Pooller 有以下特點:
 6.可以設定taskFailHandler, 這樣遇到錯誤就不會停掉poollers
 *
 */
-var SPECIFICITY_DEBUG = true;
+var SPECIFICITY_DEBUG = false;
 
 var _run = new WeakMap();
 
@@ -355,7 +355,7 @@ var InfinitePool = /*#__PURE__*/function () {
               _this.setState(_configerer.configerer.POOLLER_STATE.RUN_INFINITE);
 
             case 14:
-              if (!_this.ruleOfInfiniteRun()) {
+              if (_this.ruleOfStopInfiniteRun()) {
                 _context2.next = 20;
                 break;
               }
@@ -376,8 +376,8 @@ var InfinitePool = /*#__PURE__*/function () {
         }
       }, _callee2);
     })));
-    (0, _defineProperty2["default"])(this, "ruleOfInfiniteRun", function () {
-      return _this.isRunning() || !_this.isExecutingTaskQueueEmpty();
+    (0, _defineProperty2["default"])(this, "ruleOfStopInfiniteRun", function () {
+      return !_this.isRunning() && _this.isExecutingTaskQueueEmpty();
     });
     (0, _defineProperty2["default"])(this, "isExecutingTaskQueueEmpty", function () {
       return _lodash["default"].size(_this.queueOfExecutingTask) === 0;
@@ -433,7 +433,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS);
 
               case 10:
-                if (!(_this.ruleOfInfiniteRun() && _lodash["default"].size(_this.queueOfWaitingParam) > 0)) {
+                if (!(!_this.ruleOfStopInfiniteRun() && _lodash["default"].size(_this.queueOfWaitingParam) > 0)) {
                   _context3.next = 15;
                   break;
                 }
@@ -459,12 +459,14 @@ var InfinitePool = /*#__PURE__*/function () {
     }());
     (0, _defineProperty2["default"])(this, "runByEachTask", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
       var tasks,
+          self,
           _args4 = arguments;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               tasks = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : [];
+              self = _this;
               _this.id = _index2.utiller.getRandomHash(15);
 
               _this.beforeRun();
@@ -473,26 +475,32 @@ var InfinitePool = /*#__PURE__*/function () {
 
               _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_EACH_TASK);
 
-            case 5:
-              if (!_this.ruleOfInfiniteRun()) {
-                _context4.next = 11;
+            case 6:
+              if (_this.ruleOfStopInfiniteRun()) {
+                _context4.next = 14;
                 break;
               }
 
-              _context4.next = 8;
+              _context4.next = 9;
               return (0, _classPrivateFieldGet2["default"])(_this, _run).call(_this, _this.id);
 
-            case 8:
+            case 9:
               if (_this.getCountOfAssignTaskInQueue() <= 0) {
                 _this.terminate();
 
                 _this.printLogMessage("788121, runByEachTask() \u56E0\u70BA taskOfWaitingQueue \u6E05\u7A7A\u800C\u505C\u6B62");
               }
+              /** 為了讓while不要停止運算 !this.ruleOfStopInfiniteRun(),不然 runByTask不會停止 */
+
 
-              _context4.next = 5;
+              _context4.next = 12;
+              return _index2.utiller.syncDelay(10);
+
+            case 12:
+              _context4.next = 6;
               break;
 
-            case 11:
+            case 14:
             case "end":
               return _context4.stop();
           }
@@ -517,7 +525,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_TIMES);
 
               case 5:
-                if (!(_this.ruleOfInfiniteRun() && _this.countsOfRunByTimes > 0)) {
+                if (!(!_this.ruleOfStopInfiniteRun() && _this.countsOfRunByTimes > 0)) {
                   _context5.next = 10;
                   break;
                 }
@@ -1554,7 +1562,10 @@ var InfinitePool = /*#__PURE__*/function () {
               case 0:
                 oneToTen = _lodash["default"].range(1, 10);
                 pool = new InfinitePool(5);
-                _context24.next = 4;
+
+                _index2.utiller.appendInfo("....start method of runByParams");
+
+                _context24.next = 5;
                 return pool.runByParams.apply(pool, [/*#__PURE__*/function () {
                   var _ref13 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee23(param) {
                     var ms;
@@ -1582,7 +1593,10 @@ var InfinitePool = /*#__PURE__*/function () {
                   };
                 }()].concat((0, _toConsumableArray2["default"])(oneToTen)));
 
-              case 4:
+              case 5:
+                _index2.utiller.appendInfo("....finish method of runByParams");
+
+              case 6:
               case "end":
                 return _context24.stop();
             }
@@ -1597,23 +1611,66 @@ var InfinitePool = /*#__PURE__*/function () {
       return exampleOfRunByParam;
     }()
   }, {
-    key: "exampleOfRunByCount",
+    key: "exampleOfRunByTask",
+    value: function () {
+      var _exampleOfRunByTask = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee25() {
+        var pool, tasks, all;
+        return _regenerator["default"].wrap(function _callee25$(_context25) {
+          while (1) {
+            switch (_context25.prev = _context25.next) {
+              case 0:
+                pool = new InfinitePool(10);
+                tasks = _lodash["default"].range(1, 5).map(function (each) {
+                  return _index2.utiller.asyncUnitTaskFunction(each);
+                });
+
+                _index2.utiller.appendInfo("....start method of exampleOfRunByTask");
+
+                _context25.next = 5;
+                return pool.runByEachTask(tasks);
+
+              case 5:
+                all = _context25.sent;
+
+                _index2.utiller.appendInfo(all);
+
+                _index2.utiller.appendInfo("....finish method of exampleOfRunByTask");
+
+              case 8:
+              case "end":
+                return _context25.stop();
+            }
+          }
+        }, _callee25);
+      }));
+
+      function exampleOfRunByTask() {
+        return _exampleOfRunByTask.apply(this, arguments);
+      }
+
+      return exampleOfRunByTask;
+    }()
+  }, {
+    key: "exampleOfRunByTimes",
     value: function () {
-      var _exampleOfRunByCount = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee26() {
+      var _exampleOfRunByTimes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee27() {
         var pool, time;
-        return _regenerator["default"].wrap(function _callee26$(_context26) {
+        return _regenerator["default"].wrap(function _callee27$(_context27) {
           while (1) {
-            switch (_context26.prev = _context26.next) {
+            switch (_context27.prev = _context27.next) {
               case 0:
-                pool = new InfinitePool(1);
+                pool = new InfinitePool(5);
                 time = 0;
-                _context26.next = 4;
-                return pool.runByTimes( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee25() {
-                  return _regenerator["default"].wrap(function _callee25$(_context25) {
+
+                _index2.utiller.appendInfo("....start method of runByTimes");
+
+                _context27.next = 5;
+                return pool.runByTimes( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee26() {
+                  return _regenerator["default"].wrap(function _callee26$(_context26) {
                     while (1) {
-                      switch (_context25.prev = _context25.next) {
+                      switch (_context26.prev = _context26.next) {
                         case 0:
-                          _context25.next = 2;
+                          _context26.next = 2;
                           return _index2.utiller.syncDelay(1000);
 
                         case 2:
@@ -1622,68 +1679,71 @@ var InfinitePool = /*#__PURE__*/function () {
 
                         case 4:
                         case "end":
-                          return _context25.stop();
+                          return _context26.stop();
                       }
                     }
-                  }, _callee25);
-                })), 20);
+                  }, _callee26);
+                })), 10);
 
-              case 4:
+              case 5:
+                _index2.utiller.appendInfo("....finish method of runByTimes");
+
+              case 6:
               case "end":
-                return _context26.stop();
+                return _context27.stop();
             }
           }
-        }, _callee26);
+        }, _callee27);
       }));
 
-      function exampleOfRunByCount() {
-        return _exampleOfRunByCount.apply(this, arguments);
+      function exampleOfRunByTimes() {
+        return _exampleOfRunByTimes.apply(this, arguments);
       }
 
-      return exampleOfRunByCount;
+      return exampleOfRunByTimes;
     }()
   }, {
     key: "exampleOfInfiniteUnStopLoopingIssue",
     value: function () {
-      var _exampleOfInfiniteUnStopLoopingIssue = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee28() {
+      var _exampleOfInfiniteUnStopLoopingIssue = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee29() {
         var persistTone, _persistTone, poollers, pool, isRequiredTerminate, random, _iterator6, _step6, pooller;
 
-        return _regenerator["default"].wrap(function _callee28$(_context28) {
+        return _regenerator["default"].wrap(function _callee29$(_context29) {
           while (1) {
-            switch (_context28.prev = _context28.next) {
+            switch (_context29.prev = _context29.next) {
               case 0:
                 _persistTone = function _persistTone3() {
-                  _persistTone = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee27() {
+                  _persistTone = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee28() {
                     var sign, time;
-                    return _regenerator["default"].wrap(function _callee27$(_context27) {
+                    return _regenerator["default"].wrap(function _callee28$(_context28) {
                       while (1) {
-                        switch (_context27.prev = _context27.next) {
+                        switch (_context28.prev = _context28.next) {
                           case 0:
-                            _context27.prev = 0;
+                            _context28.prev = 0;
                             sign = _index2.utiller.getRandomHash(20);
-                            _context27.next = 4;
+                            _context28.next = 4;
                             return _index2.utiller.syncDelayRandom(1, 10);
 
                           case 4:
-                            time = _context27.sent;
+                            time = _context28.sent;
 
                             _index2.utiller.appendInfo("".concat(time, " ms, yoyoyo ").concat(sign)); // Util.appendInfo(`沒有TONE可以下載了....隨機睡個${await Util.syncDelayRandom(1500, 3500)}`)
 
 
-                            return _context27.abrupt("return", "\u4EFB\u52D9ID:".concat(sign));
+                            return _context28.abrupt("return", "\u4EFB\u52D9ID:".concat(sign));
 
                           case 9:
-                            _context27.prev = 9;
-                            _context27.t0 = _context27["catch"](0);
+                            _context28.prev = 9;
+                            _context28.t0 = _context28["catch"](0);
 
-                            _index2.utiller.appendError(_context27.t0.message);
+                            _index2.utiller.appendError(_context28.t0.message);
 
                           case 12:
                           case "end":
-                            return _context27.stop();
+                            return _context28.stop();
                         }
                       }
-                    }, _callee27, null, [[0, 9]]);
+                    }, _callee28, null, [[0, 9]]);
                   }));
                   return _persistTone.apply(this, arguments);
                 };
@@ -1708,7 +1768,7 @@ var InfinitePool = /*#__PURE__*/function () {
 
               case 11:
                 if (!true) {
-                  _context28.next = 43;
+                  _context29.next = 43;
                   break;
                 }
 
@@ -1716,30 +1776,30 @@ var InfinitePool = /*#__PURE__*/function () {
                   return each.showState();
                 });
 
-                _context28.next = 15;
+                _context29.next = 15;
                 return _index2.utiller.syncDelayRandom();
 
               case 15:
-                random = _context28.sent;
-                _context28.next = 18;
+                random = _context29.sent;
+                _context29.next = 18;
                 return _index2.utiller.syncDelay(random);
 
               case 18:
                 if (!isRequiredTerminate) {
-                  _context28.next = 41;
+                  _context29.next = 41;
                   break;
                 }
 
                 _index2.utiller.appendInfo("\u4E3B\u7DDA\u7A0B\u6536\u5230\u95DC\u9589\u6307\u4EE4...");
 
                 _iterator6 = _createForOfIteratorHelper(poollers);
-                _context28.prev = 21;
+                _context29.prev = 21;
 
                 _iterator6.s();
 
               case 23:
                 if ((_step6 = _iterator6.n()).done) {
-                  _context28.next = 32;
+                  _context29.next = 32;
                   break;
                 }
 
@@ -1747,7 +1807,7 @@ var InfinitePool = /*#__PURE__*/function () {
 
                 _index2.utiller.appendInfo("POOLER ".concat(pooller.getPoolId(), " \u6B63\u5728\u95DC\u9589\u4E2D"));
 
-                _context28.next = 28;
+                _context29.next = 28;
                 return pooller.stopInBackground();
 
               case 28:
@@ -1756,39 +1816,39 @@ var InfinitePool = /*#__PURE__*/function () {
                 _index2.utiller.appendInfo("POOLER ".concat(pooller.getPoolId(), " \u95DC\u9589\u6210\u529F!"));
 
               case 30:
-                _context28.next = 23;
+                _context29.next = 23;
                 break;
 
               case 32:
-                _context28.next = 37;
+                _context29.next = 37;
                 break;
 
               case 34:
-                _context28.prev = 34;
-                _context28.t0 = _context28["catch"](21);
+                _context29.prev = 34;
+                _context29.t0 = _context29["catch"](21);
 
-                _iterator6.e(_context28.t0);
+                _iterator6.e(_context29.t0);
 
               case 37:
-                _context28.prev = 37;
+                _context29.prev = 37;
 
                 _iterator6.f();
 
-                return _context28.finish(37);
+                return _context29.finish(37);
 
               case 40:
-                return _context28.abrupt("break", 43);
+                return _context29.abrupt("break", 43);
 
               case 41:
-                _context28.next = 11;
+                _context29.next = 11;
                 break;
 
               case 43:
               case "end":
-                return _context28.stop();
+                return _context29.stop();
             }
           }
-        }, _callee28, null, [[21, 34, 37, 40]]);
+        }, _callee29, null, [[21, 34, 37, 40]]);
       }));
 
       function exampleOfInfiniteUnStopLoopingIssue() {

package/lib/utiller/index.js

@@ -79,64 +79,62 @@ var Utiller = /*#__PURE__*/function () {
       var _funparam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "預設的param";
 
       var errorSimulator = arguments.length > 2 ? arguments[2] : undefined;
-      return /*#__PURE__*/function () {
-        var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(param) {
-          var randomValue, symbol;
-          return _regenerator["default"].wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  randomValue = _this.getRandomValue(millionSec, millionSec * 1.2);
-                  _context.prev = 1;
-                  symbol = randomValue;
+      return /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var param,
+            randomValue,
+            symbol,
+            _args = arguments;
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                param = _args.length > 0 && _args[0] !== undefined ? _args[0] : _this.getRandomHash(10);
+                randomValue = _this.getRandomValue(millionSec, millionSec * 1.2);
+                _context.prev = 2;
+                symbol = randomValue;
 
-                  _this.appendInfo("before executed ===> i'm symbol of ".concat(symbol, ", ready to be executed, inner param = ").concat(_funparam));
+                _this.appendInfo("before executed ===> i'm symbol of ".concat(symbol, ", ready to be executed, inner param = ").concat(_funparam));
 
-                  _context.next = 6;
-                  return _this.syncDelay(randomValue);
+                _context.next = 7;
+                return _this.syncDelay(randomValue);
 
-                case 6:
-                  if (!(_lodash["default"].isFunction(errorSimulator) && errorSimulator(param))) {
-                    _context.next = 8;
-                    break;
-                  }
+              case 7:
+                if (!(_lodash["default"].isFunction(errorSimulator) && errorSimulator(param))) {
+                  _context.next = 9;
+                  break;
+                }
 
-                  throw Error("force to made error happen");
+                throw Error("force to made error happen");
 
-                case 8:
-                  _this.appendInfo("after executed ===> i'm symbol of ".concat(symbol, ", the task cost ").concat(randomValue, " million-seconds ").concat(param ? "i hav params ===> ".concat(param) : ""));
+              case 9:
+                _this.appendInfo("after executed ===> i'm symbol of ".concat(symbol, ", the task cost ").concat(randomValue, " million-seconds ").concat(param ? "i hav params ===> ".concat(param) : ""));
 
-                  return _context.abrupt("return", {
-                    randomValue: randomValue,
-                    symbol: symbol,
-                    param: param
-                  });
+                return _context.abrupt("return", {
+                  randomValue: randomValue,
+                  symbol: symbol,
+                  param: param
+                });
 
-                case 12:
-                  _context.prev = 12;
-                  _context.t0 = _context["catch"](1);
+              case 13:
+                _context.prev = 13;
+                _context.t0 = _context["catch"](2);
 
-                  _this.appendError(new Error("asyncUnitTask() catch error ".concat(_context.t0.message)));
+                _this.appendError(new Error("asyncUnitTask() catch error ".concat(_context.t0.message)));
 
-                case 15:
-                  _context.prev = 15;
+              case 16:
+                _context.prev = 16;
 
-                  _this.appendInfo("wow.... finally got you");
+                _this.appendInfo("wow.... finally got you");
 
-                  return _context.finish(15);
+                return _context.finish(16);
 
-                case 18:
-                case "end":
-                  return _context.stop();
-              }
+              case 19:
+              case "end":
+                return _context.stop();
             }
-          }, _callee, null, [[1, 12, 15, 18]]);
-        }));
-
-        return function (_x) {
-          return _ref.apply(this, arguments);
-        };
-      }();
+          }
+        }, _callee, null, [[2, 13, 16, 19]]);
+      }));
     });
     (0, _defineProperty2["default"])(this, "getCallersName", function () {
       var callerName;
@@ -555,13 +553,18 @@ var Utiller = /*#__PURE__*/function () {
     }()
     /** 如果是array,用 indexOf檢查each
      *  如果是object,看有沒有這個key
-     *  如果是string, 就檢查有沒有包含 */
+     *  如果是string, 就檢查有沒有包含
+     *  precisely 就是用findIndex,去比較value
+     *
+     *  */
 
   }, {
     key: "has",
     value: function has(collection, item) {
+      var precisely = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
       if (_lodash["default"].isArray(collection)) {
-        return _lodash["default"].indexOf(collection, item) > -1;
+        if (precisely) return _lodash["default"].findIndex(collection, item) > -1;else return _lodash["default"].indexOf(collection, item) > -1;
       }
 
       if (_lodash["default"].isObject(item)) {
@@ -1114,7 +1117,7 @@ var Utiller = /*#__PURE__*/function () {
         }, _callee5, null, [[3, 12, 15, 18]]);
       }));
 
-      function asyncPool(_x2, _x3, _x4) {
+      function asyncPool(_x, _x2, _x3) {
         return _asyncPool.apply(this, arguments);
       }
 

package/package.json

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

package/template/sample.package.json

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