Added cursor position streaming and better ux all over

Author: hrshtdotme

apps/http-server/dist/controllers/roomControllers.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRoomController = createRoomController;
 exports.joinRoomController = joinRoomController;
 exports.fetchAllRoomsController = fetchAllRoomsController;
+exports.fetchRoomByIdController = fetchRoomByIdController;
 const client_1 = require("@workspace/db/client");
 const utils_1 = require("../utils");
 const common_1 = require("@workspace/common");
@@ -178,3 +179,33 @@ function fetchAllRoomsController(req, res) {
         }
     });
 }
+function fetchRoomByIdController(req, res) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const userId = req.userId;
+        const roomId = req.params.roomId;
+        if (!userId) {
+            res.status(401).json({ message: "User Id not found" });
+            return;
+        }
+        if (!roomId) {
+            res.status(400).json({ message: "Room Id required" });
+            return;
+        }
+        try {
+            const existingRooms = yield client_1.db.select().from(client_1.roomsTable).where((0, drizzle_orm_1.eq)(client_1.roomsTable.id, roomId));
+            const room = existingRooms[0];
+            if (!room) {
+                res.status(404).json({ message: "Room not found" });
+                return;
+            }
+            res.json({
+                message: "Room fetched successfully",
+                room,
+            });
+        }
+        catch (e) {
+            console.log(e);
+            res.status(500).json({ message: "Error fetching room" });
+        }
+    });
+}

apps/http-server/dist/routes/roomRouter.js

@@ -7,4 +7,5 @@ const router = (0, express_1.Router)();
 router.route("/create").post(authenticateUser_1.authenticateUser, roomControllers_1.createRoomController);
 router.route("/join").post(authenticateUser_1.authenticateUser, roomControllers_1.joinRoomController);
 router.route("/all").get(authenticateUser_1.authenticateUser, roomControllers_1.fetchAllRoomsController);
+router.route("/:roomId").get(authenticateUser_1.authenticateUser, roomControllers_1.fetchRoomByIdController);
 exports.default = router;

apps/ws-server/dist/index.js

@@ -62,6 +62,18 @@ wss.on("connection", (socket, req) => __awaiter(void 0, void 0, void 0, function
                 break;
             case "disconnect_room":
                 for (const [roomId, connections] of activeRooms.entries()) {
+                    const isMember = connections.some((conn) => conn.socket === socket);
+                    if (isMember) {
+                        connections.forEach((member) => {
+                            if (member.socket !== socket) {
+                                member.socket.send(JSON.stringify({
+                                    type: "disconnect_room",
+                                    userId: validMessage.data.userId,
+                                    roomId: roomId,
+                                }));
+                            }
+                        });
+                    }
                     const updatedConnections = connections.filter((conn) => conn.socket !== socket);
                     if (updatedConnections.length === 0) {
                         activeRooms.delete(roomId);
@@ -194,13 +206,47 @@ wss.on("connection", (socket, req) => __awaiter(void 0, void 0, void 0, function
                 }
                 break;
             }
+            case "cursor": {
+                const socketList = activeRooms.get(validMessage.data.roomId);
+                if (!(socketList === null || socketList === void 0 ? void 0 : socketList.some((conn) => conn.userId === validMessage.data.userId && conn.socket === socket))) {
+                    socket.send(JSON.stringify({
+                        type: "error_message",
+                        content: "Not connected to the room",
+                    }));
+                    return;
+                }
+                // Broadcast cursor position purely to other users in the room
+                socketList === null || socketList === void 0 ? void 0 : socketList.forEach((member) => {
+                    if (member.socket !== socket) {
+                        member.socket.send(JSON.stringify({
+                            type: "cursor",
+                            userId: validMessage.data.userId,
+                            roomId: validMessage.data.roomId,
+                            content: validMessage.data.content,
+                        }));
+                    }
+                });
+                break;
+            }
         }
     }));
     socket.on("close", () => {
         const status = userVerificationStatus.get(socket);
         console.log(`[WS Server] Connection closed for User: ${(status === null || status === void 0 ? void 0 : status.userId) || 'unverified'}`);
         userVerificationStatus.delete(socket);
         for (const [roomId, connections] of activeRooms.entries()) {
+            const isMember = connections.some((conn) => conn.socket === socket);
+            if (isMember && (status === null || status === void 0 ? void 0 : status.userId)) {
+                connections.forEach((member) => {
+                    if (member.socket !== socket) {
+                        member.socket.send(JSON.stringify({
+                            type: "disconnect_room",
+                            userId: status.userId,
+                            roomId: roomId,
+                        }));
+                    }
+                });
+            }
             const updatedConnections = connections.filter((conn) => conn.socket !== socket);
             if (updatedConnections.length === 0) {
                 activeRooms.delete(roomId);