iobroker.lorawan 0.0.11 → 0.0.12

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.12 (2024-01-21)
+* (BenAhrdt) change flow of downlink
+
 ### 0.0.11 (2024-01-20)
 * (BenAhrdt) toSend und lastSend added to folders
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.0.11",
+    "version": "0.0.12",
     "news": {
+      "0.0.12": {
+        "en": "change flow of downlink",
+        "de": "wechselstrom von downlink",
+        "ru": "изменение потока обратных ссылок",
+        "pt": "fluxo de mudança de downlink",
+        "nl": "verandering stroom van downlink",
+        "fr": "changement de flux de liaison descendante",
+        "it": "cambiamento flusso di downlink",
+        "es": "flujo de cambio de enlace descendente",
+        "pl": "zmiana przepływu w dół",
+        "uk": "зміна потоку вниз",
+        "zh-cn": "下行链路的改变"
+      },
       "0.0.11": {
         "en": "toSend und lastSend added to folders",
         "de": "toSend und lastSend in Ordnern hinzugefügt",
@@ -80,19 +93,6 @@
         "pl": "wstaw całe tłumaczenie dla config i przesuń niektóre funkcje",
         "uk": "вставити весь переклад для налаштування та переміщення деяких функцій",
         "zh-cn": "插入配置的全部翻译并移动一些函数"
-      },
-      "0.0.5": {
-        "en": "delete not configed states at startup",
-        "de": "nicht konfiszierte staaten beim start löschen",
-        "ru": "удалить не настроенные состояния при запуске",
-        "pt": "excluir estados não configurados na inicialização",
-        "nl": "verwijderde niet-geconfigeerde toestanden bij opstarten",
-        "fr": "supprimer les états non configurés au démarrage",
-        "it": "delete not configed stati all'avvio",
-        "es": "eliminar estados no confiados al inicio",
-        "pl": "usuń nieskonfigurowane stany przy starcie",
-        "uk": "видалити не налаштовані стани при запуску",
-        "zh-cn": "删除启动时未配置状态"
       }
     },
     "title": "LoRaWAN",

package/lib/modules/directorieshandler.js

@@ -19,13 +19,11 @@ class directorieshandlerClass {
 			downlinkRaw: "downlinkRaw",
 			downlinkConfiguration: "downlinkConfiguration",
 			downlinkControl: "downlinkControl",
-			downlinkToSend: "downlinkToSend",
-			downlinkLastSend: "downlinkLastSend",
 			downlinkRemaining: "downlinkRemaining"
 		};
 
 		this.directoryStructur = {
-			downlinkToSend: "downlink.toSend",
+			downlinkNextSend: "downlink.nextSend",
 			downlinkLastSend: "downlink.lastSend"
 		};
 
@@ -81,15 +79,17 @@ class directorieshandlerClass {
 								configuration:{
 									safeDirectory: this.safeableDirectories.downlinkConfiguration,
 								},
-								toSend:{
-									safeDirectory: this.safeableDirectories.downlinkToSend,
+								nextSend:{
 									hex:{
 										isState: true,
 										stateCommonType: "string"
 									}
 								},
 								lastSend:{
-									safeDirectory: this.safeableDirectories.downlinkLastSend,
+									hex:{
+										isState: true,
+										stateCommonType: "string"
+									}
 								},
 								remaining:{
 									safeDirectory: this.safeableDirectories.downlinkRemaining

package/lib/modules/downlinkConfighandler.js

@@ -69,14 +69,32 @@ class downlinkConfighandlerClass {
 		}
 	}
 
-	async getDownlink(downlinkConfig,state,changeInfo){
+	/*********************************************************************
+	 * *********************** Downlinktopic *****************************
+	 * ******************************************************************/
+
+	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);
+		}
+	}
+
+	/*********************************************************************
+	 * ************************** Downlink *******************************
+	 * ******************************************************************/
+
+	getDownlink(downlinkConfig,payloadInHex,changeInfo){
 		// Select downlink in case of origin
 		this.adapter.log.silly(`the downlink for the changeinfo ${JSON.stringify(changeInfo)} is requested`);
 		switch(this.adapter.config.origin){
 			case "ttn":
-				return await this.getTtnDownlink(downlinkConfig,state,changeInfo);
+				return this.getTtnDownlink(downlinkConfig,payloadInHex);
 			case "chirpstack":
-				return await this.getChirpstackDownlink(downlinkConfig,state,changeInfo);
+				return this.getChirpstackDownlink(downlinkConfig,payloadInHex,changeInfo);
 		}
 	}
 
@@ -84,7 +102,7 @@ class downlinkConfighandlerClass {
 	 * ******************* Calculation of payload ************************
 	 * ******************************************************************/
 
-	async calculatePayload(downlinkConfig,state,changeInfo){
+	calculatePayloadInHex(downlinkConfig,state){
 		// declare pyaload variable
 		this.adapter.log.silly(`the payload will be calculated`);
 		let payloadInHex = "";
@@ -126,27 +144,7 @@ class downlinkConfighandlerClass {
 					break;
 			}
 		}
-
-		//write hex into toSend state
-		const idFolder = `${changeInfo.obectStartDirectory}.${this.adapter.messagehandler.directoryhandler.directoryStructur.downlinkToSend}`;
-		await this.adapter.setStateAsync(`${idFolder}.hex`,payloadInHex,true);
-
-		//convert hex in base64
-		return Buffer.from(payloadInHex, "hex").toString("base64");
-	}
-
-	/*********************************************************************
-	 * *********************** Downlinktopic *****************************
-	 * ******************************************************************/
-
-	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);
-		}
+		return payloadInHex;
 	}
 
 	/*********************************************************************
@@ -178,9 +176,11 @@ class downlinkConfighandlerClass {
 	 * ************************** Downlink ******************************
 	 * ******************************************************************/
 
-	async getTtnDownlink(downlinkConfig,state,changeInfo){
+	getTtnDownlink(downlinkConfig,payloadInHex){
 		this.adapter.log.silly(`the downlink for ttn is requested`);
-		const payloadInBase64 = await this.calculatePayload(downlinkConfig,state,changeInfo);
+
+		//convert hex in base64
+		const payloadInBase64 = Buffer.from(payloadInHex, "hex").toString("base64");
 		// retun the whole downlink
 		return 	{downlinks:[{f_port:downlinkConfig.port,frm_payload:payloadInBase64,priority:downlinkConfig.priority,confirmed:downlinkConfig.confirmed}]};
 	}
@@ -217,9 +217,10 @@ class downlinkConfighandlerClass {
 	 * ************************** Downlink ******************************
 	 * ******************************************************************/
 
-	async getChirpstackDownlink(downlinkConfig,state,changeInfo){
+	getChirpstackDownlink(downlinkConfig,payloadInHex,changeInfo){
 		this.adapter.log.silly(`the downlink for chirpstack is requested`);
-		const payloadInBase64 = await this.calculatePayload(downlinkConfig,state,changeInfo);
+
+		const payloadInBase64 = Buffer.from(payloadInHex, "hex").toString("base64");
 		// retun the whole downlink
 		return 	{devEui:changeInfo.dev_uid,confirmed:downlinkConfig.confirmed,fPort:downlinkConfig.port,data:payloadInBase64};
 	}

package/lib/modules/messagehandler.js

@@ -29,8 +29,7 @@ class messagehandlerClass {
 			if(adapterObject.type === "channel" && adapterObject.common.name !== "Information"){
 				const stateId = this.adapter.removeNamespace(adapterObject._id);
 				await this.fillWithDownlinkConfig(stateId);
-				await this.addDirectoriesToPresentDirectory(`${stateId}.${this.directoryhandler.directoryStructur.downlinkToSend}`);
-				await this.addDirectoriesToPresentDirectory(`${stateId}.${this.directoryhandler.directoryStructur.downlinkLastSend}`);
+				await this.addDirectoriesToPresentDirectory(`${stateId}`);
 			}
 		}
 
@@ -47,7 +46,8 @@ class messagehandlerClass {
 	}
 
 	async addDirectoriesToPresentDirectory(startDirectory){
-		this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories.application.devices.deviceUid.deviceId.downlink.toSend,startDirectory,"","");
+		this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories.application.devices.deviceUid.deviceId.downlink.nextSend,`${startDirectory}.${this.directoryhandler.directoryStructur.downlinkNextSend}`,"","");
+		this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories.application.devices.deviceUid.deviceId.downlink.lastSend,`${startDirectory}.${this.directoryhandler.directoryStructur.downlinkLastSend}`,"","");
 	}
 
 	async fillWithDownlinkConfig(deviceStartdirectory){
@@ -119,6 +119,12 @@ class messagehandlerClass {
 
 			await this.directoryhandler.generateRekursivObjects(this.directoryhandler.directories,"",topic,message);
 
+			/*********************************************************************
+			 * ******************* Check downlink at uplink **********************
+			 * ******************************************************************/
+
+			//await this.adapter.checkSendDOwnlinkWithUplink(`${deviceStartdirectory}.mytest`);
+
 			/*********************************************************************
 			 * ************************* Infodata ********************************
 			 * ******************************************************************/

package/main.js

@@ -109,21 +109,23 @@ class Lorawan extends utils.Adapter {
 						if(this.config.origin === "ttn"){
 							let appending = "push";
 							if(changeInfo?.changedState === "push"){
-								const downlinkTopic = await this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down/${appending}`);
+								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down/${appending}`);
 								await this.sendDownlink(downlinkTopic,state.val);
 								this.setStateAsync(id,state.val,true);
 							}
 							else if(changeInfo?.changedState === "replace"){
 								appending = "replace";
-								const downlinkTopic = await this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down/${appending}`);
+								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down/${appending}`);
 								await this.sendDownlink(downlinkTopic,state.val,changeInfo);
 								this.setStateAsync(id,state.val,true);
 							}
 							else{
-								const downlinkTopic = await this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down/${appending}`);
+								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down/${appending}`);
 								const downlinkConfig = this.downlinkConfighandler?.getDownlinkConfig(changeInfo);
 								if(downlinkConfig !== undefined){
-									const downlink = await this.downlinkConfighandler?.getDownlink(downlinkConfig,state,changeInfo);
+									const payloadInHex = this.downlinkConfighandler?.calculatePayloadInHex(downlinkConfig,state);
+									await this.writeNextSend(changeInfo?.obectStartDirectory,payloadInHex);
+									const downlink = this.downlinkConfighandler?.getDownlink(downlinkConfig,payloadInHex,changeInfo);
 									if(downlink !== undefined){
 										await this.sendDownlink(downlinkTopic,JSON.stringify(downlink),changeInfo);
 									}
@@ -133,15 +135,17 @@ class Lorawan extends utils.Adapter {
 						}
 						else if(this.config.origin === "chirpstack"){
 							if(changeInfo?.changedState === "push"){
-								const downlinkTopic = await this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down`);
+								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down`);
 								await this.sendDownlink(downlinkTopic,state.val,changeInfo);
 								this.setStateAsync(id,state.val,true);
 							}
 							else{
-								const downlinkTopic = await this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down`);
-								const downlinkConfig = await this.downlinkConfighandler?.getDownlinkConfig(changeInfo);
+								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down`);
+								const downlinkConfig = this.downlinkConfighandler?.getDownlinkConfig(changeInfo);
 								if(downlinkConfig !== undefined){
-									const downlink = await this.downlinkConfighandler?.getDownlink(downlinkConfig,state,changeInfo);
+									const payloadInHex = this.downlinkConfighandler?.calculatePayloadInHex(downlinkConfig,state);
+									await this.writeNextSend(changeInfo?.obectStartDirectory,payloadInHex);
+									const downlink = this.downlinkConfighandler?.getDownlink(downlinkConfig,payloadInHex,changeInfo);
 									if(downlink !== undefined){
 										await this.sendDownlink(downlinkTopic,JSON.stringify(downlink),changeInfo);
 									}
@@ -165,15 +169,25 @@ class Lorawan extends utils.Adapter {
 		}
 	}
 
+	async checkSendDOwnlinkWithUplink(id){
+		const changeInfo = await this.getChangeInfo(id);
+		this.log.warn(JSON.stringify(changeInfo));
+	}
+
+	async writeNextSend(startDirectory,payloadInHex){
+		const idFolder = `${startDirectory}.${this.messagehandler?.directoryhandler.directoryStructur.downlinkNextSend}`;
+		await this.setStateAsync(`${idFolder}.hex`,payloadInHex,true);
+	}
+
 	async sendDownlink(topic,message,changeInfo){
-		this.mqttClient?.publish(topic,message);
-		const idFolderToSend = `${changeInfo.obectStartDirectory}.${this.messagehandler?.directoryhandler.directoryStructur.downlinkToSend}`;
+		await this.mqttClient?.publish(topic,message);
+		const idFolderNextSend = `${changeInfo.obectStartDirectory}.${this.messagehandler?.directoryhandler.directoryStructur.downlinkNextSend}`;
 		const idFolderLastSend = `${changeInfo.obectStartDirectory}.${this.messagehandler?.directoryhandler.directoryStructur.downlinkLastSend}`;
-		const toSend = await this.getStateAsync(`${idFolderToSend}.hex`);
+		const nextSend = await this.getStateAsync(`${idFolderNextSend}.hex`);
 		const lastSend = this.getHexpayloadFromDownlink(message);
 		await this.setStateAsync(`${idFolderLastSend}.hex`,lastSend,true);
-		if(toSend && lastSend === toSend?.val){
-			await this.setStateAsync(`${idFolderToSend}.hex`,0,true);
+		if(nextSend && lastSend === nextSend?.val){
+			await this.setStateAsync(`${idFolderNextSend}.hex`,0,true);
 		}
 	}
 

package/package.json

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