iobroker.zigbee 1.6.6 → 1.6.15

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;
         }
@@ -771,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);
@@ -837,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.6",
+  "version": "1.6.15",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -18,24 +18,27 @@
     "node": ">=10"
   },
   "dependencies": {
-    "zigbee-herdsman": "0.13.169",
-    "zigbee-herdsman-converters": "14.0.316",
+    "zigbee-herdsman": "0.14.14",
+    "zigbee-herdsman-converters": "14.0.421",
     "@iobroker/adapter-core": "^2.4.0",
     "tar": "^6.0.5",
     "typescript": "^4.0.5"
   },
   "description": "Zigbee devices",
   "devDependencies": {
-    "@alcalzone/release-script": "^2.2.0",
-    "@iobroker/testing": "^2.5.1",
+    "@alcalzone/release-script": "~3.4.2",
+    "@iobroker/testing": "^2.5.4",
     "axios": "^0.21.1",
     "mixin-deep": "^1.3.2",
-    "chai": "^4.2.0",
     "eslint": "^7.18.0",
     "eslint-config-google": "*",
-    "gulp": "^4.0.0",
     "lint-diff": "*",
-    "mocha": "^6.0.2"
+    "chai": "^4.3.4",
+    "chai-as-promised": "^7.1.1",
+    "gulp": "^4.0.2",
+    "gulp-jsdoc3": "^3.0.0",
+    "gulp-replace": "^1.1.3",
+    "mocha": "^9.1.3"
   },
   "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
   "keywords": [

package/.devcontainer/devcontainer.json

@@ -1,36 +0,0 @@
-// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.101.1/containers/docker-existing-docker-compose
-// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
-{
-    "name": "ioBroker Docker Compose",
-
-    // Update the 'dockerComposeFile' list if you have more compose files or use different names.
-    // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
-    "dockerComposeFile": ["docker-compose.yml"],
-
-    // The 'service' property is the name of the service for the container that VS Code should
-    // use. Update this value and .devcontainer/docker-compose.yml to the real service name.
-    "service": "iobroker",
-
-    // The optional 'workspaceFolder' property is the path VS Code should open by default when
-    // connected. This is typically a file mount in .devcontainer/docker-compose.yml
-    "workspaceFolder": "/workspace",
-
-    // Set *default* container specific settings.json values on container create.
-    "settings": {},
-
-    // Add the IDs of extensions you want installed when the container is created.
-    "extensions": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"],
-
-    // Uncomment the next line if you want start specific services in your Docker Compose config.
-    // "runServices": [],
-
-    // Uncomment the next line if you want to keep your containers running after VS Code shuts down.
-    // "shutdownAction": "none",
-
-    // When creating the container, delete unnecessary adapters, disable error reporting, set the license as confirmed, and install/update this adapter
-    "postCreateCommand": "iob del discovery && iob plugin disable sentry && iob object set system.config common.licenseConfirmed=true && NPM_PACK=$(npm pack) && iob url \"$(pwd)/$NPM_PACK\" --debug && rm \"$NPM_PACK\""
-
-    // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
-    //"remoteUser": "iobroker"
-}

package/.devcontainer/docker-compose.yml

@@ -1,51 +0,0 @@
-version: '3'
-
-services:
-    iobroker:
-        build: ./iobroker
-        container_name: iobroker-zigbee-d
-        hostname: iobroker-zigbee-d
-        # This port is only internal, so we can work on this while another instance of ioBroker is running on the host
-        expose:
-            - 8081
-        volumes:
-            - ..:/workspace
-            - iobrokerdata-zigbee-d:/opt/iobroker
-        environment:
-            - LANG=en_US.UTF-8
-            - LANGUAGE=en_US:en
-            - LC_ALL=en_US.UTF-8
-            - TZ=Europe/Berlin
-            - SETGID=1000
-
-    parcel:
-        container_name: parcel-i2c
-        build: ./parcel
-        expose:
-            - 1234
-        ports:
-            - '1235:1235'
-        volumes:
-            - ..:/workspace
-        environment:
-            - CHOKIDAR_USEPOLLING=1
-
-    # Reverse proxy to load up-to-date admin sources from the repo
-    nginx:
-        image: nginx:latest
-        depends_on:
-            - iobroker
-            - parcel
-        links:
-            - iobroker
-            - parcel
-        container_name: nginx-dvlp
-        volumes:
-            - ./nginx/nginx.conf:/etc/nginx/nginx.conf
-            - ..:/workspace
-        ports:
-            # Make the ioBroker admin available under http://localhost:8082
-            - 8082:80
-
-volumes:
-    iobrokerdata-zigbee-d:

package/.devcontainer/iobroker/Dockerfile

@@ -1,2 +0,0 @@
-FROM buanet/iobroker:latest
-RUN ln -s /opt/iobroker/node_modules/ /root/.node_modules

package/.devcontainer/nginx/nginx.conf

@@ -1,33 +0,0 @@
-
-worker_processes 1;
-events { worker_connections 1024; }
-
-http {
-  sendfile           on;
-  keepalive_timeout  65;
-
-  server {
-    listen 80;
-
-    location / {
-      proxy_redirect off;
-      proxy_pass     http://iobroker:8081;
-    }
-
-    location /socket.io/ {
-      proxy_pass         http://iobroker:8081;
-      proxy_http_version 1.1;
-      proxy_set_header   Upgrade $http_upgrade;
-      proxy_set_header   Connection "Upgrade";
-    }
-
-    location /adapter/i2c/ {
-      alias /workspace/admin/;
-    }
-
-    location /adapter/i2c/build/ {
-      proxy_redirect off;
-      proxy_pass     http://parcel:1234/;
-    }
-  }
-}

package/.devcontainer/parcel/Dockerfile

@@ -1,9 +0,0 @@
-FROM node:12
-
-RUN mkdir -p /usr/app
-
-COPY *.sh /usr/app/
-
-RUN chmod +x /usr/app/*.sh
-
-CMD /bin/bash -c "/usr/app/run.sh"

package/.devcontainer/parcel/run.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-cd /workspace
-
-echo "Installing all dependencies..."
-npm install
-
-npm run watch:parcel