@chat21/chat21-web-widget 5.0.61-rc.1 → 5.0.62

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # chat21-web-widget ver 5.0
 
+### 5.0.62 in PROD
+- added: pending messages
+- added: disconnect from messaging handler if no interaction exist within 1 minute
+- bug-fixed: cannot able to send messages due to undefined in conversationHandlerService
+
 ### 5.0.61-rc.1
 - added: 'flags' emojii category in conversatio-footer component
 - added: 'share prototype' button inside 'chatbot-panel.html' page to copy link to clipboard

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.0.61-rc.1",
+  "version": "5.0.62",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

package/src/app/app.component.ts

@@ -1727,6 +1727,12 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
     public onSelectedConversation($event: ConversationModel) {
         if ($event) {
             if (this.g.isOpen === false) {
+
+                if(this.forceDisconnect){
+                    console.log('[FORCE] onSelectedConversation --> reconnect', this.forceDisconnect)
+                    this.messagingAuthService.createCustomToken(this.g.tiledeskToken)
+                    this.forceDisconnect = false;
+                }
                 //this.f21_open();
                 this._f21_open()
             }
@@ -2094,7 +2100,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
             //disconnect 
             this.forceDisconnect = true
             this.messagingAuthService.logout()
-        }, 10*1000);
+        }, 60*1000);
         window.addEventListener("click", function(){
             console.log('[FORCE] <<INTERACTION>> within 1 minute')
             clearTimeout(clickTimeout)

package/src/app/component/conversation-detail/conversation-footer/conversation-footer.component.ts

@@ -342,6 +342,7 @@ export class ConversationFooterComponent implements OnInit, OnChanges {
           channelType: channelType
         })
         
+        this.conversationHandlerService = this.chatManager.getConversationHandlerByConversationId(this.conversationWith);
         const messageSent = this.conversationHandlerService.sendMessage(
           msg,
           type,

package/src/app/component/home-conversations/home-conversations.component.scss

@@ -239,9 +239,9 @@
         box-shadow: none;
         vertical-align: top;
 
-        // button.c21-button-primary{
-        //     margin: 5px 0px;
-        // }
+        button.c21-button-primary{
+            margin: 20px 0px;
+        }
     }
 
     .c21-footer{

package/src/assets/js/chat21client.js

@@ -979,12 +979,12 @@ class Chat21Client {
             // clean: true,
             reconnectPeriod: 1000,
             // connectTimeout: 30 * 1000,
-            will: {
-                topic: this.presence_topic,
-                payload: '{"disconnected":true}',
-                qos: 1,
-                retain: true
-            },
+            // will: {
+            //     topic: this.presence_topic,
+            //     payload: '{"disconnected":true}',
+            //     qos: 1,
+            //     retain: true
+            // },
             clientId: this.client_id,
             username: 'JWT',
             password: jwt,

package/src/chat21-core/providers/chat-manager.ts

@@ -184,7 +184,6 @@ export class ChatManager {
   getConversationHandlerByConversationId(conversationId): any {
     let handler = null;
     this.handlers.forEach(conv => {
-      this.logger.log('[CHAT MANAGER]forEach ***', conversationId, this.handlers, conv);
       if (conv.conversationWith === conversationId) {
         handler = conv;
         return;

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

@@ -127,13 +127,19 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             this.conversationWith, (message, topic) => {
                 this.logger.log('[MQTTConversationHandlerSERVICE] message added:', message, 'on topic:', topic, this.messages);
                 // this.addedMessage(msg);
-                const msg: MessageModel = message;        
-                msg.uid = message.message_id;
+                const msg: MessageModel = message;
 
-                //escape command message is already is in list checking by parendUid 
-                if(this.messages.filter(message => message.attributes['parentUid'] === msg.uid).length > 0){
-                    return;
+                //allow to replace message in unknown status (pending status: '0')
+                if(message.attributes && message.attributes.tempUID){
+                    msg.uid = message.attributes.tempUID;
+                }else{
+                    msg.uid = message.message_id
                 }
+
+                //escape command message is already is in list checking by parendUid 
+                // if(this.messages.filter(message => message.attributes['parentUid'] === msg.uid).length > 0){
+                //     return;
+                // }
                 
                 if (msg.attributes && msg.attributes.commands) {
                     this.logger.debug('[MQTTConversationHandlerSERVICE] splitted message::::', msg)
@@ -191,6 +197,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const recipientFullname = conversationWithFullname;
         const recipientId = conversationWith;
         attributes.lang = language;
+        attributes.tempUID = uuidv4(); //allow to show message in a pending status
         this.chat21Service.chatClient.sendMessage(
             msg,
             typeMsg,
@@ -210,6 +217,25 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                 }
             }
         );
+        
+        const message = new MessageModel(
+            attributes.tempUID, //allow to show message in a pending status 
+            language,
+            conversationWith,
+            recipientFullname,
+            sender,
+            senderFullname,
+            0,
+            metadataMsg,
+            msg,
+            Date.now(),
+            typeMsg,
+            attributes,
+            channelType,
+            false
+        );
+        this.addedMessage(message) //allow to show message in a pending status: add pending message in array of messages
+
         return new MessageModel(
             '',
             language,
@@ -410,7 +436,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
      */
     private updateMessageStatusReceived(msg) {
         this.logger.log('[MQTTConversationHandlerSERVICE] updateMessageStatusReceived', msg);
-        if (msg['status'] < MSG_STATUS_RECEIVED) {
+        if (msg['status'] < MSG_STATUS_RECEIVED && msg['status'] > 0) {
             this.logger.log('[MQTTConversationHandlerSERVICE] status ', msg['status'], ' < (RECEIVED:200)', MSG_STATUS_RECEIVED);
             let uid = msg.uid
             msg.attributes.commands? uid = msg.attributes.parentUid: null 

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

@@ -72,9 +72,9 @@ export class MQTTPresenceService extends PresenceService {
 
   public imHere(): void {
     this.logger.debug('[MQTT-PRESENCE] imHere', this.tenant);
-    setTimeout(() => {
-      this.chat21Service.chatClient.ImHere()
-    }, 2000);
+    // setTimeout(() => {
+    //   this.chat21Service.chatClient.ImHere()
+    // }, 2000);
   }
 
   /**