added a response to simplifly everything

Author: mirkin

gurgleapps_webserver.py

@@ -6,7 +6,8 @@
 import uos
 import uasyncio as asyncio
 import _thread
-
+import ujson as json
+from response import Response
 
 class GurgleAppsWebserver:
 
@@ -74,6 +75,7 @@ async def serve_request(self, reader, writer):
             content_length = 0
             # Read the request line by line because we want the post data potentially
             headers = []
+            post_data = None
             while True:
                 line = await reader.readline()
                 line = line.decode('utf-8').strip()
@@ -98,17 +100,18 @@ async def serve_request(self, reader, writer):
                     content_length = int(match.group(1))
                     print("content_length: "+str(content_length))
             # Read the POST data if there's any
-            post_data = None
             if content_length > 0:
-                post_data = await reader.readexactly(content_length)
-                print("POST data:", post_data)
+                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)
             # 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(writer, *params)
+                await route_function(response, *params)
                 return
             # perhaps it is a file
             file = self.get_file(self.doc_root + url)

main.py

@@ -9,40 +9,36 @@
 status = True
 led = Pin("LED", Pin.OUT)
 
-async def example_func(writer, param1, param2):
+async def example_func(response, param1, param2):
     print("example_func")
     print("param1: " + param1)
     print("param2: " + param2)
-    writer.write('HTTP/1.0 200 OK\r\nContent-type: application/json\r\n\r\n')
-    response = json.dumps({"param1": param1, "param2": param2})
-    writer.write(response)
-    await writer.drain()
-    await writer.wait_closed()
+    response_string = json.dumps({"param1": param1, "param2": param2})
+    await response.send("200 OK", "application/json", response_string)
+
 
 
-async def send_status(writer):
-    writer.write('HTTP/1.0 200 OK\r\nContent-type: application/json\r\n\r\n')
+async def send_status(response):
     # send boolean status and number frequency
-    response = json.dumps({"status": status, "delay": delay})
-    writer.write(response)
-    await writer.drain()
-    await writer.wait_closed()
+    response_string = json.dumps({"status": status, "delay": delay})
+    await response.send("200 OK", "application/json", response_string)
+
 
-async def set_delay(writer, new_delay):
+async def set_delay(response, new_delay):
     print("new delay: " + new_delay)
     global delay
     delay = float(new_delay)
-    await send_status(writer)
+    await send_status(response)
 
-async def stop_flashing(writer):
+async def stop_flashing(response):
     global status
     status = False
-    await send_status(writer)
+    await send_status(response)
 
-async def start_flashing(writer):
+async def start_flashing(response):
     global status
     status = True
-    await send_status(writer)
+    await send_status(response)
 
 async def main():
     await server.start_server()

response.py

@@ -0,0 +1,12 @@
+# response.py
+
+class Response:
+    def __init__(self, writer, post_data=None):
+        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()