diamondburned/arikawa
1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2024-07-15 14:45:48 +00:00
Code Issues Releases Activity

wsutil: Added possibly missing Reset cases and more debug logs

Browse source
This commit is contained in:
diamondburned 2020-10-31 15:52:55 -07:00
parent bbd4e57cb1
commit a46d3c2c8d
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gateway/gateway.go
View file

@ -325,6 +325,8 @@ func (g *Gateway) start(ctx context.Context) error {
return errors.Wrap(ctx.Err(), "failed to wait for Hello event") return errors.Wrap(ctx.Err(), "failed to wait for Hello event")
} }
wsutil.WSDebug("Hello received; duration:", hello.HeartbeatInterval)
// Send Discord either the Identify packet (if it's a fresh connection), or // Send Discord either the Identify packet (if it's a fresh connection), or
// a Resume packet (if it's a dead connection). // a Resume packet (if it's a dead connection).
if g.SessionID == "" { if g.SessionID == "" {

10
utils/wsutil/conn.go
View file

@ -91,6 +91,9 @@ func (c *Conn) Dial(ctx context.Context, addr string) (err error) {
return errors.Wrap(err, "failed to dial WS") return errors.Wrap(err, "failed to dial WS")
} }
// Reset the deadline.
c.Conn.SetWriteDeadline(resetDeadline)
c.events = make(chan Event, WSBuffer) c.events = make(chan Event, WSBuffer)
go startReadLoop(c.Conn, c.events) go startReadLoop(c.Conn, c.events)
@ -113,7 +116,6 @@ func (c *Conn) Send(ctx context.Context, b []byte) error {
defer c.Conn.SetWriteDeadline(resetDeadline) defer c.Conn.SetWriteDeadline(resetDeadline)
} }
// We need to clean up ourselves if things are erroring out.
if err := c.Conn.WriteMessage(websocket.TextMessage, b); err != nil { if err := c.Conn.WriteMessage(websocket.TextMessage, b); err != nil {
return err return err
} }
@ -122,6 +124,8 @@ func (c *Conn) Send(ctx context.Context, b []byte) error {
} }
func (c *Conn) Close() error { func (c *Conn) Close() error {
WSDebug("Conn: Close is called; shutting down the Websocket connection.")
// Have a deadline before closing. // Have a deadline before closing.
var deadline = time.Now().Add(5 * time.Second) var deadline = time.Now().Add(5 * time.Second)
c.Conn.SetWriteDeadline(deadline) c.Conn.SetWriteDeadline(deadline)
@ -129,6 +133,8 @@ func (c *Conn) Close() error {
// Close the WS. // Close the WS.
err := c.Conn.Close() err := c.Conn.Close()
c.Conn.SetWriteDeadline(resetDeadline)
WSDebug("Conn: Websocket closed; error:", err) WSDebug("Conn: Websocket closed; error:", err)
WSDebug("Conn: Flusing events...") WSDebug("Conn: Flusing events...")
@ -162,6 +168,8 @@ func startReadLoop(conn *websocket.Conn, eventCh chan<- Event) {
for { for {
b, err := state.handle() b, err := state.handle()
if err != nil { if err != nil {
WSDebug("Conn: Read error:", err)
// Is the error an EOF? // Is the error an EOF?
if errors.Is(err, io.EOF) { if errors.Is(err, io.EOF) {
// Yes it is, exit. // Yes it is, exit.

3
utils/wsutil/ws.go
View file

@ -135,6 +135,8 @@ func (ws *Websocket) SendCtx(ctx context.Context, b []byte) error {
} }
if err := ws.conn.Send(ctx, b); err != nil { if err := ws.conn.Send(ctx, b); err != nil {
// We need to clean up ourselves if things are erroring out.
WSDebug("Conn: Error while sending; closing the connection. Error:", err)
ws.close() ws.close()
return err return err
} }
@ -160,6 +162,7 @@ func (ws *Websocket) Close() error {
// more information. // more information.
func (ws *Websocket) close() error { func (ws *Websocket) close() error {
if ws.closed { if ws.closed {
WSDebug("Conn: Websocket is already closed.")
return ErrWebsocketClosed return ErrWebsocketClosed
} }