@autofleet/network 1.2.9-alpha-14 → 1.2.9-alpha2
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/index.js +5 -18
- package/package.json +3 -3
package/index.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
const axios = require('axios');
|
|
2
|
+
const http = require('http');
|
|
3
|
+
const https = require('https');
|
|
2
4
|
const axiosRetry = require('axios-retry');
|
|
3
|
-
const Logger = require('@autofleet/
|
|
5
|
+
const { Logger } = require('@autofleet/node-common');
|
|
4
6
|
const qs = require('qs');
|
|
5
7
|
const httpAdapter = require('axios/lib/adapters/http');
|
|
6
8
|
const merge = require('deepmerge');
|
|
@@ -28,7 +30,6 @@ const HTTPMethods = [
|
|
|
28
30
|
];
|
|
29
31
|
|
|
30
32
|
const defaultSettings = {
|
|
31
|
-
timeout: 10000,
|
|
32
33
|
headers: {
|
|
33
34
|
'X-AF-AUTH': 'ANYONE',
|
|
34
35
|
'X-IAF-ORIGIN-SERVICE': process.env.AF_SERVICE_NAME || null,
|
|
@@ -44,12 +45,8 @@ module.exports = class Network {
|
|
|
44
45
|
constructor(settings = {}) {
|
|
45
46
|
this.settings = merge(defaultSettings, settings);
|
|
46
47
|
if (this.settings.keepAlive) {
|
|
47
|
-
const keepaliveAgent = new Agent(
|
|
48
|
-
|
|
49
|
-
});
|
|
50
|
-
const keepaliveHttpsAgent = new HttpsAgent({
|
|
51
|
-
maxSockets: 1000
|
|
52
|
-
});
|
|
48
|
+
const keepaliveAgent = new Agent();
|
|
49
|
+
const keepaliveHttpsAgent = new HttpsAgent();
|
|
53
50
|
this.settings.httpAgent = keepaliveAgent;
|
|
54
51
|
this.settings.httpsAgent = keepaliveHttpsAgent;
|
|
55
52
|
delete this.settings.keepAlive;
|
|
@@ -97,16 +94,6 @@ module.exports = class Network {
|
|
|
97
94
|
logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`);
|
|
98
95
|
return response;
|
|
99
96
|
}, (error) => {
|
|
100
|
-
if(error.request._currentRequest.reusedSocket && error.code === 'ECONNRESET') {
|
|
101
|
-
// See https://www.npmjs.com/package/agentkeepalive
|
|
102
|
-
// Support req.reusedSocket
|
|
103
|
-
// https://code-examples.net/en/q/28a8069
|
|
104
|
-
logger.warn('ECONNRESET issue, will retry', {
|
|
105
|
-
req: error.request._currentRequest._currentUrl,
|
|
106
|
-
method: error.request._currentRequest._options.method,
|
|
107
|
-
})
|
|
108
|
-
return axios.request(error.config);
|
|
109
|
-
}
|
|
110
97
|
logger.error('Finish Request with error', { status: error.status, data: error.response && error.response.data });
|
|
111
98
|
throw error;
|
|
112
99
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@autofleet/network",
|
|
3
|
-
"version": "1.2.9-
|
|
3
|
+
"version": "1.2.9-alpha2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"author": "Dor Shay",
|
|
12
12
|
"license": "ISC",
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@autofleet/
|
|
14
|
+
"@autofleet/node-common": "^1.5.1",
|
|
15
15
|
"agentkeepalive": "^4.1.4",
|
|
16
16
|
"axios": "^0.21.1",
|
|
17
17
|
"axios-cache-adapter": "^2.7.3",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"qs": "^6.5.2"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"jest": "
|
|
24
|
+
"jest": "22.4.3",
|
|
25
25
|
"nock": "^10.0.0"
|
|
26
26
|
}
|
|
27
27
|
}
|