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

fancycode · 2017-11-20T14:11:37Z

This is a follow-up to #459

nickvergessen · 2017-11-20T15:40:02Z

js/webrtc.js

@@ -146,6 +143,8 @@ var spreedPeerConnectionTable = [];
 			});

 			if (!selfInCall) {
+				// Own session is no longer in the call, disconnect from all others.
+				usersChanged([], previousUsersInRoom);


nickvergessen · 2017-11-20T15:46:11Z

lib/Room.php

+	 * @param string $sessionId
+	 * @return bool
+	 */
+	public function updateUserSessionId($userId, $sessionId) {


Please check that the user id is not null (guest)

nickvergessen · 2017-11-20T15:48:17Z

lib/Controller/SignalingController.php

+			// TODO(fancycode): This will remove the user from other rooms
+			// he is currently in. Needs to get communicated to the signaling
+			// server.
+			$room->updateUserSessionId($userId, $sessionId);


Why all these changes? The session id does not change when joining/leaving a room

nickvergessen · 2017-11-20T15:52:30Z

lib/Controller/SignalingController.php

 		try {
-			$room = $this->manager->getRoomForParticipantByToken($roomId, $userId);
+			$room = $this->manager->getRoomByToken($roomId);


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

fancycode · 2017-11-23T16:38:04Z

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 · 2017-11-23T16:39:08Z

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

fancycode · 2017-11-28T09:52:50Z

@nickvergessen ptal

fancycode · 2018-01-29T14:48:01Z

Rebased and squashed commits - ptal.

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

nickvergessen · 2018-01-30T10:04:38Z

lib/Controller/SignalingController.php

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


IRequest::getContent should do the same

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

nickvergessen · 2018-01-31T15:48:13Z

lib/Controller/SignalingController.php

 		try {
-			$room = $this->manager->getRoomForParticipantByToken($roomId, $userId);
+			$room = $this->manager->getRoomByToken($roomId);
 		} catch (RoomNotFoundException $e) {
 			return new JSONResponse([


Since this is a OCSController now, you should return DataResponse only.
In your client you can set the accept header or append format=json to get json:
https://docs.nextcloud.com/server/12/developer_manual/core/externalapi.html#output

fancycode · 2018-02-02T09:34:16Z

Rebased to master.

Signed-off-by: Joachim Bauch <bauch@struktur.de>

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>

Signed-off-by: Joachim Bauch <bauch@struktur.de>

nickvergessen

Works now, rebased to hopefully fix tests

Bump @babel/preset-env from 7.5.4 to 7.5.5

fancycode requested a review from nickvergessen November 20, 2017 14:11

nickvergessen reviewed Nov 20, 2017

View reviewed changes

nickvergessen requested changes Nov 20, 2017

View reviewed changes

nickvergessen added this to the 3.0 (Nextcloud 13.0.0) milestone Nov 20, 2017

nickvergessen added 2. developing bug feature: signaling 📶 Internal and external signaling backends labels Nov 20, 2017

fancycode added 3. to review and removed 2. developing labels Nov 28, 2017

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

nickvergessen changed the base branch from master to stable13 January 15, 2018 13:48

fancycode force-pushed the split_room_call_signaling branch 4 times, most recently from 43ba0e8 to 9c0be57 Compare January 29, 2018 14:47

nickvergessen reviewed Jan 30, 2018

View reviewed changes

fancycode force-pushed the split_room_call_signaling branch 2 times, most recently from 8600dcb to e9121c9 Compare January 30, 2018 12:42

fancycode mentioned this pull request Jan 30, 2018

Define and document signaling API #339

Closed

nickvergessen reviewed Jan 31, 2018

View reviewed changes

fancycode force-pushed the split_room_call_signaling branch from 925054b to b0fee66 Compare February 2, 2018 09:33

fancycode changed the base branch from stable13 to master February 2, 2018 09:34

fancycode added 2 commits February 2, 2018 11:42

Notify backend when "in-call" status of sessions changes.

8214f22

Signed-off-by: Joachim Bauch <bauch@struktur.de>

fancycode added 6 commits February 2, 2018 11:43

Update room list on "room" events.

3f4f0b1

Signed-off-by: Joachim Bauch <bauch@struktur.de>

Add tests for the backend endpoint of "SignalingController".

8825193

Signed-off-by: Joachim Bauch <bauch@struktur.de>

Add tests for "BackendNotifier".

2b1bc06

Signed-off-by: Joachim Bauch <bauch@struktur.de>

Fix type in condition.

9a39ed9

Signed-off-by: Joachim Bauch <bauch@struktur.de>

Fix link to OCS signaling backend.

f54e9de

Signed-off-by: Joachim Bauch <bauch@struktur.de>

Return "DataResponse" to be OCS compatible.

e3ef4d2

Signed-off-by: Joachim Bauch <bauch@struktur.de>

nickvergessen force-pushed the split_room_call_signaling branch from b0fee66 to e3ef4d2 Compare February 2, 2018 10:43

nickvergessen approved these changes Feb 2, 2018

View reviewed changes

nickvergessen added the backport-request label Feb 2, 2018

nickvergessen merged commit 362f6f9 into master Feb 2, 2018

nickvergessen deleted the split_room_call_signaling branch February 2, 2018 10:51

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

fancycode mentioned this pull request Feb 2, 2018

[stable13] Split "room" from "call" when using the standalone signaling server. #622

Merged

nickvergessen removed the backport-request label Feb 12, 2018

nickvergessen mentioned this pull request Feb 13, 2018

Prep release of 3.1.0 #656

Merged

marcoambrosini pushed a commit that referenced this pull request Oct 9, 2019

Bump @babel/preset-env from 7.5.4 to 7.5.5 (#492)

2701144

Bump @babel/preset-env from 7.5.4 to 7.5.5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

fancycode commented Nov 20, 2017

nickvergessen Nov 20, 2017

nickvergessen Nov 20, 2017

nickvergessen Nov 20, 2017

nickvergessen Nov 20, 2017

fancycode commented Nov 23, 2017

fancycode commented Nov 23, 2017

fancycode commented Nov 28, 2017

fancycode commented Jan 29, 2018

nickvergessen Jan 30, 2018

fancycode Jan 30, 2018

nickvergessen Jan 31, 2018

fancycode Feb 1, 2018

fancycode commented Feb 2, 2018

nickvergessen left a comment

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

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

Conversation

fancycode commented Nov 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fancycode commented Nov 23, 2017

fancycode commented Nov 23, 2017

fancycode commented Nov 28, 2017

fancycode commented Jan 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fancycode commented Feb 2, 2018

nickvergessen left a comment

Choose a reason for hiding this comment