Skip to content

[stable17] Request offer again when receiving peer fails #2475

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

Merged
nickvergessen merged 4 commits into from
Dec 4, 2019
Merged

[stable17] Request offer again when receiving peer fails #2475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d712a7
Fix loading icon not shown on avatar
danxuliu Nov 19, 2019
e7ba1b0
Rename property to a more generic name
danxuliu Jul 15, 2019
32df6b2
Send offer again until a connection is established
danxuliu Nov 22, 2019
6276099
Request offer again when receiving peer fails
danxuliu Jul 23, 2019
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
12 changes: 11 additions & 1 deletion js/views/videoview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,18 @@
this._rawParticipantName = rawParticipantName;
this._participantName = participantName;

// Restore icon if needed after "avatar()" resets it.
var restoreIconLoadingCallback = function() {
if (this._connectionStatus === ConnectionStatus.NEW ||
this._connectionStatus === ConnectionStatus.CHECKING ||
this._connectionStatus === ConnectionStatus.DISCONNECTED_LONG ||
this._connectionStatus === ConnectionStatus.FAILED) {
this.getUI('avatar').addClass('icon-loading');
}
}.bind(this);

if (userId && userId.length) {
this.getUI('avatar').avatar(userId, this.participantAvatarSize);
this.getUI('avatar').avatar(userId, this.participantAvatarSize, undefined, undefined, restoreIconLoadingCallback);
} else {
this.getUI('avatar').imageplaceholder('?', rawParticipantName, this.participantAvatarSize);
this.getUI('avatar').css('background-color', '#b9b9b9');
Expand Down
51 changes: 43 additions & 8 deletions js/webrtc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var spreedPeerConnectionTable = [];
var ownScreenPeer = null;
var hasLocalMedia = false;
var selfInCall = 0; // OCA.SpreedMe.app.FLAG_DISCONNECTED, not available yet.
var delayedCreatePeer = [];
var delayedConnectionToPeer = [];

function updateParticipantsUI(currentUsersNo) {
'use strict';
Expand Down Expand Up @@ -196,6 +196,12 @@ var spreedPeerConnectionTable = [];
if (useMcu) {
// TODO(jojo): Already create peer object to avoid duplicate offers.
webrtc.connection.requestOffer(user, "video");

delayedConnectionToPeer[user.sessionId] = setInterval(function() {
console.log('No offer received for new peer, request offer again');

webrtc.connection.requestOffer(user, 'video');
}, 10000);
} else if (userHasStreams(selfInCall) && (!userHasStreams(user) || sessionId < currentSessionId)) {
// To avoid overloading the user joining a room (who previously called
// all the other participants), we decide who calls who by comparing
Expand All @@ -209,7 +215,19 @@ var spreedPeerConnectionTable = [];
// offer in a reasonable time, the current peer calls the
// remote peer instead of waiting to be called to
// reestablish the connection.
delayedCreatePeer[sessionId] = setTimeout(function() {
delayedConnectionToPeer[sessionId] = setInterval(function() {
// New offers are periodically sent until a connection
// is established. As an offer can not be sent again
// from an existing peer it must be removed and a new
// one must be created from scratch.
webrtc.webrtc.getPeers(sessionId, 'video').forEach(function(peer) {
peer.end();

OCA.SpreedMe.speakers.remove(peer.id, true);
OCA.SpreedMe.videos.remove(peer.id);
});

console.log("No offer nor answer received, sending offer again");
createPeer();
}, 10000);
}
Expand All @@ -228,9 +246,9 @@ var spreedPeerConnectionTable = [];
OCA.SpreedMe.videos.remove(sessionId);
delete spreedMappingTable[sessionId];
delete guestNamesTable[sessionId];
if (delayedCreatePeer[sessionId]) {
clearTimeout(delayedCreatePeer[sessionId]);
delete delayedCreatePeer[sessionId];
if (delayedConnectionToPeer[sessionId]) {
clearInterval(delayedConnectionToPeer[sessionId]);
delete delayedConnectionToPeer[sessionId];
}
});

Expand Down Expand Up @@ -326,6 +344,13 @@ var spreedPeerConnectionTable = [];
});

signaling.on('message', function (message) {
if (message.type === 'answer' && message.roomType === 'video' && delayedConnectionToPeer[message.from]) {
clearInterval(delayedConnectionToPeer[message.from]);
delete delayedConnectionToPeer[message.from];

return;
}

if (message.type !== 'offer') {
return;
}
Expand All @@ -348,9 +373,9 @@ var spreedPeerConnectionTable = [];
}
}

if (message.roomType === 'video' && delayedCreatePeer[message.from]) {
clearTimeout(delayedCreatePeer[message.from]);
delete delayedCreatePeer[message.from];
if (message.roomType === 'video' && delayedConnectionToPeer[message.from]) {
clearInterval(delayedConnectionToPeer[message.from]);
delete delayedConnectionToPeer[message.from];
}

if (!selfInCall) {
Expand Down Expand Up @@ -594,6 +619,16 @@ var spreedPeerConnectionTable = [];

videoView.setConnectionStatus(OCA.Talk.Views.VideoView.ConnectionStatus.FAILED_NO_RESTART);
}
} else {
console.log('Request offer again');

signaling.requestOffer(peer.id, 'video');

delayedConnectionToPeer[peer.id] = setInterval(function() {
console.log('No offer received, request offer again');

signaling.requestOffer(peer.id, 'video');
}, 10000);
}
break;
case 'closed':
Expand Down