@nsshunt/stsrunnerframework 1.0.129 → 1.0.131

package/dist/stsrunnerframework.umd.js

@@ -1551,7 +1551,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
               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}]`));
@@ -1578,12 +1582,12 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           __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,
@@ -2328,7 +2332,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
                     }
                     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);
+                      }
                     }
                   }
                 }
@@ -2377,7 +2385,16 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       // 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 [];
@@ -2415,6 +2432,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
             port2
             // collector message port
           } = new MessageChannel();
+          if (!isNode) {
+            port1.start();
+          }
           const workerId = v4();
           const stsWorkerEx = {
             id: workerId,
@@ -2556,10 +2576,10 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
               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}]`);
@@ -3202,11 +3222,15 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         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}]`);