Merge pull request #401 from bitfinexcom/staging

Release version to master
bitfinexcom · Sep 10, 2024 · 8399316 · 8399316
2 parents 1dcc950 + cb55be8
commit 8399316
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bfx-report",
-  "version": "4.10.7",
+  "version": "4.10.8",
   "description": "Reporting tool",
   "main": "worker.js",
   "license": "Apache-2.0",

diff --git a/workers/loc.api/helpers/api-errors-testers.js b/workers/loc.api/helpers/api-errors-testers.js
@@ -40,7 +40,7 @@ const isETimedOutError = (err) => {
 }
 
 const isNodeFetchTimeoutError = (err) => {
-  return /network timeout/i.test(_getErrorString(err))
+  return /timeout/i.test(_getErrorString(err))
 }
 
 const isEAiAgainError = (err) => {
@@ -79,6 +79,18 @@ const isBadGatewayError = (err) => {
   return /Bad Gateway/i.test(_getErrorString(err))
 }
 
+const isDNSAvailabilityError = (err) => {
+  return /ERR_NAME_NOT_RESOLVED/i.test(_getErrorString(err))
+}
+
+const isSocketHangUpError = (err) => {
+  return /socket hang up/i.test(_getErrorString(err))
+}
+
+const isCommonNetError = (err) => {
+  return /net::ERR_/i.test(_getErrorString(err))
+}
+
 const isForbiddenError = (err) => {
   return /forbidden/i.test(_getErrorString(err))
 }
@@ -101,7 +113,10 @@ const isENetError = (err) => (
   isEHostUnreachError(err) ||
   isEProtoError(err) ||
   isTempUnavailableError(err) ||
-  isBadGatewayError(err)
+  isBadGatewayError(err) ||
+  isDNSAvailabilityError(err) ||
+  isSocketHangUpError(err) ||
+  isCommonNetError(err)
 )
 
 module.exports = {
@@ -123,6 +138,9 @@ module.exports = {
   isEProtoError,
   isTempUnavailableError,
   isBadGatewayError,
+  isDNSAvailabilityError,
+  isSocketHangUpError,
+  isCommonNetError,
   isENetError,
   isForbiddenError,
   isMaintenanceError

diff --git a/workers/loc.api/helpers/get-data-from-api.js b/workers/loc.api/helpers/get-data-from-api.js
@@ -13,22 +13,26 @@ const {
 } = require('./api-errors-testers')
 
 const _delay = (mc = 80000, interrupter) => {
+  if (_isInterrupted(interrupter)) {
+    return Promise.resolve({ isInterrupted: true })
+  }
+
   return new Promise((resolve) => {
     const hasInterrupter = interrupter instanceof Interrupter
     const timeout = setTimeout(() => {
       if (hasInterrupter) {
         interrupter.offInterrupt(onceInterruptHandler)
       }
 
-      resolve()
+      resolve({ isInterrupted: false })
     }, mc)
     const onceInterruptHandler = () => {
       if (!timeout.hasRef()) {
         return
       }
 
       clearTimeout(timeout)
-      resolve()
+      resolve({ isInterrupted: true })
     }
 
     if (hasInterrupter) {
@@ -116,11 +120,12 @@ module.exports = (
         if (countRateLimitError > 100) {
           throw err
         }
-        if (_isInterrupted(_interrupter)) {
-          return { isInterrupted: true }
-        }
 
-        await _delay(ms, _interrupter)
+        const { isInterrupted } = await _delay(ms, _interrupter)
+
+        if (isInterrupted) {
+          return { isInterrupted }
+        }
 
         continue
       }
@@ -130,11 +135,12 @@ module.exports = (
         if (countNonceSmallError > 20) {
           throw err
         }
-        if (_isInterrupted(_interrupter)) {
-          return { isInterrupted: true }
-        }
 
-        await _delay(1000, _interrupter)
+        const { isInterrupted } = await _delay(1000, _interrupter)
+
+        if (isInterrupted) {
+          return { isInterrupted }
+        }
 
         continue
       }
@@ -156,7 +162,13 @@ module.exports = (
           await wsEventEmitter.emitENetError(callerName)
         }
 
-        await _delay(eNetErrorAttemptsTimeoutMs, _interrupter)
+        const {
+          isInterrupted
+        } = await _delay(eNetErrorAttemptsTimeoutMs, _interrupter)
+
+        if (isInterrupted) {
+          return { isInterrupted }
+        }
 
         continue
       }
@@ -170,11 +182,12 @@ module.exports = (
       ) {
         throw err
       }
-      if (_isInterrupted(_interrupter)) {
-        return { isInterrupted: true }
-      }
 
-      await _delay(10000, _interrupter)
+      const { isInterrupted } = await _delay(10000, _interrupter)
+
+      if (isInterrupted) {
+        return { isInterrupted }
+      }
     }
   }
 

diff --git a/workers/loc.api/helpers/index.js b/workers/loc.api/helpers/index.js
@@ -41,6 +41,9 @@ const {
   isEProtoError,
   isTempUnavailableError,
   isBadGatewayError,
+  isDNSAvailabilityError,
+  isSocketHangUpError,
+  isCommonNetError,
   isENetError,
   isForbiddenError,
   isMaintenanceError
@@ -93,6 +96,9 @@ module.exports = {
   isEProtoError,
   isTempUnavailableError,
   isBadGatewayError,
+  isDNSAvailabilityError,
+  isSocketHangUpError,
+  isCommonNetError,
   isENetError,
   isForbiddenError,
   isMaintenanceError,