Merge remote-tracking branch 'upstream/develop' into mm-exporter

server/config/config.example.js

@@ -235,6 +235,8 @@ module.exports =
 		MODERATE_CHAT    : [ userRoles.MODERATOR ],
 		// The role(s) have permission to share screen
 		SHARE_SCREEN     : [ userRoles.NORMAL ],
+		// The role(s) have permission to produce extra video
+		EXTRA_VIDEO      : [ userRoles.NORMAL ],
 		// The role(s) have permission to share files
 		SHARE_FILE       : [ userRoles.NORMAL ],
 		// The role(s) have permission to moderate files

server/lib/Lobby.js

@@ -47,7 +47,8 @@ class Lobby extends EventEmitter
 		return Object.values(this._peers).map((peer) =>
 			({
 				peerId      : peer.id,
-				displayName : peer.displayName 
+				displayName : peer.displayName,
+				picture     : peer.picture
 			}));
 	}
 

server/lib/Peer.js

@@ -336,7 +336,8 @@ class Peer extends EventEmitter
 			id          : this.id,
 			displayName : this.displayName,
 			picture     : this.picture,
-			roles       : this.roles
+			roles       : this.roles,
+			raisedHand  : this.raisedHand
 		};
 
 		return peerInfo;

server/lib/Room.js

@@ -24,6 +24,7 @@ const permissionsFromRoles =
 	SEND_CHAT        : [ userRoles.NORMAL ],
 	MODERATE_CHAT    : [ userRoles.MODERATOR ],
 	SHARE_SCREEN     : [ userRoles.NORMAL ],
+	EXTRA_VIDEO      : [ userRoles.NORMAL ],
 	SHARE_FILE       : [ userRoles.NORMAL ],
 	MODERATE_FILES   : [ userRoles.MODERATOR ],
 	MODERATE_ROOM    : [ userRoles.MODERATOR ],
@@ -530,6 +531,17 @@ class Room extends EventEmitter
 				peerId : peer.id,
 				role   : newRole
 			}, true, true);
+
+			// Got permission to promote peers, notify peer of
+			// peers in lobby
+			if (permissionsFromRoles.PROMOTE_PEER.includes(newRole))
+			{
+				const lobbyPeers = this._lobby.peerList();
+
+				lobbyPeers.length > 0 && this._notification(peer.socket, 'parkedPeers', {
+					lobbyPeers
+				});
+			}
 		});
 
 		peer.on('lostRole', ({ oldRole }) =>
@@ -586,13 +598,21 @@ class Room extends EventEmitter
 					.filter((joinedPeer) => joinedPeer.id !== peer.id)
 					.map((joinedPeer) => (joinedPeer.peerInfo));
 
+				const lobbyPeers = this._lobby.peerList();
+
 				cb(null, {
 					roles                : peer.roles,
 					peers                : peerInfos,
 					tracker              : config.fileTracker,
 					authenticated        : peer.authenticated,
 					permissionsFromRoles : permissionsFromRoles,
-					userRoles            : userRoles
+					userRoles            : userRoles,
+					chatHistory          : this._chatHistory,
+					fileHistory          : this._fileHistory,
+					lastNHistory         : this._lastN,
+					locked               : this._locked,
+					lobbyPeers           : lobbyPeers,
+					accessCode           : this._accessCode
 				});
 
 				// Mark the new Peer as joined.
@@ -728,6 +748,13 @@ class Room extends EventEmitter
 				)
 					throw new Error('peer not authorized');
 
+				if (
+					appData.source === 'extravideo' &&
+					!peer.roles.some(
+						(role) => permissionsFromRoles.EXTRA_VIDEO.includes(role))
+				)
+					throw new Error('peer not authorized');
+
 				// Ensure the Peer is joined.
 				if (!peer.joined)
 					throw new Error('Peer not yet joined');
@@ -1067,26 +1094,6 @@ class Room extends EventEmitter
 				break;
 			}
 
-			case 'serverHistory':
-			{
-				// Return to sender
-				const lobbyPeers = this._lobby.peerList();
-
-				cb(
-					null,
-					{
-						chatHistory  : this._chatHistory,
-						fileHistory  : this._fileHistory,
-						lastNHistory : this._lastN,
-						locked       : this._locked,
-						lobbyPeers   : lobbyPeers,
-						accessCode   : this._accessCode
-					}
-				);
-
-				break;
-			}
-
 			case 'lockRoom':
 			{
 				if (
@@ -1252,14 +1259,14 @@ class Room extends EventEmitter
 				break;
 			}
 
-			case 'raiseHand':
+			case 'raisedHand':
 			{
 				const { raisedHand } = request.data;
 
 				peer.raisedHand = raisedHand;
 
 				// Spread to others
-				this._notification(peer.socket, 'raiseHand', {
+				this._notification(peer.socket, 'raisedHand', {
 					peerId     : peer.id,
 					raisedHand : raisedHand
 				}, true);

server/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "multiparty-meeting-server",
-	"version": "3.2.0",
+	"version": "3.3.0",
 	"private": true,
 	"description": "multiparty meeting server",
 	"author": "Håvar Aambø Fosstveit <h@fosstveit.net>",