socket.io index refactor

src/socket.io/index.js

@@ -19,78 +19,47 @@ var	SocketIO = require('socket.io'),
 	Sockets = {},
 	Namespaces = {};
 
-/* === */
-
-
 var io;
 
 Sockets.init = function(server) {
 	var config = {
-		transports: ['polling', 'websocket'],
+		transports: ['websocket', 'polling'],
 		path: nconf.get('relative_path') + '/socket.io'
 	};
 
+	requireModules();
+
 	io = new SocketIO();
 
 	addRedisAdapter(io);
 
 	io.use(socketioWildcard);
+	io.use(authorize);
+
+	io.on('connection', onConnection);
 
 	io.listen(server, config);
 
 	Sockets.server = io;
+};
 
-	fs.readdir(__dirname, function(err, files) {
+function onConnection(socket) {
-		files.splice(files.indexOf('index.js'), 1);
+	socket.ip = socket.request.connection.remoteAddress;
-
-		async.each(files, function(lib, next) {
-			if (lib.substr(lib.length - 3) === '.js') {
-				lib = lib.slice(0, -3);
-				Namespaces[lib] = require('./' + lib);
-			}
-
-			next();
-		});
-	});
-
-	io.use(function(socket, next) {
-		console.log('AUTH');
-
-		var handshake = socket.request,
-		 	sessionID;
-
-		if (!handshake) {
-		 	return next(new Error('[[error:not-authorized]]'));
-		}
 
-		cookieParser(handshake, {}, function(err) {
+	logger.io_one(socket, socket.uid);
-			if (err) {
-				return next(err);
-			}
 
-			var sessionID = handshake.signedCookies['express.sid'];
+	onConnect(socket);
 
-			db.sessionStore.get(sessionID, function(err, sessionData) {
+	socket.on('disconnect', function() {
-				if (err) {
+		onDisconnect(socket);
-					return next(err);
-				}
-				if (sessionData && sessionData.passport && sessionData.passport.user) {
-					socket.uid = parseInt(sessionData.passport.user, 10);
-				} else {
-					socket.uid = 0;
-				}
-				next();
-			});
-		});
 	});
 
-	io.on('connection', function(socket) {
+	socket.on('*', function(payload) {
-		console.log('CONNECTED', socket.uid, socket.id);
+		onMessage(socket, payload);
-
+	});
-		socket.ip = socket.request.connection.remoteAddress;
+}
-
-		logger.io_one(socket, socket.uid);
 
+function onConnect(socket) {
 	if (socket.uid) {
 		socket.join('uid_' + socket.uid);
 		socket.join('online_users');
@@ -107,7 +76,6 @@ Sockets.init = function(server) {
 				return;
 			}
 			socket.emit('event:connect', {
-					status: 1,
 				username: userData.user.username,
 				userslug: userData.user.userslug,
 				picture: userData.user.picture,
@@ -120,28 +88,30 @@ Sockets.init = function(server) {
 	} else {
 		socket.join('online_guests');
 		socket.emit('event:connect', {
-				status: 1,
 			username: '[[global:guest]]',
 			isAdmin: false,
 			uid: 0
 		});
 	}
+}
 
-		socket.on('disconnect', function() {
+function onDisconnect(socket) {
 	var socketCount = Sockets.getUserSocketCount(socket.uid);
-			console.log('DISCONNECT', socket.uid, socket.id);
+
 	if (socket.uid && socketCount <= 0) {
 		socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: 'offline'});
 	}
 
+	// TODO : needs fixing for cluster
+
 	// for(var roomName in io.sockets.manager.roomClients[socket.id]) {
 	// 	if (roomName.indexOf('topic') !== -1) {
 	// 		io.sockets.in(roomName.slice(1)).emit('event:user_leave', socket.uid);
 	// 	}
 	// }
-		});
+}
 
-		socket.on('*', function(payload) {
+function onMessage(socket, payload) {
 	if (!payload.data.length) {
 		return winston.warn('[socket.io] Empty payload');
 	}
@@ -183,9 +153,51 @@ Sockets.init = function(server) {
 	} else {
 		callMethod(methodToCall, socket, params, callback);
 	}
+}
+
+function requireModules() {
+	fs.readdir(__dirname, function(err, files) {
+		files.splice(files.indexOf('index.js'), 1);
+
+		async.each(files, function(lib, next) {
+			if (lib.substr(lib.length - 3) === '.js') {
+				lib = lib.slice(0, -3);
+				Namespaces[lib] = require('./' + lib);
+			}
+
+			next();
 		});
 	});
-};
+}
+
+function authorize(socket, next) {
+	var handshake = socket.request,
+	 	sessionID;
+
+	if (!handshake) {
+	 	return next(new Error('[[error:not-authorized]]'));
+	}
+
+	cookieParser(handshake, {}, function(err) {
+		if (err) {
+			return next(err);
+		}
+
+		var sessionID = handshake.signedCookies['express.sid'];
+
+		db.sessionStore.get(sessionID, function(err, sessionData) {
+			if (err) {
+				return next(err);
+			}
+			if (sessionData && sessionData.passport && sessionData.passport.user) {
+				socket.uid = parseInt(sessionData.passport.user, 10);
+			} else {
+				socket.uid = 0;
+			}
+			next();
+		});
+	});
+}
 
 function addRedisAdapter(io) {
 	if (nconf.get('redis')) {