nestworker 2.0.8 → 2.1.1

package/dist/worker/worker-runtime.js

@@ -1,55 +1,165 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_worker_threads_1 = require("node:worker_threads");
+const node_async_hooks_1 = require("node:async_hooks");
 const worker_container_1 = require("../di/worker-container");
-/**
- * Worker Runtime – entry point for every worker thread.
- *
- * Receives SerializedService[] via workerData and boots a WorkerContainer
- * which eval()s the stripped class sources and reconstructs the full
- * service graph (deps injected via constructor) without any require() calls
- * into NestJS-annotated files.
- *
- * Jobs are processed serially via a queue — one postMessage() reply per job,
- * which is exactly what the pool's worker.once('message') expects.
- */
 const services = node_worker_threads_1.workerData?.services ?? [];
 const container = new worker_container_1.WorkerContainer();
 container.load(services);
-// Build flat dispatch map: "ServiceName.methodName" → bound callable
-const tasks = {};
+const instances = new Map();
 for (const svc of services) {
-    const inst = container.get(svc.name);
-    for (const { methodName } of svc.methods) {
-        tasks[`${svc.name}.${methodName}`] = (...args) => inst[methodName](...args);
+    instances.set(svc.name, container.get(svc.name));
+}
+node_worker_threads_1.parentPort?.postMessage({ type: 'worker:ready' });
+// ── Pending IPC calls ─────────────────────────────────────────────────────
+const pendingIpc = new Map();
+// ── Pending AbortControllers (keyed by abortSignalId) ────────────────────
+const pendingAborts = new Map();
+// ── Internal ALS for context propagation ─────────────────────────────────
+// One ALS instance per context key — we use a single generic ALS that holds
+// the full context map, then the user's ALS instances read from it via
+// the context restoration path in WorkerService.
+const workerAls = new node_async_hooks_1.AsyncLocalStorage();
+node_worker_threads_1.parentPort?.on('message', (msg) => {
+    const message = msg;
+    // IPC result from main thread
+    if (message.type === 'ipc:result') {
+        const res = message;
+        const pending = pendingIpc.get(res.callId);
+        if (!pending)
+            return;
+        pendingIpc.delete(res.callId);
+        res.ok ? pending.resolve(res.data) : pending.reject(new Error(res.error ?? 'IPC failed'));
+        return;
+    }
+    // Abort signal from main thread
+    if (message.type === 'abort') {
+        const abort = message;
+        pendingAborts.get(abort.abortSignalId)?.abort();
+        return;
     }
+    // Normal job
+    queue.push(message);
+    runNext();
+});
+function buildProxy(descriptor) {
+    const proxy = {};
+    const propertyKey = descriptor.propertyKey;
+    for (const methodName of descriptor.methodNames) {
+        proxy[methodName] = (...args) => new Promise((resolve, reject) => {
+            const callId = nextCallId();
+            pendingIpc.set(callId, { resolve, reject });
+            const request = {
+                type: 'ipc:invoke', callId,
+                propertyKey,
+                methodName, args,
+            };
+            try {
+                node_worker_threads_1.parentPort.postMessage(request);
+            }
+            catch (err) {
+                pendingIpc.delete(callId);
+                reject(new Error(`IPC proxy "${propertyKey}.${methodName}" could not serialise args: ` +
+                    `${err.message}`));
+            }
+        });
+    }
+    return proxy;
 }
+// Counter-based call IDs — far cheaper than crypto.randomUUID() and only
+// need to be unique within this worker process.
+let __callCounter = 0;
+const nextCallId = () => 'c' + (++__callCounter).toString(36);
 const queue = [];
 let busy = false;
 async function runNext() {
     if (busy || queue.length === 0)
         return;
     busy = true;
-    const payload = queue.shift();
-    const key = `${payload.serviceName}.${payload.methodName}`;
+    const job = queue.shift();
+    // Set up AbortController for this job
+    const abortController = new AbortController();
+    if (job.abortSignalId) {
+        pendingAborts.set(job.abortSignalId, abortController);
+    }
+    // Inject proxy stubs
+    if (job.proxyServices?.length) {
+        const inst = instances.get(job.serviceName);
+        if (inst) {
+            for (const descriptor of job.proxyServices) {
+                inst[descriptor.propertyKey] = buildProxy(descriptor);
+            }
+        }
+    }
+    // Restore ALS context and run the task inside it
+    const alsContext = job.alsContext;
+    const hasAls = alsContext && hasOwnKeys(alsContext);
+    const run = async () => {
+        const inst = instances.get(job.serviceName);
+        if (!inst)
+            throw new Error(`Service "${job.serviceName}" is not registered`);
+        const fn = inst[job.methodName];
+        if (typeof fn !== 'function') {
+            throw new Error(`Task "${job.serviceName}.${job.methodName}" is not registered`);
+        }
+        // Inject AbortSignal as a last argument if the job has an abortSignalId.
+        // Call via inst.method() — not as a detached fn() — so `this` is preserved.
+        const args = job.abortSignalId
+            ? [...job.args, abortController.signal]
+            : job.args;
+        return inst[job.methodName](...args);
+    };
     try {
-        const fn = tasks[key];
-        if (!fn)
-            throw new Error(`Task "${key}" is not registered`);
-        const data = await fn(...payload.args);
-        node_worker_threads_1.parentPort?.postMessage({ ok: true, data });
+        // Skip the ALS wrapper entirely when there's no context to propagate —
+        // ALS.run() has measurable overhead (async-hooks resource tracking).
+        const data = hasAls ? await workerAls.run(alsContext, run) : await run();
+        node_worker_threads_1.parentPort.postMessage({ ok: true, data });
     }
     catch (error) {
         const e = error;
-        node_worker_threads_1.parentPort?.postMessage({ ok: false, error: { message: e.message, stack: e.stack } });
+        const serialized = {
+            name: e.name ?? 'Error',
+            message: e.message,
+            stack: e.stack,
+            code: e.code,
+            // Capture any extra own enumerable properties (e.g. HttpException.status)
+            extra: serializeExtraProps(e),
+        };
+        node_worker_threads_1.parentPort.postMessage({ ok: false, error: serialized });
     }
     finally {
+        if (job.abortSignalId) {
+            pendingAborts.delete(job.abortSignalId);
+        }
         busy = false;
-        runNext();
+        if (queue.length > 0)
+            runNext();
     }
 }
-node_worker_threads_1.parentPort?.on('message', (payload) => {
-    queue.push(payload);
-    runNext();
-});
+function hasOwnKeys(obj) {
+    // Cheaper than Object.keys(obj).length > 0 — no array allocation.
+    // noinspection LoopStatementThatDoesntLoopJS
+    for (const _k in obj) {
+        void _k;
+        return true;
+    }
+    return false;
+}
+function serializeExtraProps(err) {
+    const skip = new Set(['name', 'message', 'stack', 'code']);
+    const extra = {};
+    let hasExtra = false;
+    for (const key of Object.keys(err)) {
+        if (skip.has(key))
+            continue;
+        try {
+            structuredClone(err[key]);
+            extra[key] = err[key];
+            hasExtra = true;
+        }
+        catch { /* skip non-cloneable */
+        }
+    }
+    return hasExtra ? extra : undefined;
+}
 //# sourceMappingURL=worker-runtime.js.map

package/dist/worker/worker-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-runtime.js","sourceRoot":"","sources":["../../src/worker/worker-runtime.ts"],"names":[],"mappings":";;AAAA,6DAA6D;AAC7D,6DAAyD;AAGzD;;;;;;;;;;GAUG;AAEH,MAAM,QAAQ,GAAwB,gCAAU,EAAE,QAAQ,IAAI,EAAE,CAAC;AACjE,MAAM,SAAS,GAAG,IAAI,kCAAe,EAAE,CAAC;AACxC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAEzB,qEAAqE;AACrE,MAAM,KAAK,GAAoD,EAAE,CAAC;AAClE,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAkD,GAAG,CAAC,IAAI,CAAC,CAAC;IACtF,KAAK,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QACzC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC;AAID,MAAM,KAAK,GAAU,EAAE,CAAC;AACxB,IAAI,IAAI,GAAG,KAAK,CAAC;AAEjB,KAAK,UAAU,OAAO;IACpB,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACvC,IAAI,GAAG,IAAI,CAAC;IACZ,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;IAC/B,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAC3D,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,qBAAqB,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,gCAAU,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,CAAC,GAAG,KAAc,CAAC;QACzB,gCAAU,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACxF,CAAC;YAAS,CAAC;QACT,IAAI,GAAG,KAAK,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,gCAAU,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,OAAY,EAAE,EAAE;IACzC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpB,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"worker-runtime.js","sourceRoot":"","sources":["../../src/worker/worker-runtime.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestworker",
-  "version": "2.0.8",
+  "version": "2.1.1",
   "description": "Enterprise-grade worker thread module for NestJS — priority pool, auto-discovery, DI in workers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,6 +13,7 @@
     "build": "tsc -p tsconfig.build.json",
     "build:watch": "tsc -p tsconfig.build.json --watch",
     "example": "npm run build && node dist/example/main.js",
+    "bench": "npm run build && node dist/example/bench.js",
     "prepublishOnly": "npm run build"
   },
   "keywords": [