iobroker.sonoff 4.0.0 → 4.2.1

package/build/lib/i18n/pt.json

@@ -0,0 +1,61 @@
+{
+    "Relays & Switches": "Relés e interruptores",
+    "Lights & Dimmers": "Luzes e reguladores",
+    "Shutters & Covers": "Persianas e toldos",
+    "Zigbee bridges": "Pontes Zigbee",
+    "Energy Meters": "Contadores de energia",
+    "Sensors": "Sensores",
+    "Other": "Outros",
+    "Settings": "Definições",
+    "Rename this device": "Renomear este dispositivo",
+    "Enter new name": "Introduzir novo nome",
+    "Delete and recreate all data points of this device": "Eliminar e recriar todos os pontos de dados deste dispositivo",
+    "This deletes all data points of this device (except its name). They will be recreated automatically the next time the device reports its state. Continue?": "Isto elimina todos os pontos de dados deste dispositivo (exceto o nome). Serão recriados automaticamente da próxima vez que o dispositivo comunicar o seu estado. Continuar?",
+    "Open device web interface": "Abrir a interface web do dispositivo",
+    "Device ID": "ID do dispositivo",
+    "RSSI": "RSSI",
+    "Uptime": "Tempo de atividade",
+    "Power": "Potência",
+    "Power metering": "Medição de potência",
+    "Thresholds": "Limiares",
+    "Digital inputs": "Entradas digitais",
+    "Color": "Cor",
+    "Dimmer": "Regulador",
+    "Color temperature": "Temperatura de cor",
+    "Temperature": "Temperatura",
+    "Humidity": "Humidade",
+    "Pressure": "Pressão",
+    "Illuminance": "Iluminância",
+    "CO2": "CO2",
+    "TVOC": "TVOC",
+    "Dew point": "Ponto de orvalho",
+    "Voltage": "Tensão",
+    "Current": "Corrente",
+    "Neutral current": "Corrente de neutro",
+    "Apparent power": "Potência aparente",
+    "Reactive power": "Potência reativa",
+    "Power factor": "Fator de potência",
+    "Frequency": "Frequência",
+    "Today": "Hoje",
+    "Today (import)": "Hoje (consumo)",
+    "Today (export)": "Hoje (injeção)",
+    "Yesterday": "Ontem",
+    "Total": "Total",
+    "Total (import)": "Total (consumo)",
+    "Total (export)": "Total (injeção)",
+    "Returned energy": "Energia injetada",
+    "Power low threshold": "Limiar inferior de potência",
+    "Power high threshold": "Limiar superior de potência",
+    "Power delta threshold": "Limiar delta de potência",
+    "Model": "Modelo",
+    "Hostname": "Nome do host",
+    "IP address": "Endereço IP",
+    "MAC address": "Endereço MAC",
+    "Gateway": "Gateway",
+    "Subnet mask": "Máscara de sub-rede",
+    "Firmware version": "Versão do firmware",
+    "Hardware": "Hardware",
+    "Build date": "Data de compilação",
+    "Core": "Core",
+    "SDK": "SDK"
+}

package/build/lib/i18n/ru.json

@@ -0,0 +1,61 @@
+{
+    "Relays & Switches": "Реле и выключатели",
+    "Lights & Dimmers": "Освещение и диммеры",
+    "Shutters & Covers": "Жалюзи и рольставни",
+    "Zigbee bridges": "Zigbee-шлюзы",
+    "Energy Meters": "Счётчики энергии",
+    "Sensors": "Датчики",
+    "Other": "Прочее",
+    "Settings": "Настройки",
+    "Rename this device": "Переименовать это устройство",
+    "Enter new name": "Введите новое имя",
+    "Delete and recreate all data points of this device": "Удалить и создать заново все точки данных этого устройства",
+    "This deletes all data points of this device (except its name). They will be recreated automatically the next time the device reports its state. Continue?": "Будут удалены все точки данных этого устройства (кроме его имени). Они будут созданы заново автоматически, как только устройство в следующий раз сообщит своё состояние. Продолжить?",
+    "Open device web interface": "Открыть веб-интерфейс устройства",
+    "Device ID": "ID устройства",
+    "RSSI": "RSSI",
+    "Uptime": "Время работы",
+    "Power": "Мощность",
+    "Power metering": "Измерение мощности",
+    "Thresholds": "Пороговые значения",
+    "Digital inputs": "Дискретные входы",
+    "Color": "Цвет",
+    "Dimmer": "Диммер",
+    "Color temperature": "Цветовая температура",
+    "Temperature": "Температура",
+    "Humidity": "Влажность",
+    "Pressure": "Давление",
+    "Illuminance": "Освещённость",
+    "CO2": "CO2",
+    "TVOC": "ЛОС",
+    "Dew point": "Точка росы",
+    "Voltage": "Напряжение",
+    "Current": "Ток",
+    "Neutral current": "Ток нейтрали",
+    "Apparent power": "Полная мощность",
+    "Reactive power": "Реактивная мощность",
+    "Power factor": "Коэффициент мощности",
+    "Frequency": "Частота",
+    "Today": "Сегодня",
+    "Today (import)": "Сегодня (потребление)",
+    "Today (export)": "Сегодня (отдача)",
+    "Yesterday": "Вчера",
+    "Total": "Всего",
+    "Total (import)": "Всего (потребление)",
+    "Total (export)": "Всего (отдача)",
+    "Returned energy": "Отданная энергия",
+    "Power low threshold": "Нижний порог мощности",
+    "Power high threshold": "Верхний порог мощности",
+    "Power delta threshold": "Порог изменения мощности",
+    "Model": "Модель",
+    "Hostname": "Имя хоста",
+    "IP address": "IP-адрес",
+    "MAC address": "MAC-адрес",
+    "Gateway": "Шлюз",
+    "Subnet mask": "Маска подсети",
+    "Firmware version": "Версия прошивки",
+    "Hardware": "Оборудование",
+    "Build date": "Дата сборки",
+    "Core": "Core",
+    "SDK": "SDK"
+}

package/build/lib/i18n/uk.json

@@ -0,0 +1,61 @@
+{
+    "Relays & Switches": "Реле та вимикачі",
+    "Lights & Dimmers": "Освітлення та димери",
+    "Shutters & Covers": "Жалюзі та ролети",
+    "Zigbee bridges": "Zigbee-шлюзи",
+    "Energy Meters": "Лічильники енергії",
+    "Sensors": "Датчики",
+    "Other": "Інше",
+    "Settings": "Налаштування",
+    "Rename this device": "Перейменувати цей пристрій",
+    "Enter new name": "Введіть нову назву",
+    "Delete and recreate all data points of this device": "Видалити та створити заново всі точки даних цього пристрою",
+    "This deletes all data points of this device (except its name). They will be recreated automatically the next time the device reports its state. Continue?": "Буде видалено всі точки даних цього пристрою (крім його назви). Вони будуть створені заново автоматично, щойно пристрій наступного разу повідомить свій стан. Продовжити?",
+    "Open device web interface": "Відкрити вебінтерфейс пристрою",
+    "Device ID": "ID пристрою",
+    "RSSI": "RSSI",
+    "Uptime": "Час роботи",
+    "Power": "Потужність",
+    "Power metering": "Вимірювання потужності",
+    "Thresholds": "Порогові значення",
+    "Digital inputs": "Дискретні входи",
+    "Color": "Колір",
+    "Dimmer": "Димер",
+    "Color temperature": "Колірна температура",
+    "Temperature": "Температура",
+    "Humidity": "Вологість",
+    "Pressure": "Тиск",
+    "Illuminance": "Освітленість",
+    "CO2": "CO2",
+    "TVOC": "ЛОС",
+    "Dew point": "Точка роси",
+    "Voltage": "Напруга",
+    "Current": "Струм",
+    "Neutral current": "Струм нейтралі",
+    "Apparent power": "Повна потужність",
+    "Reactive power": "Реактивна потужність",
+    "Power factor": "Коефіцієнт потужності",
+    "Frequency": "Частота",
+    "Today": "Сьогодні",
+    "Today (import)": "Сьогодні (споживання)",
+    "Today (export)": "Сьогодні (віддача)",
+    "Yesterday": "Учора",
+    "Total": "Разом",
+    "Total (import)": "Разом (споживання)",
+    "Total (export)": "Разом (віддача)",
+    "Returned energy": "Віддана енергія",
+    "Power low threshold": "Нижній поріг потужності",
+    "Power high threshold": "Верхній поріг потужності",
+    "Power delta threshold": "Поріг зміни потужності",
+    "Model": "Модель",
+    "Hostname": "Ім'я хоста",
+    "IP address": "IP-адреса",
+    "MAC address": "MAC-адреса",
+    "Gateway": "Шлюз",
+    "Subnet mask": "Маска підмережі",
+    "Firmware version": "Версія прошивки",
+    "Hardware": "Обладнання",
+    "Build date": "Дата збірки",
+    "Core": "Core",
+    "SDK": "SDK"
+}

package/build/lib/i18n/zh-cn.json

@@ -0,0 +1,61 @@
+{
+    "Relays & Switches": "继电器和开关",
+    "Lights & Dimmers": "灯光和调光器",
+    "Shutters & Covers": "卷帘和遮阳",
+    "Zigbee bridges": "Zigbee 网关",
+    "Energy Meters": "电能表",
+    "Sensors": "传感器",
+    "Other": "其他",
+    "Settings": "设置",
+    "Rename this device": "重命名此设备",
+    "Enter new name": "输入新名称",
+    "Delete and recreate all data points of this device": "删除并重新创建此设备的所有数据点",
+    "This deletes all data points of this device (except its name). They will be recreated automatically the next time the device reports its state. Continue?": "这将删除此设备的所有数据点（名称除外）。当设备下次上报状态时，它们会自动重新创建。是否继续？",
+    "Open device web interface": "打开设备网页界面",
+    "Device ID": "设备 ID",
+    "RSSI": "RSSI",
+    "Uptime": "运行时间",
+    "Power": "功率",
+    "Power metering": "功率测量",
+    "Thresholds": "阈值",
+    "Digital inputs": "数字输入",
+    "Color": "颜色",
+    "Dimmer": "调光器",
+    "Color temperature": "色温",
+    "Temperature": "温度",
+    "Humidity": "湿度",
+    "Pressure": "气压",
+    "Illuminance": "照度",
+    "CO2": "CO2",
+    "TVOC": "TVOC",
+    "Dew point": "露点",
+    "Voltage": "电压",
+    "Current": "电流",
+    "Neutral current": "中性线电流",
+    "Apparent power": "视在功率",
+    "Reactive power": "无功功率",
+    "Power factor": "功率因数",
+    "Frequency": "频率",
+    "Today": "今日",
+    "Today (import)": "今日（用电）",
+    "Today (export)": "今日（上网）",
+    "Yesterday": "昨日",
+    "Total": "总计",
+    "Total (import)": "总计（用电）",
+    "Total (export)": "总计（上网）",
+    "Returned energy": "上网电量",
+    "Power low threshold": "功率下限阈值",
+    "Power high threshold": "功率上限阈值",
+    "Power delta threshold": "功率变化阈值",
+    "Model": "型号",
+    "Hostname": "主机名",
+    "IP address": "IP 地址",
+    "MAC address": "MAC 地址",
+    "Gateway": "网关",
+    "Subnet mask": "子网掩码",
+    "Firmware version": "固件版本",
+    "Hardware": "硬件",
+    "Build date": "构建日期",
+    "Core": "Core",
+    "SDK": "SDK"
+}

package/build/lib/mqttBase.js

@@ -214,9 +214,30 @@ class MQTTBase {
             this.processTasks().catch(err => this.adapter.log.error(err));
         }
     }
+    /**
+     * Finds the device channel (the `iobId` of its client) a state belongs to. That is not simply the
+     * first segment after "<namespace>.": the state can be nested (e.g. "STATE.POWER1" with "Create
+     * object tree" on), and a client ID may contain dots itself, as `FORBIDDEN_CHARS` keeps them. So
+     * the longest leading path that belongs to a known client wins - the first segment is only the
+     * fallback for a client that is not connected.
+     *
+     * @param id full state ID, e.g. "sonoff.0.DVES_123456.STATE.POWER1"
+     */
+    getChannelId(id) {
+        const parts = id.substring(this.adapter.namespace.length + 1).split('.');
+        // The last segment is the data point itself, never part of the channel
+        for (let i = parts.length - 1; i > 1; i--) {
+            const channelId = parts.slice(0, i).join('.');
+            if (this.mappingClients[channelId]) {
+                return channelId;
+            }
+        }
+        return parts[0];
+    }
     async onStateChangedColors(id, state, channelId, stateId) {
         if (!channelId) {
             const parts = id.split('.');
+            channelId = this.getChannelId(id);
             stateId = parts.pop() || '';
             if (stateId === 'level' ||
                 stateId === 'state' ||
@@ -225,7 +246,6 @@ class MQTTBase {
                 stateId === 'green') {
                 stateId = `${parts.pop()}.${stateId}`;
             }
-            channelId = parts.splice(2, parts.length).join('.');
         }
         const ledModeIdExor = `${this.adapter.namespace}.${channelId}.modeLedExor`;
         if (this.cachedModeExor[ledModeIdExor] === undefined) {
@@ -555,9 +575,8 @@ class MQTTBase {
         this.adapter.log.debug(`onStateChange ${id}: ${JSON.stringify(state)}`);
         if (state && !state.ack) {
             // find client.id
-            const parts = id.split('.');
-            const stateId = parts.pop() || '';
-            const channelId = parts.splice(2, parts.length).join('.');
+            const channelId = this.getChannelId(id);
+            const stateId = id.split('.').pop() || '';
             // Check if this is a Zigbee device state change
             // Pattern: ZbReceived_DEVICEID_ATTRIBUTE (e.g., ZbReceived_0x0856_Power)
             const zbMatch = stateId.match(/^ZbReceived_([^_]+)_(Power|Dimmer)$/);
@@ -610,6 +629,31 @@ class MQTTBase {
             }
         }
     }
+    /**
+     * Forgets everything that was cached about the objects of one device, so the next message from it
+     * recreates them. `processTasks` creates every object only once per adapter run
+     * (`cacheAddedObjects`), so data points that were deleted from outside - e.g. by the device
+     * manager's "delete and recreate all data points" action - would otherwise never come back until
+     * the adapter is restarted.
+     *
+     * @param deviceId full ID of the device channel, e.g. "sonoff.0.DVES_123456"
+     */
+    forgetObjects(deviceId) {
+        const prefix = `${deviceId}.`;
+        const caches = [
+            this.cacheAddedObjects,
+            this.cachedModeExor,
+            this.cachedReadColors,
+            this.cachePowerObjects,
+        ];
+        for (const cache of caches) {
+            for (const id of Object.keys(cache)) {
+                if (id === deviceId || id.startsWith(prefix)) {
+                    delete cache[id];
+                }
+            }
+        }
+    }
     async processTasks(callback) {
         if (callback) {
             this.taskCallbacks.push(callback);
@@ -1180,10 +1224,13 @@ class MQTTBase {
         }
         else if (parts[0] === 'stat' && stateId === 'STATUS10') {
             // stat/device/STATUS10 = {"StatusSNS":{"Time":"...","Switch2":"ON","Switch3":"OFF",...}}
+            // This is the same data as the periodic tele/.../SENSOR telemetry, just requested on demand,
+            // so it must land under the exact same state IDs - using "SENSOR" here too (with OBJ_TREE
+            // on) avoids creating a second, duplicate copy of e.g. the ENERGY reading.
             try {
                 const data = JSON.parse(val);
                 if (data.StatusSNS && typeof data.StatusSNS === 'object') {
-                    this.checkData(client, packet.topic, NO_PREFIX, data.StatusSNS);
+                    this.checkData(client, packet.topic, this.config.OBJ_TREE ? 'SENSOR' : NO_PREFIX, data.StatusSNS);
                 }
             }
             catch (e) {