iobroker.zigbee 3.1.6 → 3.2.1

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;
         }
 

package/lib/zigbeecontroller.js

@@ -179,13 +179,13 @@ class ZigbeeController extends EventEmitter {
         try {
             this.emit('pairing', 'stopping zigbee-herdsman');
             await this.herdsman.stop();
-            this.emit('pairing', 'herdsman stopped !');
-            this.herdsmanStarted = false;
         }
         catch (error) {
             this.emit('pairing', `error stopping zigbee-herdsman: ${error && error.message ? error.message : 'no reason given'}`);
         }
         this.isConfigured = false;
+        this.emit('pairing', 'herdsman stopped !');
+        this.herdsmanStarted = false;
         delete this.herdsman;
 
     }
@@ -263,13 +263,13 @@ class ZigbeeController extends EventEmitter {
         // Check if we have to turn off the LED
         try {
             if (this.disableLed) {
-                this.info('Disable LED');
+                this.debug('Disable LED');
                 await this.herdsman.setLED(false);
             } else {
                 await this.herdsman.setLED(true);
             }
         } catch (e) {
-            this.info('Unable to disable LED, unsupported function.');
+            this.debug('Unable to disable LED, unsupported function.');
             this.emit('pairing','Unable to disable LED, unsupported function.');
         }
 
@@ -287,7 +287,7 @@ class ZigbeeController extends EventEmitter {
                 }
                 //await this.adapter.stController.AddModelFromHerdsman(device, entity.mapped.model);
 
-                this.adapter.getObject(device.ieeeAddr.substr(2), (err, obj) => {
+                this.adapter.getObject(utils.zbIdorIeeetoAdId(this.adapter, device.ieeeAddr, false), (err, obj) => {
                     if (obj && obj.common && obj.common.deactivated) {
                         this.callExtensionMethod('deregisterDevicePing', [device, entity]);
                     } else {
@@ -613,7 +613,7 @@ class ZigbeeController extends EventEmitter {
 
             if (_key.kind == 'coordinator') {
                 const coordinator = this.herdsman.getDevicesByType('Coordinator')[0];
-                return {
+                if (coordinator) return {
                     type: 'device',
                     device: coordinator,
                     endpoint: coordinator.getEndpoint(1),
@@ -652,7 +652,13 @@ class ZigbeeController extends EventEmitter {
             }
             if (device) {
                 const t = Date.now();
-                const mapped = await zigbeeHerdsmanConverters.findByDevice(device, false);
+                let mapped = undefined;
+                try {
+                    mapped = await zigbeeHerdsmanConverters.findByDevice(device, false);
+                }
+                catch (error) {
+
+                }
                 if (!mapped) {
                     if (device.type === 'Coordinator')
                         return {
@@ -662,7 +668,7 @@ class ZigbeeController extends EventEmitter {
                             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}`);
+                    this.emit('stash_unknown_model', `resoveEntity${device.ieeeAddr}`,`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;
@@ -764,11 +770,24 @@ class ZigbeeController extends EventEmitter {
     async permitJoin(permitTime, devid) {
         if (!this.herdsmanStarted) return false;
         try {
+            const starter = this._permitJoinTime > 0? 'Extending open network':'Opening network';
             this._permitJoinTime = permitTime;
-            await this.herdsman.permitJoin(permitTime);
-            this._permitJoinDevice = (permitTime > 0 && devid ? devid : '');
+            const dId = devid || this._permitJoinDevId
+            if (permitTime > 0) {
+                this.info(`${starter}${dId ? ' on device ' + dId : ''}.`);
+                this.emit('pairing', `${starter}${dId ? 'on device ' + dId : ''}.`);
+                await this.herdsman.permitJoin(permitTime, dId);
+                this._permitJoinDevId = dId;
+            }
+            else {
+                await this.herdsman.permitJoin(0);
+                this.info(`Closing network.`);
+                this.emit('pairing', `Closing network${this._permitJoinDevId ? ' on '+this._permitJoinDevId : ''}.`)
+                this._permitJoinDevId = undefined;
+            }
         } catch (e) {
             this._permitJoinTime = 0;
+            this._permitJoinDevId = undefined;
             this.sendError(e);
             this.error(`Failed to open the network: ${e.stack}`);
             return false;
@@ -783,20 +802,19 @@ class ZigbeeController extends EventEmitter {
             if (data.permitted) {
                 if (!this._permitJoinInterval) {
                     this.emit('pairing',`Pairing possible for ${this._permitJoinTime} seconds`)
-                    this.info(`Opening zigbee Network for ${this._permitJoinTime} seconds`)
+                    this.info(`Opened zigbee Network for ${this._permitJoinTime} seconds`)
                     this._permitJoinInterval = setInterval(async () => {
                         this.emit('pairing', 'Pairing time left', this._permitJoinTime);
                         this._permitJoinTime -= 1;
                     }, 1000);
                 }
             }
-            else {
-                this.info(`Closing Zigbee network, ${this._permitJoinTime} seconds remaining`)
+            else if (this._permitJoinInterval) {
+                const timestr = this._permitJoinTime > 0 ? ` with ${this._permitJoinTime} second${this._permitJoinTime > 1 ? 's':''} remaining.`: '.';
+                this.info(`Closed Zigbee network${timestr}`)
+                this.emit('pairing', `Closed network${timestr}`);
                 clearInterval(this._permitJoinInterval);
                 this._permitJoinInterval = null;
-                // this.emit('pairing', 'Pairing time left', 0);
-                this.emit('pairing', 'Closing network.',0);
-                this._permitJoinDevice = '';
             }
         }
         catch (error) {
@@ -864,7 +882,7 @@ class ZigbeeController extends EventEmitter {
                 this.emit('device_debug', {ID: Date.now(), data: {flag:'dl', states:[{id: '--', value:'--', payload:message}], IO:true},message:`Device '${friendlyName}' has left the network`});
             }
             else
-                this.info(`Device '${friendlyName}' left the network`);
+                this.warn(`Device '${friendlyName}' left the network`);
             this.emit('leave', message.ieeeAddr);
             // Call extensions
             this.callExtensionMethod(
@@ -997,7 +1015,7 @@ class ZigbeeController extends EventEmitter {
 
         const is = data.device.interviewState;
         if (is != 'SUCCESSFUL' && is != 'FAILED') {
-            this.info(`message ${JSON.stringify(data)} received during interview.`)
+            this.debug(`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;
@@ -1160,6 +1178,7 @@ class ZigbeeController extends EventEmitter {
         }
         */
     }
+
     // publish via converter
     //
     async publishFromState(deviceId, model, stateModel, stateList, options, debugID, has_elevated_debug) {
@@ -1408,11 +1427,12 @@ class ZigbeeController extends EventEmitter {
             payloadObj = payload;
         } else return { success: false, error: 'illegal type of payload: ' + typeof payload};
 
+
         if (payloadObj.hasOwnProperty('device') && payloadObj.hasOwnProperty('payload')) {
             try {
-                const isDevice = !payload.device.includes('group_');
+                const isDevice = !payloadObj.device.includes('group_');
                 const stateList = [];
-                const devID = isDevice ? `0x${payload.device}` : parseInt(payload.device.replace('group_', ''));
+                const devID = isDevice ? `0x${payloadObj.device}` : parseInt(payloadObj.device.replace('group_', ''));
 
                 const entity = await this.resolveEntity(devID);
                 if (!entity) {