Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refresh turn server before the ttl runs out. Support firefox.

This commit is contained in:
David Baker 2014-09-24 17:57:34 +01:00
parent 7dc7c53029
commit 6806caffc7
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
webclient/components/matrix/matrix-call.js
View File

@ -49,15 +49,6 @@ angular.module('MatrixCall', [])
.factory('MatrixCall', ['matrixService', 'matrixPhoneService', '$rootScope', '$timeout', function MatrixCallFactory(matrixService, matrixPhoneService, $rootScope, $timeout) { .factory('MatrixCall', ['matrixService', 'matrixPhoneService', '$rootScope', '$timeout', function MatrixCallFactory(matrixService, matrixPhoneService, $rootScope, $timeout) {
$rootScope.isWebRTCSupported = isWebRTCSupported(); $rootScope.isWebRTCSupported = isWebRTCSupported();
// FIXME: we should prevent any class from being placed or accepted before this has finished
matrixService.getTurnServer().then(function(response) {
console.log("Got TURN URIs: "+response.data.uris);
MatrixCall.turnServer = response.data;
}, function(error) {
console.log("Failed to get TURN URIs");
MatrixCall.turnServer = {};
});
var MatrixCall = function(room_id) { var MatrixCall = function(room_id) {
this.room_id = room_id; this.room_id = room_id;
this.call_id = "c" + new Date().getTime(); this.call_id = "c" + new Date().getTime();
@ -75,6 +66,22 @@ angular.module('MatrixCall', [])
} }
MatrixCall.getTurnServer = function() {
matrixService.getTurnServer().then(function(response) {
console.log("Got TURN URIs: "+response.data.uris);
MatrixCall.turnServer = response.data;
// re-fetch when we're about to reach the TTL
$timeout(MatrixCall.getTurnServer, MatrixCall.turnServer.ttl * 1000 * 0.9);
}, function(error) {
console.log("Failed to get TURN URIs");
MatrixCall.turnServer = {};
$timeout(MatrixCall.getTurnServer, 60000);
});
}
// FIXME: we should prevent any class from being placed or accepted before this has finished
MatrixCall.getTurnServer();
MatrixCall.CALL_TIMEOUT = 60000; MatrixCall.CALL_TIMEOUT = 60000;
MatrixCall.prototype.createPeerConnection = function() { MatrixCall.prototype.createPeerConnection = function() {
@ -82,11 +89,13 @@ angular.module('MatrixCall', [])
if (window.mozRTCPeerConnection) { if (window.mozRTCPeerConnection) {
var iceServers = []; var iceServers = [];
if (MatrixCall.turnServer) { if (MatrixCall.turnServer) {
iceServers.push({ for (var i = 0; i < MatrixCall.turnServer.uris.length; i++) {
'urls': MatrixCall.turnServer.uris, iceServers.push({
'username': MatrixCall.turnServer.username, 'url': MatrixCall.turnServer.uris[i],
'credential': MatrixCall.turnServer.password, 'username': MatrixCall.turnServer.username,
}); 'credential': MatrixCall.turnServer.password,
});
}
} }
pc = new window.mozRTCPeerConnection({"iceServers":iceServers}); pc = new window.mozRTCPeerConnection({"iceServers":iceServers});