@autofleet/node-common 1.1.37 → 1.1.40

package/logger/index.js

@@ -1,4 +1,12 @@
 const winston = require('winston');
+const { LoggingWinston } = require('@google-cloud/logging-winston');
+
+const loggingWinston = new LoggingWinston({
+  serviceContext: {
+    service: process.env.AF_SERVICE_NAME,
+    version: '1.0.1',
+  },
+});
 
 const { createLogger } = winston;
 require('dotenv').config();
@@ -36,8 +44,11 @@ const enumerateErrorFormat = winston.format((info) => {
 });
 
 const getFormat = () => {
-  if (env.NODE_ENV === 'producation') {
-    return winston.format.json();
+  if (env.NODE_ENV === 'production') {
+    return winston.format.combine(
+      enumerateErrorFormat(),
+      winston.format.json(),
+    );
   }
 
   return winston.format.combine(
@@ -52,7 +63,7 @@ const createLoggerInstance = (level, transports) => {
   const logger = createLogger({
     level,
     format: getFormat(),
-    transports: [new winston.transports.Console()],
+    transports: [new winston.transports.Console(), loggingWinston],
     exceptionHandlers: transports,
     exitOnError: false,
   });

package/network/index.js

@@ -28,6 +28,16 @@ const defaultSettings = {
   paramsSerializer: params => qs.stringify(params, { arrayFormat: 'brackets' }),
 };
 
+const getHttpRequestObject = response => ({
+  httpRequest: {
+    status: response.status,
+    requestUrl: response.config.url,
+    query: response.config.params,
+    body: response.config.data,
+    requestMethod: response.config.method.toUpperCase(),
+  },
+});
+
 module.exports = class Network {
   constructor(settings = {}) {
     this.settings = Object.assign({}, defaultSettings, settings);
@@ -59,12 +69,11 @@ module.exports = class Network {
     });
 
     this.axios.interceptors.response.use((response) => {
-      logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`);
+      logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`, getHttpRequestObject(response));
       return response;
     }, (error) => {
-      logger.error('Finish Request with error', { status: error.status, data: error.response && error.response.data });
-      // throw error;
-      return error;
+      logger.error('Finish Request with error', { data: error.response ? error.response.data : undefined, ...getHttpRequestObject(error.response || error) });
+      throw error;
     });
   }
 

package/network/index.test.js

@@ -28,17 +28,17 @@ describe('Network', () => {
     expect(response.data.two).toBe(2);
   });
 
-  // it('Getting 404', async () => {
-  //   const n = new Network({ serviceUrl: 'https://www.apple.com' });
+  it('Getting 404', async () => {
+    const n = new Network({ serviceUrl: 'https://www.apple.com' });
 
-  //   const action = async () => n.get('/resource', {
-  //     query: {
-  //       a: 'b',
-  //     },
-  //   });
+    const action = async () => n.get('/resource', {
+      query: {
+        a: 'b',
+      },
+    });
 
-    // expect(action()).rejects.toThrow(Error);
-  // });
+    expect(action()).rejects.toThrow(Error);
+  });
 
   test('Retry 1 time', async () => {
     nock('https://www.apple2.com')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.37",
+  "version": "1.1.40",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",