fix: ensure external requests has early timeout (#162)

* fix: avoid hang code * build: increase timeout * build: update timeout * build: ensure timeout early * build: add timeout * build: fix identation
microlinkhq · Mar 31, 2019 · f7a7816 · f7a7816
1 parent 99bfc73
commit f7a7816
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/packages/metascraper-clearbit-logo/index.js b/packages/metascraper-clearbit-logo/index.js
@@ -17,7 +17,7 @@ module.exports = opts => {
     const logoUrl = apiUrl(url, opts)
 
     try {
-      await got.head(logoUrl)
+      await got.head(logoUrl, { retry: 0, timeout: 1000 })
       return logoUrl
     } catch (err) {
       return null

diff --git a/packages/metascraper-logo-favicon/index.js b/packages/metascraper-logo-favicon/index.js
@@ -62,7 +62,7 @@ module.exports = () => ({
       const logoUrl = resolveUrl(origin, 'favicon.ico')
 
       try {
-        await got.head(logoUrl)
+        await got.head(logoUrl, { retry: 0, timeout: 10000 })
         return logoUrl
       } catch (err) {
         return null

diff --git a/packages/metascraper-media-provider/src/get-media/twitter-info.js b/packages/metascraper-media-provider/src/get-media/twitter-info.js
@@ -15,6 +15,8 @@ const TWITTER_BEARER_TOKEN =
 
 const TWITTER_HOSTNAMES = ['twitter.com', 'mobile.twitter.com']
 
+const TOKEN_TIMEOUT = 6000
+
 const isTweet = url => url.includes('/status/')
 
 const isTwitterHost = url => TWITTER_HOSTNAMES.includes(new URL(url).hostname)
@@ -33,23 +35,20 @@ const agent = PROXY_HOST
     proxy: {
       host: PROXY_HOST,
       port: PROXY_PORT,
-      proxyAuth:
-          PROXY_USER && PROXY_PASS ? `${PROXY_USER}:${PROXY_PASS}` : null
+      proxyAuth: PROXY_USER && PROXY_PASS ? `${PROXY_USER}:${PROXY_PASS}` : null
     }
   })
   : null
 
 const getGuestToken = async (url = '', opts = {}) => {
-  const { body } = await got.post(
-    'https://api.twitter.com/1.1/guest/activate.json',
-    {
-      headers: { Authorization: TWITTER_BEARER_TOKEN },
-      json: true,
-      retry: 0,
-      agent,
-      ...opts
-    }
-  )
+  const { body } = await got.post('https://api.twitter.com/1.1/guest/activate.json', {
+    headers: { Authorization: TWITTER_BEARER_TOKEN },
+    json: true,
+    timeout: TOKEN_TIMEOUT / 2,
+    retry: 0,
+    agent,
+    ...opts
+  })
   return get(body, 'guest_token')
 }
 
@@ -61,6 +60,7 @@ const getTwitterInfo = ({ getToken, ...opts }) => async url => {
     got(apiUrl, {
       agent,
       retry: 0,
+      timeout: TOKEN_TIMEOUT,
       json: true,
       headers: {
         authorization: TWITTER_BEARER_TOKEN,
@@ -72,11 +72,7 @@ const getTwitterInfo = ({ getToken, ...opts }) => async url => {
 
   const body = get(res, 'value.body')
 
-  const id = get(
-    body,
-    `globalObjects.tweets.${tweetId}.retweeted_status_id_str`,
-    tweetId
-  )
+  const id = get(body, `globalObjects.tweets.${tweetId}.retweeted_status_id_str`, tweetId)
 
   const tweetObj = get(body, `globalObjects.tweets.${id}`)