iobroker.zigbee 3.1.2 → 3.1.5

package/lib/zigbeecontroller.js

@@ -11,7 +11,6 @@ const DeviceAvailabilityExt = require('./zbDeviceAvailability');
 const DeviceConfigureExt = require('./zbDeviceConfigure');
 const DeviceEventExt = require('./zbDeviceEvent');
 const DelayedActionExt = require('./zbDelayedAction');
-const Groups = require('./groups');
 const utils = require('./utils');
 
 const { access, constants } =require('node:fs/promises');
@@ -75,7 +74,7 @@ class ZigbeeController extends EventEmitter {
         this.herdsmanTimeoutRegexp = new RegExp(/(\d+)ms/);
         this.herdsmanLogSettings = {};
         this.debugActive = true;
-        this.ListDevicesAtStart = true;
+        this.ListDevicesAtStart = adapter.config.listDevicesAtStart;
         this.deviceQueryActive = [];
         this.storedOptions = undefined;
         this.isConfigured = false;
@@ -167,7 +166,7 @@ class ZigbeeController extends EventEmitter {
         this.herdsmanLogSettings.extendedPanID = utils.byteArrayToString(herdsmanSettings.network.extendedPanID);
         this.herdsman = new ZigbeeHerdsman.Controller(herdsmanSettings, this.adapter.log);
         this.callExtensionMethod('setOptions', [{
-            disableActivePing: this.adapter.config.disablePing,
+            pingCluster: this.adapter.config.pingCluster,
             startReadDelay: this.adapter.config.readAllAtStart ? this.adapter.config.startReadDelay : 0,
             disableForcedPing: false,
             pingTimeout: 300,
@@ -283,8 +282,7 @@ class ZigbeeController extends EventEmitter {
                 // get the model description for the known devices
                 const entity = await this.resolveEntity(device);
                 if (!entity) {
-                    this.warn('failed to resolve Entity for ' + device.ieeeAddr);
-                    //this.emit('pairing','failed to resolve Entity for ' + device.ieeeAddr)
+                    this.debug('failed to resolve Entity for ' + device.ieeeAddr);
                     continue;
                 }
                 //await this.adapter.stController.AddModelFromHerdsman(device, entity.mapped.model);
@@ -305,7 +303,6 @@ class ZigbeeController extends EventEmitter {
                     ` (addr ${entity.device.networkAddress}): ` +
                     (entity.mapped ? `${entity.mapped.model} - ${entity.mapped.vendor} ${entity.mapped.description} ` : `Unsupported (model ${entity.device.modelID})`) +
                     `(${entity.device.type})`);
-                //this.emit('pairing',msg);
                 if (this.ListDevicesAtStart) this.info(msg);
             }
 
@@ -536,9 +533,10 @@ class ZigbeeController extends EventEmitter {
         return members;
     }
 
-    getDevice(key) {
+    async getDevice(key) {
         try {
-            return this.herdsman.getDeviceByIeeeAddr(key);
+            const dev = await this.herdsman.getDeviceByIeeeAddr(key);
+            return dev;
         }
         catch (error) {
             this.error(`getDeviceByIeeeAddr: ${(error && error.message ? error.message : 'no error message')}`);
@@ -572,7 +570,9 @@ class ZigbeeController extends EventEmitter {
             key: key,
             message: 'success'
         }
-        if (typeof key === 'object') return rv;
+        if (typeof key === 'object') {
+            return rv;
+        }
         if (typeof key === 'number') {
             rv.kind = 'group';
             return rv;
@@ -602,8 +602,11 @@ class ZigbeeController extends EventEmitter {
         return rv;
     }
 
+    async getGroup(id) {
+        return await this.herdsman.getGroupByID(id);
+    }
+
     async resolveEntity(key, ep) {
-        // this.warn('resolve entity with key of tyoe ' + typeof (key));
         try {
             const _key = await this.analyzeKey(key);
             if (_key.message !== 'success') return undefined;
@@ -615,6 +618,7 @@ class ZigbeeController extends EventEmitter {
                     device: coordinator,
                     endpoint: coordinator.getEndpoint(1),
                     name: 'Coordinator',
+                    options:{}
                 };
             }
             if (_key.kind === 'group') {
@@ -626,18 +630,38 @@ class ZigbeeController extends EventEmitter {
                     type: 'group',
                     mapped: group,
                     device: group,
+                    endpoint: group,
                     //group,
                     name: `Group ${_key.key}`,
+                    options: {},
                 };
 
             }
             //if (_key.kind === 'ieee')
             const device = (_key.kind === 'ieee' ? this.herdsman.getDeviceByIeeeAddr(_key.key) : key);
+            if (device && device.model === 'group') {
+                return {
+                    type: 'group',
+                    mapped: device,
+                    device,
+                    endpoint: device,
+                    name: `Group ${device.groupID}`,
+                    options:{}
+                }
+            }
             if (device) {
                 const t = Date.now();
                 const mapped = await zigbeeHerdsmanConverters.findByDevice(device, false);
-                if (!mapped)
-                    this.warn(`Resolve Entity did not manage to find a mapped device for ${device}`);
+                if (!mapped) {
+                    if (device.type === 'Coordinator')
+                        return {
+                            type: 'device',
+                            device: device,
+                            endpoint: device.getEndpoint(1),
+                            name: 'Coordinator',
+                        };
+                    this.warn(`Resolve Entity did not manage to find a mapped device for ${device.ieeeAddr} of type ${device.modelID}`);
+                }
                 const endpoints = mapped && mapped.endpoint ? mapped.endpoint(device) : null;
                 let endpoint;
                 if (endpoints && ep != undefined && endpoints[ep]) {
@@ -652,6 +676,7 @@ class ZigbeeController extends EventEmitter {
                         endpoint = device.endpoints[0];
                     }
                 }
+                const options = mapped ? this.adapter.stController.localConfig.getOptions(device.ieeeAddr, mapped.model) : {};
                 return {
                     type: 'device',
                     device,
@@ -659,10 +684,11 @@ class ZigbeeController extends EventEmitter {
                     endpoint,
                     endpoints: device.endpoints,
                     name: device._ieeeAddr,
+                    options:options
                 };
             }
             else {
-                this.warn(`resolve_entity failed for ${JSON.stringify(_key)}`);
+                this.debug(`resolve_entity failed for ${JSON.stringify(_key)}`);
             }
         }
         catch (error)
@@ -705,10 +731,13 @@ class ZigbeeController extends EventEmitter {
         }
 
         try {
-            if (this.HerdsmanStarted) await this.permitJoin(0);
-            await this.herdsman.stop();
-            this.HerdsmanStarted = false;
-            this.info('zigbecontroller stopped successfully');
+            if (this.herdsmanStarted) {
+                await this.permitJoin(0);
+                await this.herdsman.stop();
+                this.herdsmanStarted = false;
+                this.info('zigbecontroller stopped successfully');
+            }
+            else this.info('zigbecontroller stopped successfully - ZH was not running');
         } catch (error) {
             this.sendError(error);
             if (this.herdsmanStarted) {
@@ -847,10 +876,11 @@ class ZigbeeController extends EventEmitter {
     async handleDeviceAnnounce(message) {
         if (this.debugActive) this.debug('handleDeviceAnnounce', message);
         const entity = await this.resolveEntity(message.device || message.ieeeAddr);
-        const friendlyName = entity.name;
-
+        const friendlyName = entity ? entity.name : message.ieeeAddr ? message.ieeeAddr : message.device && message.device.ieeeAddr ? message.device.ieeeAddr : 'without data';
 
         this.emit('pairing', `Device '${friendlyName}' announced itself`);
+        if (!entity) return;
+
         if (this.adapter.stController.checkDebugDevice(friendlyName)) {
             this.emit('device_debug', {ID: Date.now(), data: {flag:'da', states:[{id: '--', value:'--', payload:message}] , IO:true} ,message:`Device '${friendlyName}' announced itself`});
         }
@@ -860,25 +890,26 @@ class ZigbeeController extends EventEmitter {
             this.info(`Device '${friendlyName}' announced itself${this.readAtAnnounce ? ', trying to read its status' : ''}`);
         }
 
-        if (entity.device && entity.device._modelID && entity.device.interviewState != 'SUCCESSFUL') {
-            this.warn(`ignoring device announcement for ${entity.device._modelID} due to interview state ${entity.device.interviewState}`);
+        if (entity.device && entity.device.modelID && entity.device.interviewState != 'SUCCESSFUL') {
+            this.info(`ignoring device announcement for ${entity.device.modelID} due to interview state ${entity.device.interviewState}`);
             this.emit('pairing', `device interview state is ${entity.device.interviewState}`)
             return;
         }
 
         const networkOpen = this.herdsman.getPermitJoin();
-        if (networkOpen && entity.device && entity.device._modelID && entity.device.interviewState != 'IN_PROGRESS')
+        /*
+        if (networkOpen && entity.device && entity.device.modelID && entity.device.interviewState != 'IN_PROGRESS')
         {
             //entity.device.modelID = entity.device._modelID;
-            this.emit('new', entity);
+            //this.emit('new', entity);
             return;
         }
-
+        */
         try {
             if (entity && entity.mapped) {
                 this.callExtensionMethod(
                     'onZigbeeEvent',
-                    [{'device': message.device, 'type': 'deviceAnnounce'}, entity ? entity.mapped : null]);
+                    [{'device': message.device, 'type': 'deviceAnnounce', options: entity.options || {}}, entity ? entity.mapped : null]);
                 this.callExtensionMethod('registerDevicePing', [message.device, entity]);
                 if (this.readAtAnnounce) await this.doDeviceQuery(message.device || message.ieeeAddr, Date.now(), false);
             }
@@ -891,7 +922,8 @@ class ZigbeeController extends EventEmitter {
     async handleDeviceJoined(message) {
         if (this.debugActive) this.debug('handleDeviceJoined', message);
         //const entity = await this.resolveEntity(message.device || message.ieeeAddr);
-        //this.emit('new', entity);
+        // this.emit('new', entity);
+        //if (entity && entity.mapped) this.callExtensionMethod([message, entity.mapped]);
     }
 
     async handleDeviceInterview(message) {
@@ -916,12 +948,12 @@ class ZigbeeController extends EventEmitter {
                     const log = {friendly_name: friendlyName, model, vendor, description, supported: true};
                     this.emit('pairing', 'Interview successful', JSON.stringify(log));
                     //entity.device.modelID = entity.device._modelID;
-                    this.emit('new', entity);
-                    // send to extensions again (for configure)
                     this.callExtensionMethod(
                         'onZigbeeEvent',
-                        [message, entity ? entity.mapped : null],
+                        [{...message,type:'deviceInterview', options: entity.options || {}}, entity.mapped],
                     );
+                    this.emit('new', entity);
+                    // send to extensions again (for configure)
                 } else {
                     if (this.debugActive) this.debug(
                         `Device '${friendlyName}' with Zigbee model '${message.device.modelID}' is NOT supported, ` +
@@ -936,8 +968,16 @@ class ZigbeeController extends EventEmitter {
                 this.error(`Failed to interview '${friendlyName}', device has not successfully been paired. Try again !!!!!!!!!! `);
                 //this.error(`Failed to interview '${friendlyName}', device has not successfully been paired. Try again !!!!!!!!!! ${message.error}`);
                 this.emit('pairing', 'Interview failed', friendlyName);
+                this.callExtensionMethod(
+                    'onZigbeeEvent',
+                    [message, entity ? entity.mapped : null],
+                );
             } else {
                 if (message.status === 'started') {
+                    this.callExtensionMethod(
+                        'onZigbeeEvent',
+                        [message, entity ? entity.mapped : null],
+                    );
                     this.info(`Starting interview of '${friendlyName}'`);
                     this.emit('pairing', 'Interview started', friendlyName);
                 }
@@ -953,7 +993,7 @@ class ZigbeeController extends EventEmitter {
 
         const is = data.device.interviewState;
         if (is != 'SUCCESSFUL' && is != 'FAILED') {
-            this.warn(`message ${JSON.stringify(data)} received during interview.`)
+            this.info(`message ${JSON.stringify(data)} received during interview.`)
         }
         const entity = await this.resolveEntity(data.device || data.ieeeAddr);
         const name = (entity && entity._modelID) ? entity._modelID : data.device.ieeeAddr;
@@ -963,11 +1003,10 @@ class ZigbeeController extends EventEmitter {
             (data.hasOwnProperty('groupID') ? ` with groupID ${data.groupID}` : ``)
         );
         this.event(data.type, entity, data);
-
         // Call extensions
         this.callExtensionMethod(
             'onZigbeeEvent',
-            [data, entity ? entity.mapped : null],
+            [{...data, options:entity.options || {}}, entity ? entity.mapped : null],
         );
     }
 
@@ -1240,7 +1279,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}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)} for device ${deviceId} with Endpoint ${epName}`;
+                const message = `convert ${key} with value ${safeJsonStringify(preparedValue)} and options ${safeJsonStringify(preparedOptions)} for device ${deviceId} with Endpoint ${epName}`;
                 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});
                 }
@@ -1288,7 +1327,8 @@ class ZigbeeController extends EventEmitter {
                 try {
                     const result = await converter.convertSet(target, key, preparedValue, meta);
                     const message = `convert result ${safeJsonStringify(result)} for device ${deviceId}`;
-                    this.emit('published', deviceId, model, stateModel, stateList, options, debugID, has_elevated_debug );
+                    if (isGroup)
+                        this.emit('published', deviceId, model, stateModel, stateList, options, debugID, has_elevated_debug );
                     if (has_elevated_debug) {
                         this.emit('device_debug', { ID:debugID, data: { flag: 'SUCCESS' , IO:false }, message:message});
                     }
@@ -1309,7 +1349,7 @@ class ZigbeeController extends EventEmitter {
                     }
                 } catch (error) {
                     if (has_elevated_debug) {
-                        const message = `caught error ${safeJsonStringify(error)} when setting value for device ${deviceId}.`;
+                        const message = `caught error ${error && error.message ? error.message : 'no reason given'} when setting value for device ${deviceId}.`;
                         this.emit('device_debug', { ID:debugID, data: { error: 'EXSET' , IO:false },message:message});
                     }
                     this.adapter.filterError(`Error ${error.code} on send command to ${deviceId}.` +
@@ -1347,8 +1387,8 @@ class ZigbeeController extends EventEmitter {
     // device: name of the device. For a device zigbee.0.0011223344556677 this would be 0011223344556677
     // payload: The data to send to the device as JSON object (key/Value pairs)
     // endpoint: optional: the endpoint to send the data to, if supported.
-    //
-    async publishPayload(payload, debugID) {
+    // acknowledge: optional: if to update the devices 'send_payload' DP (if present) after successful publish
+    async publishPayload(payload, debugID, has_elevated_debug) {
         let payloadObj = {};
         if (typeof payload === 'string') {
             try {
@@ -1410,7 +1450,10 @@ class ZigbeeController extends EventEmitter {
                     }
                 }
                 try {
-                    await this.publishFromState(`0x${payload.device}`, payload.model, payload.stateModel, stateList, payload.options, debugID);
+                    await this.publishFromState(`0x${payload.device}`, payload.model, payload.stateModel, stateList, payload.options, debugID, has_elevated_debug);
+                    if (payload.acknowledge) {
+                        this.emit('acknowledge_state', payload.device, payload.model, { id:'send_payload' }, undefined);
+                    }
                     return {success: true};
                 } catch (error) {
                     this.log.error(`Error ${error.code} on send command to ${payload.device}.` + ` Error: ${error.stack} ` + `Send command to ${payload.device} failed with ` + error);
@@ -1430,8 +1473,9 @@ class ZigbeeController extends EventEmitter {
         if (this.debugActive) this.debug(`doDeviceQuery: resolveEntity for entity: ${deviceId} is ${safeJsonStringify(entity)}`);
         const mappedModel = entity ? entity.mapped : undefined;
         if (mappedModel) {
+            const epmap = mappedModel.endpoint ? mappedModel.endpoint() : [];
             if (elevated) {
-                const message  = `Device query for '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' triggered`;
+                const message  = `Device query for '${entity.device.ieeeAddr}' triggered`;
                 this.emit('device_debug', { ID:debugID, data: { flag: 'qs' ,states:[{id:'device_query', value:true, payload:'device_query'}], IO:false }, message:message});
             }
             else
@@ -1440,24 +1484,32 @@ class ZigbeeController extends EventEmitter {
 
             for (const converter of mappedModel.toZigbee) {
                 if (converter.hasOwnProperty('convertGet')) {
-                    for (const ckey of converter.key) {
+                    const sources = [];
+                    if (converter.endpoints && epmap) {
+                        for (const epname of converter.endpoints) {
+                            const source = entity.device.endpoints.find((id) => id.ID == epmap[epname]);
+                            if (source) sources.push(source);
+                        }
+                    }
+                    if (sources.length == 0) sources.push(entity.device.endpoints[0]);
+                    for (const source of sources) {
                         try {
-                            await converter.convertGet(entity.device.endpoints[0], ckey, {device:entity.device});
-                            this.debug(`read state ${JSON.stringify(ckey)} of ${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID} after device query`);
+                            await converter.convertGet(source, '', {device:entity.device});
+                            this.debug(`read for state${converter.key.length ? '' : 's'} '${converter.key.join(',')}' of '${entity.device.ieeeAddr}/${source.ID}' after device query`);
                         } catch (error) {
                             if (elevated) {
-                                const message = `Failed to read state '${JSON.stringify(ckey)}'of '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' from query with '${error && error.message ? error.message : 'no error message'}`;
+                                const message = `Failed to read for state${converter.key.length ? '' : 's'} '${converter.key.join(',')}' of '${source.ID}' from query with '${error && error.message ? error.message : 'no error message'}`;
                                 this.warn(`ELEVATED OE02.1 ${message}`);
                                 this.emit('device_debug', { ID:debugID, data: { error: 'NOTREAD' , IO:false }, message:message });
                             }
                             else
-                                this.debug(`failed to read state ${JSON.stringify(ckey)} of ${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID} after device query`);
+                                this.debug(`failed to read for state${converter.key.length ? '' : 's'} '${converter.key.join(',')}' of '${source.ID}'after device query`);
                         }
                     }
                 }
             }
             if (elevated) {
-                const message = `ELEVATED O07: Device query for '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' complete`;
+                const message = `ELEVATED O07: Device query for '${entity.device.ieeeAddr}}' complete`;
                 this.emit('device_debug', { ID:debugID, data: { flag: 'qe' , IO:false }, message:message});
             }
             else
@@ -1467,7 +1519,7 @@ class ZigbeeController extends EventEmitter {
 
     async deviceQuery(deviceId, debugID, elevated, callback) {
         if (this.deviceQueryActive.includes (deviceId)) {
-            this.warn(`Device query for ${deviceId} is still active.`);
+            this.info(`Device query for ${deviceId} is still active.`);
             return;
         }
         this.deviceQueryActive.push(deviceId);

package/main.js

@@ -13,8 +13,6 @@ try {
 }
 const originalLogMethod = debug.log;
 
-const zigbeeHerdsmanConvertersUtils = require('zigbee-herdsman-converters/lib/utils');
-
 const safeJsonStringify = require('./lib/json');
 const fs = require('fs');
 const path = require('path');
@@ -37,7 +35,6 @@ const vm = require('vm');
 const util = require('util');
 const dmZigbee  = require('./lib/devicemgmt.js');
 const DeviceDebug = require('./lib/DeviceDebug');
-const { regexpCode } = require('ajv/dist/compile/codegen');
 const dns = require('dns');
 const net = require('net');
 const { getNetAddress } = require('./lib/utils')
@@ -277,7 +274,6 @@ class Zigbee extends utils.Adapter {
 
     SandboxRequire(sandbox, items) {
         if (!items) return true;
-        //let converterLoaded = true;
         for (const item of items) {
             const modulePath = item[2].replace(/['"]/gm, '');
 
@@ -353,9 +349,6 @@ class Zigbee extends utils.Adapter {
                     converterLoaded = false;
                     this.log.error(`converter does not export any converter array, please add 'module.exports' statement to ${mN}`);
                 }
-
-                //fs.writeFileSync(mN+'.tmp', modifiedCode)
-
                 if (converterLoaded) {
                     try {
                         this.log.warn('Trying to run sandbox for ' + mN);
@@ -416,18 +409,18 @@ class Zigbee extends utils.Adapter {
                 }
                 this.zbController.configure(this.getZigbeeOptions(message.zigbeeOptions));
                 response.status = await this.doConnect(true);
+                if (!response.status) response.error = { message: 'Unable to start the Zigbee Network. Please check the previous messages.'}
                 this.sendTo(from, command, response, callback);
             }
             catch (error) {
-                this.sendTo(from, command, { status:false }, callback);
+                this.sendTo(from, command, { status:false, error }, callback);
             }
         }
         else try {
             await this.zbController.stopHerdsman();
-            //this.logToPairing('herdsman stopped !');
             this.sendTo(from, command, { status:true }, callback);
         } catch (error) {
-            this.sendTo(from, command, { status:true }, callback);
+            this.sendTo(from, command, { status:true, error }, callback);
         }
     }
 
@@ -460,12 +453,6 @@ class Zigbee extends utils.Adapter {
             this.setState('info.connection', false, true);
             this.logToPairing(`Failed to start Zigbee: ${error && error.message ? error.message : 'no message given'}`)
             this.log.error(`Failed to start Zigbee: ${error && error.message ? error.message : 'no message given'}`);
-            /* if (error.stack) {
-                this.log.error(error.stack);
-            } else {
-                this.log.error(error);
-            }
-            */
             this.sendError(error, `Failed to start Zigbee`);
             if (noReconnect) return false;
 
@@ -630,59 +617,58 @@ class Zigbee extends utils.Adapter {
 
         await this.setState('info.connection', true, true);
         this.stController.CleanupRequired(false);
+        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) {
             const entity = await this.zbController.resolveEntity(device);
             if (entity) {
                 const model = entity.mapped ? entity.mapped.model : entity.device.modelID;
+                const idx = devicesFromObjects.indexOf(device.ieeeAddr);
+                if (idx > -1) devicesFromObjects.splice(idx, 1);
                 this.stController.updateDev(device.ieeeAddr.substr(2), model, model, () =>
                     this.stController.syncDevStates(device, model));
             }
             else (this.log.warn('resolveEntity returned no entity'));
         }
+        for (const id of devicesFromObjects) {
+            try {
+                this.log.warn(`removing object for device ${id} - it is no longer in the zigbee database`);
+                await this.delObjectAsync(id.substring(2), { recursive:true })
+            }
+            catch {
+                this.log.warn(`error removing ${id}`)
+            }
+        }
         await this.callPluginMethod('start', [this.zbController, this.stController]);
     }
 
+
     async checkIfModelUpdate(entity) {
         const model = entity.mapped ? entity.mapped.model : entity.device.modelID;
         const device = entity.device;
         const devId = device.ieeeAddr.substr(2);
 
-        return new Promise((resolve) => {
-            this.getObject(devId, (err, obj) => {
-                if (obj && obj.common.type !== model) {
-                    // let's change model
-                    this.getStatesOf(devId, (err, states) => {
-                        if (!err && states) {
-                            const chain = [];
-                            states.forEach((state) =>
-                                chain.push(this.deleteStateAsync(devId, null, state._id)));
-
-                            Promise.all(chain)
-                                .then(() =>
-                                    this.stController.deleteObj(devId, () =>
-                                        this.stController.updateDev(devId, model, model, async () => {
-                                            await this.stController.syncDevStates(device, model);
-                                            resolve();
-                                        })));
-                        } else {
-                            resolve();
-                        }
-                    });
-                } else {
-                    resolve();
-                }
-            });
-        });
+        const obj = await this.getObjectAsync(devId);
+        if (obj && obj.common.type !== model) {
+            await this.stController.deleteObj(devId);
+            await this.stController.updateDev(devId, model, model);
+            await this.stController.syncDevStates(device, model);
+        }
     }
 
     acknowledgeState(deviceId, model, stateDesc, value) {
-        if (model === 'group') {
-            const stateId = `${this.namespace}.group_${deviceId}.${stateDesc.id}`;
-            this.setState(stateId, value, true);
-        } else {
-            const stateId = `${this.namespace}.${deviceId.replace('0x', '')}.${stateDesc.id}`;
-            this.setState(stateId, value, true);
+        const stateId = (model === 'group' ?
+            `${this.namespace}.group_${deviceId}.${stateDesc.id}` :
+            `${this.namespace}.${deviceId.replace('0x', '')}.${stateDesc.id}`);
+        if (value === undefined) try {
+            this.getState(stateId, (err, state) => { if (!err && state.hasOwnProperty('val')) this.setState(stateId,  state.val, true)});
+        }
+        catch (error) {
+            this.log.warn(`Error acknowledging ${stateId} without value: ${error && error.message ? error.message : 'no reason given'}`);
+        }
+        else try { this.setState(stateId, value, true); }
+        catch (error) {
+            this.log.warn(`Error acknowledging ${stateId} with value ${JSON.stringify(value)}: ${error && error.message ? error.message : 'no reason given'}`);
         }
     }
 
@@ -754,17 +740,17 @@ class Zigbee extends utils.Adapter {
     async onUnload(callback) {
         try {
             this.log.info(`Halting zigbee adapter. Restart delay is at least ${this.ioPack.common.stopTimeout / 1000} seconds.`)
+            this.setState('info.connection', false, true);
+            const chain = [];
             if (this.config.debugHerdsman) {
                 debug.disable();
                 debug.log = originalLogMethod;
             }
-
-            this.log.info('cleaning everything up...');
+            this.log.info('cleaning everything up');
             await this.callPluginMethod('stop');
-            await this.stController.stop();
-            if (this.zbController) {
-                await this.zbController.stop();
-            }
+            if (this.stController) chain.push(this.stController.stop());
+            if (this.zbController) chain.push(this.zbController.stop());
+            await Promise.all(chain);
             this.log.info('cleanup successful');
             callback();
         } catch (error) {
@@ -776,8 +762,8 @@ class Zigbee extends utils.Adapter {
         }
     }
 
-    getZigbeeOptions(_overrideOptions) {
-        const override = (_overrideOptions ? _overrideOptions:{});
+    getZigbeeOptions(overrideOptions) {
+        const override = (overrideOptions ? overrideOptions:{});
         // file path for db
         const dbDir = this.expandFileName('');
 
@@ -823,7 +809,7 @@ class Zigbee extends utils.Adapter {
             dbPath: 'shepherd.db',
             backupPath: 'nvbackup.json',
             disableLed: this.config.disableLed,
-            disablePing: this.config.disablePing,
+            disablePing: (this.config.pingCluster=='off'),
             transmitPower: this.config.transmitPower,
             disableBackup: this.config.disableBackup,
             extPanIdFix: extPanIdFix,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.1.2",
+  "version": "3.1.5",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -21,15 +21,15 @@
     "serialport": "^13.0.0"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.2.3",
+    "@iobroker/adapter-core": "^3.3.2",
     "@iobroker/dm-utils": "^1.0.10",
     "humanize-duration": "^3.33.0",
     "tar": "^7.4.3",
     "ajv": "^8.17.1",
     "uri-js": "^4.4.1",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "zigbee-herdsman": "^6.0.0",
-    "zigbee-herdsman-converters": "^25.0.0"
+    "zigbee-herdsman-converters": "25.31.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -37,15 +37,12 @@
     "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
-    "@iobroker/testing": "^5.0.4",
+    "@iobroker/testing": "^5.1.1",
     "chai": "^5.2.1",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^9.30.0",
+    "eslint": "^9.36.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.5.4",
-    "gulp": "^4.0.2",
-    "gulp-jsdoc3": "^3.0.0",
-    "gulp-replace": "^1.1.4",
     "mixin-deep": "^2.0.1",
     "mocha": "^11.7.1",
     "@iobroker/dev-server": "^0.7.8"