From 695816b9d0a9344e9264c31c3262f64e69006fa9 Mon Sep 17 00:00:00 2001 From: Dorian Niemiec Date: Sun, 25 Aug 2024 09:45:42 +0200 Subject: [PATCH] Lint out the codebase. --- src/middleware/defaultHandlerChecks.js | 18 +++- src/middleware/status.js | 120 ++++++++++++++++++++++--- src/utils/sizify.js | 21 ++++- tests/utils/sizify.test.js | 66 +++++++------- 4 files changed, 172 insertions(+), 53 deletions(-) diff --git a/src/middleware/defaultHandlerChecks.js b/src/middleware/defaultHandlerChecks.js index c2440d9..8939a5e 100644 --- a/src/middleware/defaultHandlerChecks.js +++ b/src/middleware/defaultHandlerChecks.js @@ -5,7 +5,15 @@ module.exports = (req, res, logFacilities, config, next) => { let eheaders = config.getCustomHeaders(); eheaders["Content-Type"] = "text/html; charset=utf-8"; res.writeHead(501, http.STATUS_CODES[501], eheaders); - res.write("Proxy not implemented

Proxy not implemented

SVR.JS doesn't support proxy without proxy mod. If you're administator of this server, then install this mod in order to use SVR.JS as a proxy.

" + config.generateServerString().replace(/&/g, "&").replace(//g, ">") + "

"); + res.write( + 'Proxy not implemented

Proxy not implemented

SVR.JS doesn\'t support proxy without proxy mod. If you\'re administator of this server, then install this mod in order to use SVR.JS as a proxy.

' + + config + .generateServerString() + .replace(/&/g, "&") + .replace(//g, ">") + + "

", + ); res.end(); logFacilities.errmessage("SVR.JS doesn't support proxy without proxy mod."); return; @@ -17,11 +25,15 @@ module.exports = (req, res, logFacilities, config, next) => { res.writeHead(204, http.STATUS_CODES[204], hdss); res.end(); return; - } else if (req.method != "GET" && req.method != "POST" && req.method != "HEAD") { + } else if ( + req.method != "GET" && + req.method != "POST" && + req.method != "HEAD" + ) { res.error(405); logFacilities.errmessage("Invaild method: " + req.method); return; } next(); -} \ No newline at end of file +}; diff --git a/src/middleware/status.js b/src/middleware/status.js index 32653e1..0e4c5ff 100644 --- a/src/middleware/status.js +++ b/src/middleware/status.js @@ -2,36 +2,130 @@ const http = require("http"); const os = require("os"); const sizify = require("../utils/sizify.js"); const svrjsInfo = require("../../svrjs.json"); -const {name} = svrjsInfo; +const { name } = svrjsInfo; module.exports = (req, res, logFacilities, config, next) => { - if (config.allowStatus && (req.parsedURL.pathname == "/svrjsstatus.svr" || (os.platform() == "win32" && req.parsedURL.pathname.toLowerCase() == "/svrjsstatus.svr"))) { + if ( + config.allowStatus && + (req.parsedURL.pathname == "/svrjsstatus.svr" || + (os.platform() == "win32" && + req.parsedURL.pathname.toLowerCase() == "/svrjsstatus.svr")) + ) { const formatRelativeTime = (relativeTime) => { const days = Math.floor(relativeTime / 60 / (60 * 24)); const dateDiff = new Date(relativeTime * 1000); - return days + " days, " + dateDiff.getUTCHours() + " hours, " + dateDiff.getUTCMinutes() + " minutes, " + dateDiff.getUTCSeconds() + " seconds"; - } + return ( + days + + " days, " + + dateDiff.getUTCHours() + + " hours, " + + dateDiff.getUTCMinutes() + + " minutes, " + + dateDiff.getUTCSeconds() + + " seconds" + ); + }; let statusBody = ""; - statusBody += "Server version: " + config.generateServerString() + "
"; + statusBody += + "Server version: " + config.generateServerString() + "
"; //Those entries are just dates and numbers converted/formatted to strings, so no escaping is needed. - statusBody += "Current time: " + new Date().toString() + "
Thread start time: " + new Date(new Date() - (process.uptime() * 1000)).toString() + "
Thread uptime: " + formatRelativeTime(Math.floor(process.uptime())) + "
"; + statusBody += + "Current time: " + + new Date().toString() + + "
Thread start time: " + + new Date(new Date() - process.uptime() * 1000).toString() + + "
Thread uptime: " + + formatRelativeTime(Math.floor(process.uptime())) + + "
"; statusBody += "OS uptime: " + formatRelativeTime(os.uptime()) + "
"; statusBody += "Total request count: " + process.reqcounter + "
"; - statusBody += "Average request rate: " + (Math.round((process.reqcounter / process.uptime()) * 100) / 100) + " requests/s
"; + statusBody += + "Average request rate: " + + Math.round((process.reqcounter / process.uptime()) * 100) / 100 + + " requests/s
"; statusBody += "Client errors (4xx): " + process.err4xxcounter + "
"; statusBody += "Server errors (5xx): " + process.err5xxcounter + "
"; - statusBody += "Average error rate: " + (Math.round(((process.err4xxcounter + process.err5xxcounter) / process.reqcounter) * 10000) / 100) + "%
"; + statusBody += + "Average error rate: " + + Math.round( + ((process.err4xxcounter + process.err5xxcounter) / process.reqcounter) * + 10000, + ) / + 100 + + "%
"; statusBody += "Malformed HTTP requests: " + process.malformedcounter; - if (process.memoryUsage) statusBody += "
Memory usage of thread: " + sizify(process.memoryUsage().rss, true) + "B"; - if (process.cpuUsage) statusBody += "
Total CPU usage by thread: u" + (process.cpuUsage().user / 1000) + "ms s" + (process.cpuUsage().system / 1000) + "ms - " + (Math.round((((process.cpuUsage().user + process.cpuUsage().system) / 1000000) / process.uptime()) * 1000) / 1000) + "%"; + if (process.memoryUsage) + statusBody += + "
Memory usage of thread: " + + sizify(process.memoryUsage().rss, true) + + "B"; + if (process.cpuUsage) + statusBody += + "
Total CPU usage by thread: u" + + process.cpuUsage().user / 1000 + + "ms s" + + process.cpuUsage().system / 1000 + + "ms - " + + Math.round( + ((process.cpuUsage().user + process.cpuUsage().system) / + 1000000 / + process.uptime()) * + 1000, + ) / + 1000 + + "%"; statusBody += "
Thread PID: " + process.pid + "
"; res.writeHead(200, http.STATUS_CODES[200], { - "Content-Type": "text/html; charset=utf-8" + "Content-Type": "text/html; charset=utf-8", }); - res.end((res.head == "" ? "SVR.JS status" + (req.headers.host == undefined ? "" : " for " + String(req.headers.host).replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">")) + "" : res.head.replace(//i, "" + name.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">") + " status" + (req.headers.host == undefined ? "" : " for " + String(req.headers.host).replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">")) + "")) + "

" + name.replace(/&/g, "&").replace(//g, ">") + " status" + (req.headers.host == undefined ? "" : " for " + String(req.headers.host).replace(/&/g, "&").replace(//g, ">")) + "

" + statusBody + (res.foot == "" ? "" : res.foot)); + res.end( + (res.head == "" + ? "SVR.JS status" + + (req.headers.host == undefined + ? "" + : " for " + + String(req.headers.host) + .replace(/&/g, "&") + .replace(/</g, "<") + .replace(/>/g, ">")) + + '' + : res.head.replace( + //i, + "" + + name + .replace(/&/g, "&") + .replace(/</g, "<") + .replace(/>/g, ">") + + " status" + + (req.headers.host == undefined + ? "" + : " for " + + String(req.headers.host) + .replace(/&/g, "&") + .replace(/</g, "<") + .replace(/>/g, ">")) + + "", + )) + + "

" + + name + .replace(/&/g, "&") + .replace(//g, ">") + + " status" + + (req.headers.host == undefined + ? "" + : " for " + + String(req.headers.host) + .replace(/&/g, "&") + .replace(//g, ">")) + + "

" + + statusBody + + (res.foot == "" ? "" : res.foot), + ); return; } next(); -} \ No newline at end of file +}; diff --git a/src/utils/sizify.js b/src/utils/sizify.js index 37fe2de..203746c 100644 --- a/src/utils/sizify.js +++ b/src/utils/sizify.js @@ -2,12 +2,25 @@ function sizify(bytes, addI) { if (bytes == 0) return "0"; if (bytes < 0) bytes = -bytes; const prefixes = ["", "K", "M", "G", "T", "P", "E", "Z", "Y", "R", "Q"]; - let prefixIndex = Math.floor(Math.log2 ? Math.log2(bytes) / 10 : (Math.log(bytes) / (Math.log(2) * 10))); + let prefixIndex = Math.floor( + Math.log2 ? Math.log2(bytes) / 10 : Math.log(bytes) / (Math.log(2) * 10), + ); if (prefixIndex >= prefixes.length - 1) prefixIndex = prefixes.length - 1; let prefixIndexTranslated = Math.pow(2, 10 * prefixIndex); - let decimalPoints = 2 - Math.floor(Math.log10 ? Math.log10(bytes / prefixIndexTranslated) : (Math.log(bytes / prefixIndexTranslated) / Math.log(10))); + let decimalPoints = + 2 - + Math.floor( + Math.log10 + ? Math.log10(bytes / prefixIndexTranslated) + : Math.log(bytes / prefixIndexTranslated) / Math.log(10), + ); if (decimalPoints < 0) decimalPoints = 0; - return (Math.ceil((bytes / prefixIndexTranslated) * Math.pow(10, decimalPoints)) / Math.pow(10, decimalPoints)) + prefixes[prefixIndex] + ((prefixIndex > 0 && addI) ? "i" : ""); + return ( + Math.ceil((bytes / prefixIndexTranslated) * Math.pow(10, decimalPoints)) / + Math.pow(10, decimalPoints) + + prefixes[prefixIndex] + + (prefixIndex > 0 && addI ? "i" : "") + ); } -module.exports = sizify; \ No newline at end of file +module.exports = sizify; diff --git a/tests/utils/sizify.test.js b/tests/utils/sizify.test.js index 7a4408c..afafa57 100644 --- a/tests/utils/sizify.test.js +++ b/tests/utils/sizify.test.js @@ -1,57 +1,57 @@ -const sizify = require('../../src/utils/sizify'); +const sizify = require("../../src/utils/sizify"); describe('"sizify" function', () => { test('should return "0" for 0 bytes', () => { - expect(sizify(0)).toBe('0'); + expect(sizify(0)).toBe("0"); }); - test('should handle negative bytes', () => { - expect(sizify(-1024)).toBe('1K'); + test("should handle negative bytes", () => { + expect(sizify(-1024)).toBe("1K"); }); - test('should return correct size for small values', () => { - expect(sizify(1000)).toBe('1000'); - expect(sizify(1024)).toBe('1K'); + test("should return correct size for small values", () => { + expect(sizify(1000)).toBe("1000"); + expect(sizify(1024)).toBe("1K"); }); - test('should return correct size for larger values', () => { - expect(sizify(1048576)).toBe('1M'); - expect(sizify(1073741824)).toBe('1G'); - expect(sizify(1099511627776)).toBe('1T'); - expect(sizify(1125899906842624)).toBe('1P'); - expect(sizify(1152921504606846976)).toBe('1E'); - expect(sizify(1180591620717411303424)).toBe('1Z'); - expect(sizify(1208925819614629174706176)).toBe('1Y'); - expect(sizify(1237940039285380274899124224)).toBe('1R'); - expect(sizify(1267650600228229401496703205376)).toBe('1Q'); + test("should return correct size for larger values", () => { + expect(sizify(1048576)).toBe("1M"); + expect(sizify(1073741824)).toBe("1G"); + expect(sizify(1099511627776)).toBe("1T"); + expect(sizify(1125899906842624)).toBe("1P"); + expect(sizify(1152921504606846976)).toBe("1E"); + expect(sizify(1180591620717411303424)).toBe("1Z"); + expect(sizify(1208925819614629174706176)).toBe("1Y"); + expect(sizify(1237940039285380274899124224)).toBe("1R"); + expect(sizify(1267650600228229401496703205376)).toBe("1Q"); }); - test('should handle very large values', () => { + test("should handle very large values", () => { const largeValue = 2 ** 100; // A very large number - expect(sizify(largeValue)).toBe('1Q'); + expect(sizify(largeValue)).toBe("1Q"); }); test('should add "i" suffix when addI is true', () => { - expect(sizify(1024, true)).toBe('1Ki'); - expect(sizify(1048576, true)).toBe('1Mi'); - expect(sizify(1073741824, true)).toBe('1Gi'); + expect(sizify(1024, true)).toBe("1Ki"); + expect(sizify(1048576, true)).toBe("1Mi"); + expect(sizify(1073741824, true)).toBe("1Gi"); }); test('should not add "i" suffix when addI is false', () => { - expect(sizify(1024, false)).toBe('1K'); - expect(sizify(1048576, false)).toBe('1M'); - expect(sizify(1073741824, false)).toBe('1G'); + expect(sizify(1024, false)).toBe("1K"); + expect(sizify(1048576, false)).toBe("1M"); + expect(sizify(1073741824, false)).toBe("1G"); }); - test('should handle decimal points correctly', () => { - expect(sizify(1500)).toBe('1.47K'); - expect(sizify(1500000)).toBe('1.44M'); - expect(sizify(1500000000)).toBe('1.4G'); + test("should handle decimal points correctly", () => { + expect(sizify(1500)).toBe("1.47K"); + expect(sizify(1500000)).toBe("1.44M"); + expect(sizify(1500000000)).toBe("1.4G"); }); - test('should handle edge cases', () => { - expect(sizify(1)).toBe('1'); - expect(sizify(1023)).toBe('1023'); - expect(sizify(1025)).toBe('1.01K'); + test("should handle edge cases", () => { + expect(sizify(1)).toBe("1"); + expect(sizify(1023)).toBe("1023"); + expect(sizify(1025)).toBe("1.01K"); }); });