From 717c0053e54a9e9964571e7a376b53ff04bb48a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Fri, 8 May 2020 22:01:28 +0200
Subject: [PATCH] Better handling of reconnect. Clear the state properly and
 handle spotlights.

---
 app/src/RoomClient.js              | 17 ++++++-----------
 app/src/Spotlights.js              |  9 +++++++++
 app/src/actions/consumerActions.js |  5 +++++
 app/src/actions/peerActions.js     |  5 +++++
 app/src/actions/roomActions.js     |  5 +++++
 app/src/reducers/consumers.js      |  5 +++++
 app/src/reducers/peers.js          | 11 +++++++++--
 app/src/reducers/room.js           |  5 +++++
 8 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 2b2b387..afbfdc9 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -940,14 +940,10 @@ export default class RoomClient
 			{
 				if (consumer.kind === 'video')
 				{
-					if (spotlights.indexOf(consumer.appData.peerId) > -1)
-					{
+					if (spotlights.includes(consumer.appData.peerId))
 						await this._resumeConsumer(consumer);
-					}
 					else
-					{
 						await this._pauseConsumer(consumer);
-					}
 				}
 			}
 		}
@@ -1516,9 +1512,7 @@ export default class RoomClient
 				if (consumer.appData.peerId === peerId && consumer.appData.source === type)
 				{
 					if (mute)
-					{
 						await this._pauseConsumer(consumer);
-					}
 					else
 						await this._resumeConsumer(consumer);
 				}
@@ -1846,6 +1840,11 @@ export default class RoomClient
 				this._recvTransport = null;
 			}
 
+			this._spotlights.clearSpotlights();
+
+			store.dispatch(peerActions.clearPeers());
+			store.dispatch(consumerActions.clearConsumers());
+			store.dispatch(roomActions.clearSpotlights());
 			store.dispatch(roomActions.setRoomState('connecting'));
 		});
 
@@ -2561,8 +2560,6 @@ export default class RoomClient
 
 					case 'moderator:mute':
 					{
-						// const { peerId } = notification.data;
-
 						if (this._micProducer && !this._micProducer.paused)
 						{
 							this.muteMic();
@@ -2581,8 +2578,6 @@ export default class RoomClient
 
 					case 'moderator:stopVideo':
 					{
-						// const { peerId } = notification.data;
-
 						this.disableWebcam();
 						this.disableScreenSharing();
 
diff --git a/app/src/Spotlights.js b/app/src/Spotlights.js
index 30dc48a..3d0673f 100644
--- a/app/src/Spotlights.js
+++ b/app/src/Spotlights.js
@@ -95,6 +95,15 @@ export default class Spotlights extends EventEmitter
 		});
 	}
 
+	clearSpotlights()
+	{
+		this._started = false;
+
+		this._peerList = [];
+		this._selectedSpotlights = [];
+		this._currentSpotlights = [];
+	}
+
 	_newPeer(id)
 	{
 		logger.debug(
diff --git a/app/src/actions/consumerActions.js b/app/src/actions/consumerActions.js
index 249d156..659a609 100644
--- a/app/src/actions/consumerActions.js
+++ b/app/src/actions/consumerActions.js
@@ -10,6 +10,11 @@ export const removeConsumer = (consumerId, peerId) =>
 		payload : { consumerId, peerId }
 	});
 
+export const clearConsumers = () =>
+	({
+		type : 'CLEAR_CONSUMERS'
+	});
+
 export const setConsumerPaused = (consumerId, originator) =>
 	({
 		type    : 'SET_CONSUMER_PAUSED',
diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js
index 738928c..5672b47 100644
--- a/app/src/actions/peerActions.js
+++ b/app/src/actions/peerActions.js
@@ -10,6 +10,11 @@ export const removePeer = (peerId) =>
 		payload : { peerId }
 	});
 
+export const clearPeers = () =>
+	({
+		type : 'CLEAR_PEERS'
+	});
+
 export const setPeerDisplayName = (displayName, peerId) =>
 	({
 		type    : 'SET_PEER_DISPLAY_NAME',
diff --git a/app/src/actions/roomActions.js b/app/src/actions/roomActions.js
index cbfde37..5ae45e3 100644
--- a/app/src/actions/roomActions.js
+++ b/app/src/actions/roomActions.js
@@ -130,6 +130,11 @@ export const setSpotlights = (spotlights) =>
 		payload : { spotlights }
 	});
 
+export const clearSpotlights = () =>
+	({
+		type : 'CLEAR_SPOTLIGHTS'
+	});
+
 export const toggleJoined = () =>
 	({
 		type : 'TOGGLE_JOINED'
diff --git a/app/src/reducers/consumers.js b/app/src/reducers/consumers.js
index 68a4a4a..6be31ae 100644
--- a/app/src/reducers/consumers.js
+++ b/app/src/reducers/consumers.js
@@ -110,6 +110,11 @@ const consumers = (state = initialState, action) =>
 			return { ...state, [consumerId]: newConsumer };
 		}
 
+		case 'CLEAR_CONSUMERS':
+		{
+			return initialState;
+		}
+
 		default:
 			return state;
 	}
diff --git a/app/src/reducers/peers.js b/app/src/reducers/peers.js
index 6c4fd1f..32d6fef 100644
--- a/app/src/reducers/peers.js
+++ b/app/src/reducers/peers.js
@@ -1,4 +1,6 @@
-const peer = (state = {}, action) =>
+const initialState = {};
+
+const peer = (state = initialState, action) =>
 {
 	switch (action.type) 
 	{
@@ -85,7 +87,7 @@ const peer = (state = {}, action) =>
 	}
 };
 
-const peers = (state = {}, action) =>
+const peers = (state = initialState, action) =>
 {
 	switch (action.type)
 	{
@@ -139,6 +141,11 @@ const peers = (state = {}, action) =>
 			return { ...state, [oldPeer.id]: peer(oldPeer, action) };
 		}
 
+		case 'CLEAR_PEERS':
+		{
+			return initialState;
+		}
+
 		default:
 			return state;
 	}
diff --git a/app/src/reducers/room.js b/app/src/reducers/room.js
index 595ca4e..d784219 100644
--- a/app/src/reducers/room.js
+++ b/app/src/reducers/room.js
@@ -212,6 +212,11 @@ const room = (state = initialState, action) =>
 			return { ...state, spotlights };
 		}
 
+		case 'CLEAR_SPOTLIGHTS':
+		{
+			return { ...state, spotlights: [] };
+		}
+
 		case 'SET_LOBBY_PEERS_PROMOTION_IN_PROGRESS':
 			return { ...state, lobbyPeersPromotionInProgress: action.payload.flag };