@webex/http-core 3.5.0 → 3.6.0-next.1

package/dist/request/index.js

@@ -29,6 +29,12 @@ function request(options) {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
+    // if provided own request function, use that instead
+    // there are use cases where developer may want to provide whatever request promise they wish
+    // for example, may even use window.postMessages for parent iframe uses cases
+    if (options.request) {
+      return options.request.apply(options, [options].concat(args));
+    }
     return _request2.default.apply(void 0, [options].concat(args));
   }).then(function () {
     for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {

package/dist/request/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_events","require","_request2","_interopRequireDefault","_utils","request","options","url","uri","headers","download","EventEmitter","upload","intercept","interceptors","then","_len","arguments","length","args","Array","_key","_request","apply","concat","_len2","_key2","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,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAPA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACe,SAASI,OAAOA,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,CAAC,CAAC;EACrCL,OAAO,CAACM,MAAM,GAAG,IAAID,oBAAY,CAAC,CAAC;EAEnC,OAAO,IAAAE,gBAAS,EAACP,OAAO,EAAEA,OAAO,CAACQ,YAAY,EAAE,SAAS,CAAC,CACvDC,IAAI,CAAC;IAAA,SAAAC,IAAA,GAAAC,SAAA,CAAAC,MAAA,EAAIC,IAAI,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;MAAJF,IAAI,CAAAE,IAAA,IAAAJ,SAAA,CAAAI,IAAA;IAAA;IAAA,OAAKC,iBAAQ,CAAAC,KAAA,UAACjB,OAAO,EAAAkB,MAAA,CAAKL,IAAI,EAAC;EAAA,EAAC,CAC7CJ,IAAI,CAAC;IAAA,SAAAU,KAAA,GAAAR,SAAA,CAAAC,MAAA,EAAIC,IAAI,OAAAC,KAAA,CAAAK,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJP,IAAI,CAAAO,KAAA,IAAAT,SAAA,CAAAS,KAAA;IAAA;IAAA,OACZb,gBAAS,CAAAU,KAAA,UAACjB,OAAO,EAAEA,OAAO,CAACQ,YAAY,CAACa,KAAK,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAAJ,MAAA,CAAKL,IAAI,EAAC;EAAA,CACjF,CAAC;AACL"}
+{"version":3,"names":["_events","require","_request2","_interopRequireDefault","_utils","request","options","url","uri","headers","download","EventEmitter","upload","intercept","interceptors","then","_len","arguments","length","args","Array","_key","apply","concat","_request","_len2","_key2","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) => {\n      // if provided own request function, use that instead\n      // there are use cases where developer may want to provide whatever request promise they wish\n      // for example, may even use window.postMessages for parent iframe uses cases\n      if (options.request) {\n        return options.request(options, ...args);\n      }\n\n      return _request(options, ...args);\n    })\n    .then((...args) => {\n      return intercept(options, options.interceptors.slice().reverse(), 'Response', ...args);\n    });\n}\n"],"mappings":";;;;;;;;AAIA,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAPA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACe,SAASI,OAAOA,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,CAAC,CAAC;EACrCL,OAAO,CAACM,MAAM,GAAG,IAAID,oBAAY,CAAC,CAAC;EAEnC,OAAO,IAAAE,gBAAS,EAACP,OAAO,EAAEA,OAAO,CAACQ,YAAY,EAAE,SAAS,CAAC,CACvDC,IAAI,CAAC,YAAa;IAAA,SAAAC,IAAA,GAAAC,SAAA,CAAAC,MAAA,EAATC,IAAI,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;MAAJF,IAAI,CAAAE,IAAA,IAAAJ,SAAA,CAAAI,IAAA;IAAA;IACZ;IACA;IACA;IACA,IAAIf,OAAO,CAACD,OAAO,EAAE;MACnB,OAAOC,OAAO,CAACD,OAAO,CAAAiB,KAAA,CAAfhB,OAAO,GAASA,OAAO,EAAAiB,MAAA,CAAKJ,IAAI,EAAC;IAC1C;IAEA,OAAOK,iBAAQ,CAAAF,KAAA,UAAChB,OAAO,EAAAiB,MAAA,CAAKJ,IAAI,EAAC;EACnC,CAAC,CAAC,CACDJ,IAAI,CAAC,YAAa;IAAA,SAAAU,KAAA,GAAAR,SAAA,CAAAC,MAAA,EAATC,IAAI,OAAAC,KAAA,CAAAK,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJP,IAAI,CAAAO,KAAA,IAAAT,SAAA,CAAAS,KAAA;IAAA;IACZ,OAAOb,gBAAS,CAAAS,KAAA,UAAChB,OAAO,EAAEA,OAAO,CAACQ,YAAY,CAACa,KAAK,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAAL,MAAA,CAAKJ,IAAI,EAAC;EACxF,CAAC,CAAC;AACN"}

package/package.json

@@ -28,21 +28,21 @@
     "@webex/eslint-config-legacy": "0.0.0",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/test-helper-chai": "3.5.0",
-    "@webex/test-helper-file": "3.5.0",
-    "@webex/test-helper-make-local-url": "3.5.0",
-    "@webex/test-helper-mocha": "3.5.0",
-    "@webex/test-helper-mock-webex": "3.5.0",
-    "@webex/test-helper-test-users": "3.5.0",
+    "@webex/test-helper-chai": "3.6.0-next.1",
+    "@webex/test-helper-file": "3.6.0-next.1",
+    "@webex/test-helper-make-local-url": "3.6.0-next.1",
+    "@webex/test-helper-mocha": "3.6.0-next.1",
+    "@webex/test-helper-mock-webex": "3.6.0-next.1",
+    "@webex/test-helper-test-users": "3.6.0-next.1",
     "eslint": "^8.24.0",
     "prettier": "^2.7.1",
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/common": "3.5.0",
-    "@webex/internal-plugin-device": "3.5.0",
-    "@webex/test-helper-test-users": "3.5.0",
-    "@webex/webex-core": "3.5.0",
+    "@webex/common": "3.6.0-next.1",
+    "@webex/internal-plugin-device": "3.6.0-next.1",
+    "@webex/test-helper-test-users": "3.6.0-next.1",
+    "@webex/webex-core": "3.6.0-next.1",
     "file-type": "^16.0.1",
     "global": "^4.4.0",
     "is-function": "^1.0.1",
@@ -63,5 +63,5 @@
     "test:style": "eslint ./src/**/*.*",
     "test:unit": "webex-legacy-tools test --unit --runner jest"
   },
-  "version": "3.5.0"
+  "version": "3.6.0-next.1"
 }

package/src/request/index.js

@@ -23,8 +23,17 @@ export default function request(options) {
   options.upload = new EventEmitter();
 
   return intercept(options, options.interceptors, 'Request')
-    .then((...args) => _request(options, ...args))
-    .then((...args) =>
-      intercept(options, options.interceptors.slice().reverse(), 'Response', ...args)
-    );
+    .then((...args) => {
+      // if provided own request function, use that instead
+      // there are use cases where developer may want to provide whatever request promise they wish
+      // for example, may even use window.postMessages for parent iframe uses cases
+      if (options.request) {
+        return options.request(options, ...args);
+      }
+
+      return _request(options, ...args);
+    })
+    .then((...args) => {
+      return intercept(options, options.interceptors.slice().reverse(), 'Response', ...args);
+    });
 }

package/test/unit/spec/index.js

@@ -1,7 +1,6 @@
 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, setTimingsAndFetch} from '@webex/http-core/src/index';

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

@@ -0,0 +1,58 @@
+import {assert} from '@webex/test-helper-chai';
+import sinon from 'sinon';
+import {EventEmitter} from 'events';
+import request from '@webex/http-core/src/request';
+import * as requestModule from '../../../../src/request/request';
+import * as utils from '../../../../src/request/utils';
+
+describe('request', () => {
+  let interceptStub;
+  let requestStub;
+
+  beforeEach(() => {
+    interceptStub = sinon.spy(utils, 'intercept');
+    requestStub = sinon.stub(requestModule, 'default');
+  });
+
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it('should modify options and call _request if no custom request function is provided', async () => {
+    const options = {
+      url: 'http://example.com',
+      headers: {},
+      interceptors: [],
+    };
+
+    requestStub.resolves('response');
+
+    const result = await request(options);
+
+    assert.strictEqual(result, 'response');
+    assert.strictEqual(options.uri, 'http://example.com');
+    assert.isNull(options.url);
+    assert.deepEqual(options.headers, {});
+    assert.instanceOf(options.download, EventEmitter);
+    assert.instanceOf(options.upload, EventEmitter);
+    assert.isTrue(interceptStub.calledTwice);
+    assert.isTrue(requestStub.calledOnceWith(options));
+  });
+
+  it('should use custom request function if provided', async () => {
+    const customRequest = sinon.stub().resolves('custom response');
+    const options = {
+      url: 'http://example.com',
+      headers: {},
+      interceptors: [],
+      request: customRequest,
+    };
+
+    const result = await request(options);
+
+    assert.strictEqual(result, 'custom response');
+    assert.isTrue(customRequest.calledOnceWith(options));
+    assert.isTrue(interceptStub.calledTwice);
+    assert.isFalse(requestStub.called);
+  });
+});