Add close_code and close_reason to new implementations.

Also add state to threading implementation.

Fix #1537.

Author: aaugustin

docs/reference/asyncio/client.rst

@@ -57,3 +57,10 @@ Using a connection
     .. autoattribute:: response
 
     .. autoproperty:: subprotocol
+
+    The following attributes are available after the closing handshake,
+    once the WebSocket connection is closed:
+
+    .. autoproperty:: close_code
+
+    .. autoproperty:: close_reason

docs/reference/asyncio/common.rst

@@ -45,3 +45,10 @@ Both sides (new :mod:`asyncio`)
     .. autoattribute:: response
 
     .. autoproperty:: subprotocol
+
+    The following attributes are available after the closing handshake,
+    once the WebSocket connection is closed:
+
+    .. autoproperty:: close_code
+
+    .. autoproperty:: close_reason

docs/reference/asyncio/server.rst

@@ -79,6 +79,13 @@ Using a connection
 
     .. autoproperty:: subprotocol
 
+    The following attributes are available after the closing handshake,
+    once the WebSocket connection is closed:
+
+    .. autoproperty:: close_code
+
+    .. autoproperty:: close_reason
+
 Broadcast
 ---------
 

docs/reference/sync/client.rst

@@ -39,6 +39,8 @@ Using a connection
 
     .. autoproperty:: remote_address
 
+    .. autoproperty:: state
+
     The following attributes are available after the opening handshake,
     once the WebSocket connection is open:
 
@@ -47,3 +49,10 @@ Using a connection
     .. autoattribute:: response
 
     .. autoproperty:: subprotocol
+
+    The following attributes are available after the closing handshake,
+    once the WebSocket connection is closed:
+
+    .. autoproperty:: close_code
+
+    .. autoproperty:: close_reason

docs/reference/sync/common.rst

@@ -31,6 +31,8 @@ Both sides (:mod:`threading`)
 
     .. autoproperty:: remote_address
 
+    .. autoproperty:: state
+
     The following attributes are available after the opening handshake,
     once the WebSocket connection is open:
 
@@ -39,3 +41,10 @@ Both sides (:mod:`threading`)
     .. autoattribute:: response
 
     .. autoproperty:: subprotocol
+
+    The following attributes are available after the closing handshake,
+    once the WebSocket connection is closed:
+
+    .. autoproperty:: close_code
+
+    .. autoproperty:: close_reason

docs/reference/sync/server.rst

@@ -52,6 +52,8 @@ Using a connection
 
     .. autoproperty:: remote_address
 
+    .. autoproperty:: state
+
     The following attributes are available after the opening handshake,
     once the WebSocket connection is open:
 
@@ -61,6 +63,13 @@ Using a connection
 
     .. autoproperty:: subprotocol
 
+    The following attributes are available after the closing handshake,
+    once the WebSocket connection is closed:
+
+    .. autoproperty:: close_code
+
+    .. autoproperty:: close_reason
+
 HTTP Basic Authentication
 -------------------------
 

src/websockets/asyncio/connection.py

@@ -185,6 +185,30 @@ def subprotocol(self) -> Subprotocol | None:
         """
         return self.protocol.subprotocol
 
+    @property
+    def close_code(self) -> int | None:
+        """
+        State of the WebSocket connection, defined in :rfc:`6455`.
+
+        This attribute is provided for completeness. Typical applications
+        shouldn't check its value. Instead, they should inspect attributes
+        of :exc:`~websockets.exceptions.ConnectionClosed` exceptions.
+
+        """
+        return self.protocol.close_code
+
+    @property
+    def close_reason(self) -> str | None:
+        """
+        State of the WebSocket connection, defined in :rfc:`6455`.
+
+        This attribute is provided for completeness. Typical applications
+        shouldn't check its value. Instead, they should inspect attributes
+        of :exc:`~websockets.exceptions.ConnectionClosed` exceptions.
+
+        """
+        return self.protocol.close_reason
+
     # Public methods
 
     async def __aenter__(self) -> Connection:

src/websockets/protocol.py

@@ -173,7 +173,7 @@ def state(self, state: State) -> None:
     @property
     def close_code(self) -> int | None:
         """
-        `WebSocket close code`_.
+        `WebSocket close code`_ received from the remote endpoint.
 
         .. _WebSocket close code:
             https://datatracker.ietf.org/doc/html/rfc6455#section-7.1.5
@@ -191,7 +191,7 @@ def close_code(self) -> int | None:
     @property
     def close_reason(self) -> str | None:
         """
-        `WebSocket close reason`_.
+        `WebSocket close reason`_  received from the remote endpoint..
 
         .. _WebSocket close reason:
             https://datatracker.ietf.org/doc/html/rfc6455#section-7.1.6

src/websockets/sync/connection.py

@@ -140,6 +140,19 @@ def remote_address(self) -> Any:
         """
         return self.socket.getpeername()
 
+    @property
+    def state(self) -> State:
+        """
+        State of the WebSocket connection, defined in :rfc:`6455`.
+
+        This attribute is provided for completeness. Typical applications
+        shouldn't check its value. Instead, they should call :meth:`~recv` or
+        :meth:`send` and handle :exc:`~websockets.exceptions.ConnectionClosed`
+        exceptions.
+
+        """
+        return self.protocol.state
+
     @property
     def subprotocol(self) -> Subprotocol | None:
         """
@@ -150,6 +163,30 @@ def subprotocol(self) -> Subprotocol | None:
         """
         return self.protocol.subprotocol
 
+    @property
+    def close_code(self) -> int | None:
+        """
+        State of the WebSocket connection, defined in :rfc:`6455`.
+
+        This attribute is provided for completeness. Typical applications
+        shouldn't check its value. Instead, they should inspect attributes
+        of :exc:`~websockets.exceptions.ConnectionClosed` exceptions.
+
+        """
+        return self.protocol.close_code
+
+    @property
+    def close_reason(self) -> str | None:
+        """
+        State of the WebSocket connection, defined in :rfc:`6455`.
+
+        This attribute is provided for completeness. Typical applications
+        shouldn't check its value. Instead, they should inspect attributes
+        of :exc:`~websockets.exceptions.ConnectionClosed` exceptions.
+
+        """
+        return self.protocol.close_reason
+
     # Public methods
 
     def __enter__(self) -> Connection: