Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-10 16:43:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup ws ratelimiting, and apirequest (#957)

Browse Source 
* cleanup ws ratelimiting, and apirequest

* cleanup timestamps

* clean up timestamps
This commit is contained in:
Gus Caplan
2016-12-23 08:37:43 -06:00
committed by Amish Shah
parent 74ef0b2e14
commit e6a041241b
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/client/websocket/WebSocketManager.js
View File

@@ -105,7 +105,11 @@ class WebSocketManager extends EventEmitter {
this.ws.onclose = this.eventClose.bind(this);
this.ws.onerror = this.eventError.bind(this);
this._queue = [];
this._remaining = 3;
this._remaining = 120;
this.client.setInterval(() => {
this._remaining = 120;
this._remainingReset = Date.now();
}, 60e3);
}
connect(gateway) {
@@ -147,17 +151,15 @@ class WebSocketManager extends EventEmitter {
doQueue() {
const item = this._queue[0];
if (this.ws.readyState === WebSocket.OPEN && item) {
if (this._remaining === 0) {
this.client.setTimeout(this.doQueue.bind(this), 1000);
return;
}
this._remaining--;
this._send(item);
this._queue.shift();
this.doQueue();
this.client.setTimeout(() => this._remaining++, 1000);
if (!(this.ws.readyState === WebSocket.OPEN && item)) return;
if (this.remaining === 0) {
this.client.setTimeout(this.doQueue.bind(this), Date.now() - this.remainingReset);
return;
}
this._remaining--;
this._send(item);
this._queue.shift();
this.doQueue();
}
/**