@nsshunt/stsrunnerframework 2.0.29 → 2.0.31

package/dist/index.cjs

@@ -3686,18 +3686,13 @@ var RunnerInstance = class {
 	* @throws Re-throws any error after logging.
 	*/
 	toRunnerCore() {
-		try {
-			const retVal = {
-				id: this.id,
-				iteration: this.iteration,
-				state: this.state
-			};
-			if (this.runnerPlanRuntime) retVal.runnerPlanRuntime = { ...this.runnerPlanRuntime };
-			return retVal;
-		} catch (error) {
-			_nsshunt_stsutils.defaultLogger.error(`toRunnerCore(): Error: [${error}]`);
-			throw error;
-		}
+		const retVal = {
+			id: this.id,
+			iteration: this.iteration,
+			state: this.state
+		};
+		if (this.runnerPlanRuntime) retVal.runnerPlanRuntime = { ...this.runnerPlanRuntime };
+		return retVal;
 	}
 	/**
 	* Send a command for this runner to the owning worker via the message broker.
@@ -4544,7 +4539,7 @@ var WorkerInstance = class {
 			});
 			return workerCopy;
 		} catch (error) {
-			_nsshunt_stsutils.defaultLogger.error(`toWorkerCore(): Error: [${error}]`);
+			this.#logger.error(`toWorkerCore(): Error: [${error}]`);
 			throw error;
 		}
 	}
@@ -9980,6 +9975,7 @@ var SocketIoClient = class extends import_tiny_emitter.TinyEmitter {
 	#socket;
 	#reconnectTimeout = 2e3;
 	#ackTimeout = 5e3;
+	#reconnectTimeoutVal = void 0;
 	constructor(name) {
 		super();
 		this.#name = name;
@@ -10052,7 +10048,7 @@ var SocketIoClient = class extends import_tiny_emitter.TinyEmitter {
 		return this;
 	}
 	SetupSocket() {
-		if (!this.#address) throw new Error(`SocketIoClientHelper:SetupSocket(): Error: [address not provided]`);
+		if (!this.#address) throw new Error(`SocketIoClient:SetupSocket(): Error: [address not provided]`);
 		this.#EstablishSocketConnect();
 		return this;
 	}
@@ -10062,17 +10058,20 @@ var SocketIoClient = class extends import_tiny_emitter.TinyEmitter {
 	EngineReconnect(attempt) {}
 	#EstablishSocketConnect() {
 		if (this.#socket !== void 0) {
-			if (this.#socket.connected === true) this.#socket.disconnect();
-			this.#socket = void 0;
-			if (_nsshunt_stsutils.isNode) setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
-			else setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
+			this.ResetSocket();
+			if (_nsshunt_stsutils.isNode) this.#reconnectTimeoutVal = setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
+			else this.#reconnectTimeoutVal = setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
 			return;
 		}
 		let socketOptions;
 		if (_nsshunt_stsutils.isNode) {
 			socketOptions = { transports: ["websocket"] };
 			if (this.#agentManager) {
-				if (!this.#address) throw new Error(`SocketIoClient:SetupSocket(): Error: [address not provided when using agentManager]`);
+				if (!this.#address) {
+					const message = `SocketIoClient:#EstablishSocketConnect(): Error: [address not provided when using agentManager]`;
+					this.LogErrorMessage(message);
+					throw new Error(message);
+				}
 				socketOptions.agent = this.#agentManager.GetAgent(this.#address);
 			}
 		} else socketOptions = { transports: ["websocket"] };
@@ -10083,30 +10082,30 @@ var SocketIoClient = class extends import_tiny_emitter.TinyEmitter {
 		if (this.#socketIoCustomPath && this.#socketIoCustomPath.localeCompare("") !== 0) socketOptions.path = this.#socketIoCustomPath;
 		this.#socket = lookup(this.#address, socketOptions);
 		this.#socket.io.on("error", (err) => {
-			this.LogErrorMessage(`socketDetail.socket.io.on('error'): [${err}] Address: [${this.#address}]`);
+			this.LogErrorMessage(`SocketIoClient.socket.io.on('error'): [${err}] Address: [${this.#address}]`);
 			this.EngineError(err);
 		});
 		this.#socket.io.on("reconnect_error", (err) => {
-			this.LogErrorMessage(`socketDetail.socket.io.on('reconnect_error'): [${err}] Address: [${this.#address}]`);
+			this.LogErrorMessage(`SocketIoClient.socket.io.on('reconnect_error'): [${err}] Address: [${this.#address}]`);
 			this.EngineReconnectError(err);
 		});
 		this.#socket.on("connect_error", (err) => {
-			this.LogErrorMessage(`socketDetail.socket.on('connect_error'): [${err}] Address: [${this.#address}]`);
+			this.LogErrorMessage(`SocketIoClient.socket.on('connect_error'): [${err}] Address: [${this.#address}]`);
 			this.EngineConnectError(err);
 		});
 		this.#socket.io.on("reconnect", (attempt) => {
-			this.LogErrorMessage(`socketDetail.socket.io.on('reconnect'): Number: [${attempt}] Address: [${this.#address}]`);
+			this.LogErrorMessage(`SocketIoClient:socket.io.on('reconnect'): Number: [${attempt}] Address: [${this.#address}]`);
 			this.EngineReconnect(attempt);
 		});
 		this.#socket.on("connect", () => {
 			if (this.#socket) {
-				this.LogDebugMessage(`Socket: [${this.#socket.id}]: connected, Address: [${this.#address}]`);
+				this.LogDebugMessage(`SocketIoClient:on("connect"): Socket: [${this.#socket.id}]: connected, Address: [${this.#address}]`);
 				setTimeout(() => {
 					this.SocketConnect(this.#socket);
 				}, 0);
 				this.SetupSocketEvents(this.#socket);
 			} else {
-				const errorMessage = "Could not get socket object from socket.io, Address: [${socketDetail.address}]";
+				const errorMessage = "SocketIoClient:on(\"connect\"): Could not get socket object from socket.io, Address: [${socketDetail.address}]";
 				this.LogErrorMessage(errorMessage);
 				this.SocketConnectError(new Error(errorMessage));
 			}
@@ -10116,33 +10115,50 @@ var SocketIoClient = class extends import_tiny_emitter.TinyEmitter {
 			this.SocketDisconnect(reason);
 			switch (reason) {
 				case "io server disconnect":
-					this.LogDebugMessage("The server disconnected using disconnectSockets, i.e. normal safe shutdown from explicit disconnection by the server.");
-					this.LogDebugMessage("The connection will be re-established when the server becomes available.");
-					this.#socket = void 0;
-					if (_nsshunt_stsutils.isNode) {
-						if (this.#agentManager) this.#agentManager.ResetAgent();
-						setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
-					} else setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
+					this.LogDebugMessage("SocketIoClient:on(\"disconnect\"): The server disconnected using disconnectSockets, i.e. normal safe shutdown from explicit disconnection by the server.");
+					this.LogDebugMessage("SocketIoClient:on(\"disconnect\"): The connection will be re-established when the server becomes available.");
+					this.ResetSocket();
+					if (_nsshunt_stsutils.isNode) this.#reconnectTimeoutVal = setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
+					else this.#reconnectTimeoutVal = setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
 					break;
 				case "io client disconnect":
-					this.LogDebugMessage("The client disconnected using disconnectSockets, i.e. normal safe disconnection from explicit disconnection by the client.");
-					this.LogDebugMessage("The connection will not be re-established automatically.");
+					this.LogDebugMessage("SocketIoClient:on(\"disconnect\"): The client disconnected using disconnectSockets, i.e. normal safe disconnection from explicit disconnection by the client.");
+					this.LogDebugMessage("SocketIoClient:on(\"disconnect\"): The connection will not be re-established automatically.");
+					this.ResetSocket();
 					break;
 				case "transport close":
 				case "ping timeout":
 				case "transport error":
-					this.LogDebugMessage(`Server unexpectedly disconnected. Reason: [${reason}]`);
-					this.LogDebugMessage("The connection will be re-established when the server becomes available.");
-					if (this.#socket) this.#socket.disconnect();
-					this.#socket = void 0;
-					if (_nsshunt_stsutils.isNode) {
-						if (this.#agentManager) this.#agentManager?.ResetAgent();
-						setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
-					} else setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
+					this.LogDebugMessage(`SocketIoClient:on("disconnect"): Server unexpectedly disconnected. Reason: [${reason}]`);
+					this.LogDebugMessage("SocketIoClient:on(\"disconnect\"): The connection will be re-established when the server becomes available.");
+					this.ResetSocket();
+					if (_nsshunt_stsutils.isNode) this.#reconnectTimeoutVal = setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
+					else this.#reconnectTimeoutVal = setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
 					break;
 			}
 		});
 	}
+	ResetSocket = () => {
+		try {
+			if (this.#reconnectTimeoutVal !== void 0) {
+				clearTimeout(this.#reconnectTimeoutVal);
+				this.#reconnectTimeoutVal = void 0;
+			}
+			if (this.#socket) {
+				this.#socket.removeAllListeners();
+				this.#socket.io.removeAllListeners();
+				if (this.#socket.connected === true) this.#socket.disconnect();
+				if (_nsshunt_stsutils.isNode) {
+					if (this.#agentManager) this.#agentManager.ResetAgent();
+				}
+				this.#socket = void 0;
+			}
+		} catch (error) {
+			const errorMessage = `SocketIoClient:ResetSocket(): Error: [${error}]`;
+			this.LogErrorMessage(errorMessage);
+			this.SocketConnectError(new Error(errorMessage));
+		}
+	};
 };
 //#endregion
 //#region src/wsevents.ts
@@ -10273,7 +10289,7 @@ var NodeAgent = class extends SocketIoClient {
 	};
 	_Start = async () => {
 		this._EmitEvent("Starting", {});
-		this.WithAddress(this._options.nodeAgentEndpoint).WithLogger(_nsshunt_stsutils.defaultLogger).WithSocketIoCustomPath(this._options.nodeAgentSocketIoCustomPath).WithAckTimeout(5e3);
+		this.WithAddress(this._options.nodeAgentEndpoint).WithLogger(this._options.logger).WithSocketIoCustomPath(this._options.nodeAgentSocketIoCustomPath).WithAckTimeout(5e3);
 		if (this._options.agentManager) this.WithAgentManager(this._options.agentManager);
 		this.#info(chalk.yellow(`_Start():STS Test Runner Service Instance.`));
 		this.#info(chalk.yellow(`_Start():This service instance emulates instances of the ststestrunnernode service.`));