Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added limit for maximum number of users in a single room

auto_join_3.3
Astagor 2020-05-04 19:31:50 +02:00
parent 4acedad987
commit ac6ee1bfa3
23 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/RoomClient.js
View File

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

6
app/src/actions/roomActions.js
View File

@ -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',

15
app/src/components/JoinDialog.js
View File

@ -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 &&

6
app/src/reducers/room.js
View File

@ -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;

1
app/src/translations/cn.json
View File

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

1
app/src/translations/cs.json
View File

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

1
app/src/translations/de.json
View File

@ -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",

1
app/src/translations/dk.json
View File

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

1
app/src/translations/el.json
View File

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

1
app/src/translations/en.json
View File

@ -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",

1
app/src/translations/es.json
View File

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

1
app/src/translations/fr.json
View File

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

1
app/src/translations/hr.json
View File

@ -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",

1
app/src/translations/hu.json
View File

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

1
app/src/translations/it.json
View File

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

1
app/src/translations/nb.json
View File

@ -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",

1
app/src/translations/pl.json
View File

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

1
app/src/translations/pt.json
View File

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

1
app/src/translations/ro.json
View File

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

1
app/src/translations/tr.json
View File

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

1
app/src/translations/uk.json
View File

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

2
server/config/config.example.js
View File

@ -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 :
{

8
server/lib/Room.js
View File

@ -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())