@chat21/chat21-ionic 3.4.27-rc20 → 3.4.27-rc21

package/CHANGELOG.md

@@ -8,6 +8,10 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 3.4.27-rc21
+- **changed**: new wss reconnect and timeout keepalive 
+- **bug-fixed**: cannot route if senderFullaname contains /
+
 # 3.4.27-rc20
 - **added**: onOpenTicketExternally event in triggerEvents service
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.4.27-rc20",
+    "version": "3.4.27-rc21",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.component.ts

@@ -896,7 +896,7 @@ export class AppComponent implements OnInit {
 
       let pageUrl = 'conversation-detail/'
       if (IDConv && FullNameConv) {
-        pageUrl += IDConv + '/' + FullNameConv + '/' + Convtype
+        pageUrl += IDConv + '/' + encodeURIComponent(FullNameConv) + '/' + Convtype
       }
 
       const queryParams = this.route.snapshot.queryParams;
@@ -904,7 +904,7 @@ export class AppComponent implements OnInit {
       pageUrl += queryString ? `?${queryString}` : '';
 
       // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
-      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ));
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'));
 
 
       // const DASHBOARD_URL = this.appConfigProvider.getConfig().DASHBOARD_URL;
@@ -1356,7 +1356,7 @@ export class AppComponent implements OnInit {
   subscribeChangedConversationSelected = (user: UserModel, type: string) => {
     this.logger.log('[APP-COMP] subscribeUidConvSelectedChanged navigateByUrl', user, type);
     // this.router.navigateByUrl('conversation-detail/' + user.uid + '?conversationWithFullname=' + user.fullname);
-    this.router.navigateByUrl('conversation-detail/' + user.uid + '/' + user.fullname + '/' + type);
+    this.router.navigateByUrl('conversation-detail/' + user.uid + '/' + encodeURIComponent(user.fullname) + '/' + type);
   }
 
   subscribeProfileInfoButtonLogOut = (hasClickedLogout) => {
@@ -1532,10 +1532,10 @@ export class AppComponent implements OnInit {
             let Convtype = 'active'
             
             if (IDConv && FullNameConv) {
-              pageUrl += IDConv + '/' + FullNameConv + '/' + Convtype
+              pageUrl += IDConv + '/' + encodeURIComponent(FullNameConv) + '/' + Convtype
             }
             // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
-            this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ));
+            this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'));
           } else {
             console.log("FCM: Received in foreground", JSON.stringify(data));
             // let IDConv = data.recipient
@@ -1546,7 +1546,7 @@ export class AppComponent implements OnInit {
             //   pageUrl += IDConv + '/' + FullNameConv + '/' + Convtype
             // }
             // // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
-            // this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ));
+            // this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'));
           };
         });
     }

package/src/app/components/conversation-info/info-content/info-content.component.ts

@@ -70,8 +70,8 @@ export class InfoContentComponent implements OnInit {
     this.route.paramMap.subscribe(params => {
       this.logger.log('[INFO-CONTENT-COMP] initialize params: ', params);
       this.conversationWith = params.get('IDConv');
-      this.conversationWithFullname = params.get('FullNameConv');
-      this.conv_type = params.get('Convtype');
+      this.conversationWithFullname = decodeURIComponent(params.get('FullNameConv'));
+      this.conv_type = decodeURIComponent(params.get('Convtype'));
 
       const conversationWith_segments = this.conversationWith.split('-');
 

package/src/app/pages/conversation-detail/conversation-detail.page.ts

@@ -262,8 +262,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     this.route.paramMap.subscribe((params) => {
       this.logger.log('[CONVS-DETAIL] - constructor -> params: ', params)
       this.conversationWith = params.get('IDConv')
-      this.conversationWithFullname = params.get('FullNameConv')
-      this.conv_type = params.get('Convtype')
+      this.conversationWithFullname = decodeURIComponent(params.get('FullNameConv'))
+      this.conv_type = decodeURIComponent(params.get('Convtype'))
 
       this.events.publish('supportconvid:haschanged', this.conversationWith)
     })

package/src/app/pages/conversations-list/conversations-list.page.ts

@@ -925,24 +925,22 @@ export class ConversationListPage implements OnInit {
       this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile())
       this.logger.log('[CONVS-LIST-PAGE] DESKTOP (window < 768)', this.navService)
       this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.conversationSelected conversation_with_fullname ', this.conversationSelected)
-      let pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType
-      pageUrl += queryString ? `?${queryString}` : '';
+      let pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + encodeURIComponent(this.conversationSelected.conversation_with_fullname) + '/' + converationType
       this.logger.log('[CONVS-LIST-PAGE] pageURL', pageUrl)
         // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
-      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ), {replaceUrl: true})
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'), {replaceUrl: true})
     } else {
       this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.conversationSelected conversation_with_fullname ', this.conversationSelected)
       this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile())
       this.logger.log('[CONVS-LIST-PAGE] MOBILE (window >= 768) ', this.navService)
       let pageUrl = 'conversation-detail/' + this.uidConvSelected
       if (this.conversationSelected && this.conversationSelected.conversation_with_fullname) {
-        pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType
+        pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + encodeURIComponent(this.conversationSelected.conversation_with_fullname) + '/' + converationType
       }
       pageUrl += queryString ? `?${queryString}` : '';
       this.logger.log('[CONVS-LIST-PAGE] setUidConvSelected navigateByUrl--->: ', pageUrl)
       // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
-      
-      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ), {replaceUrl: true})
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'), {replaceUrl: true})
     }
   }
 

package/src/app/services/nav-proxy.service.ts

@@ -4,7 +4,6 @@ import { Router, NavigationExtras } from '@angular/router';
 
 // utils
 import { checkPlatformIsMobile } from '../../chat21-core/utils/utils';
-// import { ConversationDetailPage } from '../pages/conversation-detail/conversation-detail.page';
 
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';

package/src/app/services/websocket/websocket-js.ts

@@ -8,14 +8,13 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 export class WebSocketJs {
 
   public url;
-  public onCreate;
-  public onUpdate;
-  public onOpen;
-  public onData;
+  public onCreate?: Function;
+  public onUpdate?: Function;
+  public onOpen?: Function;
+  public onData?: Function;
   public ws;
   public topics;
   public callbacks;
-  public readyState: number;
   // public userHasClosed: boolean;
 
   // HEARTBEAT https://github.com/zimv/websocket-heartbeat-js/blob/master/lib/index.js
@@ -23,13 +22,15 @@ export class WebSocketJs {
   private pongTimeoutId;
 
   public pingMsg = { action: "heartbeat", payload: { message: { text: "ping" } } }
-
   public pongMsg = { action: "heartbeat", payload: { message: { text: "pong" } } }
 
-
   public pongTimeout = 10000;
   public pingTimeout = 15000;
 
+  private reconnectAttempts = 0;
+  private readonly maxReconnectDelay = 30000;
+  private manuallyClosed = false;
+
   // nktest
   // startTimeMS = 0;
 
@@ -78,7 +79,7 @@ export class WebSocketJs {
     this.callbacks.set(topic, { onCreate: onCreate, onUpdate: onUpdate, onData: onData });
     this.logger.log('[WEBSOCKET-JS] - CALLBACK-SET - callbacks', this.callbacks);
 
-    if (this.ws && this.ws.readyState == 1) {
+    if (this.ws && this.ws.readyState == WebSocket.OPEN) {
       this.logger.log('[WEBSOCKET-JS] - REF - READY STATE ', this.ws.readyState);
       this.logger.log('[WEBSOCKET-JS] - REF - READY STATE = 1 > SUBSCRIBE TO TOPICS ');
 
@@ -126,10 +127,8 @@ export class WebSocketJs {
         method: undefined
       },
     };
-    var str = JSON.stringify(message);
-    this.logger.log("[WEBSOCKET-JS] - SUBSCRIBE TO TOPIC - STRING TO SEND " + str, " FOR SUBSCRIBE TO TOPIC: ", topic);
-
-    this.send(str, `SUBSCRIBE to ${topic}`);
+    this.logger.log("[WEBSOCKET-JS] - SUBSCRIBE TO TOPIC - DATA TO SEND ", message, " FOR SUBSCRIBE TO TOPIC: ", topic);
+    this.send(message, `SUBSCRIBE to ${topic}`);
   }
 
   // -----------------------------------------------------------------------------------------------------
@@ -170,12 +169,11 @@ export class WebSocketJs {
         method: undefined
       },
     };
-    var str = JSON.stringify(message);
-    this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE str " + str);
+    this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE " + message);
 
-    if (this.ws && this.ws.readyState == 1) {
-      this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE TO TOPIC - STRING TO SEND " + str, " FOR UNSUBSCRIBE TO TOPIC: ", topic);
-      this.send(str, `UNSUSCRIBE from ${topic}`);
+    if (this.ws && this.ws.readyState == WebSocket.OPEN) {
+      this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE TO TOPIC - DATA TO SEND ", message, " FOR UNSUBSCRIBE TO TOPIC: ", topic);
+      this.send(message, `UNSUSCRIBE from ${topic}`);
 
     } else if (this.ws) {
       this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE TRY 'SEND' BUT READY STASTE IS : ", this.ws.readyState);
@@ -185,10 +183,10 @@ export class WebSocketJs {
   // -----------------------------------------------------------------------------------------------------
   // @ send - 
   // -----------------------------------------------------------------------------------------------------
-  send(initialMessage, calling_method) {
+  send(data, calling_method) {
     // this.logger.log("[WEBSOCKET-JS] - SEND - INIZIAL-MSG ", initialMessage, " CALLED BY ", calling_method);
 
-    this.ws.send(initialMessage);
+    this.ws.send(JSON.stringify(data));
   }
 
 
@@ -205,6 +203,23 @@ export class WebSocketJs {
       this.ws.close();
     }
     this.heartReset();
+    this.manuallyClosed = true;
+  }
+
+  reconnect(url, onCreate, onUpdate, onData, onOpen = undefined, onOpenCallback = undefined, _topics = [], _callbacks = new Map()) {
+    this.reconnectAttempts++;
+    const delay = Math.min(this.reconnectAttempts * 1000, this.maxReconnectDelay);
+
+    console.log(`WebSocket reconnect in ${delay}ms`);
+    const that = this;
+    setTimeout(() => {
+      if (!that.manuallyClosed) {
+        that.init(url, onCreate, onUpdate, onData, onOpen, function () {
+          that.logger.log('[WEBSOCKET-JS] websocket IS CLOSED ... CALLING RESUSCRIBE ');
+          that.resubscribe();
+        }, that.topics, that.callbacks);
+      }
+    }, delay);
   }
 
   // -----------------------------------------------------------------------------------------------------
@@ -272,41 +287,45 @@ export class WebSocketJs {
   // -----------------------------------------------------------------------------------------------------
   // @ HeartStart
   // -----------------------------------------------------------------------------------------------------
-  heartStart() {
+  private heartStart() {
     // this.getRemainingTime();
-    this.pingTimeoutId = setTimeout(() => {
-
-      // Qui viene inviato un battito cardiaco Dopo averlo ricevuto, viene restituito un messaggio di battito cardiaco.
-      // onmessage Ottieni il battito cardiaco restituito per indicare che la connessione è normale
-      if (this.ws && this.ws.readyState == 1) {
-
-        this.logger.log("[WEBSOCKET-JS] - HEART-START - SEND PING-MSG");
-
-        this.send(JSON.stringify(this.pingMsg), 'HEART-START')
 
-      } else if (this.ws) {
+    // usa intervallo adattivo se tab è in background (Chrome throtla i timer)
+    const adaptivePing = document.hidden ? this.pingTimeout * 3 : this.pingTimeout;
 
-        this.logger.log("[WEBSOCKET-JS] - HEART-START - TRY TO SEND PING-MSG BUT READY STATE IS ", this.ws.readyState);
+    // pianifica invio ping
+    this.pingTimeoutId = setTimeout(() => {
+      if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
 
-      }
+      // Qui viene inviato un battito cardiaco. Dopo averlo ricevuto, viene restituito un messaggio di battito cardiaco.
+      // onmessage Ottieni il battito cardiaco restituito per indicare che la connessione è normale
+      this.send(this.pingMsg, 'HEART-START')
 
       // Se non viene ripristinato dopo un determinato periodo di tempo, il backend viene attivamente disconnesso
       this.pongTimeoutId = setTimeout(() => {
-   this.logger.log("[WEBSOCKET-JS] - HEART-START - PONG-TIMEOUT-ID  - CLOSE WS ");
+        this.logger.log("[WEBSOCKET-JS] - HEART-START - PONG-TIMEOUT-ID  - CLOSE WS ");
         // se onclose Si esibirà reconnect，Eseguiamo ws.close() Bene, se lo esegui direttamente reconnect Si innescherà onclose Causa riconnessione due volte
         this.ws.close();
-      }, this.pongTimeout);
+      }, this.pongTimeout) as unknown as number;
+
+
+    }, adaptivePing);
 
-    }, this.pingTimeout);
   }
 
   // -----------------------------------------------------------------------------------------------------
   // @ heartReset
   // -----------------------------------------------------------------------------------------------------
-  heartReset() {
-    // this.logger.log("[WEBSOCKET-JS] - HEART-RESET");
-    clearTimeout(this.pingTimeoutId);
-    clearTimeout(this.pongTimeoutId);
+  private heartReset() {
+    if (this.pongTimeoutId !== undefined) {
+      clearTimeout(this.pongTimeoutId);
+      this.pongTimeoutId = undefined;
+    }
+
+    if (this.pingTimeoutId !== undefined) {
+      clearTimeout(this.pingTimeoutId);
+      this.pingTimeoutId = undefined;
+    }
   }
 
   // -----------------------------------------------------------------------------------------------------
@@ -315,7 +334,7 @@ export class WebSocketJs {
   init(url, onCreate, onUpdate, onData, onOpen = undefined, onOpenCallback = undefined, _topics = [], _callbacks = new Map()) {
 
 
-
+    this.manuallyClosed = false;
     this.url = url;
     this.onCreate = onCreate;
     this.onUpdate = onUpdate;
@@ -360,19 +379,12 @@ export class WebSocketJs {
       that.ws.onopen = function (e) {
         that.logger.log('[WEBSOCKET-JS] - websocket is connected ...', e);
 
-        // -----------------
-        // @ heartCheck
-        // -----------------
+        // Inizializza heartbeat
         that.heartCheck();
+        that.reconnectAttempts = 0;
 
-
-        if (onOpenCallback) {
-          onOpenCallback();
-        }
-
-        if (that.onOpen) {
-          that.onOpen();
-        }
+        if (onOpenCallback) { onOpenCallback(); }
+        if (that.onOpen) { that.onOpen(); }
 
       }
 
@@ -389,13 +401,21 @@ export class WebSocketJs {
         // --------------------
         // @ init > resubscribe
         // --------------------
+        that.heartReset();
 
-        setTimeout(function () {
-          that.init(url, onCreate, onUpdate, onData, onOpen, function () {
+        if (!that.manuallyClosed) {
+          that.reconnect(url, onCreate, onUpdate, onData, onOpen, function () {
             that.logger.log('[WEBSOCKET-JS] websocket IS CLOSED ... CALLING RESUSCRIBE ');
             that.resubscribe();
           }, that.topics, that.callbacks);
-        }, 3000);
+        }
+
+        // setTimeout(function () {
+        //   that.init(url, onCreate, onUpdate, onData, onOpen, function () {
+        //     that.logger.log('[WEBSOCKET-JS] websocket IS CLOSED ... CALLING RESUSCRIBE ');
+        //     that.resubscribe();
+        //   }, that.topics, that.callbacks);
+        // }, 3000);
       }
 
       // -----------------------------------------------------------------------------------------------------
@@ -415,8 +435,9 @@ export class WebSocketJs {
         // let test = '{ "action": "publish","payload": {"topic": "/5df26badde7e1c001743b63c/requests", "method": "CREATE", "message": [ { "_id": "5f29372d690e6f0034edf100", "status": 200, "preflight": false, "hasBot": true, "participants": ["bot_5df272e8de7e1c001743b645"],  "participantsAgents": [], "participantsBots": ["5df272e8de7e1c001743b645"], "request_id": "support-group-MDszsSJlwqQn1_WCh6u", "requester": "5f29371b690e6f0034edf0f5", "lead": "5f29372d690e6f0034edf0ff", "first_text": "ocourse the email is valid ","department": "5df26badde7e1c001743b63e", "agents": [{"user_available": true,"online_status": "online", "number_assigned_requests": 35, "_id": "5e0f2119705a35001725714d","id_project": "5df26badde7e1c001743b63c", "id_user": "5aaa99024c3b110014b478f0", "role": "admin", "createdBy": "5df26ba1de7e1c001743b637","createdAt": "2020-01-03T11:10:17.123Z", "updatedAt": "2020-01-03T11:10:17.123Z", "__v": 0 }, { "user_available": false, "online_status": "offline", "number_assigned_requests": 0, "_id": "5e1a13824437eb0017f712b4", "id_project": "5df26badde7e1c001743b63c","id_user": "5ac7521787f6b50014e0b592", "role": "admin", "createdBy": "5df26ba1de7e1c001743b637", "createdAt": "2020-01-11T18:27:14.657Z","updatedAt": "2020-01-11T18:27:14.657Z", "__v": 0}, { "user_available": false,"online_status": "offline", "number_assigned_requests": 0, "_id": "5df26bdfde7e1c001743b640", "id_project": "5df26badde7e1c001743b63c", "id_user": "5de9200d6722370017731969","role": "admin","createdBy": "5df26ba1de7e1c001743b637", "createdAt": "2019-12-12T16:33:35.244Z", "updatedAt": "2019-12-12T16:33:35.244Z","__v": 0 }, {"user_available": true, "online_status": "online","number_assigned_requests": -11, "_id": "5eb1a3647ac005003480f54d", "id_project": "5df26badde7e1c001743b63c","id_user": "5e09d16d4d36110017506d7f","role": "owner", "createdBy": "5aaa99024c3b110014b478f0","createdAt": "2020-05-05T17:33:24.328Z", "updatedAt": "2020-05-05T17:33:24.328Z","__v": 0}], "sourcePage": "https://www.tiledesk.com/pricing-self-managed/", "language": "en","userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36","attributes": { "departmentId": "5df26badde7e1c001743b63e","departmentName": "Default Department","ipAddress": "115.96.30.154","client": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36","sourcePage": "https://www.tiledesk.com/pricing-self-managed/", "projectId": "5df26badde7e1c001743b63c", "requester_id": "ce31d3fd-a358-49c7-9b9f-5aead8330063", "subtype": "info","decoded_jwt": {"_id": "ce31d3fd-a358-49c7-9b9f-5aead8330063","firstname": "Guest", "id": "ce31d3fd-a358-49c7-9b9f-5aead8330063", "fullName": "Guest ","iat": 1596536604,"aud": "https://tiledesk.com","iss": "https://tiledesk.com","sub": "guest","jti": "702a4a7e-e56a-43cf-aadd-376f7c12f633"}},"id_project": "5df26badde7e1c001743b63c","createdBy": "ce31d3fd-a358-49c7-9b9f-5aead8330063","tags": [], "notes": [],"channel": {"name": "chat21"},"createdAt": "2020-08-04T10:23:41.641Z","updatedAt": "2021-03-25T18:01:13.371Z","__v": 3,"assigned_at": "2020-08-04T10:25:26.059Z","channelOutbound": {"name": "chat21"},"snapshot": {"agents": [{"id_user": "5aaa99024c3b110014b478f0"}, {"id_user": "5ac7521787f6b50014e0b592"}, {"id_user": "5de9200d6722370017731969"}, { "id_user": "5e09d16d4d36110017506d7f"}]},"id": "5f29372d690e6f0034edf100","requester_id": "5f29372d690e6f0034edf0ff"}]}}'
         // let test_due = '{ "action": "publish","payload": {"topic": "/5df26badde7e1c001743b63c/requests", "method": "CREATE", "message": [ { "_id": "5f29372d690e6f0034edf100", "status": 200, "preflight": false, "hasBot": true, "participants": ["bot_5df272e8de7e1c001743b645"],  "participantsAgents": [], "participantsBots": ["5df272e8de7e1c001743b645"], "request_id": "support-group-MDszsSJlwqQn1_WCh6u", "requester": "5f29371b690e6f0034edf0f5", "lead": "5f29372d690e6f0034edf0ff", "first_text": "ocourse the email is valid ","department": "5df26badde7e1c001743b63e", "agents": [{"user_available": true,"online_status": "online", "number_assigned_requests": 35, "_id": "5e0f2119705a35001725714d","id_project": "5df26badde7e1c001743b63c", "id_user": "5aaa99024c3b110014b478f0", "role": "admin", "createdBy": "5df26ba1de7e1c001743b637","createdAt": "2020-01-03T11:10:17.123Z", "updatedAt": "2020-01-03T11:10:17.123Z", "__v": 0 }, { "user_available": false, "online_status": "offline", "number_assigned_requests": 0, "_id": "5e1a13824437eb0017f712b4", "id_project": "5df26badde7e1c001743b63c","id_user": "5ac7521787f6b50014e0b592", "role": "admin", "createdBy": "5df26ba1de7e1c001743b637", "createdAt": "2020-01-11T18:27:14.657Z","updatedAt": "2020-01-11T18:27:14.657Z", "__v": 0}, { "user_available": false,"online_status": "offline", "number_assigned_requests": 0, "_id": "5df26bdfde7e1c001743b640", "id_project": "5df26badde7e1c001743b63c", "id_user": "5de9200d6722370017731969","role": "admin","createdBy": "5df26ba1de7e1c001743b637", "createdAt": "2019-12-12T16:33:35.244Z", "updatedAt": "2019-12-12T16:33:35.244Z","__v": 0 }, {"user_available": true, "online_status": "online","number_assigned_requests": -11, "_id": "5eb1a3647ac005003480f54d", "id_project": "5df26badde7e1c001743b63c","id_user": "5e09d16d4d36110017506d7f","role": "owner", "createdBy": "5aaa99024c3b110014b478f0","createdAt": "2020-05-05T17:33:24.328Z", "updatedAt": "2020-05-05T17:33:24.328Z","__v": 0}], "sourcePage": "https://www.tiledesk.com/pricing-self-managed/", "language": "en","userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36","attributes": { "departmentId": "5df26badde7e1c001743b63e","departmentName": "Default Department","ipAddress": "115.96.30.154","client": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36","sourcePage": "https://www.tiledesk.com/pricing-self-managed/", "projectId": "5df26badde7e1c001743b63c", "requester_id": "ce31d3fd-a358-49c7-9b9f-5aead8330063", "subtype": "info","decoded_jwt": {"_id": "ce31d3fd-a358-49c7-9b9f-5aead8330063","firstname": "Guest", "id": "ce31d3fd-a358-49c7-9b9f-5aead8330063", "fullName": "Guest ","iat": 1596536604,"aud": "https://tiledesk.com","iss": "https://tiledesk.com","sub": "guest","jti": "702a4a7e-e56a-43cf-aadd-376f7c12f633"}},"id_project": "5df26badde7e1c001743b63c","createdBy": "ce31d3fd-a358-49c7-9b9f-5aead8330063","tags": [], "notes": [],"channel": {"name": "chat21"},"createdAt": "2020-08-04T10:23:41.641Z","updatedAt": "2021-03-25T18:01:13.371Z","__v": 3,"assigned_at": "2020-08-04T10:25:26.059Z","channelOutbound": {"name": "chat21"},"_snapshot": {"agents": [{"id_user": "5aaa99024c3b110014b478f0"}, {"id_user": "5ac7521787f6b50014e0b592"}, {"id_user": "5de9200d6722370017731969"}, { "id_user": "5e09d16d4d36110017506d7f"}]},"id": "5f29372d690e6f0034edf100","requester_id": "5f29372d690e6f0034edf0ff"}]}}'
 
+        let json;
         try {
-          var json = JSON.parse(message.data);
+          json = JSON.parse(message.data);
           // var json = JSON.parse(test_due);
           // this.logger.log('% »»» WebSocketJs - websocket onmessage JSON.parse(message.data) json payload', json.payload);
           // this.logger.log('% »»» WebSocketJs - websocket onmessage JSON.parse(message.data) json payload topic', json.payload.topic);
@@ -426,30 +447,27 @@ export class WebSocketJs {
           return;
         }
 
+        
+        // -----------------------
+        // HEARTBEAT HANDLING
+        // @ check the action and the message's text - 
+        // if action is 'heartbeat' and text is ping send the PONG message and return
+        // -----------------------
+        if (json.action === "heartbeat") {
+          const text = json?.payload?.message?.text;
+
+          // Server -> Client ping
+          if (text === "ping") {
+            that.send(that.pongMsg, 'ON-MESSAGE');
+            return;
+          }
 
-        // -------------------
-        // @ heartCheck
-        // -------------------
-        that.heartCheck();
-
-        // --------------------------------------------------------------------------------------------------------------------
-        // @ check the action and the message's text - if action is 'heartbeat' and text is ping send the PONG message and return
-        // --------------------------------------------------------------------------------------------------------------------
-
-        if (json.action == "heartbeat") {
-
-          if (json.payload.message.text == "ping") {
-            // -------------------
-            // @ send PONG
-            // -------------------
-            // that.logger.log('[WEBSOCKET-JS] -  RECEIVED PING -> SEND PONG MSG');
-
-            that.send(JSON.stringify(that.pongMsg), 'ON-MESSAGE')
-
-          } else {
-            // nk
-            // this.logger.log('[WEBSOCKET-JS] - NOT RECEIVED PING ');
+          // Server -> Client pong (risposta al nostro ping)
+          if (text === "pong") {
+            that.heartCheck();
+            return;
           }
+
           return;
         }
 

package/src/app/shared/shared.module.ts

@@ -26,8 +26,6 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { createTranslateLoader } from 'src/chat21-core/utils/utils';
 import { HttpClient } from '@angular/common/http';
 
-// import { MessageTextAreaComponent } from '../components/conversation-detail/message-text-area/message-text-area.component'; // MessageTextAreaComponent is part of the declarations ConversationDetailPageModule
-
 @NgModule({
   declarations: [
      //CONVERSATION_LIST