fixup! ws_js: Update to match new close code

coder · Apr 6, 2024 · 684adf9 · 684adf9
1 parent a9e9d67
commit 684adf9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/read.go b/read.go
@@ -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 {
+	ctx := c.closeReadCtx
+	if ctx != nil {
 		c.closeReadMu.Unlock()
-		return c.closeReadCtx
+		return ctx
 	}
 	ctx, cancel := context.WithCancel(ctx)
 	c.closeReadCtx = ctx

diff --git a/ws_js.go b/ws_js.go
@@ -392,9 +392,10 @@ func (w *writer) Close() error {
 // CloseRead implements *Conn.CloseRead for wasm.
 func (c *Conn) CloseRead(ctx context.Context) context.Context {
 	c.closeReadMu.Lock()
-	if c.closeReadCtx != nil {
+	ctx := c.closeReadCtx
+	if ctx != nil {
 		c.closeReadMu.Unlock()
-		return c.closeReadCtx
+		return ctx
 	}
 	ctx, cancel := context.WithCancel(ctx)
 	c.closeReadCtx = ctx