@nsshunt/stsfhirclient 2.0.35 → 2.0.37

package/dist/stsfhirclient.cjs

@@ -5513,6 +5513,12 @@ var require_utils = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 	var isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu);
 	/** @type {(value: string) => boolean} */
 	var isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u);
+	/** @type {(value: string) => boolean} */
+	var isHexPair = RegExp.prototype.test.bind(/^[\da-f]{2}$/iu);
+	/** @type {(value: string) => boolean} */
+	var isUnreserved = RegExp.prototype.test.bind(/^[\da-z\-._~]$/iu);
+	/** @type {(value: string) => boolean} */
+	var isPathCharacter = RegExp.prototype.test.bind(/^[\da-z\-._~!$&'()*+,;=:@/]$/iu);
 	/**
 	* @param {Array<string>} input
 	* @returns {string}
@@ -5735,19 +5741,103 @@ var require_utils = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 		return output.join("");
 	}
 	/**
-	* @param {import('../types/index').URIComponent} component
-	* @param {boolean} esc
-	* @returns {import('../types/index').URIComponent}
+	* Re-escape RFC 3986 gen-delims that must not appear literally in the host.
+	* After the URI regex parses, these characters cannot be literal in the host
+	* field, so any that appear after decoding came from percent-encoding and
+	* must be restored to prevent authority structure changes.
+	*
+	* @param {string} host
+	* @param {boolean} isIP - true for IPv4/IPv6 hosts (skip colon re-escaping)
+	* @returns {string}
 	*/
-	function normalizeComponentEncoding(component, esc) {
-		const func = esc !== true ? escape : unescape;
-		if (component.scheme !== void 0) component.scheme = func(component.scheme);
-		if (component.userinfo !== void 0) component.userinfo = func(component.userinfo);
-		if (component.host !== void 0) component.host = func(component.host);
-		if (component.path !== void 0) component.path = func(component.path);
-		if (component.query !== void 0) component.query = func(component.query);
-		if (component.fragment !== void 0) component.fragment = func(component.fragment);
-		return component;
+	var HOST_DELIMS = {
+		"@": "%40",
+		"/": "%2F",
+		"?": "%3F",
+		"#": "%23",
+		":": "%3A"
+	};
+	var HOST_DELIM_RE = /[@/?#:]/g;
+	var HOST_DELIM_NO_COLON_RE = /[@/?#]/g;
+	function reescapeHostDelimiters(host, isIP) {
+		const re = isIP ? HOST_DELIM_NO_COLON_RE : HOST_DELIM_RE;
+		re.lastIndex = 0;
+		return host.replace(re, (ch) => HOST_DELIMS[ch]);
+	}
+	/**
+	* Normalizes percent escapes and optionally decodes only unreserved ASCII bytes.
+	* Reserved delimiters such as `%2F` and `%2E` stay escaped.
+	*
+	* @param {string} input
+	* @param {boolean} [decodeUnreserved=false]
+	* @returns {string}
+	*/
+	function normalizePercentEncoding(input, decodeUnreserved = false) {
+		if (input.indexOf("%") === -1) return input;
+		let output = "";
+		for (let i = 0; i < input.length; i++) {
+			if (input[i] === "%" && i + 2 < input.length) {
+				const hex = input.slice(i + 1, i + 3);
+				if (isHexPair(hex)) {
+					const normalizedHex = hex.toUpperCase();
+					const decoded = String.fromCharCode(parseInt(normalizedHex, 16));
+					if (decodeUnreserved && isUnreserved(decoded)) output += decoded;
+					else output += "%" + normalizedHex;
+					i += 2;
+					continue;
+				}
+			}
+			output += input[i];
+		}
+		return output;
+	}
+	/**
+	* Normalizes path data without turning reserved escapes into live path syntax.
+	* Valid escapes are uppercased, raw unsafe characters are escaped, and only
+	* unreserved bytes that are not `.` are decoded.
+	*
+	* @param {string} input
+	* @returns {string}
+	*/
+	function normalizePathEncoding(input) {
+		let output = "";
+		for (let i = 0; i < input.length; i++) {
+			if (input[i] === "%" && i + 2 < input.length) {
+				const hex = input.slice(i + 1, i + 3);
+				if (isHexPair(hex)) {
+					const normalizedHex = hex.toUpperCase();
+					const decoded = String.fromCharCode(parseInt(normalizedHex, 16));
+					if (decoded !== "." && isUnreserved(decoded)) output += decoded;
+					else output += "%" + normalizedHex;
+					i += 2;
+					continue;
+				}
+			}
+			if (isPathCharacter(input[i])) output += input[i];
+			else output += escape(input[i]);
+		}
+		return output;
+	}
+	/**
+	* Escapes a component while preserving existing valid percent escapes.
+	*
+	* @param {string} input
+	* @returns {string}
+	*/
+	function escapePreservingEscapes(input) {
+		let output = "";
+		for (let i = 0; i < input.length; i++) {
+			if (input[i] === "%" && i + 2 < input.length) {
+				const hex = input.slice(i + 1, i + 3);
+				if (isHexPair(hex)) {
+					output += "%" + hex.toUpperCase();
+					i += 2;
+					continue;
+				}
+			}
+			output += escape(input[i]);
+		}
+		return output;
 	}
 	/**
 	* @param {import('../types/index').URIComponent} component
@@ -5764,7 +5854,7 @@ var require_utils = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 			if (!isIPv4(host)) {
 				const ipV6res = normalizeIPv6(host);
 				if (ipV6res.isIPV6 === true) host = `[${ipV6res.escapedHost}]`;
-				else host = component.host;
+				else host = reescapeHostDelimiters(host, false);
 			}
 			uriTokens.push(host);
 		}
@@ -5777,7 +5867,10 @@ var require_utils = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 	module.exports = {
 		nonSimpleDomain,
 		recomposeAuthority,
-		normalizeComponentEncoding,
+		reescapeHostDelimiters,
+		normalizePercentEncoding,
+		normalizePathEncoding,
+		escapePreservingEscapes,
 		removeDotSegments,
 		isIPv4,
 		isUUID,
@@ -5971,7 +6064,7 @@ var require_schemes = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 //#endregion
 //#region node_modules/fast-uri/index.js
 var require_fast_uri = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
-	var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4, nonSimpleDomain } = require_utils();
+	var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, escapePreservingEscapes, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = require_utils();
 	var { SCHEMES, getSchemeHandler } = require_schemes();
 	/**
 	* @template {import('./types/index').URIComponent|string} T
@@ -5980,7 +6073,7 @@ var require_fast_uri = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 	* @returns {T}
 	*/
 	function normalize(uri, options) {
-		if (typeof uri === "string") uri = serialize(parse(uri, options), options);
+		if (typeof uri === "string") uri = normalizeString(uri, options);
 		else if (typeof uri === "object") uri = parse(serialize(uri, options), options);
 		return uri;
 	}
@@ -6056,27 +6149,9 @@ var require_fast_uri = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 	* @returns {boolean}
 	*/
 	function equal(uriA, uriB, options) {
-		if (typeof uriA === "string") {
-			uriA = unescape(uriA);
-			uriA = serialize(normalizeComponentEncoding(parse(uriA, options), true), {
-				...options,
-				skipEscape: true
-			});
-		} else if (typeof uriA === "object") uriA = serialize(normalizeComponentEncoding(uriA, true), {
-			...options,
-			skipEscape: true
-		});
-		if (typeof uriB === "string") {
-			uriB = unescape(uriB);
-			uriB = serialize(normalizeComponentEncoding(parse(uriB, options), true), {
-				...options,
-				skipEscape: true
-			});
-		} else if (typeof uriB === "object") uriB = serialize(normalizeComponentEncoding(uriB, true), {
-			...options,
-			skipEscape: true
-		});
-		return uriA.toLowerCase() === uriB.toLowerCase();
+		const normalizedA = normalizeComparableURI(uriA, options);
+		const normalizedB = normalizeComparableURI(uriB, options);
+		return normalizedA !== void 0 && normalizedB !== void 0 && normalizedA.toLowerCase() === normalizedB.toLowerCase();
 	}
 	/**
 	* @param {Readonly<import('./types/index').URIComponent>} cmpts
@@ -6105,9 +6180,9 @@ var require_fast_uri = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 		const schemeHandler = getSchemeHandler(options.scheme || component.scheme);
 		if (schemeHandler && schemeHandler.serialize) schemeHandler.serialize(component, options);
 		if (component.path !== void 0) if (!options.skipEscape) {
-			component.path = escape(component.path);
+			component.path = escapePreservingEscapes(component.path);
 			if (component.scheme !== void 0) component.path = component.path.split("%3A").join(":");
-		} else component.path = unescape(component.path);
+		} else component.path = normalizePercentEncoding(component.path);
 		if (options.reference !== "suffix" && component.scheme) uriTokens.push(component.scheme, ":");
 		const authority = recomposeAuthority(component);
 		if (authority !== void 0) {
@@ -6127,11 +6202,20 @@ var require_fast_uri = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 	}
 	var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
 	/**
+	* @param {import('./types/index').URIComponent} parsed
+	* @param {RegExpMatchArray} matches
+	* @returns {string|undefined}
+	*/
+	function getParseError(parsed, matches) {
+		if (matches[2] !== void 0 && parsed.path && parsed.path[0] !== "/") return "URI path must start with \"/\" when authority is present.";
+		if (typeof parsed.port === "number" && (parsed.port < 0 || parsed.port > 65535)) return "URI port is malformed.";
+	}
+	/**
 	* @param {string} uri
 	* @param {import('./types/index').Options} [opts]
-	* @returns
+	* @returns {{ parsed: import('./types/index').URIComponent, malformedAuthorityOrPort: boolean }}
 	*/
-	function parse(uri, opts) {
+	function parseWithStatus(uri, opts) {
 		const options = Object.assign({}, opts);
 		/** @type {import('./types/index').URIComponent} */
 		const parsed = {
@@ -6143,6 +6227,7 @@ var require_fast_uri = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 			query: void 0,
 			fragment: void 0
 		};
+		let malformedAuthorityOrPort = false;
 		let isIP = false;
 		if (options.reference === "suffix") if (options.scheme) uri = options.scheme + ":" + uri;
 		else uri = "//" + uri;
@@ -6156,6 +6241,11 @@ var require_fast_uri = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 			parsed.query = matches[7];
 			parsed.fragment = matches[8];
 			if (isNaN(parsed.port)) parsed.port = matches[5];
+			const parseError = getParseError(parsed, matches);
+			if (parseError !== void 0) {
+				parsed.error = parsed.error || parseError;
+				malformedAuthorityOrPort = true;
+			}
 			if (parsed.host) if (isIPv4(parsed.host) === false) {
 				const ipv6result = normalizeIPv6(parsed.host);
 				parsed.host = ipv6result.host.toLowerCase();
@@ -6177,14 +6267,61 @@ var require_fast_uri = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 			if (!schemeHandler || schemeHandler && !schemeHandler.skipNormalize) {
 				if (uri.indexOf("%") !== -1) {
 					if (parsed.scheme !== void 0) parsed.scheme = unescape(parsed.scheme);
-					if (parsed.host !== void 0) parsed.host = unescape(parsed.host);
+					if (parsed.host !== void 0) parsed.host = reescapeHostDelimiters(unescape(parsed.host), isIP);
+				}
+				if (parsed.path) parsed.path = normalizePathEncoding(parsed.path);
+				if (parsed.fragment) try {
+					parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
+				} catch {
+					parsed.error = parsed.error || "URI malformed";
 				}
-				if (parsed.path) parsed.path = escape(unescape(parsed.path));
-				if (parsed.fragment) parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
 			}
 			if (schemeHandler && schemeHandler.parse) schemeHandler.parse(parsed, options);
 		} else parsed.error = parsed.error || "URI can not be parsed.";
-		return parsed;
+		return {
+			parsed,
+			malformedAuthorityOrPort
+		};
+	}
+	/**
+	* @param {string} uri
+	* @param {import('./types/index').Options} [opts]
+	* @returns
+	*/
+	function parse(uri, opts) {
+		return parseWithStatus(uri, opts).parsed;
+	}
+	/**
+	* @param {string} uri
+	* @param {import('./types/index').Options} [opts]
+	* @returns {string}
+	*/
+	function normalizeString(uri, opts) {
+		return normalizeStringWithStatus(uri, opts).normalized;
+	}
+	/**
+	* @param {string} uri
+	* @param {import('./types/index').Options} [opts]
+	* @returns {{ normalized: string, malformedAuthorityOrPort: boolean }}
+	*/
+	function normalizeStringWithStatus(uri, opts) {
+		const { parsed, malformedAuthorityOrPort } = parseWithStatus(uri, opts);
+		return {
+			normalized: malformedAuthorityOrPort ? uri : serialize(parsed, opts),
+			malformedAuthorityOrPort
+		};
+	}
+	/**
+	* @param {import ('./types/index').URIComponent|string} uri
+	* @param {import('./types/index').Options} [opts]
+	* @returns {string|undefined}
+	*/
+	function normalizeComparableURI(uri, opts) {
+		if (typeof uri === "string") {
+			const { normalized, malformedAuthorityOrPort } = normalizeStringWithStatus(uri, opts);
+			return malformedAuthorityOrPort ? void 0 : normalized;
+		}
+		if (typeof uri === "object") return serialize(uri, opts);
 	}
 	var fastUri = {
 		SCHEMES,
@@ -10116,7 +10253,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) {
@@ -10983,7 +11119,7 @@ var SocketWithoutUpgrade = class SocketWithoutUpgrade extends _socket_io_compone
 				OFFLINE_EVENT_LISTENERS.push(this._offlineEventListener);
 			}
 		}
-		if (this.opts.withCredentials) this._cookieJar = /* @__PURE__ */ createCookieJar();
+		if (this.opts.withCredentials) this._cookieJar = void 0;
 		this._open();
 	}
 	/**
@@ -13056,6 +13192,7 @@ var SocketIoClient = class extends import_tiny_emitter.TinyEmitter {
 	#socket;
 	#reconnectTimeout = 2e3;
 	#ackTimeout = 5e3;
+	#reconnectTimeoutVal = void 0;
 	constructor(name) {
 		super();
 		this.#name = name;
@@ -13128,7 +13265,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;
 	}
@@ -13138,17 +13275,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"] };
@@ -13159,30 +13299,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));
 			}
@@ -13192,33 +13332,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/cv2/fhirSocketClient.ts
@@ -13236,23 +13393,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 ...`));
@@ -13264,9 +13443,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 (0, _nsshunt_stsutils.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 (0, _nsshunt_stsutils.Sleep)(retryDelay);
+					this.LogDebugMessage(chalk.rgb(255, 165, 0)(`FhirSocketClient:WaitForSocketConnected(): ID: [${this.id}] clientName: [${this.name}] SetupSocket. Attempt Number: [${attempts}]`));
+					this.SetupSocket();
+					await (0, _nsshunt_stsutils.Sleep)(retryDelay);
+				}
+				await (0, _nsshunt_stsutils.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) => {