refactor: update WebSocket server setup and improve session handling

docker-compose.yml

@@ -182,6 +182,6 @@ services:
 
 networks:
   meb-public:
-    external: true
+    internal: true
   meb-private:
-    external: true
+    internal: true

realtime/src/index.js

@@ -16,8 +16,6 @@ app.use((req, res, next) => {
     next();
 });
 
-require('./socket');
-
 app.get('/', (req, res) => {
     res.redirect('/health');
 });
@@ -81,6 +79,8 @@ const server = app.listen(3000, '0.0.0.0', async () => {
     await require('./helper/authdb').initDB();
 });
 
+require('./socket')(server);
+
 const wss = new WebSocket.Server({ server, path: '/live' });
 
 wss.on('connection', (client) => {

realtime/src/socket.js

@@ -5,8 +5,12 @@ const tokenStore = require('./helper/tokenStore');
 const redisHelper = require('./helper/redis');
 const influxWriter = require('./helper/influxWriter');
 
-const ws = new WebSocket.Server({
+module.exports = function setupSensorWebSocket(server) {
-    port: 3000,
+    const wsPath = process.env.SENSOR_WS_PATH || '/sensor';
+
+    const ws = new WebSocket.Server({
+        server,
+        path: wsPath,
         perMessageDeflate: false,
         verifyClient: async (info, callback) => {
             const { query } = url.parse(info.req.url, true);
@@ -28,15 +32,14 @@ const ws = new WebSocket.Server({
                 callback(false, 500, `internal server error: ${error}`);
             }
         }
-});
+    });
 
-ws.on('connection', async (client, req) => {
+    ws.on('connection', async (client, req) => {
         const session = req.sensorSession;
         const sensorId = session.sensorId;
 
         client.sensorId = sensorId;
 
-    // Registra la sessione su Redis
         try {
             await redisHelper.setSession(sensorId, {
                 ...session.metadata,
@@ -46,50 +49,28 @@ ws.on('connection', async (client, req) => {
             console.error(`[WS] Redis setSession error for ${sensorId}:`, err);
         }
 
-    /**
-     * Gestione messaggi in arrivo dal sensore.
-     * 
-     * Il sensore invia dati codificati in MessagePack (binario).
-     * Il formato atteso è un array compatto (per risparmiare spazio):
-     * 
-     *   [timestamp, measurement, { field1: value1, field2: value2, ... }]
-     * 
-     * Esempio pratico (dati meteo da barca):
-     *   [1710681000, "weather", { t: 22.5, h: 65, p: 1013.2, w: 12.3 }]
-     * 
-     * Dove le chiavi abbreviate sono:
-     *   t = temperature, h = humidity, p = pressure, w = windSpeed ...
-     * 
-     * Il server decodifica il messaggio e prepara il punto per InfluxDB.
-     */
         client.on('message', async (raw) => {
             try {
                 const msg = decode(raw);
 
-            // Rispondi con ACK minimale in msgpack: { a: 1 } = acknowledged
                 client.send(encode({ a: 1 }));
 
                 const [timestamp, measurement, fields] = msg;
 
-            // Pubblica su Redis per i watchers live
                 redisHelper.publishSensorData(sensorId, { timestamp, measurement, fields });
 
-            // Controlla se ci sono watchers attivi
                 const watchers = await redisHelper.getWatcherCount(sensorId);
 
                 if (measurement === 'forecast_batch') {
                     influxWriter.writeForecastBatch(sensorId, fields);
                 } else if (watchers > 0) {
-                // Con watchers: accumula nel buffer, flusha ogni 10 punti
                     influxWriter.bufferPoint(sensorId, timestamp, measurement, fields);
                 } else {
-                // Senza watchers: scrivi immediatamente (comportamento originale)
                     influxWriter.writePoint(sensorId, timestamp, measurement, fields);
                 }
 
             } catch (err) {
                 console.error(`[WS|${sensorId}] decode error:`, err);
-            // Rispondi con errore in msgpack: { e: 1 } = error
                 client.send(encode({ e: 1 }));
             }
         });
@@ -105,6 +86,9 @@ ws.on('connection', async (client, req) => {
                 console.error(`[WS] Redis deleteSession error for ${sensorId}:`, err);
             }
         });
-});
+    });
 
-console.log(`[WS] Realtime websocket server`);
+    console.log(`[WS] Sensor websocket server ready on ${wsPath}`);
+
+    return ws;
+};