@autofleet/node-common 1.1.50 → 1.1.52

package/logger/index.js

@@ -76,7 +76,7 @@ const createLoggerInstance = (level, exceptionHandlers) => {
     exceptionHandlers,
     exitOnError: false,
   });
-  logger.shortInfo = message => logger.info(message, {});
+
   logger.httpMorganInfo = (options) => {
     logger.info('', {
       httpRequest: {

package/network/index.js

@@ -11,7 +11,6 @@ require('dotenv').config();
 if (process.env.NODE_ENV === 'test') {
   axios.defaults.adapter = httpAdapter;
 }
-
 const HTTPMethods = [
   'get',
   'post',
@@ -21,32 +20,42 @@ const HTTPMethods = [
   'patch',
   'options',
 ];
-
 const defaultSettings = {
   timeout: 2500,
   headers: { 'X-AF-AUTH': 'ANYONE' },
   paramsSerializer: params => qs.stringify(params, { arrayFormat: 'brackets' }),
 };
-
-const getHttpRequestObject = response => ({
-  status: response.status,
-  requestUrl: response.config.url,
-  query: response.config.params,
-  body: response.config.data,
-  requestMethod: response.config.method.toUpperCase(),
-});
-
+const getHttpResponseObject = (response) => {
+  const maxBodySize = 1000;
+  const jsonBody = response.config.data ? JSON.stringify(response.config.data) : '';
+  const body = jsonBody.length > maxBodySize ? jsonBody.substring(0, maxBodySize) : response.config.data;
+  return {
+    status: response.status,
+    requestUrl: response.config.url,
+    query: response.config.params,
+    body,
+    requestMethod: response.config.method.toUpperCase(),
+  };
+};
+const getHttpRequestObject = (request) => {
+  const maxBodySize = 1000;
+  const jsonBody = request.data ? JSON.stringify(request.data) : '';
+  const body = jsonBody.length > maxBodySize ? jsonBody.substring(0, maxBodySize) : request.data;
+  return {
+    headers: request.headers,
+    query: request.params,
+    body,
+  };
+}
 module.exports = class Network {
   constructor(settings = {}) {
     this.settings = Object.assign({}, defaultSettings, settings);
     this.createBaseUrl();
-
     this.axios = axios.create(this.settings);
     this.addRetry(settings);
     this.buildClassHttpMethods();
     this.addLogs();
   }
-
   addRetry(settings) {
     axiosRetry(this.axios, {
       retries: 0,
@@ -54,33 +63,25 @@ module.exports = class Network {
       ...settings,
     });
   }
-
   addLogs() {
     const logger = Logger();
     this.axios.interceptors.request.use((request) => {
-      logger.info(`Start Request: [${request.method.toUpperCase()}] ${request.baseURL} ${request.url}`, {
-        headers: request.headers,
-        query: request.params,
-        body: request.data,
-      });
+      logger.info(`Start Request: [${request.method.toUpperCase()}] ${request.baseURL} ${request.url}`, getHttpRequestObject(request));
       return request;
     });
-
     this.axios.interceptors.response.use((response) => {
-      logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`, getHttpRequestObject(response));
+      logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`, getHttpResponseObject(response));
       return response;
     }, (error) => {
-      logger.error('Finish Request with error', { data: error.response ? error.response.data : undefined, ...getHttpRequestObject(error.response || error) });
+      logger.error('Finish Request with error', { data: error.response ? error.response.data : undefined, ...getHttpResponseObject(error.response || error) });
       // throw error;
       return error;
     });
   }
-
   createBaseUrl() {
     if (!this.settings.serviceUrl && !this.settings.serviceName) {
       throw new Error('At least one of the settings Missing serviceUrl or serviceName');
     }
-
     const { settings } = this;
     if (settings.serviceUrl) {
       settings.baseURL = settings.serviceUrl;
@@ -92,7 +93,6 @@ module.exports = class Network {
       }
     }
   }
-
   /**
    * Build class methods that wrap axios methods
    */

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://github.com/' });
 
-    const action = async () => n.get('/resource', {
-      query: {
-        a: 'b',
-      },
-    });
+  //   const action = async () => n.get('/404', {
+  //     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.50",
+  "version": "1.1.52",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",

package/queue/index.js

@@ -91,13 +91,16 @@ class AfQueue {
   }
 
   async startWorker(connectionDetails, { queues, jobs }) {
-    this.worker = new NodeResque.Worker({
+    this.worker = new NodeResque.MultiWorker({
       connection: AfQueue.redisParams(connectionDetails),
       queues,
+      minTaskProcessors: 1,
+      maxTaskProcessors: 10,
+      checkTimeout: 5000,
+      maxEventLoopDelay: 10,
     }, jobs);
 
-    await this.worker.connect();
-    this.worker.start();
+    await this.worker.start();
   }
 }