Start working on refactoring server

config.js

@@ -9,10 +9,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-exports.MYSQL_SERVER = "";
+exports.MYSQL_SERVER = "localhost";
-exports.MYSQL_DB = "";
+exports.MYSQL_DB = "syncdevel";
-exports.MYSQL_USER = "";
+exports.MYSQL_USER = "syncdevel";
-exports.MYSQL_PASSWORD = "";
+exports.MYSQL_PASSWORD = "tacky";
 exports.IO_PORT = 1337; // Socket.IO port, DO NOT USE PORT 80.
 exports.WEBSERVER_PORT = 8080; // Webserver port.  Binding port 80 requires root permissions
 exports.MAX_PER_IP = 10;

server.js

@@ -1,226 +1,169 @@
-/*
-The MIT License (MIT)
-Copyright (c) 2013 Calvin Montgomery
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-const VERSION = "2.0.5";
-
-var fs = require("fs");
-var Logger = require("./logger.js");
-
-Logger.syslog.log("Starting CyTube v" + VERSION);
-var Config = require("./config.js");
 var express = require("express");
-var API = require("./api.js");
+var Config = require("./config");
-var NWS = require("./notwebsocket");
+var Logger = require("./logger");
+var Channel = require("./channel");
+var User = require("./user");
 
-var app = express();
+const VERSION = "2.1.0";
-app.get("/r/:channel(*)", function(req, res, next) {
-    var param = req.params.channel;
-    if(!param.match(/^[a-zA-Z0-9-_]+$/)) {
-        res.redirect("/" + param);
-    }
-    else {
-        res.sendfile(__dirname + "/www/channel.html");
-    }
-});
 
-app.get("/api/:apireq(*)", function(req, res, next) {
+function getIP(req) {
-    API.handle(req.url.substring(5), req, res);
-});
-
-function getClientIP(req) {
-    var ip = false;
     var raw = req.connection.remoteAddress;
     var forward = req.header("x-forwarded-for");
     if(Config.REVERSE_PROXY && forward) {
-        ip = forward.split(",")[0];
+        var ip = forward.split(",")[0];
-        Logger.syslog.log("/" + ip + " is proxied by /" + raw);
+        Logger.syslog.log("REVPROXY " + raw + " => " + ip);
         return ip;
     }
     return raw;
 }
 
-app.get("/nws/connect", function(req, res, next) {
-    var socket = NWS.newConnection(req, res);
-    var ip = getClientIP(req);
-    if(Database.checkGlobalBan(ip)) {
-        Logger.syslog.log("Disconnecting " + ip + " - bant");
-        socket.emit("kick", {
-            reason: "You're globally banned!"
-        });
-        socket.disconnect(true);
-        return;
-    }
-    socket.on("disconnect", function() {
-        exports.clients[ip]--;
-    });
-    if(!(ip in exports.clients)) {
-        exports.clients[ip] = 1;
-    }
-    else {
-        exports.clients[ip]++;
-    }
-    if(exports.clients[ip] > Config.MAX_PER_IP) {
-        socket.emit("kick", {
-            reason: "Too many connections from your IP address"
-        });
-        socket.disconnect(true);
-        return;
-    }
-    var user = new User(socket, ip);
-    Logger.syslog.log("Accepted connection from /" + user.ip);
-});
-
-app.get("/nws/:hash/:str", function(req, res, next) {
-    NWS.msgReceived(req, res);
-});
-
-app.get("/:thing(*)", function(req, res, next) {
-    res.sendfile(__dirname + "/www/" + req.params.thing);
-});
-
-app.use(function(err, req, res, next) {
-    if(404 == err.status) {
-        res.statusCode = 404;
-        res.send("Page not found");
-    }
-    else {
-        next(err);
-    }
-});
-//app.use(express.static(__dirname + "/www"));
-var httpserv = app.listen(Config.WEBSERVER_PORT);
-var ioserv = express().listen(Config.IO_PORT);
-
-exports.io = require("socket.io").listen(ioserv);
-exports.io.set("log level", 1);
-var User = require("./user.js").User;
-var Database = require("./database.js");
-Database.setup(Config);
-Database.init();
-
-var channels = {};
-exports.clients = {};
-
-fs.exists("chandump", function(exists) {
-    if(!exists) {
-        fs.mkdir("chandump", function(err) {
-            if(err)
-                Logger.errlog.log(err);
-        });
-    }
-});
-
-fs.exists("chanlogs", function(exists) {
-    if(!exists) {
-        fs.mkdir("chanlogs", function(err) {
-            if(err)
-                Logger.errlog.log(err);
-        });
-    }
-});
-
 function getSocketIP(socket) {
     var raw = socket.handshake.address.address;
     if(Config.REVERSE_PROXY) {
         if(typeof socket.handshake.headers["x-forwarded-for"] == "string") {
-            var ip = socket.handshake.headers["x-forwarded-for"].split(",")[0];
+            var ip = socket.handshake.headers["x-forwarded-for"]
-            Logger.syslog.log("/" + ip + " is proxied by /" + raw);
+                .split(",")[0];
+            Logger.syslog.log("REVPROXY " + raw + " => " + ip);
             return ip;
         }
     }
-    return socket.handshake.address.address;
+    return raw;
 }
 
-exports.io.sockets.on("connection", function(socket) {
+var Server = {
-    var ip = getSocketIP(socket);
+    channels: [],
-    if(Database.checkGlobalBan(ip)) {
+    channelLoaded: function (name) {
-        Logger.syslog.log("Disconnecting " + ip + " - bant");
+        for(var i in this.channels) {
-        socket.emit("kick", {
+            if(this.channels[i].name == name)
-            reason: "You're globally banned!"
+                return true;
+        }
+        return false;
+    },
+    getChannel: function (name) {
+        for(var i in this.channels) {
+            if(this.channels[i].name == name)
+                return this.channels[i];
+        }
+
+        var c = new Channel(name, this);
+        this.channels.push(c);
+        return c;
+    },
+    unloadChannel: function(chan) {
+        if(chan.registered)
+            chan.saveDump();
+        chan.playlist.die();
+        for(var i in this.channels) {
+            if(this.channels[i].name == chan.name) {
+                this.channels.splice(i, 1);
+                break;
+            }
+        }
+        for(var i in chan)
+            delete chan[i];
+    },
+    app: null,
+    io: null,
+    httpserv: null,
+    ioserv: null,
+    db: null,
+    ips: {},
+    init: function () {
+        this.app = express();
+        // channel path
+        this.app.get("/r/:channel(*)", function (req, res, next) {
+            var c = req.params.channel;
+            if(!c.match(/^[\w-_]+$/))
+                res.redirect("/" + c);
+            else
+                res.sendfile(__dirname + "/www/channel.html");
         });
-        socket.disconnect(true);
+
-        return;
+        // api path
-    }
+        this.api = require("./api")(this);
-    socket.on("disconnect", function() {
+        this.app.get("/api/:apireq(*)", function (req, res, next) {
-        exports.clients[ip]--;
+            this.api.handle(req.url.substring(5), req, res);
-    });
-    if(!(ip in exports.clients)) {
-        exports.clients[ip] = 1;
-    }
-    else {
-        exports.clients[ip]++;
-    }
-    if(exports.clients[ip] > Config.MAX_PER_IP) {
-        socket.emit("kick", {
-            reason: "Too many connections from your IP address"
         });
-        socket.disconnect(true);
+
-        return;
+        // default path
+        this.app.get("/:thing(*)", function (req, res, next) {
+            res.sendfile(__dirname + "/www/" + req.params.thing);
+        });
+
+        // fallback
+        this.app.use(function (err, req, res, next) {
+            if(err.status == 404) {
+                res.send(404);
+            } else {
+                next(err);
+            }
+        });
+
+        // bind servers
+        this.httpserv = this.app.listen(Config.WEBSERVER_PORT);
+        this.ioserv = express().listen(Config.IO_PORT);
+
+        // init socket.io
+        this.io = require("socket.io").listen(this.ioserv);
+        this.io.set("log level", 1);
+        this.io.sockets.on("connection", function (socket) {
+            var ip = getSocketIP(socket);
+            socket._ip = ip;
+            if(this.db.checkGlobalBan(ip)) {
+                Logger.syslog.log("Disconnecting " + ip + " - gbanned");
+                socket.emit("kick", {
+                    reason: "You're globally banned."
+                });
+                socket.disconnect(true);
+                return;
+            }
+
+            socket.on("disconnect", function () {
+                this.ips[ip]--;
+            });
+
+            if(!(ip in this.ips))
+                this.ips[ip] = 0;
+            this.ips[ip]++;
+
+            if(this.ips[ip] > Config.MAX_PER_IP) {
+                socket.emit("kick", {
+                    reason: "Too many connections from your IP address"
+                });
+                socket.disconnect(true);
+                return;
+            }
+
+            // finally a valid user
+            Logger.syslog.log("Accepted socket from /" + socket._ip);
+            new User(socket, this);
+        });
+
+        // init database
+        this.db = require("./database");
+        this.db.setup(Config);
+        this.db.init();
+    },
+    shutdown: function () {
+        Logger.syslog.log("Unloading channels");
+        for(var i in this.channels) {
+            if(this.channels[i].registered)
+                this.channels[i].saveDump();
+        }
+        Logger.syslog.log("Goodbye");
+        process.exit(0);
     }
-    var user = new User(socket, ip);
+};
-    Logger.syslog.log("Accepted connection from /" + user.ip);
+
-});
+Logger.syslog.log("Starting CyTube v" + VERSION);
+Server.init();
 
 if(!Config.DEBUG) {
-    process.on("uncaughtException", function(err) {
+    process.on("uncaughtException", function (err) {
         Logger.errlog.log("[SEVERE] Uncaught Exception: " + err);
         Logger.errlog.log(err.stack);
     });
 
-    process.on("exit", shutdown);
+    process.on("exit", Server.shutdown);
-    process.on("SIGINT", shutdown);
+    process.on("SIGINT", Server.shutdown);
-}
-
-function shutdown() {
-    Logger.syslog.log("Unloading channels...");
-    for(var name in channels) {
-        if(channels[name].registered)
-            channels[name].saveDump();
-    }
-    Logger.syslog.log("Shutting Down");
-    process.exit(0);
-}
-
-exports.getChannel = function (name) {
-    return channels[name];
-}
-
-exports.getAllChannels = function () {
-    return channels;
-}
-
-var Channel = require("./channel.js").Channel;
-exports.createChannel = function (name) {
-    var chan = new Channel(name);
-    channels[name] = chan;
-    return chan;
-}
-
-exports.getOrCreateChannel = function (name) {
-    var chan = exports.getChannel(name);
-    if(chan !== undefined && chan.name !== undefined)
-        return chan;
-    else if(chan !== undefined && chan.name === undefined) {
-        Logger.errlog.log("Empty channel still loaded: ", name);
-        delete channels[name];
-    }
-    return exports.createChannel(name);
-}
-
-exports.unload = function(chan) {
-    if(chan.registered) {
-        chan.saveDump();
-    }
-    chan.playlist.die();
-    delete channels[chan.name];
-    for(var i in chan)
-        delete chan[i];
 }