Skip to content

Commit 3a014f4

Browse files
committed
fix: don't loop if max tunnel size is reached
1 parent 9c93975 commit 3a014f4

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

packages/metascraper-media-provider/bench/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
apiKey: process.env.MICROLINK_API_KEY,
3-
proxies: [process.env.PROXY_ONE, process.env.PROXY_TWO],
3+
proxies: process.env.PROXIES.split(','),
44
urls: [
55
'https://twitter.com/Tour_du_Rwanda/status/1111166645475700737',
66
'https://twitter.com/Visit_Murcia/status/1036982439829225472',

packages/metascraper-media-provider/src/get-media/provider/generic.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ const makeError = ({ rawError, url, flags }) => {
5757
}
5858

5959
module.exports = ({ tunnel, onError, userAgent, cacheDir }) => {
60-
const retry = expirableCounter(1)
61-
60+
const retry = expirableCounter()
6261
return async url => {
6362
let data = {}
6463
do {
@@ -71,11 +70,11 @@ module.exports = ({ tunnel, onError, userAgent, cacheDir }) => {
7170
} catch (rawError) {
7271
const err = makeError({ rawError, url, flags })
7372
debug('getInfo:err', err.message)
74-
retry.incr()
7573
onError(err, url)
76-
if (!(tunnel && isTwitterRateLimit(url, err))) return data
74+
if (!tunnel && isTwitterRateLimit(url, err)) return data
75+
retry.incr()
7776
}
78-
} while (isEmpty(data))
77+
} while (isEmpty(data) && retry.val() < tunnel.size())
7978
return data
8079
}
8180
}

packages/metascraper-media-provider/src/get-media/provider/twitter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const createGuestToken = ({ userAgent, tunnel }) => {
4646
debug('guestToken:err', err.message)
4747
retry.incr()
4848
}
49-
} while (!token)
49+
} while (!token && retry.val() < tunnel.size())
5050

5151
return token
5252
}

0 commit comments

Comments
 (0)