From d22b3b0f5e8f69010765dbe8fbc40ef8d43dafca Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Thu, 7 Mar 2019 12:04:46 +0100 Subject: [PATCH] openvidu-server: KMS events small refactoring --- .../KurentoParticipantEndpointConfig.java | 35 +++++++++---------- .../server/kurento/endpoint/KmsEvent.java | 15 ++++---- .../kurento/endpoint/KmsMediaEvent.java | 8 +++-- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java index b1b6976a..9498a7a9 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java @@ -43,9 +43,8 @@ public class KurentoParticipantEndpointConfig { String msg = "KMS event [MediaFlowInStateChange] -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName() + " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp(); - KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner().getSessionId(), - endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), event.getMediaType(), - endpoint.createdAt()); + KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), + event.getMediaType(), endpoint.createdAt()); endpoint.kmsEvents.add(kmsEvent); this.CDR.log(kmsEvent); this.infoHandler.sendInfo(msg); @@ -56,9 +55,8 @@ public class KurentoParticipantEndpointConfig { String msg = "KMS event [MediaFlowOutStateChange] -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName() + " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp(); - KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner().getSessionId(), - endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), event.getMediaType(), - endpoint.createdAt()); + KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), + event.getMediaType(), endpoint.createdAt()); endpoint.kmsEvents.add(kmsEvent); this.CDR.log(kmsEvent); this.infoHandler.sendInfo(msg); @@ -68,8 +66,8 @@ public class KurentoParticipantEndpointConfig { endpoint.getWebEndpoint().addIceGatheringDoneListener(event -> { String msg = "KMS event [IceGatheringDone] -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint + ") | timestamp: " + event.getTimestamp(); - KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), - endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); + KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), + endpoint.createdAt()); endpoint.kmsEvents.add(kmsEvent); this.CDR.log(kmsEvent); this.infoHandler.sendInfo(msg); @@ -80,8 +78,8 @@ public class KurentoParticipantEndpointConfig { String msg = "KMS event [ConnectionStateChanged]: -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint + ") | oldState: " + event.getOldState() + " | newState: " + event.getNewState() + " | timestamp: " + event.getTimestamp(); - KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), - endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); + KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), + endpoint.createdAt()); endpoint.kmsEvents.add(kmsEvent); this.CDR.log(kmsEvent); this.infoHandler.sendInfo(msg); @@ -94,8 +92,8 @@ public class KurentoParticipantEndpointConfig { String msg = "KMS event [NewCandidatePairSelected]: -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint + ") | local: " + endpoint.selectedLocalIceCandidate + " | remote: " + endpoint.selectedRemoteIceCandidate + " | timestamp: " + event.getTimestamp(); - KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), - endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); + KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), + endpoint.createdAt()); endpoint.kmsEvents.add(kmsEvent); this.CDR.log(kmsEvent); this.infoHandler.sendInfo(msg); @@ -106,9 +104,8 @@ public class KurentoParticipantEndpointConfig { String msg = "KMS event [MediaTranscodingStateChange]: -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint + ") | state: " + event.getState().name() + " | mediaType: " + event.getMediaType() + " | binName: " + event.getBinName() + " | timestamp: " + event.getTimestamp(); - KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner().getSessionId(), - endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), event.getMediaType(), - endpoint.createdAt()); + KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), + event.getMediaType(), endpoint.createdAt()); endpoint.kmsEvents.add(kmsEvent); this.CDR.log(kmsEvent); this.infoHandler.sendInfo(msg); @@ -121,8 +118,8 @@ public class KurentoParticipantEndpointConfig { + typeOfEndpoint + ") | state: " + event.getState().name() + " | componentId: " + event.getComponentId() + " | streamId: " + event.getStreamId() + " | timestamp: " + event.getTimestamp(); - KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), - endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); + KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), + endpoint.createdAt()); endpoint.kmsEvents.add(kmsEvent); this.CDR.log(kmsEvent); this.infoHandler.sendInfo(msg); @@ -134,8 +131,8 @@ public class KurentoParticipantEndpointConfig { String msg = "KMS event [ERROR]: -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint + ") | errorCode: " + event.getErrorCode() + " | description: " + event.getDescription() + " | timestamp: " + event.getTimestamp(); - KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner().getSessionId(), - endpoint.getOwner().getParticipantPublicId(), endpoint.getEndpointName(), endpoint.createdAt()); + KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), + endpoint.createdAt()); endpoint.kmsEvents.add(kmsEvent); this.CDR.log(kmsEvent); this.infoHandler.sendInfo(msg); diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java index 6ef24b78..d5f1862b 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java @@ -22,19 +22,19 @@ import org.kurento.jsonrpc.JsonUtils; import com.google.gson.JsonObject; +import io.openvidu.server.core.Participant; + public class KmsEvent { long timestamp; long msSinceCreation; - String sessionId; - String connectionId; + Participant participant; String endpoint; RaiseBaseEvent event; - public KmsEvent(RaiseBaseEvent event, String sessionId, String connectionId, String endpointName, long createdAt) { + public KmsEvent(RaiseBaseEvent event, Participant participant, String endpointName, long createdAt) { this.event = event; - this.sessionId = sessionId; - this.connectionId = connectionId; + this.participant = participant; this.endpoint = endpointName; this.timestamp = System.currentTimeMillis(); // TODO: Change to event.getTimestampMillis() this.msSinceCreation = this.timestamp - createdAt; @@ -46,8 +46,9 @@ public class KmsEvent { JsonObject json = JsonUtils.toJsonObject(event); json.remove("tags"); json.addProperty("timestamp", timestamp); - json.addProperty("session", sessionId); - json.addProperty("connection", connectionId); + json.addProperty("session", participant.getSessionId()); + json.addProperty("user", participant.getFinalUserId()); + json.addProperty("connection", participant.getParticipantPublicId()); json.addProperty("endpoint", this.endpoint); json.addProperty("msSinceEndpointCreation", msSinceCreation); return json; diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsMediaEvent.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsMediaEvent.java index 8682f853..ac741118 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsMediaEvent.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsMediaEvent.java @@ -22,13 +22,15 @@ import org.kurento.client.MediaType; import com.google.gson.JsonObject; +import io.openvidu.server.core.Participant; + public class KmsMediaEvent extends KmsEvent { MediaType mediaType; - public KmsMediaEvent(MediaEvent event, String sessionId, String connectionId, String endpointName, - MediaType mediaType, long createdAt) { - super(event, sessionId, connectionId, endpointName, createdAt); + public KmsMediaEvent(MediaEvent event, Participant participant, String endpointName, MediaType mediaType, + long createdAt) { + super(event, participant, endpointName, createdAt); this.mediaType = mediaType; }