Merge pull request #52 from TibiNonEst/model-query-option

Add ability to request skin model by query params
nodecraft · Mar 28, 2022 · 5f98fd7 · 5f98fd7
2 parents 1ed7910 + 2a45a62
commit 5f98fd7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/worker/index.ts b/worker/index.ts
@@ -161,5 +161,5 @@ async function renderImage(skin: Response, request: CraftheadRequest): Promise<R
 }
 
 function getCacheKey(interpreted: CraftheadRequest): string {
-    return `https://crafthead.net/__public${CACHE_BUST}/${interpreted.requested}/${interpreted.armored}/${interpreted.identity.toLocaleLowerCase('en-US')}/${interpreted.size}`
+    return `https://crafthead.net/__public${CACHE_BUST}/${interpreted.requested}/${interpreted.armored}/${interpreted.model}/${interpreted.identity.toLocaleLowerCase('en-US')}/${interpreted.size}`
 }
diff --git a/worker/request.ts b/worker/request.ts
@@ -27,6 +27,7 @@ export interface CraftheadRequest {
     identityType: IdentityKind;
     size: number;
     armored: boolean;
+    model: string | null;
 }
 
 function stringKindToRequestedKind(kind: string): RequestedKind | null {
@@ -58,6 +59,9 @@ export function interpretRequest(request: Request): CraftheadRequest | null {
         url.href = url.href.substring(0, url.href.length - 4)
     }
 
+    let model = url.searchParams.get("model")
+    if (model && !["slim", "default"].includes(model)) model = null
+
     let armored = false
     let sliceAmt = 1
 
@@ -95,5 +99,5 @@ export function interpretRequest(request: Request): CraftheadRequest | null {
         return null
     }
 
-    return { requested, identityType, identity, size, armored }
+    return { requested, identityType, identity, size, armored, model }
 }
diff --git a/worker/services/mojang/service.ts b/worker/services/mojang/service.ts
@@ -73,7 +73,7 @@ export default class MojangRequestService {
                             status: 200,
                             headers: {
                                 'X-Crafthead-Profile-Cache-Hit': lookup.source,
-                                'X-Crafthead-Skin-Model': textureResponse.model || 'default'
+                                'X-Crafthead-Skin-Model': request.model || textureResponse.model || 'default'
                             }
                         });
                     }