@nsshunt/stsrunnerframework 1.0.84 → 1.0.86

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, _error, _processLoopExecutor, _SetMessagePort, _CreateRunnerEx2RunState, _UpdateRunnerStateById, _GetAllRunners, _CanExecuteNextIterationById, _IsCompletedById, _GetRunnerIterationById, _ResetRunnerIterationById, _IncRunnerIterationById, _GetRunnerInstanceById, _GetRunnerExecutionProfileById, _GetRunnerOptionsById, _SetRunnerOptionsById, _AddRunner, _WorkerInstance_instances, SleepImmediate_fn, _PostMessageToWorkerManagerById, _StartRunner, _StopRunnerByRunnerId, _StopAllRunners, _StopRunner, _TerminateRunner, _PauseRunner, _ResumeRunner, _ResetRunner, _ExecuteRunner, _UpdateOptions, _workersEx, _options2, _STSInstrumentController, _telemetryProcessor, _archiveList, _id, _processLoopExecutor2, _debug2, _SetRunnerIntoWorker, _ProcessTelemetry, _EmitEvent, _RunnerStateChange, _RemoveRunnerFromCollection, _CreateAsyncRunner, _PostMessageToWorkerUsingDefaultChannel, _PostMessageToWorker, _StartRunner2, _ResetRunner2, _ExecuteRunner2, _StopRunner2, _TerminateRunner2, _PauseRunner2, _ResumeRunner2, _UpdateOptionsRunner, _PauseWorker, _ResumeWorker, _StopWorker, _StartWorker, _ResetWorker, _ExecuteWorker, _UpdateOptionsWorker, _BroadcastCommandToAllRunners, _TerminateWorker, _HandleAllWorkers;
+  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, _StopRunnerByRunnerId, _StopAllRunners, _StopRunner, _TerminateRunner, _PauseRunner, _ResumeRunner, _ResetRunner, _ExecuteRunner, _UpdateOptions, _workersEx, _options2, _STSInstrumentController, _telemetryProcessor, _archiveList, _id, _processLoopExecutor2, _debug2, _SetRunnerIntoWorker, _ProcessTelemetry, _EmitWorkerEvent, _EmitRunnerEvent, _RunnerStateChange, _RemoveRunnerFromCollection, _CreateAsyncRunner, _PostMessageToWorkerUsingDefaultChannel, _PostMessageToWorker, _StartRunner2, _ResetRunner2, _ExecuteRunner2, _StopRunner2, _TerminateRunner2, _PauseRunner2, _ResumeRunner2, _UpdateOptionsRunner, _PauseWorker, _ResumeWorker, _StopWorker, _StartWorker, _ResetWorker, _ExecuteWorker, _UpdateOptionsWorker, _TerminateWorker, _BroadcastCommandToAllRunners, _HandleAllWorkers;
   const URI_BASE_VUEUTILS = "/";
   const STS_RF_RES_PREFIX = "STS_R_RF_";
   const STS_RF_RES_ENT_PREFIX = "STS_RE_RF_";
@@ -2228,10 +2228,12 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
                     __privateGet(this, _debug2).call(this, chalk.grey(`Ending publish for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
                     runnerEx.publishInstrumentController.EndPublish();
                   }
-                  const runner = this.CreateRunnerCopy(runnerEx);
-                  __privateGet(this, _archiveList).push(runner);
-                  if (__privateGet(this, _archiveList).length > __privateGet(this, _options2).maxArchiveListLength) {
-                    __privateGet(this, _archiveList).shift();
+                  if (runnerEx.state !== IRunnerState.terminated) {
+                    const runner = this.CreateRunnerCopy(runnerEx);
+                    __privateGet(this, _archiveList).push(runner);
+                    if (__privateGet(this, _archiveList).length > __privateGet(this, _options2).maxArchiveListLength) {
+                      __privateGet(this, _archiveList).shift();
+                    }
                   }
                   delete workerEx.runnersEx[removeList[i].runnerId];
                 }
@@ -2283,6 +2285,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           id: workerId,
           workerManagerId: __privateGet(this, _id),
           worker: workerFactory.createWorkerThreadWorker(),
+          workerEvents: [],
           messagePort: port1,
           options: workerOptions,
           runnersEx: {},
@@ -2306,7 +2309,14 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           Terminate: () => __privateGet(this, _TerminateWorker).call(this, stsWorkerEx),
           Reset: () => __privateGet(this, _ResetWorker).call(this, stsWorkerEx),
           Execute: () => __privateGet(this, _ExecuteWorker).call(this, stsWorkerEx),
-          UpdateOptions: (executionProfile) => __privateGet(this, _UpdateOptionsWorker).call(this, stsWorkerEx, executionProfile)
+          UpdateOptions: (executionProfile) => __privateGet(this, _UpdateOptionsWorker).call(this, stsWorkerEx, executionProfile),
+          on: (eventName, cb) => {
+            stsWorkerEx.workerEvents.push({
+              eventName,
+              cb
+            });
+            return stsWorkerEx;
+          }
         };
         if (__privateGet(this, _STSInstrumentController)) {
           __privateGet(this, _STSInstrumentController).LogEx(chalk.yellow(`pid: [${process.pid}] Creating new worker: [${stsWorkerEx.id}]`));
@@ -2337,17 +2347,45 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         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}`));
+              try {
+                console.log(chalk.magenta(`STSWorkerManager:stsWorkerEx.worker.on(exit): Worker exited with code: ${code}`));
+                __privateGet(this, _EmitWorkerEvent).call(this, "exit", stsWorkerEx);
+                if (__privateGet(this, _workersEx)[stsWorkerEx.id]) {
+                  delete __privateGet(this, _workersEx)[stsWorkerEx.id];
+                  console.log(chalk.magenta(`STSWorkerManager:stsWorkerEx.worker.on(exit): Worker: [${stsWorkerEx.id}] has been removed from the worker collection.`));
+                }
+              } catch (error) {
+                console.error(chalk.red(`STSWorkerManager:stsWorkerEx.worker.on(exit): Error: [${error}] Worker: [${stsWorkerEx.id}]`));
+              }
             });
             stsWorkerEx.worker.on("error", (error) => {
-              console.error(chalk.red(`STSWorkerManager:stsWorkerEx.worker.on(error): Worker error: ${error}`));
+              try {
+                console.error(chalk.red(`STSWorkerManager:stsWorkerEx.worker.on(error): Worker error: ${error}`));
+                __privateGet(this, _EmitWorkerEvent).call(this, "error", stsWorkerEx);
+              } catch (error2) {
+                console.error(chalk.red(`STSWorkerManager:stsWorkerEx.worker.on(error): Error: [${error2}] Worker: [${stsWorkerEx.id}]`));
+              }
             });
           } else {
             stsWorkerEx.worker.onerror = (error) => {
-              console.error(chalk.red("STSWorkerManager:stsWorkerEx.worker.onerror(): Error in worker:", error));
+              try {
+                console.error(chalk.red("STSWorkerManager:stsWorkerEx.worker.onerror(): Error in worker:", error));
+                __privateGet(this, _EmitWorkerEvent).call(this, "onerror", stsWorkerEx);
+                if (__privateGet(this, _workersEx)[stsWorkerEx.id]) {
+                  delete __privateGet(this, _workersEx)[stsWorkerEx.id];
+                  console.log(chalk.magenta(`STSWorkerManager:stsWorkerEx.worker.onerror(error): Worker: [${stsWorkerEx.id}] has been removed from the worker collection.`));
+                }
+              } catch (error2) {
+                console.error(chalk.red(`STSWorkerManager:stsWorkerEx.worker.onerror(error): Error: [${error2}] Worker: [${stsWorkerEx.id}]`));
+              }
             };
             stsWorkerEx.worker.onmessageerror = (error) => {
-              console.error(chalk.red("STSWorkerManager:stsWorkerEx.worker.onmessageerror(): Message error in worker:", error));
+              try {
+                console.error(chalk.red("STSWorkerManager:stsWorkerEx.worker.onmessageerror(): Message error in worker:", error));
+                __privateGet(this, _EmitWorkerEvent).call(this, "onmessageerror", stsWorkerEx);
+              } catch (error2) {
+                console.error(chalk.red(`STSWorkerManager:stsWorkerEx.worker.onmessageerror(error): Error: [${error2}] Worker: [${stsWorkerEx.id}]`));
+              }
             };
           }
         }
@@ -2416,10 +2454,17 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           if (runnerEx.publishInstrumentController && __privateGet(this, _telemetryProcessor)) {
             __privateGet(this, _telemetryProcessor).ProcessTelemetry(runnerEx.publishInstrumentController, runnerEx.instrumentData);
           }
-          __privateGet(this, _EmitEvent).call(this, "Telemetry", workerEx, runner.id);
+          __privateGet(this, _EmitRunnerEvent).call(this, "Telemetry", workerEx, runner.id);
         }
       });
-      __privateAdd(this, _EmitEvent, (eventName, workerEx, runnerId) => {
+      __privateAdd(this, _EmitWorkerEvent, (eventName, workerEx) => {
+        workerEx.workerEvents.forEach((ev) => {
+          if (ev.eventName.localeCompare(eventName) === 0) {
+            ev.cb(workerEx);
+          }
+        });
+      });
+      __privateAdd(this, _EmitRunnerEvent, (eventName, workerEx, runnerId) => {
         if (workerEx.runnersEvents[runnerId]) {
           const runnersEvents = workerEx.runnersEvents[runnerId];
           runnersEvents.forEach((ev) => {
@@ -2444,7 +2489,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
             eventDate: /* @__PURE__ */ new Date(),
             runner: { ...runner }
           });
-          __privateGet(this, _EmitEvent).call(this, "StateChange", workerEx, runner.id);
+          __privateGet(this, _EmitRunnerEvent).call(this, "StateChange", workerEx, runner.id);
         }
       });
       __privateAdd(this, _RemoveRunnerFromCollection, (workerEx, payloadContents) => {
@@ -2649,6 +2694,25 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __privateAdd(this, _UpdateOptionsWorker, (workerEx, executionProfile) => {
         return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _UpdateOptionsRunner), executionProfile);
       });
+      __privateAdd(this, _TerminateWorker, (workerEx) => {
+        try {
+          const retVal = __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _TerminateRunner2));
+          if (workerEx.worker) {
+            setTimeout(() => {
+              workerEx.worker.terminate();
+              __privateGet(this, _debug2).call(this, `Terminated worker: [${workerEx.id}]`);
+              if (__privateGet(this, _workersEx)[workerEx.id]) {
+                delete __privateGet(this, _workersEx)[workerEx.id];
+                console.log(chalk.magenta(`STSWorkerManager:stsWorkerEx.worker.on(exit): Worker: [${workerEx.id}] has been removed from the worker collection.`));
+              }
+            }, 500);
+          }
+          return retVal;
+        } catch (error) {
+          console.log(`Error in STSTestWorker:TerminateWorker: [${error}]`);
+          return [];
+        }
+      });
       __privateAdd(this, _BroadcastCommandToAllRunners, (workerEx, command, executionProfile) => {
         try {
           const executeCommand = (runnerEx) => {
@@ -2666,21 +2730,6 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           return [];
         }
       });
-      __privateAdd(this, _TerminateWorker, (workerEx) => {
-        try {
-          const retVal = __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 retVal;
-        } catch (error) {
-          console.log(`Error in STSTestWorker:TerminateWorker: [${error}]`);
-          return [];
-        }
-      });
       __publicField(this, "GetNextAvailableWorker", () => {
         let leastRunnerWorker = null;
         for (const [, stsWorker] of Object.entries(this.WorkersEx)) {
@@ -2817,7 +2866,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
   _debug2 = new WeakMap();
   _SetRunnerIntoWorker = new WeakMap();
   _ProcessTelemetry = new WeakMap();
-  _EmitEvent = new WeakMap();
+  _EmitWorkerEvent = new WeakMap();
+  _EmitRunnerEvent = new WeakMap();
   _RunnerStateChange = new WeakMap();
   _RemoveRunnerFromCollection = new WeakMap();
   _CreateAsyncRunner = new WeakMap();
@@ -2838,8 +2888,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
   _ResetWorker = new WeakMap();
   _ExecuteWorker = new WeakMap();
   _UpdateOptionsWorker = new WeakMap();
-  _BroadcastCommandToAllRunners = new WeakMap();
   _TerminateWorker = new WeakMap();
+  _BroadcastCommandToAllRunners = new WeakMap();
   _HandleAllWorkers = new WeakMap();
   exports2.IRunnerState = IRunnerState;
   exports2.IWorkerState = IWorkerState;