utiller 1.0.137 → 1.0.140

package/lib/pooller/index.js

@@ -682,11 +682,11 @@ var InfinitePool = /*#__PURE__*/function () {
                         while (1) {
                           switch (_context7.prev = _context7.next) {
                             case 0:
-                              tasks = self.queueOfExecutingTask.filter(function (each) {
+                              tasks = _lodash["default"].filter(self.queueOfExecutingTask, function (each) {
                                 return _lodash["default"].isEqual(each.state, "NOT");
                               }).map(function (each) {
-                                var task = each.task;
-                                return task();
+                                var taskWrapper = each.task;
+                                return taskWrapper();
                               });
                               /** Util.appendInfo(`\n\n正要執行的隊列`,self.queueOfExecutingTask) */
 
@@ -795,6 +795,8 @@ var InfinitePool = /*#__PURE__*/function () {
       var callbackWrapper = _this.mapOfHashNCallbackWrapper[hash];
 
       if (callbackWrapper !== undefined) {
+        _this.printLogMessage("5644153248, removeResolveOrRejectPromiseByHash \u62FF\u6389\u4E86\u5B8C\u6210\u7684\u4EFB\u52D9(".concat(_this.getLogMessageOfTaskHash(hash), ")"));
+
         callbackWrapper(result);
         delete _this.mapOfHashNCallbackWrapper[hash];
       }
@@ -802,7 +804,7 @@ var InfinitePool = /*#__PURE__*/function () {
       _this.removePromiseFromExecutingQueue(hash);
     });
     (0, _defineProperty2["default"])(this, "removePromiseFromExecutingQueue", function (hash) {
-      _this.printLogMessage("QueueOfExecutingTask \u62FF\u6389\u4E86\u5B8C\u6210\u7684\u4EFB\u52D9 ".concat(_this.getLogMessageOfTaskHash(hash)));
+      _this.printLogMessage("56448412, 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);
@@ -1108,6 +1110,7 @@ var InfinitePool = /*#__PURE__*/function () {
           while (1) {
             switch (_context10.prev = _context10.next) {
               case 0:
+                this.printLogMessage("448984466, \u8D70\u9032\u4F86\u4E86 syncTaskDispatcher()");
                 initialTaskShouldNotRun = this.disableFirstRun && !this.isFirstTaskCompleted();
                 isExecutingTaskAlmostFull = this.queueOfExecutingTask.length >= this.maximumOfWorker - 1;
                 /** 因為走能到syncTaskDispatcher表示其中一個工作完成了, 這個瞬間不可能 === maximumOfWorker,
@@ -1116,46 +1119,46 @@ var InfinitePool = /*#__PURE__*/function () {
                 comparison = this.isFirstTaskCompleted() && isExecutingTaskAlmostFull && this.enableOfTaskSleepByInterval;
 
                 if (!(initialTaskShouldNotRun || comparison)) {
-                  _context10.next = 8;
+                  _context10.next = 9;
                   break;
                 }
 
-                _context10.next = 6;
+                _context10.next = 7;
                 return _index2.utiller.syncDelayRandom(this.taskSleepInterval.min, this.taskSleepInterval.max);
 
-              case 6:
+              case 7:
                 restInInterval = _context10.sent;
                 this.printLogMessage("4484121, \u8D70\u5230\u4E00\u5761\u7761\u89BA\u5340 enableOfTaskSleepByInterval:".concat(this.enableOfTaskSleepByInterval, " || ").concat(restInInterval, " ms"));
 
-              case 8:
+              case 9:
                 if (!this.rulesOfAppendToExecutingTask()) {
-                  _context10.next = 20;
+                  _context10.next = 21;
                   break;
                 }
 
                 taskInfo = this.getTaskInfoDependOnPriority();
 
                 if (!taskInfo) {
-                  _context10.next = 16;
+                  _context10.next = 17;
                   break;
                 }
 
                 promise = this.taskWrapper(taskInfo.task, taskInfo.hash, this.queueOfWaitingParam.shift());
                 this.removeTaskMapByHash(taskInfo.hash);
                 this.appendTaskToExecuteQueue(taskInfo.hash, promise);
-                _context10.next = 18;
+                _context10.next = 19;
                 break;
 
-              case 16:
+              case 17:
                 /** 沒有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", 20);
+                return _context10.abrupt("break", 21);
 
-              case 18:
-                _context10.next = 8;
+              case 19:
+                _context10.next = 9;
                 break;
 
-              case 20:
+              case 21:
               case "end":
                 return _context10.stop();
             }
@@ -1629,7 +1632,7 @@ var InfinitePool = /*#__PURE__*/function () {
           while (1) {
             switch (_context25.prev = _context25.next) {
               case 0:
-                pool = new InfinitePool(10);
+                pool = new InfinitePool(3);
                 tasks = _lodash["default"].range(1, 5).map(function (each) {
                   return _index2.utiller.asyncUnitTaskFunction(each);
                 });

package/package.json

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

package/template/sample.package.json

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