@twilio/conversations 3.0.0-canary.5 → 3.0.0-rc.5

package/builds/browser.js

@@ -130,7 +130,7 @@ This software includes platform.js under the following license.
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('isomorphic-form-data');
+require('core-js/modules/es.reflect.to-string-tag.js');
 require('core-js/modules/es.reflect.construct.js');
 require('core-js/modules/es.object.keys.js');
 require('core-js/modules/es.symbol.js');
@@ -138,12 +138,12 @@ require('core-js/modules/es.array.filter.js');
 require('core-js/modules/es.object.get-own-property-descriptor.js');
 require('core-js/modules/es.object.get-own-property-descriptors.js');
 var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
-var _createClass = require('@babel/runtime/helpers/createClass');
 var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
 var _inherits = require('@babel/runtime/helpers/inherits');
 var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var _createClass = require('@babel/runtime/helpers/createClass');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/es.promise.js');
@@ -158,6 +158,7 @@ var loglevelLog = require('loglevel');
 var iso8601Duration = require('iso8601-duration');
 require('core-js/modules/es.array.iterator.js');
 require('core-js/modules/web.dom-collections.iterator.js');
+require('core-js/modules/es.json.stringify.js');
 require('core-js/modules/es.number.constructor.js');
 require('core-js/modules/es.regexp.exec.js');
 require('core-js/modules/es.string.replace.js');
@@ -168,6 +169,7 @@ var replayEventEmitter = require('@twilio/replay-event-emitter');
 var isEqual = require('lodash.isequal');
 require('core-js/modules/es.array.slice.js');
 require('core-js/modules/es.function.name.js');
+require('core-js/modules/es.regexp.test.js');
 require('core-js/modules/es.symbol.description.js');
 require('core-js/modules/es.symbol.iterator.js');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
@@ -181,6 +183,7 @@ 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');
+require('core-js/modules/es.typed-array.at.js');
 require('core-js/modules/es.typed-array.copy-within.js');
 require('core-js/modules/es.typed-array.every.js');
 require('core-js/modules/es.typed-array.fill.js');
@@ -205,6 +208,7 @@ require('core-js/modules/es.typed-array.subarray.js');
 require('core-js/modules/es.typed-array.to-locale-string.js');
 require('core-js/modules/es.typed-array.to-string.js');
 require('core-js/modules/es.array-buffer.constructor.js');
+require('isomorphic-form-data');
 require('core-js/modules/es.array.sort.js');
 require('core-js/modules/es.string.includes.js');
 require('core-js/modules/es.array.find.js');
@@ -223,24 +227,22 @@ function _interopNamespace(e) {
                 var d = Object.getOwnPropertyDescriptor(e, k);
                 Object.defineProperty(n, k, d.get ? d : {
                     enumerable: true,
-                    get: function () {
-                        return e[k];
-                    }
+                    get: function () { return e[k]; }
                 });
             }
         });
     }
-    n['default'] = e;
+    n["default"] = e;
     return Object.freeze(n);
 }
 
 var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
-var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
 var _assertThisInitialized__default = /*#__PURE__*/_interopDefaultLegacy(_assertThisInitialized);
 var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
 var _possibleConstructorReturn__default = /*#__PURE__*/_interopDefaultLegacy(_possibleConstructorReturn);
 var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeOf);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
 var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
 var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
 var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
@@ -253,13 +255,13 @@ function __decorate(decorators, target, key, desc) {
   var c = arguments.length,
       r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
       d;
-  if ((typeof Reflect === "undefined" ? "undefined" : _typeof__default['default'](Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof__default["default"](Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
     if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   }
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 function __metadata(metadataKey, metadataValue) {
-  if ((typeof Reflect === "undefined" ? "undefined" : _typeof__default['default'](Reflect)) === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof__default["default"](Reflect)) === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
 }
 
 function prepareLine(prefix, args) {
@@ -270,14 +272,14 @@ var log$7 = loglevelLog__namespace.getLogger("twilio-conversations"); // twilio-
 
 var Logger = /*#__PURE__*/function () {
   function Logger(prefix) {
-    _classCallCheck__default['default'](this, Logger);
+    _classCallCheck__default["default"](this, Logger);
 
-    _defineProperty__default['default'](this, "prefix", "");
+    _defineProperty__default["default"](this, "prefix", "");
 
     this.prefix = prefix !== null && prefix !== undefined && prefix.length > 0 ? prefix + " " : "";
   }
 
-  _createClass__default['default'](Logger, [{
+  _createClass__default["default"](Logger, [{
     key: "setLevel",
     value: function setLevel(level) {
       log$7.setLevel(level);
@@ -387,9 +389,9 @@ var Logger = /*#__PURE__*/function () {
   return Logger;
 }();
 
-function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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$3(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$3(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 var TYPING_TIMEOUT = 5;
 var HTTP_CACHE_LIFETIME = "PT5S";
 var CONSUMPTION_HORIZON_SENDING_INTERVAL = "PT5S";
@@ -399,16 +401,16 @@ var MAXIMUM_RETRY_DELAY = 4000;
 var MAXIMUM_ATTEMPTS_COUNT = 3;
 var RETRY_WHEN_THROTTLED = true;
 
-var Configuration = function Configuration() {
+var Configuration = /*#__PURE__*/_createClass__default["default"](function Configuration() {
   var _ref, _constructorOptions$u, _ref2, _constructorOptions$h, _ref3, _constructorOptions$c;
 
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var configurationResponse = arguments.length > 1 ? arguments[1] : undefined;
   var logger = arguments.length > 2 ? arguments[2] : undefined;
 
-  _classCallCheck__default['default'](this, Configuration);
+  _classCallCheck__default["default"](this, Configuration);
 
-  _defineProperty__default['default'](this, "typingIndicatorTimeoutDefault", TYPING_TIMEOUT * 1000);
+  _defineProperty__default["default"](this, "typingIndicatorTimeoutDefault", TYPING_TIMEOUT * 1000);
 
   var constructorOptions = options.Chat || options.IPMessaging || options || {};
   this.productId = constructorOptions.productId;
@@ -430,7 +432,7 @@ var Configuration = function Configuration() {
     emailBodiesAllowedContentTypes: configurationResponse.options.email_bodies_allowed_mime_types
   };
   this.typingIndicatorTimeoutOverride = constructorOptions.typingIndicatorTimeoutOverride;
-  this.backoffConfiguration = _objectSpread$3({
+  this.backoffConfiguration = _objectSpread$4({
     min: MINIMUM_RETRY_DELAY,
     max: MAXIMUM_RETRY_DELAY,
     maxAttemptsCount: MAXIMUM_ATTEMPTS_COUNT
@@ -458,7 +460,7 @@ var Configuration = function Configuration() {
     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));
   }
-};
+});
 
 /**
  * Deep-clone an object. Note that this does not work on object containing
@@ -508,14 +510,14 @@ function parseAttributes(rawAttributes, warningMessage, log) {
 
 var UriBuilder = /*#__PURE__*/function () {
   function UriBuilder(base) {
-    _classCallCheck__default['default'](this, UriBuilder);
+    _classCallCheck__default["default"](this, UriBuilder);
 
     this.base = base.replace(/\/$/, "");
     this.args = [];
     this.paths = [];
   }
 
-  _createClass__default['default'](UriBuilder, [{
+  _createClass__default["default"](UriBuilder, [{
     key: "arg",
     value: function arg(name, value) {
       if (typeof value !== "undefined") {
@@ -551,13 +553,13 @@ var UriBuilder = /*#__PURE__*/function () {
 }();
 
 var attributesValidator = declarativeTypeValidator.custom(function (value) {
-  return [["string", "number", "boolean", "object"].includes(_typeof__default['default'](value)), "a JSON type"];
+  return [["string", "number", "boolean", "object"].includes(_typeof__default["default"](value)), "a JSON type"];
 });
 var optionalAttributesValidator = declarativeTypeValidator.custom(function (value) {
-  return [["undefined", "string", "number", "boolean", "object"].includes(_typeof__default['default'](value)), "an optional JSON type"];
+  return [["undefined", "string", "number", "boolean", "object"].includes(_typeof__default["default"](value)), "an optional JSON type"];
 });
 
-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$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$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$6 = Logger.scope("User");
@@ -569,7 +571,7 @@ var log$6 = Logger.scope("User");
  */
 
 var User = /*#__PURE__*/function (_ReplayEventEmitter) {
-  _inherits__default['default'](User, _ReplayEventEmitter);
+  _inherits__default["default"](User, _ReplayEventEmitter);
 
   var _super = _createSuper$8(User);
 
@@ -579,17 +581,17 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   function User(identity, entityName, configuration, services) {
     var _this;
 
-    _classCallCheck__default['default'](this, User);
+    _classCallCheck__default["default"](this, User);
 
     _this = _super.call(this);
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "promiseToFetch", null);
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "promiseToFetch", null);
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "updated", "updated");
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "updated", "updated");
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "userSubscribed", "userSubscribed");
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "userSubscribed", "userSubscribed");
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "userUnsubscribed", "userUnsubscribed");
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "userUnsubscribed", "userUnsubscribed");
 
     _this.services = services;
     _this.subscribed = "initializing";
@@ -625,7 +627,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
    */
 
 
-  _createClass__default['default'](User, [{
+  _createClass__default["default"](User, [{
     key: "identity",
     get:
     /**
@@ -691,9 +693,9 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_update",
     value: function () {
-      var _update2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(key, value) {
+      var _update2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(key, value) {
         var updateReasons, updateAttributes;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -718,7 +720,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 9:
                 updateAttributes = parseAttributes(value.value, "Retrieved malformed attributes from the server for user: ".concat(this.state.identity), log$6);
 
-                if (!isEqual__default['default'](this.state.attributes, updateAttributes)) {
+                if (!isEqual__default["default"](this.state.attributes, updateAttributes)) {
                   this.state.attributes = updateAttributes;
                   updateReasons.push("attributes");
                 }
@@ -767,10 +769,10 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_updateReachabilityInfo",
     value: function () {
-      var _updateReachabilityInfo2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(map, update) {
+      var _updateReachabilityInfo2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(map, update) {
         var _this2 = this;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -808,10 +810,10 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_fetch",
     value: function () {
-      var _fetch2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
+      var _fetch2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3() {
         var _this3 = this;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -874,8 +876,8 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_ensureFetched",
     value: function () {
-      var _ensureFetched2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+      var _ensureFetched2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
@@ -907,8 +909,8 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "updateAttributes",
     value: function () {
-      var _updateAttributes = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(attributes) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+      var _updateAttributes = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(attributes) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
@@ -954,8 +956,8 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "updateFriendlyName",
     value: function () {
-      var _updateFriendlyName = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(friendlyName) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+      var _updateFriendlyName = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(friendlyName) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
@@ -1001,8 +1003,8 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "unsubscribe",
     value: function () {
-      var _unsubscribe = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+      var _unsubscribe = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
               case 0:
@@ -1074,7 +1076,7 @@ function _arrayLikeToArray$3(arr, len) { if (len == null || len > arr.length) le
 
 var Network = /*#__PURE__*/function () {
   function Network(configuration, services) {
-    _classCallCheck__default['default'](this, Network);
+    _classCallCheck__default["default"](this, Network);
 
     this.configuration = configuration;
     this.services = services;
@@ -1083,7 +1085,7 @@ var Network = /*#__PURE__*/function () {
     this.cleanupCache();
   }
 
-  _createClass__default['default'](Network, [{
+  _createClass__default["default"](Network, [{
     key: "isExpired",
     value: function isExpired(timestamp) {
       return !this.cacheLifetime || Date.now() - timestamp > this.cacheLifetime;
@@ -1096,7 +1098,7 @@ var Network = /*#__PURE__*/function () {
 
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var _step$value = _slicedToArray__default['default'](_step.value, 2),
+          var _step$value = _slicedToArray__default["default"](_step.value, 2),
               k = _step$value[0],
               v = _step$value[1];
 
@@ -1169,11 +1171,11 @@ var Network = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: function () {
-      var _get = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(url) {
+      var _get = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(url) {
         var _this3 = this;
 
         var cacheEntry, headers, response;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -1221,21 +1223,21 @@ var Network = /*#__PURE__*/function () {
   return Network;
 }();
 
-var NotificationTypes = function NotificationTypes() {
-  _classCallCheck__default['default'](this, NotificationTypes);
-};
+var NotificationTypes = /*#__PURE__*/_createClass__default["default"](function NotificationTypes() {
+  _classCallCheck__default["default"](this, NotificationTypes);
+});
 
-_defineProperty__default['default'](NotificationTypes, "TYPING_INDICATOR", "twilio.ipmsg.typing_indicator");
+_defineProperty__default["default"](NotificationTypes, "TYPING_INDICATOR", "twilio.ipmsg.typing_indicator");
 
-_defineProperty__default['default'](NotificationTypes, "NEW_MESSAGE", "twilio.conversations.new_message");
+_defineProperty__default["default"](NotificationTypes, "NEW_MESSAGE", "twilio.conversations.new_message");
 
-_defineProperty__default['default'](NotificationTypes, "ADDED_TO_CONVERSATION", "twilio.conversations.added_to_conversation");
+_defineProperty__default["default"](NotificationTypes, "ADDED_TO_CONVERSATION", "twilio.conversations.added_to_conversation");
 
-_defineProperty__default['default'](NotificationTypes, "REMOVED_FROM_CONVERSATION", "twilio.conversations.removed_from_conversation");
+_defineProperty__default["default"](NotificationTypes, "REMOVED_FROM_CONVERSATION", "twilio.conversations.removed_from_conversation");
 
-_defineProperty__default['default'](NotificationTypes, "CONSUMPTION_UPDATE", "twilio.channel.consumption_update");
+_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$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$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$5 = Logger.scope("Participant");
@@ -1244,7 +1246,7 @@ var log$5 = Logger.scope("Participant");
  */
 
 var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
-  _inherits__default['default'](Participant, _ReplayEventEmitter);
+  _inherits__default["default"](Participant, _ReplayEventEmitter);
 
   var _super = _createSuper$7(Participant);
 
@@ -1256,7 +1258,7 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
 
     var _this;
 
-    _classCallCheck__default['default'](this, Participant);
+    _classCallCheck__default["default"](this, Participant);
 
     _this = _super.call(this);
     _this.conversation = conversation;
@@ -1293,7 +1295,7 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
    */
 
 
-  _createClass__default['default'](Participant, [{
+  _createClass__default["default"](Participant, [{
     key: "sid",
     get:
     /**
@@ -1454,7 +1456,7 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
       var updateReasons = [];
       var updateAttributes = parseAttributes(data.attributes, "Retrieved malformed attributes from the server for participant: " + this.state.sid, log$5);
 
-      if (data.attributes && !isEqual__default['default'](this.state.attributes, updateAttributes)) {
+      if (data.attributes && !isEqual__default["default"](this.state.attributes, updateAttributes)) {
         this.state.attributes = updateAttributes;
         updateReasons.push("attributes");
       }
@@ -1492,7 +1494,7 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
         }
       }
 
-      if (data.bindings && !isEqual__default['default'](this.state.bindings, data.bindings)) {
+      if (data.bindings && !isEqual__default["default"](this.state.bindings, data.bindings)) {
         this.state.bindings = data.bindings;
         updateReasons.push("bindings");
       }
@@ -1513,8 +1515,8 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getUser",
     value: function () {
-      var _getUser = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+      var _getUser = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -1549,8 +1551,8 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "remove",
     value: function () {
-      var _remove = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+      var _remove = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -1578,8 +1580,8 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "updateAttributes",
     value: function () {
-      var _updateAttributes = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(attributes) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+      var _updateAttributes = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(attributes) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -1610,15 +1612,15 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
   return Participant;
 }(replayEventEmitter.ReplayEventEmitter);
 
-_defineProperty__default['default'](Participant, "typingStarted", "typingStarted");
+_defineProperty__default["default"](Participant, "typingStarted", "typingStarted");
 
-_defineProperty__default['default'](Participant, "typingEnded", "typingEnded");
+_defineProperty__default["default"](Participant, "typingEnded", "typingEnded");
 
-_defineProperty__default['default'](Participant, "updated", "updated");
+_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);
 
-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$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$4 = Logger.scope("Participants");
@@ -1630,18 +1632,18 @@ var log$4 = Logger.scope("Participants");
  */
 
 var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
-  _inherits__default['default'](Participants, _ReplayEventEmitter);
+  _inherits__default["default"](Participants, _ReplayEventEmitter);
 
   var _super = _createSuper$6(Participants);
 
   function Participants(conversation, participants, links, configuration, services) {
     var _this;
 
-    _classCallCheck__default['default'](this, Participants);
+    _classCallCheck__default["default"](this, Participants);
 
     _this = _super.call(this);
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "rosterEntityPromise", null);
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "rosterEntityPromise", null);
 
     _this.conversation = conversation;
     _this.participants = participants;
@@ -1651,12 +1653,12 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
     return _this;
   }
 
-  _createClass__default['default'](Participants, [{
+  _createClass__default["default"](Participants, [{
     key: "unsubscribe",
     value: function () {
-      var _unsubscribe = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+      var _unsubscribe = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
         var entity;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -1754,11 +1756,11 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "upsertParticipantFromResponse",
     value: function () {
-      var _upsertParticipantFromResponse = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(data) {
+      var _upsertParticipantFromResponse = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(data) {
         var _messagingBinding$typ;
 
         var sid, responseAttributes, dateCreated, dateUpdated, responseIdentity, roleSid, messagingBinding;
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -1795,11 +1797,11 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "upsertParticipant",
     value: function () {
-      var _upsertParticipant = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(participantSid, data) {
+      var _upsertParticipant = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(participantSid, data) {
         var _this3 = this;
 
         var participant, links;
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -1844,10 +1846,10 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipants",
     value: function () {
-      var _getParticipants = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
+      var _getParticipants = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4() {
         var _this4 = this;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
@@ -1883,10 +1885,10 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipantBySid",
     value: function () {
-      var _getParticipantBySid = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(participantSid) {
+      var _getParticipantBySid = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(participantSid) {
         var _this5 = this;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
@@ -1922,11 +1924,11 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipantByIdentity",
     value: function () {
-      var _getParticipantByIdentity = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(identity) {
+      var _getParticipantByIdentity = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(identity) {
         var _this6 = this;
 
         var foundParticipant;
-        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
@@ -1966,9 +1968,9 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "add",
     value: function () {
-      var _add = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7(identity, attributes) {
+      var _add = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(identity, attributes) {
         var participantResponse;
-        return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
               case 0:
@@ -2007,14 +2009,14 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "addNonChatParticipant",
     value: function () {
-      var _addNonChatParticipant = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8(proxyAddress, address) {
+      var _addNonChatParticipant = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(proxyAddress, address) {
         var _bindingOptions$email, _bindingOptions$email2;
 
         var attributes,
             bindingOptions,
             participantResponse,
             _args8 = arguments;
-        return _regeneratorRuntime__default['default'].wrap(function _callee8$(_context8) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) {
             switch (_context8.prev = _context8.next) {
               case 0:
@@ -2095,9 +2097,9 @@ var Media = /*#__PURE__*/function () {
    * @internal
    */
   function Media(data, services) {
-    _classCallCheck__default['default'](this, Media);
+    _classCallCheck__default["default"](this, Media);
 
-    _defineProperty__default['default'](this, "mcsMedia", null);
+    _defineProperty__default["default"](this, "mcsMedia", null);
 
     this.services = services;
 
@@ -2118,7 +2120,7 @@ var Media = /*#__PURE__*/function () {
    */
 
 
-  _createClass__default['default'](Media, [{
+  _createClass__default["default"](Media, [{
     key: "sid",
     get: function get() {
       return this.state.sid;
@@ -2173,11 +2175,11 @@ var Media = /*#__PURE__*/function () {
       var _this = this;
 
       return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(resolve, reject, onCancel) {
+        var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(resolve, reject, onCancel) {
           var _this$mcsMedia;
 
           var fetchMediaRequest, contentUrlRequest, mcsMedia;
-          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+          return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
@@ -2253,9 +2255,9 @@ var Media = /*#__PURE__*/function () {
       var _this2 = this;
 
       return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(resolve, reject, onCancel) {
+        var _ref2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(resolve, reject, onCancel) {
           var request;
-          return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+          return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
@@ -2333,7 +2335,7 @@ var AggregatedDeliveryReceipt = /*#__PURE__*/function () {
    * @internal
    */
   function AggregatedDeliveryReceipt(data) {
-    _classCallCheck__default['default'](this, AggregatedDeliveryReceipt);
+    _classCallCheck__default["default"](this, AggregatedDeliveryReceipt);
 
     this.state = data;
   }
@@ -2342,7 +2344,7 @@ var AggregatedDeliveryReceipt = /*#__PURE__*/function () {
    */
 
 
-  _createClass__default['default'](AggregatedDeliveryReceipt, [{
+  _createClass__default["default"](AggregatedDeliveryReceipt, [{
     key: "total",
     get: function get() {
       return this.state.total;
@@ -2437,7 +2439,7 @@ var RestPaginator = /*#__PURE__*/function () {
    * @internal
    */
   function RestPaginator(items, source, prevToken, nextToken) {
-    _classCallCheck__default['default'](this, RestPaginator);
+    _classCallCheck__default["default"](this, RestPaginator);
 
     this.state = {
       prevToken: prevToken,
@@ -2451,7 +2453,7 @@ var RestPaginator = /*#__PURE__*/function () {
    */
 
 
-  _createClass__default['default'](RestPaginator, [{
+  _createClass__default["default"](RestPaginator, [{
     key: "hasNextPage",
     get:
     /**
@@ -2500,7 +2502,7 @@ var RestPaginator = /*#__PURE__*/function () {
 /**
  * Represents a delivery receipt of a message.
  */
-var DetailedDeliveryReceipt =
+var DetailedDeliveryReceipt = /*#__PURE__*/_createClass__default["default"](
 /**
  * Unique identifier for the delivery receipt.
  */
@@ -2542,7 +2544,7 @@ var DetailedDeliveryReceipt =
  * @internal
  */
 function DetailedDeliveryReceipt(descriptor) {
-  _classCallCheck__default['default'](this, DetailedDeliveryReceipt);
+  _classCallCheck__default["default"](this, DetailedDeliveryReceipt);
 
   this.sid = descriptor.sid;
   this.messageSid = descriptor.message_sid;
@@ -2553,9 +2555,13 @@ function DetailedDeliveryReceipt(descriptor) {
   this.errorCode = descriptor.error_code || 0;
   this.dateCreated = descriptor.date_created;
   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; }
 
-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 _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 _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$3 = Logger.scope("Message");
@@ -2564,7 +2570,7 @@ var log$3 = Logger.scope("Message");
  */
 
 var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
-  _inherits__default['default'](Message, _ReplayEventEmitter);
+  _inherits__default["default"](Message, _ReplayEventEmitter);
 
   var _super = _createSuper$5(Message);
 
@@ -2580,7 +2586,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
     var _this;
 
-    _classCallCheck__default['default'](this, Message);
+    _classCallCheck__default["default"](this, Message);
 
     _this = _super.call(this);
     _this.conversation = conversation;
@@ -2598,10 +2604,12 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       lastUpdatedBy: (_data$lastUpdatedBy = data.lastUpdatedBy) !== null && _data$lastUpdatedBy !== void 0 ? _data$lastUpdatedBy : null,
       attributes: parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(data.sid), log$3),
       type: (_data$type = data.type) !== null && _data$type !== void 0 ? _data$type : "text",
-      media: data.type && data.type === "media" && data.media ? new Media(data.media, _this.services) : null,
-      medias: data.type && data.type === "media" && data.medias ? data.medias.map(function (m) {
+      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);
-      }) : null,
+      }) : data.type === "media" && data.media && !data.medias ? [new Media(_objectSpread$3(_objectSpread$3({}, 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
     };
@@ -2617,7 +2625,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
    */
 
 
-  _createClass__default['default'](Message, [{
+  _createClass__default["default"](Message, [{
     key: "sid",
     get:
     /**
@@ -2837,7 +2845,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       var updatedAttributes = parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(this.sid), log$3);
 
-      if (!isEqual__default['default'](this.state.attributes, updatedAttributes)) {
+      if (!isEqual__default["default"](this.state.attributes, updatedAttributes)) {
         this.state.attributes = updatedAttributes;
         updateReasons.push("attributes");
       }
@@ -2871,11 +2879,11 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipant",
     value: function () {
-      var _getParticipant = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+      var _getParticipant = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
         var _this2 = this;
 
         var participant, errorMesage;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -2961,9 +2969,9 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getDetailedDeliveryReceipts",
     value: function () {
-      var _getDetailedDeliveryReceipts = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+      var _getDetailedDeliveryReceipts = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
         var paginator, detailedDeliveryReceipts;
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -2976,7 +2984,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 4:
 
-                detailedDeliveryReceipts = [].concat(_toConsumableArray__default['default'](detailedDeliveryReceipts), _toConsumableArray__default['default'](paginator.items));
+                detailedDeliveryReceipts = [].concat(_toConsumableArray__default["default"](detailedDeliveryReceipts), _toConsumableArray__default["default"](paginator.items));
 
                 if (paginator.hasNextPage) {
                   _context2.next = 8;
@@ -3018,8 +3026,8 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "remove",
     value: function () {
-      var _remove = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+      var _remove = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -3051,8 +3059,8 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "updateBody",
     value: function () {
-      var _updateBody = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(body) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+      var _updateBody = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(body) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
@@ -3086,8 +3094,8 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "updateAttributes",
     value: function () {
-      var _updateAttributes = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(attributes) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+      var _updateAttributes = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(attributes) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
@@ -3121,13 +3129,11 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getTemporaryContentUrlsForMedia",
     value: function getTemporaryContentUrlsForMedia(contentSet) {
-      var _contentSet$map;
-
       // 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.
-      var sids = (_contentSet$map = contentSet === null || contentSet === void 0 ? void 0 : contentSet.map(function (m) {
+      var sids = contentSet.map(function (m) {
         return m.sid;
-      })) !== null && _contentSet$map !== void 0 ? _contentSet$map : [];
+      });
       return this.getTemporaryContentUrlsForMediaSids(sids);
     }
     /**
@@ -3141,9 +3147,9 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       var _this3 = 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 _callee6(resolve, reject, onCancel) {
           var mediaGetRequest, urls;
-          return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+          return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
             while (1) {
               switch (_context6.prev = _context6.next) {
                 case 0:
@@ -3207,11 +3213,11 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_getDetailedDeliveryReceiptsPaginator",
     value: function () {
-      var _getDetailedDeliveryReceiptsPaginator2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7(options) {
+      var _getDetailedDeliveryReceiptsPaginator2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7(options) {
         var _this4 = this;
 
         var messagesReceiptsUrl, url, response;
-        return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
               case 0:
@@ -3250,7 +3256,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   return Message;
 }(replayEventEmitter.ReplayEventEmitter);
 
-_defineProperty__default['default'](Message, "updated", "updated");
+_defineProperty__default["default"](Message, "updated", "updated");
 
 __decorate([declarativeTypeValidator.validateTypes([declarativeTypeValidator.nonEmptyString, "undefined"]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Media)], Message.prototype, "getEmailBody", null);
 
@@ -3260,11 +3266,9 @@ __decorate([declarativeTypeValidator.validateTypesAsync("string"), __metadata("d
 
 __decorate([declarativeTypeValidator.validateTypesAsync(attributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Message.prototype, "updateAttributes", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.custom(function (value) {
-  return [value instanceof Array && value.length > 0 && value.reduce(function (a, c) {
-    return a && c instanceof Media;
-  }, true), "a non-empty array of Media"];
-})), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", mcsClient.CancellablePromise)], Message.prototype, "getTemporaryContentUrlsForMedia", 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 _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; } } }; }
 
@@ -3272,7 +3276,7 @@ function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o
 
 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 _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; } }
 var log$2 = Logger.scope("Messages");
@@ -3281,14 +3285,14 @@ var log$2 = Logger.scope("Messages");
  */
 
 var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
-  _inherits__default['default'](Messages, _ReplayEventEmitter);
+  _inherits__default["default"](Messages, _ReplayEventEmitter);
 
   var _super = _createSuper$4(Messages);
 
   function Messages(conversation, configuration, services) {
     var _this;
 
-    _classCallCheck__default['default'](this, Messages);
+    _classCallCheck__default["default"](this, Messages);
 
     _this = _super.call(this);
     _this.conversation = conversation;
@@ -3304,14 +3308,14 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
    */
 
 
-  _createClass__default['default'](Messages, [{
+  _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(name) {
         var _this2 = this;
 
         var list;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -3413,9 +3417,9 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "unsubscribe",
     value: function () {
-      var _unsubscribe = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+      var _unsubscribe = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
         var entity;
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -3461,12 +3465,12 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       log$2.debug("Sending message V2", message.mediaContent, message.attributes, message.emailOptions);
       return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(resolve, reject, onCancel) {
+        var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(resolve, reject, onCancel) {
           var _message$emailOptions;
 
           var media, requests, _iterator, _step, _step$value, category, mediaContent, _mediaContent$content, _mediaContent$media, request, messagesPostRequest;
 
-          return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+          return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
             while (1) {
               switch (_context3.prev = _context3.next) {
                 case 0:
@@ -3488,7 +3492,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                     break;
                   }
 
-                  _step$value = _slicedToArray__default['default'](_step.value, 2), category = _step$value[0], mediaContent = _step$value[1];
+                  _step$value = _slicedToArray__default["default"](_step.value, 2), category = _step$value[0], mediaContent = _step$value[1];
                   _context3.prev = 8;
                   log$2.debug("Adding media to a message as ".concat(mediaContent instanceof FormData ? "FormData" : "SendMediaOptions"), mediaContent);
                   request = mediaContent instanceof FormData ? _this3.services.mcsClient.postFormData(mediaContent, category) : _this3.services.mcsClient.post((_mediaContent$content = mediaContent.contentType) !== null && _mediaContent$content !== void 0 ? _mediaContent$content : "", (_mediaContent$media = mediaContent.media) !== null && _mediaContent$media !== void 0 ? _mediaContent$media : "", category, mediaContent.filename);
@@ -3581,11 +3585,11 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "send",
     value: function () {
-      var _send = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(message) {
+      var _send = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(message) {
         var attributes,
             emailOptions,
             _args4 = arguments;
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
@@ -3623,14 +3627,14 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "sendMedia",
     value: function () {
-      var _sendMedia = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(mediaContent) {
+      var _sendMedia = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(mediaContent) {
         var _mediaContent$content2, _mediaContent$media2;
 
         var attributes,
             emailOptions,
             media,
             _args5 = arguments;
-        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
@@ -3695,10 +3699,10 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getMessages",
     value: function () {
-      var _getMessages2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(pageSize, anchor) {
+      var _getMessages2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(pageSize, anchor) {
         var direction,
             _args6 = arguments;
-        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
@@ -3787,7 +3791,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_getMessages",
     value: function () {
-      var _getMessages3 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7() {
+      var _getMessages3 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7() {
         var _this6 = this;
 
         var pageSize,
@@ -3797,7 +3801,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
             list,
             page,
             _args7 = arguments;
-        return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
               case 0:
@@ -3859,13 +3863,13 @@ var UnsentMessage = /*#__PURE__*/function () {
    * @internal
    */
   function UnsentMessage(messagesEntity) {
-    _classCallCheck__default['default'](this, UnsentMessage);
+    _classCallCheck__default["default"](this, UnsentMessage);
 
-    _defineProperty__default['default'](this, "attributes", {});
+    _defineProperty__default["default"](this, "attributes", {});
 
-    _defineProperty__default['default'](this, "mediaContent", []);
+    _defineProperty__default["default"](this, "mediaContent", []);
 
-    _defineProperty__default['default'](this, "emailOptions", {});
+    _defineProperty__default["default"](this, "emailOptions", {});
 
     this.messagesEntity = messagesEntity;
   }
@@ -3875,15 +3879,15 @@ var UnsentMessage = /*#__PURE__*/function () {
    */
 
 
-  _createClass__default['default'](UnsentMessage, [{
+  _createClass__default["default"](UnsentMessage, [{
     key: "send",
     value: function send() {
       var _this = this;
 
       return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(resolve, reject, onCancel) {
+        var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(resolve, reject, onCancel) {
           var request, response;
-          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+          return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
@@ -3945,7 +3949,7 @@ var MessageBuilder = /*#__PURE__*/function () {
    * @internal
    */
   function MessageBuilder(limits, messagesEntity) {
-    _classCallCheck__default['default'](this, MessageBuilder);
+    _classCallCheck__default["default"](this, MessageBuilder);
 
     this.limits = limits;
     this.message = new UnsentMessage(messagesEntity);
@@ -3958,7 +3962,7 @@ var MessageBuilder = /*#__PURE__*/function () {
    */
 
 
-  _createClass__default['default'](MessageBuilder, [{
+  _createClass__default["default"](MessageBuilder, [{
     key: "setBody",
     value: function setBody(text) {
       this.message.text = text;
@@ -4104,7 +4108,7 @@ function _unsupportedIterableToArray$1(o, minLen) { if (!o) return; if (typeof o
 
 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 _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 _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$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; } }
 /**
@@ -4132,7 +4136,7 @@ var fieldMappings = {
  */
 
 var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
-  _inherits__default['default'](Conversation, _ReplayEventEmitter);
+  _inherits__default["default"](Conversation, _ReplayEventEmitter);
 
   var _super = _createSuper$3(Conversation);
 
@@ -4252,7 +4256,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
     var _this;
 
-    _classCallCheck__default['default'](this, Conversation);
+    _classCallCheck__default["default"](this, Conversation);
 
     _this = _super.call(this);
     _this.sid = sid;
@@ -4280,7 +4284,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       participants: _this._links.participants
     };
     _this._participants = new Map();
-    _this._participantsEntity = new Participants(_assertThisInitialized__default['default'](_this), _this._participants, participantsLinks, _this._configuration, _this._services);
+    _this._participantsEntity = new Participants(_assertThisInitialized__default["default"](_this), _this._participants, participantsLinks, _this._configuration, _this._services);
 
     _this._participantsEntity.on("participantJoined", function (participant) {
       return _this.emit("participantJoined", participant);
@@ -4294,7 +4298,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       return _this.emit("participantUpdated", args);
     });
 
-    _this._messagesEntity = new Messages(_assertThisInitialized__default['default'](_this), configuration, services);
+    _this._messagesEntity = new Messages(_assertThisInitialized__default["default"](_this), configuration, services);
 
     _this._messagesEntity.on("messageAdded", function (message) {
       return _this._onMessageAdded(message);
@@ -4315,7 +4319,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
    */
 
 
-  _createClass__default['default'](Conversation, [{
+  _createClass__default["default"](Conversation, [{
     key: "uniqueName",
     get: function get() {
       return this._internalState.uniqueName;
@@ -4461,8 +4465,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
      * @returns The added participant.
      */
     function () {
-      var _add = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(identity, attributes) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+      var _add = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(identity, attributes) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -4495,11 +4499,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "addNonChatParticipant",
     value: function () {
-      var _addNonChatParticipant = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(proxyAddress, address) {
+      var _addNonChatParticipant = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(proxyAddress, address) {
         var attributes,
             bindingOptions,
             _args2 = arguments;
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -4533,10 +4537,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "advanceLastReadMessageIndex",
     value: function () {
-      var _advanceLastReadMessageIndex = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(index) {
+      var _advanceLastReadMessageIndex = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(index) {
         var _this$lastReadMessage;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -4583,8 +4587,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "delete",
     value: function () {
-      var _delete2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+      var _delete2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
@@ -4615,8 +4619,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getAttributes",
     value: function () {
-      var _getAttributes = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+      var _getAttributes = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
@@ -4655,8 +4659,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getMessages",
     value: function () {
-      var _getMessages = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(pageSize, anchor, direction) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+      var _getMessages = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(pageSize, anchor, direction) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
@@ -4687,8 +4691,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipants",
     value: function () {
-      var _getParticipants = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+      var _getParticipants = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
               case 0:
@@ -4727,11 +4731,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipantsCount",
     value: function () {
-      var _getParticipantsCount = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8() {
+      var _getParticipantsCount = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8() {
         var _response$body$partic;
 
         var url, response;
-        return _regeneratorRuntime__default['default'].wrap(function _callee8$(_context8) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) {
             switch (_context8.prev = _context8.next) {
               case 0:
@@ -4765,8 +4769,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipantBySid",
     value: function () {
-      var _getParticipantBySid = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee9(participantSid) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee9$(_context9) {
+      var _getParticipantBySid = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(participantSid) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
           while (1) {
             switch (_context9.prev = _context9.next) {
               case 0:
@@ -4794,10 +4798,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipantByIdentity",
     value: function () {
-      var _getParticipantByIdentity = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee10() {
+      var _getParticipantByIdentity = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10() {
         var identity,
             _args10 = arguments;
-        return _regeneratorRuntime__default['default'].wrap(function _callee10$(_context10) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
           while (1) {
             switch (_context10.prev = _context10.next) {
               case 0:
@@ -4833,11 +4837,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getMessagesCount",
     value: function () {
-      var _getMessagesCount = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee11() {
+      var _getMessagesCount = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11() {
         var _response$body$messag;
 
         var url, response;
-        return _regeneratorRuntime__default['default'].wrap(function _callee11$(_context11) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
           while (1) {
             switch (_context11.prev = _context11.next) {
               case 0:
@@ -4883,9 +4887,9 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getUnreadMessagesCount",
     value: function () {
-      var _getUnreadMessagesCount = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee12() {
+      var _getUnreadMessagesCount = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12() {
         var url, response, unreadMessageCount;
-        return _regeneratorRuntime__default['default'].wrap(function _callee12$(_context12) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
           while (1) {
             switch (_context12.prev = _context12.next) {
               case 0:
@@ -4937,8 +4941,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "join",
     value: function () {
-      var _join = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee13() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee13$(_context13) {
+      var _join = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee13() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context13) {
           while (1) {
             switch (_context13.prev = _context13.next) {
               case 0:
@@ -4971,8 +4975,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "leave",
     value: function () {
-      var _leave = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee14() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee14$(_context14) {
+      var _leave = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context14) {
           while (1) {
             switch (_context14.prev = _context14.next) {
               case 0:
@@ -5007,14 +5011,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
      * @param participant Identity, SID or the participant object to remove.
      */
 
-    /* eslint-disable @typescript-eslint/ban-ts-comment */
-    // @ts-ignore TODO: fix validateTypesAsync typing
-
   }, {
     key: "removeParticipant",
     value: function () {
-      var _removeParticipant = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee15(participant) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee15$(_context15) {
+      var _removeParticipant = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee15(participant) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee15$(_context15) {
           while (1) {
             switch (_context15.prev = _context15.next) {
               case 0:
@@ -5048,12 +5049,12 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "sendMessage",
     value: function () {
-      var _sendMessage = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee16(message, messageAttributes, emailOptions) {
+      var _sendMessage = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(message, messageAttributes, emailOptions) {
         var _parseToNumber2;
 
         var _parseToNumber, _response, response;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee16$(_context16) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
           while (1) {
             switch (_context16.prev = _context16.next) {
               case 0:
@@ -5111,9 +5112,9 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "setAllMessagesRead",
     value: function () {
-      var _setAllMessagesRead = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee17() {
+      var _setAllMessagesRead = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee17() {
         var messagesPage;
-        return _regeneratorRuntime__default['default'].wrap(function _callee17$(_context17) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee17$(_context17) {
           while (1) {
             switch (_context17.prev = _context17.next) {
               case 0:
@@ -5159,8 +5160,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "setAllMessagesUnread",
     value: function () {
-      var _setAllMessagesUnread = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee18() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee18$(_context18) {
+      var _setAllMessagesUnread = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee18() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee18$(_context18) {
           while (1) {
             switch (_context18.prev = _context18.next) {
               case 0:
@@ -5196,8 +5197,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "setUserNotificationLevel",
     value: function () {
-      var _setUserNotificationLevel = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee19(notificationLevel) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee19$(_context19) {
+      var _setUserNotificationLevel = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee19(notificationLevel) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee19$(_context19) {
           while (1) {
             switch (_context19.prev = _context19.next) {
               case 0:
@@ -5240,8 +5241,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "updateAttributes",
     value: function () {
-      var _updateAttributes = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee20(attributes) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee20$(_context20) {
+      var _updateAttributes = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee20(attributes) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee20$(_context20) {
           while (1) {
             switch (_context20.prev = _context20.next) {
               case 0:
@@ -5275,8 +5276,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "updateFriendlyName",
     value: function () {
-      var _updateFriendlyName = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee21(friendlyName) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee21$(_context21) {
+      var _updateFriendlyName = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee21(friendlyName) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee21$(_context21) {
           while (1) {
             switch (_context21.prev = _context21.next) {
               case 0:
@@ -5317,8 +5318,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "updateLastReadMessageIndex",
     value: function () {
-      var _updateLastReadMessageIndex = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee22(index) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee22$(_context22) {
+      var _updateLastReadMessageIndex = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee22(index) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee22$(_context22) {
           while (1) {
             switch (_context22.prev = _context22.next) {
               case 0:
@@ -5351,8 +5352,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "updateUniqueName",
     value: function () {
-      var _updateUniqueName = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee23(uniqueName) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee23$(_context23) {
+      var _updateUniqueName = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee23(uniqueName) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee23$(_context23) {
           while (1) {
             switch (_context23.prev = _context23.next) {
               case 0:
@@ -5394,10 +5395,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_subscribe",
     value: function () {
-      var _subscribe2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee24() {
+      var _subscribe2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee24() {
         var _this2 = this;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee24$(_context24) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee24$(_context24) {
           while (1) {
             switch (_context24.prev = _context24.next) {
               case 0:
@@ -5471,10 +5472,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_subscribeStreams",
     value: function () {
-      var _subscribeStreams2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee25() {
+      var _subscribeStreams2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee25() {
         var _this$_entity, _this$_entity2, data, messagesObjectName, rosterObjectName;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee25$(_context25) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee25$(_context25) {
           while (1) {
             switch (_context25.prev = _context25.next) {
               case 0:
@@ -5529,8 +5530,8 @@ 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 _callee26() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee26$(_context26) {
           while (1) {
             switch (_context26.prev = _context26.next) {
               case 0:
@@ -5637,7 +5638,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             break;
 
           case fieldMappings.attributes:
-            if (isEqual__default['default'](this._internalState.attributes, update.attributes)) {
+            if (isEqual__default["default"](this._internalState.attributes, update.attributes)) {
               break;
             }
 
@@ -5673,7 +5674,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
               updateReasons.add(localKey);
             }
 
-            if (isEqual__default['default'](this._internalState.lastMessage, {})) {
+            if (isEqual__default["default"](this._internalState.lastMessage, {})) {
               delete this._internalState.lastMessage;
             }
 
@@ -5686,7 +5687,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
               state.dateUpdated = new Date(state.dateUpdated);
             }
 
-            if (isEqual__default['default'](this._internalState.state, state)) {
+            if (isEqual__default["default"](this._internalState.state, state)) {
               break;
             }
 
@@ -5695,7 +5696,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             break;
 
           case fieldMappings.bindings:
-            if (isEqual__default['default'](this._internalState.bindings, update.bindings)) {
+            if (isEqual__default["default"](this._internalState.bindings, update.bindings)) {
               break;
             }
 
@@ -5720,7 +5721,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       if (updateReasons.size > 0) {
         this.emit("updated", {
           conversation: this,
-          updateReasons: _toConsumableArray__default['default'](updateReasons)
+          updateReasons: _toConsumableArray__default["default"](updateReasons)
         });
       }
     }
@@ -5760,9 +5761,9 @@ 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 _callee27(index) {
         var result;
-        return _regeneratorRuntime__default['default'].wrap(function _callee27$(_context27) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee27$(_context27) {
           while (1) {
             switch (_context27.prev = _context27.next) {
               case 0:
@@ -5835,27 +5836,27 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   return Conversation;
 }(replayEventEmitter.ReplayEventEmitter);
 
-_defineProperty__default['default'](Conversation, "participantJoined", "participantJoined");
+_defineProperty__default["default"](Conversation, "participantJoined", "participantJoined");
 
-_defineProperty__default['default'](Conversation, "participantLeft", "participantLeft");
+_defineProperty__default["default"](Conversation, "participantLeft", "participantLeft");
 
-_defineProperty__default['default'](Conversation, "participantUpdated", "participantUpdated");
+_defineProperty__default["default"](Conversation, "participantUpdated", "participantUpdated");
 
-_defineProperty__default['default'](Conversation, "messageAdded", "messageAdded");
+_defineProperty__default["default"](Conversation, "messageAdded", "messageAdded");
 
-_defineProperty__default['default'](Conversation, "messageRemoved", "messageRemoved");
+_defineProperty__default["default"](Conversation, "messageRemoved", "messageRemoved");
 
-_defineProperty__default['default'](Conversation, "messageUpdated", "messageUpdated");
+_defineProperty__default["default"](Conversation, "messageUpdated", "messageUpdated");
 
-_defineProperty__default['default'](Conversation, "typingEnded", "typingEnded");
+_defineProperty__default["default"](Conversation, "typingEnded", "typingEnded");
 
-_defineProperty__default['default'](Conversation, "typingStarted", "typingStarted");
+_defineProperty__default["default"](Conversation, "typingStarted", "typingStarted");
 
-_defineProperty__default['default'](Conversation, "updated", "updated");
+_defineProperty__default["default"](Conversation, "updated", "updated");
 
-_defineProperty__default['default'](Conversation, "removed", "removed");
+_defineProperty__default["default"](Conversation, "removed", "removed");
 
-_defineProperty__default['default'](Conversation, "_logger", Logger.scope("Conversation"));
+_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);
 
@@ -5871,10 +5872,7 @@ __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator
 
 __decorate([declarativeTypeValidator.validateTypesAsync([declarativeTypeValidator.nonEmptyString, Participant]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "removeParticipant", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(["string",
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-// @ts-ignore TODO: fix validateTypesAsync typing
-FormData, declarativeTypeValidator.literal(null), declarativeTypeValidator.objectSchema("media options", {
+__decorate([declarativeTypeValidator.validateTypesAsync(["string", FormData, declarativeTypeValidator.literal(null), declarativeTypeValidator.objectSchema("media options", {
   contentType: declarativeTypeValidator.nonEmptyString,
   media: declarativeTypeValidator.custom(function (value) {
     var isValid = typeof value === "string" && value.length > 0 || value instanceof Uint8Array || value instanceof ArrayBuffer;
@@ -5903,7 +5901,7 @@ var Deferred = /*#__PURE__*/function () {
   function Deferred() {
     var _this = this;
 
-    _classCallCheck__default['default'](this, Deferred);
+    _classCallCheck__default["default"](this, Deferred);
 
     this._promise = new Promise(function (resolve, reject) {
       _this._resolve = resolve;
@@ -5911,7 +5909,7 @@ var Deferred = /*#__PURE__*/function () {
     });
   }
 
-  _createClass__default['default'](Deferred, [{
+  _createClass__default["default"](Deferred, [{
     key: "promise",
     get: function get() {
       return this._promise;
@@ -5944,11 +5942,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 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 ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$2(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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$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$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; } }
 var log$1 = Logger.scope("Conversations");
@@ -5958,38 +5956,38 @@ var log$1 = Logger.scope("Conversations");
  */
 
 var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
-  _inherits__default['default'](Conversations, _ReplayEventEmitter);
+  _inherits__default["default"](Conversations, _ReplayEventEmitter);
 
   var _super = _createSuper$2(Conversations);
 
   function Conversations(configuration, services) {
     var _this;
 
-    _classCallCheck__default['default'](this, Conversations);
+    _classCallCheck__default["default"](this, Conversations);
 
     _this = _super.call(this);
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "conversations", new Map());
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "conversations", new Map());
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "myConversationsRead", new Deferred());
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "myConversationsRead", new Deferred());
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "tombstones", new Set());
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "tombstones", new Set());
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "myConversationsFetched", false);
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "myConversationsFetched", false);
 
     _this.configuration = configuration;
     _this.services = services;
     return _this;
   }
 
-  _createClass__default['default'](Conversations, [{
+  _createClass__default["default"](Conversations, [{
     key: "addConversation",
     value: function () {
-      var _addConversation = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(options) {
+      var _addConversation = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(options) {
         var _response$sid, _response$sync_object, _response$sync_object2;
 
         var attributes, response, conversationSid, conversationDocument, links, existingConversation, conversation;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -6065,12 +6063,12 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "fetchConversations",
     value: function () {
-      var _fetchConversations = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+      var _fetchConversations = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
         var _this2 = this;
 
         var map, myConversations, upserts, _iterator, _step, conversation, errorMessage;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -6174,11 +6172,11 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getConversations",
     value: function () {
-      var _getConversations = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
+      var _getConversations = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3() {
         var _this3 = this;
 
         var conversationsMap, page;
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -6215,11 +6213,11 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getConversation",
     value: function () {
-      var _getConversation = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(sid) {
+      var _getConversation = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(sid) {
         var _this4 = this;
 
         var conversationsMap, page, items;
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
@@ -6257,9 +6255,9 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getConversationByUniqueName",
     value: function () {
-      var _getConversationByUniqueName = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(uniqueName) {
+      var _getConversationByUniqueName = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(uniqueName) {
         var url, response, body, sid, data;
-        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
@@ -6304,9 +6302,9 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "peekConversation",
     value: function () {
-      var _peekConversation = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(sid) {
+      var _peekConversation = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(sid) {
         var url, response, body, data;
-        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
@@ -6350,8 +6348,8 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_getMap",
     value: function () {
-      var _getMap2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+      var _getMap2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
               case 0:
@@ -6381,11 +6379,11 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_wrapPaginator",
     value: function () {
-      var _wrapPaginator2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8(page, op) {
+      var _wrapPaginator2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(page, op) {
         var _this5 = this;
 
         var items;
-        return _regeneratorRuntime__default['default'].wrap(function _callee8$(_context8) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) {
             switch (_context8.prev = _context8.next) {
               case 0:
@@ -6427,9 +6425,9 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_updateConversation",
     value: function () {
-      var _updateConversation2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee9(source, conversation, data) {
+      var _updateConversation2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(source, conversation, data) {
         var areSourcesDifferent, isChannelSourceSync, updateData;
-        return _regeneratorRuntime__default['default'].wrap(function _callee9$(_context9) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
           while (1) {
             switch (_context9.prev = _context9.next) {
               case 0:
@@ -6466,7 +6464,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   updateData.lastConsumedMessageIndex = data.lastConsumedMessageIndex;
                 }
 
-                if (!isEqual__default['default'](updateData, {})) {
+                if (!isEqual__default["default"](updateData, {})) {
                   conversation._update(updateData);
                 }
 
@@ -6526,9 +6524,9 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_upsertConversation",
     value: function () {
-      var _upsertConversation2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee10(source, sid, data) {
+      var _upsertConversation2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(source, sid, data) {
         var conversation, baseLink, links, newConversation;
-        return _regeneratorRuntime__default['default'].wrap(function _callee10$(_context10) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
           while (1) {
             switch (_context10.prev = _context10.next) {
               case 0:
@@ -6604,10 +6602,10 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_fetchMyConversations",
     value: function () {
-      var _fetchMyConversations2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee11() {
+      var _fetchMyConversations2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11() {
         var conversations, pageToken, _response$body, url, response, receivedConversations;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee11$(_context11) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
           while (1) {
             switch (_context11.prev = _context11.next) {
               case 0:
@@ -6639,7 +6637,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   };
                 });
                 pageToken = response.body.meta.next_token;
-                conversations = [].concat(_toConsumableArray__default['default'](conversations), _toConsumableArray__default['default'](receivedConversations));
+                conversations = [].concat(_toConsumableArray__default["default"](conversations), _toConsumableArray__default["default"](receivedConversations));
 
               case 10:
                 if (pageToken) {
@@ -6715,7 +6713,7 @@ 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$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; } }
 /**
@@ -6723,14 +6721,14 @@ function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !
  */
 
 var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
-  _inherits__default['default'](Users, _ReplayEventEmitter);
+  _inherits__default["default"](Users, _ReplayEventEmitter);
 
   var _super = _createSuper$1(Users);
 
   function Users(myself, configuration, services) {
     var _this;
 
-    _classCallCheck__default['default'](this, Users);
+    _classCallCheck__default["default"](this, Users);
 
     _this = _super.call(this);
     _this.configuration = configuration;
@@ -6756,7 +6754,7 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
     return _this;
   }
 
-  _createClass__default['default'](Users, [{
+  _createClass__default["default"](Users, [{
     key: "handleUnsubscribeUser",
     value: function handleUnsubscribeUser(user) {
       if (this.subscribedUsers.has(user.identity)) {
@@ -6806,12 +6804,12 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getUser",
     value: function () {
-      var _getUser = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(identity, entityName) {
+      var _getUser = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(identity, entityName) {
         var _entityName,
             _this2 = this;
 
         var user, newUser;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -6889,9 +6887,9 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getSubscribedUsers",
     value: function () {
-      var _getSubscribedUsers = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+      var _getSubscribedUsers = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
         var users;
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -6926,11 +6924,11 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getSyncUniqueName",
     value: function () {
-      var _getSyncUniqueName = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(identity) {
+      var _getSyncUniqueName = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(identity) {
         var _response$body$sync_o, _response$body;
 
         var url, response;
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -6982,7 +6980,7 @@ var log = Logger.scope("TypingIndicator");
 
 var TypingIndicator = /*#__PURE__*/function () {
   function TypingIndicator(getConversation, config, services) {
-    _classCallCheck__default['default'](this, TypingIndicator);
+    _classCallCheck__default["default"](this, TypingIndicator);
 
     this.configuration = config;
     this.services = services;
@@ -6991,7 +6989,7 @@ var TypingIndicator = /*#__PURE__*/function () {
     this.sentUpdates = new Map();
   }
 
-  _createClass__default['default'](TypingIndicator, [{
+  _createClass__default["default"](TypingIndicator, [{
     key: "typingTimeout",
     get: function get() {
       return this.configuration.typingIndicatorTimeoutOverride || this.serviceTypingTimeout || this.configuration.typingIndicatorTimeoutDefault;
@@ -7009,8 +7007,8 @@ var TypingIndicator = /*#__PURE__*/function () {
 
       // this.services.notificationClient.subscribe(NotificationTypes.TYPING_INDICATOR, 'twilsock');
       this.services.notificationClient.on("message", /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(type, message) {
-          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(type, message) {
+          return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
@@ -7042,10 +7040,10 @@ var TypingIndicator = /*#__PURE__*/function () {
   }, {
     key: "_handleRemoteTyping",
     value: function () {
-      var _handleRemoteTyping2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(message) {
+      var _handleRemoteTyping2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(message) {
         var _this2 = this;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -7128,7 +7126,7 @@ var TypingIndicator = /*#__PURE__*/function () {
 /**
  * Push notification for a Conversations client.
  */
-var PushNotification =
+var PushNotification = /*#__PURE__*/_createClass__default["default"](
 /**
  * Title of the notification.
  */
@@ -7161,7 +7159,7 @@ var PushNotification =
  * @internal
  */
 function PushNotification(data) {
-  _classCallCheck__default['default'](this, PushNotification);
+  _classCallCheck__default["default"](this, PushNotification);
 
   this.title = data.title || null;
   this.body = data.body || null;
@@ -7170,13 +7168,13 @@ function PushNotification(data) {
   this.action = data.action || null;
   this.type = data.type || null;
   this.data = data.data || {};
-};
+});
 
-var version = "3.0.0-rc.2";
+var version = "3.0.0-rc.5";
 
-function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$1(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var trimSlashes = function trimSlashes(url) {
   return url.replace(/(^\/+|\/+$)/g, "");
@@ -7188,14 +7186,14 @@ var isMutationConflictResponse = function isMutationConflictResponse(response) {
 
 var CommandExecutor = /*#__PURE__*/function () {
   function CommandExecutor(_serviceUrl, _services, _productId) {
-    _classCallCheck__default['default'](this, CommandExecutor);
+    _classCallCheck__default["default"](this, CommandExecutor);
 
     this._serviceUrl = _serviceUrl;
     this._services = _services;
     this._productId = _productId;
   }
 
-  _createClass__default['default'](CommandExecutor, [{
+  _createClass__default["default"](CommandExecutor, [{
     key: "_preProcessUrl",
     value: function _preProcessUrl(url) {
       var trimmedUrl = trimSlashes(url);
@@ -7209,9 +7207,9 @@ var CommandExecutor = /*#__PURE__*/function () {
   }, {
     key: "_makeRequest",
     value: function () {
-      var _makeRequest2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(method, url, requestBody, headers) {
+      var _makeRequest2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(method, url, requestBody, headers) {
         var preProcessedUrl, finalHeaders, response, getUrl;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -7283,11 +7281,11 @@ 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 _callee2(url, requestBody) {
         var _this = this;
 
         var maxAttemptsCount, result;
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -7328,9 +7326,9 @@ 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 _callee3(method, url, requestBody) {
         var result;
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -7375,13 +7373,13 @@ var CommandExecutor = /*#__PURE__*/function () {
   return CommandExecutor;
 }();
 
-var _class, _temp;
+var _class;
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); 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(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); 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() { 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; } }
 
@@ -7390,16 +7388,16 @@ var Client_1;
  * Client services.
  */
 
-var ClientServices = function ClientServices() {
-  _classCallCheck__default['default'](this, ClientServices);
-};
+var ClientServices = /*#__PURE__*/_createClass__default["default"](function ClientServices() {
+  _classCallCheck__default["default"](this, ClientServices);
+});
 /**
  * A client is the starting point to the Twilio Conversations functionality.
  */
 
 
-exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEventEmitter) {
-  _inherits__default['default'](Client, _ReplayEventEmitter);
+exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter) {
+  _inherits__default["default"](Client, _ReplayEventEmitter);
 
   var _super = _createSuper(Client);
 
@@ -7647,15 +7645,15 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-    _classCallCheck__default['default'](this, Client);
+    _classCallCheck__default["default"](this, Client);
 
     _this = _super.call(this);
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "version", version);
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "version", version);
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "connectionState", "unknown");
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "connectionState", "unknown");
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "parsePushNotification", Client_1.parsePushNotification);
+    _defineProperty__default["default"](_assertThisInitialized__default["default"](_this), "parsePushNotification", Client_1.parsePushNotification);
 
     _this._fpaToken = fpaToken !== null && fpaToken !== void 0 ? fpaToken : "";
     _this._options = options !== null && options !== void 0 ? options : {};
@@ -7763,11 +7761,16 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
     _this._services.twilsockClient.onceWithReplay("connectionError", emitFailed);
 
-    _this._services.twilsockClient.onceWithReplay("disconnected", emitFailed);
+    _this._services.twilsockClient.onceWithReplay("disconnected", function () {
+      return emitFailed({
+        terminal: true,
+        message: "Twilsock has disconnected."
+      });
+    });
 
-    _this._services.twilsockClient.onceWithReplay("connected", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-      var startupEvent;
-      return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+    _this._services.twilsockClient.onceWithReplay("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) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -7788,22 +7791,26 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
             case 8:
               _this._services.twilsockClient.addPartialTelemetryEvent(new twilsock.TelemetryEventDescription("", "", new Date()), startupEvent, twilsock.TelemetryPoint.End);
 
-              _context.next = 15;
+              _context.next = 16;
               break;
 
             case 11:
               _context.prev = 11;
               _context.t0 = _context["catch"](3);
-
               // Fail ChatClient if initialization is incomplete
-              _this._rejectEnsureReady(_context.t0);
+              connectionError = {
+                terminal: true,
+                message: _context.t0.message
+              };
+
+              _this._rejectEnsureReady(connectionError);
 
               _this.emit("stateChanged", {
                 state: "failed",
-                error: _context.t0
+                error: connectionError
               });
 
-            case 15:
+            case 16:
             case "end":
               return _context.stop();
           }
@@ -7831,7 +7838,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
    */
 
 
-  _createClass__default['default'](Client, [{
+  _createClass__default["default"](Client, [{
     key: "user",
     get: function get() {
       return this._myself;
@@ -7877,8 +7884,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
      * Gracefully shut down the client.
      */
     function () {
-      var _shutdown = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+      var _shutdown = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -7911,8 +7918,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "updateToken",
     value: function () {
-      var _updateToken = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(token) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+      var _updateToken = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(token) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
@@ -7967,9 +7974,9 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "getConversationBySid",
     value: function () {
-      var _getConversationBySid = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(conversationSid) {
+      var _getConversationBySid = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(conversationSid) {
         var conversation;
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
@@ -7992,7 +7999,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                   break;
                 }
 
-                throw new Error("Conversation with SID ".concat(conversationSid, " is not found."));
+                throw new Error("Conversation with SID ".concat(conversationSid, " was not found."));
 
               case 9:
                 return _context4.abrupt("return", conversation);
@@ -8020,9 +8027,9 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "peekConversationBySid",
     value: function () {
-      var _peekConversationBySid = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(conversationSid) {
+      var _peekConversationBySid = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(conversationSid) {
         var conversation;
-        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
@@ -8041,7 +8048,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                   break;
                 }
 
-                throw new Error("Conversation with SID ".concat(conversationSid, " is not found."));
+                throw new Error("Conversation with SID ".concat(conversationSid, " was not found."));
 
               case 7:
                 return _context5.abrupt("return", conversation);
@@ -8068,9 +8075,9 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "getConversationByUniqueName",
     value: function () {
-      var _getConversationByUniqueName = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(uniqueName) {
+      var _getConversationByUniqueName = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6(uniqueName) {
         var conversation;
-        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
@@ -8093,7 +8100,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                   break;
                 }
 
-                throw new Error("Conversation with unique name ".concat(uniqueName, " is not found."));
+                throw new Error("Conversation with unique name ".concat(uniqueName, " was not found."));
 
               case 9:
                 return _context6.abrupt("return", conversation);
@@ -8119,8 +8126,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "getSubscribedConversations",
     value: function () {
-      var _getSubscribedConversations = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+      var _getSubscribedConversations = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee7() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
               case 0:
@@ -8155,8 +8162,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "createConversation",
     value: function () {
-      var _createConversation = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8(options) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee8$(_context8) {
+      var _createConversation = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee8(options) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
           while (1) {
             switch (_context8.prev = _context8.next) {
               case 0:
@@ -8193,8 +8200,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "setPushRegistrationId",
     value: function () {
-      var _setPushRegistrationId = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee9(channelType, registrationId) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee9$(_context9) {
+      var _setPushRegistrationId = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(channelType, registrationId) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
           while (1) {
             switch (_context9.prev = _context9.next) {
               case 0:
@@ -8232,8 +8239,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "unsetPushRegistrationId",
     value: function () {
-      var _unsetPushRegistrationId = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee10(channelType) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee10$(_context10) {
+      var _unsetPushRegistrationId = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(channelType) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
           while (1) {
             switch (_context10.prev = _context10.next) {
               case 0:
@@ -8277,8 +8284,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "removePushRegistrations",
     value: function () {
-      var _removePushRegistrations = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee11(channelType, registrationId) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee11$(_context11) {
+      var _removePushRegistrations = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(channelType, registrationId) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context11) {
           while (1) {
             switch (_context11.prev = _context11.next) {
               case 0:
@@ -8312,8 +8319,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
      * @param notificationPayload Push notification payload
      */
     function () {
-      var _handlePushNotification = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee12(notificationPayload) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee12$(_context12) {
+      var _handlePushNotification = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(notificationPayload) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
           while (1) {
             switch (_context12.prev = _context12.next) {
               case 0:
@@ -8350,8 +8357,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "getUser",
     value: function () {
-      var _getUser = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee13(identity) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee13$(_context13) {
+      var _getUser = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee13(identity) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context13) {
           while (1) {
             switch (_context13.prev = _context13.next) {
               case 0:
@@ -8382,8 +8389,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "getSubscribedUsers",
     value: function () {
-      var _getSubscribedUsers = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee14() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee14$(_context14) {
+      var _getSubscribedUsers = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context14) {
           while (1) {
             switch (_context14.prev = _context14.next) {
               case 0:
@@ -8419,9 +8426,9 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
       var _this2 = this;
 
       return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee15(resolve, reject, onCancel) {
+        var _ref2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee15(resolve, reject, onCancel) {
           var request, urls;
-          return _regeneratorRuntime__default['default'].wrap(function _callee15$(_context15) {
+          return _regeneratorRuntime__default["default"].wrap(function _callee15$(_context15) {
             while (1) {
               switch (_context15.prev = _context15.next) {
                 case 0:
@@ -8490,11 +8497,11 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     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 _callee16() {
         var _this3 = this;
 
         var configurationResponse;
-        return _regeneratorRuntime__default['default'].wrap(function _callee16$(_context16) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
           while (1) {
             switch (_context16.prev = _context16.next) {
               case 0:
@@ -8647,9 +8654,9 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }], [{
     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 _callee17(token, options) {
         var client;
-        return _regeneratorRuntime__default['default'].wrap(function _callee17$(_context17) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee17$(_context17) {
           while (1) {
             switch (_context17.prev = _context17.next) {
               case 0:
@@ -8708,8 +8715,10 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         if (typeof apsPayload.alert === "string") {
           body = apsPayload.alert || null;
         } else {
-          body = apsPayload.alert.body || null;
-          title = apsPayload.alert.title || null;
+          var _apsPayload$alert, _apsPayload$alert2;
+
+          body = ((_apsPayload$alert = apsPayload.alert) === null || _apsPayload$alert === void 0 ? void 0 : _apsPayload$alert.body) || null;
+          title = ((_apsPayload$alert2 = apsPayload.alert) === null || _apsPayload$alert2 === void 0 ? void 0 : _apsPayload$alert2.title) || null;
         }
 
         return new PushNotification({
@@ -8804,7 +8813,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }]);
 
   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, "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",
@@ -8812,7 +8821,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   media_count: "mediaCount",
   media: "media" // object
 
-}), _temp);
+}), _class);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "updateToken", null);
 
@@ -8838,12 +8847,20 @@ __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "getUser", null);
 
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyArray("strings", "string")), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", mcsClient.CancellablePromise)], exports.Client.prototype, "getTemporaryContentUrlsForMediaSids", null);
+
+__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([declarativeTypeValidator.validateTypes(declarativeTypeValidator.pureObject), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", PushNotification)], exports.Client, "parsePushNotification", null);
 
 exports.Client = Client_1 = __decorate([declarativeTypeValidator.validateConstructorTypes(declarativeTypeValidator.nonEmptyString, [declarativeTypeValidator.pureObject, "undefined"]), __metadata("design:paramtypes", [String, Object])], exports.Client);
 
+Object.defineProperty(exports, 'CancellablePromise', {
+    enumerable: true,
+    get: function () { return mcsClient.CancellablePromise; }
+});
 exports.AggregatedDeliveryReceipt = AggregatedDeliveryReceipt;
 exports.Conversation = Conversation;
 exports.DetailedDeliveryReceipt = DetailedDeliveryReceipt;