@resolveio/client-lib-core 1.5.1 → 1.6.0

package/fesm2020/resolveio-client-lib-core.mjs

@@ -282,7 +282,9 @@ class SocketService {
                     clearTimeout(this.pongTimeout);
                 }
                 else {
-                    this.onmessage(event);
+                    let messageData = JSON.parse(event.data);
+                    messageData = this.convertUTCDateToLocalDate(messageData);
+                    this.onmessage(messageData);
                 }
             };
             this.ws.onerror = (event) => {
@@ -292,10 +294,30 @@ class SocketService {
             };
         }
     }
+    convertUTCDateToLocalDate(data) {
+        if (Array.isArray(data)) {
+            return data.map(item => this.convertUTCDateToLocalDate(item));
+        }
+        else if (typeof data === 'object' && data !== null) {
+            const keys = Object.keys(data);
+            keys.forEach((key) => {
+                data[key] = this.convertUTCDateToLocalDate(data[key]);
+            });
+            return data;
+        }
+        else if (typeof data === 'string') {
+            // Check if the string is an ISO date format
+            const datePattern = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z$/;
+            if (datePattern.test(data)) {
+                return new Date(data);
+            }
+        }
+        return data;
+    }
     startPinging() {
         this.pingInterval = setInterval(() => {
             if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-                this.ws.send(JSON.stringify(['ping'])); // You can adjust this based on the server's expectations
+                this.send('ping');
                 this.pongTimeout = setTimeout(() => {
                     this.log(new Date(), 'WS', 'pong not received, closing connection');
                     this.close();
@@ -311,8 +333,23 @@ class SocketService {
             clearTimeout(this.pongTimeout);
         }
     }
+    convertDatesToUTC(obj) {
+        for (let key in obj) {
+            if (obj.hasOwnProperty(key)) {
+                if (obj[key] instanceof Date) {
+                    // Convert Date to UTC ISO String
+                    obj[key] = obj[key].toISOString();
+                }
+                else if (typeof obj[key] === 'object' && obj[key] !== null) {
+                    // Recursively look for Date objects within arrays or nested objects
+                    this.convertDatesToUTC(obj[key]);
+                }
+            }
+        }
+    }
     send(...data) {
         if (this.ws && this.ws.readyState === this.ws.OPEN) {
+            data.forEach(item => this.convertDatesToUTC(item));
             this.ws.send(JSON.stringify(data));
             return true;
         }
@@ -1135,48 +1172,7 @@ class SocketManagerService {
             this.socketStatus = socketStatus;
         });
         this._socket.onmessage = (event) => {
-            let resData = JSON.parse(event.data, dateReviver);
-            if (resData.data === 'reloadWSCommand') {
-                window.location.href = window.location.href + '?forceReload=true';
-            }
-            else if (resData.data === 'reconnectWSCommand') {
-                this._socket.reconnect();
-            }
-            else if (resData.data === 'disconnectWSCommand') {
-                this.closeSocket();
-            }
-            let offlineIndex = this._offlineUpdates.findIndex(a => a.messageId === resData.messageId);
-            if (offlineIndex >= 0) {
-                this._offline.removeDocument(this._offlineUpdates[offlineIndex].type, this._offlineUpdates[offlineIndex].id_offline_doc);
-                this._offlineUpdates.splice(offlineIndex, 1);
-            }
-            if (resData.data !== 'ACK' && resData.data !== 'NACK') {
-                if (this._cbArray.map(a => a.messageId).includes(resData.messageId)) {
-                    let index = this._cbArray.findIndex(a => a.messageId === resData.messageId);
-                    if (index >= 0) {
-                        clearInterval(this._cbArray[index].timerId);
-                        if (this._cbArray[index].cb) {
-                            this._cbArray[index].cb(resData.hasError ? resData.data : null, resData.hasError ? null : resData.data);
-                            this._cbArray[index].resolveFn(resData.hasError ? resData.data : null);
-                        }
-                        else {
-                            if (resData.hasError) {
-                                this._cbArray[index].rejectFn(resData.data);
-                            }
-                            else {
-                                this._cbArray[index].resolveFn(resData.data);
-                            }
-                        }
-                        this._cbArray.splice(index, 1);
-                    }
-                }
-                else if (this._subArray.map(a => a.messageId).includes(resData.messageId)) {
-                    let index = this._subArray.findIndex(a => a.messageId === resData.messageId);
-                    if (index >= 0) {
-                        this._subArray[index].subject.next(resData.data);
-                    }
-                }
-            }
+            this.handleMessage(event);
         };
         this._socket.onopen = (event) => {
             this._connectionDelayTimeout = setTimeout(() => {
@@ -1242,6 +1238,49 @@ class SocketManagerService {
             }
         }, 25);
     }
+    handleMessage(resData) {
+        if (resData.data === 'reloadWSCommand') {
+            window.location.href = window.location.href + '?forceReload=true';
+        }
+        else if (resData.data === 'reconnectWSCommand') {
+            this._socket.reconnect();
+        }
+        else if (resData.data === 'disconnectWSCommand') {
+            this.closeSocket();
+        }
+        let offlineIndex = this._offlineUpdates.findIndex(a => a.messageId === resData.messageId);
+        if (offlineIndex >= 0) {
+            this._offline.removeDocument(this._offlineUpdates[offlineIndex].type, this._offlineUpdates[offlineIndex].id_offline_doc);
+            this._offlineUpdates.splice(offlineIndex, 1);
+        }
+        if (resData.data !== 'ACK' && resData.data !== 'NACK') {
+            if (this._cbArray.map(a => a.messageId).includes(resData.messageId)) {
+                let index = this._cbArray.findIndex(a => a.messageId === resData.messageId);
+                if (index >= 0) {
+                    clearInterval(this._cbArray[index].timerId);
+                    if (this._cbArray[index].cb) {
+                        this._cbArray[index].cb(resData.hasError ? resData.data : null, resData.hasError ? null : resData.data);
+                        this._cbArray[index].resolveFn(resData.hasError ? resData.data : null);
+                    }
+                    else {
+                        if (resData.hasError) {
+                            this._cbArray[index].rejectFn(resData.data);
+                        }
+                        else {
+                            this._cbArray[index].resolveFn(resData.data);
+                        }
+                    }
+                    this._cbArray.splice(index, 1);
+                }
+            }
+            else if (this._subArray.map(a => a.messageId).includes(resData.messageId)) {
+                let index = this._subArray.findIndex(a => a.messageId === resData.messageId);
+                if (index >= 0) {
+                    this._subArray[index].subject.next(resData.data);
+                }
+            }
+        }
+    }
     openSocket(environment, protocols) {
         this._socket.openSocket(environment, protocols);
     }