|
@@ -110,25 +110,30 @@ export class RoomAssistant {
|
|
|
|
|
|
/**
|
|
|
* 离开房间
|
|
|
- * @param {*} clientRoom
|
|
|
- * @param {*} userUniqueId
|
|
|
- * @param {*} roomUniqueId
|
|
|
+ * @param {*} roomId
|
|
|
+ * @param {*} userId
|
|
|
+ * @param {*} user
|
|
|
*/
|
|
|
async leaveRoom(roomId, userId, user) {
|
|
|
- this.room.logger.info("离开房间", userId);
|
|
|
- await this.redis.hDel(roomId, userId);
|
|
|
- const AllRoomUsers = await getAllRoomUsers(roomId);
|
|
|
- const roomConfig = await getRoomConfig(roomId);
|
|
|
- this.socket.broadcast.to(roomId).emit(EVENT.roomOut, {
|
|
|
- user,
|
|
|
- roomsPerson: AllRoomUsers,
|
|
|
- roomsConfig: roomConfig,
|
|
|
- });
|
|
|
- this.socket.broadcast.to(roomId).emit(EVENT.someOneLeaveRoom, {
|
|
|
- user,
|
|
|
- roomsPerson: AllRoomUsers,
|
|
|
- });
|
|
|
- await this.socket.leave(roomId);
|
|
|
+ try {
|
|
|
+ await this.redis.hDel(roomId, userId);
|
|
|
+ this.room.logger.info("离开房间", userId, AllRoomUsers);
|
|
|
+ const AllRoomUsers = await getAllRoomUsers(roomId);
|
|
|
+ const roomConfig = await getRoomConfig(roomId);
|
|
|
+ this.socket.broadcast.to(roomId).emit(EVENT.roomOut, {
|
|
|
+ user,
|
|
|
+ roomsPerson: AllRoomUsers,
|
|
|
+ roomsConfig: roomConfig,
|
|
|
+ });
|
|
|
+
|
|
|
+ this.socket.broadcast.to(roomId).emit(EVENT.someOneLeaveRoom, {
|
|
|
+ user,
|
|
|
+ roomsPerson: AllRoomUsers,
|
|
|
+ });
|
|
|
+ await this.socket.leave(roomId);
|
|
|
+ } catch (error) {
|
|
|
+ console.log("leaveRoom::error", error);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -227,7 +232,7 @@ export class RoomAssistant {
|
|
|
watchRoomExpired(callback) {
|
|
|
subClient.subscribe("__keyevent@0__:expired", this.watchRoomExpiredFn);
|
|
|
}
|
|
|
- watchRoomExpiredFn(key) {
|
|
|
+ async watchRoomExpiredFn(key) {
|
|
|
console.log("key=> ", key);
|
|
|
}
|
|
|
unWatchRoomExpired() {
|