|
@@ -47,13 +47,20 @@ const removeRoom = async (roomId) => {
|
|
|
*/
|
|
|
const joinRoom = async (roomId, userId, user) => {
|
|
|
logger.info("joinRoom", { roomId });
|
|
|
- const hasRoom = await pubClient.exists(roomId);
|
|
|
- if (hasRoom) {
|
|
|
- await pubClient.hSet(roomId, userId, JSON.stringify(user));
|
|
|
- } else {
|
|
|
- logger.info("no room join");
|
|
|
+ try {
|
|
|
+ const hasRoom = await pubClient.exists(roomId);
|
|
|
+ if (hasRoom) {
|
|
|
+ await pubClient.hSet(roomId, userId, JSON.stringify(user));
|
|
|
+ } else {
|
|
|
+ logger.info("no room join");
|
|
|
+ }
|
|
|
+ return Promise.resolve();
|
|
|
+ } catch (error) {
|
|
|
+ logger.error(error);
|
|
|
+ return Promise.reject(error);
|
|
|
}
|
|
|
};
|
|
|
+
|
|
|
/**
|
|
|
* 离开房间
|
|
|
* @param {*} roomId
|
|
@@ -77,7 +84,7 @@ const joinRoomAction = async (roomId, userId, user, socket) => {
|
|
|
socket.join(roomId);
|
|
|
const AllRoomUsers = await getAllRoomUsers(roomId);
|
|
|
const roomConfig = await getRoomConfig(roomId);
|
|
|
- socket.broadcast.to(roomId).emit(EVENT.roomIn, {
|
|
|
+ socket.broadcast.emit(EVENT.roomIn, {
|
|
|
user,
|
|
|
roomsPerson: AllRoomUsers,
|
|
|
roomsConfig: roomConfig,
|
|
@@ -86,7 +93,6 @@ const joinRoomAction = async (roomId, userId, user, socket) => {
|
|
|
logger.info(`已加入房间 :`, { userId });
|
|
|
}
|
|
|
};
|
|
|
-
|
|
|
/**
|
|
|
* 离开房间
|
|
|
* @param {*} clientRoom
|