iobroker.zigbee 2.0.5 → 3.0.1

package/main.js

@@ -82,6 +82,7 @@ class Zigbee extends utils.Adapter {
         this.deviceManagement = new dmZigbee(this);
         this.deviceDebug =  new DeviceDebug(this),
         this.deviceDebug.on('log', this.onLog.bind(this));
+        this.debugActive = true;
 
 
         this.plugins = [
@@ -119,19 +120,6 @@ class Zigbee extends utils.Adapter {
         }
     }
 
-    warn(message) {
-        this.log.warn(message);
-    }
-    debug(message) {
-        this.log.debug(message);
-    }
-    error(message) {
-        this.log.error(message);
-    }
-    info(message) {
-        this.log.info(message);
-    }
-
     sendError(error, message) {
         try {
             if (this.supportsFeature && this.supportsFeature('PLUGINS')) {
@@ -168,7 +156,7 @@ class Zigbee extends utils.Adapter {
             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}`);
+            if (this.debugActive) this.log.debug(`Stack trace for ${em}: ${error.stack}`);
             return;
         }
 
@@ -184,7 +172,7 @@ class Zigbee extends utils.Adapter {
                 this.log.info(`${message}: Code ${error.code} (${ecode.message})`);
                 break;
             case E_DEBUG:
-                this.log.debug(`${message}: Code ${error.code} (${ecode.message})`);
+                if (this.debugActive) this.log.debug(`${message}: Code ${error.code} (${ecode.message})`);
                 break;
             case E_WARN:
                 this.log.warn(`${message}: Code ${error.code} (${ecode.message})`);
@@ -202,10 +190,14 @@ class Zigbee extends utils.Adapter {
 
     debugLog(data, ...args) {
         const message = (args) ? util.format(data, ...args) : data;
-        this.log.debug(message.slice(message.indexOf('zigbee-herdsman')));
+        if (this.debugActive) this.log.debug(message.slice(message.indexOf('zigbee-herdsman')));
     }
 
     async onReady() {
+
+        const dbActive = await this.getForeignState(`system.adapter.${this.namespace}.logLevel`);
+        this.debugActive = (dbActive && dbActive.val === 'debug');
+        this.log.info('Adapter ready - starting subsystems. Adapter is running in '+dbActive.val+ ' mode.');
         if (this.config.debugHerdsman) {
             debug.log = this.debugLog.bind(this);
             debug.enable('zigbee-herdsman*');
@@ -217,6 +209,7 @@ class Zigbee extends utils.Adapter {
         this.stController.getExposes();
 
         this.subscribeStates('*');
+        this.subscribeForeignStates(`system.adapter.${this.namespace}.logLevel`)
         // set connection false before connect to zigbee
         this.setState('info.connection', false, true);
         const zigbeeOptions = this.getZigbeeOptions();
@@ -231,13 +224,22 @@ class Zigbee extends utils.Adapter {
         this.zbController.on('msg', this.stController.onZigbeeEvent.bind(this.stController));
         this.zbController.on('publish', this.publishToState.bind(this));
         this.zbController.configure(zigbeeOptions);
+        this.zbController.debugActive = this.debugActive;
+        this.stController.debugActive = this.debugActive;
         await this.callPluginMethod('configure', [zigbeeOptions]);
 
         // elevated debug handling
         this.deviceDebug.start(this.stController, this.zbController);
 
         this.reconnectCounter = 1;
-        this.doConnect();
+        if (this.config.autostart) this.doConnect();
+    }
+    updateDebugLevel(state) {
+        const dbActive = state === 'debug';
+        this.debugActive = dbActive;
+        this.stController.debugActive = dbActive;
+        this.zbController.debugActive = dbActive;
+        this.log.info('Change of log level while running to ' + state);
     }
 
     sandboxAdd(sandbox, item, module) {
@@ -262,18 +264,18 @@ class Zigbee extends utils.Adapter {
 
             let zhcm1 = modulePath.match(/^zigbee-herdsman-converters\//);
             if (zhcm1) {
-                const i2 = modulePath.replace(/^zigbee-herdsman-converters\//, `../zigbee-herdsman-converters/`);
                 try {
+                    const i2 = modulePath.replace(/^zigbee-herdsman-converters\//, `../${sandbox.zhclibBase}/`);
                     this.sandboxAdd(sandbox, item[1], i2);
                 }
                 catch (error) {
-                    this.log.error(`Sandbox error: ${(error && error.message ? error.message : 'no error message given')}`);
+                    this.log.error(`Sandbox error: ${(error && error.message ? error.message : 'no error message given')}`)
                 }
                 continue;
             }
             zhcm1 = modulePath.match(/^..\//);
             if (zhcm1) {
-                const i2 = modulePath.replace(/^..\//, `../zigbee-herdsman-converters/`);
+                const i2 = modulePath.replace(/^..\//, `../${sandbox.zhclibBase}/`);
                 try {
                     this.sandboxAdd(sandbox, item[1], i2);
                 }
@@ -303,11 +305,14 @@ class Zigbee extends utils.Adapter {
         const extfiles = this.config.external.split(';');
         for (const moduleName of extfiles) {
             if (!moduleName) continue;
+            const ZHCP = zigbeeHerdsmanConvertersPackage;
             const sandbox = {
                 require,
                 module: {},
+                zhclibBase : path.join('zigbee-herdsman-converters',(ZHCP && ZHCP.exports && ZHCP.exports['.'] ? path.dirname(ZHCP.exports['.']) : ''))
             };
-            const mN = (fs.existsSync(moduleName) ? moduleName : this.expandFileName(moduleName).replace('zigbee.', 'zigbee_'));
+
+            const mN = (fs.existsSync(moduleName) ? moduleName : this.expandFileName(moduleName));
             if (!fs.existsSync(mN)) {
                 this.log.warn(`External converter not loaded - neither ${moduleName} nor ${mN} exist.`);
             }
@@ -333,13 +338,18 @@ class Zigbee extends utils.Adapter {
                 //fs.writeFileSync(mN+'.tmp5', modifiedCode)
                 converterLoaded &= this.SandboxRequire(sandbox,[...modifiedCode.matchAll(/const\s+(\S+)\s+=\s+require\((.+)\)/gm)]);
                 modifiedCode = modifiedCode.replace(/const\s+\S+\s+=\s+require\(.+\)/gm, '');
-                //fs.writeFileSync(mN+'.tmp6', modifiedCode)
+                //mfs.writeFileSync(mN+'.tmp', modifiedCode)
 
                 for(const component of modifiedCode.matchAll(/const (.+):(.+)=/gm)) {
                     modifiedCode = modifiedCode.replace(component[0], `const ${component[1]} = `);
                 }
                 modifiedCode = modifiedCode.replace(/export .+;/gm, '');
 
+                if (modifiedCode.indexOf('module.exports') < 0) {
+                    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) {
@@ -388,7 +398,32 @@ class Zigbee extends utils.Adapter {
         }
     }
 
-    async doConnect() {
+    async testConnect(from, command, message, callback) {
+        const response = {};
+        if (message.start) {
+            try {
+                this.logToPairing(`overriding zigbee options with:`);
+                for (const k of Object.keys(message.zigbeeOptions)) {
+                    this.logToPairing(`${k} : ${message.zigbeeOptions[k]}`)
+                }
+                this.zbController.configure(this.getZigbeeOptions(message.zigbeeOptions));
+                response.status = await this.doConnect(true);
+                this.sendTo(from, command, response, callback);
+            }
+            catch (error) {
+                this.sendTo(from, command, { status:false }, 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:false }, callback);
+        }
+    }
+
+    async doConnect(noReconnect) {
         let debugversion = '';
         try {
             const DebugIdentify = require('./debugidentify');
@@ -400,33 +435,44 @@ class Zigbee extends utils.Adapter {
         // installed version
         let gitVers = '';
         try {
+            if (noReconnect) this.logToPairing(`Starting Adapter ${debugversion}`);
             this.log.info(`Starting Adapter ${debugversion}`);
 
             this.getForeignObject(`system.adapter.${this.namespace}`,async (err, obj) => {
-                if (!err && obj && obj.common.installedFrom && obj.common.installedFrom.includes('://')) {
-                    const instFrom = obj.common.installedFrom;
-                    gitVers = gitVers + instFrom.replace('tarball', 'commit');
-                } else {
-                    gitVers = obj.common.installedFrom;
+                try {
+                    if (!err && obj && obj.common.installedFrom && obj.common.installedFrom.includes('://')) {
+                        const instFrom = obj.common.installedFrom;
+                        gitVers = gitVers + instFrom.replace('tarball', 'commit');
+                    } else {
+                        gitVers = obj.common.installedFrom;
+                    }
+                    if (noReconnect) this.logToPairing(`Installed Version: ${gitVers} (Converters ${zigbeeHerdsmanConvertersPackage.version} Herdsman ${zigbeeHerdsmanPackage.version})`);
+                    this.log.info(`Installed Version: ${gitVers} (Converters ${zigbeeHerdsmanConvertersPackage.version} Herdsman ${zigbeeHerdsmanPackage.version})`);
+                    await this.zbController.start(noReconnect);
+                } catch (error) {
+                    this.logToPairing(error && error.message ? error.message : error);
+                    this.log.error(error && error.message ? error.message : error);
                 }
-                this.log.info(`Installed Version: ${gitVers} (Converters ${zigbeeHerdsmanConvertersPackage.version} Herdsman ${zigbeeHerdsmanPackage.version})`);
-                await this.zbController.start();
+                return false;
             });
-
         } catch (error) {
             this.setState('info.connection', false, true);
-            this.log.error(`Failed to start Zigbee`);
-            if (error.stack) {
+            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;
 
             if (this.reconnectCounter > 0) {
                 this.tryToReconnect();
             }
         }
+        return true;
     }
 
     UploadRequired(status) {
@@ -489,14 +535,16 @@ class Zigbee extends utils.Adapter {
                             ]
                         );
                         const nwExtPanId = `0x${result.payload.value.reverse().toString('hex')}`;
-                        this.log.debug(`Config value ${configExtPanId} : nw value ${nwExtPanId}`);
+                        if (this.debugActive) this.log.debug(`Config value ${configExtPanId} : nw value ${nwExtPanId}`);
+                        this.logToPairing(`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`);
+                        const msg = `Unable to apply ExtPanID changes: ${e}`;
+                        this.log.error(msg);
+                        this.logToPairing(msg)
                         needChange = false;
                     }
                 } else {
@@ -505,11 +553,11 @@ class Zigbee extends utils.Adapter {
             }
             if (needChange) {
                 // need change config value and mark that fix is applied
-                this.log.debug(`Fix extPanId value to ${networkExtPanId}. And restart adapter.`);
+                if (this.debugActive) this.log.debug(`Fix extPanId value to ${networkExtPanId}. And restart adapter.`);
                 this.updateConfig({extPanID: networkExtPanId.substr(2), extPanIdFix: true});
             } else {
                 // only mark that fix is applied
-                this.log.debug(`Fix without changes. And restart adapter.`);
+                if (this.debugActive) this.log.debug(`Fix without changes. And restart adapter.`);
                 this.updateConfig({extPanIdFix: true});
             }
         }
@@ -596,18 +644,18 @@ class Zigbee extends utils.Adapter {
             this.emit('device_debug', { ID:debugID, data: { ID: deviceId, flag: '03', IO:false }, message: message});
         }
         else
-            this.log.debug(`publishFromState : ${deviceId} ${model} ${safeJsonStringify(stateList)}`);
+            if (this.debugActive) this.log.debug(`publishFromState : ${deviceId} ${model} ${safeJsonStringify(stateList)}`);
         if (model === 'group') {
             isGroup = true;
             deviceId = parseInt(deviceId);
         }
         try {
             const entity = await this.zbController.resolveEntity(deviceId);
-            this.log.debug(`entity: ${deviceId} ${model} ${safeJsonStringify(entity)}`);
+            if (this.debugActive) this.log.debug(`entity: ${deviceId} ${model} ${safeJsonStringify(entity)}`);
             const mappedModel = entity ? entity.mapped : undefined;
 
             if (!mappedModel) {
-                this.log.debug(`No mapped model for ${model}`);
+                if (this.debugActive) this.log.debug(`No mapped model for ${model}`);
                 if (has_elevated_debug) {
                     const message=`No mapped model ${deviceId} (model ${model})`;
                     this.emit('device_debug', { ID:debugID, data: { error: 'NOMODEL' , IO:false }, message: message});
@@ -636,12 +684,12 @@ class Zigbee extends utils.Adapter {
                             this.acknowledgeState(deviceId, model, stateDesc, value);
                         }
                         else {
-                            this.error('Error in SendPayload: '+result.error.message);
+                            this.log.error('Error in SendPayload: '+result.error.message);
                         }
                     } catch (error) {
                         const message = `send_payload: ${value} does not parse as JSON Object : ${error.message}`;
                         if (has_elevated_debug) this.emit('device_debug', { ID:debugID, data: { error: 'EXSEND' ,states:[{id:stateDesc.id, value:value, payload:error.message}], IO:false }, message:message});
-                        else this.error(message);
+                        else this.log.error(message);
                         return;
                     }
                     return;
@@ -654,7 +702,7 @@ class Zigbee extends utils.Adapter {
                         this.emit('device_debug', { ID:debugID, data: { flag: 'cc', states:[{id:stateDesc.id, value:value, payload:'none (OC State)'}] , IO:false }, message:message});
                     }
                     else
-                        this.log.debug('changed composite state: ' + JSON.stringify(changedState));
+                        if (this.debugActive) this.log.debug('changed composite state: ' + JSON.stringify(changedState));
 
                     this.acknowledgeState(deviceId, model, stateDesc, value);
                     if (stateDesc.compositeState && stateDesc.compositeTimeout) {
@@ -673,7 +721,7 @@ class Zigbee extends utils.Adapter {
                                 this.emit('device_debug', { ID:debugID, data: { flag: 'qs' ,states:[{id:stateDesc.id, value:value, payload:'none for device query'}], IO:false }, message:message});
                             }
                             else
-                                this.log.debug(`Device query for '${entity.device.ieeeAddr}' started`);
+                                if (this.debugActive) this.log.debug(`Device query for '${entity.device.ieeeAddr}' started`);
                             for (const converter of mappedModel.toZigbee) {
                                 if (converter.hasOwnProperty('convertGet')) {
                                     for (const ckey of converter.key) {
@@ -715,7 +763,7 @@ class Zigbee extends utils.Adapter {
                 for (const c of mappedModel.toZigbee) {
 
                     if (!c.hasOwnProperty('convertSet')) continue;
-                    this.log.debug(`Type of toZigbee is '${typeof c}', Contains key ${(c.hasOwnProperty('key')?JSON.stringify(c.key):'false ')}`)
+                    if (this.debugActive) this.log.debug(`Type of toZigbee is '${typeof c}', Contains key ${(c.hasOwnProperty('key')?JSON.stringify(c.key):'false ')}`)
                     if (!c.hasOwnProperty('key'))
                     {
                         if (converter === undefined)
@@ -726,7 +774,7 @@ class Zigbee extends utils.Adapter {
                                 this.emit('device_debug', { ID:debugID, data: { flag: `s4.${msg_counter}` , IO:false }, message:message});
                             }
                             else
-                                this.log.debug(`Setting converter to keyless converter for ${deviceId} of type ${model}`);
+                                if (this.debugActive) this.log.debug(`Setting converter to keyless converter for ${deviceId} of type ${model}`);
                             msg_counter++;
                         }
                         else
@@ -737,7 +785,7 @@ class Zigbee extends utils.Adapter {
                                 this.emit('device_debug', { ID:debugID, data: { flag: `i4.${msg_counter}` , IO:false} , message:message});
                             }
                             else
-                                this.log.debug(`ignoring keyless converter for ${deviceId} of type ${model}`);
+                                if (this.debugActive) this.log.debug(`ignoring keyless converter for ${deviceId} of type ${model}`);
                             msg_counter++;
                         }
                         continue;
@@ -750,7 +798,7 @@ class Zigbee extends utils.Adapter {
 
                         }
                         else
-                            this.log.debug(message);
+                            if (this.debugActive) this.log.debug(message);
                         converter = c;
                         msg_counter++;
                     }
@@ -761,7 +809,7 @@ class Zigbee extends utils.Adapter {
                         this.emit('device_debug', { ID:debugID, data: { error: 'NOCONV',states:[{id:stateDesc.id, value:value, payload:'no converter'}] , IO:false }, message:message});
                     }
                     else {
-                        this.log.warn(message);
+                        this.log.info(message);
                     }
                     return;
                 }
@@ -786,7 +834,7 @@ class Zigbee extends utils.Adapter {
                     this.emit('device_debug', { ID:debugID, data: { flag: '04', payload: {key:key, ep: stateDesc.epname, value:preparedValue, options:preparedOptions}, IO:false }, message:message});
                 }
                 else
-                    this.log.debug(message);
+                    if (this.debugActive) this.log.debug(message);
 
                 let target;
                 if (model === 'group') {
@@ -796,7 +844,7 @@ class Zigbee extends utils.Adapter {
                     target = target.endpoint;
                 }
 
-                this.log.debug(`target: ${safeJsonStringify(target)}`);
+                if (this.debugActive) this.log.debug(`target: ${safeJsonStringify(target)}`);
 
                 const meta = {
                     endpoint_name: epName,
@@ -833,7 +881,7 @@ class Zigbee extends utils.Adapter {
                         this.emit('device_debug', { ID:debugID, data: { flag: 'SUCCESS' , IO:false }, message:message});
                     }
                     else
-                        this.log.debug(message);
+                        if (this.debugActive) this.log.debug(message);
                     if (result !== undefined) {
                         if (stateModel && !isGroup && !stateDesc.noack) {
                             this.acknowledgeState(deviceId, model, stateDesc, value);
@@ -969,6 +1017,10 @@ class Zigbee extends utils.Adapter {
 
 
     newDevice(entity) {
+
+        if (this.debugActive) this.log.debug(`New device event: ${safeJsonStringify(entity)}`);
+        this.stController.AddModelFromHerdsman(entity.device, entity.mapped ? entity.mapped.model : entity.device.modelID)
+
         const dev = entity.device;
         const model = (entity.mapped) ? entity.mapped.model : dev.modelID;
         this.log.debug(`New device event: ${safeJsonStringify(entity)}`);
@@ -981,21 +1033,23 @@ class Zigbee extends utils.Adapter {
         if (dev) {
             this.getObject(dev.ieeeAddr.substr(2), (err, obj) => {
                 if (!obj) {
-                    this.log.debug(`new device ${dev.ieeeAddr} ${dev.networkAddress} ${model} `);
+                    const model = (entity.mapped) ? entity.mapped.model : entity.device.modelID;
+                    if (this.debugActive) this.log.debug(`new device ${dev.ieeeAddr} ${dev.networkAddress} ${model} `);
+
                     this.logToPairing(`New device joined '${dev.ieeeAddr}' model ${model}`, true);
                     this.stController.updateDev(dev.ieeeAddr.substr(2), model, model, () =>
                         this.stController.syncDevStates(dev, model));
                 }
-                else this.log.debug(`Device ${safeJsonStringify(entity)} rejoined, no new device`);
+                else if (this.debugActive) this.log.debug(`Device ${safeJsonStringify(entity)} rejoined, no new device`);
             });
         }
     }
 
     leaveDevice(ieeeAddr) {
-        this.log.debug(`Leave device event: ${ieeeAddr}`);
+        if (this.debugActive) this.log.debug(`Leave device event: ${ieeeAddr}`);
         if (ieeeAddr) {
             const devId = ieeeAddr.substr(2);
-            this.log.debug(`Delete device ${devId} from iobroker.`);
+            if (this.debugActive) this.log.debug(`Delete device ${devId} from iobroker.`);
             this.stController.deleteObj(devId);
         }
     }
@@ -1030,12 +1084,13 @@ class Zigbee extends utils.Adapter {
                 debug.log = originalLogMethod;
             }
 
-            this.log.info('cleaned everything up...');
-            if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
+            this.log.info('cleaning everything up...');
             await this.callPluginMethod('stop');
+            await this.stController.stop();
             if (this.zbController) {
                 await this.zbController.stop();
             }
+            this.log.info('cleanup successful');
             callback();
         } catch (error) {
             if (error) {
@@ -1046,10 +1101,10 @@ class Zigbee extends utils.Adapter {
         }
     }
 
-    getZigbeeOptions() {
+    getZigbeeOptions(_overrideOptions) {
+        const override = (_overrideOptions ? _overrideOptions:{});
         // file path for db
-        let dbDir = path.join(utils.getAbsoluteInstanceDataDir(this), '');
-        dbDir = dbDir.replace('zigbee.', 'zigbee_');
+        const dbDir = this.expandFileName('');
 
         if (this.systemConfig && !fs.existsSync(dbDir)) {
             try {
@@ -1059,21 +1114,21 @@ class Zigbee extends utils.Adapter {
                 this.sendError(`Cannot create directory ${dbDir}: ${e}`);
             }
         }
-        const port = this.config.port;
+        const port = override.port ? override.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);
-        const precfgkey = createByteArray(this.config.precfgkey ? this.config.precfgkey : '01030507090B0D0F00020406080A0C0D');
-        const extPanId = createByteArray(this.config.extPanID ? this.config.extPanID : 'DDDDDDDDDDDDDDDD').reverse();
-        const adapterType = this.config.adapterType || 'zstack';
+        const panID = parseInt(override.panID ? override.panID : this.config.panID ? this.config.panID : 0x1a62);
+        const channel = parseInt(override.channel ? override.channel : this.config.channel ? this.config.channel : 11);
+        const precfgkey = createByteArray(override.precfgkey ? override.precfgkey : this.config.precfgkey ? this.config.precfgkey : '01030507090B0D0F00020406080A0C0D');
+        const extPanId = createByteArray(override.extPanID ? override.extPanID : this.config.extPanID ? this.config.extPanID : 'DDDDDDDDDDDDDDDD').reverse();
+        const adapterType = override.adapterType ? override.adapterType : this.config.adapterType || 'zstack';
         // https://github.com/ioBroker/ioBroker.zigbee/issues/668
         const extPanIdFix = this.config.extPanIdFix ? this.config.extPanIdFix : false;
-        const baudRate = parseInt(this.config.baudRate ? this.config.baudRate : 115200);
+        const baudRate = parseInt(override.baudRate ? override.baudRate : this.config.baudRate ? this.config.baudRate : 115200);
 
-        const setRtscts = this.config.flowCTRL ? this.config.flowCTRL : false;
+        const setRtscts = override.flowCTRL ? override.flowCTRL : this.config.flowCTRL ? this.config.flowCTRL : false;
 
         return {
             net: {
@@ -1088,6 +1143,7 @@ class Zigbee extends utils.Adapter {
                 rtscts: setRtscts,
                 adapter: adapterType,
             },
+            transmitpower: this.transmitPower,
             dbDir: dbDir,
             dbPath: 'shepherd.db',
             backupPath: 'nvbackup.json',
@@ -1096,7 +1152,7 @@ class Zigbee extends utils.Adapter {
             transmitPower: this.config.transmitPower,
             disableBackup: this.config.disableBackup,
             extPanIdFix: extPanIdFix,
-            startWithInconsistent: this.config.startWithInconsistent || false,
+            startWithInconsistent: override.startWithInconsistent ? override.startWithInconsistent: this.config.startWithInconsistent || false,
         };
     }
 
@@ -1120,7 +1176,12 @@ class Zigbee extends utils.Adapter {
     }
 
     expandFileName(fn) {
-        return path.join(utils.getAbsoluteInstanceDataDir(this), fn);
+        return path.join(this.getDataFolder(), fn);
+    }
+
+    getDataFolder() {
+        const datapath=this.namespace.replace('.','_');
+        return path.join(utils.getAbsoluteInstanceDataDir(this).replace(this.namespace, datapath));
     }
 
     onLog(level, msg, data) {
@@ -1131,7 +1192,8 @@ class Zigbee extends utils.Adapter {
                     logger = this.log.error;
                     if (data)
                         data = data.toString();
-                    this.logToPairing(`Error: ${msg}. ${data}`, true);
+                    if (this.ErrorMessagesToPairing)
+                        this.logToPairing(`Error: ${msg}. ${data}`, true);
                     this.sendError(`Error: ${msg}. ${data}`);
                     break;
                 case 'debug':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "2.0.5",
+  "version": "3.0.1",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -18,18 +18,18 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "serialport": "^12.0.0"
+    "serialport": "^13.0.0"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.2.2",
-    "@iobroker/dm-utils": "^0.5.0",
+    "@iobroker/adapter-core": "^3.2.3",
+    "@iobroker/dm-utils": "^1.0.9",
     "humanize-duration": "^3.32.1",
     "tar": "^7.4.3",
     "ajv": "^8.17.1",
     "uri-js": "^4.4.1",
     "typescript": "^5.6.3",
-    "zigbee-herdsman": "^3.3.0",
-    "zigbee-herdsman-converters": "23.6.0"
+    "zigbee-herdsman": "3.3.2",
+    "zigbee-herdsman-converters": "23.13.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -37,12 +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.0",
+    "@iobroker/testing": "^5.0.4",
     "chai": "^5.1.2",
     "chai-as-promised": "^7.1.1",
     "eslint": "^9.19.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.3",
+    "eslint-plugin-prettier": "^5.2.5",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-replace": "^1.1.4",