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

openvidu-server: minor refactoring in SessionManager new Participant operation

pull/715/head
pabloFuente 2022-04-21 18:21:01 +02:00
parent 16c1003584
commit 4ab7286978
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
View File

@ -361,7 +361,8 @@ public abstract class SessionManager {
public Token newTokenForInsecureUser(Session session, String token, ConnectionProperties connectionProperties) public Token newTokenForInsecureUser(Session session, String token, ConnectionProperties connectionProperties)
throws Exception { throws Exception {
Token tokenObj = new Token(token, session.getSessionId(), connectionProperties, this.coturnCredentialsService.createUser()); Token tokenObj = new Token(token, session.getSessionId(), connectionProperties,
this.coturnCredentialsService.createUser());
session.storeToken(tokenObj); session.storeToken(tokenObj);
return tokenObj; return tokenObj;
} }
@ -409,13 +410,9 @@ public abstract class SessionManager {
String sessionId = session.getSessionId(); String sessionId = session.getSessionId();
if (this.sessionidParticipantpublicidParticipant.get(sessionId) != null) { if (this.sessionidParticipantpublicidParticipant.get(sessionId) != null) {
Participant p = new Participant(finalUserId, participantPrivateId, token.getConnectionId(), sessionId, Participant p = newParticipantAux(sessionId, session.getUniqueSessionId(), finalUserId,
session.getUniqueSessionId(), token, clientMetadata, location, platform, participantPrivateId, token.getConnectionId(), token, clientMetadata, location, platform,
EndpointType.WEBRTC_ENDPOINT, null); EndpointType.WEBRTC_ENDPOINT);
this.tokenRegister.registerToken(sessionId, p, token);
this.sessionidParticipantpublicidParticipant.get(sessionId).put(p.getParticipantPublicId(), p);
this.sessionidFinalUsers.get(sessionId).computeIfAbsent(finalUserId, k -> { this.sessionidFinalUsers.get(sessionId).computeIfAbsent(finalUserId, k -> {
log.info("Participant {} of session {} is a final user connecting to this session for the first time", log.info("Participant {} of session {} is a final user connecting to this session for the first time",
@ -434,13 +431,9 @@ public abstract class SessionManager {
String clientMetadata) { String clientMetadata) {
String sessionId = session.getSessionId(); String sessionId = session.getSessionId();
if (this.sessionidParticipantpublicidParticipant.get(sessionId) != null) { if (this.sessionidParticipantpublicidParticipant.get(sessionId) != null) {
Participant p = new Participant(null, participantPrivateId, ProtocolElements.RECORDER_PARTICIPANT_PUBLICID, return newParticipantAux(sessionId, session.getUniqueSessionId(), null, participantPrivateId,
sessionId, session.getUniqueSessionId(), token, clientMetadata, null, null, ProtocolElements.RECORDER_PARTICIPANT_PUBLICID, token, clientMetadata, null, null,
EndpointType.WEBRTC_ENDPOINT, null); EndpointType.WEBRTC_ENDPOINT);
this.tokenRegister.registerToken(sessionId, p, token);
this.sessionidParticipantpublicidParticipant.get(sessionId)
.put(ProtocolElements.RECORDER_PARTICIPANT_PUBLICID, p);
return p;
} else { } else {
throw new OpenViduException(Code.ROOM_NOT_FOUND_ERROR_CODE, sessionId); throw new OpenViduException(Code.ROOM_NOT_FOUND_ERROR_CODE, sessionId);
} }
@ -450,11 +443,8 @@ public abstract class SessionManager {
String platform) { String platform) {
String sessionId = session.getSessionId(); String sessionId = session.getSessionId();
if (this.sessionidParticipantpublicidParticipant.get(sessionId) != null) { if (this.sessionidParticipantpublicidParticipant.get(sessionId) != null) {
Participant p = new Participant(ipcamId, ipcamId, ipcamId, sessionId, session.getUniqueSessionId(), token, return newParticipantAux(sessionId, session.getUniqueSessionId(), ipcamId, ipcamId, ipcamId, token, null,
null, location, platform, EndpointType.PLAYER_ENDPOINT, null); location, platform, EndpointType.PLAYER_ENDPOINT);
this.tokenRegister.registerToken(sessionId, p, token);
this.sessionidParticipantpublicidParticipant.get(sessionId).put(ipcamId, p);
return p;
} else { } else {
throw new OpenViduException(Code.ROOM_NOT_FOUND_ERROR_CODE, sessionId); throw new OpenViduException(Code.ROOM_NOT_FOUND_ERROR_CODE, sessionId);
} }
@ -695,4 +685,14 @@ public abstract class SessionManager {
}); });
} }
private Participant newParticipantAux(String sessionId, String uniqueSessionId, String finalUserId,
String participantPrivateId, String participantPublicId, Token token, String clientMetadata,
GeoLocation location, String platform, EndpointType endpointType) {
Participant p = new Participant(finalUserId, participantPrivateId, participantPublicId, sessionId,
uniqueSessionId, token, clientMetadata, location, platform, endpointType, null);
this.tokenRegister.registerToken(sessionId, p, token);
this.sessionidParticipantpublicidParticipant.get(sessionId).put(p.getParticipantPublicId(), p);
return p;
}
} }