.

src/inc/routes/index.mjs

@@ -43,7 +43,8 @@ router.get(/^\/([0-9]+)$/, async (req, res) => {
       timestamp: new Date(query.stamp * 1000).toISOString()
     },
     next: query.next ? query.next : null,
-    prev: query.prev ? query.prev : null
+    prev: query.prev ? query.prev : null,
+    title: `${query.id} - f0ck.me`
   };
   res.reply({ body: tpl.render("views/item", data) });
 });

src/inc/routes/stats.mjs

@@ -2,10 +2,6 @@ import router from "../router.mjs";
 import url from "url";
 import util from "util";
 import sql from "../sql.mjs";
-import lib from "../lib.mjs";
-import tpl from "../tpl.mjs";
-
-tpl.readdir("views");
 
 router.get("/stats", async (req, res) => {
   const query = await sql.query("select src from items");
@@ -15,10 +11,7 @@ router.get("/stats", async (req, res) => {
     hosts[host] ? hosts[host]++ : hosts[host] = 1;
   });
   
-  const sorted = Object.keys(hosts).sort((a, b) => hosts[b] - hosts[a]).map(k => ({ [k]: hosts[k] })).reduce((a, b) => ({ ...a, ...b }));
-  
   res.reply({
-    body: "<pre>" + util.inspect(sorted) + "</pre>"
+    body: "<pre>" + util.inspect(Object.keys(hosts).sort((a, b) => hosts[b] - hosts[a]).map(k => ({ [k]: hosts[k] })).reduce((a, b) => ({ ...a, ...b }))) + "</pre>"
   });
-  //res.reply({ body: tpl.render("views/index", data) });
 });

src/inc/tpl.mjs

@@ -4,13 +4,13 @@ import path from "path";
 export default new class {
   #templates = {};
   #syntax = [
-    [ "each", (t, args = t.slice(4).trim().split(" ")) => `util.forEach(${args[0]},(${(args[1] === "as" && args[2]) ? args[2] : "value"},key)=>{` ],
+    [ "each", (t, _, args = t.slice(4).trim().split(" ")) => `util.forEach(${args[0]},(${(args[1] === "as" && args[2]) ? args[2] : "value"},key)=>{` ],
     [ "/each", () => "});" ],
     [ "if", t => `if(${t.slice(2).trim()}){` ],
     [ "elseif", t => `}else if(${t.slice(6).trim()}){` ],
     [ "else", () => "}else{" ],
     [ "/if", () => "}" ],
-    [ "include", t => `html+=util.tpl["${t.slice(7).trim()}"];`],
+    [ "include", (t, data) => `html+='${this.render(t.slice(7).trim(), data)}';` ], //`html+=util.include("${t.slice(7).trim()}", data);`], // parse them aswell
     [ "=", t => `html+=${t.slice(1).trim()};` ]
   ];
   readdir(dir, root = dir, rel = dir.replace(`${root}/`, "")) {
@@ -33,8 +33,8 @@ export default new class {
       .replace(/[\n\r]/g, "")
       .split(/{{\s*([^}]+)\s*}}/)
       .filter(Boolean)
-      .map(t => !(f = this.#syntax.filter(s => t.startsWith(s[0]))[0]) ? `html+='${t}';` : f[1](t))
+      .map(t => !(f = this.#syntax.filter(s => t.startsWith(s[0]))[0]) ? `html+='${t}';` : f[1](t, data))
       .join("") + "}return html.trim().replace(/>[\\n\\r\\s]*?</g, '><')"
-    ).bind(null, { forEach: this.forEach, tpl: this.#templates })(data);
+    ).bind(null, { forEach: this.forEach })(data);
   }
 };

src/websrv.mjs

@@ -1,43 +1,44 @@
 import http from "http";
 import url from "url";
+import { promises as fs } from "fs";
 import querystring from "querystring";
 import cfg from "../config.json";
 import router from "./inc/router.mjs";
 
-// routes
-import "./inc/routes/index.mjs";
-import "./inc/routes/api.mjs";
-import "./inc/routes/static.mjs";
-import "./inc/routes/stats.mjs";
+(async () => {
+  await Promise.all((await fs.readdir("./src/inc/routes"))
+    .filter(r => r.endsWith(".mjs"))
+    .map(r => import(`./inc/routes/${r}`)));
 
-http.createServer(async (req, res, r) => {
-  const t_start = process.hrtime();
-
-  req.url = url.parse(req.url.replace(/(?!^.)(\/+)?$/, ''));
-  req.url.split = req.url.pathname.split("/").slice(1);
-  req.url.qs = querystring.parse(req.url.query);
-
-  req.post = new Promise((resolve, _, data = "") => req
-    .on("data", d => void (data += d))
-    .on("end", () => void resolve(Object.fromEntries(Object.entries(querystring.parse(data)).map(([k, v]) => [k, decodeURIComponent(v)])))));
-
-  res.reply = ({
-    code = 200,
-    type = "text/html",
-    body
-  }) => res.writeHead(code, { "Content-Type": `${type}; charset=utf-8` }).end(body);
+  http.createServer(async (req, res, r) => {
+    const t_start = process.hrtime();
   
-  res.redirect = target => res.writeHead(301, {
-    "Cache-Control": "no-cache, public",
-    "Location": target
-  }).end();
-
-  !(r = router.routes.getRoute(req.url.pathname, req.method)) ? res.writeHead(404).end(`404 - ${req.url.pathname}`) : await r(req, res);
-  console.log([
-    `[${(new Date()).toLocaleTimeString()}]`,
-    `${(process.hrtime(t_start)[1] / 1e6).toFixed(2)}ms`,
-    `${req.method} ${res.statusCode}`,
-    req.url.pathname].map(e=>e.toString().padEnd(15)).join(""));
-}).listen(cfg.websrv.port, () => setTimeout(() => {
-  console.log(`f0ck is listening on port ${cfg.websrv.port}.`);
-}, 500));
+    req.url = url.parse(req.url.replace(/(?!^.)(\/+)?$/, ''));
+    req.url.split = req.url.pathname.split("/").slice(1);
+    req.url.qs = querystring.parse(req.url.query);
+  
+    req.post = new Promise((resolve, _, data = "") => req
+      .on("data", d => void (data += d))
+      .on("end", () => void resolve(Object.fromEntries(Object.entries(querystring.parse(data)).map(([k, v]) => [k, decodeURIComponent(v)])))));
+  
+    res.reply = ({
+      code = 200,
+      type = "text/html",
+      body
+    }) => res.writeHead(code, { "Content-Type": `${type}; charset=utf-8` }).end(body);
+    
+    res.redirect = target => res.writeHead(301, {
+      "Cache-Control": "no-cache, public",
+      "Location": target
+    }).end();
+  
+    !(r = router.routes.getRoute(req.url.pathname, req.method)) ? res.writeHead(404).end(`404 - ${req.url.pathname}`) : await r(req, res);
+    console.log([
+      `[${(new Date()).toLocaleTimeString()}]`,
+      `${(process.hrtime(t_start)[1] / 1e6).toFixed(2)}ms`,
+      `${req.method} ${res.statusCode}`,
+      req.url.pathname].map(e=>e.toString().padEnd(15)).join(""));
+  }).listen(cfg.websrv.port, () => setTimeout(() => {
+    console.log(`f0ck is listening on port ${cfg.websrv.port}.`);
+  }, 500));
+})();