@nsshunt/stsrunnerframework 1.0.71 → 1.0.73

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, _processLoopExecutor2, _debug2, _STSWorkerManager_instances, CreateRunnerCopy_fn, _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, _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;
 import { defaultLogger, Sleep, ModelDelimeter } from "@nsshunt/stsutils";
 import { Gauge } from "@nsshunt/stsobservability";
 const URI_BASE_VUEUTILS = "/";
@@ -2048,20 +2048,11 @@ class STSWorkerManager {
               const runnerEx = workerEx.runnersEx[removeList[i].runnerId];
               if (runnerEx) {
                 if (runnerEx.publishInstrumentController) {
-                  console.log(chalk.magenta(`Ending publish for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
+                  __privateGet(this, _debug2).call(this, chalk.grey(`Ending publish for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
                   await runnerEx.publishInstrumentController.EndPublish();
                   await Sleep(250);
                 }
-                const runner = {
-                  id: runnerEx.id,
-                  asyncRunnerContext: { ...runnerEx.asyncRunnerContext },
-                  instrumentData: { ...runnerEx.instrumentData },
-                  iteration: runnerEx.iteration,
-                  options: { ...runnerEx.options },
-                  runnerHistory: [...runnerEx.runnerHistory],
-                  state: runnerEx.state,
-                  workerId: runnerEx.workerId
-                };
+                const runner = __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx);
                 __privateGet(this, _archiveList).push(runner);
                 if (__privateGet(this, _archiveList).length > __privateGet(this, _options2).maxArchiveListLength) {
                   __privateGet(this, _archiveList).shift();
@@ -2070,6 +2061,9 @@ class STSWorkerManager {
               }
             }
           }
+          for (const [, workerEx] of Object.entries(__privateGet(this, _workersEx))) {
+            __privateGet(this, _debug2).call(this, chalk.grey(`STSWorkerManager:#processLoopExecutor(): Remaining runners from worker: [${workerEx.id}]: [${Object.keys(workerEx.runnersEx).length}]`));
+          }
           setTimeout(__privateGet(this, _processLoopExecutor2), 1e3);
         }, 100);
       } else {
@@ -2097,7 +2091,6 @@ class STSWorkerManager {
         id: workerId,
         worker: workerFactory.createWorkerThreadWorker(),
         messagePort: port1,
-        state: IWorkerState.starting,
         workerThreadWorkerOptions: workerFactory.workerThreadWorkerOptions,
         runnersEx: {},
         runnersEvents: {},
@@ -2169,17 +2162,11 @@ class STSWorkerManager {
         const publishMessagePayload2 = data;
         switch (publishMessagePayload2.command) {
           case eIWMessageCommands.MessagePortResponse:
-            stsWorkerEx.state = IWorkerState.started;
+            __privateGet(this, _debug2).call(this, `AddWorker:processMessage(): eIWMessageCommands.MessagePortResponse`);
             break;
           case eIWMessageCommands.InstrumentTelemetry:
             __privateGet(this, _ProcessTelemetry).call(this, stsWorkerEx, publishMessagePayload2.payload);
             break;
-          /*
-          case eIWMessageCommands.Completed :
-              //this.#debug(`AddWorker::eIWMessageCommands.InstrumentTelemetry`);
-              this.#ProcessCompleted(stsWorkerEx, publishMessagePayload.payload as ITestRunnerTelemetryPayload);
-              break;
-          */
           case eIWMessageCommands.RunnerStateChange:
             __privateGet(this, _RunnerStateChange).call(this, stsWorkerEx, publishMessagePayload2.payload);
             break;
@@ -2219,7 +2206,7 @@ class STSWorkerManager {
     });
     __privateAdd(this, _SetRunnerIntoWorker, (workerEx, runnerEx) => {
       const payload = {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
+        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
       };
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.AddRunner, payload);
     });
@@ -2257,6 +2244,9 @@ class STSWorkerManager {
       if (workerEx.runnersEx[runner.id]) {
         const runnerEx = workerEx.runnersEx[runner.id];
         runnerEx.state = runner.state;
+        if (!runnerEx.runnerHistory) {
+          runnerEx.runnerHistory = [];
+        }
         runnerEx.runnerHistory.push({
           eventDate: /* @__PURE__ */ new Date(),
           runner: { ...runner }
@@ -2356,61 +2346,59 @@ class STSWorkerManager {
     });
     __privateAdd(this, _StartRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.StartRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
+        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
       });
       return true;
     });
     __privateAdd(this, _ResetRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ResetRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
+        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
       });
       return true;
     });
     __privateAdd(this, _ExecuteRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ExecuteRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
+        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
       });
       return true;
     });
     __privateAdd(this, _StopRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.StopRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
+        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
       });
       return true;
     });
     __privateAdd(this, _TerminateRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.TerminateRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
+        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
       });
       return true;
     });
     __privateAdd(this, _PauseRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.PauseRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
+        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
       });
       return true;
     });
     __privateAdd(this, _ResumeRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ResumeRunner, {
-        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
+        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
       });
       return true;
     });
     __privateAdd(this, _BroadcastCommandToAllRunners, async (workerEx, command, options) => {
       try {
-        if (workerEx.state !== IWorkerState.stopped) {
-          const promArray = [];
-          const ids = Object.keys(workerEx.runnersEx);
-          ids.forEach((id) => {
-            const runnerEx = workerEx.runnersEx[id];
-            if (options) {
-              promArray.push(command(workerEx, runnerEx, options));
-            } else {
-              promArray.push(command(workerEx, runnerEx));
-            }
-          });
-          await Promise.all(promArray);
-        }
+        const promArray = [];
+        const ids = Object.keys(workerEx.runnersEx);
+        ids.forEach((id) => {
+          const runnerEx = workerEx.runnersEx[id];
+          if (options) {
+            promArray.push(command(workerEx, runnerEx, options));
+          } else {
+            promArray.push(command(workerEx, runnerEx));
+          }
+        });
+        await Promise.all(promArray);
         return true;
       } catch (error) {
         console.log(`Error in STSTestWorker:WorkerCommand: [${error}]`);
@@ -2437,19 +2425,17 @@ class STSWorkerManager {
     });
     __privateAdd(this, _BroadcastUpdateCommandToAllRunners, async (workerEx, command, executionProfile) => {
       try {
-        if (workerEx.state !== IWorkerState.stopped) {
-          const promArray = [];
-          const ids = Object.keys(workerEx.runnersEx);
-          ids.forEach((id) => {
-            const runnerEx = workerEx.runnersEx[id];
-            if (executionProfile) {
-              promArray.push(command(workerEx, runnerEx, executionProfile));
-            } else {
-              promArray.push(command(workerEx, runnerEx));
-            }
-          });
-          await Promise.all(promArray);
-        }
+        const promArray = [];
+        const ids = Object.keys(workerEx.runnersEx);
+        ids.forEach((id) => {
+          const runnerEx = workerEx.runnersEx[id];
+          if (executionProfile) {
+            promArray.push(command(workerEx, runnerEx, executionProfile));
+          } else {
+            promArray.push(command(workerEx, runnerEx));
+          }
+        });
+        await Promise.all(promArray);
         return true;
       } catch (error) {
         console.log(`Error in STSTestWorker:WorkerCommand: [${error}]`);
@@ -2462,14 +2448,12 @@ class STSWorkerManager {
     });
     __privateAdd(this, _TerminateWorker, async (workerEx) => {
       try {
-        if (workerEx.state !== IWorkerState.stopped) {
-          await __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _TerminateRunner2));
-          if (workerEx.worker) {
-            workerEx.worker.terminate();
-            __privateGet(this, _debug2).call(this, `Terminated worker: [${workerEx.id}]`);
-            delete __privateGet(this, _workersEx)[workerEx.id];
-          } else {
-          }
+        await __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _TerminateRunner2));
+        if (workerEx.worker) {
+          workerEx.worker.terminate();
+          __privateGet(this, _debug2).call(this, `Terminated worker: [${workerEx.id}]`);
+          delete __privateGet(this, _workersEx)[workerEx.id];
+        } else {
         }
         return true;
       } catch (error) {
@@ -2480,7 +2464,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, CreateRunnerCopy_fn).call(this, runnerEx)
+        runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopyNoHistory_fn).call(this, runnerEx)
       });
       return true;
     });
@@ -2577,6 +2561,13 @@ class STSWorkerManager {
     }
     __privateGet(this, _processLoopExecutor2).call(this);
   }
+  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);
+    }
+    return retVal;
+  }
   get WorkersEx() {
     return __privateGet(this, _workersEx);
   }
@@ -2595,19 +2586,39 @@ _options2 = new WeakMap();
 _STSInstrumentController = new WeakMap();
 _telemetryProcessor = new WeakMap();
 _archiveList = new WeakMap();
-_processLoopExecutor2 = new WeakMap();
-_debug2 = new WeakMap();
 _STSWorkerManager_instances = new WeakSet();
-CreateRunnerCopy_fn = function(runnerEx) {
+CreateRunnerCopyNoHistory_fn = function(runnerEx) {
   return {
     id: runnerEx.id,
     asyncRunnerContext: { ...runnerEx.asyncRunnerContext },
-    options: { ...runnerEx.options },
     instrumentData: { ...runnerEx.instrumentData },
     iteration: runnerEx.iteration,
-    state: runnerEx.state
+    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();
 _ProcessTelemetry = new WeakMap();
 _EmitEvent = new WeakMap();