@twilio/conversations 2.0.1 → 2.1.0-rc.6

package/builds/lib.js

@@ -163,6 +163,7 @@ require('core-js/modules/es.regexp.exec.js');
 require('core-js/modules/es.string.replace.js');
 require('core-js/modules/es.array.join.js');
 var declarativeTypeValidator = require('@twilio/declarative-type-validator');
+require('core-js/modules/es.array.includes.js');
 var replayEventEmitter = require('@twilio/replay-event-emitter');
 var isEqual = require('lodash.isequal');
 require('core-js/modules/es.array.slice.js');
@@ -178,7 +179,6 @@ var twilioSync = require('twilio-sync');
 var mcsClient = require('@twilio/mcs-client');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 require('core-js/modules/es.set.js');
-require('core-js/modules/es.array.includes.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.copy-within.js');
@@ -266,15 +266,15 @@ function prepareLine(prefix, args) {
   return ["".concat(new Date().toISOString(), " Conversations ").concat(prefix, ":")].concat(Array.from(args));
 }
 
-var log$9 = loglevelLog__namespace.getLogger('twilio-conversations'); // twilio-conversations is used by Flex SDK. Please DO NOT change
+var log$9 = loglevelLog__namespace.getLogger("twilio-conversations"); // twilio-conversations is used by Flex SDK. Please DO NOT change
 
 var Logger = /*#__PURE__*/function () {
   function Logger(prefix) {
     _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 + ' ' : '';
+    this.prefix = prefix !== null && prefix !== undefined && prefix.length > 0 ? prefix + " " : "";
   }
 
   _createClass__default['default'](Logger, [{
@@ -289,7 +289,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key] = arguments[_key];
       }
 
-      log$9.trace.apply(null, prepareLine(this.prefix + 'T', args));
+      log$9.trace.apply(null, prepareLine(this.prefix + "T", args));
     }
   }, {
     key: "debug",
@@ -298,7 +298,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key2] = arguments[_key2];
       }
 
-      log$9.debug.apply(null, prepareLine(this.prefix + 'D', args));
+      log$9.debug.apply(null, prepareLine(this.prefix + "D", args));
     }
   }, {
     key: "info",
@@ -307,7 +307,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key3] = arguments[_key3];
       }
 
-      log$9.info.apply(null, prepareLine(this.prefix + 'I', args));
+      log$9.info.apply(null, prepareLine(this.prefix + "I", args));
     }
   }, {
     key: "warn",
@@ -316,7 +316,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key4] = arguments[_key4];
       }
 
-      log$9.warn.apply(null, prepareLine(this.prefix + 'W', args));
+      log$9.warn.apply(null, prepareLine(this.prefix + "W", args));
     }
   }, {
     key: "error",
@@ -325,7 +325,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key5] = arguments[_key5];
       }
 
-      log$9.error.apply(null, prepareLine(this.prefix + 'E', args));
+      log$9.error.apply(null, prepareLine(this.prefix + "E", args));
     }
   }], [{
     key: "scope",
@@ -344,7 +344,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key6] = arguments[_key6];
       }
 
-      log$9.trace.apply(null, prepareLine('T', args));
+      log$9.trace.apply(null, prepareLine("T", args));
     }
   }, {
     key: "debug",
@@ -353,7 +353,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key7] = arguments[_key7];
       }
 
-      log$9.debug.apply(null, prepareLine('D', args));
+      log$9.debug.apply(null, prepareLine("D", args));
     }
   }, {
     key: "info",
@@ -362,7 +362,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key8] = arguments[_key8];
       }
 
-      log$9.info.apply(null, prepareLine('I', args));
+      log$9.info.apply(null, prepareLine("I", args));
     }
   }, {
     key: "warn",
@@ -371,7 +371,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key9] = arguments[_key9];
       }
 
-      log$9.warn.apply(null, prepareLine('W', args));
+      log$9.warn.apply(null, prepareLine("W", args));
     }
   }, {
     key: "error",
@@ -380,7 +380,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key10] = arguments[_key10];
       }
 
-      log$9.error.apply(null, prepareLine('E', args));
+      log$9.error.apply(null, prepareLine("E", args));
     }
   }]);
 
@@ -391,8 +391,8 @@ function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if
 
 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; }
 var TYPING_TIMEOUT = 5;
-var HTTP_CACHE_LIFETIME = 'PT5S';
-var CONSUMPTION_HORIZON_SENDING_INTERVAL = 'PT5S';
+var HTTP_CACHE_LIFETIME = "PT5S";
+var CONSUMPTION_HORIZON_SENDING_INTERVAL = "PT5S";
 var USER_INFOS_TO_SUBSCRIBE = 100;
 var MINIMUM_RETRY_DELAY = 1000;
 var MAXIMUM_RETRY_DELAY = 4000;
@@ -471,7 +471,7 @@ function deepClone(obj) {
 }
 
 function parseToNumber(value) {
-  if (typeof value !== 'undefined' && !isNaN(Number(value))) {
+  if (typeof value !== "undefined" && !isNaN(Number(value))) {
     return Number(value);
   }
 
@@ -510,7 +510,7 @@ var UriBuilder = /*#__PURE__*/function () {
   function UriBuilder(base) {
     _classCallCheck__default['default'](this, UriBuilder);
 
-    this.base = base.replace(/\/$/, '');
+    this.base = base.replace(/\/$/, "");
     this.args = [];
     this.paths = [];
   }
@@ -518,8 +518,8 @@ var UriBuilder = /*#__PURE__*/function () {
   _createClass__default['default'](UriBuilder, [{
     key: "arg",
     value: function arg(name, value) {
-      if (typeof value !== 'undefined') {
-        this.args.push(encodeURIComponent(name) + '=' + encodeURIComponent(value));
+      if (typeof value !== "undefined") {
+        this.args.push(encodeURIComponent(name) + "=" + encodeURIComponent(value));
       }
 
       return this;
@@ -536,11 +536,11 @@ var UriBuilder = /*#__PURE__*/function () {
       var result = this.base;
 
       if (this.paths.length) {
-        result += '/' + this.paths.join('/');
+        result += "/" + this.paths.join("/");
       }
 
       if (this.args.length) {
-        result += '?' + this.args.join('&');
+        result += "?" + this.args.join("&");
       }
 
       return result;
@@ -550,10 +550,17 @@ var UriBuilder = /*#__PURE__*/function () {
   return UriBuilder;
 }();
 
+var attributesValidator = declarativeTypeValidator.custom(function (value) {
+  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"];
+});
+
 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$8 = Logger.scope('User');
+var log$8 = Logger.scope("User");
 /**
  * Extended user information.
  * Note that `isOnline` and `isNotifiable` properties are eligible
@@ -578,14 +585,14 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
 
     _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';
+    _this.subscribed = "initializing";
 
     _this.setMaxListeners(0);
 
@@ -678,7 +685,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "isSubscribed",
     get: function get() {
-      return this.subscribed == 'subscribed';
+      return this.subscribed == "subscribed";
     } // Handles service updates
 
   }, {
@@ -695,14 +702,14 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 2:
                 updateReasons = [];
-                log$8.debug('User for', this.state.identity, 'updated:', key, value);
+                log$8.debug("User for", this.state.identity, "updated:", key, value);
                 _context.t0 = key;
-                _context.next = _context.t0 === 'friendlyName' ? 7 : _context.t0 === 'attributes' ? 9 : _context.t0 === 'reachability' ? 12 : 15;
+                _context.next = _context.t0 === "friendlyName" ? 7 : _context.t0 === "attributes" ? 9 : _context.t0 === "reachability" ? 12 : 15;
                 break;
 
               case 7:
                 if (this.state.friendlyName !== value.value) {
-                  updateReasons.push('friendlyName');
+                  updateReasons.push("friendlyName");
                   this.state.friendlyName = value.value;
                 }
 
@@ -713,7 +720,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
 
                 if (!isEqual__default['default'](this.state.attributes, updateAttributes)) {
                   this.state.attributes = updateAttributes;
-                  updateReasons.push('attributes');
+                  updateReasons.push("attributes");
                 }
 
                 return _context.abrupt("break", 16);
@@ -721,12 +728,12 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 12:
                 if (this.state.online !== value.online) {
                   this.state.online = value.online;
-                  updateReasons.push('reachabilityOnline');
+                  updateReasons.push("reachabilityOnline");
                 }
 
                 if (this.state.notifiable !== value.notifiable) {
                   this.state.notifiable = value.notifiable;
-                  updateReasons.push('reachabilityNotifiable');
+                  updateReasons.push("reachabilityNotifiable");
                 }
 
                 return _context.abrupt("break", 16);
@@ -736,7 +743,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 16:
                 if (updateReasons.length > 0) {
-                  this.emit('updated', {
+                  this.emit("updated", {
                     user: this,
                     updateReasons: updateReasons
                   });
@@ -779,8 +786,8 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return _context2.abrupt("return", Promise.resolve());
 
               case 4:
-                return _context2.abrupt("return", map.get('reachability').then(update).catch(function (err) {
-                  log$8.warn('Failed to get reachability info for ', _this2.state.identity, err);
+                return _context2.abrupt("return", map.get("reachability").then(update).catch(function (err) {
+                  log$8.warn("Failed to get reachability info for ", _this2.state.identity, err);
                 }));
 
               case 5:
@@ -822,26 +829,26 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 4:
                 this.promiseToFetch = this.services.syncClient.map({
                   id: this.state.entityName,
-                  mode: 'open_existing',
+                  mode: "open_existing",
                   includeItems: true
                 }).then(function (map) {
                   _this3.entity = map;
-                  map.on('itemUpdated', function (args) {
-                    log$8.debug(_this3.state.entityName + ' (' + _this3.state.identity + ') itemUpdated: ' + args.item.key);
+                  map.on("itemUpdated", function (args) {
+                    log$8.debug(_this3.state.entityName + " (" + _this3.state.identity + ") itemUpdated: " + args.item.key);
                     return _this3._update(args.item.key, args.item.data);
                   });
-                  return Promise.all([map.get('friendlyName').then(function (item) {
+                  return Promise.all([map.get("friendlyName").then(function (item) {
                     return _this3._update(item.key, item.data);
-                  }), map.get('attributes').then(function (item) {
+                  }), map.get("attributes").then(function (item) {
                     return _this3._update(item.key, item.data);
                   }), _this3._updateReachabilityInfo(map, function (item) {
                     return _this3._update(item.key, item.data);
                   })]);
                 }).then(function () {
-                  log$8.debug('Fetched for', _this3.identity);
-                  _this3.subscribed = 'subscribed';
+                  log$8.debug("Fetched for", _this3.identity);
+                  _this3.subscribed = "subscribed";
 
-                  _this3.emit('userSubscribed', _this3);
+                  _this3.emit("userSubscribed", _this3);
 
                   return _this3;
                 }).catch(function (err) {
@@ -909,16 +916,16 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return this._initializationPromise;
 
               case 2:
-                if (!(this.subscribed == 'unsubscribed')) {
+                if (!(this.subscribed == "unsubscribed")) {
                   _context5.next = 4;
                   break;
                 }
 
-                throw new Error('Can\'t modify unsubscribed object');
+                throw new Error("Can't modify unsubscribed object");
 
               case 4:
                 _context5.next = 6;
-                return this.services.commandExecutor.mutateResource('post', this.links.self, {
+                return this.services.commandExecutor.mutateResource("post", this.links.self, {
                   attributes: JSON.stringify(attributes)
                 });
 
@@ -956,16 +963,16 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return this._initializationPromise;
 
               case 2:
-                if (!(this.subscribed == 'unsubscribed')) {
+                if (!(this.subscribed == "unsubscribed")) {
                   _context6.next = 4;
                   break;
                 }
 
-                throw new Error('Can\'t modify unsubscribed object');
+                throw new Error("Can't modify unsubscribed object");
 
               case 4:
                 _context6.next = 6;
-                return this.services.commandExecutor.mutateResource('post', this.links.self, {
+                return this.services.commandExecutor.mutateResource("post", this.links.self, {
                   friendly_name: friendlyName
                 });
 
@@ -1014,8 +1021,8 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 5:
                 this.entity.close();
                 this.promiseToFetch = null;
-                this.subscribed = 'unsubscribed';
-                this.emit('userUnsubscribed', this);
+                this.subscribed = "unsubscribed";
+                this.emit("userUnsubscribed", this);
 
               case 9:
               case "end":
@@ -1044,9 +1051,9 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
       this._resolveInitializationPromise();
 
       if (emitUpdated) {
-        this.emit('updated', {
+        this.emit("updated", {
           user: this,
-          updateReasons: ['friendlyName', 'attributes', 'reachabilityOnline', 'reachabilityNotifiable']
+          updateReasons: ["friendlyName", "attributes", "reachabilityOnline", "reachabilityNotifiable"]
         });
       }
     }
@@ -1055,9 +1062,9 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
   return User;
 }(replayEventEmitter.ReplayEventEmitter);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(['string', 'number', 'boolean', 'object', declarativeTypeValidator.literal(null)]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], User.prototype, "updateAttributes", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(attributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], User.prototype, "updateAttributes", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(['string']), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], User.prototype, "updateFriendlyName", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(["string"]), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], User.prototype, "updateFriendlyName", null);
 
 function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
@@ -1130,13 +1137,13 @@ var Network = /*#__PURE__*/function () {
         }
 
         var retrier = new operationRetrier.Retrier(_this2.configuration.backoffConfiguration);
-        retrier.on('attempt', function () {
+        retrier.on("attempt", function () {
           request().then(function (result) {
             return retrier.succeeded(result);
           }).catch(function (err) {
             if (codesToRetryOn.indexOf(err.status) > -1) {
               retrier.failed(err);
-            } else if (err.message === 'Twilsock disconnected') {
+            } else if (err.message === "Twilsock disconnected") {
               // Ugly hack. We must make a proper exceptions for twilsock
               retrier.failed(err);
             } else {
@@ -1147,13 +1154,13 @@ var Network = /*#__PURE__*/function () {
             }
           });
         });
-        retrier.on('succeeded', function (result) {
+        retrier.on("succeeded", function (result) {
           resolve(result);
         });
-        retrier.on('cancelled', function (err) {
+        retrier.on("cancelled", function (err) {
           return reject(err);
         });
-        retrier.on('failed', function (err) {
+        retrier.on("failed", function (err) {
           return reject(err);
         });
         retrier.start();
@@ -1218,20 +1225,20 @@ var NotificationTypes = 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 _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$7 = Logger.scope('Participant');
+var log$7 = Logger.scope("Participant");
 /**
  * A participant represents a remote client in a conversation.
  */
@@ -1245,6 +1252,8 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
    * @internal
    */
   function Participant(data, sid, conversation, links, services) {
+    var _data$roleSid, _data$bindings;
+
     var _this;
 
     _classCallCheck__default['default'](this, Participant);
@@ -1254,22 +1263,23 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
     _this.links = links;
     _this.services = services;
     _this.state = {
-      attributes: parseAttributes(data.attributes, 'Retrieved malformed attributes from the server for participant: ' + sid, log$7),
+      attributes: parseAttributes(data.attributes, "Retrieved malformed attributes from the server for participant: " + sid, log$7),
       dateCreated: data.dateCreated ? parseTime$1(data.dateCreated) : null,
       dateUpdated: data.dateCreated ? parseTime$1(data.dateUpdated) : null,
       sid: sid,
       typingTimeout: null,
       isTyping: false,
-      identity: data.identity || null,
-      roleSid: data.roleSid || null,
+      identity: data.identity,
+      roleSid: (_data$roleSid = data.roleSid) !== null && _data$roleSid !== void 0 ? _data$roleSid : "",
       lastReadMessageIndex: Number.isInteger(data.lastConsumedMessageIndex) ? data.lastConsumedMessageIndex : null,
       lastReadTimestamp: data.lastConsumptionTimestamp ? parseTime$1(data.lastConsumptionTimestamp) : null,
-      type: data.type || 'chat',
-      userInfo: data.userInfo
+      type: data.type || "chat",
+      userInfo: data.userInfo,
+      bindings: (_data$bindings = data.bindings) !== null && _data$bindings !== void 0 ? _data$bindings : {}
     };
 
     if (!data.identity && !data.type) {
-      throw new Error('Received invalid Participant object from server: Missing identity or type of Participant.');
+      throw new Error("Received invalid Participant object from server: Missing identity or type of Participant.");
     }
 
     return _this;
@@ -1368,7 +1378,7 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
       return this.state.roleSid;
     }
     /**
-     * Message type of the participant.
+     * Type of the participant.
      */
 
   }, {
@@ -1376,6 +1386,23 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
     get: function get() {
       return this.state.type;
     }
+    /**
+     * Get the bindings mapping for the current participant.
+     * Available binding depends on the participant type.
+     * You could access it as `participant.bindings.sms?.address` or
+     * using the type dynamically `participant.bindings[participant.type]`
+     * just be aware that the binding information has different structure for
+     * each participant type.
+     * See also {ParticipantEmailBinding}, the only available currently binding descriptor.
+     */
+
+  }, {
+    key: "bindings",
+    get: function get() {
+      var _this$state$bindings;
+
+      return (_this$state$bindings = this.state.bindings) !== null && _this$state$bindings !== void 0 ? _this$state$bindings : {};
+    }
   }, {
     key: "_startTyping",
     value:
@@ -1386,13 +1413,16 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
     function _startTyping(timeout) {
       var _this2 = this;
 
-      clearTimeout(this.state.typingTimeout);
+      if (this.state.typingTimeout) {
+        clearTimeout(this.state.typingTimeout);
+      }
+
       this.state.isTyping = true;
-      this.emit('typingStarted', this);
-      this.conversation.emit('typingStarted', this);
-      this.state.typingTimeout = setTimeout(function () {
+      this.emit("typingStarted", this);
+      this.conversation.emit("typingStarted", this);
+      this.state.typingTimeout = Number(setTimeout(function () {
         return _this2._endTyping();
-      }, timeout);
+      }, timeout));
       return this;
     }
     /**
@@ -1408,8 +1438,8 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
       }
 
       this.state.isTyping = false;
-      this.emit('typingEnded', this);
-      this.conversation.emit('typingEnded', this);
+      this.emit("typingEnded", this);
+      this.conversation.emit("typingEnded", this);
       clearInterval(this.state.typingTimeout);
       this.state.typingTimeout = null;
     }
@@ -1422,35 +1452,35 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "_update",
     value: function _update(data) {
       var updateReasons = [];
-      var updateAttributes = parseAttributes(data.attributes, 'Retrieved malformed attributes from the server for participant: ' + this.state.sid, log$7);
+      var updateAttributes = parseAttributes(data.attributes, "Retrieved malformed attributes from the server for participant: " + this.state.sid, log$7);
 
       if (data.attributes && !isEqual__default['default'](this.state.attributes, updateAttributes)) {
         this.state.attributes = updateAttributes;
-        updateReasons.push('attributes');
+        updateReasons.push("attributes");
       }
 
       var updatedDateUpdated = parseTime$1(data.dateUpdated);
 
-      if (data.dateUpdated && updatedDateUpdated.getTime() !== (this.state.dateUpdated && this.state.dateUpdated.getTime())) {
+      if (data.dateUpdated && (updatedDateUpdated === null || updatedDateUpdated === void 0 ? void 0 : updatedDateUpdated.getTime()) !== (this.state.dateUpdated && this.state.dateUpdated.getTime())) {
         this.state.dateUpdated = updatedDateUpdated;
-        updateReasons.push('dateUpdated');
+        updateReasons.push("dateUpdated");
       }
 
       var updatedDateCreated = parseTime$1(data.dateCreated);
 
-      if (data.dateCreated && updatedDateCreated.getTime() !== (this.state.dateCreated && this.state.dateCreated.getTime())) {
+      if (data.dateCreated && (updatedDateCreated === null || updatedDateCreated === void 0 ? void 0 : updatedDateCreated.getTime()) !== (this.state.dateCreated && this.state.dateCreated.getTime())) {
         this.state.dateCreated = updatedDateCreated;
-        updateReasons.push('dateCreated');
+        updateReasons.push("dateCreated");
       }
 
       if (data.roleSid && this.state.roleSid !== data.roleSid) {
         this.state.roleSid = data.roleSid;
-        updateReasons.push('roleSid');
+        updateReasons.push("roleSid");
       }
 
       if ((Number.isInteger(data.lastConsumedMessageIndex) || data.lastConsumedMessageIndex === null) && this.state.lastReadMessageIndex !== data.lastConsumedMessageIndex) {
         this.state.lastReadMessageIndex = data.lastConsumedMessageIndex;
-        updateReasons.push('lastReadMessageIndex');
+        updateReasons.push("lastReadMessageIndex");
       }
 
       if (data.lastConsumptionTimestamp) {
@@ -1458,12 +1488,17 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
 
         if (!this.state.lastReadTimestamp || this.state.lastReadTimestamp.getTime() !== lastReadTimestamp.getTime()) {
           this.state.lastReadTimestamp = lastReadTimestamp;
-          updateReasons.push('lastReadTimestamp');
+          updateReasons.push("lastReadTimestamp");
         }
       }
 
+      if (data.bindings && !isEqual__default['default'](this.state.bindings, data.bindings)) {
+        this.state.bindings = data.bindings;
+        updateReasons.push("bindings");
+      }
+
       if (updateReasons.length > 0) {
-        this.emit('updated', {
+        this.emit("updated", {
           participant: this,
           updateReasons: updateReasons
         });
@@ -1483,12 +1518,12 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (!(this.type != 'chat')) {
+                if (!(this.type != "chat")) {
                   _context.next = 2;
                   break;
                 }
 
-                throw new Error('Getting User is not supported for this Participant type: ' + this.type);
+                throw new Error("Getting User is not supported for this Participant type: " + this.type);
 
               case 2:
                 return _context.abrupt("return", this.services.users.getUser(this.state.identity, this.state.userInfo));
@@ -1549,7 +1584,7 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context3.prev = _context3.next) {
               case 0:
                 _context3.next = 2;
-                return this.services.commandExecutor.mutateResource('post', this.links.self, {
+                return this.services.commandExecutor.mutateResource("post", this.links.self, {
                   attributes: JSON.stringify(attributes)
                 });
 
@@ -1575,18 +1610,18 @@ 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(['string', 'number', 'boolean', 'object', declarativeTypeValidator.literal(null)]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Participant.prototype, "updateAttributes", null);
+__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 _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$6 = Logger.scope('Participants');
+var log$6 = Logger.scope("Participants");
 /**
  * @classdesc Represents the collection of participants for the conversation
  * @fires Participants#participantJoined
@@ -1605,6 +1640,9 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
     _classCallCheck__default['default'](this, Participants);
 
     _this = _super.call(this);
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "rosterEntityPromise", null);
+
     _this.conversation = conversation;
     _this.participants = participants;
     _this.links = links;
@@ -1656,17 +1694,17 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       return this.rosterEntityPromise = this.rosterEntityPromise || this.services.syncClient.map({
         id: rosterObjectName,
-        mode: 'open_existing'
+        mode: "open_existing"
       }).then(function (rosterMap) {
-        rosterMap.on('itemAdded', function (args) {
-          log$6.debug(_this2.conversation.sid + ' itemAdded: ' + args.item.key);
+        rosterMap.on("itemAdded", function (args) {
+          log$6.debug(_this2.conversation.sid + " itemAdded: " + args.item.key);
 
           _this2.upsertParticipant(args.item.key, args.item.data).then(function (participant) {
-            _this2.emit('participantJoined', participant);
+            _this2.emit("participantJoined", participant);
           });
         });
-        rosterMap.on('itemRemoved', function (args) {
-          log$6.debug(_this2.conversation.sid + ' itemRemoved: ' + args.key);
+        rosterMap.on("itemRemoved", function (args) {
+          log$6.debug(_this2.conversation.sid + " itemRemoved: " + args.key);
           var participantSid = args.key;
 
           if (!_this2.participants.has(participantSid)) {
@@ -1677,19 +1715,22 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
 
           _this2.participants.delete(participantSid);
 
-          _this2.emit('participantLeft', leftParticipant);
+          if (!leftParticipant) {
+            return;
+          }
+
+          _this2.emit("participantLeft", leftParticipant);
         });
-        rosterMap.on('itemUpdated', function (args) {
-          log$6.debug(_this2.conversation.sid + ' itemUpdated: ' + args.item.key);
+        rosterMap.on("itemUpdated", function (args) {
+          log$6.debug(_this2.conversation.sid + " itemUpdated: " + args.item.key);
 
           _this2.upsertParticipant(args.item.key, args.item.data);
         });
         var participantsPromises = [];
-        var that = _this2;
 
         var rosterMapHandler = function rosterMapHandler(paginator) {
           paginator.items.forEach(function (item) {
-            participantsPromises.push(that.upsertParticipant(item.key, item.data));
+            participantsPromises.push(_this2.upsertParticipant(item.key, item.data));
           });
           return paginator.hasNextPage ? paginator.nextPage().then(rosterMapHandler) : null;
         };
@@ -1702,11 +1743,11 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
       }).catch(function (err) {
         _this2.rosterEntityPromise = null;
 
-        if (_this2.services.syncClient.connectionState != 'disconnected') {
-          log$6.error('Failed to get roster object for conversation', _this2.conversation.sid, err);
+        if (_this2.services.syncClient.connectionState != "disconnected") {
+          log$6.error("Failed to get roster object for conversation", _this2.conversation.sid, err);
         }
 
-        log$6.debug('ERROR: Failed to get roster object for conversation', _this2.conversation.sid, err);
+        log$6.debug("ERROR: Failed to get roster object for conversation", _this2.conversation.sid, err);
         throw err;
       });
     }
@@ -1736,8 +1777,8 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
                 };
                 participant = new Participant(data, participantSid, this.conversation, links, this.services);
                 this.participants.set(participantSid, participant);
-                participant.on('updated', function (args) {
-                  return _this3.emit('participantUpdated', args);
+                participant.on("updated", function (args) {
+                  return _this3.emit("participantUpdated", args);
                 });
                 return _context2.abrupt("return", participant);
 
@@ -1761,19 +1802,38 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
 
   }, {
     key: "getParticipants",
-    value: function getParticipants() {
-      var _this4 = this;
+    value: function () {
+      var _getParticipants = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
+        var _this4 = this;
 
-      return this.rosterEntityPromise.then(function () {
-        var participants = [];
+        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                return _context3.abrupt("return", this.rosterEntityPromise ? this.rosterEntityPromise.then(function () {
+                  var participants = [];
 
-        _this4.participants.forEach(function (participant) {
-          return participants.push(participant);
-        });
+                  _this4.participants.forEach(function (participant) {
+                    return participants.push(participant);
+                  });
 
-        return participants;
-      });
-    }
+                  return participants;
+                }) : []);
+
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function getParticipants() {
+        return _getParticipants.apply(this, arguments);
+      }
+
+      return getParticipants;
+    }()
     /**
      * Get participant by SID from conversation
      * @returns {Promise<Participant>}
@@ -1782,29 +1842,29 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipantBySid",
     value: function () {
-      var _getParticipantBySid = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(participantSid) {
+      var _getParticipantBySid = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(participantSid) {
         var _this5 = this;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                return _context3.abrupt("return", this.rosterEntityPromise.then(function () {
+                return _context4.abrupt("return", this.rosterEntityPromise ? this.rosterEntityPromise.then(function () {
                   var participant = _this5.participants.get(participantSid);
 
                   if (!participant) {
-                    throw new Error('Participant with SID ' + participantSid + ' was not found');
+                    throw new Error("Participant with SID " + participantSid + " was not found");
                   }
 
                   return participant;
-                }));
+                }) : null);
 
               case 1:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
 
       function getParticipantBySid(_x3) {
@@ -1821,16 +1881,16 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipantByIdentity",
     value: function () {
-      var _getParticipantByIdentity = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(identity) {
+      var _getParticipantByIdentity = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(identity) {
         var _this6 = this;
 
         var foundParticipant;
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
                 foundParticipant = null;
-                return _context4.abrupt("return", this.rosterEntityPromise.then(function () {
+                return _context5.abrupt("return", this.rosterEntityPromise ? this.rosterEntityPromise.then(function () {
                   _this6.participants.forEach(function (participant) {
                     if (participant.identity === identity) {
                       foundParticipant = participant;
@@ -1838,18 +1898,18 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
                   });
 
                   if (!foundParticipant) {
-                    throw new Error('Participant with identity ' + identity + ' was not found');
+                    throw new Error("Participant with identity " + identity + " was not found");
                   }
 
                   return foundParticipant;
-                }));
+                }) : null);
 
               case 2:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
 
       function getParticipantByIdentity(_x4) {
@@ -1860,32 +1920,32 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
     }()
     /**
      * Add a chat participant to the conversation
-     * @returns {Promise<any>}
+     * @returns {Promise<ParticipantResponse>}
      */
 
   }, {
     key: "add",
     value: function () {
-      var _add = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(identity, attributes) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+      var _add = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(identity, attributes) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
-                _context5.next = 2;
-                return this.services.commandExecutor.mutateResource('post', this.links.participants, {
+                _context6.next = 2;
+                return this.services.commandExecutor.mutateResource("post", this.links.participants, {
                   identity: identity,
-                  attributes: typeof attributes !== 'undefined' ? JSON.stringify(attributes) : undefined
+                  attributes: typeof attributes !== "undefined" ? JSON.stringify(attributes) : undefined
                 });
 
               case 2:
-                return _context5.abrupt("return", _context5.sent);
+                return _context6.abrupt("return", _context6.sent);
 
               case 3:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
 
       function add(_x5, _x6) {
@@ -1900,17 +1960,24 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
      * @param proxyAddress
      * @param address
      * @param attributes
+     * @param bindingOptions
      * @returns {Promise<any>}
      */
 
   }, {
     key: "addNonChatParticipant",
-    value: function addNonChatParticipant(proxyAddress, address, attributes) {
-      return this.services.commandExecutor.mutateResource('post', this.links.participants, {
-        attributes: typeof attributes !== 'undefined' ? JSON.stringify(attributes) : undefined,
+    value: function addNonChatParticipant(proxyAddress, address) {
+      var _bindingOptions$email, _bindingOptions$email2;
+
+      var attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var bindingOptions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+      return this.services.commandExecutor.mutateResource("post", this.links.participants, {
+        attributes: typeof attributes !== "undefined" ? JSON.stringify(attributes) : undefined,
         messaging_binding: {
           address: address,
-          proxy_address: proxyAddress
+          proxy_address: proxyAddress,
+          name: bindingOptions === null || bindingOptions === void 0 ? void 0 : (_bindingOptions$email = bindingOptions.email) === null || _bindingOptions$email === void 0 ? void 0 : _bindingOptions$email.name,
+          level: bindingOptions === null || bindingOptions === void 0 ? void 0 : (_bindingOptions$email2 = bindingOptions.email) === null || _bindingOptions$email2 === void 0 ? void 0 : _bindingOptions$email2.level
         }
       });
     }
@@ -1921,7 +1988,7 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "remove",
     value: function remove(identity) {
-      return this.services.commandExecutor.mutateResource('delete', "".concat(this.links.participants, "/").concat(identity));
+      return this.services.commandExecutor.mutateResource("delete", "".concat(this.links.participants, "/").concat(identity));
     }
   }]);
 
@@ -2032,6 +2099,8 @@ var Media = /*#__PURE__*/function () {
     key: "getContentTemporaryUrl",
     value: function () {
       var _getContentTemporaryUrl = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+        var _this$mcsMedia$getCon, _this$mcsMedia;
+
         return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -2040,7 +2109,7 @@ var Media = /*#__PURE__*/function () {
                 return this._fetchMcsMedia();
 
               case 2:
-                return _context.abrupt("return", this.mcsMedia.getContentUrl());
+                return _context.abrupt("return", (_this$mcsMedia$getCon = (_this$mcsMedia = this.mcsMedia) === null || _this$mcsMedia === void 0 ? void 0 : _this$mcsMedia.getContentUrl()) !== null && _this$mcsMedia$getCon !== void 0 ? _this$mcsMedia$getCon : null);
 
               case 3:
               case "end":
@@ -2070,6 +2139,8 @@ var Media = /*#__PURE__*/function () {
     key: "getCachedTemporaryUrl",
     value: function () {
       var _getCachedTemporaryUrl = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+        var _this$mcsMedia$getCac, _this$mcsMedia2;
+
         return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -2078,7 +2149,7 @@ var Media = /*#__PURE__*/function () {
                 return this._fetchMcsMedia();
 
               case 2:
-                return _context2.abrupt("return", this.mcsMedia.getCachedContentUrl());
+                return _context2.abrupt("return", (_this$mcsMedia$getCac = (_this$mcsMedia2 = this.mcsMedia) === null || _this$mcsMedia2 === void 0 ? void 0 : _this$mcsMedia2.getCachedContentUrl()) !== null && _this$mcsMedia$getCac !== void 0 ? _this$mcsMedia$getCac : null);
 
               case 3:
               case "end":
@@ -2121,7 +2192,7 @@ var Media = /*#__PURE__*/function () {
                 break;
 
               case 7:
-                throw new Error('Media Content Service is unavailable');
+                throw new Error("Media Content Service is unavailable");
 
               case 8:
               case "end":
@@ -2315,7 +2386,7 @@ var RestPaginator = /*#__PURE__*/function () {
   }, {
     key: "nextPage",
     value: function nextPage() {
-      return this.hasNextPage ? this.state.source(this.state.nextToken) : Promise.reject(new Error('No next page'));
+      return this.hasNextPage ? this.state.source(this.state.nextToken) : Promise.reject(new Error("No next page"));
     }
     /**
      * Request the previous page. Does not modify the existing object.
@@ -2324,7 +2395,7 @@ var RestPaginator = /*#__PURE__*/function () {
   }, {
     key: "prevPage",
     value: function prevPage() {
-      return this.hasPrevPage ? this.state.source(this.state.prevToken) : Promise.reject(new Error('No previous page'));
+      return this.hasPrevPage ? this.state.source(this.state.prevToken) : Promise.reject(new Error("No previous page"));
     }
   }]);
 
@@ -2383,7 +2454,7 @@ function DetailedDeliveryReceipt(descriptor) {
   this.conversationSid = descriptor.conversation_sid;
   this.channelMessageSid = descriptor.channel_message_sid;
   this.participantSid = descriptor.participant_sid;
-  this.status = descriptor.status || 'queued';
+  this.status = descriptor.status || "queued";
   this.errorCode = descriptor.error_code || 0;
   this.dateCreated = descriptor.date_created;
   this.dateUpdated = descriptor.date_updated;
@@ -2392,7 +2463,7 @@ function DetailedDeliveryReceipt(descriptor) {
 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$5 = Logger.scope('Message');
+var log$5 = Logger.scope("Message");
 /**
  * A message in a conversation.
  */
@@ -2410,7 +2481,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
    * @internal
    */
   function Message(index, data, conversation, links, configuration, services) {
-    var _data$author, _data$subject, _data$lastUpdatedBy, _data$type, _data$memberSid;
+    var _data$text, _data$lastUpdatedBy, _data$type, _data$memberSid;
 
     var _this;
 
@@ -2424,16 +2495,16 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
     _this.state = {
       sid: data.sid,
       index: index,
-      author: (_data$author = data.author) !== null && _data$author !== void 0 ? _data$author : null,
-      subject: (_data$subject = data.subject) !== null && _data$subject !== void 0 ? _data$subject : null,
-      body: data.text,
+      author: data.author,
+      subject: data.subject,
+      body: (_data$text = data.text) !== null && _data$text !== void 0 ? _data$text : null,
       timestamp: data.timestamp ? new Date(data.timestamp) : null,
       dateUpdated: data.dateUpdated ? new Date(data.dateUpdated) : null,
       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$5),
-      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) {
+      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) {
         return new Media(m, _this.services);
       }) : null,
       participantSid: (_data$memberSid = data.memberSid) !== null && _data$memberSid !== void 0 ? _data$memberSid : null,
@@ -2541,7 +2612,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       return this.state.attributes;
     }
     /**
-     * Push notification type of the message.
+     * Type of the message.
      */
 
   }, {
@@ -2550,7 +2621,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       return this.state.type;
     }
     /**
-     * One of the attached media.
+     * One of the attached media (if present).
      * @deprecated Use attachedMedia instead. Note that the latter is now an array.
      */
 
@@ -2566,7 +2637,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "attachedMedia",
     get: function get() {
-      return this.getMediaByCategory(['media']);
+      return this.getMediaByCategory(["media"]);
     }
     /**
      * The server-assigned unique identifier of the authoring participant.
@@ -2598,50 +2669,82 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
     value: function getMediaByCategory(categories) {
       var _this$state$medias;
 
-      return (_this$state$medias = this.state.medias) === null || _this$state$medias === void 0 ? void 0 : _this$state$medias.filter(function (m) {
+      return ((_this$state$medias = this.state.medias) !== null && _this$state$medias !== void 0 ? _this$state$medias : []).filter(function (m) {
         return categories.includes(m.category);
       });
     }
+    /**
+     * Get a media descriptor for an email body attachment of a provided type.
+     * Allowed body types are returned in the Conversation.limits().emailBodiesAllowedMimeTypes array.
+     * @param type Type of email body to request, defaults to `text/plain`.
+     */
+
+  }, {
+    key: "getEmailBody",
+    value: function getEmailBody() {
+      var _this$getMediaByCateg, _this$getMediaByCateg2;
+
+      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "text/plain";
+      return (_this$getMediaByCateg = (_this$getMediaByCateg2 = this.getMediaByCategory(["body"])) === null || _this$getMediaByCateg2 === void 0 ? void 0 : _this$getMediaByCateg2.filter(function (m) {
+        return m.contentType == type;
+      }).shift()) !== null && _this$getMediaByCateg !== void 0 ? _this$getMediaByCateg : null;
+    }
+    /**
+     * Get a media descriptor for an email history attachment of a provided type.
+     * Allowed body types are returned in the Conversation.limits().emailHistoriesAllowedMimeTypes array.
+     * @param type Type of email history to request, defaults to `text/plain`.
+     */
+
+  }, {
+    key: "getEmailHistory",
+    value: function getEmailHistory() {
+      var _this$getMediaByCateg3, _this$getMediaByCateg4;
+
+      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "text/plain";
+      return (_this$getMediaByCateg3 = (_this$getMediaByCateg4 = this.getMediaByCategory(["history"])) === null || _this$getMediaByCateg4 === void 0 ? void 0 : _this$getMediaByCateg4.filter(function (m) {
+        return m.contentType == type;
+      }).shift()) !== null && _this$getMediaByCateg3 !== void 0 ? _this$getMediaByCateg3 : null;
+    }
   }, {
     key: "_update",
     value: function _update(data) {
       var updateReasons = [];
 
-      if ((data.text || typeof data.text === 'string') && data.text !== this.state.body) {
+      if ((data.text || typeof data.text === "string") && data.text !== this.state.body) {
         this.state.body = data.text;
-        updateReasons.push('body');
+        updateReasons.push("body");
       }
 
       if (data.subject && data.subject !== this.state.subject) {
         this.state.subject = data.subject;
-        updateReasons.push('subject');
+        updateReasons.push("subject");
       }
 
       if (data.lastUpdatedBy && data.lastUpdatedBy !== this.state.lastUpdatedBy) {
         this.state.lastUpdatedBy = data.lastUpdatedBy;
-        updateReasons.push('lastUpdatedBy');
+        updateReasons.push("lastUpdatedBy");
       }
 
       if (data.author && data.author !== this.state.author) {
         this.state.author = data.author;
-        updateReasons.push('author');
+        updateReasons.push("author");
       }
 
       if (data.dateUpdated && new Date(data.dateUpdated).getTime() !== (this.state.dateUpdated && this.state.dateUpdated.getTime())) {
         this.state.dateUpdated = new Date(data.dateUpdated);
-        updateReasons.push('dateUpdated');
+        updateReasons.push("dateUpdated");
       }
 
       if (data.timestamp && new Date(data.timestamp).getTime() !== (this.state.timestamp && this.state.timestamp.getTime())) {
         this.state.timestamp = new Date(data.timestamp);
-        updateReasons.push('dateCreated');
+        updateReasons.push("dateCreated");
       }
 
       var updatedAttributes = parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(this.sid), log$5);
 
       if (!isEqual__default['default'](this.state.attributes, updatedAttributes)) {
         this.state.attributes = updatedAttributes;
-        updateReasons.push('attributes');
+        updateReasons.push("attributes");
       }
 
       var updatedAggregatedDelivery = data.delivery;
@@ -2651,16 +2754,16 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       if (isUpdatedAggregateDeliveryValid) {
         if (!currentAggregatedDelivery) {
           this.state.aggregatedDeliveryReceipt = new AggregatedDeliveryReceipt(updatedAggregatedDelivery);
-          updateReasons.push('deliveryReceipt');
+          updateReasons.push("deliveryReceipt");
         } else if (!currentAggregatedDelivery._isEquals(updatedAggregatedDelivery)) {
           currentAggregatedDelivery._update(updatedAggregatedDelivery);
 
-          updateReasons.push('deliveryReceipt');
+          updateReasons.push("deliveryReceipt");
         }
       }
 
       if (updateReasons.length > 0) {
-        this.emit('updated', {
+        this.emit("updated", {
           message: this,
           updateReasons: updateReasons
         });
@@ -2689,7 +2792,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
                 }
 
                 _context.next = 4;
-                return this.conversation.getParticipantBySid(this.participantSid).catch(function () {
+                return this.conversation.getParticipantBySid(this.state.participantSid).catch(function () {
                   log$5.debug("Participant with sid \"".concat(_this2.participantSid, "\" not found for message ").concat(_this2.sid));
                   return null;
                 });
@@ -2721,25 +2824,25 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return _context.abrupt("return", participant);
 
               case 11:
-                errorMesage = 'Participant with ';
+                errorMesage = "Participant with ";
 
                 if (this.state.participantSid) {
-                  errorMesage += 'SID \'' + this.state.participantSid + '\' ';
+                  errorMesage += "SID '" + this.state.participantSid + "' ";
                 }
 
                 if (this.state.author) {
                   if (this.state.participantSid) {
-                    errorMesage += 'or ';
+                    errorMesage += "or ";
                   }
 
-                  errorMesage += 'identity \'' + this.state.author + '\' ';
+                  errorMesage += "identity '" + this.state.author + "' ";
                 }
 
-                if (errorMesage === 'Participant with ') {
-                  errorMesage = 'Participant ';
+                if (errorMesage === "Participant with ") {
+                  errorMesage = "Participant ";
                 }
 
-                errorMesage += 'was not found';
+                errorMesage += "was not found";
                 throw new Error(errorMesage);
 
               case 17:
@@ -2826,7 +2929,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context3.prev = _context3.next) {
               case 0:
                 _context3.next = 2;
-                return this.services.commandExecutor.mutateResource('delete', this.links.self);
+                return this.services.commandExecutor.mutateResource("delete", this.links.self);
 
               case 2:
                 return _context3.abrupt("return", this);
@@ -2859,7 +2962,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context4.prev = _context4.next) {
               case 0:
                 _context4.next = 2;
-                return this.services.commandExecutor.mutateResource('post', this.links.self, {
+                return this.services.commandExecutor.mutateResource("post", this.links.self, {
                   body: body
                 });
 
@@ -2894,8 +2997,8 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context5.prev = _context5.next) {
               case 0:
                 _context5.next = 2;
-                return this.services.commandExecutor.mutateResource('post', this.links.self, {
-                  attributes: typeof attributes !== 'undefined' ? JSON.stringify(attributes) : undefined
+                return this.services.commandExecutor.mutateResource("post", this.links.self, {
+                  attributes: typeof attributes !== "undefined" ? JSON.stringify(attributes) : undefined
                 });
 
               case 2:
@@ -2933,11 +3036,11 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 0:
                 // We ignore existing mcsMedia members of each of the media entries.
                 // Instead we just collect their sids and pull new descriptors from a mediaSet GET endpoint.
-                sids = contentSet.map(function (m) {
+                sids = contentSet === null || contentSet === void 0 ? void 0 : contentSet.map(function (m) {
                   return m.sid;
                 });
 
-                if (!this.services.mcsClient) {
+                if (!(this.services.mcsClient && sids)) {
                   _context6.next = 7;
                   break;
                 }
@@ -2951,7 +3054,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
                 }));
 
               case 7:
-                throw new Error('Media Content Service is unavailable');
+                throw new Error("Media Content Service is unavailable");
 
               case 8:
               case "end":
@@ -2978,8 +3081,8 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
           while (1) {
             switch (_context7.prev = _context7.next) {
               case 0:
-                messagesReceiptsUrl = this.configuration.links.messagesReceipts.replace('%s', this.conversation.sid).replace('%s', this.sid);
-                url = new UriBuilder(messagesReceiptsUrl).arg('PageToken', options === null || options === void 0 ? void 0 : options.pageToken).arg('PageSize', options === null || options === void 0 ? void 0 : options.pageSize).build();
+                messagesReceiptsUrl = this.configuration.links.messagesReceipts.replace("%s", this.conversation.sid).replace("%s", this.sid);
+                url = new UriBuilder(messagesReceiptsUrl).arg("PageToken", options === null || options === void 0 ? void 0 : options.pageToken).arg("PageSize", options === null || options === void 0 ? void 0 : options.pageSize).build();
                 _context7.next = 4;
                 return this.services.network.get(url);
 
@@ -3013,16 +3116,20 @@ 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), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Media)], Message.prototype, "getEmailBody", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync('string'), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Message.prototype, "updateBody", null);
+__decorate([declarativeTypeValidator.validateTypes(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Media)], Message.prototype, "getEmailHistory", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(['string', 'number', 'boolean', 'object', declarativeTypeValidator.literal(null)]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Message.prototype, "updateAttributes", null);
+__decorate([declarativeTypeValidator.validateTypesAsync("string"), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Message.prototype, "updateBody", null);
+
+__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;
-  }), 'a non-empty array of Media'];
+  }, true), "a non-empty array of Media"];
 })), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", Promise)], Message.prototype, "attachTemporaryUrlsFor", 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; } } }; }
@@ -3034,7 +3141,7 @@ function _arrayLikeToArray$2(arr, len) { if (len == null || len > arr.length) le
 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$4 = Logger.scope('Messages');
+var log$4 = Logger.scope("Messages");
 /**
  * Represents the collection of messages in a conversation
  */
@@ -3084,7 +3191,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 2:
                 this.messagesListPromise = this.services.syncClient.list({
                   id: name,
-                  mode: 'open_existing'
+                  mode: "open_existing"
                 });
                 _context.prev = 3;
                 _context.next = 6;
@@ -3092,7 +3199,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 6:
                 list = _context.sent;
-                list.on('itemAdded', function (args) {
+                list.on("itemAdded", function (args) {
                   log$4.debug("".concat(_this2.conversation.sid, " itemAdded: ").concat(args.item.index));
                   var links = {
                     self: "".concat(_this2.conversation.links.messages, "/").concat(args.item.data.sid),
@@ -3102,33 +3209,37 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                   var message = new Message(args.item.index, args.item.data, _this2.conversation, links, _this2.configuration, _this2.services);
 
                   if (_this2.messagesByIndex.has(message.index)) {
-                    log$4.debug('Message arrived, but is already known and ignored', _this2.conversation.sid, message.index);
+                    log$4.debug("Message arrived, but is already known and ignored", _this2.conversation.sid, message.index);
                     return;
                   }
 
                   _this2.messagesByIndex.set(message.index, message);
 
-                  message.on('updated', function (args) {
-                    return _this2.emit('messageUpdated', args);
+                  message.on("updated", function (args) {
+                    return _this2.emit("messageUpdated", args);
                   });
 
-                  _this2.emit('messageAdded', message);
+                  _this2.emit("messageAdded", message);
                 });
-                list.on('itemRemoved', function (args) {
+                list.on("itemRemoved", function (args) {
                   log$4.debug("#{this.conversation.sid} itemRemoved: ".concat(args.index));
                   var index = args.index;
 
                   if (_this2.messagesByIndex.has(index)) {
                     var message = _this2.messagesByIndex.get(index);
 
+                    if (!message) {
+                      return;
+                    }
+
                     _this2.messagesByIndex.delete(message.index);
 
-                    message.removeAllListeners('updated');
+                    message.removeAllListeners("updated");
 
-                    _this2.emit('messageRemoved', message);
+                    _this2.emit("messageRemoved", message);
                   }
                 });
-                list.on('itemUpdated', function (args) {
+                list.on("itemUpdated", function (args) {
                   log$4.debug("".concat(_this2.conversation.sid, " itemUpdated: ").concat(args.item.index));
 
                   var message = _this2.messagesByIndex.get(args.item.index);
@@ -3144,11 +3255,11 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                 _context.t0 = _context["catch"](3);
                 this.messagesListPromise = null;
 
-                if (this.services.syncClient.connectionState !== 'disconnected') {
-                  log$4.error('Failed to get messages object for conversation', this.conversation.sid, _context.t0);
+                if (this.services.syncClient.connectionState !== "disconnected") {
+                  log$4.error("Failed to get messages object for conversation", this.conversation.sid, _context.t0);
                 }
 
-                log$4.debug('ERROR: Failed to get messages object for conversation', this.conversation.sid, _context.t0);
+                log$4.debug("ERROR: Failed to get messages object for conversation", this.conversation.sid, _context.t0);
                 throw _context.t0;
 
               case 19:
@@ -3207,7 +3318,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
     /**
      * Send Message to the conversation, message could include both text and multiple media attachments.
      * @param message Message to post
-     * @returns Returns promise which can fail
+     * @returns Returns a promise which can fail
      */
 
   }, {
@@ -3216,13 +3327,13 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
       var _sendV = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(message) {
         var _message$emailOptions;
 
-        var media, _iterator, _step, _step$value, category, mediaContent;
+        var media, _iterator, _step, _mediaContent$content, _mediaContent$media, _step$value, category, mediaContent;
 
         return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                log$4.debug('Sending message V2', message.mediaContent, message.attributes, message.emailOptions);
+                log$4.debug("Sending message V2", message.mediaContent, message.attributes, message.emailOptions);
                 media = [];
                 _iterator = _createForOfIteratorHelper$2(message.mediaContent);
                 _context3.prev = 3;
@@ -3236,7 +3347,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                 }
 
                 _step$value = _slicedToArray__default['default'](_step.value, 2), category = _step$value[0], mediaContent = _step$value[1];
-                log$4.debug("Adding media to a message as ".concat(mediaContent instanceof FormData ? 'FormData' : 'SendMediaOptions'), mediaContent);
+                log$4.debug("Adding media to a message as ".concat(mediaContent instanceof FormData ? "FormData" : "SendMediaOptions"), mediaContent);
                 _context3.t0 = media;
 
                 if (!(mediaContent instanceof FormData)) {
@@ -3254,7 +3365,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 15:
                 _context3.next = 17;
-                return this.services.mcsClient.post(mediaContent.contentType, mediaContent.media, category, mediaContent.filename);
+                return this.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);
 
               case 17:
                 _context3.t1 = _context3.sent;
@@ -3287,13 +3398,13 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 30:
                 _context3.next = 32;
-                return this.services.commandExecutor.mutateResource('post', this.conversation.links.messages, {
+                return this.services.commandExecutor.mutateResource("post", this.conversation.links.messages, {
                   body: message.text,
                   subject: (_message$emailOptions = message.emailOptions) === null || _message$emailOptions === void 0 ? void 0 : _message$emailOptions.subject,
                   media_sids: media.map(function (m) {
                     return m.sid;
                   }),
-                  attributes: typeof message.attributes !== 'undefined' ? JSON.stringify(message.attributes) : undefined
+                  attributes: typeof message.attributes !== "undefined" ? JSON.stringify(message.attributes) : undefined
                 });
 
               case 32:
@@ -3334,11 +3445,11 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 0:
                 attributes = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
                 emailOptions = _args4.length > 2 ? _args4[2] : undefined;
-                log$4.debug('Sending text message', message, attributes, emailOptions);
+                log$4.debug("Sending text message", message, attributes, emailOptions);
                 _context4.next = 5;
-                return this.services.commandExecutor.mutateResource('post', this.conversation.links.messages, {
-                  body: message !== null && message !== void 0 ? message : '',
-                  attributes: typeof attributes !== 'undefined' ? JSON.stringify(attributes) : undefined,
+                return this.services.commandExecutor.mutateResource("post", this.conversation.links.messages, {
+                  body: message !== null && message !== void 0 ? message : "",
+                  attributes: typeof attributes !== "undefined" ? JSON.stringify(attributes) : undefined,
                   subject: emailOptions === null || emailOptions === void 0 ? void 0 : emailOptions.subject
                 });
 
@@ -3371,6 +3482,8 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "sendMedia",
     value: function () {
       var _sendMedia = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(mediaContent) {
+        var _mediaContent$content2, _mediaContent$media2;
+
         var attributes,
             emailOptions,
             media,
@@ -3381,8 +3494,8 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 0:
                 attributes = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
                 emailOptions = _args5.length > 2 ? _args5[2] : undefined;
-                log$4.debug('Sending media message', mediaContent, attributes, emailOptions);
-                log$4.debug("Sending media message as ".concat(mediaContent instanceof FormData ? 'FormData' : 'SendMediaOptions'), mediaContent, attributes);
+                log$4.debug("Sending media message", mediaContent, attributes, emailOptions);
+                log$4.debug("Sending media message as ".concat(mediaContent instanceof FormData ? "FormData" : "SendMediaOptions"), mediaContent, attributes);
 
                 if (!(mediaContent instanceof FormData)) {
                   _context5.next = 10;
@@ -3399,7 +3512,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 10:
                 _context5.next = 12;
-                return this.services.mcsClient.post(mediaContent.contentType, mediaContent.media, 'media', mediaContent.filename);
+                return this.services.mcsClient.post((_mediaContent$content2 = mediaContent.contentType) !== null && _mediaContent$content2 !== void 0 ? _mediaContent$content2 : "", (_mediaContent$media2 = mediaContent.media) !== null && _mediaContent$media2 !== void 0 ? _mediaContent$media2 : "", "media", mediaContent.filename);
 
               case 12:
                 _context5.t0 = _context5.sent;
@@ -3407,9 +3520,9 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 13:
                 media = _context5.t0;
                 _context5.next = 16;
-                return this.services.commandExecutor.mutateResource('post', this.conversation.links.messages, {
+                return this.services.commandExecutor.mutateResource("post", this.conversation.links.messages, {
                   media_sids: [media.sid],
-                  attributes: typeof attributes !== 'undefined' ? JSON.stringify(attributes) : undefined
+                  attributes: typeof attributes !== "undefined" ? JSON.stringify(attributes) : undefined
                 });
 
               case 16:
@@ -3447,7 +3560,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                direction = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : 'backwards';
+                direction = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : "backwards";
                 return _context6.abrupt("return", this._getMessages(pageSize, anchor, direction));
 
               case 2:
@@ -3471,7 +3584,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       // Due to an inconsistency between Sync and Chat conventions, next and
       // previous pages should be swapped.
-      var shouldReverse = order === 'desc';
+      var shouldReverse = order === "desc";
 
       var nextPage = function nextPage() {
         return page.nextPage().then(function (page) {
@@ -3515,8 +3628,8 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
       };
       var message = new Message(index, value, this.conversation, links, this.configuration, this.services);
       this.messagesByIndex.set(message.index, message);
-      message.on('updated', function (args) {
-        return _this4.emit('messageUpdated', args);
+      message.on("updated", function (args) {
+        return _this4.emit("messageUpdated", args);
       });
       return message;
     }
@@ -3547,17 +3660,17 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context7.prev = _context7.next) {
               case 0:
                 pageSize = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : 30;
-                anchor = _args7.length > 1 && _args7[1] !== undefined ? _args7[1] : 'end';
-                direction = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : 'forward';
-                order = direction === 'backwards' ? 'desc' : 'asc';
+                anchor = _args7.length > 1 && _args7[1] !== undefined ? _args7[1] : "end";
+                direction = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : "forward";
+                order = direction === "backwards" ? "desc" : "asc";
                 _context7.next = 6;
                 return this.messagesListPromise;
 
               case 6:
                 list = _context7.sent;
                 _context7.next = 9;
-                return list.getItems({
-                  from: anchor !== 'end' ? anchor : void 0,
+                return list === null || list === void 0 ? void 0 : list.getItems({
+                  from: anchor !== "end" ? anchor : void 0,
                   pageSize: pageSize,
                   order: order,
                   limit: pageSize // @todo Limit equals pageSize by default in Sync. This is probably not ideal.
@@ -3680,6 +3793,8 @@ var MessageBuilder = /*#__PURE__*/function () {
 
     this.limits = limits;
     this.message = new UnsentMessage(messagesEntity);
+    this.emailBodies = new Map();
+    this.emailHistories = new Map();
   }
   /**
    * Sets the message body.
@@ -3715,6 +3830,30 @@ var MessageBuilder = /*#__PURE__*/function () {
       this.message.attributes = attributes;
       return this;
     }
+    /**
+     * Set email body with given MIME-type.
+     * @param mimeType Format of the body to set (text/plain or text/html).
+     * @param body Body payload in selected format.
+     */
+
+  }, {
+    key: "setEmailBody",
+    value: function setEmailBody(mimeType, body) {
+      this.emailBodies.set(mimeType, body);
+      return this;
+    }
+    /**
+     * Set email history with given MIME-type.
+     * @param mimeType Format of the history to set (text/plain or text/html).
+     * @param history History payload in selected format.
+     */
+
+  }, {
+    key: "setEmailHistory",
+    value: function setEmailHistory(mimeType, history) {
+      this.emailHistories.set(mimeType, history);
+      return this;
+    }
     /**
      * Adds media to the message.
      * @param payload Media to add.
@@ -3723,7 +3862,19 @@ var MessageBuilder = /*#__PURE__*/function () {
   }, {
     key: "addMedia",
     value: function addMedia(payload) {
-      this.message.mediaContent.push(['media', payload]);
+      if (typeof FormData === "undefined" && payload instanceof FormData) {
+        throw new Error("Could not add FormData content whilst not in a browser");
+      }
+
+      if (!(payload instanceof FormData)) {
+        var mediaOptions = payload;
+
+        if (!mediaOptions.contentType || !mediaOptions.media) {
+          throw new Error("Media content in SendMediaOptions must contain non-empty contentType and media");
+        }
+      }
+
+      this.message.mediaContent.push(["media", payload]);
       return this;
     }
     /**
@@ -3733,18 +3884,46 @@ var MessageBuilder = /*#__PURE__*/function () {
   }, {
     key: "build",
     value: function build() {
+      var _this = this;
+
+      this.emailBodies.forEach(function (_, key) {
+        if (!_this.limits.emailBodiesAllowedMimeTypes.includes(key)) {
+          throw new Error("Unsupported email body MIME type ".concat(key));
+        }
+      });
+      this.emailHistories.forEach(function (_, key) {
+        if (!_this.limits.emailHistoriesAllowedMimeTypes.includes(key)) {
+          throw new Error("Unsupported email history MIME type ".concat(key));
+        }
+      });
+
+      if (this.emailBodies.size > this.limits.emailBodiesAllowedMimeTypes.length) {
+        throw new Error("Too many email bodies attached to the message (".concat(this.emailBodies.size, " > ").concat(this.limits.emailBodiesAllowedMimeTypes.length, ")"));
+      }
+
+      if (this.emailHistories.size > this.limits.emailHistoriesAllowedMimeTypes.length) {
+        throw new Error("Too many email histories attached to the message (".concat(this.emailHistories.size, " > ").concat(this.limits.emailHistoriesAllowedMimeTypes.length, ")"));
+      }
+
       if (this.message.mediaContent.length > this.limits.mediaAttachmentsCountLimit) {
         throw new Error("Too many media attachments in the message (".concat(this.message.mediaContent.length, " > ").concat(this.limits.mediaAttachmentsCountLimit, ")"));
       } // @todo we don't know the sizes of the attachments in FormData
+      // @todo insertion below makes build() method non-repeatable - probably move to UnsentMessage.send() or even sendV2()?
 
 
+      this.emailBodies.forEach(function (body) {
+        _this.message.mediaContent.push(["body", body]);
+      });
+      this.emailHistories.forEach(function (history) {
+        _this.message.mediaContent.push(["history", history]);
+      });
       return this.message;
     }
   }, {
     key: "getPayloadContentType",
     value: function getPayloadContentType(payload) {
-      if (typeof FormData !== 'undefined' && payload instanceof FormData) {
-        return payload.get('Content-Type');
+      if (typeof FormData !== "undefined" && payload instanceof FormData) {
+        return payload.get("Content-Type");
       }
 
       return payload.contentType;
@@ -3763,20 +3942,21 @@ function _arrayLikeToArray$1(arr, len) { if (len == null || len > arr.length) le
 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; } }
-var log$3 = Logger.scope('Conversation');
+var log$3 = Logger.scope("Conversation");
 var fieldMappings = {
-  lastMessage: 'lastMessage',
-  attributes: 'attributes',
-  createdBy: 'createdBy',
-  dateCreated: 'dateCreated',
-  dateUpdated: 'dateUpdated',
-  friendlyName: 'friendlyName',
-  lastConsumedMessageIndex: 'lastConsumedMessageIndex',
-  notificationLevel: 'notificationLevel',
-  sid: 'sid',
-  status: 'status',
-  uniqueName: 'uniqueName',
-  state: 'state'
+  lastMessage: "lastMessage",
+  attributes: "attributes",
+  createdBy: "createdBy",
+  dateCreated: "dateCreated",
+  dateUpdated: "dateUpdated",
+  friendlyName: "friendlyName",
+  lastConsumedMessageIndex: "lastConsumedMessageIndex",
+  notificationLevel: "notificationLevel",
+  sid: "sid",
+  status: "status",
+  uniqueName: "uniqueName",
+  state: "state",
+  bindings: "bindings"
 };
 
 function parseTime(timeString) {
@@ -3804,6 +3984,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
    * @internal
    */
   function Conversation(descriptor, sid, links, configuration, services) {
+    var _descriptor$bindings;
+
     var _this;
 
     _classCallCheck__default['default'](this, Conversation);
@@ -3824,19 +4006,20 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     try {
       JSON.stringify(attributes);
     } catch (e) {
-      throw new Error('Attributes must be a valid JSON object.');
+      throw new Error("Attributes must be a valid JSON object.");
     }
 
     _this.entityName = descriptor.channel;
     _this.channelState = {
       uniqueName: uniqueName,
-      status: 'notParticipating',
+      status: "notParticipating",
       attributes: attributes,
       createdBy: createdBy,
       dateCreated: dateCreated,
       dateUpdated: dateUpdated,
       friendlyName: friendlyName,
-      lastReadMessageIndex: lastReadMessageIndex
+      lastReadMessageIndex: lastReadMessageIndex,
+      bindings: (_descriptor$bindings = descriptor.bindings) !== null && _descriptor$bindings !== void 0 ? _descriptor$bindings : {}
     };
 
     if (descriptor.notificationLevel) {
@@ -3849,25 +4032,31 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     _this.participants = new Map();
     _this.participantsEntity = new Participants(_assertThisInitialized__default['default'](_this), _this.participants, participantsLinks, _this.configuration, _this.services);
 
-    _this.participantsEntity.on('participantJoined', _this.emit.bind(_assertThisInitialized__default['default'](_this), 'participantJoined'));
+    _this.participantsEntity.on("participantJoined", function (participant) {
+      return _this.emit("participantJoined", participant);
+    });
 
-    _this.participantsEntity.on('participantLeft', _this.emit.bind(_assertThisInitialized__default['default'](_this), 'participantLeft'));
+    _this.participantsEntity.on("participantLeft", function (participant) {
+      return _this.emit("participantLeft", participant);
+    });
 
-    _this.participantsEntity.on('participantUpdated', function (args) {
-      return _this.emit('participantUpdated', args);
+    _this.participantsEntity.on("participantUpdated", function (args) {
+      return _this.emit("participantUpdated", args);
     });
 
     _this.messagesEntity = new Messages(_assertThisInitialized__default['default'](_this), configuration, services);
 
-    _this.messagesEntity.on('messageAdded', function (message) {
+    _this.messagesEntity.on("messageAdded", function (message) {
       return _this._onMessageAdded(message);
     });
 
-    _this.messagesEntity.on('messageUpdated', function (args) {
-      return _this.emit('messageUpdated', args);
+    _this.messagesEntity.on("messageUpdated", function (args) {
+      return _this.emit("messageUpdated", args);
     });
 
-    _this.messagesEntity.on('messageRemoved', _this.emit.bind(_assertThisInitialized__default['default'](_this), 'messageRemoved'));
+    _this.messagesEntity.on("messageRemoved", function (message) {
+      return _this.emit("messageRemoved", message);
+    });
 
     return _this;
   }
@@ -3932,7 +4121,9 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "createdBy",
     get: function get() {
-      return this.channelState.createdBy;
+      var _this$channelState$cr;
+
+      return (_this$channelState$cr = this.channelState.createdBy) !== null && _this$channelState$cr !== void 0 ? _this$channelState$cr : "";
     }
     /**
      * Custom attributes of the conversation.
@@ -3959,7 +4150,9 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "lastMessage",
     get: function get() {
-      return this.channelState.lastMessage;
+      var _this$channelState$la;
+
+      return (_this$channelState$la = this.channelState.lastMessage) !== null && _this$channelState$la !== void 0 ? _this$channelState$la : undefined;
     }
     /**
      * User notification level for this conversation.
@@ -3968,7 +4161,14 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "notificationLevel",
     get: function get() {
-      return this.channelState.notificationLevel;
+      var _this$channelState$no;
+
+      return (_this$channelState$no = this.channelState.notificationLevel) !== null && _this$channelState$no !== void 0 ? _this$channelState$no : "default";
+    }
+  }, {
+    key: "bindings",
+    get: function get() {
+      return this.channelState.bindings;
     }
   }, {
     key: "limits",
@@ -3998,16 +4198,16 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       return this.entityPromise = (_this$entityPromise = this.entityPromise) !== null && _this$entityPromise !== void 0 ? _this$entityPromise : this.services.syncClient.document({
         id: this.entityName,
-        mode: 'open_existing'
+        mode: "open_existing"
       }).then(function (entity) {
         _this2.entity = entity;
 
-        _this2.entity.on('updated', function (args) {
+        _this2.entity.on("updated", function (args) {
           _this2._update(args.data);
         });
 
-        _this2.entity.on('removed', function () {
-          return _this2.emit('removed', _this2);
+        _this2.entity.on("removed", function () {
+          return _this2.emit("removed", _this2);
         });
 
         _this2._update(_this2.entity.data);
@@ -4017,11 +4217,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         _this2.entity = null;
         _this2.entityPromise = null;
 
-        if (_this2.services.syncClient.connectionState != 'disconnected') {
-          log$3.error('Failed to get conversation object', err);
+        if (_this2.services.syncClient.connectionState != "disconnected") {
+          log$3.error("Failed to get conversation object", err);
         }
 
-        log$3.debug('ERROR: Failed to get conversation object', err);
+        log$3.debug("ERROR: Failed to get conversation object", err);
         throw err;
       });
     }
@@ -4036,7 +4236,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "_subscribeStreams",
     value: function () {
       var _subscribeStreams2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-        var messagesObjectName, rosterObjectName;
+        var _this$entity, _this$entity2, _this$entity3, messagesObjectName, rosterObjectName;
+
         return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -4046,9 +4247,9 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return this._subscribe();
 
               case 3:
-                log$3.trace('_subscribeStreams, this.entity.data=', this.entity.data);
-                messagesObjectName = this.entity.data.messages;
-                rosterObjectName = this.entity.data.roster;
+                log$3.trace("_subscribeStreams, this.entity.data=", (_this$entity = this.entity) === null || _this$entity === void 0 ? void 0 : _this$entity.data);
+                messagesObjectName = (_this$entity2 = this.entity) === null || _this$entity2 === void 0 ? void 0 : _this$entity2.data.messages;
+                rosterObjectName = (_this$entity3 = this.entity) === null || _this$entity3 === void 0 ? void 0 : _this$entity3.data.roster;
                 _context.next = 8;
                 return Promise.all([this.messagesEntity.subscribe(messagesObjectName), this.participantsEntity.subscribe(rosterObjectName)]);
 
@@ -4060,11 +4261,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                 _context.prev = 10;
                 _context.t0 = _context["catch"](0);
 
-                if (this.services.syncClient.connectionState !== 'disconnected') {
-                  log$3.error('Failed to subscribe on conversation objects', this.sid, _context.t0);
+                if (this.services.syncClient.connectionState !== "disconnected") {
+                  log$3.error("Failed to subscribe on conversation objects", this.sid, _context.t0);
                 }
 
-                log$3.debug('ERROR: Failed to subscribe on conversation objects', this.sid, _context.t0);
+                log$3.debug("ERROR: Failed to subscribe on conversation objects", this.sid, _context.t0);
                 throw _context.t0;
 
               case 15:
@@ -4141,19 +4342,19 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       this.channelState.status = status;
 
-      if (status === 'joined') {
+      if (status === "joined") {
         this._subscribeStreams().catch(function (err) {
-          log$3.debug('ERROR while setting conversation status ' + status, err);
+          log$3.debug("ERROR while setting conversation status " + status, err);
 
-          if (_this3.services.syncClient.connectionState !== 'disconnected') {
+          if (_this3.services.syncClient.connectionState !== "disconnected") {
             throw err;
           }
         });
       } else if (this.entityPromise) {
         this._unsubscribe().catch(function (err) {
-          log$3.debug('ERROR while setting conversation status ' + status, err);
+          log$3.debug("ERROR while setting conversation status " + status, err);
 
-          if (_this3.services.syncClient.connectionState !== 'disconnected') {
+          if (_this3.services.syncClient.connectionState !== "disconnected") {
             throw err;
           }
         });
@@ -4177,9 +4378,9 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
      * @internal
      */
     function _update(update) {
-      var _update$lastMessage, _update$lastMessage2, _this$channelState$la, _this$channelState$la2, _this$channelState$lo;
+      var _update$lastMessage, _update$lastMessage2, _this$channelState$la2, _this$channelState$la3, _this$channelState$lo;
 
-      log$3.trace('_update', update);
+      log$3.trace("_update", update);
       Conversation.preprocessUpdate(update, this.sid);
       var updateReasons = new Set();
 
@@ -4193,7 +4394,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
         switch (localKey) {
           case fieldMappings.status:
-            if (!update.status || update.status === 'unknown' || this.channelState.status === update.status) {
+            if (!update.status || update.status === "unknown" || this.channelState.status === update.status) {
               break;
             }
 
@@ -4216,7 +4417,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             }
 
             this.channelState.lastReadMessageIndex = update.lastConsumedMessageIndex;
-            updateReasons.add('lastReadMessageIndex');
+            updateReasons.add("lastReadMessageIndex");
             break;
 
           case fieldMappings.lastMessage:
@@ -4233,7 +4434,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
               updateReasons.add(localKey);
             }
 
-            if (((_update$lastMessage2 = update.lastMessage) === null || _update$lastMessage2 === void 0 ? void 0 : _update$lastMessage2.timestamp) !== undefined && ((_this$channelState$la = this.channelState.lastMessage) === null || _this$channelState$la === void 0 ? void 0 : (_this$channelState$la2 = _this$channelState$la.dateCreated) === null || _this$channelState$la2 === void 0 ? void 0 : _this$channelState$la2.getTime()) !== update.lastMessage.timestamp.getTime()) {
+            if (((_update$lastMessage2 = update.lastMessage) === null || _update$lastMessage2 === void 0 ? void 0 : _update$lastMessage2.timestamp) !== undefined && ((_this$channelState$la2 = this.channelState.lastMessage) === null || _this$channelState$la2 === void 0 ? void 0 : (_this$channelState$la3 = _this$channelState$la2.dateCreated) === null || _this$channelState$la3 === void 0 ? void 0 : _this$channelState$la3.getTime()) !== update.lastMessage.timestamp.getTime()) {
               this.channelState.lastMessage.dateCreated = update.lastMessage.timestamp;
               updateReasons.add(localKey);
             }
@@ -4259,6 +4460,15 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             updateReasons.add(localKey);
             break;
 
+          case fieldMappings.bindings:
+            if (isEqual__default['default'](this.channelState.bindings, update.bindings)) {
+              break;
+            }
+
+            this.channelState.bindings = update.bindings;
+            updateReasons.add(localKey);
+            break;
+
           default:
             var isDate = update[key] instanceof Date;
             var keysMatchAsDates = isDate && ((_this$channelState$lo = this.channelState[localKey]) === null || _this$channelState$lo === void 0 ? void 0 : _this$channelState$lo.getTime()) === update[key].getTime();
@@ -4274,7 +4484,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
       }
 
       if (updateReasons.size > 0) {
-        this.emit('updated', {
+        this.emit("updated", {
           conversation: this,
           updateReasons: _toConsumableArray__default['default'](updateReasons)
         });
@@ -4306,7 +4516,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         _iterator.f();
       }
 
-      this.emit('messageAdded', message);
+      this.emit("messageAdded", message);
     }
   }, {
     key: "_setLastReadMessageIndex",
@@ -4318,7 +4528,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context3.prev = _context3.next) {
               case 0:
                 _context3.next = 2;
-                return this.services.commandExecutor.mutateResource('post', "".concat(this.configuration.links.myConversations, "/").concat(this.sid), {
+                return this.services.commandExecutor.mutateResource("post", "".concat(this.configuration.links.myConversations, "/").concat(this.sid), {
                   last_read_message_index: index
                 });
 
@@ -4354,7 +4564,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                return _context4.abrupt("return", this.participantsEntity.add(identity, attributes));
+                return _context4.abrupt("return", this.participantsEntity.add(identity, attributes !== null && attributes !== void 0 ? attributes : {}));
 
               case 1:
               case "end":
@@ -4375,19 +4585,25 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
      * @param proxyAddress Proxy (Twilio) address of the participant.
      * @param address User address of the participant.
      * @param attributes Attributes to be attached to the participant.
+     * @param bindingOptions Options for adding email participants - name and CC/To level.
      */
 
   }, {
     key: "addNonChatParticipant",
     value: function () {
-      var _addNonChatParticipant = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(proxyAddress, address, attributes) {
+      var _addNonChatParticipant = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(proxyAddress, address) {
+        var attributes,
+            bindingOptions,
+            _args5 = arguments;
         return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                return _context5.abrupt("return", this.participantsEntity.addNonChatParticipant(proxyAddress, address, attributes));
+                attributes = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : {};
+                bindingOptions = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : {};
+                return _context5.abrupt("return", this.participantsEntity.addNonChatParticipant(proxyAddress, address, attributes !== null && attributes !== void 0 ? attributes : {}, bindingOptions !== null && bindingOptions !== void 0 ? bindingOptions : {}));
 
-              case 1:
+              case 3:
               case "end":
                 return _context5.stop();
             }
@@ -4395,7 +4611,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee5, this);
       }));
 
-      function addNonChatParticipant(_x4, _x5, _x6) {
+      function addNonChatParticipant(_x4, _x5) {
         return _addNonChatParticipant.apply(this, arguments);
       }
 
@@ -4421,7 +4637,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return this._subscribeStreams();
 
               case 2:
-                if (!(index < this.lastReadMessageIndex)) {
+                if (!(index < (this.lastReadMessageIndex || 0))) {
                   _context6.next = 6;
                   break;
                 }
@@ -4447,7 +4663,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee6, this);
       }));
 
-      function advanceLastReadMessageIndex(_x7) {
+      function advanceLastReadMessageIndex(_x6) {
         return _advanceLastReadMessageIndex.apply(this, arguments);
       }
 
@@ -4466,7 +4682,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context7.prev = _context7.next) {
               case 0:
                 _context7.next = 2;
-                return this.services.commandExecutor.mutateResource('delete', this.links.self);
+                return this.services.commandExecutor.mutateResource("delete", this.links.self);
 
               case 2:
                 return _context7.abrupt("return", this);
@@ -4548,7 +4764,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee9, this);
       }));
 
-      function getMessages(_x8, _x9, _x10) {
+      function getMessages(_x7, _x8, _x9) {
         return _getMessages.apply(this, arguments);
       }
 
@@ -4601,6 +4817,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "getParticipantsCount",
     value: function () {
       var _getParticipantsCount = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee11() {
+        var _response$body$partic;
+
         var url, response;
         return _regeneratorRuntime__default['default'].wrap(function _callee11$(_context11) {
           while (1) {
@@ -4612,7 +4830,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 3:
                 response = _context11.sent;
-                return _context11.abrupt("return", response.body.participants_count);
+                return _context11.abrupt("return", (_response$body$partic = response.body.participants_count) !== null && _response$body$partic !== void 0 ? _response$body$partic : 0);
 
               case 5:
               case "end":
@@ -4651,7 +4869,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee12, this);
       }));
 
-      function getParticipantBySid(_x11) {
+      function getParticipantBySid(_x10) {
         return _getParticipantBySid.apply(this, arguments);
       }
 
@@ -4665,14 +4883,17 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getParticipantByIdentity",
     value: function () {
-      var _getParticipantByIdentity = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee13(identity) {
+      var _getParticipantByIdentity = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee13() {
+        var identity,
+            _args13 = arguments;
         return _regeneratorRuntime__default['default'].wrap(function _callee13$(_context13) {
           while (1) {
             switch (_context13.prev = _context13.next) {
               case 0:
-                return _context13.abrupt("return", this.participantsEntity.getParticipantByIdentity(identity));
+                identity = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : "";
+                return _context13.abrupt("return", this.participantsEntity.getParticipantByIdentity(identity !== null && identity !== void 0 ? identity : ""));
 
-              case 1:
+              case 2:
               case "end":
                 return _context13.stop();
             }
@@ -4680,7 +4901,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee13, this);
       }));
 
-      function getParticipantByIdentity(_x12) {
+      function getParticipantByIdentity() {
         return _getParticipantByIdentity.apply(this, arguments);
       }
 
@@ -4701,6 +4922,8 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "getMessagesCount",
     value: function () {
       var _getMessagesCount = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee14() {
+        var _response$body$messag;
+
         var url, response;
         return _regeneratorRuntime__default['default'].wrap(function _callee14$(_context14) {
           while (1) {
@@ -4712,7 +4935,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 3:
                 response = _context14.sent;
-                return _context14.abrupt("return", response.body.messages_count);
+                return _context14.abrupt("return", (_response$body$messag = response.body.messages_count) !== null && _response$body$messag !== void 0 ? _response$body$messag : 0);
 
               case 5:
               case "end":
@@ -4765,12 +4988,12 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                   break;
                 }
 
-                throw new Error('Conversation was not found in the user conversations list');
+                throw new Error("Conversation was not found in the user conversations list");
 
               case 6:
                 unreadMessageCount = response.body.unread_messages_count;
 
-                if (!(typeof unreadMessageCount === 'number')) {
+                if (!(typeof unreadMessageCount === "number")) {
                   _context15.next = 9;
                   break;
                 }
@@ -4807,7 +5030,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context16.prev = _context16.next) {
               case 0:
                 _context16.next = 2;
-                return this.services.commandExecutor.mutateResource('post', this.links.participants, {
+                return this.services.commandExecutor.mutateResource("post", this.links.participants, {
                   identity: this.configuration.userIdentity
                 });
 
@@ -4840,13 +5063,13 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
           while (1) {
             switch (_context17.prev = _context17.next) {
               case 0:
-                if (!(this.channelState.status === 'joined')) {
+                if (!(this.channelState.status === "joined")) {
                   _context17.next = 3;
                   break;
                 }
 
                 _context17.next = 3;
-                return this.services.commandExecutor.mutateResource('delete', "".concat(this.links.participants, "/").concat(this.configuration.userIdentity));
+                return this.services.commandExecutor.mutateResource("delete", "".concat(this.links.participants, "/").concat(this.configuration.userIdentity));
 
               case 3:
                 return _context17.abrupt("return", this);
@@ -4871,6 +5094,9 @@ 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 () {
@@ -4880,7 +5106,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context18.prev = _context18.next) {
               case 0:
                 _context18.next = 2;
-                return this.participantsEntity.remove(typeof participant === 'string' ? participant : participant.sid);
+                return this.participantsEntity.remove(typeof participant === "string" ? participant : participant.sid);
 
               case 2:
               case "end":
@@ -4890,7 +5116,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee18, this);
       }));
 
-      function removeParticipant(_x13) {
+      function removeParticipant(_x11) {
         return _removeParticipant.apply(this, arguments);
       }
 
@@ -4909,13 +5135,15 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "sendMessage",
     value: function () {
       var _sendMessage = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee19(message, messageAttributes, emailOptions) {
-        var _response, response;
+        var _parseToNumber2;
+
+        var _parseToNumber, _response, response;
 
         return _regeneratorRuntime__default['default'].wrap(function _callee19$(_context19) {
           while (1) {
             switch (_context19.prev = _context19.next) {
               case 0:
-                if (!(typeof message === 'string' || message === null)) {
+                if (!(typeof message === "string" || message === null)) {
                   _context19.next = 5;
                   break;
                 }
@@ -4925,7 +5153,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 3:
                 _response = _context19.sent;
-                return _context19.abrupt("return", parseToNumber(_response.index));
+                return _context19.abrupt("return", (_parseToNumber = parseToNumber(_response.index)) !== null && _parseToNumber !== void 0 ? _parseToNumber : 0);
 
               case 5:
                 _context19.next = 7;
@@ -4933,7 +5161,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 7:
                 response = _context19.sent;
-                return _context19.abrupt("return", parseToNumber(response.index));
+                return _context19.abrupt("return", (_parseToNumber2 = parseToNumber(response.index)) !== null && _parseToNumber2 !== void 0 ? _parseToNumber2 : 0);
 
               case 9:
               case "end":
@@ -4943,7 +5171,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee19, this);
       }));
 
-      function sendMessage(_x14, _x15, _x16) {
+      function sendMessage(_x12, _x13, _x14) {
         return _sendMessage.apply(this, arguments);
       }
 
@@ -4952,6 +5180,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     /**
      * New interface to prepare for sending a message.
      * Use instead of `sendMessage`.
+     * @return A MessageBuilder to help set all message sending options.
      */
 
   }, {
@@ -5058,7 +5287,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context22.prev = _context22.next) {
               case 0:
                 _context22.next = 2;
-                return this.services.commandExecutor.mutateResource('post', "".concat(this.configuration.links.myConversations, "/").concat(this.sid), {
+                return this.services.commandExecutor.mutateResource("post", "".concat(this.configuration.links.myConversations, "/").concat(this.sid), {
                   notification_level: notificationLevel
                 });
 
@@ -5070,7 +5299,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee22, this);
       }));
 
-      function setUserNotificationLevel(_x17) {
+      function setUserNotificationLevel(_x15) {
         return _setUserNotificationLevel.apply(this, arguments);
       }
 
@@ -5100,7 +5329,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context23.prev = _context23.next) {
               case 0:
                 _context23.next = 2;
-                return this.services.commandExecutor.mutateResource('post', this.links.self, {
+                return this.services.commandExecutor.mutateResource("post", this.links.self, {
                   attributes: attributes !== undefined ? JSON.stringify(attributes) : undefined
                 });
 
@@ -5115,7 +5344,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee23, this);
       }));
 
-      function updateAttributes(_x18) {
+      function updateAttributes(_x16) {
         return _updateAttributes.apply(this, arguments);
       }
 
@@ -5140,7 +5369,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                 }
 
                 _context24.next = 3;
-                return this.services.commandExecutor.mutateResource('post', this.links.self, {
+                return this.services.commandExecutor.mutateResource("post", this.links.self, {
                   friendly_name: friendlyName
                 });
 
@@ -5155,7 +5384,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee24, this);
       }));
 
-      function updateFriendlyName(_x19) {
+      function updateFriendlyName(_x17) {
         return _updateFriendlyName.apply(this, arguments);
       }
 
@@ -5190,7 +5419,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee25, this);
       }));
 
-      function updateLastReadMessageIndex(_x20) {
+      function updateLastReadMessageIndex(_x18) {
         return _updateLastReadMessageIndex.apply(this, arguments);
       }
 
@@ -5215,11 +5444,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                 }
 
                 if (!uniqueName) {
-                  uniqueName = '';
+                  uniqueName = "";
                 }
 
                 _context26.next = 4;
-                return this.services.commandExecutor.mutateResource('post', this.links.self, {
+                return this.services.commandExecutor.mutateResource("post", this.links.self, {
                   unique_name: uniqueName
                 });
 
@@ -5234,7 +5463,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee26, this);
       }));
 
-      function updateUniqueName(_x21) {
+      function updateUniqueName(_x19) {
         return _updateUniqueName.apply(this, arguments);
       }
 
@@ -5244,13 +5473,13 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "preprocessUpdate",
     value: function preprocessUpdate(update, conversationSid) {
       try {
-        if (typeof update.attributes === 'string') {
+        if (typeof update.attributes === "string") {
           update.attributes = JSON.parse(update.attributes);
         } else if (update.attributes) {
           JSON.stringify(update.attributes);
         }
       } catch (e) {
-        log$3.warn('Retrieved malformed attributes from the server for conversation: ' + conversationSid);
+        log$3.warn("Retrieved malformed attributes from the server for conversation: " + conversationSid);
         update.attributes = {};
       }
 
@@ -5259,7 +5488,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
           update.dateCreated = new Date(update.dateCreated);
         }
       } catch (e) {
-        log$3.warn('Retrieved malformed dateCreated from the server for conversation: ' + conversationSid);
+        log$3.warn("Retrieved malformed dateCreated from the server for conversation: " + conversationSid);
         delete update.dateCreated;
       }
 
@@ -5268,7 +5497,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
           update.dateUpdated = new Date(update.dateUpdated);
         }
       } catch (e) {
-        log$3.warn('Retrieved malformed dateUpdated from the server for conversation: ' + conversationSid);
+        log$3.warn("Retrieved malformed dateUpdated from the server for conversation: " + conversationSid);
         delete update.dateUpdated;
       }
 
@@ -5277,7 +5506,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
           update.lastMessage.timestamp = new Date(update.lastMessage.timestamp);
         }
       } catch (e) {
-        log$3.warn('Retrieved malformed lastMessage.timestamp from the server for conversation: ' + conversationSid);
+        log$3.warn("Retrieved malformed lastMessage.timestamp from the server for conversation: " + conversationSid);
         delete update.lastMessage.timestamp;
       }
     }
@@ -5286,33 +5515,33 @@ 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");
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString, ['undefined', 'string', 'number', 'boolean', 'object', declarativeTypeValidator.literal(null)]), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "add", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString, optionalAttributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "add", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.nonEmptyString, ['undefined', 'string', 'number', 'boolean', 'object', declarativeTypeValidator.literal(null)]), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "addNonChatParticipant", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.nonEmptyString, optionalAttributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String, Object, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "addNonChatParticipant", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonNegativeInteger), __metadata("design:type", Function), __metadata("design:paramtypes", [Number]), __metadata("design:returntype", Promise)], Conversation.prototype, "advanceLastReadMessageIndex", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(['undefined', declarativeTypeValidator.nonNegativeInteger], ['undefined', declarativeTypeValidator.nonNegativeInteger], ['undefined', declarativeTypeValidator.literal('backwards', 'forward')]), __metadata("design:type", Function), __metadata("design:paramtypes", [Number, Number, String]), __metadata("design:returntype", Promise)], Conversation.prototype, "getMessages", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(["undefined", declarativeTypeValidator.nonNegativeInteger], ["undefined", declarativeTypeValidator.nonNegativeInteger], ["undefined", declarativeTypeValidator.literal("backwards", "forward")]), __metadata("design:type", Function), __metadata("design:paramtypes", [Number, Number, String]), __metadata("design:returntype", Promise)], Conversation.prototype, "getMessages", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Conversation.prototype, "getParticipantBySid", null);
 
@@ -5320,33 +5549,33 @@ __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', declarativeTypeValidator.literal(null), // Wrapping it into a custom rule is necessary because the FormData class is not available on initialization.
+__decorate([declarativeTypeValidator.validateTypesAsync(["string", declarativeTypeValidator.literal(null), // Wrapping it into a custom rule is necessary because the FormData class is not available on initialization.
 declarativeTypeValidator.custom(function (value) {
-  return [value instanceof FormData, 'an instance of FormData'];
-}), declarativeTypeValidator.objectSchema('media options', {
+  return [value instanceof FormData, "an instance of FormData"];
+}), 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;
+    var isValid = typeof value === "string" && value.length > 0 || value instanceof Uint8Array || value instanceof ArrayBuffer;
 
-    if (typeof Blob === 'function') {
+    if (typeof Blob === "function") {
       isValid = isValid || value instanceof Blob;
     }
 
-    return [isValid, 'a non-empty string, an instance of Buffer or an instance of Blob'];
+    return [isValid, "a non-empty string, an instance of Buffer or an instance of Blob"];
   })
-})], ['undefined', 'string', 'number', 'boolean', 'object', declarativeTypeValidator.literal(null)], ['undefined', declarativeTypeValidator.literal(null), declarativeTypeValidator.objectSchema('email attributes', {
-  subject: [declarativeTypeValidator.nonEmptyString, 'undefined']
+})], optionalAttributesValidator, ["undefined", declarativeTypeValidator.literal(null), declarativeTypeValidator.objectSchema("email attributes", {
+  subject: [declarativeTypeValidator.nonEmptyString, "undefined"]
 })]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object, Object, Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "sendMessage", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.literal('default', 'muted')), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Conversation.prototype, "setUserNotificationLevel", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.literal("default", "muted")), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Conversation.prototype, "setUserNotificationLevel", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(['string', 'number', 'boolean', 'object', declarativeTypeValidator.literal(null)]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateAttributes", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(attributesValidator), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateAttributes", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(['string']), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateFriendlyName", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(["string"]), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateFriendlyName", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync([declarativeTypeValidator.literal(null), declarativeTypeValidator.nonNegativeInteger]), __metadata("design:type", Function), __metadata("design:paramtypes", [Number]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateLastReadMessageIndex", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(['string', declarativeTypeValidator.literal(null)]), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateUniqueName", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(["string", declarativeTypeValidator.literal(null)]), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], Conversation.prototype, "updateUniqueName", null);
 
 var Deferred = /*#__PURE__*/function () {
   function Deferred() {
@@ -5400,7 +5629,7 @@ function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) {
 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$2 = Logger.scope('Conversations');
+var log$2 = Logger.scope("Conversations");
 /**
  * Represents conversations collection
  * {@see Conversation}
@@ -5442,12 +5671,12 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                attributes = typeof (options === null || options === void 0 ? void 0 : options.attributes) !== 'undefined' ? options.attributes : {};
+                attributes = typeof (options === null || options === void 0 ? void 0 : options.attributes) !== "undefined" ? options.attributes : {};
                 _context.next = 3;
-                return this.services.commandExecutor.mutateResource('post', this.configuration.links.conversations, {
+                return this.services.commandExecutor.mutateResource("post", this.configuration.links.conversations, {
                   friendly_name: options.friendlyName,
                   unique_name: options.uniqueName,
-                  attributes: typeof attributes !== 'undefined' ? JSON.stringify(attributes) : undefined
+                  attributes: typeof attributes !== "undefined" ? JSON.stringify(attributes) : undefined
                 });
 
               case 3:
@@ -5473,12 +5702,12 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 12:
                 conversation = new Conversation({
                   channel: conversationDocument,
-                  entityName: null,
-                  uniqueName: null,
+                  entityName: "",
+                  uniqueName: "",
                   attributes: null,
-                  createdBy: null,
-                  friendlyName: null,
-                  lastConsumedMessageIndex: null,
+                  createdBy: "",
+                  friendlyName: "",
+                  lastConsumedMessageIndex: 0,
                   dateCreated: null,
                   dateUpdated: null
                 }, conversationSid, links, this.configuration, this.services);
@@ -5490,7 +5719,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return conversation._subscribe();
 
               case 17:
-                this.emit('conversationAdded', conversation);
+                this.emit("conversationAdded", conversation);
                 return _context.abrupt("return", conversation);
 
               case 19:
@@ -5529,12 +5758,12 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 3:
                 map = _context2.sent;
-                map.on('itemAdded', function (args) {
+                map.on("itemAdded", function (args) {
                   log$2.debug("itemAdded: ".concat(args.item.key));
 
-                  _this2._upsertConversation('sync', args.item.key, args.item.data);
+                  _this2._upsertConversation("sync", args.item.key, args.item.data);
                 });
-                map.on('itemRemoved', function (args) {
+                map.on("itemRemoved", function (args) {
                   log$2.debug("itemRemoved: ".concat(args.key));
                   var sid = args.key;
 
@@ -5548,22 +5777,22 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                     return;
                   }
 
-                  if (conversation.status === 'joined') {
-                    conversation._setStatus('notParticipating', 'sync');
+                  if (conversation.status === "joined") {
+                    conversation._setStatus("notParticipating", "sync");
 
-                    _this2.emit('conversationLeft', conversation);
+                    _this2.emit("conversationLeft", conversation);
                   }
 
                   _this2.conversations.delete(sid);
 
-                  _this2.emit('conversationRemoved', conversation);
+                  _this2.emit("conversationRemoved", conversation);
 
-                  conversation.emit('removed', conversation);
+                  conversation.emit("removed", conversation);
                 });
-                map.on('itemUpdated', function (args) {
+                map.on("itemUpdated", function (args) {
                   log$2.debug("itemUpdated: ".concat(args.item.key));
 
-                  _this2._upsertConversation('sync', args.item.key, args.item.data);
+                  _this2._upsertConversation("sync", args.item.key, args.item.data);
                 });
                 _context2.next = 9;
                 return this._fetchMyConversations();
@@ -5576,7 +5805,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 try {
                   for (_iterator.s(); !(_step = _iterator.n()).done;) {
                     conversation = _step.value;
-                    upserts.push(this._upsertConversation('rest', conversation.channel_sid, conversation));
+                    upserts.push(this._upsertConversation("rest", conversation["channel_sid"], conversation));
                   }
                 } catch (err) {
                   _iterator.e(err);
@@ -5591,15 +5820,15 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 16:
                 this.myConversationsFetched = true;
                 this.tombstones.clear();
-                log$2.debug('The conversations list has been successfully fetched');
+                log$2.debug("The conversations list has been successfully fetched");
                 return _context2.abrupt("return", this);
 
               case 22:
                 _context2.prev = 22;
                 _context2.t0 = _context2["catch"](0);
-                errorMessage = 'Failed to fetch the conversations list';
+                errorMessage = "Failed to fetch the conversations list";
 
-                if (this.services.syncClient.connectionState !== 'disconnected') {
+                if (this.services.syncClient.connectionState !== "disconnected") {
                   log$2.error(errorMessage, _context2.t0);
                 }
 
@@ -5623,7 +5852,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getConversations",
     value: function () {
-      var _getConversations = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(args) {
+      var _getConversations = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
         var _this3 = this;
 
         var conversationsMap, page;
@@ -5643,7 +5872,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 page = _context3.sent;
                 return _context3.abrupt("return", this._wrapPaginator(page, function (items) {
                   return Promise.all(items.map(function (item) {
-                    return _this3._upsertConversation('sync', item.key, item.data);
+                    return _this3._upsertConversation("sync", item.key, item.data);
                   }));
                 }));
 
@@ -5655,7 +5884,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee3, this);
       }));
 
-      function getConversations(_x2) {
+      function getConversations() {
         return _getConversations.apply(this, arguments);
       }
 
@@ -5685,7 +5914,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 5:
                 page = _context4.sent;
                 items = page.items.map(function (item) {
-                  return _this4._upsertConversation('sync', item.key, item.data);
+                  return _this4._upsertConversation("sync", item.key, item.data);
                 });
                 return _context4.abrupt("return", items.length > 0 ? items[0] : null);
 
@@ -5697,7 +5926,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee4, this);
       }));
 
-      function getConversation(_x3) {
+      function getConversation(_x2) {
         return _getConversation.apply(this, arguments);
       }
 
@@ -5723,7 +5952,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 data = {
                   entityName: null,
                   lastConsumedMessageIndex: body.last_read_message_index,
-                  status: (body === null || body === void 0 ? void 0 : body.status) || 'unknown',
+                  status: (body === null || body === void 0 ? void 0 : body.status) || "unknown",
                   friendlyName: body.friendly_name,
                   dateUpdated: body.date_updated,
                   dateCreated: body.date_created,
@@ -5734,7 +5963,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   notificationLevel: body === null || body === void 0 ? void 0 : body.notification_level,
                   sid: sid
                 };
-                return _context5.abrupt("return", this._upsertConversation('sync', sid, data));
+                return _context5.abrupt("return", sid ? this._upsertConversation("sync", sid, data) : null);
 
               case 8:
               case "end":
@@ -5744,7 +5973,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee5, this);
       }));
 
-      function getConversationByUniqueName(_x4) {
+      function getConversationByUniqueName(_x3) {
         return _getConversationByUniqueName.apply(this, arguments);
       }
 
@@ -5769,7 +5998,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 data = {
                   entityName: null,
                   // lastConsumedMessageIndex: body.last_read_message_index,
-                  status: (body === null || body === void 0 ? void 0 : body.status) || 'unknown',
+                  status: (body === null || body === void 0 ? void 0 : body.status) || "unknown",
                   friendlyName: body.friendly_name,
                   dateUpdated: body.date_updated,
                   dateCreated: body.date_created,
@@ -5780,7 +6009,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   // notificationLevel: body?.notification_level,
                   sid: sid
                 };
-                return _context6.abrupt("return", this._upsertConversation('sync', sid, data));
+                return _context6.abrupt("return", this._upsertConversation("sync", sid, data));
 
               case 7:
               case "end":
@@ -5790,7 +6019,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee6, this);
       }));
 
-      function peekConversation(_x5) {
+      function peekConversation(_x4) {
         return _peekConversation.apply(this, arguments);
       }
 
@@ -5807,7 +6036,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 _context7.next = 2;
                 return this.services.syncClient.map({
                   id: this.configuration.myConversations,
-                  mode: 'open_existing'
+                  mode: "open_existing"
                 });
 
               case 2:
@@ -5867,7 +6096,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee8);
       }));
 
-      function _wrapPaginator(_x6, _x7) {
+      function _wrapPaginator(_x5, _x6) {
         return _wrapPaginator2.apply(this, arguments);
       }
 
@@ -5885,14 +6114,14 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context9.prev = _context9.next) {
               case 0:
                 areSourcesDifferent = conversation._statusSource() !== undefined && source !== conversation._statusSource();
-                isChannelSourceSync = source !== 'rest' || conversation._statusSource() === 'sync';
+                isChannelSourceSync = source !== "rest" || conversation._statusSource() === "sync";
 
-                if (!(areSourcesDifferent && isChannelSourceSync && source !== 'sync')) {
+                if (!(areSourcesDifferent && isChannelSourceSync && source !== "sync")) {
                   _context9.next = 5;
                   break;
                 }
 
-                log$2.trace('upsertConversation: conversation is known from sync and came from chat, ignoring', {
+                log$2.trace("upsertConversation: conversation is known from sync and came from chat, ignoring", {
                   sid: conversation.sid,
                   data: data.status,
                   conversation: conversation.status
@@ -5900,20 +6129,20 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return _context9.abrupt("return");
 
               case 5:
-                if (!(data.status === 'joined' && conversation.status !== 'joined')) {
+                if (!(data.status === "joined" && conversation.status !== "joined")) {
                   _context9.next = 13;
                   break;
                 }
 
-                conversation._setStatus('joined', source);
+                conversation._setStatus("joined", source);
 
                 updateData = {};
 
-                if (typeof data.notificationLevel !== 'undefined') {
+                if (typeof data.notificationLevel !== "undefined") {
                   updateData.notificationLevel = data.notificationLevel;
                 }
 
-                if (typeof data.lastConsumedMessageIndex !== 'undefined') {
+                if (typeof data.lastConsumedMessageIndex !== "undefined") {
                   updateData.lastConsumedMessageIndex = data.lastConsumedMessageIndex;
                 }
 
@@ -5922,18 +6151,18 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 }
 
                 conversation._subscribe().then(function () {
-                  _this6.emit('conversationJoined', conversation);
+                  _this6.emit("conversationJoined", conversation);
                 });
 
                 return _context9.abrupt("return");
 
               case 13:
-                if (!(data.status === 'notParticipating' && conversation.status === 'joined')) {
+                if (!(data.status === "notParticipating" && conversation.status === "joined")) {
                   _context9.next = 20;
                   break;
                 }
 
-                conversation._setStatus('notParticipating', source);
+                conversation._setStatus("notParticipating", source);
 
                 conversation._update(data);
 
@@ -5941,11 +6170,11 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return conversation._subscribe();
 
               case 18:
-                this.emit('conversationLeft', conversation);
+                this.emit("conversationLeft", conversation);
                 return _context9.abrupt("return");
 
               case 20:
-                if (!(data.status === 'notParticipating')) {
+                if (!(data.status === "notParticipating")) {
                   _context9.next = 24;
                   break;
                 }
@@ -5967,7 +6196,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee9, this);
       }));
 
-      function _updateConversation(_x8, _x9, _x10) {
+      function _updateConversation(_x7, _x8, _x9) {
         return _updateConversation2.apply(this, arguments);
       }
 
@@ -6002,17 +6231,17 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return _context10.abrupt("return", conversation);
 
               case 9:
-                if (!(['chat', 'rest'].includes(source) && this.tombstones.has(sid))) {
+                if (!(["chat", "rest"].includes(source) && this.tombstones.has(sid))) {
                   _context10.next = 12;
                   break;
                 }
 
-                log$2.trace('upsertChannel: the channel is deleted but reappeared again from chat, ignoring', sid);
-                return _context10.abrupt("return");
+                log$2.trace("upsertChannel: the channel is deleted but reappeared again from chat, ignoring", sid);
+                return _context10.abrupt("return", null);
 
               case 12:
                 // If the conversation is unknown, fetch it
-                log$2.trace('upsertConversation: creating a local conversation object with sid ' + sid, data);
+                log$2.trace("upsertConversation: creating a local conversation object with sid " + sid, data);
                 baseLink = "".concat(this.configuration.links.conversations, "/").concat(sid);
                 links = {
                   self: baseLink,
@@ -6027,12 +6256,12 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 19:
                 this._registerForEvents(newConversation);
 
-                this.emit('conversationAdded', newConversation);
+                this.emit("conversationAdded", newConversation);
 
-                if (data.status === 'joined') {
-                  newConversation._setStatus('joined', source);
+                if (data.status === "joined") {
+                  newConversation._setStatus("joined", source);
 
-                  this.emit('conversationJoined', newConversation);
+                  this.emit("conversationJoined", newConversation);
                 }
 
                 return _context10.abrupt("return", newConversation);
@@ -6045,7 +6274,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee10, this);
       }));
 
-      function _upsertConversation(_x11, _x12, _x13) {
+      function _upsertConversation(_x10, _x11, _x12) {
         return _upsertConversation2.apply(this, arguments);
       }
 
@@ -6055,7 +6284,8 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "_fetchMyConversations",
     value: function () {
       var _fetchMyConversations2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee11() {
-        var conversations, pageToken, url, response, receivedConversations;
+        var conversations, pageToken, _response$body, url, response, receivedConversations;
+
         return _regeneratorRuntime__default['default'].wrap(function _callee11$(_context11) {
           while (1) {
             switch (_context11.prev = _context11.next) {
@@ -6067,7 +6297,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 url = new UriBuilder(this.configuration.links.myConversations);
 
                 if (pageToken) {
-                  url.arg('PageToken', pageToken);
+                  url.arg("PageToken", pageToken);
                 }
 
                 _context11.next = 6;
@@ -6075,7 +6305,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 6:
                 response = _context11.sent;
-                receivedConversations = response.body.conversations.map(function (conversationDescriptor) {
+                receivedConversations = (_response$body = response.body) === null || _response$body === void 0 ? void 0 : _response$body.conversations.map(function (conversationDescriptor) {
                   return {
                     descriptor: conversationDescriptor,
                     channel_sid: conversationDescriptor.conversation_sid,
@@ -6083,7 +6313,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                     channel: conversationDescriptor.sync_objects.conversation,
                     messages: conversationDescriptor.sync_objects.messages,
                     roster: "".concat(conversationDescriptor.conversation_sid, ".roster"),
-                    lastConsumedMessageIndex: conversationDescriptor.last_consumed_message_index,
+                    lastConsumedMessageIndex: conversationDescriptor.last_read_message_index,
                     notificationLevel: conversationDescriptor.notification_level
                   };
                 });
@@ -6120,7 +6350,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       if (conversation) {
         this.conversations.delete(sid);
-        this.emit('conversationRemoved', conversation);
+        this.emit("conversationRemoved", conversation);
       }
     }
   }, {
@@ -6128,24 +6358,36 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
     value: function _registerForEvents(conversation) {
       var _this7 = this;
 
-      conversation.on('removed', function () {
+      conversation.on("removed", function () {
         return _this7._onConversationRemoved(conversation.sid);
       });
-      conversation.on('updated', function (args) {
-        return _this7.emit('conversationUpdated', args);
+      conversation.on("updated", function (args) {
+        return _this7.emit("conversationUpdated", args);
+      });
+      conversation.on("participantJoined", function (participant) {
+        return _this7.emit("participantJoined", participant);
+      });
+      conversation.on("participantLeft", function (participant) {
+        return _this7.emit("participantLeft", participant);
+      });
+      conversation.on("participantUpdated", function (args) {
+        return _this7.emit("participantUpdated", args);
+      });
+      conversation.on("messageAdded", function (message) {
+        return _this7.emit("messageAdded", message);
       });
-      conversation.on('participantJoined', this.emit.bind(this, 'participantJoined'));
-      conversation.on('participantLeft', this.emit.bind(this, 'participantLeft'));
-      conversation.on('participantUpdated', function (args) {
-        return _this7.emit('participantUpdated', args);
+      conversation.on("messageUpdated", function (args) {
+        return _this7.emit("messageUpdated", args);
       });
-      conversation.on('messageAdded', this.emit.bind(this, 'messageAdded'));
-      conversation.on('messageUpdated', function (args) {
-        return _this7.emit('messageUpdated', args);
+      conversation.on("messageRemoved", function (message) {
+        return _this7.emit("messageRemoved", message);
+      });
+      conversation.on("typingStarted", function (participant) {
+        return _this7.emit("typingStarted", participant);
+      });
+      conversation.on("typingEnded", function (participant) {
+        return _this7.emit("typingEnded", participant);
       });
-      conversation.on('messageRemoved', this.emit.bind(this, 'messageRemoved'));
-      conversation.on('typingStarted', this.emit.bind(this, 'typingStarted'));
-      conversation.on('typingEnded', this.emit.bind(this, 'typingEnded'));
     }
   }]);
 
@@ -6175,16 +6417,16 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
     _this.fifoStack = [];
     _this.myself = myself;
 
-    _this.myself.on('updated', function (args) {
-      return _this.emit('userUpdated', args);
+    _this.myself.on("updated", function (args) {
+      return _this.emit("userUpdated", args);
     });
 
-    _this.myself.on('userSubscribed', function () {
-      return _this.emit('userSubscribed', _this.myself);
+    _this.myself.on("userSubscribed", function () {
+      return _this.emit("userSubscribed", _this.myself);
     });
 
-    _this.myself.on('userUnsubscribed', function () {
-      _this.emit('userUnsubscribed', _this.myself);
+    _this.myself.on("userUnsubscribed", function () {
+      _this.emit("userUnsubscribed", _this.myself);
 
       _this.myself._ensureFetched();
     });
@@ -6200,7 +6442,7 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
         this.subscribedUsers.delete(user.identity);
       }
 
-      var foundItemIndex = -1;
+      var foundItemIndex = 0;
       var foundItem = this.fifoStack.find(function (item, index) {
         if (item == user.identity) {
           foundItemIndex = index;
@@ -6214,7 +6456,7 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
         this.fifoStack.splice(foundItemIndex, 1);
       }
 
-      this.emit('userUnsubscribed', user);
+      this.emit("userUnsubscribed", user);
     }
   }, {
     key: "handleSubscribeUser",
@@ -6224,12 +6466,15 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
       }
 
       if (this.fifoStack.length >= this.configuration.userInfosToSubscribe) {
-        this.subscribedUsers.get(this.fifoStack.shift()).unsubscribe();
+        var _this$subscribedUsers, _this$subscribedUsers2;
+
+        var item = this.fifoStack.shift();
+        (_this$subscribedUsers = this.subscribedUsers) === null || _this$subscribedUsers === void 0 ? void 0 : (_this$subscribedUsers2 = _this$subscribedUsers.get(item)) === null || _this$subscribedUsers2 === void 0 ? void 0 : _this$subscribedUsers2.unsubscribe();
       }
 
       this.fifoStack.push(user.identity);
       this.subscribedUsers.set(user.identity, user);
-      this.emit('userSubscribed', user);
+      this.emit("userSubscribed", user);
     }
     /**
      * Gets user, if it's in subscribed list - then return the user object from it,
@@ -6240,65 +6485,74 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "getUser",
     value: function () {
-      var _getUser = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(identity) {
+      var _getUser = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
         var _this2 = this;
 
-        var entityName,
+        var identity,
+            entityName,
             user,
+            newUser,
             _args = arguments;
         return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                entityName = _args.length > 1 && _args[1] !== undefined ? _args[1] : null;
-                _context.next = 3;
+                identity = _args.length > 0 && _args[0] !== undefined ? _args[0] : "";
+                entityName = _args.length > 1 && _args[1] !== undefined ? _args[1] : "";
+                _context.next = 4;
                 return this.myself._ensureFetched();
 
-              case 3:
+              case 4:
                 if (!(identity == this.myself.identity)) {
-                  _context.next = 5;
+                  _context.next = 6;
                   break;
                 }
 
                 return _context.abrupt("return", this.myself);
 
-              case 5:
+              case 6:
                 user = this.subscribedUsers.get(identity);
 
-                if (user) {
-                  _context.next = 17;
+                if (!user) {
+                  _context.next = 9;
                   break;
                 }
 
-                if (entityName) {
-                  _context.next = 11;
+                return _context.abrupt("return", user);
+
+              case 9:
+                _context.t0 = entityName;
+
+                if (_context.t0) {
+                  _context.next = 14;
                   break;
                 }
 
-                _context.next = 10;
+                _context.next = 13;
                 return this.getSyncUniqueName(identity);
 
-              case 10:
-                entityName = _context.sent;
+              case 13:
+                _context.t0 = _context.sent;
 
-              case 11:
-                user = new User(identity, entityName, this.configuration, this.services);
-                user.on('updated', function (args) {
-                  return _this2.emit('userUpdated', args);
+              case 14:
+                entityName = _context.t0;
+                newUser = new User(identity, entityName, this.configuration, this.services);
+                newUser.on("updated", function (args) {
+                  return _this2.emit("userUpdated", args);
                 });
-                user.on('userSubscribed', function () {
-                  return _this2.handleSubscribeUser(user);
+                newUser.on("userSubscribed", function () {
+                  return _this2.handleSubscribeUser(newUser);
                 });
-                user.on('userUnsubscribed', function () {
-                  return _this2.handleUnsubscribeUser(user);
+                newUser.on("userUnsubscribed", function () {
+                  return _this2.handleUnsubscribeUser(newUser);
                 });
-                _context.next = 17;
-                return user._ensureFetched();
+                _context.next = 21;
+                return newUser._ensureFetched();
 
-              case 17:
-                return _context.abrupt("return", user);
+              case 21:
+                return _context.abrupt("return", newUser);
 
-              case 18:
+              case 22:
               case "end":
                 return _context.stop();
             }
@@ -6306,7 +6560,7 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee, this);
       }));
 
-      function getUser(_x) {
+      function getUser() {
         return _getUser.apply(this, arguments);
       }
 
@@ -6357,6 +6611,8 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "getSyncUniqueName",
     value: function () {
       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) {
           while (1) {
@@ -6368,7 +6624,7 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 3:
                 response = _context3.sent;
-                return _context3.abrupt("return", response.body.sync_objects.user_info_map);
+                return _context3.abrupt("return", (_response$body$sync_o = (_response$body = response.body) === null || _response$body === void 0 ? void 0 : _response$body.sync_objects.user_info_map) !== null && _response$body$sync_o !== void 0 ? _response$body$sync_o : "");
 
               case 5:
               case "end":
@@ -6378,7 +6634,7 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee3, this);
       }));
 
-      function getSyncUniqueName(_x2) {
+      function getSyncUniqueName(_x) {
         return _getSyncUniqueName.apply(this, arguments);
       }
 
@@ -6389,7 +6645,7 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
   return Users;
 }(replayEventEmitter.ReplayEventEmitter);
 
-var log$1 = Logger.scope('TypingIndicator');
+var log$1 = Logger.scope("TypingIndicator");
 /**
  * An important note in regards to typing timeout timers. There are two places that the SDK can get the "typing_timeout" attribute from. The first
  * place that the attribute appears in is the response received from POST -> /v1/typing REST call. In the body of that response, the value of the
@@ -6436,7 +6692,7 @@ var TypingIndicator = /*#__PURE__*/function () {
       var _this = this;
 
       // this.services.notificationClient.subscribe(NotificationTypes.TYPING_INDICATOR, 'twilsock');
-      this.services.notificationClient.on('message', /*#__PURE__*/function () {
+      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) {
             while (1) {
@@ -6477,7 +6733,7 @@ var TypingIndicator = /*#__PURE__*/function () {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                log$1.trace('Got new typing indicator ', message);
+                log$1.trace("Got new typing indicator ", message);
                 this.getConversation(message.channel_sid).then(function (conversation) {
                   if (!conversation) {
                     return;
@@ -6488,7 +6744,7 @@ var TypingIndicator = /*#__PURE__*/function () {
                       return;
                     }
 
-                    var timeout = _this2.configuration.typingIndicatorTimeoutOverride + 1000 || message.typing_timeout * 1000;
+                    var timeout = _this2.configuration.typingIndicatorTimeoutOverride ? _this2.configuration.typingIndicatorTimeoutOverride + 1000 : message.typing_timeout * 1000;
 
                     participant._startTyping(timeout);
                   });
@@ -6533,18 +6789,18 @@ var TypingIndicator = /*#__PURE__*/function () {
     value: function _send(conversationSid) {
       var _this3 = this;
 
-      log$1.trace('Sending typing indicator');
+      log$1.trace("Sending typing indicator");
       var url = this.configuration.links.typing;
       var headers = {
-        'Content-Type': 'application/x-www-form-urlencoded'
+        "Content-Type": "application/x-www-form-urlencoded"
       };
       var body = "ChannelSid=".concat(conversationSid);
       return this.services.twilsockClient.post(url, headers, body, this.configuration.productId).then(function (response) {
-        if (response.body.hasOwnProperty('typing_timeout')) {
+        if (response.body.hasOwnProperty("typing_timeout")) {
           _this3.serviceTypingTimeout = response.body.typing_timeout * 1000;
         }
       }).catch(function (err) {
-        log$1.error('Failed to send typing indicator:', err);
+        log$1.error("Failed to send typing indicator:", err);
         throw err;
       });
     }
@@ -6600,14 +6856,14 @@ function PushNotification(data) {
   this.data = data.data || {};
 };
 
-var version = "2.0.1";
+var version = "2.1.0-rc.6";
 
 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 _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; }
 
 var trimSlashes = function trimSlashes(url) {
-  return url.replace(/(^\/+|\/+$)/g, '');
+  return url.replace(/(^\/+|\/+$)/g, "");
 };
 
 var isMutationConflictResponse = function isMutationConflictResponse(response) {
@@ -6645,19 +6901,19 @@ var CommandExecutor = /*#__PURE__*/function () {
               case 0:
                 preProcessedUrl = this._preProcessUrl(url);
                 finalHeaders = _objectSpread$1({
-                  'Content-Type': 'application/json; charset=utf-8'
+                  "Content-Type": "application/json; charset=utf-8"
                 }, headers || {});
                 _context.t0 = method;
-                _context.next = _context.t0 === 'get' ? 5 : _context.t0 === 'post' ? 11 : _context.t0 === 'delete' ? 15 : 19;
+                _context.next = _context.t0 === "get" ? 5 : _context.t0 === "post" ? 11 : _context.t0 === "delete" ? 15 : 19;
                 break;
 
               case 5:
                 getUrl = preProcessedUrl;
 
                 if (requestBody) {
-                  getUrl += '?' + Object.entries(requestBody).map(function (entry) {
-                    return entry.map(encodeURIComponent).join('=');
-                  }).join('&');
+                  getUrl += "?" + Object.entries(requestBody).map(function (entry) {
+                    return entry.map(encodeURIComponent).join("=");
+                  }).join("&");
                 }
 
                 _context.next = 9;
@@ -6677,7 +6933,7 @@ var CommandExecutor = /*#__PURE__*/function () {
 
               case 15:
                 _context.next = 17;
-                return this._services.transport.delete(preProcessedUrl, finalHeaders, null, this._productId);
+                return this._services.transport.delete(preProcessedUrl, finalHeaders, {}, this._productId);
 
               case 17:
                 response = _context.sent;
@@ -6727,28 +6983,24 @@ var CommandExecutor = /*#__PURE__*/function () {
                   max: 1600,
                   maxAttemptsCount: maxAttemptsCount
                 }).run(function () {
-                  return _this._makeRequest('get', url, requestBody);
+                  return _this._makeRequest("get", url, requestBody);
                 });
 
               case 4:
                 result = _context2.sent;
-                _context2.next = 10;
-                break;
+                return _context2.abrupt("return", result.body);
 
-              case 7:
-                _context2.prev = 7;
+              case 8:
+                _context2.prev = 8;
                 _context2.t0 = _context2["catch"](1);
                 throw new Error("Fetch resource from \"".concat(url, "\" failed."));
 
-              case 10:
-                return _context2.abrupt("return", result.body);
-
               case 11:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, null, [[1, 7]]);
+        }, _callee2, null, [[1, 8]]);
       }));
 
       function fetchResource(_x5, _x6) {
@@ -6768,7 +7020,7 @@ var CommandExecutor = /*#__PURE__*/function () {
               case 0:
                 _context3.next = 2;
                 return this._makeRequest(method, url, requestBody, {
-                  'X-Twilio-Mutation-Id': uuid.v4()
+                  "X-Twilio-Mutation-Id": uuid.v4()
                 });
 
               case 2:
@@ -6818,7 +7070,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 var Client_1;
-var log = Logger.scope('Client');
+var log = Logger.scope("Client");
 var SDK_VERSION = version;
 
 var ClientServices = function ClientServices() {
@@ -6866,22 +7118,14 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
     _this = _super.call(this);
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "connectionState", 'unknown');
-
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "conversationsPromise", null);
-
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "_ensureReady", null);
-
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "_resolveEnsureReady", null);
-
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "_rejectEnsureReady", null);
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "connectionState", "unknown");
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "version", SDK_VERSION);
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "parsePushNotification", Client_1.parsePushNotification);
 
-    _this.fpaToken = fpaToken;
-    _this.options = options;
+    _this.fpaToken = fpaToken !== null && fpaToken !== void 0 ? fpaToken : "";
+    _this.options = options !== null && options !== void 0 ? options : {};
 
     if (!_this.options.disableDeepClone) {
       var _options = _objectSpread(_objectSpread({}, _this.options), {}, {
@@ -6895,25 +7139,25 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
       _this.options = _options;
     }
 
-    _this.options.logLevel = (_this$options$logLeve = _this.options.logLevel) !== null && _this$options$logLeve !== void 0 ? _this$options$logLeve : 'silent';
+    _this.options.logLevel = (_this$options$logLeve = _this.options.logLevel) !== null && _this$options$logLeve !== void 0 ? _this$options$logLeve : "silent";
     log.setLevel(_this.options.logLevel);
-    var productId = _this.options.productId = 'ip_messaging'; // Filling ClientMetadata
+    var productId = _this.options.productId = "ip_messaging"; // Filling ClientMetadata
 
     _this.options.clientMetadata = _this.options.clientMetadata || {};
 
-    if (!_this.options.clientMetadata.hasOwnProperty('type')) {
-      _this.options.clientMetadata.type = 'conversations';
+    if (!_this.options.clientMetadata.hasOwnProperty("type")) {
+      _this.options.clientMetadata.type = "conversations";
     }
 
-    if (!_this.options.clientMetadata.hasOwnProperty('sdk')) {
-      _this.options.clientMetadata.sdk = 'JS';
+    if (!_this.options.clientMetadata.hasOwnProperty("sdk")) {
+      _this.options.clientMetadata.sdk = "JS";
       _this.options.clientMetadata.sdkv = SDK_VERSION;
     } // Enable session local storage for Sync
 
 
     _this.options.Sync = _this.options.Sync || {};
 
-    if (typeof _this.options.Sync.enableSessionStorage === 'undefined') {
+    if (typeof _this.options.Sync.enableSessionStorage === "undefined") {
       _this.options.Sync.enableSessionStorage = true;
     }
 
@@ -6922,11 +7166,11 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
     }
 
     if (!fpaToken) {
-      throw new Error('A valid Twilio token should be provided');
+      throw new Error("A valid Twilio token should be provided");
     }
 
     _this.services = new ClientServices();
-    _this._myself = new User('', '', null, _this.services);
+    _this._myself = new User("", "", null, _this.services);
     var startTwilsock = !_this.options.twilsockClient; // Create default init registrations if none were provided.
     // Otherwise, the outside party have to list all the init registrations they
     // need.
@@ -6941,34 +7185,34 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
     _this.services.twilsockClient = _this.options.twilsockClient = (_this$options$twilsoc = _this.options.twilsockClient) !== null && _this$options$twilsoc !== void 0 ? _this$options$twilsoc : new twilsock.TwilsockClient(fpaToken, productId, _this.options);
 
-    _this.services.twilsockClient.on('tokenAboutToExpire', function (ttl) {
-      return _this.emit('tokenAboutToExpire', ttl);
+    _this.services.twilsockClient.on("tokenAboutToExpire", function (ttl) {
+      return _this.emit("tokenAboutToExpire", ttl);
     });
 
-    _this.services.twilsockClient.on('tokenExpired', function () {
-      return _this.emit('tokenExpired');
+    _this.services.twilsockClient.on("tokenExpired", function () {
+      return _this.emit("tokenExpired");
     });
 
-    _this.services.twilsockClient.on('connectionError', function (error) {
-      return _this.emit('connectionError', error);
+    _this.services.twilsockClient.on("connectionError", function (error) {
+      return _this.emit("connectionError", error);
     });
 
-    _this.services.twilsockClient.on('stateChanged', function (state) {
+    _this.services.twilsockClient.on("stateChanged", function (state) {
       log.debug("Handling stateChanged for ConversationsClient: new state ".concat(state));
 
       if (state !== _this.connectionState) {
         _this.connectionState = state;
 
-        _this.emit('connectionStateChanged', _this.connectionState);
+        _this.emit("connectionStateChanged", _this.connectionState);
       }
     });
 
     _this.services.transport = _this.options.transport = (_this$options$transpo = _this.options.transport) !== null && _this$options$transpo !== void 0 ? _this$options$transpo : _this.options.twilsockClient;
     _this.services.notificationClient = _this.options.notificationsClient = (_this$options$notific = _this.options.notificationsClient) !== null && _this$options$notific !== void 0 ? _this$options$notific : new notifications.Notifications(fpaToken, _this.options);
     _this.services.syncClient = _this.options.syncClient = (_this$options$syncCli = _this.options.syncClient) !== null && _this$options$syncCli !== void 0 ? _this$options$syncCli : new twilioSync.SyncClient(fpaToken, _this.options);
-    var configurationOptions = options.Chat || options.IPMessaging || options || {};
-    var region = configurationOptions.region || options.region;
-    var baseUrl = configurationOptions.apiUri || configurationOptions.typingUri || "https://aim.".concat(region || 'us1', ".twilio.com");
+    var configurationOptions = (options === null || options === void 0 ? void 0 : options.Chat) || (options === null || options === void 0 ? void 0 : options.IPMessaging) || options || {};
+    var region = configurationOptions.region || (options === null || options === void 0 ? void 0 : options.region);
+    var baseUrl = configurationOptions.apiUri || configurationOptions.typingUri || "https://aim.".concat(region || "us1", ".twilio.com");
     _this.services.commandExecutor = new CommandExecutor(baseUrl, {
       transport: _this.options.transport
     }, productId);
@@ -6976,15 +7220,15 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
     var emitFailed = function emitFailed(err) {
       _this._rejectEnsureReady(err);
 
-      _this.emit('stateChanged', 'failed');
+      _this.emit("stateChanged", "failed");
     };
 
-    _this.services.twilsockClient.once('connectionError', emitFailed);
+    _this.services.twilsockClient.once("connectionError", emitFailed);
 
-    _this.services.twilsockClient.once('disconnected', emitFailed); // ConversationsClient will be able to initialize only after twilsock is connected
+    _this.services.twilsockClient.once("disconnected", emitFailed); // ConversationsClient will be able to initialize only after twilsock is connected
 
 
-    _this.services.twilsockClient.once('connected', /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+    _this.services.twilsockClient.once("connected", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
       var startupEvent;
       return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
         while (1) {
@@ -6992,20 +7236,20 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
             case 0:
               log.debug("ConversationsClient started INITIALIZING");
 
-              _this.services.twilsockClient.off('connectionError', emitFailed);
+              _this.services.twilsockClient.off("connectionError", emitFailed);
 
-              _this.services.twilsockClient.off('disconnected', emitFailed);
+              _this.services.twilsockClient.off("disconnected", emitFailed);
 
               _context.prev = 3;
-              startupEvent = 'conversations.client.startup';
+              startupEvent = "conversations.client.startup";
 
-              _this.services.twilsockClient.addPartialTelemetryEvent(new twilsock.TelemetryEventDescription(startupEvent, 'Conversations client startup', new Date()), startupEvent, twilsock.TelemetryPoint.Start);
+              _this.services.twilsockClient.addPartialTelemetryEvent(new twilsock.TelemetryEventDescription(startupEvent, "Conversations client startup", new Date()), startupEvent, twilsock.TelemetryPoint.Start);
 
               _context.next = 8;
               return _this._initialize();
 
             case 8:
-              _this.services.twilsockClient.addPartialTelemetryEvent(new twilsock.TelemetryEventDescription('', '', new Date()), startupEvent, twilsock.TelemetryPoint.End);
+              _this.services.twilsockClient.addPartialTelemetryEvent(new twilsock.TelemetryEventDescription("", "", new Date()), startupEvent, twilsock.TelemetryPoint.End);
 
               _context.next = 15;
               break;
@@ -7017,7 +7261,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
               // Fail ChatClient if initialization is incomplete
               _this._rejectEnsureReady(_context.t0);
 
-              _this.emit('stateChanged', 'failed');
+              _this.emit("stateChanged", "failed");
 
             case 15:
             case "end":
@@ -7030,7 +7274,9 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
     _this._ensureReady = new Promise(function (resolve, reject) {
       _this._resolveEnsureReady = resolve;
       _this._rejectEnsureReady = reject;
-    }).catch(function (err) {}); // @todo How to process unhandled rejection here?
+    }).catch(function () {
+      return void 0;
+    }); // @todo How to process unhandled rejection here?
 
     if (startTwilsock) {
       _this.services.twilsockClient.connect();
@@ -7059,7 +7305,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
     key: "reachabilityEnabled",
     get: function get() {
       if (!this.configuration) {
-        throw new Error('Reachability information could not yet be accessed as the client ' + "has not yet been initialized. Subscribe to the 'stateChanged' event " + 'to properly react to the client initialization.');
+        throw new Error("Reachability information could not yet be accessed as the client " + "has not yet been initialized. Subscribe to the 'stateChanged' event " + "to properly react to the client initialization.");
       }
 
       return this.configuration.reachabilityEnabled;
@@ -7099,7 +7345,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
             switch (_context2.prev = _context2.next) {
               case 0:
                 _context2.next = 2;
-                return this.services.commandExecutor.fetchResource('Client/v2/Configuration');
+                return this.services.commandExecutor.fetchResource("Client/v2/Configuration");
 
               case 2:
                 configurationResponse = _context2.sent;
@@ -7110,31 +7356,55 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 this.services.typingIndicator = new TypingIndicator(this.getConversationBySid.bind(this), this.configuration, this.services);
                 this.services.network = new Network(this.configuration, this.services);
                 this.services.users = new Users(this._myself, this.configuration, this.services);
-                this.services.users.on('userSubscribed', this.emit.bind(this, 'userSubscribed'));
-                this.services.users.on('userUpdated', function (args) {
-                  return _this4.emit('userUpdated', args);
+                this.services.users.on("userSubscribed", function (user) {
+                  _this4.emit("userSubscribed", user);
+                });
+                this.services.users.on("userUpdated", function (args) {
+                  return _this4.emit("userUpdated", args);
+                });
+                this.services.users.on("userUnsubscribed", function (user) {
+                  _this4.emit("userUnsubscribed", user);
                 });
-                this.services.users.on('userUnsubscribed', this.emit.bind(this, 'userUnsubscribed'));
                 this.conversations = new Conversations(this.configuration, this.services);
-                this.conversations.on('conversationAdded', this.emit.bind(this, 'conversationAdded'));
-                this.conversations.on('conversationRemoved', this.emit.bind(this, 'conversationRemoved'));
-                this.conversations.on('conversationJoined', this.emit.bind(this, 'conversationJoined'));
-                this.conversations.on('conversationLeft', this.emit.bind(this, 'conversationLeft'));
-                this.conversations.on('conversationUpdated', function (args) {
-                  return _this4.emit('conversationUpdated', args);
+                this.conversations.on("conversationAdded", function (conversation) {
+                  _this4.emit("conversationAdded", conversation);
+                });
+                this.conversations.on("conversationRemoved", function (conversation) {
+                  _this4.emit("conversationRemoved", conversation);
+                });
+                this.conversations.on("conversationJoined", function (conversation) {
+                  _this4.emit("conversationJoined", conversation);
+                });
+                this.conversations.on("conversationLeft", function (conversation) {
+                  _this4.emit("conversationLeft", conversation);
+                });
+                this.conversations.on("conversationUpdated", function (args) {
+                  return _this4.emit("conversationUpdated", args);
+                });
+                this.conversations.on("participantJoined", function (participant) {
+                  _this4.emit("participantJoined", participant);
+                });
+                this.conversations.on("participantLeft", function (participant) {
+                  _this4.emit("participantLeft", participant);
+                });
+                this.conversations.on("participantUpdated", function (args) {
+                  return _this4.emit("participantUpdated", args);
+                });
+                this.conversations.on("messageAdded", function (message) {
+                  return _this4.emit("messageAdded", message);
+                });
+                this.conversations.on("messageUpdated", function (args) {
+                  return _this4.emit("messageUpdated", args);
+                });
+                this.conversations.on("messageRemoved", function (message) {
+                  return _this4.emit("messageRemoved", message);
                 });
-                this.conversations.on('participantJoined', this.emit.bind(this, 'participantJoined'));
-                this.conversations.on('participantLeft', this.emit.bind(this, 'participantLeft'));
-                this.conversations.on('participantUpdated', function (args) {
-                  return _this4.emit('participantUpdated', args);
+                this.conversations.on("typingStarted", function (participant) {
+                  return _this4.emit("typingStarted", participant);
                 });
-                this.conversations.on('messageAdded', this.emit.bind(this, 'messageAdded'));
-                this.conversations.on('messageUpdated', function (args) {
-                  return _this4.emit('messageUpdated', args);
+                this.conversations.on("typingEnded", function (participant) {
+                  return _this4.emit("typingEnded", participant);
                 });
-                this.conversations.on('messageRemoved', this.emit.bind(this, 'messageRemoved'));
-                this.conversations.on('typingStarted', this.emit.bind(this, 'typingStarted'));
-                this.conversations.on('typingEnded', this.emit.bind(this, 'typingEnded'));
                 this.conversationsPromise = this.conversations.fetchConversations().then(function () {
                   return _this4.conversations;
                 }).catch(function (error) {
@@ -7149,12 +7419,12 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 });
                 this.services.typingIndicator.initialize();
                 this.services.mcsClient = new mcsClient.McsClient(this.fpaToken, this.configuration.links.mediaService, this.configuration.links.mediaSetService, _objectSpread(_objectSpread({}, this.options), {}, {
-                  transport: null
+                  transport: undefined
                 }));
 
                 this._resolveEnsureReady();
 
-                this.emit('stateChanged', 'initialized');
+                this.emit("stateChanged", "initialized");
 
               case 33:
               case "end":
@@ -7220,7 +7490,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 return this._ensureReady;
 
               case 2:
-                log.info('updateToken');
+                log.info("updateToken");
 
                 if (!(this.fpaToken === token)) {
                   _context4.next = 5;
@@ -7382,7 +7652,7 @@ 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(args) {
+      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) {
@@ -7392,7 +7662,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
               case 2:
                 return _context7.abrupt("return", this.conversationsPromise.then(function (conversations) {
-                  return conversations.getConversations(args);
+                  return conversations.getConversations();
                 }));
 
               case 3:
@@ -7403,7 +7673,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee7, this);
       }));
 
-      function getSubscribedConversations(_x4) {
+      function getSubscribedConversations() {
         return _getSubscribedConversations.apply(this, arguments);
       }
 
@@ -7440,7 +7710,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee8, this);
       }));
 
-      function createConversation(_x5) {
+      function createConversation(_x4) {
         return _createConversation.apply(this, arguments);
       }
 
@@ -7478,7 +7748,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee9, this);
       }));
 
-      function setPushRegistrationId(_x6, _x7) {
+      function setPushRegistrationId(_x5, _x6) {
         return _setPushRegistrationId.apply(this, arguments);
       }
 
@@ -7515,7 +7785,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee10, this);
       }));
 
-      function unsetPushRegistrationId(_x8) {
+      function unsetPushRegistrationId(_x7) {
         return _unsetPushRegistrationId.apply(this, arguments);
       }
 
@@ -7551,7 +7821,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee11, this);
       }));
 
-      function removePushRegistrations(_x9, _x10) {
+      function removePushRegistrations(_x8, _x9) {
         return _removePushRegistrations.apply(this, arguments);
       }
 
@@ -7574,8 +7844,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 return this._ensureReady;
 
               case 2:
-                log.debug('handlePushNotification, notificationPayload=', notificationPayload);
-                this.emit('pushNotification', Client_1.parsePushNotification(notificationPayload));
+                log.debug("handlePushNotification, notificationPayload=", notificationPayload);
+                this.emit("pushNotification", Client_1.parsePushNotification(notificationPayload));
 
               case 4:
               case "end":
@@ -7585,7 +7855,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee12, this);
       }));
 
-      function handlePushNotification(_x11) {
+      function handlePushNotification(_x10) {
         return _handlePushNotification.apply(this, arguments);
       }
 
@@ -7620,7 +7890,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee13, this);
       }));
 
-      function getUser(_x12) {
+      function getUser(_x11) {
         return _getUser.apply(this, arguments);
       }
 
@@ -7707,7 +7977,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                   break;
                 }
 
-                throw new Error('Obsolete usage of ConversationsClient.create() ' + 'factory method: if you pass twilsock from the outside then you must ' + 'use ConversationsClient constructor and be prepared to work with ' + 'uninitialized client.');
+                throw new Error("Obsolete usage of ConversationsClient.create() " + "factory method: if you pass twilsock from the outside then you must " + "use ConversationsClient constructor and be prepared to work with " + "uninitialized client.");
 
               case 2:
                 client = new Client_1(token, options);
@@ -7725,7 +7995,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee15);
       }));
 
-      function create(_x13, _x14) {
+      function create(_x12, _x13) {
         return _create.apply(this, arguments);
       }
 
@@ -7737,11 +8007,11 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
       var result = {};
 
       for (var key in Client_1.supportedPushDataFields) {
-        if (typeof data[key] === 'undefined' || data[key] === null) {
+        if (typeof data[key] === "undefined" || data[key] === null) {
           continue;
         }
 
-        if (key !== 'message_index') {
+        if (key !== "message_index") {
           result[Client_1.supportedPushDataFields[key]] = data[key];
           continue;
         }
@@ -7761,19 +8031,19 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   }, {
     key: "parsePushNotification",
     value: function parsePushNotification(notificationPayload) {
-      log.debug('parsePushNotification, notificationPayload=', notificationPayload); // APNS specifics
+      log.debug("parsePushNotification, notificationPayload=", notificationPayload); // APNS specifics
 
-      if (typeof notificationPayload.aps !== 'undefined') {
+      if (typeof notificationPayload.aps !== "undefined") {
         if (!notificationPayload.twi_message_type) {
-          throw new Error('Provided push notification payload does not contain Programmable Chat push notification type');
+          throw new Error("Provided push notification payload does not contain Programmable Chat push notification type");
         }
 
         var data = Client_1.parsePushNotificationChatData(notificationPayload);
         var apsPayload = notificationPayload.aps;
-        var body = null;
+        var body;
         var title = null;
 
-        if (typeof apsPayload.alert === 'string') {
+        if (typeof apsPayload.alert === "string") {
           body = apsPayload.alert || null;
         } else {
           body = apsPayload.alert.body || null;
@@ -7792,11 +8062,11 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
       } // FCM specifics
 
 
-      if (typeof notificationPayload.data !== 'undefined') {
+      if (typeof notificationPayload.data !== "undefined") {
         var dataPayload = notificationPayload.data;
 
         if (!dataPayload.twi_message_type) {
-          throw new Error('Provided push notification payload does not contain Programmable Chat push notification type');
+          throw new Error("Provided push notification payload does not contain Programmable Chat push notification type");
         }
 
         var _data = Client_1.parsePushNotificationChatData(notificationPayload.data);
@@ -7812,16 +8082,16 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         });
       }
 
-      throw new Error('Provided push notification payload is not Programmable Chat notification');
+      throw new Error("Provided push notification payload is not Programmable Chat notification");
     }
   }]);
 
   return Client;
-}(replayEventEmitter.ReplayEventEmitter), _defineProperty__default['default'](_class, "version", SDK_VERSION), _defineProperty__default['default'](_class, "supportedPushChannels", ['fcm', 'apn']), _defineProperty__default['default'](_class, "supportedPushDataFields", {
-  'conversation_sid': 'conversationSid',
-  'message_sid': 'messageSid',
-  'message_index': 'messageIndex'
-}), _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'), _temp);
+}(replayEventEmitter.ReplayEventEmitter), _defineProperty__default['default'](_class, "version", SDK_VERSION), _defineProperty__default['default'](_class, "supportedPushChannels", ["fcm", "apn"]), _defineProperty__default['default'](_class, "supportedPushDataFields", {
+  conversation_sid: "conversationSid",
+  message_sid: "messageSid",
+  message_index: "messageIndex"
+}), _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"), _temp);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "updateToken", null);
 
@@ -7829,27 +8099,27 @@ __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "getConversationByUniqueName", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(['undefined', declarativeTypeValidator.objectSchema('conversation options', {
-  friendlyName: ['string', 'undefined'],
-  isPrivate: ['boolean', 'undefined'],
-  uniqueName: ['string', 'undefined']
+__decorate([declarativeTypeValidator.validateTypesAsync(["undefined", declarativeTypeValidator.objectSchema("conversation options", {
+  friendlyName: ["string", "undefined"],
+  isPrivate: ["boolean", "undefined"],
+  uniqueName: ["string", "undefined"]
 })]), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], exports.Client.prototype, "createConversation", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.literal('fcm', 'apn'), 'string'), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "setPushRegistrationId", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.literal("fcm", "apn"), "string"), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "setPushRegistrationId", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.literal('fcm', 'apn')), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "unsetPushRegistrationId", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.literal("fcm", "apn")), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "unsetPushRegistrationId", null);
 
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.literal('fcm', 'apn'), declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "removePushRegistrations", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.literal("fcm", "apn"), declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "removePushRegistrations", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.pureObject), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], exports.Client.prototype, "handlePushNotification", null);
 
 __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('string', ['undefined', declarativeTypeValidator.pureObject]), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", Promise)], exports.Client, "create", 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);
+exports.Client = Client_1 = __decorate([declarativeTypeValidator.validateConstructorTypes(declarativeTypeValidator.nonEmptyString, [declarativeTypeValidator.pureObject, "undefined"]), __metadata("design:paramtypes", [String, Object])], exports.Client);
 
 exports.AggregatedDeliveryReceipt = AggregatedDeliveryReceipt;
 exports.Conversation = Conversation;