@chat21/chat21-web-widget 5.1.6 → 5.1.7-rc9

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

@@ -410,8 +410,8 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             message.text = INFO_SUPPORT_LEAD_UPDATED;
         } else if (infoMessageType(message) === INFO_MESSAGE_TYPE.MEMBER_LEFT_GROUP) {
            let subject: string;
-           if (message.attributes.messagelabel.parameters.fullname) {
-               subject = message.attributes.messagelabel.parameters.fullname;
+           if (message.attributes.messagelabel.parameters.firstname) {
+               subject = message.attributes.messagelabel.parameters.firstname;
            }else{
                subject = message.attributes.messagelabel.parameters.member_id;
            }
@@ -464,16 +464,17 @@ export class MQTTConversationHandler extends ConversationHandlerService {
     private async addCommandMessage(msg: MessageModel): Promise<boolean>{
         const that = this;
         const commands = msg.attributes.commands;
+        that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage: ', commands)
         let i=0;
         if(commands.length === 0) return;
         return new Promise((resolve, reject)=>{
             function execute(command){
+                that.logger.debug('[MQTTConversationHandlerSERVICE] command: ', command, i)
                 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
+                        !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 */
@@ -483,12 +484,14 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                             command.message.timestamp = previewsTimeMsg + 100
                             commands[i+1]? commands[i+1].time = 0 : null
                         }
-                    } else { /**MANAGE FIRST MESSAGE */
+                    } 
+                    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) {
@@ -499,28 +502,36 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                             resolve(true)
                         }
                     })
-                }else if(command.type === "wait"){
-                    that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage --> type="wait"', command, i, commands.length)
+                } else if(command.type === "wait"){
                     //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() {
+                    that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage: --> msg.status: ', msg.status)
+                    
+                    const executeNext = () => {
                         i += 1
                         if (i < commands.length) {
                             execute(commands[i])
-                        }
-                        else {
+                        } else {
                             that.logger.debug('[MQTTConversationHandlerSERVICE] addCommandMessage --> last command executed (send message), exit') 
                             resolve(true)
                         }
-                    },command.time)
+                    }
+
+                    if(msg.status === MSG_STATUS_RECEIVED){
+                        executeNext()
+                    } else {
+                        setTimeout(executeNext, command.time)
+                    }
                 }
             }
             execute(commands[0]) //START render first message
         })
     }
+
+    
     
     private generateMessageObject(message, command_message, index, callback) {
         let parentUid = message.uid

package/src/chat21-core/providers/tiledesk/tiledesk-requests.service.ts

@@ -71,7 +71,7 @@ export class TiledeskRequestsService {
 
   public getMyRequests(): Promise<{ requests: Array<any>}> {
     this.tiledeskToken = this.appStorage.getItem('tiledeskToken')
-    const url = this.URL_TILEDESK_REQUEST + '/me?preflight=true'
+    const url = this.URL_TILEDESK_REQUEST + 'me?preflight=true'
     this.logger.log('[TILEDESK-SERVICE] - GET REQUEST url ', url);
     const httpOptions = {
       headers: new HttpHeaders({

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

@@ -661,11 +661,22 @@ export function isAllowedUrlInText(text: string, allowedUrls: string[]) {
   return nonWhitelistedDomains.length === 0;
 }
 
+// function extractUrls(text: string): string[] {
+//   const urlRegex = /https?:\/\/[^\s]+/g;
+//   return text.match(urlRegex) || [];
+// }
+
 function extractUrls(text: string): string[] {
-  const urlRegex = /https?:\/\/[^\s]+/g;
-  return text.match(urlRegex) || [];
+  // Rileva URL con o senza protocollo (http/https)
+  const urlRegex = /\b((https?:\/\/)?(www\.)?[a-z0-9.-]+\.[a-z]{2,})(\/[^\s]*)?/gi;
+  const matches = text.match(urlRegex) || [];
+  // Normalizza: aggiunge https:// se manca, così il parsing con new URL() funziona
+  return matches.map((url) => {
+    if (!/^https?:\/\//i.test(url)) {
+      return 'https://' + url;
+    }
+    return url;
+  });
 }
 
 
-
-

package/src/iframe-style.css

@@ -19,7 +19,7 @@
 
 #tiledesk-container.open.overlay--popup {
     background-color: rgba(0, 0, 0, 0.4);
-    position: absolute;
+    position: fixed;
     width: 100%;
     height: 100vh;
 }

package/src/app/component/network-offline/network-offline.component.ts

@@ -1,24 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { CustomTranslateService } from 'src/chat21-core/providers/custom-translate.service';
-
-@Component({
-  selector: 'chat-network-offline',
-  templateUrl: './network-offline.component.html',
-  styleUrls: ['./network-offline.component.scss']
-})
-export class NetworkOfflineComponent implements OnInit {
-
-  translationMap: Map< string, string>;
-
-  constructor(
-    private customTranslateService: CustomTranslateService
-  ){}
-
-  ngOnInit(): void {
-    let keys = [
-      'CONNECTION_NETWORK_ERROR'
-    ]
-    this.translationMap = this.customTranslateService.translateLanguage(keys)
-  }
-
-}