@nsshunt/stsrunnerframework 1.0.6 → 1.0.8

package/dist/stsrunnerframework.mjs

@@ -17,7 +17,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     return __privateGet(obj, member, getter);
   }
 });
-var _collectorCollectorPort, _runners, _options, _debug, _SetMessagePort, _AddRunner, _WorkerInstance_instances, SleepImmediate_fn, _StartRunner, _StopAllRunners, _StopRunner, _TerminateRunner, _PauseRunner, _ResumeRunner, _ResetRunner, _ExecuteRunner, _UpdateOptions, _workersEx, _runner, _workerId, _options2, _STSInstrumentController, _telemetryProcessor, _debug2, _STSWorkerManager_instances, CreateRunnerCopy_fn, _SetRunnerIntoWorker, _ProcessTelemetry, _ProcessCompleted, _CreateAsyncRunner, _PostMessageToWorker, _StartRunner2, _ResetRunner2, _ExecuteRunner2, _StopRunner2, _TerminateRunner2, _PauseRunner2, _ResumeRunner2, _WorkerCommand, _PauseWorker, _ResumeWorker, _StopWorker, _StartWorker, _ResetWorker, _ExecuteWorker, _UpdateOptionsWorker, _TerminateWorker, _UpdateOptions2;
+var _collectorCollectorPort, _runners, _options, _debug, _SetMessagePort, _AddRunner, _WorkerInstance_instances, SleepImmediate_fn, _StartRunner, _StopAllRunners, _StopRunner, _TerminateRunner, _PauseRunner, _ResumeRunner, _ResetRunner, _ExecuteRunner, _UpdateOptions, _workersEx, _runner, _workerId, _options2, _STSInstrumentController, _telemetryProcessor, _debug2, _STSWorkerManager_instances, CreateRunnerCopy_fn, _SetRunnerIntoWorker, _ProcessTelemetry, _ProcessCompleted, _CreateAsyncRunner, _PostMessageToWorker, _StartRunner2, _ResetRunner2, _ExecuteRunner2, _StopRunner2, _TerminateRunner2, _PauseRunner2, _ResumeRunner2, _BroadcastCommandToAllRunners, _PauseWorker, _ResumeWorker, _StopWorker, _StartWorker, _ResetWorker, _ExecuteWorker, _UpdateOptionsWorker, _TerminateWorker, _UpdateOptions2;
 import { Sleep, ModelDelimeter } from "@nsshunt/stsutils";
 import { Gauge } from "@nsshunt/stsobservability";
 const URI_BASE_VUEUTILS = "/";
@@ -1617,7 +1617,8 @@ class WorkerInstance {
       const { runner } = testRunnerTelemetryPayload;
       __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${runner.id}]`)} TerminateRunner`);
       __privateGet(this, _runners)[runner.id].terminate = true;
-      await __privateGet(this, _runners)[runner.id].runnerInstance.TerminateRunner();
+      const retVal = await __privateGet(this, _runners)[runner.id].runnerInstance.TerminateRunner();
+      __privateGet(this, _debug).call(this, `${chalk$1.magenta(`runner: [${runner.id}]`)} TerminateRunner Result = [${retVal}]`);
       await Sleep(0);
     });
     __privateAdd(this, _PauseRunner, async (testRunnerTelemetryPayload) => {
@@ -2097,28 +2098,34 @@ class STSWorkerManager {
       return true;
     });
     __privateAdd(this, _TerminateRunner2, async (workerEx, runnerEx = null) => {
-      if (runnerEx === null) {
-        const ids = Object.keys(workerEx.runnersEx);
-        if (ids.length > 0) {
-          const id = ids[0];
-          runnerEx = workerEx.runnersEx[id];
+      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) {
-        __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.TerminateRunner, {
-          runner: __privateMethod(this, _STSWorkerManager_instances, CreateRunnerCopy_fn).call(this, runnerEx)
-        });
-        runnerEx.publishInstrumentController.LogEx(`Terminating runner: [${runnerEx.id}]`);
-        const promArray = [];
-        promArray.push((async () => {
-          await Sleep(100);
-          return runnerEx.publishInstrumentController.EndPublish();
-        })());
-        delete workerEx.runnersEx[runnerEx.id];
-        const retVal = await Promise.all(promArray);
-        console.log(`Removed instrument workers: [${retVal}]`);
-      }
-      return true;
+        if (runnerEx !== null) {
+          (async () => {
+            console.log(chalk$1.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)
+            });
+            runnerEx.publishInstrumentController.LogEx(`Terminating runner: [${runnerEx.id}]`);
+            await Sleep(2e3);
+            console.log(chalk$1.magenta(`Ending publish for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
+            await runnerEx.publishInstrumentController.EndPublish();
+            await Sleep(2e3);
+            delete workerEx.runnersEx[runnerEx.id];
+            console.log(chalk$1.magenta(`Completed Terminate for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
+            resolve(true);
+          })();
+        } else {
+          console.log(chalk$1.magenta(`No runner to terminate.`));
+          resolve(false);
+        }
+      });
     });
     __privateAdd(this, _PauseRunner2, async (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.PauseRunner, {
@@ -2132,10 +2139,9 @@ class STSWorkerManager {
       });
       return true;
     });
-    __privateAdd(this, _WorkerCommand, async (workerEx, command, options) => {
+    __privateAdd(this, _BroadcastCommandToAllRunners, async (workerEx, command, options) => {
       try {
         if (workerEx.state !== IWorkerState.stopped) {
-          console.log(`Stop Worker: [${workerEx.id}]`);
           const promArray = [];
           const ids = Object.keys(workerEx.runnersEx);
           ids.forEach((id) => {
@@ -2155,30 +2161,30 @@ class STSWorkerManager {
       }
     });
     __privateAdd(this, _PauseWorker, async (workerEx) => {
-      return __privateGet(this, _WorkerCommand).call(this, workerEx, __privateGet(this, _PauseRunner2));
+      return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _PauseRunner2));
     });
     __privateAdd(this, _ResumeWorker, async (workerEx) => {
-      return __privateGet(this, _WorkerCommand).call(this, workerEx, __privateGet(this, _ResumeRunner2));
+      return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _ResumeRunner2));
     });
     __privateAdd(this, _StopWorker, async (workerEx) => {
-      return __privateGet(this, _WorkerCommand).call(this, workerEx, __privateGet(this, _StopRunner2));
+      return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _StopRunner2));
     });
     __privateAdd(this, _StartWorker, async (workerEx) => {
-      return __privateGet(this, _WorkerCommand).call(this, workerEx, __privateGet(this, _StartRunner2));
+      return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _StartRunner2));
     });
     __privateAdd(this, _ResetWorker, async (workerEx) => {
-      return __privateGet(this, _WorkerCommand).call(this, workerEx, __privateGet(this, _ResetRunner2));
+      return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _ResetRunner2));
     });
     __privateAdd(this, _ExecuteWorker, async (workerEx) => {
-      return __privateGet(this, _WorkerCommand).call(this, workerEx, __privateGet(this, _ExecuteRunner2));
+      return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _ExecuteRunner2));
     });
     __privateAdd(this, _UpdateOptionsWorker, async (workerEx, options) => {
-      return __privateGet(this, _WorkerCommand).call(this, workerEx, __privateGet(this, _UpdateOptions2), options);
+      return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _UpdateOptions2), options);
     });
     __privateAdd(this, _TerminateWorker, async (workerEx) => {
       try {
         if (workerEx.state !== IWorkerState.stopped) {
-          await __privateGet(this, _WorkerCommand).call(this, workerEx, __privateGet(this, _TerminateRunner2));
+          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}]`);
@@ -2284,7 +2290,7 @@ _StopRunner2 = new WeakMap();
 _TerminateRunner2 = new WeakMap();
 _PauseRunner2 = new WeakMap();
 _ResumeRunner2 = new WeakMap();
-_WorkerCommand = new WeakMap();
+_BroadcastCommandToAllRunners = new WeakMap();
 _PauseWorker = new WeakMap();
 _ResumeWorker = new WeakMap();
 _StopWorker = new WeakMap();