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

Merge branch 'feat-lock-room' into develop

master
Håvar Aambø Fosstveit 2019-02-15 12:24:07 +01:00
parent 4fd3c6c8b1 1c5f90cff6
commit 7ab0826ad1
11 changed files with 331 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
app/lib/RoomClient.js
View File

@ -990,10 +990,22 @@ export default class RoomClient
this._signalingSocket.on('connect', () =>
{
logger.debug('signaling Peer "connect" event');
});
this._signalingSocket.on('room-ready', () =>
{
logger.debug('signaling Peer "room-ready" event');
this._joinRoom({ displayName, device });
});
this._signalingSocket.on('room-locked', () =>
{
logger.debug('signaling Peer "room-locked" event');
store.dispatch(stateActions.setRoomLockedOut());
});
this._signalingSocket.on('disconnect', () =>
{
logger.warn('signaling Peer "disconnect" event');
@ -1024,10 +1036,34 @@ export default class RoomClient
this._room.receiveNotification(notification);
});
this._signalingSocket.on('active-speaker', (data) =>
this._signalingSocket.on('lock-room', ({ peerName }) =>
{
const { peerName } = data;
store.dispatch(
stateActions.setRoomLocked());
const peer = this._room.getPeerByName(peerName);
if (peer)
{
this.notify(`${peer.appData.displayName} locked the room.`);
}
});
this._signalingSocket.on('unlock-room', ({ peerName }) =>
{
store.dispatch(
stateActions.setRoomUnLocked());
const peer = this._room.getPeerByName(peerName);
if (peer)
{
this.notify(`${peer.appData.displayName} unlocked the room.`);
}
});
this._signalingSocket.on('active-speaker', ({ peerName }) =>
{
store.dispatch(
stateActions.setRoomActiveSpeaker(peerName));
@ -1035,11 +1071,8 @@ export default class RoomClient
this._spotlights.handleActiveSpeaker(peerName);
});
this._signalingSocket.on('display-name-changed', (data) =>
this._signalingSocket.on('display-name-changed', ({ peerName, displayName: name }) =>
{
// eslint-disable-next-line no-shadow
const { peerName, displayName } = data;
// NOTE: Hack, we shouldn't do this, but this is just a demo.
const peer = this._room.getPeerByName(peerName);
@ -1050,20 +1083,18 @@ export default class RoomClient
return;
}
const oldDisplayName = peer.appData.displayName;
const oldDisplayName = peer.appData.name;
peer.appData.displayName = displayName;
peer.appData.displayName = name;
store.dispatch(
stateActions.setPeerDisplayName(displayName, peerName));
stateActions.setPeerDisplayName(name, peerName));
this.notify(`${oldDisplayName} changed their display name to ${displayName}.`);
this.notify(`${oldDisplayName} changed their display name to ${name}.`);
});
this._signalingSocket.on('profile-picture-changed', (data) =>
this._signalingSocket.on('profile-picture-changed', ({ peerName, picture }) =>
{
const { peerName, picture } = data;
store.dispatch(stateActions.setPeerPicture(peerName, picture));
});
@ -1292,6 +1323,42 @@ export default class RoomClient
}
}
async lockRoom()
{
logger.debug('lockRoom()');
try
{
await this.sendRequest('lock-room');
store.dispatch(
stateActions.setRoomLocked());
this.notify('You locked the room.');
}
catch (error)
{
logger.error('lockRoom() | failed: %o', error);
}
}
async unlockRoom()
{
logger.debug('unlockRoom()');
try
{
await this.sendRequest('unlock-room');
store.dispatch(
stateActions.setRoomUnLocked());
this.notify('You unlocked the room.');
}
catch (error)
{
logger.error('unlockRoom() | failed: %o', error);
}
}
async _setMicProducer()
{
if (!this._room.canSend('audio'))

34
app/lib/components/Controls/Sidebar.jsx
View File

@ -59,11 +59,13 @@ class Sidebar extends Component
roomClient,
toolbarsVisible,
me,
screenProducer
screenProducer,
locked
} = this.props;
let screenState;
let screenTip;
let lockState = 'unlocked';
if (me.needExtension)
{
@ -86,6 +88,11 @@ class Sidebar extends Component
screenTip = 'Start screen sharing';
}
if (locked)
{
lockState = 'locked';
}
return (
<div
className={classnames('sidebar room-controls', {
@ -161,6 +168,25 @@ class Sidebar extends Component
</Otherwise>
</Choose>
</If>
<div
className={classnames('button', 'lock', lockState, {
on : locked
})}
data-tip={`Room is ${lockState}`}
data-place='right'
data-type='dark'
onClick={() =>
{
if (locked)
{
roomClient.unlockRoom();
}
else
{
roomClient.lockRoom();
}
}}
/>
<div
className={classnames('button', 'raise-hand', {
on : me.raiseHand,
@ -188,7 +214,8 @@ Sidebar.propTypes = {
roomClient : PropTypes.any.isRequired,
toolbarsVisible : PropTypes.bool.isRequired,
me : appPropTypes.Me.isRequired,
screenProducer : appPropTypes.Producer
screenProducer : appPropTypes.Producer,
locked : PropTypes.bool.isRequired
};
const mapStateToProps = (state) =>
@ -196,7 +223,8 @@ const mapStateToProps = (state) =>
toolbarsVisible : state.room.toolbarsVisible,
screenProducer : Object.values(state.producers)
.find((producer) => producer.source === 'screen'),
me : state.me
me : state.me,
locked : state.room.locked
});
export default withRoomContext(connect(

17
app/lib/components/Room.jsx
View File

@ -73,6 +73,22 @@ class Room extends React.Component
democratic : Peers
}[room.mode];
if (room.lockedOut)
{
return (
<Fragment>
<Appear duration={300}>
<div data-component='Room'>
<div className='locked-out'>
This room is locked at the moment, try again later.
</div>
</div>
</Appear>
</Fragment>
);
}
else
{
return (
<Fragment>
<Appear duration={300}>
@ -165,6 +181,7 @@ class Room extends React.Component
</Fragment>
);
}
}
}
Room.propTypes =

17
app/lib/redux/reducers/room.js
View File

@ -2,6 +2,8 @@ const initialState =
{
url : null,
state : 'new', // new/connecting/connected/disconnected/closed,
locked : false,
lockedOut : false,
activeSpeakerName : null,
torrentSupport : false,
showSettings : false,
@ -35,6 +37,21 @@ const room = (state = initialState, action) =>
return { ...state, state: roomState, activeSpeakerName: null };
}
case 'SET_ROOM_LOCKED':
{
return { ...state, locked: true };
}
case 'SET_ROOM_UNLOCKED':
{
return { ...state, locked: false };
}
case 'SET_ROOM_LOCKED_OUT':
{
return { ...state, lockedOut: true };
}
case 'SET_ROOM_ACTIVE_SPEAKER':
{
const { peerName } = action.payload;

21
app/lib/redux/stateActions.js
View File

@ -22,6 +22,27 @@ export const setRoomActiveSpeaker = (peerName) =>
};
};
export const setRoomLocked = () =>
{
return {
type : 'SET_ROOM_LOCKED'
};
};
export const setRoomUnLocked = () =>
{
return {
type : 'SET_ROOM_UNLOCKED'
};
};
export const setRoomLockedOut = () =>
{
return {
type : 'SET_ROOM_LOCKED_OUT'
};
};
export const setMe = ({ peerName, displayName, displayNameSet, device, loginEnabled }) =>
{
return {

4
app/resources/images/icon_locked_white.svg 100644
View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24px" height="24px">
<path d="M 12 1 C 8.6761905 1 6 3.6761905 6 7 L 6 8 C 4.9 8 4 8.9 4 10 L 4 20 C 4 21.1 4.9 22 6 22 L 18 22 C 19.1 22 20 21.1 20 20 L 20 10 C 20 8.9 19.1 8 18 8 L 18 7 C 18 3.6761905 15.32381 1 12 1 z M 12 3 C 14.27619 3 16 4.7238095 16 7 L 16 8 L 8 8 L 8 7 C 8 4.7238095 9.7238095 3 12 3 z M 12 13 C 13.1 13 14 13.9 14 15 C 14 16.1 13.1 17 12 17 C 10.9 17 10 16.1 10 15 C 10 13.9 10.9 13 12 13 z" fill="#FFFFFF"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 535 B

4
app/resources/images/icon_unlocked_white.svg 100644
View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24px" height="24px">
<path style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;isolation:auto;mix-blend-mode:normal" d="M 12 1 C 9.1277778 1 6.7189086 3.0461453 6.1230469 5.7871094 L 8.078125 6.2128906 C 8.4822632 4.3538547 10.072222 3 12 3 C 14.27619 3 16 4.7238095 16 7 L 16 8 L 6 8 C 4.9 8 4 8.9 4 10 L 4 20 C 4 21.1 4.9 22 6 22 L 18 22 C 19.1 22 20 21.1 20 20 L 20 10 C 20 8.9 19.1 8 18 8 L 18 7 C 18 3.6761905 15.32381 1 12 1 z M 12 13 C 13.1 13 14 13.9 14 15 C 14 16.1 13.1 17 12 17 C 10.9 17 10 16.1 10 15 C 10 13.9 10.9 13 12 13 z" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#FFFFFF"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 867 B

14
app/stylus/components/Room.styl
View File

@ -1,6 +1,20 @@
[data-component='Room'] {
AppearFadeIn(300ms);
> .locked-out {
position: fixed;
top: 50%;
left: 50%;
transform: translateX(-50%) translateY(-50%);
width: 30vw;
text-align: center;
font-family: 'Roboto';
font-size: 2.5em;
box-shadow: 0px 5px 12px 2px rgba(17, 17, 17, 0.5);
background-color: #fff;
padding: 2vmin;
}
> .room-wrapper {
position: absolute;
top: 0;

10
app/stylus/components/Sidebar.styl
View File

@ -96,6 +96,16 @@
}
}
&.lock {
&.locked {
background-image: url('/resources/images/icon_locked_white.svg');
}
&.unlocked {
background-image: url('/resources/images/icon_unlocked_white.svg');
}
}
&.raise-hand {
background-image: url('/resources/images/icon-hand-white.svg');

42
server/lib/Room.js
View File

@ -25,6 +25,9 @@ class Room extends EventEmitter
// Closed flag.
this._closed = false;
// Locked flag.
this._locked = false;
this._chatHistory = [];
this._fileHistory = [];
@ -102,6 +105,7 @@ class Room extends EventEmitter
{
logger.info('handleConnection() [peerName:"%s"]', peerName);
// This will allow reconnects to join despite lock
if (this._signalingPeers.has(peerName))
{
logger.warn(
@ -114,6 +118,11 @@ class Room extends EventEmitter
signalingPeer.socket.disconnect();
this._signalingPeers.delete(peerName);
}
else if (this._locked) // Don't allow connections to a locked room
{
socket.emit('room-locked');
socket.disconnect(true);
}
const signalingPeer = { peerName : peerName, socket : socket };
@ -127,6 +136,7 @@ class Room extends EventEmitter
this._signalingPeers.set(peerName, signalingPeer);
this._handleSignalingPeer(signalingPeer);
socket.emit('room-ready');
}
authCallback(data)
@ -308,6 +318,38 @@ class Room extends EventEmitter
);
});
signalingPeer.socket.on('lock-room', (request, cb) =>
{
// Return no error
cb(null);
this._locked = true;
// Spread to others
signalingPeer.socket.broadcast.to(this._roomId).emit(
'lock-room',
{
peerName : signalingPeer.peerName
}
);
});
signalingPeer.socket.on('unlock-room', (request, cb) =>
{
// Return no error
cb(null);
this._locked = false;
// Spread to others
signalingPeer.socket.broadcast.to(this._roomId).emit(
'unlock-room',
{
peerName : signalingPeer.peerName
}
);
});
signalingPeer.socket.on('send-file', (request, cb) =>
{
// Return no error

11
server/server.js
View File

@ -10,7 +10,6 @@ const https = require('https');
const http = require('http');
const express = require('express');
const compression = require('compression');
const url = require('url');
const Logger = require('./lib/Logger');
const Room = require('./lib/Room');
const Dataporten = require('passport-dataporten');
@ -46,12 +45,12 @@ const dataporten = new Dataporten.Setup(config.oauth2);
app.all('*', (req, res, next) =>
{
if(req.secure)
if (req.secure)
{
return next();
}
res.redirect('https://' + req.hostname + req.url);
res.redirect(`https://${req.hostname}${req.url}`);
});
app.use(dataporten.passport.initialize());
@ -71,10 +70,10 @@ app.get('/login', (req, res, next) =>
dataporten.setupLogout(app, '/logout');
app.get('/', function (req, res) {
console.log(req.url);
app.get('/', (req, res) =>
{
res.sendFile(`${__dirname}/public/chooseRoom.html`);
})
});
app.get(
'/auth-callback',