chat4app-client-angular 1.0.21 → 1.0.22

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

@@ -1790,29 +1790,33 @@
       };
       Chat4appClientAngularService.prototype.init = function (securityChatToken, chatCallback, connectionClientId) {
           var _this = this;
+          console.log("NEW VERSION");
           return new rxjs.Observable(function (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.setIntervalConnection();
-                  }
+              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) {
                   subscriber.next(securityChatToken);
                   subscriber.complete();
+                  return;
               }
-              catch (err) {
-                  // Captura erros inesperados e envia para o canal de erro do Observable
+              _this.chatUserExternalId = connectionClientId;
+              _this.chatCallback = chatCallback;
+              _this.connectNats()
+                  .then(function () {
+                  _this.setIntervalConnection();
+                  subscriber.next(securityChatToken);
+                  subscriber.complete();
+              })
+                  .catch(function (err) {
                   subscriber.error(err);
-              }
+              });
           });
       };
       Chat4appClientAngularService.prototype.getChatUrlDownload = function (messageFileId) {
@@ -2102,50 +2106,59 @@
       Chat4appClientAngularService.prototype.setTokenChat4app = function (chat4AppSessionToken) {
           window.sessionStorage.setItem("chat4AppSessionToken", chat4AppSessionToken);
       };
-      Chat4appClientAngularService.prototype.ensureConn = function () {
+      Chat4appClientAngularService.prototype.connectNats = function () {
           var _this = this;
-          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());
+          return new Promise(function (resolve, reject) {
+              if (_this.isConnected && _this.nc) {
+                  resolve();
+                  return;
+              }
+              _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();
+                  if (_this.nc) {
+                      _this.nc.close();
                   }
               }
               catch (e) {
               }
-              var uriStep1 = this.chatServer.replace(/^https/, 'wss');
-              var server = uriStep1.replace(/(\/\/.*?)\//, '$1\/ws/');
-              if (this.debug) {
+              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 })
+              nats_min.connect({
+                  url: server,
+                  user: _this.chatUserExternalId,
+                  pass: _this.getBearerToken(),
+                  reconnect: false
+              })
                   .then(function (nc) {
-                  that_1.nc = nc;
-                  that_1.isConnected = true;
+                  _this.nc = nc;
+                  _this.isConnected = true;
                   var subject = "chat4app.config." + _this.configId + ".user." + _this.chatUserExternalId;
-                  that_1.nc.subscribe(subject, function (msg) {
+                  _this.nc.subscribe(subject, function (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");
+                      console.log("NATS connected and subscribed: " + subject);
                   }
+                  resolve();
               })
                   .catch(function (err) {
-                  // Notifica o chamador sobre o erro na conexão
                   console.log("NATS Error:");
                   console.log(err);
-                  that_1.isConnected = false;
+                  _this.isConnected = false;
+                  reject(err);
               });
-          }
+          });
       };
       Chat4appClientAngularService.prototype.setIntervalConnection = function () {
           var _this = this;
@@ -2157,9 +2170,16 @@
               }
           }
           this.interval = setInterval(function () {
-              _this.ensureConn();
+              if (!_this.isConnected) {
+                  _this.connectNats().catch(function () {
+                      if (_this.debug) {
+                          console.log("try reconnect...");
+                      }
+                  });
+                  return;
+              }
               if (_this.debug) {
-                  console.log("publish chat4app.user.online " + _this.chatUserExternalId + " ");
+                  console.log("publish chat4app.user.online " + _this.chatUserExternalId);
               }
               try {
                   _this.nc.publish("chat4app.user.online", _this.chatUserExternalId);
@@ -2167,7 +2187,7 @@
               catch (e) {
                   _this.isConnected = false;
                   if (_this.debug) {
-                      console.log("try reconnect...");
+                      console.log("connection lost, reconnecting...");
                   }
               }
           }, 1000);