added lobby, nickname fixes #44, channel name

app/Bootstrap/HttpServer.js

@@ -1,16 +1,18 @@
 define([
     'http', 
-    'node-static'
+    'node-static',
+    'Lobby/Api'
 ], 
 
-function (http, nodeStatic) {
+function (http, nodeStatic, Api) {
 
-    function HttpServer (options) {
+    function HttpServer (options, coordinator) {
         options.port = options.port || 1234;
         options.caching = typeof options.caching != 'undefined' ? options.caching : 3600;
         options.rootDirectory = options.rootDirectory || './';
 
         this.server = null;
+        this.api = new Api(coordinator);
 
         this.init(options);
     }
@@ -22,24 +24,30 @@ function (http, nodeStatic) {
 
         this.server = http.createServer(
             function (req, res) {
-
-                req.addListener('data', function() { // doesn't work on Jeenas computer without this
-                    //console.log("data")
+                
+                var fullBody = '';
+                req.addListener('data', function(chunk) { // doesn't work on Jeenas computer without this
+                    fullBody += chunk.toString();
                 });
 
                 req.addListener('error', function(err) {
                     console.log('');
                 });
 
+
                 req.addListener('end', function () {
 
                     switch(true) {
                         case req.url == '/':
-
                             fileServer.serveFile('./static/html/index.html', 200, {}, req, res);
                             console.checkpoint('HTTP Server serves index');
                             break;
 
+                        case req.url == '/game.html':
+                            fileServer.serveFile('./static/html/game.html', 200, {}, req, res);
+                            console.checkpoint('HTTP Server serves game');
+                            break;
+
                         case req.url == '/client.js':
                             fileServer.serveFile('./client.js', 200, {}, req, res);
                             break;
@@ -52,6 +60,13 @@ function (http, nodeStatic) {
                             fileServer.serveFile('./node_modules/screenfull/dist/screenfull.js', 200, {}, req, res);
                             break;
 
+                        case req.url == '/api':
+                            self.api.handleCall(fullBody);
+                            var status = self.api.isError ? 400 : 200;
+                            res.writeHead(status, {"Content-Type": self.api.getContentType()});
+                            res.end(self.api.getOutput());
+                            break;
+
                         case new RegExp(/^\/app/).test(req.url):
                             fileServer.serve(req, res, function () {
                                 self.handleFileError(res)

app/Game/Client/Networker.js

@@ -34,7 +34,12 @@ function (ProtocolHelper, GameController, User, NotificationCenter, Settings, Do
 
     Networker.prototype.onConnect = function () {
         console.log('connected.')
-        this.sendCommand('join', 'dungeon');
+        var channel = JSON.parse(localStorage["channel"]);
+        if(channel.name) {
+            this.sendCommand('join', channel.name);
+        } else {
+            window.location.href = "/";
+        }
     }
 
     Networker.prototype.onDisconnect = function () {
@@ -45,6 +50,7 @@ function (ProtocolHelper, GameController, User, NotificationCenter, Settings, Do
     }
 
     Networker.prototype.onJoinSuccess = function (options) {
+        console.log("join success")
         this.userId = options.userId;
 
         this.gameController = new GameController();

app/Lobby/Api.js

@@ -0,0 +1,52 @@
+define([
+	"Lib/Utilities/NotificationCenter",
+	"Lib/Utilities/Protocol/Helper"
+],
+ 
+function (NotificationCenter, ProtocolHelper) {
+ 
+    function Api(coordinator) {
+    	this.coordinator = coordinator;
+    	this.isError = false;
+    	this.output = null;
+    }
+ 
+    Api.prototype.handleCall = function(queryParameters) {
+
+    	var command;
+    	try	{
+	    	var message = JSON.parse(queryParameters);
+	    	command = message.command;
+    	} catch(e) {
+    		console.error(e)
+    	}
+
+    	var output = null;
+       	switch(command) {
+       		case "getChannels":
+       			output = this.coordinator.getChannels();
+       			break;
+       		default:
+       			this.isError = true;
+       			output = "Command not found";
+       			break;
+       	}
+
+       	this.output = output;
+    }
+
+    Api.prototype.getOutput = function() {
+    	var output = {};
+    	var key = this.isError ? "error" : "success";
+    	output[key] = this.output;
+    	return JSON.stringify(output);
+    	
+    };
+
+    Api.prototype.getContentType = function() {
+    	return "application/json";
+    };
+ 
+    return Api;
+ 
+});

app/Lobby/Coordinator.js

@@ -92,6 +92,16 @@ function (User, Channel, PipeToChannel, NotificationCenter) {
         return channelPipe;
     };
 
+    Coordinator.prototype.getChannels = function(options) {
+        var list = [];
+        for (var channelName in this.channelPipes) {
+            list.push({
+                name: channelName
+            });
+        }
+        return list;
+    };
+
     return Coordinator;
 
 });

app/Lobby/PipeToChannel.js

@@ -13,6 +13,7 @@ function (NotificationCenter, childProcess) {
 
 		try {
             this.channelPipe = fork('channel.js');
+            console.log(this.channelPipe)
         } catch (err) {
             throw 'Failed to fork channel! (' + err + ')';
         }

app/Lobby/User.js

@@ -20,11 +20,7 @@ function (Parent, ProtocolHelper, NotificationCenter) {
     }
 
     User.prototype = Object.create(Parent.prototype);
-
-    User.prototype.setChannelProcess = function (channelProcess) {
-        this.channelProcess = channelProcess;
-    }
-
+    
     
     // Socket callbacks