@nsshunt/stsrunnerframework 2.0.5 → 2.0.6

package/dist/stsrunnerframework.umd.js

@@ -5611,7 +5611,7 @@ ${runnerId}`,
 		* This is stored so the loop can be stopped later via {@link Terminate}.
 		*/
 		timeout;
-		archiveDelTimeout;
+		archiveDelTimeout = {};
 		/**
 		* Construct a new archive manager.
 		*
@@ -5729,17 +5729,21 @@ ${runnerId}`,
 									* This removes the runner from the active runtime graph after a delay.
 									*/
 									if (this.archiveDeleteTimeout !== 0) {
-										this.archiveDelTimeout = setTimeout(() => {
+										const delTimeoutId = v4();
+										const delTimeout = setTimeout(() => {
 											try {
 												this.options.workerRegistry.DeleteRunner(workerEx.id, removeList[i].runnerId);
 											} catch (error) {
 												this.options.logger.error(`Error in: this.options.workerRegistry.DeleteRunner(${workerEx.id}, ${removeList[i].runnerId})`);
 											}
+											delete this.archiveDelTimeout[delTimeoutId];
 										}, this.archiveDeleteTimeout * 1e3);
-										/**
-										* In Node.js, unref the timer so it does not keep the process alive.
-										*/
-										if (detect_node.default) this.archiveDelTimeout.unref();
+										if (detect_node.default) delTimeout.unref();
+										this.archiveDelTimeout[delTimeoutId] = {
+											workerId: workerEx.id,
+											runnerId: removeList[i].runnerId,
+											delTimeout
+										};
 									}
 								}
 							}
@@ -5818,13 +5822,14 @@ ${runnerId}`,
 		*/
 		Terminate = () => {
 			this.options.logger.debug(`ArchiveManager:Terminate()`);
+			this.options.logger.debug(`Runtime context: isNode = [${detect_node.default}]`);
 			if (this.timeout) {
 				this.options.logger.debug(`ArchiveManager:Terminate() - this.timeout cleared ...`);
 				clearTimeout(this.timeout);
 			}
-			if (this.archiveDelTimeout) {
-				this.options.logger.debug(`ArchiveManager:Terminate() - this.archiveDelTimeout cleared ...`);
-				clearTimeout(this.archiveDelTimeout);
+			if (this.archiveDelTimeout) for (const [delKey, delTimeoutRecord] of Object.entries(this.archiveDelTimeout)) {
+				this.options.logger.debug(`ArchiveManager:Terminate() - this.archiveDelTimeout: [${delKey}] cleared for workerId: [${delTimeoutRecord.workerId}] runnerId: [${delTimeoutRecord.runnerId}]`);
+				clearTimeout(delTimeoutRecord.delTimeout);
 			}
 		};
 	};