feat: improve ws.conn handling #57
Conversation
denopink
force-pushed
the
denopink/feat/improve-ws-conn-handling
branch
3 times, most recently
from
cddd22e to
9b0b578
Compare
internal/websocket/e2e_test.go
Outdated
| @@ -44,14 +48,19 @@ func TestEndToEnd(t *testing.T) { | |||
| require.NoError(err) | |||
|
|
|||
| mt, got, err := c.Read(ctx) | |||
| // server will halt until the websocket closes resulting in a EOF | |||
| if finished && errors.Is(err, io.EOF) { | |||
There was a problem hiding this comment.
No need to use errors.Is here. In fact, you really shouldn't. io.Reader.Read is documented as returning exactly io.EOF in this case. I realize the linter will complain, which is why I hate our linter :)
denopink
force-pushed
the
denopink/feat/improve-ws-conn-handling
branch
2 times, most recently
from
8d1fa9b to
3dd1841
Compare
| ctx, cancel := context.WithTimeout(r.Context(), 2000000*time.Millisecond) | ||
| ctx, cancel := context.WithTimeout(r.Context(), 200*time.Millisecond) |
There was a problem hiding this comment.
this was a silly artifact of some test debugging code in a previous pr
denopink
force-pushed
the
denopink/feat/improve-ws-conn-handling
branch
from
3dd1841 to
47faddb
Compare
| } | ||
|
|
||
| // Stop stops the websocket connection. | ||
| func (ws *Websocket) Stop() { | ||
| ws.m.Lock() | ||
| // Avoid the overhead of the close handshake. | ||
| ws.conn.Close(nhws.StatusNormalClosure, "") |
There was a problem hiding this comment.
looks like nhooyr.io/websocket's websocket doesn't like it when you use its own nhws.StatusNormalClosure to close the socket... I was expecting a normal EOF:
Received unexpected error:
failed to get reader: received close frame: status = StatusNormalClosure and reason = ""
Error Trace: /Users/odc/Documents/GitHub/xmidt-org/xmidt-agent/internal/websocket/e2e_test.go:56
/Users/odc/go/pkg/mod/golang.org/[email protected]/src/net/http/server.go:2136
/Users/odc/go/pkg/mod/golang.org/[email protected]/src/net/http/server.go:2938
/Users/odc/go/pkg/mod/golang.org/[email protected]/src/net/http/server.go:2009
/Users/odc/go/pkg/mod/golang.org/[email protected]/src/runtime/asm_amd64.s:1650
Error: Received unexpected error:
failed to get reader: received close frame: status = StatusNormalClosure and reason = ""
Test: TestEndToEnd
There was a problem hiding this comment.
I would assume nhws.StatusNormalClosure would trigger a io.EOF and not a unexpected error
There was a problem hiding this comment.
looks like nhooyr.io/websocket's Reader doesn't return an io.EOF for a StatusNormalClosure (status code 1000).
#57 (comment)
just a fyi
denopink
force-pushed
the
denopink/feat/improve-ws-conn-handling
branch
from
47faddb to
54bb265
Compare
denopink
force-pushed
the
denopink/feat/improve-ws-conn-handling
branch
from
ad58af4 to
d5f5710
Compare
Doesn't include
func (ws *websocket) Send()update