iobroker.zigbee 1.6.3 → 1.6.14

package/lib/zigbeecontroller.js

@@ -105,11 +105,11 @@ class ZigbeeController extends EventEmitter {
             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];
@@ -117,8 +117,8 @@ class ZigbeeController extends EventEmitter {
                 i--;
             }
 
-            this.debug(`Zigbee network parameters: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${extPanIDDebug}`);                          
-                                   
+            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));
@@ -148,6 +148,9 @@ class ZigbeeController extends EventEmitter {
                 case '19':
                     powerText = 'high';
                     break;
+                case '20':
+                    powerText = 'high+';
+                    break;
                 default:
                     powerText = 'normal';
             }
@@ -175,8 +178,16 @@ class ZigbeeController extends EventEmitter {
         }
         for (const device of devices) {
             const entity = await this.resolveEntity(device);
+            this.adapter.getObject(device.ieeeAddr.substr(2),(err, obj) => {
+                if (obj && obj.common && obj.common.deactivated)
+                {
+                    this.callExtensionMethod('deregisterDevicePing', [device, entity]);
+                }
+                else {
+                    this.callExtensionMethod('registerDevicePing', [device, entity]);
+                }
+            });
             // ensure that objects for all found clients are present
-            this.callExtensionMethod('registerDevicePing', [device, entity]);
 
             if (entity.mapped) this.emit('new', entity);
             this.info(
@@ -217,13 +228,14 @@ class ZigbeeController extends EventEmitter {
     }
 
     callExtensionMethod(method, parameters) {
+        const result = [];
         for (const extension of this.extensions) {
             if (extension[method]) {
                 try {
                     if (parameters !== undefined) {
-                        extension[method](...parameters);
+                        result.push(extension[method](...parameters));
                     } else {
-                        extension[method]();
+                        result.push(extension[method]());
                     }
                 } catch (error) {
                     this.sendError(error);
@@ -231,6 +243,7 @@ class ZigbeeController extends EventEmitter {
                 }
             }
         }
+        return Promise.all(result);
     }
 
     async getClients(all) {
@@ -248,9 +261,11 @@ class ZigbeeController extends EventEmitter {
 
     async getGroups() {
         try {
-            return this.herdsman.getGroups();
+            const rv = await this.herdsman.getGroups();
+            return rv;
         } catch (error) {
             this.sendError(error);
+            this.error(JSON.stringify(error));
             return undefined;
         }
     }
@@ -274,17 +289,32 @@ class ZigbeeController extends EventEmitter {
         }
     }
 
+    async verifyGroupExists(id) {
+      const nid = (typeof(id) === 'number' ? id:parseInt(id));
+        let group = await this.herdsman.getGroupByID(nid);
+        if (!group) {
+            group = await this.herdsman.createGroup(nid);
+            group.toZigbee = groupConverters;
+            group.model = 'group';
+            this.debug('verifyGroupExists: created group ' + nid);
+        }
+        else {
+            this.debug('verifyGroupExists: group ' + nid + ' exists');
+        }
+
+    }
+
     async getGroupMembersFromController(id) {
         const members = [];
         try {
             const group = await this.getGroupByID(id);
             if (group) {
                 const groupmembers = group.members;
-
                 for (const member of groupmembers) {
+                    const epid = (member.ID ? member.ID:-1);
                     const nwk = member.deviceNetworkAddress;
                     const device = this.getDeviceByNetworkAddress(nwk);
-                    if (device && device.ieeeAddr) members.push( { device:device.ieeeAddr, model:device.modelID } );
+                    if (device && device.ieeeAddr) members.push( { ieee:device.ieeeAddr, model:device.modelID, epid:epid, ep:member } );
                 }
             }
             else {
@@ -525,6 +555,13 @@ class ZigbeeController extends EventEmitter {
         const entity = await this.resolveEntity(message.device || message.ieeeAddr);
         const friendlyName = entity.name;
         this.warn(`Device '${friendlyName}' announced itself`);
+
+        if (entity && entity.mapped) {
+            this.callExtensionMethod(
+                'onZigbeeEvent',
+                [ {'device': message.device, 'type': 'deviceAnnounce'}, (entity ? entity.mapped : null)]);
+        }
+
         this.emit('pairing', `Device '${friendlyName}' announced itself`);
         if (!this.herdsman.getPermitJoin()) this.callExtensionMethod('registerDevicePing', [message.device, entity]);
         // if has modelID so can create device
@@ -534,6 +571,7 @@ class ZigbeeController extends EventEmitter {
         }
     }
 
+
     async handleDeviceJoined(message) {
         this.debug('handleDeviceJoined', message);
         //const entity = await this.resolveEntity(message.device || message.ieeeAddr);
@@ -686,7 +724,7 @@ class ZigbeeController extends EventEmitter {
         }
     }
 
-    async publish(deviceID, cid, cmd, zclData, cfg, ep, type, callback) {
+    async publish(deviceID, cid, cmd, zclData, cfg, ep, type, callback, zclSeqNum) {
         const entity = await this.resolveEntity(deviceID, ep);
         const device = entity.device;
         const endpoint = entity.endpoint;
@@ -727,20 +765,57 @@ class ZigbeeController extends EventEmitter {
                 result = await endpoint[cmd](cid, zclData, cfg);
             }
             if (callback) callback(undefined, result);
-        } else {
+        }
+        else if(type === 'functionalResp'){
+              cfg.disableDefaultResponse = false;
+              const result = await endpoint.commandResponse(cid, cmd, zclData, cfg, zclSeqNum);
+              if (callback) callback(undefined, result);
+        }
+        else {
             cfg.disableDefaultResponse = false;
             const result = await endpoint.command(cid, cmd, zclData, cfg);
             if (callback) callback(undefined, result);
         }
     }
 
-    async addDevToGroup(devId, groupId) {
+    async addDevToGroup(devId, groupId, epid) {
         try {
             const entity = await this.resolveEntity(devId);
             const group = await this.resolveEntity(groupId);
-            this.debug(`entity: ${safeJsonStringify(entity)}`);
-            this.debug(`group: ${safeJsonStringify(group)}`);
-            await entity.endpoint.addToGroup(group.mapped);
+            this.debug(`addDevFromGroup - entity: ${safeJsonStringify(entity)}`);
+            this.debug(`addDevFromGroup - group: ${safeJsonStringify(group)}`);
+            if (epid != undefined) {
+              for (const ep of entity.endpoints) {
+                if (ep.ID == epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)))
+                {
+                  this.debug(`adding endpoint ${ep.ID} (${epid}) to group ${groupId}`)
+                  await(ep.addToGroup(group.mapped));
+                }
+              }
+
+            }
+            else
+            {
+                if (entity.endpoint.inputClusters.includes(4))
+                {
+                    this.debug(`adding endpoint ${entity.endpoint.ID} to group`)
+                    await entity.endpoint.addToGroup(group.mapped);
+                }
+                else {
+                    let added = false;
+                    for (const ep of entity.endpoints)
+                    {
+                        if (ep.inputClusters.includes(4))
+                        {
+                            this.debug(`adding endpoint ${ep.ID} to group`)
+                            await ep.addToGroup(group.mapped);
+                            added = true;
+                            break;
+                        }
+                    }
+                    if (!added) throw ('cluster genGroups not supported');
+                }
+            }
         } catch (error) {
             this.sendError(error);
             this.error(`Exception when trying to Add ${devId}  to group ${groupId}`, error);
@@ -749,11 +824,38 @@ class ZigbeeController extends EventEmitter {
         return {};
     }
 
+    async removeDevFromGroup(devId, groupId, epid) {
+      try {
+          const entity = await this.resolveEntity(devId);
+          const group = await this.resolveEntity(groupId);
+          this.debug(`removeDevFromGroup - entity: ${safeJsonStringify(entity)}`);
+          this.debug(`removeDevFromGroup - group: ${safeJsonStringify(group)}`);
+          if (epid != undefined) {
+            for (const ep of entity.endpoints) {
+              if (ep.ID == epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)))
+              {
+                this.debug(`removing endpoint ${ep.ID} (${epid}) group ${groupId}`)
+                await(ep.removeFromGroup(group.mapped))
+              }
+            }
+          } else await entity.endpoint.removeFromGroup(group.mapped);
+      } catch (error) {
+          this.sendError(error);
+          this.error(`Exception when trying remove ${devId} (ep ${epid?epid:entity.endpoint.ID}) from group ${devId}`, error);
+          return { error: `Failed to remove dev ${devId} (ep ${epid?epid:entity.endpoint.ID}) from group ${devId}`};
+      }
+      return {};
+    }
+
     async removeDevFromAllGroups(devId) {
         try {
             const entity = await this.resolveEntity(devId);
             this.debug(`entity: ${safeJsonStringify(entity)}`);
-            await entity.endpoint.removeFromAllGroups();
+            for (const ep of entity.endpoints) {
+              if (ep.inputClusters.includes(4) || ep.outputClusters.includes(4))
+                await ep.removefromAllGroups();
+            }
+            //await entity.endpoint.removeFromAllGroups();
         } catch (error) {
             this.sendError(error);
             this.error(`Exception when trying remove ${devId} from all groups`, error);

package/main.js

@@ -159,7 +159,7 @@ class Zigbee extends utils.Adapter {
                 this.log.error(`${message}: Code ${error.code} (${ecode.message})`);
                 this.sendError(error, `${message}: Code ${error.code} (${ecode.message})`);
                 break;
-            default: 
+            default:
                 this.log.error(`${message}: Code ${error.code} (malformed error)`);
                 this.sendError(error, `${message}: Code ${error.code} (malformed error)`);
         }
@@ -431,7 +431,7 @@ class Zigbee extends utils.Adapter {
         delete msgForState['endpoint'];
         msgForState['endpoint_id'] = message.endpoint.ID;
         this.publishToState(devId, model, {msg_from_zigbee: safeJsonStringify(msgForState)});
-        
+
         if (!entity.mapped) {
             return;
         }
@@ -497,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) => {
@@ -767,8 +771,8 @@ class Zigbee extends utils.Adapter {
     getZigbeeOptions() {
         // file path for db
         let dbDir = path.join(utils.getAbsoluteInstanceDataDir(this), '');
-        dbDir = dbDir.replace('.', '_');        
-        
+        dbDir = dbDir.replace('.', '_');
+
         if (this.systemConfig && !fs.existsSync(dbDir)) {
             try {
                 fs.mkdirSync(dbDir);
@@ -833,6 +837,10 @@ class Zigbee extends utils.Adapter {
         this.setState('info.pairingMessage', message, true);
     }
 
+    expandFileName(fn) {
+      return path.join(utils.getAbsoluteInstanceDataDir(this), fn);
+    }
+
     onLog(level, msg, data) {
         if (msg) {
             let logger = this.log.info;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.6.3",
+  "version": "1.6.14",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -18,8 +18,8 @@
     "node": ">=10"
   },
   "dependencies": {
-    "zigbee-herdsman": "0.13.149",
-    "zigbee-herdsman-converters": "14.0.256",
+    "zigbee-herdsman": "0.14.6",
+    "zigbee-herdsman-converters": "14.0.397",
     "@iobroker/adapter-core": "^2.4.0",
     "tar": "^6.0.5",
     "typescript": "^4.0.5"