@chat21/chat21-web-widget 5.0.48-rc.1 → 5.0.48-rc.2

package/package.json

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

package/src/app/utils/utils.ts

@@ -23,6 +23,7 @@ import { environment } from '../../environments/environment';
  * oggi;
  * ieri;
  * giorno della settimana (lunedì, martedì, ecc)
+ * @deprecated
  */
 export function setHeaderDate(timestamp): string {
   const date = new Date(timestamp);

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

@@ -10,7 +10,6 @@ export class MessageModel {
         public metadata: any,
         public text: string,
         public timestamp: any,
-        //public headerDate: string,
         public type: string,
         public attributes: any,
         public channel_type: string,

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

@@ -251,7 +251,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                 }
             }
 
-            
+    
 
             this.addRepalceMessageInArray(msg.uid, msg);
             this.messageAdded.next(msg);
@@ -411,7 +411,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                 message.text = INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU + ': ' + textAfterColon;
             }
         } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === LEAD_UPDATED)) {
-             message.text = INFO_SUPPORT_LEAD_UPDATED;
+            message.text = INFO_SUPPORT_LEAD_UPDATED;
         } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === MEMBER_LEFT_GROUP)) {
             let subject: string;
             if (message.attributes.messagelabel.parameters.fullname) {
@@ -557,7 +557,7 @@ private generateMessageObject(message, command_message, callback) {
     command_message.attributes.parentUid = parentUid //added to manage message STATUS UPDATES
     this.addedNew(command_message)
     callback();
-  }
+}
 
 
     private isValidMessage(msgToCkeck:MessageModel): boolean{

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

@@ -21,10 +21,10 @@ import {
   htmlEntities,
   compareValues,
   searchIndexInArrayForUid,
-  setHeaderDate,
   conversationMessagesRef
 } from '../../utils/utils';
-import { checkIfIsMemberJoinedGroup, hideInfoMessage, messageType } from '../../utils/utils-message';
+import { v4 as uuidv4 } from 'uuid';
+import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived } from '../../utils/utils-message';
 
 
 // @Injectable({ providedIn: 'root' })
@@ -47,7 +47,6 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     // private variables
     private translationMap: Map<string, string>; // LABEL_TODAY, LABEL_TOMORROW
     private showInfoMessage: string[];
-    // private urlNodeFirebase: string;
     private recipientId: string;
     private recipientFullname: string;
     private tenant: string;
@@ -55,8 +54,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     private senderId: string;
     private listSubsriptions: any[];
     private CLIENT_BROWSER: string;
-    private lastDate = '';
-
+    private startTime: Date = new Date();
     private logger: LoggerService = LoggerInstance.getInstance()
 
     constructor(
@@ -71,7 +69,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
      */
     initialize(recipientId: string, recipientFullName: string,loggedUser: UserModel,
                 tenant: string,translationMap: Map<string, string>, showInfoMessage: string[]) {
-        this.logger.log('[MQTTConversationHandler] initWithRecipient:', tenant);
+        this.logger.log('[MQTTConversationHandlerSERVICE] initWithRecipient:', tenant);
         this.recipientId = recipientId;
         this.recipientFullname = recipientFullName;
         this.loggedUser = loggedUser;
@@ -96,37 +94,49 @@ export class MQTTConversationHandler extends ConversationHandlerService {
      * mi sottoscrivo a change, removed, added
      */
     connect() {
-        this.logger.log('[MQTTConversationHandler] connecting conversation handler...');
+        this.logger.log('[MQTTConversationHandlerSERVICE] connecting conversation handler...');
         if (this.conversationWith == null) {
-            this.logger.error('[MQTTConversationHandler] cant connect invalid this.conversationWith', this.conversationWith);
+            this.logger.error('[MQTTConversationHandlerSERVICE] cant connect invalid this.conversationWith', this.conversationWith);
             return;
         }
         this.chat21Service.chatClient.lastMessages(this.conversationWith, (err, messages) => {
             if (!err) {
-                messages.forEach(msg => {
-                    this.addedMessage(msg);
+                messages.forEach(message => {
+                    // this.addedMessage(msg);
+                    const msg: MessageModel = message;        
+                    msg.uid = message.message_id;
+                    if (msg.attributes && msg.attributes.commands) {
+                        // this.logger.debug('[MQTTConversationHandlerSERVICE] splitted message::::', msg)
+                        this.addCommandMessage(msg)
+                    } else {
+                        // this.logger.debug('[MQTTConversationHandlerSERVICE] NOT splitted message::::', msg)
+                        this.addedMessage(msg)
+                    }
                 });
             }
         });
         const handler_message_added = this.chat21Service.chatClient.onMessageAddedInConversation(
             this.conversationWith, (message, topic) => {
-                this.logger.log('[MQTTConversationHandler] message added:', message, 'on topic:', topic);
-                this.addedMessage(message);
+                this.logger.log('[MQTTConversationHandlerSERVICE] message added:', message, 'on topic:', topic);
+                // this.addedMessage(msg);
+                const msg: MessageModel = message;        
+                msg.uid = message.message_id;
+
+                if (msg.attributes && msg.attributes.commands) {
+                    this.logger.debug('[MQTTConversationHandlerSERVICE] splitted message::::', msg)
+                    this.addCommandMessage(msg)
+                } else {
+                    this.logger.debug('[MQTTConversationHandlerSERVICE] NOT splitted message::::', msg)
+                    this.addedMessage(msg)
+                }
         });
         const handler_message_updated = this.chat21Service.chatClient.onMessageUpdatedInConversation(
             this.conversationWith,  (message, topic) => {
-            this.logger.log('[MQTTConversationHandler] message updated:', message, 'on topic:', topic);
+            this.logger.log('[MQTTConversationHandlerSERVICE] message updated:', message, 'on topic:', topic);
             this.updatedMessageStatus(message);
         });
     }
 
-    isGroup(groupId) {
-        if (groupId.indexOf('group-') >= 0) {
-            return true;
-        }
-        return false;
-    }
-
     /**
      * bonifico url in testo messaggio
      * recupero time attuale
@@ -163,7 +173,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             channelType = TYPE_DIRECT;
         }
 
-        this.logger.log('[MQTTConversationHandler] Senderfullname', senderFullname);
+        this.logger.log('[MQTTConversationHandlerSERVICE] Senderfullname', senderFullname);
         const language = document.documentElement.lang;
         const recipientFullname = conversationWithFullname;
         const recipientId = conversationWith;
@@ -181,7 +191,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             (err, message) => {
                 if (err) {
                     message.status = '-100';
-                    this.logger.log('[MQTTConversationHandler] ERROR', err);
+                    this.logger.log('[MQTTConversationHandlerSERVICE] ERROR', err);
                 } else {
                     message.status = '150';
                 }
@@ -213,9 +223,9 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     }
 
     /** */
-    private addedMessage(messageSnapshot: any) {
+    private addedMessage(messageSnapshot: MessageModel) {
         const msg = this.messageGenerate(messageSnapshot);
-        msg.uid = msg.message_id;
+        
         let isInfoMessage = messageType(MESSAGE_TYPE_INFO, msg)
         if(isInfoMessage){
             this.messageInfo.next(msg)
@@ -232,16 +242,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             }
         }
 
-       
-        
-        // imposto il giorno del messaggio per visualizzare o nascondere l'header data
-        msg.headerDate = null;
-        const headerDate = setHeaderDate(this.translationMap, msg.timestamp);
-        if (headerDate !== this.lastDate) {
-            this.lastDate = headerDate;
-            msg.headerDate = headerDate;
-        }
-        this.logger.log('[MQTTConversationHandler] adding message:' + JSON.stringify(msg));
+        this.logger.log('[MQTTConversationHandlerSERVICE] adding message:' + JSON.stringify(msg));
         // this.logger.log('childSnapshot.message_id:' + msg.message_id);
         // this.logger.log('childSnapshot.key:' + msg.key);
         // this.logger.log('childSnapshot.uid:' + msg.uid);
@@ -250,18 +251,19 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         this.messageAdded.next(msg);
     }
 
+
     /** */
     private updatedMessageStatus(patch: any) {
         if(messageType(MESSAGE_TYPE_INFO, patch) ){
             return;
         }
-        this.logger.log('[MQTTConversationHandler] updating message with patch', patch);
+        this.logger.log('[MQTTConversationHandlerSERVICE] updating message with patch', patch);
         const index = searchIndexInArrayForUid(this.messages, patch.message_id);
         if (index > -1) {
             const message = this.messages[index];
             if (message) {
                 message.status = patch.status;
-                this.logger.log('[MQTTConversationHandler] message found and patched (replacing)', message);
+                this.logger.log('[MQTTConversationHandlerSERVICE] message found and patched (replacing)', message);
                 this.addReplaceMessageInArray(message.uid, message);
                 this.messageChanged.next(message);
             }
@@ -281,9 +283,9 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     /** */
     private messageGenerate(childSnapshot: any) {
         // const msg: MessageModel = childSnapshot.val();
-        this.logger.log("[MQTTConversationHandler] childSnapshot >" + JSON.stringify(childSnapshot));
+        this.logger.log("[MQTTConversationHandlerSERVICE] childSnapshot >" + JSON.stringify(childSnapshot));
         const msg = childSnapshot;
-        msg.uid = childSnapshot.key;
+        // msg.uid = childSnapshot.key;
         msg.text = msg.text.trim() //remove black msg with only spaces
         // controllo fatto per i gruppi da rifattorizzare
         if (!msg.sender_fullname || msg.sender_fullname === 'undefined') {
@@ -294,7 +296,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         //     msg.text = htmlEntities(msg.text);
         // }
         // verifico che il sender è il logged user
-        this.logger.log("[MQTTConversationHandler] ****>msg.sender:" + msg.sender);
+        this.logger.log("[MQTTConversationHandlerSERVICE] ****>msg.sender:" + msg.sender);
         msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
         // traduco messaggi se sono del server
         if (messageType(MESSAGE_TYPE_INFO, msg)) {
@@ -307,8 +309,6 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     private addReplaceMessageInArray(uid: string, msg: MessageModel) {
         const index = searchIndexInArrayForUid(this.messages, uid);
         if (index > -1) {
-            // const headerDate = this.messages[index].headerDate;
-            // msg.headerDate = headerDate;
             this.messages.splice(index, 1, msg);
         } else {
             this.messages.splice(0, 0, msg);
@@ -387,11 +387,11 @@ export class MQTTConversationHandler extends ConversationHandlerService {
      * @param conversationWith
      */
     private updateMessageStatusReceived(msg) {
-        this.logger.log('[MQTTConversationHandler] updateMessageStatusReceived', msg);
+        this.logger.log('[MQTTConversationHandlerSERVICE] updateMessageStatusReceived', msg);
         if (msg['status'] < MSG_STATUS_RECEIVED) {
-            this.logger.log('[MQTTConversationHandler] status ', msg['status'], ' < (RECEIVED:200)', MSG_STATUS_RECEIVED);
+            this.logger.log('[MQTTConversationHandlerSERVICE] status ', msg['status'], ' < (RECEIVED:200)', MSG_STATUS_RECEIVED);
             if (msg.sender !== this.loggedUser.uid && msg.status < MSG_STATUS_RECEIVED) {
-                this.logger.log('[MQTTConversationHandler] updating message with status received');
+                this.logger.log('[MQTTConversationHandlerSERVICE] updating message with status received');
                 this.chat21Service.chatClient.updateMessageStatus(msg.message_id, this.conversationWith, MSG_STATUS_RECEIVED, null);
             }
         }
@@ -432,15 +432,89 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     // }
 
 
-  unsubscribe(key: string) {
-    this.logger.log('[MQTTConversationHandler] unsubscribe: ', key);
-    this.listSubsriptions.forEach(sub => {
-      this.logger.log('[MQTTConversationHandler] unsubscribe: ', sub.uid, key);
-      if (sub.uid === key) {
-        sub.unsubscribe(key, null);
-        return;
-      }
-    });
-  }
+    unsubscribe(key: string) {
+        this.logger.log('[MQTTConversationHandlerSERVICE] unsubscribe: ', key);
+        this.listSubsriptions.forEach(sub => {
+        this.logger.log('[MQTTConversationHandlerSERVICE] unsubscribe: ', sub.uid, key);
+        if (sub.uid === key) {
+            sub.unsubscribe(key, null);
+            return;
+        }
+        });
+    }
+
+    private addCommandMessage(msg: MessageModel){
+        const that = this;
+        const commands = msg.attributes.commands;
+        let i=0;
+        function execute(command){
+            if(command.type === "message"){
+                that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage --> type="message"', command, i)
+                if (i >= 2) {
+                    
+                    //check if previus wait message type has time value, otherwize set to 1000ms
+                    !commands[i-1].time? commands[i-1].time= 1000 : commands[i-1].time
+                    command.message.timestamp = commands[i-2].message.timestamp + commands[i-1].time;
+                    
+                    /** CHECK IF MESSAGE IS JUST RECEIVED: IF false, set next message time (if object exist) to 0 -> this allow to show it immediately */
+                    if(!isJustRecived(that.startTime.getTime(), msg.timestamp)){
+                        let previewsTimeMsg = msg.timestamp;
+                        commands[i-2]? previewsTimeMsg = commands[i-2].message.timestamp : null;
+                        command.message.timestamp = previewsTimeMsg + 100
+                        commands[i+1]? commands[i+1].time = 0 : null
+                    }
+                } else { /**MANAGE FIRST MESSAGE */
+                    command.message.timestamp = msg.timestamp;
+                    if(!isJustRecived(that.startTime.getTime(), msg.timestamp)){
+                        commands[i+1]? commands[i+1].time = 0 : null
+                    }
+                }
+                that.generateMessageObject(msg, command.message, function () {
+                    i += 1
+                    if (i < commands.length) {
+                        execute(commands[i])
+                    }
+                    else {
+                        that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage --> last command executed (wait), exit') 
+                    }
+                })
+            }else if(command.type === "wait"){
+                that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage --> type="wait"', command, i, commands.length)
+                //publish waiting event to simulate user typing
+                if(isJustRecived(that.startTime.getTime(), msg.timestamp)){
+                    // console.log('message just received::', command, i, commands)
+                    that.messageWait.next({uid: that.conversationWith, uidUserTypingNow: msg.sender, nameUserTypingNow: msg.sender_fullname, waitTime: command.time, command: command})
+                }
+                setTimeout(function() {
+                    i += 1
+                    if (i < commands.length) {
+                        execute(commands[i])
+                    }
+                    else {
+                        that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage --> last command executed (send message), exit') 
+                    }
+                },command.time)
+            }
+        }
+        execute(commands[0]) //START render first message
+    }
+    
+    private generateMessageObject(message, command_message, callback) {
+        let parentUid = message.uid
+        command_message.uid = uuidv4();
+        if(command_message.text) command_message.text = command_message.text.trim()//remove black msg with only spaces
+        command_message.language = message.language;
+        command_message.recipient = message.recipient;
+        command_message.recipient_fullname = message.recipient_fullname;
+        command_message.sender = message.sender;
+        command_message.sender_fullname = message.sender_fullname;
+        command_message.channel_type = message.channel_type;
+        command_message.status = message.status;
+        command_message.isSender = message.isSender;
+        command_message.attributes? command_message.attributes.commands = true : command_message.attributes = {commands : true}
+        command_message.attributes.parentUid = parentUid //added to manage message STATUS UPDATES
+        this.addedMessage(command_message)
+        callback();
+    }
 
 }

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

@@ -58,7 +58,6 @@ export const TYPE_POPUP_DETAIL_MESSAGE = 'DETAIL_MESSAGE';
 export const MESSAGE_TYPE_INFO = 'INFO';
 export const MESSAGE_TYPE_MINE = 'MINE';
 export const MESSAGE_TYPE_OTHERS = 'OTHERS';
-export const MESSAGE_TYPE_DATE = 'DATE';
 
 export const CHAT_REOPENED = 'CHAT_REOPENED';
 export const CHAT_CLOSED = 'CHAT_CLOSED';

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

@@ -2,7 +2,6 @@ import {
     MESSAGE_TYPE_INFO,
     MESSAGE_TYPE_MINE,
     MESSAGE_TYPE_OTHERS,
-    MESSAGE_TYPE_DATE,
     MAX_WIDTH_IMAGES,
     CHANNEL_TYPE_GROUP,
     TYPE_SUPPORT_GROUP
@@ -72,12 +71,7 @@ export function isMine(message: any) {
 
 /** */
 export function messageType(msgType: string, message: any) {
-    if (msgType === MESSAGE_TYPE_DATE) {
-      if (message.headerDate && message.headerDate !== '') {
-        return true;
-      }
-      return false;
-    }
+
     if (msgType === MESSAGE_TYPE_INFO) {
       return isInfo(message);
     }

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

@@ -100,6 +100,9 @@ export function contactsRef(tenant) {
 //   return labelDays;
 // }
 
+/**
+ * @deprecated
+ */
 export function setHeaderDate(translate, timestamp): string {
   // const LABEL_TODAY = translate.get('LABEL_TODAY');
   // const LABEL_TOMORROW = translate.get('LABEL_TOMORROW');

package/src/environments/real_data/widget-config-native-prod.json

@@ -0,0 +1,27 @@
+{
+    "chatEngine": "mqtt",
+    "uploadEngine": "native",
+    "pushEngine":"mqtt",
+    "fileUploadAccept":"*/*",
+    "logLevel": "debug",
+    "remoteTranslationsUrl": "https://api.tiledesk.com/v3/",
+    "firebaseConfig": {
+        "apiKey": "AIzaSyDKfdKrlD7AYcbQ-U-xxgV-b3FUQ4xt7NM",
+        "authDomain": "tiledesk-prod-v2.firebaseapp.com",
+        "databaseURL": "https://tiledesk-prod-v2.firebaseio.com",
+        "projectId": "tiledesk-prod-v2",
+        "storageBucket": "tiledesk-prod-v2.appspot.com",
+        "messagingSenderId": "92907897826",
+        "appId": "1:92907897826:web:f255664014a7cc14ee2fbb",
+        "tenant": "tilechat"
+    },
+    "chat21Config": {
+        "appId": "tilechat",
+        "MQTTendpoint": "wss://eu.rtmv3.tiledesk.com/mqws/ws",
+        "APIendpoint": "https://eu.rtmv3.tiledesk.com/chatapi/api",
+        "_log": true
+    },
+    "apiUrl": "https://api.tiledesk.com/v3/",
+    "baseImageUrl": "https://eu.rtmv3.tiledesk.com/api/",
+    "authPersistence": "LOCAL"
+}

package/src/models/message.ts

@@ -15,7 +15,6 @@ export class MessageModel {
         public metadata: any,
         public text: any,
         public timestamp: any,
-        public headerDate: string,
         public type: string,
         public attributes: any,
         public channel_type: string,
@@ -34,7 +33,6 @@ export class MessageModel {
     //         metadata: this.metadata,
     //         text: this.text,
     //         timestamp: firebase.database.ServerValue.TIMESTAMP,
-    //         // headerDate: this.headerDate,
     //         type: this.type,
     //         attributes: this.attributes,
     //         channel_type: this.channel_type