ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: Recover endReason when ghost participant detected for webhook notifications

pull/828/head
cruizba 2023-10-16 12:49:47 +02:00
parent a14f8d997d
commit ea846ac415
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openvidu-server/src/main/java/io/openvidu/server/rpc/RpcNotificationService.java
View File

@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
import com.google.gson.JsonObject;
import io.openvidu.client.OpenViduException;
import io.openvidu.server.core.EndReason;
import io.openvidu.server.core.IdentifierPrefixes;
public class RpcNotificationService {
@ -129,9 +130,11 @@ public class RpcNotificationService {
log.warn("Notification '{}' couldn't be sent to participant with privateId {}: {}", method,
participantPrivateId, e.getCause().getMessage());
// TODO: this is an ad-hoc fix to clean any ghost participant of sessions
// TODO BEGIN: this is an ad-hoc fix to clean any ghost participant of sessions
log.warn("Removing ghost participant with participant private id {}", participantPrivateId);
this.rpcHandler.leaveRoomAfterConnClosed(participantPrivateId, null);
EndReason reason = getEndReasonFromParams(params);
this.rpcHandler.leaveRoomAfterConnClosed(participantPrivateId, reason);
// TODO END: this is an ad-hoc fix to clean any ghost participant of sessions
} else {
log.error("Exception sending notification '{}': {} to participant with private id {}", method, params,
@ -195,4 +198,21 @@ public class RpcNotificationService {
return participantPrivateId.startsWith(IdentifierPrefixes.IPCAM_ID);
}
/**
* Returns a possible EndReason from the params of a notification.
* Returns null if no EndReason is found
* @param params
* @return EndReason
*/
private EndReason getEndReasonFromParams(Object params) {
try {
if (params != null && params instanceof JsonObject) {
String rawParamReason = ((JsonObject) params).get("reason").getAsString();
return EndReason.valueOf(rawParamReason);
}
} catch (Exception e) {}
log.warn("No EndReason found in notification params");
return null;
}
}