iobroker.zigbee 1.6.14 → 1.6.15

package/README.md

@@ -130,6 +130,11 @@ You can thank the authors by these links:
 -->
 
 ## Changelog
+
+### 1.6.15 (2022-02-08)
+* (arteck) Battery status % calculation was changed for xiaomi devices
+* 
+
 ### 1.6.14 (2022-01)
 * (asgothian) OTA limitation
   - devices with the available state set to false are excluded from OTA updates (and the update check)

package/io-package.json

@@ -1,8 +1,13 @@
 {
     "common": {
         "name": "zigbee",
-        "version": "1.6.14",
+        "version": "1.6.15",
         "news": {
+             "1.6.15": {
+                "de": "Batterie Status wurde geändert",
+                "en": "Battery status was changed",
+                "ru": "Состояние батареи было изменено"
+            },
             "1.6.14": {
                 "de": "Gruppen wurden überarbeitet 2",
                 "en": "Groups were newly revised 2",
@@ -225,7 +230,15 @@
             "sentry": {
                 "dsn": "https://c829e2ad996d45d1bdb2247805699883@o831057.ingest.sentry.io/5812498"
             }
-        }
+        },
+        "dependencies": [
+          {
+            "admin": ">=3.0.0"
+          },
+          {
+            "js-controller": ">=1.4.2"
+          }
+        ]
     },
     "native": {
         "port": "",

package/lib/devices.js

@@ -984,7 +984,7 @@ const devices = [
         syncStates: [sync.brightness],
     },
     {
-        models: ['AC0251100NJ/AC0251700NJ'],
+        models: ['AC0251100NJ/AC0251600NJ/AC0251700NJ'],
         icon: 'img/lightify-switch.png',
         states: [states.switch_state, states.switch_circle, states.switch_hold, states.switch_release, states.battery],
     },

package/lib/exposes.js

@@ -772,16 +772,20 @@ function applyExposes(mappedDevices, byModel, allExcludesObj) {
         const strippedModel = (deviceDef.model) ? deviceDef.model.replace(/\0.*$/g, '').trim() : '';
         // check if device is mapped
         const existsMap = byModel.get(strippedModel);
-
+        
         if ((deviceDef.hasOwnProperty('exposes') && (!existsMap || !existsMap.hasOwnProperty('states'))) || allExcludesStr.indexOf(strippedModel) > 0) {
-            const newDevice = createFromExposes(strippedModel, deviceDef);
-            if (!existsMap) {
-                mappedDevices.push(newDevice);
-                byModel.set(strippedModel, newDevice);
-            } else {
-                existsMap.states = newDevice.states;
-                existsMap.exposed = true;
-            }
+            try {
+                const newDevice = createFromExposes(strippedModel, deviceDef);
+                if (!existsMap) {
+                    mappedDevices.push(newDevice);
+                    byModel.set(strippedModel, newDevice);
+                } else {
+                    existsMap.states = newDevice.states;
+                    existsMap.exposed = true;
+                }
+            } catch (e) {
+                console.log(`Wrong expose devicedefinition ${deviceDef.vendor} ${deviceDef.model}` );
+            }                
         }
     }
 }

package/lib/statescontroller.js

@@ -18,10 +18,18 @@ class StatesController extends EventEmitter {
         this.debugDevices = undefined;
         let fn = adapter.expandFileName('dev_names.json');
         this.dev_names_fn = fn.replace('.', '_');
+        this.retTimeoutHandle = null;
         fs.readFile(this.dev_names_fn, (err, data) => {
-          if (!err) {
-            savedDeviceNames = JSON.parse(data);
-          }
+            if (!err) {
+                try 
+                {
+                    savedDeviceNames = JSON.parse(data);
+                } 
+                catch 
+                {
+                    savedDeviceNames = {};
+                };
+            }
         });
     }
 
@@ -47,12 +55,14 @@ class StatesController extends EventEmitter {
 
     retainDeviceNames()
     {
-      fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNames, null, 2), (err) => {
-          if (err)
-              this.error('error saving device names: ' + JSON.Stringify(err));
-          else
-              this.debug('saved device names');
-      });
+        clearTimeout(this.retTimeoutHandle);
+        this.retTimeoutHanlde = setTimeout(()=> {
+            fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNames, null, 2), (err) => {
+                if (err)
+                    this.error('error saving device names: ' + JSON.Stringify(err));
+                else
+                    this.debug('saved device names');
+        });},5000);
     }
 
     getDebugDevices() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -18,24 +18,27 @@
     "node": ">=10"
   },
   "dependencies": {
-    "zigbee-herdsman": "0.14.6",
-    "zigbee-herdsman-converters": "14.0.397",
+    "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