iobroker.zigbee 1.5.5 → 1.6.6

package/lib/zigbeecontroller.js

@@ -37,8 +37,9 @@ class ZigbeeController extends EventEmitter {
       join - join countdown (counter)
       ready - connection successfull ()
     */
-    constructor() {
+    constructor(adapter) {
         super();
+        this.adapter = adapter;
         this._permitJoinTime = 0;
         this.herdsman_started = false;
         this.extensions = [
@@ -65,6 +66,9 @@ class ZigbeeController extends EventEmitter {
                 path: options.sp.port,
                 adapter: options.sp.adapter,
             },
+            adapter: {
+                forceStartWithInconsistentAdapterConfiguration: options.startWithInconsistent
+            },
         };
         // https://github.com/ioBroker/ioBroker.zigbee/issues/668
         if (!options.extPanIdFix) {
@@ -80,28 +84,46 @@ class ZigbeeController extends EventEmitter {
         this.disableLed = options.disableLed;
 
         this.debug(`Using zigbee-herdsman with settings: ${JSON.stringify(herdsmanSettings)}`);
-        this.herdsman = new ZigbeeHerdsman.Controller(herdsmanSettings);
+        this.herdsman = new ZigbeeHerdsman.Controller(herdsmanSettings, this.adapter.log);
         this.callExtensionMethod('setOptions', [{ disableActivePing: options.disablePing, disableForcedPing: false, pingTimeout:300, pingCount:3 }] );
     }
 
     // Start controller
     async start() {
-        //this.debug(`Using zigbee-herdsman with settings2: ${JSON.stringify(this)}`);
-        this.debug(`Starting zigbee-herdsman...`);
-        await this.herdsman.start();
-
-        this.herdsman.on('adapterDisconnected', () => this.emit('disconnect'));
-        this.herdsman.on('deviceAnnounce', this.handleDeviceAnnounce.bind(this));
-        this.herdsman.on('deviceInterview', this.handleDeviceInterview.bind(this));
-        this.herdsman.on('deviceJoined', this.handleDeviceJoined.bind(this));
-        this.herdsman.on('deviceLeave', this.handleDeviceLeave.bind(this));
-        this.herdsman.on('message', this.handleMessage.bind(this));
-
-        this.debug('zigbee-herdsman started');
-        this.herdsman_started = true;
-        this.info(`Coordinator firmware version: ${JSON.stringify(await this.herdsman.getCoordinatorVersion())}`);
-        this.debug(`Zigbee network parameters: ${JSON.stringify(await this.herdsman.getNetworkParameters())}`);
+        try {
+            //this.debug(`Using zigbee-herdsman with settings2: ${JSON.stringify(this)}`);
+            this.debug(`Starting zigbee-herdsman...`);
+            await this.herdsman.start();
+
+            this.herdsman.on('adapterDisconnected', this.handleDisconnected.bind(this));
+            this.herdsman.on('deviceAnnounce', this.handleDeviceAnnounce.bind(this));
+            this.herdsman.on('deviceInterview', this.handleDeviceInterview.bind(this));
+            this.herdsman.on('deviceJoined', this.handleDeviceJoined.bind(this));
+            this.herdsman.on('deviceLeave', this.handleDeviceLeave.bind(this));
+            this.herdsman.on('message', this.handleMessage.bind(this));
+
+            this.debug('zigbee-herdsman started');
+            this.herdsman_started = true;
+            this.info(`Coordinator firmware version: ${JSON.stringify(await this.herdsman.getCoordinatorVersion())}`);
+                        
+            // debug info from herdsman getNetworkParameters
+            const debNetworkParam = JSON.parse(JSON.stringify(await this.herdsman.getNetworkParameters()));
+            const extendedPanIDDebug = (typeof debNetworkParam.extendedPanID == 'string') ? debNetworkParam.extendedPanID.replace('0x','') : debNetworkParam.extendedPanID;
+            
+            let extPanIDDebug = '';
+            for (let i = extendedPanIDDebug.length - 1; i >= 0; i--) {
+                extPanIDDebug += extendedPanIDDebug[i-1];
+                extPanIDDebug += extendedPanIDDebug[i];
+                i--;
+            }
 
+            this.debug(`Zigbee network parameters: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${extPanIDDebug}`);                          
+                                   
+        } catch (e) {
+            this.sendError(e);
+            this.error('Starting zigbee-herdsman problem : ' + JSON.stringify(e.message));
+            throw 'Error herdsman start';
+        }
         // Check if we have to turn off the led
         try {
             if (this.disableLed) {
@@ -112,6 +134,7 @@ class ZigbeeController extends EventEmitter {
             }
         } catch (e) {
             this.info('Unable to disable LED, unsupported function.');
+            this.sendError(e);
         }
 
         // only for CC1352P and CC26X2R1 transmit power
@@ -135,6 +158,7 @@ class ZigbeeController extends EventEmitter {
         try {
             await this.herdsman.setTransmitPower(this.transmitPower);
         } catch (e) {
+            this.sendError(e);
             this.info('Unable to set transmit power, unsupported function.');
         }
 
@@ -188,6 +212,10 @@ class ZigbeeController extends EventEmitter {
         this.emit('event', type, dev, message, data);
     }
 
+    sendError(error, message) {
+        this.adapter.sendError(error, message);
+    }
+
     callExtensionMethod(method, parameters) {
         for (const extension of this.extensions) {
             if (extension[method]) {
@@ -198,8 +226,8 @@ class ZigbeeController extends EventEmitter {
                         extension[method]();
                     }
                 } catch (error) {
+                    this.sendError(error);
                     this.error(`Failed to call '${extension.constructor.name}' '${method}' (${error.stack})`);
-                    //                    throw error;
                 }
             }
         }
@@ -221,8 +249,8 @@ class ZigbeeController extends EventEmitter {
     async getGroups() {
         try {
             return this.herdsman.getGroups();
-        }
-        catch {
+        } catch (error) {
+            this.sendError(error);
             return undefined;
         }
     }
@@ -232,6 +260,7 @@ class ZigbeeController extends EventEmitter {
         try {
             if (group) group.removeFromDatabase();
         } catch (error) {
+            this.sendError(error);
             this.error('error in removeGroupById: ' + error);
         }
     }
@@ -239,8 +268,8 @@ class ZigbeeController extends EventEmitter {
     async getGroupByID(id) {
         try {
             return this.herdsman.getGroupByID(id);
-        }
-        catch {
+        } catch (error) {
+            this.sendError(error);
             return undefined;
         }
     }
@@ -263,6 +292,7 @@ class ZigbeeController extends EventEmitter {
             }
 
         } catch (error) {
+            this.sendError(error);
             if (error) this.error('getGroupMembersFromController: error is  ' + JSON.stringify(error) + ' ' + JSON.stringify(new Error().stack));
             else this.error('unidentifed error in getGroupMembersFromController');
         }
@@ -344,7 +374,6 @@ class ZigbeeController extends EventEmitter {
         }
     }
 
-
     async incMsgHandler(message){
         this.debug('incoming msg', message);
         const device = await this.herdsman.getDeviceByIeeeAddr(message.srcaddr);
@@ -371,6 +400,7 @@ class ZigbeeController extends EventEmitter {
             await this.permitJoin(0);
             await this.herdsman.stop();
         } catch (error) {
+            this.sendError(error);
             if (this.herdsman_started)
                 this.error(`Failed to stop zigbee (${error.stack})`);
             else {
@@ -379,6 +409,15 @@ class ZigbeeController extends EventEmitter {
         }
     }
 
+    async handleDisconnected() {
+        this.herdsman_started = false;
+        this.emit('disconnect');
+    }
+
+    connected() {
+        return this.herdsman_started;
+    }
+
     // Permit join
     async permitJoin(permitTime, devid, failure) {
         let permitDev;
@@ -416,9 +455,8 @@ class ZigbeeController extends EventEmitter {
                     await this.herdsman.permitJoin(false, permitDev);
                 }
             }
-        }
-        catch (e)
-        {
+        } catch (e) {
+            this.sendError(e);
             this.error(`Failed to open the network: ${e.stack}`);
         }
     }
@@ -431,6 +469,7 @@ class ZigbeeController extends EventEmitter {
                 try {
                     await this.herdsman.adapter.removeDevice(device.networkAddress, device.ieeeAddr);
                 } catch (error) {
+                    this.sendError(error);
                     if (error)
                         this.debug(`Failed to remove device ${error.stack}`);
                     // skip error if force
@@ -443,6 +482,7 @@ class ZigbeeController extends EventEmitter {
                 try {
                     await device.removeFromDatabase();
                 } catch (error) {
+                    this.sendError(error);
                     // skip error
                     if (error)
                         this.debug(`Failed to remove from DB ${error.stack}`);
@@ -455,6 +495,7 @@ class ZigbeeController extends EventEmitter {
                 );
             }
         } catch (error) {
+            this.sendError(error);
             this.error(`Failed to remove ${error.stack}`);
             if (callback) callback(`Failed to remove ${error.stack}`);
         }
@@ -474,6 +515,7 @@ class ZigbeeController extends EventEmitter {
                 [message, entity],
             );
         } catch (error) {
+            this.sendError(error);
             this.error(`Failed to handleDeviceLeave ${error.stack}`);
         }
     }
@@ -577,6 +619,7 @@ class ZigbeeController extends EventEmitter {
                 try {
                     result = await device.lqi();
                 } catch (error) {
+                    this.sendError(error);
                     if (error)
                         this.debug(`Failed to execute LQI for '${resolved.name}'. ${safeJsonStringify(error.stack)}`);
 
@@ -612,6 +655,7 @@ class ZigbeeController extends EventEmitter {
                 try {
                     result = await device.routingTable();
                 } catch (error) {
+                    this.sendError(error);
                     if (error) {
                         this.debug(`Failed to execute routing table for '${resolved.name}'. ${safeJsonStringify(error.stack)}`);
                     }
@@ -637,6 +681,7 @@ class ZigbeeController extends EventEmitter {
 
             if (callback) callback({lqis: lqis, routing: routing});
         } catch (error) {
+            this.sendError(error);
             this.debug(`Failed to get map: ${safeJsonStringify(error.stack)}`);
         }
     }
@@ -666,7 +711,7 @@ class ZigbeeController extends EventEmitter {
 
         if (type === 'foundation') {
             cfg.disableDefaultResponse = true;
-            if (cmd === 'read') {
+            if (cmd === 'read' && !Array.isArray(zclData)) {
                 // needs to be iterateable (string[] | number [])
                 zclData[Symbol.iterator] = function* () {
                     let k;
@@ -696,8 +741,8 @@ class ZigbeeController extends EventEmitter {
             this.debug(`entity: ${safeJsonStringify(entity)}`);
             this.debug(`group: ${safeJsonStringify(group)}`);
             await entity.endpoint.addToGroup(group.mapped);
-        }
-        catch (error) {
+        } catch (error) {
+            this.sendError(error);
             this.error(`Exception when trying to Add ${devId}  to group ${groupId}`, error);
             return { error:`Failed to add ${devId}  to group ${groupId}: ${JSON.stringify(error)}` };
         }
@@ -709,8 +754,8 @@ class ZigbeeController extends EventEmitter {
             const entity = await this.resolveEntity(devId);
             this.debug(`entity: ${safeJsonStringify(entity)}`);
             await entity.endpoint.removeFromAllGroups();
-        }
-        catch (error) {
+        } catch (error) {
+            this.sendError(error);
             this.error(`Exception when trying remove ${devId} from all groups`, error);
             return { error: `Failed to remove dev ${devId} from all groups: ${error}`};
         }
@@ -724,6 +769,7 @@ class ZigbeeController extends EventEmitter {
         this.debug(`Binding ${log}`);
         ep.bind(cluster, target, (error) => {
             if (error) {
+                this.sendError(error);
                 this.error(`Failed to bind ${log} - (${error})`);
             } else {
                 this.debug(`Successfully bound ${log}`);
@@ -754,6 +800,7 @@ class ZigbeeController extends EventEmitter {
             this.herdsman.reset(mode);
             if (callback) callback();
         } catch (error) {
+            this.sendError(error);
             this.error(`Failed to reset ${error.stack}`);
             if (callback) callback(error);
         }
@@ -764,6 +811,7 @@ class ZigbeeController extends EventEmitter {
             await this.herdsman.touchlinkFactoryResetFirst();
             this.permitJoin(permitTime);
         } catch (error) {
+            this.sendError(error);
             this.error(`Failed to touchlinkReset ${error.stack}`);
         }
     }

package/main.js

@@ -15,7 +15,7 @@ const originalLogMethod = debug.log;
 
 const safeJsonStringify = require('./lib/json');
 const fs = require('fs');
-const pathLib = require('path');
+const path = require('path');
 const utils = require('@iobroker/adapter-core'); // Get common adapter utils
 const SerialListPlugin = require('./lib/seriallist');
 const CommandsPlugin = require('./lib/commands');
@@ -30,6 +30,7 @@ const StatesController = require('./lib/statescontroller');
 const ExcludePlugin = require('./lib/exclude');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 const vm = require('vm');
+const util = require('util');
 
 const createByteArray = function (hexString) {
     const bytes = [];
@@ -105,18 +106,46 @@ class Zigbee extends utils.Adapter {
         }
     }
 
+    sendError(error, message) {
+        if (this.supportsFeature && this.supportsFeature('PLUGINS')) {
+            const sentryInstance = this.getPluginInstance('sentry');
+            if (sentryInstance) {
+                const Sentry = sentryInstance.getSentryObject();
+                if (Sentry) {
+                    if (message) {
+                        Sentry.configureScope(scope => {
+                            scope.addBreadcrumb({
+                                type: "error", // predefined types
+                                category: "error message",
+                                level: Sentry.Severity.Error,
+                                message: message
+                            });
+                        });
+                    }
+                    if (typeof error == 'string') {
+                        Sentry.captureException(new Error(error));
+                    } else {
+                        Sentry.captureException(error);
+                    }
+                }
+            }
+        }
+    }
+
     filterError(errormessage, message, error) {
         if (error.code === undefined)
         {
             let em =  error.stack.match(/failed \((.+?)\) at/);
             if (!em) em = error.stack.match(/failed \((.+?)\)/);
             this.log.error(`${message} no error code (${(em ? em[1]:'undefined')})`);
+            this.sendError(error, `${message} no error code`);
             this.log.debug(`Stack trace for ${em}: ${error.stack}`);
             return;
         }
         const ecode = errorCodes[error.code];
         if (ecode === undefined) {
             this.log.error(errormessage);
+            this.sendError(error, errormessage);
             return;
         }
         switch (ecode.severity) {
@@ -126,14 +155,19 @@ class Zigbee extends utils.Adapter {
                 break;
             case E_WARN: this.log.warn(`${message}: Code ${error.code} (${ecode.message})`);
                 break;
-            case E_ERROR: this.log.error(`${message}: Code ${error.code} (${ecode.message})`);
+            case E_ERROR:
+                this.log.error(`${message}: Code ${error.code} (${ecode.message})`);
+                this.sendError(error, `${message}: Code ${error.code} (${ecode.message})`);
                 break;
-            default: this.log.error(`${message}: Code ${error.code} (malformed error)`);
+            default: 
+                this.log.error(`${message}: Code ${error.code} (malformed error)`);
+                this.sendError(error, `${message}: Code ${error.code} (malformed error)`);
         }
     }
 
-    debugLog (data) {
-        this.log.debug(data.slice(data.indexOf('zigbee-herdsman')));
+    debugLog (data, ...args) {
+        const message = (args) ? util.format(data, ...args) : data;
+        this.log.debug(message.slice(message.indexOf('zigbee-herdsman')));
     }
 
     async onReady() {
@@ -153,7 +187,7 @@ class Zigbee extends utils.Adapter {
         // set connection false before connect to zigbee
         this.setState('info.connection', false, true);
         const zigbeeOptions = this.getZigbeeOptions();
-        this.zbController = new ZigbeeController();
+        this.zbController = new ZigbeeController(this);
         this.zbController.on('log', this.onLog.bind(this));
         this.zbController.on('ready', this.onZigbeeAdapterReady.bind(this));
         this.zbController.on('disconnect', this.onZigbeeAdapterDisconnected.bind(this));
@@ -237,6 +271,7 @@ class Zigbee extends utils.Adapter {
             } else {
                 this.log.error(error);
             }
+            this.sendError(error, `Failed to start Zigbee`);
             if (this.reconnectCounter > 0) {
                 this.tryToReconnect();
             }
@@ -246,6 +281,7 @@ class Zigbee extends utils.Adapter {
     async onZigbeeAdapterDisconnected() {
         this.reconnectCounter = 5;
         this.log.error('Adapter disconnected, stopping');
+        this.sendError('Adapter disconnected, stopping');
         this.setState('info.connection', false, true);
         await this.callPluginMethod('stop');
         this.tryToReconnect();
@@ -281,25 +317,31 @@ class Zigbee extends utils.Adapter {
             const adapterType = this.config.adapterType || 'zstack';
             if (adapterType === 'zstack') {
                 if (configExtPanId != networkExtPanId) {
-                    // try to read from nvram
-                    const result = await this.zbController.herdsman.adapter.znp.request(
-                        1, // Subsystem.SYS
-                        'osalNvRead',
-                        {
-                            id: 45, // EXTENDED_PAN_ID
-                            len: 0x08,
-                            offset: 0x00,
-                        },
-                        null, [
-                            0, // ZnpCommandStatus.SUCCESS
-                            2, // ZnpCommandStatus.INVALID_PARAM
-                        ]
-                    );
-                    const nwExtPanId = '0x'+result.payload.value.reverse().toString('hex');
-                    this.log.debug(`Config value ${configExtPanId} : nw value ${nwExtPanId}`);
-                    if (configExtPanId != nwExtPanId) {
-                        networkExtPanId = nwExtPanId;
-                        needChange = true;
+                    try {
+                        // try to read from nvram
+                        const result = await this.zbController.herdsman.adapter.znp.request(
+                            1, // Subsystem.SYS
+                            'osalNvRead',
+                            {
+                                id: 45, // EXTENDED_PAN_ID
+                                len: 0x08,
+                                offset: 0x00,
+                            },
+                            null, [
+                                0, // ZnpCommandStatus.SUCCESS
+                                2, // ZnpCommandStatus.INVALID_PARAM
+                            ]
+                        );
+                        const nwExtPanId = '0x'+result.payload.value.reverse().toString('hex');
+                        this.log.debug(`Config value ${configExtPanId} : nw value ${nwExtPanId}`);
+                        if (configExtPanId != nwExtPanId) {
+                            networkExtPanId = nwExtPanId;
+                            needChange = true;
+                        }
+                    } catch (e) {
+                        this.log.error(`Unable to apply ExtPanID changes: ${e}`);
+                        this.sendError(e, `Unable to apply ExtPanID changes`);
+                        needChange = false;
                     }
                 } else {
                     needChange = true;
@@ -368,9 +410,6 @@ class Zigbee extends utils.Adapter {
 
     async onZigbeeEvent(type, entity, message){
         this.log.debug(`Type ${type} device ${safeJsonStringify(entity)} incoming event: ${safeJsonStringify(message)}`);
-        if (!entity.mapped) {
-            return;
-        }
         const device = entity.device,
             mappedModel = entity.mapped,
             model = (entity.mapped) ? entity.mapped.model : entity.device.modelID,
@@ -385,6 +424,17 @@ class Zigbee extends utils.Adapter {
         if (message.linkquality) {
             this.publishToState(devId, model, {linkquality: message.linkquality});
         }
+        // publish raw event to "from_zigbee"
+        // some cleanup
+        const msgForState = Object.assign({}, message);
+        delete msgForState['device'];
+        delete msgForState['endpoint'];
+        msgForState['endpoint_id'] = message.endpoint.ID;
+        this.publishToState(devId, model, {msg_from_zigbee: safeJsonStringify(msgForState)});
+        
+        if (!entity.mapped) {
+            return;
+        }
         let converters = mappedModel.fromZigbee.filter(c => c && c.cluster === cluster && (
             (c.type instanceof Array) ? c.type.includes(type) : c.type === type));
         if (!converters.length && type === 'readResponse') {
@@ -447,6 +497,10 @@ class Zigbee extends utils.Adapter {
         const entity = await this.zbController.resolveEntity(deviceId);
         this.log.debug(`entity: ${safeJsonStringify(entity)}`);
         const mappedModel = entity.mapped;
+        if (!mappedModel) {
+            this.log.debug(`No mapped model for ${model}`);
+            return;
+        }
         this.log.debug('Mapped Model: ' +  JSON.stringify(mappedModel));
 
         stateList.forEach(async(changedState) => {
@@ -494,6 +548,7 @@ class Zigbee extends utils.Adapter {
             const converter = mappedModel.toZigbee.find((c) => c && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
             if (!converter) {
                 this.log.error(`No converter available for '${model}' with key '${stateDesc.id}' `);
+                this.sendError(`No converter available for '${model}' with key '${stateDesc.id}' `);
                 return;
             }
 
@@ -511,7 +566,7 @@ class Zigbee extends utils.Adapter {
 
             const epName = stateDesc.epname !== undefined ? stateDesc.epname : (stateDesc.prop || stateDesc.id);
             const key = stateDesc.setattr || stateDesc.prop || stateDesc.id;
-            this.log.debug(`convert ${key}, ${preparedValue}, ${safeJsonStringify(preparedOptions)}`);
+            this.log.debug(`convert ${key}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)}`);
 
             let target;
             if (model === 'group') {
@@ -536,13 +591,15 @@ class Zigbee extends utils.Adapter {
             try {
                 const result = await converter.convertSet(target, key, preparedValue, meta);
                 this.log.debug(`convert result ${safeJsonStringify(result)}`);
-                if (stateModel && !isGroup)
-                    this.acknowledgeState(deviceId, model, stateDesc, value);
-                // process sync state list
-                this.processSyncStatesList(deviceId, model, syncStateList);
-                if (isGroup) {
-                    await this.callPluginMethod('queryGroupMemberState', [deviceId, stateDesc]);
-                    this.acknowledgeState(deviceId, model, stateDesc, value);
+                if (result !== undefined) {
+                    if (stateModel && !isGroup)
+                        this.acknowledgeState(deviceId, model, stateDesc, value);
+                    // process sync state list
+                    this.processSyncStatesList(deviceId, model, syncStateList);
+                    if (isGroup) {
+                        await this.callPluginMethod('queryGroupMemberState', [deviceId, stateDesc]);
+                        this.acknowledgeState(deviceId, model, stateDesc, value);
+                    }
                 }
             } catch(error) {
                 this.filterError(`Error ${error.code} on send command to ${deviceId}.`+
@@ -574,6 +631,7 @@ class Zigbee extends utils.Adapter {
                 payload_obj = JSON.parse();
             } catch (e) {
                 this.log.error(`Unable to parse ${safeJsonStringify(payload)}: ${safeJsonStringify(e)}`);
+                this.sendError(e, `Unable to parse ${safeJsonStringify(payload)}: ${safeJsonStringify(e)}`);
                 return {success:false, error: `Unable to parse ${safeJsonStringify(payload)}: ${safeJsonStringify(e)}`};
             }
         } else if (typeof payload === 'object') {
@@ -590,15 +648,18 @@ class Zigbee extends utils.Adapter {
                 const entity = await this.zbController.resolveEntity(devID);
                 if (!entity) {
                     this.log.error(`Device ${safeJsonStringify(payload_obj.device)} not found`);
+                    this.sendError(`Device ${safeJsonStringify(payload_obj.device)} not found`);
                     return {success: false, error: `Device ${safeJsonStringify(payload_obj.device)} not found`};
                 }
                 const mappedModel = entity.mapped;
                 if (!mappedModel) {
                     this.log.error(`No Model for Device ${safeJsonStringify(payload_obj.device)}`);
+                    this.sendError(`No Model for Device ${safeJsonStringify(payload_obj.device)}`);
                     return {success: false, error: `No Model for Device ${safeJsonStringify(payload_obj.device)}`};
                 }
                 if (typeof payload_obj.payload !== 'object') {
                     this.log.error(`Illegal payload type for ${safeJsonStringify(payload_obj.device)}`);
+                    this.sendError(`Illegal payload type for ${safeJsonStringify(payload_obj.device)}`);
                     return {success: false, error: `Illegal payload type for ${safeJsonStringify(payload_obj.device)}`};
                 }
                 for (const key in payload_obj.payload) {
@@ -671,8 +732,10 @@ class Zigbee extends utils.Adapter {
                         await plugin[method]();
                     }
                 } catch (error) {
-                    if (error && !error.hasOwnProperty('code'))
+                    if (error && !error.hasOwnProperty('code')) {
                         this.log.error(`Failed to call '${plugin.constructor.name}' '${method}' (${error.stack})`);
+                        this.sendError(error, `Failed to call '${plugin.constructor.name}' '${method}'`);
+                    }
                     throw error;
                 }
             }
@@ -697,19 +760,31 @@ class Zigbee extends utils.Adapter {
             }
             callback();
         } catch (error) {
-            this.log.error(`Unload error (${error.stack})`);
+            if (error) {
+                this.log.error(`Unload error (${error.stack})`);
+            }
+            this.sendError(error, `Unload error`);
             callback();
         }
     }
 
     getZigbeeOptions() {
         // file path for db
-        const dataDir = (this.systemConfig) ? this.systemConfig.dataDir : '';
-        const dbDir = pathLib.normalize(utils.controllerDir + '/' + dataDir + this.namespace.replace('.', '_'));
-        if (this.systemConfig && !fs.existsSync(dbDir)) fs.mkdirSync(dbDir);
+        let dbDir = path.join(utils.getAbsoluteInstanceDataDir(this), '');
+        dbDir = dbDir.replace('.', '_');        
+        
+        if (this.systemConfig && !fs.existsSync(dbDir)) {
+            try {
+                fs.mkdirSync(dbDir);
+            } catch (e) {
+                this.log.error(`Cannot create directory ${dbDir}: ${e}`);
+                this.sendError(`Cannot create directory ${dbDir}: ${e}`);
+            }
+        }
         const port = this.config.port;
         if (!port) {
             this.log.error('Serial port not selected! Go to settings page.');
+            this.sendError('Serial port not selected! Go to settings page.');
         }
         const panID = parseInt(this.config.panID ? this.config.panID : 0x1a62);
         const channel = parseInt(this.config.channel ? this.config.channel : 11);
@@ -739,6 +814,7 @@ class Zigbee extends utils.Adapter {
             disablePing: this.config.disablePing,
             transmitPower: this.config.transmitPower,
             extPanIdFix: extPanIdFix,
+            startWithInconsistent: this.config.startWithInconsistent || false,
         };
     }
 
@@ -770,6 +846,7 @@ class Zigbee extends utils.Adapter {
                     if (data)
                         data = data.toString();
                     this.logToPairing('Error: ' + msg + '. ' + data, true);
+                    this.sendError('Error: ' + msg + '. ' + data);
                     break;
                 case 'debug':
                     logger = this.log.debug;
@@ -792,8 +869,6 @@ class Zigbee extends utils.Adapter {
             }
         }
     }
-
-
 }