dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-07-05 11:10:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Webpack build: 544e456302

Browse source
This commit is contained in:
Travis CI 2016-12-24 12:14:26 +00:00
parent 654fada91f
commit ef2ec573ec
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
discord.indev.js
View file

@ -90,6 +90,8 @@
* @property {boolean} [sync=false] Whether to periodically sync guilds (for userbots) * @property {boolean} [sync=false] Whether to periodically sync guilds (for userbots)
* @property {number} [restWsBridgeTimeout=5000] Maximum time permitted between REST responses and their * @property {number} [restWsBridgeTimeout=5000] Maximum time permitted between REST responses and their
* corresponding websocket events * corresponding websocket events
* @property {number} [restTimeOffset=500] The extra time in millseconds to wait before continuing to make REST
* requests (higher values will reduce rate-limiting errors on bad connections)
* @property {WSEventType[]} [disabledEvents] An array of disabled websocket events. Events in this array will not be * @property {WSEventType[]} [disabledEvents] An array of disabled websocket events. Events in this array will not be
* processed, potentially resulting in performance improvements for larger bots. Only disable events you are * processed, potentially resulting in performance improvements for larger bots. Only disable events you are
* 100% certain you don't need, as many are important, but not obviously so. The safest one to disable with the * 100% certain you don't need, as many are important, but not obviously so. The safest one to disable with the
@ -108,6 +110,7 @@ exports.DefaultOptions = {
sync: false, sync: false,
restWsBridgeTimeout: 5000, restWsBridgeTimeout: 5000,
disabledEvents: [], disabledEvents: [],
restTimeOffset: 500,
/** /**
* Websocket options. These are left as snake_case to match the API. * Websocket options. These are left as snake_case to match the API.
@ -21222,7 +21225,7 @@ class BurstRequestHandler extends RequestHandler {
this.requestResetTime = Number(res.headers['x-ratelimit-reset']) * 1000; this.requestResetTime = Number(res.headers['x-ratelimit-reset']) * 1000;
this.requestRemaining = Number(res.headers['x-ratelimit-remaining']); this.requestRemaining = Number(res.headers['x-ratelimit-remaining']);
this.timeDifference = Date.now() - new Date(res.headers.date).getTime(); this.timeDifference = Date.now() - new Date(res.headers.date).getTime();
this.handleNext((this.requestResetTime - Date.now()) + this.timeDifference + 1000); this.handleNext((this.requestResetTime - Date.now()) + this.timeDifference + this.restManager.client.options.restTimeOffset);
} }
if (err) { if (err) {
if (err.status === 429) { if (err.status === 429) {
@ -21231,7 +21234,7 @@ class BurstRequestHandler extends RequestHandler {
this.restManager.client.setTimeout(() => { this.restManager.client.setTimeout(() => {
this.globalLimit = false; this.globalLimit = false;
this.handle(); this.handle();
}, Number(res.headers['retry-after']) + 500); }, Number(res.headers['retry-after']) + this.restManager.client.options.restTimeOffset);
if (res.headers['x-ratelimit-global']) { if (res.headers['x-ratelimit-global']) {
this.globalLimit = true; this.globalLimit = true;
} }
@ -21329,7 +21332,7 @@ class SequentialRequestHandler extends RequestHandler {
this.waiting = false; this.waiting = false;
this.globalLimit = false; this.globalLimit = false;
resolve(); resolve();
}, Number(res.headers['retry-after']) + 500); }, Number(res.headers['retry-after']) + this.restManager.client.options.restTimeOffset);
if (res.headers['x-ratelimit-global']) { if (res.headers['x-ratelimit-global']) {
this.globalLimit = true; this.globalLimit = true;
} }
@ -21348,7 +21351,7 @@ class SequentialRequestHandler extends RequestHandler {
this.restManager.client.setTimeout(() => { this.restManager.client.setTimeout(() => {
this.waiting = false; this.waiting = false;
resolve(data); resolve(data);
}, (this.requestResetTime - Date.now()) + this.timeDifference + 1000); }, (this.requestResetTime - Date.now()) + this.timeDifference + this.restManager.client.options.restTimeOffset);
} else { } else {
this.waiting = false; this.waiting = false;
resolve(data); resolve(data);

6
discord.indev.min.js vendored
View file

File diff suppressed because one or more lines are too long