iobroker.sonoff 4.2.0 → 4.2.1

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)$/);