Added limit for maximum number of users in a single room

app/src/RoomClient.js

@@ -1963,6 +1963,13 @@ export default class RoomClient
 						break;
 					}
 						
+					case 'overRoomLimit':
+					{
+						store.dispatch(roomActions.setOverRoomLimit(true));
+
+						break;
+					}
+
 					case 'roomReady':
 					{
 						const { turnServers } = notification.data;

app/src/actions/roomActions.js

@@ -40,6 +40,12 @@ export const setSignInRequired = (signInRequired) =>
 		payload : { signInRequired }
 	});
 
+export const setOverRoomLimit = (overRoomLimit) =>
+	({
+		type    : 'SET_OVER_ROOM_LIMIT',
+		payload : { overRoomLimit }
+	});
+
 export const setAccessCode = (accessCode) =>
 	({
 		type    : 'SET_ACCESS_CODE',

app/src/components/JoinDialog.js

@@ -83,6 +83,10 @@ const styles = (theme) =>
 		green :
 		{
 			color : 'rgba(0, 153, 0, 1)'
+		},
+		red :
+		{
+			color : 'rgba(153, 0, 0, 1)'
 		}
 	});
 
@@ -281,6 +285,16 @@ const JoinDialog = ({
 						}}
 						fullWidth
 					/>
+					{!room.inLobby && room.overRoomLimit &&
+							<DialogContentText className={classes.red} variant='h6' gutterBottom>
+								<FormattedMessage
+									id='room.overRoomLimit'
+									defaultMessage={
+										`The room is full. Retry after some time.`
+									}
+								/>
+							</DialogContentText>
+					}
 
 				</DialogContent>
 
@@ -419,6 +433,7 @@ export default withRoomContext(connect(
 			return (
 				prev.room.inLobby === next.room.inLobby &&
 				prev.room.signInRequired === next.room.signInRequired &&
+				prev.room.overRoomLimit === next.room.overRoomLimit &&
 				prev.settings.displayName === next.settings.displayName &&
 				prev.me.displayNameInProgress === next.me.displayNameInProgress &&
 				prev.me.loginEnabled === next.me.loginEnabled &&

app/src/reducers/room.js

@@ -6,6 +6,7 @@ const initialState =
 	locked                        : false,
 	inLobby                       : false,
 	signInRequired                : false,
+	overRoomLimit              : false,
 	// access code to the room if locked and joinByAccessCode == true
 	accessCode                    : '',
 	// if true: accessCode is a possibility to open the room
@@ -88,7 +89,12 @@ const room = (state = initialState, action) =>
 
 			return { ...state, signInRequired };
 		}
+		case 'SET_OVER_ROOM_LIMIT':
+		{
+			const { overRoomLimit } = action.payload;
 
+			return { ...state, overRoomLimit };
+		}
 		case 'SET_ACCESS_CODE':
 		{
 			const { accessCode } = action.payload;

app/src/translations/cn.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/cs.json

@@ -58,6 +58,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/de.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": "Du bist stummgeschalted, Halte die SPACE-Taste um zu sprechen",
 

app/src/translations/dk.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/el.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/en.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": "{displayName} raised their hand",
 	"room.loweredHand": "{displayName} put their hand down",
 	"room.extraVideo": "Extra video",
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": "You are muted, hold down SPACE-BAR to talk",
 

app/src/translations/es.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/fr.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/hr.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": "Utišani ste, pritisnite i držite SPACE tipku za razgovor",
 

app/src/translations/hu.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/it.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 	
 	"me.mutedPTT": null,
 

app/src/translations/nb.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": "{displayName} rakk opp hånden",
 	"room.loweredHand": "{displayName} tok ned hånden",
 	"room.extraVideo": "Ekstra video",
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": "Du er dempet, hold nede SPACE for å snakke",
 

app/src/translations/pl.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/pt.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/ro.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/tr.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/uk.json

@@ -59,6 +59,7 @@
 	"room.raisedHand": null,
 	"room.loweredHand": null,
 	"room.extraVideo": null,
+	"room.overRoomLimit": null,
 
 	"me.mutedPTT": null,
 

server/config/config.example.js

@@ -247,6 +247,8 @@ module.exports =
 	// When truthy, the room will be open to all users when as long as there
 	// are allready users in the room
 	activateOnHostJoin : true,
+	// When set, maxUsersPerRoom defines how many users can join a single room. If not set, there is not limit.
+	// maxUsersPerRoom    : 20,
 	// Mediasoup settings
 	mediasoup          :
 	{

server/lib/Room.js

@@ -177,6 +177,9 @@ class Room extends EventEmitter
 			peer.roles.some((role) => accessFromRoles.BYPASS_ROOM_LOCK.includes(role))
 		)
 			this._peerJoining(peer);
+		else if ('maxUsersPerRoom' in config &&(this._getJoinedPeers().length + this._lobby.peerList().length) >= config.maxUsersPerRoom) {
+			this._handleOverRoomLimit(peer);
+		}
 		else if (this._locked)
 			this._parkPeer(peer);
 		else
@@ -188,6 +191,11 @@ class Room extends EventEmitter
 		}
 	}
 
+	_handleOverRoomLimit(peer)
+	{
+		this._notification(peer.socket, 'overRoomLimit');
+	}
+
 	_handleGuest(peer)
 	{
 		if (config.activateOnHostJoin && !this.checkEmpty())