aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2026-10-31 22:02:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor: keep each socket client's slot data together

Browse source 
clientMap[], connectedAt[] and lastPing[] were parallel arrays indexed by
the same slot.  They are now one ws_slot_t per slot.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
cjkas 2026-10-13 15:13:43 +02:00
parent bb6c929bf8
commit e15793be99
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/Sockets.cpp
View file

@ -21,29 +21,32 @@ AsyncWebServer wsServer(8080);
AsyncWebSocket ws("/"); AsyncWebSocket ws("/");
#define MAX_WS_CLIENTS 5 #define MAX_WS_CLIENTS 5
static uint32_t clientMap[MAX_WS_CLIENTS] = {0,0,0,0,0}; struct ws_slot_t {
// When each slot connected and last saw a ping, so the logs show how long a uint32_t asyncId; // 0 when the slot is free.
// client stayed and how far apart its pings arrived. // When the client connected and last pinged, so the logs show how long it
static uint32_t connectedAt[MAX_WS_CLIENTS] = {0,0,0,0,0}; // stayed and how far apart its pings arrived.
static uint32_t lastPing[MAX_WS_CLIENTS] = {0,0,0,0,0}; uint32_t connectedAt;
uint32_t lastPing;
};
static ws_slot_t slots[MAX_WS_CLIENTS] = {};
static uint8_t mapClientId(uint32_t asyncId) { static uint8_t mapClientId(uint32_t asyncId) {
for(uint8_t i = 0; i < MAX_WS_CLIENTS; i++) for(uint8_t i = 0; i < MAX_WS_CLIENTS; i++)
if(clientMap[i] == asyncId) return i; if(slots[i].asyncId == asyncId) return i;
return 255; return 255;
} }
static uint32_t getAsyncId(uint8_t slot) { static uint32_t getAsyncId(uint8_t slot) {
if(slot < MAX_WS_CLIENTS) return clientMap[slot]; if(slot < MAX_WS_CLIENTS) return slots[slot].asyncId;
return 0; return 0;
} }
static uint8_t addClient(uint32_t asyncId) { static uint8_t addClient(uint32_t asyncId) {
for(uint8_t i = 0; i < MAX_WS_CLIENTS; i++) { for(uint8_t i = 0; i < MAX_WS_CLIENTS; i++) {
if(clientMap[i] == 0) { clientMap[i] = asyncId; return i; } if(slots[i].asyncId == 0) { slots[i].asyncId = asyncId; return i; }
} }
return 255; return 255;
} }
static void removeClient(uint32_t asyncId) { static void removeClient(uint32_t asyncId) {
for(uint8_t i = 0; i < MAX_WS_CLIENTS; i++) for(uint8_t i = 0; i < MAX_WS_CLIENTS; i++)
if(clientMap[i] == asyncId) clientMap[i] = 0; if(slots[i].asyncId == asyncId) slots[i].asyncId = 0;
} }
#define MAX_SOCK_RESPONSE 2048 #define MAX_SOCK_RESPONSE 2048
@ -171,11 +174,11 @@ void SocketEmitter::end() {
wsServer.end(); wsServer.end();
for(uint8_t i = 0; i < SOCK_MAX_ROOMS; i++) for(uint8_t i = 0; i < SOCK_MAX_ROOMS; i++)
this->rooms[i].clear(); this->rooms[i].clear();
memset(clientMap, 0, sizeof(clientMap)); memset(slots, 0, sizeof(slots));
} }
void SocketEmitter::disconnect() { void SocketEmitter::disconnect() {
ws.closeAll(); ws.closeAll();
memset(clientMap, 0, sizeof(clientMap)); memset(slots, 0, sizeof(slots));
} }
void SocketEmitter::wsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) { void SocketEmitter::wsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
uint32_t asyncId = client->id(); uint32_t asyncId = client->id();
@ -190,8 +193,8 @@ void SocketEmitter::wsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client
} }
IPAddress ip = client->remoteIP(); IPAddress ip = client->remoteIP();
ESP_LOGI(TAG, "Socket [%lu] Connected from %d.%d.%d.%d (slot %u)", asyncId, ip[0], ip[1], ip[2], ip[3], slot); ESP_LOGI(TAG, "Socket [%lu] Connected from %d.%d.%d.%d (slot %u)", asyncId, ip[0], ip[1], ip[2], ip[3], slot);
connectedAt[slot] = millis(); slots[slot].connectedAt = millis();
lastPing[slot] = 0; slots[slot].lastPing = 0;
client->text("Connected"); client->text("Connected");
client->setCloseClientOnQueueFull(false); client->setCloseClientOnQueueFull(false);
sockEmit.delayInit(slot); sockEmit.delayInit(slot);
@ -202,7 +205,7 @@ void SocketEmitter::wsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client
uint8_t slot = mapClientId(asyncId); uint8_t slot = mapClientId(asyncId);
if(slot != 255) { if(slot != 255) {
ESP_LOGI(TAG, "Socket [%lu] Disconnected (slot %u) after %lums, last ping %lums ago", asyncId, slot, ESP_LOGI(TAG, "Socket [%lu] Disconnected (slot %u) after %lums, last ping %lums ago", asyncId, slot,
(unsigned long)(millis() - connectedAt[slot]), lastPing[slot] ? (unsigned long)(millis() - lastPing[slot]) : 0UL); (unsigned long)(millis() - slots[slot].connectedAt), slots[slot].lastPing ? (unsigned long)(millis() - slots[slot].lastPing) : 0UL);
for(uint8_t i = 0; i < SOCK_MAX_ROOMS; i++) for(uint8_t i = 0; i < SOCK_MAX_ROOMS; i++)
sockEmit.rooms[i].leave(slot); sockEmit.rooms[i].leave(slot);
} }
@ -242,8 +245,8 @@ void SocketEmitter::wsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client
uint8_t slot = mapClientId(asyncId); uint8_t slot = mapClientId(asyncId);
if(slot != 255) { if(slot != 255) {
uint32_t now = millis(); uint32_t now = millis();
if(lastPing[slot]) ESP_LOGD(TAG, "Socket [%lu] ping, %lums since the last", asyncId, (unsigned long)(now - lastPing[slot])); if(slots[slot].lastPing) ESP_LOGD(TAG, "Socket [%lu] ping, %lums since the last", asyncId, (unsigned long)(now - slots[slot].lastPing));
lastPing[slot] = now; slots[slot].lastPing = now;
} }
} }
break; break;