stream-chat 6.7.3 → 7.0.0-offline-support.2

package/dist/browser.es.js

@@ -437,6 +437,10 @@ var ChannelState = /*#__PURE__*/function () {
           this.threads[parentID] = threadMessages;
         }
       }
+
+      return {
+        messageSet: this.messageSets[targetMessageSetIndex]
+      };
     }
     /**
      * addPinnedMessages - adds messages in pinnedMessages property
@@ -905,6 +909,42 @@ var ChannelState = /*#__PURE__*/function () {
 
       return loadMessageIntoState;
     }()
+    /**
+     * findMessage - Finds a message inside the state
+     *
+     * @param {string} messageId The id of the message
+     * @param {string} parentMessageId The id of the parent message, if we want load a thread reply
+     *
+     * @return {ReturnType<ChannelState<StreamChatGenerics>['formatMessage']>} Returns the message, or undefined if the message wasn't found
+     */
+
+  }, {
+    key: "findMessage",
+    value: function findMessage(messageId, parentMessageId) {
+      if (parentMessageId) {
+        var messages = this.threads[parentMessageId];
+
+        if (!messages) {
+          return undefined;
+        }
+
+        return messages.find(function (m) {
+          return m.id === messageId;
+        });
+      }
+
+      var messageSetIndex = this.findMessageSetIndex({
+        id: messageId
+      });
+
+      if (messageSetIndex === -1) {
+        return undefined;
+      }
+
+      return this.messageSets[messageSetIndex].messages.find(function (m) {
+        return m.id === messageId;
+      });
+    }
   }, {
     key: "switchToMessageSet",
     value: function switchToMessageSet(index) {
@@ -1077,6 +1117,7 @@ var EVENT_MAP = {
   'user.watching.start': true,
   'user.watching.stop': true,
   // local events
+  'channels.queried': true,
   'connection.changed': true,
   'connection.recovered': true,
   'transport.changed': true
@@ -1368,6 +1409,8 @@ var Channel = /*#__PURE__*/function () {
 
     _defineProperty(this, "initialized", void 0);
 
+    _defineProperty(this, "staticState", void 0);
+
     _defineProperty(this, "lastKeyStroke", void 0);
 
     _defineProperty(this, "lastTypingEvent", void 0);
@@ -1455,6 +1498,7 @@ var Channel = /*#__PURE__*/function () {
 
     this.state = new ChannelState(this);
     this.initialized = false;
+    this.staticState = true;
     this.lastTypingEvent = null;
     this.isTyping = false;
     this.disconnected = false;
@@ -2774,7 +2818,7 @@ var Channel = /*#__PURE__*/function () {
      *
      * @param {ChannelQueryOptions<StreamChatGenerics>} options additional options for the query endpoint
      *
-     * @return {Promise<ChannelAPIResponse<StreamChatGenerics>>} The server response
+     * @return {Promise<QueryChannelAPIResponse<StreamChatGenerics>>} The server response
      */
 
   }, {
@@ -3077,7 +3121,7 @@ var Channel = /*#__PURE__*/function () {
     /**
      * create - Creates a new channel
      *
-     * @return {Promise<ChannelAPIResponse<StreamChatGenerics>>} The Server Response
+     * @return {Promise<QueryChannelAPIResponse<StreamChatGenerics>>} The Server Response
      */
 
   }, {
@@ -3089,7 +3133,7 @@ var Channel = /*#__PURE__*/function () {
      * @param {ChannelQueryOptions<StreamChatGenerics>} options The query options
      * @param {MessageSetType} messageSetToAddToIfDoesNotExist It's possible to load disjunct sets of a channel's messages into state, use `current` to load the initial channel state or if you want to extend the currently displayed messages, use `latest` if you want to load/extend the latest messages, `new` is used for loading a specific message and it's surroundings
      *
-     * @return {Promise<ChannelAPIResponse<StreamChatGenerics>>} Returns a query response
+     * @return {Promise<QueryChannelAPIResponse<StreamChatGenerics>>} Returns a query response
      */
     function () {
       var _query = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee31(options) {
@@ -3098,7 +3142,10 @@ var Channel = /*#__PURE__*/function () {
             state,
             membersStr,
             tempChannelCid,
+            _this$_initializeStat,
+            messageSet,
             _args31 = arguments;
+
         return _regeneratorRuntime.wrap(function _callee31$(_context31) {
           while (1) {
             switch (_context31.prev = _context31.next) {
@@ -3149,11 +3196,17 @@ var Channel = /*#__PURE__*/function () {
                 this.getClient()._addChannelConfig(state); // add any messages to our channel state
 
 
-                this._initializeState(state, messageSetToAddToIfDoesNotExist);
-
+                _this$_initializeStat = this._initializeState(state, messageSetToAddToIfDoesNotExist), messageSet = _this$_initializeStat.messageSet;
+                this.getClient().dispatchEvent({
+                  type: 'channels.queried',
+                  queriedChannels: {
+                    channels: [state],
+                    isLatestMessageSet: messageSet.isLatest
+                  }
+                });
                 return _context31.abrupt("return", state);
 
-              case 12:
+              case 13:
               case "end":
                 return _context31.stop();
             }
@@ -3598,6 +3651,8 @@ var Channel = /*#__PURE__*/function () {
 
         case 'message.deleted':
           if (event.message) {
+            this._extendEventWithOwnReactions(event);
+
             if (event.hard_delete) channelState.removeMessage(event.message);else channelState.addMessageSorted(event.message, false, false);
             channelState.removeQuotedMessageReferences(event.message);
 
@@ -3640,6 +3695,8 @@ var Channel = /*#__PURE__*/function () {
 
         case 'message.updated':
           if (event.message) {
+            this._extendEventWithOwnReactions(event);
+
             channelState.addMessageSorted(event.message, false, false);
 
             if (event.message.pinned) {
@@ -3752,7 +3809,7 @@ var Channel = /*#__PURE__*/function () {
   }, {
     key: "_checkInitialized",
     value: function _checkInitialized() {
-      if (!this.initialized && !this.getClient()._isUsingServerAuth()) {
+      if (!this.initialized && !this.staticState && !this.getClient()._isUsingServerAuth()) {
         throw Error("Channel ".concat(this.cid, " hasn't been initialized yet. Make sure to call .watch() and wait for it to resolve"));
       }
     } // eslint-disable-next-line sonarjs/cognitive-complexity
@@ -3794,7 +3851,8 @@ var Channel = /*#__PURE__*/function () {
         this.state.initMessages();
       }
 
-      this.state.addMessagesSorted(messages, false, true, true, messageSetToAddToIfDoesNotExist);
+      var _this$state$addMessag = this.state.addMessagesSorted(messages, false, true, true, messageSetToAddToIfDoesNotExist),
+          messageSet = _this$state$addMessag.messageSet;
 
       if (!this.state.pinnedMessages) {
         this.state.pinnedMessages = [];
@@ -3883,6 +3941,23 @@ var Channel = /*#__PURE__*/function () {
           _iterator4.f();
         }
       }
+
+      return {
+        messageSet: messageSet
+      };
+    }
+  }, {
+    key: "_extendEventWithOwnReactions",
+    value: function _extendEventWithOwnReactions(event) {
+      if (!event.message) {
+        return;
+      }
+
+      var message = this.state.findMessage(event.message.id, event.message.parent_id);
+
+      if (message) {
+        event.message.own_reactions = message.own_reactions;
+      }
     }
   }, {
     key: "_disconnect",
@@ -4747,12 +4822,12 @@ var StableWSConnection = /*#__PURE__*/function () {
     key: "_connect",
     value: function () {
       var _connect3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-        var wsURL, response, insights;
+        var isTokenReady, wsURL, response, insights;
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                if (!(this.isConnecting || this.isDisconnected)) {
+                if (!(this.isConnecting || this.isDisconnected && this.client.options.enableWSFallback)) {
                   _context5.next = 2;
                   break;
                 }
@@ -4764,14 +4839,37 @@ var StableWSConnection = /*#__PURE__*/function () {
                 this.isConnecting = true;
                 this.requestID = randomId();
                 this.client.insightMetrics.connectionStartTimestamp = new Date().getTime();
-                _context5.prev = 5;
+                isTokenReady = false;
+                _context5.prev = 6;
 
                 this._log("_connect() - waiting for token");
 
-                _context5.next = 9;
+                _context5.next = 10;
                 return this.client.tokenManager.tokenReady();
 
-              case 9:
+              case 10:
+                isTokenReady = true;
+                _context5.next = 15;
+                break;
+
+              case 13:
+                _context5.prev = 13;
+                _context5.t0 = _context5["catch"](6);
+
+              case 15:
+                _context5.prev = 15;
+
+                if (isTokenReady) {
+                  _context5.next = 20;
+                  break;
+                }
+
+                this._log("_connect() - tokenProvider failed before, so going to retry");
+
+                _context5.next = 20;
+                return this.client.tokenManager.loadToken();
+
+              case 20:
                 this._setupConnectionPromise();
 
                 wsURL = this._buildUrl();
@@ -4786,15 +4884,15 @@ var StableWSConnection = /*#__PURE__*/function () {
                 this.ws.onclose = this.onclose.bind(this, this.wsID);
                 this.ws.onerror = this.onerror.bind(this, this.wsID);
                 this.ws.onmessage = this.onmessage.bind(this, this.wsID);
-                _context5.next = 19;
+                _context5.next = 30;
                 return this.connectionOpen;
 
-              case 19:
+              case 30:
                 response = _context5.sent;
                 this.isConnecting = false;
 
                 if (!response) {
-                  _context5.next = 25;
+                  _context5.next = 36;
                   break;
                 }
 
@@ -4807,30 +4905,32 @@ var StableWSConnection = /*#__PURE__*/function () {
 
                 return _context5.abrupt("return", response);
 
-              case 25:
-                _context5.next = 32;
+              case 36:
+                _context5.next = 44;
                 break;
 
-              case 27:
-                _context5.prev = 27;
-                _context5.t0 = _context5["catch"](5);
+              case 38:
+                _context5.prev = 38;
+                _context5.t1 = _context5["catch"](15);
                 this.isConnecting = false;
 
+                this._log("_connect() - Error - ", _context5.t1);
+
                 if (this.client.options.enableInsights) {
                   this.client.insightMetrics.wsConsecutiveFailures++;
                   this.client.insightMetrics.wsTotalFailures++;
-                  insights = buildWsFatalInsight(this, convertErrorToJson(_context5.t0));
+                  insights = buildWsFatalInsight(this, convertErrorToJson(_context5.t1));
                   postInsights === null || postInsights === void 0 ? void 0 : postInsights('ws_fatal', insights);
                 }
 
-                throw _context5.t0;
+                throw _context5.t1;
 
-              case 32:
+              case 44:
               case "end":
                 return _context5.stop();
             }
           }
-        }, _callee5, this, [[5, 27]]);
+        }, _callee5, this, [[6, 13], [15, 38]]);
       }));
 
       function _connect() {
@@ -4897,7 +4997,7 @@ var StableWSConnection = /*#__PURE__*/function () {
                 return _context6.abrupt("return");
 
               case 12:
-                if (!this.isDisconnected) {
+                if (!(this.isDisconnected && this.client.options.enableWSFallback)) {
                   _context6.next = 15;
                   break;
                 }
@@ -5913,7 +6013,8 @@ function isString(x) {
 
 var StreamChat = /*#__PURE__*/function () {
   function StreamChat(_key, secretOrOptions, _options) {
-    var _this = this;
+    var _this = this,
+        _this$options;
 
     _classCallCheck(this, StreamChat);
 
@@ -5923,6 +6024,8 @@ var StreamChat = /*#__PURE__*/function () {
 
     _defineProperty(this, "anonymous", void 0);
 
+    _defineProperty(this, "persistUserOnConnectionFailure", void 0);
+
     _defineProperty(this, "axiosInstance", void 0);
 
     _defineProperty(this, "baseURL", void 0);
@@ -6050,8 +6153,12 @@ var StreamChat = /*#__PURE__*/function () {
                 _context.prev = 20;
                 _context.t0 = _context["catch"](14);
 
-                // cleanup client to allow the user to retry connectUser again
-                _this.disconnectUser();
+                if (_this.persistUserOnConnectionFailure) {
+                  // cleanup client to allow the user to retry connectUser again
+                  _this.closeConnection();
+                } else {
+                  _this.disconnectUser();
+                }
 
                 throw _context.t0;
 
@@ -6728,7 +6835,8 @@ var StreamChat = /*#__PURE__*/function () {
     this.activeChannels = {}; // mapping between channel groups and configs
 
     this.configs = {};
-    this.anonymous = false; // If its a server-side client, then lets initialize the tokenManager, since token will be
+    this.anonymous = false;
+    this.persistUserOnConnectionFailure = (_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.persistUserOnConnectionFailure; // If its a server-side client, then lets initialize the tokenManager, since token will be
     // generated from secret.
 
     this.tokenManager = new TokenManager(this.secret);
@@ -6837,7 +6945,8 @@ var StreamChat = /*#__PURE__*/function () {
        * This one is used by the frontend. This is a copy of the current user object stored on backend.
        * It contains reserved properties and own user properties which are not present in `this._user`.
        */
-      this.user = user; // this one is actually used for requests. This is a copy of current user provided to `connectUser` function.
+      this.user = user;
+      this.userID = user.id; // this one is actually used for requests. This is a copy of current user provided to `connectUser` function.
 
       this._user = _objectSpread({}, user);
     }
@@ -7869,20 +7978,10 @@ var StreamChat = /*#__PURE__*/function () {
         var sort,
             options,
             stateOptions,
-            skipInitialization,
             defaultOptions,
             payload,
             data,
-            channels,
-            _iterator2,
-            _step2,
-            channelState,
-            _iterator3,
-            _step3,
-            _channelState,
-            c,
             _args19 = arguments;
-
         return _regeneratorRuntime.wrap(function _callee19$(_context19) {
           while (1) {
             switch (_context19.prev = _context19.next) {
@@ -7890,17 +7989,16 @@ var StreamChat = /*#__PURE__*/function () {
                 sort = _args19.length > 1 && _args19[1] !== undefined ? _args19[1] : [];
                 options = _args19.length > 2 && _args19[2] !== undefined ? _args19[2] : {};
                 stateOptions = _args19.length > 3 && _args19[3] !== undefined ? _args19[3] : {};
-                skipInitialization = stateOptions.skipInitialization;
                 defaultOptions = {
                   state: true,
                   watch: true,
                   presence: false
                 }; // Make sure we wait for the connect promise if there is a pending one
 
-                _context19.next = 7;
+                _context19.next = 6;
                 return this.setUserPromise;
 
-              case 7:
+              case 6:
                 if (!this._hasConnectionID()) {
                   defaultOptions.watch = false;
                 } // Return a list of channels
@@ -7910,55 +8008,21 @@ var StreamChat = /*#__PURE__*/function () {
                   filter_conditions: filterConditions,
                   sort: normalizeQuerySort(sort)
                 }, defaultOptions), options);
-                _context19.next = 11;
+                _context19.next = 10;
                 return this.post(this.baseURL + '/channels', payload);
 
-              case 11:
+              case 10:
                 data = _context19.sent;
-                channels = []; // update our cache of the configs
-
-                _iterator2 = _createForOfIteratorHelper(data.channels);
-
-                try {
-                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                    channelState = _step2.value;
-
-                    this._addChannelConfig(channelState);
-                  }
-                } catch (err) {
-                  _iterator2.e(err);
-                } finally {
-                  _iterator2.f();
-                }
-
-                _iterator3 = _createForOfIteratorHelper(data.channels);
-
-                try {
-                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                    _channelState = _step3.value;
-                    c = this.channel(_channelState.channel.type, _channelState.channel.id);
-                    c.data = _channelState.channel;
-                    c.initialized = true;
-
-                    if (skipInitialization === undefined) {
-                      c._initializeState(_channelState, 'latest');
-                    } else if (!skipInitialization.includes(_channelState.channel.id)) {
-                      c.state.clearMessages();
-
-                      c._initializeState(_channelState, 'latest');
-                    }
-
-                    channels.push(c);
+                this.dispatchEvent({
+                  type: 'channels.queried',
+                  queriedChannels: {
+                    channels: data.channels,
+                    isLatestMessageSet: true
                   }
-                } catch (err) {
-                  _iterator3.e(err);
-                } finally {
-                  _iterator3.f();
-                }
-
-                return _context19.abrupt("return", channels);
+                });
+                return _context19.abrupt("return", this.hydrateActiveChannels(data.channels, stateOptions));
 
-              case 18:
+              case 13:
               case "end":
                 return _context19.stop();
             }
@@ -7972,6 +8036,73 @@ var StreamChat = /*#__PURE__*/function () {
 
       return queryChannels;
     }()
+  }, {
+    key: "hydrateActiveChannels",
+    value: function hydrateActiveChannels() {
+      var channelsFromApi = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      var stateOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var skipInitialization = stateOptions.skipInitialization,
+          _stateOptions$staticS = stateOptions.staticState,
+          staticState = _stateOptions$staticS === void 0 ? false : _stateOptions$staticS;
+
+      var _iterator2 = _createForOfIteratorHelper(channelsFromApi),
+          _step2;
+
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var channelState = _step2.value;
+
+          this._addChannelConfig(channelState);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+
+      var channels = [];
+
+      var _iterator3 = _createForOfIteratorHelper(channelsFromApi),
+          _step3;
+
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _channelState = _step3.value;
+          var c = this.channel(_channelState.channel.type, _channelState.channel.id);
+          c.data = _channelState.channel;
+          c.staticState = staticState;
+          c.initialized = !staticState;
+
+          if (skipInitialization === undefined) {
+            c._initializeState(_channelState, 'latest');
+          } else if (!skipInitialization.includes(_channelState.channel.id)) {
+            c.state.clearMessages();
+
+            c._initializeState(_channelState, 'latest');
+          }
+
+          channels.push(c);
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+
+      if (!staticState) {
+        // If the channels are coming from server, then clear out the
+        // previously help offline channels.
+        for (var _key5 in this.activeChannels) {
+          var _channel7 = this.activeChannels[_key5];
+
+          if (_channel7.staticState) {
+            delete this.activeChannels[_key5];
+          }
+        }
+      }
+
+      return channels;
+    }
     /**
      * search - Query messages
      *
@@ -9722,7 +9853,7 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "getUserAgent",
     value: function getUserAgent() {
-      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "6.7.3");
+      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "7.0.0-offline-support.2");
     }
   }, {
     key: "setUserAgent",
@@ -9786,9 +9917,9 @@ var StreamChat = /*#__PURE__*/function () {
       this.cleaningIntervalRef = setInterval(function () {
         // call clean on the channel, used for calling the stop.typing event etc.
         for (var _i3 = 0, _Object$values2 = Object.values(that.activeChannels); _i3 < _Object$values2.length; _i3++) {
-          var _channel7 = _Object$values2[_i3];
+          var _channel8 = _Object$values2[_i3];
 
-          _channel7.clean();
+          _channel8.clean();
         }
       }, 500);
     }