@tachybase/module-worker-thread 0.23.22 → 0.23.40

package/dist/client/index.js

@@ -1 +1 @@
-(function(t,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@tachybase/client"),require("react/jsx-runtime"),require("@tachybase/schema"),require("antd")):typeof define=="function"&&define.amd?define(["exports","@tachybase/client","react/jsx-runtime","@tachybase/schema","antd"],e):(t=typeof globalThis!="undefined"?globalThis:t||self,e(t["@tachybase/module-worker-thread"]={},t["@tachybase/client"],t.jsxRuntime,t["@tachybase/schema"],t.antd))})(this,function(t,e,r,m,a){"use strict";var v=Object.defineProperty;var f=Object.getOwnPropertySymbols;var w=Object.prototype.hasOwnProperty,F=Object.prototype.propertyIsEnumerable;var x=(t,e,r)=>e in t?v(t,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[e]=r,b=(t,e)=>{for(var r in e||(e={}))w.call(e,r)&&x(t,r,e[r]);if(f)for(var r of f(e))F.call(e,r)&&x(t,r,e[r]);return t};var c=(t,e,r)=>new Promise((m,a)=>{var u=n=>{try{o(r.next(n))}catch(p){a(p)}},l=n=>{try{o(r.throw(n))}catch(p){a(p)}},o=n=>n.done?m(n.value):Promise.resolve(n.value).then(u,l);o((r=r.apply(t,e)).next())});const u="worker-thread";function l(){return{t:(d,i={})=>e.i18n.t(d,b({ns:u},i))}}const o=s=>`{{t("${s}", { ns: ["${u}", "client"] })}}`,n=()=>{const s=e.useAPIClient();return{run(){return c(this,null,function*(){var i;(i=s.service("workerForm"))==null||i.refresh()})}}},p=s=>e.useRequest({url:"worker_thread:info"},s).data,k=()=>{const{setVisible:s}=e.useActionContext(),d=m.useForm(),{message:i}=a.App.useApp(),A=e.useAPIClient(),{t:I}=l();return{run(){return c(this,null,function*(){yield d.submit(),yield A.request({url:"worker_thread:preset",method:"post",data:{count:d.values.preset}}),i.success(I("Saved successfully")),s(!1)})}}},C={type:"object",properties:{workerForm:{"x-decorator":"Form","x-uid":"workerForm","x-decorator-props":{useValues:"{{ useWorkerInfo }}"},"x-component":"div",type:"void",title:'{{t("Worker thread info")}}',properties:{preset:{type:"number",title:o("Preset count"),minimum:0,"x-decorator":"FormItem","x-component":"InputNumber","x-component-props":{precision:0},required:!0},current:{type:"digit",title:o("Current count"),"x-decorator":"FormItem","x-component":"InputNumber","x-disabled":!0},busy:{type:"digit",title:o("Busy count"),"x-decorator":"FormItem","x-component":"InputNumber","x-disabled":!0},env:{type:"digit",title:o("Environment count"),"x-decorator":"FormItem","x-component":"InputNumber","x-disabled":!0},footer1:{type:"void","x-component":"ActionBar","x-component-props":{layout:"one-column"},properties:{submit:{title:o("Submit"),"x-component":"Action","x-component-props":{type:"primary",htmlType:"submit",useAction:"{{ resetWorkerCount }}"}},refresh:{title:o("Refresh"),"x-component":"Action","x-component-props":{type:"default",useAction:"{{ useRefresh }}"}}}}}}}},h=()=>r.jsx(a.Card,{bordered:!1,children:r.jsx(e.SchemaComponent,{scope:{resetWorkerCount:k,useWorkerInfo:p,useRefresh:n},schema:C})});class y extends e.Plugin{afterAdd(){return c(this,null,function*(){})}beforeLoad(){return c(this,null,function*(){})}load(){return c(this,null,function*(){this.app.addComponents({WorkerInfoPane:h}),this.app.systemSettingsManager.add("system-services."+u,{title:this.t("Worker thread"),icon:"ControlOutlined",Component:h,aclSnippet:`pm.system-services.${u}`,sort:10})})}}t.ModuleWorkerThreadClient=y,t.default=y,Object.defineProperties(t,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(t,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@tachybase/client"),require("react/jsx-runtime"),require("@tachybase/schema"),require("antd")):typeof define=="function"&&define.amd?define(["exports","@tachybase/client","react/jsx-runtime","@tachybase/schema","antd"],e):(t=typeof globalThis!="undefined"?globalThis:t||self,e(t["@tachybase/module-worker-thread"]={},t["@tachybase/client"],t.jsxRuntime,t["@tachybase/schema"],t.antd))})(this,function(t,e,r,h,u){"use strict";var T=Object.defineProperty;var x=Object.getOwnPropertySymbols;var F=Object.prototype.hasOwnProperty,S=Object.prototype.propertyIsEnumerable;var b=(t,e,r)=>e in t?T(t,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[e]=r,A=(t,e)=>{for(var r in e||(e={}))F.call(e,r)&&b(t,r,e[r]);if(x)for(var r of x(e))S.call(e,r)&&b(t,r,e[r]);return t};var c=(t,e,r)=>new Promise((h,u)=>{var p=n=>{try{o(r.next(n))}catch(l){u(l)}},d=n=>{try{o(r.throw(n))}catch(l){u(l)}},o=n=>n.done?h(n.value):Promise.resolve(n.value).then(p,d);o((r=r.apply(t,e)).next())});const p="worker-thread";function d(){return{t:(i,a={})=>e.i18n.t(i,A({ns:p},a))}}const o=s=>`{{t("${s}", { ns: ["${p}", "client"] })}}`,n=()=>{const s=e.useAPIClient();return{run(){return c(this,null,function*(){var a;(a=s.service("workerForm"))==null||a.refresh()})}}},l=s=>e.useRequest({url:"worker_thread:info"},s).data,k=()=>{const{setVisible:s}=e.useActionContext(),i=h.useForm(),{message:a}=u.App.useApp(),m=e.useAPIClient(),{t:C}=d();return{run(){return c(this,null,function*(){yield i.submit(),yield m.request({url:"worker_thread:preset",method:"post",data:{count:i.values.preset}}),a.success(C("Saved successfully")),s(!1)})}}},w=()=>{const{setVisible:s}=e.useActionContext(),{message:i}=u.App.useApp(),a=e.useAPIClient(),{t:m}=d();return{run(){return c(this,null,function*(){const I=i.loading(m("Restarting all..."),0);try{yield a.request({url:"worker_thread:restartAllForcely",method:"post",data:{}}),i.success(m("Restart all successfully"))}catch(g){i.error(g.message)}finally{I()}s(!1)})}}},v={type:"object",properties:{workerForm:{"x-decorator":"Form","x-uid":"workerForm","x-decorator-props":{useValues:"{{ useWorkerInfo }}"},"x-component":"div",type:"void",title:'{{t("Worker thread info")}}',properties:{preset:{type:"number",title:o("Preset count"),minimum:0,"x-decorator":"FormItem","x-component":"InputNumber","x-component-props":{precision:0},required:!0},current:{type:"digit",title:o("Current count"),"x-decorator":"FormItem","x-component":"InputNumber","x-disabled":!0},busy:{type:"digit",title:o("Busy count"),"x-decorator":"FormItem","x-component":"InputNumber","x-disabled":!0},env:{type:"digit",title:o("Environment count"),"x-decorator":"FormItem","x-component":"InputNumber","x-disabled":!0},footer1:{type:"void","x-component":"ActionBar","x-component-props":{layout:"one-column"},properties:{submit:{title:o("Submit"),"x-component":"Action","x-component-props":{type:"primary",htmlType:"submit",useAction:"{{ resetWorkerCount }}"}},refresh:{title:o("Refresh"),"x-component":"Action","x-component-props":{type:"default",useAction:"{{ useRefresh }}"}},restartAllForcely:{title:o("Restart all forcely"),"x-component":"Action","x-component-props":{type:"default",useAction:w,confirm:{title:o("Restart all forcely"),content:o("Are you sure you want to restart all worker threads? All worker threads that are currently processing main thread tasks will be immediately terminated")}}}}},helpText1:{type:"void","x-component":"div","x-component-props":{style:{color:"grey",fontSize:"12px",marginTop:"10px"}},"x-content":o("If the current preset count is less than the number of worker threads, it will wait for the worker threads to be idle before exiting")},helpText2:{type:"void","x-component":"div","x-component-props":{style:{color:"red",fontSize:"12px",marginTop:"10px"}},"x-content":o("The modification will not be refreshed immediately, please wait patiently for about 10 seconds, or click the refresh button to view the latest data")}}}}},y=()=>r.jsx(u.Card,{bordered:!1,children:r.jsx(e.SchemaComponent,{scope:{resetWorkerCount:k,useWorkerInfo:l,useRefresh:n},schema:v})});class f extends e.Plugin{afterAdd(){return c(this,null,function*(){})}beforeLoad(){return c(this,null,function*(){})}load(){return c(this,null,function*(){this.app.addComponents({WorkerInfoPane:y}),this.app.systemSettingsManager.add("system-services."+p,{title:this.t("Worker thread"),icon:"ControlOutlined",Component:y,aclSnippet:`pm.system-services.${p}`,sort:10})})}}t.ModuleWorkerThreadClient=f,t.default=f,Object.defineProperties(t,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,12 +1,12 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "0.23.22",
-  "@tachybase/schema": "0.23.22",
+  "@tachybase/client": "0.23.40",
+  "@tachybase/schema": "0.23.40",
   "antd": "5.22.5",
-  "@tachybase/server": "0.23.22",
-  "@tachybase/logger": "0.23.22",
-  "@tachybase/module-collection": "0.23.22",
-  "@tachybase/module-user": "0.23.22",
-  "@tachybase/utils": "0.23.22",
-  "@tachybase/actions": "0.23.22"
+  "@tachybase/server": "0.23.40",
+  "@tachybase/logger": "0.23.40",
+  "@tachybase/module-collection": "0.23.40",
+  "@tachybase/module-user": "0.23.40",
+  "@tachybase/utils": "0.23.40",
+  "@tachybase/actions": "0.23.40"
 };

package/dist/locale/en-US.json

@@ -1,10 +1,14 @@
 {
+  "Are you sure you want to restart all worker threads? All worker threads that are currently processing main thread tasks will be immediately terminated": "Are you sure you want to restart all worker threads? All worker threads that are currently processing main thread tasks will be immediately terminated",
   "Busy count": "Busy count",
   "Current count": "Current count",
   "Environment count": "Environment count",
+  "If the current preset count is less than the number of worker threads, it will wait for the worker threads to be idle before exiting": "If the current preset count is less than the number of worker threads, it will wait for the worker threads to be idle before exiting",
   "Invalid worker count": "Invalid worker count",
   "No worker thread": "No worker thread",
   "Preset count": "Preset count",
+  "Restart all forcely": "Restart all forcely",
+  "The modification will not be refreshed immediately, please wait patiently for about 10 seconds, or click the refresh button to view the latest data": "The modification will not be refreshed immediately, please wait patiently for about 10 seconds, or click the refresh button to view the latest data",
   "The system is currently processing other tasks. Please try again later": "The system is currently processing other tasks. Please try again later",
   "Too many workers": "Too many workers",
   "Worker thread": "Worker thread",

package/dist/locale/zh-CN.json

@@ -1,10 +1,14 @@
 {
+  "Are you sure you want to restart all worker threads? All worker threads that are currently processing main thread tasks will be immediately terminated": "你确定要重启所有工作线程吗？会立即终止正在处理主线程任务的所有工作线程",
   "Busy count": "繁忙数量",
   "Current count": "当前数量",
   "Environment count": "环境变量预设数量",
+  "If the current preset count is less than the number of worker threads, it will wait for the worker threads to be idle before exiting": "提交修改如果当前预设数量小于工作线程数量,则会等待工作线程空闲后再退出",
   "Invalid worker count": "无效的线程数",
   "No worker thread": "当前没有工作线程",
   "Preset count": "预设数量",
+  "Restart all forcely": "强制重启所有",
+  "The modification will not be refreshed immediately, please wait patiently for about 10 seconds, or click the refresh button to view the latest data": "修改后不会立即刷新,耐心等待10秒左右,也可以点击刷新按钮查看最新数据",
   "The system is currently processing other tasks. Please try again later": "当前系统处理其他事务,请稍后重试",
   "Too many workers": "设置工作线程过多",
   "Worker thread": "工作线程",

package/dist/server/worker.js

@@ -40,14 +40,24 @@ var import_workerTypes = require("./workerTypes");
 const loggerOptions = {
   system: {
     transports: (0, import_logger.getLoggerTransport)(),
-    level: (0, import_logger.getLoggerLevel)()
-    // TODO: 后续考虑是否提到info
+    level: process.env.LOGGER_LEVEL || "info"
   },
   request: {
     transports: (0, import_logger.getLoggerTransport)(),
-    level: (0, import_logger.getLoggerLevel)()
+    level: process.env.LOGGER_LEVEL || "info"
   }
 };
+async function reloadCustomCollections(app) {
+  const customCollections = await app.db.getRepository("collections").load();
+  for (const [key, collection] of app.db.collections) {
+    const dumpRules = collection.options.dumpRules;
+    if ((dumpRules == null ? void 0 : dumpRules.group) === "custom") {
+      if (!customCollections.includes(collection.name)) {
+        app.db.collections.delete(collection.name);
+      }
+    }
+  }
+}
 const handleWorkerMessages = (app) => {
   if (import_worker_threads.isMainThread) {
     return;
@@ -56,14 +66,22 @@ const handleWorkerMessages = (app) => {
     event: import_workerTypes.WorkerEvent.Started
   });
   import_worker_threads.parentPort.on("message", async (message) => {
-    app.logger.info("[worker] input", message);
+    var _a;
+    if ((_a = message.values) == null ? void 0 : _a.inputLog) {
+      app.logger.info("[worker] input", message.values.inputLog);
+    } else {
+      app.logger.info("[worker] input", message);
+    }
     const { reqId, event } = message;
     if (event === import_workerTypes.WorkerEvent.PluginMethod) {
       try {
-        const { plugin, method, params } = message.values;
+        const { plugin, method, params, reloadCols = true } = message.values;
         const appPlugin = app.pm.get(plugin);
+        if (reloadCols) {
+          await reloadCustomCollections(app);
+        }
         const result = await appPlugin[method](params);
-        app.logger.info(`[worker] output ${result}`);
+        app.logger.info(`[worker] output for ${plugin}.${method}:`, result);
         import_worker_threads.parentPort.postMessage({
           event,
           reqId,

package/dist/server/workerManager.d.ts

@@ -23,6 +23,8 @@ export declare class WorkerManager {
     private addWorker;
     clear(): Promise<void>;
     resetWorkerNum(targetNum: number): Promise<void>;
+    /** 强制重启所有线程 */
+    restartAllForcely(): Promise<void>;
     /**
      * 检查并更新并发计数
      * @param key - 用于缓存的键
@@ -40,7 +42,7 @@ export declare class WorkerManager {
     /**
      * 运行插件方法
      */
-    callPluginMethod(values: WorkerEventInputPluginMethod): Promise<unknown>;
+    callPluginMethod(values: WorkerEventInputPluginMethod): Promise<any>;
     private handleWorkerCompletion;
     /**
      * 运行通用方法

package/dist/server/workerManager.js

@@ -125,6 +125,7 @@ class WorkerManager {
       });
       worker.on("exit", async (code) => {
         if (code === 0 || code === 1) {
+          this.app.logger.debug(`[worker] terminated with code ${code}`);
           return;
         }
         this.errorRecoveryTimes++;
@@ -178,6 +179,16 @@ class WorkerManager {
       }
     }
   }
+  /** 强制重启所有线程 */
+  async restartAllForcely() {
+    if (!import_worker_threads.isMainThread) {
+      return;
+    }
+    const workerNum = this.workerNum;
+    await this.clear();
+    this.workerNum = workerNum;
+    await this.initWorkers();
+  }
   /**
    * 检查并更新并发计数
    * @param key - 用于缓存的键
@@ -245,15 +256,25 @@ class WorkerManager {
         throw new Error("The system is currently processing other tasks. Please try again later");
       }
     }
-    const result = await this.callMethod(import_workerTypes.WorkerEvent.PluginMethod, {
-      ...values,
-      plugin: this.app.pm.get(values.plugin).name
-    });
-    if (values.globalConcurrency) {
-      this.decrementConcurrencyCount(this.getGlobalKey(), this.cache);
+    let result;
+    let error;
+    try {
+      result = await this.callMethod(import_workerTypes.WorkerEvent.PluginMethod, {
+        ...values,
+        plugin: this.app.pm.get(values.plugin).name
+      });
+    } catch (err) {
+      error = err;
+    } finally {
+      if (values.globalConcurrency) {
+        this.decrementConcurrencyCount(this.getGlobalKey(), this.cache);
+      }
+      if (values.concurrency) {
+        this.decrementConcurrencyCount(this.getPluginMethodKey(values), this.cache);
+      }
     }
-    if (values.concurrency) {
-      this.decrementConcurrencyCount(this.getPluginMethodKey(values), this.cache);
+    if (error) {
+      throw error;
     }
     return result;
   }
@@ -298,11 +319,13 @@ class WorkerManager {
       let timeout;
       let handleMessage;
       let handleError;
+      let handleExit;
       handleMessage = (message) => {
         if (message.reqId === reqId) {
           clearTimeout(timeout);
           worker.off("message", handleMessage);
           worker.off("error", handleError);
+          worker.off("exit", handleExit);
           this.handleWorkerCompletion(worker, reqId, resolve, message.result);
         }
       };
@@ -310,6 +333,15 @@ class WorkerManager {
         clearTimeout(timeout);
         worker.off("message", handleMessage);
         worker.off("error", handleError);
+        worker.off("exit", handleExit);
+        this.handleWorkerCompletion(worker, reqId, resolve, void 0, reject, error);
+      };
+      handleExit = (code) => {
+        clearTimeout(timeout);
+        worker.off("message", handleMessage);
+        worker.off("error", handleError);
+        worker.off("exit", handleExit);
+        const error = new Error(`Worker stopped with exit code ${code}`);
         this.handleWorkerCompletion(worker, reqId, resolve, void 0, reject, error);
       };
       timeout = setTimeout(
@@ -329,6 +361,7 @@ class WorkerManager {
       );
       worker.on("message", handleMessage);
       worker.on("error", handleError);
+      worker.on("exit", handleExit);
       worker.postMessage({
         reqId,
         event: workerEvent,

package/dist/server/workerTypes.d.ts

@@ -12,6 +12,8 @@ export type WorkerEventInputPluginMethod<T = any> = WorkerEventInputDefault & {
     plugin: Constructor<Plugin> | string;
     method: string;
     params: T;
+    reloadCols?: boolean;
+    inputLog?: object | string;
 };
 export type WorkerEventInput = WorkerEventInputPluginMethod;
 export type WorkerWebInfo = {

package/dist/server/workerWebController.d.ts

@@ -2,4 +2,5 @@ import { Context, Next } from '@tachybase/actions';
 export declare class WorkerWebController {
     info(ctx: Context, next: Next): Promise<void>;
     preset(ctx: Context, next: Next): Promise<void>;
+    resetAllForcely(ctx: Context, next: Next): Promise<void>;
 }

package/dist/server/workerWebController.js

@@ -68,8 +68,8 @@ module.exports = __toCommonJS(workerWebController_exports);
 var import_utils = require("@tachybase/utils");
 var import_constants = require("../constants");
 var import_constants2 = require("./constants");
-var _preset_dec, _info_dec, _WorkerWebController_decorators, _init;
-_WorkerWebController_decorators = [(0, import_utils.Controller)("worker_thread")], _info_dec = [(0, import_utils.Action)("info", { acl: "blocked" })], _preset_dec = [(0, import_utils.Action)("preset", { acl: "blocked" })];
+var _resetAllForcely_dec, _preset_dec, _info_dec, _WorkerWebController_decorators, _init;
+_WorkerWebController_decorators = [(0, import_utils.Controller)("worker_thread")], _info_dec = [(0, import_utils.Action)("info", { acl: "blocked" })], _preset_dec = [(0, import_utils.Action)("preset", { acl: "blocked" })], _resetAllForcely_dec = [(0, import_utils.Action)("restartAllForcely", { acl: "blocked" })];
 class WorkerWebController {
   constructor() {
     __runInitializers(_init, 5, this);
@@ -112,10 +112,18 @@ class WorkerWebController {
       success: true
     };
   }
+  async resetAllForcely(ctx, next) {
+    const app = ctx.app;
+    await app.worker.restartAllForcely();
+    ctx.body = {
+      success: true
+    };
+  }
 }
 _init = __decoratorStart(null);
 __decorateElement(_init, 1, "info", _info_dec, WorkerWebController);
 __decorateElement(_init, 1, "preset", _preset_dec, WorkerWebController);
+__decorateElement(_init, 1, "resetAllForcely", _resetAllForcely_dec, WorkerWebController);
 WorkerWebController = __decorateElement(_init, 0, "WorkerWebController", _WorkerWebController_decorators, WorkerWebController);
 __runInitializers(_init, 1, WorkerWebController);
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/module-worker-thread",
-  "version": "0.23.22",
+  "version": "0.23.40",
   "description": "Worker thread for executing time-consuming tasks",
   "main": "dist/server/index.js",
   "dependencies": {},
@@ -9,15 +9,15 @@
     "tsx": "^4.19.2"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.22",
-    "@tachybase/client": "0.23.22",
-    "@tachybase/logger": "0.23.22",
-    "@tachybase/module-user": "0.23.22",
-    "@tachybase/module-collection": "0.23.22",
-    "@tachybase/server": "0.23.22",
-    "@tachybase/schema": "0.23.22",
-    "@tachybase/test": "0.23.22",
-    "@tachybase/utils": "0.23.22"
+    "@tachybase/client": "0.23.40",
+    "@tachybase/actions": "0.23.40",
+    "@tachybase/logger": "0.23.40",
+    "@tachybase/module-collection": "0.23.40",
+    "@tachybase/module-user": "0.23.40",
+    "@tachybase/server": "0.23.40",
+    "@tachybase/schema": "0.23.40",
+    "@tachybase/test": "0.23.40",
+    "@tachybase/utils": "0.23.40"
   },
   "description.zh-CN": "工作线程,用于执行耗时任务",
   "displayName.zh-CN": "工作线程",