iobroker.lorawan 0.3.5 → 0.3.7

package/README.md

@@ -22,6 +22,12 @@ For now there is documentation in English here: http://www.hafenmeister.com/Lora
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.3.7 (2024-02-22)
+* (BenAhrdt) improove forbidden chars and implements join raw
+
+### 0.3.6 (2024-02-21)
+* (BenAhrdt) set attributs if undefined
+
 ### 0.3.5 (2024-02-21)
 * (BenAhrdt) set tier to 2 and improove standard devices
 

package/admin/jsonConfig.json

@@ -180,7 +180,8 @@
 									"label": "name",
 									"tooltip": "nameTooltip",
 									"default": "",
-									"validator": "if(data.name === '' || data.name === null){return false;}else{return true;}",
+									"validator": "if(data.name === '' || data.name === null){return false;}else{const myRegEx = /^([0-9a-z])*$/i; return myRegEx.test(data.name);}",
+									"validatorNoSaveOnError": true,
 									"sm":2
 								},
 								{
@@ -246,6 +247,7 @@
 									"tooltip": "frontTooltip",
 									"default": "03",
 									"validator": "if(data.type !== 'string'){const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.front)}else{return true}",
+									"validatorNoSaveOnError": true,
 									"hidden": "data.type === 'boolean' || data.type === 'button'",
 									"sm":2
 								},
@@ -256,6 +258,7 @@
 									"tooltip": "endTooltip",
 									"default": "11",
 									"validator": "if(data.type !== 'string'){const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.front)}else{return true}",
+									"validatorNoSaveOnError": true,
 									"hidden": "data.type === 'boolean' || data.type === 'button'",
 									"sm":2
 								},
@@ -278,6 +281,7 @@
 									"tooltip": "onTooltip",
 									"default": "01",
 									"validator": "const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.on);",
+									"validatorNoSaveOnError": true,
 									"hidden": "data.type !== 'boolean'",
 									"sm":2
 								},
@@ -288,6 +292,7 @@
 									"tooltip": "offTooltip",
 									"default": "11",
 									"validator": "const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.off);",
+									"validatorNoSaveOnError": true,
 									"hidden": "data.type !== 'boolean'",
 									"sm":2
 								},
@@ -299,6 +304,7 @@
 									"tooltip": "onClickTooltip",
 									"default": "030111",
 									"validator": "const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.onClick);",
+									"validatorNoSaveOnError": true,
 									"hidden": "data.type !== 'button'",
 									"sm":2
 								},

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.3.5",
+    "version": "0.3.7",
     "news": {
+      "0.3.7": {
+        "en": "improove forbidden chars and implements join raw",
+        "de": "unproove verbotene wagen und geräte roh beitreten",
+        "ru": "импровизировать запрещенные шары и реализаций присоединяются к сырому",
+        "pt": "improove proibido chars e implementos se juntar cru",
+        "nl": "improove verboden tekens en werktuigen samen rauw",
+        "fr": "improove prohibed chars and implements joignent brut",
+        "it": "improove vietati carboni e strumenti si uniscono crudo",
+        "es": "improove chars prohibidos e implementos se unen a crudo",
+        "pl": "improove zakazane znaki i narzędzia dołączyć surowe",
+        "uk": "неприпустимий заборонений діаграма і реалізує приєднатися до сировини",
+        "zh-cn": "将禁用字符和工具合并为原始字符"
+      },
+      "0.3.6": {
+        "en": "set attributs if undefined",
+        "de": "wenn nicht definiert",
+        "ru": "набор атрибутов, если не определено",
+        "pt": "definir atributos se indefinido",
+        "nl": "attributes instellen indien niet gedefinieerd",
+        "fr": "définir les attributs si non définis",
+        "it": "attributi impostati se non definiti",
+        "es": "conjunto atributos si no definido",
+        "pl": "set attributs if undefined",
+        "uk": "встановити attributs if undefined",
+        "zh-cn": "如果未定义, 设置附件"
+      },
       "0.3.5": {
         "en": "set tier to 2 and improove standard devices",
         "de": "tier auf 2 und improovierte standardgeräte",
@@ -67,32 +93,6 @@
         "pl": "odbudowa dzięki lepszemu rozwiązywaniu problemów",
         "uk": "перебудувати краще повідомлення",
         "zh-cn": "以更好的信息重建"
-      },
-      "0.3.0": {
-        "en": "define user friendly Blockly Blocks with result",
-        "de": "benutzerfreundlich definieren Blockly Blocks mit Ergebnis",
-        "ru": "определение пользователя Блоки с результатом",
-        "pt": "definir amigável Blocos com resultado",
-        "nl": "gebruikersvriendelijk definiëren Blokkeren met resultaat",
-        "fr": "définir une utilisation conviviale Blocs avec résultat",
-        "it": "definire l'utente amichevole Blocchi Blockly con risultato",
-        "es": "definir fácil de usar Bloqueo bloques con resultado",
-        "pl": "zdefiniować przyjazny dla użytkownika Blokady z wynikiem",
-        "uk": "визначення дружності користувача Блокнотні блоки з результатом",
-        "zh-cn": "定义用户友好 块状块及结果"
-      },
-      "0.2.1": {
-        "en": "check types of messaging values and implements more blockly blocks",
-        "de": "überprüfen sie die arten der messaging-werte und implementiert mehr blockweise blöcke",
-        "ru": "проверить типы значений обмена сообщениями и реализовать более блоков",
-        "pt": "verificar os tipos de valores de mensagens e implementa blocos mais bloqueados",
-        "nl": "controleer soorten messaging waarden en implementeert meer blokken",
-        "fr": "vérifier les types de valeurs de messagerie et implémente des blocs plus bloc",
-        "it": "controllare i tipi di valori di messaggistica e implementa più blocchi bloccati",
-        "es": "comprobar tipos de valores de mensajería e implementar bloques más bloque",
-        "pl": "sprawdzają typy wartości wiadomości i wdrażają blokowane bloki",
-        "uk": "перевіряти типи значень обміну повідомленнями та реалізовувати більше блоків",
-        "zh-cn": "检查消息值的类型, 执行更多块"
       }
     },
     "title": "LoRaWAN",

package/lib/modules/directorieshandler.js

@@ -24,7 +24,9 @@ class directorieshandlerClass {
 			downlinkControl: "downlink.control",
 			downlinkRemaining: "downlink.remaining",
 			downlinkNextSend: "downlink.nextSend",
-			downlinkLastSend: "downlink.lastSend"
+			downlinkLastSend: "downlink.lastSend",
+			join: "join",
+			joinRaw: "join.raw"
 		};
 
 		//define path for uplink roles
@@ -96,6 +98,10 @@ class directorieshandlerClass {
 							remaining:{
 							}
 						},
+						join:{
+							raw:{
+							}
+						}
 					}
 				}
 			}

package/lib/modules/downlinkConfighandler.js

@@ -44,17 +44,17 @@ class downlinkConfighandlerClass {
 		const activeFunction = "addAndMergeDownlinkConfigs";
 		this.adapter.log.silly(`the standard and configed downlinks will be merged`);
 		try{
-			// Add standard downlink config
+			// Add user downlink config first
+			for(const downlinkConfig of Object.values(this.adapter.config.downlinkConfig)){
+				this.addDownlinkConfigByType(downlinkConfig,this.activeDownlinkConfigs);
+			}
+			// Add standard downlink config if devices not present
 			const internalDownlinks = this.getJsonArrayFromDirectoryfiles(`${this.adapter.adapterDir}${this.deviceProfilesPath}`);
 			if(Array.isArray(internalDownlinks)){
 				for(const downlinkConfig of Object.values(internalDownlinks)){
 					this.addDownlinkConfigByType(downlinkConfig,this.activeDownlinkConfigs);
 				}
 			}
-			// Add user downlink config
-			for(const downlinkConfig of Object.values(this.adapter.config.downlinkConfig)){
-				this.addDownlinkConfigByType(downlinkConfig,this.activeDownlinkConfigs);
-			}
 			// Check active userconfig
 			const adapterId = `system.adapter.${this.adapter.namespace}`;
 			const obj = await this.adapter.getForeignObjectAsync(adapterId);
@@ -89,22 +89,25 @@ class downlinkConfighandlerClass {
 	addDownlinkConfigByType(downlinkConfig,config){
 		const activeFunction = "addDownlinkConfigByType";
 		try{
-			// override standard with userconfig
-			config[downlinkConfig.deviceType] = structuredClone(downlinkConfig);
-			config[downlinkConfig.deviceType].downlinkState = {};
-			// generate downlinkstates for internal use
-			for(const downlinkParameter of Object.values(config[downlinkConfig.deviceType].downlinkParameter)){
-				// check name for forbidden chars
-				downlinkParameter.name = downlinkParameter.name.replace(this.adapter.FORBIDDEN_CHARS,"_");
-				// check the downlinkparameters for all needed attributes and generate them if undefined
-				for(const attribute in this.downlinkParameterAttributs){
-					if(downlinkConfig.deviceType !== this.internalDevices.baseDevice && downlinkParameter[attribute] === undefined){
-						this.adapter.log.warn(`attribute ${attribute} in parameter ${downlinkParameter.name} at devicetype ${downlinkConfig.deviceType} generated`);
-						downlinkParameter[attribute] = this.downlinkParameterAttributs[attribute];
+			// Check for device not present
+			if(!config[downlinkConfig.deviceType]){
+				// override standard with userconfig
+				config[downlinkConfig.deviceType] = structuredClone(downlinkConfig);
+				config[downlinkConfig.deviceType].downlinkState = {};
+				// generate downlinkstates for internal use
+				for(const downlinkParameter of Object.values(config[downlinkConfig.deviceType].downlinkParameter)){
+					// check name for forbidden chars
+					downlinkParameter.name = downlinkParameter.name.replace(this.adapter.FORBIDDEN_CHARS,"_");
+					// check the downlinkparameters for all needed attributes and generate them if undefined
+					for(const attribute in this.downlinkParameterAttributs){
+						if(downlinkConfig.deviceType !== this.internalDevices.baseDevice && downlinkParameter[attribute] === undefined){
+							this.adapter.log.debug(`attribute ${attribute} in parameter ${downlinkParameter.name} at devicetype ${downlinkConfig.deviceType} generated`);
+							downlinkParameter[attribute] = this.downlinkParameterAttributs[attribute];
+						}
 					}
+					// assign downlinkparamter to internal structure
+					config[downlinkConfig.deviceType].downlinkState[downlinkParameter.name] = downlinkParameter;
 				}
-				// assign downlinkparamter to internal structure
-				config[downlinkConfig.deviceType].downlinkState[downlinkParameter.name] = downlinkParameter;
 			}
 		}
 		catch(error){

package/lib/modules/messagehandler.js

@@ -185,7 +185,7 @@ class messagehandlerClass {
 			 * ****************** Check device startdirectory ********************
 			 * ******************************************************************/
 
-			if(messageType !== "up" && !await this.adapter.objectExists(`${deviceStartdirectory}`)){
+			if(messageType !== "up" && messageType !== "join" && !await this.adapter.objectExists(`${deviceStartdirectory}`)){
 				this.adapter.log.debug(`There was a message with the topic ${topic}, but the object ${deviceStartdirectory} does not exists yet.`);
 				return;
 			}
@@ -199,7 +199,7 @@ class messagehandlerClass {
 			 * ******************************************************************/
 
 			// check for uplink message
-			if(messageType === "up"){//if(message.uplink_message){
+			if(messageType === "up"){
 				/*********************************************************************
 			 	* ************************ Main directories *************************
 			 	* ******************************************************************/
@@ -211,9 +211,9 @@ class messagehandlerClass {
 				 * ******************************************************************/
 
 				this.adapter.log.silly(`write rawdata`);
-				let startDirectory = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkRaw}`;
+				let startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkRaw}`;
 				// write json
-				await this.adapter.setObjectNotExistsAsync(`${startDirectory}.json`,{
+				await this.adapter.setObjectNotExistsAsync(`${startId}.json`,{
 					type: "state",
 					common: {
 						name: "last recieved message",
@@ -224,7 +224,7 @@ class messagehandlerClass {
 					},
 					native: {},
 				});
-				await this.adapter.setStateAsync(`${startDirectory}.json`,JSON.stringify(message),true);
+				await this.adapter.setStateAsync(`${startId}.json`,JSON.stringify(message),true);
 
 				/*********************************************************************
 				* ********************** Rawdata (Base64) ***************************
@@ -233,7 +233,7 @@ class messagehandlerClass {
 				if(message.uplink_message.frm_payload){
 					// wite base64 data
 					this.adapter.log.silly(`write base64`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.base64`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.base64`,{
 						type: "state",
 						common: {
 							name: "last recieved data as base64",
@@ -245,11 +245,11 @@ class messagehandlerClass {
 						native: {},
 					});
 					const writedata = message.uplink_message.frm_payload;
-					await this.adapter.setStateAsync(`${startDirectory}.base64`,writedata,true);
+					await this.adapter.setStateAsync(`${startId}.base64`,writedata,true);
 
 					// write base64 data in hex data
 					this.adapter.log.silly(`write hex`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.hex`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.hex`,{
 						type: "state",
 						common: {
 							name: "last recieved data as hex",
@@ -261,11 +261,11 @@ class messagehandlerClass {
 						native: {},
 					});
 					const hexdata = Buffer.from(message.uplink_message.frm_payload, "base64").toString("hex").toUpperCase();
-					await this.adapter.setStateAsync(`${startDirectory}.hex`,hexdata,true);
+					await this.adapter.setStateAsync(`${startId}.hex`,hexdata,true);
 
 					// write base64 data in string data
 					this.adapter.log.silly(`write string`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.string`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.string`,{
 						type: "state",
 						common: {
 							name: "last recieved data as string",
@@ -277,25 +277,25 @@ class messagehandlerClass {
 						native: {},
 					});
 					const stringdata = Buffer.from(message.uplink_message.frm_payload, "base64").toString();
-					await this.adapter.setStateAsync(`${startDirectory}.string`,stringdata,true);
+					await this.adapter.setStateAsync(`${startId}.string`,stringdata,true);
 				}
 
 				/*********************************************************************
 				 * ********************** decoded payload ****************************
 				 * ******************************************************************/
 
-				startDirectory = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkDecoded}`;
+				startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkDecoded}`;
 				this.adapter.log.silly(`write decoded payload`);
-				await this.directoryhandler.generateRekursivObjects(message.uplink_message.decoded_payload,startDirectory,topic,message);
+				await this.directoryhandler.generateRekursivObjects(message.uplink_message.decoded_payload,startId,topic,message);
 
 				/*********************************************************************
 				 * ************************* remaining *******************************
 				 * ******************************************************************/
 
-				startDirectory = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkRemaining}`;
+				startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkRemaining}`;
 				this.adapter.log.silly(`write remaining uplink data`);
 
-				await this.directoryhandler.generateRekursivObjects(message.uplink_message,startDirectory,topic,message,{ignoredElementNames:{decoded_payload:{},frm_payload:{}}});
+				await this.directoryhandler.generateRekursivObjects(message.uplink_message,startId,topic,message,{ignoredElementNames:{decoded_payload:{},frm_payload:{}}});
 
 				/*********************************************************************
 			 	* ******************* Check downlink at uplink **********************
@@ -309,17 +309,17 @@ 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){
+			else if(messageType === "queued" || messageType === "sent"){
 				// Check wich downlink was recieved
 				const downlinkType = `downlink_${messageType}`;
 				/*********************************************************************
 				* ************************ Rawdata json *****************************
 				* ******************************************************************/
 
-				let startDirectory = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.downlinkRaw}`;
+				let startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.downlinkRaw}`;
 				// write json
 				this.adapter.log.silly(`write rawdata`);
-				await this.adapter.setObjectNotExistsAsync(`${startDirectory}.json`,{
+				await this.adapter.setObjectNotExistsAsync(`${startId}.json`,{
 					type: "state",
 					common: {
 						name: "last recieved message",
@@ -330,7 +330,7 @@ class messagehandlerClass {
 					},
 					native: {},
 				});
-				await this.adapter.setStateAsync(`${startDirectory}.json`,JSON.stringify(message),true);
+				await this.adapter.setStateAsync(`${startId}.json`,JSON.stringify(message),true);
 
 				/*********************************************************************
 				* ********************** Rawdata (Base64) ***************************
@@ -340,7 +340,7 @@ class messagehandlerClass {
 				this.adapter.log.silly(`write base64`);
 				if(message[downlinkType].frm_payload){
 					// wite base64 data
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.base64`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.base64`,{
 						type: "state",
 						common: {
 							name: "last recieved data as base64",
@@ -352,11 +352,11 @@ class messagehandlerClass {
 						native: {},
 					});
 					const writedata = message[downlinkType].frm_payload;
-					await this.adapter.setStateAsync(`${startDirectory}.base64`,writedata,true);
+					await this.adapter.setStateAsync(`${startId}.base64`,writedata,true);
 
 					// write base64 data in hex data
 					this.adapter.log.silly(`write hex`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.hex`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.hex`,{
 						type: "state",
 						common: {
 							name: "last recieved data as hex",
@@ -368,11 +368,11 @@ class messagehandlerClass {
 						native: {},
 					});
 					const hexdata = Buffer.from(message[downlinkType].frm_payload,"base64").toString("hex").toUpperCase();
-					await this.adapter.setStateAsync(`${startDirectory}.hex`,hexdata,true);
+					await this.adapter.setStateAsync(`${startId}.hex`,hexdata,true);
 
 					// write base64 data in string data
 					this.adapter.log.silly(`write string`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.string`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.string`,{
 						type: "state",
 						common: {
 							name: "last recieved data as string",
@@ -384,16 +384,52 @@ class messagehandlerClass {
 						native: {},
 					});
 					const stringdata = Buffer.from(message[downlinkType].frm_payload,"base64").toString();
-					await this.adapter.setStateAsync(`${startDirectory}.string`,stringdata,true);
+					await this.adapter.setStateAsync(`${startId}.string`,stringdata,true);
 				}
 
 				/*********************************************************************
 				 * ************************* remaining *******************************
 				 * ******************************************************************/
 
-				startDirectory = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.downlinkRemaining}`;
+				startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.downlinkRemaining}`;
 				this.adapter.log.silly(`write remaining downlink data`);
-				await this.directoryhandler.generateRekursivObjects(message[downlinkType],startDirectory,topic,message,{ignoredElementNames:{frm_payload:{}}});
+				await this.directoryhandler.generateRekursivObjects(message[downlinkType],startId,topic,message,{ignoredElementNames:{frm_payload:{}}});
+			}
+
+			// check for join message
+			else if(messageType === "join"){
+
+				/*********************************************************************
+			 	* ************************ Main directories *************************
+			 	* ******************************************************************/
+
+				await this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories,"",topic,message);
+
+				/*********************************************************************
+				 * ************************ Rawdata json *****************************
+				 * ******************************************************************/
+
+				this.adapter.log.silly(`write rawdata`);
+				const startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.joinRaw}`;
+				// write json
+				await this.adapter.setObjectNotExistsAsync(`${startId}.json`,{
+					type: "state",
+					common: {
+						name: "last recieved message",
+						type: "json",
+						role: "value",
+						read: true,
+						write: false
+					},
+					native: {},
+				});
+				await this.adapter.setStateAsync(`${startId}.json`,JSON.stringify(message),true);
+				const changeInfo = await this.adapter.getChangeInfo(startId);
+				this.adapter.log.info(`the device ${changeInfo.deviceEUI} joined network`);
+			}
+			// Other messagetypes
+			else{
+				this.adapter.log.debug(`the messagetype: ${messageType}, is not implemented yet`);
 			}
 
 			/*********************************************************************
@@ -434,7 +470,7 @@ class messagehandlerClass {
 			 * ****************** Check device startdirectory ********************
 			 * ******************************************************************/
 
-			if(messageType !== "up" && !await this.adapter.objectExists(`${deviceStartdirectory}`)){
+			if(messageType !== "up" && messageType !== "join" && !await this.adapter.objectExists(`${deviceStartdirectory}`)){
 				this.adapter.log.debug(`There was a message with the topic ${topic}, but the object ${deviceStartdirectory} does not exists yet.`);
 				return;
 			}
@@ -448,7 +484,7 @@ class messagehandlerClass {
 			 * ******************************************************************/
 
 			// check for uplink message
-			if(messageType === "up"){//if(message.uplink_message){
+			if(messageType === "up"){
 
 				/*********************************************************************
 			 	* ************************ Main directories *************************
@@ -460,10 +496,10 @@ class messagehandlerClass {
 				 * ************************ Rawdata json *****************************
 				 * ******************************************************************/
 
-				let startDirectory = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkRaw}`;
+				let startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkRaw}`;
 				// write json
 				this.adapter.log.silly(`write rawdata`);
-				await this.adapter.setObjectNotExistsAsync(`${startDirectory}.json`,{
+				await this.adapter.setObjectNotExistsAsync(`${startId}.json`,{
 					type: "state",
 					common: {
 						name: "last recieved message",
@@ -474,7 +510,7 @@ class messagehandlerClass {
 					},
 					native: {},
 				});
-				await this.adapter.setStateAsync(`${startDirectory}.json`,JSON.stringify(message),true);
+				await this.adapter.setStateAsync(`${startId}.json`,JSON.stringify(message),true);
 
 				/*********************************************************************
 				* ********************** Rawdata (Base64) ***************************
@@ -483,7 +519,7 @@ class messagehandlerClass {
 				if(message.data){
 					// wite base64 data
 					this.adapter.log.silly(`write base64`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.base64`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.base64`,{
 						type: "state",
 						common: {
 							name: "last recieved data as base64",
@@ -495,11 +531,11 @@ class messagehandlerClass {
 						native: {},
 					});
 					const writedata = message.data;
-					await this.adapter.setStateAsync(`${startDirectory}.base64`,writedata,true);
+					await this.adapter.setStateAsync(`${startId}.base64`,writedata,true);
 
 					// write base64 data in hex data
 					this.adapter.log.silly(`write hex`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.hex`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.hex`,{
 						type: "state",
 						common: {
 							name: "last recieved data as hex",
@@ -511,11 +547,11 @@ class messagehandlerClass {
 						native: {},
 					});
 					const hexdata = Buffer.from(message.data, "base64").toString("hex").toUpperCase();
-					await this.adapter.setStateAsync(`${startDirectory}.hex`,hexdata,true);
+					await this.adapter.setStateAsync(`${startId}.hex`,hexdata,true);
 
 					// write base64 data in string data
 					this.adapter.log.silly(`write string`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.string`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.string`,{
 						type: "state",
 						common: {
 							name: "last recieved data as string",
@@ -527,23 +563,23 @@ class messagehandlerClass {
 						native: {},
 					});
 					const stringdata = Buffer.from(message.data, "base64").toString();
-					await this.adapter.setStateAsync(`${startDirectory}.string`,stringdata,true);
+					await this.adapter.setStateAsync(`${startId}.string`,stringdata,true);
 				}
 
 				/*********************************************************************
 				 * ****************** decoded payload (Object) ***********************
 				 * ******************************************************************/
-				startDirectory = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkDecoded}`;
+				startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkDecoded}`;
 				this.adapter.log.silly(`write decoded payload (Object)`);
-				await this.directoryhandler.generateRekursivObjects(message.object,startDirectory,topic,message);
+				await this.directoryhandler.generateRekursivObjects(message.object,startId,topic,message);
 
 				/*********************************************************************
 				 * ************************* remaining *******************************
 				 * ******************************************************************/
 
-				startDirectory = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkRemaining}`;
+				startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.uplinkRemaining}`;
 				this.adapter.log.silly(`write remaining uplink data`);
-				await this.directoryhandler.generateRekursivObjects(message,startDirectory,topic,message,{ignoredElementNames:{deduplicationId:{},deviceInfo:{},data:{},object:{}}});
+				await this.directoryhandler.generateRekursivObjects(message,startId,topic,message,{ignoredElementNames:{deduplicationId:{},deviceInfo:{},data:{},object:{}}});
 
 				/*********************************************************************
 			 	* ******************* Check downlink at uplink **********************
@@ -557,16 +593,16 @@ class messagehandlerClass {
 			 * ******************************************************************/
 
 			// check for uplink message
-			else if(messageType === "down"){ //if(message.downlink_queued || message.downlink_sent)//if(message.downlink_queued || message.downlink_sent){
+			else if(messageType === "down"){
 
 				/*********************************************************************
 				 * ************************ Rawdata json *****************************
 				 * ******************************************************************/
 
-				const startDirectory = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.downlinkRaw}`;
+				const startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.downlinkRaw}`;
 				// write json
 				this.adapter.log.silly(`write rawdata`);
-				await this.adapter.setObjectNotExistsAsync(`${startDirectory}.json`,{
+				await this.adapter.setObjectNotExistsAsync(`${startId}.json`,{
 					type: "state",
 					common: {
 						name: "last recieved message",
@@ -577,7 +613,7 @@ class messagehandlerClass {
 					},
 					native: {},
 				});
-				await this.adapter.setStateAsync(`${startDirectory}.json`,JSON.stringify(message),true);
+				await this.adapter.setStateAsync(`${startId}.json`,JSON.stringify(message),true);
 
 				/*********************************************************************
 				* ********************** Rawdata (Base64) ***************************
@@ -587,7 +623,7 @@ class messagehandlerClass {
 				if(message.data){
 					// wite base64 data
 					this.adapter.log.silly(`write base64`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.base64`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.base64`,{
 						type: "state",
 						common: {
 							name: "last recieved data as base64",
@@ -599,11 +635,11 @@ class messagehandlerClass {
 						native: {},
 					});
 					const writedata = message.data;
-					await this.adapter.setStateAsync(`${startDirectory}.base64`,writedata,true);
+					await this.adapter.setStateAsync(`${startId}.base64`,writedata,true);
 
 					// write base64 data in hex data
 					this.adapter.log.silly(`write hex`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.hex`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.hex`,{
 						type: "state",
 						common: {
 							name: "last recieved data as hex",
@@ -615,11 +651,11 @@ class messagehandlerClass {
 						native: {},
 					});
 					const hexdata = Buffer.from(message.data,"base64").toString("hex").toUpperCase();
-					await this.adapter.setStateAsync(`${startDirectory}.hex`,hexdata,true);
+					await this.adapter.setStateAsync(`${startId}.hex`,hexdata,true);
 
 					// write base64 data in string data
 					this.adapter.log.silly(`write string`);
-					await this.adapter.setObjectNotExistsAsync(`${startDirectory}.string`,{
+					await this.adapter.setObjectNotExistsAsync(`${startId}.string`,{
 						type: "state",
 						common: {
 							name: "last recieved data as string",
@@ -631,7 +667,7 @@ class messagehandlerClass {
 						native: {},
 					});
 					const stringdata = Buffer.from(message.data,"base64").toString();
-					await this.adapter.setStateAsync(`${startDirectory}.string`,stringdata,true);
+					await this.adapter.setStateAsync(`${startId}.string`,stringdata,true);
 				}
 
 				/*********************************************************************
@@ -639,6 +675,42 @@ class messagehandlerClass {
 				 * ******************************************************************/
 
 			}
+
+			// check for uplink message
+			else if(messageType === "join"){
+				/*********************************************************************
+			 	* ************************ Main directories *************************
+			 	* ******************************************************************/
+
+				await this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories,"",topic,message);
+
+				/*********************************************************************
+				 * ************************ Rawdata json *****************************
+				 * ******************************************************************/
+
+				const startId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.joinRaw}`;
+				// write json
+				this.adapter.log.silly(`write rawdata`);
+				await this.adapter.setObjectNotExistsAsync(`${startId}.json`,{
+					type: "state",
+					common: {
+						name: "last recieved message",
+						type: "json",
+						role: "value",
+						read: true,
+						write: false
+					},
+					native: {},
+				});
+				await this.adapter.setStateAsync(`${startId}.json`,JSON.stringify(message),true);
+				const changeInfo = await this.adapter.getChangeInfo(startId);
+				this.adapter.log.info(`the device ${changeInfo.deviceEUI} joined network`);
+			}
+			// Other messagetypes
+			else{
+				this.adapter.log.debug(`the messagetype: ${messageType}, is not implemented yet`);
+			}
+
 			/*********************************************************************
 			 * ********************** downlinkConfigs ****************************
 			 * ******************************************************************/

package/lib/modules/mqttclient.js

@@ -54,9 +54,9 @@ class mqttClientClass {
 	getSubscribtionArray(){
 		switch(this.adapter.config.origin){
 			case this.adapter.origin.ttn:
-				return ["v3/+/devices/+/up","v3/+/devices/+/down/#"];
+				return ["v3/+/devices/+/+","v3/+/devices/+/down/+"];
 			case this.adapter.origin.chirpstack:
-				return ["application/+/device/+/event/up","application/+/device/+/command/down"];
+				return ["application/+/device/+/event/+","application/+/device/+/command/down"];
 		}
 	}
 }

package/main.js

@@ -82,8 +82,8 @@ class Lorawan extends utils.Adapter {
 		//const message = {"end_device_ids":{"device_id":"eui-lobaro-modbus","application_ids":{"application_id":"hafi-ttn-lorawan"},"dev_eui":"70B3D5E050013950","join_eui":"D55B58C0DDC074DE","dev_addr":"260B5972"},"correlation_ids":["gs:uplink:01HMQZVSCX4D7JRDNFA7GJ9D4W"],"received_at":"2024-01-22T07:06:25.260676101Z","uplink_message":{"session_key_id":"AY0v/ZirzRkpNW0Cgjdhig==","f_port":20,"f_cnt":2,"frm_payload":"AA5BAf0AxwIAAQ==","decoded_payload":{"airhumidity":50.9,"airtemperature":19.9,"port":20,"relais1":0,"relais2":1,"relais3":null,"relais5":null,"volt":3.649,"zisternenpegel":2},"rx_metadata":[{"gateway_ids":{"gateway_id":"hafenmeister-port2ttn-ng","eui":"50313953530A4750"},"time":"2024-01-22T07:06:25.013878Z","timestamp":995696116,"rssi":-37,"channel_rssi":-37,"snr":8.5,"location":{"latitude":53.5548443059465,"longitude":9.92155426743724,"altitude":10,"source":"SOURCE_REGISTRY"},"uplink_token":"CiYKJAoYaGFmZW5tZWlzdGVyLXBvcnQydHRuLW5nEghQMTlTUwpHUBD0u+TaAxoLCPGnuK0GEM3uvhkgoIL0oP24Sg==","channel_index":5,"received_at":"2024-01-22T07:06:25.032492359Z"}],"settings":{"data_rate":{"lora":{"bandwidth":125000,"spreading_factor":9,"coding_rate":"4/5"}},"frequency":"867500000","timestamp":995696116,"time":"2024-01-22T07:06:25.013878Z"},"received_at":"2024-01-22T07:06:25.054442349Z","consumed_airtime":"0.205824s","network_ids":{"net_id":"000013","ns_id":"EC656E0000000181","tenant_id":"ttn","cluster_id":"eu1","cluster_address":"eu1.cloud.thethings.network"}}};
 
 		// ACK
-		const topic = "v3/hafi-ttn-lorawan@ttn/devices/eui-a84041162183f8fb/down/ack";
-		const message = {"end_device_ids":{"device_id":"eui-a84041162183f8fb","application_ids":{"application_id":"hafi-ttn-lorawan"},"dev_eui":"A84041162183F8FB","join_eui":"A840410000000101","dev_addr":"260B141A"},"correlation_ids":["as:downlink:01HP6D18MQXJN90J5B07DC11HY","gs:uplink:01HP6D1A9X4WAA3SFMXH4ESSMV"],"received_at":"2024-02-09T07:41:41.776887672Z","downlink_ack":{"session_key_id":"AY2MUrmnuovS8DCZAfYmsA==","f_port":1,"f_cnt":21,"frm_payload":"AQAAeA==","confirmed":true,"priority":"NORMAL","correlation_ids":["as:downlink:01HP6D18MQXJN90J5B07DC11HY"],"confirmed_retry":{"attempt":1}}};
+		//const topic = "v3/hafi-ttn-lorawan@ttn/devices/eui-a84041162183f8fb/down/ack";
+		//const message = {"end_device_ids":{"device_id":"eui-a84041162183f8fb","application_ids":{"application_id":"hafi-ttn-lorawan"},"dev_eui":"A84041162183F8FB","join_eui":"A840410000000101","dev_addr":"260B141A"},"correlation_ids":["as:downlink:01HP6D18MQXJN90J5B07DC11HY","gs:uplink:01HP6D1A9X4WAA3SFMXH4ESSMV"],"received_at":"2024-02-09T07:41:41.776887672Z","downlink_ack":{"session_key_id":"AY2MUrmnuovS8DCZAfYmsA==","f_port":1,"f_cnt":21,"frm_payload":"AQAAeA==","confirmed":true,"priority":"NORMAL","correlation_ids":["as:downlink:01HP6D18MQXJN90J5B07DC11HY"],"confirmed_retry":{"attempt":1}}};
 
 		// Chipstack
 		//const topic = "application/d63c10b6-9263-4ab3-9299-4308fa19a2ad/device/a84041f621857cd2/event/up";
@@ -118,8 +118,8 @@ class Lorawan extends utils.Adapter {
 		//const message = {"time":"2024-01-27T10:29:58.221817559+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":{}},"level":"ERROR","code":"UPLINK_CODEC","description":"Exception generated by quickjs","context":{"deduplication_id":"c44e7e25-09ce-4c95-b96f-5a298c5c6440"}};
 
 		// JOIN
-		//const topic = "application/59bcc5a7-59e2-4481-9615-fc4e58791915/device/70b3d52dd300ed31/event/join";
-		//const message = {"deduplicationId":"44cef56d-1b8d-45fc-a762-03b98b620db2","time":"2023-12-12T03:13:21.551178+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":"01009400"};
+		const topic = "application/59bcc5a7-59e2-4481-9615-fc4e58791915/device/70b3d52dd300ed31/event/join";
+		const message = {"deduplicationId":"44cef56d-1b8d-45fc-a762-03b98b620db2","time":"2023-12-12T03:13:21.551178+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":"01009400"};
 
 		// DOWN
 		//const topic = "application/59bcc5a7-59e2-4481-9615-fc4e58791915/device/70b3d52dd300ed31/command/down";

package/package.json

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