mqtt-devices-parser 1.0.17 → 1.0.19

package/Changelog.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.0.19
+	Removes adding project on launching process
+	models/models:
+	 - seedCommonLwM2MObjects: avoids error on description property not defined on object
+	 - changes lwm2m seed functions name
+	 
+## 1.0.18
+	Fix and improve Sensors, checks uid length
+	Adds seedCommonLwM2MObjects and seedCommonLwM2MResources functions
+	fixes sync project tables. Makes load .models more robust
+	Adds templates table
+	add template_id to devices table
+
 ## 1.0.17
 	Fix and improve Sensors, checks uid length
 	config/index: When defining a project from here uidPrefix and uidLength must be defined

package/config/index.js

@@ -27,7 +27,7 @@ module.exports = {
   projects: {
     demo : process.env.demo || false,
   },
-  demo : {
+  demo : { // not need anymore. Can be created on dashboard
     uidPrefix: 'uid:',
     uidLength: 16 // max len for uid
   }

package/index.js

@@ -94,7 +94,7 @@ var self = module.exports = {
 
     //main tables
     if($.config.sync_main_tables){
-
+      
       await $.models.load(__dirname+"/models");
       await $.models.dropTableIndexes();
       await $.models.sync();
@@ -106,7 +106,8 @@ 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
-
+      
+      /* Add projects using dashboard !!
       for(name of projects){
         project = $.config[name];
         if (project) {
@@ -115,13 +116,11 @@ var self = module.exports = {
           await $.models.insertProject(projectData);
         }
       }
+      */
     }
 
     // project tables
     await self.readModelsInsideProjects(projectsPath);
-    await $.models.dropTableIndexes();
-    await $.models.sync();
-
   }
 }
 

package/models/devices.models.js

@@ -20,6 +20,10 @@ module.exports = (sequelize,DataTypes)=>{
 				key: 'id'
 			}
 		},
+		template_id: {
+			type: DataTypes.INTEGER,
+			allowNull: true
+		},
 		model_id: {
 			type: DataTypes.INTEGER,
 			references: {

package/models/models.js

@@ -39,22 +39,28 @@ var self = module.exports = {
 
   load: async (modelsPath) => {
     return new Promise(async (resolve, reject) => {
-      var files = await fs.readdir(modelsPath);
-      files = files.filter((file) => {
-        // Exclude models.js and non-js files
-        return (
-          file.indexOf('.') !== 0 &&
-          file !== 'models.js' &&
-          file.slice(-9) === 'models.js'
-        );
-      });
-      files.forEach((file, counter) => {
-        const model = require(path.join(modelsPath, file));
-        model(sequelize, DataTypes);
-        if (counter === files.length - 1) {
-          return resolve();
+      try {
+        let files = await fs.readdir(modelsPath);
+        files = files.filter((file) => {
+          // Exclude models.js and non-js files
+          return (
+            file.indexOf('.') !== 0 &&
+            file !== 'models.js' &&
+            file.slice(-9) === 'models.js'
+          );
+        });
+
+        // Use a for...of loop to load models sequentially
+        for (const file of files) {
+          console.log(`Sync file ${file}`);
+          const model = require(path.join(modelsPath, file));
+          await model(sequelize, DataTypes); // Ensure each model is loaded before moving to the next
         }
-      });
+
+        resolve(); // Resolve the Promise after all files are processed
+      } catch (error) {
+        reject(error); // Reject the Promise on any error
+      }
     });
   },
 
@@ -246,5 +252,153 @@ var self = module.exports = {
         });
     });
   },
-  
+
+  seedLwM2MObjects: async(objects) => {
+    try {
+      const results = await Promise.all(
+        objects.map(async (object) => {
+          const [record, created] = await sequelize.models['lwm2mObjects'].upsert(
+            {
+              objectId: object.objectId,
+              name: object.name,
+              description: object?.description,
+            },
+            {
+              where: { objectId: object.objectId }, // Ensure the record exists based on objectId
+            }
+          );
+          return { record, created };
+        })
+      );
+      console.log("Insert/Update completed for LwM2M Objects.");
+      return results;
+    } catch (error) {
+      console.error("Error inserting/updating LwM2M Objects:", error.message);
+      throw error;
+    }
+  },
+  /*
+  seedCommonLwM2MResources: async(resources) => {
+    try {
+      const results = await Promise.all(
+        resources.map(async (resource) => {
+          const [record, created] = await sequelize.models['lwm2mResources'].upsert(
+            {
+              objectId: resource.objectId,
+              resourceId: resource.resourceId,
+              name: resource.name,
+              description: resource.description,
+            },
+            {
+              where: { objectId: object.objectId, resourceId: object.resourceId }, // Ensure the record exists based on objectId and resourceId
+            }
+          );
+          return { record, created };
+        })
+      );
+      console.log("Insert/Update completed for LwM2M Resources.");
+      return results;
+    } catch (error) {
+      console.error("Error inserting/updating LwM2M Resources:", error.message);
+      throw error;
+    }
+  },
+  */
+
+  /**
+ * Seed LwM2M resources into the database.
+ *
+ * Expected DB model: sequelize.models['lwm2mResources']
+ * with a composite unique key on (objectId, resourceId) recommended.
+ *
+ * @param {Array} resources - Either:
+ *   - Flat: [{ objectId, resourceId, name, description }, ...]
+ *   - Nested: [{ objectId, name, resources: [{ resourceId, name, description }, ...] }, ...]
+ * @param {import('sequelize').Sequelize} sequelize - An initialized Sequelize instance.
+ * @returns {Promise<Array<{ objectId:number, resourceId:number, created:boolean, updated:boolean }>>}
+ */
+  seedLwM2MResources: async (resources) => {
+    if (!sequelize || !sequelize.models || !sequelize.models['lwm2mResources']) {
+      throw new Error("sequelize instance with model 'lwm2mResources' is required");
+    }
+    if (!Array.isArray(resources)) {
+      throw new Error('resources must be an array');
+    }
+
+    // Normalize input: flatten nested object.resources into a flat {objectId,resourceId,...} list
+    const flatResources = [];
+    for (const entry of resources) {
+      if (entry && Array.isArray(entry.resources)) {
+        // Nested structure: object -> resources[]
+        for (const res of entry.resources) {
+          flatResources.push({
+            objectId: entry.objectId,
+            resourceId: res.resourceId,
+            name: res.name,
+            description: res.description
+          });
+        }
+      } else if (
+        entry &&
+        typeof entry.objectId !== 'undefined' &&
+        typeof entry.resourceId !== 'undefined'
+      ) {
+        // Already flat
+        flatResources.push({
+          objectId: entry.objectId,
+          resourceId: entry.resourceId,
+          name: entry.name,
+          description: entry.description
+        });
+      } else {
+        // Skip invalid entries but warn
+        // eslint-disable-next-line no-console
+        console.warn('Skipping invalid resource entry:', entry);
+      }
+    }
+
+    const { lwm2mResources } = sequelize.models;
+
+    const results = [];
+    try {
+      await sequelize.transaction(async (t) => {
+        for (const res of flatResources) {
+          const where = { objectId: res.objectId, resourceId: res.resourceId };
+
+          // Try to find existing record
+          const [record, created] = await lwm2mResources.findOrCreate({
+            where,
+            defaults: {
+              name: res.name,
+              description: res.description
+            },
+            transaction: t
+          });
+
+          if (!created) {
+            // Update existing with latest values
+            await record.update(
+              { name: res.name, description: res.description },
+              { transaction: t }
+            );
+          }
+
+          results.push({
+            objectId: res.objectId,
+            resourceId: res.resourceId,
+            created,
+            updated: !created
+          });
+        }
+      });
+
+      // eslint-disable-next-line no-console
+      console.log('Insert/Update completed for LwM2M Resources.');
+      return results;
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error('Error inserting/updating LwM2M Resources:', error.message);
+      throw error;
+    }
+  }
 };

package/models/templates.models.js

@@ -0,0 +1,25 @@
+
+module.exports = (sequelize,DataTypes)=>{
+	return sequelize.define("templates", {
+		tag: {
+			type: DataTypes.STRING,
+			allowNull: false
+		},
+		name: {
+			type: DataTypes.STRING,
+			allowNull: false
+		},
+		client_id: {
+			type: DataTypes.INTEGER,
+			allowNull: false
+		},
+		project_id: {
+			type: DataTypes.INTEGER,
+			allowNull: false
+		},
+	},
+	{
+		tableName: 'templates',
+		freezeTableName: true
+	})
+}

package/package.json

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