@nsshunt/stsrunnerframework 1.0.74 → 1.0.76

package/dist/stsrunnerframework.umd.js

@@ -2074,7 +2074,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __privateAdd(this, _debug2, (message) => {
         console.log(chalk.cyan(`pid: [${process.pid}] STSWorkerManager::${message}`));
       });
-      __publicField(this, "AddWorker", async (useWorkerFactory) => {
+      __publicField(this, "AddWorker", (workerOptions, useWorkerFactory) => {
         let workerFactory;
         if (useWorkerFactory) {
           workerFactory = useWorkerFactory;
@@ -2092,7 +2092,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           id: workerId,
           worker: workerFactory.createWorkerThreadWorker(),
           messagePort: port1,
-          workerThreadWorkerOptions: workerFactory.workerThreadWorkerOptions,
+          options: workerOptions,
           runnersEx: {},
           runnersEvents: {},
           GetRunner: (id) => __privateGet(this, _workersEx)[workerId].GetRunner(id),
@@ -2121,13 +2121,13 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         }
         __privateGet(this, _debug2).call(this, `Adding worker: [${stsWorkerEx.id}]`);
         __privateGet(this, _debug2).call(this, `AddWorker::workerThreadWorkerOptions: [${stsWorkerEx.id}]`);
-        if (stsWorkerEx.workerThreadWorkerOptions.mocked) {
+        if (stsWorkerEx.options.mocked) {
           stsWorkerEx.worker.SetPort({
             command: eIWMessageCommands.MessagePort,
             payload: {
               port: port2,
               options: {
-                ...stsWorkerEx.workerThreadWorkerOptions
+                ...stsWorkerEx.options
               },
               workerId
             }
@@ -2137,12 +2137,12 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
             port: port2,
             //applicationStoreState: stateCopy,
             options: {
-              ...stsWorkerEx.workerThreadWorkerOptions
+              ...stsWorkerEx.options
             },
             workerId
           }, port2);
         }
-        if (!stsWorkerEx.workerThreadWorkerOptions.mocked) {
+        if (!stsWorkerEx.options.mocked) {
           if (isNode) {
             stsWorkerEx.worker.on("exit", (code) => {
               console.log(chalk.magenta(`STSWorkerManager:stsWorkerEx.worker.on(exit): Worker exited with code: ${code}`));
@@ -2273,10 +2273,10 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         const asyncRunnerContext = {
           // [level1]@[level2]^[level3]|[level4]
           // [hostName]@[agentId]-[userAgent]^[workerId]|[runnerId]
-          nid: `${workerEx.workerThreadWorkerOptions.hostName}${stsutils.ModelDelimeter.COMPONENT_SEPERATOR}${workerEx.workerThreadWorkerOptions.agentId}-${workerEx.workerThreadWorkerOptions.userAgent}${stsutils.ModelDelimeter.NID_SEPERATOR}${workerEx.id}${stsutils.ModelDelimeter.SEPERATOR}${runnerId}`,
-          hostName: workerEx.workerThreadWorkerOptions.hostName,
+          nid: `${workerEx.options.hostName}${stsutils.ModelDelimeter.COMPONENT_SEPERATOR}${workerEx.options.agentId}-${workerEx.options.userAgent}${stsutils.ModelDelimeter.NID_SEPERATOR}${workerEx.id}${stsutils.ModelDelimeter.SEPERATOR}${runnerId}`,
+          hostName: workerEx.options.hostName,
           // level 1 (e.g. host name)
-          agentName: `${workerEx.workerThreadWorkerOptions.agentId}-${workerEx.workerThreadWorkerOptions.userAgent}`,
+          agentName: `${workerEx.options.agentId}-${workerEx.options.userAgent}`,
           // level 2 (e.g. service instance ID or user agent type and tab or instance)
           threadId: `${workerEx.id}`,
           // level 3 (web worker)
@@ -2581,10 +2581,10 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       return retVal;
     }
     CreateWorkerCopy(workerEx) {
-      const { id, workerThreadWorkerOptions, runnersEx } = workerEx;
+      const { id, options, runnersEx } = workerEx;
       const workerCopy = {
         id,
-        workerThreadWorkerOptions: { ...workerThreadWorkerOptions },
+        options: { ...options },
         runners: {}
       };
       for (const [, runnerEx] of Object.entries(runnersEx)) {