@chat21/chat21-ionic 3.0.59-rc15 → 3.0.59-rc21

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # chat21-ionic ver 3.0
 
+### 3.0.59-rc21
+- chat21client.js -> v0.1.9
+
+### 3.0.59-rc20
+- Improves the transition from "mobile" to "desktop" mode and vice versa by not reloading the app 
+
+### 3.0.59-rc19
+- Fixes the bug: when the chat is in "mobile" mode and from the dashboard the agent clicks on "Open chat" for a specific conversation the "back" button of the chat does not return to the list of conversations
+- Fixes the bug: when the chat is in "mobile" mode and from the dashboard the agent clicks on "Open chat" for a specific conversation the chat does not display the details of the conversation
+
+### 3.0.59-rc18
+- Improves the "app-config" service
+
+### 3.0.59-rc16
+- Changes in config.xml the value of the "SplashScreen"
+- Improves the method to avoid page reloading when an agent clicks the "Open Chat" button of the dashboard on the realtime and non-real time conversation list page and on the conversation detail page
+- Modifies the "app-config" service by adding the ability to pass relative URLs to the websocket
+- Adds "wsUrlRel" property to env.sample, chat-config-template.json and chat-config.json
+- Adds a check in the "websocket-js.ts" service on the existence of the "ws" property of the "WebSocketJs" class before accessing the property "readyState"
+
 ### 3.0.59-rc15
 - Implements a method in app.components that counts and stores the number of open Chat tabs
 - Implements a method on the conversation list page that prevents a new chat tab from opening when the agent clicks "Open Chat" from the dashboard

package/config.xml

@@ -18,17 +18,8 @@
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreenDuration" value="300" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
-    <preference name="SplashScreen" value="assets/splash_white.jpg" />
+    <preference name="SplashScreen" value="assets/logo.png" />
     <preference name="SplashScreenDelay" value="3000" />
-    <platform name="browser">
-        <preference name="SplashScreen" value="assets/transparent.png" />
-        <preference name="AutoHideSplashScreen" value="true" />
-        <preference name="SplashScreenDelay" value="3000" />
-        <preference name="SplashScreenBackgroundColor" value="white" />
-        <preference name="ShowSplashScreen" value="false" />
-        <preference name="SplashScreenWidth" value="600" />
-        <preference name="SplashScreenHeight" value="300" />
-    </platform>
     <platform name="android">
         <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
             <application android:networkSecurityConfig="@xml/network_security_config" />

package/env.sample

@@ -1,7 +1,7 @@
 API_BASEIMAGE_URL=CHANGEIT
 DASHBOARD_URL=https://YOUR_DASHBOARD_URL
 WS_URL=wss://YOUR_TILEDESK_SERVER_URL?token=
-
+WS_URL_RELATIVE=********
 SERVER_BASE_URL=http://localhost:3000/
 
 CHAT21_ENGINE=mqtt

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@chat21/chat21-ionic",
-    "version": "3.0.59-rc15",
+    "version": "3.0.59-rc21",
     "author": "Tiledesk SRL",
     "homepage": "https://ionicframework.com/",
     "scripts": {

package/src/app/app.component.scss

@@ -1,6 +1,11 @@
-@media (min-width: 768px) {
-    .split-pane-md.split-pane-visible > .split-pane-side {
-        min-width: 312px;
-        display: block; // Safari bug fix
-    }
+.split-pane-md.split-pane-visible > .split-pane-side { 
+    min-width: 312px;
+    display: block; // Safari bug fix
 }
+
+// @media (min-width: 768px) {
+//     .split-pane-md.split-pane-visible > .split-pane-side {
+//         min-width: 312px;
+//         display: block; // Safari bug fix
+//     }
+// }

package/src/app/app.component.ts

@@ -2,7 +2,7 @@ import { URL_SOUND_LIST_CONVERSATION } from './../chat21-core/utils/constants';
 import { ArchivedConversationsHandlerService } from 'src/chat21-core/providers/abstract/archivedconversations-handler.service';
 import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 
-import { Component, ViewChild, NgZone, OnInit, HostListener, ElementRef, Renderer2, } from '@angular/core';
+import { Component, ViewChild, NgZone, OnInit, HostListener, ElementRef, Renderer2, AfterViewInit, } from '@angular/core';
 import { Config, Platform, IonRouterOutlet, IonSplitPane, NavController, MenuController, AlertController, IonNav, ToastController } from '@ionic/angular';
 import { ActivatedRoute, NavigationStart, Router } from '@angular/router';
 import { Subscription, VirtualTimeScheduler } from 'rxjs';
@@ -57,7 +57,7 @@ import { NetworkService } from './services/network-service/network.service';
 import * as PACKAGE from 'package.json';
 import { filter } from 'rxjs/operators'
 import { WebSocketJs } from './services/websocket/websocket-js';
-
+import { Location } from '@angular/common'
 // import { filter } from 'rxjs/operators';
 
 @Component({
@@ -108,7 +108,7 @@ export class AppComponent implements OnInit {
     private splashScreen: SplashScreen,
     private statusBar: StatusBar,
     private appConfigProvider: AppConfigProvider,
-    private events: EventsService,
+    public events: EventsService,
     public config: Config,
     public chatManager: ChatManager,
     public translate: TranslateService,
@@ -139,14 +139,71 @@ export class AppComponent implements OnInit {
     // private tiledeskService: TiledeskService,
     private networkService: NetworkService,
     public webSocketJs: WebSocketJs,
+    public location: Location
   ) {
 
     this.saveInStorageNumberOfOpenedChatTab();
-    this.getPageState();
-    // FOR TEST
-    // const last_project = { "user_available": true, "number_assigned_requests": 59, "last_login_at": "2021-08-09T17:30:55.234Z", "status": "active", "_id": "6112bc8f58c958003495a2cb", "id_project": { "status": 100, "_id": "60ffe291f725db00347661ef", "name": "27-LUGLIO-21-STRIPE-TEST", "activeOperatingHours": false, "createdBy": "608ad02d3a4dc000344ade17", "profile": { "name": "pro", "trialDays": 30, "agents": 5, "type": "payment", "subStart": "2021-11-18T10:42:41.000Z", "subEnd": "2021-11-19T10:42:41.000Z", "subscriptionId": "sub_Jvf4kABe9t8JvX", "last_stripe_event": "invoice.payment_succeeded" }, "versions": 20115, "channels": [{ "name": "chat21" }], "createdAt": "2021-07-27T10:40:17.752Z", "updatedAt": "2021-11-18T11:55:01.346Z", "__v": 0, "widget": { "preChatForm": true, "preChatFormJson": [{ "name": "userFullname", "type": "text", "mandatory": true, "label": { "en": "Your name", "it": "Il tuo nome" } }, { "name": "userEmail", "type": "text", "mandatory": true, "regex": "/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$/", "label": { "en": "Your email", "it": "La tua email" }, "errorLabel": { "en": "Invalid email address", "it": "Indirizzo email non valido" } }, { "name": "tel", "mandatory": true, "label": { "en": "Your phone number", "it": "Il tuo numero di telefono" } }], "preChatFormCustomFieldsEnabled": true }, "trialExpired": true, "trialDaysLeft": 84, "isActiveSubscription": true, "id": "60ffe291f725db00347661ef" }, "id_user": "60aa0fef1482fe00346854a7", "role": "admin", "createdBy": "608ad02d3a4dc000344ade17", "createdAt": "2021-08-10T17:51:11.318Z", "updatedAt": "2021-11-19T08:08:21.437Z", "__v": 0, "presence": { "status": "online", "changedAt": "2021-11-19T08:08:21.432Z" }, "isAuthenticated": true, "id": "6112bc8f58c958003495a2cb" }
-    // localStorage.setItem('last_project', JSON.stringify(last_project))
+
+    this.listenToUrlChanges();
+    // this.getPageState();
+
+    // location.subscribe((val) => {
+
+    //   console.log('location subscribe val', val)
+    //   if (val.type == "hashchange") {
+    //     const convId = getParameterByName('convId')
+    //     console.log('[APP-COMP] ngOnInit convId get with getParameterByName  ', convId)
+    //     const requesterFullaname = getParameterByName('requester_fullaname')
+    //     console.log('[APP-COMP] ngOnInit convId get with getParameterByName  ', requesterFullaname);
+
+    //     this.navigateToDetail(convId, requesterFullaname)
+
+    //     this.events.publish('convid:haschanged', convId);
+    //   }
+    // });
+
+
+
+
   }
+
+  listenToUrlChanges() {
+    const self = this;
+    window.addEventListener('hashchange', function () {
+      // console.log('location changed!');
+
+      const convId = getParameterByName('convId')
+      // console.log('[APP-COMP] getParameterByName convId ', convId)
+      if (convId) {
+        setTimeout(() => {
+          self.events.publish('supportconvid:haschanged', convId);
+        }, 0);
+      }
+
+      const contact_id = getParameterByName('contact_id')
+      // console.log('[APP-COMP] getParameterByName contact_id ', contact_id)
+      const contact_fullname = getParameterByName('contact_fullname')
+      // console.log('[APP-COMP] getParameterByName contact_fullname ', contact_fullname)
+      if (contact_id && contact_fullname) {
+        setTimeout(() => {
+          self.router.navigateByUrl('conversation-detail/' + contact_id + '/' + contact_fullname + '/new');
+          self.events.publish('directconvid:haschanged', contact_id);
+        }, 0);
+        
+      } else {
+        // console.log('[APP-COMP] contact_id and contact_fullname are null')
+      }
+
+      const conversation_detail = getParameterByName('conversation_detail')
+      // console.log('[APP-COMP] getParameterByName conversation_detail ', conversation_detail)
+      if (conversation_detail) {
+        setTimeout(() => {
+          self.router.navigate(['conversation-detail/'])
+        }, 0);
+      } 
+    });
+  }
+
   saveInStorageNumberOfOpenedChatTab() {
     this.logger.log('Calling saveInStorageChatOpenedTab!');
 
@@ -160,7 +217,9 @@ export class AppComponent implements OnInit {
     }
     const terminationEvent = 'onpagehide' in self ? 'pagehide' : 'unload';
     window.addEventListener(terminationEvent, (event) => {
-      localStorage.tabCount = +localStorage.tabCount - 1;
+      if (localStorage.tabCount > 0) {
+        localStorage.tabCount = +localStorage.tabCount - 1;
+      }
     }, { capture: true });
   }
 
@@ -184,6 +243,7 @@ export class AppComponent implements OnInit {
     // }
 
     const logStateChange = (nextState) => {
+
       const prevState = state;
       if (nextState !== prevState) {
         console.log(`State change: ${prevState} >>> ${nextState}`);
@@ -243,7 +303,7 @@ export class AppComponent implements OnInit {
     if (token) {
       // this.isOnline = false;
       // this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN token get with this.isOnline  ', this.isOnline)
-      this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN token get with getParameterByName  ', token)
+      console.log('[APP-COMP] ngOnInit AUTOLOGIN token get with getParameterByName  ', token)
       // save token in local storage then 
 
       const storedToken = this.appStorageService.getItem('tiledeskToken');
@@ -255,13 +315,13 @@ export class AppComponent implements OnInit {
         this.logger.log('[APP-COMP] ngOnInit AUTOLOGIN the current user already exist DON\'T SAVE ')
       }
     }
-    this.initializeApp('oninit');
 
+
+    this.initializeApp('oninit');
     this.listenToPostMsgs();
   }
 
-
-
+ 
   listenToPostMsgs() {
     window.addEventListener("message", (event) => {
       // console.log("[APP-COMP] message event ", event);
@@ -616,7 +676,7 @@ export class AppComponent implements OnInit {
     } catch (err) {
       this.logger.error('[APP-COMP] -> error:', err);
     }
-    this.chatManager.startApp();
+   // this.chatManager.startApp() // nk moved in chevk platform
   }
 
 
@@ -671,7 +731,7 @@ export class AppComponent implements OnInit {
   }
 
   checkPlatform() {
-    this.logger.debug('[APP-COMP] checkPlatform');
+  //  console.log('[APP-COMP] checkPlatform');
     // let pageUrl = '';
     // try {
     //   const pathPage = this.route.snapshot.firstChild.routeConfig.path;
@@ -687,16 +747,23 @@ export class AppComponent implements OnInit {
     // }
 
     if (checkPlatformIsMobile()) {
+      this.chatManager.startApp()
+      console.log('[APP-COMP] checkPlatformIsMobile',checkPlatformIsMobile());
       this.platformIs = PLATFORM_MOBILE;
       const IDConv = this.route.snapshot.firstChild.paramMap.get('IDConv');
-      this.logger.log('[APP-COMP] PLATFORM_MOBILE2 navigateByUrl', PLATFORM_MOBILE, this.route.snapshot);
+      // console.log('[APP-COMP]  platformIs', this.platformIs);
+      // console.log('[APP-COMP] PLATFORM', PLATFORM_MOBILE, 'route.snapshot', this.route.snapshot);
       if (!IDConv) {
         this.router.navigateByUrl('conversations-list')
       }
       // this.router.navigateByUrl(pageUrl);
       // this.navService.setRoot(ConversationListPage, {});
     } else {
+      this.chatManager.startApp()
+      console.log('[APP-COMP] checkPlatformIsMobile',checkPlatformIsMobile());
       this.platformIs = PLATFORM_DESKTOP;
+      // console.log('[APP-COMP]  platformIs', this.platformIs);
+      // console.log('[APP-COMP] PLATFORM', PLATFORM_DESKTOP, 'route.snapshot',  this.route.snapshot);
       this.logger.log('[APP-COMP] PLATFORM_DESKTOP ', this.navService);
 
       this.navService.setRoot(ConversationListPage, {});
@@ -846,7 +913,7 @@ export class AppComponent implements OnInit {
 
     this.conversationsHandlerService.conversationChanged.subscribe((conversation: ConversationModel) => {
 
-      this.logger.log('[APP-COMP] ***** subscribeConversationChanged conversation: ', conversation);
+      // console.log('[APP-COMP] ***** subscribeConversationChanged conversation: ', conversation);
       const currentUser = JSON.parse(this.appStorageService.getItem('currentUser'));
       this.logger.log('[APP-COMP] ***** subscribeConversationChanged current_user: ', currentUser);
 
@@ -865,7 +932,7 @@ export class AppComponent implements OnInit {
    * apro dettaglio conversazione
    */
   subscribeChangedConversationSelected = (user: UserModel, type: string) => {
-    this.logger.log('[APP-COMP] subscribeUidConvSelectedChanged navigateByUrl', user, type);
+    console.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);
   }
@@ -1018,8 +1085,8 @@ export class AppComponent implements OnInit {
   onResize(event: any) {
     const that = this;
     // this.logger.debug('this.doitResize)', this.doitResize)
-    clearTimeout(this.doitResize);
-    this.doitResize = setTimeout(() => {
+    // clearTimeout(this.doitResize);
+    // this.doitResize = setTimeout(() => {
       let platformIsNow = PLATFORM_DESKTOP;
       if (checkPlatformIsMobile()) {
         platformIsNow = PLATFORM_MOBILE;
@@ -1029,11 +1096,14 @@ export class AppComponent implements OnInit {
       }
       this.logger.debug('[APP-COMP] onResize width::::', window.innerWidth);
       this.logger.debug('[APP-COMP] onResize width:::: platformIsNow', platformIsNow);
-      this.logger.debug('[APP-COMP] onResize width:::: platformIsNow this.platformIs', this.platformIs);
+      console.log('[APP-COMP] onResize width:::: this.platformIs', this.platformIs);
+      console.log('[APP-COMP] onResize width:::: platformIsNow', platformIsNow);
       if (platformIsNow !== this.platformIs) {
-        window.location.reload();
+        // window.location.reload();
+        this.checkPlatform()
       }
-    }, 500);
+  
+    // }, 0);
   }
   // END RESIZE FUNCTIONS //
 

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.html

@@ -3,10 +3,8 @@
   <ion-toolbar>
     
     <ion-buttons slot="start">
-      <!-- (click)="pushPage('conversations-list')" -->
-      <ion-back-button text="" *ngIf="isMobile"
-          defaultHref="/conversations-list"
-         >
+      <!-- (click)="pushPage('conversations-list')" defaultHref="/conversations-list" -->
+      <ion-back-button style="display: block;" text="" *ngIf="isMobile" (click)="goBackToConversationList()">
       </ion-back-button> 
     </ion-buttons>
 

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter, OnChanges } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ImageRepoService } from 'src/chat21-core/providers/abstract/image-repo.service';
 
 // Logger
@@ -43,7 +43,8 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   constructor(
     public imageRepoService: ImageRepoService,
     private route: ActivatedRoute,
-    public platform: Platform
+    public platform: Platform,
+    private router: Router
   ) {
     this.route.paramMap.subscribe(params => {
 
@@ -125,4 +126,8 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   /** */
   pushPage(event) { }
 
+  goBackToConversationList() {
+    this.router.navigateByUrl('/conversations-list');
+  }
+
 }

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

@@ -106,7 +106,28 @@ export class ConversationListPage implements OnInit {
     this.listenGoOnline();
     this.listenGoOffline();
     this.listenToSwPostMessage();
+    this.listenSupportConvIdHasChanged();
+    this.listenDirectConvIdHasChanged();
+  }
+
+  listenSupportConvIdHasChanged() {
+    this.events.subscribe('supportconvid:haschanged', (convId) => {
+      // console.log('[CONVS-LIST-PAGE] - listen To convid:haschanged - convId', convId);
+      if (convId) {
+        const conversationSelected = this.conversations.find(item => item.uid === convId);
+        // console.log('[CONVS-LIST-PAGE] - listen To convid:haschanged - conversationSelected', conversationSelected);
+        this.onConversationSelected(conversationSelected)
+      }
+    });
+  }
 
+  listenDirectConvIdHasChanged() {
+    this.events.subscribe('directconvid:haschanged', (contact_id) => {
+      // console.log('[CONVS-LIST-PAGE] - listen To directconvid:haschanged - contact_id', contact_id);
+      if (contact_id) {
+        this.uidConvSelected = contact_id
+      }
+    });
   }
 
 
@@ -119,41 +140,41 @@ export class ConversationListPage implements OnInit {
 
     const currentUrl = this.router.url;
     this.logger.log('[CONVS-LIST-PAGE] current_url ngOnInit ', currentUrl);
-    this.route.queryParams.subscribe(params => {
-      this.logger.log('[CONVS-LIST-PAGE] ngOnInit params', params);
-      if (params && params.convselected) {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params convselected:', params.convselected);
-      
-        const conversationSelected = this.conversations.find(item => item.uid === params.convselected);
-        if (conversationSelected) {
-          this.conversationSelected = conversationSelected;
-          this.logger.log('[CONVS-LIST-PAGE] ngOnInit params convselected - conversationSelected: ', this.conversationSelected);
-          this.navigateByUrl('active', params.convselected)
-        }
+    // this.route.queryParams.subscribe(params => {
+    //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params', params);
+      // if (params && params.convselected) {
+      //   console.log('[CONVS-LIST-PAGE] ngOnInit params convselected:', params.convselected);
+
+      //   const conversationSelected = this.conversations.find(item => item.uid === params.convselected);
+      //   if (conversationSelected) {
+      //     this.conversationSelected = conversationSelected;
+      //     console.log('[CONVS-LIST-PAGE] ngOnInit params convselected - conversationSelected: ', this.conversationSelected);
+      //     this.navigateByUrl('active', params.convselected)
+      //   }
+
+      // } else {
+      //   console.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
+      // }
+      // if (params && params.contact_id && params.contact_fullname) {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params contact_id:', params.contact_id, 'contact_fullname ', params.contact_fullname);
+      //   this.router.navigateByUrl('conversation-detail/' + params.contact_id + '/' + params.contact_fullname + '/new');
+      //   this.uidConvSelected = params.contact_id
+      // } else {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
+      // }
+
+      // if (params && params.conversation_detail) {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params conversation_detail:', params.conversation_detail);
+      //   this.router.navigateByUrl('conversation-detail/');
+
+      // } else {
+      //   this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
+      // }
 
-      } else {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
-      }
-      if (params && params.contact_id && params.contact_fullname) {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params contact_id:', params.contact_id, 'contact_fullname ', params.contact_fullname);
-        this.router.navigateByUrl('conversation-detail/' + params.contact_id + '/' + params.contact_fullname + '/new');
-        this.uidConvSelected = params.contact_id
-      } else {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
-      }
-
-      if (params && params.conversation_detail) {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params conversation_detail:', params.conversation_detail);
-        this.router.navigateByUrl('conversation-detail/');
-
-      } else {
-        this.logger.log('[CONVS-LIST-PAGE] ngOnInit params NoParams ');
-      }
-
-    });
+    // });
   }
 
-  
+
 
   getSupportMode() {
     this.supportMode = this.appConfigProvider.getConfig().supportMode;
@@ -335,7 +356,6 @@ export class ConversationListPage implements OnInit {
   }
 
   listenGoOnline() {
-
     this.events.subscribe('go:online', (goonline) => {
       this.logger.info('[CONVS-LIST-PAGE] - listen To go:online - goonline', goonline);
       // this.events.unsubscribe('profileInfoButtonClick:logout')
@@ -471,8 +491,11 @@ export class ConversationListPage implements OnInit {
    * evento richiamato quando si seleziona un utente nell'elenco degli user
    * apro dettaglio conversazione
    */
+  // --------------------------------
+  // !!!!!! IS USED? ?????
+  // ------------------------------
   subscribeChangedConversationSelected = (user: UserModel, type: string) => {
-    this.logger.log('[CONVS-LIST-PAGE]  ************** subscribeUidConvSelectedChanged navigateByUrl', user, type);
+    console.log('[CONVS-LIST-PAGE]  ************** subscribeUidConvSelectedChanged navigateByUrl', user, type);
     this.uidConvSelected = user.uid;
     this.logger.log('[CONVS-LIST-PAGE]  ************** uidConvSelected ', this.uidConvSelected);
     // this.conversationsHandlerService.uidConvSelected = user.uid;
@@ -561,6 +584,7 @@ export class ConversationListPage implements OnInit {
     this.initConversationsHandler();
     this.initVariables();
     this.initSubscriptions();
+
     // this.initHandlerEventEmitter();
   }
 
@@ -615,7 +639,7 @@ export class ConversationListPage implements OnInit {
       }
       if (conversationSelected) {
         this.logger.log('[CONVS-LIST-PAGE] conversationSelected', conversationSelected);
-        this.logger.log('[CONVS-LIST-PAGE] la conv ', this.conversationSelected, ' has already been loaded');
+        this.logger.log('[CONVS-LIST-PAGE] the conversation ', this.conversationSelected, ' has already been loaded');
         this.conversationSelected = conversationSelected;
         this.logger.log('[CONVS-LIST-PAGE] setUidConvSelected: ', this.conversationSelected);
       }
@@ -623,7 +647,7 @@ export class ConversationListPage implements OnInit {
   }
 
   onConversationSelected(conversation: ConversationModel) {
-    //console.log('returnSelectedConversation::', conversation)
+    this.logger.log('onConversationSelected conversation', conversation)
     if (conversation.archived) {
       this.navigateByUrl('archived', conversation.uid)
       this.logger.log('[CONVS-LIST-PAGE] onConversationSelected archived conversation.uid ', conversation.uid)
@@ -720,6 +744,7 @@ export class ConversationListPage implements OnInit {
 
 
   navigateByUrl(converationType: string, uidConvSelected: string) {
+    this.logger.log('[CONVS-LIST-PAGE] calling navigateByUrl: ');
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl uidConvSelected: ', uidConvSelected);
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl run  this.setUidConvSelected');
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.uidConvSelected ', this.uidConvSelected);
@@ -727,12 +752,14 @@ export class ConversationListPage implements OnInit {
 
     this.setUidConvSelected(uidConvSelected, converationType);
     if (checkPlatformIsMobile()) {
-      this.logger.log('[CONVS-LIST-PAGE] PLATFORM_MOBILE 1', this.navService);
+      this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile());
+      this.logger.log('[CONVS-LIST-PAGE] DESKTOP (window >= 768)', this.navService);
       let pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType;
       this.logger.log('[CONVS-LIST-PAGE] pageURL', pageUrl)
       this.router.navigateByUrl(pageUrl);
     } else {
-      this.logger.log('[CONVS-LIST-PAGE] PLATFORM_DESKTOP 2', this.navService);
+      console.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;

package/src/app/services/app-config.ts

@@ -18,18 +18,90 @@ export class AppConfigProvider {
 
   /** */
   loadAppConfig() {
-    const that = this;
-    return this.http.get(this.appConfig.remoteConfigUrl).toPromise().then(data => {
-        that.appConfig = data;
+    // const that = this;
+    // return this.http.get(this.appConfig.remoteConfigUrl).toPromise().then(data => {
+    //     that.appConfig = data;
+    //   }).catch(err => {
+    //     console.log('error loadAppConfig' + err);
+    //   });
+
+    // ---- new
+
+
+    return this.http.get(this.appConfig.remoteConfigUrl)
+      .toPromise().then((data: any ) => {
+        // console.log('AppConfigService loadAppConfig data: ', data);
+ 
+        const allconfig = data
+        // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig: ', allconfig);
+
+        if (allconfig.hasOwnProperty('wsUrlRel')) {
+
+          // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig !!!! exist wsUrlRel ->: ', allconfig.wsUrlRel);
+          var wsUrlRelIsEmpty = this.isEmpty(allconfig.wsUrlRel)
+          // console.log('[APP-CONFIG-SERVICE] - loadAppConfig allconfig !!!! exist wsUrlRel -> wsUrlRelIsEmpty ?', wsUrlRelIsEmpty);
+
+          if (wsUrlRelIsEmpty === false) {
+            // console.log('[APP-CONFIG-SERVICE]- loadAppConfig allconfig !!!! exist - SERVER_BASE_URL', data.apiUrl);
+
+            // if (allconfig.apiUrl.indexOf("http://") !== -1) {
+
+            //   const ws_url = allconfig.apiUrl.replace("http://", "ws://").slice(0, -1) + allconfig.wsUrlRel;
+            //   // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTP - wsUrl', ws_url);
+
+            //   allconfig.wsUrl = ws_url
+
+            // } else if (allconfig.apiUrl.indexOf("https://") !== -1) {
+
+            //   const ws_url = allconfig.apiUrl.replace("https://", "wss://").slice(0, -1) + allconfig.wsUrlRel;
+
+            //   allconfig.wsUrl = ws_url
+
+            //   // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL protocol is HTTPS - wsUrl', ws_url);
+            // } else {
+            
+            
+              // console.log('AppConfigService loadAppConfig allconfig !!!! exist - SERVER_BASE_URL !!! IS RELATIVE - window.location ', window.location);
+
+              // console.log(window.location)
+
+              if (window.location.protocol === 'http:') {
+                allconfig.wsUrl = 'ws://' + window.location.hostname + allconfig.wsUrlRel
+
+              } else if (window.location.protocol === 'https:') {
+
+                allconfig.wsUrl = 'wss://' + window.location.hostname + allconfig.wsUrlRel
+              } else {
+
+                allconfig.wsUrl = 'ws://' + window.location.hostname + allconfig.wsUrlRel
+              }
+            // }
+
+          } else {
+            // console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! exist wsUrlRel but IS EMPTY');
+          }
+
+        } else {
+
+          // console.log('[APP-CONFIG-SERVICE] loadAppConfig allconfig !!!! does not exist wsUrlRel');
+        }
+
+        this.appConfig = allconfig;
+      
+
       }).catch(err => {
-        // console.log('error loadAppConfig' + err);
+        console.error('error loadAppConfig' + err);
       });
   }
 
+  isEmpty(wsUrlRel: string) {
+    return (wsUrlRel === undefined || wsUrlRel == null || wsUrlRel.length <= 0) ? true : false;
+  }
+
   /** */
   getConfig() {
     return this.appConfig;
   }
-  
+
 
 }

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

@@ -170,11 +170,11 @@ export class WebSocketJs {
     var str = JSON.stringify(message);
     this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE str " + str);
 
-    if (this.ws.readyState == 1) {
+    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}`);
 
-    } else {
+    } else if (this.ws) {
       this.logger.log("[WEBSOCKET-JS] - UN-SUBSCRIBE TRY 'SEND' BUT READY STASTE IS : ", this.ws.readyState);
     }
   }
@@ -194,7 +194,7 @@ export class WebSocketJs {
   // -----------------------------------------------------------------------------------------------------
   close() {
     this.topics = [];
-    this.callbacks = []; 
+    this.callbacks = [];
     this.logger.log("[WEBSOCKET-JS] - CALLED CLOSE - TOPICS ", this.topics, ' - CALLLBACKS ', this.callbacks);
 
     if (this.ws) {
@@ -275,13 +275,13 @@ export class WebSocketJs {
 
       // 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.readyState == 1) {
+      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 {
+      } else if (this.ws) {
 
         this.logger.log("[WEBSOCKET-JS] - HEART-START - TRY TO SEND PING-MSG BUT READY STATE IS ", this.ws.readyState);
 
@@ -440,7 +440,7 @@ export class WebSocketJs {
             // @ send PONG
             // -------------------
             // that.logger.log('[WEBSOCKET-JS] -  RECEIVED PING -> SEND PONG MSG');
-         
+
             that.send(JSON.stringify(that.pongMsg), 'ON-MESSAGE')
 
           } else {
@@ -463,15 +463,15 @@ export class WebSocketJs {
         if (json && json.payload && json.payload.message && that.isArray(json.payload.message)) {
 
           json.payload.message.forEach(element => {
-  
+
             //let insUp = that.insertOrUpdate(element);
             let insUp = json.payload.method;
-          
+
             var object = { event: json.payload, data: element };
 
             var callbackObj = that.callbacks.get(object.event.topic);
 
-         
+
             if (insUp == "CREATE") {
               if (that.onCreate) {
                 that.onCreate(element, object);
@@ -497,10 +497,10 @@ export class WebSocketJs {
         } else {
           //let insUp = that.insertOrUpdate(json.payload.message);
           let insUp = json.payload.method;
-         
+
           var object = { event: json.payload, data: json };
           var callbackObj = that.callbacks.get(object.event.topic);
-        
+
 
           if (insUp == "CREATE") {
             if (that.onCreate) {

package/src/assets/js/chat21client.js

@@ -1,7 +1,7 @@
 /*
     Chat21Client
 
-    v0.1.8
+    v0.1.9
 
     @Author Andrea Sponziello
     (c) Tiledesk 2020
@@ -22,6 +22,7 @@ class Chat21Client {
         this.client = null;
         this.reconnections = 0 // just to check how many reconnections
         this.client_id = this.uuidv4();
+        this.log = options._log ? true : false;
         if (options && options.MQTTendpoint) {
             if (options.MQTTendpoint.startsWith('/')) {
                 if (this.log) {
@@ -48,7 +49,6 @@ class Chat21Client {
         else {
             this.endpoint = "ws://34.253.207.0:15675/ws"
         }
-        this.log = options.log ? true : false;
         this.APIendpoint = options.APIendpoint;
         this.appid = options.appId;
         if (this.log) {
@@ -90,21 +90,9 @@ class Chat21Client {
         });
     }
 
-    // subscribeToMyMessages() {
-    //     // this subscription because in /conversations I receive my messages
-    //     // 'apps/tilechat/users/ME/messages/TO/outgoing'
-    //     // 'apps/tilechat/users/ME/messages/FROM/incoming'
-    //     let messages_inbox = 'apps/tilechat/users/' + this.user_id + '/messages/+'
-    //     console.log("subscribing to inbox of:", this.user_id, "topic", messages_inbox)
-    //     this.client.subscribe(messages_inbox, (err)  => {
-    //         console.log("subscribed to:", messages_inbox, " with err", err)
-    //     })
-    // }
-
     sendMessage(text, type, recipient_id, recipient_fullname, sender_fullname, attributes, metadata, channel_type, callback) {
-        // callback - function (err) 
-        // console.log("recipient_id:", recipient_id)
-        let dest_topic = `apps/${this.appid}/users/${this.user_id}/messages/${recipient_id}/outgoing`
+        // console.log("sendMessage:",text, recipient_id)
+        let dest_topic = `apps/${this.appid}/outgoing/users/${this.user_id}/messages/${recipient_id}/outgoing`
         // console.log("dest_topic:", dest_topic)
         let outgoing_message = {
             text: text,
@@ -138,7 +126,7 @@ class Chat21Client {
     sendMessageRaw(outgoing_message, recipient_id, callback) {
         // callback - function (err) 
         // console.log("recipient_id:", recipient_id)
-        let dest_topic = `apps/${this.appid}/users/${this.user_id}/messages/${recipient_id}/outgoing`
+        let dest_topic = `apps/${this.appid}/outgoing/users/${this.user_id}/messages/${recipient_id}/outgoing`
         // console.log("dest_topic:", dest_topic)
         // let outgoing_message = {
         //     text: text,
@@ -957,7 +945,7 @@ class Chat21Client {
             clientId: this.client_id,
             username: 'JWT',
             password: jwt,
-            rejectUnauthorized: true
+            rejectUnauthorized: false
         }
         if (this.log) {console.log("starting mqtt connection with LWT on:", presence_topic, this.endpoint)}
         // client = mqtt.connect('mqtt://127.0.0.1:15675/ws',options)

package/src/chat-config-template.json

@@ -25,5 +25,6 @@
     "baseImageUrl": "${API_BASEIMAGE_URL}",
     "dashboardUrl": "${DASHBOARD_URL}",
     "wsUrl": "${WS_URL}",
+    "wsUrlRel": "${WS_URL_RELATIVE}",
     "supportMode": "${SUPPORT_MODE}"
 }

package/src/chat-config.json

@@ -25,5 +25,6 @@
     "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
     "dashboardUrl": "https://support-pre.tiledesk.com/dashboard/",
     "wsUrl": "ws://localhost:3000/",
+    "wsUrlRel": "${WS_URL_RELATIVE}",
     "supportMode": false
 }

package/src/chat21-core/providers/firebase/firebase-notifications.ts

@@ -34,29 +34,37 @@ export class FirebaseNotifications extends NotificationsService {
             this.logger.error("[FIREBASE-NOTIFICATIONS] initialize - Service Worker isn't supported on this browser", navigator)
             return;
         }
-        if (('serviceWorker' in navigator)) {
-            // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser ", navigator)
-            navigator.serviceWorker.getRegistrations().then((serviceWorkerRegistrations) => {
-                this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser serviceWorkerRegistrations", serviceWorkerRegistrations)
-                if (serviceWorkerRegistrations.length > 0) {
-                    serviceWorkerRegistrations.forEach(registration => {
-                        this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registration ", registration)
-                        // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registrations scriptURL", registrations.active.scriptURL)
-                        // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registrations state", registrations.active.state)
-
-                    });
-                } else {
-                    this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser - !not registered",)
-                    // navigator.serviceWorker.register('http://localhost:8101/firebase-messaging-sw.js')
-                    //     .then(function (registration) {
-                    //         console.log('Service worker successfully registered.');
-                    //         return registration;
-                    //     }).catch(function (err) {
-                    //         console.error('Unable to register service worker.', err);
-                    //     });
-                }
-            });
-        }
+        // if (('serviceWorker' in navigator)) {
+        //     navigator.serviceWorker.register('firebase-messaging-sw.js')
+        //         .then(function (registration) {
+        //             console.log('[FIREBASE-NOTIFICATIONS] initialize serviceWorker Registration successful, scope is:', registration.scope);
+
+
+        //             // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser ", navigator)
+        //             // navigator.serviceWorker.getRegistrations().then((serviceWorkerRegistrations) => {
+        //             //     this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser serviceWorkerRegistrations", serviceWorkerRegistrations)
+        //             //     if (serviceWorkerRegistrations.length > 0) {
+        //             //         serviceWorkerRegistrations.forEach(registration => {
+        //             //             this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registration ", registration)
+        //             //             // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registrations scriptURL", registrations.active.scriptURL)
+        //             //             // this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser registrations state", registrations.active.state)
+
+        //             //         });
+        //             //     } else {
+        //             //         this.logger.log("[FIREBASE-NOTIFICATIONS] initialize - Service Worker is supported on this browser - !not registered",)
+        //             //         // navigator.serviceWorker.register('http://localhost:8101/firebase-messaging-sw.js')
+        //             //         //     .then(function (registration) {
+        //             //         //         console.log('Service worker successfully registered.');
+        //             //         //         return registration;
+        //             //         //     }).catch(function (err) {
+        //             //         //         console.error('Unable to register service worker.', err);
+        //             //         //     });
+        //             //     }
+        //             // });
+        //         }).catch(function (err) {
+        //             console.log('Service worker registration failed, error:', err);
+        //         });
+        // }
     }
 
 

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -180,13 +180,11 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             channelType,
             // language,
             (err, message) => {
-                this.logger.log('[MQTTConversationHandler] message: ' + JSON.stringify(message) + ' sent with err: ' + err);
                 if (err) {
-                // cambio lo stato in rosso: invio nn riuscito!!!
-                message.status = '-100';
-                this.logger.log('[MQTTConversationHandler] ERROR', err);
+                    message.status = '-100';
+                    this.logger.log('[MQTTConversationHandler] ERROR', err);
                 } else {
-                message.status = '150';
+                    message.status = '150';
                 }
             }
         );

package/src/chat21-core/utils/utils-message.ts

@@ -19,7 +19,7 @@ export function isFirstMessage(i: number) {
         }
         return false;
       } catch (err) {
-        console.log('error: ', err);
+        console.error('error: ', err);
       }
     }
 }
@@ -103,7 +103,7 @@ export function getSizeImg(message: any, maxWidthImage?: number): any {
       }
       return sizeImage;
     } catch (err) {
-      console.log('error: ', err);
+      console.error('error: ', err);
       return;
     }
 }