@nsshunt/stsrunnerframework 1.0.130 → 1.0.132

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

@@ -2383,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 [];
@@ -3211,11 +3220,13 @@ 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: { ...runnerEx.options.runnerPlan }
+        };
+      }
       return retVal;
     } catch (error) {
       __privateGet(this, _error2).call(this, `CreateRunnerCopy(): Error: [${error}]`);