Skip to content
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

Fix "silent" parameter not sent again when reconnecting #10688

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Fix "silent" parameter not sent again when reconnecting #10688

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffb896b
Extract resetting current call parameters to its own helper method
danxuliu Oct 12, 2023
ae75668
Fix "silent" parameter not sent again when reconnecting
danxuliu Oct 12, 2023
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
33 changes: 19 additions & 14 deletions src/utils/signaling.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ function Base(settings) {
this.currentRoomToken = null
this.currentCallToken = null
this.currentCallFlags = null
this.currentCallSilent = null
this.nextcloudSessionId = null
this.handlers = {}
this.features = {}
Expand Down Expand Up @@ -169,11 +170,16 @@ Signaling.Base.prototype.getCurrentCallFlags = function() {
return this.currentCallFlags
}

Signaling.Base.prototype._resetCurrentCallParameters = function() {
this.currentCallToken = null
this.currentCallFlags = null
this.currentCallSilent = null
}

Signaling.Base.prototype.disconnect = function() {
this.sessionId = ''
this._trigger('sessionId', [this.sessionId])
this.currentCallToken = null
this.currentCallFlags = null
this._resetCurrentCallParameters()
}

Signaling.Base.prototype.hasFeature = function(feature) {
Expand Down Expand Up @@ -222,8 +228,7 @@ Signaling.Base.prototype.leaveCurrentCall = function() {
return new Promise((resolve, reject) => {
if (this.currentCallToken) {
this.leaveCall(this.currentCallToken).then(() => { resolve() }).catch(reason => { reject(reason) })
this.currentCallToken = null
this.currentCallFlags = null
this._resetCurrentCallParameters()
} else {
resolve()
}
Expand All @@ -239,10 +244,9 @@ Signaling.Base.prototype.joinRoom = function(token, sessionId) {
resolve()
if (this.currentCallToken === token) {
// We were in this call before, join again.
this.joinCall(token, this.currentCallFlags)
this.joinCall(token, this.currentCallFlags, this.currentCallSilent)
} else {
this.currentCallToken = null
this.currentCallFlags = null
this._resetCurrentCallParameters()
}
this._joinRoomSuccess(token, sessionId)
})
Expand Down Expand Up @@ -293,6 +297,7 @@ Signaling.Base.prototype.joinCall = function(token, flags, silent) {
.then(function() {
this.currentCallToken = token
this.currentCallFlags = flags
this.currentCallSilent = silent
this._trigger('joinCall', [token])
resolve()
this._joinCallSuccess(token)
Expand Down Expand Up @@ -358,17 +363,15 @@ Signaling.Base.prototype.leaveCall = function(token, keepToken, all = false) {
resolve()
// We left the current call.
if (!keepToken && token === this.currentCallToken) {
this.currentCallToken = null
this.currentCallFlags = null
this._resetCurrentCallParameters()
}
}.bind(this))
.catch(function() {
this._trigger('leaveCall', [token, keepToken])
reject(new Error())
// We left the current call.
if (!keepToken && token === this.currentCallToken) {
this.currentCallToken = null
this.currentCallFlags = null
this._resetCurrentCallParameters()
}
}.bind(this))
})
Expand Down Expand Up @@ -520,7 +523,7 @@ Signaling.Internal.prototype._startPullingMessages = function() {
localParticipant = message.data.find(participant => participant.sessionId === this.sessionId)
if (this._joinCallAgainOnceDisconnected && !localParticipant.inCall) {
this._joinCallAgainOnceDisconnected = false
this.joinCall(this.currentCallToken, this.currentCallFlags)
this.joinCall(this.currentCallToken, this.currentCallFlags, this.currentCallSilent)
}

break
Expand Down Expand Up @@ -1181,7 +1184,7 @@ Signaling.Standalone.prototype._joinRoomSuccess = function(token, nextcloudSessi
}.bind(this))
}

Signaling.Standalone.prototype.joinCall = function(token, flags) {
Signaling.Standalone.prototype.joinCall = function(token, flags, silent) {
if (this.signalingRoomJoined !== token) {
console.debug('Not joined room yet, not joining call', token)

Expand All @@ -1195,6 +1198,7 @@ Signaling.Standalone.prototype.joinCall = function(token, flags) {
this.pendingJoinCall = {
token,
flags,
silent,
resolve,
reject,
}
Expand All @@ -1214,6 +1218,7 @@ Signaling.Standalone.prototype.joinCall = function(token, flags) {

this.currentCallToken = token
this.currentCallFlags = flags
this.currentCallSilent = silent
this._trigger('joinCall', [token])

resolve()
Expand All @@ -1230,7 +1235,7 @@ Signaling.Standalone.prototype.joinResponseReceived = function(data, token) {
const pendingJoinCallResolve = this.pendingJoinCall.resolve
const pendingJoinCallReject = this.pendingJoinCall.reject

this.joinCall(this.pendingJoinCall.token, this.pendingJoinCall.flags).then(() => {
this.joinCall(this.pendingJoinCall.token, this.pendingJoinCall.flags, this.pendingJoinCall.silent).then(() => {
pendingJoinCallResolve()
}).catch(error => {
pendingJoinCallReject(error)
Expand Down