@nsshunt/stsrunnerframework 1.0.129 → 1.0.131

package/README.md

@@ -71,16 +71,6 @@ parentPort?.on('message', (data: any) => {
         } else {
             throw new Error(`Invalid command: [${command}]`)
         }
-    } else {
-        const { command, payload } = data.data;
-        if (command === eIWMessageCommands.MessagePort) {
-            payload.port.on('message', (data: any) => {
-                worker.ProcessMessage(data.data); // browser version
-            });
-            worker.ProcessMessage(data.data);
-        } else {
-            throw new Error(`Invalid command: [${command}]`)
-        }
     }
 });
 ```
@@ -91,8 +81,6 @@ parentPort?.on('message', (data: any) => {
 import { IRunnerInstance, ITestRunnerTelemetryPayload, WorkerInstance, eIWMessageCommands } from './../index'
 import { TestCase01 } from './testCase01'
 
-import isNode from 'detect-node'
-
 export class WorkerTestCases extends WorkerInstance {
     constructor() {
         super()
@@ -111,26 +99,23 @@ export class WorkerTestCases extends WorkerInstance {
 const worker = new WorkerTestCases();
 
 onmessage = async function(data: any) {
-    if (isNode) {
-        const { command, payload } = data;
-        if (command === eIWMessageCommands.MessagePort) {
-            payload.port.on('message', (data: any) => {
-                worker.ProcessMessage(data);
-            });
-            worker.ProcessMessage(data);
-        } else {
-            throw new Error(`Invalid command: [${command}]`)
-        }
+    const { command, payload } = data.data;
+    if (command === eIWMessageCommands.MessagePort) {
+        payload.port.start();
+        payload.port.addEventListener('message', (data: any) => {
+            worker.ProcessMessage(data.data); // browser version
+        });
+
+        /*
+        payload.port.addEventListener('messageerror', (error: any) => {
+            console.error(`onmessageerror(): [${error}]`)
+            worker.ProcessMessage(data.data); // browser version
+        });
+        */
+
+        worker.ProcessMessage(data.data);
     } else {
-        const { command, payload } = data.data;
-        if (command === eIWMessageCommands.MessagePort) {
-            payload.port.on('message', (data: any) => {
-                worker.ProcessMessage(data.data); // browser version
-            });
-            worker.ProcessMessage(data.data);
-        } else {
-            throw new Error(`Invalid command: [${command}]`)
-        }
+        throw new Error(`Invalid command: [${command}]`)
     }
 }
 ```

package/dist/stsrunnerframework.mjs

@@ -1549,7 +1549,11 @@ class WorkerInstance {
             for (let i = 0; i < removeList.length; i++) {
               __privateGet(this, _runners)[removeList[i]].archived = true;
               if (__privateGet(this, _archiveDeleteTimeout) !== 0) {
-                setTimeout(() => delete __privateGet(this, _runners)[removeList[i]], __privateGet(this, _archiveDeleteTimeout) * 1e3).unref();
+                if (isNode) {
+                  setTimeout(() => delete __privateGet(this, _runners)[removeList[i]], __privateGet(this, _archiveDeleteTimeout) * 1e3).unref();
+                } else {
+                  setTimeout(() => delete __privateGet(this, _runners)[removeList[i]], __privateGet(this, _archiveDeleteTimeout) * 1e3);
+                }
               }
             }
             __privateGet(this, _debug).call(this, chalk.grey(`WorkerInstance:#processLoopExecutor(): Remaining Runner Count: [${Object.keys(__privateGet(this, _runners)).length}]`));
@@ -1576,12 +1580,12 @@ class WorkerInstance {
         __privateSet(this, _collectorCollectorPort, workerMessagePort.port);
         if (isNode) {
           __privateGet(this, _collectorCollectorPort).on("message", (data) => {
-            __privateGet(this, _debug).call(this, `collectorCollectorPort onmessage: ${JSON.stringify(data)}`);
+            __privateGet(this, _debug).call(this, `collectorCollectorPort on('message'): ${JSON.stringify(data)}`);
           });
         } else {
-          __privateGet(this, _collectorCollectorPort).onmessage = function(data) {
-            __privateGet(this, _debug).call(this, `collectorCollectorPort onmessage: ${JSON.stringify(data.data)}`);
-          };
+          __privateGet(this, _collectorCollectorPort).addEventListener("message", (data) => {
+            __privateGet(this, _debug).call(this, `collectorCollectorPort addEventListener('message'): ${JSON.stringify(data.data)}`);
+          });
         }
         const response = {
           command: eIWMessageCommands.MessagePortResponse,
@@ -2326,7 +2330,11 @@ class STSWorkerManager {
                   }
                   runnerEx.archived = true;
                   if (__privateGet(this, _archiveDeleteTimeout2) !== 0) {
-                    setTimeout(() => delete workerEx.runnersEx[removeList[i].runnerId], __privateGet(this, _archiveDeleteTimeout2) * 1e3).unref();
+                    if (isNode) {
+                      setTimeout(() => delete workerEx.runnersEx[removeList[i].runnerId], __privateGet(this, _archiveDeleteTimeout2) * 1e3).unref();
+                    } else {
+                      setTimeout(() => delete workerEx.runnersEx[removeList[i].runnerId], __privateGet(this, _archiveDeleteTimeout2) * 1e3);
+                    }
                   }
                 }
               }
@@ -2375,7 +2383,16 @@ class STSWorkerManager {
     // Filter by plan and/or tag. Leave blank to not use in filter.
     __publicField(this, "GetArchiveList", (runnerSearchFilters) => {
       try {
-        return __privateGet(this, _archiveList).filter((runner) => !runnerSearchFilters.plan ? true : !runner.options.plan ? false : runner.options.plan.localeCompare(runnerSearchFilters.plan) === 0).filter((runner) => !runnerSearchFilters.planId ? true : !runner.options.planId ? false : runner.options.planId.localeCompare(runnerSearchFilters.planId) === 0).filter((runner) => !runnerSearchFilters.tag ? true : !runner.options.tag ? false : runner.options.tag.includes(runnerSearchFilters.tag)).filter((runner) => !runnerSearchFilters.userDataKey ? true : !runner.options.userData ? false : runner.options.userData[runnerSearchFilters.userDataKey] ? true : false);
+        return __privateGet(this, _archiveList).filter((runner) => {
+          var _a, _b;
+          return !runnerSearchFilters.plan ? true : ((_b = (_a = runner.options.runnerPlan) == null ? void 0 : _a.plan) == null ? void 0 : _b.localeCompare(runnerSearchFilters.plan)) === 0;
+        }).filter((runner) => {
+          var _a, _b;
+          return !runnerSearchFilters.planId ? true : ((_b = (_a = runner.options.runnerPlan) == null ? void 0 : _a.planId) == null ? void 0 : _b.localeCompare(runnerSearchFilters.planId)) === 0;
+        }).filter((runner) => {
+          var _a;
+          return !runnerSearchFilters.tag ? true : (_a = runner.options.tag) == null ? void 0 : _a.includes(runnerSearchFilters.tag);
+        }).filter((runner) => !runnerSearchFilters.userDataKey ? true : !runner.options.userData ? false : !!runner.options.userData[runnerSearchFilters.userDataKey]);
       } catch (error) {
         __privateGet(this, _error2).call(this, `GetArchiveList(): Error: [${error}]`);
         return [];
@@ -2413,6 +2430,9 @@ class STSWorkerManager {
           port2
           // collector message port
         } = new MessageChannel();
+        if (!isNode) {
+          port1.start();
+        }
         const workerId = v4();
         const stsWorkerEx = {
           id: workerId,
@@ -2554,10 +2574,10 @@ class STSWorkerManager {
             processMessage(publishMessagePayload);
           });
         } else {
-          stsWorkerEx.messagePort.onmessage = (data) => {
+          stsWorkerEx.messagePort.addEventListener("message", (data) => {
             publishMessagePayload = data.data;
             processMessage(publishMessagePayload);
-          };
+          });
         }
         __privateGet(this, _workersEx)[stsWorkerEx.id] = stsWorkerEx;
         __privateGet(this, _debug2).call(this, `Added worker: [${stsWorkerEx.id}]`);
@@ -3200,11 +3220,15 @@ class STSWorkerManager {
       const retVal = {
         id: runnerEx.id,
         iteration: runnerEx.iteration,
-        state: runnerEx.state,
-        options: {
-          plan: runnerEx.options.plan
-        }
+        state: runnerEx.state
       };
+      if (runnerEx.options && runnerEx.options.runnerPlan) {
+        retVal.options = {
+          runnerPlan: {
+            plan: runnerEx.options.runnerPlan.plan
+          }
+        };
+      }
       return retVal;
     } catch (error) {
       __privateGet(this, _error2).call(this, `CreateRunnerCopy(): Error: [${error}]`);