iobroker.lorawan 0.0.8 → 0.0.9

package/README.md

@@ -19,6 +19,9 @@ Adapter was created in collaboration with Joerg Froehner LoraWan@hafenmeister.co
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.0.9 (2024-01-19)
+* (BenAhrdt) first version for beta
+
 ### 0.0.8 (2024-01-18)
 * (BenAhrdt) first implementation of chirpstack
 
@@ -44,6 +47,7 @@ Adapter was created in collaboration with Joerg Froehner LoraWan@hafenmeister.co
 MIT License
 
 Copyright (c) 2024 BenAhrdt <bsahrdt@gmail.com>
+Copyright (c) 2024 Joerg Froehner <LoraWan@hafenmeister.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -61,4 +65,10 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
+
+## DISCLAIMER
+The rights of the trademarks and company names,
+remain with their owners and have no relation to this adapter.
+The fairuse policy must continue to be adhered to by the operator of the adapter.
+If this repository is forked, it must be cited as the source.

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.0.8",
+    "version": "0.0.9",
     "news": {
+      "0.0.9": {
+        "en": "first version for beta",
+        "de": "erste version für beta",
+        "ru": "первая версия для бета",
+        "pt": "primeira versão para beta",
+        "nl": "eerste versie voor beta",
+        "fr": "première version pour bêta",
+        "it": "prima versione per beta",
+        "es": "primera versión para beta",
+        "pl": "pierwsza wersja dla beta",
+        "uk": "перша версія для бета",
+        "zh-cn": "β的第一个版本"
+      },
       "0.0.8": {
         "en": "first implementation of chirpstack",
         "de": "erste implementierung von chirpstack",
@@ -80,19 +93,6 @@
         "pl": "pierwszy config dla downlinks nieznany",
         "uk": "перший конфігурація для вхідних посилань",
         "zh-cn": "输入下行链路的第一个配置"
-      },
-      "0.0.2": {
-        "en": "initial release",
-        "de": "erstausstrahlung",
-        "ru": "первоначальный выпуск",
-        "pt": "lançamento inicial",
-        "nl": "eerste release",
-        "fr": "libération initiale",
-        "it": "rilascio iniziale",
-        "es": "liberación inicial",
-        "pl": "początkowe zwolnienie",
-        "uk": "початковий реліз",
-        "zh-cn": "初步释放"
       }
     },
     "title": "LoRaWAN",

package/lib/modules/directorieshandler.js

@@ -29,19 +29,19 @@ class messagehandlerClass {
 		// declare the directory structre
 		this.directories = {
 			application:{
-				objectStateName : (message) =>{
-					return this.getAttributValue(message,this.searchableAttributeNames.apllicationId);
+				objectStateName : (topic,message) =>{
+					return this.getAttributValue(topic,message,this.searchableAttributeNames.apllicationId);
 				},
 				objectCommonName: "application",
 				devices:{
 					deviceUid:{
-						objectStateName : (message) =>{
-							return this.getAttributValue(message,this.searchableAttributeNames.deviceUid);
+						objectStateName : (topic,message) =>{
+							return this.getAttributValue(topic,message,this.searchableAttributeNames.deviceUid);
 						},
 						objectCommonName: "device UID",
 						deviceId:{
-							objectStateName : (message) =>{
-								return this.getAttributValue(message,this.searchableAttributeNames.deviceId);
+							objectStateName : (topic,message) =>{
+								return this.getAttributValue(topic,message,this.searchableAttributeNames.deviceId);
 							},
 							objectCommonName: "device ID",
 							objectType:"channel",
@@ -105,7 +105,7 @@ class messagehandlerClass {
 	 * ************************ Objectstring *****************************
 	 * ******************************************************************/
 
-	async generateRekursivObjects(obj,startDirectory,message,options = undefined){
+	async generateRekursivObjects(obj,startDirectory,topic,message,options = undefined){
 		// just proceed with ojects
 		if(typeof obj === "object"){
 			// go to every element in the object
@@ -119,7 +119,7 @@ class messagehandlerClass {
 						let objectId = `${startDirectory}.${elementName}`;
 						let internalObjectId = elementName;
 						if(obj[elementName].objectStateName){
-							internalObjectId = `${obj[elementName].objectStateName(message)}`;
+							internalObjectId = `${obj[elementName].objectStateName(topic,message)}`;
 							objectId = `${startDirectory}.${internalObjectId}`;
 						}
 						if(objectId.indexOf(".") === 0){
@@ -129,10 +129,10 @@ class messagehandlerClass {
 							if(!this.reachableDirectories){
 								this.reachableDirectories = {};
 							}
-							if(!this.reachableDirectories[this.getObjectDirectory(message,this.searchableAttributeNames.deviceId)]){
-								this.reachableDirectories[this.getObjectDirectory(message,this.searchableAttributeNames.deviceId)] = {};
+							if(!this.reachableDirectories[this.getObjectDirectory(topic,message,this.searchableAttributeNames.deviceId)]){
+								this.reachableDirectories[this.getObjectDirectory(topic,message,this.searchableAttributeNames.deviceId)] = {};
 							}
-							this.reachableDirectories[this.getObjectDirectory(message,this.searchableAttributeNames.deviceId)][obj[elementName].safeDirectory] = objectId;
+							this.reachableDirectories[this.getObjectDirectory(topic,message,this.searchableAttributeNames.deviceId)][obj[elementName].safeDirectory] = objectId;
 						}
 						await this.adapter.setObjectNotExistsAsync(objectId,{
 							// @ts-ignore
@@ -142,7 +142,7 @@ class messagehandlerClass {
 							},
 							native : {},
 						});
-						await this.generateRekursivObjects(obj[elementName],objectId,message);
+						await this.generateRekursivObjects(obj[elementName],objectId,topic,message);
 					}
 					else{
 						let stateCommonType = typeof obj[elementName];
@@ -158,7 +158,7 @@ class messagehandlerClass {
 						let objectId = `${startDirectory}.${elementName}`;
 						let internalObjectId = elementName;
 						if(obj[elementName].objectStateName){
-							internalObjectId = `${obj[elementName].objectStateName(message)}`;
+							internalObjectId = `${obj[elementName].objectStateName(topic,message)}`;
 							objectId = `${startDirectory}.${internalObjectId}`;
 						}
 						if(objectId.indexOf(".") === 0){
@@ -196,13 +196,13 @@ class messagehandlerClass {
 	 * ************************** Attribute ******************************
 	 * ******************************************************************/
 
-	getAttributValue(message,resolvetype){
+	getAttributValue(topic,message,resolvetype){
 		// Select search in case of origin
-		if(this.adapter.config.origin === "ttn"){
-			return this.getTtnAttributValue(message,resolvetype);
-		}
-		else if(this.adapter.config.origin === "chirpstack"){
-			return this.getChirpstackAttributValue(message,resolvetype);
+		switch(this.adapter.config.origin){
+			case "ttn":
+				return this.getTtnAttributValue(topic,message,resolvetype);
+			case "chirpstack":
+				return this.getChirpstackAttributValue(topic,message,resolvetype);
 		}
 	}
 
@@ -210,18 +210,34 @@ class messagehandlerClass {
 	 * ************************ Object Directory *************************
 	 * ******************************************************************/
 
-	getObjectDirectory(message,resolvetype){
+	getObjectDirectory(topic,message,resolvetype){
 		// Select search in case of origin
-		if(this.adapter.config.origin === "ttn"){
-			return this.getTtnObjectDirectory(message,resolvetype);
-		}
-		else if(this.adapter.config.origin === "chirpstack"){
-			return this.getChirpstackObjectDirectory(message,resolvetype);
+		switch(this.adapter.config.origin){
+			case "ttn":
+				return this.getTtnObjectDirectory(topic,message,resolvetype);
+			case "chirpstack":
+				return this.getChirpstackObjectDirectory(topic,message,resolvetype);
 		}
 	}
 
-
-
+	/*********************************************************************
+	 * *********************** Topic resolved ****************************
+	 * ******************************************************************/
+	getTopicResoled(topic){
+		this.adapter.log.debug(`topic ${topic} is requested for resolveing`);
+		const topicElements = topic.split("/");
+		const topicResolved = {
+			applicationId: topicElements[1],
+			deviceId: topicElements[3],
+			messageType: topicElements[topicElements.length - 1]
+		};
+		// clean up application id
+		const indexOfOrigin = topicResolved.applicationId.indexOf("@");
+		if(indexOfOrigin !== -1){
+			topicResolved.applicationId = topicResolved.applicationId.substring(0,indexOfOrigin);
+		}
+		return topicResolved;
+	}
 
 	/*********************************************************************
 	 * **************************** TTN  *********************************
@@ -231,16 +247,18 @@ class messagehandlerClass {
 	 * ************************** Attribute ******************************
 	 * ******************************************************************/
 
-	getTtnAttributValue(message,resolvetype){
+	getTtnAttributValue(topic,message,resolvetype){
+		this.adapter.log.debug(`attribute ${resolvetype} is requested for ttn`);
+		const topicResolved =  this.getTopicResoled(topic);
 		switch(resolvetype){
 			case this.searchableAttributeNames.apllicationId:
-				return message.end_device_ids.application_ids.application_id;
+				return topicResolved.applicationId;
 
 			case this.searchableAttributeNames.deviceUid:
 				return message.end_device_ids.dev_eui;
 
 			case this.searchableAttributeNames.deviceId:
-				return message.end_device_ids.device_id;
+				return topicResolved.deviceId;
 
 			default:
 				this.adapter.log.warn(`No attribute with the name ${resolvetype} found.`);
@@ -252,11 +270,13 @@ class messagehandlerClass {
 	 * ************************ Object Directory *************************
 	 * ******************************************************************/
 
-	getTtnObjectDirectory(message,resolvetype){
+	getTtnObjectDirectory(topic,message,resolvetype){
+		this.adapter.log.debug(`directory ${resolvetype} is requested for ttn`);
+		const topicResolved =  this.getTopicResoled(topic);
 		if(typeof message !== "string"){
 			switch(resolvetype){
 				case this.searchableAttributeNames.deviceId:
-					return `${message.end_device_ids.application_ids.application_id}.devices.${message.end_device_ids.dev_eui}.${message.end_device_ids.device_id}`;
+					return `${topicResolved.applicationId}.devices.${message.end_device_ids.dev_eui}.${topicResolved.deviceId}`;
 
 				default:
 					return message;
@@ -271,6 +291,7 @@ class messagehandlerClass {
 
 
 
+
 	/*********************************************************************
 	 * ************************ Chirpstack  ******************************
 	 * ******************************************************************/
@@ -280,16 +301,26 @@ class messagehandlerClass {
 	 * ******************************************************************/
 
 
-	getChirpstackAttributValue(message,resolvetype){
+	getChirpstackAttributValue(topic,message,resolvetype){
+		this.adapter.log.debug(`attribute ${resolvetype} is requested for chirpstack`);
+		const topicResolved =  this.getTopicResoled(topic);
+		let devUid = undefined;
 		switch(resolvetype){
 			case this.searchableAttributeNames.apllicationId:
-				return message.deviceInfo.applicationId;
+				return topicResolved.applicationId;
 
 			case this.searchableAttributeNames.deviceUid:
-				return message.deviceInfo.devEui;
+				if(topicResolved.messageType === "up"){
+					devUid = message.deviceInfo.devEui;
+				}
+				else if(topicResolved.messageType === "down")
+				{
+					devUid = message.devEui;
+				}
+				return devUid;
 
 			case this.searchableAttributeNames.deviceId:
-				return message.deviceInfo.deviceName;
+				return topicResolved.deviceId;
 
 			default:
 				this.adapter.log.warn(`No attribute with the name ${resolvetype} found.`);
@@ -301,18 +332,34 @@ class messagehandlerClass {
 	 * ************************ Object Directory *************************
 	 * ******************************************************************/
 
-	getChirpstackObjectDirectory(message,resolvetype){
-		if(typeof message !== "string"){
-			switch(resolvetype){
-				case this.searchableAttributeNames.deviceId:
-					return `${message.deviceInfo.applicationId}.devices.${message.deviceInfo.devEui}.${message.deviceInfo.deviceName}`;
-
-				default:
-					return message;
+	getChirpstackObjectDirectory(topic,message,resolvetype){
+		this.adapter.log.debug(`directory ${resolvetype} is requested for chirpstack`);
+		const topicResolved =  this.getTopicResoled(topic);
+		let devUid = undefined;
+		if(topicResolved.messageType === "up"){
+			devUid = message.deviceInfo.devEui;
+		}
+		else if(topicResolved.messageType === "down")
+		{
+			devUid = message.devEui;
+		}
+		if(devUid !== undefined){
+			if(typeof message !== "string"){
+				switch(resolvetype){
+					case this.searchableAttributeNames.deviceId:
+						return `${topicResolved.applicationId}.devices.${devUid}.${topicResolved.deviceId}`;
+
+					default:
+						return message;
+				}
+			}
+			else{
+				return message;
 			}
 		}
 		else{
-			return message;
+			this.adapter.log.warn(`no devEui found in message`);
+			this.adapter.log.warn(`message: ${message}`);
 		}
 	}
 }

package/lib/modules/downlinkConfighandler.js

@@ -15,6 +15,7 @@ class downlinkConfighandlerClass {
 	 * ******************************************************************/
 
 	addAndMergeDownlinkConfigs(){
+		this.adapter.log.debug(`the standard and configed downlinks will be merged`);
 		// @ts-ignore
 		for(const downlinkConfig of Object.values(this.downlinks.internalDownlinks)){
 			this.addDownlinkConfigByType(downlinkConfig);
@@ -35,6 +36,7 @@ class downlinkConfighandlerClass {
 
 	getDownlinkConfig(changeInfo,options){
 		const activeFunction = "getDownlinkConfig";
+		this.adapter.log.debug(`the downlinkconfig is requested for the following changeinfo: ${JSON.stringify(changeInfo)}`);
 		try{
 			let downlinkConfig = undefined;
 			for(const deviceType in this.activeDownlinkConfigs){
@@ -69,12 +71,13 @@ class downlinkConfighandlerClass {
 	}
 
 	getDownlink(downlinkConfig,state,changeInfo){
-		// Select datahandling in case of origin
-		if(this.adapter.config.origin === "ttn"){
-			return this.getTtnDownlink(downlinkConfig,state);
-		}
-		else if(this.adapter.config.origin === "chirpstack"){
-			return this.getChirpstackDownlink(downlinkConfig,state,changeInfo);
+		// Select downlink in case of origin
+		this.adapter.log.debug(`the downlink for the changeinfo ${JSON.stringify(changeInfo)} is requested`);
+		switch(this.adapter.config.origin){
+			case "ttn":
+				return this.getTtnDownlink(downlinkConfig,state);
+			case "chirpstack":
+				return this.getChirpstackDownlink(downlinkConfig,state,changeInfo);
 		}
 	}
 
@@ -84,6 +87,7 @@ class downlinkConfighandlerClass {
 
 	calculatePayload(downlinkConfig,state){
 		// declare pyaload variable
+		this.adapter.log.debug(`the payload will be calculated`);
 		let payloadInHex = "";
 		let multipliedVal = 0;
 		//Check type
@@ -129,13 +133,13 @@ class downlinkConfighandlerClass {
 	 * *********************** Downlinktopic *****************************
 	 * ******************************************************************/
 
-	getDownlinkTopic(id,suffix){
-		// Select datahandling in case of origin
-		if(this.adapter.config.origin === "ttn"){
-			return this.getTtnDownlinkTopicFromDirektory(id,suffix);
-		}
-		else if(this.adapter.config.origin === "chirpstack"){
-			//	 this.handleChirpstack(topic,message);
+	getDownlinkTopic(changeInfo,suffix){
+		// Select downlinktopic in case of origin
+		switch(this.adapter.config.origin){
+			case "ttn":
+				return this.getTtnDownlinkTopicFromDirektory(changeInfo,suffix);
+			case "chirpstack":
+				return this.getChirpstackDownlinkTopicFromDirektory(changeInfo,suffix);
 		}
 	}
 
@@ -148,6 +152,7 @@ class downlinkConfighandlerClass {
 	 * ******************************************************************/
 
 	getTtnDownlinkTopicFromDirektory(changeInfo,suffix){
+		this.adapter.log.debug(`the downlinktopic for ttn is requested`);
 		const topicElements = {
 			Version : "v3",
 			applicationId : `/${changeInfo.applicationId}`,
@@ -168,6 +173,7 @@ class downlinkConfighandlerClass {
 	 * ******************************************************************/
 
 	getTtnDownlink(downlinkConfig,state){
+		this.adapter.log.debug(`the downlink for ttn is requested`);
 		const payloadInBase64 = this.calculatePayload(downlinkConfig,state);
 		// retun the whole downlink
 		return 	{downlinks:[{f_port:downlinkConfig.port,frm_payload:payloadInBase64,priority:downlinkConfig.priority,confirmed:downlinkConfig.confirmed}]};
@@ -185,11 +191,12 @@ class downlinkConfighandlerClass {
 	 * ******************************************************************/
 
 	getChirpstackDownlinkTopicFromDirektory(changeInfo,suffix){
+		this.adapter.log.debug(`the downlinktopic for chirpstack is requested`);
 		const topicElements = {
 			Version : "application",
 			applicationId : `/${changeInfo.applicationId}`,
-			devices : `/device`,
-			device_id : `/${changeInfo.device_id}`,
+			device : `/device`,
+			device_uid : `/${changeInfo.dev_uid}`,
 			command: `/command`,
 			suffix : suffix
 		};
@@ -205,6 +212,7 @@ class downlinkConfighandlerClass {
 	 * ******************************************************************/
 
 	getChirpstackDownlink(downlinkConfig,state,changeInfo){
+		this.adapter.log.debug(`the downlink for chirpstack is requested`);
 		const payloadInBase64 = this.calculatePayload(downlinkConfig,state);
 		// retun the whole downlink
 		return 	{devEui:changeInfo.dev_uid,confirmed:downlinkConfig.confirmed,fPort:downlinkConfig.port,data:payloadInBase64};

package/lib/modules/downlinks/downlinks.js

@@ -19,28 +19,30 @@ class downlinksClass {
 				isConfiguration: true
 			}
 		];
-		if(adapter.config.origin === "ttn"){
-			this.internalDownlinks.unshift(
-			// @ts-ignore
-				{
-					name: "push",
-					type: "json",
-					deviceType: "all"
-				},
-				{
-					name: "replace",
-					type: "json",
-					deviceType: "all"
-				});
-		}
-		else if(adapter.config.origin === "chirpstack"){
-			this.internalDownlinks.unshift(
-			// @ts-ignore
-				{
-					name: "push",
-					type: "json",
-					deviceType: "all"
-				});
+		// Select downlink in case of origin
+		switch(adapter.config.origin){
+			case "ttn":
+				this.internalDownlinks.unshift(
+					// @ts-ignore
+					{
+						name: "push",
+						type: "json",
+						deviceType: "all"
+					},
+					{
+						name: "replace",
+						type: "json",
+						deviceType: "all"
+					});
+				break;
+			case "chirpstack":
+				this.internalDownlinks.unshift(
+				// @ts-ignore
+					{
+						name: "push",
+						type: "json",
+						deviceType: "all"
+					});
 		}
 	}
 

package/lib/modules/messagehandler.js

@@ -13,11 +13,12 @@ class messagehandlerClass {
 
 	async handleMessage(topic,message){
 		// Select datahandling in case of origin
-		if(this.adapter.config.origin === "ttn"){
-			await this.handleTtnMessage(topic,message);
-		}
-		else if(this.adapter.config.origin === "chirpstack"){
-			await this.handleChirpstackMessage(topic,message);
+		switch(this.adapter.config.origin){
+			case "ttn":
+				await this.handleTtnMessage(topic,message);
+				break;
+			case "chirpstack":
+				await this.handleChirpstackMessage(topic,message);
 		}
 	}
 
@@ -46,6 +47,7 @@ class messagehandlerClass {
 	async fillWithDownlinkConfig(deviceStartdirectory){
 		for(const downlinkDevices of Object.values(this.adapter.downlinkConfighandler.activeDownlinkConfigs)){
 			for(const downlinkConfig of Object.values(downlinkDevices)){
+				this.adapter.log.debug(`the downlinkconfig ${JSON.stringify(downlinkConfig)}, will checked.`);
 				let startDirectory = "";
 				if(!downlinkConfig.isConfiguration){
 					startDirectory = `${deviceStartdirectory}.downlink.control`;
@@ -100,14 +102,15 @@ class messagehandlerClass {
 
 		try{
 			const messageType = topic.substring(topic.lastIndexOf("/") + 1 ,topic.length);
-
+			this.adapter.log.debug(`the messagetype ${messageType} was determined`);
 			// generate startdirectory of device
-			const deviceStartdirectory = this.directoryhandler.getObjectDirectory(message,this.directoryhandler.searchableAttributeNames.deviceId);
+			const deviceStartdirectory = this.directoryhandler.getObjectDirectory(topic,message,this.directoryhandler.searchableAttributeNames.deviceId);
+			this.adapter.log.debug(`the startdirectory ${deviceStartdirectory} was determined`);
+
 			/*********************************************************************
 			 * ************************ Main directories *************************
 			 * ******************************************************************/
 
-			await this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories,"",message);
 			/*********************************************************************
 			 * ************************* Infodata ********************************
 			 * ******************************************************************/
@@ -119,11 +122,16 @@ class messagehandlerClass {
 			// check for uplink message
 			if(messageType === "up"){//if(message.uplink_message){
 
+				// Generate new directories only with uplink
+
+				await this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories,"",topic,message);
+
 				/*********************************************************************
 				 * ************************ Rawdata json *****************************
 				 * ******************************************************************/
 
 				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkRaw]){
+					this.adapter.log.debug(`write rawdata`);
 					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkRaw];
 					// write json
 					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.json`,{
@@ -146,6 +154,7 @@ class messagehandlerClass {
 					// check for frm payload
 					if(message.uplink_message.frm_payload){
 						// wite base64 data
+						this.adapter.log.debug(`write base64`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.base64`,{
 							type: "state",
 							common: {
@@ -161,6 +170,7 @@ class messagehandlerClass {
 						await this.adapter.setStateAsync(`${startDirectory}.base64`,writedata,true);
 
 						// write base64 data in hex data
+						this.adapter.log.debug(`write hex`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.hex`,{
 							type: "state",
 							common: {
@@ -176,6 +186,7 @@ class messagehandlerClass {
 						await this.adapter.setStateAsync(`${startDirectory}.hex`,hexdata,true);
 
 						// write base64 data in string data
+						this.adapter.log.debug(`write string`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.string`,{
 							type: "state",
 							common: {
@@ -198,7 +209,8 @@ class messagehandlerClass {
 
 				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkDecoded]){
 					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkDecoded];
-					await this.directoryhandler.generateRekursivObjects(message.uplink_message.decoded_payload,startDirectory,message);
+					this.adapter.log.debug(`write decoded payload`);
+					await this.directoryhandler.generateRekursivObjects(message.uplink_message.decoded_payload,startDirectory,topic,message);
 				}
 
 				/*********************************************************************
@@ -207,8 +219,9 @@ class messagehandlerClass {
 
 				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkRemaining]){
 					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkRemaining];
+					this.adapter.log.debug(`write remaining uplink data`);
 					// @ts-ignore
-					await this.directoryhandler.generateRekursivObjects(message.uplink_message,startDirectory,message,{ignoredElementNames:{decoded_payload:{},frm_payload:{}}});
+					await this.directoryhandler.generateRekursivObjects(message.uplink_message,startDirectory,topic,message,{ignoredElementNames:{decoded_payload:{},frm_payload:{}}});
 				}
 			}
 
@@ -219,10 +232,7 @@ class messagehandlerClass {
 			// check for uplink message
 			else if(messageType === "queued" || messageType === "sent"){ //if(message.downlink_queued || message.downlink_sent)//if(message.downlink_queued || message.downlink_sent){
 				// Check wich downlink was recieved
-				let downlinkType = "downlink_queued";
-				if(message.downlink_sent){
-					downlinkType = "downlink_sent";
-				}
+				const downlinkType = `downlink_${messageType}`;
 				/*********************************************************************
 				 * ************************ Rawdata json *****************************
 				 * ******************************************************************/
@@ -230,6 +240,7 @@ class messagehandlerClass {
 				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.downlinkRaw]){
 					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.downlinkRaw];
 					// write json
+					this.adapter.log.debug(`write rawdata`);
 					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.json`,{
 						type: "state",
 						common: {
@@ -248,6 +259,7 @@ class messagehandlerClass {
 				 	* ******************************************************************/
 
 					// check for frm payload
+					this.adapter.log.debug(`write base64`);
 					if(message[downlinkType].frm_payload){
 						// wite base64 data
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.base64`,{
@@ -265,6 +277,7 @@ class messagehandlerClass {
 						await this.adapter.setStateAsync(`${startDirectory}.base64`,writedata,true);
 
 						// write base64 data in hex data
+						this.adapter.log.debug(`write hex`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.hex`,{
 							type: "state",
 							common: {
@@ -280,6 +293,7 @@ class messagehandlerClass {
 						await this.adapter.setStateAsync(`${startDirectory}.hex`,hexdata,true);
 
 						// write base64 data in string data
+						this.adapter.log.debug(`write string`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.string`,{
 							type: "state",
 							common: {
@@ -302,20 +316,21 @@ class messagehandlerClass {
 
 				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.downlinkRemaining]){
 					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.downlinkRemaining];
+					this.adapter.log.debug(`write remaining downlink data`);
 					// @ts-ignore
-					await this.directoryhandler.generateRekursivObjects(message[downlinkType],startDirectory,message,{ignoredElementNames:{frm_payload:{}}});
+					await this.directoryhandler.generateRekursivObjects(message[downlinkType],startDirectory,topic,message,{ignoredElementNames:{frm_payload:{}}});
 				}
 			}
 
 			/*********************************************************************
 			 * ********************** downlinkConfigs ****************************
 			 * ******************************************************************/
-
+			this.adapter.log.debug(`check configed downlinks`);
 			await this.fillWithDownlinkConfig(deviceStartdirectory);
 		}
 		catch(error){
-			this.adapter.log.warn("Message: " + JSON.stringify(message));
 			this.adapter.log.error(`error at ${activeFunction}: ` + error);
+			this.adapter.log.warn("Message: " + JSON.stringify(message));
 		}
 	}
 
@@ -337,14 +352,15 @@ class messagehandlerClass {
 
 		try{
 			const messageType = topic.substring(topic.lastIndexOf("/") + 1 ,topic.length);
-
+			this.adapter.log.debug(`the messagetype ${messageType} was determined`);
 			// generate startdirectory of device
-			const deviceStartdirectory = this.directoryhandler.getObjectDirectory(message,this.directoryhandler.searchableAttributeNames.deviceId);
+			const deviceStartdirectory = this.directoryhandler.getObjectDirectory(topic,message,this.directoryhandler.searchableAttributeNames.deviceId);
+			this.adapter.log.debug(`the startdirectory ${deviceStartdirectory} was determined`);
+
 			/*********************************************************************
 			 * ************************ Main directories *************************
 			 * ******************************************************************/
 
-			await this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories,"",message);
 			/*********************************************************************
 			 * ************************* Infodata ********************************
 			 * ******************************************************************/
@@ -356,6 +372,9 @@ class messagehandlerClass {
 			// check for uplink message
 			if(messageType === "up"){//if(message.uplink_message){
 
+				// generate new directories only with uplink
+				await this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories,"",topic,message);
+
 				/*********************************************************************
 				 * ************************ Rawdata json *****************************
 				 * ******************************************************************/
@@ -363,6 +382,7 @@ class messagehandlerClass {
 				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkRaw]){
 					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkRaw];
 					// write json
+					this.adapter.log.debug(`write rawdata`);
 					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.json`,{
 						type: "state",
 						common: {
@@ -383,6 +403,7 @@ class messagehandlerClass {
 					// check for data
 					if(message.data){
 						// wite base64 data
+						this.adapter.log.debug(`write base64`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.base64`,{
 							type: "state",
 							common: {
@@ -398,6 +419,7 @@ class messagehandlerClass {
 						await this.adapter.setStateAsync(`${startDirectory}.base64`,writedata,true);
 
 						// write base64 data in hex data
+						this.adapter.log.debug(`write hex`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.hex`,{
 							type: "state",
 							common: {
@@ -413,6 +435,7 @@ class messagehandlerClass {
 						await this.adapter.setStateAsync(`${startDirectory}.hex`,hexdata,true);
 
 						// write base64 data in string data
+						this.adapter.log.debug(`write string`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.string`,{
 							type: "state",
 							common: {
@@ -430,12 +453,13 @@ class messagehandlerClass {
 				}
 
 				/*********************************************************************
-				 * ********************** decoded payload ****************************
+				 * ****************** decoded payload (Object) ***********************
 				 * ******************************************************************/
 
 				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkDecoded]){
 					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkDecoded];
-					await this.directoryhandler.generateRekursivObjects(message.object,startDirectory,message);
+					this.adapter.log.debug(`write decoded payload (Object)`);
+					await this.directoryhandler.generateRekursivObjects(message.object,startDirectory,topic,message);
 				}
 
 				/*********************************************************************
@@ -444,8 +468,9 @@ class messagehandlerClass {
 
 				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkRemaining]){
 					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.uplinkRemaining];
+					this.adapter.log.debug(`write remaining uplink data`);
 					// @ts-ignore
-					await this.directoryhandler.generateRekursivObjects(message,startDirectory,message,{ignoredElementNames:{deduplicationId:{},deviceInfo:{},data:{},object:{}}});
+					await this.directoryhandler.generateRekursivObjects(message,startDirectory,topic,message,{ignoredElementNames:{deduplicationId:{},deviceInfo:{},data:{},object:{}}});
 				}
 			}
 
@@ -454,12 +479,8 @@ class messagehandlerClass {
 			 * ******************************************************************/
 
 			// check for uplink message
-			else if(messageType === "queued" || messageType === "sent"){ //if(message.downlink_queued || message.downlink_sent)//if(message.downlink_queued || message.downlink_sent){
-				// Check wich downlink was recieved
-				let downlinkType = "downlink_queued";
-				if(message.downlink_sent){
-					downlinkType = "downlink_sent";
-				}
+			else if(messageType === "down"){ //if(message.downlink_queued || message.downlink_sent)//if(message.downlink_queued || message.downlink_sent){
+
 				/*********************************************************************
 				 * ************************ Rawdata json *****************************
 				 * ******************************************************************/
@@ -467,6 +488,7 @@ class messagehandlerClass {
 				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.downlinkRaw]){
 					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.downlinkRaw];
 					// write json
+					this.adapter.log.debug(`write rawdata`);
 					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.json`,{
 						type: "state",
 						common: {
@@ -480,21 +502,14 @@ class messagehandlerClass {
 					});
 					await this.adapter.setStateAsync(`${startDirectory}.json`,JSON.stringify(message),true);
 
-
-
-
-					// Ab hier muss mal geschautr werden, was kommt
-
-
-
-
 					/*********************************************************************
 				 	* ********************** Rawdata (Base64) ***************************
 				 	* ******************************************************************/
 
-					// check for frm payload
-					if(message[downlinkType].frm_payload){
+					// check for data
+					if(message.data){
 						// wite base64 data
+						this.adapter.log.debug(`write base64`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.base64`,{
 							type: "state",
 							common: {
@@ -506,10 +521,11 @@ class messagehandlerClass {
 							},
 							native: {},
 						});
-						const writedata = message[downlinkType].frm_payload;
+						const writedata = message.data;
 						await this.adapter.setStateAsync(`${startDirectory}.base64`,writedata,true);
 
 						// write base64 data in hex data
+						this.adapter.log.debug(`write hex`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.hex`,{
 							type: "state",
 							common: {
@@ -521,10 +537,11 @@ class messagehandlerClass {
 							},
 							native: {},
 						});
-						const hexdata = Buffer.from(message[downlinkType].frm_payload,"base64").toString("hex").toUpperCase();
+						const hexdata = Buffer.from(message.data,"base64").toString("hex").toUpperCase();
 						await this.adapter.setStateAsync(`${startDirectory}.hex`,hexdata,true);
 
 						// write base64 data in string data
+						this.adapter.log.debug(`write string`);
 						await this.adapter.setObjectNotExistsAsync(`${startDirectory}.string`,{
 							type: "state",
 							common: {
@@ -536,7 +553,7 @@ class messagehandlerClass {
 							},
 							native: {},
 						});
-						const stringdata = Buffer.from(message[downlinkType].frm_payload,"base64").toString();
+						const stringdata = Buffer.from(message.data,"base64").toString();
 						await this.adapter.setStateAsync(`${startDirectory}.string`,stringdata,true);
 					}
 				}
@@ -545,22 +562,17 @@ class messagehandlerClass {
 				 * ************************* remaining *******************************
 				 * ******************************************************************/
 
-				if(this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.downlinkRemaining]){
-					const startDirectory = this.directoryhandler.reachableDirectories[deviceStartdirectory][this.directoryhandler.safeableDirectories.downlinkRemaining];
-					// @ts-ignore
-					await this.directoryhandler.generateRekursivObjects(message[downlinkType],startDirectory,message,{ignoredElementNames:{frm_payload:{}}});
-				}
 			}
 
 			/*********************************************************************
 			 * ********************** downlinkConfigs ****************************
 			 * ******************************************************************/
-
+			this.adapter.log.debug(`check configed downlinks`);
 			await this.fillWithDownlinkConfig(deviceStartdirectory);
 		}
 		catch(error){
-			this.adapter.log.warn("Message: " + JSON.stringify(message));
 			this.adapter.log.error(`error at ${activeFunction}: ` + error);
+			this.adapter.log.warn("Message: " + JSON.stringify(message));
 		}
 	}
 

package/lib/modules/mqttclient.js

@@ -13,7 +13,8 @@ class mqttClientClass {
 		this.client.on("connect", () => {
 			this.adapter.log.info(`Connection is active.`);
 			this.adapter.setState("info.connection", true, true);
-			this.client.subscribe("#", (err) => {
+			// @ts-ignore
+			this.client.subscribe(this.getSubscribtionArray(), (err) => {
 				if (err) {
 					this.adapter.log.error(`On subscribe: ${err}`);
 				}
@@ -21,7 +22,7 @@ class mqttClientClass {
 		});
 		this.client.on("disconnect", () => {
 			this.adapter.setState("info.connection", false, true);
-			this.adapter.log.debug(`disconnected`);
+			this.adapter.log.info(`disconnected`);
 		});
 		this.client.on("error", (err) => {
 			this.adapter.log.error(`${err}`);
@@ -33,6 +34,8 @@ class mqttClientClass {
 		});
 
 		this.client.on("message", async (topic, message) => {
+			this.adapter.log.debug(`incomming topic: ${topic}`);
+			this.adapter.log.debug(`incomming message: ${message}`);
 			// @ts-ignore
 			message = JSON.parse(message);
 
@@ -47,6 +50,15 @@ class mqttClientClass {
 	destroy(){
 		this.client.end();
 	}
+
+	getSubscribtionArray(){
+		switch(this.adapter.config.origin){
+			case "ttn":
+				return ["v3/+/devices/+/up","v3/+/devices/+/down/#"];
+			case "chirpstack":
+				return ["application/+/device/+/event/up","application/+/device/+/command/down"];
+		}
+	}
 }
 
 module.exports = mqttClientClass;

package/main.js

@@ -33,37 +33,6 @@ class Lorawan extends utils.Adapter {
 	async onReady() {
 		const activeFunction = "onReady";
 		try{
-		/*
-			Definitionen der Umrechnungen:
-			dec to hex:
-			const decdata = 33;
-			const decdatastring = decdata.toString(16);
-
-			base64 to hex:
-			return(Buffer.from(base_64, 'base64').toString("hex"));
-
-			ascii to hex:
-			return (Buffer.from(ascii).toString('hex'));
-
-			ascii to base64:
-			return (Buffer.from(ascii).toString('base64'));
-
-			base64 to string:
-			return(Buffer.from(base_64, 'base64').toString());
-
-			hex 2 base64:
-			return Buffer.from(hex, 'hex').toString('base64')
-
-			hex 2 number:
-			parseInt(hexdata,16);
-
-			return Math.abs(dec).toString(16);
-			// force 4 Digits
-			//return ('0000' + dec.toString(16).toUpperCase()).slice(-4);
-			// force 2 Digits
-			// return ('00' + dec.toString(16).toUpperCase()).slice(-2);
-
-	*/
 			// create downlinkConfigs
 			this.downlinkConfighandler = new downlinkConfighandlerClass(this);
 
@@ -82,81 +51,7 @@ class Lorawan extends utils.Adapter {
 			//Subscribe all configuration and control states
 			this.subscribeStatesAsync("*.configuration.*");
 			this.subscribeStatesAsync("*downlink.control.*");
-
-			this.fakeMessage = {
-				"deduplicationId":"655e5d71-a625-4332-833c-2700fcacefc2",
-				"time":"2024-01-17T21:08:41.551292+00:00",
-				"deviceInfo":{
-					"tenantId":"52f14cd4-c6f1-4fbd-8f87-4025e1d49242",
-					"tenantName":"ChirpStack",
-					"applicationId":"59bcc5a7-59e2-4481-9615-fc4e58791915",
-					"applicationName":"Mclimate_Vicki",
-					"deviceProfileId":"3a9bc28f-3664-4bdf-b3be-a20d1eb32dc8",
-					"deviceProfileName":"Mclimate_Vicki",
-					"deviceName":"MClimate_Vicki_Heizkoerperventil_001",
-					"devEui":"70b3d52dd300ed31",
-					"deviceClassEnabled":"CLASS_A",
-					"tags":{
-					}
-				},
-				"devAddr":"01343968",
-				"adr":true,
-				"dr":5,
-				"fCnt":8702,
-				"fPort":2,
-				"confirmed":false,
-				"data":"GAGBDItw9vYR0DA=",
-				"object":{
-					"attachedBackplate":true,
-					"batteryVoltage":3.3,
-					"relativeHumidity":43.75,
-					"childLock":false,
-					"brokenSensor":false,
-					"calibrationFailed":false,
-					"sensorTemperature":19.53,
-					"motorPosition":502.0,
-					"highMotorConsumption":false,
-					"reason":81.0,
-					"perceiveAsOnline":true,
-					"targetTemperature":12.0,
-					"lowMotorConsumption":false,
-					"operationalMode":1.0,
-					"openWindow":false,
-					"motorRange":502.0
-				},
-				"rxInfo":[
-					{
-						"gatewayId":"50313953530a4750",
-						"uplinkId":56321,
-						"gwTime":"2024-01-17T21:08:41.551292+00:00",
-						"nsTime":"2024-01-17T21:08:41.570017809+00:00",
-						"rssi":-74,
-						"snr":11.0,
-						"channel":4,
-						"location":{
-							"latitude":53.55485739669679,
-							"longitude":9.921609163284304
-						},
-						"context":"albPhA==",
-						"metadata":{
-							"region_config_id":"eu868",
-							"region_common_name":"EU868"
-						},
-						"crcStatus":"CRC_OK"
-					}
-				],
-				"txInfo":{
-					"frequency":867300000,
-					"modulation":{
-						"lora":{
-							"bandwidth":125000,
-							"spreadingFactor":7,
-							"codeRate":"CR_4_5"
-						}
-					}
-				}
-			};
-			//await this.messagehandler.handleMessage("a/up", this.fakeMessage);
+			this.log.debug(`the adapter start with the config: ${JSON.stringify(this.config)}.`);
 		}
 		catch(error){
 			this.log.error(`error at ${activeFunction}: ` + error.stack);
@@ -207,8 +102,8 @@ class Lorawan extends utils.Adapter {
 				if(!state.ack){
 					// Check for downlink in id
 					if(id.indexOf("downlink") !== -1){
+						this.log.debug(`the state ${id} has changed to ${state.val}.`);
 						// get information of the changing state
-						// @ts-ignore
 						const changeInfo = await this.getChangeInfo(id);
 						if(this.config.origin === "ttn"){
 							let appending = "push";
@@ -276,6 +171,7 @@ class Lorawan extends utils.Adapter {
 	async getChangeInfo(id){
 		const activeFunction = "getChangeInfo";
 		try{
+			this.log.debug(`changeinfo of id ${id}, will be generated.`);
 			id = this.removeNamespace(id);
 			const idElements = id.split(".");
 			const changeInfo = {
@@ -292,6 +188,7 @@ class Lorawan extends utils.Adapter {
 				// @ts-ignore
 				changeInfo.deviceType = deviceTypeIdState.val;
 			}
+			this.log.debug(`changeinfo is ${JSON.stringify(changeInfo)}.`);
 			return changeInfo;
 		}
 		catch(error){
@@ -301,6 +198,7 @@ class Lorawan extends utils.Adapter {
 
 	removeNamespace(id){
 		if(id.indexOf(this.namespace) !== -1){
+			this.log.debug(`namespace will be removed from id ${id}.`);
 			id = id.substring(this.namespace.length + 1,id.length);
 		}
 		return id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.lorawan",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "converts the desired lora gateway data to a ioBroker structure",
   "author": {
     "name": "BenAhrdt",