@nsshunt/stsrunnerframework 1.0.73 → 1.0.75

package/dist/stsrunnerframework.mjs

@@ -9,7 +9,7 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var _collectorCollectorPort, _runners, _options, _workerId, _debug, _error, _processLoopExecutor, _SetMessagePort, _CreateRunnerEx2RunState, _UpdateRunnerStateById, _GetAllRunners, _CanExecuteNextIterationById, _IsCompletedById, _GetRunnerIterationById, _ResetRunnerIterationById, _IncRunnerIterationById, _GetRunnerInstanceById, _GetRunnerExecutionProfileById, _GetRunnerOptionsById, _SetRunnerOptionsById, _AddRunner, _WorkerInstance_instances, SleepImmediate_fn, _PostMessageToWorkerManagerById, _StartRunner, _StopRunnerByRunnerById, _StopAllRunners, _StopRunner, _TerminateRunner, _PauseRunner, _ResumeRunner, _ResetRunner, _ExecuteRunner, _UpdateOptions, _workersEx, _options2, _STSInstrumentController, _telemetryProcessor, _archiveList, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn, CreateRunnerCopy_fn, CreateWorkerCopy_fn, _processLoopExecutor2, _debug2, _SetRunnerIntoWorker, _ProcessTelemetry, _EmitEvent, _RunnerStateChange, _RemoveRunnerFromCollection, _CreateAsyncRunner, _PostMessageToWorkerUsingDefaultChannel, _PostMessageToWorker, _StartRunner2, _ResetRunner2, _ExecuteRunner2, _StopRunner2, _TerminateRunner2, _PauseRunner2, _ResumeRunner2, _BroadcastCommandToAllRunners, _PauseWorker, _ResumeWorker, _StopWorker, _StartWorker, _ResetWorker, _ExecuteWorker, _BroadcastUpdateCommandToAllRunners, _UpdateOptionsWorker, _TerminateWorker, _UpdateOptions2;
+var _collectorCollectorPort, _runners, _options, _workerId, _debug, _error, _processLoopExecutor, _SetMessagePort, _CreateRunnerEx2RunState, _UpdateRunnerStateById, _GetAllRunners, _CanExecuteNextIterationById, _IsCompletedById, _GetRunnerIterationById, _ResetRunnerIterationById, _IncRunnerIterationById, _GetRunnerInstanceById, _GetRunnerExecutionProfileById, _GetRunnerOptionsById, _SetRunnerOptionsById, _AddRunner, _WorkerInstance_instances, SleepImmediate_fn, _PostMessageToWorkerManagerById, _StartRunner, _StopRunnerByRunnerById, _StopAllRunners, _StopRunner, _TerminateRunner, _PauseRunner, _ResumeRunner, _ResetRunner, _ExecuteRunner, _UpdateOptions, _workersEx, _options2, _STSInstrumentController, _telemetryProcessor, _archiveList, _processLoopExecutor2, _debug2, _SetRunnerIntoWorker, _ProcessTelemetry, _EmitEvent, _RunnerStateChange, _RemoveRunnerFromCollection, _CreateAsyncRunner, _PostMessageToWorkerUsingDefaultChannel, _PostMessageToWorker, _StartRunner2, _ResetRunner2, _ExecuteRunner2, _StopRunner2, _TerminateRunner2, _PauseRunner2, _ResumeRunner2, _BroadcastCommandToAllRunners, _PauseWorker, _ResumeWorker, _StopWorker, _StartWorker, _ResetWorker, _ExecuteWorker, _BroadcastUpdateCommandToAllRunners, _UpdateOptionsWorker, _TerminateWorker, _UpdateOptions2;
 import { defaultLogger, Sleep, ModelDelimeter } from "@nsshunt/stsutils";
 import { Gauge } from "@nsshunt/stsobservability";
 const URI_BASE_VUEUTILS = "/";
@@ -2019,7 +2019,6 @@ function v4(options, buf, offset) {
 chalk.level = 3;
 class STSWorkerManager {
   constructor(options) {
-    __privateAdd(this, _STSWorkerManager_instances);
     //#agentSession: string = null;
     __privateAdd(this, _workersEx, {});
     __privateAdd(this, _options2);
@@ -2052,7 +2051,7 @@ class STSWorkerManager {
                   await runnerEx.publishInstrumentController.EndPublish();
                   await Sleep(250);
                 }
-                const runner = __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx);
+                const runner = this.CreateRunnerCopy(runnerEx);
                 __privateGet(this, _archiveList).push(runner);
                 if (__privateGet(this, _archiveList).length > __privateGet(this, _options2).maxArchiveListLength) {
                   __privateGet(this, _archiveList).shift();
@@ -2073,7 +2072,7 @@ class STSWorkerManager {
     __privateAdd(this, _debug2, (message) => {
       console.log(chalk.cyan(`pid: [${process.pid}] STSWorkerManager::${message}`));
     });
-    __publicField(this, "AddWorker", async (useWorkerFactory) => {
+    __publicField(this, "AddWorker", async (workerOptions, useWorkerFactory) => {
       let workerFactory;
       if (useWorkerFactory) {
         workerFactory = useWorkerFactory;
@@ -2091,7 +2090,7 @@ class STSWorkerManager {
         id: workerId,
         worker: workerFactory.createWorkerThreadWorker(),
         messagePort: port1,
-        workerThreadWorkerOptions: workerFactory.workerThreadWorkerOptions,
+        options: workerOptions,
         runnersEx: {},
         runnersEvents: {},
         GetRunner: (id) => __privateGet(this, _workersEx)[workerId].GetRunner(id),
@@ -2120,13 +2119,13 @@ class STSWorkerManager {
       }
       __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
           }
@@ -2136,12 +2135,12 @@ class STSWorkerManager {
           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}`));
@@ -2206,7 +2205,7 @@ class STSWorkerManager {
     });
     __privateAdd(this, _SetRunnerIntoWorker, (workerEx, runnerEx) => {
       const payload = {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
+        runner: this.CreateRunnerCopyNoHistory(runnerEx)
       };
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.AddRunner, payload);
     });
@@ -2272,10 +2271,10 @@ class STSWorkerManager {
       const asyncRunnerContext = {
         // [level1]@[level2]^[level3]|[level4]
         // [hostName]@[agentId]-[userAgent]^[workerId]|[runnerId]
-        nid: `${workerEx.workerThreadWorkerOptions.hostName}${ModelDelimeter.COMPONENT_SEPERATOR}${workerEx.workerThreadWorkerOptions.agentId}-${workerEx.workerThreadWorkerOptions.userAgent}${ModelDelimeter.NID_SEPERATOR}${workerEx.id}${ModelDelimeter.SEPERATOR}${runnerId}`,
-        hostName: workerEx.workerThreadWorkerOptions.hostName,
+        nid: `${workerEx.options.hostName}${ModelDelimeter.COMPONENT_SEPERATOR}${workerEx.options.agentId}-${workerEx.options.userAgent}${ModelDelimeter.NID_SEPERATOR}${workerEx.id}${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)
@@ -2346,43 +2345,43 @@ class STSWorkerManager {
     });
     __privateAdd(this, _StartRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.StartRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
+        runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
       return true;
     });
     __privateAdd(this, _ResetRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ResetRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
+        runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
       return true;
     });
     __privateAdd(this, _ExecuteRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ExecuteRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
+        runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
       return true;
     });
     __privateAdd(this, _StopRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.StopRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
+        runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
       return true;
     });
     __privateAdd(this, _TerminateRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.TerminateRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
+        runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
       return true;
     });
     __privateAdd(this, _PauseRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.PauseRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
+        runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
       return true;
     });
     __privateAdd(this, _ResumeRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ResumeRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
+        runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
       return true;
     });
@@ -2464,7 +2463,7 @@ class STSWorkerManager {
     __privateAdd(this, _UpdateOptions2, async (workerEx, runnerEx, executionProfile) => {
       runnerEx.options.executionProfile = { ...executionProfile };
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.UpdateOptions, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
+        runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
       return true;
     });
@@ -2561,10 +2560,40 @@ class STSWorkerManager {
     }
     __privateGet(this, _processLoopExecutor2).call(this);
   }
+  CreateRunnerCopyNoHistory(runnerEx) {
+    return {
+      id: runnerEx.id,
+      asyncRunnerContext: { ...runnerEx.asyncRunnerContext },
+      instrumentData: { ...runnerEx.instrumentData },
+      iteration: runnerEx.iteration,
+      options: { ...runnerEx.options },
+      state: runnerEx.state,
+      workerId: runnerEx.workerId
+    };
+  }
+  CreateRunnerCopy(runnerEx) {
+    const retVal = this.CreateRunnerCopyNoHistory(runnerEx);
+    if (runnerEx.runnerHistory) {
+      retVal.runnerHistory = [...runnerEx.runnerHistory];
+    }
+    return retVal;
+  }
+  CreateWorkerCopy(workerEx) {
+    const { id, options, runnersEx } = workerEx;
+    const workerCopy = {
+      id,
+      options: { ...options },
+      runners: {}
+    };
+    for (const [, runnerEx] of Object.entries(runnersEx)) {
+      workerCopy.runners[runnerEx.id] = this.CreateRunnerCopy(runnerEx);
+    }
+    return workerCopy;
+  }
   get Workers() {
     const retVal = {};
     for (const [, workerEx] of Object.entries(__privateGet(this, _workersEx))) {
-      retVal[workerEx.id] = __privateMethod(this, _STSWorkerManager_instances, CreateWorkerCopy_fn).call(this, workerEx);
+      retVal[workerEx.id] = this.CreateWorkerCopy(workerEx);
     }
     return retVal;
   }
@@ -2586,37 +2615,6 @@ _options2 = new WeakMap();
 _STSInstrumentController = new WeakMap();
 _telemetryProcessor = new WeakMap();
 _archiveList = new WeakMap();
-_STSWorkerManager_instances = new WeakSet();
-CreateRunnerCopyNoHistory_fn = function(runnerEx) {
-  return {
-    id: runnerEx.id,
-    asyncRunnerContext: { ...runnerEx.asyncRunnerContext },
-    instrumentData: { ...runnerEx.instrumentData },
-    iteration: runnerEx.iteration,
-    options: { ...runnerEx.options },
-    state: runnerEx.state,
-    workerId: runnerEx.workerId
-  };
-};
-CreateRunnerCopy_fn = function(runnerEx) {
-  const retVal = __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx);
-  if (runnerEx.runnerHistory) {
-    retVal.runnerHistory = [...runnerEx.runnerHistory];
-  }
-  return retVal;
-};
-CreateWorkerCopy_fn = function(workerEx) {
-  const { id, workerThreadWorkerOptions, runnersEx } = workerEx;
-  const workerCopy = {
-    id,
-    workerThreadWorkerOptions: { ...workerThreadWorkerOptions },
-    runners: {}
-  };
-  for (const [, runnerEx] of Object.entries(runnersEx)) {
-    workerCopy.runners[runnerEx.id] = __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx);
-  }
-  return workerCopy;
-};
 _processLoopExecutor2 = new WeakMap();
 _debug2 = new WeakMap();
 _SetRunnerIntoWorker = new WeakMap();