@twilio/mcs-client 0.5.3 → 0.6.0-rc.10

package/builds/lib.js

@@ -19,9 +19,14 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-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');
+var require$$0 = require('crypto');
+var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
+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,41 +34,270 @@ 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');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 function _interopNamespace(e) {
-    if (e && e.__esModule) return e;
-    var n = Object.create(null);
-    if (e) {
-        Object.keys(e).forEach(function (k) {
-            if (k !== 'default') {
-                var d = Object.getOwnPropertyDescriptor(e, k);
-                Object.defineProperty(n, k, d.get ? d : {
-                    enumerable: true,
-                    get: function () {
-                        return e[k];
-                    }
-                });
-            }
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
         });
-    }
-    n['default'] = e;
-    return Object.freeze(n);
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
 }
 
-var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
+var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
 var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
 var log__namespace = /*#__PURE__*/_interopNamespace(log$2);
 
-/*! *****************************************************************************
+// this is pretty straight-forward - we use the crypto API.
+
+var crypto = require$$0__default["default"];
+
+var rng$2 = function nodeRNG() {
+  return crypto.randomBytes(16);
+};
+
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+var byteToHex = [];
+
+for (var i = 0; i < 256; ++i) {
+  byteToHex[i] = (i + 0x100).toString(16).substr(1);
+}
+
+function bytesToUuid$2(buf, offset) {
+  var i = offset || 0;
+  var bth = byteToHex; // join used to fix memory issue caused by concatenation: https://bugs.chromium.org/p/v8/issues/detail?id=3175#c4
+
+  return [bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], '-', bth[buf[i++]], bth[buf[i++]], '-', bth[buf[i++]], bth[buf[i++]], '-', bth[buf[i++]], bth[buf[i++]], '-', bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], bth[buf[i++]]].join('');
+}
+
+var bytesToUuid_1 = bytesToUuid$2;
+
+var rng$1 = rng$2;
+var bytesToUuid$1 = bytesToUuid_1; // **`v1()` - Generate time-based UUID**
+//
+// Inspired by https://github.com/LiosK/UUID.js
+// and http://docs.python.org/library/uuid.html
+
+var _nodeId;
+
+var _clockseq; // Previous uuid creation time
+
+
+var _lastMSecs = 0;
+var _lastNSecs = 0; // See https://github.com/uuidjs/uuid for API details
+
+function v1$1(options, buf, offset) {
+  var i = buf && offset || 0;
+  var b = buf || [];
+  options = options || {};
+  var node = options.node || _nodeId;
+  var clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq; // node and clockseq need to be initialized to random values if they're not
+  // specified.  We do this lazily to minimize issues related to insufficient
+  // system entropy.  See #189
+
+  if (node == null || clockseq == null) {
+    var seedBytes = rng$1();
+
+    if (node == null) {
+      // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
+      node = _nodeId = [seedBytes[0] | 0x01, seedBytes[1], seedBytes[2], seedBytes[3], seedBytes[4], seedBytes[5]];
+    }
+
+    if (clockseq == null) {
+      // Per 4.2.2, randomize (14 bit) clockseq
+      clockseq = _clockseq = (seedBytes[6] << 8 | seedBytes[7]) & 0x3fff;
+    }
+  } // UUID timestamps are 100 nano-second units since the Gregorian epoch,
+  // (1582-10-15 00:00).  JSNumbers aren't precise enough for this, so
+  // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
+  // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
+
+
+  var msecs = options.msecs !== undefined ? options.msecs : new Date().getTime(); // Per 4.2.1.2, use count of uuid's generated during the current clock
+  // cycle to simulate higher resolution clock
+
+  var nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1; // Time since last uuid creation (in msecs)
+
+  var dt = msecs - _lastMSecs + (nsecs - _lastNSecs) / 10000; // Per 4.2.1.2, Bump clockseq on clock regression
+
+  if (dt < 0 && options.clockseq === undefined) {
+    clockseq = clockseq + 1 & 0x3fff;
+  } // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
+  // time interval
+
+
+  if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) {
+    nsecs = 0;
+  } // Per 4.2.1.2 Throw error if too many uuids are requested
+
+
+  if (nsecs >= 10000) {
+    throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec');
+  }
+
+  _lastMSecs = msecs;
+  _lastNSecs = nsecs;
+  _clockseq = clockseq; // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
+
+  msecs += 12219292800000; // `time_low`
+
+  var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
+  b[i++] = tl >>> 24 & 0xff;
+  b[i++] = tl >>> 16 & 0xff;
+  b[i++] = tl >>> 8 & 0xff;
+  b[i++] = tl & 0xff; // `time_mid`
+
+  var tmh = msecs / 0x100000000 * 10000 & 0xfffffff;
+  b[i++] = tmh >>> 8 & 0xff;
+  b[i++] = tmh & 0xff; // `time_high_and_version`
+
+  b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
+
+  b[i++] = tmh >>> 16 & 0xff; // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
+
+  b[i++] = clockseq >>> 8 | 0x80; // `clock_seq_low`
+
+  b[i++] = clockseq & 0xff; // `node`
+
+  for (var n = 0; n < 6; ++n) {
+    b[i + n] = node[n];
+  }
+
+  return buf ? buf : bytesToUuid$1(b);
+}
+
+var v1_1 = v1$1;
+
+var rng = rng$2;
+var bytesToUuid = bytesToUuid_1;
+
+function v4$1(options, buf, offset) {
+  var i = buf && offset || 0;
+
+  if (typeof options == 'string') {
+    buf = options === 'binary' ? new Array(16) : null;
+    options = null;
+  }
+
+  options = options || {};
+  var rnds = options.random || (options.rng || rng)(); // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+
+  rnds[6] = rnds[6] & 0x0f | 0x40;
+  rnds[8] = rnds[8] & 0x3f | 0x80; // Copy bytes to buffer, if provided
+
+  if (buf) {
+    for (var ii = 0; ii < 16; ++ii) {
+      buf[i + ii] = rnds[ii];
+    }
+  }
+
+  return buf || bytesToUuid(rnds);
+}
+
+var v4_1 = v4$1;
+
+var v1 = v1_1;
+var v4 = v4_1;
+var uuid = v4;
+uuid.v1 = v1;
+uuid.v4 = v4;
+var uuid_1 = uuid;
+
+/**
+ * Cancellable promise. Extends the functionality of the native Promise to include the cancel method.
+ *
+ * Example:
+ *
+ * ```ts
+ *
+ * const cancellableFetchPromise = new CancellablePromise(async (resolve, reject, onCancel) => {
+ *     const request = fetch("https://example.com/");
+ *
+ *     onCancel(() => request.cancel());
+ *
+ *     try {
+ *         const response = await request;
+ *         resolve(response);
+ *     } catch (err) {
+ *         reject(err);
+ *     }
+ * });
+ *
+ * cancellableFetchPromise.cancel();
+ * ```
+ */
+
+class CancellablePromise extends Promise {
+  /**
+   * Creates a new CancellablePromise.
+   * @param executor A callback used to initialize the promise. This callback is passed three arguments:
+   * a resolve callback used to resolve the promise with a value or the result of another promise,
+   * a reject callback used to reject the promise with a provided reason or error,
+   * and an onCancel callback used to define behavior of cancellation.
+   */
+  constructor(executor) {
+    var outerId = uuid_1.v4();
+    var outerRejectPromise;
+    super((resolve, reject) => {
+      outerRejectPromise = reject;
+      return executor(value => {
+        CancellablePromise.cancellationMap.delete(outerId);
+        resolve(value);
+      }, reason => {
+        CancellablePromise.cancellationMap.delete(outerId);
+        reject(reason);
+      }, cancellationFunction => {
+        CancellablePromise.cancellationMap.set(outerId, cancellationFunction);
+      });
+    });
+    this.id = outerId;
+    this.rejectPromise = outerRejectPromise;
+  }
+  /**
+   * Cancels the promise and invokes the cancellation callback if it was defined during instantiation. Cancellation will result in the promise being rejected.
+   */
+
+
+  cancel() {
+    var onCancel = CancellablePromise.cancellationMap.get(this.id);
+    onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+
+    if (this.rejectPromise) {
+      this.catch(() => void 0);
+      this.rejectPromise(new Error("Promise was cancelled"));
+    }
+
+    return this;
+  }
+
+}
+
+_defineProperty__default["default"](CancellablePromise, "cancellationMap", new Map());
+
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -96,7 +330,7 @@ function prepareLine(prefix, 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 + " " : "";
   }
@@ -250,6 +484,7 @@ class Configuration {
  * @property {String} fileName - file name, if present, null otherwise
  * @property {MediaCategory} category - attachment category
  */
+
 class Media {
   constructor(config, network, data) {
     this.config = config;
@@ -302,79 +537,51 @@ 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 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 10:
+                _context.prev = 10;
+                _context.t0 = _context["catch"](2);
+                reject(_context.t0);
 
-            case 4:
-              return _context2.abrupt("return", _context2.sent);
-
-            case 5:
-            case "end":
-              return _context2.stop();
+              case 13:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee2);
-    }))();
+        }, _callee, null, [[2, 10]]);
+      }));
+
+      return function (_x, _x2, _x3) {
+        return _ref.apply(this, arguments);
+      };
+    }());
   }
 
   _update(data) {
@@ -446,64 +653,62 @@ function extractBody(xhr) {
 
 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;
-                  }
+    return new 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 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 responseHeaders = parseResponseHeaders(xhr.getAllResponseHeaders());
+        var body = extractBody(xhr);
 
-                    var message = "".concat(xhr.status, ": [").concat(status, "] ").concat(bodyRepresentation);
-                    reject(new TransportError(message, xhr.status, body, status, headers));
-                  }
-                };
+        if (200 <= xhr.status && xhr.status < 300) {
+          resolve({
+            status: xhr.status,
+            headers: responseHeaders,
+            body
+          });
+        } else {
+          var _xhr$statusText;
 
-                for (var headerName in headers) {
-                  xhr.setRequestHeader(headerName, headers[headerName]);
+          var status = (_xhr$statusText = xhr.statusText) !== null && _xhr$statusText !== void 0 ? _xhr$statusText : "NONE";
+          var bodyRepresentation;
 
-                  if (headerName === "Content-Type" && headers[headerName] === "application/json") {
-                    body = JSON.stringify(body);
-                  }
-                }
-
-                xhr.send(body);
-              }));
+          if (typeof body === "string") {
+            if (body && body.split("\n", 2).length === 1) bodyRepresentation = body;else {
+              var _body$replace$split$f;
 
-            case 1:
-            case "end":
-              return _context.stop();
+              // 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
@@ -511,20 +716,7 @@ class Transport {
 
 
   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
@@ -532,20 +724,7 @@ class Transport {
 
 
   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);
   }
 
 }
@@ -571,37 +750,48 @@ class Network {
   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 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();
+                          requestPromise = request();
+                          onCancel(() => {
+                            requestPromise.cancel();
+                            retrier.cancel();
+                            retrier.removeAllListeners();
+                          });
+                          _context.next = 5;
+                          return requestPromise;
 
-                        case 3:
+                        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) {
@@ -616,12 +806,12 @@ class Network {
                             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 +819,156 @@ 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 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
-                });
-              }
+    var headers = {
+      "X-Twilio-Token": this.config.token
+    };
 
-              fullUrl = new URL(url);
+    if ((typeof FormData === "undefined" || !(media instanceof FormData)) && contentType) {
+      Object.assign(headers, {
+        "Content-Type": contentType
+      });
+    }
 
-              if (category) {
-                fullUrl.searchParams.append("Category", category);
-              }
+    var fullUrl = new URL(url);
 
-              if (filename) {
-                fullUrl.searchParams.append("Filename", filename);
-              }
+    if (category) {
+      fullUrl.searchParams.append("Category", category);
+    }
 
-              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);
+    if (filename) {
+      fullUrl.searchParams.append("Filename", filename);
+    }
 
-            case 9:
-              response = _context4.sent;
-              _context4.next = 18;
-              break;
+    return new 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;
 
-            case 12:
-              _context4.prev = 12;
-              _context4.t0 = _context4["catch"](6);
+              case 9:
+                _context4.prev = 9;
+                _context4.t0 = _context4["catch"](3);
 
-              if (!(global["XMLHttpRequest"] === undefined && media instanceof FormData)) {
-                _context4.next = 16;
-                break;
-              }
+                if (!(global["XMLHttpRequest"] === undefined && media instanceof FormData)) {
+                  _context4.next = 14;
+                  break;
+                }
 
-              throw new TypeError("Posting FormData supported only with browser engine's FormData");
+                reject(new TypeError("Posting FormData supported only with browser engine's FormData"));
+                return _context4.abrupt("return");
 
-            case 16:
-              log$1.debug("post() error ".concat(_context4.t0));
-              throw _context4.t0;
+              case 14:
+                log$1.debug("post() error ".concat(_context4.t0));
+                reject(_context4.t0);
+                return _context4.abrupt("return");
 
-            case 18:
-              log$1.trace("response", response);
-              return _context4.abrupt("return", response);
+              case 17:
+                log$1.trace("response", response);
+                resolve(response);
 
-            case 20:
-            case "end":
-              return _context4.stop();
+              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.0-rc.10";
 
-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
 
   /**
@@ -799,66 +1013,96 @@ 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 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 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,33 +1110,48 @@ 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 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.
@@ -903,51 +1162,130 @@ exports['default'] = (_temp = _class = class Client {
   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 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);
-              }));
+                  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 5:
-            case "end":
-              return _context4.stop();
+              case 14:
+              case "end":
+                return _context4.stop();
+            }
           }
-        }
-      }, _callee4);
-    }))();
+        }, _callee4, null, [[3, 11]]);
+      }));
+
+      return function (_x10, _x11, _x12) {
+        return _ref4.apply(this, arguments);
+      };
+    }());
+  }
+  /**
+   * 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 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), _temp);
+}, _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.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);
+__decorate([declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.nonEmptyString), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", 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']); // Proper renames should happen in index.ts,
+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'];
+exports.CancellablePromise = CancellablePromise;
+exports.Client = exports["default"];
+exports.McsClient = exports["default"];
 exports.McsMedia = Media;
 exports.Media = Media;
-exports.default = exports['default'];
 //# sourceMappingURL=lib.js.map