mirror of
https://mau.dev/maunium/synapse.git
synced 2024-10-01 01:36:05 -04:00
Refresh turn server before the ttl runs out. Support firefox.
This commit is contained in:
parent
7dc7c53029
commit
6806caffc7
@ -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,12 +89,14 @@ angular.module('MatrixCall', [])
|
|||||||
if (window.mozRTCPeerConnection) {
|
if (window.mozRTCPeerConnection) {
|
||||||
var iceServers = [];
|
var iceServers = [];
|
||||||
if (MatrixCall.turnServer) {
|
if (MatrixCall.turnServer) {
|
||||||
|
for (var i = 0; i < MatrixCall.turnServer.uris.length; i++) {
|
||||||
iceServers.push({
|
iceServers.push({
|
||||||
'urls': MatrixCall.turnServer.uris,
|
'url': MatrixCall.turnServer.uris[i],
|
||||||
'username': MatrixCall.turnServer.username,
|
'username': MatrixCall.turnServer.username,
|
||||||
'credential': MatrixCall.turnServer.password,
|
'credential': MatrixCall.turnServer.password,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pc = new window.mozRTCPeerConnection({"iceServers":iceServers});
|
pc = new window.mozRTCPeerConnection({"iceServers":iceServers});
|
||||||
//pc = new window.mozRTCPeerConnection({'url': stunServer});
|
//pc = new window.mozRTCPeerConnection({'url': stunServer});
|
||||||
|
Loading…
Reference in New Issue
Block a user