Room now scales up to total server capacity
parent
d700a3cfb2
commit
d446b33695
|
|
@ -30,6 +30,8 @@ class Peer extends EventEmitter
|
||||||
|
|
||||||
this._email = null;
|
this._email = null;
|
||||||
|
|
||||||
|
this._routerId = null;
|
||||||
|
|
||||||
this._rtpCapabilities = null;
|
this._rtpCapabilities = null;
|
||||||
|
|
||||||
this._raisedHand = false;
|
this._raisedHand = false;
|
||||||
|
|
@ -227,6 +229,16 @@ class Peer extends EventEmitter
|
||||||
this._email = email;
|
this._email = email;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get routerId()
|
||||||
|
{
|
||||||
|
return this._routerId;
|
||||||
|
}
|
||||||
|
|
||||||
|
set routerId(routerId)
|
||||||
|
{
|
||||||
|
this._routerId = routerId;
|
||||||
|
}
|
||||||
|
|
||||||
get rtpCapabilities()
|
get rtpCapabilities()
|
||||||
{
|
{
|
||||||
return this._rtpCapabilities;
|
return this._rtpCapabilities;
|
||||||
|
|
|
||||||
|
|
@ -12,32 +12,38 @@ class Room extends EventEmitter
|
||||||
*
|
*
|
||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {mediasoup.Worker} mediasoupWorker - The mediasoup Worker in which a new
|
* @param {mediasoup.Worker} mediasoupWorkers - The mediasoup Worker in which a new
|
||||||
* mediasoup Router must be created.
|
* mediasoup Router must be created.
|
||||||
* @param {String} roomId - Id of the Room instance.
|
* @param {String} roomId - Id of the Room instance.
|
||||||
*/
|
*/
|
||||||
static async create({ mediasoupWorker, roomId })
|
static async create({ mediasoupWorkers, roomId })
|
||||||
{
|
{
|
||||||
logger.info('create() [roomId:"%s"]', roomId);
|
logger.info('create() [roomId:"%s"]', roomId);
|
||||||
|
|
||||||
// Router media codecs.
|
// Router media codecs.
|
||||||
const mediaCodecs = config.mediasoup.router.mediaCodecs;
|
const mediaCodecs = config.mediasoup.router.mediaCodecs;
|
||||||
|
|
||||||
// Create a mediasoup Router.
|
const mediasoupRouters = [];
|
||||||
const mediasoupRouter = await mediasoupWorker.createRouter({ mediaCodecs });
|
|
||||||
|
|
||||||
// Create a mediasoup AudioLevelObserver.
|
for (const worker of mediasoupWorkers)
|
||||||
const audioLevelObserver = await mediasoupRouter.createAudioLevelObserver(
|
{
|
||||||
|
const router = await worker.createRouter({ mediaCodecs });
|
||||||
|
|
||||||
|
mediasoupRouters.push(router);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a mediasoup AudioLevelObserver on first router
|
||||||
|
const audioLevelObserver = await mediasoupRouters[0].createAudioLevelObserver(
|
||||||
{
|
{
|
||||||
maxEntries : 1,
|
maxEntries : 1,
|
||||||
threshold : -80,
|
threshold : -80,
|
||||||
interval : 800
|
interval : 800
|
||||||
});
|
});
|
||||||
|
|
||||||
return new Room({ roomId, mediasoupRouter, audioLevelObserver });
|
return new Room({ roomId, mediasoupRouters, audioLevelObserver });
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor({ roomId, mediasoupRouter, audioLevelObserver })
|
constructor({ roomId, mediasoupRouters, audioLevelObserver })
|
||||||
{
|
{
|
||||||
logger.info('constructor() [roomId:"%s"]', roomId);
|
logger.info('constructor() [roomId:"%s"]', roomId);
|
||||||
|
|
||||||
|
|
@ -70,8 +76,8 @@ class Room extends EventEmitter
|
||||||
|
|
||||||
this._peers = {};
|
this._peers = {};
|
||||||
|
|
||||||
// mediasoup Router instance.
|
// Array of mediasoup Router instances.
|
||||||
this._mediasoupRouter = mediasoupRouter;
|
this._mediasoupRouters = mediasoupRouters;
|
||||||
|
|
||||||
// mediasoup AudioLevelObserver.
|
// mediasoup AudioLevelObserver.
|
||||||
this._audioLevelObserver = audioLevelObserver;
|
this._audioLevelObserver = audioLevelObserver;
|
||||||
|
|
@ -108,8 +114,11 @@ class Room extends EventEmitter
|
||||||
|
|
||||||
this._peers = null;
|
this._peers = null;
|
||||||
|
|
||||||
// Close the mediasoup Router.
|
// Close the mediasoup Routers.
|
||||||
this._mediasoupRouter.close();
|
for (const router of this._mediasoupRouters)
|
||||||
|
{
|
||||||
|
router.close();
|
||||||
|
}
|
||||||
|
|
||||||
// Emit 'close' event.
|
// Emit 'close' event.
|
||||||
this.emit('close');
|
this.emit('close');
|
||||||
|
|
@ -332,6 +341,9 @@ class Room extends EventEmitter
|
||||||
|
|
||||||
this._peers[peer.id] = peer;
|
this._peers[peer.id] = peer;
|
||||||
|
|
||||||
|
// Assign least loaded router
|
||||||
|
peer.routerId = this._getLeastLoadedRouter();
|
||||||
|
|
||||||
this._handlePeer(peer);
|
this._handlePeer(peer);
|
||||||
this._notification(peer.socket, 'roomReady');
|
this._notification(peer.socket, 'roomReady');
|
||||||
}
|
}
|
||||||
|
|
@ -413,11 +425,14 @@ class Room extends EventEmitter
|
||||||
|
|
||||||
async _handleSocketRequest(peer, request, cb)
|
async _handleSocketRequest(peer, request, cb)
|
||||||
{
|
{
|
||||||
|
const router =
|
||||||
|
this._mediasoupRouters.find((peerRouter) => peerRouter.id === peer.routerId);
|
||||||
|
|
||||||
switch (request.method)
|
switch (request.method)
|
||||||
{
|
{
|
||||||
case 'getRouterRtpCapabilities':
|
case 'getRouterRtpCapabilities':
|
||||||
{
|
{
|
||||||
cb(null, this._mediasoupRouter.rtpCapabilities);
|
cb(null, router.rtpCapabilities);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -531,7 +546,7 @@ class Room extends EventEmitter
|
||||||
webRtcTransportOptions.enableTcp = true;
|
webRtcTransportOptions.enableTcp = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const transport = await this._mediasoupRouter.createWebRtcTransport(
|
const transport = await router.createWebRtcTransport(
|
||||||
webRtcTransportOptions
|
webRtcTransportOptions
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -615,6 +630,17 @@ class Room extends EventEmitter
|
||||||
const producer =
|
const producer =
|
||||||
await transport.produce({ kind, rtpParameters, appData });
|
await transport.produce({ kind, rtpParameters, appData });
|
||||||
|
|
||||||
|
for (const destinationRouter of this._mediasoupRouters)
|
||||||
|
{
|
||||||
|
if (destinationRouter !== router)
|
||||||
|
{
|
||||||
|
await router.pipeToRouter({
|
||||||
|
producerId : producer.id,
|
||||||
|
router : destinationRouter
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Store the Producer into the Peer data Object.
|
// Store the Producer into the Peer data Object.
|
||||||
peer.addProducer(producer.id, producer);
|
peer.addProducer(producer.id, producer);
|
||||||
|
|
||||||
|
|
@ -1089,6 +1115,9 @@ class Room extends EventEmitter
|
||||||
producer.id
|
producer.id
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const router = this._mediasoupRouters.find((producerRouter) =>
|
||||||
|
producerRouter.id === producerPeer.routerId);
|
||||||
|
|
||||||
// Optimization:
|
// Optimization:
|
||||||
// - Create the server-side Consumer. If video, do it paused.
|
// - Create the server-side Consumer. If video, do it paused.
|
||||||
// - Tell its Peer about it and wait for its response.
|
// - Tell its Peer about it and wait for its response.
|
||||||
|
|
@ -1099,7 +1128,7 @@ class Room extends EventEmitter
|
||||||
// NOTE: Don't create the Consumer if the remote Peer cannot consume it.
|
// NOTE: Don't create the Consumer if the remote Peer cannot consume it.
|
||||||
if (
|
if (
|
||||||
!consumerPeer.rtpCapabilities ||
|
!consumerPeer.rtpCapabilities ||
|
||||||
!this._mediasoupRouter.canConsume(
|
!router.canConsume(
|
||||||
{
|
{
|
||||||
producerId : producer.id,
|
producerId : producer.id,
|
||||||
rtpCapabilities : consumerPeer.rtpCapabilities
|
rtpCapabilities : consumerPeer.rtpCapabilities
|
||||||
|
|
@ -1292,6 +1321,26 @@ class Room extends EventEmitter
|
||||||
socket.emit('notification', { method, data });
|
socket.emit('notification', { method, data });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_getLeastLoadedRouter()
|
||||||
|
{
|
||||||
|
let load = Infinity;
|
||||||
|
let id;
|
||||||
|
|
||||||
|
for (const router of this._mediasoupRouters)
|
||||||
|
{
|
||||||
|
const routerLoad =
|
||||||
|
Object.values(this._peers).filter((peer) => peer.routerId === router.id).length;
|
||||||
|
|
||||||
|
if (routerLoad < load)
|
||||||
|
{
|
||||||
|
id = router.id;
|
||||||
|
load = routerLoad;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return id;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = Room;
|
module.exports = Room;
|
||||||
|
|
|
||||||
|
|
@ -570,9 +570,9 @@ async function getOrCreateRoom({ roomId })
|
||||||
{
|
{
|
||||||
logger.info('creating a new Room [roomId:"%s"]', roomId);
|
logger.info('creating a new Room [roomId:"%s"]', roomId);
|
||||||
|
|
||||||
const mediasoupWorker = getMediasoupWorker();
|
// const mediasoupWorker = getMediasoupWorker();
|
||||||
|
|
||||||
room = await Room.create({ mediasoupWorker, roomId });
|
room = await Room.create({ mediasoupWorkers, roomId });
|
||||||
|
|
||||||
rooms.set(roomId, room);
|
rooms.set(roomId, room);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue