main.py

@@ -1,7 +1,5 @@
 import aiohttp.web
 
-from .model import Model
-
 routes = aiohttp.web.RouteTableDef()
 
 routes.static('/static', 'static')
@@ -10,12 +8,13 @@ admintoken = "ae33fd8cc4fdcb1ff50ba42ff48046a7"
 
 CLIENT_REGEX = r'/{client:[a-zA-Z0-9]{16}}'
 
+meta_dict = {}
+
 
 def get_client(request: aiohttp.web.Request):
     client = request.match_info.get("client", None)
-    model = request.app['model']
 
-    if not client or not model.exists_client(client):
+    if not client:
         raise aiohttp.web.HTTPBadRequest()
 
     return client
@@ -35,48 +34,47 @@ async def handler(request: aiohttp.web.Request):
     return aiohttp.web.FileResponse('ui.html')
 
 
+async def handle_request(data, client):
+    return "foo" in data
+
+
 @routes.post(CLIENT_REGEX + '/api')
 async def handler(request: aiohttp.web.Request):
     client = get_client(request)
-    model = request.app['model']
-
     data = await request.json()
 
     print(f'{client=} {data=}')
 
-    try:
-        assert await model.handle_post(data, client)
+    ok = await handle_request(data, client)
+    if ok:
+        # return aiohttp.web.json_response({"x" : x})
         return aiohttp.web.Response(status=200)
-    except Exception as e:
-        print(e)
+    else:
         return aiohttp.web.Response(status=400)
 
 
 @routes.get(CLIENT_REGEX + '/ws')
 async def _(request: aiohttp.web.Request):
     client = get_client(request)
-    model = request.app['model']
 
     ws = aiohttp.web.WebSocketResponse(heartbeat=10)
     await ws.prepare(request)
 
-    print(f'[WS] client {client} connected, {ws=}')
-    model.subscribe(client, ws)
+    print(f'model.subscribe({client}, ws)')
 
     async for msg in ws:
-        print(f'[WS] incoming message from client {client}, {ws=}, {msg=}')
+        print(f'[WS] client sent {msg=}')
 
-    print(f'[WS] client {client} disconnected, {ws=}')
-    model.unsubscribe(ws)
+    print(f'model.unsubscribe(ws)')
 
     return ws
 
 
 @routes.get(f"/api/{admintoken}")
 async def handler(request: aiohttp.web.Request):
-    model = request.app['model']
+    del request  # unused
 
-    return aiohttp.web.json_response(model.sessions)
+    return aiohttp.web.json_response(meta_dict)
 
 
 @routes.get('/')
@@ -89,8 +87,5 @@ async def handler(request):
 if __name__ == '__main__':
     app = aiohttp.web.Application()
     app.add_routes(routes)
-
-    app['model'] = Model()
-
     aiohttp.web.run_app(app, port=42042)
     print("should save state")