@tachybase/module-worker-thread 1.6.0 → 1.6.1

package/dist/externalVersion.js

@@ -1,12 +1,12 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "1.6.0",
-  "@tachybase/schema": "1.3.52",
+  "@tachybase/client": "1.6.1",
+  "@tachybase/schema": "1.6.0-alpha.9",
   "antd": "5.22.5",
-  "@tachybase/globals": "1.3.52",
-  "@tachybase/loader": "1.3.52",
+  "@tachybase/loader": "1.6.0-alpha.9",
   "dayjs": "1.11.13",
-  "@tego/server": "1.3.52",
-  "@tachybase/module-collection": "1.6.0",
-  "@tachybase/module-user": "1.6.0"
+  "@tachybase/globals": "1.6.0-alpha.9",
+  "@tego/server": "1.6.0-alpha.9",
+  "@tachybase/module-collection": "1.6.1",
+  "@tachybase/module-user": "1.6.1"
 };

package/dist/server/intercept.js

@@ -22,7 +22,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var import_node_module = require("node:module");
 var import_node_worker_threads = require("node:worker_threads");
-var import_globals = __toESM(require("@tachybase/globals"));
 var import_loader = require("@tachybase/loader");
 var import_dayjs = __toESM(require("dayjs"));
 var import_advancedFormat = __toESM(require("dayjs/plugin/advancedFormat"));
@@ -42,7 +41,9 @@ var import_weekday = __toESM(require("dayjs/plugin/weekday"));
 var import_weekOfYear = __toESM(require("dayjs/plugin/weekOfYear"));
 var import_weekYear = __toESM(require("dayjs/plugin/weekYear"));
 if (!import_node_worker_threads.isMainThread) {
-  const globals = import_globals.default.getInstance(import_node_worker_threads.workerData.initData);
+  const globalsModule = require("@tachybase/globals");
+  const TachybaseGlobal = globalsModule.default || globalsModule;
+  const globals = TachybaseGlobal.getInstance(import_node_worker_threads.workerData.initData);
   const lookingPaths = globals.get("WORKER_PATHS");
   const whitelists = new Set(globals.get("WORKER_MODULES"));
   const originalLoad = import_node_module.Module._load;

package/dist/server/workerManager.js

@@ -96,6 +96,10 @@ const _WorkerManager = class _WorkerManager {
   async addWorker() {
     const maxMemory = process.env.WORKER_MAX_MEMORY || 4096;
     const maxOldSpaceSize = `--max-old-space-size=${maxMemory}`;
+    const workerEnv = {
+      ...process.env,
+      NODE_OPTIONS: maxOldSpaceSize
+    };
     let worker;
     if (this.isProd) {
       worker = new import_node_worker_threads.Worker(import_node_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.js`), {
@@ -104,10 +108,7 @@ const _WorkerManager = class _WorkerManager {
           databaseOptions: this.databaseOptions,
           initData: import_globals.default.getInstance().toJSON()
         },
-        env: {
-          ...process.env,
-          NODE_OPTIONS: maxOldSpaceSize
-        }
+        env: workerEnv
       });
     } else {
       worker = new import_node_worker_threads.Worker(import_node_path.default.resolve(__dirname, "../../worker-starter.js"), {
@@ -117,10 +118,7 @@ const _WorkerManager = class _WorkerManager {
           databaseOptions: this.databaseOptions,
           initData: import_globals.default.getInstance().toJSON()
         },
-        env: {
-          ...process.env,
-          NODE_OPTIONS: maxOldSpaceSize
-        }
+        env: workerEnv
       });
     }
     await new Promise((resolve, reject) => {

package/dist/server/workerWebController.js

@@ -75,7 +75,7 @@ class WorkerWebController {
     __runInitializers(_init, 5, this);
   }
   async info(ctx, next) {
-    const app = ctx.app;
+    const app = ctx.tego;
     if (!app.worker) {
       ctx.body = {
         preset: 0,
@@ -103,7 +103,7 @@ class WorkerWebController {
     if (count < 0) {
       ctx.throw(400, ctx.t("Invalid worker count", { ns: import_constants.NAMESPACE }));
     }
-    const app = ctx.app;
+    const app = ctx.tego;
     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 }));
@@ -118,7 +118,7 @@ class WorkerWebController {
     return next();
   }
   async restartAllForcely(ctx, next) {
-    const app = ctx.app;
+    const app = ctx.tego;
     await app.worker.restartAllForcely();
     ctx.body = {
       success: true

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@tachybase/module-worker-thread",
   "displayName": "Worker thread",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Worker thread for executing time-consuming tasks",
   "keywords": [
     "Workflow"
   ],
   "main": "dist/server/index.js",
   "devDependencies": {
-    "@tachybase/globals": "1.3.52",
-    "@tachybase/loader": "1.3.52",
-    "@tachybase/schema": "1.3.52",
-    "@tachybase/test": "1.3.52",
-    "@tego/client": "1.3.52",
-    "@tego/server": "1.3.52",
+    "@tachybase/globals": "1.6.0-alpha.9",
+    "@tachybase/loader": "1.6.0-alpha.9",
+    "@tachybase/schema": "1.6.0-alpha.9",
+    "@tachybase/test": "1.6.0-alpha.9",
+    "@tego/client": "1.6.0-alpha.9",
+    "@tego/server": "1.6.0-alpha.9",
     "antd": "5.22.5",
     "dayjs": "1.11.13",
     "tsx": "4.20.3",
-    "@tachybase/module-user": "1.6.0",
-    "@tachybase/module-collection": "1.6.0",
-    "@tachybase/client": "1.6.0"
+    "@tachybase/module-collection": "1.6.1",
+    "@tachybase/client": "1.6.1",
+    "@tachybase/module-user": "1.6.1"
   },
   "description.zh-CN": "工作线程,用于执行耗时任务",
   "displayName.zh-CN": "工作线程",