fix: ultra clean ws

Author: Sn0wye

apps/backend/src/http/routes/ws.ts

@@ -14,15 +14,19 @@ export const wsRoutes = async (app: App) => {
         })
       }
     },
-    (conn, req) => {
+    async (conn, req) => {
+      const disconnect = await app.pubsub.subscribe(
+        req.params.roomCode,
+        message => {
+          conn.socket.send(JSON.stringify(message));
+        }
+      );
+
       conn.socket.on('ping', () => {
         conn.socket.pong();
       });
 
-      app.pubsub.subscribe(req.params.roomCode, message => {
-        console.log('message', message);
-        conn.socket.send(JSON.stringify(message));
-      });
+      conn.socket.on('close', disconnect);
     }
   );
 
@@ -38,14 +42,19 @@ export const wsRoutes = async (app: App) => {
         })
       }
     },
-    (conn, req) => {
+    async (conn, req) => {
+      const disconnect = await app.pubsub.subscribe(
+        req.params.userId,
+        message => {
+          conn.socket.send(JSON.stringify(message));
+        }
+      );
+
       conn.socket.on('ping', () => {
         conn.socket.pong();
       });
 
-      app.pubsub.subscribe(req.params.userId, message => {
-        conn.socket.send(JSON.stringify(message));
-      });
+      conn.socket.on('close', disconnect);
     }
   );
 };

apps/backend/src/lib/pub-sub.ts

@@ -14,13 +14,21 @@ export class Pubsub {
     await this.redis.publish(channel, JSON.stringify(event));
   }
 
-  public async subscribe(channel: string, cb: (event: Event) => void) {
+  public async subscribe(
+    channel: string,
+    cb: (event: Event) => void
+  ): Promise<() => Promise<void>> {
     const sub = this.redis.duplicate();
 
-    sub.on('room.message', (_, message) => {
+    sub.on('message', (_, message) => {
       cb(JSON.parse(message));
     });
 
     await sub.subscribe(channel);
+
+    return async () => {
+      await sub.unsubscribe(channel);
+      sub.quit();
+    };
   }
 }