@nsshunt/ststestrunner 1.1.53 → 1.1.55

package/dist/ststestrunner.mjs

@@ -4,7 +4,6 @@ import { STSAxiosConfig, Sleep, createAgentManager, isNode } from "@nsshunt/stsu
 import { FhirRESTClient, FhirSocketClientAllInOne, FhirSocketClientIndividual, createRetryAxiosClient } from "@nsshunt/stsfhirclient";
 import http from "node:http";
 import https from "node:https";
-import { SocketIoClient } from "@nsshunt/stssocketioutils";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -424,13 +423,23 @@ var TestCaseFhirBase = class {
 	StopRunner = async () => {
 		await this.#OutputLogMessage(`StopRunner [${this.#runner.id}]`);
 		await this.#ForcePublishTelemetryData();
-		this.Debug(`TestCaseFhirBase:StopRunner(): Calling: [#fhirClient.Terminate()]`);
+		if (this.fhirClient) {
+			this.Debug(`TestCaseFhirBase:StopRunner(): Calling: [fhirClient.ResetSocket()]`);
+			this.fhirClient.ResetSocket();
+			await Sleep(100);
+			this.fhirClient = null;
+		}
 		return true;
 	};
 	TerminateRunner = async () => {
 		await this.#OutputLogMessage(`TerminateRunner [${this.#runner.id}]`);
 		await this.#ForcePublishTelemetryData();
-		this.Debug(`TestCaseFhirBase:TerminateRunner(): Calling: [#fhirClient.Terminate()]`);
+		if (this.fhirClient) {
+			this.Debug(`TestCaseFhirBase:TerminateRunner(): Calling: [fhirClient.ResetSocket()]`);
+			this.fhirClient.ResetSocket();
+			await Sleep(100);
+			this.fhirClient = null;
+		}
 		return true;
 	};
 	Completed = async () => {
@@ -438,7 +447,12 @@ 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();
-		this.Debug(`TestCaseFhirBase:Completed(): Calling: [#fhirClient.Terminate()]`);
+		if (this.fhirClient) {
+			this.Debug(`TestCaseFhirBase:Completed(): Calling: [fhirClient.ResetSocket()]`);
+			this.fhirClient.ResetSocket();
+			await Sleep(100);
+			this.fhirClient = null;
+		}
 		return true;
 	};
 	PauseRunner = async () => {
@@ -454,6 +468,12 @@ var TestCaseFhirBase = class {
 	ResetRunner = async () => {
 		await this.#OutputLogMessage(`ResetRunner [${this.#runner.id}]`);
 		await this.#ForcePublishTelemetryData();
+		if (this.fhirClient) {
+			this.Debug(`TestCaseFhirBase:ResetRunner(): Calling: [fhirClient.ResetSocket()]`);
+			this.fhirClient.ResetSocket();
+			await Sleep(100);
+			this.fhirClient = null;
+		}
 		return true;
 	};
 	UpdateRunner = async () => {
@@ -35779,122 +35799,20 @@ var ResourceDataGenerator = class {
 	};
 };
 //#endregion
-//#region src/libmodule/workerTestCaseLogPublisher.ts
-var WorkerTestCaseLogPublisher = class extends SocketIoClient {
-	#id;
-	#options;
-	constructor(options) {
-		super("ststestrunner:SocketClientLogPublisher");
-		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(this.#options.logger).SetupSocket();
-	};
-	get id() {
-		return this.#id;
-	}
-	get logPrefix() {
-		return `ststestrunner:SocketClientLogPublisher:`;
-	}
-	SocketConnect(socket) {
-		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}]`));
-	}
-	SetupSocketEvents(socket) {
-		this.LogDebugMessage(chalk.magenta(`${this.logPrefix}SetupSocketEvents(): Socket ID: [${socket.id}]`));
-	}
-	SocketConnectError(error) {
-		this.LogErrorMessage(chalk.red(`${this.logPrefix}SocketConnectError(): Error: [${error}]`));
-	}
-	SocketDisconnect(reason) {
-		this.LogErrorMessage(chalk.red(`${this.logPrefix}SocketDisconnect(): reason: [${reason}]`));
-	}
-};
-//#endregion
-//#region src/libmodule/workerTestCaseLogger.ts
-var WorkerTestCaseLogger = class {
-	#options;
-	#socketIoClient;
-	constructor(opts) {
-		this.#options = opts;
-		this.#socketIoClient = new WorkerTestCaseLogPublisher({
-			rooms: this.#options.rooms,
-			logger: this
-		});
-		this.#socketIoClient.Start(opts.imendpoint, opts.import, opts.imsocketnamespace);
-	}
-	UsePrefix = (message) => {
-		return `[][] ==>> ${message}`;
-	};
-	error = (message) => {
-		this.log(0, message);
-		this.#options.additionalLogger.error(this.UsePrefix(message));
-	};
-	warn = (message) => {
-		this.log(1, message);
-		this.#options.additionalLogger.warn(this.UsePrefix(message));
-	};
-	info = (message) => {
-		this.log(2, message);
-		this.#options.additionalLogger.info(this.UsePrefix(message));
-	};
-	http = (message) => {
-		this.log(3, message);
-		this.#options.additionalLogger.http(this.UsePrefix(message));
-	};
-	verbose = (message) => {
-		this.log(4, message);
-		this.#options.additionalLogger.verbose(this.UsePrefix(message));
-	};
-	debug = (message) => {
-		this.log(5, message);
-		this.#options.additionalLogger.debug(this.UsePrefix(message));
-	};
-	silly = (message) => {
-		this.log(6, message);
-		this.#options.additionalLogger.silly(this.UsePrefix(message));
-	};
-	log = (level, message) => {
-		this.#socketIoClient.socket?.emit("__STSsendToRoom", this.#options.rooms, {
-			command: "logmessage",
-			payload: {
-				level,
-				message,
-				dateTime: Date.now()
-			}
-		});
-	};
-};
-//#endregion
 //#region src/libmodule/workerFhirTestCases.ts
 var WorkerFhirTestCases = class extends AbstractRunnerExecutionWorker {
 	_options;
 	_resourceDataGenerator;
-	_workerTestCaseLogger;
 	constructor(options) {
 		super();
 		this._options = options;
 		this._resourceDataGenerator = new ResourceDataGenerator();
-		this._workerTestCaseLogger = new WorkerTestCaseLogger({
-			additionalLogger: this._options.additionalLogger,
-			imendpoint: this._options.imendpoint,
-			import: this._options.import,
-			imsocketnamespace: this._options.imsocketnamespace,
-			rooms: [...this._options.rooms]
-		});
 	}
 	get resourceDataGenerator() {
 		return this._resourceDataGenerator;
 	}
 	get logger() {
-		return this._workerTestCaseLogger;
+		return this._options.logger;
 	}
 	CreateAsyncRunner = async (testRunnerTelemetryPayload) => {
 		return AsyncRunnerFactory.CreateAsyncRunner(this, testRunnerTelemetryPayload);