@twilio/conversations 3.0.0-rc.9 → 3.0.1-rc.102

package/builds/lib.js

@@ -164,6 +164,7 @@ require('core-js/modules/es.regexp.exec.js');
 require('core-js/modules/es.string.replace.js');
 require('core-js/modules/es.array.join.js');
 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');
@@ -179,7 +180,6 @@ var twilsock = require('twilsock');
 var notifications = require('@twilio/notifications');
 var twilioSync = require('twilio-sync');
 var mcsClient = require('@twilio/mcs-client');
-var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 require('core-js/modules/es.set.js');
 require('core-js/modules/es.number.is-integer.js');
 require('core-js/modules/es.typed-array.uint8-array.js');
@@ -211,10 +211,14 @@ 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');
+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');
-require('core-js/modules/es.object.entries.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 }; }
 
@@ -247,9 +251,10 @@ var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallChec
 var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
 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 _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
+var _wrapNativeSuper__default = /*#__PURE__*/_interopDefaultLegacy(_wrapNativeSuper);
 
 function __decorate(decorators, target, key, desc) {
   var c = arguments.length,
@@ -389,9 +394,9 @@ var Logger = /*#__PURE__*/function () {
   return Logger;
 }();
 
-function ownKeys$4(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; }
+function ownKeys$5(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; }
 
-function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var TYPING_TIMEOUT = 5;
 var HTTP_CACHE_LIFETIME = "PT5S";
 var CONSUMPTION_HORIZON_SENDING_INTERVAL = "PT5S";
@@ -402,7 +407,7 @@ var MAXIMUM_ATTEMPTS_COUNT = 3;
 var RETRY_WHEN_THROTTLED = true;
 
 var Configuration = /*#__PURE__*/_createClass__default["default"](function Configuration() {
-  var _ref, _constructorOptions$u, _ref2, _constructorOptions$h, _ref3, _constructorOptions$c;
+  var _ref, _constructorOptions$u, _ref2, _constructorOptions$h, _ref3, _constructorOptions$c, _options$channelMetad;
 
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var configurationResponse = arguments.length > 1 ? arguments[1] : undefined;
@@ -432,7 +437,7 @@ var Configuration = /*#__PURE__*/_createClass__default["default"](function Confi
     emailBodiesAllowedContentTypes: configurationResponse.options.email_bodies_allowed_mime_types
   };
   this.typingIndicatorTimeoutOverride = constructorOptions.typingIndicatorTimeoutOverride;
-  this.backoffConfiguration = _objectSpread$4({
+  this.backoffConfiguration = _objectSpread$5({
     min: MINIMUM_RETRY_DELAY,
     max: MAXIMUM_RETRY_DELAY,
     maxAttemptsCount: MAXIMUM_ATTEMPTS_COUNT
@@ -460,6 +465,8 @@ var Configuration = /*#__PURE__*/_createClass__default["default"](function Confi
     logger.error("Failed to parse consumption report interval ".concat(consumptionReportInterval, ", using default value ").concat(CONSUMPTION_HORIZON_SENDING_INTERVAL));
     this.consumptionReportInterval = iso8601Duration.toSeconds(iso8601Duration.parse(CONSUMPTION_HORIZON_SENDING_INTERVAL));
   }
+
+  this.channelMetadataCacheCapacity = (_options$channelMetad = options.channelMetadataCacheCapacity) !== null && _options$channelMetad !== void 0 ? _options$channelMetad : 100;
 });
 
 /**
@@ -552,16 +559,21 @@ var UriBuilder = /*#__PURE__*/function () {
   return UriBuilder;
 }();
 
-var attributesValidator = declarativeTypeValidator.custom(function (value) {
+var json = declarativeTypeValidator.custom(function (value) {
   return [["string", "number", "boolean", "object"].includes(_typeof__default["default"](value)), "a JSON type"];
 });
-var optionalAttributesValidator = declarativeTypeValidator.custom(function (value) {
+var optionalJson = declarativeTypeValidator.custom(function (value) {
   return [["undefined", "string", "number", "boolean", "object"].includes(_typeof__default["default"](value)), "an optional JSON type"];
 });
+var sendMediaOptions = declarativeTypeValidator.objectSchema("send media options", {
+  contentType: [declarativeTypeValidator.literal(null), "string"],
+  filename: ["string", "undefined"],
+  media: [declarativeTypeValidator.literal("null"), "string"].concat(_toConsumableArray__default["default"](typeof Buffer === "function" ? [Buffer] : []), _toConsumableArray__default["default"](typeof Blob === "function" ? [Blob] : []))
+});
 
-function _createSuper$8(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$8(); 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 _createSuper$9(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$9(); 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$8() { 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 _isNativeReflectConstruct$9() { 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 log$6 = Logger.scope("User");
 /**
  * Extended user information.
@@ -573,7 +585,7 @@ var log$6 = Logger.scope("User");
 var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](User, _ReplayEventEmitter);
 
-  var _super = _createSuper$8(User);
+  var _super = _createSuper$9(User);
 
   /**
    * @internal
@@ -839,6 +851,10 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
                     log$6.debug(_this3.state.entityName + " (" + _this3.state.identity + ") itemUpdated: " + args.item.key);
                     return _this3._update(args.item.key, args.item.data);
                   });
+                  map.on("itemAdded", function (args) {
+                    log$6.debug(_this3.state.entityName + " (" + _this3.state.identity + ") itemAdded: " + args.item.key);
+                    return _this3._update(args.item.key, args.item.data);
+                  });
                   return Promise.all([map.get("friendlyName").then(function (item) {
                     return _this3._update(item.key, item.data);
                   }), map.get("attributes").then(function (item) {
@@ -1047,7 +1063,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
       this.identity = identity;
       this.entityName = entityName;
       this.links = {
-        self: "".concat(this.configuration.links.users, "/").concat(this.identity)
+        self: "".concat(this.configuration.links.users, "/").concat(encodeURIComponent(this.identity))
       };
 
       this._resolveInitializationPromise();
@@ -1064,15 +1080,15 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   return User;
 }(replayEventEmitter.ReplayEventEmitter);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(attributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], User.prototype, "updateAttributes", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(json), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], User.prototype, "updateAttributes", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(["string"]), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], User.prototype, "updateFriendlyName", null);
 
-function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _createForOfIteratorHelper$4(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$4(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-function _unsupportedIterableToArray$3(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$3(o, minLen); }
+function _unsupportedIterableToArray$4(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$4(o, minLen); }
 
-function _arrayLikeToArray$3(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray$4(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 var Network = /*#__PURE__*/function () {
   function Network(configuration, services) {
@@ -1093,7 +1109,7 @@ var Network = /*#__PURE__*/function () {
   }, {
     key: "cleanupCache",
     value: function cleanupCache() {
-      var _iterator = _createForOfIteratorHelper$3(this.cache),
+      var _iterator = _createForOfIteratorHelper$4(this.cache),
           _step;
 
       try {
@@ -1237,9 +1253,9 @@ _defineProperty__default["default"](NotificationTypes, "REMOVED_FROM_CONVERSATIO
 
 _defineProperty__default["default"](NotificationTypes, "CONSUMPTION_UPDATE", "twilio.channel.consumption_update");
 
-function _createSuper$7(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$7(); 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 _createSuper$8(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$8(); 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$7() { 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 _isNativeReflectConstruct$8() { 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 log$5 = Logger.scope("Participant");
 /**
  * A participant represents a remote client in a conversation.
@@ -1248,7 +1264,7 @@ var log$5 = Logger.scope("Participant");
 var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](Participant, _ReplayEventEmitter);
 
-  var _super = _createSuper$7(Participant);
+  var _super = _createSuper$8(Participant);
 
   /**
    * @internal
@@ -1618,11 +1634,11 @@ _defineProperty__default["default"](Participant, "typingEnded", "typingEnded");
 
 _defineProperty__default["default"](Participant, "updated", "updated");
 
-__decorate([declarativeTypeValidator.validateTypesAsync(attributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Participant.prototype, "updateAttributes", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(json), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Participant.prototype, "updateAttributes", null);
 
-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 _createSuper$7(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$7(); 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 _isNativeReflectConstruct$7() { 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 log$4 = Logger.scope("Participants");
 /**
  * @classdesc Represents the collection of participants for the conversation
@@ -1634,7 +1650,7 @@ var log$4 = Logger.scope("Participants");
 var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](Participants, _ReplayEventEmitter);
 
-  var _super = _createSuper$6(Participants);
+  var _super = _createSuper$7(Participants);
 
   function Participants(conversation, participants, links, configuration, services) {
     var _this;
@@ -1691,13 +1707,14 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
     }()
   }, {
     key: "subscribe",
-    value: function subscribe(rosterObjectName) {
+    value: function subscribe(arg) {
       var _this2 = this;
 
-      return this.rosterEntityPromise = this.rosterEntityPromise || this.services.syncClient.map({
-        id: rosterObjectName,
+      var participantsMapPromise = typeof arg === "string" ? this.services.syncClient.map({
+        id: arg,
         mode: "open_existing"
-      }).then(function (rosterMap) {
+      }) : Promise.resolve(arg);
+      return this.rosterEntityPromise = this.rosterEntityPromise || participantsMapPromise.then(function (rosterMap) {
         rosterMap.on("itemAdded", function (args) {
           log$4.debug(_this2.conversation.sid + " itemAdded: " + args.item.key);
 
@@ -1969,7 +1986,6 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "add",
     value: function () {
       var _add = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(identity, attributes) {
-        var participantResponse;
         return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
@@ -1981,14 +1997,9 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
                 });
 
               case 2:
-                participantResponse = _context7.sent;
-                _context7.next = 5;
-                return this.upsertParticipantFromResponse(participantResponse);
-
-              case 5:
                 return _context7.abrupt("return", _context7.sent);
 
-              case 6:
+              case 3:
               case "end":
                 return _context7.stop();
             }
@@ -2014,7 +2025,6 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
 
         var attributes,
             bindingOptions,
-            participantResponse,
             _args8 = arguments;
         return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) {
@@ -2034,14 +2044,9 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
                 });
 
               case 4:
-                participantResponse = _context8.sent;
-                _context8.next = 7;
-                return this.upsertParticipantFromResponse(participantResponse);
-
-              case 7:
                 return _context8.abrupt("return", _context8.sent);
 
-              case 8:
+              case 5:
               case "end":
                 return _context8.stop();
             }
@@ -2062,7 +2067,7 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "remove",
     value: function remove(identity) {
-      return this.services.commandExecutor.mutateResource("delete", "".concat(this.links.participants, "/").concat(identity));
+      return this.services.commandExecutor.mutateResource("delete", "".concat(this.links.participants, "/").concat(encodeURIComponent(identity)));
     }
   }]);
 
@@ -2314,7 +2319,7 @@ var Media = /*#__PURE__*/function () {
  * Contains aggregated information about delivery statuses of a message across all participants
  * of a conversation.
  *
- * At any moment during the message delivery to a participant, the message can have zero or more of following
+ * At any moment during the message delivery to a participant, the message can have zero or more of the following
  * delivery statuses:
  * * Message is considered as **sent** to a participant if the nearest upstream carrier accepted the message.
  * * Message is considered as **delivered** to a participant if Twilio has received confirmation of message
@@ -2557,22 +2562,264 @@ function DetailedDeliveryReceipt(descriptor) {
   this.dateUpdated = descriptor.date_updated;
 });
 
-function ownKeys$3(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; }
+var collectActions = function collectActions(actions) {
+  return actions.map(function (action) {
+    var _action$id, _action$index, _action$phone, _action$url;
 
-function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$3(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+    var rawData = JSON.stringify(action);
 
-function _createSuper$5(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$5(); 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); }; }
+    switch (action.type) {
+      case "QUICK_REPLY":
+        return {
+          type: "reply",
+          title: action.title,
+          id: (_action$id = action.id) !== null && _action$id !== void 0 ? _action$id : "",
+          index: (_action$index = action.index) !== null && _action$index !== void 0 ? _action$index : 0,
+          rawData: rawData
+        };
 
-function _isNativeReflectConstruct$5() { 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; } }
+      case "PHONE_NUMBER":
+        return {
+          type: "phone",
+          title: action.title,
+          phone: (_action$phone = action.phone) !== null && _action$phone !== void 0 ? _action$phone : "",
+          rawData: rawData
+        };
+
+      case "URL":
+        return {
+          type: "url",
+          title: action.title,
+          url: (_action$url = action.url) !== null && _action$url !== void 0 ? _action$url : "",
+          rawData: rawData
+        };
+
+      default:
+        return {
+          type: "other",
+          rawData: rawData
+        };
+    }
+  });
+};
+
+var parseVariant = function parseVariant(type, data) {
+  var rawData = JSON.stringify(data);
+
+  switch (type) {
+    case "twilio/text":
+      {
+        var variant = data;
+        return {
+          type: "text",
+          body: variant.body,
+          rawData: rawData
+        };
+      }
+
+    case "twilio/media":
+      {
+        var _variant = data;
+        return {
+          type: "media",
+          body: _variant.body,
+          media: _variant.media,
+          rawData: rawData
+        };
+      }
+
+    case "twilio/location":
+      {
+        var _variant2 = data;
+        return {
+          type: "location",
+          longitude: _variant2.longitude,
+          latitude: _variant2.latitude,
+          label: _variant2.label,
+          rawData: rawData
+        };
+      }
+
+    case "twilio/quick-reply":
+      {
+        var _variant3 = data;
+        return {
+          type: "quickReply",
+          body: _variant3.body,
+          replies: _variant3.actions,
+          rawData: rawData
+        };
+      }
+
+    case "twilio/call-to-action":
+      {
+        var _variant4 = data;
+        return {
+          type: "callToAction",
+          body: _variant4.body,
+          actions: collectActions(_variant4.actions),
+          rawData: rawData
+        };
+      }
+
+    case "twilio/list-picker":
+      {
+        var _variant5 = data;
+        return {
+          type: "listPicker",
+          body: _variant5.body,
+          button: _variant5.button,
+          items: _variant5.items,
+          rawData: rawData
+        };
+      }
+
+    case "twilio/card":
+      {
+        var _variant6$media, _variant6$actions;
+
+        var _variant6 = data;
+        return {
+          type: "card",
+          title: _variant6.title,
+          subtitle: _variant6.subtitle,
+          media: (_variant6$media = _variant6.media) !== null && _variant6$media !== void 0 ? _variant6$media : [],
+          actions: collectActions((_variant6$actions = _variant6.actions) !== null && _variant6$actions !== void 0 ? _variant6$actions : []),
+          rawData: rawData
+        };
+      }
+
+    default:
+      return {
+        type: "other",
+        rawData: rawData
+      };
+  }
+};
+
+var collectVariants = function collectVariants(variants) {
+  var variantsMap = new Map();
+
+  for (var _i = 0, _Object$entries = Object.entries(variants); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _slicedToArray__default["default"](_Object$entries[_i], 2),
+        key = _Object$entries$_i[0],
+        value = _Object$entries$_i[1];
+
+    variantsMap.set(key, parseVariant(key, value));
+  }
+
+  return variantsMap;
+};
+/**
+ * Represents a variable for a content template. See
+ * {@link ContentTemplate.variables}.
+ */
+
+
+var ContentTemplateVariable = /*#__PURE__*/function () {
+  function ContentTemplateVariable(
+  /**
+   * Name of the variable.
+   */
+  name,
+  /**
+   * Key of the variable
+   */
+  value) {
+    _classCallCheck__default["default"](this, ContentTemplateVariable);
+
+    this.name = name;
+    this.value = value;
+  }
+  /**
+   * Copies the variable with a new value.
+   *
+   * @param value The new value for the variable.
+   */
+
+
+  _createClass__default["default"](ContentTemplateVariable, [{
+    key: "copyWithValue",
+    value: function copyWithValue(value) {
+      return new ContentTemplateVariable(this.name, value);
+    }
+  }]);
+
+  return ContentTemplateVariable;
+}();
+/**
+ * A rich content template.
+ *
+ * Use {@Link Client.getContentTemplates} to request all the templates available
+ * for the current account.
+ */
+
+
+var ContentTemplate = /*#__PURE__*/_createClass__default["default"](
+/**
+ * The server-assigned unique identifier for the template.
+ */
+
+/**
+ * Friendly name used to describe the content. Not visible to the recipient.
+ */
+
+/**
+ * Variables used by this template.
+ */
+
+/**
+ * Variants of the content. See {@link ContentData}.
+ */
+
+/**
+ * Date of creation.
+ */
+
+/**
+ * Date of the last update.
+ */
+
+/**
+ * @internal
+ */
+function ContentTemplate(contentTemplateResponse) {
+  _classCallCheck__default["default"](this, ContentTemplate);
+
+  this.sid = contentTemplateResponse.sid;
+  this.friendlyName = contentTemplateResponse.friendly_name;
+  this.variables = Object.entries(JSON.parse(contentTemplateResponse.variables)).map(function (_ref) {
+    var _ref2 = _slicedToArray__default["default"](_ref, 2),
+        key = _ref2[0],
+        value = _ref2[1];
+
+    return new ContentTemplateVariable(key, value);
+  });
+  this.variants = collectVariants(contentTemplateResponse.variants);
+  this.dateCreated = new Date(contentTemplateResponse.date_created);
+  this.dateUpdated = new Date(contentTemplateResponse.date_updated);
+});
+
+function ownKeys$4(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; }
+
+function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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; } }
 var log$3 = Logger.scope("Message");
+
+var XHR = // eslint-disable-next-line @typescript-eslint/no-var-requires
+global["XMLHttpRequest"] || require("xmlhttprequest").XMLHttpRequest;
 /**
  * A message in a conversation.
  */
 
+
 var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](Message, _ReplayEventEmitter);
 
-  var _super = _createSuper$5(Message);
+  var _super = _createSuper$6(Message);
 
   /**
    * Conversation that the message is in.
@@ -2582,7 +2829,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
    * @internal
    */
   function Message(index, data, conversation, links, configuration, services) {
-    var _data$text, _data$lastUpdatedBy, _data$type, _data$memberSid;
+    var _data$text, _data$lastUpdatedBy, _data$type, _data$memberSid, _data$channelMetadata;
 
     var _this;
 
@@ -2598,6 +2845,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       index: index,
       author: data.author,
       subject: data.subject,
+      contentSid: data.contentSid,
       body: (_data$text = data.text) !== null && _data$text !== void 0 ? _data$text : null,
       timestamp: data.timestamp ? new Date(data.timestamp) : null,
       dateUpdated: data.dateUpdated ? new Date(data.dateUpdated) : null,
@@ -2607,11 +2855,12 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       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$3(_objectSpread$3({}, data.media), {}, {
+      }) : data.type === "media" && data.media && !data.medias ? [new Media(_objectSpread$4(_objectSpread$4({}, data.media), {}, {
         category: "media"
       }), _this.services)] : null,
       participantSid: (_data$memberSid = data.memberSid) !== null && _data$memberSid !== void 0 ? _data$memberSid : null,
-      aggregatedDeliveryReceipt: data.delivery ? new AggregatedDeliveryReceipt(data.delivery) : null
+      aggregatedDeliveryReceipt: data.delivery ? new AggregatedDeliveryReceipt(data.delivery) : null,
+      hasChannelMetadata: (_data$channelMetadata = data.channelMetadata) !== null && _data$channelMetadata !== void 0 ? _data$channelMetadata : false
     };
     return _this;
   }
@@ -2652,6 +2901,15 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
     get: function get() {
       return this.state.subject;
     }
+    /**
+     * Unique identifier of {@link ContentTemplate} for this message.
+     */
+
+  }, {
+    key: "contentSid",
+    get: function get() {
+      return this.state.contentSid;
+    }
     /**
      * Body of the message.
      */
@@ -2671,14 +2929,15 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       return this.state.dateUpdated;
     }
     /**
-     * Index of the message in the conversation's messages list.
-     * By design of the Conversations system, the message indices may have arbitrary gaps between them,
+     * Index of this message in the conversation's list of messages.
+     *
+     * By design, the message indices may have arbitrary gaps between them,
      * that does not necessarily mean they were deleted or otherwise modified - just that
      * messages may have some non-contiguous indices even if they are being sent immediately one after another.
      *
      * Trying to use indices for some calculations is going to be unreliable.
      *
-     * To calculate the number of unread messages it is better to use the read horizon API.
+     * To calculate the number of unread messages, it is better to use the Read Horizon API.
      * See {@link Conversation.getUnreadMessagesCount} for details.
      */
 
@@ -2760,6 +3019,19 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
     get: function get() {
       return this.state.aggregatedDeliveryReceipt;
     }
+    /**
+     * @deprecated
+     * Return a (possibly empty) array of media matching a specific set of categories.
+     * Allowed category is so far only 'media'.
+     * @param categories Array of categories to match.
+     * @returns Array of media descriptors matching given categories.
+     */
+
+  }, {
+    key: "getMediaByCategory",
+    value: function getMediaByCategory(categories) {
+      return this.getMediaByCategories(categories);
+    }
     /**
      * Return a (possibly empty) array of media matching a specific set of categories.
      * Allowed category is so far only 'media'.
@@ -2980,32 +3252,27 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 2:
                 paginator = _context2.sent;
-                detailedDeliveryReceipts = [];
+                detailedDeliveryReceipts = paginator.items;
 
               case 4:
-
-                detailedDeliveryReceipts = [].concat(_toConsumableArray__default["default"](detailedDeliveryReceipts), _toConsumableArray__default["default"](paginator.items));
-
-                if (paginator.hasNextPage) {
-                  _context2.next = 8;
+                if (!paginator.hasNextPage) {
+                  _context2.next = 11;
                   break;
                 }
 
-                return _context2.abrupt("break", 13);
-
-              case 8:
-                _context2.next = 10;
+                _context2.next = 7;
                 return paginator.nextPage();
 
-              case 10:
+              case 7:
                 paginator = _context2.sent;
+                detailedDeliveryReceipts = [].concat(_toConsumableArray__default["default"](detailedDeliveryReceipts), _toConsumableArray__default["default"](paginator.items));
                 _context2.next = 4;
                 break;
 
-              case 13:
+              case 11:
                 return _context2.abrupt("return", detailedDeliveryReceipts);
 
-              case 14:
+              case 12:
               case "end":
                 return _context2.stop();
             }
@@ -3121,6 +3388,59 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       return updateAttributes;
     }()
+    /**
+     * @deprecated
+     * Get content URLs for all media attachments in the given set using a single operation.
+     * @param contentSet Set of media attachments to query content URLs.
+     */
+
+  }, {
+    key: "attachTemporaryUrlsFor",
+    value: function () {
+      var _attachTemporaryUrlsFor = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(contentSet) {
+        var _this3 = this;
+
+        var sids;
+        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
+          while (1) {
+            switch (_context6.prev = _context6.next) {
+              case 0:
+                // We ignore existing mcsMedia members of each of the media entries.
+                // Instead we just collect their sids and pull new descriptors from a mediaSet GET endpoint.
+                sids = contentSet === null || contentSet === void 0 ? void 0 : contentSet.map(function (m) {
+                  return m.sid;
+                });
+
+                if (!(this.services.mcsClient && sids)) {
+                  _context6.next = 7;
+                  break;
+                }
+
+                _context6.next = 4;
+                return this.services.mcsClient.mediaSetGet(sids);
+
+              case 4:
+                return _context6.abrupt("return", _context6.sent.map(function (item) {
+                  return new Media(item, _this3.services);
+                }));
+
+              case 7:
+                throw new Error("Media Content Service is unavailable");
+
+              case 8:
+              case "end":
+                return _context6.stop();
+            }
+          }
+        }, _callee6, this);
+      }));
+
+      function attachTemporaryUrlsFor(_x3) {
+        return _attachTemporaryUrlsFor.apply(this, arguments);
+      }
+
+      return attachTemporaryUrlsFor;
+    }()
     /**
      * Get content URLs for all media attachments in the given set using a single operation.
      * @param contentSet Set of media attachments to query content URLs.
@@ -3144,53 +3464,53 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getTemporaryContentUrlsForMediaSids",
     value: function getTemporaryContentUrlsForMediaSids(mediaSids) {
-      var _this3 = this;
+      var _this4 = this;
 
       return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(resolve, reject, onCancel) {
+        var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(resolve, reject, onCancel) {
           var mediaGetRequest, urls;
-          return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
+          return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
             while (1) {
-              switch (_context6.prev = _context6.next) {
+              switch (_context7.prev = _context7.next) {
                 case 0:
-                  mediaGetRequest = _this3.services.mcsClient.mediaSetGetContentUrls(mediaSids !== null && mediaSids !== void 0 ? mediaSids : []);
+                  mediaGetRequest = _this4.services.mcsClient.mediaSetGetContentUrls(mediaSids !== null && mediaSids !== void 0 ? mediaSids : []);
 
-                  if (!(!_this3.services.mcsClient || !mediaSids)) {
-                    _context6.next = 4;
+                  if (!(!_this4.services.mcsClient || !mediaSids)) {
+                    _context7.next = 4;
                     break;
                   }
 
                   reject(new Error("Media Content Service is unavailable"));
-                  return _context6.abrupt("return");
+                  return _context7.abrupt("return");
 
                 case 4:
                   onCancel(function () {
                     mediaGetRequest.cancel();
                   });
-                  _context6.prev = 5;
-                  _context6.next = 8;
+                  _context7.prev = 5;
+                  _context7.next = 8;
                   return mediaGetRequest;
 
                 case 8:
-                  urls = _context6.sent;
+                  urls = _context7.sent;
                   resolve(urls);
-                  _context6.next = 15;
+                  _context7.next = 15;
                   break;
 
                 case 12:
-                  _context6.prev = 12;
-                  _context6.t0 = _context6["catch"](5);
-                  reject(_context6.t0);
+                  _context7.prev = 12;
+                  _context7.t0 = _context7["catch"](5);
+                  reject(_context7.t0);
 
                 case 15:
                 case "end":
-                  return _context6.stop();
+                  return _context7.stop();
               }
             }
-          }, _callee6, null, [[5, 12]]);
+          }, _callee7, null, [[5, 12]]);
         }));
 
-        return function (_x3, _x4, _x5) {
+        return function (_x4, _x5, _x6) {
           return _ref.apply(this, arguments);
         };
       }());
@@ -3213,25 +3533,25 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_getDetailedDeliveryReceiptsPaginator",
     value: function () {
-      var _getDetailedDeliveryReceiptsPaginator2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(options) {
-        var _this4 = this;
+      var _getDetailedDeliveryReceiptsPaginator2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(options) {
+        var _this5 = this;
 
         var messagesReceiptsUrl, url, response;
-        return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) {
-            switch (_context7.prev = _context7.next) {
+            switch (_context8.prev = _context8.next) {
               case 0:
                 messagesReceiptsUrl = this.configuration.links.messagesReceipts.replace("%s", this.conversation.sid).replace("%s", this.sid);
                 url = new UriBuilder(messagesReceiptsUrl).arg("PageToken", options === null || options === void 0 ? void 0 : options.pageToken).arg("PageSize", options === null || options === void 0 ? void 0 : options.pageSize).build();
-                _context7.next = 4;
+                _context8.next = 4;
                 return this.services.network.get(url);
 
               case 4:
-                response = _context7.sent;
-                return _context7.abrupt("return", new RestPaginator(response.body.delivery_receipts.map(function (x) {
+                response = _context8.sent;
+                return _context8.abrupt("return", new RestPaginator(response.body.delivery_receipts.map(function (x) {
                   return new DetailedDeliveryReceipt(x);
                 }), function (pageToken, pageSize) {
-                  return _this4._getDetailedDeliveryReceiptsPaginator({
+                  return _this5._getDetailedDeliveryReceiptsPaginator({
                     pageToken: pageToken,
                     pageSize: pageSize
                   });
@@ -3239,46 +3559,236 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 6:
               case "end":
-                return _context7.stop();
+                return _context8.stop();
             }
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
 
-      function _getDetailedDeliveryReceiptsPaginator(_x6) {
+      function _getDetailedDeliveryReceiptsPaginator(_x7) {
         return _getDetailedDeliveryReceiptsPaginator2.apply(this, arguments);
       }
 
       return _getDetailedDeliveryReceiptsPaginator;
     }()
-  }]);
+    /**
+     * Get the {@link ContentData} for this message. Resolves to `null` when
+     * {@link Message.contentSid} is null.
+     */
 
-  return Message;
-}(replayEventEmitter.ReplayEventEmitter);
+  }, {
+    key: "getContentData",
+    value: function getContentData() {
+      var _this6 = this;
 
-_defineProperty__default["default"](Message, "updated", "updated");
+      return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(resolve, reject, onCancel) {
+          var bodies, twilioPrefix, filteredMedias, contentMedia, urlPromise, url, jsonStringPromise, json, jsonString, dataType;
+          return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
+            while (1) {
+              switch (_context9.prev = _context9.next) {
+                case 0:
+                  if (!(_this6.state.contentSid === null)) {
+                    _context9.next = 3;
+                    break;
+                  }
 
-__decorate([declarativeTypeValidator.validateTypes([declarativeTypeValidator.nonEmptyString, "undefined"]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Media)], Message.prototype, "getEmailBody", null);
+                  resolve(null);
+                  return _context9.abrupt("return");
 
-__decorate([declarativeTypeValidator.validateTypes([declarativeTypeValidator.nonEmptyString, "undefined"]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Media)], Message.prototype, "getEmailHistory", null);
+                case 3:
+                  bodies = _this6.getMediaByCategories(["body"]);
 
-__decorate([declarativeTypeValidator.validateTypesAsync("string"), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Message.prototype, "updateBody", null);
+                  if (!(bodies === null)) {
+                    _context9.next = 7;
+                    break;
+                  }
 
-__decorate([declarativeTypeValidator.validateTypesAsync(attributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Message.prototype, "updateAttributes", null);
+                  resolve(null);
+                  return _context9.abrupt("return");
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyArray("media", Media)), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", mcsClient.CancellablePromise)], Message.prototype, "getTemporaryContentUrlsForMedia", null);
+                case 7:
+                  twilioPrefix = "application/x-vnd.com.twilio.rich.";
+                  filteredMedias = bodies.filter(function (media) {
+                    return media.contentType.startsWith(twilioPrefix);
+                  });
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyArray("strings", "string")), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", mcsClient.CancellablePromise)], Message.prototype, "getTemporaryContentUrlsForMediaSids", null);
+                  if (!(filteredMedias.length === 0)) {
+                    _context9.next = 12;
+                    break;
+                  }
 
-function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+                  resolve(null);
+                  return _context9.abrupt("return");
 
-function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$2(o, minLen); }
+                case 12:
+                  contentMedia = filteredMedias[0];
+                  urlPromise = contentMedia.getContentTemporaryUrl();
+                  onCancel(function () {
+                    urlPromise.cancel();
+                  });
+                  _context9.prev = 15;
+                  _context9.next = 18;
+                  return urlPromise;
 
-function _arrayLikeToArray$2(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+                case 18:
+                  url = _context9.sent;
+                  _context9.next = 25;
+                  break;
 
-function _createSuper$4(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$4(); 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); }; }
+                case 21:
+                  _context9.prev = 21;
+                  _context9.t0 = _context9["catch"](15);
+                  reject(_context9.t0);
+                  return _context9.abrupt("return");
 
-function _isNativeReflectConstruct$4() { 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; } }
+                case 25:
+                  if (!(url === null)) {
+                    _context9.next = 28;
+                    break;
+                  }
+
+                  resolve(null);
+                  return _context9.abrupt("return");
+
+                case 28:
+                  jsonStringPromise = new Promise(function (resolve, reject) {
+                    var _url;
+
+                    var isCancelled = false;
+                    var xhr = new XHR();
+                    xhr.open("GET", (_url = url) !== null && _url !== void 0 ? _url : "", true);
+                    xhr.responseType = "text";
+
+                    xhr.onreadystatechange = function () {
+                      if (xhr.readyState !== 4 || isCancelled) {
+                        return;
+                      }
+
+                      resolve(xhr.responseText);
+                    };
+
+                    xhr.onerror = function () {
+                      reject(xhr.statusText);
+                    };
+
+                    onCancel(function () {
+                      isCancelled = true;
+                      xhr.abort();
+                      reject(new Error("XHR has been aborted"));
+                    });
+                    xhr.send();
+                  });
+                  _context9.prev = 29;
+                  _context9.next = 32;
+                  return jsonStringPromise;
+
+                case 32:
+                  jsonString = _context9.sent;
+                  json = JSON.parse(jsonString);
+                  _context9.next = 40;
+                  break;
+
+                case 36:
+                  _context9.prev = 36;
+                  _context9.t1 = _context9["catch"](29);
+                  reject(_context9.t1);
+                  return _context9.abrupt("return");
+
+                case 40:
+                  dataType = contentMedia.contentType.replace(twilioPrefix, "").replace(".", "/");
+                  resolve(parseVariant(dataType, json.data));
+
+                case 42:
+                case "end":
+                  return _context9.stop();
+              }
+            }
+          }, _callee9, null, [[15, 21], [29, 36]]);
+        }));
+
+        return function (_x8, _x9, _x10) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
+    }
+    /**
+     * Get the {@link ChannelMetadata} for this message. Resolves to `null` if
+     * the message doesn't have any channel metadata.
+     */
+
+  }, {
+    key: "getChannelMetadata",
+    value: function () {
+      var _getChannelMetadata = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
+          while (1) {
+            switch (_context10.prev = _context10.next) {
+              case 0:
+                if (this.state.hasChannelMetadata) {
+                  _context10.next = 2;
+                  break;
+                }
+
+                return _context10.abrupt("return", null);
+
+              case 2:
+                _context10.next = 4;
+                return this.services.channelMetadataClient.getChannelMetadata(this.conversation.sid, this.sid);
+
+              case 4:
+                return _context10.abrupt("return", _context10.sent);
+
+              case 5:
+              case "end":
+                return _context10.stop();
+            }
+          }
+        }, _callee10, this);
+      }));
+
+      function getChannelMetadata() {
+        return _getChannelMetadata.apply(this, arguments);
+      }
+
+      return getChannelMetadata;
+    }()
+  }]);
+
+  return Message;
+}(replayEventEmitter.ReplayEventEmitter);
+
+_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);
+
+__decorate([declarativeTypeValidator.validateTypes([declarativeTypeValidator.nonEmptyString, "undefined"]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Media)], Message.prototype, "getEmailBody", null);
+
+__decorate([declarativeTypeValidator.validateTypes([declarativeTypeValidator.nonEmptyString, "undefined"]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Media)], Message.prototype, "getEmailHistory", null);
+
+__decorate([declarativeTypeValidator.validateTypesAsync("string"), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Message.prototype, "updateBody", null);
+
+__decorate([declarativeTypeValidator.validateTypesAsync(json), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Message.prototype, "updateAttributes", null);
+
+__decorate([deprecationDecorator.deprecated("attachTemporaryUrlsFor", "getTemporaryContentUrlsForMedia"), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", Promise)], Message.prototype, "attachTemporaryUrlsFor", null);
+
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyArray("media", Media)), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", mcsClient.CancellablePromise)], Message.prototype, "getTemporaryContentUrlsForMedia", null);
+
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyArray("strings", "string")), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", mcsClient.CancellablePromise)], Message.prototype, "getTemporaryContentUrlsForMediaSids", null);
+
+function ownKeys$3(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; }
+
+function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$3(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray$3(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$3(o, minLen); }
+
+function _arrayLikeToArray$3(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _createSuper$5(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$5(); 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$5() { 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 log$2 = Logger.scope("Messages");
 /**
  * Represents the collection of messages in a conversation
@@ -3287,7 +3797,7 @@ var log$2 = Logger.scope("Messages");
 var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](Messages, _ReplayEventEmitter);
 
-  var _super = _createSuper$4(Messages);
+  var _super = _createSuper$5(Messages);
 
   function Messages(conversation, configuration, services) {
     var _this;
@@ -3304,14 +3814,15 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
   }
   /**
    * Subscribe to the Messages Event Stream
-   * @param name - The name of Sync object for the Messages resource.
+   * @param arg - Name of the Sync object, or the SyncList itself, that
+   * represents the Messages resource.
    */
 
 
   _createClass__default["default"](Messages, [{
     key: "subscribe",
     value: function () {
-      var _subscribe = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(name) {
+      var _subscribe = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(arg) {
         var _this2 = this;
 
         var list;
@@ -3327,10 +3838,10 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return _context.abrupt("return", this.messagesListPromise);
 
               case 2:
-                this.messagesListPromise = this.services.syncClient.list({
-                  id: name,
+                this.messagesListPromise = typeof arg === "string" ? this.services.syncClient.list({
+                  id: arg,
                   mode: "open_existing"
-                });
+                }) : Promise.resolve(arg);
                 _context.prev = 3;
                 _context.next = 6;
                 return this.messagesListPromise;
@@ -3481,7 +3992,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                       return request.cancel();
                     });
                   });
-                  _iterator = _createForOfIteratorHelper$2(message.mediaContent);
+                  _iterator = _createForOfIteratorHelper$3(message.mediaContent);
                   _context3.prev = 4;
 
                   _iterator.s();
@@ -3543,7 +4054,11 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                     media_sids: media.map(function (m) {
                       return m.sid;
                     }),
-                    attributes: typeof message.attributes !== "undefined" ? JSON.stringify(message.attributes) : undefined
+                    attributes: typeof message.attributes !== "undefined" ? JSON.stringify(message.attributes) : undefined,
+                    content_sid: message.contentSid,
+                    content_variables: typeof message.contentVariables !== "undefined" ? JSON.stringify(message.contentVariables.reduce(function (accum, current) {
+                      return _objectSpread$3(_objectSpread$3({}, accum), {}, _defineProperty__default["default"]({}, current.name, current.value));
+                    }, {})) : undefined
                   });
                   _context3.prev = 34;
                   _context3.t4 = resolve;
@@ -4014,6 +4529,29 @@ var MessageBuilder = /*#__PURE__*/function () {
       this.emailHistories.set(contentType, history);
       return this;
     }
+    /**
+     * Adds {@link ContentTemplate} SID for the message alongside optional
+     * variables. When no variables provided, the default values will be used.
+     *
+     * Adding the content SID converts the message to a rich message. In this
+     * case, other fields are ignored and the message is sent using the content
+     * from the the {@link ContentTemplate}.
+     *
+     * Use {@link Client.getContentTemplates} to request all available
+     * {@link ContentTemplate}s.
+     *
+     * @param contentSid SID of the {@link ContentTemplate}
+     * @param variables Custom variables to resolve the template.
+     */
+
+  }, {
+    key: "setContentTemplate",
+    value: function setContentTemplate(contentSid) {
+      var contentVariables = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      this.message.contentSid = contentSid;
+      this.message.contentVariables = contentVariables;
+      return this;
+    }
     /**
      * Adds media to the message.
      * @param payload Media to add.
@@ -4088,29 +4626,34 @@ var MessageBuilder = /*#__PURE__*/function () {
     value: function buildAndSend() {
       return this.build().send();
     }
-  }, {
-    key: "getPayloadContentType",
-    value: function getPayloadContentType(payload) {
-      if (typeof FormData !== "undefined" && payload instanceof FormData) {
-        return payload.get("Content-Type");
-      }
-
-      return payload.contentType;
-    }
   }]);
 
   return MessageBuilder;
 }();
 
-function _createForOfIteratorHelper$1(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$1(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+__decorate([declarativeTypeValidator.validateTypes("string"), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", MessageBuilder)], MessageBuilder.prototype, "setBody", null);
 
-function _unsupportedIterableToArray$1(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$1(o, minLen); }
+__decorate([declarativeTypeValidator.validateTypes("string"), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", MessageBuilder)], MessageBuilder.prototype, "setSubject", null);
 
-function _arrayLikeToArray$1(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+__decorate([declarativeTypeValidator.validateTypes(json), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", MessageBuilder)], MessageBuilder.prototype, "setAttributes", null);
 
-function _createSuper$3(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$3(); 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); }; }
+__decorate([declarativeTypeValidator.validateTypes("string", [FormData, sendMediaOptions]), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", MessageBuilder)], MessageBuilder.prototype, "setEmailBody", null);
 
-function _isNativeReflectConstruct$3() { 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; } }
+__decorate([declarativeTypeValidator.validateTypes("string", [FormData, sendMediaOptions]), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", MessageBuilder)], MessageBuilder.prototype, "setEmailHistory", null);
+
+__decorate([declarativeTypeValidator.validateTypes("string", [declarativeTypeValidator.array("content variables", ContentTemplateVariable), "undefined"]), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Array]), __metadata("design:returntype", MessageBuilder)], MessageBuilder.prototype, "setContentTemplate", null);
+
+__decorate([declarativeTypeValidator.validateTypes([FormData, sendMediaOptions]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", MessageBuilder)], MessageBuilder.prototype, "addMedia", null);
+
+function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$2(o, minLen); }
+
+function _arrayLikeToArray$2(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _createSuper$4(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$4(); 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$4() { 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; } }
 /**
  * Map of the fields that will be processed with update messages.
  */
@@ -4138,7 +4681,7 @@ var fieldMappings = {
 var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](Conversation, _ReplayEventEmitter);
 
-  var _super = _createSuper$3(Conversation);
+  var _super = _createSuper$4(Conversation);
 
   /**
    * Fired when a participant has joined the conversation.
@@ -4868,7 +5411,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       return getMessagesCount;
     }()
     /**
-     * Get unread messages count for the user if they are a participant of this
+     * Get count of unread messages for the user if they are a participant of this
      * conversation. Rejects if the user is not a participant of the conversation.
      *
      * Use this method to obtain the number of unread messages together with
@@ -4876,12 +5419,19 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
      * message indices which may have gaps. See {@link Message.index} for details.
      *
      * This method is semi-realtime. This means that this data will be eventually
-     * correct, but will also be possibly incorrect for a few seconds. The
+     * correct, but it will also be possibly incorrect for a few seconds. The
      * Conversations system does not provide real time events for counter values
      * changes.
      *
      * This is useful for any UI badges, but it is not recommended to build any
      * core application logic based on these counters being accurate in real time.
+     *
+     * If the read horizon is not set, this function will return null. This could mean
+     * that all messages in the conversation are unread, or that the read horizon system
+     * is not being used. How to interpret this `null` value is up to the customer application.
+     *
+     * @return Number of unread messages based on the current read horizon set for
+     * the user or `null` if the read horizon is not set.
      */
 
   }, {
@@ -4986,7 +5536,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                 }
 
                 _context14.next = 3;
-                return this._services.commandExecutor.mutateResource("delete", "".concat(this._links.participants, "/").concat(this._configuration.userIdentity));
+                return this._services.commandExecutor.mutateResource("delete", "".concat(this._links.participants, "/").concat(encodeURIComponent(this._configuration.userIdentity)));
 
               case 3:
                 return _context14.abrupt("return", this);
@@ -5094,7 +5644,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     }()
     /**
      * New interface to prepare for sending a message.
-     * Use this instead of {@link Message.sendMessage}.
+     * Use this instead of {@link Conversation.sendMessage}.
      * @return A MessageBuilder to help set all message sending options.
      */
 
@@ -5154,7 +5704,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     }()
     /**
      * Set all messages in the conversation unread.
-     * @return Resulting unread messages count in the conversation.
+     * @returns New count of unread messages after this update.
      */
 
   }, {
@@ -5312,7 +5862,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
      * Set the last read message index to the current read horizon.
      * @param index Message index to set as last read. If null is provided, then
      * the behavior is identical to {@link Conversation.setAllMessagesUnread}.
-     * @returns Resulting unread messages count in the conversation.
+     * @returns New count of unread messages after this update.
      */
 
   }, {
@@ -5461,6 +6011,65 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       return _subscribe;
     }()
+    /**
+     * Fetch participants and messages of the conversation. This method needs to
+     * be called during conversation initialization to catch broken conversations
+     * (broken conversations are conversations that have essential Sync entities
+     * missing, i.e. the conversation document, the messages list or the
+     * participant map). In case of this conversation being broken, the method
+     * will throw an exception that will be caught and handled gracefully.
+     * @internal
+     */
+
+  }, {
+    key: "_fetchStreams",
+    value: function () {
+      var _fetchStreams2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25() {
+        var _this$_entity, _this$_entity2;
+
+        var data;
+        return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context25) {
+          while (1) {
+            switch (_context25.prev = _context25.next) {
+              case 0:
+                _context25.next = 2;
+                return this._subscribe();
+
+              case 2:
+                Conversation._logger.trace("_streamsAvailable, this.entity.data=", (_this$_entity = this._entity) === null || _this$_entity === void 0 ? void 0 : _this$_entity.data);
+
+                data = (_this$_entity2 = this._entity) === null || _this$_entity2 === void 0 ? void 0 : _this$_entity2.data;
+                _context25.next = 6;
+                return this._services.syncClient.list({
+                  id: data.messages,
+                  mode: "open_existing"
+                });
+
+              case 6:
+                this._messagesList = _context25.sent;
+                _context25.next = 9;
+                return this._services.syncClient.map({
+                  id: data.roster,
+                  mode: "open_existing"
+                });
+
+              case 9:
+                this._participantsMap = _context25.sent;
+
+              case 10:
+              case "end":
+                return _context25.stop();
+            }
+          }
+        }, _callee25, this);
+      }));
+
+      function _fetchStreams() {
+        return _fetchStreams2.apply(this, arguments);
+      }
+
+      return _fetchStreams;
+    }()
     /**
      * Load the attributes of this conversation and instantiate its participants
      * and messages. This or _subscribe will need to be called before any events
@@ -5472,48 +6081,48 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_subscribeStreams",
     value: function () {
-      var _subscribeStreams2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25() {
-        var _this$_entity, _this$_entity2, data, messagesObjectName, rosterObjectName;
+      var _subscribeStreams2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26() {
+        var _this$_entity3, _this$_entity4, _this$_messagesList, _this$_participantsMa, data, messagesObjectName, rosterObjectName;
 
-        return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context25) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context26) {
           while (1) {
-            switch (_context25.prev = _context25.next) {
+            switch (_context26.prev = _context26.next) {
               case 0:
-                _context25.prev = 0;
-                _context25.next = 3;
+                _context26.prev = 0;
+                _context26.next = 3;
                 return this._subscribe();
 
               case 3:
-                Conversation._logger.trace("_subscribeStreams, this.entity.data=", (_this$_entity = this._entity) === null || _this$_entity === void 0 ? void 0 : _this$_entity.data);
+                Conversation._logger.trace("_subscribeStreams, this.entity.data=", (_this$_entity3 = this._entity) === null || _this$_entity3 === void 0 ? void 0 : _this$_entity3.data);
 
-                data = (_this$_entity2 = this._entity) === null || _this$_entity2 === void 0 ? void 0 : _this$_entity2.data;
+                data = (_this$_entity4 = this._entity) === null || _this$_entity4 === void 0 ? void 0 : _this$_entity4.data;
                 messagesObjectName = data.messages;
                 rosterObjectName = data.roster;
-                _context25.next = 9;
-                return Promise.all([this._messagesEntity.subscribe(messagesObjectName), this._participantsEntity.subscribe(rosterObjectName)]);
+                _context26.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:
-                _context25.next = 16;
+                _context26.next = 16;
                 break;
 
               case 11:
-                _context25.prev = 11;
-                _context25.t0 = _context25["catch"](0);
+                _context26.prev = 11;
+                _context26.t0 = _context26["catch"](0);
 
                 if (this._services.syncClient.connectionState !== "disconnected") {
-                  Conversation._logger.error("Failed to subscribe on conversation objects", this.sid, _context25.t0);
+                  Conversation._logger.error("Failed to subscribe on conversation objects", this.sid, _context26.t0);
                 }
 
-                Conversation._logger.debug("ERROR: Failed to subscribe on conversation objects", this.sid, _context25.t0);
+                Conversation._logger.debug("ERROR: Failed to subscribe on conversation objects", this.sid, _context26.t0);
 
-                throw _context25.t0;
+                throw _context26.t0;
 
               case 16:
               case "end":
-                return _context25.stop();
+                return _context26.stop();
             }
           }
-        }, _callee25, this, [[0, 11]]);
+        }, _callee26, this, [[0, 11]]);
       }));
 
       function _subscribeStreams() {
@@ -5530,17 +6139,17 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_unsubscribe",
     value: function () {
-      var _unsubscribe2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee26() {
-        return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context26) {
+      var _unsubscribe2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee27$(_context27) {
           while (1) {
-            switch (_context26.prev = _context26.next) {
+            switch (_context27.prev = _context27.next) {
               case 0:
                 if (!this._entity) {
-                  _context26.next = 5;
+                  _context27.next = 5;
                   break;
                 }
 
-                _context26.next = 3;
+                _context27.next = 3;
                 return this._entity.close();
 
               case 3:
@@ -5548,14 +6157,14 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                 this._entityPromise = null;
 
               case 5:
-                return _context26.abrupt("return", Promise.all([this._participantsEntity.unsubscribe(), this._messagesEntity.unsubscribe()]));
+                return _context27.abrupt("return", Promise.all([this._participantsEntity.unsubscribe(), this._messagesEntity.unsubscribe()]));
 
               case 6:
               case "end":
-                return _context26.stop();
+                return _context27.stop();
             }
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
 
       function _unsubscribe() {
@@ -5732,7 +6341,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_onMessageAdded",
     value: function _onMessageAdded(message) {
-      var _iterator = _createForOfIteratorHelper$1(this._participants.values()),
+      var _iterator = _createForOfIteratorHelper$2(this._participants.values()),
           _step;
 
       try {
@@ -5761,27 +6370,27 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_setLastReadMessageIndex",
     value: function () {
-      var _setLastReadMessageIndex2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee27(index) {
+      var _setLastReadMessageIndex2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee28(index) {
         var result;
-        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.next = 2;
+                _context28.next = 2;
                 return this._services.commandExecutor.mutateResource("post", "".concat(this._configuration.links.myConversations, "/").concat(this.sid), {
                   last_read_message_index: index
                 });
 
               case 2:
-                result = _context27.sent;
-                return _context27.abrupt("return", result.unread_messages_count);
+                result = _context28.sent;
+                return _context28.abrupt("return", result.unread_messages_count);
 
               case 4:
               case "end":
-                return _context27.stop();
+                return _context28.stop();
             }
           }
-        }, _callee27, this);
+        }, _callee28, this);
       }));
 
       function _setLastReadMessageIndex(_x19) {
@@ -5806,7 +6415,9 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       }
 
       try {
-        update.dateCreated && (update.dateCreated = new Date(update.dateCreated));
+        if (update.dateCreated) {
+          update.dateCreated = new Date(update.dateCreated);
+        }
       } catch (e) {
         Conversation._logger.warn("Retrieved malformed dateCreated from the server for conversation: " + conversationSid);
 
@@ -5814,7 +6425,9 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       }
 
       try {
-        update.dateUpdated && (update.dateUpdated = new Date(update.dateUpdated));
+        if (update.dateUpdated) {
+          update.dateUpdated = new Date(update.dateUpdated);
+        }
       } catch (e) {
         Conversation._logger.warn("Retrieved malformed dateUpdated from the server for conversation: " + conversationSid);
 
@@ -5858,9 +6471,9 @@ _defineProperty__default["default"](Conversation, "removed", "removed");
 
 _defineProperty__default["default"](Conversation, "_logger", Logger.scope("Conversation"));
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString, optionalAttributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "add", null);
+__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, optionalAttributesValidator), __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), __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);
 
@@ -5883,13 +6496,13 @@ __decorate([declarativeTypeValidator.validateTypesAsync(["string", FormData, dec
 
     return [isValid, "a non-empty string, an instance of Buffer or an instance of Blob"];
   })
-})], optionalAttributesValidator, ["undefined", declarativeTypeValidator.literal(null), declarativeTypeValidator.objectSchema("email attributes", {
+})], optionalJson, ["undefined", declarativeTypeValidator.literal(null), declarativeTypeValidator.objectSchema("email attributes", {
   subject: [declarativeTypeValidator.nonEmptyString, "undefined"]
 })]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object, Object, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "sendMessage", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.literal("default", "muted")), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Conversation.prototype, "setUserNotificationLevel", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(attributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateAttributes", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(json), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateAttributes", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync("string"), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateFriendlyName", null);
 
@@ -5936,19 +6549,19 @@ var Deferred = /*#__PURE__*/function () {
   return Deferred;
 }();
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _createForOfIteratorHelper$1(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$1(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _unsupportedIterableToArray$1(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$1(o, minLen); }
 
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray$1(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function ownKeys$2(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; }
 
 function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-function _createSuper$2(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$2(); 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 _createSuper$3(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$3(); 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$2() { 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 _isNativeReflectConstruct$3() { 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 log$1 = Logger.scope("Conversations");
 /**
  * Represents conversations collection
@@ -5958,7 +6571,7 @@ var log$1 = Logger.scope("Conversations");
 var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](Conversations, _ReplayEventEmitter);
 
-  var _super = _createSuper$2(Conversations);
+  var _super = _createSuper$3(Conversations);
 
   function Conversations(configuration, services) {
     var _this;
@@ -6120,7 +6733,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 9:
                 myConversations = _context2.sent;
                 upserts = [];
-                _iterator = _createForOfIteratorHelper(myConversations);
+                _iterator = _createForOfIteratorHelper$1(myConversations);
 
                 try {
                   for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -6393,7 +7006,9 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 2:
                 items = _context8.sent;
                 return _context8.abrupt("return", {
-                  items: items,
+                  items: items.filter(function (item) {
+                    return item !== null;
+                  }),
                   hasNextPage: page.hasNextPage,
                   hasPrevPage: page.hasPrevPage,
                   nextPage: function nextPage() {
@@ -6555,7 +7170,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   break;
                 }
 
-                log$1.trace("upsertChannel: the channel is deleted but reappeared again from REST, ignoring", sid);
+                log$1.trace("upsertChannel: the conversation is deleted but reappeared again from REST, ignoring", sid);
                 return _context10.abrupt("return", null);
 
               case 12:
@@ -6569,10 +7184,40 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 };
                 newConversation = new Conversation(data, sid, links, this.configuration, this.services);
                 this.conversations.set(sid, newConversation);
-                _context10.next = 19;
+                _context10.prev = 17;
+                _context10.next = 20;
                 return newConversation._subscribe();
 
-              case 19:
+              case 20:
+                if (!(data.status === "joined")) {
+                  _context10.next = 23;
+                  break;
+                }
+
+                _context10.next = 23;
+                return newConversation._fetchStreams();
+
+              case 23:
+                _context10.next = 32;
+                break;
+
+              case 25:
+                _context10.prev = 25;
+                _context10.t0 = _context10["catch"](17);
+
+                if (!(_context10.t0.name !== "SyncError")) {
+                  _context10.next = 29;
+                  break;
+                }
+
+                throw _context10.t0;
+
+              case 29:
+                log$1.trace("upsertChannel: the conversation is missing some Sync entity(ies), ignoring", sid, _context10.t0);
+                this.conversations.delete(sid);
+                return _context10.abrupt("return", null);
+
+              case 32:
                 this._registerForEvents(newConversation);
 
                 this.emit("conversationAdded", newConversation);
@@ -6585,12 +7230,12 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
 
                 return _context10.abrupt("return", newConversation);
 
-              case 23:
+              case 36:
               case "end":
                 return _context10.stop();
             }
           }
-        }, _callee10, this);
+        }, _callee10, this, [[17, 25]]);
       }));
 
       function _upsertConversation(_x10, _x11, _x12) {
@@ -6713,9 +7358,9 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   return Conversations;
 }(replayEventEmitter.ReplayEventEmitter);
 
-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 _createSuper$2(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$2(); 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; } }
+function _isNativeReflectConstruct$2() { 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; } }
 /**
  * Container for known users
  */
@@ -6723,7 +7368,7 @@ function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !
 var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](Users, _ReplayEventEmitter);
 
-  var _super = _createSuper$1(Users);
+  var _super = _createSuper$2(Users);
 
   function Users(myself, configuration, services) {
     var _this;
@@ -7170,12 +7815,16 @@ function PushNotification(data) {
   this.data = data.data || {};
 });
 
-var version = "3.0.0-rc.9";
+var version = "3.0.1-rc.102";
 
 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; }
 
 function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+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 trimSlashes = function trimSlashes(url) {
   return url.replace(/(^\/+|\/+$)/g, "");
 };
@@ -7184,6 +7833,20 @@ var isMutationConflictResponse = function isMutationConflictResponse(response) {
   return response.status.code === 202;
 };
 
+var ChannelMetadataNotFoundError = /*#__PURE__*/function (_Error) {
+  _inherits__default["default"](ChannelMetadataNotFoundError, _Error);
+
+  var _super = _createSuper$1(ChannelMetadataNotFoundError);
+
+  function ChannelMetadataNotFoundError(message) {
+    _classCallCheck__default["default"](this, ChannelMetadataNotFoundError);
+
+    return _super.call(this, message);
+  }
+
+  return _createClass__default["default"](ChannelMetadataNotFoundError);
+}( /*#__PURE__*/_wrapNativeSuper__default["default"](Error));
+
 var CommandExecutor = /*#__PURE__*/function () {
   function CommandExecutor(_serviceUrl, _services, _productId) {
     _classCallCheck__default["default"](this, CommandExecutor);
@@ -7281,40 +7944,91 @@ var CommandExecutor = /*#__PURE__*/function () {
   }, {
     key: "fetchResource",
     value: function () {
-      var _fetchResource = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(url, requestBody) {
+      var _fetchResource = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(url, requestBody) {
         var _this = this;
 
-        var maxAttemptsCount, result;
-        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+        var maxAttemptsCount, retrier, resolution;
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 maxAttemptsCount = 6;
-                _context2.prev = 1;
-                _context2.next = 4;
-                return new operationRetrier.AsyncRetrier({
+                retrier = new operationRetrier.AsyncRetrier({
                   min: 50,
                   max: 1600,
                   maxAttemptsCount: maxAttemptsCount
-                }).run(function () {
-                  return _this._makeRequest("get", url, requestBody);
                 });
+                _context3.prev = 2;
+                _context3.next = 5;
+                return retrier.run( /*#__PURE__*/_asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
+                  var response, _e$body, _e$body2;
+
+                  return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+                    while (1) {
+                      switch (_context2.prev = _context2.next) {
+                        case 0:
+                          _context2.prev = 0;
+                          _context2.next = 3;
+                          return _this._makeRequest("get", url, requestBody);
+
+                        case 3:
+                          response = _context2.sent;
+                          return _context2.abrupt("return", {
+                            type: "success",
+                            data: response.body
+                          });
+
+                        case 7:
+                          _context2.prev = 7;
+                          _context2.t0 = _context2["catch"](0);
+
+                          if (!((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : (_e$body = _context2.t0.body) === null || _e$body === void 0 ? void 0 : _e$body.status) === 404 && (_context2.t0 === null || _context2.t0 === void 0 ? void 0 : (_e$body2 = _context2.t0.body) === null || _e$body2 === void 0 ? void 0 : _e$body2.code) === 50530)) {
+                            _context2.next = 11;
+                            break;
+                          }
+
+                          return _context2.abrupt("return", {
+                            type: "noMetadata"
+                          });
+
+                        case 11:
+                          throw _context2.t0;
+
+                        case 12:
+                        case "end":
+                          return _context2.stop();
+                      }
+                    }
+                  }, _callee2, null, [[0, 7]]);
+                })));
 
-              case 4:
-                result = _context2.sent;
-                return _context2.abrupt("return", result.body);
+              case 5:
+                resolution = _context3.sent;
+                _context3.next = 11;
+                break;
 
               case 8:
-                _context2.prev = 8;
-                _context2.t0 = _context2["catch"](1);
+                _context3.prev = 8;
+                _context3.t0 = _context3["catch"](2);
                 throw new Error("Fetch resource from \"".concat(url, "\" failed."));
 
               case 11:
+                if (!(resolution.type === "noMetadata")) {
+                  _context3.next = 13;
+                  break;
+                }
+
+                throw new ChannelMetadataNotFoundError("No metadata found.");
+
+              case 13:
+                return _context3.abrupt("return", resolution.data);
+
+              case 14:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2, null, [[1, 8]]);
+        }, _callee3, null, [[2, 8]]);
       }));
 
       function fetchResource(_x5, _x6) {
@@ -7326,40 +8040,40 @@ var CommandExecutor = /*#__PURE__*/function () {
   }, {
     key: "mutateResource",
     value: function () {
-      var _mutateResource = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(method, url, requestBody) {
+      var _mutateResource = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(method, url, requestBody) {
         var result;
-        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                _context3.next = 2;
+                _context4.next = 2;
                 return this._makeRequest(method, url, requestBody, {
                   "X-Twilio-Mutation-Id": uuid.v4()
                 });
 
               case 2:
-                result = _context3.sent;
+                result = _context4.sent;
 
                 if (!isMutationConflictResponse(result)) {
-                  _context3.next = 7;
+                  _context4.next = 7;
                   break;
                 }
 
-                _context3.next = 6;
+                _context4.next = 6;
                 return this.fetchResource(result.body.resource_url);
 
               case 6:
-                return _context3.abrupt("return", _context3.sent);
+                return _context4.abrupt("return", _context4.sent);
 
               case 7:
-                return _context3.abrupt("return", result.body);
+                return _context4.abrupt("return", result.body);
 
               case 8:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
 
       function mutateResource(_x7, _x8, _x9) {
@@ -7373,6 +8087,593 @@ var CommandExecutor = /*#__PURE__*/function () {
   return CommandExecutor;
 }();
 
+var ContentClient = /*#__PURE__*/function () {
+  function ContentClient(_services) {
+    var _pageSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
+
+    var _cacheTtlMs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 5000;
+
+    _classCallCheck__default["default"](this, ContentClient);
+
+    _defineProperty__default["default"](this, "_cachedTemplates", null);
+
+    this._services = _services;
+    this._pageSize = _pageSize;
+    this._cacheTtlMs = _cacheTtlMs;
+  }
+
+  _createClass__default["default"](ContentClient, [{
+    key: "getContentTemplates",
+    value: function () {
+      var _getContentTemplates = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
+        var _this = this;
+
+        var _yield$this$_fetchCon, _yield$this$_fetchCon2, templatesPage, nextToken, templates, _yield$this$_fetchCon3, _yield$this$_fetchCon4;
+
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!(this._cachedTemplates !== null)) {
+                  _context.next = 2;
+                  break;
+                }
+
+                return _context.abrupt("return", this._cachedTemplates);
+
+              case 2:
+                _context.next = 4;
+                return this._fetchContentTemplates();
+
+              case 4:
+                _yield$this$_fetchCon = _context.sent;
+                _yield$this$_fetchCon2 = _slicedToArray__default["default"](_yield$this$_fetchCon, 2);
+                templatesPage = _yield$this$_fetchCon2[0];
+                nextToken = _yield$this$_fetchCon2[1];
+                templates = templatesPage;
+
+              case 9:
+                if (!(nextToken !== null)) {
+                  _context.next = 19;
+                  break;
+                }
+
+                _context.next = 12;
+                return this._fetchContentTemplates(nextToken);
+
+              case 12:
+                _yield$this$_fetchCon3 = _context.sent;
+                _yield$this$_fetchCon4 = _slicedToArray__default["default"](_yield$this$_fetchCon3, 2);
+                templatesPage = _yield$this$_fetchCon4[0];
+                nextToken = _yield$this$_fetchCon4[1];
+                templates = [].concat(_toConsumableArray__default["default"](templates), _toConsumableArray__default["default"](templatesPage));
+                _context.next = 9;
+                break;
+
+              case 19:
+                this._cachedTemplates = Object.freeze(templates);
+                setTimeout(function () {
+                  _this._cachedTemplates = null;
+                }, this._cacheTtlMs);
+                return _context.abrupt("return", templates);
+
+              case 22:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function getContentTemplates() {
+        return _getContentTemplates.apply(this, arguments);
+      }
+
+      return getContentTemplates;
+    }()
+  }, {
+    key: "_fetchContentTemplates",
+    value: function () {
+      var _fetchContentTemplates2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(pageToken) {
+        var contentTemplatesUrl, url, response;
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                contentTemplatesUrl = "Client/v2/ContentTemplates";
+                url = new UriBuilder(contentTemplatesUrl);
+                url.arg("PageSize", this._pageSize);
+
+                if (pageToken !== undefined) {
+                  url.arg("PageToken", pageToken);
+                }
+
+                _context2.next = 6;
+                return this._services.commandExecutor.fetchResource(url.build());
+
+              case 6:
+                response = _context2.sent;
+                return _context2.abrupt("return", [response.templates.map(function (template) {
+                  return new ContentTemplate(template);
+                }), response.meta.next_token]);
+
+              case 8:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function _fetchContentTemplates(_x) {
+        return _fetchContentTemplates2.apply(this, arguments);
+      }
+
+      return _fetchContentTemplates;
+    }()
+  }]);
+
+  return ContentClient;
+}();
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
+  function QuickLRU() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    _classCallCheck__default["default"](this, QuickLRU);
+
+    if (!(options.maxSize && options.maxSize > 0)) {
+      throw new TypeError('`maxSize` must be a number greater than 0');
+    }
+
+    this.maxSize = options.maxSize;
+    this.onEviction = options.onEviction;
+    this.cache = new Map();
+    this.oldCache = new Map();
+    this._size = 0;
+  }
+
+  _createClass__default["default"](QuickLRU, [{
+    key: "_set",
+    value: function _set(key, value) {
+      this.cache.set(key, value);
+      this._size++;
+
+      if (this._size >= this.maxSize) {
+        this._size = 0;
+
+        if (typeof this.onEviction === 'function') {
+          var _iterator = _createForOfIteratorHelper(this.oldCache.entries()),
+              _step;
+
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var _step$value = _slicedToArray__default["default"](_step.value, 2),
+                  _key = _step$value[0],
+                  _value = _step$value[1];
+
+              this.onEviction(_key, _value);
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
+
+        this.oldCache = this.cache;
+        this.cache = new Map();
+      }
+    }
+  }, {
+    key: "get",
+    value: function get(key) {
+      if (this.cache.has(key)) {
+        return this.cache.get(key);
+      }
+
+      if (this.oldCache.has(key)) {
+        var value = this.oldCache.get(key);
+        this.oldCache.delete(key);
+
+        this._set(key, value);
+
+        return value;
+      }
+    }
+  }, {
+    key: "set",
+    value: function set(key, value) {
+      if (this.cache.has(key)) {
+        this.cache.set(key, value);
+      } else {
+        this._set(key, value);
+      }
+
+      return this;
+    }
+  }, {
+    key: "has",
+    value: function has(key) {
+      return this.cache.has(key) || this.oldCache.has(key);
+    }
+  }, {
+    key: "peek",
+    value: function peek(key) {
+      if (this.cache.has(key)) {
+        return this.cache.get(key);
+      }
+
+      if (this.oldCache.has(key)) {
+        return this.oldCache.get(key);
+      }
+    }
+  }, {
+    key: "delete",
+    value: function _delete(key) {
+      var deleted = this.cache.delete(key);
+
+      if (deleted) {
+        this._size--;
+      }
+
+      return this.oldCache.delete(key) || deleted;
+    }
+  }, {
+    key: "clear",
+    value: function clear() {
+      this.cache.clear();
+      this.oldCache.clear();
+      this._size = 0;
+    }
+  }, {
+    key: "keys",
+    value: /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function keys() {
+      var _iterator2, _step2, _step2$value, key;
+
+      return _regeneratorRuntime__default["default"].wrap(function keys$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _iterator2 = _createForOfIteratorHelper(this);
+              _context.prev = 1;
+
+              _iterator2.s();
+
+            case 3:
+              if ((_step2 = _iterator2.n()).done) {
+                _context.next = 9;
+                break;
+              }
+
+              _step2$value = _slicedToArray__default["default"](_step2.value, 1), key = _step2$value[0];
+              _context.next = 7;
+              return key;
+
+            case 7:
+              _context.next = 3;
+              break;
+
+            case 9:
+              _context.next = 14;
+              break;
+
+            case 11:
+              _context.prev = 11;
+              _context.t0 = _context["catch"](1);
+
+              _iterator2.e(_context.t0);
+
+            case 14:
+              _context.prev = 14;
+
+              _iterator2.f();
+
+              return _context.finish(14);
+
+            case 17:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, keys, this, [[1, 11, 14, 17]]);
+    })
+  }, {
+    key: "values",
+    value: /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function values() {
+      var _iterator3, _step3, _step3$value, value;
+
+      return _regeneratorRuntime__default["default"].wrap(function values$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _iterator3 = _createForOfIteratorHelper(this);
+              _context2.prev = 1;
+
+              _iterator3.s();
+
+            case 3:
+              if ((_step3 = _iterator3.n()).done) {
+                _context2.next = 9;
+                break;
+              }
+
+              _step3$value = _slicedToArray__default["default"](_step3.value, 2), value = _step3$value[1];
+              _context2.next = 7;
+              return value;
+
+            case 7:
+              _context2.next = 3;
+              break;
+
+            case 9:
+              _context2.next = 14;
+              break;
+
+            case 11:
+              _context2.prev = 11;
+              _context2.t0 = _context2["catch"](1);
+
+              _iterator3.e(_context2.t0);
+
+            case 14:
+              _context2.prev = 14;
+
+              _iterator3.f();
+
+              return _context2.finish(14);
+
+            case 17:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, values, this, [[1, 11, 14, 17]]);
+    })
+  }, {
+    key: _Symbol$iterator,
+    value: /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function value() {
+      var _iterator4, _step4, item, _iterator5, _step5, _item, _item2, key;
+
+      return _regeneratorRuntime__default["default"].wrap(function value$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _iterator4 = _createForOfIteratorHelper(this.cache);
+              _context3.prev = 1;
+
+              _iterator4.s();
+
+            case 3:
+              if ((_step4 = _iterator4.n()).done) {
+                _context3.next = 9;
+                break;
+              }
+
+              item = _step4.value;
+              _context3.next = 7;
+              return item;
+
+            case 7:
+              _context3.next = 3;
+              break;
+
+            case 9:
+              _context3.next = 14;
+              break;
+
+            case 11:
+              _context3.prev = 11;
+              _context3.t0 = _context3["catch"](1);
+
+              _iterator4.e(_context3.t0);
+
+            case 14:
+              _context3.prev = 14;
+
+              _iterator4.f();
+
+              return _context3.finish(14);
+
+            case 17:
+              _iterator5 = _createForOfIteratorHelper(this.oldCache);
+              _context3.prev = 18;
+
+              _iterator5.s();
+
+            case 20:
+              if ((_step5 = _iterator5.n()).done) {
+                _context3.next = 28;
+                break;
+              }
+
+              _item = _step5.value;
+              _item2 = _slicedToArray__default["default"](_item, 1), key = _item2[0];
+
+              if (this.cache.has(key)) {
+                _context3.next = 26;
+                break;
+              }
+
+              _context3.next = 26;
+              return _item;
+
+            case 26:
+              _context3.next = 20;
+              break;
+
+            case 28:
+              _context3.next = 33;
+              break;
+
+            case 30:
+              _context3.prev = 30;
+              _context3.t1 = _context3["catch"](18);
+
+              _iterator5.e(_context3.t1);
+
+            case 33:
+              _context3.prev = 33;
+
+              _iterator5.f();
+
+              return _context3.finish(33);
+
+            case 36:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, value, this, [[1, 11, 14, 17], [18, 30, 33, 36]]);
+    })
+  }, {
+    key: "size",
+    get: function get() {
+      var oldCacheSize = 0;
+
+      var _iterator6 = _createForOfIteratorHelper(this.oldCache.keys()),
+          _step6;
+
+      try {
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var key = _step6.value;
+
+          if (!this.cache.has(key)) {
+            oldCacheSize++;
+          }
+        }
+      } catch (err) {
+        _iterator6.e(err);
+      } finally {
+        _iterator6.f();
+      }
+
+      return Math.min(this._size + oldCacheSize, this.maxSize);
+    }
+  }]);
+
+  return QuickLRU;
+}(Symbol.iterator);
+
+var quickLru = QuickLRU;
+
+/**
+ * Represents channel metadata.
+ */
+
+var ChannelMetadata = /*#__PURE__*/_createClass__default["default"](
+/**
+ * Communication channel type.
+ */
+
+/**
+ * The actual metadata.
+ */
+
+/**
+ * @internal
+ */
+function ChannelMetadata(type, data) {
+  _classCallCheck__default["default"](this, ChannelMetadata);
+
+  this.type = type;
+  this.data = data;
+  Object.freeze(data);
+});
+
+var ChannelMetadataClient = /*#__PURE__*/function () {
+  function ChannelMetadataClient(services, configuration) {
+    _classCallCheck__default["default"](this, ChannelMetadataClient);
+
+    this._services = services;
+    this._configuration = configuration;
+    this._cache = new quickLru({
+      maxSize: configuration.channelMetadataCacheCapacity
+    });
+  }
+
+  _createClass__default["default"](ChannelMetadataClient, [{
+    key: "getChannelMetadata",
+    value: function () {
+      var _getChannelMetadata = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(conversationSid, messageSid) {
+        var key, cachedItem, url, metadataResponse, metadata;
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                key = "".concat(conversationSid, ",").concat(messageSid);
+                cachedItem = this._cache.get(key);
+
+                if (!cachedItem) {
+                  _context.next = 4;
+                  break;
+                }
+
+                return _context.abrupt("return", cachedItem.item);
+
+              case 4:
+                url = "".concat(this._configuration.links.conversations, "/").concat(conversationSid, "/Messages/").concat(messageSid, "/ChannelMetadata");
+                _context.prev = 5;
+                _context.next = 8;
+                return this._services.commandExecutor.fetchResource(url);
+
+              case 8:
+                metadataResponse = _context.sent;
+                _context.next = 17;
+                break;
+
+              case 11:
+                _context.prev = 11;
+                _context.t0 = _context["catch"](5);
+
+                if (!(_context.t0 instanceof ChannelMetadataNotFoundError)) {
+                  _context.next = 16;
+                  break;
+                }
+
+                this._cache.set(key, {
+                  item: null
+                });
+
+                return _context.abrupt("return", null);
+
+              case 16:
+                throw new Error(_context.t0);
+
+              case 17:
+                metadata = new ChannelMetadata(metadataResponse.type, metadataResponse.data);
+
+                this._cache.set(key, {
+                  item: metadata
+                });
+
+                return _context.abrupt("return", metadata);
+
+              case 20:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this, [[5, 11]]);
+      }));
+
+      function getChannelMetadata(_x, _x2) {
+        return _getChannelMetadata.apply(this, arguments);
+      }
+
+      return getChannelMetadata;
+    }()
+  }]);
+
+  return ChannelMetadataClient;
+}();
+
 var _class;
 
 function ownKeys(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; }
@@ -7572,12 +8873,25 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
    */
 
   /**
+   * @deprecated Use initialized or initFailed events instead
    * Fired when the state of the client has been changed.
    *
    * Parameters:
+   * 1. {@link State} `state` - the new client state
+   * @event
+   */
+
+  /**
+   * Fired when the client has completed initialization successfully.
+   * @event
+   */
+
+  /**
+   * Fired when the client initialization failed.
+   *
+   * Parameters:
    * 1. object `data` - info object provided with the event. It has the
-   * following properties:
-   *     * {@link State} `state` - the new client state
+   * following property:
    *     * Error? `error` - the initialization error if present
    * @event
    */
@@ -7749,12 +9063,14 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
     _this._services.commandExecutor = new CommandExecutor(baseUrl, {
       transport: _this._options.transport
     }, productId);
+    _this._services.contentClient = new ContentClient(_this._services);
 
     var emitFailed = function emitFailed(error) {
       _this._rejectEnsureReady(error);
 
-      _this.emit("stateChanged", {
-        state: "failed",
+      _this.emit("stateChanged", "failed");
+
+      _this.emit("initFailed", {
         error: error
       });
     };
@@ -7766,11 +9082,11 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
       });
     };
 
-    _this._services.twilsockClient.onceWithReplay("connectionError", emitFailed);
+    _this._services.twilsockClient.once("connectionError", emitFailed);
 
-    _this._services.twilsockClient.onceWithReplay("disconnected", emitDisconnected);
+    _this._services.twilsockClient.once("disconnected", emitDisconnected);
 
-    _this._services.twilsockClient.onceWithReplay("connected", /*#__PURE__*/_asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
+    _this._services.twilsockClient.once("connected", /*#__PURE__*/_asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
       var startupEvent, connectionError;
       return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
         while (1) {
@@ -7793,7 +9109,7 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
             case 8:
               _this._services.twilsockClient.addPartialTelemetryEvent(new twilsock.TelemetryEventDescription("", "", new Date()), startupEvent, twilsock.TelemetryPoint.End);
 
-              _context.next = 16;
+              _context.next = 17;
               break;
 
             case 11:
@@ -7807,12 +9123,13 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
 
               _this._rejectEnsureReady(connectionError);
 
-              _this.emit("stateChanged", {
-                state: "failed",
+              _this.emit("stateChanged", "failed");
+
+              _this.emit("initFailed", {
                 error: connectionError
               });
 
-            case 16:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -7859,6 +9176,17 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
 
       return this._configuration.reachabilityEnabled;
     }
+    /**
+     * @deprecated
+     * Current token.
+     * @internal
+     */
+
+  }, {
+    key: "token",
+    get: function get() {
+      return this._fpaToken;
+    }
     /**
      * @deprecated Call constructor directly.
      *
@@ -7997,16 +9325,32 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
                 conversation = _context4.sent;
 
                 if (conversation) {
-                  _context4.next = 9;
+                  _context4.next = 12;
+                  break;
+                }
+
+                _context4.next = 10;
+                return this.peekConversationBySid(conversationSid);
+
+              case 10:
+                conversation = _context4.sent;
+
+                if (conversation) {
+                  deprecationDecorator.deprecationWarning("The method getConversationBySid is deprecated to retrieve conversations you're not part of. Use peekConversationBySid instead.");
+                }
+
+              case 12:
+                if (conversation) {
+                  _context4.next = 14;
                   break;
                 }
 
                 throw new Error("Conversation with SID ".concat(conversationSid, " was not found."));
 
-              case 9:
+              case 14:
                 return _context4.abrupt("return", conversation);
 
-              case 10:
+              case 15:
               case "end":
                 return _context4.stop();
             }
@@ -8492,6 +9836,43 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
       });
       return this.getTemporaryContentUrlsForMediaSids(sids);
     }
+    /**
+     * Returns rich content templates belonging to the account. Rich content
+     * templates can be created via the Twilio console or the REST API.
+     */
+
+  }, {
+    key: "getContentTemplates",
+    value: function () {
+      var _getContentTemplates = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
+          while (1) {
+            switch (_context16.prev = _context16.next) {
+              case 0:
+                _context16.next = 2;
+                return this._ensureReady;
+
+              case 2:
+                _context16.next = 4;
+                return this._services.contentClient.getContentTemplates();
+
+              case 4:
+                return _context16.abrupt("return", _context16.sent);
+
+              case 5:
+              case "end":
+                return _context16.stop();
+            }
+          }
+        }, _callee16, this);
+      }));
+
+      function getContentTemplates() {
+        return _getContentTemplates.apply(this, arguments);
+      }
+
+      return getContentTemplates;
+    }()
     /**
      * Initialize the client.
      */
@@ -8499,20 +9880,21 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
   }, {
     key: "_initialize",
     value: function () {
-      var _initialize2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16() {
+      var _initialize2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee17() {
         var _this3 = this;
 
         var configurationResponse;
-        return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee17$(_context17) {
           while (1) {
-            switch (_context16.prev = _context16.next) {
+            switch (_context17.prev = _context17.next) {
               case 0:
-                _context16.next = 2;
+                _context17.next = 2;
                 return this._services.commandExecutor.fetchResource("Client/v2/Configuration");
 
               case 2:
-                configurationResponse = _context16.sent;
+                configurationResponse = _context17.sent;
                 this._configuration = new Configuration(this._options, configurationResponse, Client_1._logger);
+                this._services.channelMetadataClient = new ChannelMetadataClient(this._services, this._configuration);
 
                 this._myself._resolveInitialization(this._configuration, this._configuration.userIdentity, this._configuration.userInfo, true);
 
@@ -8591,10 +9973,10 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
                 }).catch(function (error) {
                   throw error;
                 });
-                _context16.next = 28;
+                _context17.next = 29;
                 return this._services.users.myself._ensureFetched();
 
-              case 28:
+              case 29:
                 Client_1._supportedPushChannels.forEach(function (channelType) {
                   return _this3._subscribeToPushNotifications(channelType);
                 });
@@ -8607,16 +9989,15 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
 
                 this._resolveEnsureReady();
 
-                this.emit("stateChanged", {
-                  state: "initialized"
-                });
+                this.emit("stateChanged", "initialized");
+                this.emit("initialized");
 
-              case 33:
+              case 35:
               case "end":
-                return _context16.stop();
+                return _context17.stop();
             }
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
 
       function _initialize() {
@@ -8656,14 +10037,14 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
   }], [{
     key: "create",
     value: function () {
-      var _create = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee17(token, options) {
+      var _create = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee18(token, options) {
         var client;
-        return _regeneratorRuntime__default["default"].wrap(function _callee17$(_context17) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee18$(_context18) {
           while (1) {
-            switch (_context17.prev = _context17.next) {
+            switch (_context18.prev = _context18.next) {
               case 0:
                 if (!(options !== null && options !== void 0 && options.twilsockClient)) {
-                  _context17.next = 2;
+                  _context18.next = 2;
                   break;
                 }
 
@@ -8671,18 +10052,18 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
 
               case 2:
                 client = new Client_1(token, options);
-                _context17.next = 5;
+                _context18.next = 5;
                 return client._ensureReady;
 
               case 5:
-                return _context17.abrupt("return", client);
+                return _context18.abrupt("return", client);
 
               case 6:
               case "end":
-                return _context17.stop();
+                return _context18.stop();
             }
           }
-        }, _callee17);
+        }, _callee18);
       }));
 
       function create(_x16, _x17) {
@@ -8815,7 +10196,7 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
   }]);
 
   return Client;
-}(replayEventEmitter.ReplayEventEmitter), _defineProperty__default["default"](_class, "conversationAdded", "conversationAdded"), _defineProperty__default["default"](_class, "conversationJoined", "conversationJoined"), _defineProperty__default["default"](_class, "conversationLeft", "conversationLeft"), _defineProperty__default["default"](_class, "conversationRemoved", "conversationRemoved"), _defineProperty__default["default"](_class, "conversationUpdated", "conversationUpdated"), _defineProperty__default["default"](_class, "participantJoined", "participantJoined"), _defineProperty__default["default"](_class, "participantLeft", "participantLeft"), _defineProperty__default["default"](_class, "participantUpdated", "participantUpdated"), _defineProperty__default["default"](_class, "messageAdded", "messageAdded"), _defineProperty__default["default"](_class, "messageRemoved", "messageRemoved"), _defineProperty__default["default"](_class, "messageUpdated", "messageUpdated"), _defineProperty__default["default"](_class, "tokenAboutToExpire", "tokenAboutToExpire"), _defineProperty__default["default"](_class, "tokenExpired", "tokenExpired"), _defineProperty__default["default"](_class, "typingEnded", "typingEnded"), _defineProperty__default["default"](_class, "typingStarted", "typingStarted"), _defineProperty__default["default"](_class, "pushNotification", "pushNotification"), _defineProperty__default["default"](_class, "userSubscribed", "userSubscribed"), _defineProperty__default["default"](_class, "userUnsubscribed", "userUnsubscribed"), _defineProperty__default["default"](_class, "userUpdated", "userUpdated"), _defineProperty__default["default"](_class, "stateChanged", "stateChanged"), _defineProperty__default["default"](_class, "connectionStateChanged", "connectionStateChanged"), _defineProperty__default["default"](_class, "connectionError", "connectionError"), _defineProperty__default["default"](_class, "version", version), _defineProperty__default["default"](_class, "_logger", Logger.scope("Client")), _defineProperty__default["default"](_class, "_supportedPushChannels", ["fcm", "apn"]), _defineProperty__default["default"](_class, "_supportedPushDataFields", {
+}(replayEventEmitter.ReplayEventEmitter), _defineProperty__default["default"](_class, "conversationAdded", "conversationAdded"), _defineProperty__default["default"](_class, "conversationJoined", "conversationJoined"), _defineProperty__default["default"](_class, "conversationLeft", "conversationLeft"), _defineProperty__default["default"](_class, "conversationRemoved", "conversationRemoved"), _defineProperty__default["default"](_class, "conversationUpdated", "conversationUpdated"), _defineProperty__default["default"](_class, "participantJoined", "participantJoined"), _defineProperty__default["default"](_class, "participantLeft", "participantLeft"), _defineProperty__default["default"](_class, "participantUpdated", "participantUpdated"), _defineProperty__default["default"](_class, "messageAdded", "messageAdded"), _defineProperty__default["default"](_class, "messageRemoved", "messageRemoved"), _defineProperty__default["default"](_class, "messageUpdated", "messageUpdated"), _defineProperty__default["default"](_class, "tokenAboutToExpire", "tokenAboutToExpire"), _defineProperty__default["default"](_class, "tokenExpired", "tokenExpired"), _defineProperty__default["default"](_class, "typingEnded", "typingEnded"), _defineProperty__default["default"](_class, "typingStarted", "typingStarted"), _defineProperty__default["default"](_class, "pushNotification", "pushNotification"), _defineProperty__default["default"](_class, "userSubscribed", "userSubscribed"), _defineProperty__default["default"](_class, "userUnsubscribed", "userUnsubscribed"), _defineProperty__default["default"](_class, "userUpdated", "userUpdated"), _defineProperty__default["default"](_class, "stateChanged", "stateChanged"), _defineProperty__default["default"](_class, "initialized", "initialized"), _defineProperty__default["default"](_class, "initFailed", "initFailed"), _defineProperty__default["default"](_class, "connectionStateChanged", "connectionStateChanged"), _defineProperty__default["default"](_class, "connectionError", "connectionError"), _defineProperty__default["default"](_class, "version", version), _defineProperty__default["default"](_class, "_logger", Logger.scope("Client")), _defineProperty__default["default"](_class, "_supportedPushChannels", ["fcm", "apn"]), _defineProperty__default["default"](_class, "_supportedPushDataFields", {
   conversation_sid: "conversationSid",
   conversation_title: "conversationTitle",
   message_sid: "messageSid",
@@ -8825,6 +10206,8 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
 
 }), _class);
 
+__decorate([deprecationDecorator.deprecated("token"), __metadata("design:type", String), __metadata("design:paramtypes", [])], exports.Client.prototype, "token", null);
+
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "updateToken", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "getConversationBySid", null);
@@ -8853,7 +10236,7 @@ __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyArray("media", Media)), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", mcsClient.CancellablePromise)], exports.Client.prototype, "getTemporaryContentUrlsForMedia", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync("string", ["undefined", declarativeTypeValidator.pureObject]), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", Promise)], exports.Client, "create", null);
+__decorate([deprecationDecorator.deprecated("Client.create()", "new Client()"), declarativeTypeValidator.validateTypesAsync("string", ["undefined", declarativeTypeValidator.pureObject]), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", Promise)], exports.Client, "create", null);
 
 __decorate([declarativeTypeValidator.validateTypes(declarativeTypeValidator.pureObject), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", PushNotification)], exports.Client, "parsePushNotification", null);
 
@@ -8864,6 +10247,9 @@ Object.defineProperty(exports, 'CancellablePromise', {
     get: function () { return mcsClient.CancellablePromise; }
 });
 exports.AggregatedDeliveryReceipt = AggregatedDeliveryReceipt;
+exports.ChannelMetadata = ChannelMetadata;
+exports.ContentTemplate = ContentTemplate;
+exports.ContentTemplateVariable = ContentTemplateVariable;
 exports.Conversation = Conversation;
 exports.DetailedDeliveryReceipt = DetailedDeliveryReceipt;
 exports.Media = Media;