chat4app-client-angular 1.0.15 → 1.0.17

package/fesm2015/chat4app-client-angular.js

@@ -1,8 +1,8 @@
-import { __awaiter } from 'tslib';
 import * as i0 from '@angular/core';
 import { Injectable, Component, NgModule } from '@angular/core';
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -751,6 +751,7 @@ class Chat4appClientAngularService {
         this.chatUrl = "";
         this.debug = false;
         this.chatUserExternalId = "";
+        this.configId = "";
         this.timeoutReconnect = 500;
     }
     ngOnInit() {
@@ -760,19 +761,30 @@ class Chat4appClientAngularService {
         this.chatUrl = chat4AppConfig.endpoint + "/api/v1/";
         this.debug = chat4AppConfig.debug;
     }
-    init(securityChatToken, callback, chatCallback, connectionClientId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.chatServer || this.chatServer.trim().length == 0) {
-                throw new Error("Endpoint is empty");
-            }
-            if (!securityChatToken || securityChatToken.trim().length == 0) {
-                throw new Error("SecurityChatToken is empty");
+    init(securityChatToken, chatCallback, connectionClientId) {
+        return new Observable((subscriber) => {
+            try {
+                if (!this.chatServer || this.chatServer.trim().length === 0) {
+                    subscriber.error(new Error("Endpoint is empty"));
+                    return;
+                }
+                if (!securityChatToken || securityChatToken.trim().length === 0) {
+                    subscriber.error(new Error("SecurityChatToken is empty"));
+                    return;
+                }
+                this.setTokenChat4app(securityChatToken);
+                if (chatCallback && connectionClientId) {
+                    this.chatUserExternalId = connectionClientId;
+                    this.chatCallback = chatCallback;
+                    this.connectWebsocket();
+                }
+                subscriber.next(securityChatToken);
+                subscriber.complete();
             }
-            this.setTokenChat4app(securityChatToken);
-            if (chatCallback && connectionClientId) {
-                yield this.connectWebsocket(chatCallback, connectionClientId);
+            catch (err) {
+                // Captura erros inesperados e envia para o canal de erro do Observable
+                subscriber.error(err);
             }
-            callback(securityChatToken);
         });
     }
     getChatUrlDownload(messageFileId) {
@@ -1062,217 +1074,101 @@ class Chat4appClientAngularService {
     setTokenChat4app(chat4AppSessionToken) {
         window.sessionStorage.setItem("chat4AppSessionToken", chat4AppSessionToken);
     }
-    /* Connection */
-    onMessageFirebaseReceived(data, chatCallback) {
-        //alert("onMessageReceived connectFirebase");
-        if (data.type == "msg") {
-            let chat4appMessage = new Chat4AppMessageReceive();
-            chat4appMessage.data.chatId = data.chatId;
-            chat4appMessage.data.chatMessageId = data.chatMessageId;
-            chat4appMessage.data.externalId = data.externalId;
-            chat4appMessage.data.fromId = data.fromId;
-            chat4appMessage.data.toId = data.toId;
-            chat4appMessage.data.groupId = data.groupId;
-            chat4appMessage.data.dateHour = data.dateHour;
-            chat4appMessage.data.type = data.type;
-            chat4appMessage.notification.body = data.body;
-            if (data.fileId && data.fileId.length > 0) {
-                chat4appMessage.data.fileId = data.fileId;
-                chat4appMessage.data.fileName = data.fileName;
-                chat4appMessage.data.fileSize = data.fileSize;
-                chat4appMessage.data.fileType = data.fileType;
-            }
-            let datTmp = new Map();
-            for (let key in data) {
-                datTmp.set(key, data[key]);
-            }
-            chat4appMessage.data.all = datTmp;
-            chatCallback.onMessage(chat4appMessage);
-        }
-        else if ((data.type == "on" || data.type == "off")) {
-            let chat4appMessage = new Chat4AppMessageReceive();
-            chat4appMessage.data.chatId = data.chatId;
-            chat4appMessage.data.chatMessageId = data.chatMessageId;
-            chat4appMessage.data.externalId = data.externalId;
-            chat4appMessage.data.fromId = data.fromId;
-            chat4appMessage.data.toId = data.toId;
-            chat4appMessage.data.groupId = data.groupId;
-            chat4appMessage.data.dateHour = data.dateHour;
-            chat4appMessage.data.type = data.type;
-            let datTmp = new Map();
-            for (let key in data) {
-                datTmp.set(key, data[key]);
-            }
-            chat4appMessage.data.all = datTmp;
-            chatCallback.onOffline(chat4appMessage);
-        }
-        else if (data.type == "read") {
-            let chat4appMessage = new Chat4AppMessageReceive();
-            chat4appMessage.data.chatId = data.chatId;
-            chat4appMessage.data.chatMessageId = data.chatMessageId;
-            chat4appMessage.data.externalId = data.externalId;
-            chat4appMessage.data.fromId = data.fromId;
-            chat4appMessage.data.toId = data.toId;
-            chat4appMessage.data.groupId = data.groupId;
-            chat4appMessage.data.dateHour = data.dateHour;
-            chat4appMessage.data.type = data.type;
-            let datTmp = new Map();
-            for (let key in data) {
-                datTmp.set(key, data[key]);
-            }
-            chat4appMessage.data.all = datTmp;
-            chatCallback.onRead(chat4appMessage);
+    ensureConn() {
+        if (this.debug) {
+            console.log(`chatServer: ${this.chatServer}`);
+            console.log(`userId: ${this.chatUserExternalId}`);
+            console.log(`getBearerToken: ${this.getBearerToken()}`);
         }
-        else if (data.type == "startTyping" || data.type == "stopTyping") {
-            let chat4appMessage = new Chat4AppMessageReceive();
-            chat4appMessage.data.chatId = data.chatId;
-            chat4appMessage.data.chatMessageId = data.chatMessageId;
-            chat4appMessage.data.externalId = data.externalId;
-            chat4appMessage.data.fromId = data.fromId;
-            chat4appMessage.data.toId = data.toId;
-            chat4appMessage.data.groupId = data.groupId;
-            chat4appMessage.data.dateHour = data.dateHour;
-            chat4appMessage.data.type = data.type;
-            let datTmp = new Map();
-            for (let key in data) {
-                datTmp.set(key, data[key]);
-            }
-            chat4appMessage.data.all = datTmp;
-            chatCallback.onStartStopTyping(chat4appMessage);
+        const that = this;
+        let uriStep1 = this.chatServer.replace(/^https/, 'wss');
+        let server = uriStep1.replace(/(\/\/.*?)\//, '$1\/ws/');
+        if (this.debug) {
+            console.log(`ws server: ${server}`);
         }
-        else if (data.type == "new_user") {
-            let chat4appMessage = new Chat4AppMessageReceive();
-            chat4appMessage.data.chatId = data.chatId;
-            chat4appMessage.data.chatMessageId = data.chatMessageId;
-            chat4appMessage.data.externalId = data.externalId;
-            chat4appMessage.data.fromId = data.fromId;
-            chat4appMessage.data.toId = data.toId;
-            chat4appMessage.data.groupId = data.groupId;
-            chat4appMessage.data.dateHour = data.dateHour;
-            chat4appMessage.data.type = data.type;
-            let datTmp = new Map();
-            for (let key in data) {
-                datTmp.set(key, data[key]);
-            }
-            chat4appMessage.data.all = datTmp;
-            chatCallback.onNewUser(chat4appMessage);
-        }
-        else if (data.type == "remove_user") {
-            let chat4appMessage = new Chat4AppMessageReceive();
-            chat4appMessage.data.chatId = data.chatId;
-            chat4appMessage.data.chatMessageId = data.chatMessageId;
-            chat4appMessage.data.externalId = data.externalId;
-            chat4appMessage.data.fromId = data.fromId;
-            chat4appMessage.data.toId = data.toId;
-            chat4appMessage.data.groupId = data.groupId;
-            chat4appMessage.data.dateHour = data.dateHour;
-            chat4appMessage.data.type = data.type;
-            let datTmp = new Map();
-            for (let key in data) {
-                datTmp.set(key, data[key]);
+        that.disconnectInternal(true);
+        nats_min.connect({ url: server, user: this.chatUserExternalId, pass: this.getBearerToken(), reconnect: false })
+            .then((nc) => {
+            that.nc = nc;
+            const subject = `chat4app.config.${this.configId}.user.${this.chatUserExternalId}`;
+            that.nc.subscribe(subject, (msg) => {
+                if (this.debug) {
+                    console.log(msg);
+                }
+                this.processAndCallback(JSON.parse(msg.data));
+            });
+            this.setIntervalPing();
+            if (this.debug) {
+                console.log(`Subscribe online chat4app.user.${this.chatUserExternalId}.online`);
             }
-            chat4appMessage.data.all = datTmp;
-            chatCallback.onRemoveUser(chat4appMessage);
-        }
-        else if (data.type == "chat_closed") {
-            let chat4appMessage = new Chat4AppMessageReceive();
-            chat4appMessage.data.chatId = data.chatId;
-            chat4appMessage.data.chatMessageId = data.chatMessageId;
-            chat4appMessage.data.externalId = data.externalId;
-            chat4appMessage.data.fromId = data.fromId;
-            chat4appMessage.data.toId = data.toId;
-            chat4appMessage.data.groupId = data.groupId;
-            chat4appMessage.data.dateHour = data.dateHour;
-            chat4appMessage.data.type = data.type;
-            let datTmp = new Map();
-            for (let key in data) {
-                datTmp.set(key, data[key]);
+        })
+            .catch((err) => {
+            // Notifica o chamador sobre o erro na conexão
+            console.error("NATS Error:", err);
+        });
+    }
+    setIntervalPing() {
+        if (this.interval) {
+            try {
+                clearInterval(this.interval);
             }
-            chat4appMessage.data.all = datTmp;
-            chatCallback.onChatClosed(chat4appMessage);
-        }
-        else if (data.type == "count_notread") {
-            let chat4appMessage = new Chat4AppMessageReceive();
-            chat4appMessage.data.chatId = data.chatId;
-            chat4appMessage.data.chatMessageId = data.chatMessageId;
-            chat4appMessage.data.externalId = data.externalId;
-            chat4appMessage.data.fromId = data.fromId;
-            chat4appMessage.data.toId = data.toId;
-            chat4appMessage.data.groupId = data.groupId;
-            chat4appMessage.data.dateHour = data.dateHour;
-            chat4appMessage.data.type = data.type;
-            let datTmp = new Map();
-            for (let key in data) {
-                datTmp.set(key, data[key]);
+            catch (e) {
             }
-            chat4appMessage.data.all = datTmp;
-            chatCallback.onCountNotRead(chat4appMessage);
         }
-    }
-    ensureConn(chatUserExternalId, forceReconnectNats) {
-        return __awaiter(this, void 0, void 0, function* () {
+        this.interval = setInterval(() => {
             if (this.debug) {
-                console.log(`chatServer: ${this.chatServer}`);
-                console.log(`userId: ${chatUserExternalId}`);
-                console.log(`getBearerToken: ${this.getBearerToken()}`);
+                console.log(`publish chat4app.user.online ${this.chatUserExternalId} `);
             }
-            const that = this;
-            let uriStep1 = this.chatServer.replace(/^https/, 'wss');
-            let server = uriStep1.replace(/(\/\/.*?)\//, '$1\/ws/');
-            if (this.debug) {
-                console.log(`ws server: ${server}`);
+            try {
+                this.nc.publish(`chat4app.user.online`, this.chatUserExternalId);
             }
-            if (forceReconnectNats || !this.nc || (this.nc.isClose && this.nc.isClose())) {
-                yield that.disconnectInternal(true);
-                that.nc = yield nats_min.connect({ url: server, user: chatUserExternalId, pass: this.getBearerToken(), reconnect: false });
+            catch (e) {
+                if (this.debug) {
+                    console.log("try reconnect...");
+                }
+                this.ensureConn();
             }
-            this.chatUserExternalId = chatUserExternalId;
-            return that.nc;
-        });
+        }, 1000);
     }
     disconnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.disconnectInternal(false);
-        });
+        return this.disconnectInternal(false);
     }
     disconnectInternal(ignoreOffLine) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Check how we can disconnect
-            if (this.interval) {
-                try {
-                    clearInterval(this.interval);
-                }
-                catch (e) {
-                }
+        // Check how we can disconnect
+        if (this.interval) {
+            try {
+                clearInterval(this.interval);
             }
-            if (!ignoreOffLine && this.nc && this.chatUserExternalId && this.chatUserExternalId.length > 0 && this.getBearerToken() && this.getBearerToken().length > 0) {
-                try {
-                    yield this.setOffLine(this.chatUserExternalId).toPromise();
-                    if (this.debug)
-                        console.log("had set offline");
-                }
-                catch (e) {
-                    if (this.debug)
-                        console.error("Erro ao setar offline", e);
-                }
+            catch (e) {
             }
-            if (this.nc) {
-                try {
-                    yield this.nc.close();
-                }
-                catch (e) {
-                    if (this.debug) {
-                        console.error(e);
-                    }
-                }
-                this.nc = undefined;
+        }
+        if (!ignoreOffLine && this.nc && this.chatUserExternalId && this.chatUserExternalId.length > 0 && this.getBearerToken() && this.getBearerToken().length > 0) {
+            try {
+                this.setOffLine(this.chatUserExternalId).toPromise();
+                if (this.debug)
+                    console.log("had set offline");
             }
-            if (this.debug) {
-                console.log("disconect");
+            catch (e) {
+                if (this.debug)
+                    console.error("Erro ao setar offline", e);
             }
-        });
+        }
+        if (this.nc) {
+            try {
+                this.nc.close();
+            }
+            catch (e) {
+                if (this.debug) {
+                    console.error(e);
+                }
+            }
+            this.nc = undefined;
+        }
+        if (this.debug) {
+            console.log("disconect");
+        }
     }
-    processAndCallback(msgObj, chatCallback) {
+    processAndCallback(msgObj) {
         if (this.debug && msgObj) {
             console.log("Msg Received: " + JSON.stringify(msgObj));
         }
@@ -1283,92 +1179,45 @@ class Chat4appClientAngularService {
         }
         msgObj.data.all = datTmp;
         if (msgObj.data.type == "msg") {
-            chatCallback.onMessage(msgObj);
+            this.chatCallback.onMessage(msgObj);
         }
         else if ((msgObj.data.type == "on" || msgObj.data.type == "off")) {
-            chatCallback.onOffline(msgObj);
+            this.chatCallback.onOffline(msgObj);
         }
         else if (msgObj.data.type == "read") {
-            chatCallback.onRead(msgObj);
+            this.chatCallback.onRead(msgObj);
         }
         else if (msgObj.data.type == "startTyping" || msgObj.data.type == "stopTyping") {
-            chatCallback.onStartStopTyping(msgObj);
+            this.chatCallback.onStartStopTyping(msgObj);
         }
         else if (msgObj.data.type == "new_user") {
-            chatCallback.onNewUser(msgObj);
+            this.chatCallback.onNewUser(msgObj);
         }
         else if (msgObj.data.type == "remove_user") {
-            chatCallback.onRemoveUser(msgObj);
+            this.chatCallback.onRemoveUser(msgObj);
         }
         else if (msgObj.data.type == "chat_closed") {
-            chatCallback.onChatClosed(msgObj);
+            this.chatCallback.onChatClosed(msgObj);
         }
         else if (msgObj.data.type == "count_notread") {
-            chatCallback.onCountNotRead(msgObj);
+            this.chatCallback.onCountNotRead(msgObj);
         }
         //}
     }
-    connectWebsocket(chatCallback, userId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const that = this;
-            this.disconnectInternal(true);
-            let securityToken = this.getBearerToken();
-            let tokenAuth = "";
-            if (securityToken && securityToken.startsWith("Bearer ")) {
-                tokenAuth = securityToken;
-            }
-            else {
-                tokenAuth = "Bearer " + securityToken;
-            }
-            const configId = this.chatServer.split("/")[3];
-            const nc = yield this.ensureConn(userId);
-            //TODO Get the user id from jwt
-            const subject = `chat4app.config.${configId}.user.${userId}`;
-            const sub = nc.subscribe(subject, (msg) => {
-                if (this.debug) {
-                    console.log(msg);
-                }
-                this.processAndCallback(JSON.parse(msg.data), chatCallback);
-            });
-            if (this.interval) {
-                try {
-                    clearInterval(this.interval);
-                }
-                catch (e) {
-                }
-            }
-            that.interval = setInterval(() => {
-                if (that.debug) {
-                    console.log(`publish chat4app.user.online ${userId} `);
-                }
-                try {
-                    that.nc.publish(`chat4app.user.online`, userId);
-                }
-                catch (e) {
-                    if (this.debug) {
-                        console.log("try reconnect...");
-                    }
-                    this.ensureConn(userId, true);
-                }
-            }, 1000);
-            if (this.debug) {
-                console.log(`Subscribe online chat4app.user.${userId}.online`);
-            }
-        });
-    }
-    /*
-    disconnect() {
-//      console.log("disconnect")
-      try {
-        if (this.stompClient) {
-          this.stompClient.disconnect();
+    connectWebsocket() {
+        const that = this;
+        this.disconnectInternal(true);
+        let securityToken = this.getBearerToken();
+        let tokenAuth = "";
+        if (securityToken && securityToken.startsWith("Bearer ")) {
+            tokenAuth = securityToken;
         }
-  
-      } catch (e) {
-        console.log(e);
-      }
+        else {
+            tokenAuth = "Bearer " + securityToken;
+        }
+        this.configId = this.chatServer.split("/")[3];
+        this.ensureConn();
     }
-    */
     convertChat4AppMessageReceiveToChatMessage4App(msg) {
         var _a;
         let message = new ChatMessage4App();