mqtt-devices-parser 1.0.11 → 1.0.13

package/Changelog.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.0.13
+	adds 2 new tables to db:
+	Adds 5 new columns to devices
+	Registers device logs, records device settings..
+	fixes: ws affected by a DoS when handling a request with many HTTP headers !breaking change
+	Updates npm
+
+## 1.0.12
+	Adds module fota
+
 ## 1.0.11
 	index: MQTT
 		- makes mqtt client global,

package/index.js

@@ -14,6 +14,7 @@ $.db_device = require('./src/db/device');
 $.db_model = require('./src/db/model');
 $.db_firmware = require('./src/db/firmware');
 $.db_sensor = require('./src/db/sensor');
+$.db_fota = require('./src/db/fota');
 $.mqtt_client = null;
 
 const packageJson = require(__dirname+'/package.json');
@@ -63,6 +64,7 @@ var self = module.exports = {
       })
 
       let counter_help = 0;
+      let project = {}
       files.forEach( async(name,counter) => {
         if($.config.projects[name]){
           project[name] = {};
@@ -82,7 +84,7 @@ var self = module.exports = {
 
   },
 
-  deploy: async(_config,projectsPath)=>{
+  deploy: async(_config,projectsPath, projects)=>{
 
     if(_config != null)
         $.config = _config;
@@ -104,6 +106,15 @@ var self = module.exports = {
       await $.models.insertUser("client","client_pwd",3);
       // adds client with credentials admin@admin
       await $.models.insertClient("admin","admin",user_id); // dashboard login
+
+      for(name of projects){
+        project = $.config[name];
+        if (project) {
+          // Make a copy if you don't want to modify the original config object
+          const projectData = { ...project, name: name };
+          await $.models.insertProject(projectData);
+        }
+      }
     }
 
     // project tables
@@ -154,9 +165,19 @@ function mqtt_connect(){
       $.mqtt_client.subscribe(project+"/#")
     })
 
+    // Update 'dev' devices at each 5 min 
     checkFota = setInterval(async ()=>{
-      await $.device.checkFota();
-    },60*1000);
+      await $.device.checkFota("dev");
+      await $.device.triggerFota("dev");
+    },5*60*1000);
+
+    // Update 'prod' devices at each hour
+    checkFota = setInterval(async ()=>{
+      await $.device.checkFota("prod");
+      await $.device.triggerFota("prod");
+    },60*60*1000);
+
+    // Devices not set as dev or prod must be triggered manually
 
   });
 

package/models/devices.models.js

@@ -35,18 +35,35 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.STRING,
 			allowNull: true
 		},
-		release: {
+		accept_release: {
 			type: DataTypes.STRING,
 			allowNull: true
 		},
-		fota_tries: {
+		tech: {
 			type: DataTypes.STRING,
 			allowNull: true
 		},
-		tech: {
+		remote_settings: { // device settings
+			type: DataTypes.JSON,
+			allowNull: true
+		},
+		local_settings: { // server settings
+			type: DataTypes.JSON,
+			allowNull: true
+		},
+		settings_ref: { // settings to be used, can be a uid, deviceId, default..
 			type: DataTypes.STRING,
 			allowNull: true
 		},
+		associatedDevice: {
+			type: DataTypes.INTEGER,
+			allowNull: true
+		},
+		endpoint: { // info about protocol communication
+			type: DataTypes.JSON,
+			allowNull: true
+		},
+
 	},
 	{
 		tableName: 'devices',

package/models/firmwares.models.js

@@ -10,10 +10,6 @@ module.exports = (sequelize,DataTypes)=>{
 			allowNull: true,
 			unique: true
 		},
-		fw_version: { // deprecated
-			type: DataTypes.STRING,
-			allowNull: true
-		},
 		version: {
 			type: DataTypes.STRING,
 			allowNull: true
@@ -22,15 +18,11 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.STRING,
 			allowNull: true
 		},
-		fw_release: { // deprecated
-			type: DataTypes.STRING,
-			allowNull: true
-		},
-		release: {
+		build_release: {
 			type: DataTypes.STRING,
 			allowNull: true
 		},
-		model_id: { // deprecated
+		model_id: { 
 			type: DataTypes.INTEGER,
 			references: {
 				model: 'models',

package/models/fota.models.js

@@ -0,0 +1,32 @@
+module.exports = (sequelize,DataTypes)=>{
+	return sequelize.define("fota", {
+		device_id: {
+			type: DataTypes.INTEGER,
+			unique: true,
+		},
+		target_version: {
+			type: DataTypes.STRING,
+		},
+		target_app_version: {
+			type: DataTypes.STRING,
+		},
+		target_release: {
+			type: DataTypes.STRING,
+		},
+		firmware_id: {
+			type: DataTypes.INTEGER,
+		},
+		nAttempts: {
+			type: DataTypes.INTEGER,
+			default: 0
+		},
+		fUpdate: {
+			type: DataTypes.BOOLEAN,
+			default: 0
+		},
+	},
+	{
+		tableName: 'fota',
+		freezeTableName: true
+	})
+}

package/models/logs_actions.models.js

@@ -0,0 +1,17 @@
+
+module.exports = (sequelize,DataTypes)=>{
+	return sequelize.define("logs_actions", {
+		client_id: {
+			type: DataTypes.INTEGER,
+			allowNull: false
+		},
+		action: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+	},
+	{
+		tableName: 'logs_actions',
+		freezeTableName: true
+	})
+}

package/models/logs_device.models.js

@@ -0,0 +1,62 @@
+
+module.exports = (sequelize,DataTypes)=>{
+	return sequelize.define("logs_devices", {
+		device_id: {
+			type: DataTypes.INTEGER,
+		},
+		status: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		project_id: {
+			type: DataTypes.INTEGER,
+			references: {
+				model: 'projects',
+				key: 'id'
+			}
+		},
+		model_id: {
+			type: DataTypes.INTEGER,
+			references: {
+				model: 'models',
+				key: 'id'
+			}
+		},
+		version: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		app_version: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		tech: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		associatedDevice: {
+			type: DataTypes.INTEGER,
+			allowNull: true
+		},
+		local_settings: { // server settings
+			type: DataTypes.JSON,
+			allowNull: true
+		},
+		remote_settings: { // server settings
+			type: DataTypes.JSON,
+			allowNull: true
+		},
+		settings_ref: { // settings to be used, can be a uid, deviceId, default..
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		endpoint: { // info about protocol communication
+			type: DataTypes.JSON,
+			allowNull: true
+		},
+	},
+	{
+		tableName: 'logs_devices',
+		freezeTableName: true
+	})
+}

package/models/logs_fota.models.js

@@ -0,0 +1,41 @@
+module.exports = (sequelize,DataTypes)=>{
+	return sequelize.define("logs_fota", {
+		device_id: {
+			type: DataTypes.INTEGER,
+		},
+		model_id: {
+			type: DataTypes.STRING,
+		},
+		local_version: {
+			type: DataTypes.STRING,
+		},
+		local_app_version: {
+			type: DataTypes.STRING,
+		},
+		target_version: {
+			type: DataTypes.STRING,
+		},
+		target_app_version: {
+			type: DataTypes.STRING,
+		},
+		target_file: {
+			type: DataTypes.STRING,
+		},
+		error: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		success: {
+			type: DataTypes.BOOLEAN,
+			default: 0
+		},
+		nAttempt: {
+			type: DataTypes.INTEGER,
+			default: 0
+		},
+	},
+	{
+		tableName: 'logs_fota',
+		freezeTableName: true
+	})
+}

package/models/{sensor_logs.models.js → logs_sensor.models.js}

@@ -1,5 +1,5 @@
 module.exports = (sequelize,DataTypes)=>{
-	return sequelize.define("sensor_logs", {
+	return sequelize.define("logs_sensor", {
 		device_id: {
 			type: DataTypes.INTEGER,
 			unique: false,
@@ -34,7 +34,7 @@ module.exports = (sequelize,DataTypes)=>{
 
 	},
 	{
-		tableName: 'sensor_logs',
+		tableName: 'logs_sensor',
 		freezeTableName: true
 	})
 }

package/models/modelPermissions.models.js

@@ -0,0 +1,23 @@
+
+module.exports = (sequelize,DataTypes)=>{
+	return sequelize.define("modelPermissions", {
+		client_id: {
+			type: DataTypes.INTEGER,
+			references: {
+				model: 'clients',
+				key: 'id'
+			}
+		},
+		model_id: {
+			type: DataTypes.INTEGER,
+			references: {
+				model: 'models',
+				key: 'id'
+			}
+		}
+	},
+	{
+		tableName: 'modelPermissions',
+		freezeTableName: true
+	})
+}