changes

src/controllers/tanksController.js

@@ -5896,83 +5896,76 @@ exports.getBlockData = async (req, reply) => {
 const mqtt = require('mqtt');
 require('dotenv').config();
 
-// **Persistent MQTT Connection**
-const client = mqtt.connect('mqtt://35.207.198.4:1883', {
-  clientId: `mqtt_server_${Math.random().toString(16).substr(2, 8)}`,
-  clean: false, // Ensures MQTT retains subscriptions
+const activeClients = new Map(); // Store active clients per hw_Id
+
+// Start a persistent temp client to listen for multiple devices
+const tempClientId = `mqtt_temp_${Math.random().toString(16).substr(2, 8)}`;
+const tempClient = connectMQTT(tempClientId, true);
+
+// Function to create an MQTT client
+function connectMQTT(clientId, isTemp = false, hw_Id = null) {
+  console.log(`🔄 Connecting to MQTT with clientId: ${clientId}`);
+
+  const newClient = mqtt.connect('mqtt://35.207.198.4:1883', {
+    clientId,
+    clean: false, // Ensures session persistence
     reconnectPeriod: 2000, // Reconnect every 2 seconds
+    keepalive: 60, // Maintain connection
   });
 
-const subscribedTopics = new Set();
-const activeDevices = new Set(); // Keep track of active devices
-
-client.on('connect', () => {
-  console.log('✅ Connected to MQTT broker');
+  newClient.on('connect', () => {
+    console.log(`✅ Connected to MQTT broker as ${clientId}`);
 
-  // **Ensure re-subscriptions after reconnect**
-  subscribedTopics.forEach(topic => {
-    client.subscribe(topic, { qos: 1 }, (err) => {
+    if (isTemp) {
+      // Temporary client listens for multiple device announcements
+      newClient.subscribe('water/iot-data/announce', { qos: 1 }, (err) => {
         if (err) {
-        console.error(`❌ Error resubscribing to ${topic}:`, err);
+          console.error('❌ Error subscribing to announcement topic:', err);
         } else {
-        console.log(`🔄 Resubscribed to ${topic}`);
+          console.log('📡 Subscribed to water/iot-data/announce');
         }
       });
-  });
-
-  // **Subscribe to new device announcements**
-  client.subscribe('water/iot-data/announce', { qos: 1 }, (err) => {
+    } else if (hw_Id) {
+      // If this is the actual device client, subscribe to its topic
+      const deviceTopic = `water/iot-data/${hw_Id}`;
+      newClient.subscribe(deviceTopic, { qos: 1 }, (err) => {
         if (err) {
-      console.error('❌ Error subscribing to announcement topic:', err);
+          console.error(`❌ Error subscribing to ${deviceTopic}:`, err);
         } else {
-      console.log('📡 Subscribed to water/iot-data/announce');
+          console.log(`✅ Subscribed to ${deviceTopic}`);
+          logActiveClients(); // Log clients after each new device connects
         }
       });
+    }
   });
 
-client.on('message', async (topic, message) => {
+  newClient.on('message', async (topic, message) => {
     console.log(`📩 Message received on topic ${topic}: ${message.toString()}`);
 
     try {
       const data = JSON.parse(message.toString());
 
-    // **Handle device announcements**
-    if (topic === 'water/iot-data/announce') {
+      if (topic === 'water/iot-data/announce' && isTemp) {
         if (!data.objects || !data.objects.hw_Id) {
           console.error("❌ Invalid announcement format. Missing hw_Id.");
           return;
         }
 
         const hw_Id = data.objects.hw_Id;
-      const deviceTopic = `water/iot-data/${hw_Id}`;
-
-      if (!subscribedTopics.has(deviceTopic)) {
-        client.subscribe(deviceTopic, { qos: 1 }, (err) => {
-          if (err) {
-            console.error(`❌ Error subscribing to ${deviceTopic}:`, err);
-          } else {
-            console.log(`✅ Subscribed to ${deviceTopic}`);
-            subscribedTopics.add(deviceTopic);
-            activeDevices.add(hw_Id);
-            console.log('📡 Active Devices:', Array.from(activeDevices));
+        console.log(`🔄 New Device Found! hw_Id: ${hw_Id}`);
 
-            // ✅ **Now also process data**
-            processIotData(hw_Id, data);
+        // If this device hasn't been connected yet, create a client for it
+        if (!activeClients.has(hw_Id)) {
+          console.log(`🔄 Creating new MQTT client for hw_Id: ${hw_Id}`);
+          activeClients.set(hw_Id, connectMQTT(`mqtt_client_${hw_Id}`, false, hw_Id));
         }
-        });
-      } else {
-        console.log(`🔄 Already subscribed to ${deviceTopic}, processing data.`);
-        processIotData(hw_Id, data);
-      }
-      return;
       }
 
-    // **Process IoT Data for device topics**
       if (topic.startsWith('water/iot-data/')) {
         setImmediate(() => {
-        console.log(`🚀 Entering processIotData() for topic: ${topic}`);
-        const hw_Id = topic.split('/')[2];
-        processIotData(hw_Id, data);
+          console.log(`🚀 Processing IoT Data for topic: ${topic}`);
+          const deviceHwId = topic.split('/')[2];
+          processIotData(deviceHwId, data);
         });
       }
     } catch (err) {
@@ -5980,9 +5973,21 @@ client.on('message', async (topic, message) => {
     }
   });
 
-client.on('error', (err) => console.error('❌ MQTT Error:', err));
-client.on('close', () => console.log('⚠️ MQTT Connection Closed.'));
-client.on('offline', () => console.log('⚠️ MQTT Broker Offline.'));
+  newClient.on('error', (err) => console.error('❌ MQTT Error:', err));
+  newClient.on('close', () => console.log(`⚠️ MQTT Connection Closed for ${clientId}`));
+  newClient.on('offline', () => console.log(`⚠️ MQTT Broker Offline for ${clientId}`));
+
+  return newClient;
+}
+
+// Function to log active MQTT clients
+function logActiveClients() {
+  console.log(`\n📡 Active MQTT Clients:`);
+  activeClients.forEach((client, hw_Id) => {
+    console.log(`   🔹 Client ID: mqtt_client_${hw_Id}`);
+  });
+}
+
 
 async function processIotData(hw_Id, data) {
   try {
@@ -6098,14 +6103,14 @@ async function processIotData(hw_Id, data) {
 }
 
 
-function logSets() {
-  console.log("Subscribed Topics:", Array.from(subscribedTopics));
-  console.log("Active Devices:", Array.from(activeDevices));
-  console.log("motorIntervals:", motorIntervals);
-}
+// function logSets() {
+//   console.log("Subscribed Topics:", Array.from(subscribedTopics));
+//   console.log("Active Devices:", Array.from(activeDevices));
+//   console.log("motorIntervals:", motorIntervals);
+// }
 
-// Call logSets every 30 seconds
-setInterval(logSets, 30000);
+// // Call logSets every 30 seconds
+// setInterval(logSets, 30000);