From d7bb032c6568a782559c386c97d71900c1b65fcb Mon Sep 17 00:00:00 2001
From: UnAfraid <unafraid89@gmail.com>
Date: Thu, 8 Feb 2024 01:30:57 +0200
Subject: [PATCH 1/2] Remove hideTempErr to allow external users to check for
 errors like net.ErrClosed

---
 conn.go      | 14 +++-----------
 conn_test.go | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/conn.go b/conn.go
index 2ac19e9a..72f5df81 100644
--- a/conn.go
+++ b/conn.go
@@ -192,13 +192,6 @@ func newMaskKey() [4]byte {
 	return k
 }
 
-func hideTempErr(err error) error {
-	if e, ok := err.(net.Error); ok {
-		err = &netError{msg: e.Error(), timeout: e.Timeout()}
-	}
-	return err
-}
-
 func isControl(frameType int) bool {
 	return frameType == CloseMessage || frameType == PingMessage || frameType == PongMessage
 }
@@ -364,7 +357,6 @@ func (c *Conn) RemoteAddr() net.Addr {
 // Write methods
 
 func (c *Conn) writeFatal(err error) error {
-	err = hideTempErr(err)
 	c.writeErrMu.Lock()
 	if c.writeErr == nil {
 		c.writeErr = err
@@ -1033,7 +1025,7 @@ func (c *Conn) NextReader() (messageType int, r io.Reader, err error) {
 	for c.readErr == nil {
 		frameType, err := c.advanceFrame()
 		if err != nil {
-			c.readErr = hideTempErr(err)
+			c.readErr = err
 			break
 		}
 
@@ -1073,7 +1065,7 @@ func (r *messageReader) Read(b []byte) (int, error) {
 				b = b[:c.readRemaining]
 			}
 			n, err := c.br.Read(b)
-			c.readErr = hideTempErr(err)
+			c.readErr = err
 			if c.isServer {
 				c.readMaskPos = maskBytes(c.readMaskKey, c.readMaskPos, b[:n])
 			}
@@ -1096,7 +1088,7 @@ func (r *messageReader) Read(b []byte) (int, error) {
 		frameType, err := c.advanceFrame()
 		switch {
 		case err != nil:
-			c.readErr = hideTempErr(err)
+			c.readErr = err
 		case frameType == TextMessage || frameType == BinaryMessage:
 			c.readErr = errors.New("websocket: internal error, unexpected text or binary in Reader")
 		}
diff --git a/conn_test.go b/conn_test.go
index f0c29c39..5360628c 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -814,3 +814,26 @@ func TestFormatMessageType(t *testing.T) {
 		t.Error("failed to format message type")
 	}
 }
+
+type fakeNetClosedReader struct {
+}
+
+func (r fakeNetClosedReader) Read([]byte) (int, error) {
+	return 0, net.ErrClosed
+}
+
+func TestConnectionClosed(t *testing.T) {
+	t.Parallel()
+	var b1, b2 bytes.Buffer
+
+	client := newTestConn(fakeNetClosedReader{}, &b1, false)
+	server := newTestConn(fakeNetClosedReader{}, &b2, true)
+
+	if _, _, err := server.NextReader(); !errors.Is(err, net.ErrClosed) {
+		t.Fatalf("server expects a net.ErrClosed error, %v returned", err)
+	}
+
+	if _, _, err := client.NextReader(); !errors.Is(err, net.ErrClosed) {
+		t.Fatalf("client expects a net.ErrClosed error, %v returned", err)
+	}
+}

From 52188df6dec40bfd289172c43c8779c590339979 Mon Sep 17 00:00:00 2001
From: UnAfraid <unafraid89@gmail.com>
Date: Tue, 13 Feb 2024 18:25:37 +0200
Subject: [PATCH 2/2] Don't run TestConnectionClosed in parallel

---
 conn_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conn_test.go b/conn_test.go
index 5360628c..3bd4f61b 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -823,7 +823,6 @@ func (r fakeNetClosedReader) Read([]byte) (int, error) {
 }
 
 func TestConnectionClosed(t *testing.T) {
-	t.Parallel()
 	var b1, b2 bytes.Buffer
 
 	client := newTestConn(fakeNetClosedReader{}, &b1, false)