@nsshunt/stsrunnerframework 1.0.80 → 1.0.82

package/dist/stsrunnerframework.mjs

@@ -2049,8 +2049,7 @@ class STSWorkerManager {
               if (runnerEx) {
                 if (runnerEx.publishInstrumentController) {
                   __privateGet(this, _debug2).call(this, chalk.grey(`Ending publish for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
-                  await runnerEx.publishInstrumentController.EndPublish();
-                  await Sleep(250);
+                  runnerEx.publishInstrumentController.EndPublish();
                 }
                 const runner = this.CreateRunnerCopy(runnerEx);
                 __privateGet(this, _archiveList).push(runner);
@@ -2073,6 +2072,22 @@ class STSWorkerManager {
     __privateAdd(this, _debug2, (message) => {
       console.log(chalk.cyan(`pid: [${process.pid}] STSWorkerManager::${message}`));
     });
+    __publicField(this, "GetWorkers", () => {
+      const retVal = {};
+      for (const [, workerEx] of Object.entries(__privateGet(this, _workersEx))) {
+        retVal[workerEx.id] = this.CreateWorkerCopy(workerEx);
+      }
+      return retVal;
+    });
+    __publicField(this, "GetArchiveList", () => {
+      return __privateGet(this, _archiveList);
+    });
+    __publicField(this, "GetWorker", (workerId) => {
+      return this.CreateWorkerCopy(__privateGet(this, _workersEx)[workerId]);
+    });
+    __publicField(this, "GetRunner", (workerId, runnerId) => {
+      return this.CreateRunnerCopy(__privateGet(this, _workersEx)[workerId].runnersEx[runnerId]);
+    });
     __publicField(this, "AddWorker", (workerOptions, useWorkerFactory) => {
       let workerFactory;
       if (useWorkerFactory) {
@@ -2107,14 +2122,14 @@ class STSWorkerManager {
         ExecuteRunner: (runner) => __privateGet(this, _ExecuteRunner2).call(this, stsWorkerEx, runner),
         UpdateOptionsRunner: (runner, executionProfile) => __privateGet(this, _UpdateOptionsRunner).call(this, stsWorkerEx, runner, executionProfile),
         // Commands to execute on all runners
-        Start: async () => __privateGet(this, _StartWorker).call(this, stsWorkerEx),
-        Stop: async () => __privateGet(this, _StopWorker).call(this, stsWorkerEx),
-        Pause: async () => __privateGet(this, _PauseWorker).call(this, stsWorkerEx),
-        Resume: async () => __privateGet(this, _ResumeWorker).call(this, stsWorkerEx),
-        Terminate: async () => __privateGet(this, _TerminateWorker).call(this, stsWorkerEx),
-        Reset: async () => __privateGet(this, _ResetWorker).call(this, stsWorkerEx),
-        Execute: async () => __privateGet(this, _ExecuteWorker).call(this, stsWorkerEx),
-        UpdateOptions: async (executionProfile) => __privateGet(this, _UpdateOptionsWorker).call(this, stsWorkerEx, executionProfile)
+        Start: () => __privateGet(this, _StartWorker).call(this, stsWorkerEx),
+        Stop: () => __privateGet(this, _StopWorker).call(this, stsWorkerEx),
+        Pause: () => __privateGet(this, _PauseWorker).call(this, stsWorkerEx),
+        Resume: () => __privateGet(this, _ResumeWorker).call(this, stsWorkerEx),
+        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)
       };
       if (__privateGet(this, _STSInstrumentController)) {
         __privateGet(this, _STSInstrumentController).LogEx(chalk.yellow(`pid: [${process.pid}] Creating new worker: [${stsWorkerEx.id}]`));
@@ -2187,7 +2202,7 @@ class STSWorkerManager {
           processMessage(publishMessagePayload);
         });
       } else {
-        stsWorkerEx.messagePort.onmessage = async (data) => {
+        stsWorkerEx.messagePort.onmessage = (data) => {
           publishMessagePayload = data.data;
           processMessage(publishMessagePayload);
         };
@@ -2311,14 +2326,14 @@ class STSWorkerManager {
           rx: 0,
           tx: 0
         },
-        Start: async () => __privateGet(this, _StartRunner2).call(this, workerEx, runnerEx),
-        Stop: async () => __privateGet(this, _StopRunner2).call(this, workerEx, runnerEx),
-        Pause: async () => __privateGet(this, _PauseRunner2).call(this, workerEx, runnerEx),
-        Resume: async () => __privateGet(this, _ResumeRunner2).call(this, workerEx, runnerEx),
-        Reset: async () => __privateGet(this, _ResetRunner2).call(this, workerEx, runnerEx),
-        Execute: async () => __privateGet(this, _ExecuteRunner2).call(this, workerEx, runnerEx),
-        Terminate: async () => __privateGet(this, _TerminateRunner2).call(this, workerEx, runnerEx),
-        UpdateOptions: async (executionProfile) => __privateGet(this, _UpdateOptionsRunner).call(this, workerEx, runnerEx, executionProfile),
+        Start: () => __privateGet(this, _StartRunner2).call(this, workerEx, runnerEx),
+        Stop: () => __privateGet(this, _StopRunner2).call(this, workerEx, runnerEx),
+        Pause: () => __privateGet(this, _PauseRunner2).call(this, workerEx, runnerEx),
+        Resume: () => __privateGet(this, _ResumeRunner2).call(this, workerEx, runnerEx),
+        Reset: () => __privateGet(this, _ResetRunner2).call(this, workerEx, runnerEx),
+        Execute: () => __privateGet(this, _ExecuteRunner2).call(this, workerEx, runnerEx),
+        Terminate: () => __privateGet(this, _TerminateRunner2).call(this, workerEx, runnerEx),
+        UpdateOptions: (executionProfile) => __privateGet(this, _UpdateOptionsRunner).call(this, workerEx, runnerEx, executionProfile),
         on: (eventName, cb) => {
           if (!workerEx.runnersEvents[runnerEx.id]) {
             workerEx.runnersEvents[runnerEx.id] = [];
@@ -2346,7 +2361,7 @@ class STSWorkerManager {
       __privateGet(this, _debug2).call(this, `#PostMessageToWorker`);
       workerEx.messagePort.postMessage({ command, payload });
     });
-    __privateAdd(this, _StartRunner2, async (workerEx, runnerEx) => {
+    __privateAdd(this, _StartRunner2, (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.StartRunner, {
         runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
@@ -2357,7 +2372,7 @@ class STSWorkerManager {
         result: true
       };
     });
-    __privateAdd(this, _ResetRunner2, async (workerEx, runnerEx) => {
+    __privateAdd(this, _ResetRunner2, (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ResetRunner, {
         runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
@@ -2368,7 +2383,7 @@ class STSWorkerManager {
         result: true
       };
     });
-    __privateAdd(this, _ExecuteRunner2, async (workerEx, runnerEx) => {
+    __privateAdd(this, _ExecuteRunner2, (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ExecuteRunner, {
         runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
@@ -2379,7 +2394,7 @@ class STSWorkerManager {
         result: true
       };
     });
-    __privateAdd(this, _StopRunner2, async (workerEx, runnerEx) => {
+    __privateAdd(this, _StopRunner2, (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.StopRunner, {
         runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
@@ -2390,7 +2405,7 @@ class STSWorkerManager {
         result: true
       };
     });
-    __privateAdd(this, _TerminateRunner2, async (workerEx, runnerEx) => {
+    __privateAdd(this, _TerminateRunner2, (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.TerminateRunner, {
         runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
@@ -2401,7 +2416,7 @@ class STSWorkerManager {
         result: true
       };
     });
-    __privateAdd(this, _PauseRunner2, async (workerEx, runnerEx) => {
+    __privateAdd(this, _PauseRunner2, (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.PauseRunner, {
         runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
@@ -2412,7 +2427,7 @@ class STSWorkerManager {
         result: true
       };
     });
-    __privateAdd(this, _ResumeRunner2, async (workerEx, runnerEx) => {
+    __privateAdd(this, _ResumeRunner2, (workerEx, runnerEx) => {
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.ResumeRunner, {
         runner: this.CreateRunnerCopyNoHistory(runnerEx)
       });
@@ -2423,7 +2438,7 @@ class STSWorkerManager {
         result: true
       };
     });
-    __privateAdd(this, _UpdateOptionsRunner, async (workerEx, runnerEx, executionProfile) => {
+    __privateAdd(this, _UpdateOptionsRunner, (workerEx, runnerEx, executionProfile) => {
       runnerEx.options.executionProfile = { ...executionProfile };
       __privateGet(this, _PostMessageToWorker).call(this, workerEx, eIWMessageCommands.UpdateOptions, {
         runner: this.CreateRunnerCopyNoHistory(runnerEx)
@@ -2435,32 +2450,32 @@ class STSWorkerManager {
         result: true
       };
     });
-    __privateAdd(this, _PauseWorker, async (workerEx) => {
+    __privateAdd(this, _PauseWorker, (workerEx) => {
       return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _PauseRunner2));
     });
-    __privateAdd(this, _ResumeWorker, async (workerEx) => {
+    __privateAdd(this, _ResumeWorker, (workerEx) => {
       return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _ResumeRunner2));
     });
-    __privateAdd(this, _StopWorker, async (workerEx) => {
+    __privateAdd(this, _StopWorker, (workerEx) => {
       return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _StopRunner2));
     });
-    __privateAdd(this, _StartWorker, async (workerEx) => {
+    __privateAdd(this, _StartWorker, (workerEx) => {
       return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _StartRunner2));
     });
-    __privateAdd(this, _ResetWorker, async (workerEx) => {
+    __privateAdd(this, _ResetWorker, (workerEx) => {
       return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _ResetRunner2));
     });
-    __privateAdd(this, _ExecuteWorker, async (workerEx) => {
+    __privateAdd(this, _ExecuteWorker, (workerEx) => {
       return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _ExecuteRunner2));
     });
     // IExecutionProfile
-    __privateAdd(this, _UpdateOptionsWorker, async (workerEx, executionProfile) => {
+    __privateAdd(this, _UpdateOptionsWorker, (workerEx, executionProfile) => {
       return __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _UpdateOptionsRunner), executionProfile);
     });
-    __privateAdd(this, _BroadcastCommandToAllRunners, async (workerEx, command, executionProfile) => {
+    __privateAdd(this, _BroadcastCommandToAllRunners, (workerEx, command, executionProfile) => {
       try {
-        const executeCommand = async (runnerEx) => {
-          const result = executionProfile ? await command(workerEx, runnerEx, executionProfile) : await command(workerEx, runnerEx);
+        const executeCommand = (runnerEx) => {
+          const result = executionProfile ? command(workerEx, runnerEx, executionProfile) : command(workerEx, runnerEx);
           return {
             workerManagerId: __privateGet(this, _id),
             workerId: workerEx.id,
@@ -2468,16 +2483,15 @@ class STSWorkerManager {
             result
           };
         };
-        const promises = Object.values(workerEx.runnersEx).map((runnerEx) => executeCommand(runnerEx));
-        return await Promise.all(promises);
+        return Object.values(workerEx.runnersEx).map((runnerEx) => executeCommand(runnerEx));
       } catch (error) {
         console.error(`Error in STSTestWorker:WorkerCommand: [${error}]`);
         return [];
       }
     });
-    __privateAdd(this, _TerminateWorker, async (workerEx) => {
+    __privateAdd(this, _TerminateWorker, (workerEx) => {
       try {
-        const retVal = await __privateGet(this, _BroadcastCommandToAllRunners).call(this, workerEx, __privateGet(this, _TerminateRunner2));
+        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}]`);
@@ -2517,25 +2531,25 @@ class STSWorkerManager {
       return busyWorker;
     });
     // IExecuteRunnerActionResult[]
-    __privateAdd(this, _HandleAllWorkers, async (action, options) => {
-      const promises = Object.values(this.WorkersEx).map(async (worker) => {
+    __privateAdd(this, _HandleAllWorkers, (action, options) => {
+      const retVal = Object.values(this.WorkersEx).map((worker) => {
         if (action === "UpdateOptions") {
           return {
             workerManagerId: __privateGet(this, _id),
             workerId: worker.id,
-            executeRunnerActionResults: await worker[action](options)
+            executeRunnerActionResults: worker[action](options)
           };
         } else {
           return {
             workerManagerId: __privateGet(this, _id),
             workerId: worker.id,
-            executeRunnerActionResults: await worker[action]()
+            executeRunnerActionResults: worker[action]()
           };
         }
       });
-      return Promise.all(promises);
+      return retVal;
     });
-    __publicField(this, "StartAllWorkers", async () => {
+    __publicField(this, "StartAllWorkers", () => {
       return __privateGet(this, _HandleAllWorkers).call(this, "Start");
     });
     __publicField(this, "StopAllWorkers", () => {
@@ -2544,19 +2558,19 @@ class STSWorkerManager {
     __publicField(this, "PauseAllWorkers", () => {
       return __privateGet(this, _HandleAllWorkers).call(this, "Pause");
     });
-    __publicField(this, "ResumeAllWorkers", async () => {
+    __publicField(this, "ResumeAllWorkers", () => {
       return __privateGet(this, _HandleAllWorkers).call(this, "Resume");
     });
-    __publicField(this, "ExecuteAllWorkers", async () => {
+    __publicField(this, "ExecuteAllWorkers", () => {
       return __privateGet(this, _HandleAllWorkers).call(this, "Execute");
     });
-    __publicField(this, "ResetAllWorkers", async () => {
+    __publicField(this, "ResetAllWorkers", () => {
       return __privateGet(this, _HandleAllWorkers).call(this, "Reset");
     });
-    __publicField(this, "TerminateAllWorkers", async () => {
+    __publicField(this, "TerminateAllWorkers", () => {
       return __privateGet(this, _HandleAllWorkers).call(this, "Terminate");
     });
-    __publicField(this, "UpdateAllWorkers", async (options) => {
+    __publicField(this, "UpdateAllWorkers", (options) => {
       return __privateGet(this, _HandleAllWorkers).call(this, "UpdateOptions", options);
     });
     __privateSet(this, _id, v4());
@@ -2606,19 +2620,9 @@ class STSWorkerManager {
   get id() {
     return __privateGet(this, _id);
   }
-  get Workers() {
-    const retVal = {};
-    for (const [, workerEx] of Object.entries(__privateGet(this, _workersEx))) {
-      retVal[workerEx.id] = this.CreateWorkerCopy(workerEx);
-    }
-    return retVal;
-  }
   get WorkersEx() {
     return __privateGet(this, _workersEx);
   }
-  get archiveList() {
-    return __privateGet(this, _archiveList);
-  }
   get Options() {
     return __privateGet(this, _options2);
   }