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

openvidu-server: RequestMapping WebSocket path /info

pull/553/head
pabloFuente 2020-10-14 11:45:05 +02:00
parent 2ba178760b
commit d9127e8c56
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
View File

@ -69,6 +69,7 @@ import io.openvidu.server.recording.service.RecordingManager;
import io.openvidu.server.recording.service.RecordingManagerUtils;
import io.openvidu.server.recording.service.RecordingManagerUtilsLocalStorage;
import io.openvidu.server.rest.ApiRestPathRewriteFilter;
import io.openvidu.server.rest.RequestMappings;
import io.openvidu.server.rpc.RpcHandler;
import io.openvidu.server.rpc.RpcNotificationService;
import io.openvidu.server.utils.CommandExecutor;
@ -91,7 +92,6 @@ public class OpenViduServer implements JsonRpcConfigurer {
private static final Logger log = LoggerFactory.getLogger(OpenViduServer.class);
public static final String WS_PATH = "/openvidu";
public static String wsUrl;
public static String httpUrl;
@ -241,7 +241,7 @@ public class OpenViduServer implements JsonRpcConfigurer {
@Override
public void registerJsonRpcHandlers(JsonRpcHandlerRegistry registry) {
registry.addHandler(rpcHandler().withPingWatchdog(true).withInterceptors(new HttpHandshakeInterceptor()),
WS_PATH);
RequestMappings.WS_RPC);
}
public static String getContainerIp() throws IOException, InterruptedException {

4
openvidu-server/src/main/java/io/openvidu/server/config/InfoSocketConfig.java
View File

@ -24,13 +24,15 @@ import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
import io.openvidu.server.rest.RequestMappings;
@Configuration
@EnableWebSocket
public class InfoSocketConfig implements WebSocketConfigurer {
@Override
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
registry.addHandler(infoHandler(), "/info").setAllowedOrigins("*");
registry.addHandler(infoHandler(), RequestMappings.WS_INFO).setAllowedOrigins("*");
}
@Bean

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

@ -38,7 +38,6 @@ import io.openvidu.client.OpenViduException.Code;
import io.openvidu.client.internal.ProtocolElements;
import io.openvidu.java.client.OpenViduRole;
import io.openvidu.server.cdr.CallDetailRecord;
import io.openvidu.server.config.InfoHandler;
import io.openvidu.server.config.OpenviduConfig;
import io.openvidu.server.kurento.core.KurentoParticipant;
import io.openvidu.server.kurento.endpoint.KurentoFilter;
@ -52,9 +51,6 @@ public class SessionEventsHandler {
@Autowired
protected RpcNotificationService rpcNotificationService;
@Autowired
protected InfoHandler infoHandler;
@Autowired
protected CallDetailRecord CDR;
@ -303,7 +299,6 @@ public class SessionEventsHandler {
}
public void onNetworkQualityLevelChanged(Session session, JsonObject params) {
session.getParticipants().forEach(p -> {
rpcNotificationService.sendNotification(p.getParticipantPrivateId(),
ProtocolElements.NETWORKQUALITYLEVELCHANGED_METHOD, params);

2
openvidu-server/src/main/java/io/openvidu/server/rest/ApiRestPathRewriteFilter.java
View File

@ -24,6 +24,8 @@ public class ApiRestPathRewriteFilter implements Filter {
protected Map<String, String> PATH_REDIRECTIONS_MAP = new HashMap<String, String>() {
{
// WS
put("/info", RequestMappings.WS_INFO);
// APIs
put("/api/", RequestMappings.API + "/");
put("/config", RequestMappings.API + "/config");

5
openvidu-server/src/main/java/io/openvidu/server/rest/RequestMappings.java
View File

@ -2,10 +2,15 @@ package io.openvidu.server.rest;
public class RequestMappings {
// WebSocket
final public static String WS_RPC = "/openvidu";
final public static String WS_INFO = "/openvidu/info";
// REST API
final public static String API = "/openvidu/api";
final public static String CDR = "/openvidu/cdr";
final public static String API_ELK = "/openvidu/elk";
final public static String API_INSPECTOR = "/openvidu/inspector-api";
// Static resources
final public static String RECORDINGS = "/openvidu/recordings";
final public static String CUSTOM_LAYOUTS = "/openvidu/layouts";
final public static String FRONTEND_CE = "/dashboard";