Refactor identity handling: move uuidNameKey, uuidIdKey, and buildIdentityPayload to utils; clean up profileRoute and uuidRoute

Author: Leon-JavaScript

pages/defaultPage.js

@@ -68,7 +68,7 @@ function escapeHtml(value) {
         .replace(/&/g, "&")
         .replace(/</g, "&lt;")
         .replace(/>/g, "&gt;")
-        .replace(/\"/g, "&quot;")
+        .replace(/"/g, "&quot;")
         .replace(/'/g, "&#39;");
 }
 

routes/profileRoute.js

@@ -1,6 +1,7 @@
 import { CACHE_TTL_SECONDS, STATUS } from "../config/constants";
 import { fetchSessionProfile, lookupByUsername } from "../services/minecraftApi";
 import { getCachedEntry, setCachedEntry } from "../utils/cache";
+import { buildIdentityPayload, uuidIdKey, uuidNameKey } from "../utils/identity";
 import { badRequest, internalError, jsonResponse, notFound } from "../utils/responses";
 import {
   buildCacheMeta,
@@ -9,14 +10,6 @@ import {
   parseUsernameOrUuid
 } from "../utils/utils";
 
-function uuidNameKey(username) {
-  return `uuid:username:${username.toLowerCase()}`;
-}
-
-function uuidIdKey(uuid) {
-  return `uuid:id:${uuid.toLowerCase()}`;
-}
-
 function decodeTextures(rawProfile) {
   const texturesProperty = rawProfile.properties?.find((property) => property.name === "textures");
   return texturesProperty?.value ? decodeBase64Json(texturesProperty.value) : null;
@@ -44,14 +37,6 @@ function isValidCachedProfile(cached) {
   return Boolean(cached?.payload?.profile?.rawProfile) && typeof cached.cachedAt === "number";
 }
 
-function buildIdentityPayload(id, name, profile) {
-  return {
-    id,
-    name,
-    profile
-  };
-}
-
 async function cacheIdentityPayload(env, payload) {
   await Promise.all([
     setCachedEntry(env, uuidNameKey(payload.name), payload, CACHE_TTL_SECONDS),

routes/uuidRoute.js

@@ -1,17 +1,10 @@
 import { CACHE_TTL_SECONDS, STATUS } from "../config/constants";
 import { getCachedEntry, setCachedEntry } from "../utils/cache";
+import { buildIdentityPayload, uuidIdKey, uuidNameKey } from "../utils/identity";
 import { badRequest, internalError, jsonResponse, notFound } from "../utils/responses";
 import { buildCacheMeta, nowSeconds, parseUsernameOrUuid } from "../utils/utils";
 import { lookupByUsername, lookupByUuid } from "../services/minecraftApi";
 
-function uuidNameKey(username) {
-  return `uuid:username:${username.toLowerCase()}`;
-}
-
-function uuidIdKey(uuid) {
-  return `uuid:id:${uuid.toLowerCase()}`;
-}
-
 function buildResponse(profile, cache) {
   return {
     cache,
@@ -25,14 +18,6 @@ function isValidCachedIdentity(cached) {
   return Boolean(cached?.payload?.id) && Boolean(cached?.payload?.name) && typeof cached.cachedAt === "number";
 }
 
-function buildIdentityPayload(id, name, profile) {
-  return {
-    id,
-    name,
-    profile: profile ?? null
-  };
-}
-
 async function cacheIdentityPayload(env, payload) {
   await Promise.all([
     setCachedEntry(env, uuidNameKey(payload.name), payload, CACHE_TTL_SECONDS),

utils/identity.js

@@ -0,0 +1,15 @@
+export function uuidNameKey(username) {
+  return `uuid:username:${username.toLowerCase()}`;
+}
+
+export function uuidIdKey(uuid) {
+  return `uuid:id:${uuid.toLowerCase()}`;
+}
+
+export function buildIdentityPayload(id, name, profile = null) {
+  return {
+    id,
+    name,
+    profile
+  };
+}