add last-modified headers

Author: InventivetalentDev

src/models/v2/meta.ts

@@ -11,7 +11,7 @@ import { isPopulatedSkin2Document } from "@mineskin/database";
 import { Classification } from "@mineskin/database/dist/schemas/Classification";
 
 //TODO
-export async function getSkinMeta(req: MineSkinV2Request, res: Response<V2ResponseBody>): Promise<V2MiscResponseBody> {
+export async function getSkinMeta(req: MineSkinV2Request, res: Response<V2ResponseBody>): Promise<V2MiscResponseBody | null> {
     const uuid = UUID.parse(req.params.uuid);
 
     let skin = await container.get<SkinService>(GeneratorTypes.SkinService).findForUuid(uuid);
@@ -27,9 +27,21 @@ export async function getSkinMeta(req: MineSkinV2Request, res: Response<V2Respon
         }).exec();
         if (classification) {
             meta['description'] = classification.description;
+
+            // cache headers
+            res.header('Last-Modified', classification.updatedAt.toUTCString());
+            if (req.headers['if-modified-since']) {
+                const ifModifiedSince = new Date(req.headers['if-modified-since']);
+                if (classification.updatedAt <= ifModifiedSince) {
+                    res.status(304).end();
+                    return null;
+                }
+            }
         }
     }
 
+    res.header('Cache-Control', 'public, max-age=3600');
+
     return {
         success: true,
         meta: meta

src/models/v2/skins.ts

@@ -223,7 +223,7 @@ export async function v2ListRandomSkins(req: MineSkinV2Request, res: Response<V2
 }
 
 
-export async function v2GetSkin(req: MineSkinV2Request, res: Response<V2SkinResponse>): Promise<V2SkinResponse> {
+export async function v2GetSkin(req: MineSkinV2Request, res: Response<V2SkinResponse>): Promise<V2SkinResponse | null> {
     const uuidOrShort = UUIDOrShortId.parse(req.params.uuid);
 
     req.links.skin = `/v2/skins/${ uuidOrShort }`;
@@ -249,6 +249,17 @@ export async function v2GetSkin(req: MineSkinV2Request, res: Response<V2SkinResp
 
     skin = validateRequestedSkin(req, skin);
 
+    // cache headers
+    res.header('Cache-Control', 'public, max-age=10800');
+    res.header('Last-Modified', skin.updatedAt ? skin.updatedAt.toUTCString() : new Date().toUTCString());
+    if (req.headers['if-modified-since'] && skin.updatedAt) {
+        const ifModifiedSince = new Date(req.headers['if-modified-since']);
+        if (skin.updatedAt <= ifModifiedSince) {
+            res.status(304).end();
+            return null;
+        }
+    }
+
     Skin2.incRequests(skin.uuid).catch(e => Sentry.captureException(e));
     try {
         const metrics = container.get<IMetricsProvider>(CoreTypes.MetricsProvider);

src/routes/v2/images.ts

@@ -10,7 +10,7 @@ const router: Router = v2Router();
 router.use(wildcardCors);
 
 router.get("/:hash", expressAsyncHandler(async (req: MineSkinV2Request, res: Response<V2SkinResponse>) => {
-    res.header('Cache-Control', 'public, max-age=31536000');
+    res.header('Cache-Control', 'public, max-age=31536000, immutable');
     await v2GetImage(req, res);
 }));
 

src/routes/v2/skins.ts

@@ -52,7 +52,7 @@ router.get("/random", expressAsyncHandler(async (req: MineSkinV2Request, res: Re
 
 router.get("/:uuid", expressAsyncHandler(async (req: MineSkinV2Request, res: Response<V2SkinResponse>) => {
     const result = await v2GetSkin(req, res);
-    res.header('Cache-Control', 'public, max-age=10800');
+    if (!result) return;
     res.json(formatV2Response(req, result));
 }));
 
@@ -83,7 +83,7 @@ router.post("/:uuid/tags", expressAsyncHandler(async (req: MineSkinV2Request, re
 
 router.get("/:uuid/meta", expressAsyncHandler(async (req: MineSkinV2Request, res: Response<V2MiscResponseBody>) => {
     const result = await getSkinMeta(req, res);
-    res.header('Cache-Control', 'public, max-age=3600');
+    if (!result) return;
     res.json(formatV2Response(req, result));
 }));
 
@@ -101,17 +101,17 @@ router.post("/:uuid/report", expressAsyncHandler(async (req: MineSkinV2Request,
     }));
 }));
 
-router.patch("/:uuid",expressAsyncHandler(async (req: MineSkinV2Request, res: Response<V2MiscResponseBody>) => {
+router.patch("/:uuid", expressAsyncHandler(async (req: MineSkinV2Request, res: Response<V2MiscResponseBody>) => {
     const result = await v2UpdateSkin(req, res);
     res.json(formatV2Response(req, result));
 }));
 
-router.delete("/:uuid",expressAsyncHandler(async (req: MineSkinV2Request, res: Response<V2MiscResponseBody>) => {
+router.delete("/:uuid", expressAsyncHandler(async (req: MineSkinV2Request, res: Response<V2MiscResponseBody>) => {
     const result = await v2DeleteSkin(req, res);
     res.json(formatV2Response(req, result));
 }));
 
-router.get("/:uuid/user",expressAsyncHandler(async (req: MineSkinV2Request, res: Response<V2MiscResponseBody>) => {
+router.get("/:uuid/user", expressAsyncHandler(async (req: MineSkinV2Request, res: Response<V2MiscResponseBody>) => {
     const result = await v2GetSkinUser(req, res);
     res.header('Cache-Control', 'private, max-age=60');
     res.json(formatV2Response(req, result));