@chat21/chat21-web-widget 5.0.53 → 5.0.54

package/src/app/utils/rules.ts

@@ -1,13 +1,92 @@
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
+import { Globals } from './globals';
+import { UserModel } from './../../chat21-core/models/user';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
-export class Rules {
+import { TiledeskAuthService } from 'src/chat21-core/providers/tiledesk/tiledesk-auth.service';
+import { TiledeskRequestsService } from 'src/chat21-core/providers/tiledesk/tiledesk-requests.service';
+import { Inject, Injectable } from '@angular/core';
+import { IRules, Rule } from 'src/models/rule';
+import { getDateDifference } from 'src/chat21-core/utils/utils';
+
 
-    private url = window.location
+@Injectable({
+    providedIn: 'root'
+  })
+export class Rules {
 
+    private windowContext:Window = window
+    private tiledeskToken: string;
+    private currentUser: UserModel;
+    private request_id: string;
+    private rules: Rule[]
     private logger: LoggerService = LoggerInstance.getInstance()
-    constructor(){}
+    constructor(
+        private tiledeskRequestsService: TiledeskRequestsService,
+        private appStorageService: AppStorageService,
+        private g: Globals
+    ){}
+
+
+    initRules(context: Window, tiledeskToken: string, currentUser: UserModel, request_id: string, rules:Rule[]){
+        this.logger.info('[RULES] initRules',context, currentUser, rules)
+        this.windowContext = context
+        this.tiledeskToken = tiledeskToken
+        this.currentUser = currentUser
+        this.request_id = request_id
+        this.rules = rules
+        this.checkRules()
+    }
+
+    checkRules(){
+        this.rules.forEach((rule, index)=>{
+            if(rule.when && new RegExp(rule.when.urlMatches).test(this.windowContext.location.href)){
+                if(this.checkIfAlreadyDone(rule)){
+                    this.doAction(rule.do)
+                    return;
+                }
+                
+            }
+        })
+    }
 
-    initRules(){
-        console.log('locationnnnnnn', this.url)
+    private doAction(action: Rule['do']){
+        this.logger.info('[RULES] doAction', this.currentUser, action)
+        let message = action.filter(obj => Object.keys(obj).includes('message'))
+        if(message && message.length>0){
+            message[0]['message'].attributes = { ...this.g.attributes, ...message[0]['message'].attributes}
+            message[0]['message'].userAgent = this.g.attributes['client']
+            message[0]['message'].request_id = this.request_id
+            message[0]['message'].sourcePage = this.g.attributes['sourcePage']
+            message[0]['message'].language = this.g.lang
+            message[0]['message'].departmentid = this.g.attributes.departmentId
+            console.log('message[0]', message[0]['message'])
+            this.tiledeskRequestsService.sendMessageToRequest(this.request_id, this.tiledeskToken, message[0]['message'])
+        }
     }
+
+
+    private checkIfAlreadyDone(rule: Rule): boolean{
+        let storedRules = JSON.parse(this.appStorageService.getItem('_rules')) || {}
+        let canHandleAction: boolean = false
+        if(storedRules && storedRules.hasOwnProperty(rule.uid)){
+            let timeDifference = getDateDifference(storedRules[rule.uid], Date.now())
+            if(timeDifference.hours > rule.when.triggerEvery){
+                storedRules[rule.uid]= Date.now()
+                canHandleAction = true
+            }else{
+                canHandleAction = false
+            }
+        }else{
+            canHandleAction = true
+            storedRules[rule.uid]= Date.now()
+            
+        }
+        this.appStorageService.setItem('_rules', JSON.stringify(storedRules))
+        return canHandleAction
+    }
+
+
+
+
 }

package/src/assets/js/chat21client.js

@@ -1,7 +1,7 @@
 /*
     Chat21Client
 
-    v0.1.12.3
+    v0.1.12.4
 
     @Author Andrea Sponziello
     (c) Tiledesk 2020
@@ -966,7 +966,7 @@ class Chat21Client {
         if (this.client) {
             this.client.end()
         }
-        const presence_topic = 'apps/tilechat/users/' + this.user_id + '/presence/' + this.client_id
+        this.presence_topic = 'apps/tilechat/users/' + this.user_id + '/presence/' + this.client_id
         let options = {
             keepalive: 10,
             // protocolId: 'MQTT',
@@ -975,7 +975,7 @@ class Chat21Client {
             reconnectPeriod: 1000,
             // connectTimeout: 30 * 1000,
             will: {
-                topic: presence_topic,
+                topic: this.presence_topic,
                 payload: '{"disconnected":true}',
                 qos: 1,
                 retain: true
@@ -985,7 +985,7 @@ class Chat21Client {
             password: jwt,
             rejectUnauthorized: false
         }
-        if (this.log) {console.log("starting mqtt connection with LWT on:", presence_topic, this.endpoint)}
+        if (this.log) {console.log("starting mqtt connection with LWT on:", this.presence_topic, this.endpoint)}
         // client = mqtt.connect('mqtt://127.0.0.1:15675/ws',options)
         this.client = mqtt.connect(this.endpoint,options)
         
@@ -999,6 +999,15 @@ class Chat21Client {
                         callback();
                     });
                 }
+                this.client.publish(
+                    this.presence_topic,
+                    JSON.stringify({connected: true}),
+                    null, (err) => {
+                        if (err) {
+                            console.error("Error con presence publish:", err);
+                        }
+                    }
+                );
             }
         );
         this.client.on('reconnect',
@@ -1023,6 +1032,20 @@ class Chat21Client {
         );
     }
 
+    ImHere() {
+        if (this.client) {
+            this.client.publish(
+                this.presence_topic,
+                JSON.stringify({connected: true}),
+                null, (err) => {
+                    if (err) {
+                        console.error("Error on presence publish:", err);
+                    }
+                }
+            );
+        }
+    }
+
     close(callback) {
         if (this.topic_inbox) {
             this.client.unsubscribe(this.topic_inbox, (err)  => {

package/src/assets/twp/index.html

@@ -296,11 +296,11 @@
                 document.getElementById("preloader").style.display = "none";
             }, 1000);
             //open widget after 3s if is closed
-            setTimeout(() => {
-                if(event_data && event_data.detail && event_data.detail.global && !event_data.detail.global.isOpen){
-                    window.Tiledesk('open')
-                }
-            }, 3000);
+            // setTimeout(() => {
+            //     if(event_data && event_data.detail && event_data.detail.global && !event_data.detail.global.isOpen){
+            //         window.Tiledesk('open')
+            //     }
+            // }, 3000);
         });
 
         window.Tiledesk('onAuthStateChanged', function(event_data) {

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

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

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

@@ -5,6 +5,7 @@ export class UploadModel {
   url: string;
   progress: number;
   createdAt: Date = new Date();
+  
   constructor(file: File) {
     this.file = file;
   }

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

@@ -31,5 +31,6 @@ export abstract class PresenceService {
   abstract userIsOnline(userid: string): Observable<any>
   abstract lastOnlineForUser(userid: string): void;
   abstract setPresence(userid: string): void;
+  abstract imHere():void;
   abstract removePresence(): void;
 }

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

@@ -28,7 +28,7 @@ import {
   conversationMessagesRef  
 } from '../../utils/utils';
 import { v4 as uuidv4 } from 'uuid';
-import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived } from '../../utils/utils-message';
+import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender } from '../../utils/utils-message';
 
 // @Injectable({ providedIn: 'root' })
 @Injectable()
@@ -187,7 +187,6 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                 type: typeMsg,
                 attributes: attributes,
                 channel_type: channelType
-                // isSender: true
             });
 
         // const message = new MessageModel(
@@ -310,7 +309,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         // }
         
         // verifico che il sender è il logged user
-        msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
+        msg.isSender = isSender(msg.sender, this.loggedUser.uid);
         //check if message contains only an emojii
         // msg.emoticon = isEmojii(msg.text)
 
@@ -335,7 +334,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         // }
         
         // verifico che il sender è il logged user
-        msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
+        msg.isSender = isSender(msg.sender, this.loggedUser.uid);
         //check if message contains only an emojii
         // msg.emoticon = isEmojii(msg.text)
 
@@ -453,118 +452,92 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         }
     }
 
-    /**
-     * controllo se il messaggio è stato inviato da loggerUser
-     * richiamato dalla pagina elenco messaggi della conversazione
-     */
-    private isSender(sender: string, currentUserId: string) {
-        if (currentUserId) {
-            if (sender === currentUserId) {
-                return true;
-            } else {
-                return false;
+
+    unsubscribe(key: string) {
+        this.listSubsriptions.forEach(sub => {
+            this.logger.debug('[FIREBASEConversationHandlerSERVICE] unsubscribe: ', sub.uid, key);
+            if (sub.uid === key) {
+                this.logger.debug('[FIREBASEConversationHandlerSERVICE] unsubscribe: ', sub.uid, key);
+                sub.unsubscribe(key, null);
+                return;
             }
-        } else {
-            return false;
-        }
+        });
     }
 
 
-    /** */
-    // updateMetadataMessage(uid: string, metadata: any) {
-    //     metadata.status = true;
-    //     const message = {
-    //         metadata: metadata
-    //     };
-    //     const firebaseMessages = firebase.database().ref(this.urlNodeFirebase + uid);
-    //     firebaseMessages.set(message);
-    // }
-
-
-  unsubscribe(key: string) {
-    this.listSubsriptions.forEach(sub => {
-        this.logger.debug('[FIREBASEConversationHandlerSERVICE] unsubscribe: ', sub.uid, key);
-        if (sub.uid === key) {
-            this.logger.debug('[FIREBASEConversationHandlerSERVICE] unsubscribe: ', 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('[FIREBASEConversationHandlerSERVICE] 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])
+    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('[FIREBASEConversationHandlerSERVICE] 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('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> last command executed (wait), exit') 
+                that.generateMessageObject(msg, command.message, function () {
+                    i += 1
+                    if (i < commands.length) {
+                        execute(commands[i])
+                    }
+                    else {
+                        that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> last command executed (wait), exit') 
+                    }
+                })
+            }else if(command.type === "wait"){
+                that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> type="wait"', command, i, commands.length)
+                //publish waiting event to simulate user typing
+                if(isJustRecived(that.startTime.getTime(), msg.timestamp)){
+                    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('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> type="wait"', command, i, commands.length)
-            //publish waiting event to simulate user typing
-            if(isJustRecived(that.startTime.getTime(), msg.timestamp)){
-                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('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> last command executed (send message), exit') 
+                    }
+                },command.time)
             }
-            setTimeout(function() {
-                i += 1
-                if (i < commands.length) {
-                    execute(commands[i])
-                }
-                else {
-                    that.logger.debug('[FIREBASEConversationHandlerSERVICE] 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, 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.addedNew(command_message)
-    callback();
-}
+    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
+        command_message.attributes = {...message.attributes, ...command_message.attributes}
+        this.addedNew(command_message)
+        callback();
+    }
 
 
     private isValidMessage(msgToCkeck:MessageModel): boolean{

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

@@ -180,4 +180,8 @@ export class FirebasePresenceService extends PresenceService {
     return connectionsRef;
   }
 
+  public imHere(){
+    //NOT IMPLEMENTED FOR FIREBASE ENGINE
+  }
+
 }

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

@@ -24,7 +24,7 @@ import {
   conversationMessagesRef
 } from '../../utils/utils';
 import { v4 as uuidv4 } from 'uuid';
-import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived } from '../../utils/utils-message';
+import { messageType, checkIfIsMemberJoinedGroup, hideInfoMessage, isJustRecived, isSender } from '../../utils/utils-message';
 
 
 // @Injectable({ providedIn: 'root' })
@@ -113,7 +113,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                     }
 
                     if (msg.attributes && msg.attributes.commands ) {
-                        this.logger.debug('[MQTTConversationHandlerSERVICE] splitted message::::', this.messages)
+                        this.logger.debug('[MQTTConversationHandlerSERVICE] splitted message::::', this.messages, msg)
                         this.addCommandMessage(msg)
                     } else {
                         // this.logger.debug('[MQTTConversationHandlerSERVICE] NOT splitted message::::', msg)
@@ -308,7 +308,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         // }
         // verifico che il sender è il logged user
         this.logger.log("[MQTTConversationHandlerSERVICE] ****>msg.sender:" + msg.sender);
-        msg.isSender = this.isSender(msg.sender, this.loggedUser.uid);
+        msg.isSender = isSender(msg.sender, this.loggedUser.uid);
         // traduco messaggi se sono del server
         if (messageType(MESSAGE_TYPE_INFO, msg)) {
             this.translateInfoSupportMessages(msg);
@@ -420,33 +420,6 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         }
     }
 
-    /**
-     * controllo se il messaggio è stato inviato da loggerUser
-     * richiamato dalla pagina elenco messaggi della conversazione
-     */
-    private isSender(sender: string, currentUserId: string) {
-        if (currentUserId) {
-            if (sender === currentUserId) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-
-    /** */
-    // updateMetadataMessage(uid: string, metadata: any) {
-    //     metadata.status = true;
-    //     const message = {
-    //         metadata: metadata
-    //     };
-    //     const firebaseMessages = firebase.database().ref(this.urlNodeFirebase + uid);
-    //     firebaseMessages.set(message);
-    // }
-
 
     unsubscribe(key: string) {
         this.logger.log('[MQTTConversationHandlerSERVICE] unsubscribe: ', key);
@@ -485,7 +458,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                         commands[i+1]? commands[i+1].time = 0 : null
                     }
                 }
-                that.generateMessageObject(msg, command.message, function () {
+                that.generateMessageObject(msg, command.message, i, function () {
                     i += 1
                     if (i < commands.length) {
                         execute(commands[i])
@@ -515,9 +488,10 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         execute(commands[0]) //START render first message
     }
     
-    private generateMessageObject(message, command_message, callback) {
+    private generateMessageObject(message, command_message, index, callback) {
         let parentUid = message.uid
-        command_message.uid = uuidv4();
+        // command_message.uid = uuidv4();
+        command_message.uid = message.uid + '_' + index
         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;
@@ -529,6 +503,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         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
+        command_message.attributes = {...message.attributes, ...command_message.attributes}
         this.addedMessage(command_message)
         callback();
     }