utiller 1.0.83 → 1.0.86

package/lib/pooller/index.js

@@ -59,6 +59,8 @@ var InfinitePool = /*#__PURE__*/function () {
 
   /** 如果要讓每個pool不會因為task掉進catch 而被中斷, 就必須加入taskFailHandler*/
 
+  /** 如果設定sleep interval, 可以加這個參數要不要先執行第一次 再開始 interval 機制*/
+
   /** 用於 runByParam */
 
   /** runByTimes 的次數 */
@@ -90,8 +92,8 @@ var InfinitePool = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "enableOfTaskTimeout", _configerer.configerer.POOLLER_ENABLE_TIMEOUT);
     (0, _defineProperty2["default"])(this, "timeOfTaskTimeout", _configerer.configerer.POOLLER_TASK_TIMEOUT_DEFAULT);
     (0, _defineProperty2["default"])(this, "handlerOfAssignTaskFail", undefined);
-    (0, _defineProperty2["default"])(this, "maxWorker", void 0);
-    (0, _defineProperty2["default"])(this, "ignoreFirstRun", false);
+    (0, _defineProperty2["default"])(this, "maximumOfWorker", void 0);
+    (0, _defineProperty2["default"])(this, "disableFirstRun", false);
     (0, _defineProperty2["default"])(this, "queueOfWaitingParam", []);
     (0, _defineProperty2["default"])(this, "countsOfRunByTimes", -1);
     (0, _defineProperty2["default"])(this, "queueOfAssignTask", {});
@@ -348,7 +350,7 @@ var InfinitePool = /*#__PURE__*/function () {
               throw new _exceptioner["default"](4006, "type of task is ===> ".concat((0, _typeof2["default"])(task)));
 
             case 12:
-              _this.enableTaskSleepInterval(!!interval, interval);
+              _this.enableTaskSleepInterval(_lodash["default"].isNumber(interval), interval);
 
               _this.setState(_configerer.configerer.POOLLER_STATE.RUN_INFINITE);
 
@@ -636,7 +638,7 @@ var InfinitePool = /*#__PURE__*/function () {
       return "TASK HASH: ".concat(hash);
     });
     (0, _defineProperty2["default"])(this, "showState", function () {
-      _index2.utiller.appendInfo(_this.getPoollerLogFormat("workerCount: ".concat(_this.maxWorker)));
+      _index2.utiller.appendInfo(_this.getPoollerLogFormat("workerCount: ".concat(_this.maximumOfWorker)));
 
       _index2.utiller.appendInfo(_this.getPoollerLogFormat("taskQueue(\u9084\u5728\u6392\u968A\u7684Task): ".concat(_this.getCountOfAssignTaskInQueue())));
 
@@ -718,7 +720,7 @@ var InfinitePool = /*#__PURE__*/function () {
                   _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);
+                  if (_this.queueOfExecutingTask.length > _this.maximumOfWorker) _this.printLogMessage("4512214 \u4E00\u5B9A\u662F\u6539\u58DE\u4E86!!!!!!!!!!, ".concat(_this.getLogMessageOfExecutingTaskQueueCount, " "), true);
 
                 case 15:
                 case "end":
@@ -825,7 +827,7 @@ var InfinitePool = /*#__PURE__*/function () {
 
       return _this;
     });
-    this.maxWorker = maxWorkers;
+    this.maximumOfWorker = maxWorkers;
     this.setPoolId(_lodash["default"].toString(name));
 
     var _iterator4 = _createForOfIteratorHelper(_configerer.configerer.POOLLER_PRIORITY),
@@ -886,7 +888,7 @@ var InfinitePool = /*#__PURE__*/function () {
   }, {
     key: "setWorker",
     value: function setWorker(counts) {
-      this.maxWorker = counts;
+      this.maximumOfWorker = counts;
     }
   }, {
     key: "cleanTaskInterval",
@@ -1042,10 +1044,10 @@ var InfinitePool = /*#__PURE__*/function () {
     /** 如果設定interval, 第一個run不要執行的話,就設定true, default是false */
 
   }, {
-    key: "setIgnoreFirstRun",
-    value: function setIgnoreFirstRun() {
-      var ignore = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      this.ignoreFirstRun = ignore;
+    key: "setDisableFirstRun",
+    value: function setDisableFirstRun() {
+      var disable = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      this.disableFirstRun = disable;
     }
     /** 加上一個 被動式啟動, 不然一直while() run, 可能有效能上的問題,現階端只支援RUN_BY_TASK */
 
@@ -1070,7 +1072,7 @@ var InfinitePool = /*#__PURE__*/function () {
   }, {
     key: "isExecutingQueueFull",
     value: function isExecutingQueueFull() {
-      return _lodash["default"].size(this.queueOfExecutingTask) >= this.maxWorker;
+      return _lodash["default"].size(this.queueOfExecutingTask) >= this.maximumOfWorker;
     }
   }, {
     key: "isTaskQueueEmpty",
@@ -1083,54 +1085,59 @@ var InfinitePool = /*#__PURE__*/function () {
     key: "syncTaskDispatcher",
     value: function () {
       var _syncTaskDispatcher = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
-        var initialTaskShouldNotRun, restInInterval, taskInfo, promise;
+        var initialTaskShouldNotRun, isExecutingTaskAlmostFull, comparison, restInInterval, taskInfo, promise;
         return _regenerator["default"].wrap(function _callee10$(_context10) {
           while (1) {
             switch (_context10.prev = _context10.next) {
               case 0:
-                initialTaskShouldNotRun = this.ignoreFirstRun && !this.isFirstTaskCompleted();
+                initialTaskShouldNotRun = this.disableFirstRun && !this.isFirstTaskCompleted();
+                isExecutingTaskAlmostFull = this.queueOfExecutingTask.length >= this.maximumOfWorker - 1;
+                /** 因為走能到syncTaskDispatcher表示其中一個工作完成了, 這個瞬間不可能 === maximumOfWorker,
+                 *  所以必須減1, 除非這個syncTaskDispatcher是單獨一個線程 */
+
+                comparison = this.isFirstTaskCompleted() && isExecutingTaskAlmostFull && this.enableOfTaskSleepByInterval;
 
-                if (!(initialTaskShouldNotRun || this.isFirstTaskCompleted() && this.isExecutingQueueFull() && this.enableOfTaskSleepByInterval)) {
-                  _context10.next = 6;
+                if (!(initialTaskShouldNotRun || comparison)) {
+                  _context10.next = 8;
                   break;
                 }
 
-                _context10.next = 4;
+                _context10.next = 6;
                 return _index2.utiller.syncDelayRandom(this.taskSleepInterval.min, this.taskSleepInterval.max);
 
-              case 4:
+              case 6:
                 restInInterval = _context10.sent;
                 this.printLogMessage("4484121, \u8D70\u5230\u4E00\u5761\u7761\u89BA\u5340 enableOfTaskSleepByInterval:".concat(this.enableOfTaskSleepByInterval, " || ").concat(restInInterval, " ms"));
 
-              case 6:
+              case 8:
                 if (!this.rulesOfAppendToExecutingTask()) {
-                  _context10.next = 18;
+                  _context10.next = 20;
                   break;
                 }
 
                 taskInfo = this.getTaskInfoDependOnPriority();
 
                 if (!taskInfo) {
-                  _context10.next = 14;
+                  _context10.next = 16;
                   break;
                 }
 
                 promise = this.taskWrapper(taskInfo.task, taskInfo.hash, this.queueOfWaitingParam.shift());
                 this.removeTaskMapByHash(taskInfo.hash);
                 this.appendTaskToExecuteQueue(taskInfo.hash, promise);
-                _context10.next = 16;
+                _context10.next = 18;
                 break;
 
-              case 14:
+              case 16:
                 /** 沒有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);
+                return _context10.abrupt("break", 20);
 
-              case 16:
-                _context10.next = 6;
+              case 18:
+                _context10.next = 8;
                 break;
 
-              case 18:
+              case 20:
               case "end":
                 return _context10.stop();
             }
@@ -1317,7 +1324,7 @@ var InfinitePool = /*#__PURE__*/function () {
 
                 pool = new InfinitePool(2);
                 pool.runInfiniteInBackground(myAsyncTask, 5000);
-                pool.setIgnoreFirstRun(true);
+                pool.setDisableFirstRun(true);
                 pool.setTaskFailHandler(function (error) {
                   console.error(error.message);
                 });
@@ -1647,7 +1654,7 @@ var InfinitePool = /*#__PURE__*/function () {
               case 0:
                 _persistTone = function _persistTone3() {
                   _persistTone = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee27() {
-                    var sign;
+                    var sign, time;
                     return _regenerator["default"].wrap(function _callee27$(_context27) {
                       while (1) {
                         switch (_context27.prev = _context27.next) {
@@ -1655,34 +1662,28 @@ var InfinitePool = /*#__PURE__*/function () {
                             _context27.prev = 0;
                             sign = _index2.utiller.getRandomHash(20);
                             _context27.next = 4;
-                            return _index2.utiller.syncDelay(1000);
+                            return _index2.utiller.syncDelayRandom(1, 10);
 
                           case 4:
-                            _context27.t0 = _index2.utiller;
-                            _context27.t1 = "\u6C92\u6709TONE\u53EF\u4EE5\u4E0B\u8F09\u4E86....\u96A8\u6A5F\u7761\u500B";
-                            _context27.next = 8;
-                            return _index2.utiller.syncDelayRandom(1500, 3500);
+                            time = _context27.sent;
 
-                          case 8:
-                            _context27.t2 = _context27.sent;
-                            _context27.t3 = _context27.t1.concat.call(_context27.t1, _context27.t2);
+                            _index2.utiller.appendInfo("".concat(time, " ms, yoyoyo ").concat(sign)); // Util.appendInfo(`沒有TONE可以下載了....隨機睡個${await Util.syncDelayRandom(1500, 3500)}`)
 
-                            _context27.t0.appendInfo.call(_context27.t0, _context27.t3);
 
                             return _context27.abrupt("return", "\u4EFB\u52D9ID:".concat(sign));
 
-                          case 14:
-                            _context27.prev = 14;
-                            _context27.t4 = _context27["catch"](0);
+                          case 9:
+                            _context27.prev = 9;
+                            _context27.t0 = _context27["catch"](0);
 
-                            _index2.utiller.appendError(_context27.t4.message);
+                            _index2.utiller.appendError(_context27.t0.message);
 
-                          case 17:
+                          case 12:
                           case "end":
                             return _context27.stop();
                         }
                       }
-                    }, _callee27, null, [[0, 14]]);
+                    }, _callee27, null, [[0, 9]]);
                   }));
                   return _persistTone.apply(this, arguments);
                 };
@@ -1692,10 +1693,10 @@ var InfinitePool = /*#__PURE__*/function () {
                 };
 
                 poollers = [];
-                pool = new InfinitePool(2);
+                pool = new InfinitePool(3);
                 pool.setPoolId("tone fetch");
-                pool.setIgnoreFirstRun(false);
-                pool.runInfiniteInBackground(persistTone, 3000);
+                pool.setDisableFirstRun(true);
+                pool.runInfiniteInBackground(persistTone, 5000);
                 pool.setTaskFailHandler(function (error) {
                   return _index2.utiller.appendError("5165 error ".concat(error.message));
                 });
@@ -1703,11 +1704,11 @@ var InfinitePool = /*#__PURE__*/function () {
                 isRequiredTerminate = false;
                 setTimeout(function () {
                   isRequiredTerminate = true;
-                }, 10000);
+                }, 20000);
 
               case 11:
                 if (!true) {
-                  _context28.next = 44;
+                  _context28.next = 43;
                   break;
                 }
 
@@ -1720,28 +1721,25 @@ var InfinitePool = /*#__PURE__*/function () {
 
               case 15:
                 random = _context28.sent;
-
-                _index2.utiller.appendInfo("\u4E3B\u7DDA\u7A0B\u9084\u5728\u52AA\u4E2D\u5DE5\u4F5C\u4E2D, \u4F11\u606F\u4E00\u6BC0\u5152 ".concat(random, " mms"));
-
-                _context28.next = 19;
+                _context28.next = 18;
                 return _index2.utiller.syncDelay(random);
 
-              case 19:
+              case 18:
                 if (!isRequiredTerminate) {
-                  _context28.next = 42;
+                  _context28.next = 41;
                   break;
                 }
 
                 _index2.utiller.appendInfo("\u4E3B\u7DDA\u7A0B\u6536\u5230\u95DC\u9589\u6307\u4EE4...");
 
                 _iterator6 = _createForOfIteratorHelper(poollers);
-                _context28.prev = 22;
+                _context28.prev = 21;
 
                 _iterator6.s();
 
-              case 24:
+              case 23:
                 if ((_step6 = _iterator6.n()).done) {
-                  _context28.next = 33;
+                  _context28.next = 32;
                   break;
                 }
 
@@ -1749,48 +1747,48 @@ var InfinitePool = /*#__PURE__*/function () {
 
                 _index2.utiller.appendInfo("POOLER ".concat(pooller.getPoolId(), " \u6B63\u5728\u95DC\u9589\u4E2D"));
 
-                _context28.next = 29;
+                _context28.next = 28;
                 return pooller.stopInBackground();
 
-              case 29:
+              case 28:
                 pooller.showState();
 
                 _index2.utiller.appendInfo("POOLER ".concat(pooller.getPoolId(), " \u95DC\u9589\u6210\u529F!"));
 
-              case 31:
-                _context28.next = 24;
+              case 30:
+                _context28.next = 23;
                 break;
 
-              case 33:
-                _context28.next = 38;
+              case 32:
+                _context28.next = 37;
                 break;
 
-              case 35:
-                _context28.prev = 35;
-                _context28.t0 = _context28["catch"](22);
+              case 34:
+                _context28.prev = 34;
+                _context28.t0 = _context28["catch"](21);
 
                 _iterator6.e(_context28.t0);
 
-              case 38:
-                _context28.prev = 38;
+              case 37:
+                _context28.prev = 37;
 
                 _iterator6.f();
 
-                return _context28.finish(38);
+                return _context28.finish(37);
 
-              case 41:
-                return _context28.abrupt("break", 44);
+              case 40:
+                return _context28.abrupt("break", 43);
 
-              case 42:
+              case 41:
                 _context28.next = 11;
                 break;
 
-              case 44:
+              case 43:
               case "end":
                 return _context28.stop();
             }
           }
-        }, _callee28, null, [[22, 35, 38, 41]]);
+        }, _callee28, null, [[21, 34, 37, 40]]);
       }));
 
       function exampleOfInfiniteUnStopLoopingIssue() {

package/lib/utiller/nodeutiller.js

@@ -748,7 +748,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "copySingleFile",
     value: function copySingleFile(from, dest, fileName) {
       var force = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-      var destination = _lodash["default"].isEmpty(fileName) ? dest : _path5["default"].join(dest, fileName);
+      var destination = !_lodash["default"].isString(fileName) ? dest : _path5["default"].join(dest, fileName);
       if (_fs["default"].existsSync(destination) && !force) throw new _index2["default"](8006, destination);
 
       _fs["default"].copyFileSync(from, destination);
@@ -1128,21 +1128,21 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
   }, {
     key: "copySingleFileConservative",
-    value: function copySingleFileConservative(pathOfDestination, latestFile) {
+    value: function copySingleFileConservative(pathOfDestinationFolder, latestFile) {
       if (this.isEmptyFile(latestFile.absolute)) {
         this.appendInfo("".concat(latestFile.absolute, " is empty file, ignore copy behavior"));
         return;
       }
 
-      if (!_fs["default"].existsSync(pathOfDestination)) {
-        this.appendInfo("".concat(pathOfDestination, " is not exist, easy to override"));
-      } else if (_fs["default"].existsSync(pathOfDestination) && this.getFileLastModifiedTime(pathOfDestination) < latestFile.lastModifiedTime + 3600) {
-        this.appendInfo("".concat(pathOfDestination, " is the latest, ignore this run"));
+      if (!_fs["default"].existsSync(pathOfDestinationFolder)) {
+        this.appendInfo("".concat(pathOfDestinationFolder, " is not exist, easy to override"));
+      } else if (_fs["default"].existsSync(pathOfDestinationFolder) && this.getFileLastModifiedTime(pathOfDestinationFolder) > latestFile.lastModifiedTime) {
+        this.appendInfo("".concat(pathOfDestinationFolder, " is the latest, ignore this run"));
         return;
       }
 
-      this.persistByPath(this.getFolderPathOfSpecificPath(pathOfDestination));
-      this.copySingleFile(latestFile.absolute, pathOfDestination, undefined, true);
+      this.persistByPath(this.getFolderPathOfSpecificPath(pathOfDestinationFolder));
+      this.copySingleFile(latestFile.absolute, pathOfDestinationFolder, undefined, true);
     }
   }, {
     key: "syncDeleteFile",

package/package.json

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

package/template/sample.package.json

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