Webpack build for branch master: 51a2e465bd

This commit is contained in:
Travis CI 2017-05-01 14:25:30 +00:00
parent 6909d125b3
commit 2ef45cb24e
2 changed files with 11 additions and 2 deletions

View file

@ -17136,6 +17136,12 @@ class WebSocketConnection extends EventEmitter {
* @type {number}
*/
this.closeSequence = 0;
/**
* Whether or not the WebSocket is expecting to be closed
* @type {boolean}
*/
this.expectingClose = false;
for (const event of this.client.options.disabledEvents) this.disabledEvents[event] = true;
}
@ -17275,6 +17281,7 @@ class WebSocketConnection extends EventEmitter {
this.debug(`Tried to connect to an invalid gateway: ${gateway}`);
return false;
}
this.expectingClose = false;
this.gateway = gateway;
this.debug(`Connecting to ${gateway}`);
const ws = this.ws = new WebSocket(gateway);
@ -17298,6 +17305,7 @@ class WebSocketConnection extends EventEmitter {
return false;
}
this.heartbeat(-1);
this.expectingClose = true;
ws.close(1000);
this.packetManager.handleQueue();
this.ws = null;
@ -17399,7 +17407,8 @@ class WebSocketConnection extends EventEmitter {
* @param {CloseEvent} event Close event that was received
*/
onClose(event) {
this.debug(`Closed: ${event.code}`);
this.debug(`${this.expectingClose ? 'Server' : 'Client'} closed WebSocket connection: ${event.code}`);
this.expectingClose = false;
this.closeSequence = this.sequence;
// Reset the state before trying to fix anything
this.emit('close', event);

File diff suppressed because one or more lines are too long