8000 fix closenow race by alixander · Pull Request #427 · coder/websocket · GitHub
[go: up one dir, main page]
Skip to content

fix closenow race #427

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

Merged
merged 8 commits into from
Apr 7, 2024
Merged

fix closenow race #427

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46f4112
fix closenow race
alixander Dec 18, 2023
0b3912f
accept_test: Fix @alixander's test
nhooyr Apr 5, 2024
db18a31
close.go: Rewrite how the library handles closing
nhooyr Apr 5, 2024
856e371
ws_js: Update to match new close code
nhooyr Apr 5, 2024
0edbb28
netconn: fmt
nhooyr Apr 5, 2024
c97fb09
mask_asm: Disable for now until v1.9.0
nhooyr Apr 6, 2024
211ef4b
ws_js_test: Fix
nhooyr Apr 7, 2024
250db1e
read: Fix CloseRead to have its own done channel
nhooyr Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ws_js: Update to match new close code
  • Loading branch information
@nhooyr
nhooyr committed Apr 7, 2024
commit 856e371494bab94984371763f53f114b4cef3547
5 changes: 3 additions & 2 deletions read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@ func (c *Conn) Read(ctx context.Context) (MessageType, []byte, error) {
// This function is idempotent.
func (c *Conn) CloseRead(ctx context.Context) context.Context {
c.closeReadMu.Lock()
if c.closeReadCtx != nil {
ctx2 := c.closeReadCtx
if ctx2 != nil {
c.closeReadMu.Unlock()
return c.closeReadCtx
return ctx2
}
ctx, cancel := context.WithCancel(ctx)
c.closeReadCtx = ctx
Expand Down
25 changes: 17 additions & 8 deletions ws_js.go
View file
Open in desktop
690C
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ type Conn struct {
// read limit for a message in bytes.
msgReadLimit xsync.Int64

wg sync.WaitGroup
closeReadMu sync.Mutex
closeReadCtx context.Context

closingMu sync.Mutex
isReadClosed xsync.Int64
closeOnce sync.Once
closed chan struct{}
closeErrOnce sync.Once
Expand Down Expand Up @@ -130,7 +131,10 @@ func (c *Conn) closeWithInternal() {
// Read attempts to read a message from the connection.
// The maximum time spent waiting is bounded by the context.
func (c *Conn) Read(ctx context.Context) (MessageType, []byte, error) {
if c.isReadClosed.Load() == 1 {
c.closeReadMu.Lock()
closedRead := c.closeReadCtx != nil
c.closeReadMu.Unlock()
if closedRead {
return 0, nil, errors.New("WebSocket connection read closed")
}

Expand Down Expand Up @@ -387,14 +391,19 @@ func (w *writer) Close() error {

// CloseRead implements *Conn.CloseRead for wasm.
func (c *Conn) CloseRead(ctx context.Context) context.Context {
c.isReadClosed.Store(1)

c.closeReadMu.Lock()
ctx2 := c.closeReadCtx
if ctx2 != nil {
c.closeReadMu.Unlock()
return ctx2
}
ctx, cancel := context.WithCancel(ctx)
c.wg.Add(1)
c.closeReadCtx = ctx
c.closeReadMu.Unlock()

go func() {
defer c.CloseNow()
defer c.wg.Done()
defer cancel()
defer c.CloseNow()
_, _, err := c.read(ctx)
if err != nil {
c.Close(StatusPolicyViolation, "unexpected data message")
Expand Down
0