2 files changed, 50 insertions, 50 deletions

diff --git a/frontend/src/views/HostView.vue b/frontend/src/views/HostView.vue
index 8d6a6b9..adc9c05 100644
--- a/frontend/src/views/HostView.vue
+++ b/frontend/src/views/HostView.vue
@@ -16,46 +16,33 @@ function startGame() {
     return;
   }
   socket.send(JSON.stringify({
-    action: 'start',
-    sessionId: code.value,
+    type: 'start',
+    payload: {}
   }));
 }
 
-fetch(`${import.meta.env.VITE_BACKEND_BASE_URL}/session`,
-  {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-  }
-).then(async (response) => {
-  const data: any = await response.json();
-  code.value = data.id;
-  url.value = `${import.meta.env.VITE_FRONTEND_BASE_URL}/join/${data.id}`;
-  waitingForCode.value = false;
-  openSocket(data.id);
-});
+socket = new WebSocket(`${import.meta.env.VITE_BACKEND_WS_URL}/coop?action=create`);
 
-function openSocket(id: string) {
-  socket = new WebSocket(`${import.meta.env.VITE_BACKEND_WS_URL}`);
+socket.onmessage = (event) => {
+  const data = JSON.parse(event.data);
+  const type = data.type;
+  const payload = data.payload;
 
-  socket.onopen = () => {
-    socket.send(JSON.stringify({
-      action: 'host',
-      sessionId: id,
-    }));
-  };
-  socket.onmessage = (event) => {
-    const data = JSON.parse(event.data);
-    if (data.action === 'join') {
-      numClients.value = data.clients;
-    } else if (data.action === 'state' && data.state === 'playing') {
-      started.value = true;
-    } else if (data.action === 'move') {
-      inputQueue.value.push(data.move);
-    }
-  };
-}
+  if (type === 'create') {
+    code.value = payload.sessionId;
+    waitingForCode.value = false;
+    url.value = `${import.meta.env.VITE_FRONTEND_BASE_URL}/join/${payload.sessionId}`;
+
+  } else if (type === 'join') {
+    numClients.value = payload.numberOfClients;
+
+  } else if (type === 'state') {
+    started.value = payload.state === 'playing';
+
+  } else if (type === 'move') {
+    inputQueue.value.push(payload.move);
+  }
+};
 </script>
 
 <template>
diff --git a/frontend/src/views/JoinView.vue b/frontend/src/views/JoinView.vue
index 83421ee..d081512 100644
--- a/frontend/src/views/JoinView.vue
+++ b/frontend/src/views/JoinView.vue
@@ -10,20 +10,35 @@ const connected = ref(false);
 const gameState = ref('');
 const controlsLocked = ref(false);
 
-const socket = new WebSocket(`${import.meta.env.VITE_BACKEND_WS_URL}`);
-socket.onopen = () => {
-  socket.send(JSON.stringify({
-    action: 'join',
-    sessionId: sessionId,
-  }));
-};
+let moveTimeout: number;
+
+const socket = new WebSocket(`${import.meta.env.VITE_BACKEND_WS_URL}/coop?action=join&sessionId=${sessionId}`);
 socket.onmessage = (event) => {
   const data = JSON.parse(event.data);
-  if (data.action === 'state') {
-    gameState.value = data.state;
+  const type = data.type;
+  const payload = data.payload;
+
+  if (type === 'state') {
+    gameState.value = payload.state;
     joiningGame.value = false;
     connected.value = true;
   }
+
+  if (type === 'timeout') {
+    const timeout = payload.timeoutUntil - Date.now();
+    if (timeout < 0) {
+      controlsLocked.value = false;
+      return;
+    }
+
+    controlsLocked.value = true; 
+    if (moveTimeout) {
+      clearTimeout(moveTimeout);
+    }
+    moveTimeout = setTimeout(() => {
+      controlsLocked.value = false;
+    }, timeout);
+  }
 };
 
 function sendMove(move: string) {
@@ -31,13 +46,11 @@ function sendMove(move: string) {
     return;
   }
   controlsLocked.value = true;
-  setTimeout(() => {
-    controlsLocked.value = false;
-  }, 1000);
   socket.send(JSON.stringify({
-    action: 'move',
-    sessionId: sessionId,
-    move: move,
+    type: 'move',
+    payload: {
+      move 
+    }
   }));
 }