@mimik/request-retry 2.0.10 → 2.0.12

package/index.js

@@ -1,5 +1,4 @@
 const Promise = require('bluebird');
-const axios = require('axios');
 
 const logger = require('@mimik/sumologic-winston-logger');
 const { getRichError } = require('@mimik/response-helper');
@@ -69,8 +68,6 @@ Promise.config({ cancellation: true });
  * - `qs` is used to assign to `params`
  */
 const rpRetry = (origOptions) => {
-  const { CancelToken } = axios;
-  const source = CancelToken.source();
   const options = origOptions;
   const correlationId = (options.headers && options.headers['x-correlation-id']) ? options.headers['x-correlation-id'] : getCorrelationId();
   const errors = [];
@@ -83,7 +80,6 @@ const rpRetry = (origOptions) => {
 
   if (!options.headers) options.headers = { 'user-agent': setUserAgent() };
   else if (!options.headers['user-agent']) options.headers['user-agent'] = setUserAgent();
-  options.cancelToken = source.token;
 
   const retryProcess = (nbRetry) => rp(options)
     .then((response) => {
@@ -130,8 +126,7 @@ const rpRetry = (origOptions) => {
   const retryPromise = retryProcess(0);
   const mainTimeoutPromise = new Promise((resolve, reject) => {
     mainTimeout = setTimeout(() => {
-      delayPromises.forEach((delayPromise) => delayPromise.cancel(`retry timeout, ${criteria.timeout}, ${nbRetries}`));
-      source.cancel(`retry timeout, ${criteria.timeout}, ${nbRetries}`);
+      delayPromises.forEach((delayPromise) => delayPromise.cancel(`retry timeout delay, ${criteria.timeout}, ${nbRetries}`));
       let error = new Error('retry timeout');
 
       if (nbRetries !== 0) {

package/manual-test/man.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-require('../test/testEnv');
+require('./testEnv');
 
 const { rpRetry } = require('../index');
 
@@ -15,7 +15,7 @@ const options = {
   retry: {},
 };
 
-options.retry.delayStrategy = () => 10000;
+options.retry.delayStrategy = () => 1000;
 options.retry.timeout = 10;
 options.retry.retries = 2;
 

package/manual-test/retryMockMan.js

@@ -11,6 +11,7 @@ const config = {
     nbRetry: 400,
     success: 200,
     error: 500,
+    timeout: 4000,
   },
   post: {
     success: 201,
@@ -37,9 +38,10 @@ app.get(`${config.base}${config.path}`, (req, res) => {
     return;
   }
   nbRequest += 1;
-  res.statusCode = config.get.error;
-
-  res.send({ statusCode: config.get.error });
+  setTimeout(() => {
+    res.statusCode = config.get.error;
+    res.send({ statusCode: config.get.error });
+  }, config.get.timeout);
 });
 app.post(`${config.base}${config.path}`, (req, res) => {
   console.log('----->', 'Received a POST request');

package/manual-test/testEnv.js

@@ -0,0 +1,23 @@
+/* eslint no-process-env: "off" */
+
+/**
+ * The following environment variables are set for the test:
+ *
+ * | Env variable name | Description | Default | Comments |
+ * | ----------------- | ----------- | ------- | -------- |
+ * | SUMO_LOGIC_ENDPOINT | endpoint to use to log on sumologic | null
+ * | SUMO_LOGIC_COLLECTOR_CODE | code to use to log on sumologic | null
+ * | NO_STACK | flag to have a stack associated with the log | yes
+ * | LOG_LEVEL | log level to log | error
+ * | CONSOLE_LEVEL | log level to diplay | debug
+ * | LOG_MODE | log mode | none
+ */
+
+// process.env.SUMO_LOGIC_ENDPOINT = 'http://localhost:9080/logs/';
+// process.env.SUMO_LOGIC_COLLECTOR_CODE = '1234';
+process.env.SUMO_LOGIC_ENDPOINT = null;
+process.env.SUMO_LOGIC_COLLECTOR_CODE = null;
+process.env.NO_STACK = 'yes';
+process.env.LOG_LEVEL = 'debug';
+process.env.CONSOLE_LEVEL = 'debug';
+process.env.LOG_MODE = 'none';

package/manual-test/testRetry.js

@@ -1,14 +1,15 @@
 /* eslint-disable no-console */
+require('../test/testEnv');
 const { rpRetry } = require('../index');
 
 const options = {
   method: 'GET',
-  url: 'http://blah.com', // 'http://localhost:9070/test/retry', // 'http://www.google.com', // 'http://localhost:8080/mIT/v1/admin/healthCheck1', // 'http://blah.com'
+  url: 'http://api.swaggerhub.com/apis/mimik/Boxes/1.2.1', // 'http://www.google.com', // 'http://blah.com', // 'http://localhost:9070/test/retry', // 'http://www.google.com', // 'http://localhost:8080/mIT/v1/admin/healthCheck1', // 'http://blah.com'
   headers: {
     'x-correlation-id': '---test-request-retry---',
   },
   json: true,
-  timeout: 200,
+  timeout: 20000,
   // retry: {
   // all default: maxRetry: 2, retryDelay: 1000ms, maxTimeout: 50s, logLevel: 3 silly, type response, retryDelayStrategy: setDelay, retryStrategy: defaultRetry
   // retries: -1,  // => 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mimik/request-retry",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "Request retry wrapping axios",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "@mimik/request-helper": "^1.7.7",
     "@mimik/response-helper": "^2.6.2",
     "@mimik/sumologic-winston-logger": "^1.6.11",
-    "axios": "1.2.0",
+    "axios": "1.2.1",
     "bluebird": "3.7.2",
     "lodash": "4.17.21"
   },

package/test/testEnv.js

@@ -10,6 +10,7 @@
  * | NO_STACK | flag to have a stack associated with the log | yes
  * | LOG_LEVEL | log level to log | error
  * | CONSOLE_LEVEL | log level to diplay | debug
+ * | LOG_MODE | log mode | none
  */
 
 // process.env.SUMO_LOGIC_ENDPOINT = 'http://localhost:9080/logs/';
@@ -19,3 +20,4 @@ process.env.SUMO_LOGIC_COLLECTOR_CODE = null;
 process.env.NO_STACK = 'yes';
 process.env.LOG_LEVEL = 'debug';
 process.env.CONSOLE_LEVEL = 'debug';
+process.env.LOG_MODE = 'none';