@nsshunt/ststestrunner 1.1.102 → 1.1.104

package/dist/ststestrunner.cjs

@@ -462,7 +462,7 @@ var TestCaseFhirBase = class {
 		const onRetryAttempt = (attempt, error, delayMs) => {
 			this.#runner.instrumentData.errorCount++;
 			this.#runner.instrumentData.requestCount++;
-			const message = `TestCaseFhirBase:onRetryAttempt(): Retry #${attempt} after ${delayMs}ms due to ${error.code || error.response?.status}`;
+			const message = `TestCaseFhirBase:onRetryAttempt(): [${this._id}] Retry #${attempt} after ${delayMs}ms due to ${error.code || error.response?.status}`;
 			this.Warning(message);
 			this.#runner.instrumentData.message.push(chalk.default.red(message));
 		};
@@ -498,7 +498,7 @@ var TestCaseFhirBase = class {
 			case "stress-test-extreme-agent-options":
 				agentOptions = { ...this.stressTestExtremeAgentOptions };
 				break;
-			default: throw new Error(`GetFhirSocketClient(): unknown nodeAgentMode: [${testingAgentOptions.nodeAgentMode}]`);
+			default: throw new Error(`TestCaseFhirBase:GetAgentManager(): [${this._id}] unknown nodeAgentMode: [${testingAgentOptions.nodeAgentMode}]`);
 		}
 		if (agentOptions) agentManager = (0, _nsshunt_stsutils.createAgentManager)({
 			agentOptions,
@@ -523,17 +523,17 @@ var TestCaseFhirBase = class {
 			let fhirClient = this.runnerExecutionWorker.GetFhirClient();
 			if (fhirClient) return fhirClient;
 			if (this.runnerExecutionWorker.GetOnHold("fhirclient") === true) {
-				this.Debug(chalk.default.magenta(`[${this.runnerExecutionWorker.id}] fhir client does not exist - some other client setting up the new client (on hold/lock) - waiting ...`));
+				this.Debug(chalk.default.magenta(`[${this.runnerExecutionWorker.id}] [${this._id}] fhir client does not exist - some other client setting up the new client (on hold/lock) - waiting ...`));
 				try {
 					const start = performance.now();
 					await this.runnerExecutionWorker.WaitOnHold("fhirclient", 6e4);
-					this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] hold (lock) released after: [${performance.now() - start}ms]`));
+					this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] [${this._id}] hold (lock) released after: [${performance.now() - start}ms]`));
 					const fhirClient = this.runnerExecutionWorker.GetFhirClient();
 					if (fhirClient) {
-						this.Debug(chalk.default.green(`[${this.runnerExecutionWorker.id}] Getting existing fhir client (post hold release)`));
+						this.Debug(chalk.default.green(`[${this.runnerExecutionWorker.id}] [${this._id}] Getting existing fhir client (post hold release)`));
 						return fhirClient;
 					} else {
-						this.Error(chalk.default.red(`[${this.runnerExecutionWorker.id}] Could not get existing fhir client (post hold release)`));
+						this.Error(chalk.default.red(`[${this.runnerExecutionWorker.id}] [${this._id}] Could not get existing fhir client (post hold release)`));
 						this.Error(chalk.default.red(`continue anyway ...`));
 					}
 				} catch (error) {
@@ -541,8 +541,8 @@ var TestCaseFhirBase = class {
 				}
 			}
 			const start = performance.now();
-			this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] fhir client does not exist - setting up new client`));
-			this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] setting hold (lock)`));
+			this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] [${this._id}] fhir client does not exist - setting up new client`));
+			this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] [${this._id}] setting hold (lock)`));
 			this.runnerExecutionWorker.SetOnHold("fhirclient");
 			const fhirOptions = this.#options.fhirOptions;
 			const options = {
@@ -563,10 +563,10 @@ var TestCaseFhirBase = class {
 			if (this.runner.options.fhirOptions.stsfhirsocketclientmode === "socket-client-all-in-one") fhirClient = new _nsshunt_stsfhirclient.FhirSocketClientAllInOne("FhirSocketClient", options);
 			else fhirClient = new _nsshunt_stsfhirclient.FhirSocketClientIndividual("FhirSocketClient", options);
 			await fhirClient.WaitForSocketConnected();
-			this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] setting fhir client into object`));
+			this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] [${this._id}] setting fhir client into object`));
 			this.runnerExecutionWorker.SetFhirClient(fhirClient);
 			this.runnerExecutionWorker.ReleaseOnHold("fhirclient");
-			this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] release hold (lock) Time taken for socket connection and set object: [${performance.now() - start}ms]`));
+			this.Debug(chalk.default.yellow(`[${this.runnerExecutionWorker.id}] [${this._id}] release hold (lock) Time taken for socket connection and set object: [${performance.now() - start}ms]`));
 			return fhirClient;
 		} catch (error) {
 			this.Error(error);
@@ -683,7 +683,7 @@ var TestCaseFhirBase = class {
 				onRetryAttempt: (attempt, error, delayMs) => {
 					this.#runner.instrumentData.authenticationErrorCount++;
 					this.#runner.instrumentData.authenticationRetryCount++;
-					const message = `TestCaseFhirBase:GetAPITokenFromAuthServerUsingScope(): Retry #${attempt} after ${delayMs}ms due to ${error.code || error.response?.status}`;
+					const message = `TestCaseFhirBase:GetAPITokenFromAuthServerUsingScope(): [${this._id}] Retry #${attempt} after ${delayMs}ms due to ${error.code || error.response?.status}`;
 					this.Warning(message);
 					this.#runner.instrumentData.message.push(chalk.default.red(message));
 				}
@@ -691,7 +691,7 @@ var TestCaseFhirBase = class {
 			this.#runner.instrumentData.authenticationCount++;
 			stage = "7";
 			if (retVal.status) {
-				if (retVal.status !== 200) this.Warning(chalk.default.magenta(`TestCaseFhirBase:GetAPITokenFromAuthServerUsingScope(): Invalid response from server: [${retVal.status}]`));
+				if (retVal.status !== 200) this.Warning(chalk.default.magenta(`TestCaseFhirBase:GetAPITokenFromAuthServerUsingScope(): [${this._id}] Invalid response from server: [${retVal.status}]`));
 			} else throw new Error(chalk.default.red(`No retVal.status)`));
 			stage = "8";
 			if (retVal.data) {
@@ -715,13 +715,13 @@ var TestCaseFhirBase = class {
 			} catch (error) {
 				details = `Could not JSON.stringify(error.response.data)`;
 			}
-			error.message = `TestCaseFhirBase:GetAPITokenFromAuthServerUsingScope(): Error: [${error}], Stage: [${stage}], Details: [${details}]`;
+			error.message = `TestCaseFhirBase:GetAPITokenFromAuthServerUsingScope(): [${this._id}] Error: [${error}], Stage: [${stage}], Details: [${details}]`;
 			throw error;
 		}
 	};
 	GetAccessTokenForSocketClientAccess = async () => {
 		const timeout = setTimeout(() => {
-			this.Warning(`TestCaseFhirBase:GetAccessTokenForSocketClientAccess(): Timeout: [${this._authMaxTimeout}] exceeded for getting access token ...`);
+			this.Warning(`TestCaseFhirBase:GetAccessTokenForSocketClientAccess(): [${this._id}] Timeout: [${this._authMaxTimeout}] exceeded for getting access token ...`);
 		}, this._authMaxTimeout);
 		const start = performance.now();
 		try {
@@ -735,43 +735,40 @@ var TestCaseFhirBase = class {
 			});
 			clearTimeout(timeout);
 			const totalTime = performance.now() - start;
-			if (totalTime > this._authMaxTimeout) this.Warning(chalk.default.magenta(`TestCaseFhirBase:GetAccessTokenForSocketClientAccess(): The total time for getting the access token: [${totalTime}]`));
+			if (totalTime > this._authMaxTimeout) this.Warning(chalk.default.magenta(`TestCaseFhirBase:GetAccessTokenForSocketClientAccess(): [${this._id}] The total time for getting the access token: [${totalTime}]`));
 			return retVal;
 		} catch (error) {
 			clearTimeout(timeout);
-			error.message = `TestCaseFhirBase:GetAccessTokenForSocketClientAccess(): Error: [${error}], Duration until error: [${performance.now() - start}]`;
+			const totalTime = performance.now() - start;
+			error.message = `TestCaseFhirBase:GetAccessTokenForSocketClientAccess(): [${this._id}] Error: [${error}], Duration until error: [${totalTime}]`;
 			this.Error(error);
 			return "";
 		}
 	};
 	ResetAccessToken = () => {
-		console.log(chalk.default.magenta(`************************************************************************* start `));
-		console.log(chalk.default.magenta(`Old Token: ${this._id} : ${this.#accesssToken}`));
 		this.#accesssToken = null;
-		console.log(chalk.default.magenta(`New Token: ${this._id} : ${this.#accesssToken}`));
-		console.log(chalk.default.magenta(`************************************************************************* end `));
 	};
 	HandleError = (error) => {
-		this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): Error: [${error}]`));
-		this.Error(chalk.default.red(`TestCaseFhirBase:HandleError():   description: [${this.runner.options.description}]`));
-		this.Error(chalk.default.red(`TestCaseFhirBase:HandleError():   iteration: [${this.runner.iteration}]`));
-		this.Error(chalk.default.red(`TestCaseFhirBase:HandleError():   asyncRunnerContext: [${JSON.stringify(this.runner.asyncRunnerContext)}]`));
+		this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] Error: [${error}]`));
+		this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] description: [${this.runner.options.description}]`));
+		this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] iteration: [${this.runner.iteration}]`));
+		this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] asyncRunnerContext: [${JSON.stringify(this.runner.asyncRunnerContext)}]`));
 		if (axios.default.isAxiosError(error)) {
 			const axiosError = error;
 			if (axiosError.response) {
-				this.Error(chalk.default.red(`TestCaseFhirBase:HandleError():   AXIOS Error Response.Status = [${axiosError.response.status}]`));
-				if (axiosError.response.headers) this.Error(chalk.default.red(`TestCaseFhirBase:HandleError():   headers: [${JSON.stringify(axiosError.response.headers)}]`));
-				if (axiosError.response.data) this.Error(chalk.default.red(`TestCaseFhirBase:HandleError():   data: [${JSON.stringify(axiosError.response.data)}]`));
+				this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] AXIOS Error Response.Status = [${axiosError.response.status}]`));
+				if (axiosError.response.headers) this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] headers: [${JSON.stringify(axiosError.response.headers)}]`));
+				if (axiosError.response.data) this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] data: [${JSON.stringify(axiosError.response.data)}]`));
 				if (axiosError.response.status === StatusCodes.UNAUTHORIZED) {
 					this.runner.instrumentData.authenticationErrorCount++;
-					this.Error(chalk.default.red(`TestCaseFhirBase:HandleError():   UNAUTHORIZED - Reset Access Token`));
+					this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] UNAUTHORIZED - Reset Access Token`));
 					this.ResetAccessToken();
 					return true;
 				}
-			} else this.Error(chalk.default.red(`TestCaseFhirBase:HandleError():   AXIOS Error = [${axiosError}]`));
+			} else this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] AXIOS Error = [${axiosError}]`));
 		} else if (error.message === "UNAUTHORIZED") {
 			this.runner.instrumentData.authenticationErrorCount++;
-			this.Error(chalk.default.red(`TestCaseFhirBase:HandleError():   UNAUTHORIZED - Reset Access Token`));
+			this.Error(chalk.default.red(`TestCaseFhirBase:HandleError(): [${this._id}] UNAUTHORIZED - Reset Access Token`));
 			this.ResetAccessToken();
 			return true;
 		}
@@ -781,13 +778,9 @@ var TestCaseFhirBase = class {
 		let timeout = void 0;
 		let start = performance.now();
 		try {
-			if (this.#accesssToken) {
-				this.Debug(`TestCaseFhirBase:GetAccessToken(): ${this._id} : ${this.#accesssToken}`);
-				return this.#accesssToken;
-			}
-			this.Debug(`TestCaseFhirBase:GetAccessToken(): Getting new access token`);
+			if (this.#accesssToken) return this.#accesssToken;
 			timeout = setTimeout(() => {
-				this.Warning(chalk.default.magenta(`TestCaseFhirBase:GetAccessToken(): Timeout: [${this._authMaxTimeout}] exceeded for getting access token ...`));
+				this.Warning(chalk.default.magenta(`TestCaseFhirBase:GetAccessToken(): [${this._id}] Timeout: [${this._authMaxTimeout}] exceeded for getting access token ...`));
 			}, this._authMaxTimeout);
 			const scopes = `api://fb6513e4-16fe-4931-bed8-33b82b404a14/_.stsfhir5:All`.split(" ").sort().join(" ");
 			const authendpointUrl = `${this.#options.authOptions.asendpoint}:${this.#options.authOptions.asport}`;
@@ -801,11 +794,12 @@ var TestCaseFhirBase = class {
 			this.#accesssToken = retVal;
 			if (timeout) clearTimeout(timeout);
 			const totalTime = performance.now() - start;
-			if (totalTime > this._authMaxTimeout) this.Warning(chalk.default.magenta(`TestCaseFhirBase:GetAccessToken(): The total time for getting the access token: [${totalTime}]`));
+			if (totalTime > this._authMaxTimeout) this.Warning(chalk.default.magenta(`TestCaseFhirBase:GetAccessToken(): [${this._id}] The total time for getting the access token: [${totalTime}]`));
 			return retVal;
 		} catch (error) {
 			if (timeout) clearTimeout(timeout);
-			error.message = `TestCaseFhirBase:GetAccessToken(): Error: [${error}], Duration until error: [${performance.now() - start}]`;
+			const totalTime = performance.now() - start;
+			error.message = `TestCaseFhirBase:GetAccessToken(): [${this._id}] Error: [${error}], Duration until error: [${totalTime}]`;
 			this.Error(error);
 			return "";
 		}
@@ -949,9 +943,9 @@ var TestCaseFhirBase = class {
 	_CheckOutputLongDurationError = (snapshotStart, message) => {
 		const snapShotEnd = performance.now();
 		if (snapShotEnd - snapshotStart > 1e3) {
-			this.Error(chalk.default.red(`TestCaseFhirQueryBase:ExecuteRunner:_OutputLongDurationError(): *** ==> Long execution: [${snapShotEnd - snapshotStart}] message: [${message}]`));
-			this.Error(chalk.default.red(`TestCaseFhirQueryBase:ExecuteRunner:_OutputLongDurationError():     ==> ${this._GetDetail()}`));
-			this.Error(chalk.default.red(`TestCaseFhirQueryBase:ExecuteRunner:_OutputLongDurationError():     ==> Note: While not specifically an error, this is logged as an error.`));
+			this.Error(chalk.default.red(`TestCaseFhirBase:_CheckOutputLongDurationError(): [${this._id}] *** ==> Long execution: [${snapShotEnd - snapshotStart}] message: [${message}]`));
+			this.Error(chalk.default.red(`TestCaseFhirBase:_CheckOutputLongDurationError(): [${this._id}]     ==> ${this._GetDetail()}`));
+			this.Error(chalk.default.red(`TestCaseFhirBase:_CheckOutputLongDurationError(): [${this._id}]     ==> Note: While not specifically an error, this is logged as an error.`));
 		}
 		return snapShotEnd;
 	};
@@ -975,13 +969,13 @@ var TestCaseFhirBase = class {
 			if (this.HandleError(error) === true) if (this.retryCount < this.maxAuthRetryCount) {
 				this.retryCount++;
 				this.runner.instrumentData.authenticationRetryCount++;
-				const message = `TestCaseFhir02:ExecuteQuery():   Retry auth attempt: retryCount: [${this.retryCount}], maxAuthRetryCount: [${this.maxAuthRetryCount}]`;
+				const message = `TestCaseFhirBase:ExecuteQuery(): [${this._id}] Retry auth attempt: retryCount: [${this.retryCount}], maxAuthRetryCount: [${this.maxAuthRetryCount}]`;
 				this.Error(message);
 				if (this.retryCount > this._RetryMap.length) await (0, _nsshunt_stsutils.Sleep)(this._RetryMap[this._RetryMap.length - 1]);
 				else await (0, _nsshunt_stsutils.Sleep)(this._RetryMap[this.retryCount - 1]);
 				return await this._ExecuteQuery();
 			} else {
-				const message = `TestCaseFhir02:ExecuteQuery():   Max auth retries exceeded: retryCount: [${this.retryCount}], maxAuthRetryCount: [${this.maxAuthRetryCount}], Error: [${error}]`;
+				const message = `TestCaseFhirBase:_ExecuteQuery(): [${this._id}] Max auth retries exceeded: retryCount: [${this.retryCount}], maxAuthRetryCount: [${this.maxAuthRetryCount}], Error: [${error}]`;
 				this.Error(message);
 				error.message = message;
 				throw error;