1 files changed, 73 insertions, 18 deletions
diff --git a/WebInterface/wasm/webhogg/deploy.py b/WebInterface/wasm/webhogg/deploy.py
index 21d9a5e..7bc56ac 100755
--- a/WebInterface/wasm/webhogg/deploy.py
+++ b/WebInterface/wasm/webhogg/deploy.py
@@ -2,10 +2,20 @@
 
 from socket import socket, SOL_SOCKET, SO_REUSEADDR
 
-ws = socket()
-ws.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
-ws.bind(('localhost', 8080))
-ws.listen()
+if False:
+    CSP = {
+        'script-src': ["*", "'unsafe-inline'"],
+        'worker-src': ["*", "'unsafe-inline'"],
+        'style-src': ["*", "'unsafe-inline'"],
+        'default-src': ["*", "'unsafe-inline'"],
+    }
+
+    ADD_HEADERS = 'Content-Security-Policy: ' + '; '.join(
+            k + ' ' + ' '.join(v) for k, v in CSP.items())
+    # ADD_HEADERS += '\r\n' + ADD_HEADERS.replace('cy: ', 'cy-Report-Only: ')
+    print(ADD_HEADERS)
+    ADD_HEADERS = '\r\n' + ADD_HEADERS
+ADD_HEADERS = ''
 
 class Client:
     def __init__(self, sock, addr):
@@ -19,24 +29,69 @@ class Client:
         method, loc, ver = lines[0].split(' ')
         print(f'request from \'{self.addr}\': "{loc}"')
         attrs = {key: value for key, value in (i.split(': ') for i in lines[1:])}
-        return method, loc, attrs
+        return method, loc, attrs, ver
 
     def sen(self, loc, ver):
-        f = open(loc, 'rb')
-        c = f.read()
-        f.close()
-        self.sock.send(f'HTTP/1.1 200'.encode('utf-8') + c)
+        print(f'request {loc}')
+        if loc.startswith('/'):
+            loc = loc[1:]
+        if not loc:
+            loc = 'index.html'
+        try:
+            if loc == 'favicon.ico':
+                raise FileNotFoundError
+            f = open(loc, 'rb')
+            c = f.read()
+            f.close()
+            print(f'successfully requested {loc}')
+            if loc.endswith('.js'):
+                mime = 'application/javascript'
+            elif loc.endswith('.html'):
+                mime = 'text/html'
+            elif loc.endswith('.wasm'):
+                mime = 'application/wasm'
+            else:
+                mime = 'text/plain'
+            packet = f'HTTP/1.1 200 Success\r\nContent-Length: {len(c)}\r\nContent-Type: {mime}{ADD_HEADERS}\r\n\r\n'.encode('utf-8') + c
+            self.sock.send(packet)
+        except FileNotFoundError:
+            print(f'error request {loc}')
+            self.sock.send(f'HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\nContent-Type: text/plain\r\n\r\n'.encode('utf-8'))
+        finally:
+            try:
+                f.close()
+            except:
+                ...
 
     def run(self):
-        method, loc, attrs = self.rec()
-        self.sen(loc, ver)
+        while True:
+            method, loc, attrs, ver = self.rec()
+            self.sen(loc, ver)
+
+
+def run_server():
+    ws = socket()
+    ws.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
+    ws.bind(('localhost', 8080))
+    ws.listen()
+
+    clients = []
 
+    while True:
+        c, a = ws.accept()
+        print(f'{a[0]}:{a[1]} connected')
+        client = Client(c, a)
+        clients.append(clients)
+        client.run()
 
-clients = []
 
-while True:
-    c, a = ws.accept()
-    print(f'{a[0]}:{a[1]} connected')
-    client = Client(c, a)
-    clients.append(clients)
-    client.run()
+if __name__ == '__main__':
+    from sys import argv
+    if len(argv) > 1 and argv[1] in ('-d', '--daemon'):
+        import sys
+        from os import getcwd
+        from daemon import DaemonContext
+        with DaemonContext(working_directory=getcwd(), stderr=sys.stderr):
+            run_server()
+    else:
+        run_server()