mqtt-devices-parser 1.0.20 → 1.0.21

package/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.21
+	src/kafka/consumer: fixes parseMessage call
+	improves: logs
+	
 ## 1.0.20
 	Adds Kafka consumer support with optional MQTT message parsing (#5)
 	supports tables for mqtt templates

package/index.js

@@ -47,7 +47,6 @@ var self = module.exports = {
         await $.kafka_consumer.start();
       }
 
-      console.log("mqtt connecting..")
       mqtt_connect();
 
       setInterval(async ()=>{
@@ -133,6 +132,8 @@ var self = module.exports = {
 
 function mqtt_connect(){
 
+  console.log(`[MQTT] connecting to ${$.config.mqtt.host}:${$.config.mqtt.port}..`)
+
   const mqtt_prefix = $.config.mqtt.logs_path+"/"+$.config.mqtt.client;
   let checkFota = null;
   $.mqtt_client = mqtt.connect({
@@ -165,11 +166,21 @@ function mqtt_connect(){
           $.mqtt_client.publish(mqtt_prefix+"/"+project,"deactive",{qos:2,retain:true});
       };
     })
-    console.log(`MQTT connected to: ${$.config.mqtt.host}:${$.config.mqtt.port}`);
-    projects.map( project=>{
-      console.log("subscribing project:",project);
-      $.mqtt_client.subscribe(project+"/#")
-    })
+    console.log(`[MQTT] connected`);
+
+    if (!$.config.kafka.enabled) {
+      projects.map( project=>{
+        console.log("[MQTT] subscribing project:",project);
+        $.mqtt_client.subscribe(project+"/#", (err) => {
+          if(err){
+            console.log("[MQTT] error");
+            console.err(err);
+          }
+          else
+            console.log("[MQTT] subscribed to project:",project);
+        })
+      })
+    }
 
     // Update 'dev' devices at each 5 min 
     checkFota = setInterval(async ()=>{
@@ -189,32 +200,36 @@ function mqtt_connect(){
 
   $.mqtt_client.on("message", (topic, payload, packet) => {
     // Only parse MQTT messages if enabled in configuration
-    if ($.config.mqtt.parseMessages) {
+    if (!$.config.kafka.enabled) {
+
+      console.log(`[MQTT] rx: ${topic.toString()}`);
       // payload is Buffer
       $.device.parseMessage($.mqtt_client,topic.toString(),payload.toString(),packet.retain);
     }
   });
 
   $.mqtt_client.on("reconnect",()=>{
-    console.log("reconnect")
+    console.log("[MQTT] reconnected")
   });
 
   $.mqtt_client.on("close",()=>{
-    console.log("close")
+    console.log("[MQTT] closed")
     checkFota = null;
   });
 
   $.mqtt_client.on("offline",()=>{
-    console.log("offline")
+    console.log("[MQTT] offline")
     checkFota = null;
   });
 
   $.mqtt_client.on("disconnect",(packet)=>{
-    console.log(packet)
+    console.log(`[MQTT] disconnected`);
+    console.log(packet);
     checkFota = null;
   })
 
   $.mqtt_client.on("error",(error)=>{
-    console.log(error)
+    console.log("[MQTT] error");
+    console.err(error)
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mqtt-devices-parser",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/device/device.js

@@ -178,6 +178,7 @@ var self = module.exports = {
             try{
               object = JSON.parse(payload);
             }catch(err){
+              console.log(payload)
               console.log(err);
             }
             if (typeof object === 'object' && object !== null) {

package/src/kafka/consumer.js

@@ -11,11 +11,11 @@ var self = module.exports = {
     return new Promise(async (resolve, reject) => {
       try {
         if (!config.kafka.enabled) {
-          console.log("Kafka consumer is disabled");
+          console.log("[Kafka] consumer is disabled");
           return resolve();
         }
 
-        console.log("Initializing Kafka consumer...");
+        console.log("[Kafka] Initializing consumer...");
 
         // Build Kafka configuration
         const kafkaConfig = {
@@ -62,7 +62,7 @@ var self = module.exports = {
         const topics = projects.map(project => project.toString());
         
         if (topics.length === 0) {
-          console.log("No Kafka topics to subscribe to");
+          console.log("[Kafka] No topics to subscribe to");
           return resolve();
         }
 
@@ -71,11 +71,11 @@ var self = module.exports = {
           fromBeginning: false 
         });
 
-        console.log(`Kafka consumer subscribed to topics: ${topics.join(', ')}`);
+        console.log(`[Kafka] consumer subscribed to topics: ${topics.join(', ')}`);
 
         return resolve();
       } catch (error) {
-        console.error("Failed to initialize Kafka consumer:", error);
+        console.error("[Kafka] Failed to initialize consumer:", error);
         return reject(error);
       }
     });
@@ -87,11 +87,14 @@ var self = module.exports = {
     }
 
     try {
-      console.log("Starting Kafka consumer...");
+      console.log("[Kafka] Starting consumer...");
       running = true;
 
       await consumer.run({
         eachMessage: async ({ topic, partition, message }) => {
+
+          console.log(`[KAFKA] rx: ${message.key.toString()}`);
+
           try {
             let payload = message.value ? message.value.toString() : '';
             const kafkaTopic = topic.toString();
@@ -113,10 +116,13 @@ var self = module.exports = {
 
             try{
               payload = JSON.parse(payload);
-            }catch(error){}
+            }catch(error){
+              console.log(`[KAFKA] error: ${payload}`);
+              console.log(error)
+            }
 
             // Call the device parser with formatted topic
-            await $.device.parseMessage(payload.client.id, formattedTopic, payload.mqtt.payload, payload.mqtt.retain);
+            await $.device.parseMessage(payload.client.id, formattedTopic, JSON.stringify(payload.mqtt.payload), payload.mqtt.retain);
 
           } catch (error) {
             console.error('[Kafka] Error processing message:', {
@@ -129,9 +135,9 @@ var self = module.exports = {
         },
       });
 
-      console.log("Kafka consumer started successfully");
+      console.log("[Kafka] consumer started successfully");
     } catch (error) {
-      console.error("Failed to start Kafka consumer:", error);
+      console.error("[KAFKA] Failed to start consumer:", error);
       running = false;
       throw error;
     }
@@ -143,13 +149,13 @@ var self = module.exports = {
     }
 
     try {
-      console.log("Stopping Kafka consumer...");
+      console.log("[KAFKA] Stopping consumer...");
       running = false;
       await consumer.stop();
       await consumer.disconnect();
-      console.log("Kafka consumer stopped successfully");
+      console.log("[KAFKA] consumer stopped successfully");
     } catch (error) {
-      console.error("Error stopping Kafka consumer:", error);
+      console.error("[KAFKA] Error stopping consumer:", error);
     }
   },