improove generic creation

BenAhrdt · Jan 12, 2024 · b296b09 · b296b09
1 parent a2184e5
commit b296b09
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/lib/modules/directorieshandler.js b/lib/modules/directorieshandler.js
@@ -104,6 +104,7 @@ class messagehandlerClass {
 									}
 								},
 								configuration:{
+									safeDirectory: this.safeableDirectories.downlinkConfiguration,
 									refreshRate:{
 										isState: true,
 										stateVal: 2,
@@ -164,10 +165,10 @@ class messagehandlerClass {
 							if(!this.reachableDirectories){
 								this.reachableDirectories = {};
 							}
-							if(!this.reachableDirectories[`${message.end_device_ids.application_ids.application_id}.${message.end_device_ids.dev_eui}.${message.end_device_ids.device_id}`]){
-								this.reachableDirectories[`${message.end_device_ids.application_ids.application_id}.${message.end_device_ids.dev_eui}.${message.end_device_ids.device_id}`] = {};
+							if(!this.reachableDirectories[this.getObjectDirectory(message,this.searchableAttributeNames.deviceId)]){
+								this.reachableDirectories[this.getObjectDirectory(message,this.searchableAttributeNames.deviceId)] = {};
 							}
-							this.reachableDirectories[`${message.end_device_ids.application_ids.application_id}.${message.end_device_ids.dev_eui}.${message.end_device_ids.device_id}`][obj[elementName].safeDirectory] = objectId;
+							this.reachableDirectories[this.getObjectDirectory(message,this.searchableAttributeNames.deviceId)][obj[elementName].safeDirectory] = objectId;
 						}
 						await this.adapter.setObjectNotExistsAsync(objectId,{
 							// @ts-ignore
@@ -282,6 +283,16 @@ class messagehandlerClass {
 		}
 	}
 
+	getObjectDirectory(message,resolvetype){
+		// Select search in case of origin
+		if(this.adapter.config.ttn){
+			return this.getTtnObjectDirectory(message,resolvetype);
+		}
+		else if(this.adapter.config.chirpstack){
+			//	 this.handleChirpstack(topic,message);
+		}
+	}
+
 	getTtnObjectDirectory(message,resolvetype){
 		if(typeof message !== "string"){
 			switch(resolvetype){

diff --git a/lib/modules/messagehandler.js b/lib/modules/messagehandler.js
@@ -29,7 +29,6 @@ class messagehandlerClass {
 		}*/
 		try{
 			await this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories,"",message);
-
 			/*********************************************************************
 			 * ************************* Infodata ********************************
 			 * ******************************************************************/