@nsshunt/ststestrunner 1.1.45 → 1.1.47

package/dist/ststestrunner.mjs

@@ -29,6 +29,8 @@ var TestCaseFhirBase = class {
 	#publishTelemetryTimeout = null;
 	#publishTelemetryTimeoutVal = 1e3;
 	#originRegex = /^(api:\/\/\w+)/;
+	#resetSocketClientTrigger = 100;
+	#clientSocketFetchCount = 0;
 	#authAgentManager;
 	accessTokenTime = performance.now();
 	newTokenLimitTime = 30;
@@ -130,7 +132,15 @@ var TestCaseFhirBase = class {
 	};
 	GetFhirSocketClient = async () => {
 		try {
-			if (this.fhirClient) return this.fhirClient;
+			this.#clientSocketFetchCount++;
+			if (this.fhirClient) {
+				if (this.#clientSocketFetchCount % this.#resetSocketClientTrigger === 0) {
+					this.fhirClient.ResetSocket();
+					await Sleep(250);
+					this.fhirClient = null;
+					return this.GetFhirSocketClient();
+				}
+			}
 			const fhirOptions = this.#options.fhirOptions;
 			const options = {
 				fhirServerEndpoint: fhirOptions.stsfhirserverendpoint,
@@ -143,7 +153,7 @@ var TestCaseFhirBase = class {
 				agentManager: this.GetFhirAgentManager(),
 				joinRooms: [],
 				logger: this.#runnerExecutionWorker.logger,
-				authToken: await this.GetAccessTokenForSocketClientAccess(),
+				GetConnectionAccessToken: this.GetAccessTokenForSocketClientAccess,
 				GetAccessToken: this.GetAccessToken
 			};
 			if (this.runner.options.fhirOptions.stsfhirsocketclientmode === "socket-client-all-in-one") this.fhirClient = new FhirSocketClientAllInOne("FhirSocketClient", options);
@@ -483,7 +493,7 @@ var TestCaseFhirQueryBase = class extends TestCaseFhirBase {
 		}
 	};
 	ExecuteRunner = async () => {
-		if (this.runner.iteration % 100 === 0) this.Debug(`${this.runner.options.testType}:${this.runner.workerManagerId} -->> Iteration: ${this.runner.options.description}   ${this.runner.iteration}`);
+		if (this.runner.iteration % 100 === 0) this.Debug(`TestCaseFhirQueryBase:ExecuteRunner(): ${this.runner.options.testType}:${this.runner.workerManagerId} -->> Iteration: ${this.runner.options.description} ${this.runner.iteration}`);
 		const start = performance.now();
 		this.runner.instrumentData.activeRequestCount++;
 		this.#CheckResetClient();
@@ -501,7 +511,7 @@ var TestCaseFhirQueryBase = class extends TestCaseFhirBase {
 		this.runner.instrumentData.activeRequestCount--;
 		const diff = performance.now() - start;
 		this.runner.instrumentData.duration = diff;
-		if (diff > 150) console.debug(chalk.magenta(`*** ==> Long execution: [${diff}]`));
+		if (diff > 150) this.Debug(chalk.magenta(`TestCaseFhirQueryBase:ExecuteRunner(): *** ==> Long execution: [${diff}]`));
 		await this.PublishTelemetry();
 		return true;
 	};
@@ -510,9 +520,15 @@ var TestCaseFhirQueryBase = class extends TestCaseFhirBase {
 //#region src/libmodule/testCaseFhir01.ts
 var TestCaseFhir01 = class extends TestCaseFhirQueryBase {
 	ExecuteQuery = async () => {
-		await this.GetAccessToken();
-		this.accesssToken = null;
-		return null;
+		try {
+			await this.GetAccessToken();
+			this.accesssToken = null;
+			return null;
+		} catch (error) {
+			this.runner.instrumentData.errorCount++;
+			this.Error(`TestCaseFhir01:ExecuteQuery(): Error: [${error}]`);
+			throw error;
+		}
 	};
 };
 //#endregion
@@ -525,8 +541,9 @@ var TestCaseFhir02 = class extends TestCaseFhirQueryBase {
 			const personRecord = await this.GetPersonRecord(prefix, this.runner.iteration, "1");
 			return (await client.PostResource("Person", personRecord)).body;
 		} catch (error) {
-			console.error(error);
-			return null;
+			this.runner.instrumentData.errorCount++;
+			this.Error(`TestCaseFhir02:ExecuteQuery(): Error: [${error}]`);
+			throw error;
 		}
 	};
 };
@@ -534,49 +551,61 @@ var TestCaseFhir02 = class extends TestCaseFhirQueryBase {
 //#region src/libmodule/testCaseFhir03.ts
 var TestCaseFhir03 = class extends TestCaseFhirQueryBase {
 	ExecuteQuery = async () => {
-		const client = await this.GetClient();
-		const personRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "1");
-		const retVal = await client.GetResource("Person", personRecord.id);
-		delete personRecord.meta;
-		delete retVal.body.meta;
-		const p1 = JSON.stringify(personRecord);
-		const p2 = JSON.stringify(retVal.body);
-		if (p1.localeCompare(p2) !== 0) this.runner.instrumentData.errorCount++;
-		return retVal.body;
+		try {
+			const client = await this.GetClient();
+			const personRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "1");
+			const retVal = await client.GetResource("Person", personRecord.id);
+			delete personRecord.meta;
+			delete retVal.body.meta;
+			const p1 = JSON.stringify(personRecord);
+			const p2 = JSON.stringify(retVal.body);
+			if (p1.localeCompare(p2) !== 0) this.runner.instrumentData.errorCount++;
+			return retVal.body;
+		} catch (error) {
+			this.runner.instrumentData.errorCount++;
+			this.Error(`TestCaseFhir03:ExecuteQuery(): Error: [${error}]`);
+			throw error;
+		}
 	};
 };
 //#endregion
 //#region src/libmodule/testCaseFhir04.ts
 var TestCaseFhir04 = class extends TestCaseFhirQueryBase {
 	ExecuteQuery = async () => {
-		const client = await this.GetClient();
-		const personRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "1");
-		const retVal = await client.GetResource("Person", personRecord.id);
-		this.runner.instrumentData.requestCount++;
-		const compPersonRecord = { ...personRecord };
-		const loadedPersonRecorded = { ...retVal.body };
-		delete compPersonRecord.meta;
-		delete loadedPersonRecorded.meta;
-		const p1 = JSON.stringify(compPersonRecord);
-		const p2 = JSON.stringify(loadedPersonRecorded);
-		if (p1.localeCompare(p2) !== 0) {
-			this.runner.instrumentData.errorCount++;
-			return retVal.body;
-		}
-		const originalPersonRecord = retVal.body;
-		if (originalPersonRecord && originalPersonRecord.text) {
-			originalPersonRecord.text.div = `Put record TestCaseFhir04 ${this.runner.iteration}`;
-			const retVal = await client.PutResource("Person", originalPersonRecord, `W/"1"`);
-			const updatedRecord = { ...retVal.body };
-			delete updatedRecord.meta;
-			delete originalPersonRecord.meta;
-			const p1 = JSON.stringify(updatedRecord);
-			const p2 = JSON.stringify(originalPersonRecord);
-			if (p1.localeCompare(p2) !== 0) this.runner.instrumentData.errorCount++;
-			return retVal.body;
-		} else {
+		try {
+			const client = await this.GetClient();
+			const personRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "1");
+			const retVal = await client.GetResource("Person", personRecord.id);
+			this.runner.instrumentData.requestCount++;
+			const compPersonRecord = { ...personRecord };
+			const loadedPersonRecorded = { ...retVal.body };
+			delete compPersonRecord.meta;
+			delete loadedPersonRecorded.meta;
+			const p1 = JSON.stringify(compPersonRecord);
+			const p2 = JSON.stringify(loadedPersonRecorded);
+			if (p1.localeCompare(p2) !== 0) {
+				this.runner.instrumentData.errorCount++;
+				return retVal.body;
+			}
+			const originalPersonRecord = retVal.body;
+			if (originalPersonRecord && originalPersonRecord.text) {
+				originalPersonRecord.text.div = `Put record TestCaseFhir04 ${this.runner.iteration}`;
+				const retVal = await client.PutResource("Person", originalPersonRecord, `W/"1"`);
+				const updatedRecord = { ...retVal.body };
+				delete updatedRecord.meta;
+				delete originalPersonRecord.meta;
+				const p1 = JSON.stringify(updatedRecord);
+				const p2 = JSON.stringify(originalPersonRecord);
+				if (p1.localeCompare(p2) !== 0) this.runner.instrumentData.errorCount++;
+				return retVal.body;
+			} else {
+				this.runner.instrumentData.errorCount++;
+				return null;
+			}
+		} catch (error) {
 			this.runner.instrumentData.errorCount++;
-			return null;
+			this.Error(`TestCaseFhir04:ExecuteQuery(): Error: [${error}]`);
+			throw error;
 		}
 	};
 };
@@ -584,21 +613,27 @@ var TestCaseFhir04 = class extends TestCaseFhirQueryBase {
 //#region src/libmodule/testCaseFhir05.ts
 var TestCaseFhir05 = class extends TestCaseFhirQueryBase {
 	ExecuteQuery = async () => {
-		const client = await this.GetClient();
-		const originalPersonRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "2");
-		if (originalPersonRecord && originalPersonRecord.text) {
-			originalPersonRecord.text.div = `Put record TestCaseFhir05 ${this.runner.iteration}`;
-			const retVal = await client.PutResource("Person", originalPersonRecord, `W/"2"`);
-			const updatedRecord = { ...retVal.body };
-			delete updatedRecord.meta;
-			delete originalPersonRecord.meta;
-			const p1 = JSON.stringify(updatedRecord);
-			const p2 = JSON.stringify(originalPersonRecord);
-			if (p1.localeCompare(p2) !== 0) this.runner.instrumentData.errorCount++;
-			return retVal.body;
-		} else {
+		try {
+			const client = await this.GetClient();
+			const originalPersonRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "2");
+			if (originalPersonRecord && originalPersonRecord.text) {
+				originalPersonRecord.text.div = `Put record TestCaseFhir05 ${this.runner.iteration}`;
+				const retVal = await client.PutResource("Person", originalPersonRecord, `W/"2"`);
+				const updatedRecord = { ...retVal.body };
+				delete updatedRecord.meta;
+				delete originalPersonRecord.meta;
+				const p1 = JSON.stringify(updatedRecord);
+				const p2 = JSON.stringify(originalPersonRecord);
+				if (p1.localeCompare(p2) !== 0) this.runner.instrumentData.errorCount++;
+				return retVal.body;
+			} else {
+				this.runner.instrumentData.errorCount++;
+				return null;
+			}
+		} catch (error) {
 			this.runner.instrumentData.errorCount++;
-			return null;
+			this.Error(`TestCaseFhir05:ExecuteQuery(): Error: [${error}]`);
+			throw error;
 		}
 	};
 };
@@ -625,7 +660,8 @@ var TestCaseFhir06 = class extends TestCaseFhirQueryBase {
 			return retVal.body;
 		} catch (error) {
 			this.runner.instrumentData.errorCount++;
-			return null;
+			this.Error(`TestCaseFhir06:ExecuteQuery(): Error: [${error}]`);
+			throw error;
 		}
 	};
 };
@@ -1289,7 +1325,8 @@ var TestCaseFhir07 = class extends TestCaseFhirQueryBase {
 			const patchRecord = fast_json_patch_default.generate(observer);
 			return (await client.PatchResource("Person", personRecord.id, patchRecord, `application/json-patch+json`, `W/"3"`)).body;
 		} catch (error) {
-			console.error(error);
+			this.runner.instrumentData.errorCount++;
+			this.Error(`TestCaseFhir07:ExecuteQuery(): Error: [${error}]`);
 			throw error;
 		}
 	};
@@ -1305,7 +1342,8 @@ var TestCaseFhir08 = class extends TestCaseFhirQueryBase {
 			resource.text.div = `Merge Patched record TestCaseFhir08 ${this.runner.iteration}`;
 			return (await client.PatchResource("Person", personRecord.id, resource, `application/merge-patch+json`, `W/"4"`)).body;
 		} catch (error) {
-			console.error(error);
+			this.runner.instrumentData.errorCount++;
+			this.Error(`TestCaseFhir08:ExecuteQuery(): Error: [${error}]`);
 			throw error;
 		}
 	};
@@ -1314,12 +1352,18 @@ var TestCaseFhir08 = class extends TestCaseFhirQueryBase {
 //#region src/libmodule/testCaseFhir09.ts
 var TestCaseFhir09 = class extends TestCaseFhirQueryBase {
 	ExecuteQuery = async () => {
-		const client = await this.GetClient();
-		const personRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "5");
-		if (personRecord.text) return (await client.DeleteResource("Person", personRecord.id, `W/"5"`)).body;
-		else {
+		try {
+			const client = await this.GetClient();
+			const personRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "5");
+			if (personRecord.text) return (await client.DeleteResource("Person", personRecord.id, `W/"5"`)).body;
+			else {
+				this.runner.instrumentData.errorCount++;
+				return null;
+			}
+		} catch (error) {
 			this.runner.instrumentData.errorCount++;
-			return null;
+			this.Error(`TestCaseFhir09:ExecuteQuery(): Error: [${error}]`);
+			throw error;
 		}
 	};
 };
@@ -1327,9 +1371,15 @@ var TestCaseFhir09 = class extends TestCaseFhirQueryBase {
 //#region src/libmodule/testCaseFhir10.ts
 var TestCaseFhir10 = class extends TestCaseFhirQueryBase {
 	ExecuteQuery = async () => {
-		const client = await this.GetClient();
-		const personRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "1");
-		return (await client.GetHistoryInstanceFhirResource("Person", personRecord.id, "2")).body;
+		try {
+			const client = await this.GetClient();
+			const personRecord = await this.GetPersonRecord(`${this.runner.options.personPrefix}`, this.runner.iteration, "1");
+			return (await client.GetHistoryInstanceFhirResource("Person", personRecord.id, "2")).body;
+		} catch (error) {
+			this.runner.instrumentData.errorCount++;
+			this.Error(`TestCaseFhir10:ExecuteQuery(): Error: [${error}]`);
+			throw error;
+		}
 	};
 };
 //#endregion