From c9aed9da7b792994e7fb64e936cc953385547583 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 12 Nov 2021 18:35:58 +0100 Subject: [PATCH] openvidu-server: revert commit reversion, without polling thread bug --- .../java/io/openvidu/client/OpenViduException.java | 8 +++++--- .../server/kurento/core/KurentoSessionManager.java | 12 +++++++++--- .../server/kurento/endpoint/PublisherEndpoint.java | 2 +- .../io/openvidu/test/e2e/OpenViduTestappUser.java | 4 ---- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/openvidu-client/src/main/java/io/openvidu/client/OpenViduException.java b/openvidu-client/src/main/java/io/openvidu/client/OpenViduException.java index ed79e5ba..3976f3c2 100644 --- a/openvidu-client/src/main/java/io/openvidu/client/OpenViduException.java +++ b/openvidu-client/src/main/java/io/openvidu/client/OpenViduException.java @@ -36,12 +36,14 @@ public class OpenViduException extends JsonRpcErrorException { ROOM_CANNOT_BE_CREATED_ERROR_CODE(204), ROOM_CLOSED_ERROR_CODE(203), ROOM_NOT_FOUND_ERROR_CODE(202), ROOM_GENERIC_ERROR_CODE(201), - USER_ALREADY_STREAMING_ERROR_CODE(106), USER_NOT_STREAMING_ERROR_CODE(105), EXISTING_USER_IN_ROOM_ERROR_CODE(104), USER_CLOSED_ERROR_CODE(103), - USER_NOT_FOUND_ERROR_CODE(102), USER_GENERIC_ERROR_CODE(10), + USER_ALREADY_STREAMING_ERROR_CODE(106), USER_NOT_STREAMING_ERROR_CODE(105), + EXISTING_USER_IN_ROOM_ERROR_CODE(104), USER_CLOSED_ERROR_CODE(103), USER_NOT_FOUND_ERROR_CODE(102), + USER_GENERIC_ERROR_CODE(10), USER_UNAUTHORIZED_ERROR_CODE(401), ROLE_NOT_FOUND_ERROR_CODE(402), SESSIONID_CANNOT_BE_CREATED_ERROR_CODE(403), TOKEN_CANNOT_BE_CREATED_ERROR_CODE(404), EXISTING_FILTER_ALREADY_APPLIED_ERROR_CODE(405), - FILTER_NOT_APPLIED_ERROR_CODE(406), FILTER_EVENT_LISTENER_NOT_FOUND(407), + FILTER_NOT_APPLIED_ERROR_CODE(406), FILTER_EVENT_LISTENER_NOT_FOUND_ERROR_CODE(407), + PUBLISHER_ENDPOINT_NOT_FOUND_ERROR_CODE(408), USER_METADATA_FORMAT_INVALID_ERROR_CODE(500), diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java index 62d8fa3f..0114bd7d 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java @@ -750,8 +750,14 @@ public class KurentoSessionManager extends SessionManager { KurentoParticipant kParticipant = (KurentoParticipant) participant; log.debug("Request [ICE_CANDIDATE] endpoint={} candidate={} " + "sdpMLineIdx={} sdpMid={} ({})", endpointName, candidate, sdpMLineIndex, sdpMid, participant.getParticipantPublicId()); - kParticipant.addIceCandidate(endpointName, new IceCandidate(candidate, sdpMid, sdpMLineIndex)); - sessionEventsHandler.onRecvIceCandidate(participant, transactionId, null); + if (kParticipant.isPublisherEndpointDefined()) { + kParticipant.addIceCandidate(endpointName, new IceCandidate(candidate, sdpMid, sdpMLineIndex)); + sessionEventsHandler.onRecvIceCandidate(participant, transactionId, null); + } else { + throw new OpenViduException(Code.PUBLISHER_ENDPOINT_NOT_FOUND_ERROR_CODE, + "Request to onIceCandidate for connection " + endpointName + + " gone wrong. There is no publisher endpoint available"); + } } catch (OpenViduException e) { log.error("PARTICIPANT {}: Error receiving ICE " + "candidate (epName={}, candidate={})", participant.getParticipantPublicId(), endpointName, candidate, e); @@ -1374,7 +1380,7 @@ public class KurentoSessionManager extends SessionManager { } catch (Exception e) { log.error("Request to addFilterEventListener to stream {} gone wrong. Error: {}", streamId, e.getMessage()); - throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND, + throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND_ERROR_CODE, "Request to addFilterEventListener to stream " + streamId + " gone wrong: " + e.getMessage()); } } diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java index 0ef196b3..4ebce76d 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java @@ -158,7 +158,7 @@ public class PublisherEndpoint extends MediaEndpoint { String streamId = this.getStreamId(); log.error("Request to removeFilterEventListener to stream {} gone wrong: Filter {} has no listener added", streamId, eventType); - throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND, + throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND_ERROR_CODE, "Request to removeFilterEventListener to stream " + streamId + " gone wrong: Filter " + eventType + " has no listener added"); } diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestappUser.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestappUser.java index 96c1f886..5fe13696 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestappUser.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestappUser.java @@ -1,10 +1,6 @@ package io.openvidu.test.e2e; -import java.time.Duration; -import java.time.temporal.ChronoUnit; - import org.openqa.selenium.WebDriver; -import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.WebDriverWait; import io.openvidu.test.browsers.BrowserUser;