New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split "room" from "call" when using the standalone signaling server. #492

Merged
merged 8 commits into from Feb 2, 2018

Conversation

Projects
None yet
2 participants
@fancycode
Member

fancycode commented Nov 20, 2017

This is a follow-up to #459

@fancycode fancycode requested a review from nickvergessen Nov 20, 2017

Show outdated Hide outdated js/webrtc.js Outdated
Show outdated Hide outdated lib/Room.php Outdated
Show outdated Hide outdated lib/Controller/SignalingController.php Outdated
try {
$room = $this->manager->getRoomForParticipantByToken($roomId, $userId);
$room = $this->manager->getRoomByToken($roomId);

This comment has been minimized.

@nickvergessen

nickvergessen Nov 20, 2017

Member

I think the only thing that needed a change was to make sure user id is null instead of empty string for guests?

@nickvergessen

nickvergessen Nov 20, 2017

Member

I think the only thing that needed a change was to make sure user id is null instead of empty string for guests?

@fancycode

This comment has been minimized.

Show comment
Hide comment
@fancycode

fancycode Nov 23, 2017

Member

Simplified the code: clients through the standalone signaling server are using the Nextcloud session id as with the internal signaling. The ids get "pinged" by the signaling server to make sure sessions stay active.

Member

fancycode commented Nov 23, 2017

Simplified the code: clients through the standalone signaling server are using the Nextcloud session id as with the internal signaling. The ids get "pinged" by the signaling server to make sure sessions stay active.

@fancycode

This comment has been minimized.

Show comment
Hide comment
@fancycode

fancycode Nov 23, 2017

Member

Nice benefit, this automatically added support for password-protected rooms with the standalone signaling server 🎉

Member

fancycode commented Nov 23, 2017

Nice benefit, this automatically added support for password-protected rooms with the standalone signaling server 🎉

@fancycode

This comment has been minimized.

Show comment
Hide comment
@fancycode
Member

fancycode commented Nov 28, 2017

@nickvergessen nickvergessen modified the milestones: 3.0 (Nextcloud 13.0.0), 3.1 (Nextcloud 13.0.2/3) Jan 8, 2018

@nickvergessen nickvergessen changed the base branch from master to stable13 Jan 15, 2018

@fancycode

This comment has been minimized.

Show comment
Hide comment
@fancycode

fancycode Jan 29, 2018

Member

Rebased and squashed commits - ptal.

I will now be looking at writing some tests for the new backend code.

Member

fancycode commented Jan 29, 2018

Rebased and squashed commits - ptal.

I will now be looking at writing some tests for the new backend code.

* @return string
*/
protected function getInputStream() {
return file_get_contents('php://input');

This comment has been minimized.

@nickvergessen

nickvergessen Jan 30, 2018

Member

IRequest::getContent should do the same

@nickvergessen

nickvergessen Jan 30, 2018

Member

IRequest::getContent should do the same

This comment has been minimized.

@fancycode

fancycode Jan 30, 2018

Member

Doesn't IRequest::getContent already parse the contents if JSON is sent? I need the raw body to verify the checksum.

@fancycode

fancycode Jan 30, 2018

Member

Doesn't IRequest::getContent already parse the contents if JSON is sent? I need the raw body to verify the checksum.

@fancycode fancycode changed the base branch from stable13 to master Feb 2, 2018

@fancycode

This comment has been minimized.

Show comment
Hide comment
@fancycode

fancycode Feb 2, 2018

Member

Rebased to master.

Member

fancycode commented Feb 2, 2018

Rebased to master.

fancycode added some commits Nov 20, 2017

Notify backend when "in-call" status of sessions changes.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
Split "room" from "call" when using the standalone signaling server.
Clients use the regular joinRoom/-Call API and get a Nextcloud session
id. No special handling for sessions from the standalone signaling
server are required.

The signaling server regularly "pings" active sessions to prevent them
from timing out (in case of guest users).

Signed-off-by: Joachim Bauch <bauch@struktur.de>
Update room list on "room" events.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
Add tests for the backend endpoint of "SignalingController".
Signed-off-by: Joachim Bauch <bauch@struktur.de>
Add tests for "BackendNotifier".
Signed-off-by: Joachim Bauch <bauch@struktur.de>
Fix type in condition.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
Fix link to OCS signaling backend.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
Return "DataResponse" to be OCS compatible.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
@nickvergessen

Works now, rebased to hopefully fix tests

@nickvergessen nickvergessen merged commit 362f6f9 into master Feb 2, 2018

1 check passed

continuous-integration/drone/pr the build was successful
Details

@nickvergessen nickvergessen deleted the split_room_call_signaling branch Feb 2, 2018

@nickvergessen nickvergessen modified the milestones: 3.1 (Nextcloud 13.0.2/3), 4.0 (Nextcloud 14) Feb 2, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment