model.py

@@ -12,17 +12,7 @@ def generate_random_id(_s=set()):
     return new_id
 
 
-class Model(object):
+class Model:
-
-    global api_methods
-    api_methods = {}
-
-    def api_method():
-        global api_methods
-        def wrapper(fun):
-            api_methods[fun.__name__] = fun
-        return wrapper
-
     def __init__(self, filename = "tehmodel.json"):
         self.sockets = {} # mapping: client -> socket
         self.filename = filename
@@ -43,16 +33,11 @@ class Model(object):
         if not "sessions" in self.model:
             self.model["sessions"] = {}
 
-    @api_method()
+    async def handle_post(self, clientid, data):
-    async def create_session(self, clientid) -> str:
+        print(f"I have received P O S T data: {data} from {clientid}")
-        sessionname = generate_random_id()
+        print("let me tell everyone")
-        newsession = {"id": sessionname, "owner": clientid, "clients": []}
+        await self.send_state(clientid)
-        self.model["sessions"][sessionname] = newsession
+        return True
-        return sessionname
-
-    @api_method()
-    async def join_session(self, clientid, sessionid):
-        self.model["sessions"][sessionid]
 
     async def send_state(self, clientid):
         # TODO: compute state, send to client
@@ -81,6 +66,12 @@ class Model(object):
         self.model["clients"][clientname] = newclient
         return clientname
 
+    def create_session(self, clientid) -> str:
+        sessionname = generate_random_id()
+        newsession = {"id": sessionname, "owner": clientid, "clients": []}
+        self.model["sessions"][sessionname] = newsession
+        return sessionname
+
     def subscribe(self, clientid, socket):
         if not clientid in self.sockets:
             self.sockets[clientid] = []