mqtt-devices-parser 1.0.10 → 1.0.12

package/src/db/data.js

@@ -1,6 +1,8 @@
 const moment = require('moment');
 var mysql = require('mysql2')
 
+// Use this call only for dbs outside this module, they need to be registered on sequelize
+
 var self = module.exports = {
 
 	checkEntry : async (table,deviceId)=>{
@@ -19,8 +21,7 @@ var self = module.exports = {
 				return resolve(null);
 		})
 		.catch( err => {
-			console.log(err);
-			return resolve(null);
+			return reject(err);
 			});
 		});
 	},
@@ -73,8 +74,7 @@ var self = module.exports = {
 							return resolve(rows);
 						})
 						.catch((err)=>{
-							console.log(err);
-							return resolve();
+							return reject(err);
 						})
 					}else{
 						let filter = {
@@ -85,12 +85,14 @@ var self = module.exports = {
 							return resolve(rows);
 						})
 						.catch((err)=>{
-							console.log(err);
-							return resolve();
+							return reject(err);
 						})
 					}
 
-				}else return resolve();
+				}else{
+					return resolve();
+					//return reject(`columns not found for table ${table}`);	
+				} 
 			}else{
 
 				let key = topic;
@@ -110,8 +112,7 @@ var self = module.exports = {
 							return resolve(rows);
 						})
 						.catch((err)=>{
-							console.log(err);
-							return resolve(null);
+							return reject(err);
 						})
 					}else{
 						let filter = {
@@ -123,11 +124,13 @@ var self = module.exports = {
 							return resolve(rows);
 						})
 						.catch((err)=>{
-							console.log(err);
-							return resolve(null);
+							return reject(err);
 						})
 					}
-				}else return resolve();
+				}else{
+					return resolve();
+					//return reject(`columns not found for table ${table}`);	
+				}
 			}
 		})
 	},
@@ -137,7 +140,7 @@ var self = module.exports = {
 		return new Promise( async (resolve, reject) => {
 		
 			if (!payload || typeof payload !== 'object') 
-				return resolve();
+				return reject("Not object");
 
 			let obj = {
 				updatedAt: moment().utc().format('YYYY-MM-DD HH:mm:ss'),
@@ -146,8 +149,10 @@ var self = module.exports = {
 
 			// Get columns info
 			const db_columns = $.models.get(table);
-			if (db_columns == null) 
-				return resolve();
+			if (db_columns == null){
+				resolve();
+				//return reject(`columns not found for table ${table}`);
+			} 
 
 			// Prepare data for insertion
 			for (let key in payload) {
@@ -171,8 +176,7 @@ var self = module.exports = {
 					return resolve(rows);
 				})
 				.catch((err)=>{
-					console.log(err);
-					return resolve();
+					return reject(err);
 				})
 			}else{
 				let filter = {
@@ -183,12 +187,9 @@ var self = module.exports = {
 					return resolve(rows);
 				})
 				.catch((err)=>{
-					console.log(err);
-					return resolve();
+					return reject(err);
 				})
 			}
-
-			return resolve();
 		});
 	},
 
@@ -198,74 +199,78 @@ var self = module.exports = {
 
 	    if(!payload) return resolve();
 
-			let data = null;
-			// check if data is in JSON format
-			try{
-				data = JSON.parse(payload);
-			}catch(e){
-				data = payload;
-			}
+		let data = null;
+		// check if data is in JSON format
+		try{
+			data = JSON.parse(payload);
+		}catch(e){
+			data = payload;
+		}
 
-			let obj = {
-				updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
-			}
+		let obj = {
+			updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
+		}
 
-			let db_columns = $.models.get(table);
-			if(db_columns == null)
-				return resolve();
+		let db_columns = $.models.get(table);
+		if(db_columns == null){
+			resolve();
+			//return reject(`columns not found for table ${table}`);
+		}
 
-			let index = topic.indexOf("/");
+		let index = topic.indexOf("/");
 
-			if(index > -1){ // check if topic has subtopics
-				let key = topic.substring(0,index);
-				topic = topic.substring(index+1);
+		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
+			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));
+				// 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)
+				.then((rows)=>{
+					return resolve(rows);
+				})
+				.catch((err)=>{
+					return reject(err);
+				})
 
-					obj['device_id'] = deviceId;
-					obj['createdAt'] = moment().utc().format('YYYY-MM-DD HH:mm:ss');
-					$.db.insert(table,obj)
-					.then((rows)=>{
-						return resolve(rows);
-					})
-					.catch((err)=>{
-						console.log(err);
-						return resolve();
-					})
-
-				}else
-					return resolve();
 			}else{
+				resolve();
+				//return reject(`column ${key} not found for table ${table}`);
+			}
+		}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;
+			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)
-					.then((rows)=>{
-						return resolve(rows);
-					})
-					.catch((err)=>{
-						console.log(err);
-						return resolve();
-					})
-				}else
-					return resolve();
+				obj['device_id'] = deviceId;
+				obj['createdAt'] = moment().utc().format('YYYY-MM-DD HH:mm:ss');
+				$.db.insert(table,obj)
+				.then((rows)=>{
+					return resolve(rows);
+				})
+				.catch((err)=>{
+					return reject(err);
+				})
+			}else{
+				resolve();
+				//return reject(`column ${key} not found for table ${table}`);
 			}
+		}
 
 	  });
 	},
@@ -300,14 +305,12 @@ var self = module.exports = {
 				}
 			}
 
-			//console.log("updateJSONlog")
 			$.db.insert(table, obj)
 			.then((rows)=>{
 				return resolve(rows);
 			})
 			.catch((err)=>{
-				console.log(err);
-				return resolve();
+				return reject(err);
 			})
 		});
 	},
@@ -317,8 +320,10 @@ var self = module.exports = {
 	  return new Promise((resolve,reject) => {
 
 		let db_columns = $.models.get(table);
-		if(db_columns == null)
-			return resolve();
+		if(db_columns == null){
+			resolve();
+			//return reject(`columns not found for table ${table}`);
+		}
 
 		$.db.delete(table,{id:0})
 		let index = topic.indexOf("/");
@@ -344,8 +349,7 @@ var self = module.exports = {
 				return resolve(rows);
 			  })
 			.catch((err)=>{
-				console.log(err);
-				return resolve();
+				return reject(err);
 			})
 			}
 		}else{

package/src/db/db.js

@@ -144,6 +144,7 @@ var self = module.exports = {
     });
   },
 
+  // update column with json data
   updateJSON : async (table, column, data, filter) => {
 
     return new Promise((resolve, reject) => {
@@ -317,6 +318,29 @@ var self = module.exports = {
     });
   },
 
+  getDataFromDeviceId : async (table,deviceId)=>{
+
+    return new Promise((resolve,reject) => {
+
+      self.getConnection((err,conn)=>{
+        if(err) return reject(err);
+
+        let query = "SELECT ?? FROM ?? where device_id = ?";
+        let args = [field,table,deviceId];
+        query = mysql.format(query,args);
+        conn.query(query,function(err,rows){
+          $.db.close_db_connection(conn);
+          if(err) return reject(err)
+          else{
+            if(rows.length == 1 ){
+              return resolve(rows[0]);
+            }else return resolve(null);
+          }
+        });
+      });
+    });
+  },
+
   getFieldFromDeviceId : async (table,deviceId,field)=>{
 
     return new Promise((resolve,reject) => {

package/src/db/device.js

@@ -3,131 +3,195 @@ var mysql = require('mysql2')
 
 var self = module.exports = {
 
-	get : async (uid)=>{
+	getById : async (deviceId)=>{
 		return new Promise((resolve,reject) => {
 
-			let query = "SELECT id,uid,project_id,model_id,status FROM ?? where uid = ?";
-		    let table = ["devices",uid];
-		    query = mysql.format(query,table);
-
-		    $.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);
-		    });
+			let query = "SELECT * FROM ?? where id = ?";
+			let table = ["devices",deviceId];
+			query = mysql.format(query,table);
+
+			$.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);
+			});
 		});
 	},
 
-	insert : async(uid)=>{
+	get : async (uid)=>{
+		return new Promise((resolve,reject) => {
 
+			let query = "SELECT * FROM ?? where uid = ?";
+			let table = ["devices",uid];
+			query = mysql.format(query,table);
+
+			$.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);
+			});
+		});
+	},
+
+	listOnline : async ()=>{
 		return new Promise((resolve,reject) => {
-			let obj = {
-				uid : uid,
-				createdAt : moment().utc().format('YYYY-MM-DD HH:mm:ss'),
-				updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
-			}
 
-		    $.db.insert("devices",obj)
-		    .then (rows => {
-		      return resolve(rows[0]);
-		    })
-		    .catch(error => {
-		      return reject(error);
-		    });
+			let query = "SELECT * FROM ?? where status = ?";
+			let table = ["devices","online"];
+			query = mysql.format(query,table);
+
+			$.db.queryRow(query)
+			.then( rows => {
+				if(rows.length > 0)
+					return resolve(rows);
+				else
+					return resolve(null);
+			})
+			.catch( err => {
+				console.log(err);
+				return resolve(null);
+			});
 		});
-  	},
+	},
 
-  	updateStatus : async(uid,status)=>{
+	listByModel : async (model_id)=>{
 		return new Promise((resolve,reject) => {
 
-		    let obj = {
-		      status : status,
-		      updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
-		    };
-
-		    let filter = {
-		      uid : uid,
-		    };
-
-		    $.db.update("devices",obj,filter)
-		    .then (rows => {
-		      return resolve(rows);
-		    })
-		    .catch(error => {
-		      return reject(error);
+			let query = "SELECT * FROM ?? where model_id = ?";
+			let table = ["devices",model_id];
+			query = mysql.format(query,table);
+
+			$.db.queryRow(query)
+			.then( rows => {
+				if(rows.length > 0)
+					return resolve(rows);
+				else
+					return resolve(null);
+			})
+			.catch( err => {
+				console.log(err);
+				return resolve(null);
 			});
-	  });
-  	},
+		});
+	},
 
-  	updateTech : async(uid,tech)=>{
+	listOnlineByModel : async (model_id)=>{
 		return new Promise((resolve,reject) => {
 
-		    let obj = {
-		      tech : tech,
-		      updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
-		    };
-
-		    let filter = {
-		      uid : uid,
-		    };
-
-		    $.db.update("devices",obj,filter)
-		    .then (rows => {
-		      return resolve(rows);
-		    })
-		    .catch(error => {
-		      return reject(error);
+			let query = "SELECT * FROM ?? where model_id = ? and status = ?";
+			let table = ["devices",model_id,"online"];
+			query = mysql.format(query,table);
+
+			$.db.queryRow(query)
+			.then( rows => {
+				if(rows.length > 0)
+					return resolve(rows);
+				else
+					return resolve(null);
+			})
+			.catch( err => {
+				console.log(err);
+				return resolve(null);
 			});
-	  });
-  	},
+		});
+	},
 
-  	updateProject : async(uid,project_id)=>{
+	getField : async (id,column)=>{
 		return new Promise((resolve,reject) => {
 
-		    let obj = {
-		      project_id : project_id,
-		      updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
-		    };
-
-		    let filter = {
-		      uid : uid,
-		    };
-
-		    $.db.update("devices",obj,filter)
-		    .then (rows => {
-		      return resolve(rows);
-		    })
-		    .catch(error => {
-		      return reject(error);
+			let query = "SELECT ?? FROM devices where id = ?";
+			let table = [column,id];
+			query = mysql.format(query,table);
+
+			$.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);
+			});
+		});
+	},
+
+	insert : async(obj)=>{
+
+		return new Promise((resolve,reject) => {
+			let timestamp = moment().utc().format('YYYY-MM-DD HH:mm:ss');
+			obj['createdAt'] = timestamp;
+			obj['updatedAt'] = timestamp;
+
+			$.db.insert("devices",obj)
+			.then (rows => {
+				return resolve(rows[0]);
+			})
+			.catch(error => {
+				return reject(error);
 			});
-	  });
-  	},
+		});
+	},
 
-  	updateModel : async(uid,model_id)=>{
+	update : async(id,column,value)=>{
 		return new Promise((resolve,reject) => {
 
-		    let obj = {
-		      model_id : model_id,
-		      updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
-		    };
-
-		    let filter = {
-		      uid : uid,
-		    };
-
-		    $.db.update("devices",obj,filter)
-		    .then (rows => {
-		      return resolve(rows);
-		    })
-		    .catch(error => {
-		      return reject(error);
+			let obj = {
+				updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
+			};
+
+			obj[column] = value;
+
+			let filter = {
+				id : id,
+			};
+
+			$.db.update("devices",obj,filter)
+			.then (rows => {
+				return resolve(rows);
+			})
+			.catch(error => {
+				return reject(error);
 			});
-	  });
-  	},
+		});
+	},
+
+	updateObject : async (deviceId, obj)=>{
+
+		return new Promise( async (resolve, reject) => {
+			
+			const table = "devices";
+
+			if (!obj || typeof obj !== 'object') 
+				return reject("Not object");
+
+			obj['updatedAt'] = moment().utc().format('YYYY-MM-DD HH:mm:ss');
+
+			let filter = {
+				id : deviceId
+			}
+			$.db.update(table,obj,filter)
+			.then((rows)=>{
+				return resolve(rows);
+			})
+			.catch((err)=>{
+				return reject(err);
+			})
+
+		});
+	},
+
 }

package/src/db/firmware.js

@@ -3,16 +3,41 @@ var mysql = require('mysql2')
 
 var self = module.exports = {
 
-	getLatestFWVersion : async (modelId,release)=>{
+	getById : async (firmwareId)=>{
+		return new Promise((resolve,reject) => {
+
+		  let query = "";
+			let table = [];
+
+			query = `SELECT * FROM firmwares where id = ?`;
+			table = [firmwareId];
+
+	    query = mysql.format(query,table);
+
+	    $.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);
+	    });
+	  });
+	},
+
+	getLatestVersion : async (modelId,release)=>{
 
 	  return new Promise((resolve,reject) => {
 
 	    let query = "";
 		let table = [];
 
-		query = `SELECT fw_version,filename,token FROM firmwares where model_id = ? and fw_release = ? ORDER BY CAST(SUBSTRING_INDEX(fw_version, '.', 1) AS UNSIGNED) DESC,
-		 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(fw_version, '.', 2), '.', -1) AS UNSIGNED) DESC,
-		 CAST(SUBSTRING_INDEX(fw_version, '.', -1) AS UNSIGNED) DESC
+		query = `SELECT version,filename,token,id FROM firmwares where model_id = ? and build_release = ? ORDER BY CAST(SUBSTRING_INDEX(version, '.', 1) AS UNSIGNED) DESC,
+		 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(version, '.', 2), '.', -1) AS UNSIGNED) DESC,
+		 CAST(SUBSTRING_INDEX(version, '.', -1) AS UNSIGNED) DESC
 		 LIMIT 1`;
 		table = [modelId,release];
 
@@ -39,7 +64,7 @@ var self = module.exports = {
 	    let query = "";
 		let table = [];
 
-		query = `SELECT app_version,filename,token FROM firmwares where model_id = ? and fw_release = ? ORDER BY CAST(SUBSTRING_INDEX(app_version, '.', 1) AS UNSIGNED) DESC,
+		query = `SELECT app_version,filename,token,id FROM firmwares where model_id = ? and build_release = ? ORDER BY CAST(SUBSTRING_INDEX(app_version, '.', 1) AS UNSIGNED) DESC,
 		 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(app_version, '.', 2), '.', -1) AS UNSIGNED) DESC,
 		 CAST(SUBSTRING_INDEX(app_version, '.', -1) AS UNSIGNED) DESC
 		 LIMIT 1`;