@nsshunt/stsfhirclient 2.0.36 → 2.0.37

package/dist/stsfhirclient.mjs

@@ -10245,7 +10245,6 @@ var globalThisShim = (() => {
 	else return Function("return this")();
 })();
 var defaultBinaryType = "arraybuffer";
-function createCookieJar() {}
 //#endregion
 //#region node_modules/engine.io-client/build/esm/util.js
 function pick(obj, ...attr) {
@@ -11112,7 +11111,7 @@ var SocketWithoutUpgrade = class SocketWithoutUpgrade extends Emitter {
 				OFFLINE_EVENT_LISTENERS.push(this._offlineEventListener);
 			}
 		}
-		if (this.opts.withCredentials) this._cookieJar = /* @__PURE__ */ createCookieJar();
+		if (this.opts.withCredentials) this._cookieJar = void 0;
 		this._open();
 	}
 	/**
@@ -13185,6 +13184,7 @@ var SocketIoClient = class extends import_tiny_emitter.TinyEmitter {
 	#socket;
 	#reconnectTimeout = 2e3;
 	#ackTimeout = 5e3;
+	#reconnectTimeoutVal = void 0;
 	constructor(name) {
 		super();
 		this.#name = name;
@@ -13257,7 +13257,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;
 	}
@@ -13267,17 +13267,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 (isNode) setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
-			else setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
+			this.ResetSocket();
+			if (isNode) this.#reconnectTimeoutVal = setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
+			else this.#reconnectTimeoutVal = setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
 			return;
 		}
 		let socketOptions;
 		if (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"] };
@@ -13288,30 +13291,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));
 			}
@@ -13321,33 +13324,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 (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 (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 (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 (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 (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/cv2/fhirSocketClient.ts
@@ -13365,23 +13385,45 @@ var FhirSocketClient = class extends SocketIoClient {
 		if (this.options.joinRooms.length > 0 && socket) socket.emit("__STSjoinRoom", this.options.joinRooms);
 	}
 	SocketError(error) {
-		this.LogErrorMessage(`FhirSocketClient:SocketError(): Error clientName: [${this.name}]: SetupClientSideSocket call back: Error: [${error}]`);
+		this.LogErrorMessage(`FhirSocketClient:SocketError(): Error clientName: [${this.name}]: Error: [${error}]`);
+	}
+	SocketConnectError(error) {
+		this.LogErrorMessage(`FhirSocketClient:SocketConnectError(): Error clientName: [${this.name}]: Error: [${error}]`);
+	}
+	SocketDisconnect(reason) {
+		this.LogDebugMessage(`FhirSocketClient:SocketDisconnect(): Error clientName: [${this.name}]: Reason: [${reason}]`);
+	}
+	SetupSocketEvents(socket) {
+		this.LogDebugMessage(`FhirSocketClient:SetupSocketEvents(): Error clientName: [${this.name}]`);
 	}
-	SocketConnectError(error) {}
-	SocketDisconnect(reason) {}
-	SetupSocketEvents(socket) {}
 	SetupWSSClient = async () => {
-		this.LogDebugMessage(chalk.yellow(`FhirSocketClient:SetupWSSClient(): ID: [${this.id}] clientName: [${this.name}] Starting ...`));
-		const cstr = `${this.options.fhirServerEndpoint}:${this.options.fhirServerPort}/nsstsfhir/`;
-		this.LogDebugMessage(chalk.yellow(`FhirSocketClient:SetupWSSClient(): Socket connection string: [${cstr}]`));
-		this.WithAddress(cstr).WithSocketIoCustomPath(this.options.socketIoCustomPath).WithAuthToken(this.options.authToken);
-		if (this.options.agentManager) this.WithAgentManager(this.options.agentManager);
-		if (this.options.logger) this.WithLogger(this.options.logger);
-		this.SetupSocket();
-		this.LogDebugMessage(chalk.yellow(`FhirSocketClient:SetupWSSClient(): ID: [${this.id}] clientName: [${this.name}] Started`));
+		try {
+			this.LogDebugMessage(chalk.yellow(`FhirSocketClient:SetupWSSClient(): ID: [${this.id}] clientName: [${this.name}] Starting ...`));
+			const cstr = `${this.options.fhirServerEndpoint}:${this.options.fhirServerPort}/nsstsfhir/`;
+			this.LogDebugMessage(chalk.yellow(`FhirSocketClient:SetupWSSClient(): Socket connection string: [${cstr}]`));
+			let connectionAccessToken;
+			try {
+				connectionAccessToken = await this.options.GetConnectionAccessToken();
+			} catch (error) {
+				const message = `FhirSocketClient:SetupWSSClient():GetConnectionAccessToken(): Error clientName: [${this.name}]: Error: [${error}]`;
+				this.LogErrorMessage(message);
+				throw new Error(message);
+			}
+			this.WithAddress(cstr).WithSocketIoCustomPath(this.options.socketIoCustomPath).WithAuthToken(connectionAccessToken);
+			if (this.options.agentManager) this.WithAgentManager(this.options.agentManager);
+			if (this.options.logger) this.WithLogger(this.options.logger);
+			this.SetupSocket();
+			this.LogDebugMessage(chalk.yellow(`FhirSocketClient:SetupWSSClient(): ID: [${this.id}] clientName: [${this.name}] Started`));
+		} catch (error) {
+			const message = `FhirSocketClient:SetupWSSClient(): Error clientName: [${this.name}]: Error: [${error}]`;
+			this.LogErrorMessage(message);
+			throw new Error(message);
+		}
 	};
 	WaitForSocketConnected = async () => {
-		const maxAttempts = 50;
+		const maxAttempts = 20;
+		const resetAfterAttempts = 10;
+		const retryDelay = 250;
 		if (this.socket && this.socket.connected === true) return true;
 		else {
 			this.LogDebugMessage(chalk.yellow(`FhirSocketClient:WaitForSocketConnected(): ID: [${this.id}] clientName: [${this.name}] Waiting for connection ...`));
@@ -13393,9 +13435,20 @@ var FhirSocketClient = class extends SocketIoClient {
 					this.LogDebugMessage(chalk.yellow(`FhirSocketClient:WaitForSocketConnected(): ID: [${this.id}] clientName: [${this.name}] Connection completed after: [${attempts}] attempts.`));
 					return true;
 				}
-				await Sleep(100);
+				if (attempts === resetAfterAttempts) {
+					this.LogDebugMessage(chalk.rgb(255, 165, 0)(`FhirSocketClient:WaitForSocketConnected(): ID: [${this.id}] clientName: [${this.name}] Resetting Socket. Attempt Number: [${attempts}]`));
+					this.ResetSocket();
+					this.LogDebugMessage(chalk.rgb(255, 165, 0)(`FhirSocketClient:WaitForSocketConnected(): ID: [${this.id}] clientName: [${this.name}] Socket Reset. Attempt Number: [${attempts}]`));
+					await Sleep(retryDelay);
+					this.LogDebugMessage(chalk.rgb(255, 165, 0)(`FhirSocketClient:WaitForSocketConnected(): ID: [${this.id}] clientName: [${this.name}] SetupSocket. Attempt Number: [${attempts}]`));
+					this.SetupSocket();
+					await Sleep(retryDelay);
+				}
+				await Sleep(retryDelay);
 			}
-			throw new Error(`FhirSocketClient:WaitForSocketConnected(): Error: [Could not connect after ${maxAttempts} connection attempts]`);
+			const message = `FhirSocketClient:WaitForSocketConnected(): Error: [Could not connect after ${maxAttempts} connection attempts]`;
+			this.LogErrorMessage(message);
+			throw new Error(message);
 		}
 	};
 	WithAccessToken = (accessToken) => {