@twilio/conversations 2.6.4 → 2.6.5

package/builds/twilio-conversations.js

@@ -15695,7 +15695,7 @@ this.Twilio.Conversations = (function (exports) {
 	  }();
 
 	  var logInstance = new Logger("");
-	  var version = "0.13.11";
+	  var version = "0.13.12";
 	  /**
 	   * Settings container for the Twilsock client library
 	   */
@@ -34307,7 +34307,7 @@ this.Twilio.Conversations = (function (exports) {
 	    return Network;
 	  }();
 
-	  var version = "0.6.12";
+	  var version = "0.6.13";
 
 	  var _class;
 
@@ -38700,6 +38700,10 @@ this.Twilio.Conversations = (function (exports) {
 	   * Promise for the conversation entity document.
 	   */
 
+	  /**
+	   * Promise for the messages list.
+	   */
+
 	  /**
 	   * Conversation entity document.
 	   */
@@ -39982,44 +39986,95 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "_fetchStreams",
 	    value: function () {
-	      var _fetchStreams2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee26() {
-	        var _this$_entity, _this$_entity2;
+	      var _fetchStreams2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee27() {
+	        var _this3 = this;
 
-	        var data;
-	        return _regeneratorRuntime$1.wrap(function _callee26$(_context26) {
+	        return _regeneratorRuntime$1.wrap(function _callee27$(_context27) {
 	          while (1) {
-	            switch (_context26.prev = _context26.next) {
+	            switch (_context27.prev = _context27.next) {
 	              case 0:
-	                _context26.next = 2;
-	                return this._subscribe();
+	                if (!this._streamsPromise) {
+	                  _context27.next = 2;
+	                  break;
+	                }
 
-	              case 2:
-	                Conversation._logger.trace("_streamsAvailable, this.entity.data=", (_this$_entity = this._entity) === null || _this$_entity === void 0 ? void 0 : _this$_entity.data);
+	                return _context27.abrupt("return", this._streamsPromise);
 
-	                data = (_this$_entity2 = this._entity) === null || _this$_entity2 === void 0 ? void 0 : _this$_entity2.data;
-	                _context26.next = 6;
-	                return this._services.syncClient.list({
-	                  id: data.messages,
-	                  mode: "open_existing"
-	                });
+	              case 2:
+	                this._streamsPromise = new Promise( /*#__PURE__*/function () {
+	                  var _ref = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee26(resolve, reject) {
+	                    var _this3$_entity, _this3$_entity2;
+
+	                    var data, messagesPromise, participantsPromise;
+	                    return _regeneratorRuntime$1.wrap(function _callee26$(_context26) {
+	                      while (1) {
+	                        switch (_context26.prev = _context26.next) {
+	                          case 0:
+	                            _context26.prev = 0;
+	                            _context26.next = 3;
+	                            return _this3._subscribe();
+
+	                          case 3:
+	                            _context26.next = 9;
+	                            break;
 
-	              case 6:
-	                this._messagesList = _context26.sent;
-	                _context26.next = 9;
-	                return this._services.syncClient.map({
-	                  id: data.roster,
-	                  mode: "open_existing"
-	                });
+	                          case 5:
+	                            _context26.prev = 5;
+	                            _context26.t0 = _context26["catch"](0);
+
+	                            Conversation._logger.trace("Failed to subscribe to conversation", _context26.t0);
+
+	                            return _context26.abrupt("return", reject(_context26.t0));
+
+	                          case 9:
+	                            Conversation._logger.trace("_streamsAvailable, this.entity.data=", (_this3$_entity = _this3._entity) === null || _this3$_entity === void 0 ? void 0 : _this3$_entity.data);
+
+	                            data = (_this3$_entity2 = _this3._entity) === null || _this3$_entity2 === void 0 ? void 0 : _this3$_entity2.data;
+	                            messagesPromise = _this3._services.syncClient.list({
+	                              id: data.messages,
+	                              mode: "open_existing"
+	                            }).then(function (list) {
+	                              _this3._messagesList = list;
+	                              return list;
+	                            });
+	                            participantsPromise = _this3._services.syncClient.map({
+	                              id: data.roster,
+	                              mode: "open_existing"
+	                            }).then(function (map) {
+	                              _this3._participantsMap = map;
+	                              return map;
+	                            });
+	                            Promise.all([messagesPromise, participantsPromise]).then(function () {
+	                              return resolve(true);
+	                            }).catch(function (err) {
+	                              Conversation._logger.trace("Failed to fetch conversation streams for conversation", _this3.sid, err);
+
+	                              reject(err);
+	                            });
+
+	                          case 14:
+	                          case "end":
+	                            return _context26.stop();
+	                        }
+	                      }
+	                    }, _callee26, null, [[0, 5]]);
+	                  }));
 
-	              case 9:
-	                this._participantsMap = _context26.sent;
+	                  return function (_x20, _x21) {
+	                    return _ref.apply(this, arguments);
+	                  };
+	                }());
+	                return _context27.abrupt("return", this._streamsPromise.catch(function (err) {
+	                  _this3._streamsPromise = null;
+	                  throw err;
+	                }));
 
-	              case 10:
+	              case 4:
 	              case "end":
-	                return _context26.stop();
+	                return _context27.stop();
 	            }
 	          }
-	        }, _callee26, this);
+	        }, _callee27, this);
 	      }));
 
 	      function _fetchStreams() {
@@ -40039,48 +40094,48 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "_subscribeStreams",
 	    value: function () {
-	      var _subscribeStreams2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee27() {
-	        var _this$_entity3, _this$_entity4, _this$_messagesList, _this$_participantsMa, data, messagesObjectName, rosterObjectName;
+	      var _subscribeStreams2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee28() {
+	        var _this$_entity, _this$_entity2, _this$_messagesList, _this$_participantsMa, data, messagesObjectName, rosterObjectName;
 
-	        return _regeneratorRuntime$1.wrap(function _callee27$(_context27) {
+	        return _regeneratorRuntime$1.wrap(function _callee28$(_context28) {
 	          while (1) {
-	            switch (_context27.prev = _context27.next) {
+	            switch (_context28.prev = _context28.next) {
 	              case 0:
-	                _context27.prev = 0;
-	                _context27.next = 3;
-	                return this._subscribe();
+	                _context28.prev = 0;
+	                _context28.next = 3;
+	                return this._fetchStreams();
 
 	              case 3:
-	                Conversation._logger.trace("_subscribeStreams, this.entity.data=", (_this$_entity3 = this._entity) === null || _this$_entity3 === void 0 ? void 0 : _this$_entity3.data);
+	                Conversation._logger.trace("_subscribeStreams, this.entity.data=", (_this$_entity = this._entity) === null || _this$_entity === void 0 ? void 0 : _this$_entity.data);
 
-	                data = (_this$_entity4 = this._entity) === null || _this$_entity4 === void 0 ? void 0 : _this$_entity4.data;
+	                data = (_this$_entity2 = this._entity) === null || _this$_entity2 === void 0 ? void 0 : _this$_entity2.data;
 	                messagesObjectName = data.messages;
 	                rosterObjectName = data.roster;
-	                _context27.next = 9;
+	                _context28.next = 9;
 	                return Promise.all([this._messagesEntity.subscribe((_this$_messagesList = this._messagesList) !== null && _this$_messagesList !== void 0 ? _this$_messagesList : messagesObjectName), this._participantsEntity.subscribe((_this$_participantsMa = this._participantsMap) !== null && _this$_participantsMa !== void 0 ? _this$_participantsMa : rosterObjectName)]);
 
 	              case 9:
-	                _context27.next = 16;
+	                _context28.next = 16;
 	                break;
 
 	              case 11:
-	                _context27.prev = 11;
-	                _context27.t0 = _context27["catch"](0);
+	                _context28.prev = 11;
+	                _context28.t0 = _context28["catch"](0);
 
 	                if (this._services.syncClient.connectionState !== "disconnected") {
-	                  Conversation._logger.error("Failed to subscribe on conversation objects", this.sid, _context27.t0);
+	                  Conversation._logger.error("Failed to subscribe on conversation objects", this.sid, _context28.t0);
 	                }
 
-	                Conversation._logger.debug("ERROR: Failed to subscribe on conversation objects", this.sid, _context27.t0);
+	                Conversation._logger.debug("ERROR: Failed to subscribe on conversation objects", this.sid, _context28.t0);
 
-	                throw _context27.t0;
+	                throw _context28.t0;
 
 	              case 16:
 	              case "end":
-	                return _context27.stop();
+	                return _context28.stop();
 	            }
 	          }
-	        }, _callee27, this, [[0, 11]]);
+	        }, _callee28, this, [[0, 11]]);
 	      }));
 
 	      function _subscribeStreams() {
@@ -40097,10 +40152,10 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "_unsubscribe",
 	    value: function () {
-	      var _unsubscribe2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee28() {
-	        return _regeneratorRuntime$1.wrap(function _callee28$(_context28) {
+	      var _unsubscribe2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee29() {
+	        return _regeneratorRuntime$1.wrap(function _callee29$(_context29) {
 	          while (1) {
-	            switch (_context28.prev = _context28.next) {
+	            switch (_context29.prev = _context29.next) {
 	              case 0:
 	                if (this._entity) {
 	                  this._entity.close();
@@ -40109,14 +40164,14 @@ this.Twilio.Conversations = (function (exports) {
 	                  this._entityPromise = null;
 	                }
 
-	                return _context28.abrupt("return", Promise.all([this._participantsEntity.unsubscribe(), this._messagesEntity.unsubscribe()]));
+	                return _context29.abrupt("return", Promise.all([this._participantsEntity.unsubscribe(), this._messagesEntity.unsubscribe()]));
 
 	              case 2:
 	              case "end":
-	                return _context28.stop();
+	                return _context29.stop();
 	            }
 	          }
-	        }, _callee28, this);
+	        }, _callee29, this);
 	      }));
 
 	      function _unsubscribe() {
@@ -40133,7 +40188,7 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "_setStatus",
 	    value: function _setStatus(status, source) {
-	      var _this3 = this;
+	      var _this4 = this;
 
 	      this._dataSource = source;
 
@@ -40147,7 +40202,7 @@ this.Twilio.Conversations = (function (exports) {
 	        this._subscribeStreams().catch(function (err) {
 	          Conversation._logger.debug("ERROR while setting conversation status " + status, err);
 
-	          if (_this3._services.syncClient.connectionState !== "disconnected") {
+	          if (_this4._services.syncClient.connectionState !== "disconnected") {
 	            throw err;
 	          }
 	        });
@@ -40159,7 +40214,7 @@ this.Twilio.Conversations = (function (exports) {
 	        this._unsubscribe().catch(function (err) {
 	          Conversation._logger.debug("ERROR while setting conversation status " + status, err);
 
-	          if (_this3._services.syncClient.connectionState !== "disconnected") {
+	          if (_this4._services.syncClient.connectionState !== "disconnected") {
 	            throw err;
 	          }
 	        });
@@ -40322,30 +40377,30 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "_setLastReadMessageIndex",
 	    value: function () {
-	      var _setLastReadMessageIndex2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee29(index) {
+	      var _setLastReadMessageIndex2 = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee30(index) {
 	        var result;
-	        return _regeneratorRuntime$1.wrap(function _callee29$(_context29) {
+	        return _regeneratorRuntime$1.wrap(function _callee30$(_context30) {
 	          while (1) {
-	            switch (_context29.prev = _context29.next) {
+	            switch (_context30.prev = _context30.next) {
 	              case 0:
-	                _context29.next = 2;
+	                _context30.next = 2;
 	                return this._services.commandExecutor.mutateResource("post", "".concat(this._configuration.links.myConversations, "/").concat(this.sid), {
 	                  last_read_message_index: index
 	                });
 
 	              case 2:
-	                result = _context29.sent;
-	                return _context29.abrupt("return", result.unread_messages_count);
+	                result = _context30.sent;
+	                return _context30.abrupt("return", result.unread_messages_count);
 
 	              case 4:
 	              case "end":
-	                return _context29.stop();
+	                return _context30.stop();
 	            }
 	          }
-	        }, _callee29, this);
+	        }, _callee30, this);
 	      }));
 
-	      function _setLastReadMessageIndex(_x20) {
+	      function _setLastReadMessageIndex(_x22) {
 	        return _setLastReadMessageIndex2.apply(this, arguments);
 	      }
 
@@ -41793,7 +41848,7 @@ this.Twilio.Conversations = (function (exports) {
 	  this.data = data.data || {};
 	});
 
-	var version = "2.6.4";
+	var version = "2.6.5";
 
 	function _isNativeFunction(fn) {
 	  return Function.toString.call(fn).indexOf("[native code]") !== -1;