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

Fix stuff

master
Iñaki Baz Castillo 2018-02-07 15:37:18 +01:00
parent 9fe6e71ace
commit 926d09967f
2 changed files with 155 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
server/lib/homer.js
View File

@ -2,12 +2,9 @@
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
const Logger = require('./Logger');
const STATS_INTERVAL = 4000; // TODO const STATS_INTERVAL = 4000; // TODO
const logger = new Logger('Homer');
function homer(server) function homer(server)
{ {
if (!process.env.MEDIASOUP_HOMER_OUTPUT) if (!process.env.MEDIASOUP_HOMER_OUTPUT)
@ -15,9 +12,11 @@ function homer(server)
server.on('newroom', (room) => server.on('newroom', (room) =>
{ {
const fileName = path.join(process.env.MEDIASOUP_HOMER_OUTPUT, String(room.id)); const fileName =
path.join(
process.env.MEDIASOUP_HOMER_OUTPUT,
`${(new Date()).toISOString()}_${room.id}`);
console.warn(fileName);
const stream = fs.createWriteStream(fileName, { flags: 'a' }); const stream = fs.createWriteStream(fileName, { flags: 'a' });
emit( emit(
@ -41,7 +40,8 @@ function handleRoom(room, stream)
room.on('close', () => room.on('close', () =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'room.close' event : 'room.close'
}), }),
@ -52,7 +52,8 @@ function handleRoom(room, stream)
room.on('newpeer', (peer) => room.on('newpeer', (peer) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'room.newpeer', event : 'room.newpeer',
peerName : peer.name, peerName : peer.name,
@ -73,7 +74,8 @@ function handlePeer(peer, baseEvent, stream)
peer.on('close', (originator) => peer.on('close', (originator) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'peer.close', event : 'peer.close',
originator : originator originator : originator
@ -83,7 +85,8 @@ function handlePeer(peer, baseEvent, stream)
peer.on('newtransport', (transport) => peer.on('newtransport', (transport) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'peer.newtransport', event : 'peer.newtransport',
transportId : transport.id, transportId : transport.id,
@ -97,7 +100,8 @@ function handlePeer(peer, baseEvent, stream)
peer.on('newproducer', (producer) => peer.on('newproducer', (producer) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'peer.newproducer', event : 'peer.newproducer',
producerId : producer.id, producerId : producer.id,
@ -112,7 +116,8 @@ function handlePeer(peer, baseEvent, stream)
peer.on('newconsumer', (consumer) => peer.on('newconsumer', (consumer) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'peer.newconsumer', event : 'peer.newconsumer',
consumerId : consumer.id, consumerId : consumer.id,
@ -128,7 +133,8 @@ function handlePeer(peer, baseEvent, stream)
// Must also handle existing Consumers at the time the Peer was created. // Must also handle existing Consumers at the time the Peer was created.
for (const consumer of peer.consumers) for (const consumer of peer.consumers)
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'peer.newconsumer', event : 'peer.newconsumer',
consumerId : consumer.id, consumerId : consumer.id,
@ -149,12 +155,13 @@ function handleTransport(transport, baseEvent, stream)
transportId : transport.id transportId : transport.id
}); });
const statsInterval = setInterval((stats) => const statsInterval = setInterval(() =>
{ {
transport.getStats() transport.getStats()
.then((stats) => .then((stats) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'transport.stats', event : 'transport.stats',
stats : stats stats : stats
@ -167,7 +174,8 @@ function handleTransport(transport, baseEvent, stream)
{ {
clearInterval(statsInterval); clearInterval(statsInterval);
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'transport.close', event : 'transport.close',
originator : originator originator : originator
@ -177,7 +185,8 @@ function handleTransport(transport, baseEvent, stream)
transport.on('iceselectedtuplechange', (iceSelectedTuple) => transport.on('iceselectedtuplechange', (iceSelectedTuple) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'transport.iceselectedtuplechange', event : 'transport.iceselectedtuplechange',
iceSelectedTuple : iceSelectedTuple iceSelectedTuple : iceSelectedTuple
@ -187,7 +196,8 @@ function handleTransport(transport, baseEvent, stream)
transport.on('icestatechange', (iceState) => transport.on('icestatechange', (iceState) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'transport.icestatechange', event : 'transport.icestatechange',
iceState : iceState iceState : iceState
@ -197,7 +207,8 @@ function handleTransport(transport, baseEvent, stream)
transport.on('dtlsstatechange', (dtlsState) => transport.on('dtlsstatechange', (dtlsState) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'transport.dtlsstatechange', event : 'transport.dtlsstatechange',
dtlsState : dtlsState dtlsState : dtlsState
@ -213,12 +224,13 @@ function handleProducer(producer, baseEvent, stream)
producerId : producer.id producerId : producer.id
}); });
const statsInterval = setInterval((stats) => const statsInterval = setInterval(() =>
{ {
producer.getStats() producer.getStats()
.then((stats) => .then((stats) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'producer.stats', event : 'producer.stats',
stats : stats stats : stats
@ -231,7 +243,8 @@ function handleProducer(producer, baseEvent, stream)
{ {
clearInterval(statsInterval); clearInterval(statsInterval);
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'producer.close', event : 'producer.close',
originator : originator originator : originator
@ -241,7 +254,8 @@ function handleProducer(producer, baseEvent, stream)
producer.on('pause', (originator) => producer.on('pause', (originator) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'producer.pause', event : 'producer.pause',
originator : originator originator : originator
@ -251,7 +265,8 @@ function handleProducer(producer, baseEvent, stream)
producer.on('resume', (originator) => producer.on('resume', (originator) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'producer.resume', event : 'producer.resume',
originator : originator originator : originator
@ -267,12 +282,13 @@ function handleConsumer(consumer, baseEvent, stream)
consumerId : consumer.id consumerId : consumer.id
}); });
const statsInterval = setInterval((stats) => const statsInterval = setInterval(() =>
{ {
consumer.getStats() consumer.getStats()
.then((stats) => .then((stats) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'consumer.stats', event : 'consumer.stats',
stats : stats stats : stats
@ -285,7 +301,8 @@ function handleConsumer(consumer, baseEvent, stream)
{ {
clearInterval(statsInterval); clearInterval(statsInterval);
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'consumer.close', event : 'consumer.close',
originator : originator originator : originator
@ -295,7 +312,8 @@ function handleConsumer(consumer, baseEvent, stream)
consumer.on('handled', () => consumer.on('handled', () =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'consumer.handled', event : 'consumer.handled',
transportId : consumer.transport.id transportId : consumer.transport.id
@ -305,7 +323,8 @@ function handleConsumer(consumer, baseEvent, stream)
consumer.on('unhandled', () => consumer.on('unhandled', () =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'consumer.handled' event : 'consumer.handled'
}), }),
@ -314,7 +333,8 @@ function handleConsumer(consumer, baseEvent, stream)
consumer.on('pause', (originator) => consumer.on('pause', (originator) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'consumer.pause', event : 'consumer.pause',
originator : originator originator : originator
@ -324,7 +344,8 @@ function handleConsumer(consumer, baseEvent, stream)
consumer.on('resume', (originator) => consumer.on('resume', (originator) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'consumer.resume', event : 'consumer.resume',
originator : originator originator : originator
@ -334,7 +355,8 @@ function handleConsumer(consumer, baseEvent, stream)
consumer.on('effectiveprofilechange', (profile) => consumer.on('effectiveprofilechange', (profile) =>
{ {
emit(Object.assign({}, baseEvent, emit(
Object.assign({}, baseEvent,
{ {
event : 'consumer.effectiveprofilechange', event : 'consumer.effectiveprofilechange',
profile : profile profile : profile

2
server/server.js
View File

@ -6,8 +6,6 @@ process.title = 'mediasoup-demo-server';
const config = require('./config'); const config = require('./config');
process.env.DEBUG = process.env.DEBUG || '*INFO* *WARN* *ERROR* *mediasoup-worker*';
/* eslint-disable no-console */ /* eslint-disable no-console */
console.log('- process.env.DEBUG:', process.env.DEBUG); console.log('- process.env.DEBUG:', process.env.DEBUG);
console.log('- config.mediasoup.logLevel:', config.mediasoup.logLevel); console.log('- config.mediasoup.logLevel:', config.mediasoup.logLevel);