@autofleet/network 1.4.1 → 1.4.5

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.
Files changed (2) hide show
  1. package/index.js +8 -5
  2. package/package.json +1 -1
package/index.js CHANGED
@@ -40,6 +40,8 @@ const defaultSettings = {
40
40
  keepAlive: true,
41
41
  };
42
42
 
43
+ const createRequestString = (request) => `[${request.method.toUpperCase()}] ${request.baseURL}${request.url}`;
44
+
43
45
  module.exports = class Network {
44
46
  constructor(settings = {}) {
45
47
  this.settings = merge(defaultSettings, settings);
@@ -84,7 +86,7 @@ module.exports = class Network {
84
86
  addLogs() {
85
87
  const logger = Logger();
86
88
  this.axios.interceptors.request.use((request) => {
87
- logger.info(`Start Request: [${request.method.toUpperCase()}] ${request.baseURL} ${request.url}`, {
89
+ logger.info(`Start Request: ${createRequestString(request)}`, {
88
90
  headers: request.headers,
89
91
  query: request.query,
90
92
  body: request.body,
@@ -94,10 +96,10 @@ module.exports = class Network {
94
96
  });
95
97
 
96
98
  this.axios.interceptors.response.use((response) => {
97
- logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`);
99
+ logger.info(`Finish Request: ${createRequestString(response.config)}`);
98
100
  return response;
99
101
  }, (error) => {
100
- if(error.request && error.request._currentRequest &&
102
+ if(error.request && error.request._currentRequest &&
101
103
  error.request._currentRequest.reusedSocket && error.code === 'ECONNRESET') {
102
104
  // See https://www.npmjs.com/package/agentkeepalive
103
105
  // Support req.reusedSocket
@@ -106,9 +108,10 @@ module.exports = class Network {
106
108
  req: error.request._currentRequest._currentUrl,
107
109
  // method: error.request._currentRequest._options.method,
108
110
  })
109
- return axios.request(error.config);
111
+ return this.axios.request(error.config);
110
112
  }
111
- logger.error('Finish Request with error', {
113
+ const request = error.request;
114
+ logger.error(`Finish Request with error ${request ? createRequestString(request) : ''}`, {
112
115
  status: error.status,
113
116
  data: error.response && error.response.data
114
117
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autofleet/network",
3
- "version": "1.4.1",
3
+ "version": "1.4.5",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {