From 2a55890764a9227fd89bcdc7d6b8e9bb435c7665 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Wed, 20 Nov 2024 16:49:02 +0100
Subject: [PATCH] feat: Use nunjucks for rendering

---
 Dockerfile                               |   3 --
 bun.lockb                                | Bin 4426 -> 6252 bytes
 package.json                             |   2 +
 src/index.ts                             |   5 +++
 src/utils/renderer.ts                    |  45 +++++++----------------
 templates/{index.html => index.html.njk} |   1 +
 templates/{index.txt => index.txt.njk}   |   0
 upload_to_server.sh                      |   3 +-
 8 files changed, 22 insertions(+), 37 deletions(-)
 rename templates/{index.html => index.html.njk} (98%)
 rename templates/{index.txt => index.txt.njk} (100%)

diff --git a/Dockerfile b/Dockerfile
index d0a9adb..a81df0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,6 @@ WORKDIR /app
 
 COPY . /app
 
-# Absolutely no idea why, but piping the output directly to the file makes it empty.
-RUN mkdir -p /tmp/templates && mv /app/templates/*.html /tmp/templates/
-RUN bunx html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true /tmp/templates/index.html > /app/templates/index.html
 RUN bun install --production
 
 EXPOSE 3000
diff --git a/bun.lockb b/bun.lockb
index 5b268d4cfdeeb9165ef7f0bf1b9ffb610d23c95e..75248b3870b2fd1b3b65328d34337939df903f11 100755
GIT binary patch
delta 1960
zcmc&!drXs86#u@jEp4GKRA9D(@|fsQzrH{OHYpm2Ak$f2^)<-{6e!Y%JciUqYsMCa
zf|R?d7+rL6TjnDfI1Hlk5fa@nlgE(F%)~GsY@->@xtH;=b4ovE{B!^8B=`H>bIv{I
z-0$3be?9R&U9%=}eg6aBbhDPbVv;#>)jpE7*BLudJ=Z>HH{~b3{7K}^$&_Ehyylqn
zWntqAMR7K(!)dWoE=Q5yWUscDRTplm>;g?nQ68?6bE4xI3<&agn^o>`n1{kV7!cR&
zVkjyEun$lM2xba=o)v;||GogemtQ&Beq#PoHs$u{qAd5N_CAkS)b~O6kRr`KDKam2
zYIka_BhJyDyWdlCf2`o@v@PtqqZ#a1HMWEci6<AYytz@gynXf=X=86p*<*v{VPOls
zg^nk+v{6|BB~zg!RH9%Pl#uA@nZ!v;q}`yUgGWR*OSNcGJ^_mkEVvFOXksl(Q&bLk
zXmW|3$5hj#i_Tz<(Bu)oFip~#45b>PjL#LC2xitW#KmMVdl}LNaFZdA0Hz8^x*&tu
zARsP)!vfMJNOw!1C=L`vAq?o7U;Ycit|>VTM1?=gIHC^c<Zp-)5Ool@zv%zB0rHWs
z+x`8={pQ153-iTFU%qYWhRi+nl2xp(v+cs#AB(r!)Jq<F>AwZ7_gc>wUv1i46U&8~
zPmrdOS*Mc^JWMRAH#Ne)(A3k=r+|3oya<h%?VtDc{c?6ycb#P6jr02GRinpyB4^)i
z3%Sg_wR(~3ofSEEbw_TfE&Fx9j-8XwI5M2sWBBaOp|HMQpM61<v6ws&sobKtAy2ZW
z{&?CzqjzhM_52}Ut?Ap`@YLZe%iE0E+xjC+E!WhRh3yFkvVPxvy>;YKS?l1)^^$FW
z%DJS)9}Z_dw>uHPH9%o@-L>eN)eYX2d#7jXrg!ES&%EK5{np`5fB)EeLqlq5<?#f4
zZ$h!U&UxjJi`uAr_65(rp@z%n%zC~1jhvy8!Gq*vkcwDDd9;|ciOi%_EGLmcc}w6G
zPKfa6mUlaz%{z3mBqXh%Q(ShxOjnRF7Sp=@)`qqHJH@4^<S)rSJ-WE<ueS$IuRm)#
ze8)9;Y~PZNw_~0xJs5YjW7;hum#By>D31;yXM)VMj3~usT28F+Rgg>Y4JB$x4Ll`b
zm<g%^8+edA;O2QqzoZBq<eWqz>4z>LWssfHbL30<l~c{qUYayZe+u3YW|R|Q#2T`2
z%F}1#f+oDL-v!(eN-{+@gZM%sG(lh%!@%o}PXuo-{xnh$hT!$j#5)dBk74o4(G*}P
z|8fk+H2CacXA~X`zC64>SRWY7pBhVGO4M<52GZ^hCob7K6;FOV2T1}nLIz~ZR6Kj~
z%*N0glQafRGKrN(mmPy-*bkoGz^T{hG&&&R0Lk(M2p$7?k|>I&VV)wvGgkvq6jfO2
z*kmo@DoQRkycuQGc12*RB=qcJ$VIs-g=b@_<F(5_n+}|1=pA!4h7?UQ#q;u3U&+_?
zlSbniS`Rssk|}DRfb5p5qIp91YS%T+=$M}dp$45sZ_uQU=MEmiE`SV$lON=n!BoV!
zIyjlkQN+e)R@FK!mD+-8dthdD1}1!e$azH+*`bJt;|;8{!cyq4Ij!ZE0;^s7uZAmA
z_*Gg~%THN<Uo}-FE{?6NwHLBAT$QDwm@6-bG&as&WU0W=s0j^XC+4ibhongnqr}#O
p3xUO+r=T_Q#hkd}g)%IjogP;AsQEp;xIKR^vL{r0YE9?^`X6)f0_^|*

delta 827
zcmah{O=uHQ5Pt8a`PsjaW?PL(QCV#Lp>C5Z{uB~J5h_^-y~tvqt%{|@pEOVlwt@}x
zq6HywK*WR8gP>G`w0IFccoAC^6nf}QOF@e1MGvAE>&#|zD%64Do7ws1+nM*?MtsRA
zn+Nw_?JMWi_t}TRxq+ToZhG^4=SV_Yw!V~qO@FE`$6ke)V@k!|6CG0O31b(o<wuLd
z1vWW)$@x@y5lPD!NsN_tamJ8X8bnkPiGa1zD&|yg7j?WdG*+8`p3ELTwpQyqJ@ppi
zJOcgv2G?PcpOSj9trO`2K8xd`z#!vEi7JB`gl`Pwrj*#nA%k$4!wkY4hb4sX9As}w
zm;y51o+%%ykdtkPI2-e$69&-92r0**8O}^gIXQx(wVj^J>2MnUD-0995AY;laS!|m
z*s$)`;H+eEFZ_{gco5KFK(@Fap2;?xku=a0i%W1$vEesnZ<H%g<_BO_RmCF)RkgZM
z)M{LQ>fY9C1#+R@82h_fHyVxZYTd1eRM_2Yz)C0*rHyGT+L(q;<Nc8p9ZHHqqIl7p
z&^_pMFmy=NMlIAz>Xehux)LiI+-uH(FPw!!INH{DB$ck*-Hw;ZlY$>YGT9&pRgbha
zUdzpmk&m~-HAC=(nJ|wWWvpF5T92f*D%|Rhn~84o#MVkf+X&YGVFcm6o|gOFbUp-M
m^}Rc(mcBkw93JbsI9_n0d=VbE#vs|!0^_ak7AAN6<o^Ix0hh1<

diff --git a/package.json b/package.json
index b9a2da3..7142c71 100644
--- a/package.json
+++ b/package.json
@@ -8,11 +8,13 @@
 	"dependencies": {
 		"hono": "^4.6.9",
 		"ip": "^2.0.1",
+		"nunjucks": "^3.2.4",
 		"zod": "^3.23.8"
 	},
 	"devDependencies": {
 		"@types/bun": "latest",
 		"@types/ip": "^1.1.3",
+		"@types/nunjucks": "^3.2.6",
 		"prettier": "^3.3.3"
 	}
 }
diff --git a/src/index.ts b/src/index.ts
index 1556924..f853de1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,6 +2,11 @@ import { Hono } from "hono";
 import { portRoute } from "./routes/port";
 import { rootRoute } from "./routes/root";
 import { serveStatic } from "hono/bun";
+import * as nunjucks from "nunjucks";
+
+nunjucks.configure("templates", {
+	dev: process.env.NODE_ENV === "development",
+});
 
 const app = new Hono()
 	.use("/static/*", serveStatic({ root: "./" }))
diff --git a/src/utils/renderer.ts b/src/utils/renderer.ts
index ff75bb3..9e56dd3 100644
--- a/src/utils/renderer.ts
+++ b/src/utils/renderer.ts
@@ -1,46 +1,27 @@
 import { Context } from "hono";
 import { PresentationType } from "../middlewares/presentation";
+import * as nunjucks from "nunjucks";
 
 export default async function render(
-	request: Context,
+	context: Context,
 	templateName: "index",
 	ctx: Record<string, any>,
 ) {
-	const presentation = request.get("presentation");
-	let content = await getTemplate(templateName, presentation);
-
-	for (const [key, value] of Object.entries(ctx)) {
-		content = content.replaceAll(`{{${key}}}`, value);
-	}
-
-	switch (presentation) {
-		case "browser": {
-			return request.html(content);
-		}
-		case "terminal": {
-			return request.text(content);
-		}
-	}
-}
-
-const _templateCache: Record<string, string> = {};
-
-async function getTemplate(
-	templateName: "index",
-	presentation: PresentationType,
-): Promise<string> {
+	const presentation = context.get("presentation") as PresentationType;
 	const extension = {
 		browser: ".html",
 		terminal: ".txt",
 	}[presentation];
-	const key = templateName + extension;
+	const key = templateName + extension + ".njk";
 
-	if (_templateCache[key]) {
-		return _templateCache[key];
+	const content = nunjucks.render(key, ctx);
+
+	switch (presentation) {
+		case "browser":
+			return context.html(content);
+			break;
+		case "terminal":
+			return context.text(content);
+			break;
 	}
-
-	const currentPath = await Bun.resolve(`./templates/${key}`, process.cwd());
-	_templateCache[key] = await Bun.file(currentPath).text();
-
-	return _templateCache[key];
 }
diff --git a/templates/index.html b/templates/index.html.njk
similarity index 98%
rename from templates/index.html
rename to templates/index.html.njk
index a7bbe4a..847db48 100644
--- a/templates/index.html
+++ b/templates/index.html.njk
@@ -4,6 +4,7 @@
 		<meta charset="UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta name="darkreader-lock">
 		<title>amiopen.now</title>
 
 		<style type="text/css">
diff --git a/templates/index.txt b/templates/index.txt.njk
similarity index 100%
rename from templates/index.txt
rename to templates/index.txt.njk
diff --git a/upload_to_server.sh b/upload_to_server.sh
index 2537274..26f47a3 100755
--- a/upload_to_server.sh
+++ b/upload_to_server.sh
@@ -1,8 +1,7 @@
 ip=$1
 user=$2
 
-cd server && 
-    docker buildx build --platform linux/amd64 . --tag amiopen:latest && 
+docker buildx build --platform linux/amd64 . --tag amiopen:latest && 
     docker save -o amiopen.tar amiopen:latest && 
     scp amiopen.tar $user@$ip:~/amiopen/amiopen.tar &&
     ssh $user@$ip "cd ~/amiopen && docker container stop amiopen && docker container rm amiopen && docker load -i amiopen.tar && docker compose up -d"