Various cleanups

auto_join_3.3
Håvar Aambø Fosstveit 2020-03-22 19:55:06 +01:00
parent 603368007a
commit ed6f256fb3
1 changed files with 2 additions and 24 deletions

View File

@ -120,15 +120,14 @@ class Room extends EventEmitter
{ {
logger.info('handlePeer() [peer:"%s", roles:"%s"]', peer.id, peer.roles); logger.info('handlePeer() [peer:"%s", roles:"%s"]', peer.id, peer.roles);
// Allow reconnections, remove old peer
if (this._peers[peer.id]) if (this._peers[peer.id])
{ {
logger.warn( logger.warn(
'handleConnection() | there is already a peer with same peerId [peer:"%s"]', 'handleConnection() | there is already a peer with same peerId [peer:"%s"]',
peer.id); peer.id);
peer.close(); this._peers[peer.id].close();
return;
} }
// Always let ADMIN in, even if locked // Always let ADMIN in, even if locked
@ -461,27 +460,6 @@ class Room extends EventEmitter
case 'join': case 'join':
{ {
try
{
if (peer.socket.handshake.session.passport.user.displayName)
{
this._notification(
peer.socket,
'changeDisplayname',
{
peerId : peer.id,
displayName : peer.socket.handshake.session.passport.user.displayName,
oldDisplayName : ''
},
true
);
}
}
catch (error)
{
logger.error(error);
}
// Ensure the Peer is not already joined. // Ensure the Peer is not already joined.
if (peer.joined) if (peer.joined)
throw new Error('Peer already joined'); throw new Error('Peer already joined');