Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

implement gateway resume url handling #186

Merged
merged 2 commits into from Aug 29, 2022
Merged

implement gateway resume url handling #186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0302fbf
implement gateway resume url handling
mlnrDev Aug 15, 2022
bcb3760
make usage of resume URLs toggleable
mlnrDev Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions gateway/gateway_config.go
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@ type Config struct {
ShardID int
ShardCount int
SessionID *string
ResumeGatewayURL *string
LastSequenceReceived *int
AutoReconnect bool
MaxReconnectTries int
Expand Down
13 changes: 7 additions & 6 deletions gateway/gateway_events.go
View file
Open in desktop
Expand Up @@ -16,12 +16,13 @@ type EventData interface {

// EventReady is the event sent by discord when you successfully Identify
type EventReady struct {
Version int `json:"v"`
User discord.OAuth2User `json:"user"`
Guilds []discord.UnavailableGuild `json:"guilds"`
SessionID string `json:"session_id"`
Shard []int `json:"shard,omitempty"`
Application discord.PartialApplication `json:"application"`
Version int `json:"v"`
User discord.OAuth2User `json:"user"`
Guilds []discord.UnavailableGuild `json:"guilds"`
SessionID string `json:"session_id"`
ResumeGatewayURL string `json:"resume_gateway_url"`
Shard []int `json:"shard,omitempty"`
Application discord.PartialApplication `json:"application"`
}

func (EventReady) messageData() {}
Expand Down
10 changes: 9 additions & 1 deletion gateway/gateway_impl.go
View file
Open in desktop
Expand Up @@ -94,7 +94,11 @@ func (g *gatewayImpl) Open(ctx context.Context) error {
}
g.status = StatusConnecting

gatewayURL := fmt.Sprintf("%s?v=%d&encoding=json", g.config.URL, Version)
wsURL := g.config.URL
if g.config.ResumeGatewayURL != nil {
wsURL = *g.config.ResumeGatewayURL
}
gatewayURL := fmt.Sprintf("%s?v=%d&encoding=json", wsURL, Version)
g.lastHeartbeatSent = time.Now().UTC()
conn, rs, err := g.config.Dialer.DialContext(ctx, gatewayURL, nil)
if err != nil {
Expand Down Expand Up @@ -156,6 +160,7 @@ func (g *gatewayImpl) CloseWithCode(ctx context.Context, code int, message strin
// clear resume data as we closed gracefully
if code == websocket.CloseNormalClosure || code == websocket.CloseGoingAway {
g.config.SessionID = nil
g.config.ResumeGatewayURL = nil
g.config.LastSequenceReceived = nil
}
}
Expand Down Expand Up @@ -330,6 +335,7 @@ loop:
g.config.Logger.Error(g.formatLogs("invalid sequence provided. reconnecting..."))
g.config.LastSequenceReceived = nil
g.config.SessionID = nil
g.config.ResumeGatewayURL = nil
} else {
message := g.formatLogsf("gateway close received, reconnect: %t, code: %d, error: %s", g.config.AutoReconnect && reconnect, closeError.Code, closeError.Text)
if reconnect {
Expand Down Expand Up @@ -390,6 +396,7 @@ loop:
// get session id here
if readyEvent, ok := data.(EventReady); ok {
g.config.SessionID = &readyEvent.SessionID
g.config.ResumeGatewayURL = &readyEvent.ResumeGatewayURL
g.status = StatusReady
g.config.Logger.Debug(g.formatLogs("ready event received"))
}
Expand Down Expand Up @@ -424,6 +431,7 @@ loop:
// clear resume info
g.config.SessionID = nil
g.config.LastSequenceReceived = nil
g.config.ResumeGatewayURL = nil
}

g.CloseWithCode(context.TODO(), code, "invalid session")
Expand Down