@nsshunt/ststestrunner 1.1.42 → 1.1.44

package/dist/ststestrunner.mjs

@@ -1,6 +1,6 @@
 import { AbstractRunnerExecutionWorker } from "@nsshunt/stsrunnerframework";
 import chalk from "chalk";
-import { STSAxiosConfig, Sleep, createAgentManager, defaultLogger, emptyLogger, isNode } from "@nsshunt/stsutils";
+import { STSAxiosConfig, Sleep, createAgentManager, isNode } from "@nsshunt/stsutils";
 import { FhirRESTClient, FhirSocketClientAllInOne, FhirSocketClientIndividual, createRetryAxiosClient } from "@nsshunt/stsfhirclient";
 import http from "node:http";
 import https from "node:https";
@@ -84,7 +84,7 @@ var TestCaseFhirBase = class {
 			endpoint: fhirOptions.stsfhirserverendpoint,
 			stsfhirapiroot: fhirOptions.stsfhirapiroot,
 			stsfhirport: fhirOptions.stsfhirport,
-			logger: defaultLogger,
+			logger: this.#runnerExecutionWorker.logger,
 			agentManager: this.GetFhirAgentManager(),
 			onRetryAttempt
 		});
@@ -142,7 +142,7 @@ var TestCaseFhirBase = class {
 				baseUrl: fhirOptions.stsfhirbaseurl,
 				agentManager: this.GetFhirAgentManager(),
 				joinRooms: [],
-				logger: defaultLogger,
+				logger: this.#runnerExecutionWorker.logger,
 				authToken: await this.GetAccessTokenForSocketClientAccess(),
 				GetAccessToken: this.GetAccessToken
 			};
@@ -35747,17 +35747,17 @@ var ResourceDataGenerator = class {
 //#region src/libmodule/workerTestCaseLogPublisher.ts
 var WorkerTestCaseLogPublisher = class extends SocketIoClient {
 	#id;
-	#rooms;
-	constructor(rooms) {
+	#options;
+	constructor(options) {
 		super("ststestrunner:SocketClientLogPublisher");
-		this.#rooms = rooms;
 		this.#id = crypto.randomUUID();
+		this.#options = options;
 	}
 	Start = (im_endpoint, im_port, im_namespace) => {
 		this.LogDebugMessage(chalk.cyan(`${this.logPrefix}Start()`));
 		const url = `${im_endpoint}:${im_port}/${im_namespace}/`;
 		this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SetupSocket() url: [${url}]`));
-		this.WithAddress(url).WithLogger(defaultLogger).SetupSocket();
+		this.WithAddress(url).WithLogger(this.#options.logger).SetupSocket();
 	};
 	get id() {
 		return this.#id;
@@ -35766,8 +35766,8 @@ var WorkerTestCaseLogPublisher = class extends SocketIoClient {
 		return `ststestrunner:SocketClientLogPublisher:`;
 	}
 	SocketConnect(socket) {
-		this.LogDebugMessage(chalk.magenta(`${this.logPrefix}SocketConnect(): Socket ID: [${socket.id}], Joining Room: [${this.#rooms}]`));
-		socket.emit("__STSjoinRoom", this.#rooms);
+		this.LogDebugMessage(chalk.magenta(`${this.logPrefix}SocketConnect(): Socket ID: [${socket.id}], Joining Room: [${this.#options.rooms}]`));
+		socket.emit("__STSjoinRoom", this.#options.rooms);
 	}
 	SocketError(error) {
 		this.LogErrorMessage(chalk.red(`${this.logPrefix}SocketError(): Error: [${error}]`));
@@ -35787,12 +35787,12 @@ var WorkerTestCaseLogPublisher = class extends SocketIoClient {
 var WorkerTestCaseLogger = class {
 	#options;
 	#socketIoClient;
-	#logger;
 	constructor(opts) {
 		this.#options = opts;
-		if (this.#options.outputToDefaultLogger === true) this.#logger = defaultLogger;
-		else this.#logger = emptyLogger;
-		this.#socketIoClient = new WorkerTestCaseLogPublisher(this.#options.rooms);
+		this.#socketIoClient = new WorkerTestCaseLogPublisher({
+			rooms: this.#options.rooms,
+			logger: this
+		});
 		this.#socketIoClient.Start(opts.imendpoint, opts.import, opts.imsocketnamespace);
 	}
 	UsePrefix = (message) => {
@@ -35800,31 +35800,31 @@ var WorkerTestCaseLogger = class {
 	};
 	error = (message) => {
 		this.log(0, message);
-		this.#logger.error(this.UsePrefix(message));
+		this.#options.additionalLogger.error(this.UsePrefix(message));
 	};
 	warn = (message) => {
 		this.log(1, message);
-		this.#logger.warn(this.UsePrefix(message));
+		this.#options.additionalLogger.warn(this.UsePrefix(message));
 	};
 	info = (message) => {
 		this.log(2, message);
-		this.#logger.info(this.UsePrefix(message));
+		this.#options.additionalLogger.info(this.UsePrefix(message));
 	};
 	http = (message) => {
 		this.log(3, message);
-		this.#logger.http(this.UsePrefix(message));
+		this.#options.additionalLogger.http(this.UsePrefix(message));
 	};
 	verbose = (message) => {
 		this.log(4, message);
-		this.#logger.verbose(this.UsePrefix(message));
+		this.#options.additionalLogger.verbose(this.UsePrefix(message));
 	};
 	debug = (message) => {
 		this.log(5, message);
-		this.#logger.debug(this.UsePrefix(message));
+		this.#options.additionalLogger.debug(this.UsePrefix(message));
 	};
 	silly = (message) => {
 		this.log(6, message);
-		this.#logger.silly(this.UsePrefix(message));
+		this.#options.additionalLogger.silly(this.UsePrefix(message));
 	};
 	log = (level, message) => {
 		this.#socketIoClient.socket?.emit("__STSsendToRoom", this.#options.rooms, {
@@ -35848,7 +35848,7 @@ var WorkerFhirTestCases = class extends AbstractRunnerExecutionWorker {
 		this._options = options;
 		this._resourceDataGenerator = new ResourceDataGenerator();
 		this._workerTestCaseLogger = new WorkerTestCaseLogger({
-			outputToDefaultLogger: this._options.outputToDefaultLogger,
+			additionalLogger: this._options.additionalLogger,
 			imendpoint: this._options.imendpoint,
 			import: this._options.import,
 			imsocketnamespace: this._options.imsocketnamespace,