iobroker.zigbee 2.0.1 → 2.0.3

package/lib/groups.js

@@ -2,7 +2,6 @@
 
 const json = require('iobroker.zigbee/lib/json');
 const statesMapping = require('./devices');
-const { numberWithinRange } = require('zigbee-herdsman-converters/lib/utils');
 const idRegExp = new RegExp(/group_(\d+)/);
 
 
@@ -168,7 +167,7 @@ class Groups {
                 for (const gpid of groups[epid]) {
                     const gpidn = parseInt(gpid);
                     if (gpidn < 0) {
-                        this.warn(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` );
+                        this.debug(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` );
                         const response = await this.zbController.removeDevFromGroup(sysid, (-gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -176,7 +175,7 @@ class Groups {
                         }
                         const icon = this.stController.getDefaultGroupIcon(-gpidn)
                     } else if (gpidn > 0) {
-                        this.warn(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` );
+                        this.debug(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` );
                         const response = await this.zbController.addDevToGroup(sysid, (gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -233,7 +232,7 @@ class Groups {
             throw error;
         }
         if (result.unread.length > 0) {
-            this.warn(`unread ${stateDesc.id} change for group members ${JSON.stringify(result.unread)}`);
+            this.debug(`unread ${stateDesc.id} change for group members ${JSON.stringify(result.unread)}`);
         }
     }
 
@@ -254,11 +253,10 @@ class Groups {
             if (message.remove) {
                 for (const member of message.remove) {
                     const response = await this.zbController.removeDevFromGroup(member.id, id, member.ep);
-                    this.warn('trying to remove ' + member.id + (member.ep ? '.'+member.ep : '') + ' ' + ' from group ' + message.id + ' response is '+JSON.stringify(response));
+                    this.debug('trying to remove ' + member.id + (member.ep ? '.'+member.ep : '') + ' ' + ' from group ' + message.id + ' response is '+JSON.stringify(response));
                 }
             }
             if (icon.match(/img\/group_\d+\.png/g)) {
-                this.warn('.');
                 icon = await this.zbController.rebuildGroupIcon(group);
             }
         } catch (e) {
@@ -270,7 +268,7 @@ class Groups {
         this.warn(`rename group name ${name}, id ${id}, icon ${icon} remove ${JSON.stringify(message.removeMembers)}`);
         const group = await this.adapter.getObjectAsync(id);
         if (!group) {
-            this.warn('group object doesnt exist ')
+            this.debug('group object doesnt exist ')
             // assume we have to create the group
             this.adapter.setObjectNotExists(id, {
                 type: 'device',
@@ -301,7 +299,7 @@ class Groups {
             });
         }
         else {
-            this.warn('group object exists');
+            this.debug('group object exists');
             this.adapter.extendObject(id, {common: {name, type: 'group', icon: icon}});
         }
     }

package/lib/localConfig.js

@@ -179,13 +179,13 @@ class localConfig extends EventEmitter {
     }
 
     getOverrideData(target, isGlobal) {
-        const base = (isGlobal ? this.localData.by_model : this.localData.by_Id);
-        if (base.hasOwnProperty(target)) return base.target;
+        const base = (isGlobal ? this.localData.by_model : this.localData.by_id);
+        if (base.hasOwnProperty(target)) return base[target];
         return {};
     }
 
     setOverrideData(target, isGlobal, data) {
-        const base = (isGlobal ? this.localData.by_model : this.localData.byId);
+        const base = (isGlobal ? this.localData.by_model : this.localData.by_id);
         if (typeof target != 'string') {
             this.error('illegal target for override data: '+JSON.stringify(target));
             return;
@@ -203,7 +203,7 @@ class localConfig extends EventEmitter {
     }
 
     getOverridesWithKey(key, isGlobal) {
-        const base = (isGlobal ? this.localData.by_model : this.localData.by_Id);
+        const base = (isGlobal ? this.localData.by_model : this.localData.by_id);
         const rv = [];
         for(const prop in base) {
             if (base[prop].hasOwnProperty(key)) {
@@ -213,8 +213,13 @@ class localConfig extends EventEmitter {
         return rv;
     }
 
+    getOverrideWithKey(target, key, isGlobal) {
+        const targetdata = this.getOverrideData(target, isGlobal);
+        if (targetdata && targetdata.hasOwnProperty(key)) return targetdata[key];
+        return undefined;
+    }
+
     async updateFromDeviceNames() {
-        this.warn('updateFromDeviceNames');
         const fn = this.adapter.expandFileName('dev_names').replace('.', '_').concat('.json');
         fs.readFile(fn, (err, content) => {
             if (!err) {
@@ -280,7 +285,7 @@ class localConfig extends EventEmitter {
             const files= fs.readdirSync(_path, {withFileTypes: true, recursive: true}).filter(item => (!item.isDirectory() && item.name.endsWith('.png')));
             files.forEach((item) => {
                 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')})
+                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));
         }

package/lib/ota.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const getZbId = require('./utils').getZbId;
+const zhc_ota = require('zigbee-herdsman-converters').ota;
 
 class Ota {
     constructor(adapter) {
@@ -24,7 +25,7 @@ class Ota {
     }
 
     warn(msg) {
-        this.adapter.log.info(msg);
+        this.adapter.log.warn(msg);
     }
 
     error(msg) {
@@ -54,7 +55,7 @@ class Ota {
     async checkOtaAvail(obj) {
         const device = await this.getDeviceForMessage(obj);
         if (!device) {
-            this.debug(`Device ${obj.message.devId} is unavailable`);
+            this.info(`Device ${obj.message.devId} is unavailable`);
             this.adapter.sendTo(obj.from, obj.command, {
                 status: 'fail',
                 device: getZbId(obj.message.devId),
@@ -63,13 +64,13 @@ class Ota {
             return;
         }
         if (this.inProgress.has(device.device.ieeeAddr)) {
-            this.warn(`Update or check already in progress for '${device.name}', skipping...`);
+            this.info(`Update or check already in progress for '${device.name}', skipping...`);
             return;
         }
         // do not attempt update for a device which has been deactivated or is unavailable
         const stateObj = await this.adapter.getObjectAsync(obj.message.devId);
         if (stateObj && stateObj.common && stateObj.common.deactivated) {
-            this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
+            this.info(`Device ${obj.message.devId} is deactivated, skipping...`);
             this.adapter.sendTo(obj.from, obj.command, {
                 status: 'fail',
                 device: getZbId(obj.message.devId),
@@ -80,7 +81,7 @@ class Ota {
         const availablestate = await this.adapter.getStateAsync(`${obj.message.devId.replace(this.namespace + '.', '')}.available`);
         const lqi = await this.adapter.getStateAsync(`${obj.message.devId.replace(this.namespace + '.', '')}.link_quality`);
         if ((availablestate && (!availablestate.val)) || (lqi && lqi.val < 1)) {
-            this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
+            this.info(`Device ${obj.message.devId} is marked unavailable, skipping...`);
             this.adapter.sendTo(obj.from, obj.command, {
                 status: 'fail',
                 device: getZbId(obj.message.devId),
@@ -94,10 +95,10 @@ class Ota {
             this.debug(`Checking if firmware update is available for ${device.name}`);
 
             if (device && device.mapped.ota) {
-                const available = await device.mapped.ota.isUpdateAvailable(device.device, null);
+                const available = await zhc_ota.isUpdateAvailable(device.device, device.mapped.ota, undefined, false);
                 result.status = available.available ? 'available' : 'not_available';
                 if (available.currentFileVersion !== available.otaFileVersion) {
-                    this.warn(`current Firmware for ${device.name} is ${available.currentFileVersion} new is ${available.otaFileVersion}`);
+                    this.debug(`current Firmware for ${device.name} is ${available.currentFileVersion} new is ${available.otaFileVersion}`);
                 }
             } else {
                 result.status = 'not_supported';
@@ -132,13 +133,13 @@ class Ota {
         // do not attempt update for a device which has been deactivated or is unavailable
         const stateObj = await this.adapter.getObjectAsync(obj.message.devId);
         if (stateObj && stateObj.common && stateObj.common.deactivated) {
-            this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
+            this.info(`Device ${obj.message.devId} is deactivated, skipping...`);
             return;
         }
         const availablestate = await this.adapter.getStateAsync(`${obj.message.devId.replace(this.namespace + '.', '')}.available`);
         const lqi = await this.adapter.getStateAsync(`${obj.message.devId.replace(this.namespace + '.', '')}.link_quality`);
         if ((availablestate && (!availablestate.val)) || (lqi && lqi.val < 1)) {
-            this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
+            this.info(`Device ${obj.message.devId} is marked unavailable, skipping...`);
             return;
         }
         this.inProgress.add(device.device.ieeeAddr);
@@ -155,7 +156,7 @@ class Ota {
             };
 
             const from_ = await this.readSoftwareBuildIDAndDateCode(device.device, false);
-            const fileVersion = await device.mapped.ota.updateToLatest(device.device, onProgress);
+            const fileVersion = await zhc_ota.update(device.device, device.mapped.ota, false, onProgress)
             const to = await this.readSoftwareBuildIDAndDateCode(device.device, true);
             const [fromS, toS] = [JSON.stringify(from_), JSON.stringify(to)];
             result.status = 'success';