Preparing for returning persistent connection responses

Author: michalpokusa

adafruit_httpserver/response.py

@@ -102,6 +102,7 @@ def _send(self) -> None:
 
         self._send_headers(len(encoded_body), self._content_type)
         self._send_bytes(self._request.connection, encoded_body)
+        self._close_connection()
 
     def _send_bytes(
         self,
@@ -122,6 +123,12 @@ def _send_bytes(
                 raise
         self._size += bytes_sent
 
+    def _close_connection(self) -> None:
+        try:
+            self._request.connection.close()
+        except (BrokenPipeError, OSError):
+            pass
+
 
 class FileResponse(Response):  # pylint: disable=too-few-public-methods
     """
@@ -246,6 +253,7 @@ def _send(self) -> None:
             with open(self._full_file_path, "rb") as file:
                 while bytes_read := file.read(self._buffer_size):
                     self._send_bytes(self._request.connection, bytes_read)
+        self._close_connection()
 
 
 class ChunkedResponse(Response):  # pylint: disable=too-few-public-methods
@@ -309,6 +317,7 @@ def _send(self) -> None:
 
         # Empty chunk to indicate end of response
         self._send_chunk()
+        self._close_connection()
 
 
 class JSONResponse(Response):  # pylint: disable=too-few-public-methods
@@ -352,6 +361,7 @@ def _send(self) -> None:
 
         self._send_headers(len(encoded_data), "application/json")
         self._send_bytes(self._request.connection, encoded_data)
+        self._close_connection()
 
 
 class Redirect(Response):  # pylint: disable=too-few-public-methods
@@ -391,3 +401,5 @@ def __init__(
 
     def _send(self) -> None:
         self._send_headers()
+        self._close_connection()
+

adafruit_httpserver/server.py

@@ -334,29 +334,30 @@ def poll(self):
 
         try:
             conn, client_address = self._sock.accept()
-            with conn:
-                conn.settimeout(self._timeout)
+            conn.settimeout(self._timeout)
 
-                # Receive the whole request
-                if (request := self._receive_request(conn, client_address)) is None:
-                    return
+            # Receive the whole request
+            if (request := self._receive_request(conn, client_address)) is None:
+                conn.close()
+                return
 
-                # Find a handler for the route
-                handler = self._routes.find_handler(
-                    _Route(request.path, request.method)
-                )
+            # Find a handler for the route
+            handler = self._routes.find_handler(Route(request.path, request.method))
 
-                # Handle the request
-                response = self._handle_request(request, handler)
+            # Handle the request
+            response = self._handle_request(request, handler)
 
-                if response is None:
-                    return
+            if response is None:
+                conn.close()
+                return
+
+            # Send the response
+            response._send()  # pylint: disable=protected-access
 
-                # Send the response
-                response._send()  # pylint: disable=protected-access
+            if self.debug:
+                _debug_response_sent(response)
 
-                if self.debug:
-                    _debug_response_sent(response)
+            return
 
         except Exception as error:  # pylint: disable=broad-except
             if isinstance(error, OSError):
@@ -370,6 +371,7 @@ def poll(self):
             if self.debug:
                 _debug_exception_in_handler(error)
 
+            conn.close()
             raise error  # Raise the exception again to be handled by the user.
 
     def require_authentication(self, auths: List[Union[Basic, Bearer]]) -> None: