@nsshunt/stsrunnerframework 1.0.69 → 1.0.71

package/dist/stsrunnerframework.umd.js

@@ -13,7 +13,7 @@ var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot
 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, _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, _debug2, _STSWorkerManager_instances, CreateRunnerCopy_fn, _SetRunnerIntoWorker, _ProcessTelemetry, _EmitEvent, _RunnerStateChange, _ProcessCompleted, _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, _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;
   const URI_BASE_VUEUTILS = "/";
   const STS_RF_RES_PREFIX = "STS_R_RF_";
   const STS_RF_RES_ENT_PREFIX = "STS_RE_RF_";
@@ -29,10 +29,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     eIWMessageCommands2["ResumeRunner"] = "__STS__ResumeRunner";
     eIWMessageCommands2["ResetRunner"] = "__STS__ResetRunner";
     eIWMessageCommands2["ExecuteRunner"] = "__STS__ExecuteRunner";
-    eIWMessageCommands2["Completed"] = "__STS__Completed";
+    eIWMessageCommands2["CompletedZZ"] = "__STS__Completed";
     eIWMessageCommands2["UpdateOptions"] = "__STS__UpdateOptions";
     eIWMessageCommands2["TerminateRunner"] = "__STS__TerminateRunner";
     eIWMessageCommands2["RunnerStateChange"] = "__STS__RunnerStateChange";
+    eIWMessageCommands2["RemoveRunnerFromCollection"] = "__STS__RemoveRunnerFromCollection";
     return eIWMessageCommands2;
   })(eIWMessageCommands || {});
   var IRunnerState = /* @__PURE__ */ ((IRunnerState2) => {
@@ -1526,9 +1527,39 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __privateAdd(this, _workerId, null);
       __privateAdd(this, _debug, (message) => {
         if (__privateGet(this, _options)) {
-          console.log(chalk.green(`pid: [${process.pid}] ${__privateGet(this, _workerId)} WorkerInstance::${message}`));
+          stsutils.defaultLogger.debug(chalk.green(`pid: [${process.pid}] ${__privateGet(this, _workerId)} WorkerInstance:${message}`));
         } else {
-          console.log(chalk.green(`pid: [${process.pid}] WorkerInstance::${message}`));
+          stsutils.defaultLogger.debug(chalk.green(`pid: [${process.pid}] WorkerInstance:${message}`));
+        }
+      });
+      __privateAdd(this, _error, (error) => {
+        if (__privateGet(this, _options)) {
+          stsutils.defaultLogger.error(chalk.red(`pid: [${process.pid}] ${__privateGet(this, _workerId)} WorkerInstance:${error}`));
+        } else {
+          stsutils.defaultLogger.error(chalk.red(`pid: [${process.pid}] WorkerInstance:${error}`));
+        }
+      });
+      __privateAdd(this, _processLoopExecutor, async () => {
+        const removeList = [];
+        const promArray = [];
+        for (const [, runner] of Object.entries(__privateGet(this, _runners))) {
+          if (runner.runner.state === IRunnerState.completed || runner.runner.state === IRunnerState.error || runner.runner.state === IRunnerState.stopped || runner.runner.state === IRunnerState.terminated) {
+            promArray.push(__privateGet(this, _PostMessageToWorkerManagerById).call(this, eIWMessageCommands.RemoveRunnerFromCollection, runner.runner.id));
+            removeList.push(runner.runner.id);
+          }
+        }
+        if (promArray.length > 0) {
+          await Promise.all(promArray);
+          setTimeout(() => {
+            __privateGet(this, _debug).call(this, chalk.grey(`WorkerInstance:#processLoopExecutor(): Removing runners from collection: [${removeList}]`));
+            for (let i = 0; i < removeList.length; i++) {
+              delete __privateGet(this, _runners)[removeList[i]];
+            }
+            __privateGet(this, _debug).call(this, chalk.grey(`WorkerInstance:#processLoopExecutor(): Remaining Runner Count: [${Object.keys(__privateGet(this, _runners)).length}]`));
+            setTimeout(__privateGet(this, _processLoopExecutor), 1e3);
+          }, 100);
+        } else {
+          setTimeout(__privateGet(this, _processLoopExecutor), 1e3);
         }
       });
       __publicField(this, "GetRandomInt", (max) => {
@@ -1551,7 +1582,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           });
         } else {
           __privateGet(this, _collectorCollectorPort).onmessage = function(data) {
-            console.log(`collectorCollectorPort onmessage: ${JSON.stringify(data.data)}`);
+            __privateGet(this, _debug).call(this, `collectorCollectorPort onmessage: ${JSON.stringify(data.data)}`);
           };
         }
         const response = {
@@ -1563,13 +1594,13 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __publicField(this, "CreateAsyncRunner", (testRunnerTelemetryPayload) => {
         return null;
       });
-      __privateAdd(this, _CreateRunnerEx2RunState, (runner, runnerInstance) => {
+      __privateAdd(this, _CreateRunnerEx2RunState, async (runner, runnerInstance) => {
         __privateGet(this, _runners)[runner.id] = {
           runner,
           runnerInstance
         };
-        __privateGet(this, _runners)[runner.id].runner.state = IRunnerState.created;
         __privateGet(this, _runners)[runner.id].runner.iteration = 0;
+        __privateGet(this, _UpdateRunnerStateById).call(this, runner.id, IRunnerState.created);
       });
       __privateAdd(this, _UpdateRunnerStateById, (id, state) => {
         __privateGet(this, _runners)[id].runner.state = state;
@@ -1625,15 +1656,18 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         }
         return runner;
       });
-      __privateAdd(this, _PostMessageToWorkerManagerById, (command, id) => {
+      __privateAdd(this, _PostMessageToWorkerManagerById, async (command, id) => {
         if (__privateGet(this, _collectorCollectorPort)) {
-          const message = {
-            command,
-            payload: {
-              runner: __privateGet(this, _runners)[id].runner
-            }
-          };
-          __privateGet(this, _collectorCollectorPort).postMessage(message);
+          if (__privateGet(this, _runners)[id]) {
+            const message = {
+              command,
+              payload: {
+                runner: __privateGet(this, _runners)[id].runner
+              }
+            };
+            __privateGet(this, _collectorCollectorPort).postMessage(message);
+            await stsutils.Sleep(0);
+          }
         }
       });
       __privateAdd(this, _StartRunner, async (testRunnerTelemetryPayload) => {
@@ -1641,15 +1675,23 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         __privateGet(this, _debug).call(this, `${chalk.magenta(`runner: [${runnerId}]`)} StartRunner`);
         await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).StartRunner();
         __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.running);
+        const startLoop = /* @__PURE__ */ new Date();
         const ExecuteLoop = async () => {
-          if (__privateGet(this, _GetRunnerIterationById).call(this, runnerId) < __privateGet(this, _GetRunnerExecutionProfileById).call(this, runnerId).iterations) {
+          let cont = true;
+          const { iterations, duration, delayBetweenIterations } = __privateGet(this, _GetRunnerExecutionProfileById).call(this, runnerId);
+          if (iterations > 0) {
+            cont = __privateGet(this, _GetRunnerIterationById).call(this, runnerId) < iterations;
+          } else if (duration > 0) {
+            cont = ((/* @__PURE__ */ new Date()).getTime() - startLoop.getTime()) / 1e3 < duration;
+          }
+          if (cont) {
             if (__privateGet(this, _CanExecuteNextIterationById).call(this, runnerId)) {
               await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).Execute(__privateGet(this, _GetRunnerIterationById).call(this, runnerId));
               __privateGet(this, _IncRunnerIterationById).call(this, runnerId);
             }
             if (__privateGet(this, _CanExecuteNextIterationById).call(this, runnerId)) {
-              if (__privateGet(this, _GetRunnerExecutionProfileById).call(this, runnerId).delayBetweenIterations > 0) {
-                await stsutils.Sleep(__privateGet(this, _GetRunnerExecutionProfileById).call(this, runnerId).delayBetweenIterations);
+              if (delayBetweenIterations > 0) {
+                await stsutils.Sleep(delayBetweenIterations);
               } else {
                 await __privateMethod(this, _WorkerInstance_instances, SleepImmediate_fn).call(this);
               }
@@ -1663,7 +1705,6 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           } else {
             await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).Completed();
             __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.completed);
-            __privateGet(this, _PostMessageToWorkerManagerById).call(this, eIWMessageCommands.Completed, runnerId);
           }
         };
         ExecuteLoop();
@@ -1671,8 +1712,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __privateAdd(this, _StopRunnerByRunnerById, async (id) => {
         __privateGet(this, _debug).call(this, `${chalk.magenta(`runner: [${id}]`)} StopRunner`);
         await __privateGet(this, _GetRunnerInstanceById).call(this, id).StopRunner();
-        __privateGet(this, _UpdateRunnerStateById).call(this, id, IRunnerState.stopped);
-        await stsutils.Sleep(0);
+        await __privateGet(this, _UpdateRunnerStateById).call(this, id, IRunnerState.stopped);
       });
       __privateAdd(this, _StopAllRunners, async (testRunnerTelemetryPayload) => {
         __privateGet(this, _debug).call(this, `StopAllRunners`);
@@ -1690,31 +1730,27 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         const runnerId = testRunnerTelemetryPayload.runner.id;
         __privateGet(this, _debug).call(this, `${chalk.magenta(`runner: [${runnerId}]`)} TerminateRunner`);
         const retVal = await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).TerminateRunner();
-        __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.terminated);
+        await __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.terminated);
         __privateGet(this, _debug).call(this, `${chalk.magenta(`runner: [${runnerId}]`)} TerminateRunner Result = [${retVal}]`);
-        await stsutils.Sleep(0);
       });
       __privateAdd(this, _PauseRunner, async (testRunnerTelemetryPayload) => {
         const runnerId = testRunnerTelemetryPayload.runner.id;
         __privateGet(this, _debug).call(this, `${chalk.magenta(`runner: [${runnerId}]`)} PauseRunner`);
         await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).PauseRunner();
-        __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.paused);
-        await stsutils.Sleep(0);
+        await __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.paused);
       });
       __privateAdd(this, _ResumeRunner, async (testRunnerTelemetryPayload) => {
         const runnerId = testRunnerTelemetryPayload.runner.id;
         __privateGet(this, _debug).call(this, `${chalk.magenta(`runner: [${runnerId}]`)} ResumeRunner`);
         await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).ResumeRunner();
-        __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.running);
-        await stsutils.Sleep(0);
+        await __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.running);
       });
       __privateAdd(this, _ResetRunner, async (testRunnerTelemetryPayload) => {
         const runnerId = testRunnerTelemetryPayload.runner.id;
         __privateGet(this, _debug).call(this, `${chalk.magenta(`runner: [${runnerId}]`)} ResetRunner`);
         __privateGet(this, _ResetRunnerIterationById).call(this, runnerId);
         await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).ResetRunner();
-        __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.paused);
-        await stsutils.Sleep(0);
+        await __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.paused);
       });
       // Execute a single iteration of this runners work item
       __privateAdd(this, _ExecuteRunner, async (testRunnerTelemetryPayload) => {
@@ -1722,15 +1758,14 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         __privateGet(this, _debug).call(this, `${chalk.magenta(`runner: [${runnerId}]`)} ExecuteRunner`);
         await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).Execute(__privateGet(this, _GetRunnerIterationById).call(this, runnerId));
         __privateGet(this, _IncRunnerIterationById).call(this, runnerId);
-        __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.paused);
-        await stsutils.Sleep(0);
+        await __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.paused);
       });
       __privateAdd(this, _UpdateOptions, async (testRunnerTelemetryPayload) => {
         const runnerId = testRunnerTelemetryPayload.runner.id;
         __privateGet(this, _debug).call(this, `${chalk.magenta(`runner: [${runnerId}]`)} UpdateOptions`);
-        console.log(chalk.cyan(`before: [${JSON.stringify(__privateGet(this, _GetRunnerOptionsById).call(this, runnerId))}]`));
+        __privateGet(this, _debug).call(this, chalk.cyan(`before: [${JSON.stringify(__privateGet(this, _GetRunnerOptionsById).call(this, runnerId))}]`));
         __privateGet(this, _SetRunnerOptionsById).call(this, runnerId, testRunnerTelemetryPayload.runner.options);
-        console.log(chalk.cyan(`after: [${JSON.stringify(__privateGet(this, _GetRunnerOptionsById).call(this, runnerId))}]`));
+        __privateGet(this, _debug).call(this, chalk.cyan(`after: [${JSON.stringify(__privateGet(this, _GetRunnerOptionsById).call(this, runnerId))}]`));
         await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).UpdateOptions();
         await stsutils.Sleep(0);
       });
@@ -1791,10 +1826,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
               __privateGet(this, _debug).call(this, `Invalid payloadMessage.command: [${payloadMessage.command}] - Ignoring`);
           }
         } catch (error) {
-          console.log(error);
+          __privateGet(this, _error).call(this, error);
         }
       });
       __privateGet(this, _debug).call(this, `constructor`);
+      __privateGet(this, _processLoopExecutor).call(this);
     }
     get CollectorCollectorPort() {
       return __privateGet(this, _collectorCollectorPort);
@@ -1808,6 +1844,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
   _options = new WeakMap();
   _workerId = new WeakMap();
   _debug = new WeakMap();
+  _error = new WeakMap();
+  _processLoopExecutor = new WeakMap();
   _SetMessagePort = new WeakMap();
   _CreateRunnerEx2RunState = new WeakMap();
   _UpdateRunnerStateById = new WeakMap();
@@ -1989,6 +2027,57 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __privateAdd(this, _options2);
       __privateAdd(this, _STSInstrumentController, null);
       __privateAdd(this, _telemetryProcessor, null);
+      __privateAdd(this, _archiveList, []);
+      __privateAdd(this, _processLoopExecutor2, async () => {
+        const removeList = [];
+        for (const [, workerEx] of Object.entries(__privateGet(this, _workersEx))) {
+          for (const [, runnerEx] of Object.entries(workerEx.runnersEx)) {
+            const runnerState = runnerEx.state;
+            if (runnerState === IRunnerState.completed || runnerState === IRunnerState.error || runnerState === IRunnerState.stopped || runnerState === IRunnerState.terminated) {
+              removeList.push({
+                workerId: workerEx.id,
+                runnerId: runnerEx.id
+              });
+            }
+          }
+        }
+        if (removeList.length > 0) {
+          setTimeout(async () => {
+            __privateGet(this, _debug2).call(this, chalk.grey(`STSWorkerManager:#processLoopExecutor(): Removing runners from collection: [${JSON.stringify(removeList)}]`));
+            for (let i = 0; i < removeList.length; i++) {
+              const workerEx = __privateGet(this, _workersEx)[removeList[i].workerId];
+              if (workerEx) {
+                const runnerEx = workerEx.runnersEx[removeList[i].runnerId];
+                if (runnerEx) {
+                  if (runnerEx.publishInstrumentController) {
+                    console.log(chalk.magenta(`Ending publish for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
+                    await runnerEx.publishInstrumentController.EndPublish();
+                    await stsutils.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
+                  };
+                  __privateGet(this, _archiveList).push(runner);
+                  if (__privateGet(this, _archiveList).length > __privateGet(this, _options2).maxArchiveListLength) {
+                    __privateGet(this, _archiveList).shift();
+                  }
+                  delete workerEx.runnersEx[removeList[i].runnerId];
+                }
+              }
+            }
+            setTimeout(__privateGet(this, _processLoopExecutor2), 1e3);
+          }, 100);
+        } else {
+          setTimeout(__privateGet(this, _processLoopExecutor2), 1e3);
+        }
+      });
       __privateAdd(this, _debug2, (message) => {
         console.log(chalk.cyan(`pid: [${process.pid}] STSWorkerManager::${message}`));
       });
@@ -2087,14 +2176,22 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
             case eIWMessageCommands.InstrumentTelemetry:
               __privateGet(this, _ProcessTelemetry).call(this, stsWorkerEx, publishMessagePayload2.payload);
               break;
-            case eIWMessageCommands.Completed:
-              __privateGet(this, _ProcessCompleted).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;
+            case eIWMessageCommands.RemoveRunnerFromCollection:
+              __privateGet(this, _debug2).call(this, `AddWorker:processMessage():eIWMessageCommands.RemoveRunnerFromCollection`);
+              __privateGet(this, _debug2).call(this, `${JSON.stringify(publishMessagePayload2.payload)}`);
+              __privateGet(this, _RemoveRunnerFromCollection).call(this, stsWorkerEx, publishMessagePayload2.payload);
+              break;
             default:
-              __privateGet(this, _debug2).call(this, `AddWorker::default`);
+              __privateGet(this, _debug2).call(this, `processMessage::default`);
           }
         };
         let publishMessagePayload;
@@ -2162,14 +2259,23 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         if (workerEx.runnersEx[runner.id]) {
           const runnerEx = workerEx.runnersEx[runner.id];
           runnerEx.state = runner.state;
+          runnerEx.runnerHistory.push({
+            eventDate: /* @__PURE__ */ new Date(),
+            runner: { ...runner }
+          });
           __privateGet(this, _EmitEvent).call(this, "StateChange", workerEx, runner.id);
         }
       });
-      __privateAdd(this, _ProcessCompleted, (workerEx, payloadContents) => {
-        const { runner } = payloadContents;
-        __privateGet(this, _EmitEvent).call(this, "Completed", workerEx, runner.id);
-        console.log(chalk.green(`ProcessCompleted: [${JSON.stringify(runner)}]`));
+      __privateAdd(this, _RemoveRunnerFromCollection, (workerEx, payloadContents) => {
+        __privateGet(this, _debug2).call(this, `STSWorkerManager:#RemoveRunnerFromCollection(): Worker: [${workerEx.id}] Runner to archive: [${JSON.stringify(payloadContents)}]`);
       });
+      /*
+      #ProcessCompleted = (workerEx: IWorkerEx, payloadContents: ITestRunnerTelemetryPayload): void => {
+          const { runner } = payloadContents;
+          this.#EmitEvent('Completed', workerEx, runner.id);
+          console.log(chalk.green(`ProcessCompleted: [${JSON.stringify(runner)}]`));
+      }
+      */
       __privateAdd(this, _CreateAsyncRunner, (workerEx, runnerOptions) => {
         const runnerId = v4();
         if (__privateGet(this, _STSInstrumentController)) {
@@ -2196,6 +2302,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           publishInstrumentController: __privateGet(this, _STSInstrumentController) ? __privateGet(this, _STSInstrumentController).AddPublishInstrumentController(asyncRunnerContext) : void 0,
           asyncRunnerContext,
           options: runnerOptions,
+          runnerHistory: [],
           instrumentData: {
             requestCount: 0,
             errorCount: 0,
@@ -2253,63 +2360,31 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.StartRunner, {
           runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
         });
-        runnerEx.state = IRunnerState.running;
         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)
         });
-        runnerEx.state = IRunnerState.paused;
         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)
         });
-        runnerEx.state = IRunnerState.paused;
         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)
         });
-        runnerEx.state = IRunnerState.terminated;
         return true;
       });
-      __privateAdd(this, _TerminateRunner2, async (workerEx, runnerEx = null) => {
-        return new Promise((resolve, reject) => {
-          if (runnerEx === null) {
-            const ids = Object.keys(workerEx.runnersEx);
-            if (ids.length > 0) {
-              const id = ids[0];
-              runnerEx = workerEx.runnersEx[id];
-            }
-          }
-          if (runnerEx !== null) {
-            (async () => {
-              console.log(chalk.magenta(`Sending message to terminate runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
-              __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.TerminateRunner, {
-                runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
-              });
-              if (runnerEx.publishInstrumentController) {
-                runnerEx.publishInstrumentController.LogEx(`Terminating runner: [${runnerEx.id}]`);
-              }
-              await stsutils.Sleep(250);
-              console.log(chalk.magenta(`Ending publish for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
-              if (runnerEx.publishInstrumentController) {
-                await runnerEx.publishInstrumentController.EndPublish();
-                await stsutils.Sleep(250);
-              }
-              delete workerEx.runnersEx[runnerEx.id];
-              console.log(chalk.magenta(`Completed Terminate for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
-              resolve(true);
-            })();
-          } else {
-            console.log(chalk.magenta(`No runner to terminate.`));
-            resolve(false);
-          }
+      __privateAdd(this, _TerminateRunner2, async (workerEx, runnerEx) => {
+        __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.TerminateRunner, {
+          runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
         });
+        return true;
       });
       __privateAdd(this, _PauseRunner2, async (workerEx, runnerEx) => {
         __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.PauseRunner, {
@@ -2502,10 +2577,14 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         __privateSet(this, _STSInstrumentController, __privateGet(this, _options2).publishInstrumentController);
         __privateSet(this, _telemetryProcessor, new TelemetryProcessor());
       }
+      __privateGet(this, _processLoopExecutor2).call(this);
     }
     get WorkersEx() {
       return __privateGet(this, _workersEx);
     }
+    get archiveList() {
+      return __privateGet(this, _archiveList);
+    }
     get Options() {
       return __privateGet(this, _options2);
     }
@@ -2517,6 +2596,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
   _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) {
@@ -2533,7 +2614,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
   _ProcessTelemetry = new WeakMap();
   _EmitEvent = new WeakMap();
   _RunnerStateChange = new WeakMap();
-  _ProcessCompleted = new WeakMap();
+  _RemoveRunnerFromCollection = new WeakMap();
   _CreateAsyncRunner = new WeakMap();
   _PostMessageToWorkerUsingDefaultChannel = new WeakMap();
   _PostMessageToWorker = new WeakMap();