@chat21/chat21-web-widget 5.0.66 → 5.0.68

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

@@ -101,11 +101,14 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             this.logger.error('[MQTTConversationHandlerSERVICE] cant connect invalid this.conversationWith', this.conversationWith);
             return;
         }
-        this.chat21Service.chatClient.lastMessages(this.conversationWith, (err, messages) => {
+        this.chat21Service.chatClient.lastMessages(this.conversationWith, async (err, messages) => {
             if (!err) {
                 this.logger.log('[MQTTConversationHandlerSERVICE] message lastMessages:', messages);
                 messages.sort(compareValues('timestamp', 'asc'));
-                messages.forEach(async (message) => {
+                const that = this
+                
+                // messages.forEach(async (message) => {
+                for (const message of messages){
                     // this.addedMessage(msg);
                     const msg: MessageModel = message;
                     msg.uid = message.message_id;
@@ -117,16 +120,16 @@ export class MQTTConversationHandler extends ConversationHandlerService {
 
                     if (msg.attributes && msg.attributes.commands) {
                         this.logger.debug('[MQTTConversationHandlerSERVICE] splitted message::::', this.messages, msg)
-                        this.addCommandMessage(msg)
+                        await 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.conversationWith, async (message, topic) => {
                 this.logger.log('[MQTTConversationHandlerSERVICE] message added:', message, 'on topic:', topic, this.messages);
                 // this.addedMessage(msg);
                 const msg: MessageModel = message;
@@ -145,7 +148,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                 
                 if (msg.attributes && msg.attributes.commands) {
                     this.logger.debug('[MQTTConversationHandlerSERVICE] splitted message::::', msg)
-                    this.addCommandMessage(msg)
+                    await this.addCommandMessage(msg)
                 } else {
                     this.logger.debug('[MQTTConversationHandlerSERVICE] NOT splitted message::::', msg)
                     this.addedMessage(msg)
@@ -264,7 +267,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     }
 
     /** */
-    private addedMessage(messageSnapshot: MessageModel) {
+    private addedMessage(messageSnapshot: MessageModel): Promise<boolean> {
         const msg = this.messageGenerate(messageSnapshot);
         let isInfoMessage = messageType(MESSAGE_TYPE_INFO, msg)
         if(isInfoMessage){
@@ -461,60 +464,64 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         });
     }
 
-    private addCommandMessage(msg: MessageModel){
+    private async addCommandMessage(msg: MessageModel): Promise<boolean>{
         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, i, function () {
-                    i += 1
-                    if (i < commands.length) {
-                        execute(commands[i])
+        return new Promise((resolve, reject)=>{
+            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
+                        }
                     }
-                    else {
-                        that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage --> last command executed (wait), exit') 
+                    that.generateMessageObject(msg, command.message, i, function () {
+                        i += 1
+                        if (i < commands.length) {
+                            execute(commands[i])
+                        }
+                        else {
+                            that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage --> last command executed (wait), exit') 
+                            resolve(true)
+                        }
+                    })
+                }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})
                     }
-                })
-            }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') 
+                            resolve(true)
+                        }
+                    },command.time)
                 }
-                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
+            execute(commands[0]) //START render first message
+        })
     }
     
     private generateMessageObject(message, command_message, index, callback) {

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

@@ -8,18 +8,18 @@ import {
     MAX_WIDTH_IMAGES,
     CHANNEL_TYPE_GROUP,
     TYPE_SUPPORT_GROUP
-} from '../../chat21-core/utils/constants';
+} from './constants';
 
 /** */
 export function isImage(message: any) {
-  if (message && message.type && message.metadata && message.metadata.src && message.type === 'image') {
+  if (message && message.type && message.type === 'image' && message.metadata && message.metadata.src) {
     return true;
   }
   return false;
 }
 
 export function isFrame(message: any) {
-  if (message && message.type && message.metadata && message.metadata.src && message.type === 'frame') {
+  if (message && message.type && message.type === 'frame' && message.metadata && message.metadata.src) {
     return true;
   }
   return false;
@@ -27,10 +27,17 @@ export function isFrame(message: any) {
 
 /** */
 export function isFile(message: any) {
-    if (message && message.type && message.metadata && message.metadata.src && message.type === 'file') {
-      return true;
-    }
-    return false;
+  if (message && message.type && message.type === 'file' && message.metadata && message.metadata.src && !message.metadata.type.includes('audio')) {
+    return true;
+  }
+  return false;
+}
+
+export function isAudio(message: any) {
+  if (message && message.type && message.type === 'file' && message.metadata && message.metadata.src && message.metadata.type.includes('audio') ) {
+    return true;
+  }
+  return false;
 }
 
 /** */