iobroker.sonoff 2.5.7 → 3.1.0

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "sonoff",
-    "version": "2.5.7",
+    "version": "3.1.0",
     "news": {
+      "3.1.0": {
+        "en": "Important: Node.js 18.x  and js-controller 5.0.19+ is needed at minimum\nupgraded states for Tasmota 13.4.0.3 20240402\nenhanced some log messages\nAdded PWM Items\nFixed QoS handling to prevent invalid resubmissions\nPrevent creation of storeMap property in common and cleanup",
+        "de": "Wichtig: Node.js 18.x und js-controller 5.0.19+ ist mindestens erforderlich\naktualisierte Zustände für Tasmota 13.4.0.3 20240402\neinige log-nachrichten erweitert\nPWM Waren\nBehobene QoS-Behandlung, um ungültige Wiedereinsetzungen zu verhindern\nVerhindern Sie die Erstellung von Geschäft Karte Immobilien gemeinsam und sauber",
+        "ru": "Важно: Node.js 18.x и js-контроллер 5.0.19+ необходимо как минимум\nмодернизированные штаты для Тасмота 13.4.0.3 20240402\nрасширенные сообщения\nДобавлено PWM Пункты\nФиксированная обработка QoS для предотвращения неправильных повторной подачи\nПредотвращение создания магазина Карта недвижимости в целом и очистки",
+        "pt": "Importante: Node.js 18.x e js-controller 5.0.19+ é necessário no mínimo\nestados atualizados para Tasmota 13.4.0.3 20240402\nmelhorou algumas mensagens de log\nAdicionado PWM Itens\nManuseio QoS fixo para evitar resubmissões inválidas\nImpedir a criação de loja Propriedade do mapa em comum e limpeza",
+        "nl": "Belangrijk: Node.js 18.x en js-controller 5.0.19+ is minimaal nodig\nverbeterde staten voor Tasmota 13.4.0.3 20240402\nsommige logberichten verbeterd\nToegevoegd PWM Artikelen\nVaste QoS-behandeling om ongeldige resubmissions te voorkomen\nVoorkoming van de oprichting van een opslagplaats Kaart eigendom gemeenschappelijk en opruimen",
+        "fr": "Important: Node.js 18.x et js-controller 5.0.19+ est nécessaire au minimum\nétats améliorés pour Tasmota 13.4.03 202402\namélioré certains messages de journal\nAjouté PWM Éléments\nManipulation fixe de QoS pour empêcher les nouvelles présentations non valides\nEmpêcher la création de magasins Carte propriété en commun et nettoyage",
+        "it": "Importante: Node.js 18.x e js-controller 5.0.19+ è necessario al minimo\nstati aggiornati per Tasmota 13.4.0.3 20240402\nmigliorato alcuni messaggi di log\nAggiunto PWM Articoli\nMovimentazione QoS fissa per evitare resubmissioni non valide\nPrevenire la creazione di negozio Mappa di proprietà in comune e pulizia",
+        "es": "Importante: Node.js 18.x y js-controller 5.0.19+ se necesita al mínimo\nestados actualizados para Tasmota 13.4.0.3 20240402\nmejorar algunos mensajes de registro\nAñadido PWM Temas\nManejo fijo de QoS para prevenir las remisiones inválidas\nPrevenir la creación de la tienda Mapa propiedad en común y limpieza",
+        "pl": "Ważne: Node.js 18.x i sterownik js- 5.0.19 + jest potrzebny co najmniej\nzaktualizowane stany dla Tasmota 13.4.0.3 20240402\npoprawiła niektóre komunikaty dziennika\nDodano PWM Pozycje\nNaprawiono obsługę QoS, aby zapobiec niepoprawnym ponownym uruchomieniom\nZapobieganie tworzeniu magazynu Map właściwość wspólne i sprzątanie",
+        "uk": "Важливо: Node.js 18.x і js-controller 5.0.19+ необхідний мінімум\nоновлені стани для Тасмота 13.4.0.3 20240402\nрозширено деяких повідомлень журналу\nДодано PWM Товари\nВиправлена обробка QoS для запобігання недійсних відповідей\nПрофілактика створення магазину Карта нерухомості в загальному і чистому вигляді",
+        "zh-cn": "重要:节点.js 18.x和js控制器 5.0.19+至少需要\n塔斯莫塔州升级\n增强一些日志消息\n已添加的 PWM 项目\n防止重新提交无效的固定QoS处理\n防止创建仓库 共同和清理的映射属性"
+      },
+      "3.0.3": {
+        "en": "Added migration of password on JSON Config",
+        "de": "Migration von Passwort auf JSON Config hinzugefügt",
+        "ru": "Добавлена миграция пароля на JSON Config",
+        "pt": "Adicionado migração de senha em JSON Config",
+        "nl": "Vermelding van wachtwoord op JSON Config",
+        "fr": "Ajout de la migration de mot de passe sur JSON Config",
+        "it": "Aggiunta migrazione di password su JSON Config",
+        "es": "Migración agregada de contraseña en JSON Config",
+        "pl": "Dostęp do migracji haseł JSON Config",
+        "uk": "Додано міграції пароля на JSON Config",
+        "zh-cn": "A. 增加联索行动密码的移徙"
+      },
       "2.5.7": {
         "en": "Disabled the logging of username and password during connection errors\nadded json config",
         "de": "Deaktiviert die Protokollierung von Benutzername und Passwort während der Verbindungsfehler\nadd json config",
@@ -39,7 +65,8 @@
         "it": "Risolto il caso di crash segnalato da Sentry",
         "es": "Solucionar caso de bloqueo informado por Sentry",
         "pl": "Napraw przypadek awarii zgłoszony przez Sentry",
-        "zh-cn": "修复 Sentry 报告的崩溃案例"
+        "zh-cn": "修复 Sentry 报告的崩溃案例",
+        "uk": "Виправте випадок збою, про який повідомляє Sentry"
       },
       "2.5.0": {
         "en": "Implement writing of NSPanel Widget changes\nFix crash case reported by Sentry",
@@ -51,7 +78,8 @@
         "it": "Implementare la scrittura delle modifiche al Widget NSPanel\nRisolto il caso di crash segnalato da Sentry",
         "es": "Implementar la escritura de cambios de NSPanel Widget\nSolucionar caso de bloqueo informado por Sentry",
         "pl": "Zaimplementuj pisanie zmian NSPanel Widget\nNapraw przypadek awarii zgłoszony przez Sentry",
-        "zh-cn": "实现编写 NSPanel Widget 更改\n修复 Sentry 报告的崩溃案例"
+        "zh-cn": "实现编写 NSPanel Widget 更改\n修复 Sentry 报告的崩溃案例",
+        "uk": "Реалізувати написання змін NSPanel Widget\nВиправте випадок збою, про який повідомляє Sentry"
       },
       "2.4.7": {
         "en": "Fix crash case (Sentry IOBROKER-SONOFF-1S)",
@@ -63,31 +91,8 @@
         "it": "Risolto il crash case (Sentry IOBROKER-SONOFF-1S)",
         "es": "Reparar caso de bloqueo (Sentry IOBROKER-SONOFF-1S)",
         "pl": "Napraw przypadek awarii (Sentry IOBROKER-SONOFF-1S)",
-        "zh-cn": "修复崩溃案例（Sentry IOBROKER-SONOFF-1S）"
-      },
-      "2.4.6": {
-        "en": "Fix some crash cases reported by Sentry (IOBROKER-SONOFF-B, IOBROKER-SONOFF-R, IOBROKER-SONOFF-4, IOBROKER-SONOFF-1, IOBROKER-SONOFF-13, IOBROKER-SONOFF-1J, IOBROKER-SONOFF-16, IOBROKER-SONOFF-3, IOBROKER-SONOFF-H)\nAdjust Uptime to mixed because it seems that it can be number or string",
-        "de": "Behebung einiger von Sentry gemeldeter Absturzfälle (IOBROKER-SONOFF-B, IOBROKER-SONOFF-R, IOBROKER-SONOFF-4, IOBROKER-SONOFF-1, IOBROKER-SONOFF-13, IOBROKER-SONOFF-1J, IOBROKER-SONOFF-16, IOBROKER-SONOFF-3, IOBROKER-SONOFF-H)\nStellen Sie die Betriebszeit auf gemischt ein, da es sich anscheinend um eine Zahl oder eine Zeichenfolge handeln kann",
-        "ru": "Исправьте некоторые случаи сбоев, о которых сообщает Sentry (IOBROKER-SONOFF-B, IOBROKER-SONOFF-R, IOBROKER-SONOFF-4, IOBROKER-SONOFF-1, IOBROKER-SONOFF-13, IOBROKER-SONOFF-1J, IOBROKER-SONOFF-16, IOBROKER-SONOFF-3, IOBROKER-SONOFF-H)\nОтрегулируйте время работы до смешанного, потому что кажется, что это может быть число или строка",
-        "pt": "Corrigir alguns casos de falha relatados pelo Sentinela (IOBROKER-SONOFF-B, IOBROKER-SONOFF-R, IOBROKER-SONOFF-4, IOBROKER-SONOFF-1, IOBROKER-SONOFF-13, IOBROKER-SONOFF-1J, IOBROKER-SONOFF-16, IOBROKER-SONOFF-3, IOBROKER-SONOFF-H)\nAjuste o tempo de atividade para misto porque parece que pode ser um número ou uma string",
-        "nl": "Enkele crashgevallen gemeld door Sentry repareren (IOBROKER-SONOFF-B, IOBROKER-SONOFF-R, IOBROKER-SONOFF-4, IOBROKER-SONOFF-1, IOBROKER-SONOFF-13, IOBROKER-SONOFF-1J, IOBROKER-SONOFF-16, IOBROKER-SONOFF-3, IOBROKER-SONOFF-H)\nStel Uptime in op gemengd omdat het lijkt alsof het een nummer of een tekenreeks kan zijn",
-        "fr": "Correction de certains cas de plantage signalés par Sentry (IOBROKER-SONOFF-B, IOBROKER-SONOFF-R, IOBROKER-SONOFF-4, IOBROKER-SONOFF-1, IOBROKER-SONOFF-13, IOBROKER-SONOFF-1J, IOBROKER-SONOFF-16, IOBROKER-SONOFF-3, IOBROKER-SONOFF-H)\nAjustez le temps de disponibilité sur mixte car il semble qu'il puisse s'agir d'un nombre ou d'une chaîne",
-        "it": "Risolti alcuni casi di crash segnalati da Sentry (IOBROKER-SONOFF-B, IOBROKER-SONOFF-R, IOBROKER-SONOFF-4, IOBROKER-SONOFF-1, IOBROKER-SONOFF-13, IOBROKER-SONOFF-1J, IOBROKER-SONOFF-16, IOBROKER-SONOFF-3, IOBROKER-SONOFF-H)\nRegola Uptime su misto perché sembra che possa essere un numero o una stringa",
-        "es": "Solucione algunos casos de bloqueo informados por Sentry (IOBROKER-SONOFF-B, IOBROKER-SONOFF-R, IOBROKER-SONOFF-4, IOBROKER-SONOFF-1, IOBROKER-SONOFF-13, IOBROKER-SONOFF-1J, IOBROKER-SONOFF-16, IOBROKER-SONOFF-3, IOBROKER-SONOFF-H)\nAjuste el tiempo de actividad a mixto porque parece que puede ser un número o una cadena",
-        "pl": "Napraw niektóre przypadki awarii zgłaszane przez Sentry (IOBROKER-SONOFF-B, IOBROKER-SONOFF-R, IOBROKER-SONOFF-4, IOBROKER-SONOFF-1, IOBROKER-SONOFF-13, IOBROKER-SONOFF-1J, IOBROKER-SONOFF-16, IOBROKER-SONOFF-3, IOBROKER-SONOFF-H)\nDostosuj Uptime do mieszanego, ponieważ wydaje się, że może to być liczba lub ciąg",
-        "zh-cn": "修复 Sentry 报告的一些崩溃案例（IOBROKER-SONOFF-B、IOBROKER-SONOFF-R、IOBROKER-SONOFF-4、IOBROKER-SONOFF-1、IOBROKER-SONOFF-13、IOBROKER-SONOFF-1J、IOBROKER-SONOFF-16、 IOBROKER-SONOFF-3、IOBROKER-SONOFF-H)\n将 Uptime 调整为混合，因为它似乎可以是数字或字符串"
-      },
-      "2.4.5": {
-        "en": "Fix some crash cases reported by Sentry",
-        "de": "Beheben Sie einige von Sentry gemeldete Absturzfälle",
-        "ru": "Исправить некоторые случаи сбоев, о которых сообщает Sentry",
-        "pt": "Corrija alguns casos de falha relatados pelo Sentry",
-        "nl": "Enkele crashgevallen gemeld door Sentry oplossen",
-        "fr": "Correction de certains cas de plantage signalés par Sentry",
-        "it": "Risolti alcuni casi di crash segnalati da Sentry",
-        "es": "Arregle algunos casos de fallas reportados por Sentry",
-        "pl": "Napraw niektóre przypadki awarii zgłoszone przez Sentry",
-        "zh-cn": "修复 Sentry 报告的一些崩溃案例"
+        "zh-cn": "修复崩溃案例（Sentry IOBROKER-SONOFF-1S）",
+        "uk": "Виправити випадок збою (Sentry IOBROKER-SONOFF-1S)"
       }
     },
     "title": "Sonoff",
@@ -101,7 +106,8 @@
       "it": "Sonoff",
       "es": "Sonoff",
       "pl": "Sonoff",
-      "zh-cn": "索诺夫"
+      "zh-cn": "索诺夫",
+      "uk": "Сонофф"
     },
     "desc": {
       "en": "This adapter allows to connect sonoff components via MQTT",
@@ -113,12 +119,16 @@
       "it": "Questo adattatore consente di collegare i componenti Sonoff via MQTT",
       "es": "Este adaptador permite conectar componentes de sonof a través de MQTT",
       "pl": "Ten adapter umożliwia łączenie komponentów sonoff za pośrednictwem MQTT",
-      "zh-cn": "该适配器允许通过MQTT连接Sonoff组件"
+      "zh-cn": "该适配器允许通过MQTT连接Sonoff组件",
+      "uk": "Цей адаптер дозволяє підключати компоненти sonoff через MQTT"
     },
     "authors": [
       "bluefox <dogafox@gmail.com>"
     ],
-    "license": "MIT",
+    "licenseInformation": {
+      "license": "MIT",
+      "type": "free"
+    },
     "platform": "Javascript/Node.js",
     "mode": "daemon",
     "compact": true,
@@ -143,7 +153,7 @@
     "type": "lighting",
     "dependencies": [
       {
-        "js-controller": ">=2.0.0"
+        "js-controller": ">=5.0.19"
       }
     ],
     "plugins": {
@@ -152,11 +162,17 @@
       }
     }
   },
+  "encryptedNative": [
+    "password"
+  ],
+  "protectedNative": [
+    "password"
+  ],
   "native": {
     "port": 1883,
     "bind": "0.0.0.0",
     "user": "",
-    "pass": "",
+    "password": "",
     "timeout": 300,
     "TELE_SENSOR": true,
     "TELE_STATE": false,

package/lib/datapoints.js

@@ -6,6 +6,7 @@ module.exports = {
     A2:            {type: 'number',  role: 'value',                    read: true, write: false},
     A3:            {type: 'number',  role: 'value',                    read: true, write: false},
     ANALOG:        {type: 'object',  role: 'state',                    read: true, write: false},
+    Ap:            {type: 'number',  role: 'value',                    read: true, write: false},
     APMac:         {type: 'number',  role: 'state',                    read: true, write: false},
     Action:        {type: 'string',  role: 'value',                    read: true, write: true},
     AirQuality:    {type: 'number',  role: 'value',                    read: true, write: false, unit: '%'},
@@ -53,7 +54,7 @@ module.exports = {
     Green:         {type: 'number',  role: 'level.color.green',        read: true, write: true,  min: 0, max: 100},
     HSBColor:      {type: 'string',  role: 'value.hsb',                read: true, write: true},
     Hostname:      {type: 'string',  role: 'state',                    read: true, write: false},
-    Hue:           {type: 'number',  role: 'level.color.hue',          read: true, write: true,  min: 0}, // max ??
+    Hue:           {type: 'number',  role: 'level.color.hue',          read: true, write: true,  min: 0, max: 360},
     Humidity:      {type: 'number',  role: 'value.humidity',           read: true, write: false, unit: '%'},
     IPAddress:     {type: 'string',  role: 'state',                    read: true, write: false},
     IPaddress:     {type: 'string',  role: 'state',                    read: true, write: false},
@@ -68,12 +69,28 @@ module.exports = {
     Leistung:      {type: 'number',  role: 'value.power.consumption',  read: true, write: false, unit: 'W'},
     Light:         {type: 'number',  role: 'value',                    read: true, write: false, unit: 'lx'},
     Longitude:     {type: 'number',  role: 'value.gps.longitude',      read: true, write: false, unit: '°'},
-    Mode:          {type: 'number',  role: 'value',                    read: true, write: true},
+    Mode:          {type: 'string',  role: 'state',                    read: true, write: true},
     Module:        {type: 'string',  role: 'state',                    read: true, write: false},
     Noise:         {type: 'number',  role: 'value',                    read: true, write: false, unit: 'dB'},
     Output:        {type: 'number',  role: 'value',                    read: true, write: true},
     Outsidetemp:   {type: 'number',  role: 'value.temperature',        read: true, write: false, unit: '°C'},
     PM10:          {type: 'number',  role: 'value',                    read: true, write: false, unit: 'ug/m3'},
+    PWM1:          {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM2:          {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM3:          {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM4:          {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM5:          {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM6:          {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM7:          {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM8:          {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM9:          {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM10:         {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM11:         {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM12:         {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM13:         {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM14:         {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM15:         {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
+    PWM16:         {type: 'number',  role: 'value',                    read: true, write: true,  min: 0, max: 1023},
     POWER10:       {type: 'boolean', role: 'switch',                   read: true, write: true,  storeMap: true},
     POWER11:       {type: 'boolean', role: 'switch',                   read: true, write: true,  storeMap: true},
     POWER12:       {type: 'boolean', role: 'switch',                   read: true, write: true,  storeMap: true},
@@ -123,7 +140,7 @@ module.exports = {
     SHUTTER3:      {type: 'number',  role: 'state',                    read: true, write: false},
     SHUTTER4:      {type: 'number',  role: 'state',                    read: true, write: false},
     SSId:          {type: 'string',  role: 'state',                    read: true, write: false},
-    Saturation:    {type: 'number',  role: 'level.color.saturation',   read: true, write: true,  min: 0}, //  max: 100 ??
+    Saturation:    {type: 'number',  role: 'level.color.saturation',   read: true, write: true,  min: 0, max: 255},
     Scheme:        {type: 'number',  role: 'value',                    read: true, write: true},
     SeaPressure:   {type: 'number',  role: 'value.pressure',           read: true, write: false, unit: 'hPa'},
     SleepMode:     {type: 'string',  role: 'state',                    read: true, write: false},
@@ -176,7 +193,6 @@ module.exports = {
     WW_POWER:      {type: 'boolean', role: 'switch.light',             read: true, write: true,  storeMap: true},
     Wakeup:        {type: 'string',  role: 'state',                    read: true, write: true},
     Warmwater:     {type: 'number',  role: 'value.temperature',        read: true, write: false, unit: '°C'},
-    Wifi_SSId:     {type: 'string',  role: 'state',                    read: true, write: true},
     Window:        {type: 'number',  role: 'value',                    read: true, write: true},
     Yesterday:     {type: 'number',  role: 'value.power.consumption',  read: true, write: false, unit: 'kWh'},
     eCO2:          {type: 'number',  role: 'value.eco2',               read: true, write: false, unit: 'ppm'},

package/lib/server.js

@@ -3,10 +3,10 @@
 const mqtt    = require('mqtt-connection');
 const net     = require('net');
 const types   = require('./datapoints');
-//const memwatch = require('memwatch-next');
-//const heapdump = require('heapdump');
+// const memwatch = require('memwatch-next');
+// const heapdump = require('heapdump');
 const hueCalc = true;
-//var heapTest = 0;
+// var heapTest = 0;
 const FORBIDDEN_CHARS = /[\]\[*,;'"`<>\\?]/g;
 const mappingClients = {};
 
@@ -218,7 +218,7 @@ function MQTTServer(adapter) {
     }
 
     function _setState(id, val, callback) {
-        adapter.log.debug(`Set State after task: ${id}`);
+        adapter.log.debug(`Set state after task: ${id}`);
         adapter.setForeignState(id, val, true, callback);
     }
 
@@ -236,7 +236,7 @@ function MQTTServer(adapter) {
         if (callback) {
             taskCallbacks.push(callback);
         }
-        adapter.log.debug(`updateState ${task.id} - ${tasks.length}`);
+        adapter.log.debug(`Update state ${task.id} - ${tasks.length}`);
         if (tasks.length === 1) {
             processTasks();
         }
@@ -276,9 +276,9 @@ function MQTTServer(adapter) {
             // set white to rgb or rgbww
             adapter.getObject(id, (err, obj) => {
                 if (!obj) {
-                    adapter.log.warn(`invalid rgbww obj for ${id}`);
+                    adapter.log.warn(`Invalid rgbww obj for ${id}`);
                 } else if (typeof state.val !== 'string') {
-                    adapter.log.warn(`invalid rgbww state value for ${id} : ${JSON.stringify(state.val)} needs to be a string`);
+                    adapter.log.warn(`Invalid rgbww state value for ${id} : ${JSON.stringify(state.val)} needs to be a string`);
                 } else {
                     const role = obj.common.role;
                     let color;
@@ -380,7 +380,7 @@ function MQTTServer(adapter) {
                 const idAlive = `${deviceDesc}.Color`;
                 adapter.getForeignState(idAlive, (err, state) => {
                     if (!state || typeof state.val !== 'string') {
-                        adapter.log.info(`invalid state Color for ${idAlive}, correcting value to #000000`);
+                        adapter.log.info(`Invalid state color for ${idAlive}, correcting value to #000000`);
                         adapter.setState(idAlive, '#000000', false);
                         return;
                     }
@@ -475,7 +475,7 @@ function MQTTServer(adapter) {
                 adapter.getForeignObject(idAlive, (err, obj) => {
                     if (!obj) {
                         // no color object
-                        adapter.log.warn(`unknown object: ${id}: ${state}`);
+                        adapter.log.warn(`Unknown object: ${id}: ${state}`);
                     } else {
                         const role = obj.common.role;
                         //if (role='level.color.rgb') return;
@@ -492,7 +492,7 @@ function MQTTServer(adapter) {
                             const idAlive = `${deviceDesc}.Color`;
                             adapter.getForeignState(idAlive, (err, state) => {
                                 if (!state) {
-                                    adapter.log.warn('ill state Color');
+                                    adapter.log.warn('ill state color');
                                     return;
                                 }
                                 const color = state.val.substring(1);
@@ -527,7 +527,7 @@ function MQTTServer(adapter) {
                             const idAlive = `${deviceDesc}.Color`;
                             adapter.getForeignState(idAlive, (err, state) => {
                                 if (!state) {
-                                    adapter.log.warn('ill state Color');
+                                    adapter.log.warn('ill state color');
                                     return;
                                 }
                                 const color = state.val.substring(1);
@@ -608,7 +608,7 @@ function MQTTServer(adapter) {
                     // other objects
                     adapter.getObject(id, (err, obj) => {
                         if (!obj) {
-                            adapter.log.warn(`invalid  obj ${id}`);
+                            adapter.log.warn(`Invalid object ${id}`);
                         } else {
                             const type = obj.common.type;
                             switch (type) {
@@ -675,11 +675,15 @@ function MQTTServer(adapter) {
                 cacheAddedObjects[task.id] = true;
                 adapter.getForeignObject(task.id, (err, obj) => {
                     if (!obj || !obj.common) {
+                        if (task.data.common.storeMap) {
+                            task.data = JSON.parse(JSON.stringify(task.data)); // copy
+                            delete task.data.common.storeMap;
+                        }
                         adapter.setForeignObject(task.id, task.data, (err) => {
                             if (err) {
-                                adapter.log.warn(`New Object creation error: ${err.message}`)
+                                adapter.log.warn(`New object creation error: ${err.message}`)
                             } else {
-                                adapter.log.info(`new object created: ${task.id}`);
+                                adapter.log.info(`New object created: ${task.id}`);
                             }
                             if (task.cb) {
                                 task.cb(task.id, task.cbArg, () => {
@@ -691,8 +695,12 @@ function MQTTServer(adapter) {
                                 setImmediate(processTasks);
                             }
                         });
-                    } else if (obj.common.type !== task.data.common.type) {
-                        adapter.extendObject(task.id, {common: {type: task.data.common.type}}, err => {
+                    } else if (obj.common.type !== task.data.common.type || obj.common.storeMap !== undefined) {
+                        obj.common.type = task.data.common.type;
+                        if (obj.common.storeMap !== undefined) {
+                            delete obj.common.storeMap;
+                        }
+                        adapter.setForeignObject(task.id, obj, err => {
                             if (err) {
                                 adapter.log.warn(`Object update error: ${err.message}`)
                             } else {
@@ -848,12 +856,12 @@ function MQTTServer(adapter) {
             try {
                 messages[i].ts = Date.now();
                 messages[i].count++;
-                adapter.log.debug(`Client [${client.id}] Resend messages on connect: ${messages[i].topic} = ${messages[i].payload}`);
+                adapter.log.debug(`Client [${client.id}] resend messages on connect: ${messages[i].topic} = ${messages[i].payload}`);
                 if (messages[i].cmd === 'publish') {
                     client.publish(messages[i]);
                 }
             } catch (e) {
-                adapter.log.warn(`Client [${client.id}] Cannot resend message: ${e}`);
+                adapter.log.warn(`Client [${client.id}] cannot resend message: ${e}`);
             }
 
             if (adapter.config.sendInterval) {
@@ -1128,7 +1136,7 @@ function MQTTServer(adapter) {
                     updateState(obj, val);
 
                     if (powerStateFound) {
-                        adapter.log.debug(`Got .STATE.POWER value message -> auto add .POWER object from ${obj.id}`);
+                        adapter.log.debug(`Got .STATE.POWER value message ==> auto add .POWER object from ${obj.id}`);
                         let powerId = obj.id.replace('.STATE.POWER', '.POWER');
                         let powerName = obj.data.common.name.replace(' STATE POWER', ' POWER');
                         let powerObj = Object.assign({}, obj);
@@ -1162,7 +1170,7 @@ function MQTTServer(adapter) {
         }
 
         let val = packet.payload.toString('utf8');
-        adapter.log.debug(`[${client.id}] Received: ${packet.topic} = ${val}`);
+        adapter.log.debug(`Client [${client.id}] received: ${packet.topic} = ${val}`);
 
         /*
         adapter.getForeignState('system.adapter.sonoff.0.memRss', (err, state) => {
@@ -1238,7 +1246,7 @@ function MQTTServer(adapter) {
                         checkData(client, packet.topic, NO_PREFIX, JSON.parse(val));
                     }
                 } catch (e) {
-                    adapter.log.warn(`Cannot parse data "${stateId}": _${val}_ - ${e}`);
+                    adapter.log.warn(`Client [${client.id}] cannot parse data "${stateId}": _${val}_ - ${e}`);
                 }
             }
             return;
@@ -1265,7 +1273,7 @@ function MQTTServer(adapter) {
                     //adapter.log.warn('log sensor parse"' + stateId + '": _' + val);
                 }
             } catch (e) {
-                adapter.log.warn(`Cannot parse data "${stateId}": _${val}_ - ${e}`);
+                adapter.log.warn(`Client [${client.id}] cannot parse data"${stateId}": _${val}_ - ${e}`);
             }
         } else if (parts[0] === 'tele' && stateId.match(/^INFO\d?$/)) {
             // tele/SonoffPOW/INFO1 = {"Module":"Sonoff Pow", "Version":"5.8.0", "FallbackTopic":"SonoffPOW", "GroupTopic":"sonoffs"}
@@ -1274,14 +1282,14 @@ function MQTTServer(adapter) {
             try {
                 checkData(client, packet.topic, 'INFO', JSON.parse(val));
             } catch (e) {
-                adapter.log.warn(`Cannot parse data"${stateId}": _${val}_ - ${e}`);
+                adapter.log.warn(`Client [${client.id}] cannot parse data"${stateId}": _${val}_ - ${e}`);
             }
         } else if (parts[0] === 'tele' && stateId.match(/^(ENERGY)\d?$/)) {
             // tele/sonoff_4ch/ENERGY = {"Time":"2017-10-02T19:24:32", "Total":1.753, "Yesterday":0.308, "Today":0.205, "Period":0, "Power":3, "Factor":0.12, "Voltage":221, "Current":0.097}
             try {
                 checkData(client, packet.topic, 'ENERGY', JSON.parse(val));
             } catch (e) {
-                adapter.log.warn(`Cannot parse data"${stateId}": _${val}_ - ${e}`);
+                adapter.log.warn(`Client [${client.id}] cannot parse data"${stateId}": _${val}_ - ${e}`);
             }
         } else if (types[stateId]) {
             // /ESP_BOX/BM280/Pressure = 1010.09
@@ -1372,7 +1380,7 @@ function MQTTServer(adapter) {
                 client.destroy();
             }
         } catch (e) {
-            adapter.log.warn(`Client [${client.id}] Cannot close client: ${e}`);
+            adapter.log.warn(`Client [${client.id}] cannot close client: ${e}`);
         }
     }
 
@@ -1385,7 +1393,7 @@ function MQTTServer(adapter) {
                     const message = clients[clientId]._messages[m];
                     if (now - message.ts >= adapter.config.retransmitInterval) {
                         if (message.count > adapter.config.retransmitCount) {
-                            adapter.log.warn(`Client [${clientId}] Message ${message.messageId} deleted after ${message.count} retries`);
+                            adapter.log.warn(`Client [${clientId}] message ${message.messageId} deleted after ${message.count} retries`);
                             clients[clientId]._messages.splice(m, 1);
                             continue;
                         }
@@ -1394,12 +1402,12 @@ function MQTTServer(adapter) {
                         message.count++;
                         message.ts = now;
                         try {
-                            adapter.log.debug(`Client [${clientId}] Resend message topic: ${message.topic}, payload: ${message.payload}`);
+                            adapter.log.debug(`Client [${clientId}] resend message topic: ${message.topic}, payload: ${message.payload}`);
                             if (message.cmd === 'publish') {
                                 clients[clientId].publish(message);
                             }
                         } catch (e) {
-                            adapter.log.warn(`Client [${clientId}] Cannot publish message: ${e}`);
+                            adapter.log.warn(`Client [${clientId}] cannot publish message: ${e}`);
                         }
 
                         if (adapter.config.sendInterval) {
@@ -1454,7 +1462,7 @@ function MQTTServer(adapter) {
                         options.password = options.password.toString();
                     }
                     if (config.user !== options.username ||
-                        config.pass !== options.password) {
+                        config.password !== options.password) {
                         adapter.log.warn(`Client [${client.id}] has invalid password or username`);
                         client.connack({returnCode: 4});
                         if (oldClient) {
@@ -1470,7 +1478,7 @@ function MQTTServer(adapter) {
                 }
 
                 if (oldClient) {
-                    adapter.log.info(`Client [${client.id}] reconnected. Old secret ${clients[client.id].__secret}. New secret ${client.__secret}`);
+                    adapter.log.info(`Client [${client.id}] reconnected. Old secret ${clients[client.id].__secret} ==> New secret ${client.__secret}`);
                     // need to destroy the old client
 
                     if (client.__secret !== clients[client.id].__secret) {
@@ -1556,7 +1564,7 @@ function MQTTServer(adapter) {
                     const pack = client._messages && client._messages.find(e => e.messageId === packet.messageId);
                     if (pack) {
                         // duplicate message => ignore
-                        adapter.log.warn(`Client [${client.id}] Ignored duplicate message with ID: ${packet.messageId}`);
+                        adapter.log.warn(`Client [${client.id}] ignored duplicate message with ID: ${packet.messageId}`);
                         return;
                     } else {
                         packet.ts = Date.now();
@@ -1595,7 +1603,7 @@ function MQTTServer(adapter) {
                 if (pos !== null) {
                     client.pubrel({messageId: packet.messageId});
                 } else {
-                    adapter.log.warn(`Client [${client.id}] Received pubrec on ${client.id} for unknown messageId ${packet.messageId}`);
+                    adapter.log.warn(`Client [${client.id}] received pubrec on ${client.id} for unknown message ID: ${packet.messageId}`);
                 }
             });
 
@@ -1621,7 +1629,7 @@ function MQTTServer(adapter) {
                 if (pos !== null) {
                     client._messages.splice(pos, 1);
                 } else {
-                    adapter.log.warn(`Client [${client.id}] Received pubcomp for unknown message ID: ${packet.messageId}`);
+                    adapter.log.warn(`Client [${client.id}] received pubcomp for unknown message ID: ${packet.messageId}`);
                 }
             });
 
@@ -1652,8 +1660,9 @@ function MQTTServer(adapter) {
                     client.pubcomp({messageId: packet.messageId});
 
                     receivedTopic(client._messages[pos], client);
+                    client._messages && client._messages.splice(pos, 1);
                 } else {
-                    adapter.log.warn(`Client [${client.id}] Received pubrel on ${client.id} for unknown messageId ${packet.messageId}`);
+                    adapter.log.warn(`Client [${client.id}] received pubrel on ${client.id} for unknown messageId ${packet.messageId}`);
                 }
             });
 
@@ -1679,10 +1688,10 @@ function MQTTServer(adapter) {
                 });
 
                 if (pos !== null) {
-                    adapter.log.debug(`Client [${client.id}] Received puback for ${client.id} message ID: ${packet.messageId}`);
+                    adapter.log.debug(`Client [${client.id}] received puback for ${client.id} message ID: ${packet.messageId}`);
                     client._messages && client._messages.splice(pos, 1);
                 } else {
-                    adapter.log.warn(`Client [${client.id}] Received puback for unknown message ID: ${packet.messageId}`);
+                    adapter.log.warn(`Client [${client.id}] received puback for unknown message ID: ${packet.messageId}`);
                 }
             });
 
@@ -1731,9 +1740,8 @@ function MQTTServer(adapter) {
             });
         });
 
-        server.on('error', err => {
-            adapter.log.error(`Can not start Server ${err}`);
-        });
+        server.on('error', err =>
+            adapter.log.error(`Can not start Server ${err}`));
 
         config.port = parseInt(config.port, 10) || 1883;
 

package/main.js

@@ -25,23 +25,36 @@ function decrypt(key, value) {
 
 function startAdapter(options) {
     options = options || {};
-    Object.assign(options, {name: adapterName});
+    Object.assign(options, { name: adapterName });
 
     adapter = new utils.Adapter(options);
 
     adapter.on('ready', () => {
-        // it must be like this
-
-        adapter.getForeignObject('system.config', (err, obj) => {
-            if (obj && obj.native && obj.native.secret) {
-                //noinspection JSUnresolvedVariable
-                adapter.config.pass = decrypt(obj.native.secret, adapter.config.pass);
-            } else {
-                //noinspection JSUnresolvedVariable
-                adapter.config.pass = decrypt('Zgfr56gFe87jJOM', adapter.config.pass);
-            }
+        // delete pass if a password set
+        if (adapter.config.password && adapter.config.pass) {
+            // delete adapter.config.pass
+            adapter.getForeignObject(`system.adapter.${adapter.namespace}`, (err, config) => {
+                delete config.native.pass;
+                adapter.setForeignObject(config._id, config);
+            });
+        } else if (!adapter.config.password && adapter.config.pass) {
+            // migrate
+            adapter.getForeignObject('system.config', (err, systemConfig) => {
+                adapter.getForeignObject(`system.adapter.${adapter.namespace}`, (err, config) => {
+                    if (systemConfig && systemConfig.native && systemConfig.native.secret) {
+                        // noinspection JSUnresolvedVariable
+                        config.native.password = decrypt(systemConfig.native.secret, adapter.config.pass);
+                    } else {
+                        // noinspection JSUnresolvedVariable
+                        config.native.password = decrypt('Zgfr56gFe87jJOM', adapter.config.pass);
+                    }
+                    delete config.native.pass;
+                    adapter.setForeignObject(config._id, config);
+                });
+            });
+        } else {
             main();
-        });
+        }
     });
 
     adapter.on('unload', cb => {
@@ -53,7 +66,7 @@ function startAdapter(options) {
         }
     });
 
-    // is called if a subscribed state changes
+    // called if the subscribed state changes itself
     adapter.on('stateChange', (id, state) => {
         adapter.log.debug(`stateChange ${id}: ${JSON.stringify(state)}`);
         // you can use the ack flag to detect if state is desired or acknowledged

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "iobroker.sonoff",
   "description": "The adapter allows to send and receive MQTT messages from ioBroker and to be a broker.",
-  "version": "2.5.7",
+  "version": "3.1.0",
   "author": "bluefox <dogafox@gmail.com>",
   "homepage": "https://github.com/ioBroker/ioBroker.sonoff",
   "repository": {
@@ -17,18 +17,17 @@
   ],
   "dependencies": {
     "mqtt-connection": "^4.1.0",
-    "@iobroker/adapter-core": "^2.6.8"
+    "@iobroker/adapter-core": "^3.1.4"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.6.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.6.0",
-    "@alcalzone/release-script-plugin-license": "^3.5.9",
-    "@iobroker/legacy-testing": "^0.3.6",
-    "axios": "^1.4.0",
-    "mqtt": "^4.3.7",
-    "gulp": "^4.0.2",
-    "mocha": "^10.2.0",
-    "chai": "^4.3.7"
+    "@alcalzone/release-script": "^3.7.0",
+    "@alcalzone/release-script-plugin-iobroker": "^3.7.0",
+    "@alcalzone/release-script-plugin-license": "^3.7.0",
+    "@iobroker/adapter-dev": "^1.3.0",
+    "@iobroker/legacy-testing": "^1.0.12",
+    "mqtt": "^4.3.8",
+    "mocha": "^10.4.0",
+    "chai": "^4.4.1"
   },
   "bugs": {
     "url": "https://github.com/ioBroker/ioBroker.sonoff/issues"
@@ -47,10 +46,11 @@
     "release-patch": "release-script patch --yes",
     "release-minor": "release-script minor --yes",
     "release-major": "release-script major --yes",
-    "update-packages": "ncu --upgrade"
+    "update-packages": "ncu --upgrade",
+    "translate": "translate-adapter"
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=18.0.0"
   },
   "license": "MIT"
 }