Add peer and screenPeer attributes to LocalCallParticipantModel

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

src/utils/webrtc/index.js

@@ -123,7 +123,7 @@ function setupWebRtc() {
 
 	const _signaling = signaling
 
-	webRtc = initWebRtc(_signaling, callParticipantCollection)
+	webRtc = initWebRtc(_signaling, callParticipantCollection, localCallParticipantModel)
 	localCallParticipantModel.setWebRtc(webRtc)
 	localMediaModel.setWebRtc(webRtc)
 

src/utils/webrtc/models/LocalCallParticipantModel.js

@@ -25,6 +25,8 @@ export default function LocalCallParticipantModel() {
 
 	this.attributes = {
 		peerId: null,
+		peer: null,
+		screenPeer: null,
 		guestName: null,
 	}
 
@@ -36,8 +38,14 @@ export default function LocalCallParticipantModel() {
 
 LocalCallParticipantModel.prototype = {
 
+	get: function(key) {
+		return this.attributes[key]
+	},
+
 	set: function(key, value) {
 		this.attributes[key] = value
+
+		this._trigger('change:' + key, [value])
 	},
 
 	on: function(event, handler) {
@@ -94,6 +102,22 @@ LocalCallParticipantModel.prototype = {
 		this._unwatchDisplayNameChange = store.watch(state => state.actorStore.displayName, this.setGuestName.bind(this))
 	},
 
+	setPeer: function(peer) {
+		if (peer && this.get('peerId') !== peer.id) {
+			console.warn('Mismatch between stored peer ID and ID of given peer: ', this.get('peerId'), peer.id)
+		}
+
+		this.set('peer', peer)
+	},
+
+	setScreenPeer: function(screenPeer) {
+		if (screenPeer && this.get('peerId') !== screenPeer.id) {
+			console.warn('Mismatch between stored peer ID and ID of given screen peer: ', this.get('peerId'), screenPeer.id)
+		}
+
+		this.set('screenPeer', screenPeer)
+	},
+
 	setGuestName: function(guestName) {
 		if (!this._webRtc) {
 			throw new Error('WebRtc not initialized yet')

src/utils/webrtc/webrtc.js

@@ -41,6 +41,7 @@ let ownScreenPeer = null
 let selfInCall = PARTICIPANT.CALL_FLAG.DISCONNECTED
 const delayedConnectionToPeer = []
 let callParticipantCollection = null
+let localCallParticipantModel = null
 let showedTURNWarning = false
 
 function arrayDiff(a, b) {
@@ -72,6 +73,8 @@ function createScreensharingPeer(signaling, sessionId) {
 		})
 		webrtc.emit('createdPeer', ownScreenPeer)
 		ownScreenPeer.start()
+
+		localCallParticipantModel.setScreenPeer(ownScreenPeer)
 	}
 
 	if (sessionId === currentSessionId) {
@@ -134,6 +137,8 @@ function checkStartPublishOwnPeer(signaling) {
 	})
 	webrtc.emit('createdPeer', ownPeer)
 	ownPeer.start()
+
+	localCallParticipantModel.setPeer(ownPeer)
 }
 
 function userHasStreams(user) {
@@ -308,8 +313,9 @@ function usersInCallChanged(signaling, users) {
 	}
 }
 
-export default function initWebRTC(signaling, _callParticipantCollection) {
+export default function initWebRTC(signaling, _callParticipantCollection, _localCallParticipantModel) {
 	callParticipantCollection = _callParticipantCollection
+	localCallParticipantModel = _localCallParticipantModel
 
 	signaling.on('usersLeft', function(users) {
 		users.forEach(function(user) {
@@ -733,6 +739,8 @@ export default function initWebRTC(signaling, _callParticipantCollection) {
 			webrtc.removePeers(ownPeer.id)
 			ownPeer.end()
 			ownPeer = null
+
+			localCallParticipantModel.setPeer(ownPeer)
 		}
 
 		usersChanged(signaling, [], previousUsersInRoom)
@@ -931,6 +939,8 @@ export default function initWebRTC(signaling, _callParticipantCollection) {
 		if (ownScreenPeer) {
 			ownScreenPeer = null
 
+			localCallParticipantModel.setScreenPeer(ownScreenPeer)
+
 			signaling.sendRoomMessage({
 				roomType: 'screen',
 				type: 'unshareScreen',
@@ -943,11 +953,15 @@ export default function initWebRTC(signaling, _callParticipantCollection) {
 			webrtc.removePeers(ownPeer.id)
 			ownPeer.end()
 			ownPeer = null
+
+			localCallParticipantModel.setPeer(ownPeer)
 		}
 
 		if (ownScreenPeer) {
 			ownScreenPeer.end()
 			ownScreenPeer = null
+
+			localCallParticipantModel.setScreenPeer(ownScreenPeer)
 		}
 
 		selfInCall = PARTICIPANT.CALL_FLAG.DISCONNECTED