mqtt-devices-parser 1.0.15 → 1.0.17

package/Changelog.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 1.0.17
+	Fix and improve Sensors, checks uid length
+	config/index: When defining a project from here uidPrefix and uidLength must be defined
+	models/logs_sensor.models: removes client_id association
+	models/sensors.models: removes unique and references properties from model_id, adds device_id
+	src/db/db: adds method updateOrInsert
+	src/db/device: adds method getSensorByRef
+	src/db/model: adds method getSensorByRef
+	src/db/project: adds uidPrefix and uidLength properties
+	src/db/sensor: insert: adds fields error and obj
+	src/device/device:
+	 - fixes logs_table
+	 - adds projectOptions
+	 - checks if device.uidLength <= project.uidLength
+	 - looks for sensor ref by device_id first and then by model_id if not found. Insert object, value and error fields
+	 - removes some fota logs
+
+## 1.0.16
+	changes db tables:
+	 - models/devices.models: removes endpoint, adds protocol and psk.
+	 - adds mqtt_password
+
 ## 1.0.15
 	src/device/device: fixes fota for sniffer model
 	changes DB tables:

package/config/index.js

@@ -26,5 +26,9 @@ module.exports = {
   sync_main_tables : process.env.sync_main_tables || true,
   projects: {
     demo : process.env.demo || false,
+  },
+  demo : {
+    uidPrefix: 'uid:',
+    uidLength: 16 // max len for uid
   }
 }

package/models/clients.models.js

@@ -20,6 +20,10 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.STRING,
 			allowNull: true
 		},
+		mqtt_password: {
+			type: DataTypes.STRING(24),
+			allowNull: true
+		},
 		gmail: {
 			type: DataTypes.STRING(64),
 			//unique: true,

package/models/devices.models.js

@@ -59,11 +59,14 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.INTEGER,
 			allowNull: true
 		},
-		endpoint: { // info about protocol communication
-			type: DataTypes.JSON,
+		protocol: { // protocol communication to be used
+			type: DataTypes.STRING,
+			allowNull: false
+		},
+		psk: { // pre shared key
+			type: DataTypes.STRING,
 			allowNull: true
 		},
-
 	},
 	{
 		tableName: 'devices',

package/models/logs_sensor.models.js

@@ -22,16 +22,14 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.STRING,
 			allowNull: true,
 		},
-		cliend_id: {
-			type: DataTypes.INTEGER,
-			unique: false,
+		error: {
+			type: DataTypes.STRING,
+			allowNull: true,
+		},
+		obj: {
+			type: DataTypes.STRING,
 			allowNull: true,
-			references: {
-				model: 'clients',
-				key: 'id'
-			}
 		},
-
 	},
 	{
 		tableName: 'logs_sensor',

package/models/sensors.models.js

@@ -1,14 +1,13 @@
 
 module.exports = (sequelize,DataTypes)=>{
 	return sequelize.define("sensors", {
-		model_id: {
+		model_id: { // reference a model
 			type: DataTypes.INTEGER,
-			unique: false,
-			allowNull: false,
-			references: {
-				model: 'models',
-				key: 'id'
-			}
+			allowNull: true,
+		},
+		device_id: { // reference a device id
+			type: DataTypes.INTEGER,
+			allowNull: true,
 		},
 		active: {
 			type: DataTypes.BOOLEAN,

package/package.json

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

package/src/db/db.js

@@ -144,6 +144,67 @@ var self = module.exports = {
     });
   },
 
+  updateOrInsert: async (table, data, filter) => {
+    return new Promise((resolve, reject) => {
+      self.getConnection((err, conn) => {
+        if (err) return reject(err);
+
+        let updateQuery = "";
+        let updateValues = [];
+
+        if (typeof data === "object") {
+          const keys = Object.keys(data);
+          updateValues = Object.values(data);
+          updateQuery = `UPDATE ?? SET ${keys.map(key => `${key} = ?`).join(', ')}`;
+        } else {
+          self.close_db_connection(conn);
+          return reject("data passed is not an object");
+        }
+
+        if (typeof filter === "object") {
+          const filterKeys = Object.keys(filter);
+          const filterValues = Object.values(filter);
+          updateQuery += ` WHERE ${filterKeys.map(key => `${key} = ?`).join(' AND ')}`;
+          updateValues.push(...filterValues);
+        } else {
+          self.close_db_connection(conn);
+          return reject("filter passed is not an object");
+        }
+
+        updateValues.unshift(table);
+        updateQuery = mysql.format(updateQuery, updateValues);
+
+        conn.query(updateQuery, function (err, rows) {
+          if (err) {
+            self.close_db_connection(conn);
+            return reject(err);
+          }
+          // If affectedRows = 0, do an insert
+          if (rows.affectedRows === 0) {
+            // Combine data and filter for insert
+            const insertObj = { ...filter, ...data }; // filter first, data overrides on conflict
+            const insertKeys = Object.keys(insertObj);
+            const insertValues = Object.values(insertObj);
+
+            const insertQuery = mysql.format(
+              `INSERT INTO ?? (${insertKeys.map(() => '??').join(', ')}) VALUES (${insertKeys.map(() => '?').join(', ')})`,
+              [table, ...insertKeys, ...insertValues]
+            );
+
+            conn.query(insertQuery, function (insertErr, insertRows) {
+              self.close_db_connection(conn);
+              if (insertErr) return reject(insertErr);
+              else return resolve(insertRows);
+            });
+          } else {
+            self.close_db_connection(conn);
+            return resolve(rows);
+          }
+        });
+      });
+    });
+  },
+
   // update column with json data
   updateJSON : async (table, column, data, filter) => {
 

package/src/db/device.js

@@ -387,6 +387,27 @@ var self = module.exports = {
 	    });
 		    
 		});
+	},
+
+	getSensorByRef : async(deviceId, ref)=>{
+		return new Promise((resolve,reject) => {
+
+	    let query = "SELECT * FROM ?? where device_id = ? and ref = ?";
+	    let args = ["sensors",deviceId,ref];
+	    query = mysql.format(query,args);
+
+	    $.db.queryRow(query)
+	    .then( rows => {
+	      if(rows.length > 0)
+	        return resolve(rows[0]);
+	      else
+	        return resolve(null);
+	    })
+	    .catch( err => {
+	      console.log(err);
+	      return resolve(null);
+	    });
+	  });
 	}
 
 }

package/src/db/model.js

@@ -112,4 +112,25 @@ var self = module.exports = {
 		});
   	},
 
+  	getSensorByRef : async(modelId, ref)=>{
+		return new Promise((resolve,reject) => {
+
+	    let query = "SELECT * FROM ?? where model_id = ? and ref = ?";
+	    let args = ["sensors",modelId,ref];
+	    query = mysql.format(query,args);
+
+	    $.db.queryRow(query)
+	    .then( rows => {
+	      if(rows.length > 0)
+	        return resolve(rows[0]);
+	      else
+	        return resolve(null);
+	    })
+	    .catch( err => {
+	      console.log(err);
+	      return resolve(null);
+	    });
+	  });
+	}
+
 }

package/src/db/project.js

@@ -64,13 +64,15 @@ var self = module.exports = {
 	  });
 	},
 
-	insert : async(project, project_table, logs_table)=>{
+	insert : async(project, project_table, logs_table, projectOptions)=>{
 
 		return new Promise((resolve,reject) => {
 			let obj = {
 				name : project,
 				project_table : project_table,
 				logs_table : logs_table,
+				uidPrefix : projectOptions.uidPrefix,
+				uidLength : projectOptions.uidLength,
 				createdAt : moment().utc().format('YYYY-MM-DD HH:mm:ss'),
 				updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
 			}

package/src/db/sensor.js

@@ -95,7 +95,9 @@ var self = module.exports = {
 			let obj = {
 				device_id : deviceId,
 				sensor_id : sensorId,
-				value : payload,
+				value : payload?.value,
+				error : payload?.error,
+				obj : payload?.object,
 				createdAt : moment().utc().format('YYYY-MM-DD HH:mm:ss'),
 				updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
 			}

package/src/device/device.js

@@ -1,13 +1,12 @@
 const moment = require('moment');
 
 var _project = [];
-const logs_table = "sensor_logs";
+const logs_table = "logs_sensor";
 const semver = require('semver');
 
 var self = module.exports = {
 
   init : async (config,projects)=>{
-
     return new Promise(async (resolve,reject) => {
       $.db.connect(config,()=>{
         console.log("MYSQL is connected");
@@ -19,10 +18,12 @@ var self = module.exports = {
           };
           _project[name].module = require(`${BASE_DIR}/projects/${name}/${name}.js`)
           _project[name].module?.init();
+          let projectOptions = config[name];
           let row = await $.db_project.getByName(name);
+          
           if(row == null)
-            $.db_project.insert(name,name,"logs_"+name);
-
+            $.db_project.insert(name,name,"logs_"+name,projectOptions);
+          
           if(counter == projects.length-1)
             return resolve();
         })
@@ -60,7 +61,7 @@ var self = module.exports = {
     topic = topic.substring(index+1);
 
     // check if topic corresponds to a device
-    if(uid.startsWith(project.uidPrefix) && uid.length == project?.uidLength){
+    if(uid.startsWith(project.uidPrefix) && uid.length <= project?.uidLength){
 
       let device = await $.db_device.get(uid);
 
@@ -159,15 +160,40 @@ var self = module.exports = {
           } 
         }
       }else if(topic.startsWith("sensor/")){
-        updateSensor(device,topic,paylaod)
+        //updateSensor(device,topic,payload)
         index = topic.indexOf("/");
-        if(index == -1)
-            return;
+        if(index != -1){
+          const ref = topic.substring(index+1);
+          let res = await $.db_device.getSensorByRef(device.id,ref)
+          if(res == null)
+            res = await $.db_model.getSensorByRef(device.model_id,ref)
+          if(res != null){
+            object = null;
+            value = null;
+            error = null;
+            try{
+              object = JSON.parse(payload);
+            }catch(err){
+              console.log(err);
+            }
+            if (typeof object === 'object' && object !== null) {
+              value = object?.value;
+              error = object?.error;
+            }else{
+              value = payload;
+            }
+
+            if(value || error)
+              object = null;
 
-        const name = topic.substring(index+1);
-        let res = await $.db_sensor.getByRef(topic)
-        if(res != null){
-          await $.db_sensor.insert(logs_table,device.id,res.id,payload);
+            const data = {
+              object,
+              value,
+              error
+            }
+
+            await $.db_sensor.insert(logs_table,device.id,res.id,data);
+          }
         }
       }
 
@@ -314,15 +340,15 @@ var self = module.exports = {
 
     for (const model of models) {
       
-      console.log("model:",model?.name);
+      //console.log("model:",model?.name);
       if(!model?.id)
         continue;
 
       try{
         const latestVersion = await $.db_firmware.getLatestVersion(model.id,release);
         const latestAppVersion = await $.db_firmware.getLatestAppVersion(model.id,release);
-        console.log("latestVersion:",latestVersion?.version);
-        console.log("latestAppVersion:",latestAppVersion?.app_version);
+        //console.log("latestVersion:",latestVersion?.version);
+        //console.log("latestAppVersion:",latestAppVersion?.app_version);
 
         const devices = await $.db_device.listByModel(model.id);