iobroker.lorawan 0.3.7 → 0.3.8

package/README.md

@@ -22,6 +22,9 @@ 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.8 (2024-02-23)
+* (BenAhrdt) write def into state in case of type changes
+
 ### 0.3.7 (2024-02-22)
 * (BenAhrdt) improove forbidden chars and implements join raw
 

package/admin/jsonConfig.json

@@ -180,7 +180,7 @@
 									"label": "name",
 									"tooltip": "nameTooltip",
 									"default": "",
-									"validator": "if(data.name === '' || data.name === null){return false;}else{const myRegEx = /^([0-9a-z])*$/i; return myRegEx.test(data.name);}",
+									"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
 								},

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.3.7",
+    "version": "0.3.8",
     "news": {
+      "0.3.8": {
+        "en": "write def into state in case of type changes",
+        "de": "schreiben def in zustand bei typänderungen",
+        "ru": "написать деф в состояние в случае изменения типа",
+        "pt": "escrever def em estado em caso de alterações de tipo",
+        "nl": "def in status schrijven in geval van typewijzigingen",
+        "fr": "écrire def dans l'état en cas de changement de type",
+        "it": "scrivere def in stato in caso di variazioni di tipo",
+        "es": "escribir def en estado en caso de cambios de tipo",
+        "pl": "zapis def do stanu w przypadku zmian typu",
+        "uk": "писати деф в стан у разі зміни типу",
+        "zh-cn": "在类型变化时将 def 写入状态"
+      },
       "0.3.7": {
         "en": "improove forbidden chars and implements join raw",
         "de": "unproove verbotene wagen und geräte roh beitreten",
@@ -80,19 +93,6 @@
         "pl": "sformułowanie otrzymane = > otrzymywane w procesie messaging",
         "uk": "javascript licenses api веб-сайт go1.13.8 отримувати повідомлення",
         "zh-cn": "重述的语句 发送信件时收到"
-      },
-      "0.3.1": {
-        "en": "rebuild with better messageing",
-        "de": "neuaufbau mit besserer botschaft",
-        "ru": "перестроить с лучшим сообщением",
-        "pt": "reconstruir com melhor mensagem",
-        "nl": "herbouwen met betere berichtgeving",
-        "fr": "reconstruire avec un meilleur message",
-        "it": "ricostruire con messaggi migliori",
-        "es": "reconstruir con mejor mensaje",
-        "pl": "odbudowa dzięki lepszemu rozwiązywaniu problemów",
-        "uk": "перебудувати краще повідомлення",
-        "zh-cn": "以更好的信息重建"
       }
     },
     "title": "LoRaWAN",

package/lib/modules/messagehandler.js

@@ -63,7 +63,7 @@ class messagehandlerClass {
 		await this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories.application.devices.deviceEUI.deviceId.downlink.lastSend,`${startDirectory}.${this.directoryhandler.reachableSubfolders.downlinkLastSend}`,"","");
 	}
 
-	async fillWithDownlinkConfig(deviceStartdirectory){
+	async fillWithDownlinkConfig(deviceStartdirectory,options){
 		const activeFunction = "fillWithDownlinkConfig";
 		try{
 			const changeInfo = await this.adapter.getChangeInfo(`${deviceStartdirectory}.fillDownlinkFolder`);
@@ -122,24 +122,35 @@ class messagehandlerClass {
 									stateCommonMax = 1000000;
 								}
 							}
-							await this.adapter.extendObjectAsync(`${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.downlinkControl}.${downlinkParameter.name}`,{
+							// common set into variable to read later (for options)
+							const common = {
+								name: "",
+								type: stateCommonType,
+								role: stateCommonRole,
+								read: stateCommonRole !== "button",
+								write: true,
+								unit: downlinkParameter.unit? downlinkParameter.unit:"",
+								min: stateCommonMin,
+								max: stateCommonMax,
+								def: stateCommonType === "boolean"? false : stateCommonType === "number"? stateCommonDef: "",
+							};
+							const stateId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.downlinkControl}.${downlinkParameter.name}`;
+							await this.adapter.extendObjectAsync(stateId,{
 								type: "state",
-								common: {
-									name: "",
-									type: stateCommonType,
-									role: stateCommonRole,
-									read: stateCommonRole !== "button",
-									write: true,
-									unit: downlinkParameter.unit? downlinkParameter.unit:"",
-									min: stateCommonMin,
-									max: stateCommonMax,
-									def: stateCommonType === "boolean"? false : stateCommonType === "number"? stateCommonDef: "",
-								},
+								common: common,
 								native: {},
 							});
 							if(downlinkDevice !=="all" && downlinkDevice !== this.adapter.downlinkConfighandler.internalDevices.baseDevice){
 								foundLength[downlinkParameter.name] = downlinkDevice.length;
 							}
+							//check for right type of data (after a possible change)
+							if(!options || !options.inMessage){
+								const state = await this.adapter.getStateAsync(stateId);
+								if(typeof state.val !== typeof common.def){
+									this.adapter.log.silly(`the defaultvale for state ${stateId} will set to ${common.def}`);
+									await this.adapter.setStateAsync(stateId,common.def,true);
+								}
+							}
 						}
 					}
 				}
@@ -436,7 +447,7 @@ class messagehandlerClass {
 			 * ********************** downlinkConfigs ****************************
 			 * ******************************************************************/
 			this.adapter.log.silly(`check configed downlinks`);
-			await this.fillWithDownlinkConfig(deviceStartdirectory);
+			await this.fillWithDownlinkConfig(deviceStartdirectory,{inMessage: true});
 		}
 		catch(error){
 			this.adapter.log.error(`error at ${activeFunction}:  ${error} - - - Message: ${JSON.stringify(message)}`);
@@ -715,7 +726,7 @@ class messagehandlerClass {
 			 * ********************** downlinkConfigs ****************************
 			 * ******************************************************************/
 			this.adapter.log.silly(`check configed downlinks`);
-			await this.fillWithDownlinkConfig(deviceStartdirectory);
+			await this.fillWithDownlinkConfig(deviceStartdirectory,{inMessage: true});
 
 		}
 		catch(error){

package/package.json

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