diamondburned/arikawa
1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2024-12-02 20:02:53 +00:00
Code Issues Releases Activity

gateway: Do not resume after 15m

Browse source 
Fixes #341.

Unsure if this is a good idea, but 15 minutes seems enough.
This commit is contained in:
diamondburned 2022-09-13 19:50:42 -07:00
parent 91b2c6c840
commit 10589eab14
No known key found for this signature in database
GPG key ID: D78C4471CE776659
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gateway/gateway.go
View file

@ -26,6 +26,11 @@ var (
Encoding = "json" Encoding = "json"
) )
// deadbeatDuration is the duration that limits whether the gateway should
// resume or restart entirely. If it's less than this duration, then it's deemed
// resumable.
const deadbeatDuration = 15 * time.Minute
// CodeInvalidSequence is the code returned by Discord to signal that the given // CodeInvalidSequence is the code returned by Discord to signal that the given
// sequence number is invalid. // sequence number is invalid.
const CodeInvalidSequence = 4007 const CodeInvalidSequence = 4007
@ -345,8 +350,11 @@ func (g *gatewayImpl) OnOp(ctx context.Context, op ws.Op) bool {
g.gateway.QueueReconnect() g.gateway.QueueReconnect()
case *HelloEvent: case *HelloEvent:
// Reset gateway times.
g.beatMutex.Lock() g.beatMutex.Lock()
// Determine that we shouldn't reconnect if the last time we've received
// a heart beat was over (deadbeatDuration) ago.
resumable := g.echoBeat.IsZero() || time.Since(g.echoBeat) < deadbeatDuration
// Reset gateway times.
g.echoBeat = time.Time{} g.echoBeat = time.Time{}
g.sentBeat = time.Time{} g.sentBeat = time.Time{}
g.beatMutex.Unlock() g.beatMutex.Unlock()
@ -356,7 +364,7 @@ func (g *gatewayImpl) OnOp(ctx context.Context, op ws.Op) bool {
// Send Discord either the Identify packet (if it's a fresh // Send Discord either the Identify packet (if it's a fresh
// connection), or a Resume packet (if it's a dead connection). // connection), or a Resume packet (if it's a dead connection).
if g.state.SessionID == "" || g.state.Sequence == 0 { if !resumable || g.state.SessionID == "" || g.state.Sequence == 0 {
// SessionID is empty, so this is a completely new session. // SessionID is empty, so this is a completely new session.
if err := g.sendIdentify(ctx); err != nil { if err := g.sendIdentify(ctx); err != nil {
g.gateway.SendErrorWrap(err, "failed to send identify") g.gateway.SendErrorWrap(err, "failed to send identify")