iobroker.zigbee 3.1.5 → 3.2.0

package/lib/localConfig.js

@@ -69,17 +69,30 @@ class localConfig extends EventEmitter {
         return true;
     }
 
+    isValid(data) {
+        const t = typeof data;
+        const invalidators= ['none', '##REMOVE##'];
+        switch (t) {
+            case 'number': return true;
+            case 'string': return invalidators.indexOf(data)< 0;
+            case 'object': return true;
+            default: return false;
+        }
+    }
+
     async updateLocalOverride(_target, model, key, data, global)
     {
         const target = (global ? model : _target);
-        this.info(`updating local data: (${global ? 'global':'local'}) : ${target}:${key}:${JSON.stringify(data)}`);
+        this.debug(`updating local data: (${global ? 'global':'local'}) : ${target}:${key}:${JSON.stringify(data)}`);
 
         if (typeof target != 'string' || typeof key != 'string') {
             this.error(`update called with illegal id data:${JSON.stringify(target)}:${JSON.stringify(key)}:${JSON.stringify(data)}`)
             return false;
         }
         const base = global ? this.localData.by_model[target] || {} : this.localData.by_id[target] || {};
-        if (data && Object.keys(data).length > 0 && data != 'none') {
+
+
+        if (data && Object.keys(data).length > 0 && this.isValid(data)) {
             if (key == 'icon')
                 base[key] = data.replace(this.basefolder, '.');
             else
@@ -99,33 +112,33 @@ class localConfig extends EventEmitter {
             if (base == {}) delete this.localData.by_id[target];
             else this.localData.by_id[target] = base;
         }
-        this.info(`Local Data for ${target} is ${JSON.stringify(base)} after update`);
+        this.debug(`Local Data for ${target} is ${JSON.stringify(base)} after update`);
         this.retainData();
         return true;
     }
 
-    async getLocalOverride(_target, model, key, global)
+    getLocalOverride(target, model, key, global)
     {
-        const target = (global ? model : _target);
-        this.info(`getting local data: (${global ? 'global':'local'}) : ${target}:${key}`);
+        this.debug(`getting local data: (${global ? 'global':'local'}) : ${target}:${key}`);
 
         if (typeof target != 'string' || typeof key != 'string') {
             this.error(`update called with illegal id data:${JSON.stringify(target)}:${JSON.stringify(key)}`)
             return false;
         }
         const rv = {};
-        if ((this.localData.byModel[target] || {}).hasOwnProperty(key))
-            rv[key] = this.localData.byModel[target] || {}[key];
+        if ((this.localData.by_model[model] || {}).hasOwnProperty(key))
+            rv[key] = this.localData.by_model[model][key];
         if (global) return rv;
-        if ((this.localData.by_id[_target] || {}).hasOwnProperty(key))
-            rv[key] = this.localData.by_id[_target] || {}[key];
+        if ((this.localData.by_id[target] || {}).hasOwnProperty(key))
+            rv[key] = this.localData.by_id[target][key];
         return rv;
     }
 
     NameForId(id, model, defaultName) {
         this.debug('name for id with ' + id + ' and ' + defaultName + ' from ' + JSON.stringify(this.localData));
-        const localstorage = (this.localData.by_id[id] || this.localData.by_model[model]);
-        if (localstorage && localstorage.hasOwnProperty['name']) return localstorage.name;
+        const nameObj = this.getLocalOverride(id, model, 'name', false);
+        if (nameObj.name)
+            return nameObj.name
         return defaultName;
     }
 
@@ -164,7 +177,7 @@ class localConfig extends EventEmitter {
                                 this.error('error writing file ' + path + JSON.stringify(err))
                                 return;
                             }
-                            this.info('Updated image file ' + rv)
+                            this.debug('Updated image file ' + rv)
                         })
                     }
                 })
@@ -228,8 +241,13 @@ class localConfig extends EventEmitter {
     }
 
     getOverrideWithTargetAndKey(target, key, isGlobal) {
-        const targetdata = this.getOverrideData(target, isGlobal);
-        if (targetdata && targetdata.hasOwnProperty(key)) return targetdata[key];
+        let targetdata = this.getOverrideData(target, isGlobal);
+        const keyparts = key.split('.');
+        while (keyparts.length > 1) {
+            targetdata = targetdata[keyparts[0]] || {};
+            keyparts.splice(0,1);
+        }
+        if (targetdata && targetdata.hasOwnProperty(keyparts[0])) return targetdata[keyparts[0]];
         return undefined;
     }
 
@@ -249,7 +267,7 @@ class localConfig extends EventEmitter {
                 try {
                     for (const prop in data_js) {
                         if (data_js[prop] != 'undefined') {
-                            this.info(`updating device name for ${prop} as ${data_js[prop]}`);
+                            this.debug(`updating device name for ${prop} as ${data_js[prop]}`);
                             this.updateDeviceName(prop, data_js[prop]);
                         }
                     }
@@ -284,8 +302,8 @@ class localConfig extends EventEmitter {
         }
     }
 
-    async retainData() {
-        this.debug('retaining local config: ' + JSON.stringify(this.localData));
+    writeData() {
+        this.info('retaining local config: ' + JSON.stringify(this.localData));
         try {
             fs.writeFileSync(this.filename, JSON.stringify(this.localData, null, 2))
             this.info('Saved local configuration data');
@@ -293,6 +311,18 @@ class localConfig extends EventEmitter {
         catch (error) {
             this.error(`error saving local config: ${error.message}`);
         }
+        this.delayRetain = null;
+    }
+
+    async retainData(isStopping) {
+        if (isStopping) {
+            if (this.delayRetain) clearTimeout(this.delayRetain);
+            this.writeData(this);
+            return;
+        }
+        if (this.delayRetain) return;
+        const t = this;
+        this.delayRetain = setTimeout(() => this.writeData(t), 500);
     }
 
     enumerateImages(_path) {
@@ -329,6 +359,14 @@ class localConfig extends EventEmitter {
         return rv;
     }
 
+    getByModel(id) {
+        return this.localData.by_model[id] || {};
+    }
+
+    getByDevice(id) {
+        return this.localData.by_id[id] || {};
+    }
+
 }
 
 module.exports = localConfig;

package/lib/statescontroller.js

@@ -9,6 +9,7 @@ const localConfig = require('./localConfig');
 const path = require('path');
 const axios = require('axios');
 const zigbeeHerdsmanConvertersUtils = require('zigbee-herdsman-converters/lib/utils');
+const utils = require('./utils');
 
 class StatesController extends EventEmitter {
     constructor(adapter) {
@@ -24,7 +25,7 @@ class StatesController extends EventEmitter {
         this.timeoutHandleUpload = null;
         this.ImagesToDownload = [];
         this.stashedErrors = {};
-        this.stashedUnknownModels = [];
+        this.stashedUnknownModels = {};
         this.debugMessages = { nodevice:{ in:[], out: []} };
         this.debugActive = true;
         this.deviceQueryBlock = [];
@@ -58,9 +59,9 @@ class StatesController extends EventEmitter {
                 rv.push('<p><b>Stashed Messages</b></p>')
                 rv.push(Object.values(this.stashedErrors).join('<br>'));
             }
-            if (this.stashedUnknownModels.length > 0) {
+            if (Object.keys(this.stashedUnknownModels).length > 0) {
                 rv.push('<p><b>Devices whithout Model definition</b></p>')
-                rv.push()
+                rv.push(Object.values(this.stashedUnknownModels).join('<br>'));
             }
         }
         catch (error) {
@@ -76,7 +77,7 @@ class StatesController extends EventEmitter {
     async AddModelFromHerdsman(device, model) {
         const namespace = `${this.adapter.name}.admin`;
 
-        if (this.localConfig.getOverrideWithTargetAndKey(model, 'legacy', true)) {
+        if (this.localConfig.getOverrideWithTargetAndKey(model, 'options.legacy', true)) {
             this.debug('Applying legacy definition for ' + model);
             await this.addLegacyDevice(model);
         }
@@ -84,7 +85,7 @@ class StatesController extends EventEmitter {
             this.debug('Generating states from exposes for ' + model);
             // download icon if it external and not undefined
             if (model === undefined) {
-                const dev_name = this.verifyDeviceName(device.ieeeAddr.substr(2), model, device.modelID);
+                const dev_name = this.verifyDeviceName(utils.zbIdorIeeetoAdId(this.adapter, device.ieeeAddr, false), model, device.modelID);
                 this.warn(`icon ${dev_name} for undefined Device not available. Check your devices.`);
             } else {
                 const modelDesc = await statesMapping.addExposeToDevices(device, this, model);
@@ -101,7 +102,7 @@ class StatesController extends EventEmitter {
                     }
                     return;
                 }
-                // source is inline basee64
+                // source is inline basee64F
                 const base64Match = srcIcon.match(/data:image\/(.+);base64,/);
                 if (base64Match) {
                     this.warn(`base 64 Icon matched, trying to save it to disk as ${pathToAdminIcon}`);
@@ -119,7 +120,7 @@ class StatesController extends EventEmitter {
                                     this.warn(`${msg} -- failed: ${err && err.message ? err.message : 'no reason given'}`);
                                     return;
                                 }
-                                this.info(`${msg} -- success`);
+                                this.debug(`${msg} -- success`);
                             });
                         }
                         catch (err) {
@@ -165,7 +166,7 @@ class StatesController extends EventEmitter {
                                     this.error(`error writing file ${path}: ${err.message ? err.message : 'no reason given'}`);
                                     return;
                                 }
-                                this.info('Updated image file ' + pathToAdminIcon);
+                                this.debug('Updated image file ' + pathToAdminIcon);
                             });
                             return;
                         }
@@ -361,12 +362,7 @@ class StatesController extends EventEmitter {
                 stateModel = statesMapping.findModel(model);
                 if (!stateModel) {
                     // try to get the model from the exposes
-                    if (!this.stashedErrors.hasOwnProperty(`${deviceId}.nomodel`))
-                    {
-                        this.warn(`Device ${deviceId} "${model}" not found.`);
-                        this.stashedErrors[`${deviceId}.nomodel`] = `Device ${deviceId} "${model}" not found.`;
-                    }
-
+                    this.stashUnknownModel(`getDevStates:${deviceId}`,`Model "${model}" not found for Device ${deviceId}`);
                     states = statesMapping.commonStates;
                 } else {
                     states = stateModel.states;
@@ -385,6 +381,21 @@ class StatesController extends EventEmitter {
         }
     }
 
+    stashErrors(key, msg, error) {
+        if (!this.stashedErrors.hasOwnProperty(key))
+        {
+            if (error) this.error(msg); else this.warn(msg);
+            this.stashedErrors[key] = msg;
+        }
+    }
+
+    stashUnknownModel(model, msg) {
+        if (!this.stashedUnknownModels.hasOwnProperty(model)) {
+            this.stashedUnknownModels[model] = msg;
+            this.error(`Unknown ${model}: ${msg}`)
+        }
+    }
+
     async triggerComposite(_deviceId, stateDesc, interactive) {
         const deviceId = (_deviceId.replace('0x', ''));
         const idParts = stateDesc.id.split('.').slice(-2);
@@ -506,7 +517,7 @@ class StatesController extends EventEmitter {
                                 if (! res.stateDesc.isOption) stateList.push(res);
                             }
                             else {
-                                res.forEach((ls) => { if (!ls.stateDesc.isOption) stateList.push(res)} );
+                                res.forEach((ls) => { if (!ls.stateDesc.isOption) stateList.push(ls)} );
                             }
                         }
                     } else {
@@ -564,19 +575,31 @@ class StatesController extends EventEmitter {
     async deleteObj(devId) {
         const options = { recursive:true };
         try {
-            this.adapter.delObject(devId,options), (err) => {
-                this.adapter.log.info(`Cannot delete Object ${devId}: ${err}`);
-            }
-
+            await this.adapter.delObjectAsync(devId,options);
         } catch (error) {
             this.adapter.log.warn(`Cannot delete Object ${devId}: ${error && error.message ? error.message : 'without error message'}`);
+            return `Cannot delete Object ${devId}: ${error && error.message ? error.message : 'without error message'}`;
+        }
+    }
+
+    async checkIfModelUpdate(entity) {
+        const model = entity.mapped ? entity.mapped.model : entity.device.modelID;
+        const device = entity.device;
+        const devId = utils.zbIdorIeeetoAdId(this.adapter, device.ieeeAddr, false);
+
+        const obj = await this.adapter.getObjectAsync(devId);
+        if (obj && obj.common.type !== model) {
+            await this.updateDev(devId, model, model);
+            await this.syncDevStates(device, model);
+            await this.deleteOrphanedDeviceStates(device.ieeeAddr, model,false, () => {}, true);
         }
     }
 
+
     async deleteOrphanedDeviceStates(ieeeAddr, model, force, callback, markOnly) {
         const devStates = await this.getDevStates(ieeeAddr, model);
         const commonStates = statesMapping.commonStates;
-        const devId = ieeeAddr.substr(2);
+        const devId = utils.zbIdorIeeetoAdId(this.adapter, ieeeAddr, false);
         const messages = [];
         this.adapter.getStatesOf(devId, (err, states) => {
             if (!err && states) {
@@ -706,22 +729,14 @@ class StatesController extends EventEmitter {
                             hasChanges = true;
                             new_common.color = '#FF0000'
                             value = minval
-                            if (!this.stashedErrors.hasOwnProperty(`${stateId}.min`))
-                            {
-                                this.warn(`State value for ${stateId} has value "${nval}" less than min "${minval}". - this eror is recorded and not repeated`);
-                                this.stashedErrors[`${stateId}.min`] = `State value for ${stateId} has value "${nval}." less than min "${minval}"`;
-                            }
+                            this.stashErrors(`${stateId}.min`,`State value for ${stateId} has value "${nval}" less than min "${minval}".`, false );
                         }
                         if (typeof maxval == 'number' && nval > maxval) {
                             hasChanges = true;
                             hasChanges = true;
                             new_common.color = '#FF0000'
                             value = maxval;
-                            if (!this.stashedErrors.hasOwnProperty(`${stateId}.max`))
-                            {
-                                this.warn(`State value for ${stateId} has value "${nval}" more than max "${maxval}". - this eror is recorded and not repeated`);
-                                this.stashedErrors[`${stateId}.max`] = `State value for ${stateId} has value "${nval}" more than max "${maxval}".`;
-                            }
+                            this.stashErrors(`${stateId}.max`,`State value for ${stateId} has value "${nval}" greater than max "${maxval}".`, false );
                         }
                     }
                 }
@@ -777,6 +792,11 @@ class StatesController extends EventEmitter {
                     value = sval === 'true' || sval === 'yes' || sval === 'on';
                 }
                     break;
+                case 'object' : break;
+                default:
+                    if (['array','file','json','mixed','multistate','number','object','string'].includes(type)) break;
+                    this.stashErrors(`etype:${id}`,`set_state_typed: trying to set a value on a strangely typed object: ${type} for id ${id} : ${JSON.stringify(Error().stack)}`);
+                    break;
             }
         }
         this.adapter.setState(id, value, ack, callback);
@@ -798,15 +818,15 @@ class StatesController extends EventEmitter {
 
 
     async getDefaultGroupIcon(id, members) {
-        let groupID = 0;
-        if (typeof id == 'string') {
+        let groupID = Number(id);
+        if (typeof id == 'string' && isNaN(groupID)) {
             const regexResult = id.match(new RegExp(/group_(\d+)/));
             if (!regexResult) return '';
             groupID = Number(regexResult[1]);
         } else if (typeof id == 'number') {
             groupID = id;
         }
-        if (groupID <= 0) return;
+        if (groupID <= 0 || groupID > 65535) return 'img/group_x.png';
         if (typeof members != 'number') {
             const group = await this.adapter.zbController.getGroupMembersFromController(groupID)
             if (typeof group == 'object')
@@ -845,8 +865,9 @@ class StatesController extends EventEmitter {
                 }
             }
         }
+        const objId = model=='group' ? `group_${dev_id}` : dev_id;
 
-        const obj = await this.adapter.getObjectAsync(id);
+        const obj = await this.adapter.getObjectAsync( objId);
 
         const myCommon = {
             name: __dev_name,
@@ -1005,7 +1026,7 @@ class StatesController extends EventEmitter {
 
     async syncDevStates(dev, model) {
         if (this.debugActive) this.debug('synchronizing device states for ' + dev.ieeeAddr + ' (' + model + ')');
-        const devId = dev.ieeeAddr.substr(2);
+        const devId = utils.zbIdorIeeetoAdId(this.adapter, dev.ieeeAddr, false);
         // devId - iobroker device id
         const devStates = await this.getDevStates(dev.ieeeAddr, model);
         if (!devStates) {
@@ -1222,18 +1243,28 @@ class StatesController extends EventEmitter {
             const idx = cnt++;
             chain.push(new Promise((resolve) => {
                 if (has_elevated_debug) this.emit('device_debug', {ID:debugId,data: { flag:`02.${cnt}a`, IO:true }, message:`converter ${cnt} : Cluster ${converter.cluster}`})
-                const payloadConv = converter.convert(mappedModel, message, publish, options, meta);
-                const metapost = meta ? {
-                    deviceIEEE: meta.device ? meta.device.ieeeAddr : 'no device',
-                    deviceModelId: meta.device ? meta.device.ModelId : 'no device',
-                    logger: meta.logger ? (meta.logger.constructor ? meta.logger.constructor.name : 'not a class') : 'undefined',
-                    state : meta.state
-                } : 'undefined';
-                if (has_elevated_debug) this.emit('device_debug', {ID:debugId,data: { flag:`02.${idx}b`, IO:true }, message:` data: ${safeJsonStringify(message.data)} options: ${safeJsonStringify(options)} meta:${safeJsonStringify(metapost)} result:${safeJsonStringify(payloadConv)}`})
-                if (typeof payloadConv === 'object') {
-                    resolve(payloadConv);
+                try {
+                    const payloadConv = converter.convert(mappedModel, message, publish, options, meta);
+                    if (has_elevated_debug) {
+                        const metapost = meta ? {
+                            deviceIEEE: meta.device ? meta.device.ieeeAddr : 'no device',
+                            deviceModelId: meta.device ? meta.device.ModelId : 'no device',
+                            logger: meta.logger ? (meta.logger.constructor ? meta.logger.constructor.name : 'not a class') : 'undefined',
+                            state : meta.state
+                        } : 'undefined';
+                        this.emit('device_debug', {ID:debugId,data: { flag:`02.${idx}b`, IO:true }, message:` data: ${safeJsonStringify(message.data)} options: ${safeJsonStringify(options)} meta:${safeJsonStringify(metapost)} result:${safeJsonStringify(payloadConv)}`})
+                    }
+                    if (typeof payloadConv === 'object') {
+                        resolve(payloadConv);
+                    }
+                    else resolve({});
+                }
+                catch (error) {
+                    const msg = `Error while processing converters DEVICE_ID: '${devId}' cluster '${converter.cluster}' type '${converter.type}' ${error && error.message ? ' message: ' + error.message : ''}`;
+                    if (has_elevated_debug) this.emit('device_debug', { ID:debugId, data: { error:'EPROC', IO:true }, message: msg });
+                    this.warn(msg);
+                    resolve ({})
                 }
-                else resolve({});
             }));
         }
         const candidates = await Promise.all(chain);
@@ -1246,7 +1277,7 @@ class StatesController extends EventEmitter {
 
         if (Object.keys(payload).length > 0 && Object.keys(options).length > 0) {
             const premsg = `candidates: ${JSON.stringify(candidates)} => payload ${JSON.stringify(payload)}`
-            this.postProcessConvertedFromZigbeeMessage(mappedModel, payload, options, null);
+            this.postProcessConvertedFromZigbeeMessage(mappedModel, payload, options, message.device);
             if (has_elevated_debug) this.emit('device_debug', {ID:debugId,data: { flag:`02.${cnt}d`, IO:true }, message:`${premsg} => processed payload : ${JSON.stringify(payload)}`})
         }
         else if (has_elevated_debug) this.emit('device_debug', {ID:debugId,data: { flag:`02.${cnt}c`, IO:true }, message:`candidates: ${JSON.stringify(candidates)} => payload ${JSON.stringify(payload)}`})
@@ -1261,7 +1292,7 @@ class StatesController extends EventEmitter {
         const mappedModel = entity.mapped;
         const model = entity.mapped ? entity.mapped.model : entity.device.modelID;
         const cluster = message.cluster;
-        const devId = device.ieeeAddr.substr(2);
+        const devId = utils.zbIdorIeeetoAdId(this.adapter, device.ieeeAddr, false);
         const meta = {device};
 
         const has_elevated_debug = this.checkDebugDevice(devId);
@@ -1285,7 +1316,7 @@ class StatesController extends EventEmitter {
         // this assigment give possibility to use iobroker logger in code of the converters, via meta.logger
         meta.logger = this;
 
-        await this.adapter.checkIfModelUpdate(entity);
+        await this.checkIfModelUpdate(entity);
 
         let _voltage = 0;
         let _temperature = 0;
@@ -1344,7 +1375,7 @@ class StatesController extends EventEmitter {
             return;
         }
 
-        let converters = [...mappedModel.fromZigbee,...mappedModel.toZigbee].filter(c => c && c.cluster === cluster && (
+        let converters = [...(mappedModel?.fromZigbee || []),...(mappedModel?.toZigbee || [])].filter(c => c && c.cluster === cluster && (
             Array.isArray(c.type) ? c.type.includes(type) : c.type === type));
 
 

package/lib/utils.js

@@ -108,6 +108,27 @@ function flatten(arr) {
 
 const forceEndDevice = ['QBKG03LM', 'QBKG04LM', 'ZNMS13LM', 'ZNMS12LM'];
 
+
+function zbIdorIeeetoAdId(adapter, source, withNamespace) {
+    const preface = withNamespace ? `${adapter.namespace}.` : '';
+    const s = String(source);
+    // 0xdeadbeefdeadbeef
+    // deadbeefdeadbeef
+    if (s.length > 15)
+        return `${preface}${source.replace('0x','')}`;
+    // 2
+    if (Number(s))
+        return `${preface}group_${source}`;
+    // group_2
+    return `${preface}${source}`;
+}
+
+function adIdtoZbIdorIeee(adapter, source) {
+    const s = `${source}`.replace(`${adapter.namespace}.`, '');
+    if (s.startsWith('group')) return Number(s.substring(6));
+    if (s.length === 16 && Number(`0x${s}`)) return `0x${s}`;
+    return 'illegal'
+}
 /*flatten(
     ['QBKG03LM', 'QBKG04LM', 'ZNMS13LM', 'ZNMS12LM']
         .map(model => zigbeeHerdsmanConverters.findByModel(model))
@@ -176,6 +197,23 @@ function reverseByteString(source) {
     return '';
 }
 
+function removeFromArray(arr, toRemove) {
+    let removed = 0;
+    if (Array.isArray(arr)) {
+        const _remove = toRemove ? [...toRemove] : [undefined, null];
+        let idx = 0;
+        while (idx < arr.length) {
+            if (_remove.includes(arr[idx])) {
+                arr.splice(idx, 1);
+                removed ++;
+            }
+            else
+                idx++;
+        }
+    }
+    return removed;
+}
+
 
 
 exports.secondsToMilliseconds   = seconds => seconds * 1000;
@@ -200,3 +238,6 @@ exports.getEntityInfo           = getEntityInfo;
 exports.getNetAddress           = getNetAddress;
 exports.byteArrayToString       = byteArrayToString;
 exports.reverseByteString       = reverseByteString;
+exports.adIdtoZbIdorIeee        = adIdtoZbIdorIeee;
+exports.zbIdorIeeetoAdId        = zbIdorIeeetoAdId;
+exports.removeFromArray         = removeFromArray;

package/lib/zbDelayedAction.js

@@ -99,7 +99,7 @@ class DelayedAction extends BaseExtension {
                     continue;
                 }
                 actionDef.inAction = true;
-                this.info(`Do action on ${device.ieeeAddr} ${device.modelID}`);
+                this.debug(`Do action on ${device.ieeeAddr} ${device.modelID}`);
                 try {
                     // do action
                     await actionDef.action(device);

package/lib/zbDeviceAvailability.js

@@ -168,7 +168,7 @@ class DeviceAvailability extends BaseExtension {
             }
         }
         if (this.startReadDelay > 0 && readables.length > 0) {
-            this.info(`Triggering device_query on ${readables.length} devices in ${this.startReadDelay / 1000} seconds.`)
+            this.debug(`Triggering device_query on ${readables.length} devices in ${this.startReadDelay / 1000} seconds.`)
             setTimeout(() => {
                 readables.forEach(device => this.zigbee.doDeviceQuery(device, Date().now, false));
             }, this.startReadDelay)
@@ -312,9 +312,9 @@ class DeviceAvailability extends BaseExtension {
                 this.state[ieeeAddr] = available;
                 const payload = {available: available};
                 this.debug(`Publish available for ${ieeeAddr} = ${available}`);
-                this.zigbee.emit('publish', ieeeAddr.substr(2), entity.mapped.model, payload);
+                this.zigbee.emit('publish', utils.zbIdorIeeetoAdId(this.adapter, ieeeAddr, false), entity.mapped.model, payload);
                 this.debug(`Publish LQ for ${ieeeAddr} = ${(available ? 10 : 0)}`);
-                this.zigbee.emit('publish', ieeeAddr.substr(2), entity.mapped.model, {linkquality: (available ? 10 : 0)});
+                this.zigbee.emit('publish', utils.zbIdorIeeetoAdId(this.adapter, ieeeAddr, false), entity.mapped.model, {linkquality: (available ? 10 : 0)});
             }
         }
     }

package/lib/zbDeviceEvent.js

@@ -11,8 +11,7 @@ class DeviceEvent extends BaseExtension {
     async onZigbeeStarted() {
         for (const device of await this.zigbee.getClientIterator()) {
             const entity = await this.zigbee.resolveEntity(device);
-
-            await this.callOnEvent(device, 'start', {device, options:entity.options || {}});
+            await this.callOnEvent(device, 'start', {device, options:entity?.options || {}});
         }
     }
 
@@ -39,6 +38,8 @@ class DeviceEvent extends BaseExtension {
         if (!mappedDevice) {
             mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
         }
+        if (!device) return;
+
         const baseData = {device, deviceExposeChanged: function() { return; }, options: data.options || {}, state: data.state || {}}
         const eventData = {
             type,
@@ -62,6 +63,7 @@ class DeviceEvent extends BaseExtension {
             case 'deviceOptionsChanged':
                 // NOTE: This does not currently work. OptionsChange is not yet defined.
                 eventData.data = {...baseData, from:data.from || {}, to:data.to || {}};
+                eventData.data.options = data.to;
                 break;
         }