@pisell/core 1.0.31 → 1.1.1

package/es/tasks/index.js

@@ -1,7 +1,4 @@
-var _excluded = ["queueId", "module"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -29,10 +26,7 @@ export var TasksManager = /*#__PURE__*/function () {
     var _this = this;
     _classCallCheck(this, TasksManager);
     _defineProperty(this, "taskFunctions", void 0);
-    _defineProperty(this, "tasks", {
-      // 内置模块，  定时任务专用
-      scheduledTasks: {}
-    });
+    _defineProperty(this, "tasks", void 0);
     _defineProperty(this, "app", void 0);
     _defineProperty(this, "db", void 0);
     _defineProperty(this, "useTasks", useTasks);
@@ -240,195 +234,6 @@ export var TasksManager = /*#__PURE__*/function () {
       }
       _this.timerIds = _toConsumableArray(_timerIds || []);
     });
-    /**
-     * @title: 计算下一次执行时间
-     * @description: 根据定时任务配置计算下一次执行时间
-     * @param {Task} task
-     * @return {string | null} 下一次执行时间
-     */
-    _defineProperty(this, "calculateNextExecuteTime", function (task) {
-      if (!task.scheduled) {
-        return null;
-      }
-      var scheduled = task.scheduled,
-        scheduledResult = task.scheduledResult;
-      var now = dayjs();
-
-      // 如果有结束时间，检查是否已超过
-      if (scheduled.endAt && now.isAfter(dayjs(scheduled.endAt))) {
-        return null;
-      }
-
-      // 如果 executeAt 是数组，找到第一个未来的时间点
-      if (Array.isArray(scheduled.executeAt)) {
-        var futureTime = scheduled.executeAt.map(function (time) {
-          return dayjs(time);
-        }).filter(function (time) {
-          return time.isAfter(now);
-        }).sort(function (a, b) {
-          return a.valueOf() - b.valueOf();
-        })[0];
-        if (futureTime) {
-          return futureTime.format("YYYY-MM-DD HH:mm:ss");
-        }
-
-        // 如果所有时间点都已过，且设置了重复
-        if (!scheduled.repeat) {
-          return null;
-        }
-      }
-
-      // 如果是重复任务，计算下一次执行时间
-      if (scheduled.repeat && scheduledResult !== null && scheduledResult !== void 0 && scheduledResult.nextExecuteTime) {
-        var lastExecuteTime = dayjs(scheduledResult.nextExecuteTime);
-        var interval = scheduled.repeatInterval || 1;
-        var nextTime = lastExecuteTime;
-        switch (scheduled.repeatType) {
-          case 'daily':
-            nextTime = lastExecuteTime.add(interval, 'day');
-            break;
-          case 'weekly':
-            nextTime = lastExecuteTime.add(interval, 'week');
-            break;
-          case 'monthly':
-            nextTime = lastExecuteTime.add(interval, 'month');
-            break;
-          case 'yearly':
-            nextTime = lastExecuteTime.add(interval, 'year');
-            break;
-          default:
-            nextTime = lastExecuteTime.add(interval, 'day');
-        }
-
-        // 检查是否超过结束时间
-        if (scheduled.endAt && nextTime.isAfter(dayjs(scheduled.endAt))) {
-          return null;
-        }
-        return nextTime.format("YYYY-MM-DD HH:mm:ss");
-      }
-
-      // 首次执行，返回 executeAt 指定的时间
-      var executeTime = Array.isArray(scheduled.executeAt) ? scheduled.executeAt[0] : scheduled.executeAt;
-      return dayjs(executeTime).format("YYYY-MM-DD HH:mm:ss");
-    });
-    /**
-     * @title: 启动定时任务
-     * @description: 在特定时间点执行任务（仅在 scheduledTasks 模块中生效）
-     * @param {Task} task
-     * @return {*}
-     */
-    _defineProperty(this, "startScheduledTask", function (task) {
-      if (!task.scheduled) {
-        console.log("Tasks--->", "不是定时任务");
-        return;
-      }
-
-      // 安全检查：确保任务属于 scheduledTasks 模块
-      if (task.module !== 'scheduledTasks') {
-        console.warn("Tasks--->", "\u5B9A\u65F6\u4EFB\u52A1\u53EA\u5728 scheduledTasks \u6A21\u5757\u4E2D\u751F\u6548\uFF0C\u4EFB\u52A1 ".concat(task.id, " \u5C06\u4F5C\u4E3A\u666E\u901A\u4EFB\u52A1\u6267\u884C"));
-        return;
-      }
-      var nextExecuteTime = _this.calculateNextExecuteTime(task);
-      if (!nextExecuteTime) {
-        console.log("Tasks--->", "定时任务已完成或无下次执行时间", task);
-        // 删除已完成的定时任务
-        _this.deleteTask({
-          module: task.module,
-          queueId: task.queueId,
-          taskId: task.id
-        });
-        return;
-      }
-      var now = dayjs();
-      var executeTime = dayjs(nextExecuteTime);
-      var delay = executeTime.diff(now);
-      if (delay < 0) {
-        console.log("Tasks--->", "执行时间已过，跳过此次执行");
-        // 如果是重复任务，计算下一次执行时间
-        if (task.scheduled.repeat) {
-          var _task$scheduledResult;
-          var _task = _objectSpread({}, task);
-          _task.scheduledResult = {
-            count: ((_task$scheduledResult = _task.scheduledResult) === null || _task$scheduledResult === void 0 ? void 0 : _task$scheduledResult.count) || 0,
-            nextExecuteTime: nextExecuteTime
-          };
-          var newTask = _this.updateTask({
-            module: task.module,
-            queueId: task.queueId,
-            taskId: task.id,
-            other: _task
-          });
-          if (newTask) {
-            _this.startScheduledTask(newTask);
-          }
-        } else {
-          _this.deleteTask({
-            module: task.module,
-            queueId: task.queueId,
-            taskId: task.id
-          });
-        }
-        return;
-      }
-      console.log("Tasks--->", "\u5B9A\u65F6\u4EFB\u52A1\u5C06\u5728 ".concat(nextExecuteTime, " \u6267\u884C (").concat(delay, "ms \u540E)"), task);
-
-      // 创建定时器
-      var timerId = setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _task2$scheduledResul, _task$scheduled, _task2, _newTask;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.prev = 0;
-              _context4.next = 3;
-              return _this.runTask(task);
-            case 3:
-              console.log("Tasks--->", "定时任务执行完成", task);
-              _task2 = _objectSpread({}, task);
-              _task2.scheduledResult = {
-                count: (((_task2$scheduledResul = _task2.scheduledResult) === null || _task2$scheduledResul === void 0 ? void 0 : _task2$scheduledResul.count) || 0) + 1,
-                timerId: timerId,
-                nextExecuteTime: nextExecuteTime
-              };
-
-              // 如果是重复任务，继续调度下一次执行
-              if ((_task$scheduled = task.scheduled) !== null && _task$scheduled !== void 0 && _task$scheduled.repeat) {
-                _newTask = _this.updateTask({
-                  module: task.module,
-                  queueId: task.queueId,
-                  taskId: task.id,
-                  other: _task2
-                });
-                if (_newTask) {
-                  _this.startScheduledTask(_newTask);
-                }
-              } else {
-                // 一次性任务执行完成后删除
-                _this.deleteTask({
-                  module: task.module,
-                  queueId: task.queueId,
-                  taskId: task.id
-                });
-              }
-              _context4.next = 13;
-              break;
-            case 9:
-              _context4.prev = 9;
-              _context4.t0 = _context4["catch"](0);
-              _this.clearTaskTimer({
-                timerId: timerId
-              });
-              console.error("定时任务执行异常", _context4.t0);
-            case 13:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, null, [[0, 9]]);
-      })), delay);
-      _this.timerIds.push({
-        taskId: task.id,
-        timerId: timerId
-      });
-    });
     /**
      * @title: 启动轮询
      * @description: 根据轮询间隔定期执行任务
@@ -442,13 +247,13 @@ export var TasksManager = /*#__PURE__*/function () {
       }
 
       // 创建轮询定时器
-      var timerId = setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var timerId = setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var _task$pollingResult, _task, newTask;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context5.prev = 0;
-              _context5.next = 3;
+              _context4.prev = 0;
+              _context4.next = 3;
               return _this.runTask(task);
             case 3:
               console.log("轮询任务", task);
@@ -464,26 +269,26 @@ export var TasksManager = /*#__PURE__*/function () {
                 other: _task
               });
               if (newTask) {
-                _context5.next = 9;
+                _context4.next = 9;
                 break;
               }
-              return _context5.abrupt("return");
+              return _context4.abrupt("return");
             case 9:
               _this.startPolling(newTask);
-              _context5.next = 16;
+              _context4.next = 16;
               break;
             case 12:
-              _context5.prev = 12;
-              _context5.t0 = _context5["catch"](0);
+              _context4.prev = 12;
+              _context4.t0 = _context4["catch"](0);
               _this.clearTaskTimer({
                 timerId: timerId
               });
-              console.error("轮询任务异常", _context5.t0);
+              console.error("轮询任务异常", _context4.t0);
             case 16:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, null, [[0, 12]]);
+        }, _callee4, null, [[0, 12]]);
       })), task.polling.interval);
       _this.timerIds.push({
         taskId: task.id,
@@ -539,9 +344,7 @@ export var TasksManager = /*#__PURE__*/function () {
     }
     this.app = app;
     this.taskFunctions = new Map();
-    this.tasks = {
-      scheduledTasks: {}
-    };
+    this.tasks = {};
     this.db = app.dbManager;
     this.timerIds = [];
   }
@@ -560,9 +363,9 @@ export var TasksManager = /*#__PURE__*/function () {
     key: "addTaskFunctions",
     value: function addTaskFunctions(tasks) {
       var _this2 = this;
-      tasks.forEach(function (_ref6) {
-        var name = _ref6.name,
-          fun = _ref6.fun;
+      tasks.forEach(function (_ref5) {
+        var name = _ref5.name,
+          fun = _ref5.fun;
         _this2.taskFunctions.set(name, fun);
       });
     }
@@ -586,15 +389,15 @@ export var TasksManager = /*#__PURE__*/function () {
   }, {
     key: "init",
     value: function () {
-      var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var tasks;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context6.next = 2;
+              _context5.next = 2;
               return this.loadTaskQueueFromLocal();
             case 2:
-              tasks = _context6.sent;
+              tasks = _context5.sent;
               if (tasks) {
                 console.log("initTasks", tasks);
                 // this.tasks = tasks;
@@ -603,9 +406,9 @@ export var TasksManager = /*#__PURE__*/function () {
               }
             case 4:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
-        }, _callee6, this);
+        }, _callee5, this);
       }));
       function init() {
         return _init.apply(this, arguments);
@@ -623,42 +426,22 @@ export var TasksManager = /*#__PURE__*/function () {
      * @Date: 2024-09-26 13:52
      */
     function () {
-      var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(payload) {
-        var _this$tasks$module2;
-        var queueId, module, callback, currentQueue, _currentQueue$progres, _currentQueue$progres2, taskQueueStatus, taskQueue, errorTaskIds, _this$getTaskQueue, tasksToExecute, _iterator3, _step3, task, _yield$this$runTask, status, _task$pollingResult2, _other;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payload) {
+        var queueId, module, callback, taskQueueStatus, taskQueue, errorTaskIds, _this$getTaskQueue, tasksToExecute, _iterator3, _step3, task, _yield$this$runTask, status, _task$pollingResult2, _other;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              queueId = payload.queueId, module = payload.module, callback = payload.callback; // 检查任务队列是否正在执行
-              currentQueue = (_this$tasks$module2 = this.tasks[module]) === null || _this$tasks$module2 === void 0 ? void 0 : _this$tasks$module2[queueId];
-              if (!(currentQueue !== null && currentQueue !== void 0 && currentQueue.isRunning)) {
-                _context7.next = 5;
-                break;
-              }
-              console.warn("Tasks--->", "\u4EFB\u52A1\u961F\u5217 [".concat(module, "/").concat(queueId, "] \u6B63\u5728\u6267\u884C\u4E2D\uFF0C\u5DF2\u62E6\u622A\u91CD\u590D\u8C03\u7528\u3002"), "\u5F53\u524D\u8FDB\u5EA6: ".concat(((_currentQueue$progres = currentQueue.progress) === null || _currentQueue$progres === void 0 ? void 0 : _currentQueue$progres.completed) || 0, "/").concat(((_currentQueue$progres2 = currentQueue.progress) === null || _currentQueue$progres2 === void 0 ? void 0 : _currentQueue$progres2.total) || 0), "\u5982\u9700\u91CD\u65B0\u6267\u884C\uFF0C\u8BF7\u7B49\u5F85\u5F53\u524D\u4EFB\u52A1\u961F\u5217\u6267\u884C\u5B8C\u6210\u3002");
-              return _context7.abrupt("return");
-            case 5:
-              // 标记队列为执行中
-              this.updateQueueRunningState({
-                module: module,
-                queueId: queueId,
-                isRunning: true,
-                lastRunAt: dayjs().format("YYYY-MM-DD HH:mm:ss")
-              });
-              console.log("Tasks--->", "\u4EFB\u52A1\u961F\u5217 [".concat(module, "/").concat(queueId, "] \u5F00\u59CB\u6267\u884C"));
-
-              //@ts-ignore  当前任务队列
+              queueId = payload.queueId, module = payload.module, callback = payload.callback; //@ts-ignore  当前任务队列
               taskQueueStatus = "";
-              _context7.prev = 8;
-            case 9:
+            case 2:
               if (!(taskQueueStatus !== "completed")) {
-                _context7.next = 72;
+                _context6.next = 61;
                 break;
               }
               taskQueue = this.getTaskQueue(payload);
               errorTaskIds = [];
               if (!(taskQueue && taskQueue.length)) {
-                _context7.next = 62;
+                _context6.next = 51;
                 break;
               }
               // 只执行未执行（pending）或失败（failure）的任务
@@ -667,17 +450,17 @@ export var TasksManager = /*#__PURE__*/function () {
               });
               console.log("Tasks--->", "需要执行的任务", tasksToExecute);
               _iterator3 = _createForOfIteratorHelper(tasksToExecute);
-              _context7.prev = 16;
+              _context6.prev = 9;
               _iterator3.s();
-            case 18:
+            case 11:
               if ((_step3 = _iterator3.n()).done) {
-                _context7.next = 49;
+                _context6.next = 38;
                 break;
               }
               task = _step3.value;
-              _context7.prev = 20;
+              _context6.prev = 13;
               if (!(task.retries !== undefined && task.maxRetries !== undefined && task.retries < task.maxRetries)) {
-                _context7.next = 40;
+                _context6.next = 29;
                 break;
               }
               // 标记任务为执行中
@@ -691,31 +474,23 @@ export var TasksManager = /*#__PURE__*/function () {
                 }
               });
 
-              // 定时任务（仅在 scheduledTasks 模块中生效）
-              if (!(task.scheduled && module === 'scheduledTasks')) {
-                _context7.next = 28;
-                break;
-              }
-              this.startScheduledTask(task);
-              _context7.next = 37;
-              break;
-            case 28:
+              // 轮询任务
               if (!task.polling) {
-                _context7.next = 32;
+                _context6.next = 21;
                 break;
               }
               this.startPolling(task);
-              _context7.next = 37;
+              _context6.next = 26;
               break;
-            case 32:
-              _context7.next = 34;
+            case 21:
+              _context6.next = 23;
               return this.runTask(task);
-            case 34:
-              _yield$this$runTask = _context7.sent;
+            case 23:
+              _yield$this$runTask = _context6.sent;
               status = _yield$this$runTask.status;
               // 标记任务状态
               task.status = status;
-            case 37:
+            case 26:
               // 成功: 删除任务
               if (task.status === "success") {
                 if ((_task$pollingResult2 = task.pollingResult) !== null && _task$pollingResult2 !== void 0 && _task$pollingResult2.timerId) {}
@@ -739,9 +514,9 @@ export var TasksManager = /*#__PURE__*/function () {
                   other: _other
                 });
               }
-              _context7.next = 42;
+              _context6.next = 31;
               break;
-            case 40:
+            case 29:
               console.log("Tasks--->", "任务没有重试次数，需要删除", task);
               // 如果任务没有重试次数，则删除任务
               this.deleteTask({
@@ -749,28 +524,28 @@ export var TasksManager = /*#__PURE__*/function () {
                 queueId: queueId,
                 taskId: task.id
               });
-            case 42:
-              _context7.next = 47;
+            case 31:
+              _context6.next = 36;
               break;
-            case 44:
-              _context7.prev = 44;
-              _context7.t0 = _context7["catch"](20);
-              console.error("任务异常", _context7.t0);
-            case 47:
-              _context7.next = 18;
+            case 33:
+              _context6.prev = 33;
+              _context6.t0 = _context6["catch"](13);
+              console.error("任务异常", _context6.t0);
+            case 36:
+              _context6.next = 11;
               break;
-            case 49:
-              _context7.next = 54;
+            case 38:
+              _context6.next = 43;
               break;
-            case 51:
-              _context7.prev = 51;
-              _context7.t1 = _context7["catch"](16);
-              _iterator3.e(_context7.t1);
-            case 54:
-              _context7.prev = 54;
+            case 40:
+              _context6.prev = 40;
+              _context6.t1 = _context6["catch"](9);
+              _iterator3.e(_context6.t1);
+            case 43:
+              _context6.prev = 43;
               _iterator3.f();
-              return _context7.finish(54);
-            case 57:
+              return _context6.finish(43);
+            case 46:
               taskQueueStatus = (_this$getTaskQueue = this.getTaskQueue(payload)) !== null && _this$getTaskQueue !== void 0 && _this$getTaskQueue.some(function (task) {
                 return task.status === "failure";
               }) ? "uncompleted" : "completed";
@@ -780,13 +555,13 @@ export var TasksManager = /*#__PURE__*/function () {
                 status: taskQueueStatus
               });
               console.log("Tasks--->", "任务队列执行完成", taskQueue);
-              _context7.next = 63;
+              _context6.next = 52;
               break;
-            case 62:
+            case 51:
               taskQueueStatus = "completed";
-            case 63:
+            case 52:
               if (!(taskQueueStatus === "uncompleted")) {
-                _context7.next = 69;
+                _context6.next = 58;
                 break;
               }
               this.app.logger.addLog({
@@ -797,34 +572,24 @@ export var TasksManager = /*#__PURE__*/function () {
                   errorTaskIds: errorTaskIds
                 }
               });
-              _context7.next = 67;
+              _context6.next = 56;
               return this.timeout();
-            case 67:
-              _context7.next = 70;
+            case 56:
+              _context6.next = 59;
               break;
-            case 69:
+            case 58:
               if (taskQueueStatus === "completed") {
                 console.log("Tasks--->", "任务队列全部执行完成");
                 callback === null || callback === void 0 || callback();
               }
-            case 70:
-              _context7.next = 9;
+            case 59:
+              _context6.next = 2;
               break;
-            case 72:
-              _context7.prev = 72;
-              // 无论成功还是失败，都要解除队列的执行状态
-              this.updateQueueRunningState({
-                module: module,
-                queueId: queueId,
-                isRunning: false
-              });
-              console.log("Tasks--->", "\u4EFB\u52A1\u961F\u5217 [".concat(module, "/").concat(queueId, "] \u6267\u884C\u7ED3\u675F"));
-              return _context7.finish(72);
-            case 76:
+            case 61:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7, this, [[8,, 72, 76], [16, 51, 54, 57], [20, 44]]);
+        }, _callee6, this, [[9, 40, 43, 46], [13, 33]]);
       }));
       function run(_x3) {
         return _run.apply(this, arguments);
@@ -840,23 +605,13 @@ export var TasksManager = /*#__PURE__*/function () {
         module = payload.module,
         taskId = payload.taskId;
       this.tasks[module][queueId].tasks = (_this$tasks = this.tasks) === null || _this$tasks === void 0 || (_this$tasks = _this$tasks[module]) === null || _this$tasks === void 0 || (_this$tasks = _this$tasks[queueId]) === null || _this$tasks === void 0 || (_this$tasks = _this$tasks.tasks) === null || _this$tasks === void 0 ? void 0 : _this$tasks.filter(function (task) {
-        if (task.id === taskId) {
-          var _task$pollingResult3, _task$scheduledResult2;
-          // 清除轮询任务定时器
-          if ((_task$pollingResult3 = task.pollingResult) !== null && _task$pollingResult3 !== void 0 && _task$pollingResult3.timerId) {
-            _this3.clearTaskTimer({
-              timerId: task.pollingResult.timerId
-            });
-          }
-          // 清除定时任务定时器
-          if ((_task$scheduledResult2 = task.scheduledResult) !== null && _task$scheduledResult2 !== void 0 && _task$scheduledResult2.timerId) {
-            _this3.clearTaskTimer({
-              timerId: task.scheduledResult.timerId
-            });
-          }
-          return false;
+        var _task$pollingResult3;
+        if ((_task$pollingResult3 = task.pollingResult) !== null && _task$pollingResult3 !== void 0 && _task$pollingResult3.timerId) {
+          _this3.clearTaskTimer({
+            timerId: task.pollingResult.timerId
+          });
         }
-        return true;
+        return task.id !== taskId;
       });
       this.saveTaskQueueToLocal(this.tasks);
       console.log("Tasks--->", "删除指定任务", queueId, module, taskId);
@@ -884,23 +639,19 @@ export var TasksManager = /*#__PURE__*/function () {
   }, {
     key: "addTask",
     value: function addTask(payload) {
-      var _this$tasks$module3,
+      var _this$tasks$module2,
         _tasks$map,
         _this4 = this;
       var queueId = payload.queueId,
         module = payload.module,
         tasks = payload.tasks;
 
-      // 当前任务队列
-      var taskQueue = (_this$tasks$module3 = this.tasks[module]) === null || _this$tasks$module3 === void 0 || (_this$tasks$module3 = _this$tasks$module3[queueId]) === null || _this$tasks$module3 === void 0 ? void 0 : _this$tasks$module3.tasks;
+      //@ts-ignore 当前任务队列
+      var taskQueue = (_this$tasks$module2 = this.tasks[module]) === null || _this$tasks$module2 === void 0 || (_this$tasks$module2 = _this$tasks$module2[queueId]) === null || _this$tasks$module2 === void 0 ? void 0 : _this$tasks$module2.tasks;
       var _tasks = _toConsumableArray(taskQueue || []);
 
       // 创建新任务
       var newTasks = tasks === null || tasks === void 0 || (_tasks$map = tasks.map) === null || _tasks$map === void 0 ? void 0 : _tasks$map.call(tasks, function (d) {
-        // 检查定时任务配置
-        if (d.scheduled && module !== 'scheduledTasks') {
-          console.warn("Tasks--->", "\u68C0\u6D4B\u5230\u5B9A\u65F6\u4EFB\u52A1\u914D\u7F6E\uFF0C\u4F46\u6A21\u5757\u4E3A \"".concat(module, "\"\u3002\u5B9A\u65F6\u4EFB\u52A1\u529F\u80FD\u4EC5\u5728 \"scheduledTasks\" \u6A21\u5757\u4E2D\u751F\u6548\u3002"), "\u8BE5\u4EFB\u52A1\u5C06\u4F5C\u4E3A\u666E\u901A\u4EFB\u52A1\u7ACB\u5373\u6267\u884C\u3002\u5982\u9700\u4F7F\u7528\u5B9A\u65F6\u529F\u80FD\uFF0C\u8BF7\u5C06\u4EFB\u52A1\u6DFB\u52A0\u5230 \"scheduledTasks\" \u6A21\u5757\u3002");
-        }
         return _this4.createTaskData(_objectSpread(_objectSpread({}, d), {}, {
           queueId: queueId,
           module: module
@@ -921,13 +672,13 @@ export var TasksManager = /*#__PURE__*/function () {
   }, {
     key: "updateTask",
     value: function updateTask(payload) {
-      var _this$tasks$module4, _this$tasks$module5;
+      var _this$tasks$module3, _this$tasks$module4;
       var queueId = payload.queueId,
         taskId = payload.taskId,
         other = payload.other,
         module = payload.module;
       var newTask = null;
-      var taskQueue = ((_this$tasks$module4 = this.tasks[module]) === null || _this$tasks$module4 === void 0 || (_this$tasks$module4 = _this$tasks$module4[queueId]) === null || _this$tasks$module4 === void 0 ? void 0 : _this$tasks$module4.tasks) || [];
+      var taskQueue = ((_this$tasks$module3 = this.tasks[module]) === null || _this$tasks$module3 === void 0 || (_this$tasks$module3 = _this$tasks$module3[queueId]) === null || _this$tasks$module3 === void 0 ? void 0 : _this$tasks$module3.tasks) || [];
       var updatedTasks = taskQueue.map(function (task) {
         if (task.id === taskId) {
           newTask = _objectSpread(_objectSpread({}, task), other); // 更新任务状态
@@ -935,7 +686,7 @@ export var TasksManager = /*#__PURE__*/function () {
         }
         return task;
       });
-      var newState = _objectSpread(_objectSpread({}, this.tasks), {}, _defineProperty({}, module, _objectSpread(_objectSpread({}, this.tasks[module]), {}, _defineProperty({}, queueId, _objectSpread(_objectSpread({}, (_this$tasks$module5 = this.tasks[module]) === null || _this$tasks$module5 === void 0 ? void 0 : _this$tasks$module5[queueId]), {}, {
+      var newState = _objectSpread(_objectSpread({}, this.tasks), {}, _defineProperty({}, module, _objectSpread(_objectSpread({}, this.tasks[module]), {}, _defineProperty({}, queueId, _objectSpread(_objectSpread({}, (_this$tasks$module4 = this.tasks[module]) === null || _this$tasks$module4 === void 0 ? void 0 : _this$tasks$module4[queueId]), {}, {
         status: updatedTasks.some(function (task) {
           return task.status === "failure";
         }) ? "uncompleted" : "completed",
@@ -953,43 +704,9 @@ export var TasksManager = /*#__PURE__*/function () {
       var queueId = payload.queueId,
         status = payload.status,
         module = payload.module;
-      this.setTasksData({
-        queueId: queueId,
-        module: module,
+      var newState = _objectSpread(_objectSpread({}, this.tasks), {}, _defineProperty({}, module, _objectSpread(_objectSpread({}, this.tasks[module]), {}, _defineProperty({}, queueId, _objectSpread(_objectSpread({}, this.tasks[module][queueId]), {}, {
         status: status
-      });
-    }
-
-    /**
-     * @title: 更新队列运行状态
-     * @description: 标记队列是否正在执行
-     */
-  }, {
-    key: "updateQueueRunningState",
-    value: function updateQueueRunningState(payload) {
-      var queueId = payload.queueId,
-        module = payload.module,
-        isRunning = payload.isRunning,
-        lastRunAt = payload.lastRunAt;
-      this.setTasksData({
-        queueId: queueId,
-        module: module,
-        isRunning: isRunning,
-        lastRunAt: lastRunAt
-      });
-    }
-
-    // 设置任务
-  }, {
-    key: "setTasksData",
-    value: function setTasksData(payload) {
-      var queueId = payload.queueId,
-        module = payload.module,
-        data = _objectWithoutProperties(payload, _excluded);
-      var moduleData = this.tasks[module] || {};
-      var queueIdData = moduleData[queueId] || {};
-      var newState = _objectSpread(_objectSpread({}, this.tasks), {}, _defineProperty({}, module, _objectSpread(_objectSpread({}, moduleData), {}, _defineProperty({}, queueId, _objectSpread(_objectSpread({}, queueIdData), data)))));
-
+      })))));
       // 保存任务队列到本地存储
       this.saveTaskQueueToLocal(newState);
       this.tasks = newState;
@@ -1002,11 +719,15 @@ export var TasksManager = /*#__PURE__*/function () {
       var queueId = payload.queueId,
         module = payload.module,
         tasks = payload.tasks;
-      this.setTasksData({
-        queueId: queueId,
-        module: module,
+      var moduleData = this.tasks[module] || {};
+      var queueIdData = moduleData[queueId] || {};
+      var newState = _objectSpread(_objectSpread({}, this.tasks), {}, _defineProperty({}, module, _objectSpread(_objectSpread({}, moduleData), {}, _defineProperty({}, queueId, _objectSpread(_objectSpread({}, queueIdData), {}, {
         tasks: tasks
-      });
+      })))));
+
+      // 保存任务队列到本地存储
+      this.saveTaskQueueToLocal(newState);
+      this.tasks = newState;
     }
   }, {
     key: "clearAllTaskTimer",
@@ -1031,12 +752,8 @@ export var TasksManager = /*#__PURE__*/function () {
   }, {
     key: "clearTasks",
     value: function clearTasks(payload) {
-      var _this$tasks2;
       var queueId = payload.queueId,
         module = payload.module;
-      if (!((_this$tasks2 = this.tasks) !== null && _this$tasks2 !== void 0 && (_this$tasks2 = _this$tasks2[module]) !== null && _this$tasks2 !== void 0 && _this$tasks2[queueId])) {
-        return;
-      }
       this.clearAllTaskTimer(this.tasks[module][queueId].tasks);
       this.tasks[module][queueId].tasks = [];
       this.saveTaskQueueToLocal(this.tasks);
@@ -1071,66 +788,6 @@ export var TasksManager = /*#__PURE__*/function () {
     value: function watchTask(callback) {
       this.watchTaskCallback = callback;
     }
-
-    /**
-     * @title: 获取队列执行状态
-     * @description: 获取指定队列的执行状态和进度信息
-     * @param {string} module - 模块名
-     * @param {string} queueId - 队列ID
-     * @return {object} 队列状态信息
-     */
-  }, {
-    key: "getQueueStatus",
-    value: function getQueueStatus(module, queueId) {
-      var _this$tasks$module6, _queue$tasks;
-      var queue = (_this$tasks$module6 = this.tasks[module]) === null || _this$tasks$module6 === void 0 ? void 0 : _this$tasks$module6[queueId];
-      if (!queue) {
-        return null;
-      }
-      return {
-        isRunning: queue.isRunning || false,
-        status: queue.status,
-        progress: queue.progress || {
-          total: 0,
-          completed: 0,
-          failed: 0,
-          inProgress: 0
-        },
-        lastRunAt: queue.lastRunAt || null,
-        tasksCount: ((_queue$tasks = queue.tasks) === null || _queue$tasks === void 0 ? void 0 : _queue$tasks.length) || 0
-      };
-    }
-
-    /**
-     * @title: 获取所有队列状态
-     * @description: 获取所有任务队列的执行状态概览
-     * @return {object} 所有队列的状态信息
-     */
-  }, {
-    key: "getAllQueuesStatus",
-    value: function getAllQueuesStatus() {
-      var result = {};
-      for (var module in this.tasks) {
-        result[module] = {};
-        for (var queueId in this.tasks[module]) {
-          var _queue$tasks2;
-          var queue = this.tasks[module][queueId];
-          result[module][queueId] = {
-            isRunning: queue.isRunning || false,
-            status: queue.status,
-            progress: queue.progress || {
-              total: 0,
-              completed: 0,
-              failed: 0,
-              inProgress: 0
-            },
-            lastRunAt: queue.lastRunAt || null,
-            tasksCount: ((_queue$tasks2 = queue.tasks) === null || _queue$tasks2 === void 0 ? void 0 : _queue$tasks2.length) || 0
-          };
-        }
-      }
-      return result;
-    }
   }], [{
     key: "getInstance",
     value: function getInstance(app) {