@twilio/conversations 3.0.0-canary.100 → 3.0.0-canary.2

package/builds/lib.js

@@ -172,15 +172,17 @@ require('core-js/modules/es.function.name.js');
 require('core-js/modules/es.regexp.test.js');
 require('core-js/modules/es.symbol.description.js');
 require('core-js/modules/es.symbol.iterator.js');
+var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 require('core-js/modules/es.map.js');
+require('core-js/modules/es.set.js');
 var operationRetrier = require('@twilio/operation-retrier');
 var twilsock = require('twilsock');
+var syncerror = require('twilio-sync/src/utils/syncerror');
+var shared = require('@twilio/shared');
 var notifications = require('@twilio/notifications');
 var twilioSync = require('twilio-sync');
 var mcsClient = require('@twilio/mcs-client');
-var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
-require('core-js/modules/es.set.js');
 require('core-js/modules/es.number.is-integer.js');
 require('core-js/modules/es.typed-array.uint8-array.js');
 require('core-js/modules/es.typed-array.at.js');
@@ -250,8 +252,8 @@ var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regenerat
 var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 var loglevelLog__namespace = /*#__PURE__*/_interopNamespace(loglevelLog);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
-var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
+var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 
 function __decorate(decorators, target, key, desc) {
   var c = arguments.length,
@@ -829,10 +831,11 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _ensureFetched2.apply(this, arguments);
       }
       return _ensureFetched;
-    }() /**
-         * Edit user attributes.
-         * @param attributes New attributes.
-         */
+    }()
+    /**
+     * Edit user attributes.
+     * @param attributes New attributes.
+     */
   }, {
     key: "updateAttributes",
     value: function () {
@@ -867,10 +870,11 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _updateAttributes.apply(this, arguments);
       }
       return updateAttributes;
-    }() /**
-         * Update the friendly name of the user.
-         * @param friendlyName New friendly name.
-         */
+    }()
+    /**
+     * Update the friendly name of the user.
+     * @param friendlyName New friendly name.
+     */
   }, {
     key: "updateFriendlyName",
     value: function () {
@@ -905,10 +909,11 @@ var User = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _updateFriendlyName.apply(this, arguments);
       }
       return updateFriendlyName;
-    }() /**
-         * Remove the user from the subscription list.
-         * @return A promise of completion.
-         */
+    }()
+    /**
+     * Remove the user from the subscription list.
+     * @return A promise of completion.
+     */
   }, {
     key: "unsubscribe",
     value: function () {
@@ -969,6 +974,36 @@ __decorate([declarativeTypeValidator.validateTypesAsync(["string"]), __metadata(
 function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray$3(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$3(o, minLen); }
 function _arrayLikeToArray$3(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function messageFromErrorBody(transportError, payload) {
+  if (payload !== null && payload !== void 0 && payload.message) {
+    return payload.message;
+  }
+  switch (transportError.statusCode) {
+    case 429:
+      return "Throttled by server";
+    case 404:
+      return "Not found from server";
+    default:
+      return "Error from server";
+  }
+}
+function codeFromErrorBody(payload) {
+  var _payload$code;
+  return (_payload$code = payload === null || payload === void 0 ? void 0 : payload.code) !== null && _payload$code !== void 0 ? _payload$code : 0;
+}
+function mapTransportError(transportError, payload) {
+  if (transportError.statusCode === 409) {
+    return new syncerror.SyncNetworkError(messageFromErrorBody(transportError, payload), transportError.statusCode, codeFromErrorBody(payload), payload);
+  } else if (transportError.statusCode) {
+    return new syncerror.SyncError(messageFromErrorBody(transportError, payload), transportError.statusCode, codeFromErrorBody(payload));
+    // todo: still idk
+  } else if (transportError instanceof shared.TwilioError && transportError.errorInfo.reason === "transportDisconnected") {
+    return transportError;
+  } else {
+    var _ref, _payload$message;
+    return new syncerror.SyncError((_ref = (_payload$message = payload === null || payload === void 0 ? void 0 : payload.message) !== null && _payload$message !== void 0 ? _payload$message : transportError.message) !== null && _ref !== void 0 ? _ref : "Unexpected error", 0, 0);
+  }
+}
 var Network = /*#__PURE__*/function () {
   function Network(configuration, services) {
     _classCallCheck__default["default"](this, Network);
@@ -977,10 +1012,13 @@ var Network = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "cacheLifetime", void 0);
     _defineProperty__default["default"](this, "cache", void 0);
     _defineProperty__default["default"](this, "timer", void 0);
+    _defineProperty__default["default"](this, "pendingRequests", void 0);
+    _defineProperty__default["default"](this, "isShutdownInitiated", false);
     this.configuration = configuration;
     this.services = services;
     this.cache = new Map();
     this.cacheLifetime = this.configuration.httpCacheInterval * 100;
+    this.pendingRequests = new Set();
     this.cleanupCache();
   }
   _createClass__default["default"](Network, [{
@@ -1019,55 +1057,65 @@ var Network = /*#__PURE__*/function () {
         return _this.cleanupCache();
       }, this.cacheLifetime * 2);
     }
+  }, {
+    key: "responsePostProcess",
+    value: function responsePostProcess(response) {
+      var body;
+      try {
+        body = JSON.parse(response.payload);
+      } catch (_unused) {
+        body = response.payload;
+      }
+      return {
+        status: {
+          code: response.statusCode,
+          status: response.status
+        },
+        headers: response.headers,
+        body: body
+      };
+    }
   }, {
     key: "executeWithRetry",
     value: function executeWithRetry(request) {
       var _this2 = this;
+      var retryWhenThrottled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       return new Promise(function (resolve, reject) {
+        var codesToRetryOn = [502, 503, 504];
+        if (retryWhenThrottled) {
+          codesToRetryOn.push(429);
+        }
         var retrier = new operationRetrier.Retrier(_this2.configuration.backoffConfiguration);
         retrier.on("attempt", function () {
           request().then(function (result) {
-            var isError = result.statusCode >= 400 && result.statusCode < 500;
+            var isError = result.statusCode >= 400;
             if (!isError) {
               retrier.succeeded(result);
               return;
             }
-            var parsedPayload = JSON.parse(result.payload);
-            retrier.failed(new Error("".concat(parsedPayload.message)));
-            /*
-            const isError = result.statusCode >= 400 && result.statusCode < 500;
-            if (isError) {
-              const parsedPayload = JSON.parse(result.payload);
-              if (codesToRetryOn.includes(parsedPayload.status)) {
-                let delayOverride = parseInt(result.headers ? result.headers['Retry-After'] : null);
-                retrier.failed(mapTransportError(result, parsedPayload),
-                  isNaN(delayOverride) ? null : delayOverride * 1000);
-              } else if (parsedPayload.message === 'Twilsock disconnected') {
-                // Ugly hack. We must make a proper exceptions for twilsock
-                retrier.failed(mapTransportError(result, parsedPayload));
-              } else {
-                // Fatal error
-                retrier.removeAllListeners();
-                retrier.cancel();
-                reject(mapTransportError(result, parsedPayload));
-              }
+            var parsedPayload = {};
+            try {
+              parsedPayload = JSON.parse(result.payload);
+            } catch (_unused2) {}
+            if (codesToRetryOn.includes(result.statusCode)) {
+              var delayOverride = parseInt(result.headers ? result.headers["Retry-After"] : null);
+              retrier.failed(mapTransportError(result, parsedPayload), isNaN(delayOverride) ? undefined : delayOverride * 1000);
+            } else if (parsedPayload.message === "Twilsock disconnected") {
+              // Ugly hack. We must make a proper exceptions for twilsock
+              retrier.failed(mapTransportError(result, parsedPayload));
+            } else {
+              // Fatal error
+              retrier.removeAllListeners();
+              retrier.cancel();
+              reject(mapTransportError(result, parsedPayload));
             }
-            */
           }).catch(function (err) {
-            // if (codesToRetryOn.indexOf(err.status) > -1) {
-            //   retrier.failed(err);
-            // } else if (err.message === "Twilsock disconnected") {
-            //   // Ugly hack. We must make a proper exceptions for twilsock
-            //   retrier.failed(err);
-            // } else {
             // Fatal error
             retrier.removeAllListeners();
             retrier.cancel();
             reject(err);
-            // }
           });
         });
-
         retrier.on("succeeded", function (result) {
           resolve(result);
         });
@@ -1085,34 +1133,44 @@ var Network = /*#__PURE__*/function () {
     value: function () {
       var _get = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(url) {
         var _this3 = this;
-        var cacheEntry, response;
+        var cacheEntry, responsePromise, response, postprocessedResponse;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                if (!this.isShutdownInitiated) {
+                  _context.next = 2;
+                  break;
+                }
+                throw new Error("Client has been shut down.");
+              case 2:
                 cacheEntry = this.cache.get(url);
                 if (!(cacheEntry && !this.isExpired(cacheEntry.timestamp))) {
-                  _context.next = 3;
+                  _context.next = 5;
                   break;
                 }
                 return _context.abrupt("return", cacheEntry.response);
-              case 3:
-                _context.next = 5;
-                return this.executeWithRetry(function () {
-                  return _this3.services.transport.get({
+              case 5:
+                responsePromise = this.executeWithRetry(function () {
+                  return _this3.services.transport.sendRequest(new twilsock.HttpRequest({
                     url: url,
                     grant: _this3.configuration.productId
-                  });
+                  }));
                 }, this.configuration.retryWhenThrottled);
-              case 5:
+                this.pendingRequests.add(responsePromise);
+                _context.next = 9;
+                return responsePromise;
+              case 9:
                 response = _context.sent;
+                this.pendingRequests.delete(responsePromise);
+                postprocessedResponse = this.responsePostProcess(response);
                 this.cache.set(url, {
-                  response: response,
+                  response: postprocessedResponse,
                   timestamp: Date.now()
                 });
                 this.pokeTimer();
-                return _context.abrupt("return", response);
-              case 9:
+                return _context.abrupt("return", postprocessedResponse);
+              case 15:
               case "end":
                 return _context.stop();
             }
@@ -1124,6 +1182,39 @@ var Network = /*#__PURE__*/function () {
       }
       return get;
     }()
+  }, {
+    key: "disconnect",
+    value: function () {
+      var _disconnect = _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:
+                this.isShutdownInitiated = true;
+                _context2.prev = 1;
+                _context2.next = 4;
+                return Promise.all(_toConsumableArray__default["default"](this.pendingRequests));
+              case 4:
+                _context2.next = 8;
+                break;
+              case 6:
+                _context2.prev = 6;
+                _context2.t0 = _context2["catch"](1);
+              case 8:
+                _context2.next = 10;
+                return this.services.syncClient.shutdown();
+              case 10:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this, [[1, 6]]);
+      }));
+      function disconnect() {
+        return _disconnect.apply(this, arguments);
+      }
+      return disconnect;
+    }()
   }]);
   return Network;
 }();
@@ -1403,9 +1494,10 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getUser.apply(this, arguments);
       }
       return getUser;
-    }() /**
-         * Remove the participant from the conversation.
-         */
+    }()
+    /**
+     * Remove the participant from the conversation.
+     */
   }, {
     key: "remove",
     value: function () {
@@ -1426,10 +1518,11 @@ var Participant = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _remove.apply(this, arguments);
       }
       return remove;
-    }() /**
-         * Update the attributes of the participant.
-         * @param attributes New attributes.
-         */
+    }()
+    /**
+     * Update the attributes of the participant.
+     * @param attributes New attributes.
+     */
   }, {
     key: "updateAttributes",
     value: function () {
@@ -1650,9 +1743,10 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _upsertParticipant.apply(this, arguments);
       }
       return upsertParticipant;
-    }() /**
-         * @returns {Promise<Array<Participant>>} returns list of participants {@see Participant}
-         */
+    }()
+    /**
+     * @returns {Promise<Array<Participant>>} returns list of participants {@see Participant}
+     */
   }, {
     key: "getParticipants",
     value: function () {
@@ -1680,10 +1774,11 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getParticipants.apply(this, arguments);
       }
       return getParticipants;
-    }() /**
-         * Get participant by SID from conversation
-         * @returns {Promise<Participant>}
-         */
+    }()
+    /**
+     * Get participant by SID from conversation
+     * @returns {Promise<Participant>}
+     */
   }, {
     key: "getParticipantBySid",
     value: function () {
@@ -1711,10 +1806,11 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getParticipantBySid.apply(this, arguments);
       }
       return getParticipantBySid;
-    }() /**
-         * Get participant by identity from conversation
-         * @returns {Promise<Participant>}
-         */
+    }()
+    /**
+     * Get participant by identity from conversation
+     * @returns {Promise<Participant>}
+     */
   }, {
     key: "getParticipantByIdentity",
     value: function () {
@@ -1748,9 +1844,10 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getParticipantByIdentity.apply(this, arguments);
       }
       return getParticipantByIdentity;
-    }() /**
-         * Add a chat participant to the conversation
-         */
+    }()
+    /**
+     * Add a chat participant to the conversation
+     */
   }, {
     key: "add",
     value: function () {
@@ -1782,9 +1879,10 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _add.apply(this, arguments);
       }
       return add;
-    }() /**
-         * Add a non-chat participant to the conversation.
-         */
+    }()
+    /**
+     * Add a non-chat participant to the conversation.
+     */
   }, {
     key: "addNonChatParticipant",
     value: function () {
@@ -1827,9 +1925,10 @@ var Participants = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _addNonChatParticipant.apply(this, arguments);
       }
       return addNonChatParticipant;
-    }() /**
-         * Remove the participant with a given identity from a conversation.
-         */
+    }()
+    /**
+     * Remove the participant with a given identity from a conversation.
+     */
   }, {
     key: "remove",
     value: function remove(identity) {
@@ -2062,7 +2161,8 @@ var Media = /*#__PURE__*/function () {
  * errors (in the case of MMS for instance).
  *
  * {@link AggregatedDeliveryReceipt} class contains an aggregated value {@link DeliveryAmount} for each delivery status.
- */var AggregatedDeliveryReceipt = /*#__PURE__*/function () {
+ */
+var AggregatedDeliveryReceipt = /*#__PURE__*/function () {
   /**
    * @internal
    */
@@ -2157,7 +2257,8 @@ var Media = /*#__PURE__*/function () {
 
 /**
  * Pagination helper class.
- */var RestPaginator = /*#__PURE__*/function () {
+ */
+var RestPaginator = /*#__PURE__*/function () {
   /**
    * @internal
    */
@@ -2218,7 +2319,8 @@ var Media = /*#__PURE__*/function () {
 
 /**
  * Represents a delivery receipt of a message.
- */var DetailedDeliveryReceipt = /*#__PURE__*/_createClass__default["default"](
+ */
+var DetailedDeliveryReceipt = /*#__PURE__*/_createClass__default["default"](
 /**
  * Unique identifier for the delivery receipt.
  */
@@ -2630,9 +2732,10 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getParticipant.apply(this, arguments);
       }
       return getParticipant;
-    }() /**
-         * Get the delivery receipts of the message.
-         */
+    }()
+    /**
+     * Get the delivery receipts of the message.
+     */
   }, {
     key: "getDetailedDeliveryReceipts",
     value: function () {
@@ -2672,9 +2775,10 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getDetailedDeliveryReceipts.apply(this, arguments);
       }
       return getDetailedDeliveryReceipts;
-    }() /**
-         * Remove the message.
-         */
+    }()
+    /**
+     * Remove the message.
+     */
   }, {
     key: "remove",
     value: function () {
@@ -2698,10 +2802,11 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _remove.apply(this, arguments);
       }
       return remove;
-    }() /**
-         * Edit the message body.
-         * @param body New body of the message.
-         */
+    }()
+    /**
+     * Edit the message body.
+     * @param body New body of the message.
+     */
   }, {
     key: "updateBody",
     value: function () {
@@ -2727,10 +2832,11 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _updateBody.apply(this, arguments);
       }
       return updateBody;
-    }() /**
-         * Edit the message attributes.
-         * @param attributes New attributes.
-         */
+    }()
+    /**
+     * Edit the message attributes.
+     * @param attributes New attributes.
+     */
   }, {
     key: "updateAttributes",
     value: function () {
@@ -2756,10 +2862,11 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _updateAttributes.apply(this, arguments);
       }
       return updateAttributes;
-    }() /**
-         * 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.
-         */
+    }()
+    /**
+     * 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: "getTemporaryContentUrlsForMedia",
     value: function getTemporaryContentUrlsForMedia(contentSet) {
@@ -2844,7 +2951,7 @@ var Message = /*#__PURE__*/function (_ReplayEventEmitter) {
             switch (_context7.prev = _context7.next) {
               case 0:
                 messagesReceiptsUrl = this.configuration.links.messagesReceipts.replace("%s", this.conversation.sid).replace("%s", this.sid);
-                url = new UriBuilder(messagesReceiptsUrl).arg("PageToken", options === null || options === void 0 ? void 0 : options.pageToken).arg("PageSize", options === null || options === void 0 ? void 0 : options.pageSize).build(); // todo: remove any after the release of new Twilsock
+                url = new UriBuilder(messagesReceiptsUrl).arg("PageToken", options === null || options === void 0 ? void 0 : options.pageToken).arg("PageSize", options === null || options === void 0 ? void 0 : options.pageSize).build();
                 _context7.next = 4;
                 return this.services.network.get(url);
               case 4:
@@ -3016,10 +3123,11 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _unsubscribe.apply(this, arguments);
       }
       return unsubscribe;
-    }() /**
-         * Send a message to the conversation. The message could include text and multiple media attachments.
-         * @param message Message to post
-         */
+    }()
+    /**
+     * Send a message to the conversation. The message could include text and multiple media attachments.
+     * @param message Message to post
+     */
   }, {
     key: "sendV2",
     value: function sendV2(message) {
@@ -3151,13 +3259,14 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _send.apply(this, arguments);
       }
       return send;
-    }() /**
-         * Send Media Message to the conversation
-         * @param mediaContent Media content to post
-         * @param attributes Message attributes
-         * @param emailOptions Email options
-         * @returns Returns promise which can fail
-         */
+    }()
+    /**
+     * Send Media Message to the conversation
+     * @param mediaContent Media content to post
+     * @param attributes Message attributes
+     * @param emailOptions Email options
+     * @returns Returns promise which can fail
+     */
   }, {
     key: "sendMedia",
     value: function () {
@@ -3210,13 +3319,14 @@ var Messages = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _sendMedia.apply(this, arguments);
       }
       return sendMedia;
-    }() /**
-         * Returns messages from conversation using paginator interface
-         * @param pageSize Number of messages to return in single chunk. By default it's 30.
-         * @param anchor Most early message id which is already known, or 'end' by default
-         * @param direction Pagination order 'backwards' or 'forward', 'forward' by default
-         * @returns Last page of messages by default
-         */
+    }()
+    /**
+     * Returns messages from conversation using paginator interface
+     * @param pageSize Number of messages to return in single chunk. By default it's 30.
+     * @param anchor Most early message id which is already known, or 'end' by default
+     * @param direction Pagination order 'backwards' or 'forward', 'forward' by default
+     * @returns Last page of messages by default
+     */
   }, {
     key: "getMessages",
     value: function () {
@@ -3964,12 +4074,14 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
      */
   }, {
     key: "add",
-    value: /**
-            * Add a participant to the conversation by its identity.
-            * @param identity Identity of the Client to add.
-            * @param attributes Attributes to be attached to the participant.
-            * @returns The added participant.
-            */function () {
+    value:
+    /**
+     * Add a participant to the conversation by its identity.
+     * @param identity Identity of the Client to add.
+     * @param attributes Attributes to be attached to the participant.
+     * @returns The added participant.
+     */
+    function () {
       var _add = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(identity, attributes) {
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
@@ -3987,15 +4099,16 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _add.apply(this, arguments);
       }
       return add;
-    }() /**
-         * Add a non-chat participant to the conversation.
-         * @param proxyAddress Proxy (Twilio) address of the participant.
-         * @param address User address of the participant.
-         * @param attributes Attributes to be attached to the participant.
-         * @param bindingOptions Options for adding email participants - name and
-         * CC/To level.
-         * @returns The added participant.
-         */
+    }()
+    /**
+     * Add a non-chat participant to the conversation.
+     * @param proxyAddress Proxy (Twilio) address of the participant.
+     * @param address User address of the participant.
+     * @param attributes Attributes to be attached to the participant.
+     * @param bindingOptions Options for adding email participants - name and
+     * CC/To level.
+     * @returns The added participant.
+     */
   }, {
     key: "addNonChatParticipant",
     value: function () {
@@ -4021,14 +4134,15 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _addNonChatParticipant.apply(this, arguments);
       }
       return addNonChatParticipant;
-    }() /**
-         * Advance the conversation's last read message index to the current read
-         * horizon. Rejects if the user is not a participant of the conversation. Last
-         * read message index is updated only if the new index value is higher than
-         * the previous.
-         * @param index Message index to advance to.
-         * @return Resulting unread messages count in the conversation.
-         */
+    }()
+    /**
+     * Advance the conversation's last read message index to the current read
+     * horizon. Rejects if the user is not a participant of the conversation. Last
+     * read message index is updated only if the new index value is higher than
+     * the previous.
+     * @param index Message index to advance to.
+     * @return Resulting unread messages count in the conversation.
+     */
   }, {
     key: "advanceLastReadMessageIndex",
     value: function () {
@@ -4065,9 +4179,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _advanceLastReadMessageIndex.apply(this, arguments);
       }
       return advanceLastReadMessageIndex;
-    }() /**
-         * Delete the conversation and unsubscribe from its events.
-         */
+    }()
+    /**
+     * Delete the conversation and unsubscribe from its events.
+     */
   }, {
     key: "delete",
     value: function () {
@@ -4091,9 +4206,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _delete2.apply(this, arguments);
       }
       return _delete;
-    }() /**
-         * Get the custom attributes of this Conversation.
-         */
+    }()
+    /**
+     * Get the custom attributes of this Conversation.
+     */
   }, {
     key: "getAttributes",
     value: function () {
@@ -4117,17 +4233,18 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getAttributes.apply(this, arguments);
       }
       return getAttributes;
-    }() /**
-         * Returns messages from the conversation using the paginator interface.
-         * @param pageSize Number of messages to return in a single chunk. Default is
-         * 30.
-         * @param anchor Index of the newest message to fetch. Default is from the
-         * end.
-         * @param direction Query direction. By default, it queries backwards
-         * from newer to older. The `"forward"` value will query in the opposite
-         * direction.
-         * @return A page of messages.
-         */
+    }()
+    /**
+     * Returns messages from the conversation using the paginator interface.
+     * @param pageSize Number of messages to return in a single chunk. Default is
+     * 30.
+     * @param anchor Index of the newest message to fetch. Default is from the
+     * end.
+     * @param direction Query direction. By default, it queries backwards
+     * from newer to older. The `"forward"` value will query in the opposite
+     * direction.
+     * @return A page of messages.
+     */
   }, {
     key: "getMessages",
     value: function () {
@@ -4151,9 +4268,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getMessages.apply(this, arguments);
       }
       return getMessages;
-    }() /**
-         * Get a list of all the participants who are joined to this conversation.
-         */
+    }()
+    /**
+     * Get a list of all the participants who are joined to this conversation.
+     */
   }, {
     key: "getParticipants",
     value: function () {
@@ -4177,17 +4295,18 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getParticipants.apply(this, arguments);
       }
       return getParticipants;
-    }() /**
-         * Get conversation participants count.
-         *
-         * This method is semi-realtime. This means that this data will be eventually
-         * correct, but will also be possibly incorrect for a few seconds. The
-         * Conversations system does not provide real time events for counter values
-         * changes.
-         *
-         * This is useful for any UI badges, but it is not recommended to build any
-         * core application logic based on these counters being accurate in real time.
-         */
+    }()
+    /**
+     * Get conversation participants count.
+     *
+     * This method is semi-realtime. This means that this data will be eventually
+     * correct, but will also be possibly incorrect for a few seconds. The
+     * Conversations system does not provide real time events for counter values
+     * changes.
+     *
+     * This is useful for any UI badges, but it is not recommended to build any
+     * core application logic based on these counters being accurate in real time.
+     */
   }, {
     key: "getParticipantsCount",
     value: function () {
@@ -4215,10 +4334,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getParticipantsCount.apply(this, arguments);
       }
       return getParticipantsCount;
-    }() /**
-         * Get a participant by its SID.
-         * @param participantSid Participant SID.
-         */
+    }()
+    /**
+     * Get a participant by its SID.
+     * @param participantSid Participant SID.
+     */
   }, {
     key: "getParticipantBySid",
     value: function () {
@@ -4239,10 +4359,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getParticipantBySid.apply(this, arguments);
       }
       return getParticipantBySid;
-    }() /**
-         * Get a participant by its identity.
-         * @param identity Participant identity.
-         */
+    }()
+    /**
+     * Get a participant by its identity.
+     * @param identity Participant identity.
+     */
   }, {
     key: "getParticipantByIdentity",
     value: function () {
@@ -4266,17 +4387,18 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getParticipantByIdentity.apply(this, arguments);
       }
       return getParticipantByIdentity;
-    }() /**
-         * Get the total message count in the conversation.
-         *
-         * This method is semi-realtime. This means that this data will be eventually
-         * correct, but will also be possibly incorrect for a few seconds. The
-         * Conversations system does not provide real time events for counter values
-         * changes.
-         *
-         * This is useful for any UI badges, but it is not recommended to build any
-         * core application logic based on these counters being accurate in real time.
-         */
+    }()
+    /**
+     * Get the total message count in the conversation.
+     *
+     * This method is semi-realtime. This means that this data will be eventually
+     * correct, but will also be possibly incorrect for a few seconds. The
+     * Conversations system does not provide real time events for counter values
+     * changes.
+     *
+     * This is useful for any UI badges, but it is not recommended to build any
+     * core application logic based on these counters being accurate in real time.
+     */
   }, {
     key: "getMessagesCount",
     value: function () {
@@ -4304,29 +4426,30 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getMessagesCount.apply(this, arguments);
       }
       return getMessagesCount;
-    }() /**
-         * Get count of unread messages for the user if they are a participant of this
-         * conversation. Rejects if the user is not a participant of the conversation.
-         *
-         * Use this method to obtain the number of unread messages together with
-         * {@link Conversation.updateLastReadMessageIndex} instead of relying on the
-         * message indices which may have gaps. See {@link Message.index} for details.
-         *
-         * This method is semi-realtime. This means that this data will be eventually
-         * correct, but it will also be possibly incorrect for a few seconds. The
-         * Conversations system does not provide real time events for counter values
-         * changes.
-         *
-         * This is useful for any UI badges, but it is not recommended to build any
-         * core application logic based on these counters being accurate in real time.
-         *
-         * If the read horizon is not set, this function will return null. This could mean
-         * that all messages in the conversation are unread, or that the read horizon system
-         * is not being used. How to interpret this `null` value is up to the customer application.
-         *
-         * @return Number of unread messages based on the current read horizon set for
-         * the user or `null` if the read horizon is not set.
-         */
+    }()
+    /**
+     * Get count of unread messages for the user if they are a participant of this
+     * conversation. Rejects if the user is not a participant of the conversation.
+     *
+     * Use this method to obtain the number of unread messages together with
+     * {@link Conversation.updateLastReadMessageIndex} instead of relying on the
+     * message indices which may have gaps. See {@link Message.index} for details.
+     *
+     * This method is semi-realtime. This means that this data will be eventually
+     * correct, but it will also be possibly incorrect for a few seconds. The
+     * Conversations system does not provide real time events for counter values
+     * changes.
+     *
+     * This is useful for any UI badges, but it is not recommended to build any
+     * core application logic based on these counters being accurate in real time.
+     *
+     * If the read horizon is not set, this function will return null. This could mean
+     * that all messages in the conversation are unread, or that the read horizon system
+     * is not being used. How to interpret this `null` value is up to the customer application.
+     *
+     * @return Number of unread messages based on the current read horizon set for
+     * the user or `null` if the read horizon is not set.
+     */
   }, {
     key: "getUnreadMessagesCount",
     value: function () {
@@ -4366,9 +4489,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getUnreadMessagesCount.apply(this, arguments);
       }
       return getUnreadMessagesCount;
-    }() /**
-         * Join the conversation and subscribe to its events.
-         */
+    }()
+    /**
+     * Join the conversation and subscribe to its events.
+     */
   }, {
     key: "join",
     value: function () {
@@ -4394,9 +4518,10 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _join.apply(this, arguments);
       }
       return join;
-    }() /**
-         * Leave the conversation.
-         */
+    }()
+    /**
+     * Leave the conversation.
+     */
   }, {
     key: "leave",
     value: function () {
@@ -4424,11 +4549,12 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _leave.apply(this, arguments);
       }
       return leave;
-    }() /**
-         * Remove a participant from the conversation. When a string is passed as the
-         * argument, it will assume that the string is an identity or SID.
-         * @param participant Identity, SID or the participant object to remove.
-         */
+    }()
+    /**
+     * Remove a participant from the conversation. When a string is passed as the
+     * argument, it will assume that the string is an identity or SID.
+     * @param participant Identity, SID or the participant object to remove.
+     */
   }, {
     key: "removeParticipant",
     value: function () {
@@ -4450,15 +4576,16 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _removeParticipant.apply(this, arguments);
       }
       return removeParticipant;
-    }() /**
-         * Send a message to the conversation.
-         * @param message Message body for the text message,
-         * `FormData` or {@link SendMediaOptions} for media content. Sending FormData
-         * is supported only with the browser engine.
-         * @param messageAttributes Attributes for the message.
-         * @param emailOptions Email options for the message.
-         * @return Index of the new message.
-         */
+    }()
+    /**
+     * Send a message to the conversation.
+     * @param message Message body for the text message,
+     * `FormData` or {@link SendMediaOptions} for media content. Sending FormData
+     * is supported only with the browser engine.
+     * @param messageAttributes Attributes for the message.
+     * @param emailOptions Email options for the message.
+     * @return Index of the new message.
+     */
   }, {
     key: "sendMessage",
     value: function () {
@@ -4529,11 +4656,12 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _sendMessage.apply(this, arguments);
       }
       return sendMessage;
-    }() /**
-         * New interface to prepare for sending a message.
-         * Use this instead of {@link Message.sendMessage}.
-         * @return A MessageBuilder to help set all message sending options.
-         */
+    }()
+    /**
+     * New interface to prepare for sending a message.
+     * Use this instead of {@link Message.sendMessage}.
+     * @return A MessageBuilder to help set all message sending options.
+     */
   }, {
     key: "prepareMessage",
     value: function prepareMessage() {
@@ -4578,10 +4706,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _setAllMessagesRead.apply(this, arguments);
       }
       return setAllMessagesRead;
-    }() /**
-         * Set all messages in the conversation unread.
-         * @returns New count of unread messages after this update.
-         */
+    }()
+    /**
+     * Set all messages in the conversation unread.
+     * @returns New count of unread messages after this update.
+     */
   }, {
     key: "setAllMessagesUnread",
     value: function () {
@@ -4608,10 +4737,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _setAllMessagesUnread.apply(this, arguments);
       }
       return setAllMessagesUnread;
-    }() /**
-         * Set user notification level for this conversation.
-         * @param notificationLevel New user notification level.
-         */
+    }()
+    /**
+     * Set user notification level for this conversation.
+     * @param notificationLevel New user notification level.
+     */
   }, {
     key: "setUserNotificationLevel",
     value: function () {
@@ -4635,12 +4765,13 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _setUserNotificationLevel.apply(this, arguments);
       }
       return setUserNotificationLevel;
-    }() /**
-         * Send a notification to the server indicating that this client is currently
-         * typing in this conversation. Typing ended notification is sent after a
-         * while automatically, but by calling this method again you ensure that
-         * typing ended is not received.
-         */
+    }()
+    /**
+     * Send a notification to the server indicating that this client is currently
+     * typing in this conversation. Typing ended notification is sent after a
+     * while automatically, but by calling this method again you ensure that
+     * typing ended is not received.
+     */
   }, {
     key: "typing",
     value: function typing() {
@@ -4675,10 +4806,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _updateAttributes.apply(this, arguments);
       }
       return updateAttributes;
-    }() /**
-         * Update the friendly name of the conversation.
-         * @param friendlyName New friendly name.
-         */
+    }()
+    /**
+     * Update the friendly name of the conversation.
+     * @param friendlyName New friendly name.
+     */
   }, {
     key: "updateFriendlyName",
     value: function () {
@@ -4708,12 +4840,13 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _updateFriendlyName.apply(this, arguments);
       }
       return updateFriendlyName;
-    }() /**
-         * Set the last read message index to the current read horizon.
-         * @param index Message index to set as last read. If null is provided, then
-         * the behavior is identical to {@link Conversation.setAllMessagesUnread}.
-         * @returns New count of unread messages after this update.
-         */
+    }()
+    /**
+     * Set the last read message index to the current read horizon.
+     * @param index Message index to set as last read. If null is provided, then
+     * the behavior is identical to {@link Conversation.setAllMessagesUnread}.
+     * @returns New count of unread messages after this update.
+     */
   }, {
     key: "updateLastReadMessageIndex",
     value: function () {
@@ -4737,11 +4870,12 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _updateLastReadMessageIndex.apply(this, arguments);
       }
       return updateLastReadMessageIndex;
-    }() /**
-         * Update the unique name of the conversation.
-         * @param uniqueName New unique name for the conversation. Setting unique name
-         * to null removes it.
-         */
+    }()
+    /**
+     * Update the unique name of the conversation.
+     * @param uniqueName New unique name for the conversation. Setting unique name
+     * to null removes it.
+     */
   }, {
     key: "updateUniqueName",
     value: function () {
@@ -4772,12 +4906,13 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _updateUniqueName.apply(this, arguments);
       }
       return updateUniqueName;
-    }() /**
-         * Load and subscribe to this conversation and do not subscribe to its
-         * participants and messages. This or _subscribeStreams will need to be called
-         * before any events on conversation will fire.
-         * @internal
-         */
+    }()
+    /**
+     * Load and subscribe to this conversation and do not subscribe to its
+     * participants and messages. This or _subscribeStreams will need to be called
+     * before any events on conversation will fire.
+     * @internal
+     */
   }, {
     key: "_subscribe",
     value: function () {
@@ -4831,15 +4966,16 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _subscribe2.apply(this, arguments);
       }
       return _subscribe;
-    }() /**
-         * Fetch participants and messages of the conversation. This method needs to
-         * be called during conversation initialization to catch broken conversations
-         * (broken conversations are conversations that have essential Sync entities
-         * missing, i.e. the conversation document, the messages list or the
-         * participant map). In case of this conversation being broken, the method
-         * will throw an exception that will be caught and handled gracefully.
-         * @internal
-         */
+    }()
+    /**
+     * Fetch participants and messages of the conversation. This method needs to
+     * be called during conversation initialization to catch broken conversations
+     * (broken conversations are conversations that have essential Sync entities
+     * missing, i.e. the conversation document, the messages list or the
+     * participant map). In case of this conversation being broken, the method
+     * will throw an exception that will be caught and handled gracefully.
+     * @internal
+     */
   }, {
     key: "_fetchStreams",
     value: function () {
@@ -4880,13 +5016,14 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _fetchStreams2.apply(this, arguments);
       }
       return _fetchStreams;
-    }() /**
-         * Load the attributes of this conversation and instantiate its participants
-         * and messages. This or _subscribe will need to be called before any events
-         * on the conversation will fire. This will need to be called before any
-         * events on participants or messages will fire
-         * @internal
-         */
+    }()
+    /**
+     * Load the attributes of this conversation and instantiate its participants
+     * and messages. This or _subscribe will need to be called before any events
+     * on the conversation will fire. This will need to be called before any
+     * events on participants or messages will fire
+     * @internal
+     */
   }, {
     key: "_subscribeStreams",
     value: function () {
@@ -4928,10 +5065,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _subscribeStreams2.apply(this, arguments);
       }
       return _subscribeStreams;
-    }() /**
-         * Stop listening for and firing events on this conversation.
-         * @internal
-         */
+    }()
+    /**
+     * Stop listening for and firing events on this conversation.
+     * @internal
+     */
   }, {
     key: "_unsubscribe",
     value: function () {
@@ -4962,10 +5100,11 @@ var Conversation = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _unsubscribe2.apply(this, arguments);
       }
       return _unsubscribe;
-    }() /**
-         * Set conversation status.
-         * @internal
-         */
+    }()
+    /**
+     * Set conversation status.
+     * @internal
+     */
   }, {
     key: "_setStatus",
     value: function _setStatus(status, source) {
@@ -5349,9 +5488,10 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _addConversation.apply(this, arguments);
       }
       return addConversation;
-    }() /**
-         * Fetch conversations list and instantiate all necessary objects
-         */
+    }()
+    /**
+     * Fetch conversations list and instantiate all necessary objects
+     */
   }, {
     key: "fetchConversations",
     value: function () {
@@ -5523,8 +5663,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 return this.services.network.get(url);
               case 3:
                 response = _context5.sent;
-                // todo: remove any after the release of new Twilsock
-                body = JSON.parse(response.payload);
+                body = response.body;
                 sid = body.conversation_sid;
                 data = {
                   entityName: null,
@@ -5562,7 +5701,7 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                url = new UriBuilder(this.configuration.links.conversations).path(sid).build(); // todo: remove any after the release of new Twilsock
+                url = new UriBuilder(this.configuration.links.conversations).path(sid).build();
                 _context6.next = 3;
                 return this.services.network.get(url);
               case 3:
@@ -5844,7 +5983,6 @@ var Conversations = /*#__PURE__*/function (_ReplayEventEmitter) {
                 if (pageToken) {
                   url.arg("PageToken", pageToken);
                 }
-                // todo: remove any after the release of new Twilsock
                 _context11.next = 6;
                 return this.services.network.get(url.build());
               case 6:
@@ -6067,9 +6205,10 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getUser.apply(this, arguments);
       }
       return getUser;
-    }() /**
-         * @returns {Promise<Array<User>>} returns list of subscribed User objects {@see User}
-         */
+    }()
+    /**
+     * @returns {Promise<Array<User>>} returns list of subscribed User objects {@see User}
+     */
   }, {
     key: "getSubscribedUsers",
     value: function () {
@@ -6098,27 +6237,27 @@ var Users = /*#__PURE__*/function (_ReplayEventEmitter) {
         return _getSubscribedUsers.apply(this, arguments);
       }
       return getSubscribedUsers;
-    }() /**
-         * @returns {Promise<string>} User's sync unique name
-         */
+    }()
+    /**
+     * @returns {Promise<string>} User's sync unique name
+     */
   }, {
     key: "getSyncUniqueName",
     value: function () {
       var _getSyncUniqueName = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(identity) {
-        var _body$sync_objects$us;
-        var url, response, body;
+        var _response$body$sync_o;
+        var url, response;
         return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                url = new UriBuilder(this.configuration.links.users).path(identity).build(); // todo: remove any after the release of new Twilsock
+                url = new UriBuilder(this.configuration.links.users).path(identity).build();
                 _context3.next = 3;
                 return this.services.network.get(url);
               case 3:
                 response = _context3.sent;
-                body = JSON.parse(response.payload || "null");
-                return _context3.abrupt("return", (_body$sync_objects$us = body === null || body === void 0 ? void 0 : body.sync_objects.user_info_map) !== null && _body$sync_objects$us !== void 0 ? _body$sync_objects$us : "");
-              case 6:
+                return _context3.abrupt("return", (_response$body$sync_o = response.body.sync_objects.user_info_map) !== null && _response$body$sync_o !== void 0 ? _response$body$sync_o : "");
+              case 5:
               case "end":
                 return _context3.stop();
             }
@@ -6191,7 +6330,7 @@ var TypingIndicator = /*#__PURE__*/function () {
                     break;
                   }
                   _context.next = 3;
-                  return _this._handleRemoteTyping(message);
+                  return _this._handleRemoteTyping(JSON.parse(message));
                 case 3:
                 case "end":
                   return _context.stop();
@@ -6243,10 +6382,11 @@ var TypingIndicator = /*#__PURE__*/function () {
         return _handleRemoteTyping2.apply(this, arguments);
       }
       return _handleRemoteTyping;
-    }() /**
-         * Send typing event for the given conversation sid
-         * @param {String} conversationSid
-         */
+    }()
+    /**
+     * Send typing event for the given conversation sid
+     * @param {String} conversationSid
+     */
   }, {
     key: "send",
     value: function send(conversationSid) {
@@ -6266,15 +6406,14 @@ var TypingIndicator = /*#__PURE__*/function () {
       var headers = {
         "Content-Type": "application/x-www-form-urlencoded"
       };
-      var body = "ChannelSid=".concat(conversationSid);
-      return this.services.twilsockClient.post({
+      var payload = "ChannelSid=".concat(conversationSid);
+      return this.services.twilsockClient.sendRequest(new twilsock.HttpRequest({
+        method: "POST",
         url: url,
         headers: headers,
-        body: body,
+        payload: payload,
         grant: this.configuration.productId
-      })
-      // todo: remove any after the release of new Twilsock
-      .then(function (response) {
+      })).then(function (response) {
         var body = JSON.parse(response.payload);
         if (body.hasOwnProperty("typing_timeout")) {
           _this3.serviceTypingTimeout = body.typing_timeout * 1000;
@@ -6290,7 +6429,8 @@ var TypingIndicator = /*#__PURE__*/function () {
 
 /**
  * Push notification for a Conversations client.
- */var PushNotification = /*#__PURE__*/_createClass__default["default"](
+ */
+var PushNotification = /*#__PURE__*/_createClass__default["default"](
 /**
  * Title of the notification.
  */
@@ -6340,7 +6480,7 @@ function PushNotification(data) {
   this.data = data.data || {};
 });
 
-var version = "2.2.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); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -6395,32 +6535,34 @@ var CommandExecutor = /*#__PURE__*/function () {
                   }).join("&");
                 }
                 _context.next = 9;
-                return this._services.transport.get({
+                return this._services.transport.sendRequest(new twilsock.HttpRequest({
                   url: getUrl,
                   headers: finalHeaders,
                   grant: this._productId
-                });
+                }));
               case 9:
                 response = _context.sent;
                 return _context.abrupt("break", 19);
               case 11:
                 _context.next = 13;
-                return this._services.transport.post({
+                return this._services.transport.sendRequest(new twilsock.HttpRequest({
+                  method: "POST",
                   url: preProcessedUrl,
                   headers: finalHeaders,
-                  body: JSON.stringify(requestBody),
+                  payload: JSON.stringify(requestBody),
                   grant: this._productId
-                });
+                }));
               case 13:
                 response = _context.sent;
                 return _context.abrupt("break", 19);
               case 15:
                 _context.next = 17;
-                return this._services.transport.delete({
+                return this._services.transport.sendRequest(new twilsock.HttpRequest({
+                  method: "DELETE",
                   url: preProcessedUrl,
                   headers: finalHeaders,
                   grant: this._productId
-                });
+                }));
               case 17:
                 response = _context.sent;
                 return _context.abrupt("break", 19);
@@ -6498,18 +6640,21 @@ var CommandExecutor = /*#__PURE__*/function () {
                 });
               case 2:
                 result = _context3.sent;
-                parsedPayload = JSON.parse(result.payload);
+                parsedPayload = {};
+                try {
+                  parsedPayload = JSON.parse(result.payload);
+                } catch (_unused) {}
                 if (!isMutationConflictResponse(result)) {
-                  _context3.next = 8;
+                  _context3.next = 9;
                   break;
                 }
-                _context3.next = 7;
+                _context3.next = 8;
                 return this.fetchResource(parsedPayload.resource_url);
-              case 7:
-                return _context3.abrupt("return", _context3.sent);
               case 8:
-                return _context3.abrupt("return", parsedPayload);
+                return _context3.abrupt("return", _context3.sent);
               case 9:
+                return _context3.abrupt("return", parsedPayload);
+              case 10:
               case "end":
                 return _context3.stop();
             }
@@ -6545,9 +6690,10 @@ var ClientServices = /*#__PURE__*/_createClass__default["default"](function Clie
   _defineProperty__default["default"](this, "syncClient", void 0);
   _defineProperty__default["default"](this, "mcsClient", void 0);
   _defineProperty__default["default"](this, "transport", void 0);
-}); /**
-     * A client is the starting point to the Twilio Conversations functionality.
-     */
+});
+/**
+ * A client is the starting point to the Twilio Conversations functionality.
+ */
 exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter) {
   _inherits__default["default"](Client, _ReplayEventEmitter);
   var _super = _createSuper(Client);
@@ -6939,12 +7085,7 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
     });
     _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 :
-    // TwilsockClient is different between versions 0.12.2
-    // (dep of twilio-sync@3.2.2) and 0.13.1 (dep of current
-    // @twilio/conversations). Thus, casting to any.
-    // todo: fix sync caching and migrate to that version of sync.
-    new twilioSync.SyncClient(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");
@@ -7047,10 +7188,13 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
      */
   }, {
     key: "shutdown",
-    value: /**
-            * Gracefully shut down the client.
-            */function () {
+    value:
+    /**
+     * Gracefully shut down the client.
+     */
+    function () {
       var _shutdown = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
+        var _this$_services$netwo;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -7059,7 +7203,7 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
                 return this._ensureReady;
               case 2:
                 _context2.next = 4;
-                return this._services.twilsockClient.disconnect();
+                return (_this$_services$netwo = this._services.network) === null || _this$_services$netwo === void 0 ? void 0 : _this$_services$netwo.disconnect();
               case 4:
               case "end":
                 return _context2.stop();
@@ -7071,10 +7215,11 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _shutdown.apply(this, arguments);
       }
       return shutdown;
-    }() /**
-         * Update the token used by the client and re-register with the Conversations services.
-         * @param token New access token.
-         */
+    }()
+    /**
+     * Update the token used by the client and re-register with the Conversations services.
+     * @param token New access token.
+     */
   }, {
     key: "updateToken",
     value: function () {
@@ -7115,10 +7260,11 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _updateToken.apply(this, arguments);
       }
       return updateToken;
-    }() /**
-         * Get a known conversation by its SID.
-         * @param conversationSid Conversation sid
-         */
+    }()
+    /**
+     * Get a known conversation by its SID.
+     * @param conversationSid Conversation sid
+     */
   }, {
     key: "getConversationBySid",
     value: function () {
@@ -7156,11 +7302,12 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _getConversationBySid.apply(this, arguments);
       }
       return getConversationBySid;
-    }() /**
-         * Peek a conversation by its SID.
-         * @param conversationSid Conversation sid
-         * @internal
-         */
+    }()
+    /**
+     * Peek a conversation by its SID.
+     * @param conversationSid Conversation sid
+     * @internal
+     */
   }, {
     key: "peekConversationBySid",
     value: function () {
@@ -7195,10 +7342,11 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _peekConversationBySid.apply(this, arguments);
       }
       return peekConversationBySid;
-    }() /**
-         * Get a known conversation by its unique identifier name.
-         * @param uniqueName The unique identifier name of the conversation.
-         */
+    }()
+    /**
+     * Get a known conversation by its unique identifier name.
+     * @param uniqueName The unique identifier name of the conversation.
+     */
   }, {
     key: "getConversationByUniqueName",
     value: function () {
@@ -7236,9 +7384,10 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _getConversationByUniqueName.apply(this, arguments);
       }
       return getConversationByUniqueName;
-    }() /**
-         * Get the current list of all the subscribed conversations.
-         */
+    }()
+    /**
+     * Get the current list of all the subscribed conversations.
+     */
   }, {
     key: "getSubscribedConversations",
     value: function () {
@@ -7264,11 +7413,12 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _getSubscribedConversations.apply(this, arguments);
       }
       return getSubscribedConversations;
-    }() /**
-         * Create a conversation on the server and subscribe to its events.
-         * The default is a conversation with an empty friendly name.
-         * @param options Options for the conversation.
-         */
+    }()
+    /**
+     * Create a conversation on the server and subscribe to its events.
+     * The default is a conversation with an empty friendly name.
+     * @param options Options for the conversation.
+     */
   }, {
     key: "createConversation",
     value: function () {
@@ -7295,12 +7445,13 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _createConversation.apply(this, arguments);
       }
       return createConversation;
-    }() /**
-         * Register for push notifications.
-         * @param channelType Channel type.
-         * @param registrationId Push notification ID provided by the FCM/APNS service
-         * on the platform.
-         */
+    }()
+    /**
+     * Register for push notifications.
+     * @param channelType Channel type.
+     * @param registrationId Push notification ID provided by the FCM/APNS service
+     * on the platform.
+     */
   }, {
     key: "setPushRegistrationId",
     value: function () {
@@ -7327,11 +7478,12 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _setPushRegistrationId.apply(this, arguments);
       }
       return setPushRegistrationId;
-    }() /**
-         * Unregister from push notifications.
-         * @param channelType Channel type.
-         * @deprecated Use removePushRegistrations() instead.
-         */
+    }()
+    /**
+     * Unregister from push notifications.
+     * @param channelType Channel type.
+     * @deprecated Use removePushRegistrations() instead.
+     */
   }, {
     key: "unsetPushRegistrationId",
     value: function () {
@@ -7357,19 +7509,20 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _unsetPushRegistrationId.apply(this, arguments);
       }
       return unsetPushRegistrationId;
-    }() /**
-         * 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.
-         *
-         * @param channelType Channel type.
-         * @param registrationId Push notification ID provided by the FCM/APNS service
-         * on the platform.
-         */
+    }()
+    /**
+     * 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.
+     *
+     * @param channelType Channel type.
+     * @param registrationId Push notification ID provided by the FCM/APNS service
+     * on the platform.
+     */
   }, {
     key: "removePushRegistrations",
     value: function () {
@@ -7391,16 +7544,19 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _removePushRegistrations.apply(this, arguments);
       }
       return removePushRegistrations;
-    }() /**
-         * Current version of the Conversations client.
-         */
+    }()
+    /**
+     * 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.
-            * @param notificationPayload Push notification payload
-            */function () {
+    value:
+    /**
+     * Handle push notification payload parsing and emit the
+     * {@link Client.pushNotification} event on this {@link Client} instance.
+     * @param notificationPayload Push notification payload
+     */
+    function () {
       var _handlePushNotification = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(notificationPayload) {
         return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
           while (1) {
@@ -7422,13 +7578,14 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         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;
-         * if not, then subscribe and add user to the subscribed list.
-         * @param identity Identity of the user.
-         * @returns A fully initialized user.
-         */
+    }()
+    /**
+     * 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.
+     */
   }, {
     key: "getUser",
     value: function () {
@@ -7452,9 +7609,10 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _getUser.apply(this, arguments);
       }
       return getUser;
-    }() /**
-         * Get a list of subscribed user objects.
-         */
+    }()
+    /**
+     * Get a list of subscribed user objects.
+     */
   }, {
     key: "getSubscribedUsers",
     value: function () {
@@ -7478,11 +7636,12 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _getSubscribedUsers.apply(this, arguments);
       }
       return getSubscribedUsers;
-    }() /**
-         * 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.
-         */
+    }()
+    /**
+     * 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) {
@@ -7619,6 +7778,9 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
                 this._conversationsPromise = this._conversationsEntity.fetchConversations().then(function () {
                   return _this3._conversationsEntity;
                 }).catch(function (error) {
+                  if (error.message === "Client has been shut down.") {
+                    return _this3._conversationsEntity;
+                  }
                   throw error;
                 });
                 _context16.next = 28;
@@ -7644,10 +7806,11 @@ exports.Client = Client_1 = (_class = /*#__PURE__*/function (_ReplayEventEmitter
         return _initialize2.apply(this, arguments);
       }
       return _initialize;
-    }() /**
-         * Subscribe to push notifications.
-         * @param channelType The channel type to subscribe to.
-         */
+    }()
+    /**
+     * Subscribe to push notifications.
+     * @param channelType The channel type to subscribe to.
+     */
   }, {
     key: "_subscribeToPushNotifications",
     value: function _subscribeToPushNotifications(channelType) {