Wow, same port for ws

1 files changed, 12 insertions, 14 deletions

diff --git a/build/server.js b/build/server.js
index 09a3071..72d8eab 100644
--- a/build/server.js
+++ b/build/server.js
@@ -633,9 +633,6 @@ server_HttpServer.getMimeType = function(ext) {
 	return contentType;
 };
 var server_Main = function(port,wsPort) {
-	if(wsPort == null) {
-		wsPort = 4201;
-	}
 	if(port == null) {
 		port = 4200;
 	}
@@ -654,8 +651,6 @@ var server_Main = function(port,wsPort) {
 	this.statePath = "" + this.rootDir + "/user/state.json";
 	this.config = this.getUserConfig();
 	this.loadState();
-	this.wss = new js_npm_ws_Server({ port : wsPort});
-	this.wss.on("connection",$bind(this,this.onConnect));
 	var exit = function() {
 		_gthis.saveState();
 		process.exit();
@@ -665,13 +660,13 @@ var server_Main = function(port,wsPort) {
 	process.on("SIGUSR1",exit);
 	process.on("SIGUSR2",exit);
 	process.on("uncaughtException",function(err) {
-		haxe_Log.trace(err,{ fileName : "src/server/Main.hx", lineNumber : 54, className : "server.Main", methodName : "new"});
+		haxe_Log.trace(err,{ fileName : "src/server/Main.hx", lineNumber : 52, className : "server.Main", methodName : "new"});
 		_gthis.logError("uncaughtException",{ message : err.message, stack : err.stack});
 		exit();
 		return;
 	});
 	process.on("unhandledRejection",function(reason,promise) {
-		haxe_Log.trace("Unhandled Rejection at:",{ fileName : "src/server/Main.hx", lineNumber : 62, className : "server.Main", methodName : "new", customParams : [reason]});
+		haxe_Log.trace("Unhandled Rejection at:",{ fileName : "src/server/Main.hx", lineNumber : 60, className : "server.Main", methodName : "new", customParams : [reason]});
 		_gthis.logError("unhandledRejection",reason);
 		exit();
 		return;
@@ -681,17 +676,20 @@ var server_Main = function(port,wsPort) {
 	this.port = port;
 	server_Utils.getGlobalIp(function(ip) {
 		_gthis.globalIp = ip;
-		haxe_Log.trace("Local: http://" + _gthis.localIp + ":" + port,{ fileName : "src/server/Main.hx", lineNumber : 72, className : "server.Main", methodName : "new"});
-		haxe_Log.trace("Global: http://" + _gthis.globalIp + ":" + port,{ fileName : "src/server/Main.hx", lineNumber : 73, className : "server.Main", methodName : "new"});
+		haxe_Log.trace("Local: http://" + _gthis.localIp + ":" + port,{ fileName : "src/server/Main.hx", lineNumber : 70, className : "server.Main", methodName : "new"});
+		haxe_Log.trace("Global: http://" + _gthis.globalIp + ":" + port,{ fileName : "src/server/Main.hx", lineNumber : 71, className : "server.Main", methodName : "new"});
 		return;
 	});
 	var dir = "" + this.rootDir + "/res";
 	server_HttpServer.init(dir,"" + this.rootDir + "/user/res");
 	Lang.init("" + dir + "/langs");
-	js_node_Http.createServer(function(req,res) {
+	var server1 = js_node_Http.createServer(function(req,res) {
 		server_HttpServer.serveFiles(req,res);
 		return;
-	}).listen(port,"0.0.0.0");
+	});
+	server1.listen(port);
+	this.wss = new js_npm_ws_Server({ server : server1, port : wsPort});
+	this.wss.on("connection",$bind(this,this.onConnect));
 };
 server_Main.__name__ = true;
 server_Main.main = function() {
@@ -711,7 +709,7 @@ server_Main.prototype = {
 			var field = _g1[_g];
 			++_g;
 			if(Reflect.field(config,field) == null) {
-				haxe_Log.trace("Warning: config field \"" + field + "\" is unknown",{ fileName : "src/server/Main.hx", lineNumber : 91, className : "server.Main", methodName : "getUserConfig"});
+				haxe_Log.trace("Warning: config field \"" + field + "\" is unknown",{ fileName : "src/server/Main.hx", lineNumber : 92, className : "server.Main", methodName : "getUserConfig"});
 			}
 			config[field] = Reflect.field(customConfig,field);
 		}
@@ -751,7 +749,7 @@ server_Main.prototype = {
 		var ip = req.connection.remoteAddress;
 		var id = this.freeIds.length > 0 ? this.freeIds.shift() : this.clients.length;
 		var name = "Guest " + (id + 1);
-		haxe_Log.trace("" + name + " connected (" + ip + ")",{ fileName : "src/server/Main.hx", lineNumber : 133, className : "server.Main", methodName : "onConnect"});
+		haxe_Log.trace("" + name + " connected (" + ip + ")",{ fileName : "src/server/Main.hx", lineNumber : 134, className : "server.Main", methodName : "onConnect"});
 		var client = new Client(ws,req,id,name,0);
 		if(req.connection.localAddress == ip) {
 			client.group |= 4;
@@ -777,7 +775,7 @@ server_Main.prototype = {
 			return;
 		});
 		ws.on("close",function(err) {
-			haxe_Log.trace("Client " + client.name + " disconnected",{ fileName : "src/server/Main.hx", lineNumber : 161, className : "server.Main", methodName : "onConnect"});
+			haxe_Log.trace("Client " + client.name + " disconnected",{ fileName : "src/server/Main.hx", lineNumber : 162, className : "server.Main", methodName : "onConnect"});
 			server_Utils.sortedPush(_gthis.freeIds,client.id);
 			HxOverrides.remove(_gthis.clients,client);
 			_gthis.sendClientList();