@nsshunt/stsfhirclient 1.0.56 → 1.0.58

package/dist/stsfhirclient.mjs

@@ -8,7 +8,7 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value2) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value2);
 var __privateSet = (obj, member, value2, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value2) : member.set(obj, value2), value2);
-var _socketUtils, _id, _options2, _debug, _error, _info, _SetupWSSClient, _OnSocketConnected, _options3, _DUMMY_USER, _invokeMethods, _maxRetries, _sleepDuration, _NoRetryStatusCodes, _stsfhirapiroot, _fhirSocketClient, _LogDebugMessage, _LogErrorMessage, _HandleError, _InvokeResourceAPI, _TestMode, ___InvokeResourceAPI, _BuildQueryString;
+var _socketUtils, _id, _options2, _clientName, _debug, _error, _info, _SetupWSSClient, _OnSocketConnected, _options3, _DUMMY_USER, _invokeMethods, _maxRetries, _sleepDuration, _NoRetryStatusCodes, _stsfhirapiroot, _fhirSocketClient, _LogDebugMessage, _LogErrorMessage, _HandleError, _InvokeResourceAPI, _TestMode, ___InvokeResourceAPI, _BuildQueryString;
 import axios from "axios";
 import { defaultLogger, Sleep, STSAxiosConfig } from "@nsshunt/stsutils";
 const byteToHex = [];
@@ -5024,10 +5024,12 @@ class FhirSocketClient {
     __privateAdd(this, _socketUtils);
     __privateAdd(this, _id, v4());
     __privateAdd(this, _options2);
+    __privateAdd(this, _clientName);
     __privateAdd(this, _debug, (message) => defaultLogger.debug(message));
     __privateAdd(this, _error, (error) => defaultLogger.error(error));
     __privateAdd(this, _info, (message) => defaultLogger.info(message));
     __privateAdd(this, _SetupWSSClient, async (clientName, joinRooms) => {
+      console.log(chalk.yellow(`FhirSocketClient:#SetupWSSClient(): ID: [${__privateGet(this, _id)}] clientName: [${clientName}] Starting ...`));
       const cstr = `${__privateGet(this, _options2).fhirServerEndpoint}/nsstsfhir/`;
       console.log(chalk.yellow(`FhirSocketClient:#SetupWSSClient(): Socket connection string: [${cstr}]`));
       __privateGet(this, _socketUtils).SetupClientSideSocket(
@@ -5043,12 +5045,13 @@ class FhirSocketClient {
         (socket2) => {
         },
         // Error Callback
-        (error) => __privateGet(this, _error).call(this, `${clientName}: SetupClientSideSocket call back: [${error}]`)
+        (error) => __privateGet(this, _error).call(this, `FhirSocketClient:#SetupWSSClient(): Error clientName: [${clientName}]: SetupClientSideSocket call back: Error: [${error}]`)
       );
+      console.log(chalk.yellow(`FhirSocketClient:#SetupWSSClient(): ID: [${__privateGet(this, _id)}] clientName: [${clientName}] Started`));
     });
     // Handle connection logic separately
     __privateAdd(this, _OnSocketConnected, (socket, clientName, joinRooms) => {
-      __privateGet(this, _debug).call(this, chalk.green(`${__privateGet(this, _id)} ${clientName}: --> connected`));
+      __privateGet(this, _debug).call(this, chalk.green(`FhirSocketClient:#OnSocketConnected(): ID: [${__privateGet(this, _id)}] clientName: [${clientName}]: --> connected`));
       if (joinRooms.length > 0) {
         socket.emit("__STSjoinRoom", joinRooms);
       }
@@ -5058,11 +5061,18 @@ class FhirSocketClient {
       if (socket && socket.connected === true) {
         return;
       }
+      console.log(chalk.yellow(`FhirSocketClient:#WaitForSocketConnected(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Waiting for connection ...`));
       let connected = false;
+      let attempts = 0;
       while (!connected) {
+        attempts++;
+        if (attempts % 10 === 0) {
+          console.log(chalk.yellow(`FhirSocketClient:#WaitForSocketConnected(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] waiting for connection attempts: [${attempts}].`));
+        }
         const socketRetVal = __privateGet(this, _socketUtils).GetSocket(__privateGet(this, _options2).socketClientName);
         if (socketRetVal && socketRetVal.connected === true) {
           connected = true;
+          console.log(chalk.yellow(`FhirSocketClient:#WaitForSocketConnected(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Connection completed after: [${attempts}] attempts.`));
           break;
         }
         await Sleep(100);
@@ -5082,6 +5092,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("createFhirResource", resource, request, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:CreateResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5105,6 +5116,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("createFhirResources", resource, request, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:CreateResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5130,6 +5142,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("getFhirResource", resource, request, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:GetResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5153,6 +5166,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("getFhirResources", resource, request, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:GetResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5178,6 +5192,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("updateFhirResource", resource, request, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:UpdateResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5201,6 +5216,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("updateFhirResources", resource, request, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:UpdateResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5226,6 +5242,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("patchFhirResource", resource, request, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:PatchResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5249,6 +5266,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("patchFhirResources", resource, request, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:PatchResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5274,6 +5292,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("deleteFhirResource", resource, request, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:DeleteResource(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5297,6 +5316,7 @@ class FhirSocketClient {
         return new Promise((resolve, reject) => {
           this.socket.timeout(__privateGet(this, _options2).timeout).emit("deleteFhirResources", resource, delRequest, (err, res) => {
             if (err) {
+              __privateGet(this, _error).call(this, `FhirSocketClient:DeleteResources(): ID: [${__privateGet(this, _id)}] clientName: [${__privateGet(this, _clientName)}] Error: [${err}]`);
               reject(err);
             } else {
               resolve(res);
@@ -5309,6 +5329,7 @@ class FhirSocketClient {
     __privateSet(this, _options2, options);
     __privateSet(this, _socketUtils, new SocketIoClientHelper(__privateGet(this, _options2).socketIoClientHelperOptions));
     const clientName = v4();
+    __privateSet(this, _clientName, clientName);
     __privateGet(this, _SetupWSSClient).call(this, clientName, []);
   }
   get socket() {
@@ -5318,6 +5339,7 @@ class FhirSocketClient {
 _socketUtils = new WeakMap();
 _id = new WeakMap();
 _options2 = new WeakMap();
+_clientName = new WeakMap();
 _debug = new WeakMap();
 _error = new WeakMap();
 _info = new WeakMap();