chat4app-client-angular 1.0.18 → 1.0.20

package/bundles/chat4app-client-angular.umd.js

@@ -1779,7 +1779,7 @@
           this.debug = false;
           this.chatUserExternalId = "";
           this.configId = "";
-          this.timeoutReconnect = 500;
+          this.isConnected = false;
       }
       Chat4appClientAngularService.prototype.ngOnInit = function () {
       };
@@ -1804,7 +1804,7 @@
                   if (chatCallback && connectionClientId) {
                       _this.chatUserExternalId = connectionClientId;
                       _this.chatCallback = chatCallback;
-                      _this.connectWebsocket();
+                      _this.setIntervalConnection();
                   }
                   subscriber.next(securityChatToken);
                   subscriber.complete();
@@ -2104,41 +2104,50 @@
       };
       Chat4appClientAngularService.prototype.ensureConn = function () {
           var _this = this;
-          if (this.debug) {
-              console.log("chatServer: " + this.chatServer);
-              console.log("userId: " + this.chatUserExternalId);
-              console.log("getBearerToken: " + this.getBearerToken());
-          }
-          var that = this;
-          var uriStep1 = this.chatServer.replace(/^https/, 'wss');
-          var 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(function (nc) {
-              that.nc = nc;
-              var subject = "chat4app.config." + _this.configId + ".user." + _this.chatUserExternalId;
-              that.nc.subscribe(subject, function (msg) {
+          if (!this.isConnected) {
+              var that_1 = 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();
+                  }
+              }
+              catch (e) {
+              }
+              var uriStep1 = this.chatServer.replace(/^https/, 'wss');
+              var server = uriStep1.replace(/(\/\/.*?)\//, '$1\/ws/');
+              if (this.debug) {
+                  console.log("ws server: " + server);
+              }
+              nats_min.connect({ url: server, user: this.chatUserExternalId, pass: this.getBearerToken(), reconnect: false })
+                  .then(function (nc) {
+                  that_1.nc = nc;
+                  that_1.isConnected = true;
+                  var subject = "chat4app.config." + _this.configId + ".user." + _this.chatUserExternalId;
+                  that_1.nc.subscribe(subject, function (msg) {
+                      if (_this.debug) {
+                          console.log(msg);
+                      }
+                      _this.processAndCallback(JSON.parse(msg.data));
+                  });
                   if (_this.debug) {
-                      console.log(msg);
+                      console.log("Subscribe online chat4app.user." + _this.chatUserExternalId + ".online");
                   }
-                  _this.processAndCallback(JSON.parse(msg.data));
+              })
+                  .catch(function (err) {
+                  // Notifica o chamador sobre o erro na conexão
+                  console.log("NATS Error:");
+                  console.log(err);
+                  that_1.isConnected = false;
               });
-              _this.setIntervalPing();
-              if (_this.debug) {
-                  console.log("Subscribe online chat4app.user." + _this.chatUserExternalId + ".online");
-              }
-          })
-              .catch(function (err) {
-              // Notifica o chamador sobre o erro na conexão
-              console.log("NATS Error:");
-              console.log(err);
-              setTimeout(_this.ensureConn, 1000);
-          });
+          }
       };
-      Chat4appClientAngularService.prototype.setIntervalPing = function () {
+      Chat4appClientAngularService.prototype.setIntervalConnection = function () {
           var _this = this;
           if (this.interval) {
               try {
@@ -2148,6 +2157,7 @@
               }
           }
           this.interval = setInterval(function () {
+              _this.ensureConn();
               if (_this.debug) {
                   console.log("publish chat4app.user.online " + _this.chatUserExternalId + " ");
               }
@@ -2155,17 +2165,14 @@
                   _this.nc.publish("chat4app.user.online", _this.chatUserExternalId);
               }
               catch (e) {
+                  _this.isConnected = false;
                   if (_this.debug) {
                       console.log("try reconnect...");
                   }
-                  _this.ensureConn();
               }
           }, 1000);
       };
       Chat4appClientAngularService.prototype.disconnect = function () {
-          return this.disconnectInternal(false);
-      };
-      Chat4appClientAngularService.prototype.disconnectInternal = function (ignoreOffLine) {
           // Check how we can disconnect
           if (this.interval) {
               try {
@@ -2174,7 +2181,7 @@
               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)
@@ -2236,20 +2243,6 @@
           }
           //}
       };
-      Chat4appClientAngularService.prototype.connectWebsocket = function () {
-          var that = this;
-          this.disconnectInternal(true);
-          var securityToken = this.getBearerToken();
-          var tokenAuth = "";
-          if (securityToken && securityToken.startsWith("Bearer ")) {
-              tokenAuth = securityToken;
-          }
-          else {
-              tokenAuth = "Bearer " + securityToken;
-          }
-          this.configId = this.chatServer.split("/")[3];
-          this.ensureConn();
-      };
       Chat4appClientAngularService.prototype.convertChat4AppMessageReceiveToChatMessage4App = function (msg) {
           var _a;
           var message = new ChatMessage4App();