Update index.js

index.js

@@ -1,7 +1,7 @@
 import { createServer } from 'node:http';
 import { randomUUID } from 'node:crypto';
 import { Server } from 'socket.io';
-import { getSpecialCarColorForName, isSpecialCarColor, normalizeDisplayCarColor } from './src/utils/carColors.js';
+import { getSpecialCarColorForName, isSpecialCarColor } from './src/utils/carColors.js';
 import { createRandomSeed } from './src/utils/math.js';
 
 // ==========================================
@@ -183,11 +183,19 @@ const validate = {
   color: (color) => REGEX.PROFILE_COLOR.test(color),
 };
 
-function resolveAuthorizedColor(username, requestedColor) {
+function getReservedColorForUsername(username) {
+  return getSpecialCarColorForName(username, null);
+}
+
+function resolveAuthorizedColor(username, requestedColor, ack) {
   const normalizedRequested = normalize.color(requestedColor || '#8cf4ff');
-  const specialColor = getSpecialCarColorForName(username, null);
-  if (specialColor) return specialColor;
-  if (isSpecialCarColor(normalizedRequested)) return normalizeDisplayCarColor(normalizedRequested);
+  const reservedColor = getReservedColorForUsername(username);
+
+  if (reservedColor) return reservedColor;
+  if (isSpecialCarColor(normalizedRequested)) {
+    reject(ack, 'restricted_color', 'That special color is reserved for specific players.', 'color');
+    return null;
+  }
   return normalizedRequested;
 }
 
@@ -418,10 +426,10 @@ function addSocketToRoom(socket, room, username, color) {
 
 function canRejoinPlayer(player, username, reconnectToken) {
   return Boolean(
-    player
-    && player.disconnected
-    && player.username.toLowerCase() === username.toLowerCase()
-    && player.reconnectToken === reconnectToken
+    player &&
+    player.disconnected &&
+    player.username.toLowerCase() === username.toLowerCase() &&
+    player.reconnectToken === reconnectToken
   );
 }
 
@@ -548,7 +556,8 @@ io.on('connection', (socket) => {
     const requestedColor = normalize.color(payload.color || '#8cf4ff');
 
     if (!validateProfile(roomId, username, requestedColor, ack)) return;
-    const color = resolveAuthorizedColor(username, requestedColor);
+    const color = resolveAuthorizedColor(username, requestedColor, ack);
+    if (!color) return;
     if (rooms.has(roomId)) return reject(ack, 'room_exists', 'Room already exists.', 'roomId');
 
     removeSocketFromRoom(socket.id);
@@ -566,12 +575,12 @@ io.on('connection', (socket) => {
     const reconnectToken = String(payload.reconnectToken || '').trim();
 
     if (!validateProfile(roomId, username, requestedColor, ack)) return;
-    const color = resolveAuthorizedColor(username, requestedColor);
+    const color = resolveAuthorizedColor(username, requestedColor, ack);
+    if (!color) return;
 
     const room = rooms.get(roomId);
     if (!room) return reject(ack, 'room_not_found', 'Room does not exist.', 'roomId');
 
-    // Handle rejoining a match already in progress.
     if (room.status !== ROOM_STATUS.WAITING) {
       const rejoiningPlayerEntry = Array.from(room.players.entries())
         .find(([_, player]) => canRejoinPlayer(player, username, reconnectToken));
@@ -589,7 +598,6 @@ io.on('connection', (socket) => {
       return respond(ack, { ok: true, room: serializeRoom(room), rejoined: true, reconnectToken: rejoiningPlayer.reconnectToken });
     }
 
-    // Normal Join
     if (getActivePlayerCount(room) >= CONFIG.MAX_ROOM_PLAYERS) return reject(ack, 'room_full', 'Room is full.', 'roomId');
     if (isAttrTaken(room, 'username', username)) return reject(ack, 'username_taken', 'Username taken.', 'username');
     if (isAttrTaken(room, 'color', color)) return reject(ack, 'color_taken', 'Color taken.', 'color');
@@ -619,7 +627,8 @@ io.on('connection', (socket) => {
     const requestedColor = normalize.color(payload.color ?? player.color);
 
     if (!validateProfile(room.id, username, requestedColor, ack)) return;
-    const color = resolveAuthorizedColor(username, requestedColor);
+    const color = resolveAuthorizedColor(username, requestedColor, ack);
+    if (!color) return;
     if (isAttrTaken(room, 'username', username, socket.id)) return reject(ack, 'username_taken', 'Username taken.', 'username');
     if (isAttrTaken(room, 'color', color, socket.id)) return reject(ack, 'color_taken', 'Color taken.', 'color');