mqtt-devices-parser 1.0.7 → 1.0.9

package/Changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.0.9
+	- Adds method to delete logs older than 1 week
+
+## 1.0.8
+	- removes port from link to update fw devices
+	- fixes fw_version comparison
+
 ## 1.0.7
 	- config/index: changes local IP
 	- src/db/firmware: changes query to get latest fw release

package/index.js

@@ -41,6 +41,11 @@ var self = module.exports = {
       console.log("mqtt connecting..")
       mqtt_connect();
 
+      setInterval(async ()=>{
+        await $.device.deleteLogs();
+      },60*60*1000);
+      
+
       return resolve();
     })
   },

package/package.json

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

package/src/db/data.js

@@ -191,6 +191,56 @@ var self = module.exports = {
 			}
 		}
 
+	    return resolve();
+	  });
+	},
+
+	deleteLogs : async (table, deviceId, topic, payload)=>{
+
+	  return new Promise((resolve,reject) => {
+
+		let db_columns = $.models.get(table);
+		if(db_columns == null)
+			return resolve();
+
+		$.db.delete(table,{id:0})
+		let index = topic.indexOf("/");
+
+		if(index > -1){ // check if topic has subtopics
+			let key = topic.substring(0,index);
+			topic = topic.substring(index+1);
+
+			if(db_columns.hasOwnProperty(key)){ // check if db has a column for this key
+			  // create JSON struct with the remaining topic
+			  // key is the column
+
+			  // build object with the remaining topic and respective data
+			  if(typeof data === "object")
+			    obj[key] = JSON.stringify(parser.pathIntoObject(topic,JSON.stringify(data)))
+			  else
+			    obj[key] = JSON.stringify(parser.pathIntoObject(topic,data));
+
+			  obj['device_id'] = deviceId;
+			  obj['createdAt'] = moment().utc().format('YYYY-MM-DD HH:mm:ss');
+			  $.db.insert(table,obj)
+
+			}
+		}else{
+
+			let key = topic;
+			if(db_columns.hasOwnProperty(key)){ // check if db has a column for this key
+			  // build object with respective data
+			  if(typeof data === "object")
+			    obj[key] = JSON.stringify(data);
+			  else
+			    obj[key] = data;
+
+			  obj['device_id'] = deviceId;
+			  obj['createdAt'] = moment().utc().format('YYYY-MM-DD HH:mm:ss');
+			  $.db.insert(table,obj);
+			}
+		}
+
 	    return resolve();
 	  });
 	}

package/src/db/db.js

@@ -264,6 +264,59 @@ var self = module.exports = {
     });
   },
 
+  getTables : async()=>{
+
+    return new Promise((resolve,reject) => {
+
+      self.getConnection((err,conn)=>{
+        if(err) return reject(err);
+
+        let query = "SHOW TABLES;"
+
+        conn.query(query,function(err,rows){
+          self.close_db_connection(conn);
+          if(err) return reject(err)
+          else return resolve(rows);
+        });
+      });
+    });
+  },
+
+  deleteOldEntries : async(table,filter)=>{
+
+    return new Promise((resolve,reject) => {
+
+      self.getConnection((err,conn)=>{
+        if(err) return reject(err);
+
+        let query = "";
+        if(typeof filter === "object"){
+          let values = [];
+          query = `DELETE FROM ?? WHERE `;
+          values.push(table);
+          for (let key in filter){
+            if(key == "createdAt"){
+              query += "createdAt < ?";
+            }else if(key = "id")
+              query += "id < ?"
+            else 
+              return reject("key not supported");
+            values.push(filter[key]);
+          }
+          query = mysql.format(query,values);
+        }else{
+          return reject("filter passed is not an object");
+        }
+
+        conn.query(query,function(err,rows){
+          self.close_db_connection(conn);
+          if(err) return reject(err)
+          else return resolve(rows);
+        });
+      });
+    });
+  },
+
   getFieldFromDeviceId : async (table,deviceId,field)=>{
 
     return new Promise((resolve,reject) => {

package/src/device/device.js

@@ -1,3 +1,4 @@
+const moment = require('moment');
 
 var project = [];
 const logs_table = "sensor_logs";
@@ -31,6 +32,25 @@ var self = module.exports = {
 
   },
 
+  deleteLogs : async()=>{
+
+    let tables = await $.db.getTables();
+    // Define one week in milliseconds
+    // Loop through each table
+    for (const tableObj of tables) {
+      const tableName = tableObj['Tables_in_mqtt-aedes']
+      const oneWeekAgo = moment().utc().subtract(7, 'days').format('YYYY-MM-DD HH:mm:ss');
+      if(tableName.startsWith("logs_")){
+        const uptimeSeconds = Math.floor(process.uptime());
+        console.log(`deleting logs of table ${tableName} older than ${oneWeekAgo}"`);
+        await $.db.deleteOldEntries(tableName, { createdAt: oneWeekAgo });
+        time = Math.floor(process.uptime()) - uptimeSeconds;
+        console.log(`Logs of table ${tableName} deleted in ${time}s`);
+      }
+    }
+
+  },
+
   parseMessage : async (client,topic,payload,retain)=>{
 
     let topic_bck = topic;
@@ -84,7 +104,7 @@ var self = module.exports = {
         await $.db_device.updateTech(uid,payload);
       }else if(topic.endsWith("fw_version")){
         let fw_version = await $.db.getFieldFromDeviceId(project_name,device.id,"fw_version");
-        if(fw_version == payload)
+        if(fw_version != payload)
           await $.db_data.update(project_name,device.id,"fota_tries",1); // ! 0 is not working..
       }else if(topic.endsWith("app_version")){
         let app_version = await $.db.getFieldFromDeviceId(project_name,device.id,"app_version");
@@ -110,7 +130,7 @@ var self = module.exports = {
           return;
 
         let mqtt_prefix = `${project_name}/${uid}`;
-        let link = `${$.config.web.protocol}${$.config.web.domain}:${$.config.web.port}${$.config.web.fw_path}${new_firmware.filename}/download?token=${new_firmware.token}`;
+        let link = `${$.config.web.protocol}${$.config.web.domain}${$.config.web.fw_path}${new_firmware.filename}/download?token=${new_firmware.token}`;
 
         if(new_firmware != null && semver.lt(fw_version, new_firmware.fw_version)) {
           console.log(`updating firmware of ${uid} to ${new_firmware.fw_version}`);
@@ -141,3 +161,6 @@ var self = module.exports = {
   },
 
 }
+
+
+