Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

start towards glare support (currently not much better but no worse than before) including fixing a lot of self/var self/this fails that caused chaos when we started to have more than one call in play.

Browse Source
This commit is contained in:
David Baker 2014-09-11 15:23:06 +01:00
parent 806c49a690
commit fb082cf50f
3 changed files with 116 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webclient/app-controller.js
View File

@ -135,9 +135,9 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even
}); });
$rootScope.$on(matrixPhoneService.INCOMING_CALL_EVENT, function(ngEvent, call) { $rootScope.$on(matrixPhoneService.INCOMING_CALL_EVENT, function(ngEvent, call) {
console.trace("incoming call"); console.log("incoming call");
if ($rootScope.currentCall && $rootScope.currentCall.state != 'ended') { if ($rootScope.currentCall && $rootScope.currentCall.state != 'ended') {
console.trace("rejecting call because we're already in a call"); console.log("rejecting call because we're already in a call");
call.hangup(); call.hangup();
return; return;
} }
@ -146,6 +146,13 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even
$rootScope.currentCall = call; $rootScope.currentCall = call;
}); });
$rootScope.$on(matrixPhoneService.REPLACED_CALL_EVENT, function(ngEvent, oldCall, newCall) {
console.log("call ID "+oldCall+" has been replaced by call ID "+newCall+"!");
newCall.onError = $scope.onCallError;
newCall.onHangup = $scope.onCallHangup;
$rootScope.currentCall = newCall;
});
$scope.answerCall = function() { $scope.answerCall = function() {
$rootScope.currentCall.answer(); $rootScope.currentCall.answer();
}; };
@ -161,7 +168,7 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even
$rootScope.onCallHangup = function(call) { $rootScope.onCallHangup = function(call) {
if (call == $rootScope.currentCall) { if (call == $rootScope.currentCall) {
$timeout(function(){ $timeout(function(){
$rootScope.currentCall = undefined; if (call == $rootScope.currentCall) $rootScope.currentCall = undefined;
}, 4070); }, 4070);
} }
} }

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

@ -40,15 +40,6 @@ window.RTCPeerConnection = window.RTCPeerConnection || window.webkitRTCPeerConne
window.RTCSessionDescription = window.RTCSessionDescription || window.webkitRTCSessionDescription || window.mozRTCSessionDescription; window.RTCSessionDescription = window.RTCSessionDescription || window.webkitRTCSessionDescription || window.mozRTCSessionDescription;
window.RTCIceCandidate = window.RTCIceCandidate || window.webkitRTCIceCandidate || window.mozRTCIceCandidate; window.RTCIceCandidate = window.RTCIceCandidate || window.webkitRTCIceCandidate || window.mozRTCIceCandidate;
var createPeerConnection = function() {
var stunServer = 'stun:stun.l.google.com:19302';
if (window.mozRTCPeerConnection) {
return new window.mozRTCPeerConnection({'url': stunServer});
} else {
return new window.RTCPeerConnection({"iceServers":[{"urls":"stun:stun.l.google.com:19302"}]});
}
}
angular.module('MatrixCall', []) angular.module('MatrixCall', [])
.factory('MatrixCall', ['matrixService', 'matrixPhoneService', '$rootScope', function MatrixCallFactory(matrixService, matrixPhoneService, $rootScope) { .factory('MatrixCall', ['matrixService', 'matrixPhoneService', '$rootScope', function MatrixCallFactory(matrixService, matrixPhoneService, $rootScope) {
var MatrixCall = function(room_id) { var MatrixCall = function(room_id) {
@ -58,8 +49,24 @@ angular.module('MatrixCall', [])
this.didConnect = false; this.didConnect = false;
} }
MatrixCall.prototype.createPeerConnection = function() {
var stunServer = 'stun:stun.l.google.com:19302';
var pc;
if (window.mozRTCPeerConnection) {
pc = window.mozRTCPeerConnection({'url': stunServer});
} else {
pc = new window.RTCPeerConnection({"iceServers":[{"urls":"stun:stun.l.google.com:19302"}]});
}
var self = this;
pc.oniceconnectionstatechange = function() { self.onIceConnectionStateChanged(); };
pc.onsignalingstatechange = function() { self.onSignallingStateChanged(); };
pc.onicecandidate = function(c) { self.gotLocalIceCandidate(c); };
pc.onaddstream = function(s) { self.onAddStream(s); };
return pc;
}
MatrixCall.prototype.placeCall = function(config) { MatrixCall.prototype.placeCall = function(config) {
self = this; var self = this;
matrixPhoneService.callPlaced(this); matrixPhoneService.callPlaced(this);
navigator.getUserMedia({audio: config.audio, video: config.video}, function(s) { self.gotUserMediaForInvite(s); }, function(e) { self.getUserMediaFailed(e); }); navigator.getUserMedia({audio: config.audio, video: config.video}, function(s) { self.gotUserMediaForInvite(s); }, function(e) { self.getUserMediaFailed(e); });
this.state = 'wait_local_media'; this.state = 'wait_local_media';
@ -69,22 +76,23 @@ angular.module('MatrixCall', [])
MatrixCall.prototype.initWithInvite = function(msg) { MatrixCall.prototype.initWithInvite = function(msg) {
this.msg = msg; this.msg = msg;
this.peerConn = createPeerConnection(); this.peerConn = this.createPeerConnection();
self= this; this.peerConn.setRemoteDescription(new RTCSessionDescription(this.msg.offer), this.onSetRemoteDescriptionSuccess, this.onSetRemoteDescriptionError);
this.peerConn.oniceconnectionstatechange = function() { self.onIceConnectionStateChanged(); };
this.peerConn.onicecandidate = function(c) { self.gotLocalIceCandidate(c); };
this.peerConn.onsignalingstatechange = function() { self.onSignallingStateChanged(); };
this.peerConn.onaddstream = function(s) { self.onAddStream(s); };
this.peerConn.setRemoteDescription(new RTCSessionDescription(this.msg.offer), self.onSetRemoteDescriptionSuccess, self.onSetRemoteDescriptionError);
this.state = 'ringing'; this.state = 'ringing';
this.direction = 'inbound'; this.direction = 'inbound';
}; };
MatrixCall.prototype.answer = function() { MatrixCall.prototype.answer = function() {
console.trace("Answering call "+this.call_id); console.log("Answering call "+this.call_id);
self = this; var self = this;
if (!this.localAVStream && !this.waitForLocalAVStream) {
navigator.getUserMedia({audio: true, video: false}, function(s) { self.gotUserMediaForAnswer(s); }, function(e) { self.getUserMediaFailed(e); }); navigator.getUserMedia({audio: true, video: false}, function(s) { self.gotUserMediaForAnswer(s); }, function(e) { self.getUserMediaFailed(e); });
this.state = 'wait_local_media'; this.state = 'wait_local_media';
} else if (this.localAVStream) {
this.gotUserMediaForAnswer(this.localAVStream);
} else if (this.waitForLocalAVStream) {
this.state = 'wait_local_media';
}
}; };
MatrixCall.prototype.stopAllMedia = function() { MatrixCall.prototype.stopAllMedia = function() {
@ -100,8 +108,8 @@ angular.module('MatrixCall', [])
} }
}; };
MatrixCall.prototype.hangup = function() { MatrixCall.prototype.hangup = function(suppressEvent) {
console.trace("Ending call "+this.call_id); console.log("Ending call "+this.call_id);
this.stopAllMedia(); this.stopAllMedia();
if (this.peerConn) this.peerConn.close(); if (this.peerConn) this.peerConn.close();
@ -114,24 +122,23 @@ angular.module('MatrixCall', [])
}; };
matrixService.sendEvent(this.room_id, 'm.call.hangup', undefined, content).then(this.messageSent, this.messageSendFailed); matrixService.sendEvent(this.room_id, 'm.call.hangup', undefined, content).then(this.messageSent, this.messageSendFailed);
this.state = 'ended'; this.state = 'ended';
if (self.onHangup) self.onHangup(self); if (this.onHangup && !suppressEvent) this.onHangup(this);
}; };
MatrixCall.prototype.gotUserMediaForInvite = function(stream) { MatrixCall.prototype.gotUserMediaForInvite = function(stream) {
if (!$rootScope.currentCall || $rootScope.currentCall.state == 'ended') return; if (this.successor) {
this.successor.gotUserMediaForAnswer(stream);
return;
}
if (this.state == 'ended') return;
this.localAVStream = stream; this.localAVStream = stream;
var audioTracks = stream.getAudioTracks(); var audioTracks = stream.getAudioTracks();
for (var i = 0; i < audioTracks.length; i++) { for (var i = 0; i < audioTracks.length; i++) {
audioTracks[i].enabled = true; audioTracks[i].enabled = true;
} }
this.peerConn = createPeerConnection(); this.peerConn = this.createPeerConnection();
self = this; var self = this;
this.peerConn.oniceconnectionstatechange = function() { self.onIceConnectionStateChanged(); };
this.peerConn.onsignalingstatechange = function() { self.onSignallingStateChanged(); };
this.peerConn.onicecandidate = function(c) { self.gotLocalIceCandidate(c); };
this.peerConn.onaddstream = function(s) { self.onAddStream(s); };
this.peerConn.addStream(stream);
this.peerConn.createOffer(function(d) { this.peerConn.createOffer(function(d) {
self.gotLocalOffer(d); self.gotLocalOffer(d);
}, function(e) { }, function(e) {
@ -143,7 +150,7 @@ angular.module('MatrixCall', [])
}; };
MatrixCall.prototype.gotUserMediaForAnswer = function(stream) { MatrixCall.prototype.gotUserMediaForAnswer = function(stream) {
if (!$rootScope.currentCall || $rootScope.currentCall.state == 'ended') return; if (this.state == 'ended') return;
this.localAVStream = stream; this.localAVStream = stream;
var audioTracks = stream.getAudioTracks(); var audioTracks = stream.getAudioTracks();
@ -151,7 +158,7 @@ angular.module('MatrixCall', [])
audioTracks[i].enabled = true; audioTracks[i].enabled = true;
} }
this.peerConn.addStream(stream); this.peerConn.addStream(stream);
self = this; var self = this;
var constraints = { var constraints = {
'mandatory': { 'mandatory': {
'OfferToReceiveAudio': true, 'OfferToReceiveAudio': true,
@ -165,7 +172,7 @@ angular.module('MatrixCall', [])
}; };
MatrixCall.prototype.gotLocalIceCandidate = function(event) { MatrixCall.prototype.gotLocalIceCandidate = function(event) {
console.trace(event); console.log(event);
if (event.candidate) { if (event.candidate) {
var content = { var content = {
version: 0, version: 0,
@ -177,9 +184,9 @@ angular.module('MatrixCall', [])
} }
MatrixCall.prototype.gotRemoteIceCandidate = function(cand) { MatrixCall.prototype.gotRemoteIceCandidate = function(cand) {
console.trace("Got ICE candidate from remote: "+cand); console.log("Got ICE candidate from remote: "+cand);
if (this.state == 'ended') { if (this.state == 'ended') {
console.trace("Ignoring remote ICE candidate because call has ended"); console.log("Ignoring remote ICE candidate because call has ended");
return; return;
} }
var candidateObject = new RTCIceCandidate({ var candidateObject = new RTCIceCandidate({
@ -190,12 +197,12 @@ angular.module('MatrixCall', [])
}; };
MatrixCall.prototype.receivedAnswer = function(msg) { MatrixCall.prototype.receivedAnswer = function(msg) {
this.peerConn.setRemoteDescription(new RTCSessionDescription(msg.answer), self.onSetRemoteDescriptionSuccess, self.onSetRemoteDescriptionError); this.peerConn.setRemoteDescription(new RTCSessionDescription(msg.answer), this.onSetRemoteDescriptionSuccess, this.onSetRemoteDescriptionError);
this.state = 'connecting'; this.state = 'connecting';
}; };
MatrixCall.prototype.gotLocalOffer = function(description) { MatrixCall.prototype.gotLocalOffer = function(description) {
console.trace("Created offer: "+description); console.log("Created offer: "+description);
this.peerConn.setLocalDescription(description); this.peerConn.setLocalDescription(description);
var content = { var content = {
@ -205,14 +212,14 @@ angular.module('MatrixCall', [])
}; };
matrixService.sendEvent(this.room_id, 'm.call.invite', undefined, content).then(this.messageSent, this.messageSendFailed); matrixService.sendEvent(this.room_id, 'm.call.invite', undefined, content).then(this.messageSent, this.messageSendFailed);
self = this; var self = this;
$rootScope.$apply(function() { $rootScope.$apply(function() {
self.state = 'invite_sent'; self.state = 'invite_sent';
}); });
}; };
MatrixCall.prototype.createdAnswer = function(description) { MatrixCall.prototype.createdAnswer = function(description) {
console.trace("Created answer: "+description); console.log("Created answer: "+description);
this.peerConn.setLocalDescription(description); this.peerConn.setLocalDescription(description);
var content = { var content = {
version: 0, version: 0,
@ -220,7 +227,7 @@ angular.module('MatrixCall', [])
answer: description answer: description
}; };
matrixService.sendEvent(this.room_id, 'm.call.answer', undefined, content).then(this.messageSent, this.messageSendFailed); matrixService.sendEvent(this.room_id, 'm.call.answer', undefined, content).then(this.messageSent, this.messageSendFailed);
self = this; var self = this;
$rootScope.$apply(function() { $rootScope.$apply(function() {
self.state = 'connecting'; self.state = 'connecting';
}); });
@ -243,10 +250,10 @@ angular.module('MatrixCall', [])
MatrixCall.prototype.onIceConnectionStateChanged = function() { MatrixCall.prototype.onIceConnectionStateChanged = function() {
if (this.state == 'ended') return; // because ICE can still complete as we're ending the call if (this.state == 'ended') return; // because ICE can still complete as we're ending the call
console.trace("Ice connection state changed to: "+this.peerConn.iceConnectionState); console.log("Ice connection state changed to: "+this.peerConn.iceConnectionState);
// ideally we'd consider the call to be connected when we get media but chrome doesn't implement nay of the 'onstarted' events yet // ideally we'd consider the call to be connected when we get media but chrome doesn't implement nay of the 'onstarted' events yet
if (this.peerConn.iceConnectionState == 'completed' || this.peerConn.iceConnectionState == 'connected') { if (this.peerConn.iceConnectionState == 'completed' || this.peerConn.iceConnectionState == 'connected') {
self = this; var self = this;
$rootScope.$apply(function() { $rootScope.$apply(function() {
self.state = 'connected'; self.state = 'connected';
self.didConnect = true; self.didConnect = true;
@ -255,19 +262,19 @@ angular.module('MatrixCall', [])
}; };
MatrixCall.prototype.onSignallingStateChanged = function() { MatrixCall.prototype.onSignallingStateChanged = function() {
console.trace("Signalling state changed to: "+this.peerConn.signalingState); console.log("call "+this.call_id+": Signalling state changed to: "+this.peerConn.signalingState);
}; };
MatrixCall.prototype.onSetRemoteDescriptionSuccess = function() { MatrixCall.prototype.onSetRemoteDescriptionSuccess = function() {
console.trace("Set remote description"); console.log("Set remote description");
}; };
MatrixCall.prototype.onSetRemoteDescriptionError = function(e) { MatrixCall.prototype.onSetRemoteDescriptionError = function(e) {
console.trace("Failed to set remote description"+e); console.log("Failed to set remote description"+e);
}; };
MatrixCall.prototype.onAddStream = function(event) { MatrixCall.prototype.onAddStream = function(event) {
console.trace("Stream added"+event); console.log("Stream added"+event);
var s = event.stream; var s = event.stream;
@ -288,14 +295,15 @@ angular.module('MatrixCall', [])
}; };
MatrixCall.prototype.onRemoteStreamStarted = function(event) { MatrixCall.prototype.onRemoteStreamStarted = function(event) {
self = this; var self = this;
$rootScope.$apply(function() { $rootScope.$apply(function() {
self.state = 'connected'; self.state = 'connected';
}); });
}; };
MatrixCall.prototype.onRemoteStreamEnded = function(event) { MatrixCall.prototype.onRemoteStreamEnded = function(event) {
self = this; console.log("Remote stream ended");
var self = this;
$rootScope.$apply(function() { $rootScope.$apply(function() {
self.state = 'ended'; self.state = 'ended';
self.hangupParty = 'remote'; self.hangupParty = 'remote';
@ -306,18 +314,31 @@ angular.module('MatrixCall', [])
}; };
MatrixCall.prototype.onRemoteStreamTrackStarted = function(event) { MatrixCall.prototype.onRemoteStreamTrackStarted = function(event) {
self = this; var self = this;
$rootScope.$apply(function() { $rootScope.$apply(function() {
self.state = 'connected'; self.state = 'connected';
}); });
}; };
MatrixCall.prototype.onHangupReceived = function() { MatrixCall.prototype.onHangupReceived = function() {
console.log("Hangup received");
this.state = 'ended'; this.state = 'ended';
this.hangupParty = 'remote'; this.hangupParty = 'remote';
this.stopAllMedia(); this.stopAllMedia();
this.peerConn.close(); this.peerConn.close();
if (this.onHangup) this.onHangup(self); if (this.onHangup) this.onHangup(this);
};
MatrixCall.prototype.replacedBy = function(newCall) {
if (this.state == 'wait_local_media') {
newCall.waitForLocalAVStream = true;
} else if (this.state == 'create_offer') {
newCall.localAVStream = this.localAVStream;
} else if (this.state == 'invite_sent') {
newCall.localAVStream = this.localAVStream;
}
this.successor = newCall;
this.hangup(true);
}; };
return MatrixCall; return MatrixCall;

36
webclient/components/matrix/matrix-phone-service.js
View File

@ -22,6 +22,7 @@ angular.module('matrixPhoneService', [])
}; };
matrixPhoneService.INCOMING_CALL_EVENT = "INCOMING_CALL_EVENT"; matrixPhoneService.INCOMING_CALL_EVENT = "INCOMING_CALL_EVENT";
matrixPhoneService.REPLACED_CALL_EVENT = "REPLACED_CALL_EVENT";
matrixPhoneService.allCalls = {}; matrixPhoneService.allCalls = {};
matrixPhoneService.callPlaced = function(call) { matrixPhoneService.callPlaced = function(call) {
@ -38,29 +39,56 @@ angular.module('matrixPhoneService', [])
call.call_id = msg.call_id; call.call_id = msg.call_id;
call.initWithInvite(msg); call.initWithInvite(msg);
matrixPhoneService.allCalls[call.call_id] = call; matrixPhoneService.allCalls[call.call_id] = call;
// Were we trying to call that user (room)?
var existingCall;
var callIds = Object.keys(matrixPhoneService.allCalls);
for (var i = 0; i < callIds.length; ++i) {
var thisCallId = callIds[i];
var thisCall = matrixPhoneService.allCalls[thisCallId];
if (call.room_id == thisCall.room_id && thisCall.direction == 'outbound'
&& (thisCall.state == 'wait_local_media' || thisCall.state == 'invite_sent' || thisCall.state == 'create_offer')) {
existingCall = thisCall;
break;
}
}
if (existingCall) {
if (existingCall.call_id < call.call_id) {
console.log("Glare detected: rejecting incoming call "+call.call_id+" and keeping outgoing call "+existingCall.call_id);
call.hangup();
} else {
console.log("Glare detected: answering incoming call "+call.call_id+" and canceling outgoing call "+existingCall.call_id);
existingCall.replacedBy(call);
call.answer();
$rootScope.$broadcast(matrixPhoneService.REPLACED_CALL_EVENT, existingCall, call);
}
} else {
$rootScope.$broadcast(matrixPhoneService.INCOMING_CALL_EVENT, call); $rootScope.$broadcast(matrixPhoneService.INCOMING_CALL_EVENT, call);
}
} else if (event.type == 'm.call.answer') { } else if (event.type == 'm.call.answer') {
var call = matrixPhoneService.allCalls[msg.call_id]; var call = matrixPhoneService.allCalls[msg.call_id];
if (!call) { if (!call) {
console.trace("Got answer for unknown call ID "+msg.call_id); console.log("Got answer for unknown call ID "+msg.call_id);
return; return;
} }
call.receivedAnswer(msg); call.receivedAnswer(msg);
} else if (event.type == 'm.call.candidate') { } else if (event.type == 'm.call.candidate') {
var call = matrixPhoneService.allCalls[msg.call_id]; var call = matrixPhoneService.allCalls[msg.call_id];
if (!call) { if (!call) {
console.trace("Got candidate for unknown call ID "+msg.call_id); console.log("Got candidate for unknown call ID "+msg.call_id);
return; return;
} }
call.gotRemoteIceCandidate(msg.candidate); call.gotRemoteIceCandidate(msg.candidate);
} else if (event.type == 'm.call.hangup') { } else if (event.type == 'm.call.hangup') {
var call = matrixPhoneService.allCalls[msg.call_id]; var call = matrixPhoneService.allCalls[msg.call_id];
if (!call) { if (!call) {
console.trace("Got hangup for unknown call ID "+msg.call_id); console.log("Got hangup for unknown call ID "+msg.call_id);
return; return;
} }
call.onHangupReceived(); call.onHangupReceived();
matrixPhoneService.allCalls[msg.call_id] = undefined; delete(matrixPhoneService.allCalls[msg.call_id]);
} }
}); });