@twilio/conversations 2.1.0 → 3.0.0-rc.1

package/builds/browser.js

@@ -147,8 +147,8 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/es.promise.js');
+require('core-js/modules/es.array.map.js');
 require('core-js/modules/web.dom-collections.for-each.js');
-require('core-js/modules/es.number.constructor.js');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var _typeof = require('@babel/runtime/helpers/typeof');
 require('core-js/modules/es.array.concat.js');
@@ -156,9 +156,9 @@ require('core-js/modules/es.array.from.js');
 require('core-js/modules/es.string.iterator.js');
 var loglevelLog = require('loglevel');
 var iso8601Duration = require('iso8601-duration');
-require('core-js/modules/es.array.map.js');
 require('core-js/modules/es.array.iterator.js');
 require('core-js/modules/web.dom-collections.iterator.js');
+require('core-js/modules/es.number.constructor.js');
 require('core-js/modules/es.regexp.exec.js');
 require('core-js/modules/es.string.replace.js');
 require('core-js/modules/es.array.join.js');
@@ -266,7 +266,7 @@ 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$8 = loglevelLog__namespace.getLogger("twilio-conversations"); // twilio-conversations is used by Flex SDK. Please DO NOT change
 
 var Logger = /*#__PURE__*/function () {
   function Logger(prefix) {
@@ -280,7 +280,7 @@ var Logger = /*#__PURE__*/function () {
   _createClass__default['default'](Logger, [{
     key: "setLevel",
     value: function setLevel(level) {
-      log$9.setLevel(level);
+      log$8.setLevel(level);
     }
   }, {
     key: "trace",
@@ -289,7 +289,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key] = arguments[_key];
       }
 
-      log$9.trace.apply(null, prepareLine(this.prefix + "T", args));
+      log$8.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$8.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$8.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$8.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$8.error.apply(null, prepareLine(this.prefix + "E", args));
     }
   }], [{
     key: "scope",
@@ -335,7 +335,7 @@ var Logger = /*#__PURE__*/function () {
   }, {
     key: "setLevel",
     value: function setLevel(level) {
-      log$9.setLevel(level);
+      log$8.setLevel(level);
     }
   }, {
     key: "trace",
@@ -344,7 +344,7 @@ var Logger = /*#__PURE__*/function () {
         args[_key6] = arguments[_key6];
       }
 
-      log$9.trace.apply(null, prepareLine("T", args));
+      log$8.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$8.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$8.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$8.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$8.error.apply(null, prepareLine("E", args));
     }
   }]);
 
@@ -426,8 +426,8 @@ var Configuration = function Configuration() {
     mediaAttachmentsCountLimit: configurationResponse.options.media_attachments_count_limit,
     mediaAttachmentSizeLimitInMb: configurationResponse.options.media_attachment_size_limit_in_mb,
     mediaAttachmentsTotalSizeLimitInMb: configurationResponse.options.media_attachments_total_size_limit_in_mb,
-    emailHistoriesAllowedMimeTypes: configurationResponse.options.email_histories_allowed_mime_types,
-    emailBodiesAllowedMimeTypes: configurationResponse.options.email_bodies_allowed_mime_types
+    emailHistoriesAllowedContentTypes: configurationResponse.options.email_histories_allowed_mime_types,
+    emailBodiesAllowedContentTypes: configurationResponse.options.email_bodies_allowed_mime_types
   };
   this.typingIndicatorTimeoutOverride = constructorOptions.typingIndicatorTimeoutOverride;
   this.backoffConfiguration = _objectSpread$3({
@@ -560,7 +560,7 @@ var optionalAttributesValidator = declarativeTypeValidator.custom(function (valu
 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$7 = Logger.scope("User");
 /**
  * Extended user information.
  * Note that `isOnline` and `isNotifiable` properties are eligible
@@ -702,7 +702,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               case 2:
                 updateReasons = [];
-                log$8.debug("User for", this.state.identity, "updated:", key, value);
+                log$7.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;
                 break;
@@ -716,7 +716,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return _context.abrupt("break", 16);
 
               case 9:
-                updateAttributes = parseAttributes(value.value, "Retrieved malformed attributes from the server for user: ".concat(this.state.identity), log$8);
+                updateAttributes = parseAttributes(value.value, "Retrieved malformed attributes from the server for user: ".concat(this.state.identity), log$7);
 
                 if (!isEqual__default['default'](this.state.attributes, updateAttributes)) {
                   this.state.attributes = updateAttributes;
@@ -787,7 +787,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
 
               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);
+                  log$7.warn("Failed to get reachability info for ", _this2.state.identity, err);
                 }));
 
               case 5:
@@ -834,7 +834,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
                 }).then(function (map) {
                   _this3.entity = map;
                   map.on("itemUpdated", function (args) {
-                    log$8.debug(_this3.state.entityName + " (" + _this3.state.identity + ") itemUpdated: " + args.item.key);
+                    log$7.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) {
@@ -845,7 +845,7 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
                     return _this3._update(item.key, item.data);
                   })]);
                 }).then(function () {
-                  log$8.debug("Fetched for", _this3.identity);
+                  log$7.debug("Fetched for", _this3.identity);
                   _this3.subscribed = "subscribed";
 
                   _this3.emit("userSubscribed", _this3);
@@ -1238,7 +1238,7 @@ _defineProperty__default['default'](NotificationTypes, "CONSUMPTION_UPDATE", "tw
 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$6 = Logger.scope("Participant");
 /**
  * A participant represents a remote client in a conversation.
  */
@@ -1263,7 +1263,7 @@ 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$6),
       dateCreated: data.dateCreated ? parseTime$1(data.dateCreated) : null,
       dateUpdated: data.dateCreated ? parseTime$1(data.dateUpdated) : null,
       sid: sid,
@@ -1452,7 +1452,7 @@ 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$6);
 
       if (data.attributes && !isEqual__default['default'](this.state.attributes, updateAttributes)) {
         this.state.attributes = updateAttributes;
@@ -1621,7 +1621,7 @@ __decorate([declarativeTypeValidator.validateTypesAsync(attributesValidator), __
 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$5 = Logger.scope("Participants");
 /**
  * @classdesc Represents the collection of participants for the conversation
  * @fires Participants#participantJoined
@@ -1697,14 +1697,14 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
         mode: "open_existing"
       }).then(function (rosterMap) {
         rosterMap.on("itemAdded", function (args) {
-          log$6.debug(_this2.conversation.sid + " itemAdded: " + args.item.key);
+          log$5.debug(_this2.conversation.sid + " itemAdded: " + args.item.key);
 
           _this2.upsertParticipant(args.item.key, args.item.data).then(function (participant) {
             _this2.emit("participantJoined", participant);
           });
         });
         rosterMap.on("itemRemoved", function (args) {
-          log$6.debug(_this2.conversation.sid + " itemRemoved: " + args.key);
+          log$5.debug(_this2.conversation.sid + " itemRemoved: " + args.key);
           var participantSid = args.key;
 
           if (!_this2.participants.has(participantSid)) {
@@ -1722,7 +1722,7 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
           _this2.emit("participantLeft", leftParticipant);
         });
         rosterMap.on("itemUpdated", function (args) {
-          log$6.debug(_this2.conversation.sid + " itemUpdated: " + args.item.key);
+          log$5.debug(_this2.conversation.sid + " itemUpdated: " + args.item.key);
 
           _this2.upsertParticipant(args.item.key, args.item.data);
         });
@@ -1744,10 +1744,10 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
         _this2.rosterEntityPromise = null;
 
         if (_this2.services.syncClient.connectionState != "disconnected") {
-          log$6.error("Failed to get roster object for conversation", _this2.conversation.sid, err);
+          log$5.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$5.debug("ERROR: Failed to get roster object for conversation", _this2.conversation.sid, err);
         throw err;
       });
     }
@@ -2097,117 +2097,140 @@ 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;
+    value: function getContentTemporaryUrl() {
+      var _this = this;
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return this._fetchMcsMedia();
+      return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(resolve, reject, onCancel) {
+          var _this$mcsMedia;
 
-              case 2:
-                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);
+          var fetchMediaRequest, contentUrlRequest, mcsMedia;
+          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  fetchMediaRequest = _this._fetchMcsMedia();
+                  contentUrlRequest = (_this$mcsMedia = _this.mcsMedia) === null || _this$mcsMedia === void 0 ? void 0 : _this$mcsMedia.getContentUrl();
+                  onCancel(function () {
+                    fetchMediaRequest.cancel();
 
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+                    if (contentUrlRequest) {
+                      contentUrlRequest.cancel();
+                    }
+                  });
+                  _context.prev = 3;
 
-      function getContentTemporaryUrl() {
-        return _getContentTemporaryUrl.apply(this, arguments);
-      }
+                  if (_this.mcsMedia) {
+                    _context.next = 9;
+                    break;
+                  }
 
-      return getContentTemporaryUrl;
-    }()
-    /**
-     * Returns cached direct content URL for the media.
-     *
-     * This URL will expire in several minutes. This function does not refresh the URL and can be used to query it several times
-     * without causing network traffic.
-     * If the URL becomes expired, you need to request a new one using getContentTemporaryUrl().
-     *
-     * @returns {Promise<String>}
-     */
+                  _context.next = 7;
+                  return fetchMediaRequest;
 
-  }, {
-    key: "getCachedTemporaryUrl",
-    value: function () {
-      var _getCachedTemporaryUrl = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-        var _this$mcsMedia$getCac, _this$mcsMedia2;
+                case 7:
+                  mcsMedia = _context.sent;
+                  contentUrlRequest = mcsMedia.getContentUrl();
 
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this._fetchMcsMedia();
+                case 9:
+                  _context.t0 = resolve;
 
-              case 2:
-                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);
+                  if (!contentUrlRequest) {
+                    _context.next = 16;
+                    break;
+                  }
 
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
+                  _context.next = 13;
+                  return contentUrlRequest;
 
-      function getCachedTemporaryUrl() {
-        return _getCachedTemporaryUrl.apply(this, arguments);
-      }
+                case 13:
+                  _context.t1 = _context.sent;
+                  _context.next = 17;
+                  break;
 
-      return getCachedTemporaryUrl;
-    }()
+                case 16:
+                  _context.t1 = null;
+
+                case 17:
+                  _context.t2 = _context.t1;
+                  (0, _context.t0)(_context.t2);
+                  _context.next = 24;
+                  break;
+
+                case 21:
+                  _context.prev = 21;
+                  _context.t3 = _context["catch"](3);
+                  reject(_context.t3);
+
+                case 24:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee, null, [[3, 21]]);
+        }));
+
+        return function (_x, _x2, _x3) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    }
   }, {
     key: "_fetchMcsMedia",
-    value: function () {
-      var _fetchMcsMedia2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                if (this.mcsMedia) {
-                  _context3.next = 8;
-                  break;
-                }
+    value: function _fetchMcsMedia() {
+      var _this2 = this;
 
-                if (!this.services.mcsClient) {
-                  _context3.next = 7;
+      return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(resolve, reject, onCancel) {
+          var request;
+          return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+            while (1) {
+              switch (_context2.prev = _context2.next) {
+                case 0:
+                  request = _this2.services.mcsClient.get(_this2.state.sid);
+
+                  if (!_this2.services.mcsClient) {
+                    _context2.next = 14;
+                    break;
+                  }
+
+                  onCancel(function () {
+                    return request.cancel();
+                  });
+                  _context2.prev = 3;
+                  _context2.next = 6;
+                  return request;
+
+                case 6:
+                  _this2.mcsMedia = _context2.sent;
+                  resolve(_this2.mcsMedia);
+                  _context2.next = 13;
                   break;
-                }
 
-                _context3.next = 4;
-                return this.services.mcsClient.get(this.state.sid);
+                case 10:
+                  _context2.prev = 10;
+                  _context2.t0 = _context2["catch"](3);
+                  reject(_context2.t0);
 
-              case 4:
-                this.mcsMedia = _context3.sent;
-                _context3.next = 8;
-                break;
+                case 13:
+                  return _context2.abrupt("return");
 
-              case 7:
-                throw new Error("Media Content Service is unavailable");
+                case 14:
+                  reject(new Error("Media Content Service is unavailable"));
 
-              case 8:
-              case "end":
-                return _context3.stop();
+                case 15:
+                case "end":
+                  return _context2.stop();
+              }
             }
-          }
-        }, _callee3, this);
-      }));
-
-      function _fetchMcsMedia() {
-        return _fetchMcsMedia2.apply(this, arguments);
-      }
+          }, _callee2, null, [[3, 10]]);
+        }));
 
-      return _fetchMcsMedia;
-    }()
+        return function (_x4, _x5, _x6) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
+    }
   }]);
 
   return Media;
@@ -2463,7 +2486,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$4 = Logger.scope("Message");
 /**
  * A message in a conversation.
  */
@@ -2501,7 +2524,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       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),
+      attributes: parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(data.sid), log$4),
       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) {
@@ -2637,7 +2660,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "attachedMedia",
     get: function get() {
-      return this.getMediaByCategory(["media"]);
+      return this.getMediaByCategories(["media"]);
     }
     /**
      * The server-assigned unique identifier of the authoring participant.
@@ -2665,8 +2688,8 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
      */
 
   }, {
-    key: "getMediaByCategory",
-    value: function getMediaByCategory(categories) {
+    key: "getMediaByCategories",
+    value: function getMediaByCategories(categories) {
       var _this$state$medias;
 
       return ((_this$state$medias = this.state.medias) !== null && _this$state$medias !== void 0 ? _this$state$medias : []).filter(function (m) {
@@ -2675,7 +2698,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
     }
     /**
      * Get a media descriptor for an email body attachment of a provided type.
-     * Allowed body types are returned in the Conversation.limits().emailBodiesAllowedMimeTypes array.
+     * Allowed body types are returned in the Conversation.limits().emailBodiesAllowedContentTypes array.
      * @param type Type of email body to request, defaults to `text/plain`.
      */
 
@@ -2685,13 +2708,13 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       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 (_this$getMediaByCateg = (_this$getMediaByCateg2 = this.getMediaByCategories(["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.
+     * Allowed body types are returned in the Conversation.limits().emailHistoriesAllowedContentTypes array.
      * @param type Type of email history to request, defaults to `text/plain`.
      */
 
@@ -2701,7 +2724,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       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 (_this$getMediaByCateg3 = (_this$getMediaByCateg4 = this.getMediaByCategories(["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;
     }
@@ -2740,7 +2763,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
         updateReasons.push("dateCreated");
       }
 
-      var updatedAttributes = parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(this.sid), log$5);
+      var updatedAttributes = parseAttributes(data.attributes, "Got malformed attributes for the message ".concat(this.sid), log$4);
 
       if (!isEqual__default['default'](this.state.attributes, updatedAttributes)) {
         this.state.attributes = updatedAttributes;
@@ -2793,7 +2816,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
                 _context.next = 4;
                 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));
+                  log$4.debug("Participant with sid \"".concat(_this2.participantSid, "\" not found for message ").concat(_this2.sid));
                   return null;
                 });
 
@@ -2808,7 +2831,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
 
                 _context.next = 8;
                 return this.conversation.getParticipantByIdentity(this.state.author).catch(function () {
-                  log$5.debug("Participant with identity \"".concat(_this2.author, "\" not found for message ").concat(_this2.sid));
+                  log$4.debug("Participant with identity \"".concat(_this2.author, "\" not found for message ").concat(_this2.sid));
                   return null;
                 });
 
@@ -3019,57 +3042,96 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
       return updateAttributes;
     }()
     /**
-     * Get content URLs for all media attachments in the given set using single operation.
-     * @param contentSet Set of media attachments to query for content URL.
+     * Get content URLs for all media attachments in the given set using a single operation.
+     * @param contentSet Set of media attachments to query content URLs.
      */
 
   }, {
-    key: "attachTemporaryUrlsFor",
-    value: function () {
-      var _attachTemporaryUrlsFor = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(contentSet) {
-        var _this3 = this;
+    key: "getTemporaryContentUrlsForMedia",
+    value: function getTemporaryContentUrlsForMedia(contentSet) {
+      var _contentSet$map;
 
-        var sids;
-        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                // We ignore existing mcsMedia members of each of the media entries.
-                // Instead we just collect their sids and pull new descriptors from a mediaSet GET endpoint.
-                sids = contentSet === null || contentSet === void 0 ? void 0 : contentSet.map(function (m) {
-                  return m.sid;
-                });
+      // We ignore existing mcsMedia members of each of the media entries.
+      // Instead we just collect their sids and pull new descriptors from a mediaSet GET endpoint.
+      var sids = (_contentSet$map = contentSet === null || contentSet === void 0 ? void 0 : contentSet.map(function (m) {
+        return m.sid;
+      })) !== null && _contentSet$map !== void 0 ? _contentSet$map : [];
+      return this.getTemporaryContentUrlsForMediaSids(sids);
+    }
+    /**
+     * Get content URLs for all media attachments in the given set of media sids using a single operation.
+     * @param mediaSids Set of media sids to query for the content URL.
+     */
 
-                if (!(this.services.mcsClient && sids)) {
-                  _context6.next = 7;
-                  break;
-                }
+  }, {
+    key: "getTemporaryContentUrlsForMediaSids",
+    value: function getTemporaryContentUrlsForMediaSids(mediaSids) {
+      var _this3 = this;
 
-                _context6.next = 4;
-                return this.services.mcsClient.mediaSetGet(sids);
+      return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(resolve, reject, onCancel) {
+          var mediaGetRequest, urls;
+          return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+            while (1) {
+              switch (_context6.prev = _context6.next) {
+                case 0:
+                  mediaGetRequest = _this3.services.mcsClient.mediaSetGetContentUrls(mediaSids !== null && mediaSids !== void 0 ? mediaSids : []);
 
-              case 4:
-                return _context6.abrupt("return", _context6.sent.map(function (item) {
-                  return new Media(item, _this3.services);
-                }));
+                  if (!(!_this3.services.mcsClient || !mediaSids)) {
+                    _context6.next = 4;
+                    break;
+                  }
 
-              case 7:
-                throw new Error("Media Content Service is unavailable");
+                  reject(new Error("Media Content Service is unavailable"));
+                  return _context6.abrupt("return");
 
-              case 8:
-              case "end":
-                return _context6.stop();
+                case 4:
+                  onCancel(function () {
+                    mediaGetRequest.cancel();
+                  });
+                  _context6.prev = 5;
+                  _context6.next = 8;
+                  return mediaGetRequest;
+
+                case 8:
+                  urls = _context6.sent;
+                  resolve(urls);
+                  _context6.next = 15;
+                  break;
+
+                case 12:
+                  _context6.prev = 12;
+                  _context6.t0 = _context6["catch"](5);
+                  reject(_context6.t0);
+
+                case 15:
+                case "end":
+                  return _context6.stop();
+              }
             }
-          }
-        }, _callee6, this);
-      }));
+          }, _callee6, null, [[5, 12]]);
+        }));
 
-      function attachTemporaryUrlsFor(_x3) {
-        return _attachTemporaryUrlsFor.apply(this, arguments);
-      }
+        return function (_x3, _x4, _x5) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    }
+    /**
+     * Get content URLs for all media attached to the message.
+     */
 
-      return attachTemporaryUrlsFor;
-    }()
+  }, {
+    key: "getTemporaryContentUrlsForAttachedMedia",
+    value: function getTemporaryContentUrlsForAttachedMedia() {
+      var _media$map;
+
+      var media = this.attachedMedia;
+      var sids = (_media$map = media === null || media === void 0 ? void 0 : media.map(function (m) {
+        return m.sid;
+      })) !== null && _media$map !== void 0 ? _media$map : [];
+      return this.getTemporaryContentUrlsForMediaSids(sids);
+    }
   }, {
     key: "_getDetailedDeliveryReceiptsPaginator",
     value: function () {
@@ -3105,7 +3167,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee7, this);
       }));
 
-      function _getDetailedDeliveryReceiptsPaginator(_x4) {
+      function _getDetailedDeliveryReceiptsPaginator(_x6) {
         return _getDetailedDeliveryReceiptsPaginator2.apply(this, arguments);
       }
 
@@ -3130,7 +3192,7 @@ __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator
   return [value instanceof Array && value.length > 0 && value.reduce(function (a, c) {
     return a && c instanceof Media;
   }, true), "a non-empty array of Media"];
-})), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", Promise)], Message.prototype, "attachTemporaryUrlsFor", null);
+})), __metadata("design:type", Function), __metadata("design:paramtypes", [Array]), __metadata("design:returntype", mcsClient.CancellablePromise)], Message.prototype, "getTemporaryContentUrlsForMedia", 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; } } }; }
 
@@ -3141,7 +3203,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$3 = Logger.scope("Messages");
 /**
  * Represents the collection of messages in a conversation
  */
@@ -3200,7 +3262,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 6:
                 list = _context.sent;
                 list.on("itemAdded", function (args) {
-                  log$4.debug("".concat(_this2.conversation.sid, " itemAdded: ").concat(args.item.index));
+                  log$3.debug("".concat(_this2.conversation.sid, " itemAdded: ").concat(args.item.index));
                   var links = {
                     self: "".concat(_this2.conversation.links.messages, "/").concat(args.item.data.sid),
                     conversation: _this2.conversation.links.self,
@@ -3209,7 +3271,7 @@ 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$3.debug("Message arrived, but is already known and ignored", _this2.conversation.sid, message.index);
                     return;
                   }
 
@@ -3222,7 +3284,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                   _this2.emit("messageAdded", message);
                 });
                 list.on("itemRemoved", function (args) {
-                  log$4.debug("#{this.conversation.sid} itemRemoved: ".concat(args.index));
+                  log$3.debug("#{this.conversation.sid} itemRemoved: ".concat(args.index));
                   var index = args.index;
 
                   if (_this2.messagesByIndex.has(index)) {
@@ -3240,7 +3302,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                   }
                 });
                 list.on("itemUpdated", function (args) {
-                  log$4.debug("".concat(_this2.conversation.sid, " itemUpdated: ").concat(args.item.index));
+                  log$3.debug("".concat(_this2.conversation.sid, " itemUpdated: ").concat(args.item.index));
 
                   var message = _this2.messagesByIndex.get(args.item.index);
 
@@ -3256,10 +3318,10 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                 this.messagesListPromise = null;
 
                 if (this.services.syncClient.connectionState !== "disconnected") {
-                  log$4.error("Failed to get messages object for conversation", this.conversation.sid, _context.t0);
+                  log$3.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$3.debug("ERROR: Failed to get messages object for conversation", this.conversation.sid, _context.t0);
                 throw _context.t0;
 
               case 19:
@@ -3316,114 +3378,126 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
       return unsubscribe;
     }()
     /**
-     * Send Message to the conversation, message could include both text and multiple media attachments.
+     * Send a message to the conversation. The message could include text and multiple media attachments.
      * @param message Message to post
-     * @returns Returns a promise which can fail
      */
 
   }, {
     key: "sendV2",
-    value: function () {
-      var _sendV = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(message) {
-        var _message$emailOptions;
+    value: function sendV2(message) {
+      var _this3 = this;
 
-        var media, _iterator, _step, _mediaContent$content, _mediaContent$media, _step$value, category, mediaContent;
+      log$3.debug("Sending message V2", message.mediaContent, message.attributes, message.emailOptions);
+      return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(resolve, reject, onCancel) {
+          var _message$emailOptions;
 
-        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);
-                media = [];
-                _iterator = _createForOfIteratorHelper$2(message.mediaContent);
-                _context3.prev = 3;
+          var media, requests, _iterator, _step, _step$value, category, mediaContent, _mediaContent$content, _mediaContent$media, request, messagesPostRequest;
 
-                _iterator.s();
+          return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+            while (1) {
+              switch (_context3.prev = _context3.next) {
+                case 0:
+                  media = [];
+                  requests = [];
+                  onCancel(function () {
+                    requests.forEach(function (request) {
+                      return request.cancel();
+                    });
+                  });
+                  _iterator = _createForOfIteratorHelper$2(message.mediaContent);
+                  _context3.prev = 4;
 
-              case 5:
-                if ((_step = _iterator.n()).done) {
-                  _context3.next = 22;
-                  break;
-                }
+                  _iterator.s();
 
-                _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);
-                _context3.t0 = media;
+                case 6:
+                  if ((_step = _iterator.n()).done) {
+                    _context3.next = 25;
+                    break;
+                  }
 
-                if (!(mediaContent instanceof FormData)) {
+                  _step$value = _slicedToArray__default['default'](_step.value, 2), category = _step$value[0], mediaContent = _step$value[1];
+                  _context3.prev = 8;
+                  log$3.debug("Adding media to a message as ".concat(mediaContent instanceof FormData ? "FormData" : "SendMediaOptions"), mediaContent);
+                  request = mediaContent instanceof FormData ? _this3.services.mcsClient.postFormData(mediaContent, category) : _this3.services.mcsClient.post((_mediaContent$content = mediaContent.contentType) !== null && _mediaContent$content !== void 0 ? _mediaContent$content : "", (_mediaContent$media = mediaContent.media) !== null && _mediaContent$media !== void 0 ? _mediaContent$media : "", category, mediaContent.filename);
+                  requests.push(request);
+                  _context3.t0 = media;
                   _context3.next = 15;
-                  break;
-                }
-
-                _context3.next = 12;
-                return this.services.mcsClient.postFormData(mediaContent, category);
-
-              case 12:
-                _context3.t1 = _context3.sent;
-                _context3.next = 18;
-                break;
+                  return request;
 
-              case 15:
-                _context3.next = 17;
-                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 15:
+                  _context3.t1 = _context3.sent;
 
-              case 17:
-                _context3.t1 = _context3.sent;
+                  _context3.t0.push.call(_context3.t0, _context3.t1);
 
-              case 18:
-                _context3.t2 = _context3.t1;
+                  _context3.next = 23;
+                  break;
 
-                _context3.t0.push.call(_context3.t0, _context3.t2);
+                case 19:
+                  _context3.prev = 19;
+                  _context3.t2 = _context3["catch"](8);
+                  reject(_context3.t2);
+                  return _context3.abrupt("return");
 
-              case 20:
-                _context3.next = 5;
-                break;
+                case 23:
+                  _context3.next = 6;
+                  break;
 
-              case 22:
-                _context3.next = 27;
-                break;
+                case 25:
+                  _context3.next = 30;
+                  break;
 
-              case 24:
-                _context3.prev = 24;
-                _context3.t3 = _context3["catch"](3);
+                case 27:
+                  _context3.prev = 27;
+                  _context3.t3 = _context3["catch"](4);
 
-                _iterator.e(_context3.t3);
+                  _iterator.e(_context3.t3);
 
-              case 27:
-                _context3.prev = 27;
+                case 30:
+                  _context3.prev = 30;
 
-                _iterator.f();
+                  _iterator.f();
 
-                return _context3.finish(27);
+                  return _context3.finish(30);
 
-              case 30:
-                _context3.next = 32;
-                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
-                });
+                case 33:
+                  messagesPostRequest = _this3.services.commandExecutor.mutateResource("post", _this3.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
+                  });
+                  _context3.prev = 34;
+                  _context3.t4 = resolve;
+                  _context3.next = 38;
+                  return messagesPostRequest;
+
+                case 38:
+                  _context3.t5 = _context3.sent;
+                  (0, _context3.t4)(_context3.t5);
+                  _context3.next = 45;
+                  break;
 
-              case 32:
-                return _context3.abrupt("return", _context3.sent);
+                case 42:
+                  _context3.prev = 42;
+                  _context3.t6 = _context3["catch"](34);
+                  reject(_context3.t6);
 
-              case 33:
-              case "end":
-                return _context3.stop();
+                case 45:
+                case "end":
+                  return _context3.stop();
+              }
             }
-          }
-        }, _callee3, this, [[3, 24, 27, 30]]);
-      }));
-
-      function sendV2(_x2) {
-        return _sendV.apply(this, arguments);
-      }
+          }, _callee3, null, [[4, 27, 30, 33], [8, 19], [34, 42]]);
+        }));
 
-      return sendV2;
-    }()
+        return function (_x2, _x3, _x4) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    }
     /**
      * Send Message to the conversation
      * @param message Message to post
@@ -3445,18 +3519,14 @@ 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);
-                _context4.next = 5;
-                return this.services.commandExecutor.mutateResource("post", this.conversation.links.messages, {
+                log$3.debug("Sending text message", message, attributes, emailOptions);
+                return _context4.abrupt("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
-                });
-
-              case 5:
-                return _context4.abrupt("return", _context4.sent);
+                }));
 
-              case 6:
+              case 4:
               case "end":
                 return _context4.stop();
             }
@@ -3464,7 +3534,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee4, this);
       }));
 
-      function send(_x3) {
+      function send(_x5) {
         return _send.apply(this, arguments);
       }
 
@@ -3494,8 +3564,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$3.debug("Sending media message", mediaContent, attributes, emailOptions);
+                log$3.debug("Sending media message as ".concat(mediaContent instanceof FormData ? "FormData" : "SendMediaOptions"), mediaContent, attributes);
 
                 if (!(mediaContent instanceof FormData)) {
                   _context5.next = 10;
@@ -3536,7 +3606,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee5, this);
       }));
 
-      function sendMedia(_x4) {
+      function sendMedia(_x6) {
         return _sendMedia.apply(this, arguments);
       }
 
@@ -3571,7 +3641,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
         }, _callee6, this);
       }));
 
-      function getMessages(_x5, _x6) {
+      function getMessages(_x7, _x8) {
         return _getMessages2.apply(this, arguments);
       }
 
@@ -3580,7 +3650,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_wrapPaginator",
     value: function _wrapPaginator(order, page, op) {
-      var _this3 = this;
+      var _this4 = this;
 
       // Due to an inconsistency between Sync and Chat conventions, next and
       // previous pages should be swapped.
@@ -3588,13 +3658,13 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       var nextPage = function nextPage() {
         return page.nextPage().then(function (page) {
-          return _this3._wrapPaginator(order, page, op);
+          return _this4._wrapPaginator(order, page, op);
         });
       };
 
       var previousPage = function previousPage() {
         return page.prevPage().then(function (page) {
-          return _this3._wrapPaginator(order, page, op);
+          return _this4._wrapPaginator(order, page, op);
         });
       };
 
@@ -3613,7 +3683,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
   }, {
     key: "_upsertMessage",
     value: function _upsertMessage(index, value) {
-      var _this4 = this;
+      var _this5 = this;
 
       var cachedMessage = this.messagesByIndex.get(index);
 
@@ -3629,7 +3699,7 @@ 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);
+        return _this5.emit("messageUpdated", args);
       });
       return message;
     }
@@ -3646,7 +3716,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
     key: "_getMessages",
     value: function () {
       var _getMessages3 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7() {
-        var _this5 = this;
+        var _this6 = this;
 
         var pageSize,
             anchor,
@@ -3682,7 +3752,7 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
                 _context7.next = 12;
                 return this._wrapPaginator(order, page, function (items) {
                   return Promise.all(items.map(function (item) {
-                    return _this5._upsertMessage(item.index, item.data);
+                    return _this6._upsertMessage(item.index, item.data);
                   }));
                 });
 
@@ -3735,34 +3805,48 @@ var UnsentMessage = /*#__PURE__*/function () {
 
   _createClass__default['default'](UnsentMessage, [{
     key: "send",
-    value: function () {
-      var _send = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-        var response;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return this.messagesEntity.sendV2(this);
+    value: function send() {
+      var _this = this;
 
-              case 2:
-                response = _context.sent;
-                return _context.abrupt("return", parseToNumber(response.index));
+      return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(resolve, reject, onCancel) {
+          var request, response;
+          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  request = _this.messagesEntity.sendV2(_this);
+                  onCancel(function () {
+                    return request.cancel();
+                  });
+                  _context.prev = 2;
+                  _context.next = 5;
+                  return request;
 
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+                case 5:
+                  response = _context.sent;
+                  resolve(parseToNumber(response.index));
+                  _context.next = 12;
+                  break;
 
-      function send() {
-        return _send.apply(this, arguments);
-      }
+                case 9:
+                  _context.prev = 9;
+                  _context.t0 = _context["catch"](2);
+                  reject(_context.t0);
 
-      return send;
-    }()
+                case 12:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee, null, [[2, 9]]);
+        }));
+
+        return function (_x, _x2, _x3) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    }
   }]);
 
   return UnsentMessage;
@@ -3831,27 +3915,27 @@ var MessageBuilder = /*#__PURE__*/function () {
       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.
+     * Set the email body with a given content type.
+     * @param contentType Format of the body to set (text/plain or text/html).
+     * @param body Body payload in the selected format.
      */
 
   }, {
     key: "setEmailBody",
-    value: function setEmailBody(mimeType, body) {
-      this.emailBodies.set(mimeType, body);
+    value: function setEmailBody(contentType, body) {
+      this.emailBodies.set(contentType, 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.
+     * Set the email history with a given content type.
+     * @param contentType Format of the history to set (text/plain or text/html).
+     * @param history History payload in the selected format.
      */
 
   }, {
     key: "setEmailHistory",
-    value: function setEmailHistory(mimeType, history) {
-      this.emailHistories.set(mimeType, history);
+    value: function setEmailHistory(contentType, history) {
+      this.emailHistories.set(contentType, history);
       return this;
     }
     /**
@@ -3887,22 +3971,22 @@ var MessageBuilder = /*#__PURE__*/function () {
       var _this = this;
 
       this.emailBodies.forEach(function (_, key) {
-        if (!_this.limits.emailBodiesAllowedMimeTypes.includes(key)) {
-          throw new Error("Unsupported email body MIME type ".concat(key));
+        if (!_this.limits.emailBodiesAllowedContentTypes.includes(key)) {
+          throw new Error("Unsupported email body content 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.limits.emailHistoriesAllowedContentTypes.includes(key)) {
+          throw new Error("Unsupported email history content 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.emailBodies.size > this.limits.emailBodiesAllowedContentTypes.length) {
+        throw new Error("Too many email bodies attached to the message (".concat(this.emailBodies.size, " > ").concat(this.limits.emailBodiesAllowedContentTypes.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.emailHistories.size > this.limits.emailHistoriesAllowedContentTypes.length) {
+        throw new Error("Too many email histories attached to the message (".concat(this.emailHistories.size, " > ").concat(this.limits.emailHistoriesAllowedContentTypes.length, ")"));
       }
 
       if (this.message.mediaContent.length > this.limits.mediaAttachmentsCountLimit) {
@@ -3919,8 +4003,17 @@ var MessageBuilder = /*#__PURE__*/function () {
       });
       return this.message;
     }
-  }, {
-    key: "getPayloadContentType",
+    /**
+     * Prepares a message and sends it to the conversation.
+     */
+
+  }, {
+    key: "buildAndSend",
+    value: function buildAndSend() {
+      return this.build().send();
+    }
+  }, {
+    key: "getPayloadContentType",
     value: function getPayloadContentType(payload) {
       if (typeof FormData !== "undefined" && payload instanceof FormData) {
         return payload.get("Content-Type");
@@ -3942,7 +4035,7 @@ 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$2 = Logger.scope("Conversation");
 var fieldMappings = {
   lastMessage: "lastMessage",
   attributes: "attributes",
@@ -4222,10 +4315,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         _this2.entityPromise = null;
 
         if (_this2.services.syncClient.connectionState != "disconnected") {
-          log$3.error("Failed to get conversation object", err);
+          log$2.error("Failed to get conversation object", err);
         }
 
-        log$3.debug("ERROR: Failed to get conversation object", err);
+        log$2.debug("ERROR: Failed to get conversation object", err);
         throw err;
       });
     }
@@ -4251,7 +4344,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return this._subscribe();
 
               case 3:
-                log$3.trace("_subscribeStreams, this.entity.data=", (_this$entity = this.entity) === null || _this$entity === void 0 ? void 0 : _this$entity.data);
+                log$2.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;
@@ -4266,10 +4359,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
                 _context.t0 = _context["catch"](0);
 
                 if (this.services.syncClient.connectionState !== "disconnected") {
-                  log$3.error("Failed to subscribe on conversation objects", this.sid, _context.t0);
+                  log$2.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$2.debug("ERROR: Failed to subscribe on conversation objects", this.sid, _context.t0);
                 throw _context.t0;
 
               case 15:
@@ -4348,7 +4441,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
 
       if (status === "joined") {
         this._subscribeStreams().catch(function (err) {
-          log$3.debug("ERROR while setting conversation status " + status, err);
+          log$2.debug("ERROR while setting conversation status " + status, err);
 
           if (_this3.services.syncClient.connectionState !== "disconnected") {
             throw err;
@@ -4356,7 +4449,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         });
       } else if (this.entityPromise) {
         this._unsubscribe().catch(function (err) {
-          log$3.debug("ERROR while setting conversation status " + status, err);
+          log$2.debug("ERROR while setting conversation status " + status, err);
 
           if (_this3.services.syncClient.connectionState !== "disconnected") {
             throw err;
@@ -4384,7 +4477,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
     function _update(update) {
       var _update$lastMessage, _update$lastMessage2, _this$channelState$la2, _this$channelState$la3, _this$channelState$lo;
 
-      log$3.trace("_update", update);
+      log$2.trace("_update", update);
       Conversation.preprocessUpdate(update, this.sid);
       var updateReasons = new Set();
 
@@ -5483,7 +5576,7 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
           JSON.stringify(update.attributes);
         }
       } catch (e) {
-        log$3.warn("Retrieved malformed attributes from the server for conversation: " + conversationSid);
+        log$2.warn("Retrieved malformed attributes from the server for conversation: " + conversationSid);
         update.attributes = {};
       }
 
@@ -5492,7 +5585,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$2.warn("Retrieved malformed dateCreated from the server for conversation: " + conversationSid);
         delete update.dateCreated;
       }
 
@@ -5501,7 +5594,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$2.warn("Retrieved malformed dateUpdated from the server for conversation: " + conversationSid);
         delete update.dateUpdated;
       }
 
@@ -5510,7 +5603,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$2.warn("Retrieved malformed lastMessage.timestamp from the server for conversation: " + conversationSid);
         delete update.lastMessage.timestamp;
       }
     }
@@ -5633,7 +5726,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$1 = Logger.scope("Conversations");
 /**
  * Represents conversations collection
  * {@see Conversation}
@@ -5763,12 +5856,12 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 3:
                 map = _context2.sent;
                 map.on("itemAdded", function (args) {
-                  log$2.debug("itemAdded: ".concat(args.item.key));
+                  log$1.debug("itemAdded: ".concat(args.item.key));
 
                   _this2._upsertConversation("sync", args.item.key, args.item.data);
                 });
                 map.on("itemRemoved", function (args) {
-                  log$2.debug("itemRemoved: ".concat(args.key));
+                  log$1.debug("itemRemoved: ".concat(args.key));
                   var sid = args.key;
 
                   if (!_this2.myConversationsFetched) {
@@ -5794,7 +5887,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   conversation.emit("removed", conversation);
                 });
                 map.on("itemUpdated", function (args) {
-                  log$2.debug("itemUpdated: ".concat(args.item.key));
+                  log$1.debug("itemUpdated: ".concat(args.item.key));
 
                   _this2._upsertConversation("sync", args.item.key, args.item.data);
                 });
@@ -5824,7 +5917,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
               case 16:
                 this.myConversationsFetched = true;
                 this.tombstones.clear();
-                log$2.debug("The conversations list has been successfully fetched");
+                log$1.debug("The conversations list has been successfully fetched");
                 return _context2.abrupt("return", this);
 
               case 22:
@@ -5833,10 +5926,10 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 errorMessage = "Failed to fetch the conversations list";
 
                 if (this.services.syncClient.connectionState !== "disconnected") {
-                  log$2.error(errorMessage, _context2.t0);
+                  log$1.error(errorMessage, _context2.t0);
                 }
 
-                log$2.debug("ERROR: ".concat(errorMessage), _context2.t0);
+                log$1.debug("ERROR: ".concat(errorMessage), _context2.t0);
                 throw _context2.t0;
 
               case 28:
@@ -6125,7 +6218,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   break;
                 }
 
-                log$2.trace("upsertConversation: conversation is known from sync and came from chat, ignoring", {
+                log$1.trace("upsertConversation: conversation is known from sync and came from chat, ignoring", {
                   sid: conversation.sid,
                   data: data.status,
                   conversation: conversation.status
@@ -6215,7 +6308,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
           while (1) {
             switch (_context10.prev = _context10.next) {
               case 0:
-                log$2.trace("upsertConversation called for ".concat(sid), data);
+                log$1.trace("upsertConversation called for ".concat(sid), data);
                 conversation = this.conversations.get(sid); // If the channel is known, update it
 
                 if (!conversation) {
@@ -6223,7 +6316,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   break;
                 }
 
-                log$2.trace("upsertConversation: the conversation ".concat(conversation.sid, " is known;") + "its status is known from the source ".concat(conversation._statusSource(), " ") + "and the update came from the source ".concat(source), conversation);
+                log$1.trace("upsertConversation: the conversation ".concat(conversation.sid, " is known;") + "its status is known from the source ".concat(conversation._statusSource(), " ") + "and the update came from the source ".concat(source), conversation);
                 _context10.next = 6;
                 return this._updateConversation(source, conversation, data);
 
@@ -6240,12 +6333,12 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                   break;
                 }
 
-                log$2.trace("upsertChannel: the channel is deleted but reappeared again from chat, ignoring", sid);
+                log$1.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$1.trace("upsertConversation: creating a local conversation object with sid " + sid, data);
                 baseLink = "".concat(this.configuration.links.conversations, "/").concat(sid);
                 links = {
                   self: baseLink,
@@ -6649,7 +6742,7 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
   return Users;
 }(replayEventEmitter.ReplayEventEmitter);
 
-var log$1 = Logger.scope("TypingIndicator");
+var log = 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
@@ -6737,7 +6830,7 @@ var TypingIndicator = /*#__PURE__*/function () {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                log$1.trace("Got new typing indicator ", message);
+                log.trace("Got new typing indicator ", message);
                 this.getConversation(message.channel_sid).then(function (conversation) {
                   if (!conversation) {
                     return;
@@ -6753,7 +6846,7 @@ var TypingIndicator = /*#__PURE__*/function () {
                     participant._startTyping(timeout);
                   });
                 }).catch(function (err) {
-                  log$1.error(err);
+                  log.error(err);
                   throw err;
                 });
 
@@ -6793,7 +6886,7 @@ var TypingIndicator = /*#__PURE__*/function () {
     value: function _send(conversationSid) {
       var _this3 = this;
 
-      log$1.trace("Sending typing indicator");
+      log.trace("Sending typing indicator");
       var url = this.configuration.links.typing;
       var headers = {
         "Content-Type": "application/x-www-form-urlencoded"
@@ -6804,7 +6897,7 @@ var TypingIndicator = /*#__PURE__*/function () {
           _this3.serviceTypingTimeout = response.body.typing_timeout * 1000;
         }
       }).catch(function (err) {
-        log$1.error("Failed to send typing indicator:", err);
+        log.error("Failed to send typing indicator:", err);
         throw err;
       });
     }
@@ -6860,7 +6953,7 @@ function PushNotification(data) {
   this.data = data.data || {};
 };
 
-var version = "2.1.0";
+var version = "3.0.0-rc.1";
 
 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; }
 
@@ -7074,8 +7167,9 @@ 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 SDK_VERSION = version;
+/**
+ * Client services.
+ */
 
 var ClientServices = function ClientServices() {
   _classCallCheck__default['default'](this, ClientServices);
@@ -7091,28 +7185,246 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
   var _super = _createSuper(Client);
 
   /**
-   * Client connection state.
+   * Fired when a conversation becomes visible to the client. The event is also
+   * triggered when the client creates a new conversation.
+   * Fired for all conversations that the client has joined.
+   *
+   * Parameters:
+   * 1. {@link Conversation} `conversation` - the conversation in question
+   * @event
+   */
+
+  /**
+   * Fired when the client joins a conversation.
+   *
+   * Parameters:
+   * 1. {@link Conversation} `conversation` - the conversation in question
+   * @event
+   */
+
+  /**
+   * Fired when the client leaves a conversation.
+   *
+   * Parameters:
+   * 1. {@link Conversation} `conversation` - the conversation in question
+   * @event
+   */
+
+  /**
+   * Fired when a conversation is no longer visible to the client.
+   *
+   * Parameters:
+   * 1. {@link Conversation} `conversation` - the conversation in question
+   * @event
+   */
+
+  /**
+   * Fired when the attributes or the metadata of a conversation have been
+   * updated. During conversation's creation and initialization, this event
+   * might be fired multiple times for same joined or created conversation as
+   * new data is arriving from different sources.
+   *
+   * Parameters:
+   * 1. object `data` - info object provided with the event. It has the
+   * following properties:
+   *     * {@link Conversation} `conversation` - the conversation in question
+   *     * {@link ConversationUpdateReason}[] `updateReasons` - array of reasons
+   *     for the update
+   * @event
+   */
+
+  /**
+   * Fired when a participant has joined a conversation.
+   *
+   * Parameters:
+   * 1. {@link Participant} `participant` - the participant in question
+   * @event
+   */
+
+  /**
+   * Fired when a participant has left a conversation.
+   *
+   * Parameters:
+   * 1. {@link Participant} `participant` - the participant in question
+   * @event
+   */
+
+  /**
+   * Fired when a participant's fields have been updated.
+   *
+   * Parameters:
+   * 1. object `data` - info object provided with the event. It has the
+   * following properties:
+   *     * {@link Participant} `participant` - the participant in question
+   *     * {@link ParticipantUpdateReason}[] `updateReasons` - array of reasons
+   *     for the update
+   * @event
+   */
+
+  /**
+   * Fired when a new message has been added to the conversation on the server.
+   *
+   * Parameters:
+   * 1. {@link Message} `message` - the message in question
+   * @event
+   */
+
+  /**
+   * Fired when a message is removed from the message list of a conversation.
+   *
+   * Parameters:
+   * 1. {@link Message} `message` - the message in question
+   * @event
+   */
+
+  /**
+   * Fired when the fields of an existing message are updated with new values.
+   *
+   * Parameters:
+   * 1. object `data` - info object provided with the event. It has the
+   * following properties:
+   *     * {@link Message} `message` - the message in question
+   *     * {@link MessageUpdateReason}[] `updateReasons` - array of reasons for
+   *     the update
+   * @event
+   */
+
+  /**
+   * Fired when the token is about to expire and needs to be updated.
+   * * Parameters:
+   * 1. number `message` - token's time to live
+   * @event
+   */
+
+  /**
+   * Fired when the token has expired.
+   * @event
+   */
+
+  /**
+   * Fired when a participant has stopped typing.
+   *
+   * Parameters:
+   * 1. {@link Participant} `participant` - the participant in question
+   * @event
+   */
+
+  /**
+   * Fired when a participant has started typing.
+   *
+   * Parameters:
+   * 1. {@link Participant} `participant` - the participant in question
+   * @event
+   */
+
+  /**
+   * Fired when the client has received (and parsed) a push notification via one
+   * of the push channels (apn or fcm).
+   *
+   * Parameters:
+   * 1. {@link PushNotification} `pushNotification` - the push notification in
+   * question
+   * @event
+   */
+
+  /**
+   * Fired when the client has subscribed to a user.
+   *
+   * Parameters:
+   * 1. {@link User} `user` - the user in question
+   * @event
+   */
+
+  /**
+   * Fired when the client has unsubscribed from a user.
+   *
+   * Parameters:
+   * 1. {@link User} `user` - the user in question
+   * @event
+   */
+
+  /**
+   * Fired when the properties or the reachability status of a user have been
+   * updated.
+   *
+   * Parameters:
+   * 1. object `data` - info object provided with the event. It has the
+   * following properties:
+   *     * {@link User} `user` - the user in question
+   *     * {@link UserUpdateReason}[] `updateReasons` - array of reasons for the
+   *     update
+   * @event
+   */
+
+  /**
+   * Fired when the state of the client has been changed.
+   *
+   * Parameters:
+   * 1. object `data` - info object provided with the event. It has the
+   * following properties:
+   *     * {@link State} `state` - the new client state
+   *     * Error? `error` - the initialization error if present
+   * @event
+   */
+
+  /**
+   * Fired when the connection state of the client has been changed.
+   *
+   * Parameters:
+   * 1. {@link ConnectionState} `state` - the new connection state
+   * @event
+   */
+
+  /**
+   * Fired when the connection is interrupted for an unexpected reason.
+   *
+   * Parameters:
+   * 1. object `data` - info object provided with the event. It has the
+   * following properties:
+   *     * boolean `terminal` - Twilsock will stop connection attempts if true
+   *     * string `message` - the error message of the root cause
+   *     * number? `httpStatusCode` - http status code if available
+   *     * number? `errorCode` - Twilio public error code if available
+   * @event
    */
 
   /**
    * Current version of the Conversations client.
    */
 
+  /**
+   * Logger instance.
+   */
+
+  /**
+   * Supported push notification channels.
+   */
+
+  /**
+   * Supported push data fields.
+   */
+
   /**
    * Current version of the Conversations client.
    */
 
   /**
-   * Returned Conversations instance is not yet fully initialized. Calling any operations will block until it is.
-   * Use connection events to monitor when client becomes fully available (connectionStateChanged with state
-   * 'connected') or not available (connectionStateChange with state 'denied', event tokenExpired, event connectionError).
+   * Client connection state.
+   */
+
+  /**
+   * Returned Conversations instance is not yet fully initialized. Calling any
+   * operations will block until it is. Use connection events to monitor when
+   * client becomes fully available (connectionStateChanged with state
+   * 'connected') or not available (connectionStateChange with state 'denied',
+   * event tokenExpired, event connectionError).
    *
    * @param fpaToken Access token
    * @param options Options to customize the Client
    * @returns A not yet fully-initialized client.
    */
   function Client(fpaToken) {
-    var _this$options$logLeve, _this$options$twilsoc, _this$options$transpo, _this$options$notific, _this$options$syncCli;
+    var _this$_options$logLev, _this$_options$twilso, _this$_options$transp, _this$_options$notifi, _this$_options$syncCl;
 
     var _this;
 
@@ -7122,87 +7434,89 @@ 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), "version", version);
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "version", SDK_VERSION);
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "connectionState", "unknown");
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "parsePushNotification", Client_1.parsePushNotification);
 
-    _this.fpaToken = fpaToken !== null && fpaToken !== void 0 ? fpaToken : "";
-    _this.options = options !== null && options !== void 0 ? options : {};
+    _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), {}, {
+    if (!_this._options.disableDeepClone) {
+      var _options = _objectSpread(_objectSpread({}, _this._options), {}, {
         transport: undefined,
         twilsockClient: undefined
       });
 
       _options = deepClone(_options);
-      _options.transport = _this.options.transport;
-      _options.twilsockClient = _this.options.twilsockClient;
-      _this.options = _options;
+      _options.transport = _this._options.transport;
+      _options.twilsockClient = _this._options.twilsockClient;
+      _this._options = _options;
     }
 
-    _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
+    _this._options.logLevel = (_this$_options$logLev = _this._options.logLevel) !== null && _this$_options$logLev !== void 0 ? _this$_options$logLev : "silent";
+
+    Client_1._logger.setLevel(_this._options.logLevel);
 
-    _this.options.clientMetadata = _this.options.clientMetadata || {};
+    var productId = _this._options.productId = "ip_messaging"; // Filling ClientMetadata
 
-    if (!_this.options.clientMetadata.hasOwnProperty("type")) {
-      _this.options.clientMetadata.type = "conversations";
+    _this._options.clientMetadata = _this._options.clientMetadata || {};
+
+    if (!_this._options.clientMetadata.hasOwnProperty("type")) {
+      _this._options.clientMetadata.type = "conversations";
     }
 
-    if (!_this.options.clientMetadata.hasOwnProperty("sdk")) {
-      _this.options.clientMetadata.sdk = "JS";
-      _this.options.clientMetadata.sdkv = SDK_VERSION;
+    if (!_this._options.clientMetadata.hasOwnProperty("sdk")) {
+      _this._options.clientMetadata.sdk = "JS";
+      _this._options.clientMetadata.sdkv = version;
     } // Enable session local storage for Sync
 
 
-    _this.options.Sync = _this.options.Sync || {};
+    _this._options.Sync = _this._options.Sync || {};
 
-    if (typeof _this.options.Sync.enableSessionStorage === "undefined") {
-      _this.options.Sync.enableSessionStorage = true;
+    if (typeof _this._options.Sync.enableSessionStorage === "undefined") {
+      _this._options.Sync.enableSessionStorage = true;
     }
 
-    if (_this.options.region) {
-      _this.options.Sync.region = _this.options.region;
+    if (_this._options.region) {
+      _this._options.Sync.region = _this._options.region;
     }
 
     if (!fpaToken) {
       throw new Error("A valid Twilio token should be provided");
     }
 
-    _this.services = new ClientServices();
-    _this._myself = new User("", "", null, _this.services);
-    var startTwilsock = !_this.options.twilsockClient; // Create default init registrations if none were provided.
+    _this._services = new ClientServices();
+    _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.
     // Init registrations passed to the Conversations client will be passed down
     // to the Sync client as well.
 
-    if (!_this.options.initRegistrations) {
+    if (!_this._options.initRegistrations) {
       var initRegistration = new twilsock.InitRegistration(productId);
       Client_1.populateInitRegistrations(initRegistration);
-      _this.options.initRegistrations = [initRegistration];
+      _this._options.initRegistrations = [initRegistration];
     }
 
-    _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 = _this._options.twilsockClient = (_this$_options$twilso = _this._options.twilsockClient) !== null && _this$_options$twilso !== void 0 ? _this$_options$twilso : new twilsock.TwilsockClient(fpaToken, productId, _this._options);
 
-    _this.services.twilsockClient.on("tokenAboutToExpire", function (ttl) {
+    _this._services.twilsockClient.on("tokenAboutToExpire", function (ttl) {
       return _this.emit("tokenAboutToExpire", ttl);
     });
 
-    _this.services.twilsockClient.on("tokenExpired", function () {
+    _this._services.twilsockClient.on("tokenExpired", function () {
       return _this.emit("tokenExpired");
     });
 
-    _this.services.twilsockClient.on("connectionError", function (error) {
+    _this._services.twilsockClient.on("connectionError", function (error) {
       return _this.emit("connectionError", error);
     });
 
-    _this.services.twilsockClient.on("stateChanged", function (state) {
-      log.debug("Handling stateChanged for ConversationsClient: new state ".concat(state));
+    _this._services.twilsockClient.on("stateChanged", function (state) {
+      Client_1._logger.debug("Handling stateChanged for ConversationsClient: new state ".concat(state));
 
       if (state !== _this.connectionState) {
         _this.connectionState = state;
@@ -7211,49 +7525,52 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
       }
     });
 
-    _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);
+    _this._services.transport = _this._options.transport = (_this$_options$transp = _this._options.transport) !== null && _this$_options$transp !== void 0 ? _this$_options$transp : _this._options.twilsockClient;
+    _this._services.notificationClient = _this._options.notificationsClient = (_this$_options$notifi = _this._options.notificationsClient) !== null && _this$_options$notifi !== void 0 ? _this$_options$notifi : new notifications.Notifications(fpaToken, _this._options);
+    _this._services.syncClient = _this._options.syncClient = (_this$_options$syncCl = _this._options.syncClient) !== null && _this$_options$syncCl !== void 0 ? _this$_options$syncCl : new twilioSync.SyncClient(fpaToken, _this._options);
     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
+    _this._services.commandExecutor = new CommandExecutor(baseUrl, {
+      transport: _this._options.transport
     }, productId);
 
-    var emitFailed = function emitFailed(err) {
-      _this._rejectEnsureReady(err);
+    var emitFailed = function emitFailed(error) {
+      _this._rejectEnsureReady(error);
 
-      _this.emit("stateChanged", "failed");
+      _this.emit("stateChanged", {
+        state: "failed",
+        error: error
+      });
     };
 
-    _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); // The client 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) {
           switch (_context.prev = _context.next) {
             case 0:
-              log.debug("ConversationsClient started INITIALIZING");
+              Client_1._logger.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";
 
-              _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;
@@ -7265,7 +7582,10 @@ 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", {
+                state: "failed",
+                error: _context.t0
+              });
 
             case 15:
             case "end":
@@ -7283,154 +7603,77 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
     }); // @todo How to process unhandled rejection here?
 
     if (startTwilsock) {
-      _this.services.twilsockClient.connect();
+      _this._services.twilsockClient.connect();
     }
 
     return _this;
   }
+  /**
+   * Information of the logged-in user. Before client initialization, returns an
+   * uninitialized user. Will trigger a {@link Client.userUpdated} event after
+   * initialization.
+   */
+
 
   _createClass__default['default'](Client, [{
     key: "user",
-    get:
-    /**
-     * Information of the logged-in user. Before client initialization, returns an
-     * uninitialized user. Will trigger a {@link Client.userUpdated} event after
-     * initialization.
-     */
-    function get() {
+    get: function get() {
       return this._myself;
     }
     /**
-     * Client reachability state. Throws if accessed before the client
+     * Client reachability state. Throws an error if accessed before the client
      * initialization was completed.
      */
 
   }, {
     key: "reachabilityEnabled",
     get: function get() {
-      if (!this.configuration) {
+      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.");
       }
 
-      return this.configuration.reachabilityEnabled;
-    }
-  }, {
-    key: "token",
-    get: function get() {
-      return this.fpaToken;
-    }
-  }, {
-    key: "_subscribeToPushNotifications",
-    value: function _subscribeToPushNotifications(channelType) {
-      var _this2 = this;
-
-      [NotificationTypes.NEW_MESSAGE, NotificationTypes.ADDED_TO_CONVERSATION, NotificationTypes.REMOVED_FROM_CONVERSATION, NotificationTypes.TYPING_INDICATOR, NotificationTypes.CONSUMPTION_UPDATE].forEach(function (messageType) {
-        _this2.services.notificationClient.subscribe(channelType, messageType);
-      });
+      return this._configuration.reachabilityEnabled;
     }
-  }, {
-    key: "_unsubscribeFromPushNotifications",
-    value: function _unsubscribeFromPushNotifications(channelType) {
-      var _this3 = this;
+    /**
+     * @deprecated Call constructor directly.
+     *
+     * Factory method to create a Conversations client instance.
+     *
+     * The factory method will automatically trigger connection.
+     * Do not use it if you need finer-grained control.
+     *
+     * Since this method returns an already-initialized client, some of the events
+     * will be lost because they happen *before* the initialization. It is
+     * recommended that `client.onWithReplay` is used as opposed to `client.on`
+     * for subscribing to client events. The `client.onWithReplay` will re-emit
+     * the most recent value for a given event if it emitted before the
+     * subscription.
+     *
+     * @param token Access token.
+     * @param options Options to customize the client.
+     * @returns Returns a fully initialized client.
+     */
 
-      [NotificationTypes.NEW_MESSAGE, NotificationTypes.ADDED_TO_CONVERSATION, NotificationTypes.REMOVED_FROM_CONVERSATION, NotificationTypes.TYPING_INDICATOR, NotificationTypes.CONSUMPTION_UPDATE].forEach(function (messageType) {
-        _this3.services.notificationClient.unsubscribe(channelType, messageType);
-      });
-    }
   }, {
-    key: "_initialize",
-    value: function () {
-      var _initialize2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-        var _this4 = this;
-
-        var configurationResponse;
+    key: "shutdown",
+    value:
+    /**
+     * Gracefully shut down the client.
+     */
+    function () {
+      var _shutdown = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
         return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 _context2.next = 2;
-                return this.services.commandExecutor.fetchResource("Client/v2/Configuration");
+                return this._ensureReady;
 
               case 2:
-                configurationResponse = _context2.sent;
-                this.configuration = new Configuration(this.options, configurationResponse, log);
-
-                this._myself._resolveInitialization(this.configuration, this.configuration.userIdentity, this.configuration.userInfo, true);
-
-                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", 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.conversations = new Conversations(this.configuration, this.services);
-                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("typingStarted", function (participant) {
-                  return _this4.emit("typingStarted", participant);
-                });
-                this.conversations.on("typingEnded", function (participant) {
-                  return _this4.emit("typingEnded", participant);
-                });
-                this.conversationsPromise = this.conversations.fetchConversations().then(function () {
-                  return _this4.conversations;
-                }).catch(function (error) {
-                  throw error;
-                });
-                _context2.next = 28;
-                return this.services.users.myself._ensureFetched();
-
-              case 28:
-                Client_1.supportedPushChannels.forEach(function (channelType) {
-                  return _this4._subscribeToPushNotifications(channelType);
-                });
-                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: undefined
-                }));
-
-                this._resolveEnsureReady();
-
-                this.emit("stateChanged", "initialized");
+                _context2.next = 4;
+                return this._services.twilsockClient.disconnect();
 
-              case 33:
+              case 4:
               case "end":
                 return _context2.stop();
             }
@@ -7438,20 +7681,21 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee2, this);
       }));
 
-      function _initialize() {
-        return _initialize2.apply(this, arguments);
+      function shutdown() {
+        return _shutdown.apply(this, arguments);
       }
 
-      return _initialize;
+      return shutdown;
     }()
     /**
-     * Gracefully shut down the client.
+     * Update the token used by the client and re-register with the Conversations services.
+     * @param token New access token.
      */
 
   }, {
-    key: "shutdown",
+    key: "updateToken",
     value: function () {
-      var _shutdown = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
+      var _updateToken = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(token) {
         return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
@@ -7460,10 +7704,32 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 return this._ensureReady;
 
               case 2:
-                _context3.next = 4;
-                return this.services.twilsockClient.disconnect();
+                Client_1._logger.info("updateToken");
 
-              case 4:
+                if (!(this._fpaToken === token)) {
+                  _context3.next = 5;
+                  break;
+                }
+
+                return _context3.abrupt("return", this);
+
+              case 5:
+                _context3.next = 7;
+                return this._services.twilsockClient.updateToken(token);
+
+              case 7:
+                _context3.next = 9;
+                return this._services.notificationClient.updateToken(token);
+
+              case 9:
+                _context3.next = 11;
+                return this._services.mcsClient.updateToken(token);
+
+              case 11:
+                this._fpaToken = token;
+                return _context3.abrupt("return", this);
+
+              case 13:
               case "end":
                 return _context3.stop();
             }
@@ -7471,21 +7737,22 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee3, this);
       }));
 
-      function shutdown() {
-        return _shutdown.apply(this, arguments);
+      function updateToken(_x) {
+        return _updateToken.apply(this, arguments);
       }
 
-      return shutdown;
+      return updateToken;
     }()
     /**
-     * Update the token used by the client and re-register with the Conversations services.
-     * @param token New access token.
+     * Get a known conversation by its SID.
+     * @param conversationSid Conversation sid
      */
 
   }, {
-    key: "updateToken",
+    key: "getConversationBySid",
     value: function () {
-      var _updateToken = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(token) {
+      var _getConversationBySid = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(conversationSid) {
+        var conversation;
         return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
@@ -7494,32 +7761,27 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 return this._ensureReady;
 
               case 2:
-                log.info("updateToken");
+                _context4.next = 4;
+                return this._conversations.myConversationsRead.promise;
 
-                if (!(this.fpaToken === token)) {
-                  _context4.next = 5;
-                  break;
-                }
+              case 4:
+                _context4.next = 6;
+                return this._conversations.getConversation(conversationSid);
 
-                return _context4.abrupt("return", this);
+              case 6:
+                conversation = _context4.sent;
 
-              case 5:
-                _context4.next = 7;
-                return this.services.twilsockClient.updateToken(token);
+                if (conversation) {
+                  _context4.next = 9;
+                  break;
+                }
 
-              case 7:
-                _context4.next = 9;
-                return this.services.notificationClient.updateToken(token);
+                throw new Error("Conversation with SID ".concat(conversationSid, " is not found."));
 
               case 9:
-                _context4.next = 11;
-                return this.services.mcsClient.updateToken(token);
+                return _context4.abrupt("return", conversation);
 
-              case 11:
-                this.fpaToken = token;
-                return _context4.abrupt("return", this);
-
-              case 13:
+              case 10:
               case "end":
                 return _context4.stop();
             }
@@ -7527,21 +7789,22 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee4, this);
       }));
 
-      function updateToken(_x) {
-        return _updateToken.apply(this, arguments);
+      function getConversationBySid(_x2) {
+        return _getConversationBySid.apply(this, arguments);
       }
 
-      return updateToken;
+      return getConversationBySid;
     }()
     /**
-     * Get a known conversation by its SID.
+     * Peek a conversation by its SID.
      * @param conversationSid Conversation sid
+     * @internal
      */
 
   }, {
-    key: "getConversationBySid",
+    key: "peekConversationBySid",
     value: function () {
-      var _getConversationBySid = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(conversationSid) {
+      var _peekConversationBySid = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(conversationSid) {
         var conversation;
         return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
           while (1) {
@@ -7552,38 +7815,22 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
               case 2:
                 _context5.next = 4;
-                return this.conversations.myConversationsRead.promise;
+                return this._conversations.peekConversation(conversationSid);
 
               case 4:
-                _context5.next = 6;
-                return this.conversations.getConversation(conversationSid);
-
-              case 6:
-                conversation = _context5.sent;
-
-                if (conversation) {
-                  _context5.next = 11;
-                  break;
-                }
-
-                _context5.next = 10;
-                return this.conversations.peekConversation(conversationSid);
-
-              case 10:
                 conversation = _context5.sent;
 
-              case 11:
                 if (conversation) {
-                  _context5.next = 13;
+                  _context5.next = 7;
                   break;
                 }
 
                 throw new Error("Conversation with SID ".concat(conversationSid, " is not found."));
 
-              case 13:
+              case 7:
                 return _context5.abrupt("return", conversation);
 
-              case 14:
+              case 8:
               case "end":
                 return _context5.stop();
             }
@@ -7591,11 +7838,11 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee5, this);
       }));
 
-      function getConversationBySid(_x2) {
-        return _getConversationBySid.apply(this, arguments);
+      function peekConversationBySid(_x3) {
+        return _peekConversationBySid.apply(this, arguments);
       }
 
-      return getConversationBySid;
+      return peekConversationBySid;
     }()
     /**
      * Get a known conversation by its unique identifier name.
@@ -7616,11 +7863,11 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
               case 2:
                 _context6.next = 4;
-                return this.conversations.myConversationsRead.promise;
+                return this._conversations.myConversationsRead.promise;
 
               case 4:
                 _context6.next = 6;
-                return this.conversations.getConversationByUniqueName(uniqueName);
+                return this._conversations.getConversationByUniqueName(uniqueName);
 
               case 6:
                 conversation = _context6.sent;
@@ -7643,7 +7890,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee6, this);
       }));
 
-      function getConversationByUniqueName(_x3) {
+      function getConversationByUniqueName(_x4) {
         return _getConversationByUniqueName.apply(this, arguments);
       }
 
@@ -7665,7 +7912,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 return this._ensureReady;
 
               case 2:
-                return _context7.abrupt("return", this.conversationsPromise.then(function (conversations) {
+                return _context7.abrupt("return", this._conversationsPromise.then(function (conversations) {
                   return conversations.getConversations();
                 }));
 
@@ -7702,7 +7949,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
               case 2:
                 options = options || {};
-                return _context8.abrupt("return", this.conversationsPromise.then(function (conversationsEntity) {
+                return _context8.abrupt("return", this._conversationsPromise.then(function (conversationsEntity) {
                   return conversationsEntity.addConversation(options);
                 }));
 
@@ -7714,7 +7961,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee8, this);
       }));
 
-      function createConversation(_x4) {
+      function createConversation(_x5) {
         return _createConversation.apply(this, arguments);
       }
 
@@ -7723,7 +7970,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
     /**
      * Register for push notifications.
      * @param channelType Channel type.
-     * @param registrationId Push notification ID provided by the FCM/APNS service on the platform.
+     * @param registrationId Push notification ID provided by the FCM/APNS service
+     * on the platform.
      */
 
   }, {
@@ -7740,9 +7988,10 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
               case 2:
                 this._subscribeToPushNotifications(channelType);
 
-                this.services.notificationClient.setPushRegistrationId(channelType, registrationId);
+                this._services.notificationClient.setPushRegistrationId(channelType, registrationId);
+
                 _context9.next = 6;
-                return this.services.notificationClient.commitChanges();
+                return this._services.notificationClient.commitChanges();
 
               case 6:
               case "end":
@@ -7752,7 +8001,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee9, this);
       }));
 
-      function setPushRegistrationId(_x5, _x6) {
+      function setPushRegistrationId(_x6, _x7) {
         return _setPushRegistrationId.apply(this, arguments);
       }
 
@@ -7779,7 +8028,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 this._unsubscribeFromPushNotifications(channelType);
 
                 _context10.next = 5;
-                return this.services.notificationClient.commitChanges();
+                return this._services.notificationClient.commitChanges();
 
               case 5:
               case "end":
@@ -7789,7 +8038,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee10, this);
       }));
 
-      function unsetPushRegistrationId(_x7) {
+      function unsetPushRegistrationId(_x8) {
         return _unsetPushRegistrationId.apply(this, arguments);
       }
 
@@ -7799,11 +8048,14 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
      * Clear existing registrations directly using provided device token.
      * This is useful to ensure stopped subscriptions without resubscribing.
      *
-     * This function goes completely beside the state machine and removes all registrations.
-     * Use with caution: if it races with current state machine operations, madness will ensue.
+     * This function goes completely beside the state machine and removes all
+     * registrations.
+     * Use with caution: if it races with current state machine operations,
+     * madness will ensue.
      *
      * @param channelType Channel type.
-     * @param registrationId Push notification ID provided by the FCM/APNS service on the platform.
+     * @param registrationId Push notification ID provided by the FCM/APNS service
+     * on the platform.
      */
 
   }, {
@@ -7815,7 +8067,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
             switch (_context11.prev = _context11.next) {
               case 0:
                 _context11.next = 2;
-                return this.services.notificationClient.removeRegistrations(channelType, registrationId);
+                return this._services.notificationClient.removeRegistrations(channelType, registrationId);
 
               case 2:
               case "end":
@@ -7825,17 +8077,22 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee11, this);
       }));
 
-      function removePushRegistrations(_x8, _x9) {
+      function removePushRegistrations(_x9, _x10) {
         return _removePushRegistrations.apply(this, arguments);
       }
 
       return removePushRegistrations;
     }()
+    /**
+     * Current version of the Conversations client.
+     */
+
   }, {
     key: "handlePushNotification",
     value:
     /**
-     * Handle push notification payload parsing and emit the {@link Client.pushNotification} event on this {@link Client} instance.
+     * Handle push notification payload parsing and emit the
+     * {@link Client.pushNotification} event on this {@link Client} instance.
      * @param notificationPayload Push notification payload
      */
     function () {
@@ -7848,7 +8105,8 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 return this._ensureReady;
 
               case 2:
-                log.debug("handlePushNotification, notificationPayload=", notificationPayload);
+                Client_1._logger.debug("handlePushNotification, notificationPayload=", notificationPayload);
+
                 this.emit("pushNotification", Client_1.parsePushNotification(notificationPayload));
 
               case 4:
@@ -7859,14 +8117,15 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee12, this);
       }));
 
-      function handlePushNotification(_x10) {
+      function handlePushNotification(_x11) {
         return _handlePushNotification.apply(this, arguments);
       }
 
       return handlePushNotification;
     }()
     /**
-     * Gets a user with the given identity. If it's in the subscribed list, then return the user object from it;
+     * Gets a user with the given identity. If it's in the subscribed list, then
+     * return the user object from it;
      * if not, then subscribe and add user to the subscribed list.
      * @param identity Identity of the user.
      * @returns A fully initialized user.
@@ -7884,7 +8143,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 return this._ensureReady;
 
               case 2:
-                return _context13.abrupt("return", this.services.users.getUser(identity));
+                return _context13.abrupt("return", this._services.users.getUser(identity));
 
               case 3:
               case "end":
@@ -7894,7 +8153,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
         }, _callee13, this);
       }));
 
-      function getUser(_x11) {
+      function getUser(_x12) {
         return _getUser.apply(this, arguments);
       }
 
@@ -7916,7 +8175,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
                 return this._ensureReady;
 
               case 2:
-                return _context14.abrupt("return", this.services.users.getSubscribedUsers());
+                return _context14.abrupt("return", this._services.users.getSubscribedUsers());
 
               case 3:
               case "end":
@@ -7932,52 +8191,254 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
       return getSubscribedUsers;
     }()
-  }], [{
-    key: "populateInitRegistrations",
-    value: function populateInitRegistrations(reg) {
-      reg.populateInitRegistrations([NotificationTypes.TYPING_INDICATOR]);
-      twilioSync.SyncClient.populateInitRegistrations(reg);
+    /**
+     * Get content URLs for all media attachments in the given set of media sids
+     * using a single operation.
+     * @param mediaSids Set of media sids to query for the content URL.
+     */
+
+  }, {
+    key: "getTemporaryContentUrlsForMediaSids",
+    value: function getTemporaryContentUrlsForMediaSids(mediaSids) {
+      var _this2 = this;
+
+      return new mcsClient.CancellablePromise( /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee15(resolve, reject, onCancel) {
+          var request, urls;
+          return _regeneratorRuntime__default['default'].wrap(function _callee15$(_context15) {
+            while (1) {
+              switch (_context15.prev = _context15.next) {
+                case 0:
+                  if (!(!_this2._services.mcsClient || !mediaSids)) {
+                    _context15.next = 3;
+                    break;
+                  }
+
+                  reject(new Error("Media Content Service is unavailable"));
+                  return _context15.abrupt("return");
+
+                case 3:
+                  request = _this2._services.mcsClient.mediaSetGetContentUrls(mediaSids);
+                  onCancel(function () {
+                    request.cancel();
+                  });
+                  _context15.prev = 5;
+                  _context15.next = 8;
+                  return request;
+
+                case 8:
+                  urls = _context15.sent;
+                  resolve(urls);
+                  _context15.next = 15;
+                  break;
+
+                case 12:
+                  _context15.prev = 12;
+                  _context15.t0 = _context15["catch"](5);
+                  reject(_context15.t0);
+
+                case 15:
+                case "end":
+                  return _context15.stop();
+              }
+            }
+          }, _callee15, null, [[5, 12]]);
+        }));
+
+        return function (_x13, _x14, _x15) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
     }
     /**
-     * Fired when a conversation becomes visible to the client. The event is also triggered when the client creates a new conversation.
-     * Fired for all conversations client has joined.
-     *
-     * Parameters:
-     * 1. {@link Conversation} `conversation` - the conversation in question
-     * @event
+     * Get content URLs for all media attachments in the given set using a single
+     * operation.
+     * @param contentSet Set of media attachments to query content URLs.
      */
 
   }, {
-    key: "create",
-    value:
+    key: "getTemporaryContentUrlsForMedia",
+    value: function getTemporaryContentUrlsForMedia(contentSet) {
+      // We ignore existing mcsMedia members of each of the media entries.
+      // Instead, we just collect their sids and pull new descriptors from a
+      // mediaSet GET endpoint.
+      var sids = contentSet.map(function (m) {
+        return m.sid;
+      });
+      return this.getTemporaryContentUrlsForMediaSids(sids);
+    }
     /**
-     * @deprecated Call constructor directly.
-     *
-     * Factory method to create a Conversations client instance.
-     *
-     * The factory method will automatically trigger connection.
-     * Do not use it if you need finer-grained control.
-     *
-     * Since this method returns an already-initialized client, some of the events
-     * will be lost because they happen *before* the initialization. It is
-     * recommended that `client.onWithReplay` is used as opposed to `client.on`
-     * for subscribing to client events. The `client.onWithReplay` will re-emit
-     * the most recent value for a given event if it emitted before the
-     * subscription.
-     *
-     * @param token Access token.
-     * @param options Options to customize the client.
-     * @returns Returns a fully initialized client.
+     * Initialize the client.
      */
-    function () {
-      var _create = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee15(token, options) {
+
+  }, {
+    key: "_initialize",
+    value: function () {
+      var _initialize2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee16() {
+        var _this3 = this;
+
+        var configurationResponse;
+        return _regeneratorRuntime__default['default'].wrap(function _callee16$(_context16) {
+          while (1) {
+            switch (_context16.prev = _context16.next) {
+              case 0:
+                _context16.next = 2;
+                return this._services.commandExecutor.fetchResource("Client/v2/Configuration");
+
+              case 2:
+                configurationResponse = _context16.sent;
+                this._configuration = new Configuration(this._options, configurationResponse, Client_1._logger);
+
+                this._myself._resolveInitialization(this._configuration, this._configuration.userIdentity, this._configuration.userInfo, true);
+
+                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", function (user) {
+                  _this3.emit("userSubscribed", user);
+                });
+
+                this._services.users.on("userUpdated", function (args) {
+                  return _this3.emit("userUpdated", args);
+                });
+
+                this._services.users.on("userUnsubscribed", function (user) {
+                  _this3.emit("userUnsubscribed", user);
+                });
+
+                this._conversations = new Conversations(this._configuration, this._services);
+
+                this._conversations.on("conversationAdded", function (conversation) {
+                  _this3.emit("conversationAdded", conversation);
+                });
+
+                this._conversations.on("conversationRemoved", function (conversation) {
+                  _this3.emit("conversationRemoved", conversation);
+                });
+
+                this._conversations.on("conversationJoined", function (conversation) {
+                  _this3.emit("conversationJoined", conversation);
+                });
+
+                this._conversations.on("conversationLeft", function (conversation) {
+                  _this3.emit("conversationLeft", conversation);
+                });
+
+                this._conversations.on("conversationUpdated", function (args) {
+                  return _this3.emit("conversationUpdated", args);
+                });
+
+                this._conversations.on("participantJoined", function (participant) {
+                  _this3.emit("participantJoined", participant);
+                });
+
+                this._conversations.on("participantLeft", function (participant) {
+                  _this3.emit("participantLeft", participant);
+                });
+
+                this._conversations.on("participantUpdated", function (args) {
+                  return _this3.emit("participantUpdated", args);
+                });
+
+                this._conversations.on("messageAdded", function (message) {
+                  return _this3.emit("messageAdded", message);
+                });
+
+                this._conversations.on("messageUpdated", function (args) {
+                  return _this3.emit("messageUpdated", args);
+                });
+
+                this._conversations.on("messageRemoved", function (message) {
+                  return _this3.emit("messageRemoved", message);
+                });
+
+                this._conversations.on("typingStarted", function (participant) {
+                  return _this3.emit("typingStarted", participant);
+                });
+
+                this._conversations.on("typingEnded", function (participant) {
+                  return _this3.emit("typingEnded", participant);
+                });
+
+                this._conversationsPromise = this._conversations.fetchConversations().then(function () {
+                  return _this3._conversations;
+                }).catch(function (error) {
+                  throw error;
+                });
+                _context16.next = 28;
+                return this._services.users.myself._ensureFetched();
+
+              case 28:
+                Client_1._supportedPushChannels.forEach(function (channelType) {
+                  return _this3._subscribeToPushNotifications(channelType);
+                });
+
+                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: undefined
+                }));
+
+                this._resolveEnsureReady();
+
+                this.emit("stateChanged", {
+                  state: "initialized"
+                });
+
+              case 33:
+              case "end":
+                return _context16.stop();
+            }
+          }
+        }, _callee16, this);
+      }));
+
+      function _initialize() {
+        return _initialize2.apply(this, arguments);
+      }
+
+      return _initialize;
+    }()
+    /**
+     * Subscribe to push notifications.
+     * @param channelType The channel type to subscribe to.
+     */
+
+  }, {
+    key: "_subscribeToPushNotifications",
+    value: function _subscribeToPushNotifications(channelType) {
+      var _this4 = this;
+
+      [NotificationTypes.NEW_MESSAGE, NotificationTypes.ADDED_TO_CONVERSATION, NotificationTypes.REMOVED_FROM_CONVERSATION, NotificationTypes.TYPING_INDICATOR, NotificationTypes.CONSUMPTION_UPDATE].forEach(function (messageType) {
+        _this4._services.notificationClient.subscribe(channelType, messageType);
+      });
+    }
+    /**
+     * Unsubscribe from push notifications.
+     * @param channelType The channel type to unsubscribe from.
+     */
+
+  }, {
+    key: "_unsubscribeFromPushNotifications",
+    value: function _unsubscribeFromPushNotifications(channelType) {
+      var _this5 = this;
+
+      [NotificationTypes.NEW_MESSAGE, NotificationTypes.ADDED_TO_CONVERSATION, NotificationTypes.REMOVED_FROM_CONVERSATION, NotificationTypes.TYPING_INDICATOR, NotificationTypes.CONSUMPTION_UPDATE].forEach(function (messageType) {
+        _this5._services.notificationClient.unsubscribe(channelType, messageType);
+      });
+    }
+  }], [{
+    key: "create",
+    value: function () {
+      var _create = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee17(token, options) {
         var client;
-        return _regeneratorRuntime__default['default'].wrap(function _callee15$(_context15) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee17$(_context17) {
           while (1) {
-            switch (_context15.prev = _context15.next) {
+            switch (_context17.prev = _context17.next) {
               case 0:
                 if (!(options !== null && options !== void 0 && options.twilsockClient)) {
-                  _context15.next = 2;
+                  _context17.next = 2;
                   break;
                 }
 
@@ -7985,64 +8446,45 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
               case 2:
                 client = new Client_1(token, options);
-                _context15.next = 5;
+                _context17.next = 5;
                 return client._ensureReady;
 
               case 5:
-                return _context15.abrupt("return", client);
+                return _context17.abrupt("return", client);
 
               case 6:
               case "end":
-                return _context15.stop();
+                return _context17.stop();
             }
           }
-        }, _callee15);
+        }, _callee17);
       }));
 
-      function create(_x12, _x13) {
+      function create(_x16, _x17) {
         return _create.apply(this, arguments);
       }
 
       return create;
     }()
-  }, {
-    key: "parsePushNotificationChatData",
-    value: function parsePushNotificationChatData(data) {
-      var result = {};
-
-      for (var key in Client_1.supportedPushDataFields) {
-        if (typeof data[key] === "undefined" || data[key] === null) {
-          continue;
-        }
-
-        if (key !== "message_index") {
-          result[Client_1.supportedPushDataFields[key]] = data[key];
-          continue;
-        }
-
-        if (parseToNumber(data[key]) !== null) {
-          result[Client_1.supportedPushDataFields[key]] = Number(data[key]);
-        }
-      }
-
-      return result;
-    }
     /**
-     * Static method for push notification payload parsing. Returns parsed push as a {@link PushNotification} object.
+     * Static method for push notification payload parsing. Returns parsed push as
+     * a {@link PushNotification} object.
      * @param notificationPayload Push notification payload.
      */
 
   }, {
     key: "parsePushNotification",
     value: function parsePushNotification(notificationPayload) {
-      log.debug("parsePushNotification, notificationPayload=", notificationPayload); // APNS specifics
+      Client_1._logger.debug("parsePushNotification, notificationPayload=", notificationPayload); // APNS specifics
+
 
       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");
         }
 
-        var data = Client_1.parsePushNotificationChatData(notificationPayload);
+        var data = Client_1._parsePushNotificationChatData(notificationPayload);
+
         var apsPayload = notificationPayload.aps;
         var body;
         var title = null;
@@ -8073,7 +8515,7 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
           throw new Error("Provided push notification payload does not contain Programmable Chat push notification type");
         }
 
-        var _data = Client_1.parsePushNotificationChatData(notificationPayload.data);
+        var _data = Client_1._parsePushNotificationChatData(notificationPayload.data);
 
         return new PushNotification({
           title: dataPayload.twi_title || null,
@@ -8088,19 +8530,80 @@ exports.Client = Client_1 = (_temp = _class = /*#__PURE__*/function (_ReplayEven
 
       throw new Error("Provided push notification payload is not Programmable Chat notification");
     }
+    /**
+     * Static method for parsing push notification chat data.
+     * @param data Data to parse
+     */
+
+  }, {
+    key: "_parsePushNotificationChatData",
+    value: function _parsePushNotificationChatData(data) {
+      var result = {};
+
+      for (var key in Client_1._supportedPushDataFields) {
+        var value = data[key];
+
+        if (typeof value === "undefined" || value === null) {
+          continue;
+        }
+
+        if (key === "message_index" || key === "media_count") {
+          var number = parseToNumber(value);
+
+          if (number !== null) {
+            result[Client_1._supportedPushDataFields[key]] = number;
+          }
+
+          continue;
+        }
+
+        if (key === "media") {
+          if (typeof value === "string") {
+            try {
+              result[Client_1._supportedPushDataFields[key]] = JSON.parse(value);
+            } catch (_unused) {
+              Client_1._logger.debug("Media message notification parsing error");
+            }
+          }
+
+          continue;
+        }
+
+        result[Client_1._supportedPushDataFields[key]] = value;
+      }
+
+      return result;
+    }
+    /**
+     * Populate the client with init registrations.
+     * @param reg The init registration to populate.
+     */
+
+  }, {
+    key: "populateInitRegistrations",
+    value: function populateInitRegistrations(reg) {
+      reg.populateInitRegistrations([NotificationTypes.TYPING_INDICATOR]);
+      twilioSync.SyncClient.populateInitRegistrations(reg);
+    }
   }]);
 
   return Client;
-}(replayEventEmitter.ReplayEventEmitter), _defineProperty__default['default'](_class, "version", SDK_VERSION), _defineProperty__default['default'](_class, "supportedPushChannels", ["fcm", "apn"]), _defineProperty__default['default'](_class, "supportedPushDataFields", {
+}(replayEventEmitter.ReplayEventEmitter), _defineProperty__default['default'](_class, "conversationAdded", "conversationAdded"), _defineProperty__default['default'](_class, "conversationJoined", "conversationJoined"), _defineProperty__default['default'](_class, "conversationLeft", "conversationLeft"), _defineProperty__default['default'](_class, "conversationRemoved", "conversationRemoved"), _defineProperty__default['default'](_class, "conversationUpdated", "conversationUpdated"), _defineProperty__default['default'](_class, "participantJoined", "participantJoined"), _defineProperty__default['default'](_class, "participantLeft", "participantLeft"), _defineProperty__default['default'](_class, "participantUpdated", "participantUpdated"), _defineProperty__default['default'](_class, "messageAdded", "messageAdded"), _defineProperty__default['default'](_class, "messageRemoved", "messageRemoved"), _defineProperty__default['default'](_class, "messageUpdated", "messageUpdated"), _defineProperty__default['default'](_class, "tokenAboutToExpire", "tokenAboutToExpire"), _defineProperty__default['default'](_class, "tokenExpired", "tokenExpired"), _defineProperty__default['default'](_class, "typingEnded", "typingEnded"), _defineProperty__default['default'](_class, "typingStarted", "typingStarted"), _defineProperty__default['default'](_class, "pushNotification", "pushNotification"), _defineProperty__default['default'](_class, "userSubscribed", "userSubscribed"), _defineProperty__default['default'](_class, "userUnsubscribed", "userUnsubscribed"), _defineProperty__default['default'](_class, "userUpdated", "userUpdated"), _defineProperty__default['default'](_class, "stateChanged", "stateChanged"), _defineProperty__default['default'](_class, "connectionStateChanged", "connectionStateChanged"), _defineProperty__default['default'](_class, "connectionError", "connectionError"), _defineProperty__default['default'](_class, "version", version), _defineProperty__default['default'](_class, "_logger", Logger.scope("Client")), _defineProperty__default['default'](_class, "_supportedPushChannels", ["fcm", "apn"]), _defineProperty__default['default'](_class, "_supportedPushDataFields", {
   conversation_sid: "conversationSid",
+  conversation_title: "conversationTitle",
   message_sid: "messageSid",
-  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);
+  message_index: "messageIndex",
+  media_count: "mediaCount",
+  media: "media" // object
+
+}), _temp);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "updateToken", null);
 
 __decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "getConversationBySid", null);
 
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports.Client.prototype, "peekConversationBySid", null);
+
 __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", {