fix: condition under no tunnel

microlinkhq · Oct 17, 2019 · a1866f1 · a1866f1
1 parent 3a014f4
commit a1866f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/metascraper-media-provider/src/get-media/provider/generic.js b/packages/metascraper-media-provider/src/get-media/provider/generic.js
@@ -58,6 +58,8 @@ const makeError = ({ rawError, url, flags }) => {
 
 module.exports = ({ tunnel, onError, userAgent, cacheDir }) => {
   const retry = expirableCounter()
+  const hasTunnelAvailable = () => tunnel && retry.val() < tunnel.size()
+
   return async url => {
     let data = {}
     do {
@@ -74,7 +76,7 @@ module.exports = ({ tunnel, onError, userAgent, cacheDir }) => {
         if (!tunnel && isTwitterRateLimit(url, err)) return data
         retry.incr()
       }
-    } while (isEmpty(data) && retry.val() < tunnel.size())
+    } while (isEmpty(data) && hasTunnelAvailable())
     return data
   }
 }

diff --git a/packages/metascraper-media-provider/src/get-media/provider/twitter.js b/packages/metascraper-media-provider/src/get-media/provider/twitter.js
@@ -15,6 +15,7 @@ const TWITTER_BEARER_TOKEN =
 
 const createGuestToken = ({ userAgent, tunnel }) => {
   const retry = expirableCounter()
+  const hasTunnelAvailable = () => tunnel && retry.val() < tunnel.size()
 
   return async () => {
     let token
@@ -46,7 +47,7 @@ const createGuestToken = ({ userAgent, tunnel }) => {
         debug('guestToken:err', err.message)
         retry.incr()
       }
-    } while (!token && retry.val() < tunnel.size())
+    } while (!token && hasTunnelAvailable())
 
     return token
   }