implement cache de-exister

Reviewed-on: StrafesNET/maps-service#153

README.md

@@ -26,10 +26,10 @@ Prerequisite: golang installed
 
 Prerequisite: bun installed
 
-The environment variables `BASE_URL` and `AUTH_HOST` will need to be set for the middleware.
+The environment variables `API_HOST` and `AUTH_HOST` will need to be set for the middleware.
 Example `.env` in web's root:
 ```
-BASE_URL="http://localhost:8082/"
+API_HOST="http://localhost:8082/"
 AUTH_HOST="http://localhost:8083/"
 ```
 

pkg/service/audit_events.go

@@ -25,15 +25,24 @@ func (svc *Service) CreateMapfixAuditComment(ctx context.Context, req api.Create
 	if err != nil {
 		return err
 	}
-	if !has_role {
-		return ErrPermissionDeniedNeedRoleMapfixReview
-	}
 
 	userId, err := userInfo.GetUserID()
 	if err != nil {
 		return err
 	}
 
+	if !has_role {
+		// Submitter has special permission to comment on their mapfix
+		mapfix, err := svc.DB.Mapfixes().Get(ctx, params.MapfixID)
+		if err != nil {
+			return err
+		}
+
+		if mapfix.Submitter != userId {
+			return ErrPermissionDeniedNeedRoleMapfixReview
+		}
+	}
+
 	data := []byte{}
 	_, err = req.Read(data)
 	if err != nil {
@@ -146,15 +155,24 @@ func (svc *Service) CreateSubmissionAuditComment(ctx context.Context, req api.Cr
 	if err != nil {
 		return err
 	}
-	if !has_role {
-		return ErrPermissionDeniedNeedRoleSubmissionReview
-	}
 
 	userId, err := userInfo.GetUserID()
 	if err != nil {
 		return err
 	}
 
+	if !has_role {
+		// Submitter has special permission to comment on their submission
+		submission, err := svc.DB.Submissions().Get(ctx, params.SubmissionID)
+		if err != nil {
+			return err
+		}
+
+		if submission.Submitter != userId {
+			return ErrPermissionDeniedNeedRoleSubmissionReview
+		}
+	}
+
 	data := []byte{}
 	_, err = req.Read(data)
 	if err != nil {

web/src/app/lib/errorImageResponse.ts

@@ -0,0 +1,35 @@
+import path from 'path';
+import { promises as fs } from 'fs';
+import { NextResponse } from 'next/server';
+
+export async function errorImageResponse(
+	statusCode: number = 500,
+	options?: { message?: string }
+): Promise<NextResponse> {
+	const file = `${statusCode}.png`;
+	const filePath = path.join(process.cwd(), 'public/errors', file);
+
+	const headers: Record<string, string> = {
+		'Content-Type': 'image/png',
+	};
+	if (options?.message) {
+		headers['X-Error-Message'] = encodeURIComponent(options.message);
+	}
+
+	try {
+		const buffer = await fs.readFile(filePath);
+		headers['Content-Length'] = buffer.length.toString();
+		return new NextResponse(buffer, {
+			status: statusCode,
+			headers,
+		});
+	} catch {
+		const fallback = path.join(process.cwd(), 'public/errors', '500.png');
+		const buffer = await fs.readFile(fallback);
+		headers['Content-Length'] = buffer.length.toString();
+		return new NextResponse(buffer, {
+			status: 500,
+			headers,
+		});
+	}
+}

web/src/app/mapfixes/page.tsx

@@ -11,10 +11,31 @@ import "./(styles)/page.scss";
 import { ListSortConstants } from "../ts/Sort";
 
 export default function MapfixInfoPage() {
-	const [mapfixes, setMapfixes] = useState<MapfixList>({Total:-1,Mapfixes:[]})
+	const [mapfixes, setMapfixes] = useState<MapfixList|null>(null)
 	const [currentPage, setCurrentPage] = useState(1);
 	const cardsPerPage = 24; // built to fit on a 1920x1080 monitor
 
+	useEffect(() => {
+		async function fetchMapfixes() {
+			const res = await fetch(`/api/mapfixes?Page=${currentPage}&Limit=${cardsPerPage}&Sort=${ListSortConstants.ListSortDateDescending}`)
+			if (res.ok) {
+				setMapfixes(await res.json())
+			}
+		}
+
+		setTimeout(() => {
+			fetchMapfixes()
+		}, 50);
+	}, [currentPage])
+
+	if (!mapfixes) {
+		return <Webpage>
+			<main>
+				Loading...
+			</main>
+		</Webpage>
+	}
+
 	const totalPages = Math.ceil(mapfixes.Total / cardsPerPage);
 
 	const currentCards = mapfixes.Mapfixes.slice(
@@ -34,27 +55,6 @@ export default function MapfixInfoPage() {
 		}
 	};
 
-	useEffect(() => {
-		async function fetchMapfixes() {
-			const res = await fetch(`/api/mapfixes?Page=${currentPage}&Limit=${cardsPerPage}&Sort=${ListSortConstants.ListSortDateDescending}`)
-			if (res.ok) {
-				setMapfixes(await res.json())
-			}
-		}
-
-		setTimeout(() => {
-			fetchMapfixes()
-		}, 50);
-	}, [currentPage])
-
-	if (mapfixes.Total < 0) {
-		return <Webpage>
-			<main>
-				Loading...
-			</main>
-		</Webpage>
-	}
-
 	if (mapfixes.Total == 0) {
 		return <Webpage>
 			<main>

web/src/app/submissions/page.tsx

@@ -9,10 +9,31 @@ import "./(styles)/page.scss";
 import { ListSortConstants } from "../ts/Sort";
 
 export default function SubmissionInfoPage() {
-	const [submissions, setSubmissions] = useState<SubmissionList>({Total:-1,Submissions:[]})
+	const [submissions, setSubmissions] = useState<SubmissionList|null>(null)
 	const [currentPage, setCurrentPage] = useState(1);
 	const cardsPerPage = 24; // built to fit on a 1920x1080 monitor
 
+	useEffect(() => {
+		async function fetchSubmissions() {
+			const res = await fetch(`/api/submissions?Page=${currentPage}&Limit=${cardsPerPage}&Sort=${ListSortConstants.ListSortDateDescending}`)
+			if (res.ok) {
+				setSubmissions(await res.json())
+			}
+		}
+
+		setTimeout(() => {
+			fetchSubmissions()
+		}, 50);
+	}, [currentPage])
+
+	if (!submissions) {
+		return <Webpage>
+			<main>
+				Loading...
+			</main>
+		</Webpage>
+	}
+
 	const totalPages = Math.ceil(submissions.Total / cardsPerPage);
 
 	const currentCards = submissions.Submissions.slice(
@@ -32,27 +53,6 @@ export default function SubmissionInfoPage() {
 		}
 	};
 
-	useEffect(() => {
-		async function fetchSubmissions() {
-			const res = await fetch(`/api/submissions?Page=${currentPage}&Limit=${cardsPerPage}&Sort=${ListSortConstants.ListSortDateDescending}`)
-			if (res.ok) {
-				setSubmissions(await res.json())
-			}
-		}
-
-		setTimeout(() => {
-			fetchSubmissions()
-		}, 50);
-	}, [currentPage])
-
-	if (submissions.Total < 0) {
-		return <Webpage>
-			<main>
-				Loading...
-			</main>
-		</Webpage>
-	}
-
 	if (submissions.Total == 0) {
 		return <Webpage>
 			<main>

web/src/app/thumbnails/asset/[assetId]/route.tsx

@@ -1,8 +1,18 @@
 import { NextRequest, NextResponse } from 'next/server';
+import { errorImageResponse } from '@/app/lib/errorImageResponse';
 
 const cache = new Map<number, { buffer: Buffer; expires: number }>();
 const CACHE_TTL = 15 * 60 * 1000;
 
+setInterval(() => {
+    const now = Date.now();
+    for (const [key, value] of cache.entries()) {
+        if (value.expires <= now) {
+            cache.delete(key);
+        }
+    }
+}, 60 * 5 * 1000);
+
 export async function GET(
 	request: NextRequest,
 	context: { params: Promise<{ assetId: number }> }
@@ -10,10 +20,9 @@ export async function GET(
 	const { assetId } = await context.params;
 	
 	if (!assetId) {
-		return NextResponse.json(
-			{ error: 'Missing asset ID' },
-			{ status: 400 }
-		);
+		return errorImageResponse(400, {
+			message: "Missing asset ID",
+		})
 	}
 
 	let finalAssetId = assetId;
@@ -31,17 +40,17 @@ export async function GET(
 	} catch { }
 
 	const now = Date.now();
-    const cached = cache.get(finalAssetId);
+	const cached = cache.get(finalAssetId);
 
-    if (cached && cached.expires > now) {
-        return new NextResponse(cached.buffer, {
-            headers: {
-                'Content-Type': 'image/png',
-                'Content-Length': cached.buffer.length.toString(),
-                'Cache-Control': `public, max-age=${CACHE_TTL / 1000}`,
-            },
-        });
-    }
+	if (cached && cached.expires > now) {
+		return new NextResponse(cached.buffer, {
+			headers: {
+				'Content-Type': 'image/png',
+				'Content-Length': cached.buffer.length.toString(),
+				'Cache-Control': `public, max-age=${CACHE_TTL / 1000}`,
+			},
+		});
+	}
 
 	try {
 		const response = await fetch(
@@ -49,22 +58,21 @@ export async function GET(
 		);
 
 		if (!response.ok) {
-			throw new Error('Failed to fetch thumbnail JSON');
+			throw new Error(`Failed to fetch thumbnail JSON [${response.status}]`)
 		}
 
 		const data = await response.json();
 
 		const imageUrl = data.data[0]?.imageUrl;
 		if (!imageUrl) {
-			return NextResponse.json(
-				{ error: 'No image URL found in the response' },
-				{ status: 404 }
-			);
+			return errorImageResponse(404, {
+				message: "No image URL found in the response",
+			})
 		}
 
 		const imageResponse = await fetch(imageUrl);
 		if (!imageResponse.ok) {
-			throw new Error('Failed to fetch the image');
+			throw new Error(`Failed to fetch the image [${imageResponse.status}]`)
 		}
 
 		const arrayBuffer = await imageResponse.arrayBuffer();
@@ -79,10 +87,9 @@ export async function GET(
 				'Cache-Control': `public, max-age=${CACHE_TTL / 1000}`,
 			},
 		});
-	} catch {
-		return NextResponse.json(
-			{ error: 'Failed to fetch or process thumbnail' },
-			{ status: 500 }
-		);
+	} catch (err) {
+		return errorImageResponse(500, {
+            message: `Failed to fetch or process thumbnail: ${err}`,
+        })
 	}
 }

web/src/app/thumbnails/maps/[mapId]/route.tsx

@@ -1,16 +1,20 @@
-import { NextRequest, NextResponse } from "next/server";
+import { NextRequest, NextResponse } from "next/server"
 
 export async function GET(
     request: NextRequest,
     context: { params: Promise<{ mapId: string }> }
 ): Promise<NextResponse> {
     // TODO: implement this, we need a cdn for in-game map thumbnails...
+
+    if (!process.env.API_HOST) {
+        throw new Error('env variable "API_HOST" is not set')
+    }
     
-    const { mapId } = await context.params;
+    const { mapId } = await context.params
 
-    const protocol = request.headers.get("x-forwarded-proto") || "https";
-    const host = request.headers.get("host");
-    const origin = `${protocol}://${host}`;
+    const apiHost = process.env.API_HOST.replace(/\/api\/?$/, "")
+    const redirectPath = `/thumbnails/asset/${mapId}`
+    const redirectUrl = `${apiHost}${redirectPath}`
 
-    return NextResponse.redirect(`${origin}/thumbnails/asset/${mapId}`);
+    return NextResponse.redirect(redirectUrl)
 }

web/src/middleware.ts

@@ -8,25 +8,26 @@ export function middleware(request: NextRequest) {
 	const { pathname, search } = request.nextUrl
 
 	if (pathname.startsWith("/api")) {
-		if (!process.env.BASE_URL) {
-			throw new Error('env variable "BASE_URL" is not set')
+		if (!process.env.API_HOST) {
+			throw new Error('env variable "API_HOST" is not set')
 		}
-		
-		const baseUrl = process.env.BASE_URL.replace(/\/$/, "");
-		const apiUrl = new URL(baseUrl + pathname + search);
+
+		const baseUrl = process.env.API_HOST.replace(/\/$/, "");
+		const path = pathname.replace(/^\/api/, "");
+		const apiUrl = new URL(baseUrl + path + search);
 
 		return NextResponse.rewrite(apiUrl, { request });
 	} else if (pathname.startsWith("/auth")) {
 		if (!process.env.AUTH_HOST) {
 			throw new Error('env variable "AUTH_HOST" is not set')
 		}
-		
+
 		const authHost = process.env.AUTH_HOST.replace(/\/$/, "");
 		const path = pathname.replace(/^\/auth/, "");
 		const redirectUrl = new URL(authHost + path + search);
 
 		return NextResponse.redirect(redirectUrl, 302);
-	}    
+	}
 
 	return NextResponse.next()
-}
+}