using request and response seperation of concerns

Author: mirkin

gurgleapps_webserver.py

@@ -8,6 +8,7 @@
 import _thread
 import ujson as json
 from response import Response
+from request import Request
 
 class GurgleAppsWebserver:
 
@@ -82,20 +83,18 @@ async def serve_request(self, reader, writer):
                 if line == "":
                     break
                 headers.append(line)
-
-            request = "\r".join(headers)
-            print(request)
-            request = str(request)
+            request_raw = str("\r".join(headers))
+            print(request_raw)
             request_pattern = re.compile(r"(GET|POST)\s+([^\s]+)\s+HTTP")
-            match = request_pattern.search(request)
+            match = request_pattern.search(request_raw)
             if match:
                 method = match.group(1)
                 url = match.group(2)
                 print(method, url)
             # extract content length for POST requests
             if method == "POST":
                 content_length_pattern = re.compile(r"Content-Length:\s+(\d+)")
-                match = content_length_pattern.search(request)
+                match = content_length_pattern.search(request_raw)
                 if match:
                     content_length = int(match.group(1))
                     print("content_length: "+str(content_length))
@@ -104,14 +103,15 @@ async def serve_request(self, reader, writer):
                 post_data_raw = await reader.readexactly(content_length)
                 print("POST data:", post_data_raw)
                 post_data = json.loads(post_data_raw)
-            response = Response(writer, post_data)
+            request = Request(post_data)
+            response = Response(writer)
             # check if the url is a function route and if so run the function
             path_components = self.get_path_components(url)
             print("path_components: "+str(path_components))
             route_function, params = self.match_route(path_components)
             if route_function:
                 print("calling function: "+str(route_function)+" with params: "+str(params))
-                await route_function(response, *params)
+                await route_function(request, response, *params)
                 return
             # perhaps it is a file
             file = self.get_file(self.doc_root + url)

main.py

@@ -9,36 +9,36 @@
 status = True
 led = Pin("LED", Pin.OUT)
 
-async def example_func(response, param1, param2):
+async def example_func(request, response, param1, param2):
     print("example_func")
     print("param1: " + param1)
     print("param2: " + param2)
-    response_string = json.dumps({"param1": param1, "param2": param2})
+    response_string = json.dumps({ "param1": param1, "param2": param2, "post_data": request.post_data})
     await response.send("200 OK", "application/json", response_string)
 
 
 
-async def send_status(response):
+async def send_status(request, response):
     # send boolean status and number frequency
     response_string = json.dumps({"status": status, "delay": delay})
     await response.send("200 OK", "application/json", response_string)
 
 
-async def set_delay(response, new_delay):
+async def set_delay(request, response, new_delay):
     print("new delay: " + new_delay)
     global delay
     delay = float(new_delay)
-    await send_status(response)
+    await send_status(request, response)
 
-async def stop_flashing(response):
+async def stop_flashing(request, response):
     global status
     status = False
-    await send_status(response)
+    await send_status(request, response)
 
-async def start_flashing(response):
+async def start_flashing(request, response):
     global status
     status = True
-    await send_status(response)
+    await send_status(request, response)
 
 async def main():
     await server.start_server()
@@ -63,10 +63,4 @@ async def run():
 server.add_function_route("/status", send_status)
 server.add_function_route("/example/func/<param1>/<param2>", example_func)
 
-""" server.add_function_route("^/set-delay/(\d+(?:\.\d+)?)$", set_delay) #23.78 2 23 float 
-server.add_function_route("^/stop$", stop_flashing)
-server.add_function_route("^/start$", start_flashing)
-server.add_function_route("^/status$", send_status) """
-
-
 asyncio.run(run())

request.py

@@ -0,0 +1,5 @@
+# request.py
+
+class Request:
+    def __init__(self, post_data=None):
+        self.post_data = post_data

response.py

@@ -1,12 +1,11 @@
 # response.py
 
 class Response:
-    def __init__(self, writer, post_data=None):
+    def __init__(self, writer):
         self.writer = writer
-        self.post_data = post_data
 
     async def send(self, status, content_type, content):
         self.writer.write(f'HTTP/1.0 {status}\r\nContent-type: {content_type}\r\n\r\n')
         self.writer.write(content)
         await self.writer.drain()
-        await self.writer.wait_closed()
+        await self.writer.wait_closed()