pothtonswer/discordmuffin
1
0
Fork 1
Code Issues 2 Pull requests 1 Projects 2 Releases Packages Wiki Activity Actions

Prevent concurrent writes to gateway websocket.

Browse source
This commit is contained in:
Bruce Marriner 2016-04-30 19:11:13 -05:00
parent 20240f3915
commit e9e9ef86b3
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
structs.go
View file

@ -89,6 +89,9 @@ type Session struct {
// stores session ID of current Gateway connection // stores session ID of current Gateway connection
sessionID string sessionID string
// used to make sure gateway websocket writes do not happen concurrently
wsMutex sync.Mutex
} }
type rateLimitMutex struct { type rateLimitMutex struct {

11
wsapi.go
View file

@ -237,7 +237,10 @@ func (s *Session) heartbeat(wsConn *websocket.Conn, listening <-chan interface{}
var err error var err error
ticker := time.NewTicker(i * time.Millisecond) ticker := time.NewTicker(i * time.Millisecond)
for { for {
s.wsMutex.Lock()
err = wsConn.WriteJSON(heartbeatOp{1, s.sequence}) err = wsConn.WriteJSON(heartbeatOp{1, s.sequence})
s.wsMutex.Unlock()
if err != nil { if err != nil {
log.Println("Error sending heartbeat:", err) log.Println("Error sending heartbeat:", err)
return return
@ -284,7 +287,9 @@ func (s *Session) UpdateStatus(idle int, game string) (err error) {
usd.Game = &updateStatusGame{game} usd.Game = &updateStatusGame{game}
} }
s.wsMutex.Lock()
err = s.wsConn.WriteJSON(updateStatusOp{3, usd}) err = s.wsConn.WriteJSON(updateStatusOp{3, usd})
s.wsMutex.Unlock()
return return
} }
@ -340,7 +345,9 @@ func (s *Session) onEvent(messageType int, message []byte) {
// Must respond with a heartbeat packet within 5 seconds // Must respond with a heartbeat packet within 5 seconds
if e.Operation == 1 { if e.Operation == 1 {
s.log(LogInformational, "sending heartbeat in response to Op1") s.log(LogInformational, "sending heartbeat in response to Op1")
s.wsMutex.Lock()
err = s.wsConn.WriteJSON(heartbeatOp{1, s.sequence}) err = s.wsConn.WriteJSON(heartbeatOp{1, s.sequence})
s.wsMutex.Unlock()
if err != nil { if err != nil {
s.log(LogError, "error sending heartbeat in response to Op1") s.log(LogError, "error sending heartbeat in response to Op1")
return return
@ -358,7 +365,9 @@ func (s *Session) onEvent(messageType int, message []byte) {
if e.Operation == 9 { if e.Operation == 9 {
s.log(LogInformational, "sending identify packet to gateway in response to Op9") s.log(LogInformational, "sending identify packet to gateway in response to Op9")
s.wsMutex.Lock()
err = s.wsConn.WriteJSON(handshakeOp{2, handshakeData{s.Token, handshakeProperties{runtime.GOOS, "Discordgo v" + VERSION, "", "", ""}, 250, s.Compress}}) err = s.wsConn.WriteJSON(handshakeOp{2, handshakeData{s.Token, handshakeProperties{runtime.GOOS, "Discordgo v" + VERSION, "", "", ""}, 250, s.Compress}})
s.wsMutex.Unlock()
if err != nil { if err != nil {
s.log(LogWarning, "error sending gateway identify packet, %s, %s", s.gateway, err) s.log(LogWarning, "error sending gateway identify packet, %s, %s", s.gateway, err)
return return
@ -468,7 +477,9 @@ func (s *Session) ChannelVoiceJoin(gID, cID string, mute, deaf bool) (voice *Voi
// Send the request to Discord that we want to join the voice channel // Send the request to Discord that we want to join the voice channel
data := voiceChannelJoinOp{4, voiceChannelJoinData{&gID, &cID, mute, deaf}} data := voiceChannelJoinOp{4, voiceChannelJoinData{&gID, &cID, mute, deaf}}
s.wsMutex.Lock()
err = s.wsConn.WriteJSON(data) err = s.wsConn.WriteJSON(data)
s.wsMutex.Unlock()
if err != nil { if err != nil {
s.log(LogInformational, "Deleting VoiceConnection %s", gID) s.log(LogInformational, "Deleting VoiceConnection %s", gID)
delete(s.VoiceConnections, gID) delete(s.VoiceConnections, gID)