Update rooms.ts for numeric player IDs

- Changed Player.id from string to number - Removed name field from Player interface - Updated publicRoom to not expose name field - Players are now identified by numeric IDs only
Remove player names, use numeric IDs
2026-04-08 18:48:07 -05:00 · 2026-04-08 18:47:43 -05:00
4 changed files with 46 additions and 38 deletions
--- a/src/public/index.html
+++ b/src/public/index.html
@@ -50,12 +50,16 @@
        <div class="land-card">
          <div class="land-card-icon">⬜</div>
          <h2>// JOIN A SESSION</h2>
-          <p>Enter a room code to join an existing session. You'll be assigned a numeric ID.</p>
+          <p>Enter a room code and your name to join an existing session.</p>
          <div class="field">
            <label>ROOM CODE</label>
            <input id="ji-code" maxlength="8" placeholder="XXXXXX" style="letter-spacing:5px;text-transform:uppercase;font-size:20px;"
              oninput="this.value=this.value.toUpperCase()" />
          </div>
+          <div class="field">
+            <label>YOUR NAME</label>
+            <input id="ji-name" maxlength="24" placeholder="Enter name…" />
+          </div>
          <button class="btn btn-g btn-full" onclick="joinRoom()">JOIN ROOM →</button>
        </div>
      </div>
--- a/src/public/script.js
+++ b/src/public/script.js
@@ -45,7 +45,7 @@ function schedReconn(){
    const d=Math.min(8000,500*Math.pow(1.5,reconnAttempts++));
    reconnTimer=setTimeout(()=>{
        if(role==='mod'){const m=loadMod();if(m)connect(()=>ws_send({type:'mod_rejoin',roomId:m.id,modSecret:m.s}));}
-        else if(role==='player'&&myId){const p=loadPlay();if(p)connect(()=>ws_send({type:'join_room',roomId:p.rid,playerName:p.name,playerId:p.pid}));}
+        else if(role==='player'&&myId){const p=loadPlay();if(p)connect(()=>ws_send({type:'join_room',roomId:p.rid,playerId:p.pid}));}
        else connect(null);
    },d);
 }
@@ -172,7 +172,8 @@ function goSetup(){renderSetupTeamNames();showScr('s-setup');}
 function joinRoom(){
    const code=document.getElementById('ji-code').value.trim().toUpperCase();
    if(!code){toast('Enter room code','err');return;}
-    connect(()=>ws_send({type:'join_room',roomId:code}));
+    const autoId=Math.floor(Math.random()*99999999)+1;
+    connect(()=>ws_send({type:'join_room',roomId:code,playerId:autoId}));
 }
 function openRejoin(){
    const m=loadMod();if(!m)return;
@@ -409,7 +410,7 @@ function renderModPlayerList(){
        row.className='pl-row'+(p.isConnected?'':' offline');
        row.innerHTML=`
          <div class="pl-info" style="flex:1;min-width:0;">
-            <div class="pl-name">${esc(p.name)} ${p.isConnected?'':`<span class="tag tag-red" style="font-size:9px;padding:2px 6px;">OFFLINE</span>`}</div>
+            <div class="pl-name">${esc(p.name)} <span class="tag tag-y" style="font-size:12px;padding:3px 8px;background:rgba(249,226,175,0.15);color:var(--yellow);border:none;">#${p.playerId}</span> ${p.isConnected?'':`<span class="tag tag-red" style="font-size:9px;padding:2px 6px;">OFFLINE</span>`}</div>
            ${teamName?`<div class="pl-meta" style="color:${color}">${esc(teamName)}</div>`:'<div class="pl-meta">No team</div>'}
            ${teamSel}
          </div>
@@ -435,7 +436,7 @@ function renderModTeams(){
        card.innerHTML=`
          <div class="tc-n" style="color:${color}">${esc(name)}</div>
          <div class="tc-c" style="color:${color}">${members.length}</div>
-          <div class="tc-m">${members.map(p=>esc(p.name)).join('<br>')||'—'}</div>
+          <div class="tc-m">${members.map(p=>`#${p.playerId}`).join('<br>')||'—'}</div>
        `;
        grid.appendChild(card);
        if(typeof gsap!=='undefined'){
@@ -525,7 +526,7 @@ function renderPlayer(){
    if(!room)return;
    document.getElementById('p-code').textContent=room.id;
    const me=room.players.find(p=>p.id===myId);
-    document.getElementById('p-namelbl').textContent=me?.name??'';
+    document.getElementById('p-namelbl').textContent=`#${me?.playerId||'?'}`;
    renderTeamPicker();
    renderPlayerBuzzer();
    renderRoster();
@@ -624,7 +625,7 @@ function renderRoster(){
        row.className='roster-row'+(isMe?' roster-me':'');
        row.innerHTML=`
          <div class="roster-dot" style="background:${p.isConnected?(isMe?'var(--g)':color):'var(--border2)'}"></div>
-          <div style="flex:1">${esc(p.name)}${isMe?' <span style="font-size:11px;color:var(--dim);letter-spacing:1px;">(YOU)</span>':''}</div>
+          <div style="flex:1">${esc(p.name)} ${isMe?`<span style="font-size:11px;color:var(--dim);letter-spacing:1px;">(#${p.playerId}) (YOU)</span>`:''}</div>
          ${teamName?`<div style="font-size:12px;color:${color};letter-spacing:0.5px;">${esc(teamName)}</div>`:''}
        `;
        el.appendChild(row);
@@ -636,10 +637,11 @@ function addFeed(evt){
    const isFirst=evt.buzzOrder?.[0]===evt.playerId;
    const color=evt.teamIndex!==null?teamColor(evt.teamIndex):'var(--g)';
    const teamStr=(room?.settings.mode==='teams'&&evt.teamIndex!==null)?` [${esc(room.settings.teamNames[evt.teamIndex]??'')}]`:'';
+    const playerStr=`#${evt.playerId}`;
    const div=document.createElement('div');
    div.className='feed-entry'+(isFirst?' first':'');
    div.style.borderLeftColor=isFirst?'var(--yellow)':color;
-    div.innerHTML=`<strong>${esc(evt.playerName)}</strong>${teamStr} buzzed${isFirst?' <span style="color:var(--yellow);font-weight:700;"> — FIRST!</span>':''}`;
+    div.innerHTML=`<strong>${playerStr}</strong>${teamStr} buzzed${isFirst?' <span style="color:var(--yellow);font-weight:700;"> — FIRST!</span>':''}`;
    feed.prepend(div);
    if(typeof gsap!=='undefined'){
        gsap.fromTo(div,
--- a/src/rooms.ts
+++ b/src/rooms.ts
@@ -11,11 +11,10 @@ export interface RoomSettings {
 }

 export interface Player {
-  id: string;
-  name: string;
-  teamIndex: number | null;
-  ws: ServerWebSocket<unknown> | null;
-  isConnected: boolean;
+    id: number;
+    teamIndex: number | null;
+    ws: ServerWebSocket<unknown> | null;
+    isConnected: boolean;
 }

 export interface BuzzerState {
@@ -69,23 +68,22 @@ export function freshBuzzer(): BuzzerState {
 }

 export function publicRoom(room: Room) {
-  return {
-    id:          room.id,
-    settings:    room.settings,
-    locked:      room.locked,
-    teamLocked:  room.teamLocked,
-    modOnline:   room.modWs !== null,
-    buzzerState: {
-      roundOpen: room.buzzerState.roundOpen,
-      buzzOrder: room.buzzerState.buzzOrder,
-    },
-    players: Array.from(room.players.values()).map(p => ({
-      id:          p.id,
-      name:        p.name,
-      teamIndex:   p.teamIndex,
-      isConnected: p.isConnected,
-    })),
-  };
+    return {
+        id:          room.id,
+        settings:    room.settings,
+        locked:      room.locked,
+        teamLocked:  room.teamLocked,
+        modOnline:   room.modWs !== null,
+        buzzerState: {
+            roundOpen: room.buzzerState.roundOpen,
+            buzzOrder: room.buzzerState.buzzOrder,
+        },
+        players: Array.from(room.players.values()).map(p => ({
+            id:          p.id,
+            teamIndex:   p.teamIndex,
+            isConnected: p.isConnected,
+        })),
+    };
 }

 export function broadcast(room: Room, msg: object, exclude?: ServerWebSocket<unknown>) {
--- a/src/ws-handler.ts
+++ b/src/ws-handler.ts
@@ -2,7 +2,7 @@ import type { ServerWebSocket } from "bun";
 import {
  rooms, wsToPlayer,
  Room, Player,
-  genId, greekName, sanitize, freshBuzzer, publicRoom, broadcast, toMod,
+  sanitize, freshBuzzer, publicRoom, broadcast, toMod,
 } from "./rooms";

 type WS = ServerWebSocket<unknown>;
@@ -65,15 +65,19 @@ export function handleMessage(ws: WS, raw: string) {
    if (!room) { er(ws, "Room not found"); return; }
    if (room.locked) { er(ws, "Room is locked"); return; }

-    const name = sanitize(msg.playerName ?? "Player", 24) || "Player";
    const existingId = sanitize(msg.playerId ?? "", 12);
    let player: Player | undefined;

-    if (existingId && room.players.has(existingId)) {
-      player = room.players.get(existingId)!;
-      player.ws = ws; player.isConnected = true; player.name = name;
+    if (existingId && existingId.match(/^\d+$/)) {
+      if (room.players.has(existingId)) {
+        player = room.players.get(existingId)!;
+        player.ws = ws; player.isConnected = true;
+      } else {
+        er(ws, "Invalid player ID"); return;
+      }
    } else {
-      player = { id: genId(), name, teamIndex: null, ws, isConnected: true };
+      const autoId = Math.floor(Math.random() * 99999999) + 1;
+      player = { id: autoId, teamIndex: null, ws, isConnected: true };
      room.players.set(player.id, player);
    }

@@ -118,8 +122,8 @@ export function handleMessage(ws: WS, raw: string) {
    const p = room.players.get(ctx.playerId)!;
    const pubOrder = room.settings.showBuzzOrder ? bz.buzzOrder : [bz.buzzOrder[0]];

-    broadcast(room, { type: "buzz_event", playerId: ctx.playerId, playerName: p.name, teamIndex: p.teamIndex, buzzOrder: pubOrder, room: publicRoom(room) });
-    toMod(room,     { type: "buzz_event", playerId: ctx.playerId, playerName: p.name, teamIndex: p.teamIndex, buzzOrder: bz.buzzOrder, buzzTimes: Object.fromEntries(bz.buzzTimes), room: publicRoom(room) });
+    broadcast(room, { type: "buzz_event", playerId: ctx.playerId, teamIndex: p.teamIndex, buzzOrder: pubOrder, room: publicRoom(room) });
+    toMod(room,     { type: "buzz_event", playerId: ctx.playerId, teamIndex: p.teamIndex, buzzOrder: bz.buzzOrder, buzzTimes: Object.fromEntries(bz.buzzTimes), room: publicRoom(room) });
    return;
  }