pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: remove behaviours dependent on connectionState

Browse Source 
Before this commit, there were some usages of
RTCPeerConnection.connectionState which is not available on some
browsers, including Firefox.

This commit fixes this issue and make it so that we only use
RTCPeerConnection.iceConnectionState instead.

closes odoo/odoo#78064

X-original-commit: 297442f72e23bc1a03ea857699fcae20b5cd0bbc
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
This commit is contained in:
Thanh Dodeur
2021-10-08 16:09:21 +00:00
parent 07670d41a8
commit 08a60701ac
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/models/rtc/rtc.js
+11 -6
View File
@@ -548,7 +548,7 @@ function factory(dependencies) {
*/
async _handleRtcTransactionAnswer(fromToken, { sdp }) {
const peerConnection = this._peerConnections[fromToken];
if (!peerConnection || peerConnection.connectionState === 'closed' || peerConnection.signalingState === 'stable') {
if (!peerConnection || this.invalidIceConnectionStates.has(peerConnection.iceConnectionState) || peerConnection.signalingState === 'stable') {
return;
}
if (peerConnection.signalingState === 'have-remote-offer') {
@@ -572,7 +572,7 @@ function factory(dependencies) {
*/
async _handleRtcTransactionICECandidate(fromToken, { candidate }) {
const peerConnection = this._peerConnections[fromToken];
if (!peerConnection || peerConnection.connectionState === 'closed') {
if (!peerConnection || this.invalidIceConnectionStates.has(peerConnection.iceConnectionState)) {
return;
}
const rtcIceCandidate = new window.RTCIceCandidate(candidate);
@@ -593,7 +593,7 @@ function factory(dependencies) {
async _handleRtcTransactionOffer(fromToken, { sdp }) {
const peerConnection = this._peerConnections[fromToken] || this._createPeerConnection(fromToken);
if (!peerConnection || peerConnection.connectionState === 'closed') {
if (!peerConnection || this.invalidIceConnectionStates.has(peerConnection.iceConnectionState)) {
return;
}
if (peerConnection.signalingState === 'have-remote-offer') {
@@ -749,9 +749,6 @@ function factory(dependencies) {
if (peerConnection.iceConnectionState === 'connected') {
return;
}
if (['connected', 'closed'].includes(peerConnection.connectionState)) {
return;
}
this._addLogEntry(token, `calling back to recover ${peerConnection.iceConnectionState} connection, reason: ${reason}`);
await this._notifyPeers([token], {
event: 'disconnect',
@@ -1249,6 +1246,14 @@ function factory(dependencies) {
},
],
}),
/**
* list of connection states considered invalid, which means that
* no action should be taken on such peerConnection.
*/
invalidIceConnectionStates: attr({
default: new Set(['disconnected', 'failed', 'closed']),
readonly: true,
}),
/**
* true if the browser supports webRTC
*/