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

openvidu-server: mediaServer joinRoom response parameter

pull/630/head
pabloFuente 2021-05-28 12:40:46 +02:00
parent b4c6c2b4a7
commit 8e5836a21b
7 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openvidu-browser/src/OpenVidu/OpenVidu.ts
View File

@ -105,6 +105,10 @@ export class OpenVidu {
* @hidden * @hidden
*/ */
finalUserId: string; finalUserId: string;
/**
* @hidden
*/
mediaServer: string;
/** /**
* @hidden * @hidden
*/ */

1
openvidu-browser/src/OpenVidu/Session.ts
View File

@ -1486,6 +1486,7 @@ export class Session extends EventDispatcher {
} }
this.openvidu.role = opts.role; this.openvidu.role = opts.role;
this.openvidu.finalUserId = opts.finalUserId; this.openvidu.finalUserId = opts.finalUserId;
this.openvidu.mediaServer = opts.mediaServer;
this.capabilities = { this.capabilities = {
subscribe: true, subscribe: true,
publish: this.openvidu.role !== 'SUBSCRIBER', publish: this.openvidu.role !== 'SUBSCRIBER',

1
openvidu-browser/src/OpenViduInternal/Interfaces/Private/LocalConnectionOptions.ts
View File

@ -31,4 +31,5 @@ export interface LocalConnectionOptions {
turnUsername: string; turnUsername: string;
turnCredential: string; turnCredential: string;
version: string; version: string;
mediaServer: string;
} }

1
openvidu-client/src/main/java/io/openvidu/client/internal/ProtocolElements.java
View File

@ -152,6 +152,7 @@ public class ProtocolElements {
public static final String PARTICIPANTJOINED_VALUE_PARAM = "value"; public static final String PARTICIPANTJOINED_VALUE_PARAM = "value";
public static final String PARTICIPANTJOINED_SESSION_PARAM = "session"; public static final String PARTICIPANTJOINED_SESSION_PARAM = "session";
public static final String PARTICIPANTJOINED_VERSION_PARAM = "version"; public static final String PARTICIPANTJOINED_VERSION_PARAM = "version";
public static final String PARTICIPANTJOINED_MEDIASERVER_PARAM = "mediaServer";
public static final String PARTICIPANTJOINED_RECORD_PARAM = "record"; public static final String PARTICIPANTJOINED_RECORD_PARAM = "record";
public static final String PARTICIPANTJOINED_ROLE_PARAM = "role"; public static final String PARTICIPANTJOINED_ROLE_PARAM = "role";
public static final String PARTICIPANTJOINED_COTURNIP_PARAM = "coturnIp"; public static final String PARTICIPANTJOINED_COTURNIP_PARAM = "coturnIp";

5
openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
View File

@ -61,6 +61,7 @@ import io.openvidu.java.client.VideoCodec;
import io.openvidu.server.OpenViduServer; import io.openvidu.server.OpenViduServer;
import io.openvidu.server.cdr.CDREventName; import io.openvidu.server.cdr.CDREventName;
import io.openvidu.server.config.Dotenv.DotenvFormatException; import io.openvidu.server.config.Dotenv.DotenvFormatException;
import io.openvidu.server.core.MediaServer;
import io.openvidu.server.recording.RecordingNotification; import io.openvidu.server.recording.RecordingNotification;
import io.openvidu.server.rest.RequestMappings; import io.openvidu.server.rest.RequestMappings;
@ -246,6 +247,10 @@ public class OpenviduConfig {
return false; return false;
} }
public MediaServer getMediaServer() {
return MediaServer.kurento;
}
public String getOpenViduRecordingPath() { public String getOpenViduRecordingPath() {
return this.openviduRecordingPath; return this.openviduRecordingPath;
} }

7
openvidu-server/src/main/java/io/openvidu/server/core/MediaServer.java Normal file
View File

@ -0,0 +1,7 @@
package io.openvidu.server.core;
public enum MediaServer {
kurento, mediasoup
}

5
openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java
View File

@ -153,15 +153,18 @@ public class SessionEventsHandler {
ProtocolElements.PARTICIPANTJOINED_METHOD, notifParams); ProtocolElements.PARTICIPANTJOINED_METHOD, notifParams);
} }
} }
result.addProperty(ProtocolElements.PARTICIPANTJOINED_USER_PARAM, participant.getParticipantPublicId()); result.addProperty(ProtocolElements.PARTICIPANTJOINED_USER_PARAM, participant.getParticipantPublicId());
result.addProperty(ProtocolElements.PARTICIPANTJOINED_FINALUSERID_PARAM, participant.getFinalUserId()); result.addProperty(ProtocolElements.PARTICIPANTJOINED_FINALUSERID_PARAM, participant.getFinalUserId());
result.addProperty(ProtocolElements.PARTICIPANTJOINED_CREATEDAT_PARAM, participant.getActiveAt()); result.addProperty(ProtocolElements.PARTICIPANTJOINED_CREATEDAT_PARAM, participant.getActiveAt());
result.addProperty(ProtocolElements.PARTICIPANTJOINED_METADATA_PARAM, participant.getFullMetadata()); result.addProperty(ProtocolElements.PARTICIPANTJOINED_METADATA_PARAM, participant.getFullMetadata());
result.add(ProtocolElements.PARTICIPANTJOINED_VALUE_PARAM, resultArray); result.add(ProtocolElements.PARTICIPANTJOINED_VALUE_PARAM, resultArray);
result.addProperty(ProtocolElements.PARTICIPANTJOINED_SESSION_PARAM, participant.getSessionId()); result.addProperty(ProtocolElements.PARTICIPANTJOINED_SESSION_PARAM, participant.getSessionId());
result.addProperty(ProtocolElements.PARTICIPANTJOINED_VERSION_PARAM, result.addProperty(ProtocolElements.PARTICIPANTJOINED_VERSION_PARAM,
openviduBuildConfig.getOpenViduServerVersion()); openviduBuildConfig.getOpenViduServerVersion());
result.addProperty(ProtocolElements.PARTICIPANTJOINED_VERSION_PARAM,
this.openviduConfig.getMediaServer().name());
if (participant.getToken() != null) { if (participant.getToken() != null) {
result.addProperty(ProtocolElements.PARTICIPANTJOINED_RECORD_PARAM, participant.getToken().record()); result.addProperty(ProtocolElements.PARTICIPANTJOINED_RECORD_PARAM, participant.getToken().record());
if (participant.getToken().getRole() != null) { if (participant.getToken().getRole() != null) {