@chat21/chat21-ionic 3.0.103-rc.2 → 3.0.104

package/CHANGELOG.md

@@ -1,9 +1,15 @@
 # chat21-ionic ver 3.0
 
+### 3.0.104 in PROD
+- bug-fixed: messages are lost after chrome close all websocket connections due to inactivity and mqtt not reconnected automatically
+
+### 3.0.103 in PROD
+
 ### 3.0.103-rc.2
 - added: google signIn for mobile platform
 - added: FMC and inAppBrowser plugins
 - minor improvements on canned responses component
+- changed: /email/send with new API 
 
 ### 3.0.103-rc.1
 - added: ANGULAR 12 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.103-rc.2",
+    "version": "3.0.104",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {
@@ -109,9 +109,14 @@
             "cordova-plugin-whitelist": {},
             "cordova-plugin-statusbar": {},
             "cordova-plugin-splashscreen": {},
-            "cordova-plugin-ionic-webview": {},
+            "cordova-plugin-ionic-webview": {
+                "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+            },
             "cordova-plugin-ionic-keyboard": {},
             "cordova-plugin-chooser": {},
+            "cordova-android-support-gradle-release": {
+                "ANDROID_SUPPORT_VERSION": "27.+"
+            },
             "cordova-plugin-network-information": {},
             "cordova-plugin-inappbrowser": {},
             "cordova-plugin-fcm-with-dependecy-updated": {
@@ -139,9 +144,6 @@
                 "DEEPLINK_4_HOST": " ",
                 "DEEPLINK_5_SCHEME": " ",
                 "DEEPLINK_5_HOST": " "
-            },
-            "cordova-android-support-gradle-release": {
-                "ANDROID_SUPPORT_VERSION": "27.+"
             }
         },
         "platforms": [

package/src/app/app.component.ts

@@ -129,7 +129,7 @@ export class AppComponent implements OnInit {
     public webSocketJs: WebSocketJs,
     public scriptService: ScriptService,
     public location: Location,
-    private fcm: FCM
+    public fcm: FCM
   ) {
 
     this.saveInStorageNumberOfOpenedChatTab();
@@ -847,7 +847,7 @@ export class AppComponent implements OnInit {
     }
   }
 
-  private manageTabNotification(sound_type: string, badgeNotificationCount?: number) {
+  private manageTabNotification(sound_type: string, canSound: boolean, badgeNotificationCount?: number) {
     if (!this.isTabVisible) {
       // TAB IS HIDDEN --> manage title and SOUND
       let badgeNewConverstionNumber = badgeNotificationCount? badgeNotificationCount : this.conversationsHandlerService.countIsNew()
@@ -870,8 +870,8 @@ export class AppComponent implements OnInit {
     if(sound_status && sound_status !== 'undefined'){
       this.isSoundEnabled = sound_status === 'enabled'? true: false
     }
-    this.logger.debug('[APP-COMP] manageTabNotification can saund?', this.isInitialized, this.isSoundEnabled, sound_type)
-    if(this.isInitialized && this.isSoundEnabled) {
+    this.logger.debug('[APP-COMP] manageTabNotification can saund?', canSound, this.isSoundEnabled, sound_type)
+    if(this.isSoundEnabled && canSound) {
       switch(sound_type){
         case 'conv_added': {
           this.soundConversationAdded();
@@ -997,9 +997,9 @@ export class AppComponent implements OnInit {
     this.events.subscribe('unservedRequest:count', this.subscribeUnservedRequestCount)
     this.events.subscribe('convList:onConversationSelected', this.subscribeConversationSelected)
     this.conversationsHandlerService.conversationAdded.subscribe((conversation: ConversationModel) => {
-      // this.logger.log('[APP-COMP] ***** subscribeConversationAdded *****', conversation);
+      this.logger.log('[APP-COMP] ***** subscribeConversationAdded *****', conversation);
       if (conversation && conversation.is_new === true) {
-        this.manageTabNotification('conv_added')
+        this.manageTabNotification('conv_added', conversation.sound)
       }
       if(conversation) this.updateConversationsOnStorage()
     });
@@ -1019,7 +1019,7 @@ export class AppComponent implements OnInit {
           let checkIfStatusChanged = changes.value.is_new === changes.previousValue.is_new? true: false
           let checkIfUidChanged = changes.value.uid === changes.previousValue.uid? true: false
           if(changes.value.is_new && checkIfStatusChanged && checkIfUidChanged){
-            this.manageTabNotification('new_message');
+            this.manageTabNotification('new_message', true);
           }
         }
       }
@@ -1195,7 +1195,7 @@ export class AppComponent implements OnInit {
     if (hasClickedLogout === true) {
       this.segmentSignedOut()
       this.appStorageService.removeItem('conversations')
-      this.isInitialized = false;
+
       // ----------------------------------------------
       // PUSH NOTIFICATIONS
       // ----------------------------------------------
@@ -1223,7 +1223,7 @@ export class AppComponent implements OnInit {
     if(unservedRequestCount && unservedRequestCount > 0){
       this.logger.debug("subscribeUnservedRequestCount appIsInitialized::::",this.isInitialized)
       if(this.isInitialized){
-        this.manageTabNotification('conv_unassigned', unservedRequestCount) //sound and alternate title
+        this.manageTabNotification('conv_unassigned', true, unservedRequestCount) //sound and alternate title
       }
     }
   }
@@ -1284,6 +1284,8 @@ export class AppComponent implements OnInit {
     this.presenceService.removePresence();
     this.tiledeskAuthService.logOut()
     this.messagingAuthService.logout()
+    this.isInitialized = false;
+    this.events.publish('appComp:appIsInitialized', false)
   }
 
   private initConversationsHandler(userId: string) {
@@ -1342,7 +1344,7 @@ export class AppComponent implements OnInit {
   }
 
   private handleNotifications(){
-    if(this.platform.is('cordova')){
+    if(!this.platform.is('desktop')){
        this.fcm.onNotification().subscribe(data => {
           let pageUrl = 'conversation-detail/'
           if (data.wasTapped) {

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.ts

@@ -117,10 +117,10 @@ export class IonConversationDetailComponent extends ConversationContentComponent
     //   console.log('[CONVS-DETAIL] translations: ', labels);
     // });
     this.translate.get(['AddAsCannedResponse', 'ViewedPage']).subscribe((text: string) => {
-        console.log('[CONVS-DETAIL] AddAsCannedResponse translated: ', text);
-        this.addAsCannedResponseTooltipText = text['AddAsCannedResponse']
-        this.viewedPageTooltipText = text['ViewedPage']
-      })
+      this.logger.log('[CONVS-DETAIL] AddAsCannedResponse translated: ', text);
+      this.addAsCannedResponseTooltipText = text['AddAsCannedResponse']
+      this.viewedPageTooltipText = text['ViewedPage']
+    })
   }
 
   listenToUploadFileProgress() {

package/src/app/components/utils/user-presence/user-presence.component.ts

@@ -67,7 +67,7 @@ export class UserPresenceComponent implements OnInit, OnDestroy {
     subscribtion = this.subscriptions.find(item => item.key === subscribtionKey);
     if (!subscribtion) {
       subscribtion = this.presenceService.BSIsOnline.subscribe((data: any) => {
-        this.logger.log('[USER-PRESENCE-COMP] $subs to BSIsOnline - data ', data);
+        // this.logger.log('[USER-PRESENCE-COMP] $subs to BSIsOnline - data ', data);
         if (data) {
           const userId = data.uid;
           const isOnline = data.isOnline;

package/src/app/modals/send-email/send-email.page.ts

@@ -18,7 +18,6 @@ export class SendEmailModal implements OnInit {
   @Input() enableBackdropDismiss: any
   @Input() conversationWith: string;
   @Input() msg: string;
-  // @Input() email: string;
   @Input() projectId: string;
   @Input() translationMap: Map<string, string>;
   @Output() onSubmitForm = new EventEmitter<{}>();
@@ -72,8 +71,6 @@ export class SendEmailModal implements OnInit {
     return this.formBuilder.group({
       subject: ['', [Validators.required]],
       text: ['', Validators.required],
-      // to: this.email,
-      // request_id: this.conversationWith
     })
   }
   async onClose() {

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

@@ -1244,7 +1244,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
     subscription = this.subscriptions.find(item => item.key === subscriptionKey);
     if (!subscription) {
       subscription = this.presenceService.BSIsOnline.subscribe((data: any) => {
-        this.logger.log('[USER-PRESENCE-COMP] $subs to BSIsOnline - data ', data);
+        // this.logger.log('[USER-PRESENCE-COMP] $subs to BSIsOnline - data ', data);
         if (data) {
           const userId = data.uid;
           const isOnline = data.isOnline;

package/src/assets/js/chat21client.js

@@ -1,7 +1,7 @@
 /*
     Chat21Client
 
-    v0.1.12.6
+    v0.1.12.7
 
     @Author Andrea Sponziello
     @Member Gabriele Panico
@@ -24,7 +24,6 @@ class Chat21Client {
         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) {
@@ -545,7 +544,7 @@ class Chat21Client {
             if (this.log) {
                 console.log("this.on_message_handler already subscribed. Reconnected num", this.reconnections)
             }
-            callbsubscribedCallbackack();
+            subscribedCallback();
             return
         }
         this.subscribeToMyConversations(() => {
@@ -999,7 +998,10 @@ class Chat21Client {
         
         this.client.on('connect', // TODO if token is wrong it must reply with an error!
             () => {
-                if (this.log) {console.log("Chat client connected. User:" + user_id)}
+                if (this.log) {
+                    console.log("Chat client connected. User:" + user_id)
+                    console.log("Chat client connected. this.connected:" + this.connected)
+                }
                 if (!this.connected) {
                     if (this.log) {console.log("Chat client first connection for:" + user_id)}
                     this.connected = true
@@ -1026,6 +1028,7 @@ class Chat21Client {
         );
         this.client.on('close',
             () => {
+                this.connected = false
                 if (this.log) {console.log("Chat client close event");}
             }
         );

package/src/chat21-core/models/conversation.ts

@@ -20,6 +20,7 @@ export class ConversationModel {
     public color: string,
     public avatar: string,
     public archived: boolean,
-    public type: string
+    public type: string,
+    public sound: boolean
   ) { }
 }

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

@@ -153,6 +153,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
         this.logger.debug('[MQTTConversationsHandler] connecting MQTT conversations handler');
         const handlerConversationAdded = this.chat21Service.chatClient.onConversationAdded( (conv) => {
             let conversation = this.completeConversation(conv); // needed to get the "conversation_with", and find the conv in the conv-history
+            conversation.sound = true
             this.logger.log("onConversationAdded completed:",conversation);
             const index = this.searchIndexInArrayForConversationWith(this.conversations, conversation.conversation_with);
             if (index > -1) {
@@ -165,6 +166,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
             }
         });
         const handlerConversationUpdated = this.chat21Service.chatClient.onConversationUpdated( (conv, topic) => {
+            conv.sound = true;
             this.logger.debug('[MQTTConversationsHandler] conversation updated:', JSON.stringify(conv));
             this.changed(conv);
         });
@@ -187,6 +189,7 @@ export class MQTTConversationsHandler extends ConversationsHandlerService {
             this.logger.debug('[MQTTConversationsHandler] Last conversations', conversations, 'err', err);
             if (!err) {
                 conversations.forEach(conv => {
+                    conv.sound = false;
                     this.added(conv);
                 });
                 loaded();

package/src/chat21-core/providers/mqtt/mqtt-presence.service.ts

@@ -45,7 +45,7 @@ export class MQTTPresenceService extends PresenceService {
     const that = this;
     let local_BSIsOnline = new BehaviorSubject<any>(null);
     this.webSocketService.wsRequesterStatus$.subscribe((data: any) => {
-    this.logger.log('[NATIVEPresenceSERVICE] $subs to wsService - data ', data, userid);
+    // this.logger.log('[NATIVEPresenceSERVICE] $subs to wsService - data ', data, userid);
     if (data && data.presence && data.presence.status === 'online' ) {
         that.BSIsOnline.next({ uid: data.uuid_user, isOnline: true });
         local_BSIsOnline.next({ uid: data.uuid_user, isOnline: true });

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

@@ -34,7 +34,8 @@ export class ConvertRequestToConversation {
             getColorBck(request.lead.fullname),
             avatarPlaceholder(request.lead.fullname),
             false,
-            'text'
+            'text',
+            false
         ); 
     }