Refactor texture handling and update route structure

Moved sessionserver routes to correct directory and removed subdirectory logic from texture file lookup. Updated texture URLs to remove leading slashes and fixed endpoint concatenation. Added default textures for Alex and Steve.

routes/textures/texture/[hash].js

@@ -9,12 +9,7 @@ const TEXTURES_DIR = path.join(process.cwd(), "data", "textures")
 router.get("/", async (req, res, next) => {
     try {
         const hash = req.params.hash
-        if (!/^[a-f0-9]{64}$/i.test(hash)) {
-            throw new DefaultError(404, "Texture not found")
-        }
-
-        const subDir = hash.substring(0, 2)
-        const filePath = path.join(TEXTURES_DIR, subDir, hash)
+        const filePath = path.join(TEXTURES_DIR, hash)
         if (!fs.existsSync(filePath)) {
             throw new DefaultError(404, "Texture not found")
         }

services/authService.js

@@ -56,7 +56,7 @@ async function authenticate({ identifier, password, clientToken, requireUser })
 
     delete userResult.user.password
 
-    const $clientToken = uuidRegex.test(clientToken) ? clientToken : crypto.randomUUID()
+    const $clientToken = clientToken || crypto.randomUUID()
     const accessToken = jwt.sign({
         uuid: userResult.user.uuid,
         username: userResult.user.username,
@@ -120,7 +120,7 @@ async function refreshToken({ previousAccessToken, clientToken, requireUser }) {
 
     await authRepository.invalidateClientSession(previousAccessToken, clientToken)
 
-    const $clientToken = uuidRegex.test(clientToken) ? clientToken : crypto.randomUUID()
+    const $clientToken = clientToken || crypto.randomUUID()
     const newAccessToken = jwt.sign({
         uuid: userResult.user.uuid,
         username: userResult.user.username,

services/sessionsService.js

@@ -73,12 +73,12 @@ async function getProfile({ uuid, unsigned = false }) {
     const hasValidCape = !!activeCape
 
     const skinNode = hasValidSkin ? {
-        url: (process.env.TEXTURES_ENDPOINTS || `http://localhost:${process.env.WEB_PORT}/textures/`) + activeSkin.url,
+        url: (process.env.TEXTURES_ENDPOINTS || `http://localhost:${process.env.WEB_PORT}/textures`) + activeSkin.url,
         metadata: activeSkin.variant === "SLIM" ? { model: "slim" } : undefined
     } : undefined
 
     const capeNode = hasValidCape ? {
-        url: (process.env.TEXTURES_ENDPOINTS || `http://localhost:${process.env.WEB_PORT}/textures/`) + activeCape.url
+        url: (process.env.TEXTURES_ENDPOINTS || `http://localhost:${process.env.WEB_PORT}/textures`) + activeCape.url
     } : undefined
 
     const texturesObject = {

services/userService.js

@@ -459,7 +459,7 @@ async function uploadSkin(uuid, fileObject, variant) {
             await fs.writeFile(targetPath, buffer)
 
             const newTextureUuid = crypto.randomUUID()
-            const textureUrl = `/texture/${hash}`
+            const textureUrl = `texture/${hash}`
             await userRepository.createTexture(newTextureUuid, hash, 'SKIN', textureUrl, null)
         }