@tachybase/module-worker-thread 1.3.10 → 1.3.12

package/dist/externalVersion.js

@@ -1,14 +1,14 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "1.3.10",
-  "@tachybase/schema": "1.3.10",
+  "@tachybase/client": "1.3.12",
+  "@tachybase/schema": "1.3.12",
   "antd": "5.22.5",
-  "@tachybase/globals": "1.3.10",
-  "@tachybase/loader": "1.3.10",
-  "@tachybase/server": "1.3.10",
-  "@tachybase/logger": "1.3.10",
-  "@tachybase/module-collection": "1.3.10",
-  "@tachybase/module-user": "1.3.10",
-  "@tachybase/utils": "1.3.10",
-  "@tachybase/actions": "1.3.10"
+  "@tachybase/globals": "1.3.12",
+  "@tachybase/loader": "1.3.12",
+  "@tachybase/server": "1.3.12",
+  "@tachybase/logger": "1.3.12",
+  "@tachybase/module-collection": "1.3.12",
+  "@tachybase/module-user": "1.3.12",
+  "@tachybase/utils": "1.3.12",
+  "@tachybase/actions": "1.3.12"
 };

package/dist/server/intercept.js

@@ -24,11 +24,10 @@ 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");
-const paths = process.env.NODE_MODULES_PATH.split(",");
-import_globals.default.getInstance().set("PLUGIN_PATHS", paths);
-if (!import_node_worker_threads.isMainThread && process.env.RUN_MODE === "engine") {
-  const lookingPaths = process.env.TACHYBASE_WORKER_PATHS.split(",");
-  const whitelists = new Set(process.env.TACHYBASE_WORKER_MODULES.split(","));
+if (!import_node_worker_threads.isMainThread) {
+  const globals = import_globals.default.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;
   import_node_module.Module._load = (0, import_loader.defineLoader)(whitelists, originalLoad, lookingPaths);
 }

package/dist/server/plugin.js

@@ -66,7 +66,7 @@ __export(plugin_exports, {
   default: () => plugin_default
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_worker_threads = require("worker_threads");
+var import_node_worker_threads = require("node:worker_threads");
 var import_server = require("@tachybase/server");
 var import_constants = require("../constants");
 var import_constants2 = require("./constants");
@@ -80,12 +80,12 @@ class ModuleWorkerThreadServer extends (_a = import_server.Plugin) {
   async afterAdd() {
   }
   async beforeLoad() {
-    if (!import_worker_threads.isMainThread) {
+    if (!import_node_worker_threads.isMainThread) {
       return;
     }
   }
   async load() {
-    if (!import_worker_threads.isMainThread) {
+    if (!import_node_worker_threads.isMainThread) {
       return;
     }
     const workerCount = this.app.name === "main" ? import_constants2.WORKER_COUNT : import_constants2.WORKER_COUNT_SUB;
@@ -98,7 +98,7 @@ class ModuleWorkerThreadServer extends (_a = import_server.Plugin) {
     });
     this.app.on("beforeStop", async () => {
       var _a2;
-      if (!import_worker_threads.isMainThread) {
+      if (!import_node_worker_threads.isMainThread) {
         return;
       }
       if ((_a2 = this.app.worker) == null ? void 0 : _a2.available) {
@@ -115,7 +115,7 @@ class ModuleWorkerThreadServer extends (_a = import_server.Plugin) {
   async afterEnable() {
   }
   async afterDisable() {
-    if (!import_worker_threads.isMainThread) {
+    if (!import_node_worker_threads.isMainThread) {
       return;
     }
     await this.app.worker.clear();

package/dist/server/worker.js

@@ -32,12 +32,16 @@ __export(worker_exports, {
 module.exports = __toCommonJS(worker_exports);
 var import_intercept = require("./intercept");
 var import_node_worker_threads = require("node:worker_threads");
+var import_globals = __toESM(require("@tachybase/globals"));
 var import_logger = require("@tachybase/logger");
 var import_module_collection = __toESM(require("@tachybase/module-collection"));
 var import_module_user = __toESM(require("@tachybase/module-user"));
 var import_server = require("@tachybase/server");
 var import_utils = require("@tachybase/utils");
 var import_workerTypes = require("./workerTypes");
+if (!import_node_worker_threads.isMainThread) {
+  const globals = import_globals.default.getInstance(import_node_worker_threads.workerData.initData);
+}
 const loggerOptions = {
   system: {
     transports: (0, import_logger.getLoggerTransport)(),

package/dist/server/workerManager.js

@@ -32,8 +32,8 @@ __export(workerManager_exports, {
 module.exports = __toCommonJS(workerManager_exports);
 var import_node_crypto = require("node:crypto");
 var import_node_path = __toESM(require("node:path"));
-var import_node_url = require("node:url");
 var import_node_worker_threads = require("node:worker_threads");
+var import_globals = __toESM(require("@tachybase/globals"));
 var import_utils = require("@tachybase/utils");
 var import_constants = require("./constants");
 var import_workerTypes = require("./workerTypes");
@@ -101,7 +101,8 @@ const _WorkerManager = class _WorkerManager {
       worker = new import_node_worker_threads.Worker(import_node_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.js`), {
         workerData: {
           appName: this.app.name,
-          databaseOptions: this.databaseOptions
+          databaseOptions: this.databaseOptions,
+          initData: import_globals.default.getInstance().toJSON()
         },
         env: {
           ...process.env,
@@ -109,11 +110,12 @@ const _WorkerManager = class _WorkerManager {
         }
       });
     } else {
-      worker = new import_node_worker_threads.Worker(import_node_path.default.resolve(__dirname, "../../worker-starter.mjs"), {
+      worker = new import_node_worker_threads.Worker(import_node_path.default.resolve(__dirname, "../../worker-starter.js"), {
         workerData: {
-          scriptPath: (0, import_node_url.pathToFileURL)(import_node_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.ts`)).href,
+          scriptPath: import_node_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.ts`),
           appName: this.app.name,
-          databaseOptions: this.databaseOptions
+          databaseOptions: this.databaseOptions,
+          initData: import_globals.default.getInstance().toJSON()
         },
         env: {
           ...process.env,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-worker-thread",
   "displayName": "Worker thread",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "description": "Worker thread for executing time-consuming tasks",
   "keywords": [
     "Workflow"
@@ -10,20 +10,20 @@
   "dependencies": {},
   "devDependencies": {
     "antd": "5.22.5",
-    "tsx": "^4.19.2"
+    "tsx": "4.20.3"
   },
   "peerDependencies": {
-    "@tachybase/client": "1.3.10",
-    "@tachybase/globals": "1.3.10",
-    "@tachybase/loader": "1.3.10",
-    "@tachybase/module-collection": "1.3.10",
-    "@tachybase/module-user": "1.3.10",
-    "@tachybase/actions": "1.3.10",
-    "@tachybase/logger": "1.3.10",
-    "@tachybase/schema": "1.3.10",
-    "@tachybase/test": "1.3.10",
-    "@tachybase/server": "1.3.10",
-    "@tachybase/utils": "1.3.10"
+    "@tachybase/client": "1.3.12",
+    "@tachybase/globals": "1.3.12",
+    "@tachybase/loader": "1.3.12",
+    "@tachybase/actions": "1.3.12",
+    "@tachybase/logger": "1.3.12",
+    "@tachybase/module-user": "1.3.12",
+    "@tachybase/module-collection": "1.3.12",
+    "@tachybase/schema": "1.3.12",
+    "@tachybase/server": "1.3.12",
+    "@tachybase/test": "1.3.12",
+    "@tachybase/utils": "1.3.12"
   },
   "description.zh-CN": "工作线程,用于执行耗时任务",
   "displayName.zh-CN": "工作线程",

package/worker-starter.js

@@ -0,0 +1,8 @@
+const tsx = require('tsx/cjs/api');
+const { workerData } = require('node:worker_threads');
+
+tsx.register();
+
+if (workerData.scriptPath) {
+  require(workerData.scriptPath);
+}

package/worker-starter.mjs

@@ -1,8 +0,0 @@
-import { register } from "tsx/esm/api";
-import { workerData } from "worker_threads";
-
-register();
-
-if(workerData.scriptPath){
-  await import(workerData.scriptPath);
-}