iobroker.zigbee 3.0.5 → 3.1.4

package/lib/localConfig.js

@@ -1,10 +1,8 @@
 'use strict';
 
-/*eslint no-unused-vars: ['off']*/
 const fs = require('fs');
 const path = require('path');
 const utils = require('@iobroker/adapter-core'); // Get common adapter utils
-// const { src } = require('gulp');
 
 const EventEmitter = require('events').EventEmitter;
 
@@ -20,7 +18,6 @@ class localConfig extends EventEmitter {
         this.adapter.on('ready', () => this.onReady());
     }
 
-
     async onReady()
     {
     }
@@ -60,7 +57,7 @@ class localConfig extends EventEmitter {
         }
         if (typeof name != 'string' || name.trim().length < 1)
         {
-            if (this.localData.hasOwnProperty(id))
+            if (this.localData.by_id.hasOwnProperty(id))
                 delete this.localData.by_id[id].name;
         }
         else {
@@ -103,6 +100,7 @@ class localConfig extends EventEmitter {
             else this.localData.by_id[target] = base;
         }
         this.info(`Local Data for ${target} is ${JSON.stringify(base)} after update`);
+        this.retainData();
         return true;
     }
 
@@ -115,9 +113,12 @@ class localConfig extends EventEmitter {
             this.error(`update called with illegal id data:${JSON.stringify(target)}:${JSON.stringify(key)}`)
             return false;
         }
-        const base = global ? this.localData.by_model[target] || {} : this.localData.by_id[target] || {};
         const rv = {};
-        if (base.hasOwnProperty(key)) rv[key] = base[key];
+        if ((this.localData.byModel[target] || {}).hasOwnProperty(key))
+            rv[key] = this.localData.byModel[target] || {}[key];
+        if (global) return rv;
+        if ((this.localData.by_id[_target] || {}).hasOwnProperty(key))
+            rv[key] = this.localData.by_id[_target] || {}[key];
         return rv;
     }
 
@@ -284,7 +285,7 @@ class localConfig extends EventEmitter {
     }
 
     async retainData() {
-        //this.warn('retaining local config: ' + JSON.stringify(this.localData));
+        this.debug('retaining local config: ' + JSON.stringify(this.localData));
         try {
             fs.writeFileSync(this.filename, JSON.stringify(this.localData, null, 2))
             this.info('Saved local configuration data');
@@ -303,7 +304,6 @@ class localConfig extends EventEmitter {
                 const fn = path.join(item.parentPath, item.name);
                 rv.push({file: fn, name: item.name, data: fs.readFileSync(path.join(item.parentPath, item.name), 'base64'), isBase64:true});
             });
-            //this.warn('enumerateImages for  ' + _path + ' is ' + JSON.stringify(rv));
         }
         catch (error) {
             this.error(`error in enumerateImages : ${error.message ? error.message : 'undefined error'}`)
@@ -311,11 +311,22 @@ class localConfig extends EventEmitter {
         return rv;
     }
 
-    getOptions(dev_id) {
+    getOptions(_dev_id, model_id) {
+        function extractOptions(target, options) {
+            if (typeof target != 'object') target = {};
+            if (typeof options != 'object') return target;
+            Object.keys(options).forEach((option) => target[option] = options[option]);
+            return target;
+        }
+        const dev_id = _dev_id.startsWith('0x') ? _dev_id.substring(2) : _dev_id
+
         const ld = this.localData.by_id[dev_id];
-        if (ld === undefined || ld.options === undefined) return {};
-        this.debug(`getOptions for ${dev_id} : ${JSON.stringify(ld.options)}`);
-        return ld.options;
+        const gd = this.localData.by_model[model_id];
+        const rv = {};
+        if (gd) extractOptions(rv, gd.options);
+        if (ld) extractOptions(rv, ld.options);
+        this.debug(`getOptions for ${dev_id} : ${JSON.stringify(rv)}`);
+        return rv;
     }
 
 }

package/lib/networkmap.js

@@ -4,6 +4,7 @@ class NetworkMap {
     constructor(adapter) {
         this.adapter = adapter;
         this.adapter.on('message', this.onMessage.bind(this));
+        this.mapdata = undefined;
     }
 
     start(zbController, stController) {
@@ -37,16 +38,23 @@ class NetworkMap {
             switch (obj.command) {
                 case 'getMap':
                     if (obj && obj.message && typeof obj.message === 'object') {
-                        this.getMap(obj.from, obj.command, obj.callback);
+                        this.getMap(obj.from, obj.command, obj.message, obj.callback);
                     }
                     break;
             }
         }
     }
 
-    getMap(from, command, callback) {
+    getMap(from, command, message, callback) {
+        if (message.forcebuild) this.mapdata = undefined;
+        if (this.mapdata) {
+            this.mapdata.errors = {};
+            this.adapter.sendTo(from, command, this.mapdata, callback)
+            return;
+        }
         if (this.zbController) {
             this.zbController.getMap(networkmap => {
+                this.mapdata = networkmap;
                 this.adapter.log.debug(`getMap result: ${JSON.stringify(networkmap)}`);
                 this.adapter.sendTo(from, command, networkmap, callback);
             });

package/lib/states.js

@@ -81,7 +81,8 @@ const states = {
         read: true,
         type: 'number',
         min: 0,
-        max: 255
+        max: 255,
+        isCommonState:true,
     },
     available: {
         id: 'available',
@@ -91,7 +92,8 @@ const states = {
         role: 'state',
         write: false,
         read: true,
-        type: 'boolean'
+        type: 'boolean',
+        isCommonState:true,
     },
     device_query: { // button to trigger device read
         id: 'device_query',
@@ -103,6 +105,7 @@ const states = {
         read: false,
         type: 'boolean',
         isOption: true,
+        isCommonState:true,
     },
     from_zigbee: {
         id: 'msg_from_zigbee',
@@ -112,6 +115,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
+        isCommonState:true,
     },
     send_payload: {
         id: 'send_payload',
@@ -121,6 +125,7 @@ const states = {
         write: true,
         read: true,
         type: 'string',
+        isCommonState:true,
     },
     checking: { // press button for checking
         id: 'checking',
@@ -6603,6 +6608,31 @@ const states = {
         read: true,
         type: 'number',
     },
+
+    groupstateupdate: {
+        id: 'stateupdate',
+        name: 'Set group by member states',
+        icon: undefined,
+        role: 'state',
+        write: true,
+        read: true,
+        type: 'string',
+        states: {off:'off',max:'max',min:'min',avg:'avg',mat:'mat'},
+        def:'off',
+        isCommonState: true,
+        isOption: true,
+    },
+    groupmemberupdate: {
+        id: 'memberupdate',
+        name: 'Read member states',
+        icon: undefined,
+        role: 'state',
+        write: true,
+        read: true,
+        type: 'boolean',
+        isCommonState: true,
+        isOption: true,
+    }
 };
 
 module.exports = {