@pisell/core 1.0.44 → 1.0.46

package/lib/tasks/index.js

@@ -35,278 +35,197 @@ module.exports = __toCommonJS(tasks_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_useTasks = __toESM(require("./useTasks"));
-var TasksManager = class _TasksManager {
-  static instance;
-  taskFunctions;
-  tasks = {
-    // 内置模块，  定时任务专用
-    scheduledTasks: {}
-  };
-  app;
-  db;
-  useTasks = import_useTasks.default;
-  watchTaskCallback = () => {
-  };
-  timerIds = [];
+var TasksManager = class {
   constructor(app) {
-    if (!app) {
-      throw new Error("app is required");
-    }
-    this.app = app;
-    this.taskFunctions = /* @__PURE__ */ new Map();
     this.tasks = {
+      // 内置模块，  定时任务专用
       scheduledTasks: {}
     };
-    this.db = app.dbManager;
+    this.useTasks = import_useTasks.default;
+    this.watchTaskCallback = () => {
+    };
     this.timerIds = [];
-  }
-  // 单例模式
-  static getInstance(app) {
-    if (!_TasksManager.instance && app) {
-      _TasksManager.instance = new _TasksManager(app);
-    }
-    return _TasksManager.instance;
-  }
-  // 注册任务函数
-  addTaskFunction(name, fun) {
-    this.taskFunctions.set(name, fun);
-    console.log("Tasks--->", `注册任务函数成功: ${name}`);
-  }
-  // 注册任务函数列表
-  addTaskFunctions(tasks) {
-    tasks.forEach(({ name, fun }) => {
-      this.taskFunctions.set(name, fun);
-    });
-  }
-  getTasks() {
-    return this.tasks;
-  }
-  // 获取任务函数
-  getTaskFunction(name) {
-    if (!name) {
-      return null;
-    }
-    return this.taskFunctions.get(name);
-  }
-  // 初始化任务
-  async init() {
-    const tasks = await this.loadTaskQueueFromLocal();
-    if (tasks) {
-      console.log("initTasks", tasks);
-    }
-  }
-  // 将任务队列状态同步到 local
-  saveTaskQueueToLocal = async (state) => {
-    var _a;
-    console.log("saveTaskQueueToLocal", state);
-    let tasksData = await this.db.get("tasks", "tasks");
-    const newData = { id: "tasks", ...state };
-    if (!tasksData) {
-      await this.db.add("tasks", newData);
-    } else {
-      await this.db.update("tasks", newData);
-    }
-    (_a = this.watchTaskCallback) == null ? void 0 : _a.call(this, this.tasks);
-  };
-  // 从 local 加载任务队列状态
-  loadTaskQueueFromLocal = async () => {
-    var _a, _b;
-    try {
-      const tasks = await this.db.get("tasks", "tasks");
-      for (let module2 in tasks) {
-        for (let queueId in tasks[module2]) {
-          for (let task of ((_b = (_a = tasks == null ? void 0 : tasks[module2]) == null ? void 0 : _a[queueId]) == null ? void 0 : _b.tasks) || []) {
-            if (task.destroy) {
-              delete tasks[module2][queueId].tasks;
+    // 将任务队列状态同步到 local
+    this.saveTaskQueueToLocal = async (state) => {
+      var _a;
+      console.log("saveTaskQueueToLocal", state);
+      let tasksData = await this.db.get("tasks", "tasks");
+      const newData = { id: "tasks", ...state };
+      if (!tasksData) {
+        await this.db.add("tasks", newData);
+      } else {
+        await this.db.update("tasks", newData);
+      }
+      (_a = this.watchTaskCallback) == null ? void 0 : _a.call(this, this.tasks);
+    };
+    // 从 local 加载任务队列状态
+    this.loadTaskQueueFromLocal = async () => {
+      var _a, _b;
+      try {
+        const tasks = await this.db.get("tasks", "tasks");
+        for (let module2 in tasks) {
+          for (let queueId in tasks[module2]) {
+            for (let task of ((_b = (_a = tasks == null ? void 0 : tasks[module2]) == null ? void 0 : _a[queueId]) == null ? void 0 : _b.tasks) || []) {
+              if (task.destroy) {
+                delete tasks[module2][queueId].tasks;
+              }
             }
           }
         }
+        return tasks;
+      } catch (err) {
+        console.log("loadTaskQueueFromLocal", err);
+        return null;
       }
-      return tasks;
-    } catch (err) {
-      console.log("loadTaskQueueFromLocal", err);
-      return null;
-    }
-  };
-  /**
-   * @title: 执行任务
-   * @description:
-   * @param {Task} task
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-09-26 13:53
-   */
-  runTask = async (task) => {
-    const beforeAction = this.getTaskFunction(task.beforeAction || "");
-    const afterAction = this.getTaskFunction(task.afterAction || "");
-    const action = this.getTaskFunction(task.action || "");
-    let beforeActionRes;
-    let afterActionRes;
-    let actionRes = { status: "success" };
-    try {
-      if (beforeAction) {
-        beforeActionRes = await beforeAction({ task });
-      }
-      if (action) {
-        actionRes = await action({ task, beforeActionRes });
-      }
-      if (afterAction) {
-        afterActionRes = await afterAction({ task, actionRes, afterActionRes });
+    };
+    /**
+     * @title: 执行任务
+     * @description:
+     * @param {Task} task
+     * @return {*}
+     * @Author: zhiwei.Wang
+     * @Date: 2024-09-26 13:53
+     */
+    this.runTask = async (task) => {
+      const beforeAction = this.getTaskFunction(task.beforeAction || "");
+      const afterAction = this.getTaskFunction(task.afterAction || "");
+      const action = this.getTaskFunction(task.action || "");
+      let beforeActionRes;
+      let afterActionRes;
+      let actionRes = { status: "success" };
+      try {
+        if (beforeAction) {
+          beforeActionRes = await beforeAction({ task });
+        }
+        if (action) {
+          actionRes = await action({ task, beforeActionRes });
+        }
+        if (afterAction) {
+          afterActionRes = await afterAction({ task, actionRes, afterActionRes });
+        }
+      } catch (error) {
+        this.app.logger.addLog({
+          type: "info",
+          title: `任务执行失败-${task.id}`,
+          metadata: { error, taskPayload: task == null ? void 0 : task.payload }
+        });
+        actionRes = { status: "failure" };
       }
-    } catch (error) {
-      this.app.logger.addLog({
-        type: "info",
-        title: `任务执行失败-${task.id}`,
-        metadata: { error, taskPayload: task == null ? void 0 : task.payload }
+      console.log("Tasks--->", `任务执行成功: ${task.id}`);
+      return actionRes;
+    };
+    /**
+     * @title: 清除任务定时器
+     */
+    this.clearTaskTimer = (params) => {
+      const { timerId, taskId } = params;
+      const _timerIds = [];
+      const needClearTimerIds = [];
+      this.timerIds.forEach((id) => {
+        const taskIdRult = taskId ? (id == null ? void 0 : id.taskId) === taskId : true;
+        const timerIdRult = timerId ? (id == null ? void 0 : id.timerId) === timerId : true;
+        if (taskIdRult && timerIdRult) {
+          needClearTimerIds.push(id);
+        } else {
+          _timerIds.push(id);
+        }
       });
-      actionRes = { status: "failure" };
-    }
-    console.log("Tasks--->", `任务执行成功: ${task.id}`);
-    return actionRes;
-  };
-  /**
-   * @title: 清除任务定时器
-   */
-  clearTaskTimer = (params) => {
-    const { timerId, taskId } = params;
-    const _timerIds = [];
-    const needClearTimerIds = [];
-    this.timerIds.forEach((id) => {
-      const taskIdRult = taskId ? (id == null ? void 0 : id.taskId) === taskId : true;
-      const timerIdRult = timerId ? (id == null ? void 0 : id.timerId) === timerId : true;
-      if (taskIdRult && timerIdRult) {
-        needClearTimerIds.push(id);
-      } else {
-        _timerIds.push(id);
-      }
-    });
-    if (needClearTimerIds.length) {
-      for (let id of needClearTimerIds) {
-        clearTimeout(id.timerId);
-      }
-    }
-    this.timerIds = [..._timerIds || []];
-  };
-  /**
-   * @title: 计算下一次执行时间
-   * @description: 根据定时任务配置计算下一次执行时间
-   * @param {Task} task
-   * @return {string | null} 下一次执行时间
-   */
-  calculateNextExecuteTime = (task) => {
-    if (!task.scheduled) {
-      return null;
-    }
-    const { scheduled, scheduledResult } = task;
-    const now = (0, import_dayjs.default)();
-    if (scheduled.endAt && now.isAfter((0, import_dayjs.default)(scheduled.endAt))) {
-      return null;
-    }
-    if (Array.isArray(scheduled.executeAt)) {
-      const futureTime = scheduled.executeAt.map((time) => (0, import_dayjs.default)(time)).filter((time) => time.isAfter(now)).sort((a, b) => a.valueOf() - b.valueOf())[0];
-      if (futureTime) {
-        return futureTime.format("YYYY-MM-DD HH:mm:ss");
+      if (needClearTimerIds.length) {
+        for (let id of needClearTimerIds) {
+          clearTimeout(id.timerId);
+        }
       }
-      if (!scheduled.repeat) {
+      this.timerIds = [..._timerIds || []];
+    };
+    /**
+     * @title: 计算下一次执行时间
+     * @description: 根据定时任务配置计算下一次执行时间
+     * @param {Task} task
+     * @return {string | null} 下一次执行时间
+     */
+    this.calculateNextExecuteTime = (task) => {
+      if (!task.scheduled) {
         return null;
       }
-    }
-    if (scheduled.repeat && (scheduledResult == null ? void 0 : scheduledResult.nextExecuteTime)) {
-      const lastExecuteTime = (0, import_dayjs.default)(scheduledResult.nextExecuteTime);
-      const interval = scheduled.repeatInterval || 1;
-      let 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((0, import_dayjs.default)(scheduled.endAt))) {
+      const { scheduled, scheduledResult } = task;
+      const now = (0, import_dayjs.default)();
+      if (scheduled.endAt && now.isAfter((0, import_dayjs.default)(scheduled.endAt))) {
         return null;
       }
-      return nextTime.format("YYYY-MM-DD HH:mm:ss");
-    }
-    const executeTime = Array.isArray(scheduled.executeAt) ? scheduled.executeAt[0] : scheduled.executeAt;
-    return (0, import_dayjs.default)(executeTime).format("YYYY-MM-DD HH:mm:ss");
-  };
-  /**
-   * @title: 启动定时任务
-   * @description: 在特定时间点执行任务（仅在 scheduledTasks 模块中生效）
-   * @param {Task} task
-   * @return {*}
-   */
-  startScheduledTask = (task) => {
-    var _a;
-    if (!task.scheduled) {
-      console.log("Tasks--->", "不是定时任务");
-      return;
-    }
-    if (task.module !== "scheduledTasks") {
-      console.warn("Tasks--->", `定时任务只在 scheduledTasks 模块中生效，任务 ${task.id} 将作为普通任务执行`);
-      return;
-    }
-    const nextExecuteTime = this.calculateNextExecuteTime(task);
-    if (!nextExecuteTime) {
-      console.log("Tasks--->", "定时任务已完成或无下次执行时间", task);
-      this.deleteTask({
-        module: task.module,
-        queueId: task.queueId,
-        taskId: task.id
-      });
-      return;
-    }
-    const now = (0, import_dayjs.default)();
-    const executeTime = (0, import_dayjs.default)(nextExecuteTime);
-    const delay = executeTime.diff(now);
-    if (delay < 0) {
-      console.log("Tasks--->", "执行时间已过，跳过此次执行");
-      if (task.scheduled.repeat) {
-        const _task = { ...task };
-        _task.scheduledResult = {
-          count: ((_a = _task.scheduledResult) == null ? void 0 : _a.count) || 0,
-          nextExecuteTime
-        };
-        const newTask = this.updateTask({
-          module: task.module,
-          queueId: task.queueId,
-          taskId: task.id,
-          other: _task
-        });
-        if (newTask) {
-          this.startScheduledTask(newTask);
+      if (Array.isArray(scheduled.executeAt)) {
+        const futureTime = scheduled.executeAt.map((time) => (0, import_dayjs.default)(time)).filter((time) => time.isAfter(now)).sort((a, b) => a.valueOf() - b.valueOf())[0];
+        if (futureTime) {
+          return futureTime.format("YYYY-MM-DD HH:mm:ss");
         }
-      } else {
+        if (!scheduled.repeat) {
+          return null;
+        }
+      }
+      if (scheduled.repeat && (scheduledResult == null ? void 0 : scheduledResult.nextExecuteTime)) {
+        const lastExecuteTime = (0, import_dayjs.default)(scheduledResult.nextExecuteTime);
+        const interval = scheduled.repeatInterval || 1;
+        let 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((0, import_dayjs.default)(scheduled.endAt))) {
+          return null;
+        }
+        return nextTime.format("YYYY-MM-DD HH:mm:ss");
+      }
+      const executeTime = Array.isArray(scheduled.executeAt) ? scheduled.executeAt[0] : scheduled.executeAt;
+      return (0, import_dayjs.default)(executeTime).format("YYYY-MM-DD HH:mm:ss");
+    };
+    /**
+     * @title: 启动定时任务
+     * @description: 在特定时间点执行任务（仅在 scheduledTasks 模块中生效）
+     * @param {Task} task
+     * @return {*}
+     */
+    this.startScheduledTask = (task) => {
+      var _a;
+      if (!task.scheduled) {
+        console.log("Tasks--->", "不是定时任务");
+        return;
+      }
+      if (task.module !== "scheduledTasks") {
+        console.warn("Tasks--->", `定时任务只在 scheduledTasks 模块中生效，任务 ${task.id} 将作为普通任务执行`);
+        return;
+      }
+      const nextExecuteTime = this.calculateNextExecuteTime(task);
+      if (!nextExecuteTime) {
+        console.log("Tasks--->", "定时任务已完成或无下次执行时间", task);
         this.deleteTask({
           module: task.module,
           queueId: task.queueId,
           taskId: task.id
         });
+        return;
       }
-      return;
-    }
-    console.log("Tasks--->", `定时任务将在 ${nextExecuteTime} 执行 (${delay}ms 后)`, task);
-    const timerId = setTimeout(async () => {
-      var _a2, _b;
-      try {
-        await this.runTask(task);
-        console.log("Tasks--->", "定时任务执行完成", task);
-        let _task = { ...task };
-        _task.scheduledResult = {
-          count: (((_a2 = _task.scheduledResult) == null ? void 0 : _a2.count) || 0) + 1,
-          timerId,
-          nextExecuteTime
-        };
-        if ((_b = task.scheduled) == null ? void 0 : _b.repeat) {
+      const now = (0, import_dayjs.default)();
+      const executeTime = (0, import_dayjs.default)(nextExecuteTime);
+      const delay = executeTime.diff(now);
+      if (delay < 0) {
+        console.log("Tasks--->", "执行时间已过，跳过此次执行");
+        if (task.scheduled.repeat) {
+          const _task = { ...task };
+          _task.scheduledResult = {
+            count: ((_a = _task.scheduledResult) == null ? void 0 : _a.count) || 0,
+            nextExecuteTime
+          };
           const newTask = this.updateTask({
             module: task.module,
             queueId: task.queueId,
@@ -323,95 +242,172 @@ var TasksManager = class _TasksManager {
             taskId: task.id
           });
         }
-      } catch (error) {
-        this.clearTaskTimer({ timerId });
-        console.error("定时任务执行异常", error);
+        return;
       }
-    }, delay);
-    this.timerIds.push({ taskId: task.id, timerId });
-  };
-  /**
-   * @title: 启动轮询
-   * @description: 根据轮询间隔定期执行任务
-   * @param {Task} task
-   * @return {*}
-   */
-  startPolling = (task) => {
-    if (!task.polling || !task.polling.interval) {
-      console.log("不是轮询任务");
-      return;
-    }
-    const timerId = setTimeout(async () => {
-      var _a;
-      try {
-        await this.runTask(task);
-        console.log("轮询任务", task);
-        let _task = { ...task };
-        _task.pollingResult = {
-          count: (((_a = _task.pollingResult) == null ? void 0 : _a.count) || 0) + 1,
-          timerId
-        };
-        const newTask = this.updateTask({
-          module: task.module,
-          queueId: task.queueId,
-          taskId: task.id,
-          other: _task
-        });
-        if (!newTask) {
-          return;
+      console.log("Tasks--->", `定时任务将在 ${nextExecuteTime} 执行 (${delay}ms 后)`, task);
+      const timerId = setTimeout(async () => {
+        var _a2, _b;
+        try {
+          await this.runTask(task);
+          console.log("Tasks--->", "定时任务执行完成", task);
+          let _task = { ...task };
+          _task.scheduledResult = {
+            count: (((_a2 = _task.scheduledResult) == null ? void 0 : _a2.count) || 0) + 1,
+            timerId,
+            nextExecuteTime
+          };
+          if ((_b = task.scheduled) == null ? void 0 : _b.repeat) {
+            const 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
+            });
+          }
+        } catch (error) {
+          this.clearTaskTimer({ timerId });
+          console.error("定时任务执行异常", error);
         }
-        this.startPolling(newTask);
-      } catch (error) {
-        this.clearTaskTimer({ timerId });
-        console.error("轮询任务异常", error);
+      }, delay);
+      this.timerIds.push({ taskId: task.id, timerId });
+    };
+    /**
+     * @title: 启动轮询
+     * @description: 根据轮询间隔定期执行任务
+     * @param {Task} task
+     * @return {*}
+     */
+    this.startPolling = (task) => {
+      if (!task.polling || !task.polling.interval) {
+        console.log("不是轮询任务");
+        return;
       }
-    }, task.polling.interval);
-    this.timerIds.push({ taskId: task.id, timerId });
-  };
-  /**
-   * @title: 创建任务数据
-   * @description:
-   * @param {Partial} payload
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-09-26 13:54
-   */
-  createTaskData = (payload) => {
-    return {
-      id: (0, import_utils.getUniqueId)("task_"),
-      create_at: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
-      type: "local",
-      retries: 0,
-      maxRetries: 3,
-      status: "pending",
-      // 执行函数
-      action: "",
-      // 执行参数
-      payload: {},
-      // 执行前的钩子
-      beforeAction: "",
-      // 执行前的参数
-      beforePayload: {},
-      // 执行后的钩子
-      afterAction: "",
-      // 执行后的参数
-      afterPayload: {},
-      destroy: true,
-      ...payload
+      const timerId = setTimeout(async () => {
+        var _a;
+        try {
+          await this.runTask(task);
+          console.log("轮询任务", task);
+          let _task = { ...task };
+          _task.pollingResult = {
+            count: (((_a = _task.pollingResult) == null ? void 0 : _a.count) || 0) + 1,
+            timerId
+          };
+          const newTask = this.updateTask({
+            module: task.module,
+            queueId: task.queueId,
+            taskId: task.id,
+            other: _task
+          });
+          if (!newTask) {
+            return;
+          }
+          this.startPolling(newTask);
+        } catch (error) {
+          this.clearTaskTimer({ timerId });
+          console.error("轮询任务异常", error);
+        }
+      }, task.polling.interval);
+      this.timerIds.push({ taskId: task.id, timerId });
     };
-  };
-  getTaskQueue = (payload) => {
-    var _a, _b;
-    const { queueId, module: module2 } = payload;
-    return (_b = (_a = this.tasks[module2]) == null ? void 0 : _a[queueId]) == null ? void 0 : _b.tasks;
-  };
-  timeout = (ms) => {
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve(true);
-      }, ms || 5e3);
+    /**
+     * @title: 创建任务数据
+     * @description:
+     * @param {Partial} payload
+     * @return {*}
+     * @Author: zhiwei.Wang
+     * @Date: 2024-09-26 13:54
+     */
+    this.createTaskData = (payload) => {
+      return {
+        id: (0, import_utils.getUniqueId)("task_"),
+        create_at: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
+        type: "local",
+        retries: 0,
+        maxRetries: 3,
+        status: "pending",
+        // 执行函数
+        action: "",
+        // 执行参数
+        payload: {},
+        // 执行前的钩子
+        beforeAction: "",
+        // 执行前的参数
+        beforePayload: {},
+        // 执行后的钩子
+        afterAction: "",
+        // 执行后的参数
+        afterPayload: {},
+        destroy: true,
+        ...payload
+      };
+    };
+    this.getTaskQueue = (payload) => {
+      var _a, _b;
+      const { queueId, module: module2 } = payload;
+      return (_b = (_a = this.tasks[module2]) == null ? void 0 : _a[queueId]) == null ? void 0 : _b.tasks;
+    };
+    this.timeout = (ms) => {
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(true);
+        }, ms || 5e3);
+      });
+    };
+    if (!app) {
+      throw new Error("app is required");
+    }
+    this.app = app;
+    this.taskFunctions = /* @__PURE__ */ new Map();
+    this.tasks = {
+      scheduledTasks: {}
+    };
+    this.db = app.dbManager;
+    this.timerIds = [];
+  }
+  // 单例模式
+  static getInstance(app) {
+    if (!TasksManager.instance && app) {
+      TasksManager.instance = new TasksManager(app);
+    }
+    return TasksManager.instance;
+  }
+  // 注册任务函数
+  addTaskFunction(name, fun) {
+    this.taskFunctions.set(name, fun);
+    console.log("Tasks--->", `注册任务函数成功: ${name}`);
+  }
+  // 注册任务函数列表
+  addTaskFunctions(tasks) {
+    tasks.forEach(({ name, fun }) => {
+      this.taskFunctions.set(name, fun);
     });
-  };
+  }
+  getTasks() {
+    return this.tasks;
+  }
+  // 获取任务函数
+  getTaskFunction(name) {
+    if (!name) {
+      return null;
+    }
+    return this.taskFunctions.get(name);
+  }
+  // 初始化任务
+  async init() {
+    const tasks = await this.loadTaskQueueFromLocal();
+    if (tasks) {
+      console.log("initTasks", tasks);
+    }
+  }
   /**
    * @title: 执行任务队列
    * @description: