Merge pull request #63 from michalpokusa/external-routes-websockets-sse

External Routes, Server-Sent Events, Websockets

Author: FoamyGuy

Diff for: README.rst

@@ -31,6 +31,7 @@ HTTP Server for CircuitPython.
 - Supports chunked transfer encoding.
 - Supports URL parameters and wildcard URLs.
 - Supports HTTP Basic and Bearer Authentication on both server and route per level.
+- Supports Websockets and Server-Sent Events.
 
 
 Dependencies

Diff for: adafruit_httpserver/__init__.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries, Michał Pokusa
 #
 # SPDX-License-Identifier: MIT
 """
@@ -58,7 +58,10 @@
     ChunkedResponse,
     JSONResponse,
     Redirect,
+    SSEResponse,
+    Websocket,
 )
+from .route import Route, as_route
 from .server import (
     Server,
     NO_REQUEST,
@@ -68,6 +71,7 @@
 )
 from .status import (
     Status,
+    SWITCHING_PROTOCOLS_101,
     OK_200,
     CREATED_201,
     ACCEPTED_202,

Diff for: adafruit_httpserver/authentication.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2023 Michał Pokusa
 #
 # SPDX-License-Identifier: MIT
 """

Diff for: adafruit_httpserver/exceptions.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2023 Michał Pokusa
 #
 # SPDX-License-Identifier: MIT
 """

Diff for: adafruit_httpserver/headers.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2022 Michał Pokusa
 #
 # SPDX-License-Identifier: MIT
 """

Diff for: adafruit_httpserver/methods.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2022 Michał Pokusa
 #
 # SPDX-License-Identifier: MIT
 """

Diff for: adafruit_httpserver/mime_types.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries, Michał Pokusa
 #
 # SPDX-License-Identifier: MIT
 """

Diff for: adafruit_httpserver/request.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries, Michał Pokusa
 #
 # SPDX-License-Identifier: MIT
 """
@@ -302,8 +302,8 @@ def form_data(self) -> Union[FormData, None]:
         return self._form_data
 
     def json(self) -> Union[dict, None]:
-        """Body of the request, as a JSON-decoded dictionary."""
-        return json.loads(self.body) if self.body else None
+        """Body of the request, as a JSON-decoded dictionary. Only available for POST requests."""
+        return json.loads(self.body) if (self.body and self.method == "POST") else None
 
     @property
     def _raw_header_bytes(self) -> bytes: