hy/chatapp3-java
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: async quit room compensation

Browse Source
This commit is contained in:
hy001 2026-04-16 21:21:32 +08:00
parent 25c4152325
commit 7331cfea51
2 changed files with 128 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
rc-service/rc-service-live/live-application/src/main/java/com/red/circle/live/app/command/user/LiveQuitRoomExe.java
View File

@ -12,10 +12,12 @@ import com.red.circle.live.infra.database.cache.service.LiveMusicHeartbeatServic
import com.red.circle.other.inner.endpoint.live.ActiveVoiceRoomClient;
import com.red.circle.other.inner.model.dto.live.ActiveVoiceRoomCO;
import com.red.circle.tool.core.collection.CollectionUtils;
import com.red.circle.tool.core.thread.ThreadPoolManager;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
@ -23,6 +25,7 @@ import org.springframework.stereotype.Component;
*
* @author pengliang on 2023/12/12
*/
@Slf4j
@Component
@RequiredArgsConstructor
public class LiveQuitRoomExe {
@ -37,45 +40,66 @@ public class LiveQuitRoomExe {
private static final int CACHE_EXPIRE_MINUTES = 10;
public void execute(AppRoomIdCmd cmd) {
// 移除在线用户
Long roomId = cmd.getRoomId();
Long userId = cmd.requiredReqUserId();
// 同步删除房间本地在线状态，远端补偿交给后台线程处理
liveMicrophoneGateway.removeRoomOnlineUser(
cmd.getRoomId(),
cmd.requiredReqUserId()
roomId,
userId
);
// 下麦克风
List<LiveMicrophone> liveMicrophones = liveMicCacheService.listLiveMicrophone(cmd.getRoomId(),
cmd.requiredReqUserId());
// 同步下掉当前用户占用的本地麦位，避免客户端继续感知到在房状态
List<LiveMicrophone> liveMicrophones = liveMicCacheService.listLiveMicrophone(roomId, userId);
boolean micChanged = false;
if (CollectionUtils.isNotEmpty(liveMicrophones)) {
liveMicrophones.forEach(mic ->
liveMicrophoneGateway.tryMicOpsLock(cmd.getRoomId(), mic.getMicIndex(), () -> {
liveMicCacheService.goDown(cmd.getRoomId(), mic.getMicIndex());
liveMicrophoneGateway.micUserChangeNotice(cmd.getRoomId());
})
);
for (LiveMicrophone mic : liveMicrophones) {
final boolean[] removed = {false};
liveMicrophoneGateway.tryMicOpsLock(roomId, mic.getMicIndex(), () -> {
liveMicCacheService.goDown(roomId, mic.getMicIndex());
removed[0] = true;
});
micChanged = micChanged || removed[0];
}
}
// 移除播放音乐
LiveMusicStatus musicStatus = liveMusicHeartbeatService.getMusicUser(cmd.getRoomId());
// 同步清理本地音乐状态
LiveMusicStatus musicStatus = liveMusicHeartbeatService.getMusicUser(roomId);
if (Objects.nonNull(musicStatus)
&& Objects.equals(musicStatus.getUserId(), cmd.requiredReqUserId())) {
liveMusicHeartbeatService.removeMickUser(cmd.getRoomId());
&& Objects.equals(musicStatus.getUserId(), userId)) {
liveMusicHeartbeatService.removeMickUser(roomId);
}
//将没人的房间存入缓存10分钟
boolean finalMicChanged = micChanged;
ThreadPoolManager.getInstance().execute(() -> {
if (finalMicChanged) {
try {
ResultResponse<ActiveVoiceRoomCO> noBodyRoom = activeVoiceRoomClient.createNoBodyRoom(cmd.getRoomId());
liveMicrophoneGateway.micUserChangeNotice(roomId);
} catch (Exception e) {
log.error("quitRoom micUserChangeNotice error roomId={}, userId={}", roomId, userId, e);
}
}
cacheEmptyRoom(roomId, userId);
});
}
private void cacheEmptyRoom(Long roomId, Long userId) {
try {
ResultResponse<ActiveVoiceRoomCO> noBodyRoom = activeVoiceRoomClient.createNoBodyRoom(roomId);
ActiveVoiceRoomCO body = noBodyRoom.getBody();
if (Objects.nonNull(body)) {
// 缓存空房间信息，设置10分钟过期
String cacheKey = EMPTY_ROOM_CACHE_KEY + cmd.getRoomId();
redisService.setIfAbsent(cacheKey, JSON.toJSONString(body), CACHE_EXPIRE_MINUTES, TimeUnit.MINUTES);
String cacheKey = EMPTY_ROOM_CACHE_KEY + roomId;
redisService.setIfAbsent(
cacheKey,
JSON.toJSONString(body),
CACHE_EXPIRE_MINUTES,
TimeUnit.MINUTES
);
}
} catch (Exception e) {
//ignore
log.error("quitRoom cacheEmptyRoom error roomId={}, userId={}", roomId, userId, e);
}
}
}

48
rc-service/rc-service-live/live-infrastructure/src/main/java/com/red/circle/live/infra/repository/LiveMicrophoneGatewayImpl.java
View File

@ -649,20 +649,10 @@ public class LiveMicrophoneGatewayImpl implements LiveMicrophoneGateway {
@Override
public void removeRoomOnlineUser(Long roomId, Long userId) {
//刷新在线用户信息
userOnlineClient.updateStatusAndSessionId(userId, UserOnlineStatusEnum.IDLE,0L);
this.refreshUserProcess(roomId, liveMicUserCacheService.removeUser(roomId, userId));
//删除用户的心动值
List<LiveHeartbeatCmd> liveHeartbeats = liveHeartbeatClient.listLiveHeartbeat(roomId).getBody();
if(CollectionUtils.isNotEmpty(liveHeartbeats)){
liveHeartbeats= liveHeartbeats.stream()
.filter(item -> !Objects.equals(item.getId(),userId)).collect(
Collectors.toList());
liveHeartbeatClient.create(roomId, liveHeartbeats);
}
LiveRoomUserRefresh liveRoomUserRefresh = liveMicUserCacheService.removeUser(roomId, userId);
ThreadPoolManager.getInstance().execute(
() -> compensateRemoveRoomOnlineUser(roomId, userId, liveRoomUserRefresh)
);
}
@Override
@ -792,4 +782,34 @@ public class LiveMicrophoneGatewayImpl implements LiveMicrophoneGateway {
return list.stream().collect(Collectors.toMap(LiveHeartbeatCmd::getId,LiveHeartbeatCmd::getHeartbeatVal));
}
private void compensateRemoveRoomOnlineUser(Long roomId, Long userId,
LiveRoomUserRefresh liveRoomUserRefresh) {
try {
userOnlineClient.updateStatusAndSessionId(userId, UserOnlineStatusEnum.IDLE, 0L);
} catch (Exception e) {
log.error("removeRoomOnlineUser updateStatusAndSessionId error roomId={}, userId={}", roomId,
userId, e);
}
try {
refreshUserProcess(roomId, liveRoomUserRefresh);
} catch (Exception e) {
log.error("removeRoomOnlineUser refreshUserProcess error roomId={}, userId={}", roomId,
userId, e);
}
try {
List<LiveHeartbeatCmd> liveHeartbeats = liveHeartbeatClient.listLiveHeartbeat(roomId).getBody();
if (CollectionUtils.isNotEmpty(liveHeartbeats)) {
liveHeartbeats = liveHeartbeats.stream()
.filter(item -> !Objects.equals(item.getId(), userId))
.collect(Collectors.toList());
liveHeartbeatClient.create(roomId, liveHeartbeats);
}
} catch (Exception e) {
log.error("removeRoomOnlineUser refreshHeartbeat error roomId={}, userId={}", roomId, userId,
e);
}
}
}