Updates and fixes

* updates deps * switch to adapter-dev * prevent invalid property storeMap in objects and fix * update gha
ioBroker · May 25, 2024 · 61f6608 · 61f6608
1 parent d74917f
commit 61f6608
Show file tree

Hide file tree

Showing 21 changed files with 8,016 additions and 945 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -28,11 +28,11 @@ jobs:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 18.x
 
 
       - name: Install Dependencies
-        run: npm i
+        run: npm ci
 
 #      - name: Perform a type check
 #        run: npm run check:ts
@@ -52,7 +52,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x, 22.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
@@ -63,7 +63,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: Install Dependencies
-        run: npm i
+        run: npm ci
 
       - name: Run local tests
         run: npm test
@@ -94,7 +94,7 @@ jobs:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Extract the version and commit body from the tag
         id: extract_release
@@ -111,7 +111,7 @@ jobs:
           echo "::set-output name=BODY::$BODY"
 
       - name: Install Dependencies
-        run: npm i
+        run: npm ci
 
 #      - name: Create a clean build
 #        run: npm run build

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2023 bluefox <[email protected]>
+Copyright (c) 2014-2024 bluefox <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -122,6 +122,14 @@ States:
 	### **WORK IN PROGRESS**
 -->
 ## Changelog
+
+### __WORK IN PROGRESS__
+* (mattreim) upgraded states for Tasmota 13.4.0.3 20240402
+* (mattreim) enhanced some log messages
+* (mattreim) Added PWM Items
+* (Apollon77) Fixed QoS handling to prevent invalid resubmissions
+* (Apollon77) Prevent creation of storeMap property in common and cleanup
+
 ### 3.0.3 (2023-09-25)
 * (bluefox/Bettman66) Added migration of password on JSON Config
 
@@ -256,7 +264,7 @@ States:
 
 The MIT License (MIT)
 
-Copyright (c) 2017-2023, bluefox <[email protected]>
+Copyright (c) 2017-2024, bluefox <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
@@ -5,8 +5,10 @@
     "Chained certificate:": "Verkettetes Zertifikat",
     "Client": "Client/subscriber",
     "Client ID:": "Client ID",
+    "Client timeout": "Client-Timeout",
     "Connection": "Verbindung",
     "Connection settings": "Verbindungseinstellungen",
+    "Create object tree": "Objektbaum erstellen",
     "Divided by comma": "Mit Komma getrennt, z.B 'mqtt/0/#,javascript/#'",
     "For stat/RESULT": "Für stat/RESULT",
     "For tele/SENSOR": "Für tele/SENSOR",
@@ -18,6 +20,7 @@
     "Mask to publish": "z.B 'mqtt.0.*,javascript.*'",
     "Mask to publish own states:": "Maske für Bekanntgeben von eigenen States",
     "Max topic length:": "Maximale Topicnamelänge",
+    "Other settings": "Andere Einstellungen",
     "Password confirmation:": "Passwort-Wiederholung",
     "Password:": "Passwort",
     "Patterns:": "Subscribe patterns",
@@ -44,11 +47,8 @@
     "Use chunk patch:": "Benutze Patch für Chunking",
     "Use different topic names for set and get:": "Unterschiedliche Namen für setzten und lesen",
     "User:": "Benutzer",
+    "WARNING! Check README.md!": "WARNUNG! Überprüfen Sie README.md!",
     "chars": "Symbolen",
     "connected": "verbunden",
-    "ms": "ms",
-    "Client timeout": "Client-Timeout",
-    "Create object tree": "Objektbaum erstellen",
-    "WARNING! Check README.md!": "WARNUNG! Überprüfen Sie README.md!",
-    "Other settings": "Andere Einstellungen"
+    "ms": "ms"
 }
diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -5,8 +5,10 @@
     "Chained certificate:": "Chained certificate",
     "Client": "Client/subscriber",
     "Client ID:": "Client ID",
+    "Client timeout": "Client timeout",
     "Connection": "Connection",
     "Connection settings": "Connection settings",
+    "Create object tree": "Create object tree",
     "Divided by comma": "Divided by comma, e.g. 'mqtt/0/#,javascript/#'",
     "For stat/RESULT": "For stat/RESULT",
     "For tele/SENSOR": "For tele/SENSOR",
@@ -18,6 +20,7 @@
     "Mask to publish": "e.g. 'mqtt.0.*,javascript.*'",
     "Mask to publish own states:": "Mask to publish own states",
     "Max topic length:": "Max topic name length",
+    "Other settings": "Other settings",
     "Password confirmation:": "Password confirmation",
     "Password:": "Password",
     "Patterns:": "Subscribe patterns",
@@ -44,11 +47,8 @@
     "Use chunk patch:": "Use chunk patch",
     "Use different topic names for set and get:": "Use different topic names for set and get",
     "User:": "User",
+    "WARNING! Check README.md!": "WARNING! Check README.md!",
     "chars": "chars",
     "connected": "connected",
-    "ms": "ms",
-    "Client timeout": "Client timeout",
-    "Create object tree": "Create object tree",
-    "WARNING! Check README.md!": "WARNING! Check README.md!",
-    "Other settings": "Other settings"
+    "ms": "ms"
 }
diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -1,54 +1,54 @@
 {
-  "Adapter settings": "Configuraciones Sonoff",
-  "Authentication settings": "Configuraciones de autenticación",
-  "Auto creation of states": "Creación automática de estados",
-  "Chained certificate:": "Certificado encadenado",
-  "Client": "Cliente/suscriptor",
-  "Client ID:": "Identificación del cliente",
-  "Connection": "Conexión",
-  "Connection settings": "Configuración de conexión",
-  "Divided by comma": "Dividido por coma, p. 'mqtt/0/#, javascript/#'",
-  "For stat/RESULT": "Por stat/RESULT",
-  "For tele/SENSOR": "Por tele/SENSOR",
-  "For tele/STATE": "Por tele/STATE",
-  "IP": "IP",
-  "Ignore warnings with pingreq": "Ignore las advertencias con pingreq",
-  "Interval before send topics by connection:": "Intervalo antes de enviar temas por conexión",
-  "Main settings": "Ajustes principales",
-  "Mask to publish": "p.ej. 'mqtt.0.*, javascript.*'",
-  "Mask to publish own states:": "Máscara para publicar estados propios",
-  "Max topic length:": "Longitud máxima del nombre del tema",
-  "Password confirmation:": "confirmación de contraseña",
-  "Password:": "Contraseña",
-  "Patterns:": "Suscribir patrones",
-  "Port:": "Puerto",
-  "Prefix for topics:": "Prefijo para todos los temas",
-  "Private certificate:": "Certificado privado",
-  "Public certificate:": "Certificado público",
-  "Publish all states at start:": "Publicar estados propios al conectar",
-  "Publish states on subscribe:": "Publicar estados al suscribirse",
-  "Result: ": "Resultado",
-  "Secure:": "Seguro",
-  "Send interval:": "Intervalo de envío",
-  "Send states (ack=true) too:": "Enviar estados (ack = true) también",
-  "Server": "Servidor/intermediario",
-  "Set certificates or load it first in the system settings (right top).": "Establezca certificados o cárguelos primero en la configuración del sistema (arriba a la derecha).",
-  "Sonoff Settings": "Configuraciones Sonoff",
-  "Sonoff adapter settings": "Configuraciones del adaptador Sonoff",
-  "Store only on change:": "Publicar solo en el cambio",
-  "Test connection": "Prueba de conexión con el servidor",
-  "Trace output for every message:": "Salida de seguimiento para cada mensaje",
-  "Type:": "Tipo",
-  "URL:": "URL",
-  "Use WebSockets:": "Use WebSockets también",
-  "Use chunk patch:": "Use el fragmento de fragmento",
-  "Use different topic names for set and get:": "Use diferentes nombres de tema para establecer y obtener",
-  "User:": "Usuario",
-  "chars": "caracteres",
-  "connected": "conectado",
-  "ms": "Sra",
-  "Client timeout": "tiempo de espera del cliente",
-  "Create object tree": "Crear árbol de objetos",
-  "WARNING! Check README.md!": "¡ADVERTENCIA! ¡Compruebe README.md!",
-  "Other settings": "Otros ajustes"
-}
+    "Adapter settings": "Configuraciones Sonoff",
+    "Authentication settings": "Configuraciones de autenticación",
+    "Auto creation of states": "Creación automática de estados",
+    "Chained certificate:": "Certificado encadenado",
+    "Client": "Cliente/suscriptor",
+    "Client ID:": "Identificación del cliente",
+    "Client timeout": "tiempo de espera del cliente",
+    "Connection": "Conexión",
+    "Connection settings": "Configuración de conexión",
+    "Create object tree": "Crear árbol de objetos",
+    "Divided by comma": "Dividido por coma, p. 'mqtt/0/#, javascript/#'",
+    "For stat/RESULT": "Por stat/RESULT",
+    "For tele/SENSOR": "Por tele/SENSOR",
+    "For tele/STATE": "Por tele/STATE",
+    "IP": "IP",
+    "Ignore warnings with pingreq": "Ignore las advertencias con pingreq",
+    "Interval before send topics by connection:": "Intervalo antes de enviar temas por conexión",
+    "Main settings": "Ajustes principales",
+    "Mask to publish": "p.ej. 'mqtt.0.*, javascript.*'",
+    "Mask to publish own states:": "Máscara para publicar estados propios",
+    "Max topic length:": "Longitud máxima del nombre del tema",
+    "Other settings": "Otros ajustes",
+    "Password confirmation:": "confirmación de contraseña",
+    "Password:": "Contraseña",
+    "Patterns:": "Suscribir patrones",
+    "Port:": "Puerto",
+    "Prefix for topics:": "Prefijo para todos los temas",
+    "Private certificate:": "Certificado privado",
+    "Public certificate:": "Certificado público",
+    "Publish all states at start:": "Publicar estados propios al conectar",
+    "Publish states on subscribe:": "Publicar estados al suscribirse",
+    "Result: ": "Resultado",
+    "Secure:": "Seguro",
+    "Send interval:": "Intervalo de envío",
+    "Send states (ack=true) too:": "Enviar estados (ack = true) también",
+    "Server": "Servidor/intermediario",
+    "Set certificates or load it first in the system settings (right top).": "Establezca certificados o cárguelos primero en la configuración del sistema (arriba a la derecha).",
+    "Sonoff Settings": "Configuraciones Sonoff",
+    "Sonoff adapter settings": "Configuraciones del adaptador Sonoff",
+    "Store only on change:": "Publicar solo en el cambio",
+    "Test connection": "Prueba de conexión con el servidor",
+    "Trace output for every message:": "Salida de seguimiento para cada mensaje",
+    "Type:": "Tipo",
+    "URL:": "URL",
+    "Use WebSockets:": "Use WebSockets también",
+    "Use chunk patch:": "Use el fragmento de fragmento",
+    "Use different topic names for set and get:": "Use diferentes nombres de tema para establecer y obtener",
+    "User:": "Usuario",
+    "WARNING! Check README.md!": "¡ADVERTENCIA! ¡Compruebe README.md!",
+    "chars": "caracteres",
+    "connected": "conectado",
+    "ms": "Sra"
+}
diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -1,54 +1,54 @@
 {
-  "Adapter settings": "Paramètres Sonoff",
-  "Authentication settings": "Paramètres d'authentification",
-  "Auto creation of states": "Création automatique d'états",
-  "Chained certificate:": "Certificat chaîné",
-  "Client": "Client/abonné",
-  "Client ID:": "identité du client",
-  "Connection": "Connexion",
-  "Connection settings": "Paramètres de connexion",
-  "Divided by comma": "Divisé par une virgule, par ex. 'mqtt/0/#, javascript/#'",
-  "For stat/RESULT": "Pour stat/RESULT",
-  "For tele/SENSOR": "Pour tele/SENSOR",
-  "For tele/STATE": "Pour tele/STATE",
-  "IP": "IP",
-  "Ignore warnings with pingreq": "Ignorer les avertissements avec pingreq",
-  "Interval before send topics by connection:": "Intervalle avant d'envoyer des sujets par connexion",
-  "Main settings": "Réglages principaux",
-  "Mask to publish": "par exemple. 'mqtt.0.*, javascript.*'",
-  "Mask to publish own states:": "Masque pour publier ses propres états",
-  "Max topic length:": "Longueur maximale du nom de la rubrique",
-  "Password confirmation:": "Confirmation mot de passe",
-  "Password:": "Mot de passe",
-  "Patterns:": "Modèles de souscription",
-  "Port:": "Port",
-  "Prefix for topics:": "Préfixe pour tous les sujets",
-  "Private certificate:": "Certificat privé",
-  "Public certificate:": "Certificat public",
-  "Publish all states at start:": "Publier ses propres états sur se connecter",
-  "Publish states on subscribe:": "Publier les états sur l'abonnement",
-  "Result: ": "Résultat",
-  "Secure:": "Garantir",
-  "Send interval:": "Envoyer un intervalle",
-  "Send states (ack=true) too:": "Envoyer des états (ack = true) aussi",
-  "Server": "Serveur/courtier",
-  "Set certificates or load it first in the system settings (right top).": "Définissez des certificats ou chargez-les d'abord dans les paramètres du système (en haut à droite).",
-  "Sonoff Settings": "Paramètres Sonoff",
-  "Sonoff adapter settings": "Paramètres de l'adaptateur Sonoff",
-  "Store only on change:": "Publier uniquement en cas de modification",
-  "Test connection": "Tester la connexion avec le serveur",
-  "Trace output for every message:": "Trace de sortie pour chaque message",
-  "Type:": "Type",
-  "URL:": "URL",
-  "Use WebSockets:": "Utilisez aussi WebSockets",
-  "Use chunk patch:": "Utiliser un patch de morceau",
-  "Use different topic names for set and get:": "Utilisez différents noms de sujet pour définir et obtenir",
-  "User:": "Utilisateur",
-  "chars": "chars",
-  "connected": "connecté",
-  "ms": "Mme",
-  "Client timeout": "Délai d'expiration du client",
-  "Create object tree": "Créer une arborescence d'objets",
-  "WARNING! Check README.md!": "AVERTISSEMENT! Vérifiez README.md!",
-  "Other settings": "Autres réglages"
-}
+    "Adapter settings": "Paramètres Sonoff",
+    "Authentication settings": "Paramètres d'authentification",
+    "Auto creation of states": "Création automatique d'états",
+    "Chained certificate:": "Certificat chaîné",
+    "Client": "Client/abonné",
+    "Client ID:": "identité du client",
+    "Client timeout": "Délai d'expiration du client",
+    "Connection": "Connexion",
+    "Connection settings": "Paramètres de connexion",
+    "Create object tree": "Créer une arborescence d'objets",
+    "Divided by comma": "Divisé par une virgule, par ex. 'mqtt/0/#, javascript/#'",
+    "For stat/RESULT": "Pour stat/RESULT",
+    "For tele/SENSOR": "Pour tele/SENSOR",
+    "For tele/STATE": "Pour tele/STATE",
+    "IP": "IP",
+    "Ignore warnings with pingreq": "Ignorer les avertissements avec pingreq",
+    "Interval before send topics by connection:": "Intervalle avant d'envoyer des sujets par connexion",
+    "Main settings": "Réglages principaux",
+    "Mask to publish": "par exemple. 'mqtt.0.*, javascript.*'",
+    "Mask to publish own states:": "Masque pour publier ses propres états",
+    "Max topic length:": "Longueur maximale du nom de la rubrique",
+    "Other settings": "Autres réglages",
+    "Password confirmation:": "Confirmation mot de passe",
+    "Password:": "Mot de passe",
+    "Patterns:": "Modèles de souscription",
+    "Port:": "Port",
+    "Prefix for topics:": "Préfixe pour tous les sujets",
+    "Private certificate:": "Certificat privé",
+    "Public certificate:": "Certificat public",
+    "Publish all states at start:": "Publier ses propres états sur se connecter",
+    "Publish states on subscribe:": "Publier les états sur l'abonnement",
+    "Result: ": "Résultat",
+    "Secure:": "Garantir",
+    "Send interval:": "Envoyer un intervalle",
+    "Send states (ack=true) too:": "Envoyer des états (ack = true) aussi",
+    "Server": "Serveur/courtier",
+    "Set certificates or load it first in the system settings (right top).": "Définissez des certificats ou chargez-les d'abord dans les paramètres du système (en haut à droite).",
+    "Sonoff Settings": "Paramètres Sonoff",
+    "Sonoff adapter settings": "Paramètres de l'adaptateur Sonoff",
+    "Store only on change:": "Publier uniquement en cas de modification",
+    "Test connection": "Tester la connexion avec le serveur",
+    "Trace output for every message:": "Trace de sortie pour chaque message",
+    "Type:": "Type",
+    "URL:": "URL",
+    "Use WebSockets:": "Utilisez aussi WebSockets",
+    "Use chunk patch:": "Utiliser un patch de morceau",
+    "Use different topic names for set and get:": "Utilisez différents noms de sujet pour définir et obtenir",
+    "User:": "Utilisateur",
+    "WARNING! Check README.md!": "AVERTISSEMENT! Vérifiez README.md!",
+    "chars": "chars",
+    "connected": "connecté",
+    "ms": "Mme"
+}