more modifications

Author: therealbenpai

api/index.js

@@ -0,0 +1,9 @@
+const router = require('express').Router();
+require('dotenv').config();
+
+const mainRoutes = require('./routes/router');
+
+router
+    .use('/', mainRoutes);
+
+module.exports = router;

api/middleware/.gitkeep

@@ -0,0 +1,9 @@
+const router = require('express').Router();
+require('dotenv').config();
+
+const mainRoutes = require('./routes/router');
+
+router
+    .use('/', mainRoutes);
+
+module.exports = router;

routes/api/crypto.js api/routes/crypto.js

@@ -0,0 +1,11 @@
+const router = require('express').Router();
+require('dotenv').config();
+
+const cdn = require('./cdn');
+const assets = require('./assets/router');
+
+router
+    .use('/cdn', cdn)
+    .use('/assets', assets)
+
+module.exports = router;

routes/api/dictionary.js api/routes/dictionary.js

@@ -11,7 +11,7 @@ info:
     name: "GNU Affero General Public License v3.0"
     url: "https://www.gnu.org/licenses/agpl-3.0.en.html"
 servers:
-  - url: "https://thefemdevs.com/api/"
+  - url: "https://api.thefemdevs.com/"
     description: "Production Server"
 paths:
   /user/get:

routes/api/facts.js api/routes/facts.js

@@ -29,7 +29,7 @@ class Timer {
         }
     }
     static timestamp = v => new Intl.DateTimeFormat(this.#timesettings.locale, this.#timesettings.options).format(v)
-    static elapsedTime = (timestamp) => isNaN(timestamp) ? TypeError("Timestamp must be a number") : Object.entries({ year: Math.floor(Math.floor(timestamp) / (60 ** 2) / 24 / 30 / 12), month: Math.floor(Math.floor(timestamp) / (60 ** 2) / 24 / 30) % 12, day: Math.floor(Math.floor(timestamp) / (60 ** 2) / 24) % 30, hour: Math.floor(Math.floor(timestamp) / (60 ** 2)) % 24, minute: Math.floor(Math.floor(timestamp) / 60) % 60, second: Math.floor(timestamp) % 60 }).map(([key, value]) => value !== 0 ? `${value} ${key}${value == 1 ? '' : 's'}` : null).filter(value => value !== null).join(', ')
+    static elapsedTime = (timestamp) => isNaN(timestamp) ? TypeError("Timestamp must be a number") : Object.entries({ year: Math.floor(Math.floor(timestamp) / (60*60*24*30*12)), month: Math.floor(Math.floor(timestamp) / (60*60*24*30)) % 12, day: Math.floor(Math.floor(timestamp) / (60*60*24)) % 30, hour: Math.floor(Math.floor(timestamp) / (60*60)) % 24, minute: Math.floor(Math.floor(timestamp) / 60) % 60, second: Math.floor(timestamp) % 60 }).map(([key, value]) => value !== 0 ? `${value} ${key}${value == 1 ? '' : 's'}` : null).filter(value => value !== null).join(', ')
     static stringToMilliseconds = (timeString) => typeof timeString !== 'string' ? TypeError("Time String must be a string") : timeString.split(' ').map(value => { switch (value.slice(-1)) { case 'w': return value.slice(0, -1) * 604800000; case 'd': return value.slice(0, -1) * 86400000; case 'h': return value.slice(0, -1) * 3600000; case 'm': return value.slice(0, -1) * 60000; case 's': return value.slice(0, -1) * 1000; } }).reduce((a, b) => a + b, 0);
     static stringToSeconds = (timeString) => this.stringToMilliseconds(timeString) / 1000;
     static unixTime = (date) => (!(date instanceof Date) && typeof date !== 'number') ? TypeError("Date must be a Date object") : Math.round(date.getTime() / 1000)
@@ -63,30 +63,19 @@ class Formatter {
 }
 
 class ArrayAndJSON {
-    static combineArrays = new Array().concat
-    static combineJSON = (d1, d2) => Object.fromEntries([...Object.entries(d1), ...Object.entries(d2)])
-    static arrayToJSON = (array) => {
-        if (array.every(subdata => Array.isArray(subdata) && subdata.length == 2)) return Object.fromEntries(array)
-        let json = {};
-        array.forEach((v, i) => {
-            json[i] = v;
-        });
-        return json;
-    }
+    static combineArrays = Array.prototype.concat
+    static combineJSON = Object.assign
+    static arrayToJSON = (array) => Object.fromEntries(array.map((v, i) => (Array.isArray(v) && v.length == 2) ? v : [i, v]))
     static JSONToArray = (json, keys = false) => (keys) ? Object.entries(json) : Object.values(json)
     static arrayToSet = (array) => new Set(array)
-    static setToArray = (set) => [...set]
-    static arrayToMap = (array) => new Map(array)
-    static mapToArray = (map) => [...map]
-    static _par = (array) => array = array.sort(() => Math.random() > 0.5 ? 1 : -1)
-    static arrayRandomizer = (a, it = 25) => {
-        for (let i = 0; i < it; ++i) this._par(a);
-        return a
-    }
+    static setToArray = (set) => Array.from(set)
+    static objectToMap = (obj) => new Map(Object.entries(obj))
+    static mapToObject = (map) => Object.fromEntries(map.entries())
+    static arrayRandomizer = (a) => Array.from(a).sort(() => Math.random() > 0.5 ? 1 : -1);
 }
 
 class Cryptography {
-    static Utf8Encode = (string) => string.replace(/\r\n/g, '\n').split('').map((c) => c.charCodeAt(0)).map(char => { if (char < 128) return String.fromCharCode(char); else if ((char > 127) && (char < 2048)) return String.fromCharCode((char >> 6) | 192) + String.fromCharCode((char & 63) | 128); else return String.fromCharCode((char >> 12) | 224) + String.fromCharCode(((char >> 6) & 63) | 128) + String.fromCharCode((char & 63) | 128); }).join('');
+    static Utf8Encode = (string) => string.replace(/\r\n/g, '\n').split('').map((c) => c.charCodeAt(0)).map(char => (char < 128) ? String.fromCharCode(char) : ((char > 127) && (char < 2048)) ? String.fromCharCode((char >> 6) | 192) + String.fromCharCode((char & 63) | 128) : String.fromCharCode((char >> 12) | 224) + String.fromCharCode(((char >> 6) & 63) | 128) + String.fromCharCode((char & 63) | 128)).join('');
     static SHA1 = (msg) => {
         const rotate_left = (n, s) => (n << s) | (n >>> (32 - s))
         const cvt_hex = (val) => {

routes/api/location.js api/routes/location.js

@@ -1,15 +1,12 @@
 const app = require('express')();
 const http = require('http');
-const axios = require('axios');
-const cron = require('node-cron');
+const cors = require('cors');
+const vhost = require('vhost');
 const crypto = require('crypto');
 const Admin = require('firebase-admin');
 const { RateLimiterMemory } = require('rate-limiter-flexible');
 require('dotenv').config();
 
-//- Routers
-const router = require('./routes/router');
-
 const RateLimiter = new RateLimiterMemory({
     points: 30,
     duration: 1,
@@ -70,6 +67,14 @@ const Database = new (require('./functions/database'))();
 
 setInterval(_ => (!reqLogs[0]) ? null : Database.emit('access', reqLogs.shift()), 500)
 
+/** @type {cors.CorsOptions} */
+const CORSPerms = {
+    credentials: true,
+    maxAge: 86400,
+    methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'TRACE', 'HEAD'],
+    optionsSuccessStatus: 200,
+}
+
 app
     .set('view engine', 'pug')
     .set('case sensitive routing', false)
@@ -129,7 +134,13 @@ app
     .use(TRACE)
     .use(MRL)
     .use(Headers)
-    .use('/', router)
+    .use(cors(CORSPerms))
+    .use(vhost('api.thefemdevs.com', require('./api/')))
+    .use(vhost('oss.thefemdevs.com', require('./oss/')))
+    .use(vhost('cdn.thefemdevs.com', require('./cdn/')))
+    .use(vhost('www.thefemdevs.com', require('./routes/router')))
+    .use(vhost('thefemdevs.com', require('./routes/router')))
+    .use(vhost('localhost', require('./routes/router')))
     .get(`/robots.txt`, (_, res) => {
         res
             .sendFile(`${process.cwd()}/metadata/robots.txt`)
@@ -142,7 +153,7 @@ app
     .use((req, res, next) => {
         const { path } = req;
         const methodUsed = req.method.toUpperCase();
-        let allowedMethods = router.stack.filter(r => r.route && r.route.path === path)
+        let allowedMethods = app._router.stack.filter(r => r.route && r.route.path === path)
         if (allowedMethods.length == 0) return next();
         allowedMethods.map(r => r.route.stack[0])
         allowedMethods = { ...allowedMethods[0] }

routes/api/minecraft/hive.js api/routes/minecraft/hive.js

@@ -1,15 +1,13 @@
 // const Cryptolens = require('cryptolens');
 require('dotenv').config();
 
-const TokenManager = require('../functions/crypto')
-const { RequestHandler } = require('express');
-
-/** @type {import('express').RequestHandler} */ module.exports = async (req, res, next) => {
 
+/** @type {import('express').RequestHandler} */
+module.exports = async (req, res, next) => {
     if (!req.headers['authorization']) return res.sendError(1);
-    const [_, token] = req.headers['authorization'].split(' ');
+    const token = req.headers['authorization'].split(' ')[1];
     if (!token) return res.sendError(1);
-    if (!TokenManager.verify(token)) return res.sendError(2);
+    if (!require('../functions/crypto').verify(token)) return res.sendError(2);
     const connection = await req.Database.Pool.connect();
     const { rows } = await connection.query(`SELECT * FROM public.apitokens WHERE token = '${token}'`)
     if (rows.length == 0) return res.sendError(2)

routes/api/minecraft/hypixel.js api/routes/minecraft/hypixel.js

@@ -1,18 +1,11 @@
-const { RequestHandler } = require('express');
-
 /** @type {import('express').RequestHandler} */ module.exports = (req, res, next) => {
+    const { platform: os, versions: v } = process;
     res
         .setHeader('X-Repo', 'https://github.com/femdevs/femdev-website')
         .setHeader('X-Live-Deploy', 'https://thefemdevs.com')
         .setHeader('X-Repository-License', 'Affero General Public License v3.0 or newer (AGPL-3.0-or-later)')
-        .setHeader(
-            'X-OS',
-            process.platform == 'win32' ? 'Windows' :
-                process.platform == 'linux' ? 'Linux' :
-                    process.platform == 'darwin' ? 'MacOS' :
-                        'Other'
-        )
-        .setHeader('X-Node-Version', process.version)
+        .setHeader('X-OS', os == 'win32' ? 'Windows' : os == 'linux' ? 'Linux' : os == 'darwin' ? 'MacOS' : 'Other')
+        .setHeader('X-Node-Version', v.node)
         .setHeader('Content-Security-Policy', "default-src *; script-src 'self' google.com *.google.com *.googlesyndication.com googlesyndication.com *.googleadservices.com googleadservices.com *.corbado.io corbado.io *.sentry-cdn.com sentry-cdn.com blob: 'unsafe-inline'; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src *; font-src *; connect-src *; media-src *; object-src 'none';frame-ancestors *; form-action 'self'; upgrade-insecure-requests; block-all-mixed-content; sandbox allow-forms allow-same-origin allow-scripts; base-uri 'self'; manifest-src 'self'; require-trusted-types-for 'script';")
         .setHeader('Cross-Origin-Opener-Policy', 'same-origin')
         .setHeader('Cross-Origin-Embedder-Policy', 'require-corp')

routes/api/minecraft/router.js api/routes/minecraft/router.js

@@ -8,10 +8,11 @@ module.exports = (rateLimiter) => (function (req, res, next) {
         .consume(req.ip, (req.originalUrl.startsWith('/assets') ? 1 : 2))
         .then(
             (data) => {
+                const { remainingPoints: r, consumedPoints: c, msBeforeNext: m } = data;
                 res
-                    .setHeader('X-RateLimit-Limit', data.remainingPoints + data.consumedPoints)
-                    .setHeader('X-RateLimit-Remaining', data.remainingPoints)
-                    .setHeader('X-RateLimit-Reset', data.msBeforeNext);
+                    .setHeader('X-RateLimit-Limit', r + c)
+                    .setHeader('X-RateLimit-Remaining', r)
+                    .setHeader('X-RateLimit-Reset', m);
                 next();
             },
             (rej) => {

routes/api/phone.js api/routes/phone.js

@@ -6,66 +6,66 @@ class CC {
     static chalk = new Chalk.Instance({ level: 3 });
     /** @type {Map<string,Chalk.Chalk>} */
     static colors = new Map()
-        .set('dr', CC.chalk.rgb(120, 0, 0))
-        .set('lr', CC.chalk.rgb(250, 120, 120))
-        .set('o', CC.chalk.rgb(255, 120, 0))
-        .set('y', CC.chalk.yellow)
-        .set('dg', CC.chalk.rgb(0, 150, 0))
-        .set('lg', CC.chalk.rgb(0, 190, 0))
-        .set('bg', CC.chalk.rgb(100, 255, 0))
-        .set('db', CC.chalk.rgb(0, 0, 139))
-        .set('lb', CC.chalk.rgb(65, 105, 225))
-        .set('bb', CC.chalk.rgb(0, 191, 255))
-        .set('p', CC.chalk.rgb(255, 0, 255))
-        .set('pi', CC.chalk.rgb(255, 105, 180))
-        .set('w', CC.chalk.rgb(255, 255, 255))
-        .set('g', CC.chalk.rgb(120, 120, 120))
-        .set('b', CC.chalk.rgb(0, 0, 0));
-    static CPrep = (color) => CC.colors.get(color).bold.underline;
-    /** @type {Map<string, Map<string,Chalk.Chalk>>} */
+        .set('dr', this.chalk.rgb(120, 0, 0))
+        .set('lr', this.chalk.rgb(250, 120, 120))
+        .set('o', this.chalk.rgb(255, 120, 0))
+        .set('y', this.chalk.yellow)
+        .set('dg', this.chalk.rgb(0, 150, 0))
+        .set('lg', this.chalk.rgb(0, 190, 0))
+        .set('bg', this.chalk.rgb(100, 255, 0))
+        .set('db', this.chalk.rgb(0, 0, 139))
+        .set('lb', this.chalk.rgb(65, 105, 225))
+        .set('bb', this.chalk.rgb(0, 191, 255))
+        .set('p', this.chalk.rgb(255, 0, 255))
+        .set('pi', this.chalk.rgb(255, 105, 180))
+        .set('w', this.chalk.rgb(255, 255, 255))
+        .set('g', this.chalk.rgb(120, 120, 120))
+        .set('b', this.chalk.rgb(0, 0, 0));
+    static CPrep = (color) => this.colors.get(color).bold.underline;
+    /** @type {Map<string, Map<string, Chalk.Chalk>>} */
     static Dict = new Map()
         .set('status', (new Map()
-            .set('1', CC.CPrep('dg'))
-            .set('2', CC.CPrep('dg'))
-            .set('3', CC.CPrep('lb'))
-            .set('4', CC.CPrep('y'))
-            .set('5', CC.CPrep('dr'))
-            .set('default', CC.CPrep('w'))))
+            .set('1', this.CPrep('dg'))
+            .set('2', this.CPrep('dg'))
+            .set('3', this.CPrep('lb'))
+            .set('4', this.CPrep('y'))
+            .set('5', this.CPrep('dr'))
+            .set('default', this.CPrep('w'))))
         .set('method', (new Map()
-            .set('GET', CC.CPrep('dg'))
-            .set('POST', CC.CPrep('db'))
-            .set('PUT', CC.CPrep('y'))
-            .set('DELETE', CC.CPrep('dr'))
-            .set('PATCH', CC.CPrep('p'))
-            .set('HEAD', CC.CPrep('lb'))
-            .set('OPTIONS', CC.CPrep('o'))
-            .set('TRACE', CC.CPrep('bb'))
-            .set('CONNECT', CC.CPrep('bg'))))
+            .set('GET', this.CPrep('dg'))
+            .set('POST', this.CPrep('db'))
+            .set('PUT', this.CPrep('y'))
+            .set('DELETE', this.CPrep('dr'))
+            .set('PATCH', this.CPrep('p'))
+            .set('HEAD', this.CPrep('lb'))
+            .set('OPTIONS', this.CPrep('o'))
+            .set('TRACE', this.CPrep('bb'))
+            .set('CONNECT', this.CPrep('bg'))))
         .set('resTime', (new Map()
-            .set('0', CC.CPrep('lg'))
-            .set('1', CC.CPrep('dg'))
-            .set('2', CC.CPrep('y'))
-            .set('3', CC.CPrep('dr'))
-            .set('4', CC.CPrep('dr'))
-            .set('5', CC.CPrep('p'))
-            .set('6', CC.CPrep('bb'))
-            .set('7', CC.CPrep('db'))
-            .set('8', CC.CPrep('lb'))
-            .set('9', CC.CPrep('w'))
-            .set('10', CC.CPrep('g'))))
+            .set('0', this.CPrep('lg'))
+            .set('1', this.CPrep('dg'))
+            .set('2', this.CPrep('y'))
+            .set('3', this.CPrep('dr'))
+            .set('4', this.CPrep('dr'))
+            .set('5', this.CPrep('p'))
+            .set('6', this.CPrep('bb'))
+            .set('7', this.CPrep('db'))
+            .set('8', this.CPrep('lb'))
+            .set('9', this.CPrep('w'))
+            .set('10', this.CPrep('g'))))
         .set('bytes', (new Map()
-            .set('0', CC.colors.get('g'))
-            .set('1', CC.colors.get('lg'))
-            .set('2', CC.colors.get('dg'))
-            .set('3', CC.colors.get('y'))
-            .set('4', CC.colors.get('lr'))
-            .set('5', CC.colors.get('dr'))
-            .set('-1', CC.colors.get('w'))))
-    static status = (code) => (CC.Dict.get('status').get(String(code).at(0)))(code);
-    static path = (CC.colors.get('db'));
-    static method = (method) => (CC.Dict.get('method').get(method))(method);
-    static resTime = (t) => (CC.Dict.get('resTime').get(String(Math.min(Math.floor(t / 100), 10))))(`${t}ms`)
-    static bytes = (bytes) => (CC.Dict.get('bytes').get(String([0, 1, 5, 10, 50, 100].findIndex((v) => ((Math.ceil(Number(bytes) / (10 ** 5))) <= v)))))(`${new Intl.NumberFormat('en-US').format(bytes)} bytes`);
+            .set('0', this.colors.get('g'))
+            .set('1', this.colors.get('lg'))
+            .set('2', this.colors.get('dg'))
+            .set('3', this.colors.get('y'))
+            .set('4', this.colors.get('lr'))
+            .set('5', this.colors.get('dr'))
+            .set('-1', this.colors.get('w'))))
+    static status = (code) => (this.Dict.get('status').get(String(code).at(0)))(code);
+    static path = (this.colors.get('db'));
+    static method = (method) => (this.Dict.get('method').get(method))(method);
+    static resTime = (t) => (this.Dict.get('resTime').get(String(Math.min(Math.floor(t / 100), 10))))(`${t}ms`)
+    static bytes = (bytes) => (this.Dict.get('bytes').get(String([0, 1, 5, 10, 50, 100].findIndex((v) => ((Math.ceil(Number(bytes) / (10 ** 5))) <= v)))))(`${new Intl.NumberFormat('en-US').format(bytes)} bytes`);
 }
 
 /** @type {import('express').RequestHandler} */

routes/api/quotes.js api/routes/quotes.js

@@ -0,0 +1,9 @@
+const router = require('express').Router();
+require('dotenv').config();
+
+const mainRoutes = require('./routes/router');
+
+router
+    .use('/', mainRoutes);
+
+module.exports = router;

routes/api/router.js api/routes/router.js

@@ -0,0 +1,9 @@
+const router = require('express').Router();
+require('dotenv').config();
+
+const projects = require('./project');
+
+router
+    .use('/projects', projects)
+
+module.exports = router;