Integrate joystick and clean code

app/app.js

@@ -6,15 +6,23 @@ module.exports = function() {
     var routes = require('./routes');
     var socket = require('./socket')(app, io);
     var EventEmitter = require('events').EventEmitter;
+
     app.events = new EventEmitter;
-    try{
+
+    try {
         var game = require('byte-odromo-game')( app, routes );
-    }catch( e ){
+    } catch( e ) {
         console.log('Not game found.');
         console.log(e);
     };
-
 
+    try {
+        var joystick = require('byte-odromo-joystick')( app, routes );
+    } catch( e ) {
+        console.log('Not joystick found.');
+        console.log(e);
+    };
+
     // Config
     app.use('/', routes);
     app.set('views', __dirname + '/views');

app/controllers/indexController.js

@@ -1,10 +1,3 @@
-var utils = require('../utils');
-
-// indexController
-/*var indexController = function(req, res, next) {
-	var hash = utils.generateHash();
-	res.redirect('/game/'+hash);
-};*/
 var indexController = function(req, res, next) {
 	res.render('index.html');
 };

app/routes.js

@@ -2,10 +2,5 @@ var express = require('express'),
 	router = express.Router();
 
 router.get('/', require('./controllers/indexController'));
-router.get('/test', function( req, res, next ){
-	res.render('test.html');
-});
-
-router.get('/game/:id', require('./controllers/gameController'));
 
 module.exports = router;

app/socket.js

@@ -5,6 +5,7 @@ module.exports = function(app,io) {
     app.roomList = {};
     //@TODO complete lobby events to be listened by games
     io.on('connection', function( socket ) {
+
         app.events.emit( 'socket.connection', { socket: socket } );
         console.log('----connection-----');
 
@@ -22,6 +23,7 @@ module.exports = function(app,io) {
                 userId: userId
             };
             var newParams = { socket: socket, params: objectMerge( params, roomAndUser ) };
+
             app.events.emit( 'socket.createRoom', newParams );
 
             socket.join( roomId );
@@ -32,13 +34,13 @@ module.exports = function(app,io) {
             io.sockets.emit( 'createNewRoom', roomId );
         });
 
-        socket.on('getMembers', function( roomId ){
+        socket.on('getMembers', function( roomId ) {
             socket.emit( 'getMembers', app.roomList[ roomId ] );
         });
 
-        socket.on('getRooms', function(){
+        socket.on('getRooms', function() {
             var rooms = [];
-            for( var el in app.roomList ){
+            for ( var el in app.roomList ) {
                 rooms.push( el );
             }
             socket.emit( 'getRooms', rooms );
@@ -49,26 +51,28 @@ module.exports = function(app,io) {
             //@TODO what happend if room doesn't exist?
             if( app.roomList[ guess.roomId ] ){
                 socket.join( guess.roomId );
-                app.roomList[ guess.roomId ].push( guess.id );
+                socket.roomId = guess.roomId;
+                socket.userId = guess.userId;
+                app.roomList[ guess.roomId ].push( guess.userId );
 
                 socket.emit( 'joinRoom',  guess.roomId );
                 // emit to all, include the client
                 // io.sockets.to(socket.room).emit('game', 'Nuevo player conectado');
                 // emit to all, exclude the client
-                socket.broadcast.to( guess.roomId ).emit('newJoinRoom', { id: guess.id });
+                socket.broadcast.to( guess.roomId ).emit('newJoinRoom', { id: guess.userId });
             }
         });
 
-        socket.on( 'leaveRoom', function( data ){
+        socket.on( 'leaveRoom', function( data ) {
             socket.leave( data.roomId );
             //loop on members of given room
             for( var i = 0; i < app.roomList[data.roomId].length; i++ ){
                 //found position of member id
-                if( app.roomList[data.roomId][i] == data.userId ){
+                if( app.roomList[data.roomId][i] == data.userId ) {
                     //remove member from room list
                     app.roomList[data.roomId].splice( i, 1 );
                     //remove room if its empty
-                    if( app.roomList[data.roomId].length == 0 ){
+                    if( app.roomList[data.roomId].length == 0 ) {
                         delete app.roomList[data.roomId];
                     }
                     break;
@@ -79,8 +83,14 @@ module.exports = function(app,io) {
                 //update removed room
                 io.sockets.emit( 'closeRoom', data.userId );
             }
+
             socket.emit( 'leaveRoom',  data.userId );
             socket.broadcast.to( data.roomId ).emit('newLeaveRoom', data.userId );
         })
+
+        socket.on( 'game' , function( data ) {
+            io.sockets.to(socket.roomId).emit('game', {userId: socket.userId, data: data});
+        });
+
     });
 };