iobroker.lorawan 0.5.4 → 0.5.5

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.5.5 (2024-03-01)
+* (BenAhrdt) first step of handling with date
+
 ### 0.5.4 (2024-03-01)
 * (BenAhrdt) implement ther approvedFolder conzept for writecommands from message
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.5.4",
+    "version": "0.5.5",
     "news": {
+      "0.5.5": {
+        "en": "first step of handling with date",
+        "de": "erster schritt der handhabung mit datum",
+        "ru": "первый шаг обработки с датой",
+        "pt": "primeiro passo de manuseio com data",
+        "nl": "eerste stap van verwerking met datum",
+        "fr": "première étape de la manipulation avec date",
+        "it": "primo passo di gestione con data",
+        "es": "primer paso de manejo con fecha",
+        "pl": "pierwszy etap postępowania z datą",
+        "uk": "перший крок обробки з датою",
+        "zh-cn": "处理日期的第一步"
+      },
       "0.5.4": {
         "en": "implement ther approvedFolder conzept for writecommands from message",
         "de": "den genehmigten Ordner-Konzept für Schreibbefehle aus der Nachricht",
@@ -80,19 +93,6 @@
         "pl": "wdrożenienowych profili projektowych",
         "uk": "впроваджувати нові пристрої",
         "zh-cn": "执行新设备配置"
-      },
-      "0.4.0": {
-        "en": "searchallgorythm improoved, defaultvalues changed, remove query for \"all\"",
-        "de": "searchallgorythm improoved, standardwerte geändert, entfernen abfrage für \"all\"",
-        "ru": "searchallgorythm сброшен, изменены значения по умолчанию, удален запрос \"все\"",
-        "pt": "searchallgorythm improoved, defaultvalues alterado, remover consulta para \"all\"",
-        "nl": "searchallgorythm improoved, defaultvalues veranderd, query verwijderen voor \"all\"",
-        "fr": "searchallgorythm improoved, valeurs par défaut changé, supprimer la requête pour \"all\"",
-        "it": "ricercaallgorythm improoved, valori di default modificati, rimuovere la query per \"tutti\"",
-        "es": "searchallgorythm improvisado, valores predeterminados cambiaron, eliminar la consulta para \"todo\"",
-        "pl": "searchogorythm improused, defaultvalues changed, remove query for \"all\"",
-        "uk": "searchallgorythm improoved, типові значення змінені, видалення запиту для \"all\"",
-        "zh-cn": "搜索所有未启动的理论, 默认值已更改, 删除“ 所有” 的查询"
       }
     },
     "title": "LoRaWAN",

package/lib/modules/directorieshandler.js

@@ -29,6 +29,22 @@ 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);
+			}
+		};
+
 		//define path for uplink roles
 		this.uplinkRolesPath = "/lib/modules/roles/uplinks.json";
 
@@ -125,6 +141,18 @@ 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 ********************************
 	 * ******************************************************************/
@@ -241,20 +269,27 @@ class directorieshandlerClass {
 							await this.generateRekursivObjects(obj[elementName],objectId,topic,message);
 						}
 						else{
-							let stateCommonType = typeof obj[elementName];
+							const common = {
+								type: typeof obj[elementName],
+								name: "",
+								role: "value",
+								unit: obj[elementName]? obj[elementName].CommonStateUnit? obj[elementName].CommonStateUnit : "" : "",
+								write: false
+							};
+							/*let stateCommonType = typeof obj[elementName];
 							let stateCommonName = "";
 							let stateCommonWrite = false;
-							let stateCommonRole = "value";
+							let stateCommonRole = "value";*/
 							let stateVal = obj[elementName];
 							let objectId = `${startDirectory}.${elementName}`;
 							let internalObjectId = elementName;
 							if(obj[elementName]){
 								if(obj[elementName].isState){
 									stateVal = obj[elementName].stateVal !== undefined? obj[elementName].stateVal: undefined;
-									stateCommonType = obj[elementName].stateCommonType? obj[elementName].stateCommonType : typeof stateVal;
-									stateCommonName = obj[elementName].stateCommonName ? obj[elementName].stateCommonName : stateCommonName;
-									stateCommonWrite = obj[elementName].stateCommonWrite ? obj[elementName].stateCommonWrite : stateCommonWrite;
-									stateCommonRole = obj[elementName].stateCommonRole ? obj[elementName].stateCommonRole : stateCommonRole;
+									common.type = obj[elementName].stateCommonType? obj[elementName].stateCommonType : typeof stateVal;
+									common.name = obj[elementName].stateCommonName ? obj[elementName].stateCommonName : common.name;
+									common.write = obj[elementName].stateCommonWrite ? obj[elementName].stateCommonWrite : common.write;
+									common.role = obj[elementName].stateCommonRole ? obj[elementName].stateCommonRole : common.role;
 								}
 								if(obj[elementName].objectId){
 									internalObjectId = `${obj[elementName].objectId(topic,message)}`;
@@ -262,24 +297,22 @@ class directorieshandlerClass {
 								}
 							}
 							// Check for roles
-							if(this.uplinkRoles[elementName]){
-								stateCommonRole = this.uplinkRoles[elementName];
-							}
+							/*if(this.uplinkRoles[elementName]){
+								common.role = this.uplinkRoles[elementName];
+							}*/
 							// Check for id dont starts with "."
 							if(objectId.indexOf(".") === 0){
 								objectId.substring(1,objectId.length);
 							}
+							// Check for an assign definition (calculation and / or role assignment)
+							if(this.assigns[elementName]){
+								stateVal = this.assigns[elementName](stateVal,common);
+							}
+							common.read = common.role !== "button";
+							common.def = obj[elementName] || typeof obj[elementName] === "boolean" ? obj[elementName].stateCommonDef? obj[elementName].stateCommonDef: common.type === "boolean"? false : common.type === "number"? 0: "": common.type === "number"? 0: "";
 							await this.adapter.setObjectNotExistsAsync(objectId,{
 								type: "state",
-								common: {
-									type: stateCommonType !== undefined? stateCommonType!== "object"? stateCommonType: "mixed": "mixed",
-									name: stateCommonName,
-									role: stateCommonRole,
-									read: stateCommonRole !== "button",
-									unit: obj[elementName]? obj[elementName].CommonStateUnit? obj[elementName].CommonStateUnit : "" : "",
-									def: obj[elementName] || typeof obj[elementName] === "boolean" ? obj[elementName].stateCommonDef? obj[elementName].stateCommonDef: stateCommonType === "boolean"? false : stateCommonType === "number"? 0: "": stateCommonType === "number"? 0: "",
-									write: stateCommonWrite
-								},
+								common: common,
 								native: {},
 							});
 							if(typeof stateVal === "object"){

package/package.json

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