chat4app-client-angular 1.0.10 → 1.0.12

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

@@ -1788,17 +1788,28 @@
           this.debug = chat4AppConfig.debug;
       };
       Chat4appClientAngularService.prototype.init = function (securityChatToken, callback, chatCallback, connectionClientId) {
-          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");
-          }
-          this.setTokenChat4app(securityChatToken);
-          if (chatCallback && connectionClientId) {
-              this.connectWebsocket(chatCallback, connectionClientId);
-          }
-          callback(securityChatToken);
+          return __awaiter(this, void 0, void 0, function () {
+              return __generator(this, function (_b) {
+                  switch (_b.label) {
+                      case 0:
+                          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");
+                          }
+                          this.setTokenChat4app(securityChatToken);
+                          if (!(chatCallback && connectionClientId)) return [3 /*break*/, 2];
+                          return [4 /*yield*/, this.connectWebsocket(chatCallback, connectionClientId)];
+                      case 1:
+                          _b.sent();
+                          _b.label = 2;
+                      case 2:
+                          callback(securityChatToken);
+                          return [2 /*return*/];
+                  }
+              });
+          });
       };
       Chat4appClientAngularService.prototype.getChatUrlDownload = function (messageFileId) {
           return this.chatUrl + "chatmessage/getFile?messageFileId=" + messageFileId + "&token=" + this.getBearerToken();
@@ -2217,8 +2228,6 @@
               chatCallback.onChatClosed(chat4appMessage);
           }
           else if (data.type == "count_notread") {
-              console.log("count_notread");
-              console.log(data);
               var chat4appMessage = new Chat4AppMessageReceive();
               chat4appMessage.data.chatId = data.chatId;
               chat4appMessage.data.chatMessageId = data.chatMessageId;
@@ -2236,7 +2245,7 @@
               chatCallback.onCountNotRead(chat4appMessage);
           }
       };
-      Chat4appClientAngularService.prototype.ensureConn = function (chatUserExternalId) {
+      Chat4appClientAngularService.prototype.ensureConn = function (chatUserExternalId, forceReconnectNats) {
           return __awaiter(this, void 0, void 0, function () {
               var that, uriStep1, server, _b;
               return __generator(this, function (_c) {
@@ -2253,13 +2262,16 @@
                           if (this.debug) {
                               console.log("ws server: " + server);
                           }
-                          if (!(!this.nc || (this.nc.isClose && this.nc.isClose()))) return [3 /*break*/, 2];
+                          if (!(forceReconnectNats || !this.nc || (this.nc.isClose && this.nc.isClose()))) return [3 /*break*/, 3];
+                          return [4 /*yield*/, that.disconnectInternal(true)];
+                      case 1:
+                          _c.sent();
                           _b = that;
                           return [4 /*yield*/, nats_min.connect({ url: server, user: chatUserExternalId, pass: this.getBearerToken(), reconnect: false })];
-                      case 1:
-                          _b.nc = _c.sent();
-                          _c.label = 2;
                       case 2:
+                          _b.nc = _c.sent();
+                          _c.label = 3;
+                      case 3:
                           this.chatUserExternalId = chatUserExternalId;
                           return [2 /*return*/, that.nc];
                   }
@@ -2267,6 +2279,13 @@
           });
       };
       Chat4appClientAngularService.prototype.disconnect = function () {
+          return __awaiter(this, void 0, void 0, function () {
+              return __generator(this, function (_b) {
+                  return [2 /*return*/, this.disconnectInternal(false)];
+              });
+          });
+      };
+      Chat4appClientAngularService.prototype.disconnectInternal = function (ignoreOffLine) {
           return __awaiter(this, void 0, void 0, function () {
               var e_1;
               var _this = this;
@@ -2281,7 +2300,7 @@
                               catch (e) {
                               }
                           }
-                          if (this.nc && this.chatUserExternalId && this.chatUserExternalId.length > 0 && this.getBearerToken() && this.getBearerToken().length > 0) {
+                          if (!ignoreOffLine && this.nc && this.chatUserExternalId && this.chatUserExternalId.length > 0 && this.getBearerToken() && this.getBearerToken().length > 0) {
                               this.setOffLine(this.chatUserExternalId).subscribe(function () {
                                   if (_this.debug) {
                                       console.log("had set offline");
@@ -2358,7 +2377,7 @@
                   switch (_b.label) {
                       case 0:
                           that = this;
-                          this.disconnect();
+                          this.disconnectInternal(true);
                           securityToken = this.getBearerToken();
                           tokenAuth = "";
                           if (securityToken && securityToken.startsWith("Bearer ")) {