@nocobase/plugin-async-task-manager 1.6.0-alpha.8 → 1.6.0-alpha.9

package/dist/externalVersion.js

@@ -8,12 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-alpha.8",
+  "@nocobase/client": "1.6.0-alpha.9",
   "react": "18.2.0",
   "antd": "5.12.8",
-  "@nocobase/logger": "1.6.0-alpha.8",
-  "@nocobase/server": "1.6.0-alpha.8",
-  "@nocobase/plugin-error-handler": "1.6.0-alpha.8",
+  "@nocobase/logger": "1.6.0-alpha.9",
+  "@nocobase/server": "1.6.0-alpha.9",
+  "lodash": "4.17.21",
+  "@nocobase/plugin-error-handler": "1.6.0-alpha.9",
   "@ant-design/icons": "5.2.6",
   "dayjs": "1.11.10"
 };

package/dist/node_modules/uuid/package.json

@@ -1 +1 @@
-{"name":"uuid","version":"3.4.0","description":"RFC4122 (v1, v4, and v5) UUIDs","commitlint":{"extends":["@commitlint/config-conventional"]},"keywords":["uuid","guid","rfc4122"],"license":"MIT","bin":{"uuid":"./bin/uuid"},"devDependencies":{"@commitlint/cli":"~8.2.0","@commitlint/config-conventional":"~8.2.0","eslint":"~6.4.0","husky":"~3.0.5","mocha":"6.2.0","runmd":"1.2.1","standard-version":"7.0.0"},"scripts":{"lint":"eslint .","test":"npm run lint && mocha test/test.js","md":"runmd --watch --output=README.md README_js.md","release":"standard-version","prepare":"runmd --output=README.md README_js.md"},"browser":{"./lib/rng.js":"./lib/rng-browser.js","./lib/sha1.js":"./lib/sha1-browser.js","./lib/md5.js":"./lib/md5-browser.js"},"repository":{"type":"git","url":"https://github.com/uuidjs/uuid.git"},"husky":{"hooks":{"commit-msg":"commitlint -E HUSKY_GIT_PARAMS"}},"_lastModified":"2025-01-02T11:38:54.439Z"}
+{"name":"uuid","version":"3.4.0","description":"RFC4122 (v1, v4, and v5) UUIDs","commitlint":{"extends":["@commitlint/config-conventional"]},"keywords":["uuid","guid","rfc4122"],"license":"MIT","bin":{"uuid":"./bin/uuid"},"devDependencies":{"@commitlint/cli":"~8.2.0","@commitlint/config-conventional":"~8.2.0","eslint":"~6.4.0","husky":"~3.0.5","mocha":"6.2.0","runmd":"1.2.1","standard-version":"7.0.0"},"scripts":{"lint":"eslint .","test":"npm run lint && mocha test/test.js","md":"runmd --watch --output=README.md README_js.md","release":"standard-version","prepare":"runmd --output=README.md README_js.md"},"browser":{"./lib/rng.js":"./lib/rng-browser.js","./lib/sha1.js":"./lib/sha1-browser.js","./lib/md5.js":"./lib/md5-browser.js"},"repository":{"type":"git","url":"https://github.com/uuidjs/uuid.git"},"husky":{"hooks":{"commit-msg":"commitlint -E HUSKY_GIT_PARAMS"}},"_lastModified":"2025-01-06T05:51:59.635Z"}

package/dist/server/plugin.d.ts

@@ -1,7 +1,9 @@
 import { Plugin } from '@nocobase/server';
 export declare class PluginAsyncExportServer extends Plugin {
+    private progressThrottles;
     afterAdd(): Promise<void>;
     beforeLoad(): Promise<void>;
+    getThrottledProgressEmitter(taskId: string, userId: string): Function;
     load(): Promise<void>;
 }
 export default PluginAsyncExportServer;

package/dist/server/plugin.js

@@ -44,7 +44,9 @@ var import_server = require("@nocobase/server");
 var import_base_task_manager = require("./base-task-manager");
 var import_command_task_type = require("./command-task-type");
 var import_async_tasks = __toESM(require("./resourcers/async-tasks"));
+var import_lodash = require("lodash");
 class PluginAsyncExportServer extends import_server.Plugin {
+  progressThrottles = /* @__PURE__ */ new Map();
   async afterAdd() {
   }
   async beforeLoad() {
@@ -57,6 +59,31 @@ class PluginAsyncExportServer extends import_server.Plugin {
     this.app.container.get("AsyncTaskManager").registerTaskType(import_command_task_type.CommandTaskType);
     this.app.acl.allow("asyncTasks", ["get", "fetchFile"], "loggedIn");
   }
+  getThrottledProgressEmitter(taskId, userId) {
+    if (!this.progressThrottles.has(taskId)) {
+      this.progressThrottles.set(
+        taskId,
+        (0, import_lodash.throttle)(
+          (progress) => {
+            this.app.emit("ws:sendToTag", {
+              tagKey: "userId",
+              tagValue: userId,
+              message: {
+                type: "async-tasks:progress",
+                payload: {
+                  taskId,
+                  progress
+                }
+              }
+            });
+          },
+          500,
+          { leading: true, trailing: true }
+        )
+      );
+    }
+    return this.progressThrottles.get(taskId);
+  }
   async load() {
     this.app.resourceManager.define(import_async_tasks.default);
     const asyncTaskManager = this.app.container.get("AsyncTaskManager");
@@ -97,36 +124,31 @@ class PluginAsyncExportServer extends import_server.Plugin {
     asyncTaskManager.on("taskProgress", ({ task, progress }) => {
       const userId = task.tags["userId"];
       if (userId) {
-        this.app.emit("ws:sendToTag", {
-          tagKey: "userId",
-          tagValue: userId,
-          message: {
-            type: "async-tasks:progress",
-            payload: {
-              taskId: task.taskId,
-              progress
-            }
-          }
-        });
+        const throttledEmit = this.getThrottledProgressEmitter(task.taskId, userId);
+        throttledEmit(progress);
       }
     });
     asyncTaskManager.on("taskStatusChange", ({ task, status }) => {
       const userId = task.tags["userId"];
-      if (userId) {
-        this.app.emit("ws:sendToTag", {
-          tagKey: "userId",
-          tagValue: userId,
-          message: {
-            type: "async-tasks:status",
-            payload: {
-              taskId: task.taskId,
-              status: task.toJSON().status
-            }
+      if (!userId) return;
+      this.app.emit("ws:sendToTag", {
+        tagKey: "userId",
+        tagValue: userId,
+        message: {
+          type: "async-tasks:status",
+          payload: {
+            taskId: task.taskId,
+            status: task.toJSON().status
           }
-        });
+        }
+      });
+      if (status.type !== "running" && status.type !== "pending") {
+        const throttled = this.progressThrottles.get(task.taskId);
+        if (throttled) {
+          throttled.cancel();
+          this.progressThrottles.delete(task.taskId);
+        }
       }
-    });
-    asyncTaskManager.on("taskStatusChange", ({ status }) => {
       if (status.type === "success") {
         this.app.emit("workflow:dispatch");
       }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "异步任务管理器",
   "description": "Manage and monitor asynchronous tasks such as data import/export. Support task progress tracking and notification.",
   "description.zh-CN": "管理和监控数据导入导出等异步任务。支持任务进度跟踪和通知。",
-  "version": "1.6.0-alpha.8",
+  "version": "1.6.0-alpha.9",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
@@ -12,5 +12,5 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "f7ab757a5d7fb723c96bc9c1340291e4deec03ea"
+  "gitHead": "c6136fc6c9a2daab33fb1a20716cd9768e9a147f"
 }