Rewrite WebSocket internals #1410
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
devsnek
suggested changes
Apr 26, 2017
| @@ -13,6 +13,8 @@ class ResumedHandler extends AbstractHandler { | |||
| client.emit('debug', `RESUMED ${ws._trace.join(' -> ')} | replayed ${replayed} events. `); | |||
| client.emit('resume', replayed); | |||
|
|
|||
| ws.connection.triggerReady(); | |||
|
|
||
| if (this.ws.disabledEvents[packet.t] !== undefined) return false; | ||
| // #if (this.ws.disabledEvents[packet.t] !== undefined) return false; |
| this._emitReady(); | ||
| } | ||
| switch (this.connection.status) { | ||
| case Constants.Status.IDLE: |
There was a problem hiding this comment.
these can be compounded
case Constants.Status.IDLE:
case Constants.Status.DISCONNECTED:
this.connection.connect(gateway, 5500);
return true;| if ([4004, 4010, 4011].includes(event.code)) return; | ||
| if (!this.reconnecting && event.code !== 1000) this.tryReconnect(); | ||
| send(packet) { | ||
| if (!this.connection) return this.debug('No connection to websocket'); |
| }); | ||
| this.sequence = -1; | ||
| destroy() { | ||
| if (!this.connection) return this.debug('Attempted to destroy WebSocket but no connection exists!'); |
There was a problem hiding this comment.
return this.debug returns this.client.emit which means you return based on if the debug event has listeners
| */ | ||
| send(data) { | ||
| if (!this.ws || this.ws.readyState !== WebSocket.OPEN) { | ||
| return this.debug(`Tried to send packet ${data} but no WebSocket is available!`); |
| get readyState() { | ||
| return this.ws.readyState; | ||
| setSequence(s) { | ||
| this.sequence = s > this.sequence ? s : this.sequence; |
There was a problem hiding this comment.
this could result in this.sequence = this.sequence which is kinda useless
| */ | ||
| reconnect() { | ||
| this.client.emit(Constants.Events.RECONNECTING); | ||
| this.connect(this.gateway, 5500, true); |
There was a problem hiding this comment.
this 5500 is used a lot, it should probably be moved to a variable somewhere
| * @param {Error} error Error that occurred | ||
| */ | ||
| onError(error) { | ||
| this.debug(error); |
| this.emit('close', event); | ||
| this.heartbeat(-1); | ||
| // Should we reconnect? | ||
| if (![1000, 4004, 4010, 4011].includes(event.code)) this.reconnect(); |
There was a problem hiding this comment.
constants with map of code => error message like we talked about earlier
|
Just wanted to comment to say I'm leaving a test script up with multiple shards on for a couple days and I'll report back when it's done. It's currently reporting idle(3) for all shards though. |
|
@JMTK could you add |
|
@hydrabolt 1st line is the Authenticated using token line so i just took it out. Everything else is what it stopped at(including my own logs) and then you can see me logging the .status of 3 The latency is fairly high but all the heartbeats afterwards were short: |
amishshah
changed the title
devsnek
pushed a commit
to devsnek/discord.js
that referenced
this pull request
May 14, 2017
* Start rewriting Manager and Connection * more stuff * stuff * Fix ready bug * some stuff i forgot * fix some stuff * add stupid heartbeat ack like seriously who cares * woo! * fix a bug * rate limit the dumb websocket * stuff * hdocs * Docs * Remove ClientManager#setupKeepAlive as it is now redundant * Change Client._pingTimestamp to a getter that fetches the timestamp from the WebSocketConnection * are you happy now eslint smh * make gus happy * Add CloseEvent external doc * Make sure to emit 'reconnecting' when actually reconnecting * ffs * Fix RESUME logic * Add heartbeat ack debug messages, including latency data * Dumb stuff for Gus * thx eslint * more dumb stuff * more dumb crap smh gus i h8 u * moar messages * fix for using wrong status, causing certain events not to be fired (discordjs#1422)
devsnek
pushed a commit
to devsnek/discord.js
that referenced
this pull request
May 14, 2017
* Start rewriting Manager and Connection * more stuff * stuff * Fix ready bug * some stuff i forgot * fix some stuff * add stupid heartbeat ack like seriously who cares * woo! * fix a bug * rate limit the dumb websocket * stuff * hdocs * Docs * Remove ClientManager#setupKeepAlive as it is now redundant * Change Client._pingTimestamp to a getter that fetches the timestamp from the WebSocketConnection * are you happy now eslint smh * make gus happy * Add CloseEvent external doc * Make sure to emit 'reconnecting' when actually reconnecting * ffs * Fix RESUME logic * Add heartbeat ack debug messages, including latency data * Dumb stuff for Gus * thx eslint * more dumb stuff * more dumb crap smh gus i h8 u * moar messages * fix for using wrong status, causing certain events not to be fired (discordjs#1422)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please describe the changes this PR makes and why it should be merged:
Rewrites the internal WebSocket stuff so it's not as crappy and easier to use for internal sharding in the future
Semantic versioning classification:
Todo: