@twilio/conversations 3.0.1-rc.103 → 3.0.1

package/builds/browser.js

@@ -154,10 +154,10 @@ var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
-require('core-js/modules/es.object.to-string.js');
-require('core-js/modules/es.promise.js');
 require('core-js/modules/es.array.map.js');
+require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/web.dom-collections.for-each.js');
+require('core-js/modules/es.promise.js');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var _typeof = require('@babel/runtime/helpers/typeof');
 require('core-js/modules/es.array.concat.js');
@@ -176,7 +176,6 @@ var declarativeTypeValidator = require('@twilio/declarative-type-validator');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 require('core-js/modules/es.array.includes.js');
 var replayEventEmitter = require('@twilio/replay-event-emitter');
-var isEqual = require('lodash.isequal');
 require('core-js/modules/es.array.slice.js');
 require('core-js/modules/es.function.name.js');
 require('core-js/modules/es.regexp.test.js');
@@ -217,16 +216,15 @@ require('core-js/modules/es.typed-array.subarray.js');
 require('core-js/modules/es.typed-array.to-locale-string.js');
 require('core-js/modules/es.typed-array.to-string.js');
 require('core-js/modules/es.array-buffer.constructor.js');
-require('isomorphic-form-data');
 require('core-js/modules/es.array.sort.js');
 require('core-js/modules/es.string.includes.js');
 require('core-js/modules/es.string.starts-with.js');
+require('core-js/modules/es.weak-set.js');
 var deprecationDecorator = require('@twilio/deprecation-decorator');
 require('core-js/modules/es.object.entries.js');
 require('core-js/modules/es.array.find.js');
 require('core-js/modules/es.array.splice.js');
 var _wrapNativeSuper = require('@babel/runtime/helpers/wrapNativeSuper');
-var uuid = require('uuid');
 require('core-js/modules/es.object.freeze.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -261,7 +259,6 @@ var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regenerat
 var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 var loglevelLog__namespace = /*#__PURE__*/_interopNamespace(loglevelLog);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
-var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var _wrapNativeSuper__default = /*#__PURE__*/_interopDefaultLegacy(_wrapNativeSuper);
 
@@ -301,11 +298,13 @@ var Logger = /*#__PURE__*/function () {
   }, {
     key: "trace",
     value: function trace() {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+      if (log$7.getLevel() == log$7.levels.TRACE) {
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
 
-      log$7.trace.apply(null, prepareLine(this.prefix + "T", args));
+        log$7.debug.apply(null, prepareLine(this.prefix + "T", args));
+      }
     }
   }, {
     key: "debug",
@@ -356,11 +355,13 @@ var Logger = /*#__PURE__*/function () {
   }, {
     key: "trace",
     value: function trace() {
-      for (var _len6 = arguments.length, args = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
-        args[_key6] = arguments[_key6];
-      }
+      if (log$7.getLevel() == log$7.levels.TRACE) {
+        for (var _len6 = arguments.length, args = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+          args[_key6] = arguments[_key6];
+        }
 
-      log$7.trace.apply(null, prepareLine("T", args));
+        log$7.debug.apply(null, prepareLine("T", args));
+      }
     }
   }, {
     key: "debug",
@@ -570,6 +571,56 @@ var UriBuilder = /*#__PURE__*/function () {
 
   return UriBuilder;
 }();
+/**
+ * Deep equality check for objects
+ * @param a - first value to compare
+ * @param b - second value to compare
+ * @returns true if values are deeply equal
+ */
+
+
+function isEqual(a, b) {
+  if (a === b) {
+    return true;
+  }
+
+  if (a === null || b === null || a === undefined || b === undefined) {
+    return a === b;
+  }
+
+  if (_typeof__default["default"](a) !== _typeof__default["default"](b)) {
+    return false;
+  }
+
+  if (_typeof__default["default"](a) !== "object") {
+    return a === b;
+  }
+
+  if (Array.isArray(a) && Array.isArray(b)) {
+    if (a.length !== b.length) {
+      return false;
+    }
+
+    return a.every(function (item, index) {
+      return isEqual(item, b[index]);
+    });
+  }
+
+  if (Array.isArray(a) || Array.isArray(b)) {
+    return false;
+  }
+
+  var aKeys = Object.keys(a);
+  var bKeys = Object.keys(b);
+
+  if (aKeys.length !== bKeys.length) {
+    return false;
+  }
+
+  return aKeys.every(function (key) {
+    return isEqual(a[key], b[key]);
+  });
+}
 
 var json = declarativeTypeValidator.custom(function (value) {
   return [["string", "number", "boolean", "object"].includes(_typeof__default["default"](value)), "a JSON type"];
@@ -650,6 +701,22 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
    * @event
    */
 
+  /**
+   * Fired when the client has subscribed to the user.
+   *
+   * Parameters:
+   * 1. {@link User} `user` - the user in question
+   * @event
+   */
+
+  /**
+   * Fired when the client has unsubscribed from the user.
+   *
+   * Parameters:
+   * 1. {@link User} `user` - the user in question
+   * @event
+   */
+
 
   _createClass__default["default"](User, [{
     key: "identity",
@@ -744,7 +811,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 9:
                 updateAttributes = parseAttributes(value.value, "Retrieved malformed attributes from the server for user: ".concat(this.state.identity), log$6);
 
-                if (!isEqual__default["default"](this.state.attributes, updateAttributes)) {
+                if (!isEqual(this.state.attributes, updateAttributes)) {
                   this.state.attributes = updateAttributes;
                   updateReasons.push("attributes");
                 }
@@ -1322,6 +1389,24 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
    * @event
    */
 
+  /**
+   * Fired when the participant has stopped typing.
+   *
+   * Parameters:
+   * 1. {@link Participant} `participant` - the participant in question
+   * @event
+   */
+
+  /**
+   * Fired when the fields of the participant have been updated.
+   *
+   * Parameters:
+   * 1. object `data` - info object provided with the event. It has the following properties:
+   *     * {@link Participant} participant - the participant in question
+   *     * {@link ParticipantUpdateReason}[] updateReasons - array of reasons for the update
+   * @event
+   */
+
 
   _createClass__default["default"](Participant, [{
     key: "sid",
@@ -1448,8 +1533,9 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
       }
 
       this.state.isTyping = true;
-      this.emit("typingStarted", this);
-      this.conversation.emit("typingStarted", this);
+      this.emit(Participant.typingStarted, this);
+      this.conversation.emit(Conversation.typingStarted, this); // @fixme layering violation
+
       this.state.typingTimeout = Number(setTimeout(function () {
         return _this2._endTyping();
       }, timeout));
@@ -1468,8 +1554,8 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
       }
 
       this.state.isTyping = false;
-      this.emit("typingEnded", this);
-      this.conversation.emit("typingEnded", this);
+      this.emit(Participant.typingEnded, this);
+      this.conversation.emit(Conversation.typingEnded, this);
       clearInterval(this.state.typingTimeout);
       this.state.typingTimeout = null;
     }
@@ -1484,7 +1570,7 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
       var updateReasons = [];
       var updateAttributes = parseAttributes(data.attributes, "Retrieved malformed attributes from the server for participant: " + this.state.sid, log$5);
 
-      if (data.attributes && !isEqual__default["default"](this.state.attributes, updateAttributes)) {
+      if (data.attributes && !isEqual(this.state.attributes, updateAttributes)) {
         this.state.attributes = updateAttributes;
         updateReasons.push("attributes");
       }
@@ -1522,13 +1608,13 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
         }
       }
 
-      if (data.bindings && !isEqual__default["default"](this.state.bindings, data.bindings)) {
+      if (data.bindings && !isEqual(this.state.bindings, data.bindings)) {
         this.state.bindings = data.bindings;
         updateReasons.push("bindings");
       }
 
       if (updateReasons.length > 0) {
-        this.emit("updated", {
+        this.emit(Participant.updated, {
           participant: this,
           updateReasons: updateReasons
         });
@@ -1664,7 +1750,8 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
 
   var _super = _createSuper$7(Participants);
 
-  function Participants(conversation, participants, links, configuration, services) {
+  // passed in from Conversation
+  function Participants(conversation, participants, links, services) {
     var _this;
 
     _classCallCheck__default["default"](this, Participants);
@@ -1676,7 +1763,6 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
     _this.conversation = conversation;
     _this.participants = participants;
     _this.links = links;
-    _this.configuration = configuration;
     _this.services = services;
     return _this;
   }
@@ -1727,14 +1813,14 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
         mode: "open_existing"
       }) : Promise.resolve(arg);
       return this.rosterEntityPromise = this.rosterEntityPromise || participantsMapPromise.then(function (rosterMap) {
-        rosterMap.on("itemAdded", function (args) {
+        rosterMap.on(twilioSync.SyncMap.itemAdded, function (args) {
           log$4.debug(_this2.conversation.sid + " itemAdded: " + args.item.key);
 
           _this2.upsertParticipant(args.item.key, args.item.data).then(function (participant) {
-            _this2.emit("participantJoined", participant);
+            _this2.emit(Conversation.participantJoined, participant);
           });
         });
-        rosterMap.on("itemRemoved", function (args) {
+        rosterMap.on(twilioSync.SyncMap.itemRemoved, function (args) {
           log$4.debug(_this2.conversation.sid + " itemRemoved: " + args.key);
           var participantSid = args.key;
 
@@ -1750,12 +1836,14 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
             return;
           }
 
-          _this2.emit("participantLeft", leftParticipant);
+          _this2.emit(Conversation.participantLeft, leftParticipant);
         });
-        rosterMap.on("itemUpdated", function (args) {
+        rosterMap.on(twilioSync.SyncMap.itemUpdated, function (args) {
           log$4.debug(_this2.conversation.sid + " itemUpdated: " + args.item.key);
 
-          _this2.upsertParticipant(args.item.key, args.item.data);
+          _this2.upsertParticipant(args.item.key, args.item.data).catch(function (e) {
+            return log$4.error(e);
+          });
         });
         var participantsPromises = [];
 
@@ -1849,8 +1937,8 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
                 };
                 participant = new Participant(data, participantSid, this.conversation, links, this.services);
                 this.participants.set(participantSid, participant);
-                participant.on("updated", function (args) {
-                  return _this3.emit("participantUpdated", args);
+                participant.on(Participant.updated, function (args) {
+                  return _this3.emit(Conversation.participantUpdated, args);
                 });
                 return _context3.abrupt("return", participant);
 
@@ -2114,6 +2202,8 @@ var Media = /*#__PURE__*/function () {
    * @internal
    */
   function Media(data, services) {
+    var _data$filename;
+
     _classCallCheck__default["default"](this, Media);
 
     _defineProperty__default["default"](this, "mcsMedia", null);
@@ -2127,7 +2217,7 @@ var Media = /*#__PURE__*/function () {
     this.state = {
       sid: data.sid,
       category: data.category,
-      filename: data.filename,
+      filename: (_data$filename = data.filename) !== null && _data$filename !== void 0 ? _data$filename : null,
       contentType: data.contentType,
       size: data.size
     };
@@ -2200,10 +2290,12 @@ var Media = /*#__PURE__*/function () {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  fetchMediaRequest = _this._fetchMcsMedia();
+                  fetchMediaRequest = _this.mcsMedia ? undefined : _this._fetchMcsMedia();
                   contentUrlRequest = (_this$mcsMedia = _this.mcsMedia) === null || _this$mcsMedia === void 0 ? void 0 : _this$mcsMedia.getContentUrl();
                   onCancel(function () {
-                    fetchMediaRequest.cancel();
+                    if (fetchMediaRequest) {
+                      fetchMediaRequest.cancel();
+                    }
 
                     if (contentUrlRequest) {
                       contentUrlRequest.cancel();
@@ -2211,7 +2303,7 @@ var Media = /*#__PURE__*/function () {
                   });
                   _context.prev = 3;
 
-                  if (_this.mcsMedia) {
+                  if (contentUrlRequest) {
                     _context.next = 9;
                     break;
                   }
@@ -2221,7 +2313,7 @@ var Media = /*#__PURE__*/function () {
 
                 case 7:
                   mcsMedia = _context.sent;
-                  contentUrlRequest = mcsMedia.getContentUrl();
+                  contentUrlRequest = mcsMedia === null || mcsMedia === void 0 ? void 0 : mcsMedia.getContentUrl();
 
                 case 9:
                   _context.t0 = resolve;
@@ -2278,13 +2370,11 @@ var Media = /*#__PURE__*/function () {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
-                  request = _this2.services.mcsClient.get(_this2.state.sid);
-
-                  if (!_this2.services.mcsClient) {
-                    _context2.next = 14;
-                    break;
+                  if (_this2.services.mcsClient === null) {
+                    reject(new Error("Media Content Service is unavailable"));
                   }
 
+                  request = _this2.services.mcsClient.get(_this2.state.sid);
                   onCancel(function () {
                     return request.cancel();
                   });
@@ -2294,27 +2384,22 @@ var Media = /*#__PURE__*/function () {
 
                 case 6:
                   _this2.mcsMedia = _context2.sent;
+                  _this2.state = _this2.mcsMedia._state();
                   resolve(_this2.mcsMedia);
-                  _context2.next = 13;
+                  _context2.next = 14;
                   break;
 
-                case 10:
-                  _context2.prev = 10;
+                case 11:
+                  _context2.prev = 11;
                   _context2.t0 = _context2["catch"](3);
                   reject(_context2.t0);
 
-                case 13:
-                  return _context2.abrupt("return");
-
                 case 14:
-                  reject(new Error("Media Content Service is unavailable"));
-
-                case 15:
                 case "end":
                   return _context2.stop();
               }
             }
-          }, _callee2, null, [[3, 10]]);
+          }, _callee2, null, [[3, 11]]);
         }));
 
         return function (_x4, _x5, _x6) {
@@ -2322,6 +2407,15 @@ var Media = /*#__PURE__*/function () {
         };
       }());
     }
+    /**
+     * @internal
+     */
+
+  }, {
+    key: "_state",
+    value: function _state() {
+      return this.state;
+    }
   }]);
 
   return Media;
@@ -2819,6 +2913,12 @@ function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) {
 function _createSuper$6(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$6(); return function _createSuperInternal() { var Super = _getPrototypeOf__default["default"](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default["default"](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default["default"](this, result); }; }
 
 function _isNativeReflectConstruct$6() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
+
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 var log$3 = Logger.scope("Message");
 
 var XHR = // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -2828,6 +2928,10 @@ global["XMLHttpRequest"] || {};
  */
 
 
+var _wrapMedia = /*#__PURE__*/new WeakSet();
+
+var _assignMedias = /*#__PURE__*/new WeakSet();
+
 var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](Message, _ReplayEventEmitter);
 
@@ -2841,13 +2945,18 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
    * @internal
    */
   function Message(index, data, conversation, links, configuration, services) {
-    var _data$text, _data$lastUpdatedBy, _data$type, _data$memberSid, _data$channelMetadata;
+    var _data$text, _data$lastUpdatedBy, _data$type, _data$memberSid, _data$channelMetadata, _data$medias, _data$media;
 
     var _this;
 
     _classCallCheck__default["default"](this, Message);
 
     _this = _super.call(this);
+
+    _classPrivateMethodInitSpec(_assertThisInitialized__default["default"](_this), _assignMedias);
+
+    _classPrivateMethodInitSpec(_assertThisInitialized__default["default"](_this), _wrapMedia);
+
     _this.conversation = conversation;
     _this.links = links;
     _this.configuration = configuration;
@@ -2864,16 +2973,15 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       lastUpdatedBy: (_data$lastUpdatedBy = data.lastUpdatedBy) !== null && _data$lastUpdatedBy !== void 0 ? _data$lastUpdatedBy : null,
       attributes: parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(data.sid), log$3),
       type: (_data$type = data.type) !== null && _data$type !== void 0 ? _data$type : "text",
-      media: data.type === "media" && data.media ? new Media(data.media, _this.services) : null,
-      medias: data.type === "media" && data.medias ? data.medias.map(function (m) {
-        return new Media(m, _this.services);
-      }) : data.type === "media" && data.media && !data.medias ? [new Media(_objectSpread$4(_objectSpread$4({}, data.media), {}, {
-        category: "media"
-      }), _this.services)] : null,
+      media: null,
+      medias: null,
       participantSid: (_data$memberSid = data.memberSid) !== null && _data$memberSid !== void 0 ? _data$memberSid : null,
       aggregatedDeliveryReceipt: data.delivery ? new AggregatedDeliveryReceipt(data.delivery) : null,
       hasChannelMetadata: (_data$channelMetadata = data.channelMetadata) !== null && _data$channelMetadata !== void 0 ? _data$channelMetadata : false
     };
+
+    _classPrivateMethodGet(_assertThisInitialized__default["default"](_this), _assignMedias, _assignMedias2).call(_assertThisInitialized__default["default"](_this), (_data$medias = data.medias) !== null && _data$medias !== void 0 ? _data$medias : null, (_data$media = data.media) !== null && _data$media !== void 0 ? _data$media : null);
+
     return _this;
   }
   /**
@@ -3095,6 +3203,12 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_update",
     value: function _update(data) {
+      var _data$medias2,
+          _this2 = this,
+          _this$state$medias2,
+          _classPrivateMethodGe2,
+          _this$state$media;
+
       var updateReasons = [];
 
       if ((data.text || typeof data.text === "string") && data.text !== this.state.body) {
@@ -3129,7 +3243,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       var updatedAttributes = parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(this.sid), log$3);
 
-      if (!isEqual__default["default"](this.state.attributes, updatedAttributes)) {
+      if (!isEqual(this.state.attributes, updatedAttributes)) {
         this.state.attributes = updatedAttributes;
         updateReasons.push("attributes");
       }
@@ -3147,6 +3261,29 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
           updateReasons.push("deliveryReceipt");
         }
+      } // @fixme: This is a fairly heavy check.
+      // Map data back and forth to perform a necessary field massage.
+
+
+      var input = ((_data$medias2 = data.medias) !== null && _data$medias2 !== void 0 ? _data$medias2 : []).map(function (value) {
+        var _classPrivateMethodGe;
+
+        return (_classPrivateMethodGe = _classPrivateMethodGet(_this2, _wrapMedia, _wrapMedia2).call(_this2, value)) === null || _classPrivateMethodGe === void 0 ? void 0 : _classPrivateMethodGe._state();
+      }).filter(function (el) {
+        return !(el === null);
+      });
+      var current = ((_this$state$medias2 = this.state.medias) !== null && _this$state$medias2 !== void 0 ? _this$state$medias2 : []).map(function (value) {
+        return value._state();
+      }).filter(function (el) {
+        return !(el === null);
+      });
+
+      if (!isEqual(input, current) || !isEqual((_classPrivateMethodGe2 = _classPrivateMethodGet(this, _wrapMedia, _wrapMedia2).call(this, data.media)) === null || _classPrivateMethodGe2 === void 0 ? void 0 : _classPrivateMethodGe2._state(), (_this$state$media = this.state.media) === null || _this$state$media === void 0 ? void 0 : _this$state$media._state())) {
+        var _data$medias3, _data$media2;
+
+        _classPrivateMethodGet(this, _assignMedias, _assignMedias2).call(this, (_data$medias3 = data.medias) !== null && _data$medias3 !== void 0 ? _data$medias3 : null, (_data$media2 = data.media) !== null && _data$media2 !== void 0 ? _data$media2 : null);
+
+        updateReasons.push("media");
       }
 
       if (updateReasons.length > 0) {
@@ -3164,9 +3301,9 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "getParticipant",
     value: function () {
       var _getParticipant = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
-        var _this2 = this;
+        var _this3 = this;
 
-        var participant, errorMesage;
+        var participant, errorMessage;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -3180,7 +3317,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
                 _context.next = 4;
                 return this.conversation.getParticipantBySid(this.state.participantSid).catch(function () {
-                  log$3.debug("Participant with sid \"".concat(_this2.participantSid, "\" not found for message ").concat(_this2.sid));
+                  log$3.debug("Participant with sid \"".concat(_this3.participantSid, "\" not found for message ").concat(_this3.sid));
                   return null;
                 });
 
@@ -3195,7 +3332,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
                 _context.next = 8;
                 return this.conversation.getParticipantByIdentity(this.state.author).catch(function () {
-                  log$3.debug("Participant with identity \"".concat(_this2.author, "\" not found for message ").concat(_this2.sid));
+                  log$3.debug("Participant with identity \"".concat(_this3.author, "\" not found for message ").concat(_this3.sid));
                   return null;
                 });
 
@@ -3211,26 +3348,26 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return _context.abrupt("return", participant);
 
               case 11:
-                errorMesage = "Participant with ";
+                errorMessage = "Participant with ";
 
                 if (this.state.participantSid) {
-                  errorMesage += "SID '" + this.state.participantSid + "' ";
+                  errorMessage += "SID '" + this.state.participantSid + "' ";
                 }
 
                 if (this.state.author) {
                   if (this.state.participantSid) {
-                    errorMesage += "or ";
+                    errorMessage += "or ";
                   }
 
-                  errorMesage += "identity '" + this.state.author + "' ";
+                  errorMessage += "identity '" + this.state.author + "' ";
                 }
 
-                if (errorMesage === "Participant with ") {
-                  errorMesage = "Participant ";
+                if (errorMessage === "Participant with ") {
+                  errorMessage = "Participant ";
                 }
 
-                errorMesage += "was not found";
-                throw new Error(errorMesage);
+                errorMessage += "was not found";
+                throw new Error(errorMessage);
 
               case 17:
               case "end":
@@ -3410,7 +3547,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "attachTemporaryUrlsFor",
     value: function () {
       var _attachTemporaryUrlsFor = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(contentSet) {
-        var _this3 = this;
+        var _this4 = this;
 
         var sids;
         return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
@@ -3433,7 +3570,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 4:
                 return _context6.abrupt("return", _context6.sent.map(function (item) {
-                  return new Media(item, _this3.services);
+                  return new Media(item, _this4.services);
                 }));
 
               case 7:
@@ -3476,7 +3613,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getTemporaryContentUrlsForMediaSids",
     value: function getTemporaryContentUrlsForMediaSids(mediaSids) {
-      var _this4 = this;
+      var _this5 = this;
 
       return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(resolve, reject, onCancel) {
@@ -3485,9 +3622,9 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
             while (1) {
               switch (_context7.prev = _context7.next) {
                 case 0:
-                  mediaGetRequest = _this4.services.mcsClient.mediaSetGetContentUrls(mediaSids !== null && mediaSids !== void 0 ? mediaSids : []);
+                  mediaGetRequest = _this5.services.mcsClient.mediaSetGetContentUrls(mediaSids !== null && mediaSids !== void 0 ? mediaSids : []);
 
-                  if (!(!_this4.services.mcsClient || !mediaSids)) {
+                  if (!(!_this5.services.mcsClient || !mediaSids)) {
                     _context7.next = 4;
                     break;
                   }
@@ -3546,7 +3683,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "_getDetailedDeliveryReceiptsPaginator",
     value: function () {
       var _getDetailedDeliveryReceiptsPaginator2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(options) {
-        var _this5 = this;
+        var _this6 = this;
 
         var messagesReceiptsUrl, url, response;
         return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
@@ -3563,7 +3700,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return _context8.abrupt("return", new RestPaginator(response.body.delivery_receipts.map(function (x) {
                   return new DetailedDeliveryReceipt(x);
                 }), function (pageToken, pageSize) {
-                  return _this5._getDetailedDeliveryReceiptsPaginator({
+                  return _this6._getDetailedDeliveryReceiptsPaginator({
                     pageToken: pageToken,
                     pageSize: pageSize
                   });
@@ -3591,7 +3728,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getContentData",
     value: function getContentData() {
-      var _this6 = this;
+      var _this7 = this;
 
       return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(resolve, reject, onCancel) {
@@ -3600,7 +3737,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
             while (1) {
               switch (_context9.prev = _context9.next) {
                 case 0:
-                  if (!(_this6.state.contentSid === null)) {
+                  if (!(_this7.state.contentSid === null)) {
                     _context9.next = 3;
                     break;
                   }
@@ -3609,7 +3746,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
                   return _context9.abrupt("return");
 
                 case 3:
-                  bodies = _this6.getMediaByCategories(["body"]);
+                  bodies = _this7.getMediaByCategories(["body"]);
 
                   if (!(bodies === null)) {
                     _context9.next = 7;
@@ -3802,6 +3939,28 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   return Message;
 }(replayEventEmitter.ReplayEventEmitter);
 
+function _wrapMedia2(media) {
+  var category = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  return media ? category ? new Media(_objectSpread$4(_objectSpread$4({}, media), {}, {
+    category: category
+  }), this.services) : new Media(media, this.services) : null;
+}
+
+function _assignMedias2(medias, media) {
+  var _this8 = this;
+
+  this.state.media = _classPrivateMethodGet(this, _wrapMedia, _wrapMedia2).call(this, media); // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+
+  this.state.medias = medias ? medias.map(function (m) {
+    return _classPrivateMethodGet(_this8, _wrapMedia, _wrapMedia2).call(_this8, m);
+  }).filter(function (el) {
+    return el !== null;
+  }) : media && !medias ? [_classPrivateMethodGet(this, _wrapMedia, _wrapMedia2).call(this, media, "media")].filter(function (el) {
+    return el !== null;
+  }) : null;
+}
+
 _defineProperty__default["default"](Message, "updated", "updated");
 
 __decorate([deprecationDecorator.deprecated("getMediaByCategory", "getMediaByCategories"), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", Array)], Message.prototype, "getMediaByCategory", null);
@@ -4830,6 +4989,68 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
    * Logger instance.
    */
 
+  /**
+   * Unique system identifier of the conversation.
+   */
+
+  /**
+   * Conversation links for REST requests.
+   * @internal
+   */
+
+  /**
+   * Configuration of the client that the conversation belongs to.
+   */
+
+  /**
+   * Conversation service objects.
+   */
+
+  /**
+   * Internal state of the conversation.
+   */
+
+  /**
+   * Name of the conversation entity document.
+   */
+
+  /**
+   * Messages entity.
+   */
+
+  /**
+   * Sync list containing messages.
+   */
+
+  /**
+   * Map of participants.
+   * @internal
+   */
+
+  /**
+   * Participants entity.
+   */
+
+  /**
+   * Sync map containing participants.
+   */
+
+  /**
+   * Source of the most recent update.
+   */
+
+  /**
+   * Promise for the conversation entity document.
+   */
+
+  /**
+   * Promise for the messages list.
+   */
+
+  /**
+   * Conversation entity document.
+   */
+
   /**
    * @param descriptor Conversation descriptor.
    * @param sid Conversation SID.
@@ -4871,32 +5092,39 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       participants: _this._links.participants
     };
     _this._participants = new Map();
-    _this._participantsEntity = new Participants(_assertThisInitialized__default["default"](_this), _this._participants, participantsLinks, _this._configuration, _this._services);
+    _this._participantsEntity = new Participants(_assertThisInitialized__default["default"](_this), _this._participants, // state leak
+    participantsLinks, _this._services);
 
-    _this._participantsEntity.on("participantJoined", function (participant) {
-      return _this.emit("participantJoined", participant);
+    _this._participantsEntity.on(Conversation.participantJoined, function (participant) {
+      return (// @todo update participants map here??
+        _this.emit(Conversation.participantJoined, participant)
+      );
     });
 
-    _this._participantsEntity.on("participantLeft", function (participant) {
-      return _this.emit("participantLeft", participant);
+    _this._participantsEntity.on(Conversation.participantLeft, function (participant) {
+      return (// @todo update participants map here??
+        _this.emit(Conversation.participantLeft, participant)
+      );
     });
 
-    _this._participantsEntity.on("participantUpdated", function (args) {
-      return _this.emit("participantUpdated", args);
+    _this._participantsEntity.on(Conversation.participantUpdated, function (args) {
+      return (// @todo update participants map here??
+        _this.emit(Conversation.participantUpdated, args)
+      );
     });
 
     _this._messagesEntity = new Messages(_assertThisInitialized__default["default"](_this), configuration, services);
 
-    _this._messagesEntity.on("messageAdded", function (message) {
+    _this._messagesEntity.on(Conversation.messageAdded, function (message) {
       return _this._onMessageAdded(message);
     });
 
-    _this._messagesEntity.on("messageUpdated", function (args) {
-      return _this.emit("messageUpdated", args);
+    _this._messagesEntity.on(Conversation.messageUpdated, function (args) {
+      return _this.emit(Conversation.messageUpdated, args);
     });
 
-    _this._messagesEntity.on("messageRemoved", function (message) {
-      return _this.emit("messageRemoved", message);
+    _this._messagesEntity.on(Conversation.messageRemoved, function (message) {
+      return _this.emit(Conversation.messageRemoved, message);
     });
 
     return _this;
@@ -4999,7 +5227,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       return (_this$_internalState$3 = this._internalState.notificationLevel) !== null && _this$_internalState$3 !== void 0 ? _this$_internalState$3 : "default";
     }
     /**
-     * Conversation bindings. Undocumented feature (for now).
+     * Conversation bindings. An undocumented feature (for now).
      * @internal
      */
 
@@ -5981,18 +6209,19 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     }()
     /**
      * Get recipients of all messages in the conversation.
+     * @param options Optional configuration, set pageSize to request a specific pagination page size. Page size specifies a number of messages to include in a single batch. Each message may include multiple recipients.
      */
 
   }, {
     key: "getMessageRecipients",
     value: function () {
-      var _getMessageRecipients = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24() {
+      var _getMessageRecipients = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24(options) {
         return _regeneratorRuntime__default["default"].wrap(function _callee24$(_context24) {
           while (1) {
             switch (_context24.prev = _context24.next) {
               case 0:
                 _context24.next = 2;
-                return this._services.messageRecipientsClient.getRecipientsFromConversation(this.sid);
+                return this._services.messageRecipientsClient.getRecipientsFromConversation(this.sid, options);
 
               case 2:
                 return _context24.abrupt("return", _context24.sent);
@@ -6005,7 +6234,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee24, this);
       }));
 
-      function getMessageRecipients() {
+      function getMessageRecipients(_x19) {
         return _getMessageRecipients.apply(this, arguments);
       }
 
@@ -6014,7 +6243,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     /**
      * Load and subscribe to this conversation and do not subscribe to its
      * participants and messages. This or _subscribeStreams will need to be called
-     * before any events on conversation will fire.
+     * before any events in the conversation will fire.
      * @internal
      */
 
@@ -6047,12 +6276,12 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 6:
                 this._entity = _context25.sent;
 
-                this._entity.on("updated", function (args) {
+                this._entity.on(twilioSync.SyncDocument.updated, function (args) {
                   return _this2._update(args.data);
                 });
 
-                this._entity.on("removed", function () {
-                  return _this2.emit("removed", _this2);
+                this._entity.on(twilioSync.SyncDocument.removed, function () {
+                  return _this2.emit(Conversation.removed, _this2);
                 });
 
                 this._update(this._entity.data);
@@ -6100,44 +6329,95 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_fetchStreams",
     value: function () {
-      var _fetchStreams2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26() {
-        var _this$_entity, _this$_entity2;
+      var _fetchStreams2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27() {
+        var _this3 = this;
 
-        var data;
-        return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context26) {
+        return _regeneratorRuntime__default["default"].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__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26(resolve, reject) {
+                    var _this3$_entity, _this3$_entity2;
+
+                    var data, messagesPromise, participantsPromise;
+                    return _regeneratorRuntime__default["default"].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() {
@@ -6157,48 +6437,48 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_subscribeStreams",
     value: function () {
-      var _subscribeStreams2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27() {
-        var _this$_entity3, _this$_entity4, _this$_messagesList, _this$_participantsMa, data, messagesObjectName, rosterObjectName;
+      var _subscribeStreams2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28() {
+        var _this$_entity, _this$_entity2, _this$_messagesList, _this$_participantsMa, data, messagesObjectName, rosterObjectName;
 
-        return _regeneratorRuntime__default["default"].wrap(function _callee27$(_context27) {
+        return _regeneratorRuntime__default["default"].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() {
@@ -6215,32 +6495,26 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_unsubscribe",
     value: function () {
-      var _unsubscribe2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28() {
-        return _regeneratorRuntime__default["default"].wrap(function _callee28$(_context28) {
+      var _unsubscribe2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee29$(_context29) {
           while (1) {
-            switch (_context28.prev = _context28.next) {
+            switch (_context29.prev = _context29.next) {
               case 0:
-                if (!this._entity) {
-                  _context28.next = 5;
-                  break;
-                }
+                if (this._entity) {
+                  this._entity.close();
 
-                _context28.next = 3;
-                return this._entity.close();
-
-              case 3:
-                this._entity = null;
-                this._entityPromise = null;
+                  this._entity = null;
+                  this._entityPromise = null;
+                }
 
-              case 5:
-                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 6:
+              case 2:
               case "end":
-                return _context28.stop();
+                return _context29.stop();
             }
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
 
       function _unsubscribe() {
@@ -6257,7 +6531,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_setStatus",
     value: function _setStatus(status, source) {
-      var _this3 = this;
+      var _this4 = this;
 
       this._dataSource = source;
 
@@ -6271,7 +6545,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         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;
           }
         });
@@ -6283,7 +6557,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         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;
           }
         });
@@ -6323,7 +6597,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             break;
 
           case fieldMappings.attributes:
-            if (isEqual__default["default"](this._internalState.attributes, update.attributes)) {
+            if (isEqual(this._internalState.attributes, update.attributes)) {
               break;
             }
 
@@ -6359,7 +6633,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
               updateReasons.add(localKey);
             }
 
-            if (isEqual__default["default"](this._internalState.lastMessage, {})) {
+            if (isEqual(this._internalState.lastMessage, {})) {
               delete this._internalState.lastMessage;
             }
 
@@ -6372,7 +6646,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
               state.dateUpdated = new Date(state.dateUpdated);
             }
 
-            if (isEqual__default["default"](this._internalState.state, state)) {
+            if (isEqual(this._internalState.state, state)) {
               break;
             }
 
@@ -6381,7 +6655,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             break;
 
           case fieldMappings.bindings:
-            if (isEqual__default["default"](this._internalState.bindings, update.bindings)) {
+            if (isEqual(this._internalState.bindings, update.bindings)) {
               break;
             }
 
@@ -6404,7 +6678,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       }
 
       if (updateReasons.size > 0) {
-        this.emit("updated", {
+        this.emit(Conversation.updated, {
           conversation: this,
           updateReasons: _toConsumableArray__default["default"](updateReasons)
         });
@@ -6436,7 +6710,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         _iterator.f();
       }
 
-      this.emit("messageAdded", message);
+      this.emit(Conversation.messageAdded, message);
     }
     /**
      * Set last read message index.
@@ -6446,30 +6720,30 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_setLastReadMessageIndex",
     value: function () {
-      var _setLastReadMessageIndex2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee29(index) {
+      var _setLastReadMessageIndex2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(index) {
         var result;
-        return _regeneratorRuntime__default["default"].wrap(function _callee29$(_context29) {
+        return _regeneratorRuntime__default["default"].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(_x19) {
+      function _setLastReadMessageIndex(_x22) {
         return _setLastReadMessageIndex2.apply(this, arguments);
       }
 
@@ -6549,7 +6823,7 @@ _defineProperty__default["default"](Conversation, "_logger", Logger.scope("Conve
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString, optionalJson), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "add", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.nonEmptyString, optionalJson), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String, Object, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "addNonChatParticipant", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.nonEmptyString, optionalJson, optionalJson), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String, Object, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "addNonChatParticipant", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonNegativeInteger), __metadata("design:type", Function), __metadata("design:paramtypes", [Number]), __metadata("design:returntype", Promise)], Conversation.prototype, "advanceLastReadMessageIndex", null);
 
@@ -6685,6 +6959,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return this.services.commandExecutor.mutateResource("post", this.configuration.links.conversations, {
                   friendly_name: options.friendlyName,
                   unique_name: options.uniqueName,
+                  access: options.access,
                   attributes: typeof attributes !== "undefined" ? JSON.stringify(attributes) : undefined
                 });
 
@@ -6746,7 +7021,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
       return addConversation;
     }()
     /**
-     * Fetch conversations list and instantiate all necessary objects
+     * Fetch conversations' list and instantiate all necessary objects
      */
 
   }, {
@@ -6767,12 +7042,12 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 3:
                 map = _context2.sent;
-                map.on("itemAdded", function (args) {
+                map.on(twilioSync.SyncMap.itemAdded, function (args) {
                   log$1.debug("itemAdded: ".concat(args.item.key));
 
                   _this2._upsertConversation("sync", args.item.key, args.item.data);
                 });
-                map.on("itemRemoved", function (args) {
+                map.on(twilioSync.SyncMap.itemRemoved, function (args) {
                   log$1.debug("itemRemoved: ".concat(args.key));
                   var sid = args.key;
 
@@ -6798,7 +7073,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
 
                   conversation.emit("removed", conversation);
                 });
-                map.on("itemUpdated", function (args) {
+                map.on(twilioSync.SyncMap.itemUpdated, function (args) {
                   log$1.debug("itemUpdated: ".concat(args.item.key));
 
                   _this2._upsertConversation("sync", args.item.key, args.item.data);
@@ -6969,6 +7244,8 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   createdBy: body.created_by,
                   attributes: body.attributes,
                   channel: body.sync_objects.conversation,
+                  roster: body.sync_objects.participants,
+                  messages: body.sync_objects.messages,
                   notificationLevel: body === null || body === void 0 ? void 0 : body.notification_level,
                   sid: sid
                 };
@@ -7014,8 +7291,10 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   uniqueName: body.unique_name,
                   createdBy: body.created_by,
                   attributes: body.attributes,
-                  channel: "".concat(sid, ".channel"),
-                  // notificationLevel: body?.notification_level,
+                  channel: body.sync_objects.conversation || "".concat(sid, ".channel"),
+                  roster: body.sync_objects.participants,
+                  messages: body.sync_objects.messages,
+                  notificationLevel: body === null || body === void 0 ? void 0 : body.notification_level,
                   sid: sid
                 };
                 return _context6.abrupt("return", this._upsertConversation("sync", sid, data));
@@ -7155,7 +7434,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   updateData.lastConsumedMessageIndex = data.lastConsumedMessageIndex;
                 }
 
-                if (!isEqual__default["default"](updateData, {})) {
+                if (!isEqual(updateData, {})) {
                   conversation._update(updateData);
                 }
 
@@ -7352,7 +7631,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                     status: conversationDescriptor.status,
                     channel: conversationDescriptor.sync_objects.conversation,
                     messages: conversationDescriptor.sync_objects.messages,
-                    roster: "".concat(conversationDescriptor.conversation_sid, ".roster"),
+                    roster: conversationDescriptor.sync_objects.participants || "".concat(conversationDescriptor.conversation_sid, ".roster"),
                     lastConsumedMessageIndex: conversationDescriptor.last_read_message_index,
                     notificationLevel: conversationDescriptor.notification_level
                   };
@@ -7775,7 +8054,7 @@ var TypingIndicator = /*#__PURE__*/function () {
                   }
 
                   conversation._participants.forEach(function (participant) {
-                    if (participant.identity !== message.identity) {
+                    if (participant.identity !== message.identity && participant.type !== "apple") {
                       return;
                     }
 
@@ -7891,7 +8170,15 @@ function PushNotification(data) {
   this.data = data.data || {};
 });
 
-var version = "3.0.1-rc.103";
+var version = "3.0.1";
+
+/**
+ * Generate a random UUID using the Web Crypto API.
+ * Available in Node.js 14.17+, modern browsers, and React Native.
+ */
+var randomUUID = function randomUUID() {
+  return crypto.randomUUID();
+};
 
 function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -7900,6 +8187,7 @@ function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) {
 function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf__default["default"](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default["default"](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default["default"](this, result); }; }
 
 function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var uuidv4 = randomUUID;
 
 var trimSlashes = function trimSlashes(url) {
   return url.replace(/(^\/+|\/+$)/g, "");
@@ -8124,7 +8412,7 @@ var CommandExecutor = /*#__PURE__*/function () {
               case 0:
                 _context4.next = 2;
                 return this._makeRequest(method, url, requestBody, {
-                  "X-Twilio-Mutation-Id": uuid.v4()
+                  "X-Twilio-Mutation-Id": uuidv4()
                 });
 
               case 2:
@@ -8764,6 +9052,22 @@ var EmailRecipientDescriptor = /*#__PURE__*/_createClass__default["default"](
  * Type of recipient.
  */
 
+/**
+ * Sid of the message that this recipient belongs to.
+ */
+
+/**
+ * Email recipient level.
+ */
+
+/**
+ * Name of the recipient.
+ */
+
+/**
+ * Address of the recipient.
+ */
+
 /**
  * @internal
  */
@@ -8886,7 +9190,7 @@ var MessageRecipientsClient = /*#__PURE__*/function () {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                url = new UriBuilder(this._configuration.links.conversations).path(conversationSid).path("MessageRecipients").arg("PageToken", (_paginatorOptions$pag = paginatorOptions === null || paginatorOptions === void 0 ? void 0 : paginatorOptions.pageToken) !== null && _paginatorOptions$pag !== void 0 ? _paginatorOptions$pag : "").arg("PageSize", (_paginatorOptions$pag2 = paginatorOptions === null || paginatorOptions === void 0 ? void 0 : paginatorOptions.pageSize) !== null && _paginatorOptions$pag2 !== void 0 ? _paginatorOptions$pag2 : "").build();
+                url = new UriBuilder(this._configuration.links.conversations).path(conversationSid).path("MessageRecipients").arg("PageToken", (_paginatorOptions$pag = paginatorOptions === null || paginatorOptions === void 0 ? void 0 : paginatorOptions.pageToken) !== null && _paginatorOptions$pag !== void 0 ? _paginatorOptions$pag : undefined).arg("PageSize", (_paginatorOptions$pag2 = paginatorOptions === null || paginatorOptions === void 0 ? void 0 : paginatorOptions.pageSize) !== null && _paginatorOptions$pag2 !== void 0 ? _paginatorOptions$pag2 : undefined).build();
                 _context2.next = 3;
                 return this._services.commandExecutor.fetchResource(url);
 
@@ -9218,7 +9522,47 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
    */
 
   /**
-   * Returned Conversations instance is not yet fully initialized. Calling any
+   * Promise that resolves on successful initialization.
+   */
+
+  /**
+   * Options passed to the client.
+   */
+
+  /**
+   * Client service objects.
+   */
+
+  /**
+   * The user of the client.
+   */
+
+  /**
+   * Resolves the {@link Client._ensureReady} promise.
+   */
+
+  /**
+   * Rejects the {@link Client._ensureReady} promise.
+   */
+
+  /**
+   * The current token of the client.
+   */
+
+  /**
+   * The constructed configuration object.
+   */
+
+  /**
+   * The Conversations entity.
+   */
+
+  /**
+   * Promise that resolves when initial conversations are fetched.
+   */
+
+  /**
+   * Returned Conversations Client instance is not yet fully initialized. Calling any
    * operations will block until it is. Use connection events to monitor when
    * client becomes fully available (connectionStateChanged with state
    * 'connected') or not available (connectionStateChange with state 'denied',
@@ -9308,16 +9652,16 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
 
     _this._services.twilsockClient = _this._options.twilsockClient = (_this$_options$twilso = _this._options.twilsockClient) !== null && _this$_options$twilso !== void 0 ? _this$_options$twilso : new twilsock.TwilsockClient(fpaToken, productId, _this._options);
 
-    _this._services.twilsockClient.on("tokenAboutToExpire", function () {
-      return _this.emit("tokenAboutToExpire");
+    _this._services.twilsockClient.on(Client_1.tokenAboutToExpire, function () {
+      return _this.emit(Client_1.tokenAboutToExpire);
     });
 
-    _this._services.twilsockClient.on("tokenExpired", function () {
-      return _this.emit("tokenExpired");
+    _this._services.twilsockClient.on(Client_1.tokenExpired, function () {
+      return _this.emit(Client_1.tokenExpired);
     });
 
-    _this._services.twilsockClient.on("connectionError", function (error) {
-      return _this.emit("connectionError", error);
+    _this._services.twilsockClient.on(Client_1.connectionError, function (error) {
+      return _this.emit(Client_1.connectionError, error);
     });
 
     _this._services.twilsockClient.on("stateChanged", function (state) {
@@ -9326,7 +9670,7 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
       if (state !== _this.connectionState) {
         _this.connectionState = state;
 
-        _this.emit("connectionStateChanged", _this.connectionState);
+        _this.emit(Client_1.connectionStateChanged, _this.connectionState);
       }
     });
 
@@ -9344,9 +9688,9 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
     var emitFailed = function emitFailed(error) {
       _this._rejectEnsureReady(error);
 
-      _this.emit("stateChanged", "failed");
+      _this.emit(Client_1.stateChanged, "failed");
 
-      _this.emit("initFailed", {
+      _this.emit(Client_1.initFailed, {
         error: error
       });
     };
@@ -9356,6 +9700,8 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         terminal: true,
         message: "Twilsock has disconnected."
       });
+
+      _this._initializeEnsureReady((options === null || options === void 0 ? void 0 : options.throwErrorsAlways) || false);
     };
 
     _this._services.twilsockClient.once("connectionError", emitFailed);
@@ -9399,9 +9745,9 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
 
               _this._rejectEnsureReady(connectionError);
 
-              _this.emit("stateChanged", "failed");
+              _this.emit(Client_1.stateChanged, "failed");
 
-              _this.emit("initFailed", {
+              _this.emit(Client_1.initFailed, {
                 error: connectionError
               });
 
@@ -9413,12 +9759,7 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
       }, _callee, null, [[3, 11]]);
     })));
 
-    _this._ensureReady = new Promise(function (resolve, reject) {
-      _this._resolveEnsureReady = resolve;
-      _this._rejectEnsureReady = reject;
-    }).catch(function () {
-      return void 0;
-    }); // @todo How to process unhandled rejection here?
+    _this._initializeEnsureReady((options === null || options === void 0 ? void 0 : options.throwErrorsAlways) || false);
 
     if (startTwilsock) {
       _this._services.twilsockClient.connect();
@@ -9643,7 +9984,6 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
     /**
      * Peek a conversation by its SID.
      * @param conversationSid Conversation sid
-     * @internal
      */
 
   }, {
@@ -9929,7 +10269,7 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
       return removePushRegistrations;
     }()
     /**
-     * Current version of the Conversations client.
+     * Parse a push notification payload.
      */
 
   }, {
@@ -10248,6 +10588,7 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
                 this._conversationsPromise = this._conversationsEntity.fetchConversations().then(function () {
                   return _this3._conversationsEntity;
                 }).catch(function (error) {
+                  console.error("Failed to fetch conversations _conversationsPromise -> client.ts", error);
                   throw error;
                 });
                 _context17.next = 30;
@@ -10266,8 +10607,8 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
 
                 this._resolveEnsureReady();
 
-                this.emit("stateChanged", "initialized");
-                this.emit("initialized");
+                this.emit(Client_1.stateChanged, "initialized");
+                this.emit(Client_1.initialized);
 
               case 36:
               case "end":
@@ -10311,6 +10652,26 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         _this5._services.notificationClient.unsubscribe(channelType, messageType);
       });
     }
+    /**
+     * Initialize the ensureReady promise.
+     */
+
+  }, {
+    key: "_initializeEnsureReady",
+    value: function _initializeEnsureReady(throwErrorsAlways) {
+      var _this6 = this;
+
+      this._ensureReady = new Promise(function (resolve, reject) {
+        _this6._resolveEnsureReady = resolve;
+        _this6._rejectEnsureReady = reject;
+      }).catch(function (error) {
+        if (throwErrorsAlways) {
+          throw error;
+        } else {
+          return void 0;
+        }
+      });
+    }
   }], [{
     key: "create",
     value: function () {