@nocobase/plugin-async-task-manager 2.0.0-alpha.56 → 2.0.0-alpha.57

package/dist/externalVersion.js

@@ -8,15 +8,15 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-alpha.56",
+  "@nocobase/client": "2.0.0-alpha.57",
   "react": "18.2.0",
-  "@nocobase/utils": "2.0.0-alpha.56",
+  "@nocobase/utils": "2.0.0-alpha.57",
   "lodash": "4.17.21",
-  "@nocobase/server": "2.0.0-alpha.56",
-  "@nocobase/logger": "2.0.0-alpha.56",
-  "@nocobase/database": "2.0.0-alpha.56",
+  "@nocobase/server": "2.0.0-alpha.57",
+  "@nocobase/logger": "2.0.0-alpha.57",
+  "@nocobase/database": "2.0.0-alpha.57",
   "antd": "5.24.2",
   "react-i18next": "11.18.6",
   "dayjs": "1.11.13",
-  "@nocobase/actions": "2.0.0-alpha.56"
+  "@nocobase/actions": "2.0.0-alpha.57"
 };

package/dist/server/base-task-manager.js

@@ -130,31 +130,43 @@ class BaseTaskManager {
   cleanup = async () => {
     this.logger.debug("Running cleanup for completed tasks...");
     const TaskRepo = this.app.db.getRepository("asyncTasks");
-    const tasksToCleanup = await TaskRepo.find({
-      fields: ["id"],
-      filter: {
-        $or: [
-          {
-            status: [import_constants.TASK_STATUS.SUCCEEDED, import_constants.TASK_STATUS.FAILED],
-            doneAt: {
-              $lt: new Date(Date.now() - this.cleanupDelay)
+    try {
+      const tasksToCleanup = await TaskRepo.find({
+        fields: ["id"],
+        filter: {
+          $or: [
+            {
+              status: [import_constants.TASK_STATUS.SUCCEEDED, import_constants.TASK_STATUS.FAILED],
+              doneAt: {
+                $lt: new Date(Date.now() - this.cleanupDelay)
+              }
+            },
+            {
+              status: import_constants.TASK_STATUS.CANCELED
             }
-          },
-          {
-            status: import_constants.TASK_STATUS.CANCELED
-          }
-        ]
+          ]
+        }
+      });
+      this.logger.debug(`Found ${tasksToCleanup.length} tasks to cleanup`);
+      if (tasksToCleanup.length) {
+        for (const task of tasksToCleanup) {
+          this.tasks.delete(task.id);
+          this.progressThrottles.delete(task.id);
+        }
+        await TaskRepo.destroy({
+          filterByTk: tasksToCleanup.map((task) => task.id),
+          individualHooks: true
+        });
+      }
+    } catch (error) {
+      this.logger.error(`DB error during cleanup: ${error.message}. Will stop cleanup timer.`, { error });
+      if (error.name === "SequelizeConnectionAcquireTimeoutError") {
+        if (this.cleanupTimer) {
+          clearInterval(this.cleanupTimer);
+          this.cleanupTimer = null;
+        }
       }
-    });
-    this.logger.debug(`Found ${tasksToCleanup.length} tasks to cleanup`);
-    for (const task of tasksToCleanup) {
-      this.tasks.delete(task.id);
-      this.progressThrottles.delete(task.id);
     }
-    await TaskRepo.destroy({
-      filterByTk: tasksToCleanup.map((task) => task.id),
-      individualHooks: true
-    });
   };
   getThrottledProgressEmitter(taskId, userId) {
     if (!this.progressThrottles.has(taskId)) {

package/package.json

@@ -6,7 +6,7 @@
   "description": "Manage and monitor asynchronous tasks such as data import/export. Support task progress tracking and notification.",
   "description.ru-RU": "Управление асинхронными задачами и мониторинг (например, импорт/экспорт данных). Поддержка отслеживания прогресса и уведомлений о задачах.",
   "description.zh-CN": "管理和监控数据导入导出等异步任务。支持任务进度跟踪和通知。",
-  "version": "2.0.0-alpha.56",
+  "version": "2.0.0-alpha.57",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "2.x",
@@ -17,5 +17,5 @@
   "dependencies": {
     "p-queue": "^6.6.2"
   },
-  "gitHead": "a26a7c3422ea8089e0f04c89c9d32ff25bc09a0c"
+  "gitHead": "b9ec8bc83fd86a9cadfc4fb2f87a4e015061b289"
 }