iobroker.zigbee 3.3.1-alpha.0 → 3.3.2

package/lib/zigbeecontroller.js

@@ -1230,6 +1230,20 @@ class ZigbeeController extends EventEmitter {
         */
     }
 
+
+    async getConverterValue(converter, target, key, preparedValue, preparedObject, meta) {
+        if (preparedObject) {
+        //  try {
+            return  { result:await converter.convertSet(target, key, preparedObject, meta), fromObject:true };
+        //  }
+        //      catch (error)
+        //  {
+        //      return { result:await converter.convertSet(target, key, preparedValue, meta), fromObject:false };
+        //  }
+        }
+        else return { result:await converter.convertSet(target, key, preparedValue, meta), fromObject:false };
+    }
+
     // publish via converter
     //
     async publishFromState(deviceId, model, stateModel, stateList, options, debugID, has_elevated_debug) {
@@ -1284,6 +1298,12 @@ class ZigbeeController extends EventEmitter {
 
                     return;
                 }
+                // force read for brightness
+                const skey = stateDesc.setattr || stateDesc.prop || stateDesc.id;
+                const readKey = { key: undefined, converter: undefined };
+                if (skey === 'brightness') readKey.key = 'state';
+                if (skey === 'state') readKey.key = 'brightness';
+
                 for (const c of mappedModel.toZigbee) {
 
                     if (!c.hasOwnProperty('convertSet')) continue;
@@ -1292,6 +1312,8 @@ class ZigbeeController extends EventEmitter {
                     {
                         if (converter === undefined)
                         {
+                            if (readKey.key && readKey.converter === undefined && c.hasOwnProperty('convertGet'))
+                                readKey.converter = c;
                             converter = c;
                             if (has_elevated_debug) {
                                 const message = `Setting converter to keyless converter for ${deviceId} of type ${model}`;
@@ -1326,8 +1348,14 @@ class ZigbeeController extends EventEmitter {
                         converter = c;
                         msg_counter++;
                     }
+                    if (readKey.key && c.key.includes(readKey.key) && c.hasOwnProperty('convertGet'))
+                        readKey.converter = c;
                 }
                 if (converter === undefined) {
+                    if (stateDesc.isInternalState) {
+                        this.emit('acknowledge_state', deviceId, undefined, stateDesc , undefined );
+                        return;
+                    }
                     const message = `No converter available for '${model}' with key '${stateDesc.id}' `;
                     if (has_elevated_debug) {
                         this.emit('device_debug', { ID:debugID, data: { error: 'NOCONV',states:[{id:stateDesc.id, value:value, payload:'no converter'}] , IO:false }, message:message});
@@ -1353,7 +1381,7 @@ class ZigbeeController extends EventEmitter {
 
                 const epName = stateDesc.epname !== undefined ? stateDesc.epname : (stateDesc.prop || stateDesc.id);
                 const key = stateDesc.setattr || stateDesc.prop || stateDesc.id;
-                const message = `convert ${key} with value ${safeJsonStringify(preparedValue)} and options ${safeJsonStringify(preparedOptions)} for device ${deviceId} with Endpoint ${epName}`;
+                const message = `convert ${key} with value ${safeJsonStringify(preparedValue)} and options ${safeJsonStringify(preparedOptions)} for device ${deviceId} ${stateDesc.epname ? `with Endpoint ${epName}` : 'without Endpoint'}`;
                 if (has_elevated_debug) {
                     this.emit('device_debug', { ID:debugID, data: { flag: '04', payload: {key:key, ep: stateDesc.epname, value:preparedValue, options:preparedOptions}, IO:false }, message:message});
                 }
@@ -1371,7 +1399,7 @@ class ZigbeeController extends EventEmitter {
                 if (this.debugActive) this.debug(`target: ${safeJsonStringify(target)}`);
 
                 const meta = {
-                    endpoint_name: epName,
+                    endpoint_name: stateDesc.epname,
                     options: preparedOptions,
                     device: entity.device,
                     mapped: model === 'group' ? [] : mappedModel,
@@ -1398,10 +1426,22 @@ class ZigbeeController extends EventEmitter {
                     }
                 }
                 let retry = 2;
+                /*
+                let preparedObject = null;
+                try {
+                    preparedObject = JSON.parse(preparedValue);
+                }
+                catch (error)
+                { }
+                */
+
                 do
                 {
                     try {
                         const result = await converter.convertSet(target, key, preparedValue, meta);
+                        const fromObject = false;
+                        const preparedObject = null;
+                        //const { result, fromObject } = await this.getConverterValue(converter, target, key, preparedValue, preparedObject, meta);
                         const message = `convert result ${safeJsonStringify(result)} for device ${deviceId}`;
                         if (isGroup)
                             this.emit('published', deviceId, model, stateModel, stateList, options, debugID, has_elevated_debug );
@@ -1411,7 +1451,7 @@ class ZigbeeController extends EventEmitter {
                         else
                             if (this.debugActive) this.debug(message);
                         if (result !== undefined) {
-                            if (stateModel && !isGroup && !stateDesc.noack) {
+                            if (!stateDesc.noack) {
                                 this.emit('acknowledge_state', deviceId, model, stateDesc, value );
                             }
                             // process sync state list
@@ -1419,7 +1459,8 @@ class ZigbeeController extends EventEmitter {
                         }
                         else {
                             if (has_elevated_debug) {
-                                const message = `Convert does not return a result result for ${key} with ${safeJsonStringify(preparedValue)} on device ${deviceId}.`;
+                                const stringvalue = fromObject ? safeJsonStringify(preparedObject) : typeof preparedValue == 'object' ? safeJsonStringify(preparedValue) : preparedValue;
+                                const message = `Convert does not return a result result for ${key} with ${stringvalue} on device ${deviceId}.`;
                                 this.emit('device_debug', { ID:debugID, data: { flag: '06' , IO:false }, message:message});
                             }
                         }
@@ -1440,7 +1481,13 @@ class ZigbeeController extends EventEmitter {
                             ` Error: ${error.message}`, `Send command to ${deviceId} failed with`, error);
                         }
                     }
-                } while (retry > 0)
+                } while (retry > 0);
+
+                if (readKey.converter) {
+                    const tt = preparedOptions.transition || preparedOptions.transition_time;
+                    setTimeout(async () => { await readKey.converter.convertGet(target, readKey.key, {device:entity.device})}, tt ? tt * 1000 : 100)
+                }
+
             });
         } catch (err) {
             const message = `No entity for ${deviceId} : ${err && err.message ? err.message : 'no error message'}`;
@@ -1574,14 +1621,16 @@ class ZigbeeController extends EventEmitter {
             for (const converter of mappedModel.toZigbee) {
                 if (converter.hasOwnProperty('convertGet')) {
                     cCount++;
-                    const sources = [];
-                    if (converter.endpoints && epmap) {
-                        for (const epname of converter.endpoints) {
+                    const sources = new Set();
+                    if (!converter.endpoints) sources.add(entity.device.endpoints[0]);
+                    const epCandidates = converter.endpoints ? converter.endpoints : epmap ? Object.keys(epmap) : undefined;
+                    if (epCandidates) {
+                        for (const epname of epCandidates) {
                             const source = entity.device.endpoints.find((id) => id.ID == epmap[epname]);
-                            if (source) sources.push(source);
+                            if (source) sources.add(source);
                         }
                     }
-                    if (sources.length == 0) sources.push(entity.device.endpoints[0]);
+                    if (sources.size == 0) sources.add(entity.device.endpoints[0]);
                     for (const source of sources) {
                         for (const k of converter.key)
                             try {

package/main.js

@@ -130,15 +130,13 @@ class Zigbee extends utils.Adapter {
                     const Sentry = sentryInstance.getSentryObject();
                     if (Sentry) {
                         if (message) {
-                            Sentry.configureScope(scope =>
-                                scope.addBreadcrumb({
-                                    type: 'error', // predefined types
-                                    category: 'error message',
-                                    level: 'error',
-                                    message
-                                }));
+                            Sentry && Sentry.withScope(scope => scope.addBreadcrumb({
+                                type: 'error', // predefined types
+                                category: 'error message',
+                                level: 'error',
+                                message
+                            }));
                         }
-
                         if (typeof error == 'string') {
                             Sentry.captureException(new Error(error));
                         } else {
@@ -641,13 +639,13 @@ class Zigbee extends utils.Adapter {
         await this.callPluginMethod('start', [this.zbController, this.stController]);
     }
 
-    async syncAllDeviceStates(resetRoles) {
+    async syncAllDeviceStates(rebuildStates) {
         this.stController.CleanupRequired(false);
-        if (resetRoles) this.stController.clearModelDefinitions();
+        if (rebuildStates) this.stController.clearModelDefinitions();
         const devicesFromObjects = (await this.getDevicesAsync()).filter(item => item.native.id.length ==16).map((item) => `0x${item.native.id}`);
         const devicesFromDB = this.zbController.getClientIterator(false);
         for (const device of devicesFromDB) {
-            if (resetRoles) {
+            if (rebuildStates) {
                 const hM = await zigbeeHerdsmanConverters.findByDevice(device);
                 await this.stController.AddModelFromHerdsman(device, hM ? hM.model : device.modelID);
             }
@@ -660,7 +658,7 @@ class Zigbee extends utils.Adapter {
             if (entity) {
                 const model = entity.mapped ? entity.mapped.model : entity.device.modelID;
                 this.stController.updateDev(zbIdorIeeetoAdId(this, device.ieeeAddr, false), model, model, () =>
-                    this.stController.syncDevStates(device, model, resetRoles));
+                    this.stController.syncDevStates(device, model));
             }
             else (this.log.debug('resolveEntity returned no entity'));
         }
@@ -705,15 +703,12 @@ class Zigbee extends utils.Adapter {
         await this.stController.AddModelFromHerdsman(entity.device, model)
         if (device) {
             this.getObject(zbIdorIeeetoAdId(this, device.ieeeAddr, false), (err, obj) => {
-                if (!obj) {
-                    const model = (entity.mapped) ? entity.mapped.model : entity.device.modelID;
-                    if (this.debugActive) this.log.debug(`new device ${device.ieeeAddr} ${device.networkAddress} ${model} `);
+                const model = (entity.mapped) ? entity.mapped.model : entity.device.modelID;
+                if (this.debugActive) this.log.debug(`new device ${device.ieeeAddr} ${device.networkAddress} ${model} `);
 
-                    this.logToPairing(`New device joined '${device.ieeeAddr}' model ${model}`, true);
-                    this.stController.updateDev(zbIdorIeeetoAdId(this, device.ieeeAddr, false), model, model, () =>
-                        this.stController.syncDevStates(device, model, false));
-                }
-                else if (this.debugActive) this.log.debug(`Device ${safeJsonStringify(entity)} rejoined, no new device`);
+                if (!obj) this.logToPairing(`New device joined '${device.ieeeAddr}' model ${model}`, true);
+                this.stController.updateDev(zbIdorIeeetoAdId(this, device.ieeeAddr, false), model, model, () =>
+                    this.stController.syncDevStates(device, model));
             });
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.3.1-alpha.0",
+  "version": "3.3.2",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -23,13 +23,13 @@
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
     "@iobroker/dm-utils": "^1.0.13",
-    "humanize-duration": "^3.33.1",
+    "humanize-duration": "^3.33.2",
     "tar": "^7.5.2",
     "ajv": "^8.17.1",
     "uri-js": "^4.4.1",
     "typescript": "^5.9.3",
-    "zigbee-herdsman": "^7.0.0",
-    "zigbee-herdsman-converters": "25.84.0"
+    "zigbee-herdsman": "^8.0.1",
+    "zigbee-herdsman-converters": "^25.99.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -38,7 +38,7 @@
     "@alcalzone/release-script-plugin-license": "^4.0.0",
     "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
     "@iobroker/testing": "^5.2.2",
-    "eslint": "^9.39.1",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.5.4",
     "mixin-deep": "^2.0.1",