Changeset 594 in code for trunk

Timestamp:

Sep 21, 2021, 9:49:48 AM (4 years ago)

Author:

contact

Message:

Workaround lack of net.ErrClosed in WebSocket library

File:

• trunk/conn.go (modified) (1 diff)

trunk/conn.go

@@ -75 +75 @@
 }
 
+func isErrWebSocketClosed(err error) bool {
+        return err != nil && strings.HasSuffix(err.Error(), "failed to close WebSocket: already wrote close")
+}
+
 func (wic *websocketIRCConn) Close() error {
-        return wic.conn.Close(websocket.StatusNormalClosure, "")
+        err := wic.conn.Close(websocket.StatusNormalClosure, "")
+        // TODO: remove once this PR is merged:
+        // https://github.com/nhooyr/websocket/pull/303
+        if isErrWebSocketClosed(err) {
+                return nil
+        }
+        return err
 }