Make timing more lenient

Author: ruelalarcon

cardgame.js

@@ -21,6 +21,10 @@ function sanitizeHtml(str) {
  .replace(/>/g, '>');
 }
 
+async function wait(ms) {
+ return new Promise(resolve => setTimeout(resolve, ms));
+}
+
 // Add card sanitization helper
 function sanitizeCard(card) {
  return {
@@ -47,7 +51,7 @@ app.use(sessionParser);
 
 // In-memory storage (intentionally vulnerable)
 const users = new Map(); // username -> {password, cards}
-const activeConnections = new Map(); // username -> WebSocket
+const activeConnections = new Map(); // username -> Set<WebSocket>
 
 // Card generation utilities
 function generateUniqueCard(username) {
@@ -85,16 +89,20 @@ function checkForDuplication(username) {
 
 // Broadcast active players to all connected clients
 function broadcastActivePlayers() {
+ // Get unique active players
  const activePlayers = Array.from(activeConnections.keys());
  const message = JSON.stringify({
  type: 'activePlayers',
  players: activePlayers.filter(player => isValidUsername(player))
  });
 
- activeConnections.forEach(ws => {
- if (ws.readyState === WebSocket.OPEN) {
- ws.send(message);
- }
+ // Send to all connections
+ activeConnections.forEach((connections, username) => {
+ connections.forEach(ws => {
+ if (ws.readyState === WebSocket.OPEN) {
+ ws.send(message);
+ }
+ });
  });
 }
 
@@ -191,7 +199,13 @@ wss.on('connection', (ws, req) => {
  return;
  }
 
- activeConnections.set(username, ws);
+ // Create a Set for this user's connections if it doesn't exist
+ if (!activeConnections.has(username)) {
+ activeConnections.set(username, new Set());
+ }
+
+ // Add this connection to the user's set of connections
+ activeConnections.get(username).add(ws);
  broadcastActivePlayers();
 
  ws.on('message', (message) => {
@@ -210,7 +224,15 @@ wss.on('connection', (ws, req) => {
  });
 
  ws.on('close', () => {
- activeConnections.delete(username);
+ // Remove this specific connection
+ const userConnections = activeConnections.get(username);
+ if (userConnections) {
+ userConnections.delete(ws);
+ // Only remove the user from activeConnections if they have no connections left
+ if (userConnections.size === 0) {
+ activeConnections.delete(username);
+ }
+ }
  broadcastActivePlayers();
  });
  });
@@ -231,39 +253,48 @@ async function handleGiftCards(username, data, ws) {
  }
 
  // Simulate network delay
- await new Promise(resolve => setTimeout(resolve, 100));
+ await wait(300);
 
  const giftedCards = cardIds
  .map(cardId => fromUser.cards.find(card => card.id === cardId))
  .filter(card => card)
  .map(sanitizeCard);
 
  // Simulate more network delay
- await new Promise(resolve => setTimeout(resolve, 100));
+ await wait(300);
 
  giftedCards.forEach(card => {
  fromUser.cards = fromUser.cards.filter(c => c.id !== card.id);
  });
 
  toUserData.cards.push(...giftedCards);
 
- const fromWs = activeConnections.get(username);
- const toWs = activeConnections.get(toUser);
-
- if (fromWs && fromWs.readyState === WebSocket.OPEN) {
- fromWs.send(JSON.stringify({
- type: 'giftComplete',
- inventory: fromUser.cards.map(sanitizeCard)
- }));
+ // Send updates to all connections for both users
+ const fromConnections = activeConnections.get(username);
+ const toConnections = activeConnections.get(toUser);
+
+ if (fromConnections) {
+ fromConnections.forEach(conn => {
+ if (conn.readyState === WebSocket.OPEN) {
+ conn.send(JSON.stringify({
+ type: 'giftComplete',
+ inventory: fromUser.cards.map(sanitizeCard)
+ }));
+ }
+ });
  }
 
- if (toWs && toWs.readyState === WebSocket.OPEN) {
- toWs.send(JSON.stringify({
- type: 'giftReceived',
- from: sanitizeHtml(username),
- cards: giftedCards,
- inventory: toUserData.cards.map(sanitizeCard)
- }));
+ if (toConnections) {
+ toConnections.forEach(conn => {
+ if (conn.readyState === WebSocket.OPEN) {
+ conn.send(JSON.stringify({
+ type: 'giftReceived',
+ from: sanitizeHtml(username),
+ cards: giftedCards,
+ inventory: toUserData.cards.map(sanitizeCard)
+ }));
+ }
+ });
  }
 }