Skip to content

Commit

Permalink
Simplify the message type check.
Browse files Browse the repository at this point in the history
  • Loading branch information
sbruens committed Oct 2, 2024
1 parent 6b03e58 commit 026bc94
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions caddy/websocket_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package outlinecaddy
import (
"bufio"
"bytes"
"errors"
_ "errors"
"fmt"
"io"
Expand Down Expand Up @@ -100,21 +101,13 @@ func (c *wsConnWrapper) Read(b []byte) (n int, err error) {
if err != nil {
return 0, err
}

switch messageType {
case websocket.TextMessage:
_, err = io.Copy(&c.readBuf, reader)
if err != nil {
return 0, err
}
case websocket.BinaryMessage:
return 0, nil
case websocket.CloseMessage:
return 0, nil
default:
return 0, fmt.Errorf("unsupported message type: %v", messageType)
if messageType != websocket.TextMessage {
return 0, errors.New("must be text message")
}
_, err = io.Copy(&c.readBuf, reader)
if err != nil {
return 0, err
}
return 0, nil
}
return c.readBuf.Read(b)
}
Expand Down

0 comments on commit 026bc94

Please sign in to comment.