@webex/webex-core 2.59.3-next.1 → 2.59.4-next.1

package/src/interceptors/request-event.js

@@ -1,93 +1,93 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {get} from 'lodash';
-import {Interceptor} from '@webex/http-core';
-
-/**
- * @class
- */
-export default class RequestEventInterceptor extends Interceptor {
-  /**
-   * @returns {RequestEventInterceptor}
-   */
-  static create() {
-    return new RequestEventInterceptor({webex: this});
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @returns {Object}
-   */
-  onRequest(options) {
-    const logger = get(this, 'webex.logger', console);
-
-    try {
-      this.webex.trigger('request:start', options);
-    } catch (error) {
-      logger.warn('event handler for request:start failed ', error);
-    }
-
-    return Promise.resolve(options);
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @param {Error} reason
-   * @returns {Object}
-   */
-  onRequestError(options, reason) {
-    // We need to do the normal onRequest logging, but then log how the request
-    // failed since the response logger won't be called.
-    const logger = get(this, 'webex.logger', console);
-
-    try {
-      this.webex.trigger('request:end', options, reason);
-      this.webex.trigger('request:failure', options, reason);
-    } catch (error) {
-      logger.warn('event handler for request:end failed ', error);
-    }
-
-    return Promise.reject(reason);
-  }
-
-  /**
-   * @see Interceptor#onResponse
-   * @param {Object} options
-   * @param {HttpResponse} response
-   * @returns {Object}
-   */
-  onResponse(options, response) {
-    const logger = get(this, 'webex.logger', console);
-
-    try {
-      this.webex.trigger('request:success', response.options, response);
-    } catch (error) {
-      logger.warn('event handler for request:success failed ', error);
-    }
-
-    return Promise.resolve(response);
-  }
-
-  /**
-   * @see Interceptor#onResponseError
-   * @param {Object} options
-   * @param {Error} reason
-   * @returns {Object}
-   */
-  onResponseError(options, reason) {
-    const logger = get(this, 'webex.logger', console);
-
-    try {
-      this.webex.trigger('request:end', options, reason);
-      this.webex.trigger('request:failure', options, reason);
-    } catch (error) {
-      logger.warn('event handler for request:failure failed ', error);
-    }
-
-    return Promise.reject(reason);
-  }
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {get} from 'lodash';
+import {Interceptor} from '@webex/http-core';
+
+/**
+ * @class
+ */
+export default class RequestEventInterceptor extends Interceptor {
+  /**
+   * @returns {RequestEventInterceptor}
+   */
+  static create() {
+    return new RequestEventInterceptor({webex: this});
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @returns {Object}
+   */
+  onRequest(options) {
+    const logger = get(this, 'webex.logger', console);
+
+    try {
+      this.webex.trigger('request:start', options);
+    } catch (error) {
+      logger.warn('event handler for request:start failed ', error);
+    }
+
+    return Promise.resolve(options);
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @param {Error} reason
+   * @returns {Object}
+   */
+  onRequestError(options, reason) {
+    // We need to do the normal onRequest logging, but then log how the request
+    // failed since the response logger won't be called.
+    const logger = get(this, 'webex.logger', console);
+
+    try {
+      this.webex.trigger('request:end', options, reason);
+      this.webex.trigger('request:failure', options, reason);
+    } catch (error) {
+      logger.warn('event handler for request:end failed ', error);
+    }
+
+    return Promise.reject(reason);
+  }
+
+  /**
+   * @see Interceptor#onResponse
+   * @param {Object} options
+   * @param {HttpResponse} response
+   * @returns {Object}
+   */
+  onResponse(options, response) {
+    const logger = get(this, 'webex.logger', console);
+
+    try {
+      this.webex.trigger('request:success', response.options, response);
+    } catch (error) {
+      logger.warn('event handler for request:success failed ', error);
+    }
+
+    return Promise.resolve(response);
+  }
+
+  /**
+   * @see Interceptor#onResponseError
+   * @param {Object} options
+   * @param {Error} reason
+   * @returns {Object}
+   */
+  onResponseError(options, reason) {
+    const logger = get(this, 'webex.logger', console);
+
+    try {
+      this.webex.trigger('request:end', options, reason);
+      this.webex.trigger('request:failure', options, reason);
+    } catch (error) {
+      logger.warn('event handler for request:failure failed ', error);
+    }
+
+    return Promise.reject(reason);
+  }
+}

package/src/interceptors/request-logger.js

@@ -1,78 +1,78 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import util from 'util';
-
-import {get, has, isArray, isString, omit} from 'lodash';
-import {Interceptor} from '@webex/http-core';
-
-/**
- * @class
- */
-export default class RequestLoggerInterceptor extends Interceptor {
-  /**
-   * @returns {RequestLoggerInterceptor}
-   */
-  static create() {
-    return new RequestLoggerInterceptor({webex: this});
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @returns {Object}
-   */
-  onRequest(options) {
-    const logger = get(this, 'webex.logger', console);
-
-    logger.info('/**********************************************************************\\ ');
-    logger.info('Request:', options.method || 'GET', options.uri);
-    logger.info('WEBEX_TRACKINGID: ', get(options, 'headers.trackingid'));
-    /* istanbul ignore next */
-    if (has(options, 'headers.x-trans-id')) {
-      logger.info('X-Trans-ID: ', get(options, 'headers.x-trans-id'));
-    }
-    const now = new Date();
-
-    if (process.env.ENABLE_VERBOSE_NETWORK_LOGGING) {
-      logger.info('timestamp (start): ', now.getTime(), now.toISOString());
-      try {
-        // Determine if body is a buffer without relying on Buffer to avoid
-        // node/browser conflicts.
-        if (
-          options.body &&
-          options.body.length &&
-          !isArray(options.body) &&
-          !isString(options.body)
-        ) {
-          logger.info('Request Options:', util.inspect(omit(options, 'body'), {depth: null}));
-        } else {
-          logger.info('Request Options:', util.inspect(options, {depth: null}));
-        }
-      } catch (e) {
-        logger.warn('Could not stringify request options:', e);
-      }
-    }
-
-    return Promise.resolve(options);
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @param {Error} reason
-   * @returns {Object}
-   */
-  onRequestError(options, reason) {
-    // We need to do the normal onRequest logging, but then log how the request
-    // failed since the response logger won't be called.
-    this.onRequest(options);
-    const logger = get(this, 'webex.logger', console);
-
-    logger.error('Request Failed: ', reason.stack);
-    logger.info('\\**********************************************************************/');
-
-    return Promise.reject(reason);
-  }
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import util from 'util';
+
+import {get, has, isArray, isString, omit} from 'lodash';
+import {Interceptor} from '@webex/http-core';
+
+/**
+ * @class
+ */
+export default class RequestLoggerInterceptor extends Interceptor {
+  /**
+   * @returns {RequestLoggerInterceptor}
+   */
+  static create() {
+    return new RequestLoggerInterceptor({webex: this});
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @returns {Object}
+   */
+  onRequest(options) {
+    const logger = get(this, 'webex.logger', console);
+
+    logger.info('/**********************************************************************\\ ');
+    logger.info('Request:', options.method || 'GET', options.uri);
+    logger.info('WEBEX_TRACKINGID: ', get(options, 'headers.trackingid'));
+    /* istanbul ignore next */
+    if (has(options, 'headers.x-trans-id')) {
+      logger.info('X-Trans-ID: ', get(options, 'headers.x-trans-id'));
+    }
+    const now = new Date();
+
+    if (process.env.ENABLE_VERBOSE_NETWORK_LOGGING) {
+      logger.info('timestamp (start): ', now.getTime(), now.toISOString());
+      try {
+        // Determine if body is a buffer without relying on Buffer to avoid
+        // node/browser conflicts.
+        if (
+          options.body &&
+          options.body.length &&
+          !isArray(options.body) &&
+          !isString(options.body)
+        ) {
+          logger.info('Request Options:', util.inspect(omit(options, 'body'), {depth: null}));
+        } else {
+          logger.info('Request Options:', util.inspect(options, {depth: null}));
+        }
+      } catch (e) {
+        logger.warn('Could not stringify request options:', e);
+      }
+    }
+
+    return Promise.resolve(options);
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @param {Error} reason
+   * @returns {Object}
+   */
+  onRequestError(options, reason) {
+    // We need to do the normal onRequest logging, but then log how the request
+    // failed since the response logger won't be called.
+    this.onRequest(options);
+    const logger = get(this, 'webex.logger', console);
+
+    logger.error('Request Failed: ', reason.stack);
+    logger.info('\\**********************************************************************/');
+
+    return Promise.reject(reason);
+  }
+}

package/src/interceptors/request-timing.js

@@ -1,65 +1,65 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import {Interceptor} from '@webex/http-core';
-
-/**
- * @class
- */
-export default class RequestTimingInterceptor extends Interceptor {
-  /**
-   * @param {Object} options
-   * @returns {RequestTimingInterceptor}
-   */
-  static create(options) {
-    return new RequestTimingInterceptor(this, options);
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @returns {Object}
-   */
-  onRequest(options) {
-    options.$timings = options.$timings || {};
-    options.$timings.requestStart = Date.now();
-
-    return options;
-  }
-
-  /**
-   * @see Interceptor#onRequestError
-   * @param {Object} options
-   * @returns {Object}
-   */
-  onRequestError(options) {
-    options.$timings.requestEnd = options.$timings.requestFail = Date.now();
-
-    return Promise.reject(options);
-  }
-
-  /**
-   * @see Interceptor#onResponse
-   * @param {Object} options
-   * @param {HttpResponse} response
-   * @returns {Object}
-   */
-  onResponse(options, response) {
-    options.$timings.requestEnd = Date.now();
-
-    return Promise.resolve(response);
-  }
-
-  /**
-   * @see Interceptor#onResponseError
-   * @param {Object} options
-   * @param {Error} reason
-   * @returns {Object}
-   */
-  onResponseError(options, reason) {
-    options.$timings.requestEnd = options.$timings.requestFail = Date.now();
-
-    return Promise.reject(reason);
-  }
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import {Interceptor} from '@webex/http-core';
+
+/**
+ * @class
+ */
+export default class RequestTimingInterceptor extends Interceptor {
+  /**
+   * @param {Object} options
+   * @returns {RequestTimingInterceptor}
+   */
+  static create(options) {
+    return new RequestTimingInterceptor(this, options);
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @returns {Object}
+   */
+  onRequest(options) {
+    options.$timings = options.$timings || {};
+    options.$timings.requestStart = Date.now();
+
+    return options;
+  }
+
+  /**
+   * @see Interceptor#onRequestError
+   * @param {Object} options
+   * @returns {Object}
+   */
+  onRequestError(options) {
+    options.$timings.requestEnd = options.$timings.requestFail = Date.now();
+
+    return Promise.reject(options);
+  }
+
+  /**
+   * @see Interceptor#onResponse
+   * @param {Object} options
+   * @param {HttpResponse} response
+   * @returns {Object}
+   */
+  onResponse(options, response) {
+    options.$timings.requestEnd = Date.now();
+
+    return Promise.resolve(response);
+  }
+
+  /**
+   * @see Interceptor#onResponseError
+   * @param {Object} options
+   * @param {Error} reason
+   * @returns {Object}
+   */
+  onResponseError(options, reason) {
+    options.$timings.requestEnd = options.$timings.requestFail = Date.now();
+
+    return Promise.reject(reason);
+  }
+}

package/src/interceptors/response-logger.js

@@ -1,98 +1,98 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import util from 'util';
-
-import {get, omit} from 'lodash';
-import {Interceptor} from '@webex/http-core';
-import {isBuffer} from '@webex/common';
-
-/**
- * @class
- */
-export default class ResponseLoggerInterceptor extends Interceptor {
-  /**
-   * @returns {ResponseLoggerInterceptor}
-   */
-  static create() {
-    return new ResponseLoggerInterceptor({webex: this});
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @param {HttpResponse} response
-   * @returns {Object}
-   */
-  onResponse(options, response) {
-    const now = new Date();
-
-    this.printResponseHeader(options, response);
-
-    const logger = get(this, 'webex.logger', console);
-
-    if (process.env.ENABLE_VERBOSE_NETWORK_LOGGING) {
-      logger.info('timestamp (end): ', now.getTime(), now.toISOString());
-      if (typeof response.body === 'string' || isBuffer(response.body)) {
-        logger.info('Response: ', 'Not printed, it`s probably a file');
-      } else if (typeof response.body === 'object') {
-        try {
-          logger.info('Response: ', util.inspect(omit(response.body, 'features'), {depth: null}));
-        } catch (err) {
-          logger.info('Response: ', '[Not Serializable]', err);
-        }
-      }
-    }
-    logger.info('\\**********************************************************************/');
-
-    return response;
-  }
-
-  /**
-   * @see Interceptor#onRequest
-   * @param {Object} options
-   * @param {Object} reason
-   * @returns {Object}
-   */
-  onResponseError(options, reason) {
-    const now = new Date();
-
-    this.printResponseHeader(options, reason);
-
-    const logger = get(this, 'webex.logger', console);
-
-    if (process.env.ENABLE_VERBOSE_NETWORK_LOGGING) {
-      logger.info('timestamp (end): ', now.getTime(), now.toISOString());
-      try {
-        logger.error('Response: ', util.inspect(reason.body, {depth: null}));
-      } catch (err) {
-        logger.error('Response: ', reason.body);
-      }
-    }
-    logger.info('\\**********************************************************************/');
-
-    return Promise.reject(reason);
-  }
-
-  /**
-   * Prints the basic header
-   * @param {Object} options
-   * @param {HttpResponse|WebexHttpError} response
-   * @returns {undefined}
-   */
-  printResponseHeader(options, response) {
-    const logger = get(this, 'webex.logger', console);
-
-    logger.info('Status Code:', response.statusCode);
-    logger.info(
-      'WEBEX_TRACKINGID:',
-      get(options, 'headers.trackingid') || get(response, 'headers.trackingid')
-    );
-    logger.info('Network duration:', options.$timings.networkEnd - options.$timings.networkStart);
-    logger.info(
-      'Processing duration:',
-      options.$timings.requestEnd - options.$timings.requestStart
-    );
-  }
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import util from 'util';
+
+import {get, omit} from 'lodash';
+import {Interceptor} from '@webex/http-core';
+import {isBuffer} from '@webex/common';
+
+/**
+ * @class
+ */
+export default class ResponseLoggerInterceptor extends Interceptor {
+  /**
+   * @returns {ResponseLoggerInterceptor}
+   */
+  static create() {
+    return new ResponseLoggerInterceptor({webex: this});
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @param {HttpResponse} response
+   * @returns {Object}
+   */
+  onResponse(options, response) {
+    const now = new Date();
+
+    this.printResponseHeader(options, response);
+
+    const logger = get(this, 'webex.logger', console);
+
+    if (process.env.ENABLE_VERBOSE_NETWORK_LOGGING) {
+      logger.info('timestamp (end): ', now.getTime(), now.toISOString());
+      if (typeof response.body === 'string' || isBuffer(response.body)) {
+        logger.info('Response: ', 'Not printed, it`s probably a file');
+      } else if (typeof response.body === 'object') {
+        try {
+          logger.info('Response: ', util.inspect(omit(response.body, 'features'), {depth: null}));
+        } catch (err) {
+          logger.info('Response: ', '[Not Serializable]', err);
+        }
+      }
+    }
+    logger.info('\\**********************************************************************/');
+
+    return response;
+  }
+
+  /**
+   * @see Interceptor#onRequest
+   * @param {Object} options
+   * @param {Object} reason
+   * @returns {Object}
+   */
+  onResponseError(options, reason) {
+    const now = new Date();
+
+    this.printResponseHeader(options, reason);
+
+    const logger = get(this, 'webex.logger', console);
+
+    if (process.env.ENABLE_VERBOSE_NETWORK_LOGGING) {
+      logger.info('timestamp (end): ', now.getTime(), now.toISOString());
+      try {
+        logger.error('Response: ', util.inspect(reason.body, {depth: null}));
+      } catch (err) {
+        logger.error('Response: ', reason.body);
+      }
+    }
+    logger.info('\\**********************************************************************/');
+
+    return Promise.reject(reason);
+  }
+
+  /**
+   * Prints the basic header
+   * @param {Object} options
+   * @param {HttpResponse|WebexHttpError} response
+   * @returns {undefined}
+   */
+  printResponseHeader(options, response) {
+    const logger = get(this, 'webex.logger', console);
+
+    logger.info('Status Code:', response.statusCode);
+    logger.info(
+      'WEBEX_TRACKINGID:',
+      get(options, 'headers.trackingid') || get(response, 'headers.trackingid')
+    );
+    logger.info('Network duration:', options.$timings.networkEnd - options.$timings.networkStart);
+    logger.info(
+      'Processing duration:',
+      options.$timings.requestEnd - options.$timings.requestStart
+    );
+  }
+}