iobroker.lorawan 0.1.13 → 0.2.0

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.2.0 (2024-02-12)
+* (BenAhrdt) more functionality in messageing
+
 ### 0.1.13 (2024-02-12)
 * (BenAhrdt) building of directory changed and message implemented
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.1.13",
+    "version": "0.2.0",
     "news": {
+      "0.2.0": {
+        "en": "more functionality in messageing",
+        "de": "mehr funktionalität in der meldung",
+        "ru": "больше функциональности в сообщении",
+        "pt": "mais funcionalidade em mensagens",
+        "nl": "meer functionaliteit in berichtgeving",
+        "fr": "plus de fonctionnalité dans la messagerie",
+        "it": "più funzionalità nel messaggio",
+        "es": "más funcionalidad en el mensaje",
+        "pl": "większa funkcjonalność w zakresie rozwiązywania problemów",
+        "uk": "більше функцій в повідомленнях",
+        "zh-cn": "信件中更多的功能"
+      },
       "0.1.13": {
         "en": "building of directory changed and message implemented",
         "de": "aufbau des geänderten verzeichnisses und der implementierten meldung",
@@ -80,19 +93,6 @@
         "pl": "implementation crc calculation",
         "uk": "реалізація розрахунку кришки",
         "zh-cn": "执行计算"
-      },
-      "0.1.7": {
-        "en": "change filter on statechange",
-        "de": "änderungsfilter auf statechange",
-        "ru": "изменение фильтра для изменения состояния",
-        "pt": "filtro de mudança de estado",
-        "nl": "filter wijzigen bij statusverandering",
-        "fr": "modifier le filtre sur le changement d'état",
-        "it": "cambiare il filtro sul cambio di stato",
-        "es": "filtro de cambio en el cambio de estado",
-        "pl": "zmienić filtr na statechange",
-        "uk": "зміна фільтра на державну зміну",
-        "zh-cn": "状态更改过滤器"
       }
     },
     "title": "LoRaWAN",

package/main.js

@@ -375,6 +375,20 @@ class Lorawan extends utils.Adapter {
 		return id;
 	}
 
+	// Get Chnageinfo in case of device EUI (used more times in onMessage)
+	async getChangeInfoFromDeviceEUI(deviceUI,subId){
+		let changeInfo = undefined;
+		const adapterObjects = await this.getAdapterObjectsAsync();
+		for(const adapterObject of Object.values(adapterObjects)){
+			if(adapterObject.type === "device"){
+				if(adapterObject._id.indexOf(deviceUI) !== -1){
+					changeInfo = await this.getChangeInfo(`${adapterObject._id}.${subId}`);
+					break;
+				}
+			}
+		}
+		return changeInfo;
+	}
 
 	// If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor.
 	// /**
@@ -389,18 +403,9 @@ class Lorawan extends utils.Adapter {
 				let result = {};
 				if(obj.command === "getDeviceInfo"){
 					if(obj.message.deviceEUI){
-						let changeInfo = undefined;
-						const adapterObjects = await this.getAdapterObjectsAsync();
-						for(const adapterObject of Object.values(adapterObjects)){
-							if(adapterObject.type === "device"){
-								if(adapterObject._id.indexOf(obj.message.deviceEUI) !== -1){
-									changeInfo = await this.getChangeInfo(`${adapterObject._id}.${this.messagehandler?.directoryhandler.reachableSubfolders.configuration}.devicetype`);
-									break;
-								}
-							}
-						}
+						const changeInfo = await this.getChangeInfoFromDeviceEUI(obj.message.deviceEUI,`${this.messagehandler?.directoryhandler.reachableSubfolders.configuration}.devicetype`);
 						if(changeInfo){
-							result = {applicationId: changeInfo.applicationId, deviceEUI: changeInfo.deviceEUI, deviceId: changeInfo.deviceId};
+							result = {applicationId: changeInfo.applicationId, deviceEUI: changeInfo.deviceEUI, deviceId: changeInfo.deviceId, deviceType: changeInfo.deviceType};
 						}
 						else{
 							result = {error:true, message:"No device found"};
@@ -414,18 +419,9 @@ class Lorawan extends utils.Adapter {
 				}
 				else if (obj.command === "sendDownlink"){
 					if(obj.message.deviceEUI && obj.message.downlink && (obj.message.value || obj.message.value === false)){
-						let changeInfo = undefined;
-						const adapterObjects = await this.getAdapterObjectsAsync();
-						for(const adapterObject of Object.values(adapterObjects)){
-							if(adapterObject.type === "device"){
-								if(adapterObject._id.indexOf(obj.message.deviceEUI) !== -1){
-									changeInfo = await this.getChangeInfo(`${adapterObject._id}.${this.messagehandler?.directoryhandler.reachableSubfolders.downlinkControl}.${obj.message.downlink}`);
-									break;
-								}
-							}
-						}
+						const changeInfo = await this.getChangeInfoFromDeviceEUI(obj.message.deviceEUI,`${this.messagehandler?.directoryhandler.reachableSubfolders.downlinkControl}.${obj.message.downlink}`);
 						if(changeInfo){
-							const downlinkId = `${changeInfo.id}`;
+							const downlinkId = changeInfo.id;
 							if(await this.objectExists(downlinkId)){
 								const downlinkParameter = this.downlinkConfighandler?.getDownlinkParameter(changeInfo);
 								// downlinkvalue is type number
@@ -433,7 +429,7 @@ class Lorawan extends utils.Adapter {
 									// Check limit
 									if((!downlinkParameter.limitMin || obj.message.value >= downlinkParameter.limitMinValue) && (!downlinkParameter.limitMax || obj.message.value <= downlinkParameter.limitMaxValue)){
 										await this.setStateAsync(downlinkId,obj.message.value);
-										result = {applicationId: changeInfo.applicationId, deviceEUI: changeInfo.deviceEUI, deviceId: changeInfo.deviceId, downlink: obj.message.downlink, value: obj.message.value};
+										result = {applicationId: changeInfo.applicationId, deviceEUI: changeInfo.deviceEUI, deviceId: changeInfo.deviceId, deviceType: changeInfo.deviceType,downlink: obj.message.downlink, value: obj.message.value};
 									}
 									else{
 										result = {error:true, message:"value is not in valid range"};
@@ -442,7 +438,7 @@ class Lorawan extends utils.Adapter {
 								// downlinkvalue not a number
 								else{
 									await this.setStateAsync(downlinkId,obj.message.value);
-									result = {applicationId: changeInfo.applicationId, deviceEUI: changeInfo.deviceEUI, deviceId: changeInfo.deviceId, downlink: obj.message.downlink, value: obj.message.value};
+									result = {applicationId: changeInfo.applicationId, deviceEUI: changeInfo.deviceEUI, deviceId: changeInfo.deviceId, deviceType: changeInfo.deviceType, downlink: obj.message.downlink, value: obj.message.value};
 								}
 							}
 							else{
@@ -459,7 +455,33 @@ class Lorawan extends utils.Adapter {
 					// Send response
 					if (obj.callback) this.sendTo(obj.from, obj.command, result, obj.callback);
 				}
-				else{
+				else if (obj.command === "getUplinkDecoded"){
+					if(obj.message.deviceEUI && obj.message.uplink){
+						const changeInfo = await this.getChangeInfoFromDeviceEUI(obj.message.deviceEUI,`${this.messagehandler?.directoryhandler.reachableSubfolders.uplinkDecoded}.${obj.message.uplink}`);
+						if(changeInfo){
+							const uplinkId = changeInfo.id;
+							if(await this.objectExists(uplinkId)){
+								const stateResult = await this.getStateAsync(changeInfo.id);
+								if(stateResult){
+									result = {applicationId: changeInfo.applicationId, deviceEUI: changeInfo.deviceEUI, deviceId: changeInfo.deviceId, deviceType: changeInfo.deviceType, value: stateResult.val};
+								}
+							}
+							else{
+								result = {error:true, message:"No uplink matches"};
+							}
+						}
+						else{
+							result = {error:true, message:"No device found"};
+						}
+					}
+					else{
+						result = {error:true, message:"No deviceEUI & uplink found"};
+					}
+					// Send response
+					if (obj.callback) this.sendTo(obj.from, obj.command, result, obj.callback);
+				}
+				else
+				{
 					const result = {error:true, message: "No message matched"};
 					if (obj.callback) this.sendTo(obj.from, obj.command, result, obj.callback);
 				}

package/package.json

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