@nsshunt/stsrunnerframework 2.0.1 → 2.0.3

package/dist/stsrunnerframework.mjs

@@ -5612,6 +5612,7 @@ var ArchiveManager = class {
 	* This is stored so the loop can be stopped later via {@link Terminate}.
 	*/
 	timeout;
+	archiveDelTimeout;
 	/**
 	* Construct a new archive manager.
 	*
@@ -5682,78 +5683,89 @@ var ArchiveManager = class {
 			* If matching runners were found, process them after a short delay.
 			* Otherwise just schedule the next scan loop.
 			*/
-			if (removeList.length > 0) setTimeout(async () => {
-				this.options.logger.debug(import_source.default.grey(`STSWorkerManager:_processLoopExecutor(): Removing runners from collection: [${JSON.stringify(removeList)}]`));
-				/**
-				* Process each matched runner from the temporary remove list.
-				*/
-				for (let i = 0; i < removeList.length; i++) {
-					const workerEx = this.options.workerRegistry.GetWorkerEx(removeList[i].workerId);
-					if (workerEx) {
-						const runnerEx = workerEx.GetRunnerEx(removeList[i].runnerId);
-						if (runnerEx) {
-							/**
-							* Stop any active telemetry/instrument publishing for this runner.
-							*
-							* This is done before archive/delete handling so no further
-							* publishing occurs after the runner is considered retired.
-							*/
-							if (runnerEx.publishInstrumentController) {
-								this.options.logger.debug(import_source.default.grey(`Ending publish for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
-								runnerEx.publishInstrumentController.EndPublish();
-							}
-							/**
-							* Only non-terminated runners are stored in the archive list.
-							*
-							* Terminated runners are treated as retired/removed but not archived.
-							*/
-							if (runnerEx.state !== IRunnerState.terminated) {
-								this.options.logger.debug(import_source.default.grey(`Archive runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
-								const runner = runnerEx.toRunner();
-								this.archiveList.push(runner);
+			if (removeList.length > 0) {
+				const startTimeout = setTimeout(async () => {
+					this.options.logger.debug(import_source.default.grey(`STSWorkerManager:_processLoopExecutor(): Removing runners from collection: [${JSON.stringify(removeList)}]`));
+					/**
+					* Process each matched runner from the temporary remove list.
+					*/
+					for (let i = 0; i < removeList.length; i++) {
+						const workerEx = this.options.workerRegistry.GetWorkerEx(removeList[i].workerId);
+						if (workerEx) {
+							const runnerEx = workerEx.GetRunnerEx(removeList[i].runnerId);
+							if (runnerEx) {
 								/**
-								* Enforce archive list size cap by discarding the oldest item.
+								* Stop any active telemetry/instrument publishing for this runner.
+								*
+								* This is done before archive/delete handling so no further
+								* publishing occurs after the runner is considered retired.
 								*/
-								if (this.archiveList.length > this.options.maxArchiveListLength) this.archiveList.shift();
-							} else this.options.logger.debug(import_source.default.grey(`Runner has been terminated and will not be archived, runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
-							/**
-							* Mark as archived regardless of whether it was actually added
-							* to the archive list. This prevents the runner from being
-							* reprocessed on future scans.
-							*/
-							runnerEx.archived = true;
-							/**
-							* Schedule deletion of the live runner instance from the worker registry.
-							*
-							* This removes the runner from the active runtime graph after a delay.
-							*/
-							if (this.archiveDeleteTimeout !== 0) {
-								const timeout = setTimeout(() => this.options.workerRegistry.DeleteRunner(workerEx.id, removeList[i].runnerId), this.archiveDeleteTimeout * 1e3);
+								if (runnerEx.publishInstrumentController) {
+									this.options.logger.debug(import_source.default.grey(`Ending publish for runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
+									runnerEx.publishInstrumentController.EndPublish();
+								}
 								/**
-								* In Node.js, unref the timer so it does not keep the process alive.
+								* Only non-terminated runners are stored in the archive list.
+								*
+								* Terminated runners are treated as retired/removed but not archived.
 								*/
-								if (import_browser.default) timeout.unref();
+								if (runnerEx.state !== IRunnerState.terminated) {
+									this.options.logger.debug(import_source.default.grey(`Archive runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
+									const runner = runnerEx.toRunner();
+									this.archiveList.push(runner);
+									/**
+									* Enforce archive list size cap by discarding the oldest item.
+									*/
+									if (this.archiveList.length > this.options.maxArchiveListLength) this.archiveList.shift();
+								} else this.options.logger.debug(import_source.default.grey(`Runner has been terminated and will not be archived, runner: [${JSON.stringify(runnerEx.asyncRunnerContext)}]`));
+								/**
+								* Mark as archived regardless of whether it was actually added
+								* to the archive list. This prevents the runner from being
+								* reprocessed on future scans.
+								*/
+								runnerEx.archived = true;
+								/**
+								* Schedule deletion of the live runner instance from the worker registry.
+								*
+								* This removes the runner from the active runtime graph after a delay.
+								*/
+								if (this.archiveDeleteTimeout !== 0) {
+									this.archiveDelTimeout = 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})`);
+										}
+									}, this.archiveDeleteTimeout * 1e3);
+									/**
+									* In Node.js, unref the timer so it does not keep the process alive.
+									*/
+									if (import_browser.default) this.archiveDelTimeout.unref();
+								}
 							}
 						}
 					}
-				}
-				/**
-				* Emit a debug summary showing remaining live runner counts per worker.
-				*/
-				for (const [, workerEx] of Object.entries(this.options.workerRegistry.GetWorkersEx([]))) {
-					const message = `STSWorkerManager:_processLoopExecutor(): Remaining runners from worker: [${workerEx.id}]: [${workerEx.GetAllRunnersEx().length}]`;
-					this.options.logger.debug(import_source.default.magenta(message));
-				}
+					/**
+					* Emit a debug summary showing remaining live runner counts per worker.
+					*/
+					for (const [, workerEx] of Object.entries(this.options.workerRegistry.GetWorkersEx([]))) {
+						const message = `STSWorkerManager:_processLoopExecutor(): Remaining runners from worker: [${workerEx.id}]: [${workerEx.GetAllRunnersEx().length}]`;
+						this.options.logger.debug(import_source.default.magenta(message));
+					}
+					/**
+					* Schedule the next archive scan.
+					*/
+					this.timeout = setTimeout(() => this.ProcessLoopExecutor(), 1e3);
+					if (import_browser.default) this.timeout.unref();
+				}, 100);
+				if (import_browser.default) startTimeout.unref();
+			} else {
 				/**
-				* Schedule the next archive scan.
+				* No archive candidates found; just schedule the next scan.
 				*/
 				this.timeout = setTimeout(() => this.ProcessLoopExecutor(), 1e3);
-			}, 100);
-			else
- /**
-			* No archive candidates found; just schedule the next scan.
-			*/
-			this.timeout = setTimeout(() => this.ProcessLoopExecutor(), 1e3);
+				if (import_browser.default) this.timeout.unref();
+			}
 		} catch (error) {
 			this.options.logger.error(`_processLoopExecutor(): Error: [${error}]`);
 			throw error;
@@ -5806,7 +5818,15 @@ var ArchiveManager = class {
 	* - called during overall worker-manager shutdown/termination
 	*/
 	Terminate = () => {
-		if (this.timeout) clearTimeout(this.timeout);
+		this.options.logger.debug(`ArchiveManager:Terminate()`);
+		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);
+		}
 	};
 };
 //#endregion
@@ -8236,6 +8256,7 @@ var STSWorkerManager = class {
 	* - callers should explicitly terminate workers first if desired
 	*/
 	Terminate() {
+		this.options.logger.debug(`STSWorkerManager:Terminate()`);
 		this.#archiveManager.Terminate();
 	}
 	/**