Fix linting errors, export mediasoup server

master
Torjus 2018-07-23 12:22:14 +02:00
parent f44bde4ef4
commit 313ce81685
5 changed files with 41 additions and 26 deletions

View File

@ -3,15 +3,15 @@ module.exports =
// oAuth2 conf // oAuth2 conf
oauth2 : oauth2 :
{ {
client_id : '', client_id : '',
client_secret : '', client_secret : '',
providerID : '', providerID : '',
redirect_uri : 'https://mYDomainName:port/auth-callback', redirect_uri : 'https://mYDomainName:port/auth-callback',
authorization_endpoint : '', authorization_endpoint : '',
userinfo_endpoint : '', userinfo_endpoint : '',
token_endpoint : '', token_endpoint : '',
scopes : { request : [ 'openid', 'userid','profile'] }, scopes : { request: [ 'openid', 'userid', 'profile' ] },
response_type : 'code' response_type : 'code'
}, },
// Listening hostname for `gulp live|open`. // Listening hostname for `gulp live|open`.
domain : 'localhost', domain : 'localhost',
@ -22,7 +22,7 @@ module.exports =
}, },
// Listening port for https server. // Listening port for https server.
listeningPort : 3443, listeningPort : 3443,
mediasoup : mediasoup :
{ {
// mediasoup Server settings. // mediasoup Server settings.
logLevel : 'warn', logLevel : 'warn',

View File

@ -15,20 +15,30 @@ const gulp = require('gulp');
const plumber = require('gulp-plumber'); const plumber = require('gulp-plumber');
const eslint = require('gulp-eslint'); const eslint = require('gulp-eslint');
const LINTING_FILES =
[
'gulpfile.js',
'server.js',
'config.example.js',
'lib/**/*.js'
];
gulp.task('lint', () => gulp.task('lint', () =>
{ {
const src =
[
'gulpfile.js',
'server.js',
'config.example.js',
'lib/**/*.js'
];
return gulp.src(src) return gulp.src(LINTING_FILES)
.pipe(plumber()) .pipe(plumber())
.pipe(eslint()) .pipe(eslint())
.pipe(eslint.format()); .pipe(eslint.format());
}); });
gulp.task('lint-fix', function()
{
return gulp.src(LINTING_FILES)
.pipe(plumber())
.pipe(eslint({ fix: true }))
.pipe(eslint.format())
.pipe(gulp.dest((file) => file.base));
});
gulp.task('default', gulp.series('lint')); gulp.task('default', gulp.series('lint'));

View File

@ -233,8 +233,8 @@ class Room extends EventEmitter
accept(); accept();
this._protooRoom.spread('profile-picture-changed', { this._protooRoom.spread('profile-picture-changed', {
peerName: protooPeer.id, peerName : protooPeer.id,
picture: request.data.picture picture : request.data.picture
}, [ protooPeer ]); }, [ protooPeer ]);
break; break;
@ -284,7 +284,7 @@ class Room extends EventEmitter
this._protooRoom.spread( this._protooRoom.spread(
'raisehand-message', 'raisehand-message',
{ {
peerName : protooPeer.id, peerName : protooPeer.id,
raiseHandState : raiseHandState raiseHandState : raiseHandState
}, },
[ protooPeer ]); [ protooPeer ]);

View File

@ -317,3 +317,5 @@ function stdinError(msg)
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.error(colors.red.bold('ERROR: ') + colors.red(msg)); console.error(colors.red.bold('ERROR: ') + colors.red(msg));
} }
export default mediaServer;

View File

@ -21,7 +21,7 @@ console.log('- config.mediasoup.logTags:', config.mediasoup.logTags);
/* eslint-enable no-console */ /* eslint-enable no-console */
// Start the mediasoup server. // Start the mediasoup server.
require('./mediasoup'); const mediaServer = require('./mediasoup');
const logger = new Logger(); const logger = new Logger();
@ -58,22 +58,25 @@ app.get(
if (rooms.has(req.query.roomId)) if (rooms.has(req.query.roomId))
{ {
const room = rooms.get(req.query.roomId)._protooRoom; const room = rooms.get(req.query.roomId)._protooRoom;
if ( room.hasPeer(req.query.peerName) )
if (room.hasPeer(req.query.peerName))
{ {
const peer = room.getPeer(req.query.peerName); const peer = room.getPeer(req.query.peerName);
peer.send('auth', { peer.send('auth', {
name: req.user.displayName, name : req.user.displayName,
picture: req.user.photos[0] picture : req.user.photos[0]
}); });
} }
} }
} }
) );
// Serve all files in the public folder as static files. // Serve all files in the public folder as static files.
app.use(express.static('public')); app.use(express.static('public'));
const httpsServer = https.createServer(tls, app); const httpsServer = https.createServer(tls, app);
httpsServer.listen(config.listeningPort, '0.0.0.0', () => httpsServer.listen(config.listeningPort, '0.0.0.0', () =>
{ {
logger.info('Server running on port: ', config.listeningPort); logger.info('Server running on port: ', config.listeningPort);