iobroker.zigbee 3.0.0 → 3.0.2

package/lib/networkmap.js

@@ -9,6 +9,7 @@ class NetworkMap {
     start(zbController, stController) {
         this.zbController = zbController;
         this.stController = stController;
+        return this.stop;
     }
 
     stop() {
@@ -53,4 +54,4 @@ class NetworkMap {
     }
 }
 
-module.exports = NetworkMap;
+module.exports = NetworkMap;

package/lib/statescontroller.js

@@ -57,23 +57,6 @@ class StatesController extends EventEmitter {
         this.adapter.sendError(error, message);
     }
 
-    TriggerUpload(delay) {
-        if (this.timeoutHandleUpload) return;
-        this.warn('triggering upload')
-        this.timeoutHandleUpload = this.adapter.setTimeout(() => {
-            try {
-                this.warn('executing upload')
-                exec('iobroker upload zigbee', (error, stdout, stderr) => {
-                    if (error) this.error('exec error: ' + JSON.stringify(error));
-                    this.warn('upload done');
-                });
-            }
-            catch (error) {
-                this.error('error on upload exec');
-            }
-        }, delay);
-    }
-
     getStashedErrors() {
         const rv = [];
         try {
@@ -99,19 +82,19 @@ class StatesController extends EventEmitter {
 
     async AddModelFromHerdsman(device, model) {
         // this.warn('addModelFromHerdsman ' + JSON.stringify(model) + ' ' + JSON.stringify(this.localConfig.getOverrideWithKey(model, 'legacy', true)));
-        if (this.localConfig.getOverrideWithKey(model, 'legacy', true)) {
+        if (this.localConfig.getOverrideWithTargetAndKey(model, 'legacy', true)) {
             this.debug('Applying legacy definition for ' + model);
             await this.addLegacyDevice(model);
         }
         else {
             this.debug('Generating states from exposes for ' + model);
-            const modelDesc = await statesMapping.addExposeToDevices(device, this, model);
-            const srcIcon = modelDesc.icon;
             // download icon if it external and not undefined
             if (model === undefined) {
                 const dev_name = this.verifyDeviceName(device.ieeeAddr.substr(2), model, device.modelID);
-                this.warn(`download icon ${dev_name} for undefined Device not available. Check your devices.`);
+                this.warn(`icon ${dev_name} for undefined Device not available. Check your devices.`);
             } else {
+                const modelDesc = await statesMapping.addExposeToDevices(device, this, model);
+                const srcIcon = modelDesc.icon;
                 const model_modif = model.replace(/\//g, '-');
                 const pathToAdminIcon = `img/${model_modif}.png`;
 
@@ -134,15 +117,17 @@ class StatesController extends EventEmitter {
                 }
                 const base64Match = srcIcon.match(/data:image\/(.+);base64,/);
                 if (base64Match) {
+                    this.warn(`base 64 Icon matched, trying to save it to disk as ${pathToAdminIcon}`);
                     modelDesc.icon = pathToAdminIcon;
                     this.adapter.fileExists(namespace, pathToAdminIcon, async (err,result) => {
                         if (result) {
-                            this.debug(`no need to save icon to ${pathToAdminIcon}`);
+                            this.warn(`no need to save icon to ${pathToAdminIcon}`);
                             return;
                         }
-                        this.debug(`Saving base64 data to ${pathToAdminIcon}`)
+                        this.warn(`Saving base64 data to ${pathToAdminIcon}`)
                         const buffer = new Buffer(srcIcon.replace(base64Match[0],''), 'base64');
                         this.adapter.writeFile(pathToAdminIcon, buffer);
+                        this.warn('write file complete.');
                     });
                     return;
                 }
@@ -296,48 +281,60 @@ class StatesController extends EventEmitter {
                         }
 
                     }
-                    this.collectOptions(id.split('.')[2], model, options =>
+                    this.collectOptions(id.split('.')[2], model, true,  options =>
                         this.publishFromState(deviceId, model, stateKey, state, options, debugId));
                 }
             });
         }
     }
 
-    async collectOptions(devId, model, callback) {
-        const result = {};
-        // find model states for options and get it values. No options for groups !!!
-        const devStates = await this.getDevStates('0x' + devId, model);
-        if (devStates == null || devStates == undefined || devStates.states == null || devStates.states == undefined) {
-            callback(result);
-            return;
-        }
-
-        const states = devStates.states.filter(statedesc => statedesc.isOption || statedesc.inOptions);
-        if (states == null || states == undefined) {
-            callback(result);
-            return;
-        }
-        let cnt = 0;
+    async collectOptions(devId, model, getOptionStates, callback) {
         try {
-            const len = states.length;
-            states.forEach(statedesc => {
-                const id = `${this.adapter.namespace}.${devId}.${statedesc.id}`;
-                this.adapter.getState(id, (err, state) => {
-                    cnt = cnt + 1;
-                    if (!err && state) {
-                        result[statedesc.id] = state.val;
-                    }
-                    if (cnt === len) {
-                        callback(result);
-                    }
-                });
-            });
-            if (!len) {
+            const result = this.localConfig.getOptions(devId);
+            if (!getOptionStates) {
                 callback(result);
+                return;
+            }
+            // find model states for options and get it values. No options for groups !!!
+            const devStates = await this.getDevStates('0x' + devId, model);
+            if (devStates == null || devStates == undefined || devStates.states == null || devStates.states == undefined) {
+                callback(result);
+                return;
+            }
+
+            const states = devStates.states.filter(statedesc => statedesc.isOption || statedesc.inOptions);
+            if (states == null || states == undefined) {
+                callback(result);
+                return;
+            }
+            let cnt = 0;
+            try {
+                const len = states.length;
+                states.forEach(statedesc => {
+                    const id = `${this.adapter.namespace}.${devId}.${statedesc.id}`;
+                    this.adapter.getState(id, (err, state) => {
+                        cnt = cnt + 1;
+                        if (!err && state) {
+                            this.debug(`collect options for ${devId}:  ${JSON.stringify(result)}`);
+                            result[statedesc.id] = state.val;
+                        }
+                        if (cnt === len) {
+                            callback(result);
+                        }
+                    });
+                });
+                if (!len) {
+                    callback(result);
+                }
+            } catch (error) {
+                this.sendError(error);
+                this.error(`Error collectOptions for ${devId}. Error: ${error.stack}`);
             }
-        } catch (error) {
-            this.sendError(error);
-            this.error(`Error collectOptions for ${devId}. Error: ${error.stack}`);
+        }
+        catch (error) {
+            this.error(`Error in collectOptions for ${devId} , ${model} : ${error && error.message ? error.message : 'no message given'}`);
+            callback({});
+
         }
     }
 
@@ -1047,7 +1044,7 @@ class StatesController extends EventEmitter {
 
                         } else {
                             if (statedesc.prepublish) {
-                                this.collectOptions(devId, model, options =>
+                                this.collectOptions(devId, model, false, options =>
                                     statedesc.prepublish(devId, value, newvalue => {
                                         this.updateState(devId, stateID, newvalue, common) }, options)
                                 );
@@ -1088,7 +1085,7 @@ class StatesController extends EventEmitter {
             };
 
             const options = await new Promise((resolve, reject) => {
-                this.collectOptions(devId, model, (options) => {
+                this.collectOptions(devId, model, false, (options) => {
                     resolve(options);
                 });
             });
@@ -1220,10 +1217,15 @@ class StatesController extends EventEmitter {
                 if (cluster !== '64529') {
                     if (has_elevated_debug) this.emit('device_debug', { ID:debugId, data: { error:'EPROC', IO:true }});
                     this.error(`Error while processing converters DEVICE_ID: '${devId}' cluster '${cluster}' type '${type}'`);
+                    this.error(`error message: ${error && error.message ? error.message : ''}`);
                 }
             });
     }
 
+    async stop() {
+        this.localConfig.retainData();
+    }
+
 
 
 }

package/lib/zbDeviceConfigure.js

@@ -155,7 +155,7 @@ class DeviceConfigure extends BaseExtension {
                 if (mappedDevice.configure === undefined) return `No configure available for ${device.ieeeAddr} ${mappedDevice.model}.`;
                 this.info(`Configuring ${device.ieeeAddr} ${mappedDevice.model}`);
                 this.configuring.add(device.ieeeAddr);
-                if (typeof mappedDevice.configure === 'function') await mappedDevice.configure(device, coordinatorEndpoint, this);
+                if (typeof mappedDevice.configure === 'function') await mappedDevice.configure(device, coordinatorEndpoint, mappedDevice);
                 else {
                     const promises = [];
                     promises.push(...mappedDevice.configure);

package/lib/zigbeecontroller.js

@@ -118,7 +118,7 @@ class ZigbeeController extends EventEmitter {
             this.powerText = powerLevels[this.transmitPower] || 'normal';
         }
 
-        this.info(`  --> transmitPower : ${this.powerText}`);
+        //this.info(`  --> transmitPower : ${this.powerText}`);
 
         const herdsmanSettings = {
             network: {
@@ -185,6 +185,16 @@ class ZigbeeController extends EventEmitter {
     async start() {
         try {
             this.emit('pairing',`Starting zigbee-herdsman...`);
+            this.powerText = '';
+            if (this.transmitPower !== '0') {
+                const powerLevels = {
+                    '-22': 'low',
+                    '19': 'high',
+                    '20': 'high+'
+                };
+                this.powerText = powerLevels[this.transmitPower] || 'normal';
+            }
+            this.info(`configured transmit power : ${this.powerText}`);
             if (this.debugActive) this.debug(`Starting zigbee-herdsman...`);
 
             // install event handlers before start
@@ -669,6 +679,7 @@ class ZigbeeController extends EventEmitter {
             if (this.HerdsmanStarted) await this.permitJoin(0);
             await this.herdsman.stop();
             this.HerdsmanStarted = false;
+            this.info('zigbecontroller stopped successfully');
         } catch (error) {
             this.sendError(error);
             if (this.herdsmanStarted) {

package/main.js

@@ -232,7 +232,11 @@ class Zigbee extends utils.Adapter {
         this.deviceDebug.start(this.stController, this.zbController);
 
         this.reconnectCounter = 1;
-        if (this.config.autostart) this.doConnect();
+        if (this.config.autostart) {
+            this.log.info('Autostart Zigbee subsystem');
+            this.doConnect();
+        }
+        else this.log.warn('Zigbee autostart option not set - omitting start of zigbee substystem!');
     }
     updateDebugLevel(state) {
         const dbActive = state === 'debug';
@@ -809,7 +813,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;
                 }
@@ -1079,17 +1083,19 @@ class Zigbee extends utils.Adapter {
      */
     async onUnload(callback) {
         try {
+            this.log.info(`Halting zigbee adapter. Restart delay is at least ${this.ioPack.common.stopTimeout / 1000} seconds.`)
             if (this.config.debugHerdsman) {
                 debug.disable();
                 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -22,14 +22,14 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
-    "@iobroker/dm-utils": "^1.0.9",
-    "humanize-duration": "^3.32.1",
+    "@iobroker/dm-utils": "^1.0.10",
+    "humanize-duration": "^3.33.0",
     "tar": "^7.4.3",
     "ajv": "^8.17.1",
     "uri-js": "^4.4.1",
-    "typescript": "^5.6.3",
-    "zigbee-herdsman": "^3.3.2",
-    "zigbee-herdsman-converters": "^23.13.0"
+    "typescript": "^5.8.3",
+    "zigbee-herdsman": "4.0.0",
+    "zigbee-herdsman-converters": "23.35.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -40,9 +40,9 @@
     "@iobroker/testing": "^5.0.4",
     "chai": "^5.1.2",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^9.19.0",
+    "eslint": "^9.30.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.5",
+    "eslint-plugin-prettier": "^5.5.1",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-replace": "^1.1.4",