iobroker.zigbee 1.6.8 → 1.6.16

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,74 +1,77 @@
-{
-  "name": "iobroker.zigbee",
-  "version": "1.6.8",
-  "author": {
-    "name": "Kirov Ilya",
-    "email": "kirovilya@gmail.com"
-  },
-  "bugs": {
-    "url": "https://github.com/ioBroker/ioBroker.zigbee/issues"
-  },
-  "contributors": [
-    {
-      "name": "Kirov Ilya",
-      "email": "kirovilya@gmail.com"
-    }
-  ],
-  "engines": {
-    "node": ">=10"
-  },
-  "dependencies": {
-    "zigbee-herdsman": "0.13.178",
-    "zigbee-herdsman-converters": "14.0.339",
-    "@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",
-    "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"
-  },
-  "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
-  "keywords": [
-    "ioBroker",
-    "zigbee",
-    "cc2531",
-    "cc2530",
-    "cc2538",
-    "cc2652",
-    "deconz",
-    "conbee",
-    "raspbee",
-    "ezsp",
-    "efr32"
-  ],
-  "license": "MIT",
-  "main": "main.js",
-  "optionalDependencies": {},
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ioBroker/ioBroker.zigbee.git"
-  },
-  "scripts": {
-    "test": "npm run test:package && npm run test:unit",
-    "docgen": "node support/docgen.js",
-    "test:package": "mocha test/package --exit",
-    "test:unit": "mocha test/unit --exit",
-    "test:integration": "mocha test/integration --exit",
-    "watch:parcel": "parcel admin/src/index.tsx -d admin/build --hmr-port 1235",
-    "test:js": "mocha --opts test/mocha.custom.opts",
-    "lint": "npm run lint:js",
-    "lint:js": "eslint",
-    "release": "release-script"
-  }
-}
+{
+  "name": "iobroker.zigbee",
+  "version": "1.6.16",
+  "author": {
+    "name": "Kirov Ilya",
+    "email": "kirovilya@gmail.com"
+  },
+  "bugs": {
+    "url": "https://github.com/ioBroker/ioBroker.zigbee/issues"
+  },
+  "contributors": [
+    {
+      "name": "Kirov Ilya",
+      "email": "kirovilya@gmail.com"
+    }
+  ],
+  "engines": {
+    "node": ">=10"
+  },
+  "dependencies": {
+    "zigbee-herdsman": "0.14.16",
+    "zigbee-herdsman-converters": "14.0.422",
+    "@iobroker/adapter-core": "^2.4.0",
+    "tar": "^6.0.5",
+    "typescript": "^4.0.5"
+  },
+  "description": "Zigbee devices",
+  "devDependencies": {
+    "@alcalzone/release-script": "~3.4.2",
+    "@iobroker/testing": "^2.5.4",
+    "axios": "^0.21.1",
+    "mixin-deep": "^1.3.2",
+    "eslint": "^7.18.0",
+    "eslint-config-google": "*",
+    "lint-diff": "*",
+    "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": [
+    "ioBroker",
+    "zigbee",
+    "cc2531",
+    "cc2530",
+    "cc2538",
+    "cc2652",
+    "deconz",
+    "conbee",
+    "raspbee",
+    "ezsp",
+    "efr32"
+  ],
+  "license": "MIT",
+  "main": "main.js",
+  "optionalDependencies": {},
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ioBroker/ioBroker.zigbee.git"
+  },
+  "scripts": {
+    "test": "npm run test:package && npm run test:unit",
+    "docgen": "node support/docgen.js",
+    "test:package": "mocha test/package --exit",
+    "test:unit": "mocha test/unit --exit",
+    "test:integration": "mocha test/integration --exit",
+    "watch:parcel": "parcel admin/src/index.tsx -d admin/build --hmr-port 1235",
+    "test:js": "mocha --opts test/mocha.custom.opts",
+    "lint": "npm run lint:js",
+    "lint:js": "eslint",
+    "release": "release-script"
+  }
+}

package/support/docgen.js

@@ -1,93 +1,93 @@
-/**
- * This script generates the supported devices page.
- * 
- */
-
-let devices = [...require('zigbee-herdsman-converters').devices];
-
-for (const device of devices) {
-    if (device.whiteLabel) {
-        for (const whiteLabel of device.whiteLabel) {
-            const whiteLabelDevice = {
-                ...device,
-                model: whiteLabel.model,
-                vendor: whiteLabel.vendor,
-                description: whiteLabel.description,
-                whiteLabelOf: device,
-            };
-
-            delete whiteLabelDevice.whiteLabel;
-
-            devices.push(whiteLabelDevice);
-        }
-    }
-}
-
-devices = new Map(devices.map((d) => [d.model, d]));
-
-const Devices = require('../lib/devices');
-let iobDevices = Devices.devices;
-Devices.fillStatesWithExposes('');
-
-const iobCount = iobDevices.filter((d) => (!d.exposed)).length;
-iobDevices = new Map(iobDevices.map((d) => d.models.map((m) => [m, d])).flat());
-
-const fs = require('fs');
-const outputdir = process.argv[2];
-
-if (!outputdir) {
-    console.error('Please specify an output directory');
-}
-
-const file = 'Supported-devices.md';
-let text = `*NOTE: Automatically generated by 'npm run docgen'* \n\n` +
-    `Currently **${iobDevices.size}**(${iobCount} described in adapter) devices are supported.\n\n` +
-    `(⭐EXP) - means that the device is presented automatically, based on the 'exposes' from the zigbee-herdsman-converters.\n\n`;
-
-const logDevices = (devmodels) => {
-    let result = '';
-
-    devmodels.forEach((devmodel) => {
-        const iobDevice = iobDevices.get(devmodel);
-        const device = devices.get(devmodel);
-        const pathImg = (iobDevice.icon.startsWith('http')) ? devmodel : iobDevice.icon.replace(new RegExp('img/', 'g'), '').replace(new RegExp('.png', 'g'), '');
-        const icon = (iobDevice.icon.startsWith('http')) ? iobDevice.icon : `https://github.com/ioBroker/ioBroker.zigbee/raw/master/admin/${iobDevice.icon}`;
-        let brand;
-        const models = [];
-        let zmodels;
-        if (device.zigbeeModel) {
-            zmodels = device.zigbeeModel;
-        } else {
-            zmodels = [devmodel];
-        }
-        zmodels.forEach((modelId) => {
-            const re = /[^\x20-\x7E]+/g;
-            const model = modelId.replace(re, ' ');
-            const desc = `${device.description} (${device.supports})`;
-            const name = `**${device.model}${(iobDevice.exposed) ? ' (⭐EXP)': ''}**<br>`;
-            if (brand == undefined) {
-                brand= {
-                    name: name,
-                    desc: desc,
-                    pathImg: pathImg,
-                };
-            }
-            models.push(model);
-        });
-        const modelsStr = models.join(', ');
-        result += `| ${brand.name} (${modelsStr}) | ${brand.desc} |  ![${brand.pathImg}](${icon}) |\n`;
-    });
-
-    return result;
-};
-
-const vendors = Array.from(new Set([...iobDevices.keys()].map((m) => (devices.get(m)) ? devices.get(m).vendor : null)));
-vendors.sort();
-text += '|  Model | Description | Picture |\n';
-text += '| ------------- | ------------- | -------------------------- |\n';
-vendors.forEach((vendor) => {
-    text += `|  | **${vendor}**  |   |\n`;   
-    text += logDevices([...iobDevices.keys()].map((m) => devices.get(m)).filter((d) => d && d.vendor === vendor).map((d) => d.model));
-});
-
-fs.writeFileSync(outputdir + '/' + file, text);
+/**
+ * This script generates the supported devices page.
+ * 
+ */
+
+let devices = [...require('zigbee-herdsman-converters').devices];
+
+for (const device of devices) {
+    if (device.whiteLabel) {
+        for (const whiteLabel of device.whiteLabel) {
+            const whiteLabelDevice = {
+                ...device,
+                model: whiteLabel.model,
+                vendor: whiteLabel.vendor,
+                description: whiteLabel.description,
+                whiteLabelOf: device,
+            };
+
+            delete whiteLabelDevice.whiteLabel;
+
+            devices.push(whiteLabelDevice);
+        }
+    }
+}
+
+devices = new Map(devices.map((d) => [d.model, d]));
+
+const Devices = require('../lib/devices');
+let iobDevices = Devices.devices;
+Devices.fillStatesWithExposes('');
+
+const iobCount = iobDevices.filter((d) => (!d.exposed)).length;
+iobDevices = new Map(iobDevices.map((d) => d.models.map((m) => [m, d])).flat());
+
+const fs = require('fs');
+const outputdir = process.argv[2];
+
+if (!outputdir) {
+    console.error('Please specify an output directory');
+}
+
+const file = 'Supported-devices.md';
+let text = `*NOTE: Automatically generated by 'npm run docgen'* \n\n` +
+    `Currently **${iobDevices.size}**(${iobCount} described in adapter) devices are supported.\n\n` +
+    `(⭐EXP) - means that the device is presented automatically, based on the 'exposes' from the zigbee-herdsman-converters.\n\n`;
+
+const logDevices = (devmodels) => {
+    let result = '';
+
+    devmodels.forEach((devmodel) => {
+        const iobDevice = iobDevices.get(devmodel);
+        const device = devices.get(devmodel);
+        const pathImg = (iobDevice.icon.startsWith('http')) ? devmodel : iobDevice.icon.replace(new RegExp('img/', 'g'), '').replace(new RegExp('.png', 'g'), '');
+        const icon = (iobDevice.icon.startsWith('http')) ? iobDevice.icon : `https://github.com/ioBroker/ioBroker.zigbee/raw/master/admin/${iobDevice.icon}`;
+        let brand;
+        const models = [];
+        let zmodels;
+        if (device.zigbeeModel) {
+            zmodels = device.zigbeeModel;
+        } else {
+            zmodels = [devmodel];
+        }
+        zmodels.forEach((modelId) => {
+            const re = /[^\x20-\x7E]+/g;
+            const model = modelId.replace(re, ' ');
+            const desc = `${device.description} (${device.supports})`;
+            const name = `**${device.model}${(iobDevice.exposed) ? ' (⭐EXP)': ''}**<br>`;
+            if (brand == undefined) {
+                brand= {
+                    name: name,
+                    desc: desc,
+                    pathImg: pathImg,
+                };
+            }
+            models.push(model);
+        });
+        const modelsStr = models.join(', ');
+        result += `| ${brand.name} (${modelsStr}) | ${brand.desc} |  ![${brand.pathImg}](${icon}) |\n`;
+    });
+
+    return result;
+};
+
+const vendors = Array.from(new Set([...iobDevices.keys()].map((m) => (devices.get(m)) ? devices.get(m).vendor : null)));
+vendors.sort();
+text += '|  Model | Description | Picture |\n';
+text += '| ------------- | ------------- | -------------------------- |\n';
+vendors.forEach((vendor) => {
+    text += `|  | **${vendor}**  |   |\n`;   
+    text += logDevices([...iobDevices.keys()].map((m) => devices.get(m)).filter((d) => d && d.vendor === vendor).map((d) => d.model));
+});
+
+fs.writeFileSync(outputdir + '/' + file, text);

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