@twilio/mcs-client 0.5.3 → 0.6.0-canary.102

package/builds/lib.js

@@ -19,9 +19,13 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var shared = require('@twilio/shared');
 var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('core-js/modules/es.promise.js');
+require('core-js/modules/es.array.iterator.js');
+require('core-js/modules/es.map.js');
+require('core-js/modules/web.dom-collections.iterator.js');
+require('core-js/modules/web.dom-collections.for-each.js');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
 require('core-js/modules/es.array.from.js');
 var log$2 = require('loglevel');
@@ -29,10 +33,11 @@ require('core-js/modules/es.string.starts-with.js');
 require('core-js/modules/es.array.reduce.js');
 require('core-js/modules/es.regexp.exec.js');
 require('core-js/modules/es.string.split.js');
+require('core-js/modules/es.string.replace.js');
+require('core-js/modules/es.json.stringify.js');
 require('core-js/modules/es.object.assign.js');
-require('core-js/modules/es.array.iterator.js');
-require('core-js/modules/web.dom-collections.iterator.js');
 require('core-js/modules/web.url.js');
+require('core-js/modules/web.url-search-params.js');
 var operationRetrier = require('@twilio/operation-retrier');
 var declarativeTypeValidator = require('@twilio/declarative-type-validator');
 
@@ -47,14 +52,12 @@ function _interopNamespace(e) {
                 var d = Object.getOwnPropertyDescriptor(e, k);
                 Object.defineProperty(n, k, d.get ? d : {
                     enumerable: true,
-                    get: function () {
-                        return e[k];
-                    }
+                    get: function () { return e[k]; }
                 });
             }
         });
     }
-    n['default'] = e;
+    n["default"] = e;
     return Object.freeze(n);
 }
 
@@ -63,7 +66,7 @@ var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_definePropert
 var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
 var log__namespace = /*#__PURE__*/_interopNamespace(log$2);
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -79,8 +82,8 @@ PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 function __decorate(decorators, target, key, desc) {
   var c = arguments.length,
-      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
-      d;
+    r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+    d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
     if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   }
@@ -93,125 +96,99 @@ function __metadata(metadataKey, metadataValue) {
 function prepareLine(prefix, args) {
   return ["".concat(new Date().toISOString(), " MCS Client ").concat(prefix, ":")].concat(Array.from(args));
 }
-
 class Logger {
   constructor(prefix) {
-    _defineProperty__default['default'](this, "prefix", "");
-
+    _defineProperty__default["default"](this, "prefix", "");
     this.prefix = prefix !== null && prefix !== undefined && prefix.length > 0 ? prefix + " " : "";
   }
-
   static scope(prefix) {
     return new Logger(prefix);
   }
-
   setLevel(level) {
     log__namespace.setLevel(level);
   }
-
   static setLevel(level) {
     log__namespace.setLevel(level);
   }
   /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
-
   trace() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     log__namespace.trace.apply(null, prepareLine(this.prefix + "T", args));
   }
-
   debug() {
     for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
       args[_key2] = arguments[_key2];
     }
-
     log__namespace.debug.apply(null, prepareLine(this.prefix + "D", args));
   }
-
   info() {
     for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
       args[_key3] = arguments[_key3];
     }
-
     log__namespace.info.apply(null, prepareLine(this.prefix + "I", args));
   }
-
   warn() {
     for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
       args[_key4] = arguments[_key4];
     }
-
     log__namespace.warn.apply(null, prepareLine(this.prefix + "W", args));
   }
-
   error() {
     for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
       args[_key5] = arguments[_key5];
     }
-
     log__namespace.error.apply(null, prepareLine(this.prefix + "E", args));
   }
-
   static trace() {
     for (var _len6 = arguments.length, args = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
       args[_key6] = arguments[_key6];
     }
-
     log__namespace.trace.apply(null, prepareLine("T", args));
   }
-
   static debug() {
     for (var _len7 = arguments.length, args = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
       args[_key7] = arguments[_key7];
     }
-
     log__namespace.debug.apply(null, prepareLine("D", args));
   }
-
   static info() {
     for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
       args[_key8] = arguments[_key8];
     }
-
     log__namespace.info.apply(null, prepareLine("I", args));
   }
-
   static warn() {
     for (var _len9 = arguments.length, args = new Array(_len9), _key9 = 0; _key9 < _len9; _key9++) {
       args[_key9] = arguments[_key9];
     }
-
     log__namespace.warn.apply(null, prepareLine("W", args));
   }
-
   static error() {
     for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
       args[_key10] = arguments[_key10];
     }
-
     log__namespace.error.apply(null, prepareLine("E", args));
   }
-
 }
 
 var MINIMUM_RETRY_DELAY = 1000;
 var MAXIMUM_RETRY_DELAY = 4000;
 var MAXIMUM_ATTEMPTS_COUNT = 3;
 var RETRY_WHEN_THROTTLED = true;
-
 var regionalMcsHost = region => "https://mcs.".concat(region !== null && region !== void 0 ? region : "us1", ".twilio.com");
-
 var isFullUrl = url => url.startsWith("http");
-
 var fullUrl = (partUrl, region) => "".concat(!isFullUrl(partUrl) ? regionalMcsHost(region) : "").concat(partUrl);
-
 class Configuration {
   constructor(token, baseUrl, baseSetUrl, options) {
     var _ref, _options$MCS, _ref2, _constructorOptions$r, _constructorOptions$r2, _constructorOptions$b;
-
+    _defineProperty__default["default"](this, "token", void 0);
+    _defineProperty__default["default"](this, "retryWhenThrottledOverride", void 0);
+    _defineProperty__default["default"](this, "backoffConfigOverride", void 0);
+    _defineProperty__default["default"](this, "mediaUrl", void 0);
+    _defineProperty__default["default"](this, "mediaSetUrl", void 0);
+    _defineProperty__default["default"](this, "region", void 0);
     var constructorOptions = (_ref = (_options$MCS = options.MCS) !== null && _options$MCS !== void 0 ? _options$MCS : options) !== null && _ref !== void 0 ? _ref : {};
     this.region = (_ref2 = (_constructorOptions$r = constructorOptions.region) !== null && _constructorOptions$r !== void 0 ? _constructorOptions$r : options.region) !== null && _ref2 !== void 0 ? _ref2 : 'us1';
     this.mediaUrl = fullUrl(baseUrl, this.region);
@@ -220,7 +197,6 @@ class Configuration {
     this.retryWhenThrottledOverride = (_constructorOptions$r2 = constructorOptions.retryWhenThrottledOverride) !== null && _constructorOptions$r2 !== void 0 ? _constructorOptions$r2 : RETRY_WHEN_THROTTLED;
     this.backoffConfigOverride = (_constructorOptions$b = constructorOptions.backoffConfigOverride) !== null && _constructorOptions$b !== void 0 ? _constructorOptions$b : Configuration.backoffConfigDefault;
   }
-
   static get backoffConfigDefault() {
     return {
       min: MINIMUM_RETRY_DELAY,
@@ -228,15 +204,12 @@ class Configuration {
       maxAttemptsCount: MAXIMUM_ATTEMPTS_COUNT
     };
   }
-
   static get retryWhenThrottledDefault() {
     return RETRY_WHEN_THROTTLED;
   }
-
   updateToken(token) {
     this.token = token;
   }
-
 }
 
 /**
@@ -252,46 +225,38 @@ class Configuration {
  */
 class Media {
   constructor(config, network, data) {
+    _defineProperty__default["default"](this, "state", void 0);
+    _defineProperty__default["default"](this, "network", void 0);
+    _defineProperty__default["default"](this, "config", void 0);
     this.config = config;
     this.network = network;
-
     this._update(data);
   }
-
   get sid() {
     return this.state.sid;
   }
-
   get serviceSid() {
     return this.state.serviceSid;
   }
-
   get dateCreated() {
     return this.state.dateCreated;
   }
-
   get dateUpdated() {
     return this.state.dateUpdated;
   }
-
   get contentType() {
     return this.state.contentType;
   }
-
   get size() {
     return this.state.size;
   }
   /** @deprecated Use filename instead */
-
-
   get fileName() {
     return this.state.filename;
   }
-
   get filename() {
     return this.state.filename;
   }
-
   get category() {
     return this.state.category;
   }
@@ -302,84 +267,45 @@ class Media {
    *
    * It is reasonable to build your own refresh logic upon these two functions: as soon as URL returned
    * by getCachedContentUrl() returns 40x status you should call getContentUrl() to refresh it.
-   *
-   * @returns {Promise<string>}
    */
-
-
   getContentUrl() {
     var _this = this;
-
-    return _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.network.get("".concat(_this.config.mediaUrl, "/").concat(_this.sid));
-
-            case 2:
-              response = _context.sent;
-
-              _this._update(response.body);
-
-              return _context.abrupt("return", Promise.resolve(_this.state.contentDirectUrl));
-
-            case 5:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }))();
-  }
-  /**
-   * Returns direct content URL to uploaded binary. This URL will expire after some time.
-   * This function does not support getting a new URL however. Once set it will remain the same.
-   * Use getContentUrl() to query a new one.
-   *
-   * It is reasonable to build your own refresh logic upon these two functions: as soon as URL returned
-   * by getCachedContentUrl() returns 40x status you should call getContentUrl() to refresh it.
-   *
-   * @returns {Promise<string>}
-   */
-
-
-  getCachedContentUrl() {
-    var _this2 = this;
-
-    return _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:
-              if (!_this2.state.contentDirectUrl) {
-                _context2.next = 2;
+    return new shared.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.network.get("".concat(_this.config.mediaUrl, "/").concat(_this.sid));
+                onCancel(() => request.cancel());
+                _context.prev = 2;
+                _context.next = 5;
+                return request;
+              case 5:
+                response = _context.sent;
+                _this._update(response.body);
+                resolve(_this.state.contentDirectUrl);
+                _context.next = 13;
                 break;
-              }
-
-              return _context2.abrupt("return", Promise.resolve(_this2.state.contentDirectUrl));
-
-            case 2:
-              _context2.next = 4;
-              return _this2.getContentUrl();
-
-            case 4:
-              return _context2.abrupt("return", _context2.sent);
-
-            case 5:
-            case "end":
-              return _context2.stop();
+              case 10:
+                _context.prev = 10;
+                _context.t0 = _context["catch"](2);
+                reject(_context.t0);
+              case 13:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee2);
-    }))();
+        }, _callee, null, [[2, 10]]);
+      }));
+      return function (_x, _x2, _x3) {
+        return _ref.apply(this, arguments);
+      };
+    }());
   }
-
   _update(data) {
     var _data$links$content_d, _data$filename, _data$category, _data$is_multipart_up;
-
     this.state = {
       sid: data.sid,
       serviceSid: data.service_sid,
@@ -399,40 +325,38 @@ class Media {
       isMultipartUpstream: (_data$is_multipart_up = data.is_multipart_upstream) !== null && _data$is_multipart_up !== void 0 ? _data$is_multipart_up : false
     };
   }
-
 }
 
 class TransportError extends Error {
   constructor(message, code, body, status, headers) {
     super(message);
+    _defineProperty__default["default"](this, "code", void 0);
+    _defineProperty__default["default"](this, "body", void 0);
+    _defineProperty__default["default"](this, "status", void 0);
+    _defineProperty__default["default"](this, "headers", void 0);
     this.code = code;
     this.body = body;
     this.status = status;
     this.headers = headers;
   }
-
 }
 
+// eslint-disable-next-line
 var XHR = global["XMLHttpRequest"] || require("xmlhttprequest").XMLHttpRequest;
-
 function parseResponseHeaders(headerString) {
   if (!headerString) {
     return {};
   }
-
   return headerString.split("\r\n").map(el => el.split(": ")).filter(el => el.length === 2 && el[1].length > 0).reduce((prev, curr) => {
     prev[curr[0]] = curr[1];
     return prev;
   }, {});
 }
-
 function extractBody(xhr) {
   var contentType = xhr.getResponseHeader("Content-Type");
-
   if (!contentType || contentType.indexOf("application/json") !== 0 || xhr.responseText.length === 0) {
     return xhr.responseText;
   }
-
   try {
     return JSON.parse(xhr.responseText);
   } catch (e) {
@@ -442,168 +366,125 @@ function extractBody(xhr) {
 /**
  * Provides generic network interface
  */
-
-
 class Transport {
   static request(method, url, headers, body) {
-    return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-      return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", new Promise((resolve, reject) => {
-                var xhr = new XHR();
-                xhr.open(method, url, true);
-
-                xhr.onreadystatechange = function onreadystatechange() {
-                  if (xhr.readyState !== 4) {
-                    return;
-                  }
-
-                  var headers = parseResponseHeaders(xhr.getAllResponseHeaders());
-                  var body = extractBody(xhr);
-
-                  if (200 <= xhr.status && xhr.status < 300) {
-                    resolve({
-                      status: xhr.status,
-                      headers,
-                      body
-                    });
-                  } else {
-                    var _xhr$statusText;
-
-                    var status = (_xhr$statusText = xhr.statusText) !== null && _xhr$statusText !== void 0 ? _xhr$statusText : "NONE";
-                    var bodyRepresentation;
-
-                    if (typeof body === "string") {
-                      bodyRepresentation = body && body.split("\n", 2).length === 1 ? body : "";
-                    } else {
-                      bodyRepresentation = JSON.stringify(body);
-                    }
-
-                    var message = "".concat(xhr.status, ": [").concat(status, "] ").concat(bodyRepresentation);
-                    reject(new TransportError(message, xhr.status, body, status, headers));
-                  }
-                };
-
-                for (var headerName in headers) {
-                  xhr.setRequestHeader(headerName, headers[headerName]);
-
-                  if (headerName === "Content-Type" && headers[headerName] === "application/json") {
-                    body = JSON.stringify(body);
-                  }
-                }
-
-                xhr.send(body);
-              }));
-
-            case 1:
-            case "end":
-              return _context.stop();
+    return new shared.CancellablePromise((resolve, reject, onCancel) => {
+      var xhr = new XHR();
+      var isCancelled = false;
+      onCancel(() => {
+        xhr.abort();
+        isCancelled = true;
+      });
+      xhr.open(method, url, true);
+      xhr.onreadystatechange = function onreadystatechange() {
+        if (xhr.readyState !== 4 || isCancelled) {
+          return;
+        }
+        var responseHeaders = parseResponseHeaders(xhr.getAllResponseHeaders());
+        var body = extractBody(xhr);
+        if (200 <= xhr.status && xhr.status < 300) {
+          resolve({
+            status: xhr.status,
+            headers: responseHeaders,
+            body
+          });
+        } else {
+          var _xhr$statusText;
+          var status = (_xhr$statusText = xhr.statusText) !== null && _xhr$statusText !== void 0 ? _xhr$statusText : "NONE";
+          var bodyRepresentation;
+          if (typeof body === "string") {
+            if (body && body.split("\n", 2).length === 1) bodyRepresentation = body;else {
+              var _body$replace$split$f;
+              // TODO: RTDSDK-3716: investigate why body is HTML string
+              var errorInfo = (_body$replace$split$f = body.replace(/<.*?>/g, "").split(/\r\n/g).filter(str => str.length)[0]) === null || _body$replace$split$f === void 0 ? void 0 : _body$replace$split$f.split(" ");
+              bodyRepresentation = (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.length) > 2 ? errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.slice(1).join(" ") : "";
+            }
+          } else {
+            bodyRepresentation = JSON.stringify(body);
           }
+          var message = "".concat(xhr.status, ": [").concat(status, "] ").concat(bodyRepresentation);
+          reject(new TransportError(message, xhr.status, body, status, responseHeaders));
         }
-      }, _callee);
-    }))();
+      };
+      for (var headerName in headers) {
+        xhr.setRequestHeader(headerName, headers[headerName]);
+        if (headerName === "Content-Type" && headers[headerName] === "application/json") {
+          body = JSON.stringify(body);
+        }
+      }
+      xhr.send(body);
+    });
   }
   /**
    * Make a GET request by given URL
    */
-
-
   get(url, headers) {
-    return _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:
-              return _context2.abrupt("return", Transport.request("GET", url, headers));
-
-            case 1:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }))();
+    return Transport.request("GET", url, headers);
   }
   /**
    * Make a POST request by given URL
    */
-
-
   post(url, headers, body) {
-    return _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:
-              return _context3.abrupt("return", Transport.request("POST", url, headers, body));
-
-            case 1:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3);
-    }))();
+    return Transport.request("POST", url, headers, body);
   }
-
 }
 
 var log$1 = Logger.scope("Network");
-
 class Network {
   constructor(config, transport) {
+    _defineProperty__default["default"](this, "config", void 0);
+    _defineProperty__default["default"](this, "transport", void 0);
     this.config = config;
     this.transport = transport;
   }
-
   backoffConfig() {
     return Object.assign(Configuration.backoffConfigDefault, this.config.backoffConfigOverride);
   }
-
   retryWhenThrottled() {
     var _ref, _this$config$retryWhe;
-
     return (_ref = (_this$config$retryWhe = this.config.retryWhenThrottledOverride) !== null && _this$config$retryWhe !== void 0 ? _this$config$retryWhe : Configuration.retryWhenThrottledDefault) !== null && _ref !== void 0 ? _ref : false;
   }
-
   executeWithRetry(request, retryWhenThrottled) {
     var _this = this;
-
-    return _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:
-              return _context2.abrupt("return", new Promise((resolve, reject) => {
-                var codesToRetryOn = [502, 503, 504];
-
+    return new shared.CancellablePromise( /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(resolve, reject, onCancel) {
+        var retrier, codesToRetryOn;
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                retrier = new operationRetrier.Retrier(_this.backoffConfig());
+                codesToRetryOn = [502, 503, 504];
                 if (retryWhenThrottled) {
                   codesToRetryOn.push(429);
                 }
-
-                var retrier = new operationRetrier.Retrier(_this.backoffConfig());
-                retrier.on("attempt", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-                  var result;
-                  return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+                onCancel(() => {
+                  retrier.cancel();
+                  retrier.removeAllListeners();
+                });
+                retrier.on("attempt", /*#__PURE__*/_asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
+                  var requestPromise, result;
+                  return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
                         case 0:
                           _context.prev = 0;
-                          _context.next = 3;
-                          return request();
-
-                        case 3:
+                          requestPromise = request();
+                          onCancel(() => {
+                            requestPromise.cancel();
+                            retrier.cancel();
+                            retrier.removeAllListeners();
+                          });
+                          _context.next = 5;
+                          return requestPromise;
+                        case 5:
                           result = _context.sent;
                           retrier.succeeded(result);
-                          _context.next = 10;
+                          _context.next = 12;
                           break;
-
-                        case 7:
-                          _context.prev = 7;
+                        case 9:
+                          _context.prev = 9;
                           _context.t0 = _context["catch"](0);
-
                           if (codesToRetryOn.indexOf(_context.t0.status) > -1) {
                             retrier.failed(_context.t0);
                           } else if (_context.t0.message === "Twilsock disconnected") {
@@ -615,13 +496,12 @@ class Network {
                             retrier.cancel();
                             reject(_context.t0);
                           }
-
-                        case 10:
+                        case 12:
                         case "end":
                           return _context.stop();
                       }
                     }
-                  }, _callee, null, [[0, 7]]);
+                  }, _callee, null, [[0, 9]]);
                 })));
                 retrier.on("succeeded", result => {
                   resolve(result);
@@ -629,132 +509,131 @@ class Network {
                 retrier.on("cancelled", err => reject(err));
                 retrier.on("failed", err => reject(err));
                 retrier.start();
-              }));
-
-            case 1:
-            case "end":
-              return _context2.stop();
+              case 9:
+              case "end":
+                return _context2.stop();
+            }
           }
-        }
-      }, _callee2);
-    }))();
+        }, _callee2);
+      }));
+      return function (_x, _x2, _x3) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
   }
-
   get(url) {
     var _this2 = this;
-
-    return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-      var headers, response;
-      return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              headers = {
-                "X-Twilio-Token": _this2.config.token
-              };
-              log$1.trace("sending GET request to ", url, " headers ", headers);
-              _context3.prev = 2;
-              _context3.next = 5;
-              return _this2.executeWithRetry(() => _this2.transport.get(url, headers), _this2.retryWhenThrottled());
-
-            case 5:
-              response = _context3.sent;
-              log$1.trace("response", response);
-              return _context3.abrupt("return", response);
-
-            case 10:
-              _context3.prev = 10;
-              _context3.t0 = _context3["catch"](2);
-              log$1.debug("get() error ".concat(_context3.t0));
-              throw _context3.t0;
-
-            case 14:
-            case "end":
-              return _context3.stop();
+    return new shared.CancellablePromise( /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(resolve, reject, onCancel) {
+        var headers, request, response;
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                headers = {
+                  "X-Twilio-Token": _this2.config.token
+                };
+                request = _this2.executeWithRetry(() => _this2.transport.get(url, headers), _this2.retryWhenThrottled());
+                log$1.trace("sending GET request to ", url, " headers ", headers);
+                onCancel(() => request.cancel());
+                _context3.prev = 4;
+                _context3.next = 7;
+                return request;
+              case 7:
+                response = _context3.sent;
+                log$1.trace("response", response);
+                resolve(response);
+                _context3.next = 16;
+                break;
+              case 12:
+                _context3.prev = 12;
+                _context3.t0 = _context3["catch"](4);
+                log$1.debug("get() error ".concat(_context3.t0));
+                reject(_context3.t0);
+              case 16:
+              case "end":
+                return _context3.stop();
+            }
           }
-        }
-      }, _callee3, null, [[2, 10]]);
-    }))();
+        }, _callee3, null, [[4, 12]]);
+      }));
+      return function (_x4, _x5, _x6) {
+        return _ref4.apply(this, arguments);
+      };
+    }());
   }
-
   post(url, category, media, contentType, filename) {
     var _this3 = this;
-
-    return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
-      var headers, fullUrl, response;
-      return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              headers = {
-                "X-Twilio-Token": _this3.config.token
-              };
-
-              if ((typeof FormData === "undefined" || !(media instanceof FormData)) && contentType) {
-                Object.assign(headers, {
-                  "Content-Type": contentType
-                });
-              }
-
-              fullUrl = new URL(url);
-
-              if (category) {
-                fullUrl.searchParams.append("Category", category);
-              }
-
-              if (filename) {
-                fullUrl.searchParams.append("Filename", filename);
-              }
-
-              log$1.trace("sending POST request to ".concat(url, " with headers ").concat(headers));
-              _context4.prev = 6;
-              _context4.next = 9;
-              return _this3.transport.post(fullUrl.href, headers, media);
-
-            case 9:
-              response = _context4.sent;
-              _context4.next = 18;
-              break;
-
-            case 12:
-              _context4.prev = 12;
-              _context4.t0 = _context4["catch"](6);
-
-              if (!(global["XMLHttpRequest"] === undefined && media instanceof FormData)) {
-                _context4.next = 16;
+    var headers = {
+      "X-Twilio-Token": this.config.token
+    };
+    if ((typeof FormData === "undefined" || !(media instanceof FormData)) && contentType) {
+      Object.assign(headers, {
+        "Content-Type": contentType
+      });
+    }
+    var fullUrl = new URL(url);
+    if (category) {
+      fullUrl.searchParams.append("Category", category);
+    }
+    if (filename) {
+      fullUrl.searchParams.append("Filename", filename);
+    }
+    return new shared.CancellablePromise( /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(resolve, reject, onCancel) {
+        var request, response;
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                request = _this3.transport.post(fullUrl.href, headers, media);
+                onCancel(() => request.cancel());
+                log$1.trace("sending POST request to ".concat(url, " with headers ").concat(headers));
+                _context4.prev = 3;
+                _context4.next = 6;
+                return request;
+              case 6:
+                response = _context4.sent;
+                _context4.next = 17;
                 break;
-              }
-
-              throw new TypeError("Posting FormData supported only with browser engine's FormData");
-
-            case 16:
-              log$1.debug("post() error ".concat(_context4.t0));
-              throw _context4.t0;
-
-            case 18:
-              log$1.trace("response", response);
-              return _context4.abrupt("return", response);
-
-            case 20:
-            case "end":
-              return _context4.stop();
+              case 9:
+                _context4.prev = 9;
+                _context4.t0 = _context4["catch"](3);
+                if (!(global["XMLHttpRequest"] === undefined && media instanceof FormData)) {
+                  _context4.next = 14;
+                  break;
+                }
+                reject(new TypeError("Posting FormData supported only with browser engine's FormData"));
+                return _context4.abrupt("return");
+              case 14:
+                log$1.debug("post() error ".concat(_context4.t0));
+                reject(_context4.t0);
+                return _context4.abrupt("return");
+              case 17:
+                log$1.trace("response", response);
+                resolve(response);
+              case 19:
+              case "end":
+                return _context4.stop();
+            }
           }
-        }
-      }, _callee4, null, [[6, 12]]);
-    }))();
+        }, _callee4, null, [[3, 9]]);
+      }));
+      return function (_x7, _x8, _x9) {
+        return _ref5.apply(this, arguments);
+      };
+    }());
   }
-
 }
 
-var version = "0.5.3";
+var version = "0.6.1";
 
-var _class, _temp;
+var _class;
 var log = Logger.scope("");
 /**
  * @classdesc A Client provides an interface for Media Content Service
  */
-
-exports['default'] = (_temp = _class = class Client {
+exports["default"] = (_class = class Client {
   // eslint-disable-next-line
 
   /**
@@ -768,8 +647,11 @@ exports['default'] = (_temp = _class = class Client {
    */
   constructor(token, baseUrl, baseSetUrl) {
     var _this$options$logLeve, _this$options$transpo;
-
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    _defineProperty__default["default"](this, "transport", void 0);
+    _defineProperty__default["default"](this, "options", void 0);
+    _defineProperty__default["default"](this, "network", void 0);
+    _defineProperty__default["default"](this, "config", void 0);
     this.options = options;
     this.options.logLevel = (_this$options$logLeve = this.options.logLevel) !== null && _this$options$logLeve !== void 0 ? _this$options$logLeve : "silent";
     this.config = new Configuration(token, baseUrl, baseSetUrl, this.options);
@@ -784,14 +666,11 @@ exports['default'] = (_temp = _class = class Client {
    * @property {String} [logLevel='silent'] - The level of logging to enable. Valid options
    *   (from strictest to broadest): ['silent', 'error', 'warn', 'info', 'debug', 'trace']
    */
-
   /**
    * Update the token used for Client operations
    * @param {String} token - The JWT string of the new token
    * @returns {void}
    */
-
-
   updateToken(token) {
     log.info("updateToken");
     this.config.updateToken(token);
@@ -799,66 +678,82 @@ exports['default'] = (_temp = _class = class Client {
   /**
    * Gets media from media service
    * @param {String} sid - Media's SID
-   * @returns {Promise<Media>}
    */
-
-
   get(sid) {
     var _this = this;
-
-    return _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.network.get("".concat(_this.config.mediaUrl, "/").concat(sid));
-
-            case 2:
-              response = _context.sent;
-              return _context.abrupt("return", new Media(_this.config, _this.network, response.body));
-
-            case 4:
-            case "end":
-              return _context.stop();
+    return new shared.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.network.get("".concat(_this.config.mediaUrl, "/").concat(sid));
+                onCancel(() => request.cancel());
+                _context.prev = 2;
+                _context.next = 5;
+                return request;
+              case 5:
+                response = _context.sent;
+                resolve(new Media(_this.config, _this.network, response.body));
+                _context.next = 12;
+                break;
+              case 9:
+                _context.prev = 9;
+                _context.t0 = _context["catch"](2);
+                reject(_context.t0);
+              case 12:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee);
-    }))();
+        }, _callee, null, [[2, 9]]);
+      }));
+      return function (_x, _x2, _x3) {
+        return _ref.apply(this, arguments);
+      };
+    }());
   }
   /**
    * Posts raw content to media service
    * @param {String} contentType - content type of media
    * @param {String|Buffer|Blob} media - content to post
    * @param {MediaCategory|null} category - category for the media
-   * @returns {Promise<Media>}
    */
-
-
   post(contentType, media, category, filename) {
     var _this2 = this;
-
-    return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-      var response;
-      return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return _this2.network.post(_this2.config.mediaUrl, category !== null && category !== void 0 ? category : "media", media, contentType, filename);
-
-            case 2:
-              response = _context2.sent;
-              return _context2.abrupt("return", new Media(_this2.config, _this2.network, response.body));
-
-            case 4:
-            case "end":
-              return _context2.stop();
+    return new shared.CancellablePromise( /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(resolve, reject, onCancel) {
+        var request, response;
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                request = _this2.network.post(_this2.config.mediaUrl, category !== null && category !== void 0 ? category : "media", media, contentType, filename);
+                onCancel(() => request.cancel());
+                _context2.prev = 2;
+                _context2.next = 5;
+                return request;
+              case 5:
+                response = _context2.sent;
+                resolve(new Media(_this2.config, _this2.network, response.body));
+                _context2.next = 12;
+                break;
+              case 9:
+                _context2.prev = 9;
+                _context2.t0 = _context2["catch"](2);
+                reject(_context2.t0);
+              case 12:
+              case "end":
+                return _context2.stop();
+            }
           }
-        }
-      }, _callee2);
-    }))();
+        }, _callee2, null, [[2, 9]]);
+      }));
+      return function (_x4, _x5, _x6) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
   }
   /**
    * Posts FormData to media service. Can be used only with browser engine's FormData.
@@ -866,88 +761,158 @@ exports['default'] = (_temp = _class = class Client {
    * new TypeError("Posting FormData supported only with browser engine's FormData")
    * @param {FormData} formData - form data to post
    * @param {MediaCategory|null} category - category for the media
-   * @returns {Promise<Media>}
    */
-
-
   postFormData(formData, category) {
     var _this3 = this;
-
-    return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-      var response;
-      return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return _this3.network.post(_this3.config.mediaUrl, category !== null && category !== void 0 ? category : "media", formData);
-
-            case 2:
-              response = _context3.sent;
-              return _context3.abrupt("return", new Media(_this3.config, _this3.network, response.body));
-
-            case 4:
-            case "end":
-              return _context3.stop();
+    return new shared.CancellablePromise( /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(resolve, reject, onCancel) {
+        var request, response;
+        return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                request = _this3.network.post(_this3.config.mediaUrl, category !== null && category !== void 0 ? category : "media", formData);
+                onCancel(() => request.cancel());
+                _context3.prev = 2;
+                _context3.next = 5;
+                return request;
+              case 5:
+                response = _context3.sent;
+                resolve(new Media(_this3.config, _this3.network, response.body));
+                _context3.next = 12;
+                break;
+              case 9:
+                _context3.prev = 9;
+                _context3.t0 = _context3["catch"](2);
+                reject(_context3.t0);
+              case 12:
+              case "end":
+                return _context3.stop();
+            }
           }
-        }
-      }, _callee3);
-    }))();
+        }, _callee3, null, [[2, 9]]);
+      }));
+      return function (_x7, _x8, _x9) {
+        return _ref3.apply(this, arguments);
+      };
+    }());
   }
   /**
    * Retrieve information about multiple media SIDs at the same time.
    * @param mediaSids Array of Media SIDs to get information from.
    */
-
-
   mediaSetGet(mediaSids) {
     var _this4 = this;
-
-    return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
-      var query, response;
-      return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              query = {
-                command: "get",
-                list: mediaSids.map(sid => ({
-                  media_sid: sid
-                }))
-              };
-              _context4.next = 3;
-              return _this4.network.post("".concat(_this4.config.mediaSetUrl), null, query, "application/json");
-
-            case 3:
-              response = _context4.sent;
-              return _context4.abrupt("return", response.body.map(item => {
-                if (item.code !== 200) {
-                  throw new Error("Failed to obtain detailed information about Media items (failed SID ".concat(item.media_record.sid, ")"));
-                }
-
-                return new Media(_this4.config, _this4.network, item.media_record);
-              }));
-
-            case 5:
-            case "end":
-              return _context4.stop();
+    return new shared.CancellablePromise( /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(resolve, reject, onCancel) {
+        var query, request, response, media;
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                query = {
+                  command: "get",
+                  list: mediaSids.map(sid => ({
+                    media_sid: sid
+                  }))
+                };
+                request = _this4.network.post("".concat(_this4.config.mediaSetUrl), null, query, "application/json");
+                onCancel(() => request.cancel());
+                _context4.prev = 3;
+                _context4.next = 6;
+                return request;
+              case 6:
+                response = _context4.sent;
+                media = response.body.map(item => {
+                  if (item.code !== 200) {
+                    reject("Failed to obtain detailed information about Media items (failed SID ".concat(item.media_record.sid, ")"));
+                    return;
+                  }
+                  return new Media(_this4.config, _this4.network, item.media_record);
+                });
+                resolve(media);
+                _context4.next = 14;
+                break;
+              case 11:
+                _context4.prev = 11;
+                _context4.t0 = _context4["catch"](3);
+                reject(_context4.t0);
+              case 14:
+              case "end":
+                return _context4.stop();
+            }
           }
-        }
-      }, _callee4);
-    }))();
+        }, _callee4, null, [[3, 11]]);
+      }));
+      return function (_x10, _x11, _x12) {
+        return _ref4.apply(this, arguments);
+      };
+    }());
   }
-
-}, _defineProperty__default['default'](_class, "version", version), _temp);
-
-__decorate([declarativeTypeValidator.validateTypes(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], exports['default'].prototype, "updateToken", null);
-
-__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], exports['default'].prototype, "get", null);
-
-exports['default'] = __decorate([declarativeTypeValidator.validateConstructorTypes(declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.nonEmptyString, [declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.literal(null)], [declarativeTypeValidator.pureObject, "undefined"]), __metadata("design:paramtypes", [String, String, Object, Object])], exports['default']); // Proper renames should happen in index.ts,
-
-exports.Client = exports['default'];
-exports.McsClient = exports['default'];
+  /**
+   * Retrieve temporary URLs for a set of media SIDs.
+   * @param mediaSids array of the media SIDs to get URLs from.
+   */
+  mediaSetGetContentUrls(mediaSids) {
+    var _this5 = this;
+    return new shared.CancellablePromise( /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(resolve, reject, onCancel) {
+        var query, request, response, urls;
+        return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                query = {
+                  command: "get",
+                  list: mediaSids.map(sid => ({
+                    media_sid: sid
+                  }))
+                };
+                request = _this5.network.post("".concat(_this5.config.mediaSetUrl), null, query, "application/json");
+                onCancel(() => request.cancel());
+                _context5.prev = 3;
+                _context5.next = 6;
+                return request;
+              case 6:
+                response = _context5.sent;
+                urls = new Map();
+                response.body.forEach(item => {
+                  if (item.code !== 200) {
+                    reject("Failed to obtain detailed information about Media items (failed SID ".concat(item.media_record.sid, ")"));
+                    return;
+                  }
+                  urls.set(item.media_record.sid, item.media_record.links.content_direct_temporary);
+                });
+                resolve(urls);
+                _context5.next = 15;
+                break;
+              case 12:
+                _context5.prev = 12;
+                _context5.t0 = _context5["catch"](3);
+                reject(_context5.t0);
+              case 15:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5, null, [[3, 12]]);
+      }));
+      return function (_x13, _x14, _x15) {
+        return _ref5.apply(this, arguments);
+      };
+    }());
+  }
+}, _defineProperty__default["default"](_class, "version", version), _class);
+__decorate([declarativeTypeValidator.validateTypes(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], exports["default"].prototype, "updateToken", null);
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", shared.CancellablePromise)], exports["default"].prototype, "get", null);
+exports["default"] = __decorate([declarativeTypeValidator.validateConstructorTypes(declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.nonEmptyString, [declarativeTypeValidator.nonEmptyString, declarativeTypeValidator.literal(null)], [declarativeTypeValidator.pureObject, "undefined"]), __metadata("design:paramtypes", [String, String, Object, Object])], exports["default"]);
+
+Object.defineProperty(exports, 'CancellablePromise', {
+    enumerable: true,
+    get: function () { return shared.CancellablePromise; }
+});
+exports.Client = exports["default"];
+exports.McsClient = exports["default"];
 exports.McsMedia = Media;
 exports.Media = Media;
-exports.default = exports['default'];
 //# sourceMappingURL=lib.js.map