@tachybase/module-worker-thread 0.23.58 → 1.0.18

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,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"}})});
+(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 F=Object.defineProperty;var f=Object.getOwnPropertySymbols;var T=Object.prototype.hasOwnProperty,S=Object.prototype.propertyIsEnumerable;var b=(t,e,r)=>e in t?F(t,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[e]=r,A=(t,e)=>{for(var r in e||(e={}))T.call(e,r)&&b(t,r,e[r]);if(f)for(var r of f(e))S.call(e,r)&&b(t,r,e[r]);return t};var c=(t,e,r)=>new Promise((h,u)=>{var p=s=>{try{o(r.next(s))}catch(l){u(l)}},d=s=>{try{o(r.throw(s))}catch(l){u(l)}},o=s=>s.done?h(s.value):Promise.resolve(s.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=n=>`{{t("${n}", { ns: ["${p}", "client"] })}}`,s=()=>{const n=e.useAPIClient();return{run(){return c(this,null,function*(){var a;(a=n.service("workerForm"))==null||a.refresh()})}}},l=n=>e.useRequest({url:"worker_thread:info"},n).data,k=()=>{const{setVisible:n}=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")),n(!1)})}}},w=()=>{const{setVisible:n}=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()}n(!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},max:{type:"digit",title:o("Max 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:s},schema:v})});class x 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=x,t.default=x,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.58",
-  "@tachybase/schema": "0.23.58",
+  "@tachybase/client": "1.0.18",
+  "@tachybase/schema": "1.0.18",
   "antd": "5.22.5",
-  "@tachybase/server": "0.23.58",
-  "@tachybase/logger": "0.23.58",
-  "@tachybase/module-collection": "0.23.58",
-  "@tachybase/module-user": "0.23.58",
-  "@tachybase/utils": "0.23.58",
-  "@tachybase/actions": "0.23.58"
+  "@tachybase/server": "1.0.18",
+  "@tachybase/logger": "1.0.18",
+  "@tachybase/module-collection": "1.0.18",
+  "@tachybase/module-user": "1.0.18",
+  "@tachybase/utils": "1.0.18",
+  "@tachybase/actions": "1.0.18"
 };

package/dist/locale/en-US.json

@@ -5,6 +5,7 @@
   "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",
+  "Max count": "Max count",
   "No worker thread": "No worker thread",
   "Preset count": "Preset count",
   "Restart all forcely": "Restart all forcely",

package/dist/locale/zh-CN.json

@@ -5,6 +5,7 @@
   "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": "无效的线程数",
+  "Max count": "最大数量",
   "No worker thread": "当前没有工作线程",
   "Preset count": "预设数量",
   "Restart all forcely": "强制重启所有",

package/dist/server/constants.d.ts

@@ -4,3 +4,4 @@ export declare const WORKER_TIMEOUT: number;
 export declare const WORKER_ERROR_RETRY: number;
 export declare const WORKER_COUNT_SUB: number;
 export declare const WORKER_FILE = "./worker";
+export declare const WORKER_COUNT_MAX_SUB: number;

package/dist/server/constants.js

@@ -19,6 +19,7 @@ var constants_exports = {};
 __export(constants_exports, {
   WORKER_COUNT: () => WORKER_COUNT,
   WORKER_COUNT_MAX: () => WORKER_COUNT_MAX,
+  WORKER_COUNT_MAX_SUB: () => WORKER_COUNT_MAX_SUB,
   WORKER_COUNT_SUB: () => WORKER_COUNT_SUB,
   WORKER_ERROR_RETRY: () => WORKER_ERROR_RETRY,
   WORKER_FILE: () => WORKER_FILE,
@@ -31,10 +32,12 @@ const WORKER_TIMEOUT = process.env.WORKER_TIMEOUT ? +process.env.WORKER_TIMEOUT
 const WORKER_ERROR_RETRY = process.env.WORKER_ERROR_RETRY ? +process.env.WORKER_ERROR_RETRY : 3;
 const WORKER_COUNT_SUB = process.env.WORKER_COUNT_SUB ? +process.env.WORKER_COUNT_SUB : 0;
 const WORKER_FILE = "./worker";
+const WORKER_COUNT_MAX_SUB = process.env.WORKER_COUNT_MAX_SUB ? +process.env.WORKER_COUNT_MAX_SUB : 1;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   WORKER_COUNT,
   WORKER_COUNT_MAX,
+  WORKER_COUNT_MAX_SUB,
   WORKER_COUNT_SUB,
   WORKER_ERROR_RETRY,
   WORKER_FILE,

package/dist/server/plugin.js

@@ -68,7 +68,8 @@ __export(plugin_exports, {
 module.exports = __toCommonJS(plugin_exports);
 var import_worker_threads = require("worker_threads");
 var import_server = require("@tachybase/server");
-var import_constants = require("./constants");
+var import_constants = require("../constants");
+var import_constants2 = require("./constants");
 var import_workerManager = require("./workerManager");
 var import_workerWebController = require("./workerWebController");
 var _ModuleWorkerThreadServer_decorators, _init, _a;
@@ -87,7 +88,7 @@ class ModuleWorkerThreadServer extends (_a = import_server.Plugin) {
     if (!import_worker_threads.isMainThread) {
       return;
     }
-    const workerCount = this.app.name === "main" ? import_constants.WORKER_COUNT : import_constants.WORKER_COUNT_SUB;
+    const workerCount = this.app.name === "main" ? import_constants2.WORKER_COUNT : import_constants2.WORKER_COUNT_SUB;
     this.app.on("afterStart", async () => {
       if (this.app.worker) {
         await this.app.worker.clear();
@@ -105,7 +106,7 @@ class ModuleWorkerThreadServer extends (_a = import_server.Plugin) {
       }
     });
     this.app.acl.registerSnippet({
-      name: `pm.system-services.${this.name}`,
+      name: `pm.system-services.${import_constants.NAMESPACE}`,
       actions: ["worker_thread:*"]
     });
   }

package/dist/server/workerManager.js

@@ -93,12 +93,20 @@ const _WorkerManager = class _WorkerManager {
     await Promise.all(Array.from({ length: this.workerNum }).map(() => this.addWorker()));
   }
   async addWorker() {
+    const maxMemory = process.env.WORKER_MAX_MEMORY || 4096;
+    const maxOldSpaceSize = `--max-old-space-size=${maxMemory}`;
     let worker;
     if (this.isProd) {
       worker = new import_worker_threads.Worker(import_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.js`), {
         workerData: {
           appName: this.app.name,
           databaseOptions: this.databaseOptions
+        },
+        env: {
+          ...process.env,
+          ...{
+            NODE_OPTIONS: maxOldSpaceSize
+          }
         }
       });
     } else {
@@ -107,6 +115,12 @@ const _WorkerManager = class _WorkerManager {
           scriptPath: import_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.ts`),
           appName: this.app.name,
           databaseOptions: this.databaseOptions
+        },
+        env: {
+          ...process.env,
+          ...{
+            NODE_OPTIONS: maxOldSpaceSize
+          }
         }
       });
     }
@@ -323,7 +337,11 @@ const _WorkerManager = class _WorkerManager {
           worker.off("message", handleMessage);
           worker.off("error", handleError);
           worker.off("exit", handleExit);
-          this.handleWorkerCompletion(worker, reqId, resolve, message.result);
+          if (message.error) {
+            this.handleWorkerCompletion(worker, reqId, resolve, void 0, reject, message.error);
+          } else {
+            this.handleWorkerCompletion(worker, reqId, resolve, message.result);
+          }
         }
       };
       handleError = (error) => {

package/dist/server/workerWebController.d.ts

@@ -1,6 +1,6 @@
 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>;
+    info(ctx: Context, next: Next): Promise<any>;
+    preset(ctx: Context, next: Next): Promise<any>;
+    restartAllForcely(ctx: Context, next: Next): Promise<any>;
 }

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 _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" })];
+var _restartAllForcely_dec, _preset_dec, _info_dec, _WorkerWebController_decorators, _init;
+_WorkerWebController_decorators = [(0, import_utils.Controller)("worker_thread")], _info_dec = [(0, import_utils.Action)("info", { acl: "private" })], _preset_dec = [(0, import_utils.Action)("preset", { acl: "private" })], _restartAllForcely_dec = [(0, import_utils.Action)("restartAllForcely", { acl: "private" })];
 class WorkerWebController {
   constructor() {
     __runInitializers(_init, 5, this);
@@ -87,13 +87,16 @@ class WorkerWebController {
       const current = app.worker.getCurrentWorkerNum();
       const busy = app.worker.getBusyWorkerNum();
       const env = app.name === "main" ? import_constants2.WORKER_COUNT : import_constants2.WORKER_COUNT_SUB;
+      const max = app.name === "main" ? import_constants2.WORKER_COUNT_MAX : import_constants2.WORKER_COUNT_MAX_SUB;
       ctx.body = {
         preset,
         current,
         busy,
-        env
+        env,
+        max
       };
     }
+    return next();
   }
   async preset(ctx, next) {
     const { count } = ctx.action.params.values;
@@ -101,7 +104,8 @@ class WorkerWebController {
       ctx.throw(400, ctx.t("Invalid worker count", { ns: import_constants.NAMESPACE }));
     }
     const app = ctx.app;
-    if (count > import_constants2.WORKER_COUNT_MAX) {
+    const countMax = app.name === "main" ? import_constants2.WORKER_COUNT_MAX : import_constants2.WORKER_COUNT_MAX_SUB;
+    if (count > countMax) {
       ctx.throw(400, ctx.t("Too many workers", { ns: import_constants.NAMESPACE }));
     }
     if (!app.worker) {
@@ -111,19 +115,21 @@ class WorkerWebController {
     ctx.body = {
       success: true
     };
+    return next();
   }
-  async resetAllForcely(ctx, next) {
+  async restartAllForcely(ctx, next) {
     const app = ctx.app;
     await app.worker.restartAllForcely();
     ctx.body = {
       success: true
     };
+    return next();
   }
 }
 _init = __decoratorStart(null);
 __decorateElement(_init, 1, "info", _info_dec, WorkerWebController);
 __decorateElement(_init, 1, "preset", _preset_dec, WorkerWebController);
-__decorateElement(_init, 1, "resetAllForcely", _resetAllForcely_dec, WorkerWebController);
+__decorateElement(_init, 1, "restartAllForcely", _restartAllForcely_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.58",
+  "version": "1.0.18",
   "description": "Worker thread for executing time-consuming tasks",
   "main": "dist/server/index.js",
   "dependencies": {},
@@ -9,15 +9,15 @@
     "tsx": "^4.19.2"
   },
   "peerDependencies": {
-    "@tachybase/client": "0.23.58",
-    "@tachybase/logger": "0.23.58",
-    "@tachybase/actions": "0.23.58",
-    "@tachybase/module-collection": "0.23.58",
-    "@tachybase/module-user": "0.23.58",
-    "@tachybase/schema": "0.23.58",
-    "@tachybase/test": "0.23.58",
-    "@tachybase/utils": "0.23.58",
-    "@tachybase/server": "0.23.58"
+    "@tachybase/actions": "1.0.18",
+    "@tachybase/client": "1.0.18",
+    "@tachybase/logger": "1.0.18",
+    "@tachybase/module-collection": "1.0.18",
+    "@tachybase/module-user": "1.0.18",
+    "@tachybase/schema": "1.0.18",
+    "@tachybase/server": "1.0.18",
+    "@tachybase/test": "1.0.18",
+    "@tachybase/utils": "1.0.18"
   },
   "description.zh-CN": "工作线程,用于执行耗时任务",
   "displayName.zh-CN": "工作线程",