tgpholly/EUS
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

database shite

Browse source
This commit is contained in:
Holly Stubbs 2021-12-11 06:24:35 +00:00
parent 87453e5109
commit bfe6676867
Signed by: tgpholly
GPG key ID: B8583C4B7D18119E
2 changed files with 211 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

350
EUS.js
View file

@ -3,8 +3,9 @@ const fs = require("fs"),
chalk = require("chalk"), chalk = require("chalk"),
busboy = require("connect-busboy"), busboy = require("connect-busboy"),
randomstring = require("randomstring"), randomstring = require("randomstring"),
getSize = require("get-folder-size"), diskUsage = require("diskusage"),
diskUsage = require("diskusage-ng"), streamMeter = require("stream-meter"),
mysql = require("mysql"),
emoji = require("../misc/emoji_list.json"); emoji = require("../misc/emoji_list.json");
// Defines the function of this module // Defines the function of this module
@ -13,13 +14,70 @@ const MODULE_FUNCTION = "handle_requests",
// Base path for module folder creation and navigation // Base path for module folder creation and navigation
BASE_PATH = "/EUS"; BASE_PATH = "/EUS";
console.log("[EUS] Loading EUS...");
// This will never change
const diskRunningOnSize = diskUsage.checkSync(__dirname).total;
let eusConfig = {}, let eusConfig = {},
image_json = {},
d = new Date(),
startTime,
endTime,
useUploadKey = true, useUploadKey = true,
cacheJSON = ""; cacheJSON = "",
startupFinished = false;
class Database {
constructor(databaseAddress, databasePort = 3306, databaseUsername, databasePassword, databaseName, connectedCallback) {
this.connectionPool = mysql.createPool({
connectionLimit: 128,
host: databaseAddress,
port: databasePort,
user: databaseUsername,
password: databasePassword,
database: databaseName
});
this.dbActive = false;
if (connectedCallback == null) {
this.dbActive = true;
} else {
const connectionCheckInterval = setInterval(() => {
this.query("SELECT id FROM images LIMIT 1")
.then(data => {
if (startupFinished) global.modules.consoleHelper.printInfo(emoji.globe_europe, `Connected to database`);
else console.log("[EUS] Connected to database");
this.dbActive = true;
clearInterval(connectionCheckInterval);
connectedCallback();
})
.catch(err => {});
}, 167); // Roughly 6 times per sec
}
}
async query(sqlQuery) {
return new Promise((resolve, reject) => {
this.connectionPool.getConnection((err, connection) => {
if (err) {
reject(err);
try {
connection.release();
} catch (e) {}
} else {
connection.query(sqlQuery, (err, data) => {
if (err) {
reject(err);
connection.release();
} else {
if (sqlQuery.includes("LIMIT 1")) resolve(data[0]);
else resolve(data);
connection.release();
}
});
}
});
});
}
}
// Only ran on startup so using sync functions is fine // Only ran on startup so using sync functions is fine
// Makes the folder for files of the module // Makes the folder for files of the module
@ -37,24 +95,11 @@ if (!fs.existsSync(__dirname + BASE_PATH + "/i")) {
fs.mkdirSync(__dirname + BASE_PATH + "/i"); fs.mkdirSync(__dirname + BASE_PATH + "/i");
console.log(`[EUS] Made EUS images folder`); console.log(`[EUS] Made EUS images folder`);
} }
// Makes the image-type file
if (!fs.existsSync(__dirname + BASE_PATH + "/image-type.json")) {
// Doesn't exist, create it.
fs.writeFileSync(`${__dirname}${BASE_PATH}/image-type.json`, '{}');
console.log("[EUS] Made EUS image-type File!");
// File has been created, load it.
image_json = require(`${__dirname}${BASE_PATH}/image-type.json`);
} else {
// File already exists, load it.
const ijLoadStartTime = new Date().getTime();
image_json = require(`${__dirname}${BASE_PATH}/image-type.json`);
console.log(`[EUS] Loaded image-type file, took ${new Date().getTime() - ijLoadStartTime}ms`);
}
// Makes the config file // Makes the config file
if (!fs.existsSync(__dirname + BASE_PATH + "/config.json")) { if (!fs.existsSync(__dirname + BASE_PATH + "/config.json")) {
// Config doesn't exist, make it. // Config doesn't exist, make it.
fs.writeFileSync(`${__dirname}${BASE_PATH}/config.json`, '{\n\t"baseURL":"http://example.com/",\n\t"acceptedTypes": [\n\t\t".png",\n\t\t".jpg",\n\t\t".jpeg",\n\t\t".gif"\n\t],\n\t"uploadKey": ""\n}'); fs.writeFileSync(`${__dirname}${BASE_PATH}/config.json`, '{\n\t"baseURL":"http://example.com/",\n\t"acceptedTypes": [\n\t\t".png",\n\t\t".jpg",\n\t\t".jpeg",\n\t\t".gif"\n\t],\n\t"uploadKey": "",\n\t"database": {\n\t\t"databaseAddress": "127.0.0.1",\n\t\t"databasePort": 3306,\n\t\t"databaseUsername": "root",\n\t\t"databasePassword": "password",\n\t\t"databaseName": "EUS"\n\t}\n}');
console.log("[EUS] Made EUS config File!"); console.log("[EUS] Made EUS config File!");
console.log("[EUS] Please edit the EUS Config file before restarting."); console.log("[EUS] Please edit the EUS Config file before restarting.");
// Config has been made, close framework. // Config has been made, close framework.
@ -64,75 +109,46 @@ if (!fs.existsSync(__dirname + BASE_PATH + "/config.json")) {
if (validateConfig(eusConfig)) console.log("[EUS] EUS config passed all checks"); if (validateConfig(eusConfig)) console.log("[EUS] EUS config passed all checks");
} }
const dbConnection = new Database(eusConfig["database"]["databaseAddress"], eusConfig["database"]["databasePort"], eusConfig["database"]["databaseUsername"], eusConfig["database"]["databasePassword"], eusConfig["database"]["databaseName"], async () => {
cacheJSON = JSON.stringify(await cacheFilesAndSpace());
cacheIsReady = true;
});
// Cache for the file count and space usage, this takes a while to do so it's best to cache the result // Cache for the file count and space usage, this takes a while to do so it's best to cache the result
let cacheIsReady = false; let cacheIsReady = false;
async function cacheFilesAndSpace() { function cacheFilesAndSpace() {
return new Promise((resolve, reject) => { return new Promise(async (resolve, reject) => {
const startCacheTime = new Date().getTime(); const startCacheTime = Date.now();
cacheIsReady = false;
let cachedFilesAndSpace = { let cachedFilesAndSpace = {
files: {} fileCounts: {},
},
// Cache file totals
total = 0;
// Add each accepted file type to the json
for (var i2 = 0; i2 < eusConfig.acceptedTypes.length; i2++) {
cachedFilesAndSpace["files"][`${eusConfig.acceptedTypes[i2]}`.replace(".", "")] = 0;
}
// Read all files from the images directory
fs.readdir(__dirname + BASE_PATH + "/i", async (err, files) => {
if (err) reject(err);
else {
// Loop through all files
for (var i = 0; i < files.length; i++) {
// Loop through all accepted file types to check for a match
for (var i1 = 0; i1 < eusConfig.acceptedTypes.length; i1++) {
const readFileName = files[i].split(".");
if (`.${readFileName[readFileName.length-1]}` == eusConfig.acceptedTypes[i1]) {
// There is a match! Add it to the json
cachedFilesAndSpace["files"][eusConfig.acceptedTypes[i1].replace(".", "")]++;
// Also increase the total
total++;
}
}
}
// Set the total in the json to the calculated total value
cachedFilesAndSpace["files"]["total"] = total;
// Cache usage
cachedFilesAndSpace["space"] = {
usage: {}
};
// Get the space used on the disk
getSize(__dirname + BASE_PATH + "/i", async (err, size) => {
if (err) reject(err);
else {
// Calculate in different units the space taken up on disk
let sizeOfFolder = (size / 2048);
cachedFilesAndSpace["space"]["usage"]["mb"] = sizeOfFolder;
sizeOfFolder = (size / 3072);
cachedFilesAndSpace["space"]["usage"]["gb"] = sizeOfFolder;
cachedFilesAndSpace["space"]["usage"]["string"] = await spaceToLowest(size, true);
// Get total disk space
diskUsage(__dirname, async (err, data) => {
if (err) reject(err);
else {
cachedFilesAndSpace["space"]["total"] = {
value: await spaceToLowest(data["total"], false),
mbvalue: (data["total"] / 2048),
gbvalue: (data["total"] / 3072),
stringValue: (await spaceToLowest(data["total"], true)).split(" ")[1].toLowerCase(),
string: await spaceToLowest(data["total"], true)
}; };
const dbData = await dbConnection.query(`SELECT imageType, COUNT(imageType) AS "count" FROM images GROUP BY imageType`);
let totalFiles = 0;
dbData.forEach(fileType => {
cachedFilesAndSpace["fileCounts"][fileType.imageType] = fileType.count;
totalFiles += fileType.count;
});
cachedFilesAndSpace["filesTotal"] = totalFiles;
cachedFilesAndSpace["space"] = {usage: {}, total:{}};
const dbSize = (await dbConnection.query(`SELECT SUM(imageSize) FROM images LIMIT 1`))["SUM(imageSize)"];
const totalSizeBytes = dbSize == null ? 0 : dbSize;
const mbSize = totalSizeBytes / 1024 / 1024;
cachedFilesAndSpace["space"]["usage"]["mb"] = parseFloat(mbSize.toFixed(4));
cachedFilesAndSpace["space"]["usage"]["gb"] = parseFloat((mbSize / 1024).toFixed(4));
cachedFilesAndSpace["space"]["usage"]["string"] = await spaceToLowest(totalSizeBytes, true);
//totalDiskSize
const totalMBSize = diskRunningOnSize / 1024 / 1024;
cachedFilesAndSpace["space"]["total"]["mb"] = parseFloat(totalMBSize.toFixed(4));
cachedFilesAndSpace["space"]["total"]["gb"] = parseFloat((totalMBSize / 1024).toFixed(4));
cachedFilesAndSpace["space"]["total"]["string"] = await spaceToLowest(diskRunningOnSize, true);
resolve(cachedFilesAndSpace); resolve(cachedFilesAndSpace);
global.modules.consoleHelper.printInfo(emoji.folder, `Stats api cache took ${new Date().getTime() - startCacheTime}ms`); global.modules.consoleHelper.printInfo(emoji.folder, `Stats api cache took ${Date.now() - startCacheTime}ms`);
}
});
}
});
}
});
}); });
} }
@ -154,7 +170,7 @@ function validateConfig(json) {
} }
// acceptedTypes checks // acceptedTypes checks
if (json["acceptedTypes"] == null) { if (json["acceptedTypes"] == null) {
console.error("EUS acceptedTypes array does not exist!"); console.error("EUS acceptedTypes list does not exist!");
performShutdownAfterValidation = true; performShutdownAfterValidation = true;
} else { } else {
if (json["acceptedTypes"].length < 1) console.warn("EUS acceptedTypes array has no extentions in it, users will not be able to upload images!"); if (json["acceptedTypes"].length < 1) console.warn("EUS acceptedTypes array has no extentions in it, users will not be able to upload images!");
@ -166,10 +182,41 @@ function validateConfig(json) {
} else { } else {
if (json["uploadKey"] == "") useUploadKey = false; if (json["uploadKey"] == "") useUploadKey = false;
} }
// database checks
if (json["database"] == null) {
console.error("EUS database properties do not exist!");
performShutdownAfterValidation = true;
} else {
// databaseAddress
if (json["database"]["databaseAddress"] == null) {
console.error("EUS database.databaseAddress property does not exist!");
performShutdownAfterValidation = true;
}
// databasePort
if (json["database"]["databasePort"] == null) {
console.error("EUS database.databasePort property does not exist!");
performShutdownAfterValidation = true;
}
// databaseUsername
if (json["database"]["databaseUsername"] == null) {
console.error("EUS database.databaseUsername property does not exist!");
performShutdownAfterValidation = true;
}
// databasePassword
if (json["database"]["databasePassword"] == null) {
console.error("EUS database.databasePassword property does not exist!");
performShutdownAfterValidation = true;
}
// databaseName
if (json["database"]["databaseName"] == null) {
console.error("EUS database.databaseName property does not exist!");
performShutdownAfterValidation = true;
}
}
// Check if server needs to be shutdown // Check if server needs to be shutdown
if (performShutdownAfterValidation) { if (performShutdownAfterValidation) {
console.error("EUS config properties are missing, refer to docs for more details (https://docs.ethanus.ml)"); console.error("EUS config properties are missing, refer to docs for more details (https://wiki.eusv.ml)");
process.exit(1); process.exit(1);
} }
else return true; else return true;
@ -184,12 +231,32 @@ function cleanURL(url = "") {
.split("%7B").join("{").split("%7C").join("|").split("%7D").join("}").split("%7E").join("~"); .split("%7B").join("{").split("%7C").join("|").split("%7D").join("}").split("%7E").join("~");
} }
function regularFile(req, res, urs = "", startTime = 0) {
if (req.url === "/") { urs = "/index.html" } else { urs = req.url }
fs.access(`${__dirname}${BASE_PATH}/files${urs}`, (error) => {
if (error) {
// Doesn't exist, send a 404 to the client.
error404Page(res);
global.modules.consoleHelper.printInfo(emoji.cross, `${req.method}: ${chalk.red("[404]")} ${req.url} ${Date.now() - startTime}ms`);
} else {
// File does exist, send it back to the client.
res.sendFile(__dirname + BASE_PATH + "/files"+req.url);
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${Date.now() - startTime}ms`);
}
});
}
function error404Page(res) {
res.status(404).send("404!<hr>EUS");
}
module.exports = { module.exports = {
extras:async function() { extras:async function() {
// Setup express to use busboy // Setup express to use busboy
global.app.use(busboy()); global.app.use(busboy());
cacheJSON = JSON.stringify(await cacheFilesAndSpace()); startupFinished = true;
cacheIsReady = true; //cacheJSON = JSON.stringify(await cacheFilesAndSpace());
//cacheIsReady = true;
}, },
get:async function(req, res) { get:async function(req, res) {
/* /*
@ -213,39 +280,31 @@ module.exports = {
if (req.url.includes("/api/")) return handleAPI(req, res); if (req.url.includes("/api/")) return handleAPI(req, res);
// Register the time at the start of the request // Register the time at the start of the request
d = new Date(); const startTime = Date.now();
startTime = d.getTime();
// Get the requested image // Get the requested image
let urs = `${req.url}`; urs = urs.split("/")[1]; let urs = `${req.url}`; urs = urs.split("/")[1];
// Get the file type of the image from image_json and make sure it exists // Check if we even need to query the DB
fs.access(`${__dirname}${BASE_PATH}/i/${urs}${image_json[urs]}`, (error) => { const dbAble = (!/[^0-9A-Za-z]/.test(urs)) && urs != "" && urs != "index" && (req.url.split("/").length == 2);
if (error) {
// Doesn't exist, handle request normaly if (dbAble) {
if (req.url === "/") { urs = "/index.html" } else { urs = req.url } if (dbConnection.dbActive) {
fs.access(`${__dirname}${BASE_PATH}/files${urs}`, (error) => { // Try to get what we think is an image's details from the DB
if (error) { const dbEntry = await dbConnection.query(`SELECT imageType FROM images WHERE imageId = "${urs}" LIMIT 1`);
// Doesn't exist, send a 404 to the client.
res.status(404).send("404!<hr>EUS"); // There's an entry in the DB for this, send the file back.
d = new Date(); if (dbEntry != null) {
endTime = d.getTime(); res.sendFile(`${__dirname}${BASE_PATH}/i/${urs}.${dbEntry.imageType}`);
global.modules.consoleHelper.printInfo(emoji.cross, `${req.method}: ${chalk.red("[404]")} ${req.url} ${endTime - startTime}ms`); global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} (ImageReq) ${req.url} ${Date.now() - startTime}ms`);
} else {
// File does exist, send it back to the client.
res.sendFile(__dirname + BASE_PATH + "/files"+req.url);
d = new Date();
endTime = d.getTime();
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`);
} }
}); // There's no entry, so treat this as a regular file.
} else { else regularFile(req, res, urs, startTime);
// Image does exist, send it back.
res.sendFile(`${__dirname}${BASE_PATH}/i/${urs}${image_json[urs]}`);
d = new Date();
endTime = d.getTime();
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`);
} }
}); else res.status(400).end("EUS is restarting, please try again in a few secs.");
}
// We can still serve files if they are not dbable
// since we don't need to check the db
else regularFile(req, res, urs, startTime);
}, },
post:async function(req, res) { post:async function(req, res) {
/* /*
@ -261,59 +320,53 @@ module.exports = {
if (useUploadKey && eusConfig["uploadKey"] != req.header("key")) return res.end("Incorrect key provided for upload"); if (useUploadKey && eusConfig["uploadKey"] != req.header("key")) return res.end("Incorrect key provided for upload");
d = new Date(); startTime = d.getTime(); const startTime = Date.now();
var fstream; var fstream;
var thefe; var thefe;
// Pipe the request to busboy // Pipe the request to busboy
req.pipe(req.busboy); req.pipe(req.busboy);
req.busboy.on('file', function (fieldname, file, filename) { req.busboy.on('file', function (fieldname, file, filename) {
// Get the image-type json
image_json = require(`${__dirname}${BASE_PATH}/image-type.json`);
// Make a new file name // Make a new file name
fileOutName = randomstring.generate(14); fileOutName = randomstring.generate(14);
global.modules.consoleHelper.printInfo(emoji.fast_up, `${req.method}: Upload of ${fileOutName} started.`); global.modules.consoleHelper.printInfo(emoji.fast_up, `${req.method}: Upload of ${fileOutName} started.`);
// Check the file is within the accepted file types // Check the file is within the accepted file types
if (eusConfig.acceptedTypes.includes(`.${filename.split(".")[filename.split(".").length-1]}`)) { if (eusConfig.acceptedTypes.includes(`.${filename.split(".")[filename.split(".").length-1]}`)) {
// File is accepted, set the extention of the file in thefe for later use. // File is accepted, set the extention of the file in thefe for later use.
thefe = `.${filename.split(".")[filename.split(".").length-1]}`; thefe = `${filename.split(".")[filename.split(".").length-1]}`;
} else { } else {
// File isn't accepted, send response back to client stating so. // File isn't accepted, send response back to client stating so.
res.status(403).end("This file type isn't accepted currently."); res.status(403).end("This file type isn't accepted currently.");
return; return;
} }
// Create a write stream for the file // Create a write stream for the file
fstream = fs.createWriteStream(__dirname + BASE_PATH + "/i/" + fileOutName + thefe); fstream = fs.createWriteStream(__dirname + BASE_PATH + "/i/" + fileOutName + "." + thefe);
file.pipe(fstream); // Create meter for tracking the size of the file
fstream.on('close', function () { const meter = streamMeter();
// Get the time at the end of the upload file.pipe(meter).pipe(fstream);
d = new Date(); endTime = d.getTime(); fstream.on('close', async () => {
// Add image file type to the image_json array // Add this image to the database
image_json[fileOutName] = `.${filename.split(".")[filename.split(".").length-1]}`; await dbConnection.query(`INSERT INTO images (id, imageId, imageType, imageSize) VALUES (NULL, "${fileOutName}", "${thefe}", ${meter.bytes})`);
// Save image_json array to the file
fs.writeFile(`${__dirname}${BASE_PATH}/image-type.json`, JSON.stringify(image_json), async (err) => {
if (err) reject(err);
else {
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: Upload of ${fileOutName} finished. Took ${endTime - startTime}ms`);
// Send URL of the uploaded image to the client // Send URL of the uploaded image to the client
res.end(eusConfig.baseURL+""+fileOutName); res.end(eusConfig.baseURL + fileOutName);
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: Upload of ${fileOutName} finished. Took ${Date.now() - startTime}ms`);
// Update cached files & space // Update cached files & space
cacheJSON = JSON.stringify(await cacheFilesAndSpace()); cacheJSON = JSON.stringify(await cacheFilesAndSpace());
} cacheIsReady = true;
});
}); });
}); });
} }
} }
async function handleAPI(req, res) { async function handleAPI(req, res) {
d = new Date(); startTime = d.getTime(); const startTime = Date.now();
let jsonaa = {}, filesaa = 0, spaceaa = 0; let jsonaa = {}, filesaa = 0, spaceaa = 0, endTime = 0;
switch (req.url.split("?")[0]) { switch (req.url.split("?")[0]) {
// Status check to see the onlint status of EUS // Status check to see the online status of EUS
// Used by ESL to make sure EUS is online // Used by ESL to make sure EUS is online
case "/api/get-server-status": case "/api/get-server-status":
d = new Date(); endTime = d.getTime(); endTime = Date.now();
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`); global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`);
return res.end('{"status":1,"version":"'+global.internals.version+'"}'); return res.end('{"status":1,"version":"'+global.internals.version+'"}');
@ -331,7 +384,7 @@ async function handleAPI(req, res) {
if (filesaa == 1) { if (filesaa == 1) {
// If getting the space used on the server isn't required send the json // If getting the space used on the server isn't required send the json
if (spaceaa != 1) { if (spaceaa != 1) {
d = new Date(); endTime = d.getTime(); endTime = Date.now();
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`); global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`);
delete jsonaa["space"]; delete jsonaa["space"];
return res.end(JSON.stringify(jsonaa)); return res.end(JSON.stringify(jsonaa));
@ -339,14 +392,14 @@ async function handleAPI(req, res) {
} }
// Getting space is required // Getting space is required
if (spaceaa == 1) { if (spaceaa == 1) {
d = new Date(); endTime = d.getTime(); endTime = Date.now();
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`); global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`);
if (filesaa != 1) delete jsonaa["files"]; if (filesaa != 1) delete jsonaa["files"];
return res.end(JSON.stringify(jsonaa)); return res.end(JSON.stringify(jsonaa));
} }
if (filesaa != 1 && spaceaa != 1) { if (filesaa != 1 && spaceaa != 1) {
d = new Date(); endTime = d.getTime(); endTime = Date.now();
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`); global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`);
return res.end("Please add f and or s to your queries to get the files and space"); return res.end("Please add f and or s to your queries to get the files and space");
} }
@ -354,7 +407,7 @@ async function handleAPI(req, res) {
// Information API // Information API
case "/api/get-info": case "/api/get-info":
d = new Date(); endTime = d.getTime(); endTime = Date.now();
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`); global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`);
return res.end(JSON.stringify({ return res.end(JSON.stringify({
version: global.internals.version, version: global.internals.version,
@ -362,7 +415,7 @@ async function handleAPI(req, res) {
})); }));
default: default:
d = new Date(); endTime = d.getTime(); endTime = Date.now();
global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`); global.modules.consoleHelper.printInfo(emoji.heavy_check, `${req.method}: ${chalk.green("[200]")} ${req.url} ${endTime - startTime}ms`);
return res.send(` return res.send(`
<h2>All currently avaliable api endpoints</h2> <h2>All currently avaliable api endpoints</h2>
@ -373,18 +426,15 @@ async function handleAPI(req, res) {
} }
} }
const spaceValues = ["B", "KB", "MB", "GB", "TB", "PB", "EB"]; // Futureproofing:tm: const spaceValues = ["B", "KB", "MB", "GB", "TB", "PB", "EB"]; // Futureproofing™
async function spaceToLowest(spaceValue, includeStringValue) { async function spaceToLowest(spaceValue, includeStringValue) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// Converts space values to lower values e.g MB, GB, TB etc depending on the size of the number // Converts space values to lower values e.g MB, GB, TB etc depending on the size of the number
let i1 = 1; let i1 = 1;
// Loop through until value is at it's lowest // Loop through until value is at it's lowest
for (let i = 0; i < i1; i++) { while (spaceValue >= 1024) {
if (spaceValue >= 1024) {
spaceValue = spaceValue / 1024; spaceValue = spaceValue / 1024;
}
if (spaceValue >= 1024) i1++; if (spaceValue >= 1024) i1++;
} }
@ -394,3 +444,5 @@ async function spaceToLowest(spaceValue, includeStringValue) {
} }
module.exports.MOD_FUNC = MODULE_FUNCTION; module.exports.MOD_FUNC = MODULE_FUNCTION;
console.log("[EUS] Finished loading");

3
README.md
View file

@ -14,8 +14,9 @@
EUS has extra dependencies other than those of [Revolution](https://github.com/tgpethan/Revolution), the server EUS is made on, of which include: EUS has extra dependencies other than those of [Revolution](https://github.com/tgpethan/Revolution), the server EUS is made on, of which include:
- [connect-busboy](https://www.npmjs.com/package/connect-busboy) - [connect-busboy](https://www.npmjs.com/package/connect-busboy)
- [randomstring](https://www.npmjs.com/package/randomstring) - [randomstring](https://www.npmjs.com/package/randomstring)
- [get-folder-size](https://www.npmjs.com/package/get-folder-size)
- [diskusage](https://www.npmjs.com/package/diskusage) - [diskusage](https://www.npmjs.com/package/diskusage)
- [stream-meter](https://www.npmjs.com/package/stream-meter)
- [mysql](https://www.npmjs.com/package/mysql)
Install the dependencies and then simply drop the EUS.js into a Revolution instance's modules folder **(If you still have [example_request_handler.js](https://github.com/tgpethan/Revolution/blob/master/modules/example_request_handler.js) be sure to delete it!)** Install the dependencies and then simply drop the EUS.js into a Revolution instance's modules folder **(If you still have [example_request_handler.js](https://github.com/tgpethan/Revolution/blob/master/modules/example_request_handler.js) be sure to delete it!)**