Various cleanups
parent
603368007a
commit
ed6f256fb3
|
|
@ -120,15 +120,14 @@ class Room extends EventEmitter
|
|||
{
|
||||
logger.info('handlePeer() [peer:"%s", roles:"%s"]', peer.id, peer.roles);
|
||||
|
||||
// Allow reconnections, remove old peer
|
||||
if (this._peers[peer.id])
|
||||
{
|
||||
logger.warn(
|
||||
'handleConnection() | there is already a peer with same peerId [peer:"%s"]',
|
||||
peer.id);
|
||||
|
||||
peer.close();
|
||||
|
||||
return;
|
||||
this._peers[peer.id].close();
|
||||
}
|
||||
|
||||
// Always let ADMIN in, even if locked
|
||||
|
|
@ -461,27 +460,6 @@ class Room extends EventEmitter
|
|||
|
||||
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.
|
||||
if (peer.joined)
|
||||
throw new Error('Peer already joined');
|
||||
|
|
|
|||
Loading…
Reference in New Issue