chat4app-client-angular 1.0.18 → 1.0.20

package/fesm2015/chat4app-client-angular.js

@@ -752,7 +752,7 @@ class Chat4appClientAngularService {
         this.debug = false;
         this.chatUserExternalId = "";
         this.configId = "";
-        this.timeoutReconnect = 500;
+        this.isConnected = false;
     }
     ngOnInit() {
     }
@@ -776,7 +776,7 @@ class Chat4appClientAngularService {
                 if (chatCallback && connectionClientId) {
                     this.chatUserExternalId = connectionClientId;
                     this.chatCallback = chatCallback;
-                    this.connectWebsocket();
+                    this.setIntervalConnection();
                 }
                 subscriber.next(securityChatToken);
                 subscriber.complete();
@@ -1075,41 +1075,50 @@ class Chat4appClientAngularService {
         window.sessionStorage.setItem("chat4AppSessionToken", chat4AppSessionToken);
     }
     ensureConn() {
-        if (this.debug) {
-            console.log(`chatServer: ${this.chatServer}`);
-            console.log(`userId: ${this.chatUserExternalId}`);
-            console.log(`getBearerToken: ${this.getBearerToken()}`);
-        }
-        const that = this;
-        let uriStep1 = this.chatServer.replace(/^https/, 'wss');
-        let server = uriStep1.replace(/(\/\/.*?)\//, '$1\/ws/');
-        if (this.debug) {
-            console.log(`ws server: ${server}`);
-        }
-        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);
+        if (!this.isConnected) {
+            const that = this;
+            this.configId = this.chatServer.split("/")[3];
+            if (this.debug) {
+                console.log(`chatServer: ${this.chatServer}`);
+                console.log(`userId: ${this.chatUserExternalId}`);
+                console.log(`getBearerToken: ${this.getBearerToken()}`);
+            }
+            try {
+                if (this.nc) {
+                    this.nc.close();
                 }
-                this.processAndCallback(JSON.parse(msg.data));
-            });
-            this.setIntervalPing();
+            }
+            catch (e) {
+            }
+            let uriStep1 = this.chatServer.replace(/^https/, 'wss');
+            let server = uriStep1.replace(/(\/\/.*?)\//, '$1\/ws/');
             if (this.debug) {
-                console.log(`Subscribe online chat4app.user.${this.chatUserExternalId}.online`);
+                console.log(`ws server: ${server}`);
             }
-        })
-            .catch((err) => {
-            // Notifica o chamador sobre o erro na conexão
-            console.log("NATS Error:");
-            console.log(err);
-            setTimeout(this.ensureConn, 1000);
-        });
+            nats_min.connect({ url: server, user: this.chatUserExternalId, pass: this.getBearerToken(), reconnect: false })
+                .then((nc) => {
+                that.nc = nc;
+                that.isConnected = true;
+                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));
+                });
+                if (this.debug) {
+                    console.log(`Subscribe online chat4app.user.${this.chatUserExternalId}.online`);
+                }
+            })
+                .catch((err) => {
+                // Notifica o chamador sobre o erro na conexão
+                console.log("NATS Error:");
+                console.log(err);
+                that.isConnected = false;
+            });
+        }
     }
-    setIntervalPing() {
+    setIntervalConnection() {
         if (this.interval) {
             try {
                 clearInterval(this.interval);
@@ -1118,6 +1127,7 @@ class Chat4appClientAngularService {
             }
         }
         this.interval = setInterval(() => {
+            this.ensureConn();
             if (this.debug) {
                 console.log(`publish chat4app.user.online ${this.chatUserExternalId} `);
             }
@@ -1125,17 +1135,14 @@ class Chat4appClientAngularService {
                 this.nc.publish(`chat4app.user.online`, this.chatUserExternalId);
             }
             catch (e) {
+                this.isConnected = false;
                 if (this.debug) {
                     console.log("try reconnect...");
                 }
-                this.ensureConn();
             }
         }, 1000);
     }
     disconnect() {
-        return this.disconnectInternal(false);
-    }
-    disconnectInternal(ignoreOffLine) {
         // Check how we can disconnect
         if (this.interval) {
             try {
@@ -1144,7 +1151,7 @@ class Chat4appClientAngularService {
             catch (e) {
             }
         }
-        if (!ignoreOffLine && this.nc && this.chatUserExternalId && this.chatUserExternalId.length > 0 && this.getBearerToken() && this.getBearerToken().length > 0) {
+        if (this.nc && this.chatUserExternalId && this.chatUserExternalId.length > 0 && this.getBearerToken() && this.getBearerToken().length > 0) {
             try {
                 this.setOffLine(this.chatUserExternalId).toPromise();
                 if (this.debug)
@@ -1206,20 +1213,6 @@ class Chat4appClientAngularService {
         }
         //}
     }
-    connectWebsocket() {
-        const that = this;
-        this.disconnectInternal(true);
-        let securityToken = this.getBearerToken();
-        let tokenAuth = "";
-        if (securityToken && securityToken.startsWith("Bearer ")) {
-            tokenAuth = securityToken;
-        }
-        else {
-            tokenAuth = "Bearer " + securityToken;
-        }
-        this.configId = this.chatServer.split("/")[3];
-        this.ensureConn();
-    }
     convertChat4AppMessageReceiveToChatMessage4App(msg) {
         var _a;
         let message = new ChatMessage4App();