mir/node-telegram-bot-api
2
0
Fork 0
mirror of https://github.com/yagop/node-telegram-bot-api synced 2025-08-29 13:27:44 +00:00
Code Issues Releases Wiki Activity

[test] Calculate rate-limit timeout from error response

Browse Source 
Feature:

  Instead of guessing of a proper timeout, we shall use the error
  response to calculate it. The error provides us with the number
  of milliseconds we need to wait before retrying the request.
This commit is contained in:
GochoMugo 2017-01-06 16:10:46 +03:00
parent 80a25c0e6e
commit 6dabdb47d8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/utils.js
View File

@ -153,11 +153,12 @@ function handleRatelimit(bot, methodName, suite) {
const backupMethodName = `__${methodName}`; const backupMethodName = `__${methodName}`;
if (!bot[backupMethodName]) bot[backupMethodName] = bot[methodName]; if (!bot[backupMethodName]) bot[backupMethodName] = bot[methodName];
const maxRetries = 3;
const addSecs = 5;
const method = bot[backupMethodName]; const method = bot[backupMethodName];
assert.equal(typeof method, 'function'); assert.equal(typeof method, 'function');
bot[methodName] = (...args) => { bot[methodName] = (...args) => {
const minute = 60 * 1000;
let retry = 0; let retry = 0;
function exec() { function exec() {
return method.call(bot, ...args) return method.call(bot, ...args)
@ -166,16 +167,20 @@ function handleRatelimit(bot, methodName, suite) {
throw error; throw error;
} }
retry++; retry++;
if (retry > 3) { if (retry > maxRetries) {
throw error; throw error;
} }
console.error('tests: Handling rate-limit error'); // eslint-disable-line no-console if (typeof error.response.body === 'string') {
const timeout = minute * retry; error.response.body = JSON.parse(error.response.body);
suite.timeout(timeout); }
const retrySecs = error.response.body.parameters.retry_after;
const timeout = (1000 * retrySecs) + (1000 * addSecs);
console.error('tests: Handling rate-limit error. Retrying after %d secs', timeout / 1000); // eslint-disable-line no-console
suite.timeout(timeout * 2);
return new Promise(function timeoutPromise(resolve, reject) { return new Promise(function timeoutPromise(resolve, reject) {
setTimeout(function execTimeout() { setTimeout(function execTimeout() {
return exec().then(resolve).catch(reject); return exec().then(resolve).catch(reject);
}, timeout / 2); }, timeout);
}); });
}); });
} }