admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release/2024-10-04: Hotfix

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-10-01 13:37:34 -04:00
parent b7423aebf6
commit a883b817b0
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/web-sockets/redisSocketEvents.js
View File

@@ -33,12 +33,14 @@ const redisSocketEvents = (io, { addUserToRoom, getUsersInRoom, removeUserFromRo
try { try {
const room = getBodyshopRoom(bodyshopUUID); const room = getBodyshopRoom(bodyshopUUID);
socket.join(room); socket.join(room);
await addUserToRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
createLogEvent(socket, "DEBUG", `Client joined bodyshop room: ${room}`); createLogEvent(socket, "DEBUG", `Client joined bodyshop room: ${room}`);
// TODO Removed room functionality for now
// await addUserToRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
// Notify all users in the room about the updated user list // Notify all users in the room about the updated user list
const usersInRoom = await getUsersInRoom(room); // const usersInRoom = await getUsersInRoom(room);
io.to(room).emit("room-users-updated", usersInRoom); // io.to(room).emit("room-users-updated", usersInRoom);
} catch (error) { } catch (error) {
createLogEvent(socket, "ERROR", `Error joining room: ${error}`); createLogEvent(socket, "ERROR", `Error joining room: ${error}`);
} }
@@ -54,14 +56,14 @@ const redisSocketEvents = (io, { addUserToRoom, getUsersInRoom, removeUserFromRo
} }
}); });
socket.on("get-room-users", async (bodyshopUUID, callback) => { // socket.on("get-room-users", async (bodyshopUUID, callback) => {
try { // try {
const usersInRoom = await getUsersInRoom(getBodyshopRoom(bodyshopUUID)); // const usersInRoom = await getUsersInRoom(getBodyshopRoom(bodyshopUUID));
callback(usersInRoom); // callback(usersInRoom);
} catch (error) { // } catch (error) {
createLogEvent(socket, "ERROR", `Error getting room: ${error}`); // createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
} // }
}); // });
socket.on("broadcast-to-bodyshop", async (bodyshopUUID, message) => { socket.on("broadcast-to-bodyshop", async (bodyshopUUID, message) => {
try { try {
@@ -77,11 +79,12 @@ const redisSocketEvents = (io, { addUserToRoom, getUsersInRoom, removeUserFromRo
try { try {
createLogEvent(socket, "DEBUG", `User disconnected.`); createLogEvent(socket, "DEBUG", `User disconnected.`);
// TODO Remove room functionality for now
// Get all rooms the socket is part of // Get all rooms the socket is part of
const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id); // const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id);
for (const room of rooms) { // for (const room of rooms) {
await removeUserFromRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id }); // await removeUserFromRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
} // }
} catch (error) { } catch (error) {
createLogEvent(socket, "ERROR", `Error getting room: ${error}`); createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
} }