Reformat webserver.js

1 files changed, 122 insertions, 118 deletions

diff --git a/webserver.js b/webserver.js
index 14833b4..aecca12 100755
--- a/webserver.js
+++ b/webserver.js
@@ -1,207 +1,211 @@
 #!/usr/bin/env node
-var cmn=require("./modules/$common.js");
-var app=require("express")(),
-    http=require("http"),
-    httpServer=http.Server(app),
-    io=require("socket.io")(httpServer),
-    url=require("url"),
-    fs=require("fs"),
-    util=require("util"),
-    node_path=require("path"),
-    bodyParser=require("body-parser"),
-    basicAuth=require("basic-auth"),
-    Logger=require("./logger");
-
-
-if(process.argv.length>3){
+const cmn = require("./modules/$common.js");
+const app = require("express")();
+const http = require("http");
+const httpServer = http.Server(app);
+const io = require("socket.io")(httpServer);
+const url = require("url");
+const fs = require("fs");
+const util = require("util");
+const node_path = require("path");
+const bodyParser = require("body-parser");
+const basicAuth = require("basic-auth");
+// const Logger = require("./logger");
+
+
+if (process.argv.length > 3) {
 	console.log("Pass optional port as first argument");
 	process.exit(1);
 }
-var PORT=process.argv.length==3?+process.argv[2]:80;
+const PORT = process.argv.length == 3 ? +process.argv[2] : 80;
 
 
-// var reqlogger=new Logger("request_log.txt");
+// const reqlogger = new Logger("request_log.txt");
 
 
-var whatpulse={"keys":"<??>","clicks":"<??>"};
-function refreshWhatpulse(){
-	http.get("http://api.whatpulse.org/user.php?user=tomsmeding&format=json&formatted=yes",function(res){
-		var body="";
-		res.on("data",function(data){body+=data;});
-		res.on("end",function(){
-			try{body=JSON.parse(body);}
-			catch(e){return;}
-			whatpulse.keys=body.Keys/*.replace(/,/g,"&nbsp;")*/;
-			whatpulse.clicks=body.Clicks/*.replace(/,/g,"&nbsp;")*/;
+const whatpulse = {"keys": "<??>", "clicks": "<??>"};
+function refreshWhatpulse() {
+	const url = "http://api.whatpulse.org/user.php?user=tomsmeding&format=json&formatted=yes";
+	http.get(url, function (res) {
+		let body = "";
+		res.on("data", function (data) { body += data; });
+		res.on("end", function () {
+			try { body = JSON.parse(body); }
+			catch (e) { return; }
+			whatpulse.keys = body.Keys/*.replace(/,/g, "&nbsp;")*/;
+			whatpulse.clicks = body.Clicks/*.replace(/,/g, "&nbsp;")*/;
 		});
-	}).on("error",function(err){
+	}).on("error", function (err) {
 		console.log(`Whatpulse request error: ${err.message}`);
 	});
 }
-setInterval(refreshWhatpulse,6*3600*1000); //every 6 hours
+setInterval(refreshWhatpulse, 6*3600*1000);  //every 6 hours
 refreshWhatpulse();
 
-// function simpleLogEscape(str){
+// function simpleLogEscape(str) {
 // 	return str
-// 			.replace(/\\/g,"\\\\")
-// 			.replace(/\n/g,"\\n")
-// 			.replace(/ /g,"\\_");
+// 			.replace(/\\/g, "\\\\")
+// 			.replace(/\n/g, "\\n")
+// 			.replace(/ /g, "\\_");
 // }
 
-// app.use(function(req,res,next){
-// 	var line=simpleLogEscape(req.ip)+" "+
-// 	         simpleLogEscape(req.method)+" "+
-// 	         simpleLogEscape(req.hostname)+" "+
-// 	         simpleLogEscape(req.url);
-// 	if(req.headers["dnt"])line+=" dnt="+simpleLogEscape(req.headers["dnt"]);
-// 	if(req.headers["referer"])line+=" referer="+simpleLogEscape(req.headers["referer"]);
+// app.use(function (req, res, next) {
+// 	let line = simpleLogEscape(req.ip) + " " +
+// 	           simpleLogEscape(req.method) + " " +
+// 	           simpleLogEscape(req.hostname) + " " +
+// 	           simpleLogEscape(req.url);
+// 	if (req.headers["dnt"]) line += " dnt=" + simpleLogEscape(req.headers["dnt"]);
+// 	if (req.headers["referer"]) line += " referer=" + simpleLogEscape(req.headers["referer"]);
 // 	reqlogger.log(line);
 // 	next();
 // });
 
-/*app.use(function (req, res, next) {
-	console.log(req.subdomains);
-	next();
-});*/
+// app.use(function (req, res, next) {
+//     console.log(req.subdomains);
+//     next();
+// });
 
 app.use(bodyParser.text());
 
 
-var module_list=fs.readdirSync("modules").filter(function(f){
-	return ["$common.js",".DS_Store"].indexOf(f)==-1&&f[0]!="$";
+const module_list = fs.readdirSync("modules").filter(function (f) {
+	return ["$common.js", ".DS_Store"].indexOf(f) == -1 && f[0] != "$";
 });
-for(i=0;i<module_list.length;i++){
-	require("./modules/"+module_list[i]+"/"+module_list[i]+".js")(app,io,cmn.serverdir+"/modules/"+module_list[i]);
-	console.log("Loaded module "+module_list[i]);
+for (let i = 0; i < module_list.length; i++) {
+	const mod = require("./modules/" + module_list[i] + "/" + module_list[i] + ".js");
+	mod(app, io, cmn.serverdir + "/modules/" + module_list[i]);
+	console.log("Loaded module " + module_list[i]);
 }
 
 
-function requestFile(req,res,listdirs,path,origpath){
-	fname=cmn.webfilesdir+path;
-	console.log("Requesting file "+fname);
-	if(!fs.existsSync(fname)){
+function requestFile(req, res, listdirs, path, origpath) {
+	fname = cmn.webfilesdir + path;
+	console.log("Requesting file " + fname);
+	if (!fs.existsSync(fname)) {
 		res.status(404).send("That file does not exist.");
 		return;
 	}
-	var stats=fs.statSync(fname);
-	if(stats.isFile()){
+	const stats = fs.statSync(fname);
+	if (stats.isFile()) {
 		res.sendFile(fname);
-	} else if(stats.isDirectory()&&listdirs){
-		var items=fs
+	} else if (stats.isDirectory() && listdirs) {
+		const items = fs
 			.readdirSync(fname)
-			.filter(function(f){return f[0]!=".";})
-			.map(function(f){
+			.filter(function (f) { return f[0] != "."; })
+			.map(function (f) {
 				try {
-					if(fs.statSync(node_path.join(fname,f)).isDirectory())return f+"/";
+					if (fs.statSync(node_path.join(fname, f)).isDirectory()) return f + "/";
 					else return f;
-				} catch(e){
+				} catch (e) {
 					return null;
 				}
 			})
-			.filter(function(f){
-				return f!==null;
+			.filter(function (f) {
+				return f !== null;
 			});
 		res.send(
-			String(fs.readFileSync(cmn.serverdir+"/dirlisting.html"))
-				.replace("<!--DIRDIR-->",path)
-				.replace("[/*LISTINGLISTING*/]",JSON.stringify(items))
+			String(fs.readFileSync(cmn.serverdir + "/dirlisting.html"))
+				.replace("<!--DIRDIR-->", path)
+				.replace("[/*LISTINGLISTING*/]", JSON.stringify(items))
 		);
-	} else if(stats.isDirectory()&&fs.readdirSync(fname).indexOf("index.html")!=-1){
-		if(origpath[origpath.length-1]!="/")origpath+="/";
-		res.redirect(301,origpath+"index.html");
+	} else if (stats.isDirectory() && fs.readdirSync(fname).indexOf("index.html") != -1) {
+		if (origpath[origpath.length-1] != "/") origpath += "/";
+		res.redirect(301, origpath + "index.html");
 	} else {
 		res.status(404).send("That file does not exist.");
 		return;
 	}
 }
 
-function makeUrlSafe(req,sliceLength){
-	var parsed=url.parse(req.url);
-	var part=parsed.pathname.slice(sliceLength);
-	if(part=="")return "/";
-	return part.replace(/\/\.+[^\/]*\//g,"/");
+function makeUrlSafe(req, sliceLength) {
+	const parsed = url.parse(req.url);
+	const part = parsed.pathname.slice(sliceLength);
+	if (part == "") return "/";
+	return part.replace(/\/\.+[^\/]*\//g, "/");
 }
 
 
 
-app.get("/",function(req,res){
-	res.send(
-		String(fs.readFileSync(cmn.serverdir+"/index.html"))
-		.replace(/<!--<<PULSE-KEYS>>-->/,whatpulse["keys"])
-		.replace(/<!--<<PULSE-CLICKS>>-->/,whatpulse["clicks"])
-	);
+app.get("/", function (req, res) {
+	res.sendFile(cmn.serverdir + "/index.html");
+	// res.send(
+	//     String(fs.readFileSync(cmn.serverdir + "/index.html"))
+	//         .replace(/<!--<<PULSE-KEYS>>-->/, whatpulse["keys"])
+	//         .replace(/<!--<<PULSE-CLICKS>>-->/, whatpulse["clicks"])
+	// );
 });
 
-app.get(["/f/univq","/f/univq/*"],cmn.authgen());
+app.get(["/f/univq", "/f/univq/*"], cmn.authgen());
 
-app.get(["/f","/f/*"],function(req,res){
-	requestFile(req,res,false,unescape(makeUrlSafe(req,2)),req.url);
+app.get(["/f", "/f/*"], function (req, res) {
+	requestFile(req, res, false, unescape(makeUrlSafe(req, 2)), req.url);
 });
 
-app.get(["/ff","/ff/*"],cmn.authgen());
-app.get(["/ff","/ff/*"],function(req,res){
-	requestFile(req,res,true,unescape(makeUrlSafe(req,3)),req.url);
+app.get(["/ff", "/ff/*"], cmn.authgen());
+app.get(["/ff", "/ff/*"], function (req, res) {
+	requestFile(req, res, true, unescape(makeUrlSafe(req, 3)), req.url);
 });
 
-app.get("/.well-known/*",function(req,res){
-	requestFile(req,res,false,"/well-known"+unescape(makeUrlSafe(req,12)),req.url);
+app.get("/.well-known/*", function (req, res) {
+	requestFile(req, res, false, "/well-known" + unescape(makeUrlSafe(req, 12)), req.url);
 });
 
-app.get("/google*.html",function(req,res){
-	var url=unescape(makeUrlSafe(req,0));
-	if(url.match(/^\/google[0-9a-fA-F]*\.html$/)){
-		res.sendFile(__dirname+url);
+app.get("/google*.html", function (req, res) {
+	const url = unescape(makeUrlSafe(req, 0));
+	if (url.match(/^\/google[0-9a-fA-F]*\.html$/)) {
+		res.sendFile(__dirname + url);
 	} else {
 		res.status(404).send("That file does not exist.");
 	}
 });
 
-["o","k","rip","rip2"].forEach(function(target){
-	app.get("/"+target,function(req,res){
-		res.sendFile(cmn.webfilesdir+"/"+target+".html");
+["o", "k", "rip", "rip2"].forEach(function (target) {
+	app.get("/" + target, function (req, res) {
+		res.sendFile(cmn.webfilesdir + "/" + target + ".html");
 	});
-	app.get("/"+target+"/*",function(req,res){
-		res.set('Content-Type', 'text/html');
+	app.get("/" + target + "/*", function (req, res) {
+		res.set('Content-Type',  'text/html');
+		const msg = url.parse(req.url).pathname.slice(target.length + 2);
 		res.send(
-			String(fs.readFileSync(cmn.webfilesdir+"/"+target+".html"))
-			.replace("<!--MESSAGEMESSAGE-->",cmn.simpleHTMLescape(url.parse(req.url).pathname.slice(target.length+2)))
+			String(fs.readFileSync(cmn.webfilesdir + "/" + target + ".html"))
+				.replace("<!--MESSAGEMESSAGE-->", cmn.simpleHTMLescape(msg))
 		);
 	});
 });
 
-app.get("/dr",function(req,res){
-	res.sendFile(cmn.webfilesdir+"/duckroll.html");
+app.get("/dr", function (req, res) {
+	res.sendFile(cmn.webfilesdir + "/duckroll.html");
 });
 
-app.get(["/gpg","/pgp","/gpg.asc","/pgp.asc"],function(req,res){
+app.get(["/gpg", "/pgp", "/gpg.asc", "/pgp.asc"], function (req, res) {
 	res.type("text/plain");
-	res.sendFile(cmn.webfilesdir+"/pgp.asc");
+	res.sendFile(cmn.webfilesdir + "/pgp.asc");
 });
 
-app.get("/tomsg",function(req,res){
-	res.sendFile(cmn.webfilesdir+"/tomsg.html");
+app.get("/tomsg", function (req, res) {
+	res.sendFile(cmn.webfilesdir + "/tomsg.html");
 });
 
-app.get("/goioi",function(req,res){
-	res.sendFile(cmn.webfilesdir+"/goioi.html");
+app.get("/goioi", function (req, res) {
+	res.sendFile(cmn.webfilesdir + "/goioi.html");
 });
 
 
-/*app.get("/chat",function(req,res){
-	res.redirect(301,"http://tomsmeding.com:81");
-});*/
+// app.get("/chat", function (req, res) {
+//     res.redirect(301, "http://tomsmeding.com:81");
+// });
 
 
 // Error-handling middleware
-app.use(function(err,req,res,next){
-	var id=new Date().getTime().toString()+Math.random().toFixed(10).slice(2);
-	console.log("Error caught in app: (id="+id+")");
+app.use(function (err, req, res, next) {
+	const id = new Date().getTime().toString() + Math.random().toFixed(10).slice(2);
+	console.log("Error caught in app: (id=" + id + ")");
 	console.log(err.stack);
-	res.status(500).end("An internal error occurred; it has been logged with id "+id+".\n");
+	res.status(500).end("An internal error occurred; it has been logged with id " + id + ".\n");
 });
 
-var server=httpServer.listen(PORT,function(){
-	var host=server.address().address;
-	var port=server.address().port;
-	console.log("Server listening at http://"+host+":"+port);
+const server = httpServer.listen(PORT, function () {
+	const host = server.address().address;
+	const port = server.address().port;
+	console.log("Server listening at http://" + host + ":" + port);
 });