@tachybase/module-worker-thread 1.1.16 → 1.1.20

package/dist/externalVersion.js

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

package/dist/server/intercept.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/server/intercept.js

@@ -0,0 +1,27 @@
+var import_node_module = require("node:module");
+var import_node_path = require("node:path");
+var import_node_worker_threads = require("node:worker_threads");
+if (!import_node_worker_threads.isMainThread && process.env.RUN_MODE === "engine") {
+  let isBareModule = function(name) {
+    return !name.startsWith(".") && !name.startsWith("/") && !(0, import_node_path.isAbsolute)(name);
+  };
+  const lookingPaths = process.env.TACHYBASE_WORKER_PATHS.split(",");
+  const originalLoad = import_node_module.Module._load;
+  process.env.TACHYBASE_WORKER_PATHS = lookingPaths.join(",");
+  import_node_module.Module._load = function(request, parent, isMain) {
+    if ((0, import_node_module.isBuiltin)(request)) {
+      return originalLoad(request, parent, isMain);
+    }
+    if (isBareModule(request)) {
+      try {
+        const resolvedFromApp = require.resolve(request, { paths: lookingPaths });
+        return originalLoad(resolvedFromApp, parent, isMain);
+      } catch (err) {
+        if (err.code === "MODULE_NOT_FOUND") {
+          return originalLoad(request, parent, isMain);
+        }
+      }
+    }
+    return originalLoad(request, parent, isMain);
+  };
+}

package/dist/server/worker.d.ts

@@ -1 +1,2 @@
+import './intercept';
 export declare const main: () => Promise<void>;

package/dist/server/worker.js

@@ -30,7 +30,8 @@ __export(worker_exports, {
   main: () => main
 });
 module.exports = __toCommonJS(worker_exports);
-var import_worker_threads = require("worker_threads");
+var import_intercept = require("./intercept");
+var import_node_worker_threads = require("node:worker_threads");
 var import_logger = require("@tachybase/logger");
 var import_module_collection = __toESM(require("@tachybase/module-collection"));
 var import_module_user = __toESM(require("@tachybase/module-user"));
@@ -59,13 +60,13 @@ async function reloadCustomCollections(app) {
   }
 }
 const handleWorkerMessages = (app) => {
-  if (import_worker_threads.isMainThread) {
+  if (import_node_worker_threads.isMainThread) {
     return;
   }
-  import_worker_threads.parentPort.postMessage({
+  import_node_worker_threads.parentPort.postMessage({
     event: import_workerTypes.WorkerEvent.Started
   });
-  import_worker_threads.parentPort.on("message", async (message) => {
+  import_node_worker_threads.parentPort.on("message", async (message) => {
     var _a;
     if ((_a = message.values) == null ? void 0 : _a.inputLog) {
       app.logger.info("[worker] input", message.values.inputLog);
@@ -82,14 +83,14 @@ const handleWorkerMessages = (app) => {
         }
         const result = await appPlugin[method](params);
         app.logger.info(`[worker] output for ${plugin}.${method}:`, result);
-        import_worker_threads.parentPort.postMessage({
+        import_node_worker_threads.parentPort.postMessage({
           event,
           reqId,
           result
         });
       } catch (error) {
         app.logger.error("[worker] error", error);
-        import_worker_threads.parentPort.postMessage({
+        import_node_worker_threads.parentPort.postMessage({
           event,
           reqId,
           error
@@ -97,7 +98,7 @@ const handleWorkerMessages = (app) => {
       }
     } else {
       app.logger.error("[worker] invalid message", message);
-      import_worker_threads.parentPort.postMessage({
+      import_node_worker_threads.parentPort.postMessage({
         event,
         reqId,
         error: "invalid message"
@@ -108,11 +109,11 @@ const handleWorkerMessages = (app) => {
 const main = async () => {
   var _a, _b, _c;
   let app;
-  const appName = import_worker_threads.workerData.appName || "main";
+  const appName = import_node_worker_threads.workerData.appName || "main";
   try {
     const applicationOptions = {
       name: `worker-${appName}-${(0, import_utils.uid)()}`,
-      database: import_worker_threads.workerData.databaseOptions,
+      database: import_node_worker_threads.workerData.databaseOptions,
       logger: loggerOptions
     };
     app = new import_server.Application(applicationOptions);

package/dist/server/workerManager.js

@@ -30,9 +30,9 @@ __export(workerManager_exports, {
   WorkerManager: () => WorkerManager
 });
 module.exports = __toCommonJS(workerManager_exports);
-var import_crypto = require("crypto");
-var import_path = __toESM(require("path"));
-var import_worker_threads = require("worker_threads");
+var import_node_crypto = require("node:crypto");
+var import_node_path = __toESM(require("node:path"));
+var import_node_worker_threads = require("node:worker_threads");
 var import_utils = require("@tachybase/utils");
 var import_constants = require("./constants");
 var import_workerTypes = require("./workerTypes");
@@ -59,7 +59,7 @@ const _WorkerManager = class _WorkerManager {
     this.busyWorkerSet = /* @__PURE__ */ new Set();
     this.cache = /* @__PURE__ */ new Map();
     this.errorRecoveryTimes = 0;
-    if (!import_worker_threads.isMainThread) {
+    if (!import_node_worker_threads.isMainThread) {
       return;
     }
     if (workerNum !== void 0) {
@@ -86,10 +86,10 @@ const _WorkerManager = class _WorkerManager {
     return this.busyWorkerSet.size;
   }
   async initWorkers() {
-    if (!import_worker_threads.isMainThread) {
+    if (!import_node_worker_threads.isMainThread) {
       return;
     }
-    this.isProd = await (0, import_utils.fsExists)(import_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.js`));
+    this.isProd = await (0, import_utils.fsExists)(import_node_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.js`));
     await Promise.all(Array.from({ length: this.workerNum }).map(() => this.addWorker()));
   }
   async addWorker() {
@@ -97,30 +97,26 @@ const _WorkerManager = class _WorkerManager {
     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`), {
+      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
         },
         env: {
           ...process.env,
-          ...{
-            NODE_OPTIONS: maxOldSpaceSize
-          }
+          NODE_OPTIONS: maxOldSpaceSize
         }
       });
     } else {
-      worker = new import_worker_threads.Worker(import_path.default.resolve(__dirname, "../../worker-starter.mjs"), {
+      worker = new import_node_worker_threads.Worker(import_node_path.default.resolve(__dirname, "../../worker-starter.mjs"), {
         workerData: {
-          scriptPath: import_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.ts`),
+          scriptPath: import_node_path.default.resolve(__dirname, `${import_constants.WORKER_FILE}.ts`),
           appName: this.app.name,
           databaseOptions: this.databaseOptions
         },
         env: {
           ...process.env,
-          ...{
-            NODE_OPTIONS: maxOldSpaceSize
-          }
+          NODE_OPTIONS: maxOldSpaceSize
         }
       });
     }
@@ -154,7 +150,7 @@ const _WorkerManager = class _WorkerManager {
     });
   }
   async clear() {
-    if (!import_worker_threads.isMainThread) {
+    if (!import_node_worker_threads.isMainThread) {
       return;
     }
     await Promise.all(this.workerList.map((worker) => worker.terminate()));
@@ -168,7 +164,7 @@ const _WorkerManager = class _WorkerManager {
   }
   async resetWorkerNum(targetNum) {
     var _a;
-    if (!import_worker_threads.isMainThread) {
+    if (!import_node_worker_threads.isMainThread) {
       return;
     }
     this.workerNum = targetNum;
@@ -192,7 +188,7 @@ const _WorkerManager = class _WorkerManager {
   }
   /** 强制重启所有线程 */
   async restartAllForcely() {
-    if (!import_worker_threads.isMainThread) {
+    if (!import_node_worker_threads.isMainThread) {
       return;
     }
     const workerNum = this.workerNum;
@@ -315,7 +311,7 @@ const _WorkerManager = class _WorkerManager {
     if (this.workerList.length === 0) {
       throw new Error("No available workers");
     }
-    const reqId = (0, import_crypto.randomUUID)();
+    const reqId = (0, import_node_crypto.randomUUID)();
     if (this.currentWorkerIndex >= this.workerList.length) {
       this.currentWorkerIndex = 0;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-worker-thread",
   "displayName": "Worker thread",
-  "version": "1.1.16",
+  "version": "1.1.20",
   "description": "Worker thread for executing time-consuming tasks",
   "keywords": [
     "Workflow"
@@ -13,15 +13,15 @@
     "tsx": "^4.19.2"
   },
   "peerDependencies": {
-    "@tachybase/client": "1.1.16",
-    "@tachybase/actions": "1.1.16",
-    "@tachybase/module-collection": "1.1.16",
-    "@tachybase/logger": "1.1.16",
-    "@tachybase/module-user": "1.1.16",
-    "@tachybase/server": "1.1.16",
-    "@tachybase/schema": "1.1.16",
-    "@tachybase/test": "1.1.16",
-    "@tachybase/utils": "1.1.16"
+    "@tachybase/actions": "1.1.20",
+    "@tachybase/logger": "1.1.20",
+    "@tachybase/client": "1.1.20",
+    "@tachybase/module-collection": "1.1.20",
+    "@tachybase/schema": "1.1.20",
+    "@tachybase/module-user": "1.1.20",
+    "@tachybase/server": "1.1.20",
+    "@tachybase/test": "1.1.20",
+    "@tachybase/utils": "1.1.20"
   },
   "description.zh-CN": "工作线程,用于执行耗时任务",
   "displayName.zh-CN": "工作线程",