utiller 1.0.136 → 1.0.139
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/pooller/index.js +11 -7
- package/package.json +1 -1
- package/template/sample.package.json +1 -1
package/lib/pooller/index.js
CHANGED
|
@@ -231,7 +231,7 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
231
231
|
|
|
232
232
|
self.updateExecuteTaskState(hashOfTask);
|
|
233
233
|
assignedTask(param).then(function (result) {
|
|
234
|
-
_this.printLogMessage("984545, \u5BA2\u7AEF\u59D4\u8A17\u7684\u4EFB\u52D9,resolve\u56DE\u61C9: ".concat(result));
|
|
234
|
+
_this.printLogMessage("984545, \u5BA2\u7AEF\u59D4\u8A17\u7684\u4EFB\u52D9(TASK HASH:".concat(hashOfTask, "),resolve\u56DE\u61C9: ").concat(result));
|
|
235
235
|
|
|
236
236
|
assignedTaskResult = result;
|
|
237
237
|
isAssignedTaskCompleted = true;
|
|
@@ -244,13 +244,15 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
244
244
|
clearTimeout(timeoutHash);
|
|
245
245
|
resolve();
|
|
246
246
|
|
|
247
|
-
_this.printLogMessage("98942, taskWrapper()\u88E1\u9762\u7B2C\u4E00\u500Bpromise(\u70BA\u4E86timeout\u8A2D\u8A08)\u5B8C\u6210\u4E86");
|
|
247
|
+
_this.printLogMessage("98942,(TASK HASH:".concat(hashOfTask, ") taskWrapper()\u88E1\u9762\u7B2C\u4E00\u500Bpromise(\u70BA\u4E86timeout\u8A2D\u8A08)\u5B8C\u6210\u4E86"));
|
|
248
248
|
});
|
|
249
249
|
}).then(function (result) {
|
|
250
250
|
/** 能走到這裡,代表沒有timeout的狀況下,執行了委託的任務 */
|
|
251
251
|
if (!isAssignedTaskCompleted) {
|
|
252
252
|
throw assignedTaskError;
|
|
253
253
|
} else {
|
|
254
|
+
_this.printLogMessage("9894841,(TASK HASH:".concat(hashOfTask, ") taskWrapper()\u88E1\u9762\u7B2C\u4E8C\u500Bpromise(\u6574\u500B\u4EFB\u52D9)\u5B8C\u6210\u4E86"));
|
|
255
|
+
|
|
254
256
|
return "".concat(_this.getLogMessageOfTaskHash(hashOfTask), " completed");
|
|
255
257
|
}
|
|
256
258
|
})["catch"](function (error) {
|
|
@@ -680,11 +682,11 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
680
682
|
while (1) {
|
|
681
683
|
switch (_context7.prev = _context7.next) {
|
|
682
684
|
case 0:
|
|
683
|
-
tasks = self.queueOfExecutingTask
|
|
685
|
+
tasks = _lodash["default"].filter(self.queueOfExecutingTask, function (each) {
|
|
684
686
|
return _lodash["default"].isEqual(each.state, "NOT");
|
|
685
687
|
}).map(function (each) {
|
|
686
|
-
var
|
|
687
|
-
return
|
|
688
|
+
var taskWrapper = each.task;
|
|
689
|
+
return taskWrapper();
|
|
688
690
|
});
|
|
689
691
|
/** Util.appendInfo(`\n\n正要執行的隊列`,self.queueOfExecutingTask) */
|
|
690
692
|
|
|
@@ -793,6 +795,8 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
793
795
|
var callbackWrapper = _this.mapOfHashNCallbackWrapper[hash];
|
|
794
796
|
|
|
795
797
|
if (callbackWrapper !== undefined) {
|
|
798
|
+
_this.printLogMessage("5644153248, removeResolveOrRejectPromiseByHash \u62FF\u6389\u4E86\u5B8C\u6210\u7684\u4EFB\u52D9(".concat(_this.getLogMessageOfTaskHash(hash), ")"));
|
|
799
|
+
|
|
796
800
|
callbackWrapper(result);
|
|
797
801
|
delete _this.mapOfHashNCallbackWrapper[hash];
|
|
798
802
|
}
|
|
@@ -800,7 +804,7 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
800
804
|
_this.removePromiseFromExecutingQueue(hash);
|
|
801
805
|
});
|
|
802
806
|
(0, _defineProperty2["default"])(this, "removePromiseFromExecutingQueue", function (hash) {
|
|
803
|
-
_this.printLogMessage("QueueOfExecutingTask \u62FF\u6389\u4E86\u5B8C\u6210\u7684\u4EFB\u52D9 ".concat(_this.getLogMessageOfTaskHash(hash)));
|
|
807
|
+
_this.printLogMessage("56448412, QueueOfExecutingTask \u62FF\u6389\u4E86\u5B8C\u6210\u7684\u4EFB\u52D9 ".concat(_this.getLogMessageOfTaskHash(hash)));
|
|
804
808
|
|
|
805
809
|
_lodash["default"].remove(_this.queueOfExecutingTask, function (each) {
|
|
806
810
|
return _lodash["default"].isEqual(hash, each.hash);
|
|
@@ -1627,7 +1631,7 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
1627
1631
|
while (1) {
|
|
1628
1632
|
switch (_context25.prev = _context25.next) {
|
|
1629
1633
|
case 0:
|
|
1630
|
-
pool = new InfinitePool(
|
|
1634
|
+
pool = new InfinitePool(3);
|
|
1631
1635
|
tasks = _lodash["default"].range(1, 5).map(function (each) {
|
|
1632
1636
|
return _index2.utiller.asyncUnitTaskFunction(each);
|
|
1633
1637
|
});
|
package/package.json
CHANGED