few tweaks to make responses easier

Author: mirkin

gurgleapps_webserver.py

@@ -1,11 +1,8 @@
 import network
-import socket
-import time
 import re
-import config
+import time
 import uos
 import uasyncio as asyncio
-import _thread
 import ujson as json
 from response import Response
 from request import Request
@@ -119,17 +116,10 @@ async def serve_request(self, reader, writer):
             if file:
                 print("file found so serving it")
                 print(file)
-                writer.write('HTTP/1.0 200 OK\r\nContent-type: text/html\r\n\r\n')
-                writer.write(file)
-                await writer.drain()
-                await writer.wait_closed()
+                await response.send(file)
                 return
             print("file not found")
-            response = self.html % "page not found "+url
-            writer.write('HTTP/1.0 404 Not Found\r\nContent-type: text/html\r\n\r\n')
-            writer.write(response)
-            await writer.drain()
-            await writer.wait_closed()
+            await response.send(self.html % "page not found "+url, status_code=404)
             if (url == "/shutdown"):
                 self.serving = False
         except OSError as e:

main.py

@@ -14,14 +14,14 @@ async def example_func(request, response, param1, param2):
     print("param1: " + param1)
     print("param2: " + param2)
     response_string = json.dumps({ "param1": param1, "param2": param2, "post_data": request.post_data})
-    await response.send("200 OK", "application/json", response_string)
+    await response.send_json(response_string, 200)
 
 
 
 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)
+    await response.send_json(response_string, 200)
 
 
 async def set_delay(request, response, new_delay):

response.py

@@ -4,8 +4,14 @@ class Response:
     def __init__(self, writer):
         self.writer = writer
 
-    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)
+    async def send(self, body, status_code = 200, content_type = "text/html"):
+        self.writer.write(f'HTTP/1.0 {status_code}\r\nContent-type: {content_type}\r\n\r\n')
+        self.writer.write(body)
         await self.writer.drain()
-        await self.writer.wait_closed()
+        await self.writer.wait_closed()
+
+    async def send_html(self, body, status_code=200):
+        await self.send(body, status_code, content_type='text/html')
+
+    async def send_json(self, body, status_code=200):
+        await self.send(body, status_code, content_type='application/json')