@webex/http-core 3.0.0-beta.8 → 3.0.0-beta.81

package/src/http-error.js

@@ -23,14 +23,7 @@ export default class HttpError extends Exception {
    *
    * @type {Array}
    */
-  static errorKeys = [
-    'error',
-    'errorString',
-    'response',
-    'errorResponse',
-    'message',
-    'msg'
-  ];
+  static errorKeys = ['error', 'errorString', 'response', 'errorResponse', 'message', 'msg'];
 
   /**
    * Default error string if no error can be extracted from the http response
@@ -55,8 +48,7 @@ export default class HttpError extends Exception {
         try {
           body = JSON.parse(body);
           message = this.parseObject(body);
-        }
-        catch (err) {
+        } catch (err) {
           message = body;
         }
         break;
@@ -73,52 +65,52 @@ export default class HttpError extends Exception {
     Object.defineProperties(this, {
       body: {
         enumerable: false,
-        value: body
+        value: body,
       },
       httpVersion: {
         enumerable: false,
-        value: res.httpVersion
+        value: res.httpVersion,
       },
       headers: {
         enumerable: false,
-        value: res.headers || {}
+        value: res.headers || {},
       },
       rawHeaders: {
         enumerable: false,
-        value: res.rawHeaders || []
+        value: res.rawHeaders || [],
       },
       trailers: {
         enumerable: false,
-        value: res.trailers || {}
+        value: res.trailers || {},
       },
       rawTrailers: {
         enumerable: false,
-        value: res.rawTrailers || []
+        value: res.rawTrailers || [],
       },
       method: {
         enumerable: false,
-        value: res.method
+        value: res.method,
       },
       url: {
         enumerable: false,
-        value: res.url
+        value: res.url,
       },
       statusCode: {
         enumerable: false,
-        value: res.statusCode
+        value: res.statusCode,
       },
       statusMessage: {
         enumerable: false,
-        value: res.statusMessage
+        value: res.statusMessage,
       },
       socket: {
         enumerable: false,
-        value: res.socket
+        value: res.socket,
       },
       _res: {
         enumerable: false,
-        value: res
-      }
+        value: res,
+      },
     });
 
     return message;

package/src/index.js

@@ -20,17 +20,12 @@ const protorequest = curry(function protorequest(defaultOptions, options) {
   }
 
   // Hide useless elements from logs
-  [
-    'download',
-    'interceptors',
-    'logger',
-    'upload'
-  ].forEach((prop) => {
+  ['download', 'interceptors', 'logger', 'upload'].forEach((prop) => {
     let descriptor = Reflect.getOwnPropertyDescriptor(options, prop);
 
     descriptor = assign({}, descriptor, {
       enumerable: false,
-      writable: true
+      writable: true,
     });
     Reflect.defineProperty(options, prop, descriptor);
   });
@@ -50,8 +45,8 @@ const defaultOptions = {
   json: true,
   interceptors: [
     // Reminder: this is supposed to be an instantiated interceptor.
-    HttpStatusInterceptor.create()
-  ]
+    HttpStatusInterceptor.create(),
+  ],
 };
 
 export const defaults = protorequest;

package/src/interceptors/http-status.js

@@ -18,12 +18,12 @@ export default class HttpStatusInterceptor extends Interceptor {
    */
   constructor(webex, options) {
     super(webex);
-    const ErrorConstructor = options && (options.error || options.ErrorConstructor) || HttpError;
+    const ErrorConstructor = (options && (options.error || options.ErrorConstructor)) || HttpError;
 
     Object.defineProperties(this, {
       ErrorConstructor: {
-        value: ErrorConstructor
-      }
+        value: ErrorConstructor,
+      },
     });
   }
 
@@ -46,9 +46,11 @@ export default class HttpStatusInterceptor extends Interceptor {
         return Promise.resolve(response);
       }
       // to handle locus redirects
-      if (response.statusCode === 404 &&
+      if (
+        response.statusCode === 404 &&
         response.body &&
-        response.body.errorCode === LOCUS_REDIRECT_ERROR) {
+        response.body.errorCode === LOCUS_REDIRECT_ERROR
+      ) {
         return Promise.resolve(response);
       }
     }

package/src/lib/detect.js

@@ -10,7 +10,6 @@ import {fromBuffer} from 'file-type';
  * @returns {Promise<string>}
  */
 export default async function detect(buffer) {
-  /* global Blob */
   if (
     !(buffer instanceof Blob) &&
     !(buffer instanceof ArrayBuffer) &&

package/src/lib/interceptor.js

@@ -20,7 +20,7 @@ export default class Interceptor {
 
         Reflect.defineProperty(this, key, {
           enumerable: true,
-          value
+          value,
         });
       });
     }
@@ -43,9 +43,7 @@ export default class Interceptor {
     // prepend a header for the interceptor
     logger.info('/***** Interceptor ****************************************************\\');
 
-    logger.info(
-      `${this.constructor.name} - ${JSON.stringify(options, null, 2)}`
-    );
+    logger.info(`${this.constructor.name} - ${JSON.stringify(options, null, 2)}`);
   }
 
   /**

package/src/lib/xhr.js

@@ -11,243 +11,246 @@
 // we're trying to diverge as little as possible.
 /* eslint-disable */
 
-"use strict";
-var window = require("global/window")
-var isFunction = require("is-function")
-var parseHeaders = require("parse-headers")
-var xtend = require("xtend")
-
-createXHR.XMLHttpRequest = window.XMLHttpRequest || noop
-createXHR.XDomainRequest = "withCredentials" in (new createXHR.XMLHttpRequest()) ? createXHR.XMLHttpRequest : window.XDomainRequest
-
-forEachArray(["get", "put", "post", "patch", "head", "delete"], function(method) {
-    createXHR[method === "delete" ? "del" : method] = function(uri, options, callback) {
-        options = initParams(uri, options, callback)
-        options.method = method.toUpperCase()
-        return _createXHR(options)
-    }
-})
+'use strict';
+var window = require('global/window');
+var isFunction = require('is-function');
+var parseHeaders = require('parse-headers');
+var xtend = require('xtend');
+
+createXHR.XMLHttpRequest = window.XMLHttpRequest || noop;
+createXHR.XDomainRequest =
+  'withCredentials' in new createXHR.XMLHttpRequest()
+    ? createXHR.XMLHttpRequest
+    : window.XDomainRequest;
+
+forEachArray(['get', 'put', 'post', 'patch', 'head', 'delete'], function (method) {
+  createXHR[method === 'delete' ? 'del' : method] = function (uri, options, callback) {
+    options = initParams(uri, options, callback);
+    options.method = method.toUpperCase();
+    return _createXHR(options);
+  };
+});
 
 function forEachArray(array, iterator) {
-    for (var i = 0; i < array.length; i+= 1) {
-        iterator(array[i])
-    }
+  for (var i = 0; i < array.length; i += 1) {
+    iterator(array[i]);
+  }
 }
 
-function isEmpty(obj){
-    for(var i in obj){
-        if(obj.hasOwnProperty(i)) return false
-    }
-    return true
+function isEmpty(obj) {
+  for (var i in obj) {
+    if (obj.hasOwnProperty(i)) return false;
+  }
+  return true;
 }
 
 function initParams(uri, options, callback) {
-    var params = uri
+  var params = uri;
 
-    if (isFunction(options)) {
-        callback = options
-        if (typeof uri === "string") {
-            params = {uri:uri}
-        }
-    } else {
-        params = xtend(options, {uri: uri})
+  if (isFunction(options)) {
+    callback = options;
+    if (typeof uri === 'string') {
+      params = {uri: uri};
     }
+  } else {
+    params = xtend(options, {uri: uri});
+  }
 
-    params.callback = callback
-    return params
+  params.callback = callback;
+  return params;
 }
 
 function createXHR(uri, options, callback) {
-    options = initParams(uri, options, callback)
-    return _createXHR(options)
+  options = initParams(uri, options, callback);
+  return _createXHR(options);
 }
 
 function _createXHR(options) {
-    if(typeof options.callback === "undefined"){
-        throw new Error("callback argument missing")
+  if (typeof options.callback === 'undefined') {
+    throw new Error('callback argument missing');
+  }
+
+  var called = false;
+  var callback = function cbOnce(err, response, body) {
+    if (!called) {
+      called = true;
+      options.callback(err, response, body);
     }
+  };
 
-    var called = false
-    var callback = function cbOnce(err, response, body){
-        if(!called){
-            called = true
-            options.callback(err, response, body)
-        }
+  function readystatechange() {
+    if (xhr.readyState === 4) {
+      setTimeout(loadFunc, 0);
     }
+  }
 
-    function readystatechange() {
-        if (xhr.readyState === 4) {
-            setTimeout(loadFunc, 0)
-        }
-    }
-
-    function getBody() {
-        // Chrome with requestType=blob throws errors arround when even testing access to responseText
-        var body = undefined
-
-        if (xhr.response) {
-            body = xhr.response
-        } else {
-            body = xhr.responseText || getXml(xhr)
-        }
+  function getBody() {
+    // Chrome with requestType=blob throws errors arround when even testing access to responseText
+    var body = undefined;
 
-        if (isJson) {
-            try {
-                body = JSON.parse(body)
-            } catch (e) {}
-        }
-
-        return body
-    }
-
-    function errorFunc(evt) {
-        clearTimeout(timeoutTimer)
-        if(!(evt instanceof Error)){
-            evt = new Error("" + (evt || "Unknown XMLHttpRequest Error") )
-        }
-        evt.statusCode = 0
-        return callback(evt, failureResponse)
+    if (xhr.response) {
+      body = xhr.response;
+    } else {
+      body = xhr.responseText || getXml(xhr);
     }
 
-    // will load the data & process the response in a special response object
-    function loadFunc() {
-        if (aborted) return
-        var status
-        clearTimeout(timeoutTimer)
-        if(options.useXDR && xhr.status===undefined) {
-            //IE8 CORS GET successful response doesn't have a status field, but body is fine
-            status = 200
-        } else {
-            status = (xhr.status === 1223 ? 204 : xhr.status)
-        }
-        var response = failureResponse
-        var err = null
-
-        if (status !== 0){
-            response = {
-                body: getBody(),
-                statusCode: status,
-                method: method,
-                headers: {},
-                url: uri,
-                rawRequest: xhr
-            }
-            if(xhr.getAllResponseHeaders){ //remember xhr can in fact be XDR for CORS in IE
-                response.headers = parseHeaders(xhr.getAllResponseHeaders())
-            }
-        } else {
-            err = new Error("Internal XMLHttpRequest Error")
-        }
-        return callback(err, response, response.body)
+    if (isJson) {
+      try {
+        body = JSON.parse(body);
+      } catch (e) {}
     }
 
-    var xhr = options.xhr || null
+    return body;
+  }
 
-    if (!xhr) {
-        if (options.cors || options.useXDR) {
-            xhr = new createXHR.XDomainRequest()
-        }else{
-            xhr = new createXHR.XMLHttpRequest()
-        }
+  function errorFunc(evt) {
+    clearTimeout(timeoutTimer);
+    if (!(evt instanceof Error)) {
+      evt = new Error('' + (evt || 'Unknown XMLHttpRequest Error'));
     }
+    evt.statusCode = 0;
+    return callback(evt, failureResponse);
+  }
+
+  // will load the data & process the response in a special response object
+  function loadFunc() {
+    if (aborted) return;
+    var status;
+    clearTimeout(timeoutTimer);
+    if (options.useXDR && xhr.status === undefined) {
+      //IE8 CORS GET successful response doesn't have a status field, but body is fine
+      status = 200;
+    } else {
+      status = xhr.status === 1223 ? 204 : xhr.status;
+    }
+    var response = failureResponse;
+    var err = null;
 
-    var key
-    var aborted
-    var uri = options.uri || options.url
-    var method = options.method || "GET"
-    var body = options.body || options.data
-    var headers = options.headers || {}
-    var sync = !!options.sync
-    var isJson = false
-    var timeoutTimer
-    var failureResponse = {
-        body: undefined,
-        headers: {},
-        statusCode: 0,
+    if (status !== 0) {
+      response = {
+        body: getBody(),
+        statusCode: status,
         method: method,
+        headers: {},
         url: uri,
-        rawRequest: xhr
-    }
-
-    if ("json" in options && options.json !== false) {
-        isJson = true
-        headers["accept"] || headers["Accept"] || (headers["Accept"] = "application/json") //Don't override existing accept header declared by user
-        if (method !== "GET" && method !== "HEAD") {
-            headers["content-type"] || headers["Content-Type"] || (headers["Content-Type"] = "application/json") //Don't override existing accept header declared by user
-            body = JSON.stringify(options.json === true ? body : options.json)
-        }
+        rawRequest: xhr,
+      };
+      if (xhr.getAllResponseHeaders) {
+        //remember xhr can in fact be XDR for CORS in IE
+        response.headers = parseHeaders(xhr.getAllResponseHeaders());
+      }
+    } else {
+      err = new Error('Internal XMLHttpRequest Error');
     }
+    return callback(err, response, response.body);
+  }
 
-    xhr.onreadystatechange = readystatechange
-    xhr.onload = loadFunc
-    xhr.onerror = errorFunc
-    // IE9 must have onprogress be set to a unique function.
-    xhr.onprogress = function () {
-        // IE must die
-    }
-    xhr.onabort = function(){
-        aborted = true;
-    }
-    xhr.ontimeout = errorFunc
-    xhr.open(method, uri, !sync, options.username, options.password)
-    //has to be after open
-    if(!sync) {
-        xhr.withCredentials = !!options.withCredentials
-    }
-    // Cannot set timeout with sync request
-    // not setting timeout on the xhr object, because of old webkits etc. not handling that correctly
-    // both npm's request and jquery 1.x use this kind of timeout, so this is being consistent
-    if (!sync && options.timeout > 0 ) {
-        timeoutTimer = setTimeout(function(){
-            if (aborted) return
-            aborted = true//IE9 may still call readystatechange
-            xhr.abort("timeout")
-            var e = new Error("XMLHttpRequest timeout")
-            e.code = "ETIMEDOUT"
-            errorFunc(e)
-        }, options.timeout )
-    }
+  var xhr = options.xhr || null;
 
-    if (xhr.setRequestHeader) {
-        for(key in headers){
-            if(headers.hasOwnProperty(key)){
-                xhr.setRequestHeader(key, headers[key])
-            }
-        }
-    } else if (options.headers && !isEmpty(options.headers)) {
-        throw new Error("Headers cannot be set on an XDomainRequest object")
+  if (!xhr) {
+    if (options.cors || options.useXDR) {
+      xhr = new createXHR.XDomainRequest();
+    } else {
+      xhr = new createXHR.XMLHttpRequest();
     }
-
-    if ("responseType" in options) {
-        xhr.responseType = options.responseType
+  }
+
+  var key;
+  var aborted;
+  var uri = options.uri || options.url;
+  var method = options.method || 'GET';
+  var body = options.body || options.data;
+  var headers = options.headers || {};
+  var sync = !!options.sync;
+  var isJson = false;
+  var timeoutTimer;
+  var failureResponse = {
+    body: undefined,
+    headers: {},
+    statusCode: 0,
+    method: method,
+    url: uri,
+    rawRequest: xhr,
+  };
+
+  if ('json' in options && options.json !== false) {
+    isJson = true;
+    headers['accept'] || headers['Accept'] || (headers['Accept'] = 'application/json'); //Don't override existing accept header declared by user
+    if (method !== 'GET' && method !== 'HEAD') {
+      headers['content-type'] ||
+        headers['Content-Type'] ||
+        (headers['Content-Type'] = 'application/json'); //Don't override existing accept header declared by user
+      body = JSON.stringify(options.json === true ? body : options.json);
     }
-
-    if ("beforeSend" in options &&
-        typeof options.beforeSend === "function"
-    ) {
-        options.beforeSend(xhr)
+  }
+
+  xhr.onreadystatechange = readystatechange;
+  xhr.onload = loadFunc;
+  xhr.onerror = errorFunc;
+  // IE9 must have onprogress be set to a unique function.
+  xhr.onprogress = function () {
+    // IE must die
+  };
+  xhr.onabort = function () {
+    aborted = true;
+  };
+  xhr.ontimeout = errorFunc;
+  xhr.open(method, uri, !sync, options.username, options.password);
+  //has to be after open
+  if (!sync) {
+    xhr.withCredentials = !!options.withCredentials;
+  }
+  // Cannot set timeout with sync request
+  // not setting timeout on the xhr object, because of old webkits etc. not handling that correctly
+  // both npm's request and jquery 1.x use this kind of timeout, so this is being consistent
+  if (!sync && options.timeout > 0) {
+    timeoutTimer = setTimeout(function () {
+      if (aborted) return;
+      aborted = true; //IE9 may still call readystatechange
+      xhr.abort('timeout');
+      var e = new Error('XMLHttpRequest timeout');
+      e.code = 'ETIMEDOUT';
+      errorFunc(e);
+    }, options.timeout);
+  }
+
+  if (xhr.setRequestHeader) {
+    for (key in headers) {
+      if (headers.hasOwnProperty(key)) {
+        xhr.setRequestHeader(key, headers[key]);
+      }
     }
+  } else if (options.headers && !isEmpty(options.headers)) {
+    throw new Error('Headers cannot be set on an XDomainRequest object');
+  }
 
-    // Microsoft Edge browser sends "undefined" when send is called with undefined value.
-    // XMLHttpRequest spec says to pass null as body to indicate no body
-    // See https://github.com/naugtur/xhr/issues/100.
-    xhr.send(body || null)
+  if ('responseType' in options) {
+    xhr.responseType = options.responseType;
+  }
 
-    return xhr
+  if ('beforeSend' in options && typeof options.beforeSend === 'function') {
+    options.beforeSend(xhr);
+  }
 
+  // Microsoft Edge browser sends "undefined" when send is called with undefined value.
+  // XMLHttpRequest spec says to pass null as body to indicate no body
+  // See https://github.com/naugtur/xhr/issues/100.
+  xhr.send(body || null);
 
+  return xhr;
 }
 
 function getXml(xhr) {
-    if (xhr.responseType === "document") {
-        return xhr.responseXML
-    }
-    var firefoxBugTakenEffect = xhr.responseXML && xhr.responseXML.documentElement.nodeName === "parsererror"
-    if (xhr.responseType === "" && !firefoxBugTakenEffect) {
-        return xhr.responseXML
-    }
-
-    return null
+  if (xhr.responseType === 'document') {
+    return xhr.responseXML;
+  }
+  var firefoxBugTakenEffect =
+    xhr.responseXML && xhr.responseXML.documentElement.nodeName === 'parsererror';
+  if (xhr.responseType === '' && !firefoxBugTakenEffect) {
+    return xhr.responseXML;
+  }
+
+  return null;
 }
 
 function noop() {}

package/src/progress-event.js

@@ -16,17 +16,22 @@ export default function ProgressEvent(loaded, total) {
     loaded: {
       enumerable: true,
       value: loaded,
-      writable: false
+      writable: false,
     },
     total: {
       enumerable: true,
       value: total,
-      writable: false
+      writable: false,
     },
     lengthComputable: {
       enumerable: true,
-      value: isNumber(loaded) && !Number.isNaN(loaded) && isNumber(total) && !Number.isNaN(total) && total > 0,
-      writable: false
-    }
+      value:
+        isNumber(loaded) &&
+        !Number.isNaN(loaded) &&
+        isNumber(total) &&
+        !Number.isNaN(total) &&
+        total > 0,
+      writable: false,
+    },
   });
 }