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

make login sane (#735)

Browse Source
This commit is contained in:
Gus Caplan
2016-09-24 11:55:31 -05:00
committed by Amish Shah
parent 116e6bb4c8
commit bd1449bc5a
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/ClientManager.js
View File

@@ -32,6 +32,10 @@ class ClientManager {
this.client.rest.methods.getGateway().then(gateway => {
this.client.emit(Constants.Events.DEBUG, `Using gateway ${gateway}`);
this.client.ws.connect(gateway);
this.client.ws.once('close', event => {
if (event.code === 4004) reject(new Error(Constants.Errors.BAD_LOGIN));
if (event.code === 4010) reject(new Error(Constants.Errors.INVALID_SHARD));
});
this.client.once(Constants.Events.READY, () => {
resolve(token);
this.client.clearTimeout(timeout);

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

@@ -1,4 +1,5 @@
const WebSocket = require('ws');
const EventEmitter = require('events').EventEmitter;
const Constants = require('../../util/Constants');
const zlib = require('zlib');
const PacketManager = require('./packets/WebSocketPacketManager');
@@ -7,8 +8,9 @@ const PacketManager = require('./packets/WebSocketPacketManager');
* The WebSocket Manager of the Client
* @private
*/
class WebSocketManager {
class WebSocketManager extends EventEmitter {
constructor(client) {
super();
/**
* The Client that instantiated this WebSocketManager
* @type {Client}
@@ -164,12 +166,14 @@ class WebSocketManager {
* @param {Object} event The received websocket data
*/
eventClose(event) {
this.emit('close', event);
/**
* Emitted whenever the client websocket is disconnected
* @event Client#disconnect
*/
if (!this.reconnecting) this.client.emit(Constants.Events.DISCONNECT);
if (event.code === 4004) throw new Error(Constants.Errors.BAD_LOGIN);
if (event.code === 4004) return;
if (event.code === 4010) return;
if (!this.reconnecting && event.code !== 1000) this.tryReconnect();
}