iobroker.zigbee 1.7.5 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.7.5",
+  "version": "1.8.0",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -17,28 +17,33 @@
   "engines": {
     "node": ">=10"
   },
+  "optionalDependencies": {
+    "serialport": "^10.5.0"
+  },
   "dependencies": {
-    "zigbee-herdsman": "0.14.34",
-    "zigbee-herdsman-converters": "14.0.531",
-    "@iobroker/adapter-core": "^2.4.0",
-    "tar": "^6.0.5",
-    "typescript": "^4.0.5"
+    "zigbee-herdsman": "0.14.76",
+    "zigbee-herdsman-converters": "14.0.676",
+    "@iobroker/adapter-core": "^2.6.7",
+    "tar": "^6.1.12",
+    "typescript": "^4.9.3"
   },
   "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",
+    "@alcalzone/release-script": "^3.5.9",
+    "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
+    "@alcalzone/release-script-plugin-license": "^3.5.9",
+    "@iobroker/testing": "^4.1.0",
+    "axios": "^1.2.0",
+    "mixin-deep": "^2.0.1",
+    "eslint": "^8.28.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-replace": "^1.1.3",
-    "mocha": "^9.1.3"
+    "mocha": "^10.1.0"
   },
   "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
   "keywords": [
@@ -56,7 +61,15 @@
   ],
   "license": "MIT",
   "main": "main.js",
-  "optionalDependencies": {},
+  "files": [
+    "admin/",
+    "lib/",
+    "docs/",
+    "support/",
+    "io-package.json",
+    "LICENSE",
+    "main.js"
+  ],
   "readmeFilename": "README.md",
   "repository": {
     "type": "git",
@@ -70,8 +83,9 @@
     "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"
+    "release": "release-script",
+    "release-patch": "release-script patch --yes --no-update-lockfile",
+    "release-minor": "release-script minor --yes --no-update-lockfile",
+    "release-major": "release-script major --yes --no-update-lockfile"
   }
 }

package/.eslintignore

@@ -1,2 +0,0 @@
-node_modules/*
-test/*

package/.eslintrc.json

@@ -1,37 +0,0 @@
-{
-    "env": {
-        "es6": true,
-        "node": true,
-        "mocha": true
-    },
-    "extends": "eslint:recommended",
-    "rules": {
-        "indent": [
-            "error",
-            4,
-            {
-                "SwitchCase": 1
-            }
-        ],
-        "linebreak-style": 0,
-        "no-console": "off",
-        "no-var": "error",
-        "prefer-const": "error",
-        "quotes": [
-            "error",
-            "single",
-            {
-                "avoidEscape": true,
-                "allowTemplateLiterals": true
-            }
-        ],
-        "semi": [
-            "error",
-            "always"
-        ],
-        "no-prototype-builtins": "off"
-    },
-    "parserOptions": {
-        "ecmaVersion": 2019
-    }
-}

package/.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-custom: ['https://www.paypal.me/goofyk', 'https://paypal.me/ArthurRupp']

package/.github/stale.yml

@@ -1,13 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

package/.github/workflows/test-and-release.yml

@@ -1,151 +0,0 @@
-name: Test and Release
-
-# Run this job on all pushes and pull requests
-# as well as tags with a semantic version
-on:
-  push:
-    branches:
-      - "*"
-    tags:
-      # normal versions
-      - "v[0-9]+.[0-9]+.[0-9]+"
-      # pre-releases
-      - "v[0-9]+.[0-9]+.[0-9]+-**"
-  pull_request: {}
-
-jobs:
-  # Performs quick checks before the expensive test runs
-  check-and-lint:
-    if: contains(github.event.head_commit.message, '[skip ci]') == false
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install Dependencies
-        run: npm ci
-
-      - name: Lint source code
-        run: npm run lint
-      - name: Test package files
-        run: npm run test:package
-
-  # Runs adapter tests on all supported node versions and OSes
-  adapter-tests:
-    if: contains(github.event.head_commit.message, '[skip ci]') == false
-
-    needs: [check-and-lint]
-
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        node-version: [12.x, 14.x, 16.x]
-        os: [ubuntu-latest, macos-latest]
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install Dependencies
-        run: npm ci
-
-      - name: Run unit tests
-        run: npm run test:unit
-
-      - name: Run integration tests (unix only)
-        if: startsWith(runner.OS, 'windows') == false
-        run: DEBUG=testing:* npm run test:integration
-
-      - name: Run integration tests (windows only)
-        if: startsWith(runner.OS, 'windows')
-        run: set DEBUG=testing:* & npm run test:integration
-
-  # Deploys the final package to NPM
-  deploy:
-    needs: [adapter-tests]
-
-    # Trigger this step only when a commit on any branch is tagged with a version number
-    if: |
-      contains(github.event.head_commit.message, '[skip ci]') == false &&
-      github.event_name == 'push' &&
-      startsWith(github.ref, 'refs/tags/v')
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Extract the version and commit body from the tag
-        id: extract_release
-        # The body may be multiline, therefore newlines and % need to be escaped
-        run: |
-          VERSION="${{ github.ref }}"
-          VERSION=${VERSION##*/v}
-          echo "::set-output name=VERSION::$VERSION"
-          BODY=$(git show -s --format=%b)
-          BODY="${BODY//'%'/'%25'}"
-          BODY="${BODY//$'\n'/'%0A'}"
-          BODY="${BODY//$'\r'/'%0D'}"
-          echo "::set-output name=BODY::$BODY"
-
-#     If you like, activate automated version publish to NPM
-#     Only if commit contains a version, see : https://github.com/AlCalzone/release-script
-
-      - name: Publish package to npm
-        run: |
-          npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
-          npm whoami
-          npm publish
-
-#      - name: Create Github Release
-#        uses: actions/create-release@v1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.Github_Token}}
-#        with:
-#          tag_name: ${{ github.ref }}
-#          release_name: Release v${{ steps.extract_release.outputs.VERSION }}
-#          draft: false
-#          # Prerelease versions create prereleases on Github
-#          prerelease: ${{ contains(steps.extract_release.outputs.VERSION, '-') }}
-#          body: ${{ steps.extract_release.outputs.BODY }}
-#
-#      - name: Notify Sentry.io about the release
-#        run: |
-#          npm i -g @sentry/cli
-#          export SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-#          export SENTRY_URL=https://sentry.iobroker.net
-#          export SENTRY_ORG=iobroker
-#          export SENTRY_PROJECT=iobroker-zigbee
-#          export SENTRY_VERSION=iobroker.zigbee@${{ steps.extract_release.outputs.VERSION }}
-#          sentry-cli releases new $SENTRY_VERSION
-#          sentry-cli releases finalize $SENTRY_VERSION
-#        # Add the following line BEFORE finalize if repositories are connected in Sentry
-#        # sentry-cli releases set-commits $SENTRY_VERSION --auto
-#
-#        # Add the following line BEFORE finalize if sourcemap uploads are needed
-#        # sentry-cli releases files $SENTRY_VERSION upload-sourcemaps build/

package/.travis/wiki.sh

@@ -1,28 +0,0 @@
-#!/bin/sh -e
-
-setup_git() {
-  git config --global user.email "travis@travis-ci.org"
-  git config --global user.name "Travis CI"
-}
-
-update_wiki() {
-  rm -rf ioBroker.zigbee.wiki
-  git clone https://${GH_TOKEN}@github.com/ioBroker/ioBroker.zigbee.wiki.git
-  npm run docgen ioBroker.zigbee.wiki
-  cd ioBroker.zigbee.wiki
-  git add -A
-  git diff-index --quiet HEAD || git commit -m "Travis CI: update wiki"
-  git push origin
-  cd ..
-  rm -rf ioBroker.zigbee.wiki
-}
-
-# Only update wiki if on master branch and not pull request
-if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]
-then
-  echo "Updating wiki!"
-  setup_git
-  update_wiki
-else
-  echo "Not updating wiki, triggered by pull request or not on master branch"
-fi

package/admin/adapter-settings.js

@@ -1,244 +0,0 @@
-/*global $, location, socket, document, window, io, alert, load, systemDictionary, systemLang, translateAll*/
-const path = location.pathname;
-const parts = path.split('/');
-parts.splice(-3);
-
-const socket = io.connect('/', { path: parts.join('/') + '/socket.io' });
-var query = (window.location.search || '').replace(/^\?/, '').replace(/#.*$/, '');
-var args = {};
-let theme = null;
-
-// parse parameters
-query.trim().split('&').filter(function (t) { return t.trim(); }).forEach(function (b, i) {
-    const parts = b.split('=');
-    if (!i && parts.length === 1 && !isNaN(parseInt(b, 10))) {
-        args.instance = parseInt(b, 10);
-    }
-    var name = parts[0];
-    args[name] = parts.length === 2 ? parts[1] : true;
-
-    if (name === 'instance') {
-        args.instance = parseInt(args.instance, 10) || 0;
-    }
-
-    if (args[name] === 'true') {
-        args[name] = true;
-    } else if (args[name] === 'false') {
-        args[name] = false;
-    }
-});
-
-var instance = args.instance;
-
-let common   = null; // common information of adapter
-const host     = null; // host object on which the adapter runs
-const changed  = false;
-let systemConfig;
-let certs    = [];
-let adapter  = '';
-const onChangeSupported = false;
-
-const tmp = window.location.pathname.split('/');
-adapter = tmp[tmp.length - 2];
-const _adapterInstance = 'system.adapter.' + adapter + '.' + instance;
-
-$(document).ready(function () {
-    'use strict';
-    loadSystemConfig(function () {
-        if (typeof translateAll === 'function') translateAll();
-        loadSettings(prepareTooltips);
-    });
-});
-
-
-// Read language settings
-function loadSystemConfig(callback) {
-    socket.emit('getObject', 'system.config', function (err, res) {
-        if (!err && res && res.common) {
-            systemLang   = res.common.language || systemLang;
-            systemConfig = res;
-        }
-        socket.emit('getObject', 'system.certificates', function (err, res) {
-            if (!err && res) {
-                if (res.native && res.native.certificates) {
-                    certs = [];
-                    for (const c in res.native.certificates) {
-                        if (res.native.certificates.hasOwnProperty(c) && !res.native.certificates[c]) continue;
-                        const _cert = {
-                            name: c,
-                            type: (res.native.certificates[c].substring(0, '-----BEGIN RSA PRIVATE KEY'.length) === '-----BEGIN RSA PRIVATE KEY' || res.native.certificates[c].substring(0, '-----BEGIN PRIVATE KEY'.length) === '-----BEGIN PRIVATE KEY') ? 'private' : 'public'
-                        };
-                        if (_cert.type === 'public') {
-                            const m = res.native.certificates[c].split('-----END CERTIFICATE-----');
-                            let count = 0;
-                            for (let _m = 0; _m < m.length; _m++) {
-                                if (m[_m].replace(/[\r\n|\r|\n]+/, '').trim()) count++;
-                            }
-                            if (count > 1) _cert.type = 'chained';
-                        }
-
-                        certs.push(_cert);
-                    }
-                }
-            }
-            if (callback) callback();
-        });
-    });
-}
-
-function loadSettings(callback) {
-    socket.emit('getObject', _adapterInstance, function (err, res) {
-        if (!err && res && res.native) {
-            $('.adapter-instance').html(adapter + '.' + instance);
-            $('.adapter-config').html('system.adapter.' + adapter + '.' + instance);
-            common = res.common;
-            if (res.common && res.common.name) $('.adapter-name').html(res.common.name);
-            if (typeof load === 'undefined') {
-                alert('Please implement save function in your admin/index.html');
-            } else {
-				// detect, that we are now in react container (themeNames = ['dark', 'blue', 'colored', 'light'])
-
-				const _query = query.split('&');
-
-				for (var q = 0; q < _query.length; q++) {
-					if (_query[q].indexOf('react=') !== -1) {
-						$('.adapter-container').addClass('react-' + _query[q].substring(6));
-						theme = 'react-' + _query[q].substring(6);
-					}
-                }
-
-                load(res.native, onChange);
-            }
-            if (typeof callback === 'function') {
-                callback();
-            }
-        } else {
-            if (typeof callback === 'function') {
-                callback();
-            }
-            alert('error loading settings for ' + _adapterInstance + '\n\n' + err);
-        }
-    });
-}
-
-function prepareTooltips() {
-    $('.admin-icon').each(function () {
-        let id = $(this).data('id');
-        if (!id) {
-            let $prev = $(this).prev();
-            let $input = $prev.find('input');
-            if (!$input.length) $input = $prev.find('select');
-            if (!$input.length) $input = $prev.find('textarea');
-
-            if (!$input.length) {
-                $prev = $prev.parent();
-                $input = $prev.find('input');
-                if (!$input.length) $input = $prev.find('select');
-                if (!$input.length) $input = $prev.find('textarea');
-            }
-            if ($input.length) id = $input.attr('id');
-        }
-
-        if (!id) return;
-
-        let tooltip = '';
-        if (systemDictionary['tooltip_' + id]) {
-            tooltip = systemDictionary['tooltip_' + id][systemLang] || systemDictionary['tooltip_' + id].en;
-        }
-
-        let icon = '';
-        let link = $(this).data('link');
-        if (link) {
-            if (link === true) {
-                if (common.readme) {
-                    link = common.readme + '#' + id;
-                } else {
-                    link = 'https://github.com/ioBroker/ioBroker.' + common.name + '#' + id;
-                }
-            }
-            if (!link.match('^https?:\/\/')) {
-                if (common.readme) {
-                    link = common.readme + '#' + link;
-                } else {
-                    link = 'https://github.com/ioBroker/ioBroker.' + common.name + '#' + link;
-                }
-            }
-            icon += '<a class="admin-tooltip-link" target="config_help" href="' + link + '" title="' + (tooltip || systemDictionary.htooltip[systemLang]) + '"><img class="admin-tooltip-icon" src="../../img/info.png" /></a>';
-        } else if (tooltip) {
-            icon += '<img class="admin-tooltip-icon" title="' + tooltip + '" src="../../img/info.png"/>';
-        }
-
-        if (icon) {
-            $(this).html(icon);
-        }
-    });
-    $('.admin-text').each(function () {
-        let id = $(this).data('id');
-        if (!id) {
-            let $prev = $(this).prev();
-            let $input = $prev.find('input');
-            if (!$input.length) $input = $prev.find('select');
-            if (!$input.length) $input = $prev.find('textarea');
-            if (!$input.length) {
-                $prev = $prev.parent();
-                $input = $prev.find('input');
-                if (!$input.length) $input = $prev.find('select');
-                if (!$input.length) $input = $prev.find('textarea');
-            }
-            if ($input.length) id = $input.attr('id');
-        }
-
-        if (!id) return;
-
-        // check if translation for this exist
-        if (systemDictionary['info_' + id]) {
-            $(this).html('<span class="admin-tooltip-text">' + (systemDictionary['info_' + id][systemLang] || systemDictionary['info_' + id].en) + '</span>');
-        }
-    });
-}
-
-
-function sendTo(_adapter_instance, command, message, callback) {
-    socket.emit('sendTo', (_adapter_instance || adapter + '.' + instance), command, message, callback);
-}
-
-function sendToHost(host, command, message, callback) {
-    socket.emit('sendToHost', host || common.host, command, message, callback);
-}
-
-function onChange(isChanged) {
-    //
-}
-
-function showMessage(message, title, icon) {
-    var $dialogMessage;
-    // noinspection JSJQueryEfficiency
-    $dialogMessage = $('#dialog-message');
-    if (!$dialogMessage.length) {
-        $('body').append(
-            '<div class="m"><div id="dialog-message" class="modal modal-fixed-footer">' +
-            '    <div class="modal-content">' +
-            '        <h6 class="dialog-title title"></h6>' +
-            '        <p><i class="large material-icons dialog-icon"></i><span class="dialog-text"></span></p>' +
-            '    </div>' +
-            '    <div class="modal-footer">' +
-            '        <a class="modal-action modal-close waves-effect waves-green btn-flat translate">Ok</a>' +
-            '    </div>' +
-            '</div></div>');
-        $dialogMessage = $('#dialog-message');
-    }
-    if (icon) {
-        $dialogMessage.find('.dialog-icon')
-            .show()
-            .html(icon);
-    } else {
-        $dialogMessage.find('.dialog-icon').hide();
-    }
-    if (title) {
-        $dialogMessage.find('.dialog-title').html(title).show();
-    } else {
-        $dialogMessage.find('.dialog-title').hide();
-    }
-    $dialogMessage.find('.dialog-text').html(message);
-    $dialogMessage.modal().modal('open');
-}