@nsshunt/ststestrunner 1.1.29 → 1.1.30

package/dist/ststestrunner.mjs

@@ -23,8 +23,6 @@ var TestCaseFhirBase = class {
 	#runner;
 	#runnerExecutionWorker;
 	#accesssToken = null;
-	#clientId = "36615b3a-b71b-49af-a68b-4180daed7a5a";
-	#clientSecret = "7fbbf116-0537-424b-904f-d8d0a62adf9e";
 	#publishTelemetryCount = 0;
 	#maxBufferSize = 50;
 	#publishTelemetryTimeout = null;
@@ -80,23 +78,23 @@ var TestCaseFhirBase = class {
 		const fhirRESTClient = new FhirRESTClient({
 			GetAccessToken: this.GetAccessToken,
 			user: "USR_user01@stsmda.com.au",
-			endpoint: fhirOptions.fhirServerEndpoint,
+			endpoint: fhirOptions.stsfhirserverendpoint,
 			stsfhirapiroot: fhirOptions.stsfhirapiroot,
 			stsfhirport: fhirOptions.stsfhirport,
 			logger: defaultLogger,
-			agentManager: this.GetAgentManager(),
+			agentManager: this.GetFhirAgentManager(),
 			onRetryAttempt
 		});
 		this.restFhirClient = fhirRESTClient;
 		return fhirRESTClient;
 	};
-	GetAgentManager = () => {
+	GetAgentManager = (testingAgentOptions) => {
 		let agentManager = void 0;
 		let agentOptions = void 0;
-		switch (this.#options.nodeAgentMode) {
+		switch (testingAgentOptions.nodeAgentMode) {
 			case "no-agent": break;
 			case "custom-agent-options":
-				if (this.#options.nodeAgentCustomOptions) agentOptions = { ...this.#options.nodeAgentCustomOptions };
+				if (testingAgentOptions.nodeAgentCustomOptions) agentOptions = { ...testingAgentOptions.nodeAgentCustomOptions };
 				else agentOptions = { ...this.defaultAgentOptions };
 				break;
 			case "default-agent-options":
@@ -108,7 +106,7 @@ var TestCaseFhirBase = class {
 			case "stress-test-extreme-agent-options":
 				agentOptions = { ...this.stressTestExtremeAgentOptions };
 				break;
-			default: throw new Error(`GetFhirSocketClient(): unknown nodeAgentMode: [${this.#options.nodeAgentMode}]`);
+			default: throw new Error(`GetFhirSocketClient(): unknown nodeAgentMode: [${testingAgentOptions.nodeAgentMode}]`);
 		}
 		if (agentOptions) agentManager = createAgentManager({
 			agentOptions,
@@ -121,25 +119,31 @@ var TestCaseFhirBase = class {
 		});
 		return agentManager;
 	};
+	GetFhirAgentManager = () => {
+		return this.GetAgentManager(this.#options.fhirOptions.stsfhiragentOptions);
+	};
+	GetAuthAgentManager = () => {
+		return this.GetAgentManager(this.#options.authOptions.asagentoptions);
+	};
 	GetFhirSocketClient = async () => {
 		try {
 			if (this.fhirClient) return this.fhirClient;
 			const fhirOptions = this.#options.fhirOptions;
 			const options = {
-				fhirServerEndpoint: fhirOptions.fhirServerEndpoint,
+				fhirServerEndpoint: fhirOptions.stsfhirserverendpoint,
 				fhirapiroot: fhirOptions.stsfhirapiroot,
 				fhirServerPort: fhirOptions.stsfhirport,
 				socketClientName: fhirOptions.stsfhirsocketname,
 				socketIoCustomPath: fhirOptions.stsfhirsocketcustompath,
 				timeout: fhirOptions.stsfhirsockettimeout,
 				baseUrl: fhirOptions.stsfhirbaseurl,
-				agentManager: this.GetAgentManager(),
+				agentManager: this.GetFhirAgentManager(),
 				joinRooms: [],
 				logger: defaultLogger,
 				authToken: await this.GetAccessTokenForSocketClientAccess(),
 				GetAccessToken: this.GetAccessToken
 			};
-			if (this.runner.options.fhirOptions.socketClientMode === "socket-client-all-in-one") this.fhirClient = new FhirSocketClientAllInOne("FhirSocketClient", options);
+			if (this.runner.options.fhirOptions.stsfhirsocketclientmode === "socket-client-all-in-one") this.fhirClient = new FhirSocketClientAllInOne("FhirSocketClient", options);
 			else this.fhirClient = new FhirSocketClientIndividual("FhirSocketClient", options);
 			await this.fhirClient.WaitForSocketConnected();
 			return this.fhirClient;
@@ -243,7 +247,7 @@ var TestCaseFhirBase = class {
 			const url = endPoint ? `${endPoint}${this.#options.authOptions.asoauthapiroot}/token` : `${this.#options.authOptions.asendpoint}:${this.#options.authOptions.asport}${this.#options.authOptions.asoauthapiroot}/token`;
 			stage = `6.5: url: [${url}] payload: [${JSON.stringify(payload)}]`;
 			const axiosConfig = new STSAxiosConfig(url, "post").withDefaultHeaders().withData(payload);
-			const agentManager = this.GetAgentManager();
+			const agentManager = this.GetAuthAgentManager();
 			if (agentManager) axiosConfig.withAgentManager(agentManager);
 			const retVal = await createRetryAxiosClient({
 				maxRetries: 4,
@@ -457,7 +461,7 @@ var TestCaseFhirQueryBase = class extends TestCaseFhirBase {
 	}
 	GetClient = async () => {
 		let client;
-		if (this.runner.options.fhirOptions.socketClientMode === "no-socket-client") client = await this.GetRESTClient();
+		if (this.runner.options.fhirOptions.stsfhirsocketclientmode === "no-socket-client") client = await this.GetRESTClient();
 		else client = await this.GetFhirSocketClient();
 		return client;
 	};