Skip to content

Handle error when joining room in the external signaling server #3804

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.

Sign up for GitHub

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

Closed
danxuliu wants to merge 2 commits into from
Closed

Handle error when joining room in the external signaling server #3804

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7b307b
Remove dead code
danxuliu Jun 12, 2020
8d43dbb
Handle error when joining room in the external signaling server
danxuliu Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions src/utils/signaling.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ Signaling.Standalone.prototype._joinRoomSuccess = function(token, nextcloudSessi
'sessionid': nextcloudSessionId,
},
}, function(data) {
this.joinResponseReceived(data, token)
this.joinResponseReceived(data, token, nextcloudSessionId)
}.bind(this))
}

Expand Down Expand Up @@ -958,8 +958,16 @@ Signaling.Standalone.prototype.joinCall = function(token, flags) {
return Signaling.Base.prototype.joinCall.apply(this, arguments)
}

Signaling.Standalone.prototype.joinResponseReceived = function(data, token) {
Signaling.Standalone.prototype.joinResponseReceived = function(data, token, nextcloudSessionId) {
console.debug('Joined', data, token)

if (data.type === 'error') {
// Keep trying until the room is joined in the signaling server too.
this._joinRoomSuccess(token, nextcloudSessionId)

return
}

this.signalingRoomJoined = token
if (this.pendingJoinCall && token === this.pendingJoinCall.token) {
const pendingJoinCallResolve = this.pendingJoinCall.resolve
Expand All @@ -973,16 +981,6 @@ Signaling.Standalone.prototype.joinResponseReceived = function(data, token) {

this.pendingJoinCall = null
}
if (this.roomCollection) {
// The list of rooms is not fetched from the server. Update ping
// of joined room so it gets sorted to the top.
this.roomCollection.forEach(function(room) {
if (room.get('token') === token) {
room.set('lastPing', (new Date()).getTime() / 1000)
}
})
this.roomCollection.sort()
}
}

Signaling.Standalone.prototype._doLeaveRoom = function(token) {
Expand Down