@webex/http-core 2.59.2 → 2.59.3-next.1

package/src/index.js

@@ -1,58 +1,58 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {assign, curry, defaults as lodashDefaults, isString} from 'lodash';
-
-import HttpStatusInterceptor from './interceptors/http-status';
-import _request from './request';
-
-// Curry protorequest so we generate a function with default options built in.
-const protorequest = curry(function protorequest(defaultOptions, options) {
-  // allow for options to be a string (and therefore expect options in the third
-  // position) to match request's api.
-  if (isString(options)) {
-    const uri = options;
-
-    /* eslint prefer-rest-params: [0] */
-    options = arguments[2] || {};
-    options.uri = uri;
-  }
-
-  // Hide useless elements from logs
-  ['download', 'interceptors', 'logger', 'upload'].forEach((prop) => {
-    let descriptor = Reflect.getOwnPropertyDescriptor(options, prop);
-
-    descriptor = assign({}, descriptor, {
-      enumerable: false,
-      writable: true,
-    });
-    Reflect.defineProperty(options, prop, descriptor);
-  });
-
-  lodashDefaults(options, defaultOptions);
-
-  if (!options.json && options.json !== false) {
-    Reflect.deleteProperty(options, 'json');
-  }
-
-  options.logger = options.logger || this.logger || console;
-
-  return _request(options);
-});
-
-const defaultOptions = {
-  json: true,
-  interceptors: [
-    // Reminder: this is supposed to be an instantiated interceptor.
-    HttpStatusInterceptor.create(),
-  ],
-};
-
-export const defaults = protorequest;
-export const request = protorequest(defaultOptions);
-export {default as ProgressEvent} from './progress-event';
-export {default as Interceptor} from './lib/interceptor';
-export {default as HttpError} from './http-error';
-export {default as HttpStatusInterceptor} from './interceptors/http-status';
-export {default as detect} from './lib/detect';
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {assign, curry, defaults as lodashDefaults, isString} from 'lodash';
+
+import HttpStatusInterceptor from './interceptors/http-status';
+import _request from './request';
+
+// Curry protorequest so we generate a function with default options built in.
+const protorequest = curry(function protorequest(defaultOptions, options) {
+  // allow for options to be a string (and therefore expect options in the third
+  // position) to match request's api.
+  if (isString(options)) {
+    const uri = options;
+
+    /* eslint prefer-rest-params: [0] */
+    options = arguments[2] || {};
+    options.uri = uri;
+  }
+
+  // Hide useless elements from logs
+  ['download', 'interceptors', 'logger', 'upload'].forEach((prop) => {
+    let descriptor = Reflect.getOwnPropertyDescriptor(options, prop);
+
+    descriptor = assign({}, descriptor, {
+      enumerable: false,
+      writable: true,
+    });
+    Reflect.defineProperty(options, prop, descriptor);
+  });
+
+  lodashDefaults(options, defaultOptions);
+
+  if (!options.json && options.json !== false) {
+    Reflect.deleteProperty(options, 'json');
+  }
+
+  options.logger = options.logger || this.logger || console;
+
+  return _request(options);
+});
+
+const defaultOptions = {
+  json: true,
+  interceptors: [
+    // Reminder: this is supposed to be an instantiated interceptor.
+    HttpStatusInterceptor.create(),
+  ],
+};
+
+export const defaults = protorequest;
+export const request = protorequest(defaultOptions);
+export {default as ProgressEvent} from './progress-event';
+export {default as Interceptor} from './lib/interceptor';
+export {default as HttpError} from './http-error';
+export {default as HttpStatusInterceptor} from './interceptors/http-status';
+export {default as detect} from './lib/detect';

package/src/interceptors/http-status.js

@@ -1,63 +1,63 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import HttpError from '../http-error';
-import Interceptor from '../lib/interceptor';
-
-const LOCUS_REDIRECT_ERROR = 2000002;
-
-/**
- * @class
- */
-export default class HttpStatusInterceptor extends Interceptor {
-  /**
-   * @param {Object} webex
-   * @param {Object} options
-   * @returns {HttpStatusInterceptor}
-   */
-  constructor(webex, options) {
-    super(webex);
-    const ErrorConstructor = (options && (options.error || options.ErrorConstructor)) || HttpError;
-
-    Object.defineProperties(this, {
-      ErrorConstructor: {
-        value: ErrorConstructor,
-      },
-    });
-  }
-
-  /**
-   * @param {Object} options
-   * @returns {HttpStatusInterceptor}
-   */
-  static create(options) {
-    return new HttpStatusInterceptor(this, options);
-  }
-
-  /**
-   * @param {Object} options
-   * @param {HttpResponse} response
-   * @returns {Promise}
-   */
-  onResponse(options, response) {
-    if (response.statusCode) {
-      if (response.statusCode < 400) {
-        return Promise.resolve(response);
-      }
-      // to handle locus redirects
-      if (
-        response.statusCode === 404 &&
-        response.body &&
-        response.body.errorCode === LOCUS_REDIRECT_ERROR
-      ) {
-        return Promise.resolve(response);
-      }
-    }
-
-    // Note: the extra parenthesis below are required to make sure `new` is
-    // applied to the correct method (i.e., the result of `select()`, not
-    // `select()` itself).
-    return Promise.reject(new (this.ErrorConstructor.select(response.statusCode))(response));
-  }
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import HttpError from '../http-error';
+import Interceptor from '../lib/interceptor';
+
+const LOCUS_REDIRECT_ERROR = 2000002;
+
+/**
+ * @class
+ */
+export default class HttpStatusInterceptor extends Interceptor {
+  /**
+   * @param {Object} webex
+   * @param {Object} options
+   * @returns {HttpStatusInterceptor}
+   */
+  constructor(webex, options) {
+    super(webex);
+    const ErrorConstructor = (options && (options.error || options.ErrorConstructor)) || HttpError;
+
+    Object.defineProperties(this, {
+      ErrorConstructor: {
+        value: ErrorConstructor,
+      },
+    });
+  }
+
+  /**
+   * @param {Object} options
+   * @returns {HttpStatusInterceptor}
+   */
+  static create(options) {
+    return new HttpStatusInterceptor(this, options);
+  }
+
+  /**
+   * @param {Object} options
+   * @param {HttpResponse} response
+   * @returns {Promise}
+   */
+  onResponse(options, response) {
+    if (response.statusCode) {
+      if (response.statusCode < 400) {
+        return Promise.resolve(response);
+      }
+      // to handle locus redirects
+      if (
+        response.statusCode === 404 &&
+        response.body &&
+        response.body.errorCode === LOCUS_REDIRECT_ERROR
+      ) {
+        return Promise.resolve(response);
+      }
+    }
+
+    // Note: the extra parenthesis below are required to make sure `new` is
+    // applied to the correct method (i.e., the result of `select()`, not
+    // `select()` itself).
+    return Promise.reject(new (this.ErrorConstructor.select(response.statusCode))(response));
+  }
+}

package/src/lib/detect.js

@@ -1,33 +1,33 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {fromBuffer} from 'file-type';
-
-/**
- * Determine mimeType for the specified buffer;
- * @param {Buffer|Uint8Array|ArrayBuffer} buffer
- * @returns {Promise<string>}
- */
-export default async function detect(buffer) {
-  if (
-    !(buffer instanceof Blob) &&
-    !(buffer instanceof ArrayBuffer) &&
-    !(buffer instanceof Uint8Array)
-  ) {
-    throw new Error('`detect` requires a buffer of type Blob, ArrayBuffer, or Uint8Array');
-  }
-
-  if (buffer instanceof Blob) {
-    return buffer.type;
-  }
-
-  // `fromBuffer()` can take a buffer that is either a ArrayBuffer or Uinit8Array
-  const fileType = await fromBuffer(buffer);
-
-  if (!fileType) {
-    return 'application/octet-stream';
-  }
-
-  return fileType.mime;
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {fromBuffer} from 'file-type';
+
+/**
+ * Determine mimeType for the specified buffer;
+ * @param {Buffer|Uint8Array|ArrayBuffer} buffer
+ * @returns {Promise<string>}
+ */
+export default async function detect(buffer) {
+  if (
+    !(buffer instanceof Blob) &&
+    !(buffer instanceof ArrayBuffer) &&
+    !(buffer instanceof Uint8Array)
+  ) {
+    throw new Error('`detect` requires a buffer of type Blob, ArrayBuffer, or Uint8Array');
+  }
+
+  if (buffer instanceof Blob) {
+    return buffer.type;
+  }
+
+  // `fromBuffer()` can take a buffer that is either a ArrayBuffer or Uinit8Array
+  const fileType = await fromBuffer(buffer);
+
+  if (!fileType) {
+    return 'application/octet-stream';
+  }
+
+  return fileType.mime;
+}

package/src/lib/interceptor.js

@@ -1,95 +1,95 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {get} from 'lodash';
-
-/**
- * @class
- */
-export default class Interceptor {
-  /**
-   * @constructor
-   * @param {Object} attrs
-   * @returns {UrlInterceptor}
-   */
-  constructor(attrs) {
-    if (attrs) {
-      Object.keys(attrs).forEach((key) => {
-        const value = attrs[key];
-
-        Reflect.defineProperty(this, key, {
-          enumerable: true,
-          value,
-        });
-      });
-    }
-  }
-
-  /**
-   * Logs the options of a request. This should be utilized
-   * during the intercepting process, but can be used at any
-   * time otherwise.
-   * @param {object} options
-   * @returns {void}
-   */
-  logOptions(options = {}) {
-    const logger = get(this, 'webex.logger', console);
-
-    if (!process.env.ENABLE_VERBOSE_NETWORK_LOGGING || !logger) {
-      return;
-    }
-
-    // prepend a header for the interceptor
-    logger.info('/***** Interceptor ****************************************************\\');
-
-    logger.info(`${this.constructor.name} - ${JSON.stringify(options, null, 2)}`);
-  }
-
-  /**
-   * @abstract
-   * @returns {Interceptor}
-   */
-  static create() {
-    throw new Error('`Interceptor.create()` must be defined');
-  }
-
-  /**
-   * Transform request options before sending them
-   * @param {Object} options
-   * @returns {Promise<Object>}
-   */
-  onRequest(options) {
-    return Promise.resolve(options);
-  }
-
-  /**
-   * Handle request failures
-   * @param {Object} options
-   * @param {Error} reason
-   * @returns {RejectedPromise<Error>}
-   */
-  onRequestError(options, reason) {
-    return Promise.reject(reason);
-  }
-
-  /**
-   * Transform response before returning it
-   * @param {Object} options
-   * @param {HttpResponse} response
-   * @returns {Promise<HttpResponse>}
-   */
-  onResponse(options, response) {
-    return Promise.resolve(response);
-  }
-
-  /**
-   * Handle response errors
-   * @param {Object} options
-   * @param {WebexHttpError} reason
-   * @returns {Promise<WebexHttpError>}
-   */
-  onResponseError(options, reason) {
-    return Promise.reject(reason);
-  }
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {get} from 'lodash';
+
+/**
+ * @class
+ */
+export default class Interceptor {
+  /**
+   * @constructor
+   * @param {Object} attrs
+   * @returns {UrlInterceptor}
+   */
+  constructor(attrs) {
+    if (attrs) {
+      Object.keys(attrs).forEach((key) => {
+        const value = attrs[key];
+
+        Reflect.defineProperty(this, key, {
+          enumerable: true,
+          value,
+        });
+      });
+    }
+  }
+
+  /**
+   * Logs the options of a request. This should be utilized
+   * during the intercepting process, but can be used at any
+   * time otherwise.
+   * @param {object} options
+   * @returns {void}
+   */
+  logOptions(options = {}) {
+    const logger = get(this, 'webex.logger', console);
+
+    if (!process.env.ENABLE_VERBOSE_NETWORK_LOGGING || !logger) {
+      return;
+    }
+
+    // prepend a header for the interceptor
+    logger.info('/***** Interceptor ****************************************************\\');
+
+    logger.info(`${this.constructor.name} - ${JSON.stringify(options, null, 2)}`);
+  }
+
+  /**
+   * @abstract
+   * @returns {Interceptor}
+   */
+  static create() {
+    throw new Error('`Interceptor.create()` must be defined');
+  }
+
+  /**
+   * Transform request options before sending them
+   * @param {Object} options
+   * @returns {Promise<Object>}
+   */
+  onRequest(options) {
+    return Promise.resolve(options);
+  }
+
+  /**
+   * Handle request failures
+   * @param {Object} options
+   * @param {Error} reason
+   * @returns {RejectedPromise<Error>}
+   */
+  onRequestError(options, reason) {
+    return Promise.reject(reason);
+  }
+
+  /**
+   * Transform response before returning it
+   * @param {Object} options
+   * @param {HttpResponse} response
+   * @returns {Promise<HttpResponse>}
+   */
+  onResponse(options, response) {
+    return Promise.resolve(response);
+  }
+
+  /**
+   * Handle response errors
+   * @param {Object} options
+   * @param {WebexHttpError} reason
+   * @returns {Promise<WebexHttpError>}
+   */
+  onResponseError(options, reason) {
+    return Promise.reject(reason);
+  }
+}