change concept of assigning roles, values and writecommands

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**
 -->
+### **WORK IN PROGRESS**
+* (BenAhrdt) change concept of assigning roles, values and writecommands
+
 ### 0.5.5 (2024-03-01)
 * (BenAhrdt) first step of handling with date
 

lib/modules/directorieshandler.js

@@ -1,5 +1,4 @@
 const { isDeepStrictEqual } = require("util");
-const fs = require("fs");
 
 class directorieshandlerClass {
 	constructor(adapter) {
@@ -29,33 +28,61 @@ class directorieshandlerClass {
 			joinRaw: "join.raw"
 		};
 
-		// Assign definitions for special states
-		this.assigns = {
-			time: (value,common)=>{
-				return this.timestringToDate(value,common);
-			},
-			gwTime: (value,common)=>{
-				return this.timestringToDate(value,common);
-			},
-			nsTime: (value,common)=>{
-				return this.timestringToDate(value,common);
-			},
-			timestamp: (value,common)=>{
-				return this.timestringToDate(value,common);
+		/*********************************************************************
+		 * ********************* Definition of Assigns  **********************
+		 * ******************************************************************/
+
+		// Definition of Assign timestamps
+		this.timestringToDate = (value,common) =>{
+			common.role = "date";
+			if(typeof value === "string"){
+				common.type = "number";
+				return new Date(value).valueOf();
+			}
+			else{
+				return value;
 			}
 		};
 
-		//define path for uplink roles
-		this.uplinkRolesPath = "/lib/modules/roles/uplinks.json";
+		// Assign definitions for special states
+		this.assigns = {
+			time: this.timestringToDate,
+			gwTime: this.timestringToDate,
+			nsTime: this.timestringToDate,
+			timestamp: this.timestringToDate
+		};
 
-		// get roles
-		this.uplinkRoles = this.getJsonFromDirectoryfile(`${this.adapter.adapterDir}${this.uplinkRolesPath}`);
+		/*********************************************************************
+		 * ************************** writecommands  *************************
+		 * ******************************************************************/
+
+		this.executeWritecommand = async (elementName,sourceId,value) =>{
+			// Check, if there is a writetrigger and the stateval is not euqal its releaseVal(still present)
+			const writecommand = this.writeCommand[elementName];
+			if(writecommand && writecommand.releaseValue !== value){
+				const baseInfo = this.adapter.getBaseDeviceInfo(sourceId);
+				const subfolder = sourceId.slice(baseInfo.objectStartDirectory.length + 1,sourceId.length - baseInfo.changedState.length - 1);
+				if(!writecommand.approvedFolders || writecommand.approvedFolders[subfolder]){
+					const destinationId = `${baseInfo.objectStartDirectory}.${writecommand.destination}`;
+					const destinationState = await this.adapter.getStateAsync(destinationId);
+					if(destinationState?.val === writecommand.releaseValue){
+						this.adapter.log.debug(`writetrigger ${elementName} recogniced. value ${value} will be written into ${this.writeCommand[elementName].destination}`);
+						await this.adapter.setStateAsync(destinationId,value);
+					}
+				}
+			}
+		};
 
-		//define path for devicetype difinitions
-		this.writeCommandPath = "/lib/modules/commands/write.json";
+		this.writeCommandDeviceType = {destination:"configuration.devicetype",releaseValue:"",approvedFolders:{"uplink.decoded":true}};
 
-		// get devicetype definitions
-		this.writeCommand = this.getJsonFromDirectoryfile(`${this.adapter.adapterDir}${this.writeCommandPath}`);
+		this.writeCommand = {
+			Devicetype: this.writeCommandDeviceType,
+			devicetype: this.writeCommandDeviceType,
+			Device: this.writeCommandDeviceType,
+			device: this.writeCommandDeviceType,
+			Hardware_mode: this.writeCommandDeviceType,
+			Hardware_Mode: this.writeCommandDeviceType
+		};
 
 		// declare the directory structre
 		this.directories = {
@@ -137,38 +164,6 @@ class directorieshandlerClass {
 		};
 	}
 
-	/*********************************************************************
-	 * *************************** General  ******************************
-	 * ******************************************************************/
-
-	// Caclculation of timestring into number (role = date)
-	timestringToDate(value,common){
-		common.role = "date";
-		common.type = "number";
-		if(typeof value === "string"){
-			return new Date(value).valueOf();
-		}
-		else{
-			return value;
-		}
-	}
-
-	/*********************************************************************
-	 * **************************** Roles ********************************
-	 * ******************************************************************/
-
-	getJsonFromDirectoryfile(file){
-		const activeFunction = "getJsonFromDirectoryfiles";
-		this.adapter.log.silly(`the file ${file} will be readout`);
-		try{
-			return JSON.parse(fs.readFileSync(file, "utf-8"));
-		}
-		catch(error){
-			this.adapter.log.error(`error at ${activeFunction}: ` + error);
-			return undefined;
-		}
-	}
-
 	/*********************************************************************
 	 * ************************ Objectstring *****************************
 	 * ******************************************************************/
@@ -296,10 +291,6 @@ class directorieshandlerClass {
 									objectId = `${startDirectory}.${internalObjectId}`;
 								}
 							}
-							// Check for roles
-							/*if(this.uplinkRoles[elementName]){
-								common.role = this.uplinkRoles[elementName];
-							}*/
 							// Check for id dont starts with "."
 							if(objectId.indexOf(".") === 0){
 								objectId.substring(1,objectId.length);
@@ -333,26 +324,6 @@ class directorieshandlerClass {
 		}
 	}
 
-	/*********************************************************************
-	 * ************************* writecommand ****************************
-	 * ******************************************************************/
-
-	async executeWritecommand(writecommand,sourceId,value){
-		// Check, if there is a writetrigger and the stateval is not euqal its releaseVal(still present)
-		if(this.writeCommand[writecommand] && this.writeCommand[writecommand].releaseValue !== value){
-			const baseInfo = this.adapter.getBaseDeviceInfo(sourceId);
-			const subfolder = sourceId.slice(baseInfo.objectStartDirectory.length + 1,sourceId.length - baseInfo.changedState.length - 1);
-			if(!this.writeCommand[writecommand].approvedFolders || this.writeCommand[writecommand].approvedFolders[subfolder]){
-				const destinationId = `${baseInfo.objectStartDirectory}.${this.writeCommand[writecommand].destination}`;
-				const destinationState = await this.adapter.getStateAsync(destinationId);
-				if(destinationState?.val === this.writeCommand[writecommand].releaseValue){
-					this.adapter.log.debug(`writetrigger ${writecommand} recogniced. value ${value} will be written into ${this.writeCommand[writecommand].destination}`);
-					await this.adapter.setStateAsync(destinationId,value);
-				}
-			}
-		}
-	}
-
 	/*********************************************************************
 	 * ************************** Attribute ******************************
 	 * ******************************************************************/

lib/modules/downlinkConfighandler.js

@@ -13,26 +13,26 @@ class downlinkConfighandlerClass {
 		};
 
 		this.downlinkParameterAttributs = {
-			"name": "",
-			"port": 1,
-			"priority": "NORMAL",
-			"type": "number",
-			"confirmed": false,
-			"front": "",
-			"end": "",
-			"lengthInByte": 3,
-			"on": "",
-			"off": "",
-			"onClick": "",
-			"multiplyfaktor": 1,
-			"unit": "",
-			"crc": "noCrc",
-			"limitMin": false,
-			"limitMinValue": 0,
-			"limitMax": false,
-			"limitMaxValue": 0,
-			"swap": false,
-			"decimalPlaces": 0
+			name: "",
+			port: 1,
+			priority: "NORMAL",
+			type: "number",
+			confirmed: false,
+			front: "",
+			end: "",
+			lengthInByte: 3,
+			on: "",
+			off: "",
+			onClick: "",
+			multiplyfaktor: 1,
+			unit: "",
+			crc: "noCrc",
+			limitMin: false,
+			limitMinValue: 0,
+			limitMax: false,
+			limitMaxValue: 0,
+			swap: false,
+			decimalPlaces: 0
 		};
 	}
 

lib/modules/messagehandler.js

@@ -5,11 +5,16 @@ class messagehandlerClass {
 		this.adapter = adapter;
 		this.directoryhandler = new directorieshandlerClass(this.adapter);
 
-		//define path for uplink roles
-		this.downlinkRolesPath = "/lib/modules/roles/downlinks.json";
-
-		// get roles
-		this.downlinkRoles = this.directoryhandler.getJsonFromDirectoryfile(`${this.adapter.adapterDir}${this.downlinkRolesPath}`);
+		/*********************************************************************
+		 * *************************** Roles  ********************************
+		 * ******************************************************************/
+
+		// Assign definitions for special states
+		this.downlinkRoles = {
+			button: "button",
+			boolean: "switch",
+			json: "json"
+		};
 	}