Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-19 04:53:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix protocol versions

Browse Source
This commit is contained in:
Amish Shah
2016-08-13 16:23:24 +01:00
parent c02d7808c1
commit a2f8680514
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/rest/RESTMethods.js
View File

@@ -30,7 +30,10 @@ class RESTMethods {
getGateway() { getGateway() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.rest.makeRequest('get', Constants.Endpoints.gateway, true) this.rest.makeRequest('get', Constants.Endpoints.gateway, true)
.then(res => resolve(res.url)) .then(res => {
this.rest.client.store.gateway = `${res.url}/?encoding=json&v=${this.rest.client.options.protocol_version}`;
resolve(this.rest.client.store.gateway);
})
.catch(reject); .catch(reject);
}); });
} }

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

@@ -16,7 +16,6 @@ class WebSocketManager {
connect(gateway) { connect(gateway) {
this.status = Constants.Status.CONNECTING; this.status = Constants.Status.CONNECTING;
this.store.gateway = `${gateway}/?v=${this.client.options.protocol_version}`;
this.ws = new WebSocket(gateway); this.ws = new WebSocket(gateway);
this.ws.onopen = () => this.eventOpen(); this.ws.onopen = () => this.eventOpen();
this.ws.onclose = () => this.eventClose(); this.ws.onclose = () => this.eventClose();
@@ -81,10 +80,14 @@ class WebSocketManager {
return this.eventError(Constants.Errors.BAD_WS_MESSAGE); return this.eventError(Constants.Errors.BAD_WS_MESSAGE);
} }
if (packet.op === 10) {
this.client.manager.setupKeepAlive(packet.d.heartbeat_interval);
}
return this.packetManager.handle(packet); return this.packetManager.handle(packet);
} }
EventError() { eventError() {
this.tryReconnect(); this.tryReconnect();
} }
@@ -108,7 +111,7 @@ class WebSocketManager {
this.ws.close(); this.ws.close();
this.packetManager.handleQueue(); this.packetManager.handleQueue();
this.client.emit(Constants.Events.RECONNECTING); this.client.emit(Constants.Events.RECONNECTING);
this.connect(this.store.gateway); this.connect(this.client.store.gateway);
} }
} }

1
src/client/websocket/packets/handlers/Ready.js
View File

@@ -8,7 +8,6 @@ class ReadyHandler extends AbstractHandler {
handle(packet) { handle(packet) {
const data = packet.d; const data = packet.d;
const client = this.packetManager.client; const client = this.packetManager.client;
client.manager.setupKeepAlive(data.heartbeat_interval);
client.store.user = client.store.add('users', new ClientUser(client, data.user)); client.store.user = client.store.add('users', new ClientUser(client, data.user));