iobroker.zigbee 1.8.3 → 1.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.8.3",
+  "version": "1.8.5",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -17,10 +17,13 @@
   "engines": {
     "node": ">=10"
   },
+  "optionalDependencies": {
+    "serialport": "^10.5.0"
+  },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.4.0",
-    "tar": "^6.0.5",
-    "typescript": "^4.0.5",
+    "@iobroker/adapter-core": "^2.6.7",
+    "tar": "^6.1.12",
+    "typescript": "^4.9.3",
     "zigbee-herdsman": "0.14.76",
     "zigbee-herdsman-converters": "14.0.678"
   },
@@ -29,18 +32,18 @@
     "@alcalzone/release-script": "^3.5.9",
     "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
-    "@iobroker/testing": "^2.5.4",
-    "axios": "^0.21.1",
-    "chai": "^4.3.4",
+    "@iobroker/testing": "^4.1.0",
+    "axios": "^1.2.0",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.14.0",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-replace": "^1.1.3",
-    "mixin-deep": "^1.3.2",
-    "mocha": "^9.1.3"
+    "mixin-deep": "^2.0.1",
+    "mocha": "^10.1.0"
   },
   "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
   "keywords": [
@@ -58,6 +61,15 @@
   ],
   "license": "MIT",
   "main": "main.js",
+  "files": [
+    "admin/",
+    "lib/",
+    "docs/",
+    "support/",
+    "io-package.json",
+    "LICENSE",
+    "main.js"
+  ],
   "readmeFilename": "README.md",
   "repository": {
     "type": "git",
@@ -71,7 +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": "eslint --ext .ts \"packages/*/src/**/*.ts\"",
-    "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/auto-merge.yml

@@ -1,17 +0,0 @@
-# Configure here which dependency updates should be merged automatically.
-# The recommended configuration is the following:
-- match:
-      # Only merge patches for production dependencies
-      dependency_type: production
-      update_type: "semver:patch"
-- match:
-      # Except for security fixes, here we allow minor patches
-      dependency_type: production
-      update_type: "security:minor"
-- match:
-      # and development dependencies can have a minor update, too
-      dependency_type: development
-      update_type: "semver:minor"
-
-# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see:
-# https://dependabot.com/docs/config-file/#automerged_updates

package/.github/dependabot.yml

@@ -1,24 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: monthly
-      time: "04:00"
-      timezone: Europe/Berlin
-  - package-ecosystem: npm
-    directory: "/"
-    schedule:
-      interval: monthly
-      time: "04:00"
-      timezone: Europe/Berlin
-    open-pull-requests-limit: 5
-    versioning-strategy: increase
-  - package-ecosystem: npm
-    directory: "/src"
-    schedule:
-      interval: monthly
-      time: "04:00"
-      timezone: Europe/Berlin
-    open-pull-requests-limit: 5
-    versioning-strategy: increase

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/codeql.yml

@@ -1,41 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-  schedule:
-    - cron: "54 15 * * 0"
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ javascript ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: ${{ matrix.language }}
-          queries: +security-and-quality
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-        with:
-          category: "/language:${{ matrix.language }}"

package/.github/workflows/dependabot-automerge.yml

@@ -1,22 +0,0 @@
-# Automatically merge Dependabot PRs when version comparison is within the range
-# that is configured in .github/auto-merge.yml
-
-name: Auto-Merge Dependabot PRs
-
-on:
-  pull_request_target:
-
-jobs:
-  auto-merge:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Check if PR should be auto-merged
-        uses: ahmadnassri/action-dependabot-auto-merge@v2
-        with:
-          # This must be a personal access token with push access
-          github-token: ${{ secrets.AUTO_MERGE_TOKEN }}
-          # By default, squash and merge, so Github chooses nice commit messages
-          command: squash and merge

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

@@ -1,149 +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@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install Dependencies
-        run: npm i
-
-      - 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: [14.x, 16.x, 18.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@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install Dependencies
-        run: npm i
-
-      - 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@v3
-        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/.releaseconfig.json

@@ -1,3 +0,0 @@
-{
-  "plugins": ["iobroker", "license"]
-}

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/.travis.yml

@@ -1,41 +0,0 @@
-os:
-  - linux
-  - osx
-  - windows
-sudo: required
-language: node_js
-node_js:
-  - '12'
-  - '14'
-  - '16'
-before_install:
-  - 'if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ln -s `which node` `which node`js; fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then which nodejs || which node; fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CC=clang++; export CXX=clang++; export CXXFLAGS=-std=c++11; fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink pkg-config; fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=g++-6; CC=gcc-6; fi'
-  - npm install -g node-gyp
-install:
-  - npm install --unsafe-perm
-before_script:
-  - export NPMVERSION=$(echo "$($(which npm) -v)"|cut -c1)
-  - 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm@5; fi'
-  - npm -v
-after_success:
-  - .travis/wiki.sh
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-6
-      - g++-6
-env:
-  global:
-    - secure: >-
-        jYhOGVA5M7ZP9n4ccCr5J9DiODgRyVnKqAqyIE7+TA0jBg1jSPyWydoNuG02htIiNRMp4se+t8mFWIG3QqiFtoJbOdBt3yZYhVdfkx+4JyQpZAZq790C3jGdTSM/sVdaw2D+5Uvhqb4y7YOQ7SUYsRb5IH0NN2ZnOIZuGiOq8eVZ+np3gYNgsJwRWxrOrUi8lIA7APMe8esmOuTmKuFNfxhVWu98WegztBxnQmfCfwUl0OxgXxpdoElIQcbEV2zkJPOowZSioQvE5dxgIuf+leBeWdDm6g7bDmV84CkXmHlWkJoyyz1DYM7XFib4vSX9nJ2HZ2U7/wtbBd9/92JPoClvmiagb4wtICVO98LMXdayF3kRO/h7uH9HTHY1Mo98HHhxWMyfXVh6cWkDPYutSkFBG+a/tQB1jvbHq8j6O98VNpkLVqlbBIV8i0+uzoWOyaCVjZgcc7PtzfuWeNYB4c5cTu+HuofKwx3aBGJvnIukIeD/BJjnB76d4hfm++K6bDjKU61Gd7rY0/C1Ik8HsKxDdGvM5Ro6XARugoLTgym9Xk/ByU0AYrD05F+JzC2T+Hv1xACCq50HtsDAflpc9T4kLV3towQ69bE+N5kMfX5/X4rnVCkeerb+5X3EZjjslcUbwT4REahmihXR+8Mzz6f3O7ATUUA0BclD773ZFFY=
-script:
-  - 'npm run test:package'
-  - 'npm run test:unit'
-  - 'npm run test:integration'
-  - 'if [ "$TRAVIS_OS_NAME" != "windows" ]; then if [ "$TRAVIS_COMMIT_RANGE" != "" ]; then COMMIT_RANGE=$TRAVIS_COMMIT_RANGE; else COMMIT_RANGE="HEAD^..HEAD"; fi; echo "Lint check of commit range $COMMIT_RANGE"; lint-diff $COMMIT_RANGE; fi;'