@webex/http-core 3.0.0-beta.19 → 3.0.0-beta.190

package/dist/index.js

@@ -36,7 +36,7 @@ _Object$defineProperty(exports, "detect", {
     return _detect.default;
   }
 });
-exports.request = void 0;
+exports.request = exports.protoprepareFetchOptions = void 0;
 var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/reflect/get-own-property-descriptor"));
 var _defineProperty = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/reflect/define-property"));
 var _deleteProperty = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/reflect/delete-property"));
@@ -46,6 +46,7 @@ var _curry2 = _interopRequireDefault(require("lodash/curry"));
 var _assign2 = _interopRequireDefault(require("lodash/assign"));
 var _httpStatus = _interopRequireDefault(require("./interceptors/http-status"));
 var _request2 = _interopRequireDefault(require("./request"));
+var _utils = require("./request/utils");
 var _progressEvent = _interopRequireDefault(require("./progress-event"));
 var _interceptor = _interopRequireDefault(require("./lib/interceptor"));
 var _httpError = _interopRequireDefault(require("./http-error"));
@@ -78,6 +79,24 @@ var protorequest = (0, _curry2.default)(function protorequest(defaultOptions, op
   options.logger = options.logger || this.logger || console;
   return (0, _request2.default)(options);
 });
+var protoprepareFetchOptions = (0, _curry2.default)(function protoprepareFetchOptions(defaultOptions, options) {
+  // Hide useless elements from logs
+  ['download', 'interceptors', 'logger', 'upload'].forEach(function (prop) {
+    var descriptor = (0, _getOwnPropertyDescriptor.default)(options, prop);
+    descriptor = (0, _assign2.default)({}, descriptor, {
+      enumerable: false,
+      writable: true
+    });
+    (0, _defineProperty.default)(options, prop, descriptor);
+  });
+  (0, _defaults2.default)(options, defaultOptions);
+  if (!options.json && options.json !== false) {
+    (0, _deleteProperty.default)(options, 'json');
+  }
+  options.logger = options.logger || this.logger || console;
+  return (0, _utils.prepareFetchOptions)(options);
+});
+exports.protoprepareFetchOptions = protoprepareFetchOptions;
 var defaultOptions = {
   json: true,
   interceptors: [

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["protorequest","defaultOptions","options","uri","arguments","forEach","prop","descriptor","enumerable","writable","json","logger","console","_request","interceptors","HttpStatusInterceptor","create","defaults","request"],"sources":["index.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport {assign, curry, defaults as lodashDefaults, isString} from 'lodash';\n\nimport HttpStatusInterceptor from './interceptors/http-status';\nimport _request from './request';\n\n// Curry protorequest so we generate a function with default options built in.\nconst protorequest = curry(function protorequest(defaultOptions, options) {\n  // allow for options to be a string (and therefore expect options in the third\n  // position) to match request's api.\n  if (isString(options)) {\n    const uri = options;\n\n    /* eslint prefer-rest-params: [0] */\n    options = arguments[2] || {};\n    options.uri = uri;\n  }\n\n  // Hide useless elements from logs\n  ['download', 'interceptors', 'logger', 'upload'].forEach((prop) => {\n    let descriptor = Reflect.getOwnPropertyDescriptor(options, prop);\n\n    descriptor = assign({}, descriptor, {\n      enumerable: false,\n      writable: true,\n    });\n    Reflect.defineProperty(options, prop, descriptor);\n  });\n\n  lodashDefaults(options, defaultOptions);\n\n  if (!options.json && options.json !== false) {\n    Reflect.deleteProperty(options, 'json');\n  }\n\n  options.logger = options.logger || this.logger || console;\n\n  return _request(options);\n});\n\nconst defaultOptions = {\n  json: true,\n  interceptors: [\n    // Reminder: this is supposed to be an instantiated interceptor.\n    HttpStatusInterceptor.create(),\n  ],\n};\n\nexport const defaults = protorequest;\nexport const request = protorequest(defaultOptions);\nexport {default as ProgressEvent} from './progress-event';\nexport {default as Interceptor} from './lib/interceptor';\nexport {default as HttpError} from './http-error';\nexport {default as HttpStatusInterceptor} from './interceptors/http-status';\nexport {default as detect} from './lib/detect';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA;AACA;AA8CA;AACA;AACA;AAEA;AAhDA;AACA,IAAMA,YAAY,GAAG,qBAAM,SAASA,YAAY,CAACC,cAAc,EAAEC,OAAO,EAAE;EACxE;EACA;EACA,IAAI,wBAASA,OAAO,CAAC,EAAE;IACrB,IAAMC,GAAG,GAAGD,OAAO;;IAEnB;IACAA,OAAO,GAAGE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5BF,OAAO,CAACC,GAAG,GAAGA,GAAG;EACnB;;EAEA;EACA,CAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAACE,OAAO,CAAC,UAACC,IAAI,EAAK;IACjE,IAAIC,UAAU,GAAG,uCAAiCL,OAAO,EAAEI,IAAI,CAAC;IAEhEC,UAAU,GAAG,sBAAO,CAAC,CAAC,EAAEA,UAAU,EAAE;MAClCC,UAAU,EAAE,KAAK;MACjBC,QAAQ,EAAE;IACZ,CAAC,CAAC;IACF,6BAAuBP,OAAO,EAAEI,IAAI,EAAEC,UAAU,CAAC;EACnD,CAAC,CAAC;EAEF,wBAAeL,OAAO,EAAED,cAAc,CAAC;EAEvC,IAAI,CAACC,OAAO,CAACQ,IAAI,IAAIR,OAAO,CAACQ,IAAI,KAAK,KAAK,EAAE;IAC3C,6BAAuBR,OAAO,EAAE,MAAM,CAAC;EACzC;EAEAA,OAAO,CAACS,MAAM,GAAGT,OAAO,CAACS,MAAM,IAAI,IAAI,CAACA,MAAM,IAAIC,OAAO;EAEzD,OAAO,IAAAC,iBAAQ,EAACX,OAAO,CAAC;AAC1B,CAAC,CAAC;AAEF,IAAMD,cAAc,GAAG;EACrBS,IAAI,EAAE,IAAI;EACVI,YAAY,EAAE;EACZ;EACAC,mBAAqB,CAACC,MAAM,EAAE;AAElC,CAAC;AAEM,IAAMC,QAAQ,GAAGjB,YAAY;AAAC;AAC9B,IAAMkB,OAAO,GAAGlB,YAAY,CAACC,cAAc,CAAC;AAAC"}
+{"version":3,"names":["protorequest","defaultOptions","options","uri","arguments","forEach","prop","descriptor","enumerable","writable","json","logger","console","_request","protoprepareFetchOptions","_prepareFetchOptions","interceptors","HttpStatusInterceptor","create","defaults","request"],"sources":["index.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport {assign, curry, defaults as lodashDefaults, isString} from 'lodash';\n\nimport HttpStatusInterceptor from './interceptors/http-status';\nimport _request from './request';\nimport {prepareFetchOptions as _prepareFetchOptions} from './request/utils';\n\n// Curry protorequest so we generate a function with default options built in.\nconst protorequest = curry(function protorequest(defaultOptions, options) {\n  // allow for options to be a string (and therefore expect options in the third\n  // position) to match request's api.\n  if (isString(options)) {\n    const uri = options;\n\n    /* eslint prefer-rest-params: [0] */\n    options = arguments[2] || {};\n    options.uri = uri;\n  }\n\n  // Hide useless elements from logs\n  ['download', 'interceptors', 'logger', 'upload'].forEach((prop) => {\n    let descriptor = Reflect.getOwnPropertyDescriptor(options, prop);\n\n    descriptor = assign({}, descriptor, {\n      enumerable: false,\n      writable: true,\n    });\n    Reflect.defineProperty(options, prop, descriptor);\n  });\n\n  lodashDefaults(options, defaultOptions);\n\n  if (!options.json && options.json !== false) {\n    Reflect.deleteProperty(options, 'json');\n  }\n\n  options.logger = options.logger || this.logger || console;\n\n  return _request(options);\n});\n\nexport const protoprepareFetchOptions = curry(function protoprepareFetchOptions(\n  defaultOptions,\n  options\n) {\n  // Hide useless elements from logs\n  ['download', 'interceptors', 'logger', 'upload'].forEach((prop) => {\n    let descriptor = Reflect.getOwnPropertyDescriptor(options, prop);\n\n    descriptor = assign({}, descriptor, {\n      enumerable: false,\n      writable: true,\n    });\n    Reflect.defineProperty(options, prop, descriptor);\n  });\n\n  lodashDefaults(options, defaultOptions);\n\n  if (!options.json && options.json !== false) {\n    Reflect.deleteProperty(options, 'json');\n  }\n\n  options.logger = options.logger || this.logger || console;\n\n  return _prepareFetchOptions(options);\n});\n\nconst defaultOptions = {\n  json: true,\n  interceptors: [\n    // Reminder: this is supposed to be an instantiated interceptor.\n    HttpStatusInterceptor.create(),\n  ],\n};\n\nexport const defaults = protorequest;\nexport const request = protorequest(defaultOptions);\nexport {default as ProgressEvent} from './progress-event';\nexport {default as Interceptor} from './lib/interceptor';\nexport {default as HttpError} from './http-error';\nexport {default as HttpStatusInterceptor} from './interceptors/http-status';\nexport {default as detect} from './lib/detect';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA;AACA;AACA;AAwEA;AACA;AACA;AAEA;AA1EA;AACA,IAAMA,YAAY,GAAG,qBAAM,SAASA,YAAY,CAACC,cAAc,EAAEC,OAAO,EAAE;EACxE;EACA;EACA,IAAI,wBAASA,OAAO,CAAC,EAAE;IACrB,IAAMC,GAAG,GAAGD,OAAO;;IAEnB;IACAA,OAAO,GAAGE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5BF,OAAO,CAACC,GAAG,GAAGA,GAAG;EACnB;;EAEA;EACA,CAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAACE,OAAO,CAAC,UAACC,IAAI,EAAK;IACjE,IAAIC,UAAU,GAAG,uCAAiCL,OAAO,EAAEI,IAAI,CAAC;IAEhEC,UAAU,GAAG,sBAAO,CAAC,CAAC,EAAEA,UAAU,EAAE;MAClCC,UAAU,EAAE,KAAK;MACjBC,QAAQ,EAAE;IACZ,CAAC,CAAC;IACF,6BAAuBP,OAAO,EAAEI,IAAI,EAAEC,UAAU,CAAC;EACnD,CAAC,CAAC;EAEF,wBAAeL,OAAO,EAAED,cAAc,CAAC;EAEvC,IAAI,CAACC,OAAO,CAACQ,IAAI,IAAIR,OAAO,CAACQ,IAAI,KAAK,KAAK,EAAE;IAC3C,6BAAuBR,OAAO,EAAE,MAAM,CAAC;EACzC;EAEAA,OAAO,CAACS,MAAM,GAAGT,OAAO,CAACS,MAAM,IAAI,IAAI,CAACA,MAAM,IAAIC,OAAO;EAEzD,OAAO,IAAAC,iBAAQ,EAACX,OAAO,CAAC;AAC1B,CAAC,CAAC;AAEK,IAAMY,wBAAwB,GAAG,qBAAM,SAASA,wBAAwB,CAC7Eb,cAAc,EACdC,OAAO,EACP;EACA;EACA,CAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAACG,OAAO,CAAC,UAACC,IAAI,EAAK;IACjE,IAAIC,UAAU,GAAG,uCAAiCL,OAAO,EAAEI,IAAI,CAAC;IAEhEC,UAAU,GAAG,sBAAO,CAAC,CAAC,EAAEA,UAAU,EAAE;MAClCC,UAAU,EAAE,KAAK;MACjBC,QAAQ,EAAE;IACZ,CAAC,CAAC;IACF,6BAAuBP,OAAO,EAAEI,IAAI,EAAEC,UAAU,CAAC;EACnD,CAAC,CAAC;EAEF,wBAAeL,OAAO,EAAED,cAAc,CAAC;EAEvC,IAAI,CAACC,OAAO,CAACQ,IAAI,IAAIR,OAAO,CAACQ,IAAI,KAAK,KAAK,EAAE;IAC3C,6BAAuBR,OAAO,EAAE,MAAM,CAAC;EACzC;EAEAA,OAAO,CAACS,MAAM,GAAGT,OAAO,CAACS,MAAM,IAAI,IAAI,CAACA,MAAM,IAAIC,OAAO;EAEzD,OAAO,IAAAG,0BAAoB,EAACb,OAAO,CAAC;AACtC,CAAC,CAAC;AAAC;AAEH,IAAMD,cAAc,GAAG;EACrBS,IAAI,EAAE,IAAI;EACVM,YAAY,EAAE;EACZ;EACAC,mBAAqB,CAACC,MAAM,EAAE;AAElC,CAAC;AAEM,IAAMC,QAAQ,GAAGnB,YAAY;AAAC;AAC9B,IAAMoB,OAAO,GAAGpB,YAAY,CAACC,cAAc,CAAC;AAAC"}

package/dist/request/index.js

@@ -6,9 +6,9 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = request;
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
 var _events = require("events");
 var _request2 = _interopRequireDefault(require("./request"));
+var _utils = require("./utils");
 /*!
  * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
  */
@@ -25,7 +25,7 @@ function request(options) {
   options.headers = options.headers || {};
   options.download = new _events.EventEmitter();
   options.upload = new _events.EventEmitter();
-  return intercept(options.interceptors, 'Request').then(function () {
+  return (0, _utils.intercept)(options, options.interceptors, 'Request').then(function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
@@ -34,34 +34,7 @@ function request(options) {
     for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
       args[_key2] = arguments[_key2];
     }
-    return intercept.apply(void 0, [options.interceptors.slice().reverse(), 'Response'].concat(args));
+    return _utils.intercept.apply(void 0, [options, options.interceptors.slice().reverse(), 'Response'].concat(args));
   });
-
-  /**
-   * @param {Array} interceptors
-   * @param {string} key
-   * @param {Object} res
-   * @private
-   * @returns {Promise}
-   */
-  function intercept(interceptors, key, res) {
-    var successKey = "on".concat(key);
-    var errorKey = "on".concat(key, "Error");
-    return interceptors.reduce(function (promise, interceptor) {
-      return promise.then(function (result) {
-        interceptor.logOptions(options);
-        if (interceptor[successKey]) {
-          return interceptor[successKey](options, result);
-        }
-        return _promise.default.resolve(result);
-      }, function (reason) {
-        interceptor.logOptions(options);
-        if (interceptor[errorKey]) {
-          return interceptor[errorKey](options, reason);
-        }
-        return _promise.default.reject(reason);
-      });
-    }, _promise.default.resolve(res));
-  }
 }
 //# sourceMappingURL=index.js.map

package/dist/request/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["request","options","url","uri","headers","download","EventEmitter","upload","intercept","interceptors","then","args","_request","slice","reverse","key","res","successKey","errorKey","reduce","promise","interceptor","result","logOptions","resolve","reason","reject"],"sources":["index.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport {EventEmitter} from 'events';\n\nimport _request from './request';\n\n/**\n * @param {Object} options\n * @returns {Promise}\n */\nexport default function request(options) {\n  if (options.url) {\n    options.uri = options.url;\n    options.url = null;\n  }\n\n  options.headers = options.headers || {};\n\n  options.download = new EventEmitter();\n  options.upload = new EventEmitter();\n\n  return intercept(options.interceptors, 'Request')\n    .then((...args) => _request(options, ...args))\n    .then((...args) => intercept(options.interceptors.slice().reverse(), 'Response', ...args));\n\n  /**\n   * @param {Array} interceptors\n   * @param {string} key\n   * @param {Object} res\n   * @private\n   * @returns {Promise}\n   */\n  function intercept(interceptors, key, res) {\n    const successKey = `on${key}`;\n    const errorKey = `on${key}Error`;\n\n    return interceptors.reduce(\n      (promise, interceptor) =>\n        promise.then(\n          (result) => {\n            interceptor.logOptions(options);\n            if (interceptor[successKey]) {\n              return interceptor[successKey](options, result);\n            }\n\n            return Promise.resolve(result);\n          },\n          (reason) => {\n            interceptor.logOptions(options);\n            if (interceptor[errorKey]) {\n              return interceptor[errorKey](options, reason);\n            }\n\n            return Promise.reject(reason);\n          }\n        ),\n      Promise.resolve(res)\n    );\n  }\n}\n"],"mappings":";;;;;;;;;AAIA;AAEA;AANA;AACA;AACA;;AAMA;AACA;AACA;AACA;AACe,SAASA,OAAO,CAACC,OAAO,EAAE;EACvC,IAAIA,OAAO,CAACC,GAAG,EAAE;IACfD,OAAO,CAACE,GAAG,GAAGF,OAAO,CAACC,GAAG;IACzBD,OAAO,CAACC,GAAG,GAAG,IAAI;EACpB;EAEAD,OAAO,CAACG,OAAO,GAAGH,OAAO,CAACG,OAAO,IAAI,CAAC,CAAC;EAEvCH,OAAO,CAACI,QAAQ,GAAG,IAAIC,oBAAY,EAAE;EACrCL,OAAO,CAACM,MAAM,GAAG,IAAID,oBAAY,EAAE;EAEnC,OAAOE,SAAS,CAACP,OAAO,CAACQ,YAAY,EAAE,SAAS,CAAC,CAC9CC,IAAI,CAAC;IAAA,kCAAIC,IAAI;MAAJA,IAAI;IAAA;IAAA,OAAKC,iBAAQ,gBAACX,OAAO,SAAKU,IAAI,EAAC;EAAA,EAAC,CAC7CD,IAAI,CAAC;IAAA,mCAAIC,IAAI;MAAJA,IAAI;IAAA;IAAA,OAAKH,SAAS,gBAACP,OAAO,CAACQ,YAAY,CAACI,KAAK,EAAE,CAACC,OAAO,EAAE,EAAE,UAAU,SAAKH,IAAI,EAAC;EAAA,EAAC;;EAE5F;AACF;AACA;AACA;AACA;AACA;AACA;EACE,SAASH,SAAS,CAACC,YAAY,EAAEM,GAAG,EAAEC,GAAG,EAAE;IACzC,IAAMC,UAAU,eAAQF,GAAG,CAAE;IAC7B,IAAMG,QAAQ,eAAQH,GAAG,UAAO;IAEhC,OAAON,YAAY,CAACU,MAAM,CACxB,UAACC,OAAO,EAAEC,WAAW;MAAA,OACnBD,OAAO,CAACV,IAAI,CACV,UAACY,MAAM,EAAK;QACVD,WAAW,CAACE,UAAU,CAACtB,OAAO,CAAC;QAC/B,IAAIoB,WAAW,CAACJ,UAAU,CAAC,EAAE;UAC3B,OAAOI,WAAW,CAACJ,UAAU,CAAC,CAAChB,OAAO,EAAEqB,MAAM,CAAC;QACjD;QAEA,OAAO,iBAAQE,OAAO,CAACF,MAAM,CAAC;MAChC,CAAC,EACD,UAACG,MAAM,EAAK;QACVJ,WAAW,CAACE,UAAU,CAACtB,OAAO,CAAC;QAC/B,IAAIoB,WAAW,CAACH,QAAQ,CAAC,EAAE;UACzB,OAAOG,WAAW,CAACH,QAAQ,CAAC,CAACjB,OAAO,EAAEwB,MAAM,CAAC;QAC/C;QAEA,OAAO,iBAAQC,MAAM,CAACD,MAAM,CAAC;MAC/B,CAAC,CACF;IAAA,GACH,iBAAQD,OAAO,CAACR,GAAG,CAAC,CACrB;EACH;AACF"}
+{"version":3,"names":["request","options","url","uri","headers","download","EventEmitter","upload","intercept","interceptors","then","args","_request","slice","reverse"],"sources":["index.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport {EventEmitter} from 'events';\n\nimport _request from './request';\nimport {intercept} from './utils';\n\n/**\n * @param {Object} options\n * @returns {Promise}\n */\nexport default function request(options) {\n  if (options.url) {\n    options.uri = options.url;\n    options.url = null;\n  }\n\n  options.headers = options.headers || {};\n\n  options.download = new EventEmitter();\n  options.upload = new EventEmitter();\n\n  return intercept(options, options.interceptors, 'Request')\n    .then((...args) => _request(options, ...args))\n    .then((...args) =>\n      intercept(options, options.interceptors.slice().reverse(), 'Response', ...args)\n    );\n}\n"],"mappings":";;;;;;;;AAIA;AAEA;AACA;AAPA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACe,SAASA,OAAO,CAACC,OAAO,EAAE;EACvC,IAAIA,OAAO,CAACC,GAAG,EAAE;IACfD,OAAO,CAACE,GAAG,GAAGF,OAAO,CAACC,GAAG;IACzBD,OAAO,CAACC,GAAG,GAAG,IAAI;EACpB;EAEAD,OAAO,CAACG,OAAO,GAAGH,OAAO,CAACG,OAAO,IAAI,CAAC,CAAC;EAEvCH,OAAO,CAACI,QAAQ,GAAG,IAAIC,oBAAY,EAAE;EACrCL,OAAO,CAACM,MAAM,GAAG,IAAID,oBAAY,EAAE;EAEnC,OAAO,IAAAE,gBAAS,EAACP,OAAO,EAAEA,OAAO,CAACQ,YAAY,EAAE,SAAS,CAAC,CACvDC,IAAI,CAAC;IAAA,kCAAIC,IAAI;MAAJA,IAAI;IAAA;IAAA,OAAKC,iBAAQ,gBAACX,OAAO,SAAKU,IAAI,EAAC;EAAA,EAAC,CAC7CD,IAAI,CAAC;IAAA,mCAAIC,IAAI;MAAJA,IAAI;IAAA;IAAA,OACZH,gBAAS,gBAACP,OAAO,EAAEA,OAAO,CAACQ,YAAY,CAACI,KAAK,EAAE,CAACC,OAAO,EAAE,EAAE,UAAU,SAAKH,IAAI,EAAC;EAAA,EAChF;AACL"}

package/dist/request/utils.js

@@ -0,0 +1,76 @@
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
+var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.intercept = intercept;
+exports.prepareFetchOptions = prepareFetchOptions;
+var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
+var _events = require("events");
+/* eslint-disable import/prefer-default-export */
+
+/**
+ * @param {Object} options
+ * @param {Array<Object>} interceptors
+ * @param {string} key
+ * @param {Object | undefined} res
+ * @private
+ * @returns {Promise}
+ */
+function intercept(options, interceptors, key) {
+  var res = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
+  var successKey = "on".concat(key);
+  var errorKey = "on".concat(key, "Error");
+  return interceptors.reduce(function (promise, interceptor) {
+    return promise.then(function (result) {
+      interceptor.logOptions(options);
+      if (interceptor[successKey]) {
+        return interceptor[successKey](options, result);
+      }
+      return _promise.default.resolve(result);
+    }, function (reason) {
+      interceptor.logOptions(options);
+      if (interceptor[errorKey]) {
+        return interceptor[errorKey](options, reason);
+      }
+      return _promise.default.reject(reason);
+    });
+  }, _promise.default.resolve(res));
+}
+
+/**
+ * Prepare options for a fetch.
+ * @param {object} options
+ * @returns {Promise}
+ */
+function prepareFetchOptions(_x) {
+  return _prepareFetchOptions.apply(this, arguments);
+}
+function _prepareFetchOptions() {
+  _prepareFetchOptions = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(options) {
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (options.url) {
+            options.uri = options.url;
+            options.url = null;
+          }
+          options.headers = options.headers || {};
+          options.download = new _events.EventEmitter();
+          options.upload = new _events.EventEmitter();
+          return _context.abrupt("return", intercept(options, options.interceptors, 'Request').then(function () {
+            return options;
+          }));
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _prepareFetchOptions.apply(this, arguments);
+}
+//# sourceMappingURL=utils.js.map

package/dist/request/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["intercept","options","interceptors","key","res","undefined","successKey","errorKey","reduce","promise","interceptor","then","result","logOptions","resolve","reason","reject","prepareFetchOptions","url","uri","headers","download","EventEmitter","upload"],"sources":["utils.ts"],"sourcesContent":["/* eslint-disable import/prefer-default-export */\nimport {EventEmitter} from 'events';\nimport Interceptor from '../lib/interceptor';\n\n/**\n * @param {Object} options\n * @param {Array<Object>} interceptors\n * @param {string} key\n * @param {Object | undefined} res\n * @private\n * @returns {Promise}\n */\nexport function intercept(\n  options: object,\n  interceptors: Array<Interceptor>,\n  key: string,\n  res: object = undefined\n): Promise<any> {\n  const successKey = `on${key}`;\n  const errorKey = `on${key}Error`;\n\n  return interceptors.reduce(\n    (promise, interceptor) =>\n      promise.then(\n        (result) => {\n          interceptor.logOptions(options);\n          if (interceptor[successKey]) {\n            return interceptor[successKey](options, result);\n          }\n\n          return Promise.resolve(result);\n        },\n        (reason) => {\n          interceptor.logOptions(options);\n          if (interceptor[errorKey]) {\n            return interceptor[errorKey](options, reason);\n          }\n\n          return Promise.reject(reason);\n        }\n      ),\n    Promise.resolve(res)\n  );\n}\n\n/**\n * Prepare options for a fetch.\n * @param {object} options\n * @returns {Promise}\n */\nexport async function prepareFetchOptions(options: any): Promise<any> {\n  if (options.url) {\n    options.uri = options.url;\n    options.url = null;\n  }\n\n  options.headers = options.headers || {};\n\n  options.download = new EventEmitter();\n  options.upload = new EventEmitter();\n\n  return intercept(options, options.interceptors, 'Request').then(() => options);\n}\n"],"mappings":";;;;;;;;;;;;AACA;AADA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,SAAS,CACvBC,OAAe,EACfC,YAAgC,EAChCC,GAAW,EAEG;EAAA,IADdC,GAAW,uEAAGC,SAAS;EAEvB,IAAMC,UAAU,eAAQH,GAAG,CAAE;EAC7B,IAAMI,QAAQ,eAAQJ,GAAG,UAAO;EAEhC,OAAOD,YAAY,CAACM,MAAM,CACxB,UAACC,OAAO,EAAEC,WAAW;IAAA,OACnBD,OAAO,CAACE,IAAI,CACV,UAACC,MAAM,EAAK;MACVF,WAAW,CAACG,UAAU,CAACZ,OAAO,CAAC;MAC/B,IAAIS,WAAW,CAACJ,UAAU,CAAC,EAAE;QAC3B,OAAOI,WAAW,CAACJ,UAAU,CAAC,CAACL,OAAO,EAAEW,MAAM,CAAC;MACjD;MAEA,OAAO,iBAAQE,OAAO,CAACF,MAAM,CAAC;IAChC,CAAC,EACD,UAACG,MAAM,EAAK;MACVL,WAAW,CAACG,UAAU,CAACZ,OAAO,CAAC;MAC/B,IAAIS,WAAW,CAACH,QAAQ,CAAC,EAAE;QACzB,OAAOG,WAAW,CAACH,QAAQ,CAAC,CAACN,OAAO,EAAEc,MAAM,CAAC;MAC/C;MAEA,OAAO,iBAAQC,MAAM,CAACD,MAAM,CAAC;IAC/B,CAAC,CACF;EAAA,GACH,iBAAQD,OAAO,CAACV,GAAG,CAAC,CACrB;AACH;;AAEA;AACA;AACA;AACA;AACA;AAJA,SAKsBa,mBAAmB;EAAA;AAAA;AAAA;EAAA,+FAAlC,iBAAmChB,OAAY;IAAA;MAAA;QAAA;UACpD,IAAIA,OAAO,CAACiB,GAAG,EAAE;YACfjB,OAAO,CAACkB,GAAG,GAAGlB,OAAO,CAACiB,GAAG;YACzBjB,OAAO,CAACiB,GAAG,GAAG,IAAI;UACpB;UAEAjB,OAAO,CAACmB,OAAO,GAAGnB,OAAO,CAACmB,OAAO,IAAI,CAAC,CAAC;UAEvCnB,OAAO,CAACoB,QAAQ,GAAG,IAAIC,oBAAY,EAAE;UACrCrB,OAAO,CAACsB,MAAM,GAAG,IAAID,oBAAY,EAAE;UAAC,iCAE7BtB,SAAS,CAACC,OAAO,EAAEA,OAAO,CAACC,YAAY,EAAE,SAAS,CAAC,CAACS,IAAI,CAAC;YAAA,OAAMV,OAAO;UAAA,EAAC;QAAA;QAAA;UAAA;MAAA;IAAA;EAAA,CAC/E;EAAA;AAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/http-core",
-  "version": "3.0.0-beta.19",
+  "version": "3.0.0-beta.190",
   "description": "Core HTTP library for the Cisco Webex",
   "license": "MIT",
   "main": "dist/index.js",
@@ -24,18 +24,18 @@
     ]
   },
   "devDependencies": {
-    "@webex/test-helper-chai": "3.0.0-beta.19",
-    "@webex/test-helper-file": "3.0.0-beta.19",
-    "@webex/test-helper-make-local-url": "3.0.0-beta.19",
-    "@webex/test-helper-mocha": "3.0.0-beta.19",
+    "@webex/test-helper-chai": "3.0.0-beta.190",
+    "@webex/test-helper-file": "3.0.0-beta.190",
+    "@webex/test-helper-make-local-url": "3.0.0-beta.190",
+    "@webex/test-helper-mocha": "3.0.0-beta.190",
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.19",
-    "@webex/http-core": "3.0.0-beta.19",
-    "@webex/internal-plugin-device": "3.0.0-beta.19",
-    "@webex/test-helper-test-users": "3.0.0-beta.19",
-    "@webex/webex-core": "3.0.0-beta.19",
+    "@webex/common": "3.0.0-beta.190",
+    "@webex/http-core": "3.0.0-beta.190",
+    "@webex/internal-plugin-device": "3.0.0-beta.190",
+    "@webex/test-helper-test-users": "3.0.0-beta.190",
+    "@webex/webex-core": "3.0.0-beta.190",
     "file-type": "^16.0.1",
     "global": "^4.4.0",
     "is-function": "^1.0.1",

package/src/index.js

@@ -6,6 +6,7 @@ import {assign, curry, defaults as lodashDefaults, isString} from 'lodash';
 
 import HttpStatusInterceptor from './interceptors/http-status';
 import _request from './request';
+import {prepareFetchOptions as _prepareFetchOptions} from './request/utils';
 
 // Curry protorequest so we generate a function with default options built in.
 const protorequest = curry(function protorequest(defaultOptions, options) {
@@ -41,6 +42,32 @@ const protorequest = curry(function protorequest(defaultOptions, options) {
   return _request(options);
 });
 
+export const protoprepareFetchOptions = curry(function protoprepareFetchOptions(
+  defaultOptions,
+  options
+) {
+  // 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 _prepareFetchOptions(options);
+});
+
 const defaultOptions = {
   json: true,
   interceptors: [

package/src/request/index.js

@@ -5,6 +5,7 @@
 import {EventEmitter} from 'events';
 
 import _request from './request';
+import {intercept} from './utils';
 
 /**
  * @param {Object} options
@@ -21,42 +22,9 @@ export default function request(options) {
   options.download = new EventEmitter();
   options.upload = new EventEmitter();
 
-  return intercept(options.interceptors, 'Request')
+  return intercept(options, options.interceptors, 'Request')
     .then((...args) => _request(options, ...args))
-    .then((...args) => intercept(options.interceptors.slice().reverse(), 'Response', ...args));
-
-  /**
-   * @param {Array} interceptors
-   * @param {string} key
-   * @param {Object} res
-   * @private
-   * @returns {Promise}
-   */
-  function intercept(interceptors, key, res) {
-    const successKey = `on${key}`;
-    const errorKey = `on${key}Error`;
-
-    return interceptors.reduce(
-      (promise, interceptor) =>
-        promise.then(
-          (result) => {
-            interceptor.logOptions(options);
-            if (interceptor[successKey]) {
-              return interceptor[successKey](options, result);
-            }
-
-            return Promise.resolve(result);
-          },
-          (reason) => {
-            interceptor.logOptions(options);
-            if (interceptor[errorKey]) {
-              return interceptor[errorKey](options, reason);
-            }
-
-            return Promise.reject(reason);
-          }
-        ),
-      Promise.resolve(res)
+    .then((...args) =>
+      intercept(options, options.interceptors.slice().reverse(), 'Response', ...args)
     );
-  }
 }

package/src/request/utils.ts

@@ -0,0 +1,63 @@
+/* eslint-disable import/prefer-default-export */
+import {EventEmitter} from 'events';
+import Interceptor from '../lib/interceptor';
+
+/**
+ * @param {Object} options
+ * @param {Array<Object>} interceptors
+ * @param {string} key
+ * @param {Object | undefined} res
+ * @private
+ * @returns {Promise}
+ */
+export function intercept(
+  options: object,
+  interceptors: Array<Interceptor>,
+  key: string,
+  res: object = undefined
+): Promise<any> {
+  const successKey = `on${key}`;
+  const errorKey = `on${key}Error`;
+
+  return interceptors.reduce(
+    (promise, interceptor) =>
+      promise.then(
+        (result) => {
+          interceptor.logOptions(options);
+          if (interceptor[successKey]) {
+            return interceptor[successKey](options, result);
+          }
+
+          return Promise.resolve(result);
+        },
+        (reason) => {
+          interceptor.logOptions(options);
+          if (interceptor[errorKey]) {
+            return interceptor[errorKey](options, reason);
+          }
+
+          return Promise.reject(reason);
+        }
+      ),
+    Promise.resolve(res)
+  );
+}
+
+/**
+ * Prepare options for a fetch.
+ * @param {object} options
+ * @returns {Promise}
+ */
+export async function prepareFetchOptions(options: any): Promise<any> {
+  if (options.url) {
+    options.uri = options.url;
+    options.url = null;
+  }
+
+  options.headers = options.headers || {};
+
+  options.download = new EventEmitter();
+  options.upload = new EventEmitter();
+
+  return intercept(options, options.interceptors, 'Request').then(() => options);
+}

package/test/integration/spec/request.js

@@ -78,7 +78,8 @@ describe('http-core', function () {
           }));
       });
 
-      it('makes CORS compatible calls', () =>
+      // SPARK-413317
+      it.skip('makes CORS compatible calls', () =>
         request({
           uri: 'https://ds.ciscospark.com/v1/region/',
         }).then((res) => {

package/test/unit/spec/index.js

@@ -0,0 +1,34 @@
+import {assert} from '@webex/test-helper-chai';
+import sinon from 'sinon';
+
+import * as utils from '@webex/http-core/src/request/utils';
+import WebexTrackingIdInterceptor from '@webex/webex-core/src/interceptors/webex-tracking-id';
+import UserAgentInterceptor from '@webex/webex-core/src/interceptors/webex-user-agent';
+import {protoprepareFetchOptions} from '@webex/http-core/src/index';
+
+describe('http-core index tests', () => {
+  describe('#protoprepareFetchOptions()', () => {
+    it('uses default options and adds expected options', async () => {
+      const defaultOptions = {
+        interceptors: [WebexTrackingIdInterceptor.create(), UserAgentInterceptor.create()],
+      };
+      const options = {};
+
+      const prepareFetchOptions = protoprepareFetchOptions(defaultOptions);
+
+      await prepareFetchOptions(options);
+
+      assert.deepEqual(options, {
+        headers: {
+          trackingid: 'undefined_1',
+          'spark-user-agent': 'webex-js-sdk/development (node)',
+        },
+      });
+
+      assert.equal(typeof options.logger, 'object');
+      assert.equal(typeof options.upload, 'object');
+      assert.equal(typeof options.download, 'object');
+      assert.isArray(options.interceptors);
+    });
+  });
+});

package/test/unit/spec/request/utils.js

@@ -0,0 +1,36 @@
+import {assert} from '@webex/test-helper-chai';
+import sinon from 'sinon';
+
+import * as utils from '@webex/http-core/src/request/utils';
+import WebexTrackingIdInterceptor from '@webex/webex-core/src/interceptors/webex-tracking-id';
+import UserAgentInterceptor from '@webex/webex-core/src/interceptors/webex-user-agent';
+
+describe('Request utils', () => {
+  describe('#intercept()', () => {
+    it('updates options from interceptors', async () => {
+      const options = {};
+      const interceptors = [WebexTrackingIdInterceptor.create(), UserAgentInterceptor.create()];
+
+      return utils.intercept(options, interceptors, 'Request').then(() => {
+        assert.equal(Object.keys(options.headers).length, 2);
+        assert.equal(options.headers.trackingid, 'undefined_1');
+        assert.equal(options.headers['spark-user-agent'], 'webex-js-sdk/development (node)');
+      });
+    });
+  });
+
+  describe('#prepareFetchOptions()', () => {
+    it('updates options as expected', async () => {
+      const options = {
+        interceptors: [WebexTrackingIdInterceptor.create(), UserAgentInterceptor.create()],
+      };
+
+      return utils.prepareFetchOptions(options).then(() => {
+        assert.equal(Object.keys(options.headers).length, 2);
+
+        assert.equal(options.download != undefined, true);
+        assert.equal(options.upload != undefined, true);
+      });
+    });
+  });
+});