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

Merge branch 'develop'

master
Stefan Otto 2018-06-29 13:10:20 +02:00
parent 369310704f e192f4e424
commit 8fdd1d1ab1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/lib/homer.js
View File

@ -13,9 +13,7 @@ function homer(server)
server.on('newroom', (room) => server.on('newroom', (room) =>
{ {
const fileName = const fileName =
path.join( path.join(process.env.MEDIASOUP_HOMER_OUTPUT);
process.env.MEDIASOUP_HOMER_OUTPUT,
`${(new Date()).toISOString()}_${room.id}`);
const stream = fs.createWriteStream(fileName, { flags: 'a' }); const stream = fs.createWriteStream(fileName, { flags: 'a' });

22
server/router.js
View File

@ -158,19 +158,21 @@ const actions = {
var resolvedBase = path.resolve('./public'); var resolvedBase = path.resolve('./public');
var safeSuffix = path.normalize(req.url).replace(/^(\.\.[\/\\])+/, ''); var safeSuffix = path.normalize(req.url).replace(/^(\.\.[\/\\])+/, '');
var fileLoc = path.join(resolvedBase, safeSuffix); var fileLoc = path.join(resolvedBase, safeSuffix);
var headers = {};
var stream = fs.createReadStream(fileLoc); var stream = fs.createReadStream(fileLoc);
// Handle non-existent file -> delivering index.html // Handle non-existent file -> delivering index.html
stream.on('error', function(error) { stream.on('error', function(error) {
stream = fs.createReadStream(path.resolve('./public/index.html')); stream = fs.createReadStream(path.resolve('./public/index.html'));
res.statusCode = 200;
stream.pipe(res);
});
// File exists, stream it to user
res.statusCode = 200; res.statusCode = 200;
stream.pipe(res); stream.pipe(res);
});
// File exists, stream it to user
if (parsedUrl.pathname.indexOf('svg') === parsedUrl.pathname.length -3) {headers = {'Content-Type': 'image/svg+xml'}};
res.writeHead(200, headers);
stream.pipe(res);
} }
}, },