@coherentglobal/wasm-runner 0.1.4 → 0.2.4

package/dist/node/template/main.template.ejs

@@ -4,8 +4,8 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable no-underscore-dangle */
 const WorkerThread = require('<%= modules.workerThread %>').default;
+const { threadId } = require('worker_threads');
 const model = require('<%= runtime %>');
-const externalResolver = require('<%= modules.externalResolver %>');
 const { logger } = require('<%= modules.logger %>');
 const metadata = <%- metadata %>;
 const formspec = <%- formspec %>;
@@ -26,6 +26,7 @@ let wb;
 let isReady = false;
 let execute = () => { return Promise.resolve(false) };
 let _execute = () => { return Promise.resolve(false) };
+const requestQueue = [];
 let modelIsBusy = false;
 
 /**
@@ -34,6 +35,43 @@ let modelIsBusy = false;
  */
 let workerThreadInstance = null;
 
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+const start = Date.now();
+let readyRes = undefined;
+
+const REPORT_INTERVAL = 5000;
+
+async function processQueue() {
+  if (modelIsBusy || requestQueue.length === 0) return;
+
+  modelIsBusy = true;
+  const { resolve, reject, req } = requestQueue.shift();
+  const start = Date.now();
+
+  try {
+    const payload = await execute(req);
+    resolve({
+      payload: payload,
+      // memoryUsage: process.memoryUsage().rss,
+      threadId,
+      time: Date.now() - start
+    });
+  } catch (err) {
+    reject({
+      error: err,
+      // memoryUsage: process.memoryUsage().rss,
+      threadId,
+      time: Date.now() - start
+    });
+  } finally {
+    modelIsBusy = false;
+    // Process next request if any
+    processQueue();
+  }
+}
 
 try {
   logger.debug({
@@ -66,34 +104,35 @@ try {
 
           switch (service) {
             case DISPATCH_TYPE.SPARK_SERVICE: {
-              return workerThreadInstance.requestMessage(requestData, ctx);
-              // return result
-            }
-            case DISPATCH_TYPE.EXTERNAL_API: {
-              // eslint-disable-next-line no-return-await
-              return await externalResolver.externalApi(requestData, ctx);
+              const resultSparkService = await workerThreadInstance.requestMessage(requestData, ctx);
+              return resultSparkService;
             }
             default: {
               logger.error(
                 `Not implemented for service ${service} data ${result}`
               );
+              return '';
             }
           }
         };
 
+        let interval;
         let currentParameterSetKey;
         execute = function (req) {
           try {
             if (req === "isReady") {
-              return Promise.resolve(isReady);
+              return Promise.resolve(readyRes);
             }
 
             if (req === "destroy") {
+              if (interval) {
+                clearInterval(interval);
+              }
               instance._destroy(wb);
               return Promise.resolve(true);
             }
 
-            if(!req.request_data) req.request_data = {}
+            if (!req.request_data) req.request_data = {}
 
             let rawString = false;
             if (req.request_data._raw) {
@@ -113,7 +152,7 @@ try {
               }
             }
 
-            if(!req.request_meta) req.request_meta = {}
+            if (!req.request_meta) req.request_meta = {}
 
             if (req.request_meta?._ctx?.correlationId) {
               ctx.correlationId = req.request_meta._ctx.correlationId;
@@ -147,15 +186,15 @@ try {
               delete req.request_meta._ctx.servicemap;
             }
 
-            if(req.request_meta._ctx?.xcallChainId) {
+            if (req.request_meta._ctx?.xcallChainId) {
               ctx.xcallChainId = req.request_meta._ctx?.xcallChainId;
               delete req.request_meta._ctx.xcallChainId;
             }
 
-            if(req.request_meta._ctx?.callId) {
+            if (req.request_meta._ctx?.callId) {
               ctx.callid = req.request_meta._ctx.callId;
               delete req.request_meta._ctx.callId;
-            } else if(req.callid) {
+            } else if (req.callid) {
               ctx.callid = req.callid;
               delete req.callid;
             }
@@ -164,10 +203,16 @@ try {
               req.request_meta.allow_range_address = false;
             }
 
+            if (req.request_meta?._ctx?.trace) {
+              ctx.trace = req.request_meta._ctx.trace;
+              delete req.request_meta._ctx.trace;
+            }
+
             const startTime = Date.now();
             logger.debug({
               TimeStamp: Date.now(),
               EventType: 'Runner.ModelThread.Execute',
+              Message: `Runner.ModelThread.Execute ${modelName}`,
               threadCallId: ctx.callid,
               correlationId: ctx.correlationId,
             });
@@ -189,7 +234,6 @@ try {
             let result
             if (isAsyncCheck) {
               try {
-
                 result = instance.ccall(
                   "node_calc_v3",
                   "number",
@@ -206,14 +250,14 @@ try {
                   instance._free(outBuffer);
                   instance._free(outPtr);
 
-                  if(isMetadataSubSvc) {
+                  if (isMetadataSubSvc) {
                     result = JSON.parse(result);
-                    if(!result.response_data) {
+                    if (!result.response_data) {
                       result.response_data = {}
                     }
                     const hasImageOutputs = metadata?.ImageOutputs ?? []
-                    const imageOutputs = hasImageOutputs ? hasImageOutputs.reduce( (prev, curr) => {
-                      if(!curr?.ImageName) return prev
+                    const imageOutputs = hasImageOutputs ? hasImageOutputs.reduce((prev, curr) => {
+                      if (!curr?.ImageName) return prev
                       prev[curr.ImageName] = curr?.Base64Content || ""
                       return prev
                     }, {}) : {}
@@ -228,14 +272,14 @@ try {
                   }
 
 
-                  if(isFormSpecSubSvc) {
+                  if (isFormSpecSubSvc) {
                     result = JSON.parse(result);
-                    if(!result.response_data) {
+                    if (!result.response_data) {
                       result.response_data = {}
                     }
 
                     // result.response_data.outputs = Object.assign({}, result.response_data.outputs, formspec);
-                     result.response_data.outputs = formspec;
+                    result.response_data.outputs = formspec;
                     return rawString ? JSON.stringify(result) : result;
                   }
 
@@ -266,14 +310,14 @@ try {
                   instance._free(outBuffer);
                   instance._free(outPtr);
 
-                  if(isMetadataSubSvc) {
+                  if (isMetadataSubSvc) {
                     result = JSON.parse(result);
-                    if(!result.response_data) {
+                    if (!result.response_data) {
                       result.response_data = {}
                     }
                     const hasImageOutputs = metadata?.ImageOutputs ?? []
-                    const imageOutputs = hasImageOutputs ? hasImageOutputs.reduce( (prev, curr) => {
-                      if(!curr?.ImageName) return prev
+                    const imageOutputs = hasImageOutputs ? hasImageOutputs.reduce((prev, curr) => {
+                      if (!curr?.ImageName) return prev
                       prev[curr.ImageName] = curr?.Base64Content || ""
                       return prev
                     }, {}) : {}
@@ -282,17 +326,17 @@ try {
                       ...metadata?.Outputs,
                       ...imageOutputs,
                     }
-                    result.response_data.outputs = Object.assign({},  metadataOutput);
+                    result.response_data.outputs = Object.assign({}, metadataOutput);
                     return rawString ? JSON.stringify(result) : result;
                   }
 
-                  if(isFormSpecSubSvc) {
+                  if (isFormSpecSubSvc) {
                     result = JSON.parse(result);
-                    if(!result.response_data) {
+                    if (!result.response_data) {
                       result.response_data = {}
                     }
 
-                     // result.response_data.outputs = Object.assign({}, result.response_data.outputs, formspec);
+                    // result.response_data.outputs = Object.assign({}, result.response_data.outputs, formspec);
                     result.response_data.outputs = formspec;
                     return rawString ? JSON.stringify(result) : result;
                   }
@@ -306,7 +350,7 @@ try {
                     correlationId: ctx.correlationId,
                   });
 
-                  return rawString ? result : JSON.parse(result);
+                  return rawString ? result.concat('') : JSON.parse(result);
                 });
               }
             } else {
@@ -326,14 +370,14 @@ try {
                 instance._free(outPtr);
 
 
-                if(isMetadataSubSvc) {
+                if (isMetadataSubSvc) {
                   result = JSON.parse(result);
-                  if(!result.response_data) {
+                  if (!result.response_data) {
                     result.response_data = {}
                   }
                   const hasImageOutputs = metadata?.ImageOutputs ?? []
-                  const imageOutputs = hasImageOutputs ? hasImageOutputs.reduce( (prev, curr) => {
-                    if(!curr?.ImageName) return prev
+                  const imageOutputs = hasImageOutputs ? hasImageOutputs.reduce((prev, curr) => {
+                    if (!curr?.ImageName) return prev
                     prev[curr.ImageName] = curr?.Base64Content || null
                     return prev
                   }, {}) : {}
@@ -346,13 +390,13 @@ try {
                   return rawString ? JSON.stringify(result) : result;
                 }
 
-                if(isFormSpecSubSvc) {
+                if (isFormSpecSubSvc) {
                   result = JSON.parse(result);
-                  if(!result.response_data) {
+                  if (!result.response_data) {
                     result.response_data = {}
                   }
 
-                   //result.response_data.outputs = Object.assign({}, result.response_data.outputs, formspec);
+                  //result.response_data.outputs = Object.assign({}, result.response_data.outputs, formspec);
                   result.response_data.outputs = formspec;
                   return rawString ? JSON.stringify(result) : result;
                 }
@@ -366,7 +410,7 @@ try {
                   correlationId: ctx.correlationId,
                 });
 
-                return rawString ? result : JSON.parse(result);
+                return rawString ? result.concat('') : JSON.parse(result);
               });
             }
 
@@ -377,36 +421,15 @@ try {
           }
         };
 
-
-        _execute = function (req) {
-          return new Promise((resolve, reject) => {
-            if(!modelIsBusy) {
-              logger.debug({
-                TimeStamp: Date.now(),
-                Message: `Execute ${modelName}`,
-                EventType: 'Execute',
-              })
-              modelIsBusy = true;
-              return _execute(req)
-                  .then((result) => {
-                    resolve(result);
-                  }).catch((err) => {
-                    reject(err);
-                  }).finally(() => {
-                    modelIsBusy = false
-                  });
-            } else {
-              setTimeout(() => {
-                logger.debug({
-                  TimeStamp: Date.now(),
-                  Message: `Execute.wait ${modelName}`,
-                  EventType: 'Execute.wait',
-                });
-                execute(req)
-              }, 1)
-            }
-          });
-        }
+        interval = setInterval(() => {
+          // Delay report if model is working
+          if (modelIsBusy) {
+            return;
+          }
+          workerThreadInstance.reportStats({
+            memoryUsage: process.memoryUsage().rss,
+          })
+        }, REPORT_INTERVAL)
 
         logger.debug({
           TimeStamp: Date.now(),
@@ -415,6 +438,14 @@ try {
         });
 
         wb = instance._construct();
+
+        _execute = async function (req) {
+          return new Promise((resolve, reject) => {
+            requestQueue.push({ resolve, reject, req });
+            processQueue();
+          });
+        }
+
         logger.debug({
           TimeStamp: Date.now(),
           EventType: 'Runner.ModelThread.MODEL_CONSTRUCT.COMPLETE',
@@ -422,6 +453,13 @@ try {
         });
 
         isReady = true;
+        readyRes = {
+          memoryUsage: process.memoryUsage().rss,
+          threadId,
+          time: Date.now() - start,
+          readyTs: Date.now()
+        };
+
         return Promise.resolve();
       } catch (err) {
         instance = undefined
@@ -461,7 +499,8 @@ async function main(input) {
     throw new Error("Param must be a json string or json object");
   }
 
-  return execute(input);
+  return _execute(input);
 };
 
 module.exports = new WorkerThread(main);
+

package/dist/node/threads/mockWorkerThread.d.ts

@@ -23,6 +23,7 @@ declare class WorkerThread extends ThreadWorker<any, any> {
      * Response from main thread.
      */
     requestMessage(payload: any, context: any): Promise<any>;
+    reportStats(payload: any): void;
 }
 import { ThreadWorker } from "poolifier";
 export { WorkerThread as default };

package/dist/node/threads/mockWorkerThread.js

@@ -1,12 +1,11 @@
 const events = require("events");
-const { isMainThread, parentPort } = require("worker_threads");
+const { isMainThread, parentPort, threadId } = require("worker_threads");
 const { createId } = require("@paralleldrive/cuid2");
 const { ThreadWorker } = require("poolifier");
-// eslint-disable-next-line import/no-unresolved, import/extensions
+
 const { THREAD_EVENT_TYPES } = require("../../mockConstants");
 
 class WorkerThread extends ThreadWorker {
-  // eslint-disable-next-line no-useless-constructor
   constructor(taskFunctions, opts) {
     super(taskFunctions, opts);
   }
@@ -82,6 +81,14 @@ class WorkerThread extends ThreadWorker {
       });
     });
   }
+
+  reportStats(payload) {
+    this.postMessage({
+      payload,
+      type: THREAD_EVENT_TYPES.STATS_REPORT,
+      threadId,
+    });
+  }
 }
 
 module.exports = {

package/dist/node/threads/mockWorkerThread.js.map

@@ -1 +1 @@
-{"version":3,"file":"mockWorkerThread.js","sourceRoot":"","sources":["../../../src/node/threads/mockWorkerThread.js"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC/D,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AACrD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAC9C,mEAAmE;AACnE,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAE9D,MAAM,YAAa,SAAQ,YAAY;IACrC,kDAAkD;IAClD,YAAY,aAAa,EAAE,IAAI;QAC7B,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,OAAO;QACjB,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,QAAQ;QAChB,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACG,cAAc,CAAC,OAAO,EAAE,OAAO;;YACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,OAAO,GAAG,QAAQ,EAAE,CAAC;gBAC3B,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBAE/C,8CAA8C;gBAC9C,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE;oBACtC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;oBACzC,IAAI,QAAQ,CAAC,IAAI,KAAK,kBAAkB,CAAC,KAAK,EAAE,CAAC;wBAC/C,MAAM,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC;oBAC5B,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC;oBAC7B,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,6BAA6B;gBAC7B,IAAI,CAAC,WAAW,CAAC;oBACf,OAAO;oBACP,OAAO;oBACP,IAAI,EAAE,kBAAkB,CAAC,eAAe;oBACxC,OAAO;iBACR,CAAC,CAAC;gBAEH,8CAA8C;gBAC9C,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;oBACzB,IACE,OAAO,CAAC,OAAO,KAAK,OAAO;wBAC3B,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,kBAAkB,CAAC,QAAQ;4BAC5C,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,kBAAkB,CAAC,KAAK,CAAC,EAC7C,CAAC;wBACD,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;oBACtC,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AAED,MAAM,CAAC,OAAO,GAAG;IACf,OAAO,EAAE,YAAY;CACtB,CAAC"}
+{"version":3,"file":"mockWorkerThread.js","sourceRoot":"","sources":["../../../src/node/threads/mockWorkerThread.js"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACzE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AACrD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAE9C,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAE9D,MAAM,YAAa,SAAQ,YAAY;IACrC,YAAY,aAAa,EAAE,IAAI;QAC7B,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,OAAO;QACjB,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,QAAQ;QAChB,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO;QACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,OAAO,GAAG,QAAQ,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YAE/C,8CAA8C;YAC9C,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACtC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;gBACzC,IAAI,QAAQ,CAAC,IAAI,KAAK,kBAAkB,CAAC,KAAK,EAAE,CAAC;oBAC/C,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,6BAA6B;YAC7B,IAAI,CAAC,WAAW,CAAC;gBACf,OAAO;gBACP,OAAO;gBACP,IAAI,EAAE,kBAAkB,CAAC,eAAe;gBACxC,OAAO;aACR,CAAC,CAAC;YAEH,8CAA8C;YAC9C,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;gBACzB,IACE,OAAO,CAAC,OAAO,KAAK,OAAO;oBAC3B,CAAC,OAAO,EAAE,IAAI,KAAK,kBAAkB,CAAC,QAAQ;wBAC5C,OAAO,EAAE,IAAI,KAAK,kBAAkB,CAAC,KAAK,CAAC,EAC7C,CAAC;oBACD,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,OAAO;QACjB,IAAI,CAAC,WAAW,CAAC;YACf,OAAO;YACP,IAAI,EAAE,kBAAkB,CAAC,YAAY;YACrC,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG;IACf,OAAO,EAAE,YAAY;CACtB,CAAC"}

package/dist/node/threads/workerPool.d.ts

@@ -1,7 +1,9 @@
 import { FixedThreadPool } from "poolifier";
 import type { ThreadPoolOptions } from "poolifier";
+import { EventResponseData } from "../../types";
 declare class WorkerPool extends FixedThreadPool {
-    constructor(numberOfThreads: number, filePath: string, opts?: ThreadPoolOptions);
+    id: string;
+    constructor(id: string, numberOfThreads: number, filePath: string, opts?: ThreadPoolOptions, _maximumNumberOfThreads?: number);
     /**
      * Sends message to a specific worker thread or broadcasts the message
      * to all running threads.
@@ -9,11 +11,8 @@ declare class WorkerPool extends FixedThreadPool {
      * @param message
      * Any data that needs to passed to the worker.
      *
-     * @param workerIndex
-     * Optional. Zero base index of the worker that will receive the message. Leave
-     * this field empty to enable the message broadcast to all workers.
      */
-    postMessage(message: unknown, workerIndex?: number): void;
+    postMessage(message: EventResponseData): void;
 }
 export default WorkerPool;
 export type { FixedThreadPool };

package/dist/node/threads/workerPool.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const poolifier_1 = require("poolifier");
 class WorkerPool extends poolifier_1.FixedThreadPool {
-    constructor(numberOfThreads, filePath, opts) {
+    id;
+    constructor(id, numberOfThreads, filePath, opts, _maximumNumberOfThreads) {
         super(numberOfThreads, filePath, opts);
+        this.id = id;
     }
     /**
      * Sends message to a specific worker thread or broadcasts the message
@@ -12,17 +14,12 @@ class WorkerPool extends poolifier_1.FixedThreadPool {
      * @param message
      * Any data that needs to passed to the worker.
      *
-     * @param workerIndex
-     * Optional. Zero base index of the worker that will receive the message. Leave
-     * this field empty to enable the message broadcast to all workers.
      */
-    postMessage(message, workerIndex) {
-        if (workerIndex && workerIndex < this.workerNodes.length) {
-            this.workerNodes[workerIndex].worker.postMessage(message);
-        }
-        else {
-            for (let i = 0; i < this.workerNodes.length; i++) {
-                this.workerNodes[i].worker.postMessage(message);
+    postMessage(message) {
+        if (message.threadId) {
+            const workerIndex = this.workerNodes.findIndex((w) => w.info?.id === message.threadId);
+            if (this.workerNodes[workerIndex]) {
+                this.workerNodes[workerIndex].worker.postMessage(message);
             }
         }
     }

package/dist/node/threads/workerPool.js.map

@@ -1 +1 @@
-{"version":3,"file":"workerPool.js","sourceRoot":"","sources":["../../../src/node/threads/workerPool.ts"],"names":[],"mappings":";;AAAA,yCAA4C;AAG5C,MAAM,UAAW,SAAQ,2BAAe;IACtC,YACE,eAAuB,EACvB,QAAgB,EAChB,IAAwB;QAExB,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAED;;;;;;;;;;OAUG;IACH,WAAW,CAAC,OAAgB,EAAE,WAAoB;QAChD,IAAI,WAAW,IAAI,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACzD,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjD,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}
+{"version":3,"file":"workerPool.js","sourceRoot":"","sources":["../../../src/node/threads/workerPool.ts"],"names":[],"mappings":";;AAAA,yCAA4C;AAI5C,MAAM,UAAW,SAAQ,2BAAe;IACtC,EAAE,CAAS;IAEX,YACE,EAAU,EACV,eAAuB,EACvB,QAAgB,EAChB,IAAwB,EACxB,uBAAgC;QAEhC,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAED;;;;;;;OAOG;IACH,WAAW,CAAC,OAA0B;QACpC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAC5C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,KAAK,OAAO,CAAC,QAAQ,CACvC,CAAC;YAEF,IAAI,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;gBAClC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}

package/dist/node/threads/workerPool.ts

@@ -1,13 +1,19 @@
 import { FixedThreadPool } from "poolifier";
 import type { ThreadPoolOptions } from "poolifier";
+import { EventResponseData } from "../../types";
 
 class WorkerPool extends FixedThreadPool {
+  id: string;
+
   constructor(
+    id: string,
     numberOfThreads: number,
     filePath: string,
-    opts?: ThreadPoolOptions
+    opts?: ThreadPoolOptions,
+    _maximumNumberOfThreads?: number,
   ) {
     super(numberOfThreads, filePath, opts);
+    this.id = id;
   }
 
   /**
@@ -17,16 +23,15 @@ class WorkerPool extends FixedThreadPool {
    * @param message
    * Any data that needs to passed to the worker.
    *
-   * @param workerIndex
-   * Optional. Zero base index of the worker that will receive the message. Leave
-   * this field empty to enable the message broadcast to all workers.
    */
-  postMessage(message: unknown, workerIndex?: number) {
-    if (workerIndex && workerIndex < this.workerNodes.length) {
-      this.workerNodes[workerIndex].worker.postMessage(message);
-    } else {
-      for (let i = 0; i < this.workerNodes.length; i++) {
-        this.workerNodes[i].worker.postMessage(message);
+  postMessage(message: EventResponseData) {
+    if (message.threadId) {
+      const workerIndex = this.workerNodes.findIndex(
+        (w) => w.info?.id === message.threadId,
+      );
+
+      if (this.workerNodes[workerIndex]) {
+        this.workerNodes[workerIndex].worker.postMessage(message);
       }
     }
   }

package/dist/node/threads/workerThread.d.ts

@@ -1,8 +1,6 @@
 import { ThreadWorker } from "poolifier";
-import type { TaskFunctions, TaskFunction, WorkerOptions } from "poolifier";
 import type { EventRequestData } from "../../types";
 declare class WorkerThread extends ThreadWorker {
-    constructor(taskFunctions: TaskFunction<unknown, Response> | TaskFunctions<unknown, Response>, opts?: WorkerOptions);
     /**
      * Sends message back to the main thread.
      *
@@ -16,6 +14,7 @@ declare class WorkerThread extends ThreadWorker {
      * Function to receive the message data.
      */
     onMessage(callback: (value?: any) => void): void;
+    private cleanupListener;
     /**
      * Sends a request to the main thread and waits for a response.
      *
@@ -26,5 +25,6 @@ declare class WorkerThread extends ThreadWorker {
      * Response from main thread.
      */
     requestMessage(payload: any, context: any): Promise<unknown>;
+    reportStats(payload: any): void;
 }
 export default WorkerThread;

package/dist/node/threads/workerThread.js

@@ -1,22 +1,10 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const worker_threads_1 = require("worker_threads");
-const cuid2_1 = require("@paralleldrive/cuid2");
 const poolifier_1 = require("poolifier");
 const constants_1 = require("../../constants");
+const activeListeners = new Map();
 class WorkerThread extends poolifier_1.ThreadWorker {
-    constructor(taskFunctions, opts) {
-        super(taskFunctions, opts);
-    }
     /**
      * Sends message back to the main thread.
      *
@@ -44,6 +32,15 @@ class WorkerThread extends poolifier_1.ThreadWorker {
             worker_threads_1.parentPort.on("message", callback);
         }
     }
+    cleanupListener = (eventId) => {
+        setTimeout(() => {
+            const listener = activeListeners.get(eventId);
+            if (listener) {
+                worker_threads_1.parentPort.off("message", listener);
+                activeListeners.delete(eventId);
+            }
+        });
+    };
     /**
      * Sends a request to the main thread and waits for a response.
      *
@@ -53,29 +50,33 @@ class WorkerThread extends poolifier_1.ThreadWorker {
      * @returns {Promise<Object>}
      * Response from main thread.
      */
-    requestMessage(payload, context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const eventId = (0, cuid2_1.createId)();
-                // Send the request to parent
-                this.postMessage({
-                    payload,
-                    context,
-                    type: constants_1.THREAD_EVENT_TYPES.REQUEST_EXECUTE,
-                    eventId,
-                });
-                // Receive the response from parent once ready
-                this.onMessage((message) => {
-                    if (message.eventId === eventId &&
-                        (message === null || message === void 0 ? void 0 : message.type) === constants_1.THREAD_EVENT_TYPES.RESPONSE) {
-                        resolve(message === null || message === void 0 ? void 0 : message.payload);
-                    }
-                    else if (message.eventId === eventId &&
-                        (message === null || message === void 0 ? void 0 : message.type) === constants_1.THREAD_EVENT_TYPES.ERROR) {
-                        reject(message === null || message === void 0 ? void 0 : message.payload);
-                    }
-                });
+    async requestMessage(payload, context) {
+        return new Promise((resolve, reject) => {
+            // Send the request to parent
+            this.postMessage({
+                payload,
+                context,
+                type: constants_1.THREAD_EVENT_TYPES.REQUEST_EXECUTE,
+                threadId: worker_threads_1.threadId,
             });
+            // Receive the response from parent once ready
+            const messageListener = (message) => {
+                worker_threads_1.parentPort.off("message", messageListener);
+                if (message?.type === constants_1.THREAD_EVENT_TYPES.RESPONSE) {
+                    resolve(message?.payload);
+                }
+                else if (message?.type === constants_1.THREAD_EVENT_TYPES.ERROR) {
+                    reject(message?.payload);
+                }
+            };
+            this.onMessage(messageListener);
+        });
+    }
+    reportStats(payload) {
+        this.postMessage({
+            payload,
+            type: constants_1.THREAD_EVENT_TYPES.STATS_REPORT,
+            threadId: worker_threads_1.threadId,
         });
     }
 }

package/dist/node/threads/workerThread.js.map

@@ -1 +1 @@
-{"version":3,"file":"workerThread.js","sourceRoot":"","sources":["../../../src/node/threads/workerThread.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mDAA0D;AAC1D,gDAAwD;AACxD,yCAAyC;AACzC,+CAAqD;AAKrD,MAAM,YAAa,SAAQ,wBAAY;IACrC,YACE,aAEoC,EACpC,IAAoB;QAEpB,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,OAAyB;QACnC,IAAI,6BAAY,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,2BAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,QAA+B;QACvC,IAAI,6BAAY,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,2BAAU,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACG,cAAc,CAAC,OAAY,EAAE,OAAY;;YAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,OAAO,GAAG,IAAA,gBAAI,GAAE,CAAC;gBAEvB,6BAA6B;gBAC7B,IAAI,CAAC,WAAW,CAAC;oBACf,OAAO;oBACP,OAAO;oBACP,IAAI,EAAE,8BAAkB,CAAC,eAA6B;oBACtD,OAAO;iBACR,CAAC,CAAC;gBAEH,8CAA8C;gBAC9C,IAAI,CAAC,SAAS,CAAC,CAAC,OAAyB,EAAE,EAAE;oBAC3C,IACE,OAAO,CAAC,OAAO,KAAK,OAAO;wBAC3B,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,8BAAkB,CAAC,QAAQ,EAC7C,CAAC;wBACD,OAAO,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBAC5B,CAAC;yBAAM,IACL,OAAO,CAAC,OAAO,KAAK,OAAO;wBAC3B,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,8BAAkB,CAAC,KAAK,EAC1C,CAAC;wBACD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBAC3B,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AAED,kBAAe,YAAY,CAAC"}
+{"version":3,"file":"workerThread.js","sourceRoot":"","sources":["../../../src/node/threads/workerThread.ts"],"names":[],"mappings":";;AAAA,mDAAoE;AACpE,yCAAyC;AACzC,+CAAqD;AAIrD,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;AAElC,MAAM,YAAa,SAAQ,wBAAY;IACrC;;;;OAIG;IACH,WAAW,CAAC,OAAyB;QACnC,IAAI,6BAAY,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,2BAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,QAA+B;QACvC,IAAI,6BAAY,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,2BAAU,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAEO,eAAe,GAAG,CAAC,OAAO,EAAE,EAAE;QACpC,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9C,IAAI,QAAQ,EAAE,CAAC;gBACb,2BAAU,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBACpC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF;;;;;;;;OAQG;IACH,KAAK,CAAC,cAAc,CAAC,OAAY,EAAE,OAAY;QAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,6BAA6B;YAC7B,IAAI,CAAC,WAAW,CAAC;gBACf,OAAO;gBACP,OAAO;gBACP,IAAI,EAAE,8BAAkB,CAAC,eAA6B;gBACtD,QAAQ,EAAR,yBAAQ;aACT,CAAC,CAAC;YAEH,8CAA8C;YAC9C,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAE,EAAE;gBACpD,2BAAU,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;gBAC3C,IAAI,OAAO,EAAE,IAAI,KAAK,8BAAkB,CAAC,QAAQ,EAAE,CAAC;oBAClD,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC5B,CAAC;qBAAM,IAAI,OAAO,EAAE,IAAI,KAAK,8BAAkB,CAAC,KAAK,EAAE,CAAC;oBACtD,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC,CAAC;YACF,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,OAAY;QACtB,IAAI,CAAC,WAAW,CAAC;YACf,OAAO;YACP,IAAI,EAAE,8BAAkB,CAAC,YAA0B;YACnD,QAAQ,EAAR,yBAAQ;SACT,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAe,YAAY,CAAC"}