@nsshunt/ststestrunner 1.1.44 → 1.1.45

package/dist/ststestrunner.mjs

@@ -162,6 +162,10 @@ var TestCaseFhirBase = class {
 	Debug = (message) => {
 		this.#runnerExecutionWorker.logger.debug(message);
 	};
+	Error = (message) => {
+		this.LogErrorMessage(message);
+		this.#runnerExecutionWorker.logger.error(message);
+	};
 	Warning = (message) => {
 		this.#runnerExecutionWorker.logger.warn(message);
 	};
@@ -289,7 +293,7 @@ var TestCaseFhirBase = class {
 				return "";
 			}
 		} catch (error) {
-			console.error(error);
+			this.Error(error);
 			let details = "None available.";
 			if (error.response && error.response.data) try {
 				details = JSON.stringify(error.response.data);
@@ -352,7 +356,7 @@ var TestCaseFhirBase = class {
 		};
 	};
 	StartTestDataLoad = async () => {
-		console.log(chalk.magenta(`StartTestDataLoad(): Start ...`));
+		this.Debug(chalk.magenta(`StartTestDataLoad(): Start ...`));
 		let VU = 0;
 		const blockNum = VU * 200;
 		const blocksToLoad = 20;
@@ -364,16 +368,16 @@ var TestCaseFhirBase = class {
 				if (recordsetData) {
 					const qqq = recordsetData[0].text;
 					for (let j = 0; j < qqq.length; j++) this.#randomDataRecordset.push(qqq[j]);
-					console.error(chalk.magenta(this.#randomDataRecordset.length));
+					this.Error(chalk.magenta(this.#randomDataRecordset.length));
 				}
-			} else console.error(chalk.magenta(`StartTestDataLoad(): Could not get person records.`));
+			} else this.Error(chalk.magenta(`StartTestDataLoad(): Could not get person records.`));
 			await Sleep(10);
 		}
-		console.log(`Finished load for VU: [${VU}]`);
-		console.log(`First 10 entries`);
-		for (let i = 0; i < 10; i++) console.log(this.#randomDataRecordset[i].id);
-		console.log(`block num: [${blockNum}]   length: [${this.#randomDataRecordset.length}]   VU: [${VU}]`);
-		console.log(chalk.magenta(`StartTestDataLoad(): End`));
+		this.Debug(`Finished load for VU: [${VU}]`);
+		this.Debug(`First 10 entries`);
+		for (let i = 0; i < 10; i++) this.Debug(this.#randomDataRecordset[i].id);
+		this.Debug(`block num: [${blockNum}]   length: [${this.#randomDataRecordset.length}]   VU: [${VU}]`);
+		this.Debug(chalk.magenta(`StartTestDataLoad(): End`));
 	};
 	#ForcePublishTelemetryData = async () => {
 		await this.#PublishTelemetryData();
@@ -417,13 +421,13 @@ var TestCaseFhirBase = class {
 	StopRunner = async () => {
 		await this.#OutputLogMessage(`StopRunner [${this.#runner.id}]`);
 		await this.#ForcePublishTelemetryData();
-		console.log(`TestCaseFhirBase:StopRunner(): Calling: [#fhirClient.Terminate()]`);
+		this.Debug(`TestCaseFhirBase:StopRunner(): Calling: [#fhirClient.Terminate()]`);
 		return true;
 	};
 	TerminateRunner = async () => {
 		await this.#OutputLogMessage(`TerminateRunner [${this.#runner.id}]`);
 		await this.#ForcePublishTelemetryData();
-		console.log(`TestCaseFhirBase:TerminateRunner(): Calling: [#fhirClient.Terminate()]`);
+		this.Debug(`TestCaseFhirBase:TerminateRunner(): Calling: [#fhirClient.Terminate()]`);
 		return true;
 	};
 	Completed = async () => {
@@ -431,7 +435,7 @@ var TestCaseFhirBase = class {
 		this.runner.instrumentData.timer = performance.now() - start;
 		await this.#OutputLogMessage(`Completed [${this.#runner.id}] [${JSON.stringify(this.#runner.instrumentData)}]`);
 		await this.#ForcePublishTelemetryData();
-		console.log(`TestCaseFhirBase:Completed(): Calling: [#fhirClient.Terminate()]`);
+		this.Debug(`TestCaseFhirBase:Completed(): Calling: [#fhirClient.Terminate()]`);
 		return true;
 	};
 	PauseRunner = async () => {
@@ -1395,14 +1399,9 @@ var TestCase01 = class {
 		this.#runnerExecutionWorker = runnerExecutionWorker;
 		this.#runner = runner;
 	}
-	/**
-	* Internal low-level log sink used by this test case.
-	*
-	* Currently disabled/commented out to avoid noisy console output during tests.
-	*
-	* @param message Message to output.
-	*/
-	#LogMessage = (message) => {};
+	Debug = (message) => {
+		this.#runnerExecutionWorker.logger.debug(message);
+	};
 	/**
 	* Generate an animated indented log message for the runner.
 	*
@@ -1429,7 +1428,7 @@ var TestCase01 = class {
 		};
 		const logMessageData = this.#logMessageDataSet[runner.id];
 		const message = `${" ".repeat(logMessageData.indent)} [${runner.id}] >> Hello World << ${iteration}`;
-		this.#LogMessage(message);
+		this.Debug(message);
 		runner.instrumentData.message.push(message);
 		logMessageData.indent += logMessageData.adder;
 		if (logMessageData.indent > 20) logMessageData.adder = -1;
@@ -1450,7 +1449,7 @@ var TestCase01 = class {
 	#SetupTimeout = async () => {
 		if (!this.#publishTelemetryTimeout) {
 			this.#publishTelemetryTimeout = setTimeout(async () => {
-				this.#LogMessage(chalk.yellow(`   PublishTelemetryData - Normal Behaviour (**** TIMEOUT ****) `));
+				this.Debug(chalk.yellow(`   PublishTelemetryData - Normal Behaviour (**** TIMEOUT ****) `));
 				await this.#PublishTelemetryData();
 				this.#publishTelemetryCount = 0;
 				this.#publishTelemetryTimeout = null;
@@ -1479,7 +1478,7 @@ var TestCase01 = class {
 	*/
 	#PublishTelemetryData = async () => {
 		this.#runnerExecutionWorker.PostTelemetryById(this.#runner.id);
-		this.#LogMessage(chalk.red(`------------------------------------------------------------------------------------------------------------`));
+		this.Debug(chalk.red(`------------------------------------------------------------------------------------------------------------`));
 		this.#runner.instrumentData.velocity = 0;
 		this.#runner.instrumentData.message = [];
 		this.#runner.instrumentData.tx = 0;
@@ -1499,7 +1498,7 @@ var TestCase01 = class {
 	* - complete
 	*/
 	#ForcePublishTelemetryData = async () => {
-		this.#LogMessage(chalk.magenta(`   **** FORCED PUBLISH **** `));
+		this.Debug(chalk.magenta(`   **** FORCED PUBLISH **** `));
 		await this.#PublishTelemetryData();
 	};
 	/**
@@ -1520,7 +1519,7 @@ var TestCase01 = class {
 	#PublishTelemetry = async () => {
 		this.#publishTelemetryCount++;
 		if (this.#publishTelemetryCount % this.#maxBufferSize === 0) {
-			this.#LogMessage(chalk.cyan(`   **** MAX COUNT REACHED **** `));
+			this.Debug(chalk.cyan(`   **** MAX COUNT REACHED **** `));
 			this.#publishTelemetryCount = 0;
 			if (this.#publishTelemetryTimeout) {
 				clearTimeout(this.#publishTelemetryTimeout);
@@ -1591,7 +1590,7 @@ var TestCase01 = class {
 		if (this.#runner.instrumentData.requestCount % options.logMessageMod === 0) this.#GenLogMessage(this.#runner, this.#runner.iteration);
 		if (this.#runner.instrumentData.requestCount % 1 === 0) {
 			const message = `Worker: [${this.#runner.asyncRunnerContext.threadId}], Runner: [${this.#runner.asyncRunnerContext.id}] has completed: [${this.#runner.instrumentData.requestCount}] iterations of max: [${options.executionProfile.iterations}]`;
-			this.#LogMessage(message);
+			this.Debug(message);
 			this.#runner.instrumentData.message = [message];
 		}
 		/**
@@ -1620,7 +1619,7 @@ var TestCase01 = class {
 	*/
 	#OutputLogMessage = async (message) => {
 		const messageOutput = chalk.grey(message);
-		this.#LogMessage(messageOutput);
+		this.Debug(messageOutput);
 		this.#runner.instrumentData.message.push(messageOutput);
 		await this.#PublishTelemetry();
 	};
@@ -1807,15 +1806,9 @@ var TestCase02 = class {
 		this.#runnerExecutionWorker = runnerExecutionWorker;
 		this.#runner = runner;
 	}
-	/**
-	* Internal low-level log sink.
-	*
-	* Currently disabled/commented out to avoid noisy console output during normal testing.
-	* The class still uses `console.log(...)` directly in `ExecuteRunner()` for visible progress.
-	*
-	* @param message Message to output.
-	*/
-	#LogMessage = (message) => {};
+	Debug = (message) => {
+		this.#runnerExecutionWorker.logger.debug(message);
+	};
 	/**
 	* Generate an animated indented "Hello World" style log message.
 	*
@@ -1840,7 +1833,7 @@ var TestCase02 = class {
 		};
 		const logMessageData = this.#logMessageDataSet[runner.id];
 		const message = `${" ".repeat(logMessageData.indent)} [${runner.id}] >> Hello World << ${iteration}`;
-		this.#LogMessage(message);
+		this.Debug(message);
 		runner.instrumentData.message.push(message);
 		logMessageData.indent += logMessageData.adder;
 		if (logMessageData.indent > 20) logMessageData.adder = -1;
@@ -1861,7 +1854,7 @@ var TestCase02 = class {
 	#SetupTimeout = async () => {
 		if (!this.#publishTelemetryTimeout) {
 			this.#publishTelemetryTimeout = setTimeout(async () => {
-				this.#LogMessage(chalk.yellow(`   PublishTelemetryData - Normal Behaviour (**** TIMEOUT ****) `));
+				this.Debug(chalk.yellow(`   PublishTelemetryData - Normal Behaviour (**** TIMEOUT ****) `));
 				await this.#PublishTelemetryData();
 				this.#publishTelemetryCount = 0;
 				this.#publishTelemetryTimeout = null;
@@ -1886,7 +1879,7 @@ var TestCase02 = class {
 	*/
 	#PublishTelemetryData = async () => {
 		this.#runnerExecutionWorker.PostTelemetryById(this.#runner.id);
-		this.#LogMessage(chalk.red(`------------------------------------------------------------------------------------------------------------`));
+		this.Debug(chalk.red(`------------------------------------------------------------------------------------------------------------`));
 		this.#runner.instrumentData.velocity = 0;
 		this.#runner.instrumentData.message = [];
 		this.#runner.instrumentData.tx = 0;
@@ -1899,7 +1892,7 @@ var TestCase02 = class {
 	* Used for lifecycle transitions where immediate visibility is desirable.
 	*/
 	#ForcePublishTelemetryData = async () => {
-		this.#LogMessage(chalk.magenta(`   **** FORCED PUBLISH **** `));
+		this.Debug(chalk.magenta(`   **** FORCED PUBLISH **** `));
 		await this.#PublishTelemetryData();
 	};
 	/**
@@ -1920,7 +1913,7 @@ var TestCase02 = class {
 	#PublishTelemetry = async () => {
 		this.#publishTelemetryCount++;
 		if (this.#publishTelemetryCount % this.#maxBufferSize === 0) {
-			this.#LogMessage(chalk.cyan(`   **** MAX COUNT REACHED **** `));
+			this.Debug(chalk.cyan(`   **** MAX COUNT REACHED **** `));
 			this.#publishTelemetryCount = 0;
 			if (this.#publishTelemetryTimeout) {
 				clearTimeout(this.#publishTelemetryTimeout);
@@ -1952,7 +1945,6 @@ var TestCase02 = class {
 	* - updates runner telemetry
 	* - optionally generates animated telemetry messages
 	* - always generates a progress message for telemetry
-	* - always writes a progress message to `console.log(...)`
 	* - simulates work with either:
 	*   - `Sleep(options.sleepDuration)`, or
 	*   - immediate yield
@@ -1973,7 +1965,7 @@ var TestCase02 = class {
 	* Additional visible behaviour
 	* ----------------------------
 	* Unlike `TestCase01`, this implementation always writes a progress message
-	* directly to the process/browser console using `console.log(...)`.
+	* directly to the process/browser console using the provided logger.
 	*
 	* This makes it more useful for manually watching test progress while the
 	* framework is running.
@@ -1992,7 +1984,7 @@ var TestCase02 = class {
 		if (this.#runner.instrumentData.requestCount % options.logMessageMod === 0) this.#GenLogMessage(this.#runner, this.#runner.iteration);
 		if (this.#runner.instrumentData.requestCount % 1 === 0) {
 			const message = `Worker: [${this.#runner.asyncRunnerContext.threadId}], Runner: [${this.#runner.asyncRunnerContext.id}] has completed: [${this.#runner.instrumentData.requestCount}] iterations of max: [${options.executionProfile.iterations}]`;
-			this.#LogMessage(message);
+			this.Debug(message);
 			this.#runner.instrumentData.message = [message];
 		}
 		/**
@@ -2001,7 +1993,7 @@ var TestCase02 = class {
 		* This is the main behavioural difference from `TestCase01`.
 		*/
 		const message = `Worker: [${this.#runner.asyncRunnerContext.threadId}], Runner: [${this.#runner.asyncRunnerContext.id}] has completed: [${this.#runner.instrumentData.requestCount}] iterations of max: [${options.executionProfile.iterations}]`;
-		console.log(message);
+		this.Debug(message);
 		/**
 		* Simulate actual work.
 		*
@@ -2029,7 +2021,7 @@ var TestCase02 = class {
 	*/
 	#OutputLogMessage = async (message) => {
 		const messageOutput = chalk.grey(message);
-		this.#LogMessage(messageOutput);
+		this.Debug(messageOutput);
 		this.#runner.instrumentData.message.push(messageOutput);
 		await this.#PublishTelemetry();
 	};