Nafiul Huda commited on
Commit
c053b8a
·
verified ·
1 Parent(s): 499b20f

Update server.js

Browse files
Files changed (1) hide show
  1. server.js +53 -40
server.js CHANGED
@@ -9,7 +9,6 @@ const io = new Server(server, { cors: { origin: "*" } });
9
 
10
  app.use(express.static('public'));
11
 
12
- // Data files
13
  const DATA_FILE = './data.json';
14
 
15
  // Load data
@@ -32,7 +31,6 @@ function saveData() {
32
  let data = loadData();
33
  const activePlayers = new Map();
34
 
35
- // Get client IP
36
  function getIP(socket) {
37
  return socket.handshake.headers['x-forwarded-for']?.split(',')[0].trim()
38
  || socket.handshake.address
@@ -41,7 +39,6 @@ function getIP(socket) {
41
 
42
  io.on('connection', (socket) => {
43
  const ip = getIP(socket);
44
- console.log(`Connected: ${ip}`);
45
 
46
  // Send current state
47
  socket.emit('init', {
@@ -49,42 +46,50 @@ io.on('connection', (socket) => {
49
  leaderboard: data.leaderboard.slice(0, 10)
50
  });
51
 
52
- // Player joins/updates
53
- socket.on('update', (playerData) => {
54
  const player = {
55
  id: socket.id,
56
  ip: ip,
57
- name: (playerData.name || 'Anon').substring(0, 12),
58
- x: playerData.x,
59
- y: playerData.y,
60
- vy: playerData.vy,
61
- score: playerData.score,
62
- color: playerData.color,
63
- alive: playerData.alive,
64
- facingRight: playerData.facingRight
 
65
  };
66
 
67
  activePlayers.set(socket.id, player);
68
 
69
- // Save progress for this IP
70
- data.players[ip] = {
71
- name: player.name,
72
- score: player.score,
73
- highScore: Math.max(player.score, data.players[ip]?.highScore || 0),
74
- y: player.y,
75
- x: player.x,
76
- color: player.color,
77
- lastSeen: Date.now()
78
- };
 
 
79
  });
80
 
81
- // Game over - save to leaderboard
82
  socket.on('gameover', (finalData) => {
83
  const score = finalData.score || 0;
84
  const name = (finalData.name || 'Anon').substring(0, 12);
85
 
 
 
 
 
 
 
 
86
  if (score > 0) {
87
- // Update leaderboard
88
  const existing = data.leaderboard.find(e => e.ip === ip);
89
  if (existing) {
90
  if (score > existing.score) {
@@ -99,13 +104,6 @@ io.on('connection', (socket) => {
99
  data.leaderboard.sort((a, b) => b.score - a.score);
100
  data.leaderboard = data.leaderboard.slice(0, 50);
101
 
102
- // Clear saved progress
103
- if (data.players[ip]) {
104
- data.players[ip].score = 0;
105
- data.players[ip].y = 0;
106
- data.players[ip].x = 270;
107
- }
108
-
109
  saveData();
110
  io.emit('leaderboard', data.leaderboard.slice(0, 10));
111
  }
@@ -113,28 +111,43 @@ io.on('connection', (socket) => {
113
 
114
  socket.on('disconnect', () => {
115
  activePlayers.delete(socket.id);
116
- saveData();
117
- console.log(`Disconnected: ${ip}`);
118
  });
119
  });
120
 
121
- // Broadcast all players at 30fps (enough for others)
122
  setInterval(() => {
123
- const players = Array.from(activePlayers.values());
 
 
 
 
 
 
 
 
 
 
 
 
 
 
124
  if (players.length > 0) {
125
- io.emit('players', players);
 
126
  }
127
- }, 33);
128
 
129
- // Cleanup old saved players (7 days)
130
  setInterval(() => {
131
  const week = Date.now() - 7 * 24 * 60 * 60 * 1000;
 
132
  for (const ip in data.players) {
133
  if (data.players[ip].lastSeen < week) {
134
  delete data.players[ip];
 
135
  }
136
  }
137
- saveData();
138
  }, 3600000);
139
 
140
  const PORT = process.env.PORT || 7860;
 
9
 
10
  app.use(express.static('public'));
11
 
 
12
  const DATA_FILE = './data.json';
13
 
14
  // Load data
 
31
  let data = loadData();
32
  const activePlayers = new Map();
33
 
 
34
  function getIP(socket) {
35
  return socket.handshake.headers['x-forwarded-for']?.split(',')[0].trim()
36
  || socket.handshake.address
 
39
 
40
  io.on('connection', (socket) => {
41
  const ip = getIP(socket);
 
42
 
43
  // Send current state
44
  socket.emit('init', {
 
46
  leaderboard: data.leaderboard.slice(0, 10)
47
  });
48
 
49
+ socket.on('update', (p) => {
50
+ // We now store velocity for smoother client-side interpolation
51
  const player = {
52
  id: socket.id,
53
  ip: ip,
54
+ name: (p.name || 'Anon').substring(0, 12),
55
+ x: p.x,
56
+ y: p.y,
57
+ vx: p.vx, // Receive velocity
58
+ vy: p.vy, // Receive velocity
59
+ score: p.score,
60
+ color: p.color,
61
+ alive: p.alive,
62
+ facingRight: p.facingRight
63
  };
64
 
65
  activePlayers.set(socket.id, player);
66
 
67
+ // Save progress occasionally or on specific events to reduce disk I/O
68
+ if (Math.random() < 0.05) {
69
+ data.players[ip] = {
70
+ name: player.name,
71
+ score: player.score,
72
+ highScore: Math.max(player.score, data.players[ip]?.highScore || 0),
73
+ y: player.y,
74
+ x: player.x,
75
+ color: player.color,
76
+ lastSeen: Date.now()
77
+ };
78
+ }
79
  });
80
 
 
81
  socket.on('gameover', (finalData) => {
82
  const score = finalData.score || 0;
83
  const name = (finalData.name || 'Anon').substring(0, 12);
84
 
85
+ // Always save high score on death
86
+ if (data.players[ip]) {
87
+ data.players[ip].score = 0;
88
+ data.players[ip].y = 0;
89
+ data.players[ip].lastSeen = Date.now();
90
+ }
91
+
92
  if (score > 0) {
 
93
  const existing = data.leaderboard.find(e => e.ip === ip);
94
  if (existing) {
95
  if (score > existing.score) {
 
104
  data.leaderboard.sort((a, b) => b.score - a.score);
105
  data.leaderboard = data.leaderboard.slice(0, 50);
106
 
 
 
 
 
 
 
 
107
  saveData();
108
  io.emit('leaderboard', data.leaderboard.slice(0, 10));
109
  }
 
111
 
112
  socket.on('disconnect', () => {
113
  activePlayers.delete(socket.id);
 
 
114
  });
115
  });
116
 
117
+ // Broadcast loop - Increased to ~60fps (15ms) for smoother multiplayer
118
  setInterval(() => {
119
+ const players = [];
120
+ for (const [id, p] of activePlayers) {
121
+ // Minify data slightly for bandwidth
122
+ players.push({
123
+ id: id,
124
+ n: p.name,
125
+ x: Math.round(p.x),
126
+ y: Math.round(p.y),
127
+ vx: p.vx, // Send velocity for interpolation
128
+ vy: p.vy,
129
+ c: p.color,
130
+ f: p.facingRight ? 1 : 0
131
+ });
132
+ }
133
+
134
  if (players.length > 0) {
135
+ // volatile emit: if client is lagging, drop packet (prevents TCP holdup)
136
+ io.volatile.emit('players', players);
137
  }
138
+ }, 15);
139
 
140
+ // Cleanup
141
  setInterval(() => {
142
  const week = Date.now() - 7 * 24 * 60 * 60 * 1000;
143
+ let changed = false;
144
  for (const ip in data.players) {
145
  if (data.players[ip].lastSeen < week) {
146
  delete data.players[ip];
147
+ changed = true;
148
  }
149
  }
150
+ if (changed) saveData();
151
  }, 3600000);
152
 
153
  const PORT = process.env.PORT || 7860;