@nsshunt/stsfhirclient 1.0.56 → 1.0.58

package/dist/stsfhirclient.umd.js

@@ -12,7 +12,7 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
-  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;
   const byteToHex = [];
   for (let i = 0; i < 256; ++i) {
     byteToHex.push((i + 256).toString(16).slice(1));
@@ -5026,10 +5026,12 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       __privateAdd(this, _socketUtils);
       __privateAdd(this, _id, v4());
       __privateAdd(this, _options2);
+      __privateAdd(this, _clientName);
       __privateAdd(this, _debug, (message) => stsutils.defaultLogger.debug(message));
       __privateAdd(this, _error, (error) => stsutils.defaultLogger.error(error));
       __privateAdd(this, _info, (message) => stsutils.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(
@@ -5045,12 +5047,13 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           (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);
         }
@@ -5060,11 +5063,18 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
         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 stsutils.Sleep(100);
@@ -5084,6 +5094,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5107,6 +5118,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5132,6 +5144,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5155,6 +5168,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5180,6 +5194,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5203,6 +5218,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5228,6 +5244,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5251,6 +5268,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5276,6 +5294,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5299,6 +5318,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
           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);
@@ -5311,6 +5331,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
       __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() {
@@ -5320,6 +5341,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
   _socketUtils = new WeakMap();
   _id = new WeakMap();
   _options2 = new WeakMap();
+  _clientName = new WeakMap();
   _debug = new WeakMap();
   _error = new WeakMap();
   _info = new WeakMap();