@nsshunt/stsrunnerframework 1.0.60 → 1.0.62

package/README.md

@@ -1 +1,34 @@
-# stsrunnerframework
+# stsrunnerframework
+
+terminated - this means the process has been terminated and no end-of-process steps should execute such as reports etc.
+
+stopped - end the test and report as if completed normnally
+
+
+```mermaid
+---
+config:
+  theme: neo
+  look: neo
+title: STSRunnerFramework
+---
+stateDiagram
+  direction TB
+  [*] --> Created:Select Start
+  Created --> Running
+  Created --> Error:Error Caught
+  Running --> Completed:Iterations Exhausted
+  Running --> Error:Error Caught
+  Running --> Stopped:Select Stop
+  Completed --> [*]
+  Running --> Paused:Select Pause
+  Paused --> Running:Select Resume
+  Paused --> Paused:Select Execute or Reset
+  Paused --> Stopped:Select Stop
+  Running --> Terminated:Select Terminate
+  Paused --> Terminated:Select Terminate
+  Paused --> Completed:Select Execute<br>Iterations Exhausted
+  Terminated --> [*]
+  Error --> [*]
+  Stopped --> [*]
+```

package/dist/stsrunnerframework.mjs

@@ -9,7 +9,7 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value2) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value2);
 var __privateSet = (obj, member, value2, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value2) : member.set(obj, value2), value2);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var _collectorCollectorPort, _runners, _options3, _workerId, _debug, _SetMessagePort, _CreateRunnerEx2RunState, _UpdateRunnerStateById, _GetAllRunners, _CanExecuteNextIterationById, _GetRunnerIterationById, _ResetRunnerIterationById, _IncRunnerIterationById, _GetRunnerInstanceById, _GetRunnerExecutionProfileById, _GetRunnerOptionsById, _SetRunnerOptionsById, _AddRunner, _WorkerInstance_instances, SleepImmediate_fn, _PostMessageToWorkerManagerById, _StartRunner, _StopRunnerByRunnerById, _StopAllRunners, _StopRunner, _TerminateRunner, _PauseRunner, _ResumeRunner, _ResetRunner, _ExecuteRunner, _UpdateOptions, _workersEx, _options4, _STSInstrumentController, _telemetryProcessor, _debug2, _STSWorkerManager_instances, CreateRunnerCopy_fn, _SetRunnerIntoWorker, _ProcessTelemetry, _RunnerStateChange, _ProcessCompleted, _CreateAsyncRunner, _PostMessageToWorkerUsingDefaultChannel, _PostMessageToWorker, _StartRunner2, _ResetRunner2, _ExecuteRunner2, _StopRunner2, _TerminateRunner2, _PauseRunner2, _ResumeRunner2, _BroadcastCommandToAllRunners, _PauseWorker, _ResumeWorker, _StopWorker, _StartWorker, _ResetWorker, _ExecuteWorker, _BroadcastUpdateCommandToAllRunners, _UpdateOptionsWorker, _TerminateWorker, _UpdateOptions2, _options5, _rest01Client, _accessToken2, _agentManager, _authUtilsNode, _GetAccessToken;
+var _collectorCollectorPort, _runners, _options3, _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, _options4, _STSInstrumentController, _telemetryProcessor, _debug2, _STSWorkerManager_instances, CreateRunnerCopy_fn, _SetRunnerIntoWorker, _ProcessTelemetry, _RunnerStateChange, _ProcessCompleted, _CreateAsyncRunner, _PostMessageToWorkerUsingDefaultChannel, _PostMessageToWorker, _StartRunner2, _ResetRunner2, _ExecuteRunner2, _StopRunner2, _TerminateRunner2, _PauseRunner2, _ResumeRunner2, _BroadcastCommandToAllRunners, _PauseWorker, _ResumeWorker, _StopWorker, _StartWorker, _ResetWorker, _ExecuteWorker, _BroadcastUpdateCommandToAllRunners, _UpdateOptionsWorker, _TerminateWorker, _UpdateOptions2, _options5, _rest01Client, _accessToken2, _agentManager, _authUtilsNode, _GetAccessToken;
 import { Sleep, ModelDelimeter, STSAxiosConfig, GetErrorPayload, AgentManager, defaultLogger } from "@nsshunt/stsutils";
 import { Gauge } from "@nsshunt/stsobservability";
 import { accessSync, constants as constants$2, readFileSync } from "node:fs";
@@ -47,24 +47,13 @@ var eIWMessageCommands = /* @__PURE__ */ ((eIWMessageCommands2) => {
   return eIWMessageCommands2;
 })(eIWMessageCommands || {});
 var IRunnerState = /* @__PURE__ */ ((IRunnerState2) => {
-  IRunnerState2["starting"] = "starting";
-  IRunnerState2["started"] = "started";
-  IRunnerState2["stopping"] = "stopping";
+  IRunnerState2["created"] = "created";
+  IRunnerState2["running"] = "running";
+  IRunnerState2["paused"] = "paused";
+  IRunnerState2["completed"] = "completed";
   IRunnerState2["stopped"] = "stopped";
-  IRunnerState2["terminating"] = "terminating";
   IRunnerState2["terminated"] = "terminated";
-  IRunnerState2["resuming"] = "resuming";
-  IRunnerState2["resumed"] = "resumed";
-  IRunnerState2["pausing"] = "pausing";
-  IRunnerState2["paused"] = "paused";
-  IRunnerState2["executing"] = "executing";
-  IRunnerState2["executed"] = "executed";
-  IRunnerState2["resetting"] = "resetting";
-  IRunnerState2["reset"] = "reset";
   IRunnerState2["error"] = "error";
-  IRunnerState2["completed"] = "completed";
-  IRunnerState2["created"] = "created";
-  IRunnerState2["running"] = "running";
   return IRunnerState2;
 })(IRunnerState || {});
 var IWorkerState = /* @__PURE__ */ ((IWorkerState2) => {
@@ -1628,7 +1617,14 @@ class WorkerInstance {
     });
     __privateAdd(this, _CanExecuteNextIterationById, (id) => {
       const state = __privateGet(this, _runners)[id].runner.state;
-      if (state === IRunnerState.running || state === IRunnerState.executed || state === IRunnerState.resumed || state === IRunnerState.reset || state === IRunnerState.started) {
+      if (state === IRunnerState.running) {
+        return true;
+      }
+      return false;
+    });
+    __privateAdd(this, _IsCompletedById, (id) => {
+      const state = __privateGet(this, _runners)[id].runner.state;
+      if (state === IRunnerState.error || state === IRunnerState.completed || state === IRunnerState.stopped || state === IRunnerState.terminated) {
         return true;
       }
       return false;
@@ -1680,10 +1676,8 @@ class WorkerInstance {
     __privateAdd(this, _StartRunner, async (testRunnerTelemetryPayload) => {
       const runnerId = testRunnerTelemetryPayload.runner.id;
       __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${runnerId}]`)} StartRunner`);
-      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.starting);
-      await Sleep(0);
       await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).StartRunner();
-      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.started);
+      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.running);
       const ExecuteLoop = async () => {
         if (__privateGet(this, _GetRunnerIterationById).call(this, runnerId) < __privateGet(this, _GetRunnerExecutionProfileById).call(this, runnerId).iterations) {
           if (__privateGet(this, _CanExecuteNextIterationById).call(this, runnerId)) {
@@ -1698,8 +1692,10 @@ class WorkerInstance {
             }
             ExecuteLoop();
           } else {
-            await Sleep(50);
-            ExecuteLoop();
+            if (!__privateGet(this, _IsCompletedById).call(this, runnerId)) {
+              await Sleep(50);
+              ExecuteLoop();
+            }
           }
         } else {
           await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).Completed();
@@ -1711,8 +1707,6 @@ class WorkerInstance {
     });
     __privateAdd(this, _StopRunnerByRunnerById, async (id) => {
       __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${id}]`)} StopRunner`);
-      __privateGet(this, _UpdateRunnerStateById).call(this, id, IRunnerState.stopping);
-      await Sleep(0);
       await __privateGet(this, _GetRunnerInstanceById).call(this, id).StopRunner();
       __privateGet(this, _UpdateRunnerStateById).call(this, id, IRunnerState.stopped);
       await Sleep(0);
@@ -1732,8 +1726,6 @@ class WorkerInstance {
     __privateAdd(this, _TerminateRunner, async (testRunnerTelemetryPayload) => {
       const runnerId = testRunnerTelemetryPayload.runner.id;
       __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${runnerId}]`)} TerminateRunner`);
-      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.terminating);
-      await Sleep(0);
       const retVal = await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).TerminateRunner();
       __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.terminated);
       __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${runnerId}]`)} TerminateRunner Result = [${retVal}]`);
@@ -1742,8 +1734,6 @@ class WorkerInstance {
     __privateAdd(this, _PauseRunner, async (testRunnerTelemetryPayload) => {
       const runnerId = testRunnerTelemetryPayload.runner.id;
       __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${runnerId}]`)} PauseRunner`);
-      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.pausing);
-      await Sleep(0);
       await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).PauseRunner();
       __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.paused);
       await Sleep(0);
@@ -1751,31 +1741,25 @@ class WorkerInstance {
     __privateAdd(this, _ResumeRunner, async (testRunnerTelemetryPayload) => {
       const runnerId = testRunnerTelemetryPayload.runner.id;
       __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${runnerId}]`)} ResumeRunner`);
-      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.resuming);
-      await Sleep(0);
       await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).ResumeRunner();
-      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.resumed);
+      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.running);
       await Sleep(0);
     });
     __privateAdd(this, _ResetRunner, async (testRunnerTelemetryPayload) => {
       const runnerId = testRunnerTelemetryPayload.runner.id;
       __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${runnerId}]`)} ResetRunner`);
       __privateGet(this, _ResetRunnerIterationById).call(this, runnerId);
-      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.resetting);
-      await Sleep(0);
       await __privateGet(this, _GetRunnerInstanceById).call(this, runnerId).ResetRunner();
-      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.reset);
+      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.paused);
       await Sleep(0);
     });
     // Execute a single iteration of this runners work item
     __privateAdd(this, _ExecuteRunner, async (testRunnerTelemetryPayload) => {
       const runnerId = testRunnerTelemetryPayload.runner.id;
       __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${runnerId}]`)} ExecuteRunner`);
-      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.executing);
-      await Sleep(0);
       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.executed);
+      __privateGet(this, _UpdateRunnerStateById).call(this, runnerId, IRunnerState.paused);
       await Sleep(0);
     });
     __privateAdd(this, _UpdateOptions, async (testRunnerTelemetryPayload) => {
@@ -1867,6 +1851,7 @@ _CreateRunnerEx2RunState = new WeakMap();
 _UpdateRunnerStateById = new WeakMap();
 _GetAllRunners = new WeakMap();
 _CanExecuteNextIterationById = new WeakMap();
+_IsCompletedById = new WeakMap();
 _GetRunnerIterationById = new WeakMap();
 _ResetRunnerIterationById = new WeakMap();
 _IncRunnerIterationById = new WeakMap();
@@ -2199,6 +2184,9 @@ class STSWorkerManager {
         }
       }
     });
+    //@@ make this have an event
+    //@@ make refactor event to own method
+    //@@ check for other events to capture
     __privateAdd(this, _RunnerStateChange, (workerEx, payloadContents) => {
       const { runner } = payloadContents;
       if (workerEx.runnersEx[runner.id]) {
@@ -2298,21 +2286,21 @@ class STSWorkerManager {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ResetRunner, {
         runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
       });
-      runnerEx.state = IRunnerState.stopped;
+      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.running;
+      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.stopped;
+      runnerEx.state = IRunnerState.terminated;
       return true;
     });
     __privateAdd(this, _TerminateRunner2, async (workerEx, runnerEx = null) => {