From 8e098045af79dc9d446ca703d24c47edb6af86fd Mon Sep 17 00:00:00 2001
From: Matias <mati108@gmail.com>
Date: Sat, 20 Jul 2019 07:26:59 -0300
Subject: [PATCH] Adding recoverable errors

---
 Integrations/FileStorage.js | 54 ++++++++++++++++++++++++++-----------
 docker-compose.yml          |  2 +-
 package.json                |  2 +-
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/Integrations/FileStorage.js b/Integrations/FileStorage.js
index 015fa987d..47a515121 100644
--- a/Integrations/FileStorage.js
+++ b/Integrations/FileStorage.js
@@ -4,7 +4,24 @@ const Ecosystem = require('./Ecosystem')
 exports.newFileStorage = function newFileStorage() {
   const MODULE_NAME = 'FileStorage'
   const MAX_RETRY = 30
-  let currentRetry = 0
+  let currentRetryGetTextFile = 0
+  let currentRetryWriteTextFile = 0
+
+  const recoverableErrors = [
+    'SOCKETTIMEDOUT',
+    'TIMEDOUT',
+    'CONNRESET',
+    'CONNREFUSED',
+    'NOTFOUND',
+    'ENOTFOUND',
+    'ECONNREFUSED',
+    'CONNREFUSED',
+    'NOTFOUND',
+    'ESOCKETTIMEDOUT',
+    'ECONNRESET',
+    'ETIMEDOUT',
+    'EAI_AGAIN'
+  ]
 
   return {
     getTextFile,
@@ -15,7 +32,7 @@ exports.newFileStorage = function newFileStorage() {
     log('[INFO] ' + message)
   }
   function log(message) {
-    console.log( "['" + new Date().toISOString() + "', 0,'" + MODULE_NAME + "','" + message + "']")
+    console.log("['" + new Date().toISOString() + "', 0,'" + MODULE_NAME + "','" + message + "']")
   }
 
   function logError(message) {
@@ -48,7 +65,6 @@ exports.newFileStorage = function newFileStorage() {
         }
       })
 
-      currentRetry = 0
       if (response.data.errors) {
         callBackFunction({ code: response.data.errors[0] })
         return
@@ -61,13 +77,13 @@ exports.newFileStorage = function newFileStorage() {
       }
 
     } catch (err) {
-      if ((err.code === 'ETIMEDOUT' || err.code === 'ECONNRESET' || err.code === 'ENOTFOUND') && currentRetry < MAX_RETRY) {
-        currentRetry++
-        logInfo('getTextFile -> Retrying connection to the server because received error: ' + err.code + '. Retry #: ' + currentRetry)
+      if (verifyRetry(err.code) && currentRetryGetTextFile < MAX_RETRY) {
+        currentRetryGetTextFile++
+        logInfo('getTextFile -> Retrying connection to the server because received error: ' + err.code + '. Retry #: ' + currentRetryGetTextFile)
         getTextFile(container, filePath, callBackFunction)
       } else {
-        currentRetry = 0
-        logError('getTextFile -> error = '+ err.message)
+        currentRetryGetTextFile = 0
+        logError('getTextFile -> error = ' + err.message)
         callBackFunction(global.DEFAULT_FAIL_RESPONSE)
       }
     }
@@ -100,8 +116,6 @@ exports.newFileStorage = function newFileStorage() {
         }
       })
 
-      currentRetry = 0
-
       if (!response || response.data.errors) {
         let customErr = {
           result: global.CUSTOM_FAIL_RESPONSE.result,
@@ -113,13 +127,13 @@ exports.newFileStorage = function newFileStorage() {
       }
 
     } catch (err) {
-      if ((err.code === 'ETIMEDOUT' || err.code === 'ECONNRESET' || err.code === 'ENOTFOUND' || err.message === "Request failed with status code 413") && currentRetry < MAX_RETRY) {
-        currentRetry++
-        logInfo('createTextFile -> Retrying connection to the server because received error: ' + err.code + '. Retry #: ' + currentRetry)
+      if (verifyRetry(err.code) && currentRetryWriteTextFile < MAX_RETRY) {
+        currentRetryWriteTextFile++
+        logInfo('createTextFile -> Retrying connection to the server because received error: ' + err.code + '. Retry #: ' + currentRetryWriteTextFile)
         createTextFile(container, filePath, fileContent, callBackFunction)
       } else {
-        currentRetry = 0
-        logError('createTextFile -> error = '+ err.message)
+        currentRetryWriteTextFile = 0
+        logError('createTextFile -> error = ' + err.message)
         callBackFunction(global.DEFAULT_FAIL_RESPONSE)
       }
     }
@@ -134,4 +148,14 @@ exports.newFileStorage = function newFileStorage() {
       }
     }
   }
+
+  function verifyRetry(errorCode) {
+    for (let i = 0; i < recoverableErrors.length; i++) {
+      const error = recoverableErrors[i];
+      if (error === errorCode) {
+        return true
+      }
+    }
+    return false
+  }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 18b634729..0a18fee7b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   node:
-    image: superalgos/clone-executor:1.0.48
+    image: superalgos/clone-executor:1.0.51
     build:
       context: .
       dockerfile: ./Dockerfile
diff --git a/package.json b/package.json
index 8213c9a20..f17de00e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superalgos/clone-executor",
-  "version": "1.0.48",
+  "version": "1.0.51",
   "description": "Module responsible for executing the bots on the cloud.",
   "author": "Superalgos, ltd.",
   "license": "Apache-2.0",