kuba/fm-dx-webserver
1
0
Fork 0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-07-29 16:29:19 +02:00
Code Issues Activity

send time in messages, and also make sure that there are no phantom users (it will happen when a user's connection is suddenly stopped, or their ip changes)

Browse Source
This commit is contained in:
kuba
2026-07-21 20:55:03 +02:00
parent 820e281ac5
commit b670a74bb3
4 changed files with 37 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/datahandler.js
+1 -1
View File
@@ -229,7 +229,7 @@ function handleData(wss, receivedData, rdsWss) {
}).catch((error) => console.log("Error fetching Tx info:", error));
// Send the updated data to the client
const dataToSendJSON = JSON.stringify(dataToSend);
const dataToSendJSON = JSON.stringify({...dataToSend, timestamp: Math.floor(Date.now() / 1000)});
if (currentTime - lastUpdateTime >= updateInterval) {
wss.clients.forEach((client) => client.send(dataToSendJSON));
lastUpdateTime = Date.now();
server/helpers.js
+5 -5
View File
@@ -280,19 +280,19 @@ function resolveDataBuffer(data) {
if (receivedData.length) dataHandler.handleData(wss, receivedData, rdsWss);
}
function kickClient(ipAddress) {
// Find the entry in connectedClients associated with the provided IP address
const targetClient = storage.connectedUsers.find(client => client.ip === ipAddress);
if (targetClient && targetClient.instance) {
// Send a termination message to the client
targetClient.instance.send('KICK');
// Close the WebSocket connection after a short delay to allow the client to receive the message
setTimeout(() => {
targetClient.instance.close();
const index = storage.connectedUsers.indexOf(targetClient);
if (index !== -1) storage.connectedUsers.splice(index, 1);
consoleCmd.logInfo(`Web client kicked (${ipAddress})`);
}, 500);
}, 750);
} else consoleCmd.logInfo(`Kicking client ${ipAddress} failed. No suitable client found.`);
}
server/web.js
+16 -34
View File
@@ -66,20 +66,17 @@ wss.on('connection', (ws, request) => {
// Per-IP limit connection open
if (clientIp) {
const isLocalIp = (clientIp === '127.0.0.1' || clientIp === '::1' || clientIp.startsWith('192.168.') || clientIp.startsWith('10.') || clientIp.startsWith('172.16.'));
if (!isLocalIp) {
if (!ipConnectionCounts.has(clientIp)) ipConnectionCounts.set(clientIp, 0);
const currentCount = ipConnectionCounts.get(clientIp);
if (currentCount >= MAX_CONNECTIONS_PER_IP) {
ws.close(1008, 'Too many open connections from this IP');
const lastLogTime = ipLogTimestamps.get(clientIp) || 0;
const now = Date.now();
if (now - lastLogTime > IP_LOG_INTERVAL_MS) {
logWarn(`Web client \x1b[31mclosed: limit exceeded\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
ipLogTimestamps.set(clientIp, now);
} return;
} ipConnectionCounts.set(clientIp, currentCount + 1);
}
if (!ipConnectionCounts.has(clientIp)) ipConnectionCounts.set(clientIp, 0);
const currentCount = ipConnectionCounts.get(clientIp);
if (currentCount >= MAX_CONNECTIONS_PER_IP) {
ws.close(1008, 'Too many open connections from this IP');
const lastLogTime = ipLogTimestamps.get(clientIp) || 0;
const now = Date.now();
if (now - lastLogTime > IP_LOG_INTERVAL_MS) {
logWarn(`Web client \x1b[31mclosed: limit exceeded\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
ipLogTimestamps.set(clientIp, now);
} return;
} ipConnectionCounts.set(clientIp, currentCount + 1);
}
if(currentUsers >= MAX_USERS) {
@@ -88,10 +85,7 @@ wss.on('connection', (ws, request) => {
return;
}
if (clientIp !== '127.0.0.1' ||
(request.headers && request.headers['origin'] && request.headers['origin'].trim() !== '')) {
currentUsers++;
}
if (clientIp !== '127.0.0.1') currentUsers++;
if (timeoutAntenna) clearTimeout(timeoutAntenna);
@@ -170,24 +164,12 @@ wss.on('connection', (ws, request) => {
ws.on('close', (code) => {
// Per-IP limit connection closed
if (clientIp) {
const isLocalIp = (
clientIp === '127.0.0.1' ||
clientIp === '::1' ||
clientIp.startsWith('192.168.') ||
clientIp.startsWith('10.') ||
clientIp.startsWith('172.16.')
);
if (!isLocalIp) {
const current = ipConnectionCounts.get(clientIp) || 1;
ipConnectionCounts.set(clientIp, Math.max(0, current - 1));
}
const current = ipConnectionCounts.get(clientIp) || 1;
ipConnectionCounts.set(clientIp, Math.max(0, current - 1));
}
if (clientIp !== '127.0.0.1' ||
(request.socket && request.socket.remoteAddress && request.socket.remoteAddress !== '::ffff:127.0.0.1') ||
(request.headers && request.headers['origin'] && request.headers['origin'].trim() !== '')) {
currentUsers--;
} dataHandler.showOnlineUsers(currentUsers);
if (clientIp !== '127.0.0.1') currentUsers--;
dataHandler.showOnlineUsers(currentUsers);
const index = storage.connectedUsers.findIndex(user => user.ip === clientIp);
if (index !== -1) storage.connectedUsers.splice(index, 1);