From 313ce816857baa57bed7cc322a1cb45082baa051 Mon Sep 17 00:00:00 2001
From: Torjus <torjusti@gmail.com>
Date: Mon, 23 Jul 2018 12:22:14 +0200
Subject: [PATCH] Fix linting errors, export mediasoup server

---
 server/config.example.js | 18 +++++++++---------
 server/gulpfile.js       | 26 ++++++++++++++++++--------
 server/lib/Room.js       |  6 +++---
 server/mediasoup.js      |  4 +++-
 server/server.js         | 13 ++++++++-----
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/server/config.example.js b/server/config.example.js
index 8ad774b..f1cd18d 100644
--- a/server/config.example.js
+++ b/server/config.example.js
@@ -3,15 +3,15 @@ module.exports =
 	// oAuth2 conf
 	oauth2 :
 	{
-		client_id			: '',
-		client_secret		: '',
-		providerID		: '',
-		redirect_uri	: 'https://mYDomainName:port/auth-callback',
+		client_id           			: '',
+		client_secret        		: '',
+		providerID           		: '',
+		redirect_uri          	: 'https://mYDomainName:port/auth-callback',
 		authorization_endpoint	: '',
-		userinfo_endpoint : '',
-		token_endpoint : '',
-		scopes				: { request : [ 'openid', 'userid','profile'] },
-		response_type : 'code'
+		userinfo_endpoint      : '',
+		token_endpoint         : '',
+		scopes             				: { request: [ 'openid', 'userid', 'profile' ] },
+		response_type          : 'code'
 	},
 	// Listening hostname for `gulp live|open`.
 	domain : 'localhost',
@@ -22,7 +22,7 @@ module.exports =
 	},
 	// Listening port for https server.
 	listeningPort : 3443,
-	mediasoup :
+	mediasoup     :
 	{
 		// mediasoup Server settings.
 		logLevel : 'warn',
diff --git a/server/gulpfile.js b/server/gulpfile.js
index 13d87df..b19c999 100644
--- a/server/gulpfile.js
+++ b/server/gulpfile.js
@@ -15,20 +15,30 @@ const gulp = require('gulp');
 const plumber = require('gulp-plumber');
 const eslint = require('gulp-eslint');
 
+const LINTING_FILES =
+[
+	'gulpfile.js',
+	'server.js',
+	'config.example.js',
+	'lib/**/*.js'
+];
+
 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(eslint())
 		.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'));
diff --git a/server/lib/Room.js b/server/lib/Room.js
index 1f6d13c..096f055 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -233,8 +233,8 @@ class Room extends EventEmitter
 					accept();
 
 					this._protooRoom.spread('profile-picture-changed', {
-						peerName: protooPeer.id,
-						picture: request.data.picture
+						peerName : protooPeer.id,
+						picture  : request.data.picture
 					}, [ protooPeer ]);
 
 					break;
@@ -284,7 +284,7 @@ class Room extends EventEmitter
 					this._protooRoom.spread(
 						'raisehand-message',
 						{
-							peerName    : protooPeer.id,
+							peerName       : protooPeer.id,
 							raiseHandState : raiseHandState
 						},
 						[ protooPeer ]);
diff --git a/server/mediasoup.js b/server/mediasoup.js
index 6b56094..9632e29 100644
--- a/server/mediasoup.js
+++ b/server/mediasoup.js
@@ -316,4 +316,6 @@ function stdinError(msg)
 {
 	// eslint-disable-next-line no-console
 	console.error(colors.red.bold('ERROR: ') + colors.red(msg));
-}
\ No newline at end of file
+}
+
+export default mediaServer;
\ No newline at end of file
diff --git a/server/server.js b/server/server.js
index 1a1c03a..e544f6c 100755
--- a/server/server.js
+++ b/server/server.js
@@ -21,7 +21,7 @@ console.log('- config.mediasoup.logTags:', config.mediasoup.logTags);
 /* eslint-enable no-console */
 
 // Start the mediasoup server.
-require('./mediasoup');
+const mediaServer = require('./mediasoup');
 
 const logger = new Logger();
 
@@ -58,22 +58,25 @@ app.get(
 		if (rooms.has(req.query.roomId))
 		{
 			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);
+
 				peer.send('auth', {
-					name: req.user.displayName,
-					picture: req.user.photos[0]
+					name    : req.user.displayName,
+					picture : req.user.photos[0]
 				});
 			}
 		}
 	}
-)
+);
 
 // Serve all files in the public folder as static files.
 app.use(express.static('public'));
 
 const httpsServer = https.createServer(tls, app);
+
 httpsServer.listen(config.listeningPort, '0.0.0.0', () =>
 {
 	logger.info('Server running on port: ', config.listeningPort);