@webex/http-core 2.29.3 → 2.30.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/request/index.js.map +1 -1
- package/dist/request/request.js +3 -3
- package/dist/request/request.js.map +1 -1
- package/package.json +43 -34
- package/src/request/index.js +22 -18
- package/src/request/request.js +1 -1
|
@@ -1 +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((promise, interceptor)
|
|
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,OAAT,CAAiBC,OAAjB,EAA0B;EACvC,IAAIA,OAAO,CAACC,GAAZ,EAAiB;IACfD,OAAO,CAACE,GAAR,GAAcF,OAAO,CAACC,GAAtB;IACAD,OAAO,CAACC,GAAR,GAAc,IAAd;EACD;;EAEDD,OAAO,CAACG,OAAR,GAAkBH,OAAO,CAACG,OAAR,IAAmB,EAArC;EAEAH,OAAO,CAACI,QAAR,GAAmB,IAAIC,oBAAJ,EAAnB;EACAL,OAAO,CAACM,MAAR,GAAiB,IAAID,oBAAJ,EAAjB;EAEA,OAAOE,SAAS,CAACP,OAAO,CAACQ,YAAT,EAAuB,SAAvB,CAAT,CACJC,IADI,CACC;IAAA,kCAAIC,IAAJ;MAAIA,IAAJ;IAAA;;IAAA,OAAaC,iBAAA,gBAASX,OAAT,SAAqBU,IAArB,EAAb;EAAA,CADD,EAEJD,IAFI,CAEC;IAAA,mCAAIC,IAAJ;MAAIA,IAAJ;IAAA;;IAAA,OAAaH,SAAS,MAAT,UAAUP,OAAO,CAACQ,YAAR,CAAqBI,KAArB,GAA6BC,OAA7B,EAAV,EAAkD,UAAlD,SAAiEH,IAAjE,EAAb;EAAA,CAFD,CAAP;EAIA;AACF;AACA;AACA;AACA;AACA;AACA;;EACE,SAASH,SAAT,CAAmBC,YAAnB,EAAiCM,GAAjC,EAAsCC,GAAtC,EAA2C;IACzC,IAAMC,UAAU,eAAQF,GAAR,CAAhB;IACA,IAAMG,QAAQ,eAAQH,GAAR,UAAd;IAEA,OAAON,YAAY,CAACU,MAAb,CACL,UAACC,OAAD,EAAUC,WAAV;MAAA,OACED,OAAO,CAACV,IAAR,CACE,UAACY,MAAD,EAAY;QACVD,WAAW,CAACE,UAAZ,CAAuBtB,OAAvB;;QACA,IAAIoB,WAAW,CAACJ,UAAD,CAAf,EAA6B;UAC3B,OAAOI,WAAW,CAACJ,UAAD,CAAX,CAAwBhB,OAAxB,EAAiCqB,MAAjC,CAAP;QACD;;QAED,OAAO,iBAAQE,OAAR,CAAgBF,MAAhB,CAAP;MACD,CARH,EASE,UAACG,MAAD,EAAY;QACVJ,WAAW,CAACE,UAAZ,CAAuBtB,OAAvB;;QACA,IAAIoB,WAAW,CAACH,QAAD,CAAf,EAA2B;UACzB,OAAOG,WAAW,CAACH,QAAD,CAAX,CAAsBjB,OAAtB,EAA+BwB,MAA/B,CAAP;QACD;;QAED,OAAO,iBAAQC,MAAR,CAAeD,MAAf,CAAP;MACD,CAhBH,CADF;IAAA,CADK,EAoBL,iBAAQD,OAAR,CAAgBR,GAAhB,CApBK,CAAP;EAsBD;AACF"}
|
package/dist/request/request.js
CHANGED
|
@@ -20,7 +20,7 @@ var _safeBuffer = require("safe-buffer");
|
|
|
20
20
|
|
|
21
21
|
var _common = require("@webex/common");
|
|
22
22
|
|
|
23
|
-
var _detect = require("../lib/detect");
|
|
23
|
+
var _detect = _interopRequireDefault(require("../lib/detect"));
|
|
24
24
|
|
|
25
25
|
var _progressEvent = _interopRequireDefault(require("../progress-event"));
|
|
26
26
|
|
|
@@ -43,7 +43,7 @@ function prepareOptions(options) {
|
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
if ((0, _common.isBuffer)(options.body)) {
|
|
46
|
-
return (0, _detect.
|
|
46
|
+
return (0, _detect.default)(options.body).then(function (type) {
|
|
47
47
|
options.headers['content-type'] = type;
|
|
48
48
|
return options;
|
|
49
49
|
});
|
|
@@ -75,7 +75,7 @@ function doRequest(options) {
|
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
if ((0, _common.isBuffer)(response.body) && !response.body.type) {
|
|
78
|
-
resolve((0, _detect.
|
|
78
|
+
resolve((0, _detect.default)(response.body).then(function (type) {
|
|
79
79
|
response.body.type = type;
|
|
80
80
|
return response;
|
|
81
81
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["prepareOptions","options","responseType","encoding","withCredentials","jar","isBuffer","body","detect","then","type","headers","resolve","doRequest","logger","r","request","error","response","warn","Buffer","from","statusCode","method","url","on","total","loaded","data","length","download","emit","ProgressEvent","_request"],"sources":["request.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport request from 'request';\nimport {Buffer} from 'safe-buffer';\nimport {isBuffer} from '@webex/common';\n\nimport
|
|
1
|
+
{"version":3,"names":["prepareOptions","options","responseType","encoding","withCredentials","jar","isBuffer","body","detect","then","type","headers","resolve","doRequest","logger","r","request","error","response","warn","Buffer","from","statusCode","method","url","on","total","loaded","data","length","download","emit","ProgressEvent","_request"],"sources":["request.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport request from 'request';\nimport {Buffer} from 'safe-buffer';\nimport {isBuffer} from '@webex/common';\n\nimport detect from '../lib/detect';\nimport ProgressEvent from '../progress-event';\n\n/**\n * @param {Object} options\n * @private\n * @returns {Promise}\n */\nfunction prepareOptions(options) {\n if (options.responseType === 'buffer' || options.responseType === 'blob') {\n options.encoding = null;\n }\n\n if (options.withCredentials) {\n options.jar = true;\n }\n\n if (isBuffer(options.body)) {\n return detect(options.body)\n .then((type) => {\n options.headers['content-type'] = type;\n\n return options;\n });\n }\n\n return Promise.resolve(options);\n}\n\n/**\n * @param {Object} options\n * @private\n * @returns {Promise}\n */\nfunction doRequest(options) {\n return new Promise((resolve) => {\n const {logger} = options;\n\n const r = request(options, (error, response) => {\n if (error) {\n logger.warn(error);\n }\n\n if (response) {\n response.options = options;\n\n // I'm not sure why this line is necessary. request seems to be creating\n // buffers that aren't Buffers.\n if (options.responseType === 'buffer' && response.body.type === 'Buffer' && !isBuffer(response.body)) {\n response.body = Buffer.from(response.body);\n }\n\n if (isBuffer(response.body) && !response.body.type) {\n resolve(detect(response.body)\n .then((type) => {\n response.body.type = type;\n\n return response;\n }));\n\n return;\n }\n\n resolve(response);\n }\n else {\n // Make a network error behave like a browser network error.\n resolve({\n statusCode: 0,\n options,\n headers: options.headers,\n method: options.method,\n url: options.url,\n body: error\n });\n }\n });\n\n r.on('response', (response) => {\n const total = parseInt(response.headers['content-length'], 10);\n let loaded = 0;\n\n response.on('data', (data) => {\n loaded += data.length;\n options.download.emit('progress', new ProgressEvent(loaded, total));\n });\n });\n });\n}\n\n/**\n * @name request\n * @param {Object} options\n * @returns {Promise}\n */\nexport default function _request(options) {\n return prepareOptions(options)\n .then(doRequest);\n}\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,36 +1,45 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
"
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
2
|
+
"name": "@webex/http-core",
|
|
3
|
+
"version": "2.30.0",
|
|
4
|
+
"description": "Core HTTP library for the Cisco Webex",
|
|
5
|
+
"license": "MIT",
|
|
6
|
+
"main": "dist/index.js",
|
|
7
|
+
"devMain": "src/index.js",
|
|
8
|
+
"repository": "https://github.com/webex/webex-js-sdk/tree/master/packages/@webex/http-core",
|
|
9
|
+
"engines": {
|
|
10
|
+
"node": ">=14"
|
|
11
|
+
},
|
|
12
|
+
"browser": {
|
|
13
|
+
"./dist/request/request.js": "./dist/request/request.shim.js",
|
|
14
|
+
"./src/request/request.js": "./src/request/request.shim.js"
|
|
15
|
+
},
|
|
16
|
+
"browserify": {
|
|
17
|
+
"transform": [
|
|
18
|
+
"babelify",
|
|
19
|
+
"envify"
|
|
20
|
+
]
|
|
21
|
+
},
|
|
22
|
+
"devDependencies": {
|
|
23
|
+
"@webex/test-helper-chai": "workspace:^",
|
|
24
|
+
"@webex/test-helper-file": "workspace:^",
|
|
25
|
+
"@webex/test-helper-make-local-url": "workspace:^",
|
|
26
|
+
"@webex/test-helper-mocha": "workspace:^",
|
|
27
|
+
"sinon": "^9.2.4"
|
|
28
|
+
},
|
|
29
|
+
"dependencies": {
|
|
30
|
+
"@webex/common": "workspace:^",
|
|
31
|
+
"@webex/http-core": "workspace:^",
|
|
32
|
+
"@webex/internal-plugin-device": "workspace:^",
|
|
33
|
+
"@webex/test-helper-test-users": "workspace:^",
|
|
34
|
+
"@webex/webex-core": "workspace:^",
|
|
35
|
+
"file-type": "^16.0.1",
|
|
36
|
+
"global": "^4.4.0",
|
|
37
|
+
"is-function": "^1.0.1",
|
|
38
|
+
"lodash": "^4.17.21",
|
|
39
|
+
"parse-headers": "^2.0.2",
|
|
40
|
+
"qs": "^6.7.0",
|
|
41
|
+
"request": "^2.88.0",
|
|
42
|
+
"safe-buffer": "^5.2.0",
|
|
43
|
+
"xtend": "^4.0.2"
|
|
44
|
+
}
|
|
36
45
|
}
|
package/src/request/index.js
CHANGED
|
@@ -36,23 +36,27 @@ export default function request(options) {
|
|
|
36
36
|
const successKey = `on${key}`;
|
|
37
37
|
const errorKey = `on${key}Error`;
|
|
38
38
|
|
|
39
|
-
return interceptors.reduce(
|
|
40
|
-
(
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
39
|
+
return interceptors.reduce(
|
|
40
|
+
(promise, interceptor) =>
|
|
41
|
+
promise.then(
|
|
42
|
+
(result) => {
|
|
43
|
+
interceptor.logOptions(options);
|
|
44
|
+
if (interceptor[successKey]) {
|
|
45
|
+
return interceptor[successKey](options, result);
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
return Promise.resolve(result);
|
|
49
|
+
},
|
|
50
|
+
(reason) => {
|
|
51
|
+
interceptor.logOptions(options);
|
|
52
|
+
if (interceptor[errorKey]) {
|
|
53
|
+
return interceptor[errorKey](options, reason);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
return Promise.reject(reason);
|
|
57
|
+
}
|
|
58
|
+
),
|
|
59
|
+
Promise.resolve(res)
|
|
60
|
+
);
|
|
57
61
|
}
|
|
58
62
|
}
|
package/src/request/request.js
CHANGED