diff options
| -rw-r--r-- | build/server.js | 23 | ||||
| -rw-r--r-- | default-config.json | 1 | ||||
| -rw-r--r-- | src/Types.hx | 1 | ||||
| -rw-r--r-- | src/client/Main.hx | 4 | ||||
| -rw-r--r-- | src/server/Main.hx | 14 |
5 files changed, 21 insertions, 22 deletions
diff --git a/build/server.js b/build/server.js index 33397b4..1e2a5b5 100644 --- a/build/server.js +++ b/build/server.js @@ -933,10 +933,7 @@ server_HttpServer.getMimeType = function(ext) { } return contentType; }; -var server_Main = function(port,wsPort) { - if(port == null) { - port = 4200; - } +var server_Main = function() { this.loadedClientsCount = 0; this.htmlChars = new EReg("[&^<>'\"]",""); this.itemPos = 0; @@ -948,10 +945,6 @@ var server_Main = function(port,wsPort) { this.clients = []; this.rootDir = "" + __dirname + "/.."; var _gthis = this; - var envPort = process.env.PORT; - if(envPort != null) { - port = envPort; - } this.statePath = "" + this.rootDir + "/user/state.json"; process.on("SIGINT",$bind(this,this.exit)); process.on("SIGUSR1",$bind(this,this.exit)); @@ -976,11 +969,15 @@ var server_Main = function(port,wsPort) { this.config.salt = this.generateConfigSalt(); this.localIp = server_Utils.getLocalIp(); this.globalIp = this.localIp; - this.port = port; + this.port = this.config.port; + var envPort = process.env.PORT; + if(envPort != null) { + this.port = envPort; + } server_Utils.getGlobalIp(function(ip) { _gthis.globalIp = ip; - haxe_Log.trace("Local: http://" + _gthis.localIp + ":" + port,{ fileName : "src/server/Main.hx", lineNumber : 79, className : "server.Main", methodName : "new"}); - haxe_Log.trace("Global: http://" + _gthis.globalIp + ":" + port,{ fileName : "src/server/Main.hx", lineNumber : 80, className : "server.Main", methodName : "new"}); + haxe_Log.trace("Local: http://" + _gthis.localIp + ":" + _gthis.port,{ fileName : "src/server/Main.hx", lineNumber : 79, className : "server.Main", methodName : "new"}); + haxe_Log.trace("Global: http://" + _gthis.globalIp + ":" + _gthis.port,{ fileName : "src/server/Main.hx", lineNumber : 80, className : "server.Main", methodName : "new"}); return; }); var dir = "" + this.rootDir + "/res"; @@ -990,8 +987,8 @@ var server_Main = function(port,wsPort) { server_HttpServer.serveFiles(req,res); return; }); - server1.listen(port); - this.wss = new js_npm_ws_Server({ server : server1, port : wsPort}); + server1.listen(this.port); + this.wss = new js_npm_ws_Server({ server : server1}); this.wss.on("connection",$bind(this,this.onConnect)); }; server_Main.__name__ = true; diff --git a/default-config.json b/default-config.json index 488532f..37c3861 100644 --- a/default-config.json +++ b/default-config.json @@ -1,4 +1,5 @@ { + "port": 4200, "channelName": "SyncTube", "maxLoginLength": 20, "maxMessageLength": 500, diff --git a/src/Types.hx b/src/Types.hx index 41d5340..a98c7a1 100644 --- a/src/Types.hx +++ b/src/Types.hx @@ -8,6 +8,7 @@ typedef VideoData = { } typedef Config = { + port:Int, channelName:String, maxLoginLength:Int, maxMessageLength:Int, diff --git a/src/client/Main.hx b/src/client/Main.hx index 8ec1704..1552d38 100644 --- a/src/client/Main.hx +++ b/src/client/Main.hx @@ -2,11 +2,11 @@ package client; import haxe.crypto.Sha256; import haxe.Timer; +import haxe.Json; import js.html.MouseEvent; import js.html.KeyboardEvent; import js.html.Event; import js.html.Element; -import haxe.Json; import js.html.InputElement; import js.html.WebSocket; import js.Browser; @@ -38,7 +38,7 @@ class Main { static function main():Void new Main(); - public function new(?host:String, ?port:String) { + function new(?host:String, ?port:String) { player = new Player(this); if (host == null) host = Browser.location.hostname; if (host == "") host = "localhost"; diff --git a/src/server/Main.hx b/src/server/Main.hx index 033e2a0..5cac674 100644 --- a/src/server/Main.hx +++ b/src/server/Main.hx @@ -1,11 +1,9 @@ package server; import haxe.crypto.Sha256; -import js.lib.Date; import sys.FileSystem; import sys.io.File; import haxe.Timer; -import Client.ClientData; import haxe.Json; import js.Node.process; import js.Node.__dirname; @@ -13,6 +11,8 @@ import js.npm.ws.Server as WSServer; import js.npm.ws.WebSocket; import js.node.http.IncomingMessage; import js.node.Http; +import js.lib.Date; +import Client.ClientData; import Types.Config; import Types.Permission; import Types.UserList; @@ -43,9 +43,7 @@ class Main { static function main():Void new Main(); - public function new(port = 4200, ?wsPort:Int) { - final envPort = (process.env : Dynamic).PORT; - if (envPort != null) port = envPort; + function new() { statePath = '$rootDir/user/state.json'; // process.on("exit", exit); process.on("SIGINT", exit); // ctrl+c @@ -72,7 +70,9 @@ class Main { config.salt = generateConfigSalt(); localIp = Utils.getLocalIp(); globalIp = localIp; - this.port = port; + port = config.port; + final envPort = (process.env : Dynamic).PORT; + if (envPort != null) port = envPort; Utils.getGlobalIp(ip -> { globalIp = ip; @@ -88,7 +88,7 @@ class Main { HttpServer.serveFiles(req, res); }); server.listen(port); - wss = new WSServer({server: server, port: wsPort}); + wss = new WSServer({server: server}); wss.on("connection", onConnect); } |