From 4e6633c04b1cce386dd728ed58dc2ff96a5b2ac6 Mon Sep 17 00:00:00 2001
From: Izan Gil <66965250+SrIzan10@users.noreply.github.com>
Date: Wed, 29 Oct 2025 19:38:43 +0100
Subject: [PATCH] chore: oops

---
 server/routes/ws/signaling.ts | 71 +++++++++++++----------------------
 1 file changed, 26 insertions(+), 45 deletions(-)

diff --git a/server/routes/ws/signaling.ts b/server/routes/ws/signaling.ts
index 0918a0c..f0364d8 100644
--- a/server/routes/ws/signaling.ts
+++ b/server/routes/ws/signaling.ts
@@ -1,49 +1,31 @@
 // thanks nitropack smh
 type Peer = Parameters<NonNullable<Parameters<typeof defineWebSocketHandler>[0]['message']>>[0];
 
-// Store peer instances in memory (these can't be serialized to storage)
-const activePeers = new Map<string, Peer>();
-
-async function getRooms() {
-  return await useStorage('rooms').getItem<Record<string, { broadcaster: string, viewers: string[] }>>('data') || {};
-}
-
-async function saveRooms(rooms: Record<string, { broadcaster: string, viewers: string[] }>) {
-  await useStorage('rooms').setItem('data', rooms);
-}
+const rooms: Record<string, { broadcaster: Peer, viewers: Peer[] }> = {};
 
 export default defineWebSocketHandler({
-  async open(peer) {
-    activePeers.set(peer.id, peer);
-  },
-
-  async message(peer, message) {
+  message(peer, message) {
     // TODO: proper typing
+    //if (message.text() === 'ping') return;
     const msg = message.json() as any;
     console.log("[ws] message", peer.id, msg);
-    const rooms = await getRooms();
 
     if (msg.event === 'create-room') {
       const roomId = generateRoomId();
-      rooms[roomId] = { broadcaster: peer.id, viewers: [] };
-      await saveRooms(rooms);
+      rooms[roomId] = { broadcaster: peer, viewers: [] };
       peer.send(JSON.stringify({ event: 'room-created', roomId }));
     }
     if (msg.event === 'join-room') {
       const room = rooms[msg.roomId];
       if (room) {
-        room.viewers.push(peer.id);
-        await saveRooms(rooms);
-        const broadcasterPeer = activePeers.get(room.broadcaster);
-        if (broadcasterPeer) {
-          broadcasterPeer.send(JSON.stringify({ event: 'viewer-joined', viewerId: peer.id }));
-        }
+        room.viewers.push(peer);
+        room.broadcaster.send(JSON.stringify({ event: 'viewer-joined', viewerId: peer.id }));
       } else {
         peer.send(JSON.stringify({ event: 'error', message: 'Room not found' }));
       }
     }
     if (msg.event === 'offer') {
-      const viewerSocket = activePeers.get(msg.targetId);
+      const viewerSocket = findSocketById(msg.targetId);
       if (viewerSocket) {
         viewerSocket.send(JSON.stringify({
           event: 'offer',
@@ -53,17 +35,17 @@ export default defineWebSocketHandler({
       }
     }
     if (msg.event === 'answer') {
-      const broadcasterSocket = activePeers.get(msg.targetId);
+      const broadcasterSocket = findSocketById(msg.targetId)
       if (broadcasterSocket) {
-        broadcasterSocket.send(JSON.stringify({
+        broadcasterSocket.send({
           event: 'answer',
           sdp: msg.sdp,
           from: peer.id,
-        }));
+        })
       }
     }
     if (msg.event === 'ice-candidate') {
-      const targetSocket = activePeers.get(msg.targetId);
+      const targetSocket = findSocketById(msg.targetId);
       if (targetSocket) {
         targetSocket.send(JSON.stringify({
           event: 'ice-candidate',
@@ -74,36 +56,35 @@ export default defineWebSocketHandler({
     }
   },
 
-  async close(peer, event) {
+  close(peer, event) {
     console.log("[ws] close", peer.id, event);
-    activePeers.delete(peer.id);
-    const rooms = await getRooms();
-    
     for (const [roomId, room] of Object.entries(rooms)) {
-      if (room.broadcaster === peer.id) {
+      if (room.broadcaster.id === peer.id) {
         // broadcaster disconnected, close room
-        room.viewers.forEach(viewerId => {
-          const viewer = activePeers.get(viewerId);
-          if (viewer) {
-            viewer.send(JSON.stringify({ event: 'room-closed' }));
-          }
+        room.viewers.forEach(viewer => {
+          viewer.send(JSON.stringify({ event: 'room-closed' }));
         });
         delete rooms[roomId];
       } else {
-        const viewerIndex = room.viewers.indexOf(peer.id);
+        const viewerIndex = room.viewers.findIndex(v => v.id === peer.id);
         if (viewerIndex !== -1) {
           room.viewers.splice(viewerIndex, 1);
-          const broadcasterPeer = activePeers.get(room.broadcaster);
-          if (broadcasterPeer) {
-            broadcasterPeer.send(JSON.stringify({ event: 'viewer-left', viewerId: peer.id }));
-          }
+          room.broadcaster.send(JSON.stringify({ event: 'viewer-left', viewerId: peer.id }));
         }
       }
     }
-    await saveRooms(rooms);
   },
 });
 
 function generateRoomId(): string {
   return Math.random().toString().slice(2, 8);
 }
+
+function findSocketById(id: string): Peer | null {
+  for (const room of Object.values(rooms)) {
+    if (room.broadcaster.id === id) return room.broadcaster;
+    const viewer = room.viewers.find(v => v.id === id);
+    if (viewer) return viewer;
+  }
+  return null;
+}