chore(dev): release 1.33.2 (#19158 )

fix(ignore): update zigbee-herdsman-converters to 15.106.0 (#19511 )
Co-authored-by: Koenkk <Koenkk@users.noreply.github.com>
2026-08-29 07:08:56 +00:00 · 2023-11-01 20:15:16 +01:00 · 2023-11-01 18:53:54 +00:00 · 2023-10-31 20:25:11 +00:00 · 2023-10-31 16:31:14 +01:00 · 2023-10-30 20:28:33 +00:00
52 changed files with 4371 additions and 3313 deletions
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: "IMPORTANT: Check development branch changelog first!!"
-    url: https://github.com/Koenkk/zigbee2mqtt/releases/tag/latest-dev
+    url: https://gist.github.com/Koenkk/bfd4c3d1725a2cccacc11d6ba51008ba
    about: "Before submitting an issue, check if the issue hasn't already been solved in the development branch. Click 'Open' to see the release notes of the development branch. In case it is, you can read here how to switch to the development branch: https://www.zigbee2mqtt.io/advanced/more/switch-to-dev-branch.html"
  - name: Questions/discussion
    url: https://github.com/Koenkk/zigbee2mqtt/discussions/new
@@ -1,12 +1,6 @@
 name: ci

-on:
-  pull_request:
-  push:
-    branches-ignore:
-      - deps/*
-    tags:
-      - '**'
+on: [pull_request, push]

 permissions:
  contents: write
@@ -16,8 +10,8 @@ jobs:
  ci:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
      with:
        node-version: 20
        registry-url: https://registry.npmjs.org/
@@ -38,13 +32,13 @@ jobs:
      run: echo ${{ secrets.GH_TOKEN }} | docker login ghcr.io -u koenkk --password-stdin
    - name: Docker setup - QEMU
      if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
      with:
        platforms: all
    - name: Docker setup - Buildx
      if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
      id: buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
      with:
        version: latest
    - name: Docker build dev
@@ -93,8 +87,8 @@ jobs:
    runs-on: ${{ matrix.os }}
    continue-on-error: true
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
        with:
          node-version: ${{ matrix.node }}
          registry-url: https://registry.npmjs.org/
@@ -14,7 +14,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Initialize CodeQL
        uses: github/codeql-action/init@v2
      - name: Autobuild
@@ -9,6 +9,6 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: 'Checkout repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: 'Dependency review'
        uses: actions/dependency-review-action@v3
@@ -9,7 +9,7 @@ jobs:
  merge_master_to_dev:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - uses: devmasx/merge-branch@master
        with:
          type: now
@@ -16,7 +16,7 @@ jobs:
      release_created: ${{ steps.release.outputs.release_created }}
      version: "${{steps.release.outputs.major}}.${{steps.release.outputs.minor}}.${{steps.release.outputs.patch}}"
    steps:
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: 20

@@ -27,60 +27,61 @@ jobs:
          package-name: release-please-action
          default-branch: dev
          token: ${{secrets.GH_TOKEN}}
+          include-v-in-tag: false
+          skip-github-release: true

      # Checkout repos
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          repository: koenkk/zigbee2mqtt
          path: ./z2m
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          repository: koenkk/zigbee2mqtt
          path: ./z2m-master
          ref: master
-      - uses: actions/checkout@v3
-        with:
-          repository: koenkk/zigbee2mqtt
-          path: ./z2m-changelog
-          ref: release-please--branches--dev--components--release-please-action

-      - name: Update latest-dev tag
+      - name: Restore cache commit-user-lookup.json
+        uses: actions/cache/restore@v3
+        with:
+          path: z2m/scripts/commit-user-lookup.json
+          key: commit-user-lookup-dummy
+          restore-keys: |
+            commit-user-lookup-
+      - name: Generate changelog
        run: |
-          cd z2m
-          git push --delete origin latest-dev
-          git tag latest-dev
-          git push origin latest-dev
-      - name: Update latest-dev release changelog
-        run: |
-          PR=$(echo '${{ steps.release.outputs.pr }}' | jq -r '.number')
          MASTER_Z2M_VERSION=$(cat z2m-master/package.json | jq -r '.version')
          MASTER_ZHC_VERSION=$(cat z2m-master/package.json | jq -r '.dependencies."zigbee-herdsman-converters"')
          MASTER_ZH_VERSION=$(cat z2m-master/package.json | jq -r '.dependencies."zigbee-herdsman"')
-          cp z2m-changelog/CHANGELOG.md z2m
+          wget -q -O - https://raw.githubusercontent.com/Koenkk/zigbee2mqtt/release-please--branches--dev--components--release-please-action/CHANGELOG.md > z2m/CHANGELOG.md || true
          cd z2m
          npm ci
-          node scripts/generateChangelog.js $MASTER_Z2M_VERSION $MASTER_ZHC_VERSION $MASTER_ZH_VERSION >> ../changelog.txt
+          node scripts/generateChangelog.js $MASTER_Z2M_VERSION $MASTER_ZHC_VERSION $MASTER_ZH_VERSION >> ../changelog.md
+        env:
+          GH_TOKEN: ${{secrets.GH_TOKEN}}
+      - name: Update changelog in release PR
+        run: |
+          gh gist edit bfd4c3d1725a2cccacc11d6ba51008ba -a changelog.md
        env:
          GH_TOKEN: ${{secrets.GH_TOKEN}}
-      - uses: ncipollo/release-action@v1
-        with:
-          bodyFile: changelog.txt
-          prerelease: true
-          name: latest-dev
-          allowUpdates: true
-          tag: latest-dev
      - name: Upload changelog
        uses: actions/upload-artifact@v3
        with:
          name: changelog
-          path: changelog.txt
+          path: changelog.md
+      - name: Save cache commit-user-lookup.json
+        uses: actions/cache/save@v3
+        if: always()
+        with:
+          path: z2m/scripts/commit-user-lookup.json
+          key: commit-user-lookup-${{ hashFiles('z2m/scripts/commit-user-lookup.json') }}
   
  create_release:
    runs-on: ubuntu-latest
    needs: [release-please]
    if: ${{ needs.release-please.outputs.release_created }}
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
      with:
        ref: dev
        token: ${{secrets.GH_TOKEN}}
@@ -88,11 +89,11 @@ jobs:
      uses: actions/download-artifact@v3
      with:
        name: changelog
-        path: ../changelog.txt
+        path: ../changelog
    - uses: ncipollo/release-action@v1
      name: Create release
      with:
-        bodyFile: ../changelog.txt
+        bodyFile: ../changelog/changelog.md
        draft: true
        name: ${{ needs.release-please.outputs.version }}
        tag: ${{ needs.release-please.outputs.version }}
@@ -105,8 +106,10 @@ jobs:
        github_token: ${{secrets.GH_TOKEN}}
    - name: Promote to dev
      run: |
-        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package.json > package.json
-        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package-lock.json > package-lock.json
-    - uses: stefanzweifel/git-auto-commit-action@v4
+        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package.json > package.json.tmp
+        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package-lock.json > package-lock.json.tmp
+        mv package.json.tmp package.json
+        mv package-lock.json.tmp package-lock.json
+    - uses: stefanzweifel/git-auto-commit-action@v5
      with:
-        commit_message: Promote to dev
+        commit_message: "chore: promote to dev"
@@ -13,11 +13,11 @@ jobs:

    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
      with:
        ref: dev
        token: ${{ secrets.GH_TOKEN }}
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
      with:
        node-version: 20
        cache: npm
@@ -14,18 +14,21 @@ jobs:
      pull-requests: write  # for peter-evans/create-pull-request to create a PR
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
      with:
        ref: dev
        token: ${{ secrets.GH_TOKEN }}
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
      with:
        node-version: 20
        cache: npm
-    - run: npx npm-check-updates -u -x connect-gzip-static # connect-gzip-static only supports node 16
+    # connect-gzip-static only supports node 16
+    # @types/ws 8.5.5 is broken
+    - run: npx npm-check-updates -u -x connect-gzip-static -x @types/ws 
    - run: npm install
    - uses: peter-evans/create-pull-request@v5
      with:
        commit-message: "fix(ignore): update dependencies"
        branch: "deps/all"
        title: Update dependencies
+        token: ${{ secrets.GH_TOKEN }}
@@ -48,6 +48,9 @@ typings/
 # Optional eslint cache
 .eslintcache

+# Build cache
+tsconfig.tsbuildinfo
+
 # Optional REPL history
 .node_repl_history

@@ -80,3 +83,7 @@ data/extension

 # Ignore config
 data/*.yaml
+!data/configuration.example.yaml
+
+# commit-user-lookup.json
+scripts/commit-user-lookup.json
@@ -8,6 +8,7 @@ coverage
 .codeclimate.yml
 .github
 babel.config.js
+tsconfig.tsbuildinfo

 #linters
 .jscsrc
@@ -1,4 +1,4 @@
 {
-  ".": "1.31.0",
-  "bootstrap-sha": "b2dd21e164b457d5cd0c9d455cdb879d881c44bd"
+  ".": "1.33.2",
+  "bootstrap-sha": "7ee207fc0e05f32c9636c0298b48eea1b91ed9e1"
 }
@@ -1,5 +1,227 @@
 # Changelog

+## [1.33.2](https://github.com/Koenkk/zigbee2mqtt/compare/1.33.1...1.33.2) (2023-11-01)
+
+
+### Bug Fixes
+
+* Add device class for soil_moisture sensor in HA ([#19486](https://github.com/Koenkk/zigbee2mqtt/issues/19486)) ([98c7a2a](https://github.com/Koenkk/zigbee2mqtt/commit/98c7a2ab56ccf6db227a8ff9f8dd333e7f61eaf9))
+* Add in_progress attribute for Home Assistant update sensor ([#19207](https://github.com/Koenkk/zigbee2mqtt/issues/19207)) ([cdce6b1](https://github.com/Koenkk/zigbee2mqtt/commit/cdce6b11d268ab3de9a7aa3a16020268efdfe7cf))
+* Adjust default entity category of updates in Home Assistant ([#19435](https://github.com/Koenkk/zigbee2mqtt/issues/19435)) ([d0a4f5f](https://github.com/Koenkk/zigbee2mqtt/commit/d0a4f5f628de7c1ba8f004ee3fd8587b6391fd5c))
+* Bump semver version ([#19179](https://github.com/Koenkk/zigbee2mqtt/issues/19179)) ([32c1bdf](https://github.com/Koenkk/zigbee2mqtt/commit/32c1bdfccbcef21e0405dd0529dfc101efca9811))
+* Enable Home Assistant force entity by default ([#19212](https://github.com/Koenkk/zigbee2mqtt/issues/19212)) ([95d22c0](https://github.com/Koenkk/zigbee2mqtt/commit/95d22c0822a3b3d4b17c10aa424e26e488f70556))
+* Enable incremental TSC builds ([#19293](https://github.com/Koenkk/zigbee2mqtt/issues/19293)) ([cc86e76](https://github.com/Koenkk/zigbee2mqtt/commit/cc86e76a7ad21fc13a9df4b3c859c512edc5d762))
+* Fix device keeps requesting OTA due to incorrect transaction sequence number. https://github.com/Koenkk/zigbee2mqtt/issues/19129 ([daaade4](https://github.com/Koenkk/zigbee2mqtt/commit/daaade45d919d982461e49cfa4cefd195e70cd7d))
+* Fix entity category of Home Assistant exposed enum sensors ([#19474](https://github.com/Koenkk/zigbee2mqtt/issues/19474)) ([69f6891](https://github.com/Koenkk/zigbee2mqtt/commit/69f6891db58e432c7b397d8f98f401aeccd5b2f7))
+* Fix entity category of Home Assistant exposed sensor entities ([#19434](https://github.com/Koenkk/zigbee2mqtt/issues/19434)) ([e7749e2](https://github.com/Koenkk/zigbee2mqtt/commit/e7749e25e9056c8c4fd6144addba3567ee4b9fb9))
+* **ignore:** update dependencies ([#19208](https://github.com/Koenkk/zigbee2mqtt/issues/19208)) ([9615faa](https://github.com/Koenkk/zigbee2mqtt/commit/9615faac2f197007562a9a55767644ff61a5a055))
+* **ignore:** update dependencies ([#19301](https://github.com/Koenkk/zigbee2mqtt/issues/19301)) ([31541bd](https://github.com/Koenkk/zigbee2mqtt/commit/31541bd6bae09537acb87dfa3f223743d2effce8))
+* **ignore:** update dependencies ([#19375](https://github.com/Koenkk/zigbee2mqtt/issues/19375)) ([6d387b3](https://github.com/Koenkk/zigbee2mqtt/commit/6d387b31c1abd0360b947695a3f3adff71c24b7f))
+* **ignore:** update dependencies ([#19466](https://github.com/Koenkk/zigbee2mqtt/issues/19466)) ([0b37769](https://github.com/Koenkk/zigbee2mqtt/commit/0b3776916b1ff9241602dbae8072abfcbd66d18b))
+* **ignore:** update zigbee-herdsman to 0.19.1 ([#19194](https://github.com/Koenkk/zigbee2mqtt/issues/19194)) ([fcb0af0](https://github.com/Koenkk/zigbee2mqtt/commit/fcb0af00d3044d51901051e5bc29376b400b63eb))
+* **ignore:** update zigbee-herdsman to 0.19.2 ([#19277](https://github.com/Koenkk/zigbee2mqtt/issues/19277)) ([a0c13c1](https://github.com/Koenkk/zigbee2mqtt/commit/a0c13c1c1ea2c9dc04e797a3a7031a753b6e8c21))
+* **ignore:** update zigbee-herdsman to 0.20.0 ([#19313](https://github.com/Koenkk/zigbee2mqtt/issues/19313)) ([43a5c7b](https://github.com/Koenkk/zigbee2mqtt/commit/43a5c7b2f0940bd95980ea5cfeb39f3165537c5d))
+* **ignore:** update zigbee-herdsman to 0.21.0 ([#19421](https://github.com/Koenkk/zigbee2mqtt/issues/19421)) ([f73cca0](https://github.com/Koenkk/zigbee2mqtt/commit/f73cca0e396399640e39bbd8d77ebae5b0a12105))
+* **ignore:** update zigbee-herdsman-converters to 15.100.0 ([#19376](https://github.com/Koenkk/zigbee2mqtt/issues/19376)) ([71dd0ab](https://github.com/Koenkk/zigbee2mqtt/commit/71dd0ab772185427eed687845c8ecfacb4e66072))
+* **ignore:** update zigbee-herdsman-converters to 15.101.0 ([#19397](https://github.com/Koenkk/zigbee2mqtt/issues/19397)) ([52a545d](https://github.com/Koenkk/zigbee2mqtt/commit/52a545d86e441619fadbb942bab40c9ae9135fe0))
+* **ignore:** update zigbee-herdsman-converters to 15.102.0 ([#19422](https://github.com/Koenkk/zigbee2mqtt/issues/19422)) ([1fa10f6](https://github.com/Koenkk/zigbee2mqtt/commit/1fa10f6f289234d6b2e90d35b01425075958ea9e))
+* **ignore:** update zigbee-herdsman-converters to 15.103.0 ([#19443](https://github.com/Koenkk/zigbee2mqtt/issues/19443)) ([7e82a49](https://github.com/Koenkk/zigbee2mqtt/commit/7e82a491f6d7294340cd01baaa74f66acd1e88e4))
+* **ignore:** update zigbee-herdsman-converters to 15.104.0 ([#19479](https://github.com/Koenkk/zigbee2mqtt/issues/19479)) ([e2fccc2](https://github.com/Koenkk/zigbee2mqtt/commit/e2fccc219b63943b7cd5939e53733c63f6ba181c))
+* **ignore:** update zigbee-herdsman-converters to 15.105.0 ([#19492](https://github.com/Koenkk/zigbee2mqtt/issues/19492)) ([fe25924](https://github.com/Koenkk/zigbee2mqtt/commit/fe25924780c454751bada81a783151e5ee5746a8))
+* **ignore:** update zigbee-herdsman-converters to 15.105.1 ([#19503](https://github.com/Koenkk/zigbee2mqtt/issues/19503)) ([d79235e](https://github.com/Koenkk/zigbee2mqtt/commit/d79235e27bf85046d269246678a0859985efd9f8))
+* **ignore:** update zigbee-herdsman-converters to 15.106.0 ([#19511](https://github.com/Koenkk/zigbee2mqtt/issues/19511)) ([3538690](https://github.com/Koenkk/zigbee2mqtt/commit/35386903f2a429c241fa996c29bbbd571c7b046d))
+* **ignore:** update zigbee-herdsman-converters to 15.87.0 ([#19156](https://github.com/Koenkk/zigbee2mqtt/issues/19156)) ([de0f060](https://github.com/Koenkk/zigbee2mqtt/commit/de0f060378738a6a32bd9a7b9780fc3ede56e331))
+* **ignore:** update zigbee-herdsman-converters to 15.88.0 ([#19185](https://github.com/Koenkk/zigbee2mqtt/issues/19185)) ([0b60cd1](https://github.com/Koenkk/zigbee2mqtt/commit/0b60cd1100c264fb58cb54fe769aeed2b630f72c))
+* **ignore:** update zigbee-herdsman-converters to 15.89.0 ([#19190](https://github.com/Koenkk/zigbee2mqtt/issues/19190)) ([b085fac](https://github.com/Koenkk/zigbee2mqtt/commit/b085fac50f9d3969192cce9c93cc7330359aca70))
+* **ignore:** update zigbee-herdsman-converters to 15.89.1 ([#19195](https://github.com/Koenkk/zigbee2mqtt/issues/19195)) ([de7736a](https://github.com/Koenkk/zigbee2mqtt/commit/de7736a370cf6c3d62b0d51dea5ea63824edbe8d))
+* **ignore:** update zigbee-herdsman-converters to 15.90.0 ([#19209](https://github.com/Koenkk/zigbee2mqtt/issues/19209)) ([2aae1bd](https://github.com/Koenkk/zigbee2mqtt/commit/2aae1bd54a94e64a52a9f373c3cecc7667198d00))
+* **ignore:** update zigbee-herdsman-converters to 15.92.1 ([#19234](https://github.com/Koenkk/zigbee2mqtt/issues/19234)) ([d027b85](https://github.com/Koenkk/zigbee2mqtt/commit/d027b8520068af471e8bf5cc29ef5a2a5eb6552c))
+* **ignore:** update zigbee-herdsman-converters to 15.93.0 ([#19278](https://github.com/Koenkk/zigbee2mqtt/issues/19278)) ([afb83fc](https://github.com/Koenkk/zigbee2mqtt/commit/afb83fcbd0ec60ce02d2ce1e677243258bbf2b4d))
+* **ignore:** update zigbee-herdsman-converters to 15.94.0 ([#19290](https://github.com/Koenkk/zigbee2mqtt/issues/19290)) ([29247e1](https://github.com/Koenkk/zigbee2mqtt/commit/29247e19ac8a0e67d193b12fde71743c02afc86c))
+* **ignore:** update zigbee-herdsman-converters to 15.94.1 ([#19295](https://github.com/Koenkk/zigbee2mqtt/issues/19295)) ([70b0fed](https://github.com/Koenkk/zigbee2mqtt/commit/70b0fed2dedeb76609e9afc0ef0ac2b34a3032b5))
+* **ignore:** update zigbee-herdsman-converters to 15.94.2 ([#19304](https://github.com/Koenkk/zigbee2mqtt/issues/19304)) ([81a8df9](https://github.com/Koenkk/zigbee2mqtt/commit/81a8df9855e4069d57ab6ba990c0ef8ac79e66d6))
+* **ignore:** update zigbee-herdsman-converters to 15.95.0 ([#19314](https://github.com/Koenkk/zigbee2mqtt/issues/19314)) ([3461f11](https://github.com/Koenkk/zigbee2mqtt/commit/3461f118690646f643cab53f02d50a1392a9ead3))
+* **ignore:** update zigbee-herdsman-converters to 15.96.0 ([#19328](https://github.com/Koenkk/zigbee2mqtt/issues/19328)) ([5d1bd25](https://github.com/Koenkk/zigbee2mqtt/commit/5d1bd256f9c58a47d7b8120e3d625b770f5516ef))
+* **ignore:** update zigbee-herdsman-converters to 15.97.0 ([#19337](https://github.com/Koenkk/zigbee2mqtt/issues/19337)) ([a86f3d8](https://github.com/Koenkk/zigbee2mqtt/commit/a86f3d8765f31df18451bcd1c34ad031d476dae4))
+* **ignore:** update zigbee-herdsman-converters to 15.98.0 ([#19358](https://github.com/Koenkk/zigbee2mqtt/issues/19358)) ([8a28154](https://github.com/Koenkk/zigbee2mqtt/commit/8a2815466193f94bc9d462afe6f9386a29f21200))
+* **ignore:** update zigbee-herdsman-converters to 15.99.0 ([#19366](https://github.com/Koenkk/zigbee2mqtt/issues/19366)) ([0cd9948](https://github.com/Koenkk/zigbee2mqtt/commit/0cd99487ccb3f401b02fa580b24a9209021e0216))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.137 ([#19165](https://github.com/Koenkk/zigbee2mqtt/issues/19165)) ([b261f2c](https://github.com/Koenkk/zigbee2mqtt/commit/b261f2c6c1f2ec0ea0e0f1b443d30acb62a740d3))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.138 ([#19365](https://github.com/Koenkk/zigbee2mqtt/issues/19365)) ([17ad362](https://github.com/Koenkk/zigbee2mqtt/commit/17ad362fa7006574270649faf50c88e949253830))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.139 ([#19378](https://github.com/Koenkk/zigbee2mqtt/issues/19378)) ([08a5f32](https://github.com/Koenkk/zigbee2mqtt/commit/08a5f32ea9951fccf3b5a6ee3c56372a200906b2))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.140 ([#19413](https://github.com/Koenkk/zigbee2mqtt/issues/19413)) ([0e55b38](https://github.com/Koenkk/zigbee2mqtt/commit/0e55b382ba32f1157375d35bdc2200061122cdb2))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.141 ([#19446](https://github.com/Koenkk/zigbee2mqtt/issues/19446)) ([2541fea](https://github.com/Koenkk/zigbee2mqtt/commit/2541feac25f8cde9a6417935b31848ac1b04d78f))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.142 ([#19447](https://github.com/Koenkk/zigbee2mqtt/issues/19447)) ([6c7be58](https://github.com/Koenkk/zigbee2mqtt/commit/6c7be58a3f77efb5341309e801a9a2279a7a4e35))
+* Publish zigbee-herdsman/zigbee-herdsman-converters version to `bridge/info` ([#19364](https://github.com/Koenkk/zigbee2mqtt/issues/19364)) ([e36983b](https://github.com/Koenkk/zigbee2mqtt/commit/e36983b4b5d50af8586f8f0bb226d1be59b34c9b))
+
+## [1.33.1](https://github.com/Koenkk/zigbee2mqtt/compare/1.33.0...1.33.1) (2023-10-03)
+
+
+### Bug Fixes
+
+* Correct typos ([#19143](https://github.com/Koenkk/zigbee2mqtt/issues/19143)) ([83e3313](https://github.com/Koenkk/zigbee2mqtt/commit/83e331323c19c70f25617fa6baf75e933cd9baf7))
+* Fix `configuration.example.yaml` missing from container ([#18836](https://github.com/Koenkk/zigbee2mqtt/issues/18836)) ([0543ad4](https://github.com/Koenkk/zigbee2mqtt/commit/0543ad4b19f2a8e79a12f2b84b94d005acb60396))
+* **ignore:** update dependencies ([#18995](https://github.com/Koenkk/zigbee2mqtt/issues/18995)) ([5477163](https://github.com/Koenkk/zigbee2mqtt/commit/5477163727d0ed3399614fbb5c12201b2c098127))
+* **ignore:** update dependencies ([#19061](https://github.com/Koenkk/zigbee2mqtt/issues/19061)) ([d99da63](https://github.com/Koenkk/zigbee2mqtt/commit/d99da63b8968c1cb8ae9788317e493f4343dd1a1))
+* **ignore:** update dependencies ([#19127](https://github.com/Koenkk/zigbee2mqtt/issues/19127)) ([1c7bb8f](https://github.com/Koenkk/zigbee2mqtt/commit/1c7bb8fc241d7c3232d2088d6a603318d9cf6c01))
+* **ignore:** update zigbee-herdsman to 0.18.6 ([#18838](https://github.com/Koenkk/zigbee2mqtt/issues/18838)) ([6654c7f](https://github.com/Koenkk/zigbee2mqtt/commit/6654c7f1a34694590fc575270f80faca32472cca))
+* **ignore:** update zigbee-herdsman to 0.18.7 ([#18865](https://github.com/Koenkk/zigbee2mqtt/issues/18865)) ([914b4c6](https://github.com/Koenkk/zigbee2mqtt/commit/914b4c67575b77534af98e9ae76749e331e81ffa))
+* **ignore:** update zigbee-herdsman to 0.19.0 ([#18998](https://github.com/Koenkk/zigbee2mqtt/issues/18998)) ([84f9950](https://github.com/Koenkk/zigbee2mqtt/commit/84f99505561501690f8cf15cd9c98bda580d13df))
+* **ignore:** update zigbee-herdsman-converters to 15.69.0 ([#18835](https://github.com/Koenkk/zigbee2mqtt/issues/18835)) ([3285850](https://github.com/Koenkk/zigbee2mqtt/commit/3285850efa2080c9bfc71373387d4cf5296bbc5b))
+* **ignore:** update zigbee-herdsman-converters to 15.70.0 ([#18866](https://github.com/Koenkk/zigbee2mqtt/issues/18866)) ([91a9e32](https://github.com/Koenkk/zigbee2mqtt/commit/91a9e32a8369fc5c9b919670e4d7564ace3b9371))
+* **ignore:** update zigbee-herdsman-converters to 15.71.0 ([#18887](https://github.com/Koenkk/zigbee2mqtt/issues/18887)) ([f509410](https://github.com/Koenkk/zigbee2mqtt/commit/f5094101898d33fc691311a45ec32f6ac85c18cb))
+* **ignore:** update zigbee-herdsman-converters to 15.72.0 ([#18901](https://github.com/Koenkk/zigbee2mqtt/issues/18901)) ([ea8de2b](https://github.com/Koenkk/zigbee2mqtt/commit/ea8de2ba1e60abeda455092ee79219ea2d11adcc))
+* **ignore:** update zigbee-herdsman-converters to 15.73.0 ([#18917](https://github.com/Koenkk/zigbee2mqtt/issues/18917)) ([d6ed0f4](https://github.com/Koenkk/zigbee2mqtt/commit/d6ed0f45da8a4e2aa0629b89f1a3361f495245e7))
+* **ignore:** update zigbee-herdsman-converters to 15.74.0 ([#18949](https://github.com/Koenkk/zigbee2mqtt/issues/18949)) ([6de7662](https://github.com/Koenkk/zigbee2mqtt/commit/6de7662ca80667cbba669ea3a6ccc7bd3e83362b))
+* **ignore:** update zigbee-herdsman-converters to 15.75.0 ([#18972](https://github.com/Koenkk/zigbee2mqtt/issues/18972)) ([cc95c85](https://github.com/Koenkk/zigbee2mqtt/commit/cc95c859692b4316f3313ad49f99ad7f8e2b29d3))
+* **ignore:** update zigbee-herdsman-converters to 15.76.0 ([#18978](https://github.com/Koenkk/zigbee2mqtt/issues/18978)) ([4040840](https://github.com/Koenkk/zigbee2mqtt/commit/4040840d8e9dc222324be917a281cf29c3bf0da6))
+* **ignore:** update zigbee-herdsman-converters to 15.77.0 ([#18984](https://github.com/Koenkk/zigbee2mqtt/issues/18984)) ([0a69bb5](https://github.com/Koenkk/zigbee2mqtt/commit/0a69bb54c8eb7b4bc459a72d15b408e0c6f3d3de))
+* **ignore:** update zigbee-herdsman-converters to 15.78.0 ([#18999](https://github.com/Koenkk/zigbee2mqtt/issues/18999)) ([eac9240](https://github.com/Koenkk/zigbee2mqtt/commit/eac9240e0600e91e9fcd71f45e861cb4d90acdef))
+* **ignore:** update zigbee-herdsman-converters to 15.80.0 ([#19023](https://github.com/Koenkk/zigbee2mqtt/issues/19023)) ([af209b6](https://github.com/Koenkk/zigbee2mqtt/commit/af209b6f53ebca7032169c689617da169c7b56d4))
+* **ignore:** update zigbee-herdsman-converters to 15.81.1 ([#19041](https://github.com/Koenkk/zigbee2mqtt/issues/19041)) ([9a7aeaf](https://github.com/Koenkk/zigbee2mqtt/commit/9a7aeaf62b1d17fe3935ac731029e93ccd7b32d5))
+* **ignore:** update zigbee-herdsman-converters to 15.82.0 ([#19067](https://github.com/Koenkk/zigbee2mqtt/issues/19067)) ([1190a34](https://github.com/Koenkk/zigbee2mqtt/commit/1190a342e90194184e76de80fd4264f87a65de94))
+* **ignore:** update zigbee-herdsman-converters to 15.83.0 ([#19088](https://github.com/Koenkk/zigbee2mqtt/issues/19088)) ([a7bb3fc](https://github.com/Koenkk/zigbee2mqtt/commit/a7bb3fc9e882d0ffabaea61357db41818bdbbaa3))
+* **ignore:** update zigbee-herdsman-converters to 15.84.0 ([#19096](https://github.com/Koenkk/zigbee2mqtt/issues/19096)) ([7ccb4bc](https://github.com/Koenkk/zigbee2mqtt/commit/7ccb4bcafe9837a59285e8cebac4dfda1095ca62))
+* **ignore:** update zigbee-herdsman-converters to 15.85.0 ([#19102](https://github.com/Koenkk/zigbee2mqtt/issues/19102)) ([90763fd](https://github.com/Koenkk/zigbee2mqtt/commit/90763fd83f2904be174ab86f74623de1029babca))
+* **ignore:** update zigbee-herdsman-converters to 15.86.0 ([#19149](https://github.com/Koenkk/zigbee2mqtt/issues/19149)) ([45ce494](https://github.com/Koenkk/zigbee2mqtt/commit/45ce4949518c7755fba2ac0ded36c54c254c66e1))
+* **ignore:** update zigbee-herdsman-converters to 15.86.1 ([#19150](https://github.com/Koenkk/zigbee2mqtt/issues/19150)) ([b990ed9](https://github.com/Koenkk/zigbee2mqtt/commit/b990ed9a60351c5d2782c34b38234cdcddff0f3a))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.136 ([#19040](https://github.com/Koenkk/zigbee2mqtt/issues/19040)) ([9b66ab1](https://github.com/Koenkk/zigbee2mqtt/commit/9b66ab1367638c7291c8b4a997c215354915a642))
+
+## [1.33.0](https://github.com/Koenkk/zigbee2mqtt/compare/1.32.2...1.33.0) (2023-09-01)
+
+
+### Features
+
+* Add Home Assistant origin to discovery ([#18741](https://github.com/Koenkk/zigbee2mqtt/issues/18741)) ([704ecf3](https://github.com/Koenkk/zigbee2mqtt/commit/704ecf366e51ff777e96379acbb89d9c3c416d6d))
+* Drop Node.js 14 support ([#18555](https://github.com/Koenkk/zigbee2mqtt/issues/18555)) ([1f52fae](https://github.com/Koenkk/zigbee2mqtt/commit/1f52faee398e720ad64e61b559e04be81b58b979))
+* Let Home Assistant generate entity name when device_class is present ([#18208](https://github.com/Koenkk/zigbee2mqtt/issues/18208)) ([df93e4c](https://github.com/Koenkk/zigbee2mqtt/commit/df93e4c8f9490e503e5896e082fc2578f98c2e0e))
+* Support coordinator check ([#18599](https://github.com/Koenkk/zigbee2mqtt/issues/18599)) ([3af130a](https://github.com/Koenkk/zigbee2mqtt/commit/3af130a2c056aab74d793a963aceead348f56058))
+* Support generating extended_pan_id ([#18596](https://github.com/Koenkk/zigbee2mqtt/issues/18596)) ([aa021d9](https://github.com/Koenkk/zigbee2mqtt/commit/aa021d988db31ef206a9bfa6b5312d631bb3de79))
+* Support scene renaming ([#18667](https://github.com/Koenkk/zigbee2mqtt/issues/18667)) ([4b3a2c9](https://github.com/Koenkk/zigbee2mqtt/commit/4b3a2c9f5a74ec25fd82d219a7fc31cddb7c7def))
+* Use labels in Home Assistant entity naming ([#18678](https://github.com/Koenkk/zigbee2mqtt/issues/18678)) ([e33e335](https://github.com/Koenkk/zigbee2mqtt/commit/e33e335c0ca92670eee4be672ec53282cc2b79d3))
+
+
+### Bug Fixes
+
+* Add secure default config ([#18357](https://github.com/Koenkk/zigbee2mqtt/issues/18357)) ([68ec507](https://github.com/Koenkk/zigbee2mqtt/commit/68ec507e30bead5e9263c0fdc4c47e18c257d82f))
+* Fix Home Assistant `MQTT device name is equal to entity name in your config ([#18491](https://github.com/Koenkk/zigbee2mqtt/issues/18491)) ([f619610](https://github.com/Koenkk/zigbee2mqtt/commit/f6196107a75f9257366505a3ad5ef7b29ff5bc1c))
+* Fix Home Assistant `TypeError: object of type 'NoneType' has no len()` error. https://github.com/Koenkk/zigbee2mqtt/issues/17861 ([ed22ece](https://github.com/Koenkk/zigbee2mqtt/commit/ed22ecedbfd51fc2f5572930aacd37e5b48e04cf))
+* Generate pan_id for new installations ([#18530](https://github.com/Koenkk/zigbee2mqtt/issues/18530)) ([cf313c5](https://github.com/Koenkk/zigbee2mqtt/commit/cf313c503b7b070e24739a1f5139e5833405eebc))
+* **ignore:** chore: Update dependencies ([#18459](https://github.com/Koenkk/zigbee2mqtt/issues/18459)) ([b55cc0a](https://github.com/Koenkk/zigbee2mqtt/commit/b55cc0a037ccb2c16ac2147ae7e1fb2e4d596806))
+* **ignore:** Revert "chore: Update dependencies ([#18459](https://github.com/Koenkk/zigbee2mqtt/issues/18459))" ([b09b8ec](https://github.com/Koenkk/zigbee2mqtt/commit/b09b8ec3d6b30b0bc34c36819e39298ec5a94c63))
+* **ignore:** update dependencies ([#18598](https://github.com/Koenkk/zigbee2mqtt/issues/18598)) ([0d00a14](https://github.com/Koenkk/zigbee2mqtt/commit/0d00a144f5c40bf1fce30f9ee65335a6d0076972))
+* **ignore:** update dependencies ([#18755](https://github.com/Koenkk/zigbee2mqtt/issues/18755)) ([bc17e64](https://github.com/Koenkk/zigbee2mqtt/commit/bc17e6406bdd4104ba7f1b4c7663a18f82fee35b))
+* **ignore:** update zigbee-herdsman to 0.17.3 ([#18556](https://github.com/Koenkk/zigbee2mqtt/issues/18556)) ([a892a1b](https://github.com/Koenkk/zigbee2mqtt/commit/a892a1b898f8cf4fc02c1ec7d9159d426c5ea547))
+* **ignore:** update zigbee-herdsman to 0.18.0 ([#18600](https://github.com/Koenkk/zigbee2mqtt/issues/18600)) ([cc0536c](https://github.com/Koenkk/zigbee2mqtt/commit/cc0536c5ab1d5f04b75bf9cd21c4f9579c60dc31))
+* **ignore:** update zigbee-herdsman to 0.18.1 ([#18627](https://github.com/Koenkk/zigbee2mqtt/issues/18627)) ([3736b59](https://github.com/Koenkk/zigbee2mqtt/commit/3736b5901b9f497b74a2efa57adb105802ddc153))
+* **ignore:** update zigbee-herdsman to 0.18.2 ([#18648](https://github.com/Koenkk/zigbee2mqtt/issues/18648)) ([db812cd](https://github.com/Koenkk/zigbee2mqtt/commit/db812cd72918eb0438129639c9d7a8af86f8fc37))
+* **ignore:** update zigbee-herdsman to 0.18.3 ([#18714](https://github.com/Koenkk/zigbee2mqtt/issues/18714)) ([6a1b6a1](https://github.com/Koenkk/zigbee2mqtt/commit/6a1b6a14038290fc9d13008b09da002fd55f540f))
+* **ignore:** update zigbee-herdsman to 0.18.4 ([#18727](https://github.com/Koenkk/zigbee2mqtt/issues/18727)) ([1439f4c](https://github.com/Koenkk/zigbee2mqtt/commit/1439f4c6ace962f8b14ec43a8b418ca12a4db27f))
+* **ignore:** update zigbee-herdsman to 0.18.5 ([#18816](https://github.com/Koenkk/zigbee2mqtt/issues/18816)) ([68169f0](https://github.com/Koenkk/zigbee2mqtt/commit/68169f0e50290c8c2fa5fba052b4446c9a46d2f1))
+* **ignore:** update zigbee-herdsman-converters to 15.51.0 ([#18501](https://github.com/Koenkk/zigbee2mqtt/issues/18501)) ([2d917a7](https://github.com/Koenkk/zigbee2mqtt/commit/2d917a7d0db1fc4d89ba163d63e2d2932d0655fe))
+* **ignore:** update zigbee-herdsman-converters to 15.52.0 ([#18514](https://github.com/Koenkk/zigbee2mqtt/issues/18514)) ([0718ca1](https://github.com/Koenkk/zigbee2mqtt/commit/0718ca162dcf6ab41f192e4dd8ecc83b38e25410))
+* **ignore:** update zigbee-herdsman-converters to 15.53.0 ([#18524](https://github.com/Koenkk/zigbee2mqtt/issues/18524)) ([f08cd81](https://github.com/Koenkk/zigbee2mqtt/commit/f08cd81ac0ad4436883acf39947e7254002ef9fe))
+* **ignore:** update zigbee-herdsman-converters to 15.54.0 ([#18527](https://github.com/Koenkk/zigbee2mqtt/issues/18527)) ([abba8b3](https://github.com/Koenkk/zigbee2mqtt/commit/abba8b3ba8c31c2b9057f74e455824045082a4ec))
+* **ignore:** update zigbee-herdsman-converters to 15.54.1 ([#18537](https://github.com/Koenkk/zigbee2mqtt/issues/18537)) ([b5e9ed4](https://github.com/Koenkk/zigbee2mqtt/commit/b5e9ed436cd3a8e5b8183fe44685d2f41422b2fd))
+* **ignore:** update zigbee-herdsman-converters to 15.55.0 ([#18547](https://github.com/Koenkk/zigbee2mqtt/issues/18547)) ([6050428](https://github.com/Koenkk/zigbee2mqtt/commit/60504285663e346c2078819c6445905fb2aaff1c))
+* **ignore:** update zigbee-herdsman-converters to 15.55.1 ([#18557](https://github.com/Koenkk/zigbee2mqtt/issues/18557)) ([7f05f31](https://github.com/Koenkk/zigbee2mqtt/commit/7f05f31c72cfd394cbe0d8e20de5c9f5d245db85))
+* **ignore:** update zigbee-herdsman-converters to 15.55.2 ([#18566](https://github.com/Koenkk/zigbee2mqtt/issues/18566)) ([8675b1c](https://github.com/Koenkk/zigbee2mqtt/commit/8675b1c9ed405d7abe42f6725c0627968c533f4b))
+* **ignore:** update zigbee-herdsman-converters to 15.55.3 ([#18578](https://github.com/Koenkk/zigbee2mqtt/issues/18578)) ([b1796e3](https://github.com/Koenkk/zigbee2mqtt/commit/b1796e3e1a1d58c79dda39a8041ce67ceea133a4))
+* **ignore:** update zigbee-herdsman-converters to 15.57.0 ([#18616](https://github.com/Koenkk/zigbee2mqtt/issues/18616)) ([145bc05](https://github.com/Koenkk/zigbee2mqtt/commit/145bc05dc30d952e919035a7b741f91ee98a8997))
+* **ignore:** update zigbee-herdsman-converters to 15.58.1 ([#18658](https://github.com/Koenkk/zigbee2mqtt/issues/18658)) ([dcbf4e5](https://github.com/Koenkk/zigbee2mqtt/commit/dcbf4e5b0e75d0e50688434079588fe179406520))
+* **ignore:** update zigbee-herdsman-converters to 15.59.0 ([#18661](https://github.com/Koenkk/zigbee2mqtt/issues/18661)) ([7185d9e](https://github.com/Koenkk/zigbee2mqtt/commit/7185d9e5013888f8276e74849c7463560c46f369))
+* **ignore:** update zigbee-herdsman-converters to 15.60.0 ([#18672](https://github.com/Koenkk/zigbee2mqtt/issues/18672)) ([71c4211](https://github.com/Koenkk/zigbee2mqtt/commit/71c4211d13df29aefb217a030c5e114c7a666112))
+* **ignore:** update zigbee-herdsman-converters to 15.62.0 ([#18742](https://github.com/Koenkk/zigbee2mqtt/issues/18742)) ([514d9f3](https://github.com/Koenkk/zigbee2mqtt/commit/514d9f38b2a7a46fe766dd422f540350bbbe0f5e))
+* **ignore:** update zigbee-herdsman-converters to 15.63.0 ([#18758](https://github.com/Koenkk/zigbee2mqtt/issues/18758)) ([b193d89](https://github.com/Koenkk/zigbee2mqtt/commit/b193d8904299a0c5673da3b9185200ef6a3ed368))
+* **ignore:** update zigbee-herdsman-converters to 15.64.0 ([#18784](https://github.com/Koenkk/zigbee2mqtt/issues/18784)) ([5084b12](https://github.com/Koenkk/zigbee2mqtt/commit/5084b1293e2ea857b363837eabf7ca0087f2607c))
+* **ignore:** update zigbee-herdsman-converters to 15.66.1 ([#18790](https://github.com/Koenkk/zigbee2mqtt/issues/18790)) ([0ec68a4](https://github.com/Koenkk/zigbee2mqtt/commit/0ec68a4b71208fe42ea011e0084c8af0b187a261))
+* **ignore:** update zigbee-herdsman-converters to 15.67.0 ([#18815](https://github.com/Koenkk/zigbee2mqtt/issues/18815)) ([97f6a84](https://github.com/Koenkk/zigbee2mqtt/commit/97f6a840e47612e98f20ba355dae7fb3dfd0868c))
+* **ignore:** update zigbee-herdsman-converters to 15.67.1 ([#18817](https://github.com/Koenkk/zigbee2mqtt/issues/18817)) ([e78aa35](https://github.com/Koenkk/zigbee2mqtt/commit/e78aa3589b4c468716917f9f734f03801f86c3cd))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.134 ([#18761](https://github.com/Koenkk/zigbee2mqtt/issues/18761)) ([4949a54](https://github.com/Koenkk/zigbee2mqtt/commit/4949a54d664083f6152bafa78c5468f9a2c50f2b))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.135 ([#18814](https://github.com/Koenkk/zigbee2mqtt/issues/18814)) ([9a6445a](https://github.com/Koenkk/zigbee2mqtt/commit/9a6445a8a024c8b415caa9cd08e48df12a46e83b))
+* Use QOS1 for rarely sent discovery and availability messages ([#18756](https://github.com/Koenkk/zigbee2mqtt/issues/18756)) ([d1e50ce](https://github.com/Koenkk/zigbee2mqtt/commit/d1e50ce534b906f426b28f2aaf8b0a51a97de264))
+
+## [1.32.2](https://github.com/Koenkk/zigbee2mqtt/compare/1.32.1...1.32.2) (2023-08-01)
+
+
+### Bug Fixes
+
+* Fix `'dict object' has no attribute 'ir_code_to_send'` error. https://github.com/Koenkk/zigbee2mqtt/issues/18180 ([dec9191](https://github.com/Koenkk/zigbee2mqtt/commit/dec91919bc50aed1f1d3fd9525abd2db49242e7f))
+* Fix insecure Zigbee network encryption key generation ([#18372](https://github.com/Koenkk/zigbee2mqtt/issues/18372)) ([df8e168](https://github.com/Koenkk/zigbee2mqtt/commit/df8e1687b2db3f49ba8c3d97a4c92b7892a54f1e))
+* Fix not all cluster unbound/bound when specified. https://github.com/Koenkk/zigbee2mqtt/issues/10740 ([0bdf663](https://github.com/Koenkk/zigbee2mqtt/commit/0bdf663ca126d0569b62871e1b787992472faea4))
+* Fix socket error crashing Zigbee2MQTT ([#18388](https://github.com/Koenkk/zigbee2mqtt/issues/18388)) ([f64cd7e](https://github.com/Koenkk/zigbee2mqtt/commit/f64cd7e8f38f0c1fc1bbd85b5b5caf560565c024))
+* **ignore:** Add ep `l` till 24 ([#18422](https://github.com/Koenkk/zigbee2mqtt/issues/18422)) ([4bd281c](https://github.com/Koenkk/zigbee2mqtt/commit/4bd281ce6cbd43f38b2a3131cd38b25885a22b3a))
+* **ignore:** Add th1-th10 endpoints for Ubisys H10 ([#18405](https://github.com/Koenkk/zigbee2mqtt/issues/18405)) ([91f22f1](https://github.com/Koenkk/zigbee2mqtt/commit/91f22f1230241f5fb3b27b2ee84d944a1c3c5107))
+* **ignore:** Attempt 2 to fix cache saving ([ea412cf](https://github.com/Koenkk/zigbee2mqtt/commit/ea412cfe82a0462930ec8dddf00b9a363c484b73))
+* **ignore:** Attempt 3 to fix commit-user-lookup ([590564c](https://github.com/Koenkk/zigbee2mqtt/commit/590564c15888f73826f20eca91e2c253c7d000e7))
+* **ignore:** Attempt to fix cache not saving ([fa02bb5](https://github.com/Koenkk/zigbee2mqtt/commit/fa02bb5b74216db78b23db144c915d00c7dc48c1))
+* **ignore:** fix commit-user-lookup cache ([758b814](https://github.com/Koenkk/zigbee2mqtt/commit/758b8144a19ca04eac5faae5b7e16c090e9fda77))
+* **ignore:** Fix failing test ([ba0cc61](https://github.com/Koenkk/zigbee2mqtt/commit/ba0cc6196550b3b6873f3733690daef9002c5863))
+* **ignore:** update dependencies ([#18260](https://github.com/Koenkk/zigbee2mqtt/issues/18260)) ([ee1a5f0](https://github.com/Koenkk/zigbee2mqtt/commit/ee1a5f04008beaac54fb68e20c31c1664563a4f2))
+* **ignore:** update dependencies ([#18403](https://github.com/Koenkk/zigbee2mqtt/issues/18403)) ([8e94662](https://github.com/Koenkk/zigbee2mqtt/commit/8e946623a9db6282a53b55d5d5f3e4b000d080ee))
+* **ignore:** update zigbee-herdsman to 0.17.2 ([#18291](https://github.com/Koenkk/zigbee2mqtt/issues/18291)) ([073989c](https://github.com/Koenkk/zigbee2mqtt/commit/073989c7a434c3fd73abaee95fa4ada9394d695d))
+* **ignore:** update zigbee-herdsman-converters to 15.38.0 ([#18262](https://github.com/Koenkk/zigbee2mqtt/issues/18262)) ([813dd49](https://github.com/Koenkk/zigbee2mqtt/commit/813dd49a41e7d3f41b6c79db708bb08d29cd7f0c))
+* **ignore:** update zigbee-herdsman-converters to 15.39.0 ([#18282](https://github.com/Koenkk/zigbee2mqtt/issues/18282)) ([3c855d2](https://github.com/Koenkk/zigbee2mqtt/commit/3c855d20424761d43ace9b5ed55460eedce092f0))
+* **ignore:** update zigbee-herdsman-converters to 15.39.1 ([#18292](https://github.com/Koenkk/zigbee2mqtt/issues/18292)) ([a3c8e1c](https://github.com/Koenkk/zigbee2mqtt/commit/a3c8e1c3c98bd97ef52c29929dc9bb5f9598d0fd))
+* **ignore:** update zigbee-herdsman-converters to 15.40.0 ([#18314](https://github.com/Koenkk/zigbee2mqtt/issues/18314)) ([af0521b](https://github.com/Koenkk/zigbee2mqtt/commit/af0521b54ca9195e62d68ccd9fcb49d0d0c226e4))
+* **ignore:** update zigbee-herdsman-converters to 15.41.0 ([#18328](https://github.com/Koenkk/zigbee2mqtt/issues/18328)) ([330a913](https://github.com/Koenkk/zigbee2mqtt/commit/330a913e76b556295f57290743670a40e48139ca))
+* **ignore:** update zigbee-herdsman-converters to 15.42.0 ([#18343](https://github.com/Koenkk/zigbee2mqtt/issues/18343)) ([313865b](https://github.com/Koenkk/zigbee2mqtt/commit/313865b0a38754df52ef2f28132053a47379cc43))
+* **ignore:** update zigbee-herdsman-converters to 15.43.0 ([#18356](https://github.com/Koenkk/zigbee2mqtt/issues/18356)) ([7a22cee](https://github.com/Koenkk/zigbee2mqtt/commit/7a22cee639bf9115c6782302900b89f4978468d9))
+* **ignore:** update zigbee-herdsman-converters to 15.44.0 ([#18365](https://github.com/Koenkk/zigbee2mqtt/issues/18365)) ([3408e3c](https://github.com/Koenkk/zigbee2mqtt/commit/3408e3c05a102d32818260c0368a47c9726aa40d))
+* **ignore:** update zigbee-herdsman-converters to 15.45.0 ([#18404](https://github.com/Koenkk/zigbee2mqtt/issues/18404)) ([57d031d](https://github.com/Koenkk/zigbee2mqtt/commit/57d031d54aadaf87513d2c7d32f3302db501be67))
+* **ignore:** update zigbee-herdsman-converters to 15.46.0 ([#18421](https://github.com/Koenkk/zigbee2mqtt/issues/18421)) ([ced3d43](https://github.com/Koenkk/zigbee2mqtt/commit/ced3d43dad5f8a578f1875ffaf68ffb1d177c584))
+* **ignore:** update zigbee-herdsman-converters to 15.47.0 ([#18430](https://github.com/Koenkk/zigbee2mqtt/issues/18430)) ([087b85c](https://github.com/Koenkk/zigbee2mqtt/commit/087b85cb9f3bc7a317dc22483461de32a9c1a0d8))
+* **ignore:** update zigbee-herdsman-converters to 15.48.0 ([#18438](https://github.com/Koenkk/zigbee2mqtt/issues/18438)) ([d487f37](https://github.com/Koenkk/zigbee2mqtt/commit/d487f37a7a755e37caf3a8da4f8190981fdb5625))
+* **ignore:** update zigbee-herdsman-converters to 15.49.0 ([#18443](https://github.com/Koenkk/zigbee2mqtt/issues/18443)) ([8139d7f](https://github.com/Koenkk/zigbee2mqtt/commit/8139d7f1f494b4051c1bba7ea453e76e4be77fad))
+* **ignore:** update zigbee-herdsman-converters to 15.50.0 ([#18475](https://github.com/Koenkk/zigbee2mqtt/issues/18475)) ([3478e40](https://github.com/Koenkk/zigbee2mqtt/commit/3478e4001760541b65d9bfdbdcd1d082a3da8023))
+* **ignore:** update zigbee-herdsman-converters to 15.50.1 ([#18487](https://github.com/Koenkk/zigbee2mqtt/issues/18487)) ([683d29f](https://github.com/Koenkk/zigbee2mqtt/commit/683d29f9f70f3149cbbff6b543d53af0f931e706))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.132 ([#18289](https://github.com/Koenkk/zigbee2mqtt/issues/18289)) ([05eff95](https://github.com/Koenkk/zigbee2mqtt/commit/05eff957eb3c5414df7bf2909b5b6d9ff6fdb258))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.133 ([#18390](https://github.com/Koenkk/zigbee2mqtt/issues/18390)) ([e1d52ae](https://github.com/Koenkk/zigbee2mqtt/commit/e1d52ae43aa132f296d151eced7d208cfb1b3a62))
+* Use HA sensor device class `atmospheric_pressure` instead of `pressure` ([#18306](https://github.com/Koenkk/zigbee2mqtt/issues/18306)) ([1252f10](https://github.com/Koenkk/zigbee2mqtt/commit/1252f10d39beed640370410a45d5c2fdc504b440))
+
+## [1.32.1](https://github.com/Koenkk/zigbee2mqtt/compare/1.32.0...1.32.1) (2023-07-08)
+
+### Bug Fixes
+
+* **ignore:** update zigbee-herdsman-converters to 15.33.1-hotfix.0 ([15601d6](https://github.com/Koenkk/zigbee2mqtt/commit/15601d6339cfc7408872a71071a98abadd9b33ff))
+
+## [1.32.0](https://github.com/Koenkk/zigbee2mqtt/compare/1.31.2...1.32.0) (2023-07-01)
+
+
+### Features
+
+* Support Home Assistant water device_class ([#18066](https://github.com/Koenkk/zigbee2mqtt/issues/18066)) ([e083a6b](https://github.com/Koenkk/zigbee2mqtt/commit/e083a6bff7fafd17d5ff6ad4b87916b83727d8be))
+* Support settable Home Assistant text ([#18114](https://github.com/Koenkk/zigbee2mqtt/issues/18114)) ([9474452](https://github.com/Koenkk/zigbee2mqtt/commit/94744525ba466c6512ab6a6181b3073970a02023))
+
+
+### Bug Fixes
+
+* Fix Home Assistant truncate error when `program` is `null`. https://github.com/Koenkk/zigbee2mqtt/issues/16460 ([11f0be5](https://github.com/Koenkk/zigbee2mqtt/commit/11f0be55d871363cb4c07adbbeac57fb4ddf479e))
+* **ignore:** Better fix for [#17891](https://github.com/Koenkk/zigbee2mqtt/issues/17891) ([#17951](https://github.com/Koenkk/zigbee2mqtt/issues/17951)) ([a7e02a7](https://github.com/Koenkk/zigbee2mqtt/commit/a7e02a7be847418df463095b68951c1a1459ca83))
+* **ignore:** Fix DeviceMessage.meta type ([8833947](https://github.com/Koenkk/zigbee2mqtt/commit/88339473ce7eb09add8f1836ab4c33b4a405d7e7))
+* **ignore:** Fix e10dd893ab2875e5420952b4452bf75aeec93922 ([446dbbf](https://github.com/Koenkk/zigbee2mqtt/commit/446dbbf1fc0e07c61cd233c8b4ea509ce6423c86))
+* **ignore:** update dependencies ([#17991](https://github.com/Koenkk/zigbee2mqtt/issues/17991)) ([e10dd89](https://github.com/Koenkk/zigbee2mqtt/commit/e10dd893ab2875e5420952b4452bf75aeec93922))
+* **ignore:** update dependencies ([#18052](https://github.com/Koenkk/zigbee2mqtt/issues/18052)) ([1dc0b24](https://github.com/Koenkk/zigbee2mqtt/commit/1dc0b24e9a8ae9a03809aff5d3ff9758b63d9f22))
+* **ignore:** update dependencies ([#18112](https://github.com/Koenkk/zigbee2mqtt/issues/18112)) ([57566c7](https://github.com/Koenkk/zigbee2mqtt/commit/57566c76ed8ccaabcdc32f84a7fddcf5da3b02b3))
+* **ignore:** update zigbee-herdsman to 0.15.0 ([#17966](https://github.com/Koenkk/zigbee2mqtt/issues/17966)) ([05cab61](https://github.com/Koenkk/zigbee2mqtt/commit/05cab61e1faa15a9a72d87f8e9ec26e3d1eb4046))
+* **ignore:** update zigbee-herdsman to 0.15.1 ([#18080](https://github.com/Koenkk/zigbee2mqtt/issues/18080)) ([17cff2a](https://github.com/Koenkk/zigbee2mqtt/commit/17cff2a26f16207bd30bb2659e11ce792d02dd75))
+* **ignore:** update zigbee-herdsman to 0.15.2 ([#18091](https://github.com/Koenkk/zigbee2mqtt/issues/18091)) ([03005b3](https://github.com/Koenkk/zigbee2mqtt/commit/03005b38c86f79384e20bb240a8947ce969411c6))
+* **ignore:** update zigbee-herdsman to 0.15.3 ([#18116](https://github.com/Koenkk/zigbee2mqtt/issues/18116)) ([2d62027](https://github.com/Koenkk/zigbee2mqtt/commit/2d62027e24ea2de401155e0bc7fabaee85fa7bab))
+* **ignore:** update zigbee-herdsman to 0.16.0 ([#18124](https://github.com/Koenkk/zigbee2mqtt/issues/18124)) ([38c2ea5](https://github.com/Koenkk/zigbee2mqtt/commit/38c2ea5bf72f67f29b89dc84524e91923989fd27))
+* **ignore:** update zigbee-herdsman-converters to 15.20.0 ([#17954](https://github.com/Koenkk/zigbee2mqtt/issues/17954)) ([0c7e7e5](https://github.com/Koenkk/zigbee2mqtt/commit/0c7e7e5089d1023150f23123df7eab90ea65fe59))
+* **ignore:** update zigbee-herdsman-converters to 15.22.0 ([#18004](https://github.com/Koenkk/zigbee2mqtt/issues/18004)) ([b0b3aee](https://github.com/Koenkk/zigbee2mqtt/commit/b0b3aee6483efe9fbb2f434c44ed76d6b3a4e54a))
+* **ignore:** update zigbee-herdsman-converters to 15.23.0 ([#18015](https://github.com/Koenkk/zigbee2mqtt/issues/18015)) ([4ad838c](https://github.com/Koenkk/zigbee2mqtt/commit/4ad838c114edc7dd5d9d104df9b2ce49933a8c20))
+* **ignore:** update zigbee-herdsman-converters to 15.24.0 ([#18025](https://github.com/Koenkk/zigbee2mqtt/issues/18025)) ([c47f5df](https://github.com/Koenkk/zigbee2mqtt/commit/c47f5df021478e8997f13f06ea17591b745615e3))
+* **ignore:** update zigbee-herdsman-converters to 15.25.0 ([#18056](https://github.com/Koenkk/zigbee2mqtt/issues/18056)) ([57aaa5a](https://github.com/Koenkk/zigbee2mqtt/commit/57aaa5a85aff308d4bd66353fd42969eb38a60d4))
+* **ignore:** update zigbee-herdsman-converters to 15.26.0 ([#18067](https://github.com/Koenkk/zigbee2mqtt/issues/18067)) ([91d67a0](https://github.com/Koenkk/zigbee2mqtt/commit/91d67a0ef5135e08ac81171b78931b7903efcc5a))
+* **ignore:** update zigbee-herdsman-converters to 15.27.0 ([#18075](https://github.com/Koenkk/zigbee2mqtt/issues/18075)) ([5777d76](https://github.com/Koenkk/zigbee2mqtt/commit/5777d76e5508d7dba4750aa5efc34977ba01de1a))
+* **ignore:** update zigbee-herdsman-converters to 15.28.0 ([#18092](https://github.com/Koenkk/zigbee2mqtt/issues/18092)) ([6d3389b](https://github.com/Koenkk/zigbee2mqtt/commit/6d3389b409b003740ac4b2b90aa39a8ccbec26e3))
+* **ignore:** update zigbee-herdsman-converters to 15.29.0 ([#18099](https://github.com/Koenkk/zigbee2mqtt/issues/18099)) ([a744838](https://github.com/Koenkk/zigbee2mqtt/commit/a744838e9c982461479f0b5273e25abd32c4074d))
+* **ignore:** update zigbee-herdsman-converters to 15.30.0 ([#18115](https://github.com/Koenkk/zigbee2mqtt/issues/18115)) ([a56719d](https://github.com/Koenkk/zigbee2mqtt/commit/a56719d19ca32fabf375e293cdef0172826c8672))
+* **ignore:** update zigbee-herdsman-converters to 15.31.0 ([#18125](https://github.com/Koenkk/zigbee2mqtt/issues/18125)) ([ed85367](https://github.com/Koenkk/zigbee2mqtt/commit/ed85367e5383b9a59a69fe2836b02763f6744849))
+* **ignore:** update zigbee-herdsman-converters to 15.32.0 ([#18132](https://github.com/Koenkk/zigbee2mqtt/issues/18132)) ([61dd1dd](https://github.com/Koenkk/zigbee2mqtt/commit/61dd1dd96dc9154f2b46a635bf2ccaeac2d69ba5))
+* **ignore:** update zigbee-herdsman-converters to 15.33.0 ([#18156](https://github.com/Koenkk/zigbee2mqtt/issues/18156)) ([81973c3](https://github.com/Koenkk/zigbee2mqtt/commit/81973c3a2a356c52859d167d3eedaf78f747b8e5))
+* **ignore:** update zigbee-herdsman-converters to 15.33.1 ([#18161](https://github.com/Koenkk/zigbee2mqtt/issues/18161)) ([d1824f1](https://github.com/Koenkk/zigbee2mqtt/commit/d1824f169b71e0590dce14d7f451dbbb67bdf5d9))
+
 ## [1.31.0](https://github.com/Koenkk/zigbee2mqtt/compare/1.30.4...v1.31.0) (2023-06-01)


@@ -1,8 +1,8 @@
 # Contributing to Zigbee2MQTT

-Everybody is invited and welcome to contribute to Zigbee2MQTT. Zigbee2MQTT is writen in JavaScript and is based upon [zigbee-herdsman](https://github.com/koenkk/zigbee-herdsman) and [zigbee-herdsman-converters](https://github.com/koenkk/zigbee-herdsman-converters). Zigbee-herdsman-converters contains all device definition, zigbee-herdsman is responsible for handling all communication with the adapter.
+Everybody is invited and welcome to contribute to Zigbee2MQTT. Zigbee2MQTT is written in JavaScript and is based upon [zigbee-herdsman](https://github.com/koenkk/zigbee-herdsman) and [zigbee-herdsman-converters](https://github.com/koenkk/zigbee-herdsman-converters). Zigbee-herdsman-converters contains all device definitions, zigbee-herdsman is responsible for handling all communication with the adapter.

 - Pull requests are always created against the [**dev**](https://github.com/Koenkk/zigbee2mqtt/tree/dev) branch.
 - Easiest way to start developing Zigbee2MQTT is by setting up a development environment (aka bare-metal installation). You can follow this [guide](https://www.zigbee2mqtt.io/guide/installation/01_linux.html) to do this.
 - You can run the tests locally by executing `npm test`. Zigbee2MQTT enforces 100% code coverage, in case you add new code check if your code is covered by running `npm run test-with-coverage`. The coverage report can be found under `coverage/lcov-report/index.html`. Linting is also enforced and can be run with `npm run eslint`.
- When you want to add support for a new devices no changes to Zigbee2MQTT have to be made, only to zigbee-herdsman-converters. You can find a guide for it [here](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html).
+- When you want to add support for a new device no changes to Zigbee2MQTT have to be made, only to zigbee-herdsman-converters. You can find a guide for it [here](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html).
@@ -58,20 +58,35 @@ Zigbee2MQTT integrates well with (almost) every home automation solution because

 <br>

+<img align="left" height="100px" width="100px" src="https://etc.athom.com/logo/white/256.png">
+
+### [Homey](https://homey.app/)
+- Integration implemented in the [Homey App](https://homey.app/nl-nl/app/com.gruijter.zigbee2mqtt/)
+- Documentation and support in the [Homey Forum](https://community.homey.app/t/83214)
+
+<br>
+
 <img align="left" height="100px" width="100px" src="https://user-images.githubusercontent.com/2734836/47615848-b8dd8700-dabd-11e8-9d77-175002dd8987.png">

 ### [Domoticz](https://www.domoticz.com/)
- Integration implemented in [domoticz-zigbee2mqtt-plugin](https://github.com/stas-demydiuk/domoticz-zigbee2mqtt-plugin)
+- Integration implemented in Domoticz ([documentation](https://www.domoticz.com/wiki/Zigbee2MQTT)).

 <br>

 <img align="left" height="100px" width="100px" src="./images/gladys-assistant-logo.jpg">

 ### [Gladys Assistant](https://gladysassistant.com/)
- Integration implemented natively in Gladys Assistant. Read documentation [here](https://gladysassistant.com/docs/integrations/zigbee2mqtt/)
+- Integration implemented natively in Gladys Assistant ([documentation](https://gladysassistant.com/docs/integrations/zigbee2mqtt/)).

 <br>

+<img align="left" height="100px" width="100px" src="https://forum.iobroker.net/assets/uploads/system/site-logo.png">
+
+### [IoBroker](https://www.iobroker.net/)
+- Integration implemented in IoBroker ([documentation](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt)).
+  
+<br>
+
 ## Architecture
 ![Architecture](images/architecture.png)

@@ -0,0 +1,29 @@
+# Home Assistant integration (MQTT discovery)
+homeassistant: false
+
+# Enable the frontend, runs on port 8080 by default
+frontend: true
+
+# MQTT settings
+mqtt:
+  # MQTT base topic for zigbee2mqtt MQTT messages
+  base_topic: zigbee2mqtt
+  # MQTT server URL
+  server: 'mqtt://localhost'
+  # MQTT server authentication, uncomment if required:
+  # user: my_user
+  # password: my_password
+
+# Serial settings
+serial:
+  # Location of CC2531 USB sniffer
+  port: /dev/ttyACM0
+
+# Advanced settings
+advanced:
+  # Let Zigbee2MQTT generate a network key on first start
+  network_key: GENERATE
+  # Let Zigbee2MQTT generate a pan_id on first start
+  pan_id: GENERATE
+  # Let Zigbee2MQTT generate a ext_pan_id on first start
+  ext_pan_id: GENERATE
@@ -1,4 +1,4 @@
-FROM alpine:3.18.0 as base
+FROM alpine:3.18.4 as base

 WORKDIR /app
 RUN apk add --no-cache tzdata eudev tini nodejs
@@ -20,7 +20,7 @@ FROM base as release

 COPY --from=dependencies_and_build /app/node_modules ./node_modules
 COPY dist ./dist
-COPY package.json LICENSE index.js data/configuration.yaml ./
+COPY package.json LICENSE index.js data/configuration.yaml data/configuration.example.yaml ./

 COPY docker/docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
@@ -11,7 +11,7 @@ echo "Using '$DATA' as data directory"

 if [ ! -f "$DATA/configuration.yaml" ]; then
    echo "Creating configuration file..."
-    cp /app/configuration.yaml "$DATA/configuration.yaml"
+    cp /app/configuration.example.yaml "$DATA/configuration.yaml"
 fi

 exec "$@"
@@ -105,7 +105,7 @@ export default class Availability extends Extension {
    override async start(): Promise<void> {
        this.eventBus.onEntityRenamed(this, (data) => {
            if (utils.isAvailabilityEnabledForEntity(data.entity, settings.get())) {
-                this.mqtt.publish(`${data.from}/availability`, null, {retain: true, qos: 0});
+                this.mqtt.publish(`${data.from}/availability`, null, {retain: true, qos: 1});
                this.publishAvailability(data.entity, false, true);
            }
        });
@@ -122,7 +122,7 @@ export default class Availability extends Extension {
    @bind private publishAvailabilityForAllEntities(): void {
        for (const entity of [...this.zigbee.devices(false), ...this.zigbee.groups()]) {
            if (utils.isAvailabilityEnabledForEntity(entity, settings.get())) {
-                // Publish initial availablility
+                // Publish initial availability
                this.publishAvailability(entity, true, false, true);

                if (entity.isDevice()) {
@@ -164,7 +164,7 @@ export default class Availability extends Extension {
        const topic = `${entity.name}/availability`;
        const payload = utils.availabilityPayload(available ? 'online' : 'offline', settings.get());
        this.availabilityCache[entity.ID] = available;
-        this.mqtt.publish(topic, payload, {retain: true, qos: 0});
+        this.mqtt.publish(topic, payload, {retain: true, qos: 1});

        if (!skipGroups && entity.isDevice()) {
            this.zigbee.groups().filter((g) => g.hasMember(entity))
@@ -12,7 +12,7 @@ import Group from '../model/group';
 const legacyApi = settings.get().advanced.legacy_api;
 const legacyTopicRegex = new RegExp(`^${settings.get().mqtt.base_topic}/bridge/(bind|unbind)/.+$`);
 const topicRegex = new RegExp(`^${settings.get().mqtt.base_topic}/bridge/request/device/(bind|unbind)`);
-const clusterCandidates = ['genScenes', 'genOnOff', 'genLevelCtrl', 'lightingColorCtrl', 'closuresWindowCovering',
+const allClusterCandidates = ['genScenes', 'genOnOff', 'genLevelCtrl', 'lightingColorCtrl', 'closuresWindowCovering',
    'hvacThermostat', 'msIlluminanceMeasurement', 'msTemperatureMeasurement', 'msRelativeHumidity',
    'msSoilMoisture', 'msCO2'];

@@ -246,8 +246,8 @@ export default class Bind extends Extension {

            // Find which clusters are supported by both the source and target.
            // Groups are assumed to support all clusters.
+            const clusterCandidates = clusters ?? allClusterCandidates;
            for (const cluster of clusterCandidates) {
-                if (clusters && !clusters.includes(cluster)) continue;
                let matchingClusters = false;

                const anyClusterValid = utils.isZHGroup(bindTarget) || typeof bindTarget === 'number' ||
@@ -23,6 +23,8 @@ type DefinitionPayload = {

 export default class Bridge extends Extension {
    private zigbee2mqttVersion: {commitHash: string, version: string};
+    private zigbeeHerdsmanVersion: {version: string};
+    private zigbeeHerdsmanConvertersVersion: {version: string};
    private coordinatorVersion: zh.CoordinatorVersion;
    private restartRequired = false;
    private lastJoinedDeviceIeeeAddr: string;
@@ -46,6 +48,7 @@ export default class Bridge extends Extension {
            'install_code/add': this.installCodeAdd,
            'touchlink/scan': this.touchlinkScan,
            'health_check': this.healthCheck,
+            'coordinator_check': this.coordinatorCheck,
            'options': this.bridgeOptions,
            // Below are deprecated
            'config/last_seen': this.configLastSeen,
@@ -66,6 +69,8 @@ export default class Bridge extends Extension {
        logger.addTransport(new EventTransport());

        this.zigbee2mqttVersion = await utils.getZigbee2MQTTVersion();
+        this.zigbeeHerdsmanVersion = await utils.getDependencyVersion('zigbee-herdsman');
+        this.zigbeeHerdsmanConvertersVersion = await utils.getDependencyVersion('zigbee-herdsman-converters');
        this.coordinatorVersion = await this.zigbee.getCoordinatorVersion();

        this.eventBus.onEntityRenamed(this, () => this.publishInfo());
@@ -181,6 +186,14 @@ export default class Bridge extends Extension {
        return utils.getResponse(message, {healthy: true}, null);
    }

+    @bind async coordinatorCheck(message: string | KeyValue): Promise<MQTTResponse> {
+        const result = await this.zigbee.coordinatorCheck();
+        const missingRouters = result.missingRouters.map((d) => {
+            return {ieee_address: d.ieeeAddr, friendly_name: d.name};
+        });
+        return utils.getResponse(message, {missing_routers: missingRouters}, null);
+    }
+
    @bind async groupAdd(message: string | KeyValue): Promise<MQTTResponse> {
        if (typeof message === 'object' && !message.hasOwnProperty('friendly_name')) {
            throw new Error(`Invalid payload`);
@@ -573,6 +586,8 @@ export default class Bridge extends Extension {
        const payload = {
            version: this.zigbee2mqttVersion.version,
            commit: this.zigbee2mqttVersion.commitHash,
+            zigbee_herdsman_converters: this.zigbeeHerdsmanConvertersVersion,
+            zigbee_herdsman: this.zigbeeHerdsmanVersion,
            coordinator: {
                ieee_address: this.zigbee.firstCoordinatorEndpoint().getDevice().ieeeAddr,
                ...this.coordinatorVersion,
@@ -9,7 +9,7 @@ abstract class Extension {
    protected addExtension: (extension: Extension) => Promise<void>;

    /**
-     * Besides intializing variables, the constructor should do nothing!
+     * Besides initializing variables, the constructor should do nothing!
     *
     * @param {Zigbee} zigbee Zigbee controller
     * @param {MQTT} mqtt MQTT controller
@@ -119,11 +119,12 @@ export default class Frontend extends Extension {
    }

    @bind private onWebSocketConnection(ws: WebSocket): void {
+        ws.on('error', (msg) => logger.error(`WebSocket error: ${msg.message}`));
        ws.on('message', (data: Buffer, isBinary: boolean) => {
            if (!isBinary && data) {
                const message = data.toString();
                const {topic, payload} = JSON.parse(message);
-                this.mqtt.onMessage(`${this.mqttBaseTopic}/${topic}`, stringify(payload));
+                this.mqtt.onMessage(`${this.mqttBaseTopic}/${topic}`, Buffer.from(stringify(payload)));
            }
        });

@@ -16,6 +16,7 @@ const sensorClick: DiscoveryEntry = {
    object_id: 'click',
    mockProperties: [{property: 'click', value: null}],
    discovery_payload: {
+        name: 'Click',
        icon: 'mdi:toggle-switch',
        value_template: '{{ value_json.click }}',
    },
@@ -42,6 +43,7 @@ const legacyMapping = [
            mockProperties: [{property: 'brightness', value: null}],
            object_id: 'brightness',
            discovery_payload: {
+                name: 'Brightness',
                unit_of_measurement: 'brightness',
                icon: 'mdi:brightness-5',
                value_template: '{{ value_json.brightness }}',
@@ -69,6 +71,7 @@ export default class HomeAssistant extends Extension {
    private statusTopic = settings.get().homeassistant.status_topic;
    private entityAttributes = settings.get().homeassistant.legacy_entity_attributes;
    private zigbee2MQTTVersion: string;
+    private discoveryOrigin: {name: string, sw: string, url: string};

    constructor(zigbee: Zigbee, mqtt: MQTT, state: State, publishEntityState: PublishEntityState,
        eventBus: EventBus, enableDisableExtension: (enable: boolean, name: string) => Promise<void>,
@@ -85,6 +88,7 @@ export default class HomeAssistant extends Extension {
        }

        this.zigbee2MQTTVersion = (await utils.getZigbee2MQTTVersion(false)).version;
+        this.discoveryOrigin = {name: 'Zigbee2MQTT', sw: this.zigbee2MQTTVersion, url: 'https://www.zigbee2mqtt.io'};

        this.eventBus.onDeviceRemoved(this, this.onDeviceRemoved);
        this.eventBus.onMQTTMessage(this, this.onMQTTMessage);
@@ -142,6 +146,7 @@ export default class HomeAssistant extends Extension {
                object_id: endpoint ? `light_${endpoint}` : 'light',
                mockProperties: [{property: state.property, value: null}],
                discovery_payload: {
+                    name: endpoint ? utils.capitalize(endpoint) : null,
                    brightness: !!hasBrightness,
                    schema: 'json',
                    command_topic: true,
@@ -187,6 +192,7 @@ export default class HomeAssistant extends Extension {
                object_id: endpoint ? `switch_${endpoint}` : 'switch',
                mockProperties: [{property: property, value: null}],
                discovery_payload: {
+                    name: endpoint ? utils.capitalize(endpoint) : null,
                    payload_off: state.value_off,
                    payload_on: state.value_on,
                    value_template: `{{ value_json.${property} }}`,
@@ -197,6 +203,7 @@ export default class HomeAssistant extends Extension {

            const different = ['valve_detection', 'window_detection', 'auto_lock', 'away_mode'];
            if (different.includes(property)) {
+                discoveryEntry.discovery_payload.name = firstExpose.label;
                discoveryEntry.discovery_payload.command_topic_postfix = property;
                discoveryEntry.discovery_payload.state_off = state.value_off;
                discoveryEntry.discovery_payload.state_on = state.value_on;
@@ -220,6 +227,7 @@ export default class HomeAssistant extends Extension {
                object_id: endpoint ? `climate_${endpoint}` : 'climate',
                mockProperties: [],
                discovery_payload: {
+                    name: endpoint ? utils.capitalize(endpoint) : null,
                    // Static
                    state_topic: false,
                    temperature_unit: 'C',
@@ -308,6 +316,7 @@ export default class HomeAssistant extends Extension {
                    object_id: endpoint ? `${tempCalibration.name}_${endpoint}` : `${tempCalibration.name}`,
                    mockProperties: [{property: tempCalibration.property, value: null}],
                    discovery_payload: {
+                        name: endpoint ? `${tempCalibration.label} ${endpoint}` : tempCalibration.label,
                        value_template: `{{ value_json.${tempCalibration.property} }}`,
                        command_topic: true,
                        command_topic_prefix: endpoint,
@@ -334,6 +343,7 @@ export default class HomeAssistant extends Extension {
                    object_id: endpoint ? `${piHeatingDemand.name}_${endpoint}` : `${piHeatingDemand.name}`,
                    mockProperties: [{property: piHeatingDemand.property, value: null}],
                    discovery_payload: {
+                        name: endpoint ? `${piHeatingDemand.label} ${endpoint}` : piHeatingDemand.label,
                        value_template: `{{ value_json.${piHeatingDemand.property} }}`,
                        ...(piHeatingDemand.unit && {unit_of_measurement: piHeatingDemand.unit}),
                        entity_category: 'diagnostic',
@@ -354,6 +364,7 @@ export default class HomeAssistant extends Extension {
                object_id: 'lock',
                mockProperties: [{property: state.property, value: null}],
                discovery_payload: {
+                    name: null,
                    command_topic: true,
                    value_template: `{{ value_json.${state.property} }}`,
                },
@@ -361,12 +372,14 @@ export default class HomeAssistant extends Extension {

            if (state.property === 'keypad_lockout') {
                // deprecated: keypad_lockout is messy, but changing is breaking
+                discoveryEntry.discovery_payload.name = firstExpose.label;
                discoveryEntry.discovery_payload.payload_lock = state.value_on;
                discoveryEntry.discovery_payload.payload_unlock = state.value_off;
                discoveryEntry.discovery_payload.state_topic = true;
                discoveryEntry.object_id = 'keypad_lock';
            } else if (state.property === 'child_lock') {
                // deprecated: child_lock is messy, but changing is breaking
+                discoveryEntry.discovery_payload.name = firstExpose.label;
                discoveryEntry.discovery_payload.payload_lock = state.value_on;
                discoveryEntry.discovery_payload.payload_unlock = state.value_off;
                discoveryEntry.discovery_payload.state_locked = 'LOCK';
@@ -399,6 +412,7 @@ export default class HomeAssistant extends Extension {
                mockProperties: [{property: state.property, value: null}],
                object_id: endpoint ? `cover_${endpoint}` : 'cover',
                discovery_payload: {
+                    name: endpoint ? utils.capitalize(endpoint) : null,
                    command_topic_prefix: endpoint,
                    command_topic: true,
                    state_topic: true,
@@ -473,6 +487,7 @@ export default class HomeAssistant extends Extension {
                object_id: 'fan',
                mockProperties: [{property: 'fan_state', value: null}],
                discovery_payload: {
+                    name: null,
                    state_topic: true,
                    state_value_template: '{{ value_json.fan_state }}',
                    command_topic: true,
@@ -584,6 +599,7 @@ export default class HomeAssistant extends Extension {
                        `switch_${firstExpose.name}_${endpoint}` :
                        `switch_${firstExpose.name}`,
                    discovery_payload: {
+                        name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
                        value_template: typeof firstExpose.value_on === 'boolean' ?
                            `{% if value_json.${firstExpose.property} %} true {% else %} false {% endif %}` :
                            `{{ value_json.${firstExpose.property} }}`,
@@ -595,6 +611,10 @@ export default class HomeAssistant extends Extension {
                        ...(lookup[firstExpose.name] || {}),
                    },
                };
+
+                // Let Home Assistant generate entity name when device_class is present
+                if (discoveryEntry.discovery_payload.device_class) delete discoveryEntry.discovery_payload.name;
+
                discoveryEntries.push(discoveryEntry);
            } else {
                const discoveryEntry: DiscoveryEntry = {
@@ -602,22 +622,29 @@ export default class HomeAssistant extends Extension {
                    object_id: endpoint ? `${firstExpose.name}_${endpoint}` : `${firstExpose.name}`,
                    mockProperties: [{property: firstExpose.property, value: null}],
                    discovery_payload: {
+                        name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
                        value_template: `{{ value_json.${firstExpose.property} }}`,
                        payload_on: firstExpose.value_on,
                        payload_off: firstExpose.value_off,
                        ...(lookup[firstExpose.name] || {}),
                    },
                };
+
+                // Let Home Assistant generate entity name when device_class is present
+                if (discoveryEntry.discovery_payload.device_class) delete discoveryEntry.discovery_payload.name;
+
                discoveryEntries.push(discoveryEntry);
            }
        } else if (firstExpose.type === 'numeric') {
            const lookup: {[s: string]: KeyValue} = {
                ac_frequency: {device_class: 'frequency', enabled_by_default: false, entity_category: 'diagnostic',
                    state_class: 'measurement'},
-                alarm_humidity_max: {device_class: 'humidity', icon: 'mdi:water-plus'},
-                alarm_humidity_min: {device_class: 'humidity', icon: 'mdi:water-minus'},
-                alarm_temperature_max: {device_class: 'temperature', icon: 'mdi:thermometer-high'},
-                alarm_temperature_min: {device_class: 'temperature', icon: 'mdi:thermometer-low'},
+                alarm_humidity_max: {device_class: 'humidity', entity_category: 'config', icon: 'mdi:water-plus'},
+                alarm_humidity_min: {device_class: 'humidity', entity_category: 'config', icon: 'mdi:water-minus'},
+                alarm_temperature_max: {device_class: 'temperature', entity_category: 'config',
+                    icon: 'mdi:thermometer-high'},
+                alarm_temperature_min: {device_class: 'temperature', entity_category: 'config',
+                    icon: 'mdi:thermometer-low'},
                angle: {icon: 'angle-acute'},
                angle_axis: {icon: 'angle-acute'},
                aqi: {device_class: 'aqi', state_class: 'measurement'},
@@ -626,7 +653,8 @@ export default class HomeAssistant extends Extension {
                away_preset_temperature: {entity_category: 'config', icon: 'mdi:thermometer'},
                battery: {device_class: 'battery', entity_category: 'diagnostic', state_class: 'measurement'},
                battery2: {device_class: 'battery', entity_category: 'diagnostic', state_class: 'measurement'},
-                battery_voltage: {device_class: 'voltage', entity_category: 'diagnostic', state_class: 'measurement'},
+                battery_voltage: {device_class: 'voltage', entity_category: 'diagnostic', state_class: 'measurement',
+                    enabled_by_default: true},
                boost_heating_countdown: {device_class: 'duration'},
                boost_heating_countdown_time_set: {entity_category: 'config', icon: 'mdi:timer'},
                boost_time: {entity_category: 'config', icon: 'mdi:timer'},
@@ -695,7 +723,7 @@ export default class HomeAssistant extends Extension {
                power_factor: {device_class: 'power_factor', enabled_by_default: false,
                    entity_category: 'diagnostic', state_class: 'measurement'},
                precision: {entity_category: 'config', icon: 'mdi:decimal-comma-increase'},
-                pressure: {device_class: 'pressure', state_class: 'measurement'},
+                pressure: {device_class: 'atmospheric_pressure', state_class: 'measurement'},
                presence_timeout: {entity_category: 'config', icon: 'mdi:timer'},
                reporting_time: {entity_category: 'config', icon: 'mdi:clock-time-one-outline'},
                requested_brightness_level: {
@@ -705,7 +733,7 @@ export default class HomeAssistant extends Extension {
                    enabled_by_default: false, entity_category: 'diagnostic', icon: 'mdi:brightness-5',
                },
                smoke_density: {icon: 'mdi:google-circles-communities', state_class: 'measurement'},
-                soil_moisture: {icon: 'mdi:water-percent', state_class: 'measurement'},
+                soil_moisture: {device_class: 'moisture', state_class: 'measurement'},
                temperature: {device_class: 'temperature', state_class: 'measurement'},
                temperature_calibration: {entity_category: 'config', icon: 'mdi:wrench-clock'},
                temperature_max: {entity_category: 'config', icon: 'mdi:thermometer-plus'},
@@ -732,6 +760,10 @@ export default class HomeAssistant extends Extension {
                    entity_category: 'diagnostic',
                    state_class: 'measurement',
                },
+                water_consumed: {
+                    device_class: 'water',
+                    state_class: 'total_increasing',
+                },
                x_axis: {icon: 'mdi:axis-x-arrow'},
                y_axis: {icon: 'mdi:axis-y-arrow'},
                z_axis: {icon: 'mdi:axis-z-arrow'},
@@ -751,6 +783,7 @@ export default class HomeAssistant extends Extension {
                object_id: endpoint ? `${firstExpose.name}_${endpoint}` : `${firstExpose.name}`,
                mockProperties: [{property: firstExpose.property, value: null}],
                discovery_payload: {
+                    name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
                    value_template: `{{ value_json.${firstExpose.property} }}`,
                    enabled_by_default: !allowsSet,
                    ...(firstExpose.unit && {unit_of_measurement: firstExpose.unit}),
@@ -772,6 +805,9 @@ export default class HomeAssistant extends Extension {
                delete discoveryEntry.discovery_payload.device_class;
            }

+            // Let Home Assistant generate entity name when device_class is present
+            if (discoveryEntry.discovery_payload.device_class) delete discoveryEntry.discovery_payload.name;
+
            discoveryEntries.push(discoveryEntry);

            /**
@@ -785,6 +821,7 @@ export default class HomeAssistant extends Extension {
                    object_id: endpoint ? `${firstExpose.name}_${endpoint}` : `${firstExpose.name}`,
                    mockProperties: [{property: firstExpose.property, value: null}],
                    discovery_payload: {
+                        name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
                        value_template: `{{ value_json.${firstExpose.property} }}`,
                        command_topic: true,
                        command_topic_prefix: endpoint,
@@ -801,6 +838,9 @@ export default class HomeAssistant extends Extension {
                    delete discoveryEntry.discovery_payload.device_class;
                }

+                // Let Home Assistant generate entity name when device_class is present
+                if (discoveryEntry.discovery_payload.device_class) delete discoveryEntry.discovery_payload.name;
+
                if (firstExpose.value_min != null) discoveryEntry.discovery_payload.min = firstExpose.value_min;
                if (firstExpose.value_max != null) discoveryEntry.discovery_payload.max = firstExpose.value_max;

@@ -809,20 +849,20 @@ export default class HomeAssistant extends Extension {
        } else if (firstExpose.type === 'enum') {
            const lookup: {[s: string]: KeyValue} = {
                action: {icon: 'mdi:gesture-double-tap'},
-                alarm_humidity: {icon: 'mdi:water-percent-alert'},
-                alarm_temperature: {icon: 'mdi:thermometer-alert'},
+                alarm_humidity: {entity_category: 'config', icon: 'mdi:water-percent-alert'},
+                alarm_temperature: {entity_category: 'config', icon: 'mdi:thermometer-alert'},
                backlight_auto_dim: {entity_category: 'config', icon: 'mdi:brightness-auto'},
                backlight_mode: {entity_category: 'config', icon: 'mdi:lightbulb'},
                color_power_on_behavior: {entity_category: 'config', icon: 'mdi:palette'},
                control_mode: {entity_category: 'config', icon: 'mdi:tune'},
                device_mode: {entity_category: 'config', icon: 'mdi:tune'},
                effect: {enabled_by_default: false, icon: 'mdi:palette'},
-                force: {enabled_by_default: false, icon: 'mdi:valve'},
+                force: {entity_category: 'config', icon: 'mdi:valve'},
                keep_time: {entity_category: 'config', icon: 'mdi:av-timer'},
                keypad_lockout: {entity_category: 'config', icon: 'mdi:lock'},
                load_detection_mode: {entity_category: 'config', icon: 'mdi:tune'},
-                load_dimmable: {entity_category: 'diagnostic', icon: 'mdi:chart-bell-curve'},
-                load_type: {entity_category: 'diagnostic', icon: 'mdi:led-on'},
+                load_dimmable: {entity_category: 'config', icon: 'mdi:chart-bell-curve'},
+                load_type: {entity_category: 'config', icon: 'mdi:led-on'},
                melody: {entity_category: 'config', icon: 'mdi:music-note'},
                mode_phase_control: {entity_category: 'config', icon: 'mdi:tune'},
                mode: {entity_category: 'config', icon: 'mdi:tune'},
@@ -830,8 +870,8 @@ export default class HomeAssistant extends Extension {
                operation_mode: {entity_category: 'config', icon: 'mdi:tune'},
                power_on_behavior: {entity_category: 'config', icon: 'mdi:power-settings'},
                power_outage_memory: {entity_category: 'config', icon: 'mdi:power-settings'},
-                power_supply_mode: {entity_category: 'diagnostic', icon: 'mdi:power-settings'},
-                power_type: {entity_category: 'diagnostic', icon: 'mdi:lightning-bolt-circle'},
+                power_supply_mode: {entity_category: 'config', icon: 'mdi:power-settings'},
+                power_type: {entity_category: 'config', icon: 'mdi:lightning-bolt-circle'},
                sensitivity: {entity_category: 'config', icon: 'mdi:tune'},
                sensors_type: {entity_category: 'config', icon: 'mdi:tune'},
                sound_volume: {entity_category: 'config', icon: 'mdi:volume-high'},
@@ -852,6 +892,7 @@ export default class HomeAssistant extends Extension {
                    object_id: firstExpose.property,
                    mockProperties: [{property: firstExpose.property, value: null}],
                    discovery_payload: {
+                        name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
                        value_template: valueTemplate,
                        enabled_by_default: !(firstExpose.access & ACCESS_SET),
                        ...lookup[firstExpose.name],
@@ -864,12 +905,13 @@ export default class HomeAssistant extends Extension {
             * Note: currently both sensor and select are discovered, this is to avoid
             * breaking changes for sensors already existing in HA (legacy).
             */
-            if ((firstExpose.access & ACCESS_SET)) {
+            if (firstExpose.access & ACCESS_SET) {
                discoveryEntries.push({
                    type: 'select',
                    object_id: firstExpose.property,
                    mockProperties: [], // Already mocked above in case access STATE is supported
                    discovery_payload: {
+                        name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
                        value_template: valueTemplate,
                        state_topic: !!(firstExpose.access & ACCESS_STATE),
                        command_topic_prefix: endpoint,
@@ -881,35 +923,64 @@ export default class HomeAssistant extends Extension {
                });
            }
        } else if (firstExpose.type === 'text' || firstExpose.type === 'composite' || firstExpose.type === 'list') {
+            // Deprecated: remove text sensor
+            const settableText = firstExpose.type === 'text' && firstExpose.access & ACCESS_SET;
+            const lookup: {[s: string]: KeyValue} = {
+                action: {icon: 'mdi:gesture-double-tap'},
+                programming_mode: {icon: 'mdi:calendar-clock'},
+                program: {value_template: `{{ value_json.${firstExpose.property}|default('',true) ` +
+                    `| truncate(254, True, '', 0) }}`},
+            };
            if (firstExpose.access & ACCESS_STATE) {
-                const lookup: {[s: string]: KeyValue} = {
-                    action: {icon: 'mdi:gesture-double-tap'},
-                    programming_mode: {icon: 'mdi:calendar-clock'},
-                    program: {value_template: `{{ value_json.${firstExpose.property} | truncate(254, True, '', 0) }}`},
-                };
-
                const discoveryEntry: DiscoveryEntry = {
                    type: 'sensor',
                    object_id: firstExpose.property,
                    mockProperties: [{property: firstExpose.property, value: null}],
                    discovery_payload: {
+                        name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
                        value_template: `{{ value_json.${firstExpose.property} }}`,
+                        enabled_by_default: !settableText,
                        ...lookup[firstExpose.name],
                    },
                };
                discoveryEntries.push(discoveryEntry);
            }
+            if (settableText) {
+                discoveryEntries.push({
+                    type: 'text',
+                    object_id: firstExpose.property,
+                    mockProperties: [], // Already mocked above in case access STATE is supported
+                    discovery_payload: {
+                        name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                        state_topic: firstExpose.access & ACCESS_STATE,
+                        value_template: `{{ value_json.${firstExpose.property} }}`,
+                        command_topic_prefix: endpoint,
+                        command_topic: true,
+                        command_topic_postfix: firstExpose.property,
+                        ...lookup[firstExpose.name],
+                    },
+                });
+            }
        } else {
            throw new Error(`Unsupported exposes type: '${firstExpose.type}'`);
        }

+        discoveryEntries.forEach((d) => {
+            // If a sensor has entity category `config`, then change
+            // it to `diagnostic`. Sensors have no input, so can't be configured.
+            // https://github.com/Koenkk/zigbee2mqtt/pull/19474
+            if (d.type === 'sensor' && d.discovery_payload.entity_category === 'config') {
+                d.discovery_payload.entity_category = 'diagnostic';
+            }
+        });
+
        return discoveryEntries;
    }

    @bind onDeviceRemoved(data: eventdata.DeviceRemoved): void {
        logger.debug(`Clearing Home Assistant discovery topic for '${data.name}'`);
        this.discovered[data.ieeeAddr]?.topics.forEach((topic) => {
-            this.mqtt.publish(topic, null, {retain: true, qos: 0}, this.discoveryTopic, false, false);
+            this.mqtt.publish(topic, null, {retain: true, qos: 1}, this.discoveryTopic, false, false);
        });

        delete this.discovered[data.ieeeAddr];
@@ -990,7 +1061,7 @@ export default class HomeAssistant extends Extension {
        if (data.homeAssisantRename) {
            for (const config of this.getConfigs(data.entity)) {
                const topic = this.getDiscoveryTopic(config, data.entity);
-                this.mqtt.publish(topic, null, {retain: true, qos: 0}, this.discoveryTopic, false, false);
+                this.mqtt.publish(topic, null, {retain: true, qos: 1}, this.discoveryTopic, false, false);
            }

            // Make sure Home Assistant deletes the old entity first otherwise another one (_2) is created
@@ -1044,7 +1115,7 @@ export default class HomeAssistant extends Extension {
                    for (const expose of exposes.filter((e) => groupSupportedTypes.includes(e.type))) {
                        let key = expose.type;
                        if (['switch', 'lock', 'cover'].includes(expose.type) && expose.endpoint) {
-                            // A device can have multiple of these types which have to discovered seperately.
+                            // A device can have multiple of these types which have to discovered separately.
                            // e.g. switch with property state and valve_detection.
                            const state = expose.features.find((f) => f.name === 'state');
                            key += featurePropertyWithoutEndpoint(state);
@@ -1065,6 +1136,7 @@ export default class HomeAssistant extends Extension {
                object_id: 'last_seen',
                mockProperties: [{property: 'last_seen', value: null}],
                discovery_payload: {
+                    name: 'Last seen',
                    value_template: '{{ value_json.last_seen }}',
                    icon: 'mdi:clock',
                    enabled_by_default: false,
@@ -1086,6 +1158,7 @@ export default class HomeAssistant extends Extension {
                object_id: 'update_state',
                mockProperties: [], // update is mocked below with updateSensor
                discovery_payload: {
+                    name: 'Update state',
                    icon: 'mdi:update',
                    value_template: `{{ value_json['update']['state'] }}`,
                    enabled_by_default: false,
@@ -1099,6 +1172,7 @@ export default class HomeAssistant extends Extension {
                object_id: 'update_available',
                mockProperties: [{property: 'update_available', value: null}],
                discovery_payload: {
+                    name: null,
                    payload_on: true,
                    payload_off: false,
                    value_template: `{{ value_json['update']['state'] == "available" }}`,
@@ -1113,14 +1187,18 @@ export default class HomeAssistant extends Extension {
                object_id: 'update',
                mockProperties: [{property: 'update', value: {state: null}}],
                discovery_payload: {
+                    name: null,
                    entity_picture: 'https://github.com/Koenkk/zigbee2mqtt/raw/master/images/logo.png',
                    latest_version_topic: true,
                    state_topic: true,
                    device_class: 'firmware',
+                    entity_category: 'config',
                    command_topic: `${settings.get().mqtt.base_topic}/bridge/request/device/ota_update/update`,
                    payload_install: `{"id": "${entity.ieeeAddr}"}`,
                    value_template: `{{ value_json['update']['installed_version'] }}`,
                    latest_version_template: `{{ value_json['update']['latest_version'] }}`,
+                    json_attributes_topic: `${settings.get().mqtt.base_topic}/${entity.name}`, // state topic
+                    json_attributes_template: `{"in_progress": "{{ value_json['update']['state'] == 'updating' }}"}`,
                },
            };
            configs.push(updateSensor);
@@ -1201,20 +1279,20 @@ export default class HomeAssistant extends Extension {

            const devicePayload = this.getDevicePayload(entity);

-            // Set (unique) name, separate by space if device name contains space.
-            const nameSeparator = devicePayload.name.includes('_') ? '_' : ' ';
-            payload.name = devicePayload.name;
+            // Suggest object_id (entity_id) for entity
+            payload.object_id = devicePayload.name.replace(/\s+/g, '_').toLowerCase();
            if (config.object_id.startsWith(config.type) && config.object_id.includes('_')) {
-                payload.name += `${nameSeparator}${config.object_id.split(/_(.+)/)[1]}`;
+                payload.object_id += `_${config.object_id.split(/_(.+)/)[1]}`;
            } else if (!config.object_id.startsWith(config.type)) {
-                payload.name += `${nameSeparator}${config.object_id.replace(/_/g, nameSeparator)}`;
+                payload.object_id += `_${config.object_id}`;
            }

            // Set unique_id
            payload.unique_id = `${entity.options.ID}_${config.object_id}_${settings.get().mqtt.base_topic}`;

-            // Attributes for device registry
+            // Attributes for device registry and origin
            payload.device = devicePayload;
+            payload.origin = this.discoveryOrigin;

            // Availability payload
            payload.availability = [{topic: `${settings.get().mqtt.base_topic}/bridge/state`}];
@@ -1359,7 +1437,7 @@ export default class HomeAssistant extends Extension {
            }

            const topic = this.getDiscoveryTopic(config, entity);
-            this.mqtt.publish(topic, stringify(payload), {retain: true, qos: 0}, this.discoveryTopic, false, false);
+            this.mqtt.publish(topic, stringify(payload), {retain: true, qos: 1}, this.discoveryTopic, false, false);
            this.discovered[discoverKey].topics.add(topic);
            this.discovered[discoverKey].objectIDs.add(config.object_id);
            config.mockProperties?.forEach((mockProperty) =>
@@ -1419,7 +1497,7 @@ export default class HomeAssistant extends Extension {
            if (clear) {
                logger.debug(`Clearing Home Assistant config '${data.topic}'`);
                const topic = data.topic.substring(this.discoveryTopic.length + 1);
-                this.mqtt.publish(topic, null, {retain: true, qos: 0}, this.discoveryTopic, false, false);
+                this.mqtt.publish(topic, null, {retain: true, qos: 1}, this.discoveryTopic, false, false);
            }
        } else if ((data.topic === this.statusTopic || data.topic === defaultStatusTopic) &&
            data.message.toLowerCase() === 'online') {
@@ -1537,9 +1615,10 @@ export default class HomeAssistant extends Extension {
            payload: value,
            topic: `${settings.get().mqtt.base_topic}/${device.name}/${key}`,
            device: this.getDevicePayload(device),
+            origin: this.discoveryOrigin,
        };

-        await this.mqtt.publish(topic, stringify(payload), {retain: true, qos: 0}, this.discoveryTopic, false, false);
+        await this.mqtt.publish(topic, stringify(payload), {retain: true, qos: 1}, this.discoveryTopic, false, false);
        this.discoveredTriggers[device.ieeeAddr].add(discoveredKey);
    }

@@ -9,7 +9,7 @@ import Extension from '../extension';
 * This extensions soft resets the ZNP after a certain timeout.
 */
 export default class SoftReset extends Extension {
-    private timer: NodeJS.Timer = null;
+    private timer: NodeJS.Timeout = null;
    private timeout = utils.seconds(settings.get().advanced.soft_reset_timeout);

    override async start(): Promise<void> {
@@ -2,8 +2,8 @@ import * as settings from '../util/settings';
 import logger from '../util/logger';
 import stringify from 'json-stable-stringify-without-jsonify';
 import utils from '../util/utils';
-import tradfriOTA from 'zigbee-herdsman-converters/lib/ota/tradfri';
-import zigbeeOTA from 'zigbee-herdsman-converters/lib/ota/zigbeeOTA';
+import * as tradfriOTA from 'zigbee-herdsman-converters/lib/ota/tradfri';
+import * as zigbeeOTA from 'zigbee-herdsman-converters/lib/ota/zigbeeOTA';
 import Extension from './extension';
 import bind from 'bind-decorator';
 import Device from '../model/device';
@@ -119,7 +119,8 @@ export default class OTAUpdate extends Extension {

        // Respond to the OTA request: respond with NO_IMAGE_AVAILABLE (0x98) (so the client stops requesting OTAs)
        const endpoint = data.device.zh.endpoints.find((e) => e.supportsOutputCluster('genOta')) || data.endpoint;
-        await endpoint.commandResponse('genOta', 'queryNextImageResponse', {status: 0x98});
+        await endpoint.commandResponse('genOta', 'queryNextImageResponse',
+            {status: 0x98}, undefined, data.meta.zclTransactionSequenceNumber);
        logger.debug(`Responded to OTA request of '${data.device.name}' with 'NO_IMAGE_AVAILABLE'`);
    }

@@ -1,7 +1,7 @@

 import * as settings from '../util/settings';
 import zigbeeHerdsmanConverters from 'zigbee-herdsman-converters';
-import philips from 'zigbee-herdsman-converters/lib/philips';
+import * as philips from 'zigbee-herdsman-converters/lib/philips';
 import logger from '../util/logger';
 import utils from '../util/utils';
 import Extension from './extension';
@@ -13,7 +13,7 @@ import bind from 'bind-decorator';
 const topicRegex = new RegExp(`^(.+?)(?:/(${utils.endpointNames.join('|')}|\\d+))?/(get|set)(?:/(.+))?`);
 const propertyEndpointRegex = new RegExp(`^(.*?)_(${utils.endpointNames.join('|')})$`);
 const stateValues = ['on', 'off', 'toggle', 'open', 'close', 'stop', 'lock', 'unlock'];
-const sceneConverterKeys = ['scene_store', 'scene_add', 'scene_remove', 'scene_remove_all'];
+const sceneConverterKeys = ['scene_store', 'scene_add', 'scene_remove', 'scene_remove_all', 'scene_rename'];

 // Legacy: don't provide default converters anymore, this is required by older z2m installs not saving group members
 const defaultGroupConverters = [
@@ -144,6 +144,7 @@ export default class Publish extends Extension {
        {
            if (Array.isArray(definition)) {
                const c = new Set(definition.map((d) => d.toZigbee).flat());
+                // @ts-expect-error
                if (c.size == 0) converters = defaultGroupConverters;
                else converters = Array.from(c);
            } else if (definition) {
@@ -1,9 +1,10 @@
-import mqtt from 'mqtt';
+import * as mqtt from 'mqtt';
 import logger from './util/logger';
 import * as settings from './util/settings';
 import utils from './util/utils';
 import fs from 'fs';
 import bind from 'bind-decorator';
+import type {QoS} from 'mqtt-packet';

 export default class MQTT {
    private publishedTopics: Set<string> = new Set();
@@ -11,7 +12,7 @@ export default class MQTT {
    private client: mqtt.MqttClient;
    private eventBus: EventBus;
    private initialConnect = true;
-    private republishRetainedTimer: NodeJS.Timer;
+    private republishRetainedTimer: NodeJS.Timeout;
    private retainedMessages: {[s: string]: {payload: string, options: MQTTOptions,
        skipLog: boolean, skipReceive: boolean, topic: string, base: string}} = {};

@@ -26,7 +27,7 @@ export default class MQTT {
        const options: mqtt.IClientOptions = {
            will: {
                topic: `${settings.get().mqtt.base_topic}/bridge/state`,
-                payload: utils.availabilityPayload('offline', settings.get()),
+                payload: Buffer.from(utils.availabilityPayload('offline', settings.get())),
                retain: settings.get().mqtt.force_disable_retain ? false : true,
                qos: 1,
            },
@@ -133,14 +134,14 @@ export default class MQTT {
        this.client.subscribe(topic);
    }

-    @bind public onMessage(topic: string, message: string): void {
+    @bind public onMessage(topic: string, message: Buffer): void {
        // Since we subscribe to zigbee2mqtt/# we also receive the message we send ourselves, skip these.
        if (!this.publishedTopics.has(topic)) {
-            logger.debug(`Received MQTT message on '${topic}' with data '${message}'`);
-            this.eventBus.emitMQTTMessage({topic, message: message + ''});
+            logger.debug(`Received MQTT message on '${topic}' with data '${message.toString()}'`);
+            this.eventBus.emitMQTTMessage({topic, message: message.toString()});
        }

-        if (this.republishRetainedTimer && topic == `${settings.get().mqtt.base_topic}/bridge/state`) {
+        if (this.republishRetainedTimer && topic === `${settings.get().mqtt.base_topic}/bridge/info`) {
            clearTimeout(this.republishRetainedTimer);
            this.republishRetainedTimer = null;
        }
@@ -153,7 +154,7 @@ export default class MQTT {
    async publish(topic: string, payload: string, options: MQTTOptions={},
        base=settings.get().mqtt.base_topic, skipLog=false, skipReceive=true,
    ): Promise<void> {
-        const defaultOptions: {qos: mqtt.QoS, retain: boolean} = {qos: 0, retain: false};
+        const defaultOptions: {qos: QoS, retain: boolean} = {qos: 0, retain: false};
        topic = `${base}/${topic}`;

        if (skipReceive) {
@@ -16,7 +16,7 @@ const dontCacheProperties = [
 class State {
    private state: {[s: string | number]: KeyValue} = {};
    private file = data.joinPath('state.json');
-    private timer: NodeJS.Timer = null;
+    private timer: NodeJS.Timeout = null;

    constructor(private readonly eventBus: EventBus, private readonly zigbee: Zigbee) {
        this.eventBus = eventBus;
@@ -17,6 +17,10 @@ import type {
    Cluster as ZHCluster,
 } from 'zigbee-herdsman/dist/zcl/tstype';

+import type {
+    FrameControl as ZHFrameControl,
+} from 'zigbee-herdsman/dist/zcl';
+
 import type * as ZHEvents from 'zigbee-herdsman/dist/controller/events';

 import type TypeEventBus from 'lib/eventBus';
@@ -27,7 +31,7 @@ import type TypeDevice from 'lib/model/device';
 import type TypeGroup from 'lib/model/group';
 import type TypeExtension from 'lib/extension/extension';

-import type mqtt from 'mqtt';
+import type {QoS} from 'mqtt-packet';

 declare global {
    // Define some class types as global
@@ -41,7 +45,7 @@ declare global {

    // Types
    interface MQTTResponse {data: KeyValue, status: 'error' | 'ok', error?: string, transaction?: string}
-    interface MQTTOptions {qos?: mqtt.QoS, retain?: boolean, properties?: {messageExpiryInterval: number}}
+    interface MQTTOptions {qos?: QoS, retain?: boolean, properties?: {messageExpiryInterval: number}}
    type StateChangeReason = 'publishDebounce' | 'groupOptimistic' | 'lastSeenChanged' | 'publishCached';
    type PublishEntityState = (entity: Device | Group, payload: KeyValue,
        stateChangeReason?: StateChangeReason) => Promise<void>;
@@ -94,12 +98,12 @@ declare global {
                meta: {state: KeyValue, logger: Logger, device: zh.Device}) => Promise<KeyValue>,
        }

-        interface DefinitionExposeFeature {name: string, endpoint?: string,
+        interface DefinitionExposeFeature {name: string, label: string, endpoint?: string,
            property: string, value_max?: number, value_min?: number, unit?: string,
            value_off?: string, value_on?: string, value_step?: number, values: string[], access: number}

        interface DefinitionExpose {
-            type: string, name?: string, features?: DefinitionExposeFeature[],
+            type: string, name?: string, label?: string, features?: DefinitionExposeFeature[],
            endpoint?: string, values?: string[], value_off?: string, value_on?: string, value_step?: number,
            access: number, property: string, unit?: string,
            value_min?: number, value_max?: number}
@@ -162,7 +166,7 @@ declare global {
            groupID: number;
            cluster: string | number;
            data: KeyValue | Array<string | number>;
-            meta: {zclTransactionSequenceNumber?: number;};
+            meta: {zclTransactionSequenceNumber?: number; manufacturerCode?: number; frameControl?: ZHFrameControl;};
        };
    }

@@ -185,7 +189,7 @@ declare global {
            base_topic: string,
            include_device_information: boolean,
            force_disable_retain: boolean
-            version?: number,
+            version?: 3 | 4 | 5,
            user?: string,
            password?: string,
            server: string,
@@ -253,7 +257,7 @@ declare global {
            log_level: 'debug' | 'info' | 'error' | 'warn',
            log_syslog: KeyValue,
            pan_id: number | 'GENERATE',
-            ext_pan_id: number[],
+            ext_pan_id: number[] | 'GENERATE',
            channel: number,
            adapter_concurrent: number | null,
            adapter_delay: number | null,
@@ -7,16 +7,3 @@ declare module 'zigbee-herdsman-converters' {
    export function onEvent(type: string, data: KeyValue, device: zh.Device, settings: KeyValue,
        state: KeyValue): Promise<void>;
 }
-
-declare module 'zigbee-herdsman-converters/lib/ota/tradfri' {
-    export function useTestURL(): void;
-}
-
-declare module 'zigbee-herdsman-converters/lib/ota/zigbeeOTA' {
-    export function useIndexOverride(indexFileName: string): void;
-    export function setDataDir(dataDir: string): void;
-}
-
-declare module 'zigbee-herdsman-converters/lib/philips' {
-    export const tz: {[s: string]: zhc.ToZigbeeConverter};
-}
@@ -449,7 +449,7 @@
          "type": "boolean",
          "title": "Legacy availability payload",
          "requiresRestart": true,
-          "description": "Payload to be used for device availabilty and bridge/state topics. true = text, false = JSON",
+          "description": "Payload to be used for device availability and bridge/state topics. true = text, false = JSON",
          "default": true
        },
        "log_rotation": {
@@ -582,10 +582,18 @@
          "description": "ZigBee pan ID, changing requires repairing all devices!"
        },
        "ext_pan_id": {
-          "type": "array",
-          "items": {
-            "type": "number"
-          },
+          "oneOf": [{
+            "type": "string",
+            "title": "Extended pan ID (string)"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "number"
+              },
+              "title": "Extended pan ID (array)"
+            }
+          ],
          "title": "Ext Pan ID",
          "requiresRestart": true,
          "description": "Zigbee extended pan ID, changing requires repairing all devices!"
@@ -904,7 +912,7 @@
          "title": "Group off state",
          "default": "auto",
          "requiresRestart": true,
-          "description": "Control when to publish state OFF for a group. 'all_members_off': only publish state OFF when all group memebers are in state OFF, 'last_member_state': publish state OFF whenever one of its members changes to OFF"
+          "description": "Control when to publish state OFF for a group. 'all_members_off': only publish state OFF when all group members are in state OFF, 'last_member_state': publish state OFF whenever one of its members changes to OFF"
        },
        "filtered_attributes": {
          "type": "array",
@@ -285,6 +285,11 @@ export function validate(): string[] {
        errors.push(`advanced.pan_id: should be number or 'GENERATE' (is '${_settings.advanced.pan_id}')`);
    }

+    if (_settings.advanced && _settings.advanced.ext_pan_id && typeof _settings.advanced.ext_pan_id === 'string' &&
+        _settings.advanced.ext_pan_id !== 'GENERATE') {
+        errors.push(`advanced.ext_pan_id: should be array or 'GENERATE' (is '${_settings.advanced.ext_pan_id}')`);
+    }
+
    // Verify that all friendly names are unique
    const names: string[] = [];
    const check = (e: DeviceOptions | GroupOptions): void => {
@@ -35,6 +35,8 @@ const endpointNames = [
    'ep1', 'ep2', 'row_1', 'row_2', 'row_3', 'row_4', 'relay', 'usb',
    'l1', 'l2', 'l3', 'l4', 'l5', 'l6', 'l7', 'l8',
    'l9', 'l10', 'l11', 'l12', 'l13', 'l14', 'l15', 'l16',
+    'l17', 'l18', 'l19', 'l20', 'l21', 'l22', 'l23', 'l24',
+    'th1', 'th2', 'th3', 'th4', 'th5', 'th6', 'th7', 'th8', 'th9', 'th10',
    'button_1', 'button_2', 'button_3', 'button_4', 'button_5',
    'button_6', 'button_7', 'button_8', 'button_9', 'button_10',
    'button_11', 'button_12', 'button_13', 'button_14', 'button_15',
@@ -79,7 +81,9 @@ async function getZigbee2MQTTVersion(includeCommitHash=true): Promise<{commitHas
 }

 async function getDependencyVersion(depend: string): Promise<{version: string}> {
-    const packageJSON = await import(path.join(require.resolve(depend), '..', '..', 'package.json'));
+    const modulePath = path.dirname(require.resolve(depend));
+    const packageJSONPath = path.join(modulePath.slice(0, modulePath.indexOf(depend) + depend.length), 'package.json');
+    const packageJSON = await import(packageJSONPath);
    const version = packageJSON.version;
    return {version};
 }
@@ -9,6 +9,7 @@ import Device from './model/device';
 import Group from './model/group';
 import * as ZHEvents from 'zigbee-herdsman/dist/controller/events';
 import bind from 'bind-decorator';
+import {randomInt} from 'crypto';

 export default class Zigbee {
    private herdsman: Controller;
@@ -27,7 +28,8 @@ export default class Zigbee {
            network: {
                panID: settings.get().advanced.pan_id === 'GENERATE' ?
                    this.generatePanID() : settings.get().advanced.pan_id as number,
-                extendedPanID: settings.get().advanced.ext_pan_id,
+                extendedPanID: settings.get().advanced.ext_pan_id === 'GENERATE' ?
+                    this.generateExtPanID() : settings.get().advanced.ext_pan_id as number[],
                channelList: [settings.get().advanced.channel],
                networkKey: settings.get().advanced.network_key === 'GENERATE' ?
                    this.generateNetworkKey() : settings.get().advanced.network_key as number[],
@@ -164,13 +166,19 @@ export default class Zigbee {
    }

    private generateNetworkKey(): number[] {
-        const key = Array.from({length: 16}, () => Math.floor(Math.random() * 255));
+        const key = Array.from({length: 16}, () => randomInt(256));
        settings.set(['advanced', 'network_key'], key);
        return key;
    }

+    private generateExtPanID(): number[] {
+        const key = Array.from({length: 8}, () => randomInt(256));
+        settings.set(['advanced', 'ext_pan_id'], key);
+        return key;
+    }
+
    private generatePanID(): number {
-        const panID = Math.floor(Math.random() * (0xFFFF - 2)) + 1;
+        const panID = randomInt(1, 0xFFFF - 1);
        settings.set(['advanced', 'pan_id'], panID);
        return panID;
    }
@@ -187,6 +195,11 @@ export default class Zigbee {
        return this.herdsman.backup();
    }

+    async coordinatorCheck(): Promise<{missingRouters: Device[]}> {
+        const check = await this.herdsman.coordinatorCheck();
+        return {missingRouters: check.missingRouters.map((d) => this.resolveDevice(d.ieeeAddr))};
+    }
+
    async getNetworkParameters(): Promise<zh.NetworkParameters> {
        return this.herdsman.getNetworkParameters();
    }
@@ -1,6 +1,6 @@
 {
  "name": "zigbee2mqtt",
-  "version": "1.31.1",
+  "version": "1.33.2",
  "description": "Zigbee to MQTT bridge using Zigbee-herdsman",
  "main": "index.js",
  "repository": {
@@ -8,7 +8,7 @@
    "url": "git+https://github.com/Koenkk/zigbee2mqtt.git"
  },
  "engines": {
-    "node": "^14 || ^16 || ^18 || ^19 || ^20"
+    "node": "^16 || ^18 || ^19 || ^20"
  },
  "keywords": [
    "xiaomi",
@@ -26,7 +26,9 @@
    "start": "node index.js",
    "test-with-coverage": "jest test --coverage",
    "test": "jest test",
-    "test-watch": "jest test --watch"
+    "test-watch": "jest test --watch",
+    "clean": "rimraf coverage dist tsconfig.tsbuildinfo",
+    "prepack": "npm run clean && npm run build"
  },
  "author": "Koen Kanters",
  "license": "GPL-3.0",
@@ -43,49 +45,51 @@
    "fast-deep-equal": "^3.1.3",
    "finalhandler": "^1.2.0",
    "git-last-commit": "^1.0.1",
-    "humanize-duration": "^3.28.0",
+    "humanize-duration": "^3.30.0",
    "js-yaml": "^4.1.0",
    "json-stable-stringify-without-jsonify": "^1.0.1",
    "jszip": "^3.10.1",
    "mkdir-recursive": "^0.4.0",
    "moment": "^2.29.4",
-    "mqtt": "4.3.7",
+    "mqtt": "5.1.3",
    "object-assign-deep": "^0.4.0",
-    "rimraf": "^5.0.1",
-    "semver": "^7.5.1",
+    "rimraf": "^5.0.5",
+    "semver": "^7.5.4",
    "source-map-support": "^0.5.21",
    "uri-js": "^4.4.1",
-    "winston": "^3.9.0",
+    "winston": "^3.11.0",
    "winston-syslog": "^2.7.0",
-    "winston-transport": "^4.5.0",
-    "ws": "^8.13.0",
-    "zigbee-herdsman": "0.14.117",
-    "zigbee-herdsman-converters": "15.13.1-hotfix.0",
-    "zigbee2mqtt-frontend": "0.6.129"
+    "winston-transport": "^4.6.0",
+    "ws": "^8.14.2",
+    "zigbee-herdsman": "0.21.0",
+    "zigbee-herdsman-converters": "15.106.0",
+    "zigbee2mqtt-frontend": "0.6.142"
  },
  "devDependencies": {
-    "@babel/core": "^7.22.1",
+    "@babel/core": "^7.23.2",
    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.22.3",
-    "@babel/preset-env": "^7.22.2",
-    "@babel/preset-typescript": "^7.21.5",
-    "@types/debounce": "^1.2.1",
-    "@types/finalhandler": "^1.2.0",
-    "@types/humanize-duration": "^3.27.1",
-    "@types/jest": "^29.5.1",
-    "@types/js-yaml": "^4.0.5",
-    "@types/object-assign-deep": "^0.4.0",
+    "@babel/plugin-proposal-decorators": "^7.23.2",
+    "@babel/preset-env": "^7.23.2",
+    "@babel/preset-typescript": "^7.23.2",
+    "@types/debounce": "^1.2.3",
+    "@types/finalhandler": "^1.2.2",
+    "@types/humanize-duration": "^3.27.2",
+    "@types/jest": "^29.5.6",
+    "@types/js-yaml": "^4.0.8",
+    "@types/node": "^20.8.9",
+    "@types/object-assign-deep": "^0.4.2",
+    "@types/readable-stream": "4.0.4",
    "@types/rimraf": "^3.0.2",
-    "@types/ws": "^8.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
-    "babel-jest": "^29.5.0",
-    "eslint": "^8.41.0",
+    "@types/ws": "8.5.4",
+    "@typescript-eslint/eslint-plugin": "^6.9.0",
+    "@typescript-eslint/parser": "^6.9.0",
+    "babel-jest": "^29.7.0",
+    "eslint": "^8.52.0",
    "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jest": "^27.2.1",
-    "jest": "^29.5.0",
+    "eslint-plugin-jest": "^27.6.0",
+    "jest": "^29.7.0",
    "tmp": "^0.2.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.2.2"
  },
  "jest": {
    "coverageThreshold": {
@@ -7,8 +7,8 @@
      "bump-patch-for-minor-pre-major": false,
      "draft": false,
      "include-v-in-tag": false,
-      "prerelease": false,
-      "skip-github-release": true
+      "prerelease": true,
+      "skip-github-release": false
    }
  },
  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
@@ -19,14 +19,20 @@ const changelogs = [
 ];

 const releaseRe = /## \[(.+)\]/;
-const changes = {features: [], fixes: [], detect: [], add: []};
+const changes = {features: [], fixes: [], detect: [], add: [], error: []};
 let context = null;
 const changeRe = [
-    /^\* (\*\*(.+):\*\*)?(.+)\((\[#\d+\]\(.+\))\) \(\[(.+)\]\(https:.+\)$/,
-    /^\* (\*\*(.+):\*\*)?(.+)(https:\/\/github\.com.+) \(\[(.+)\]\(https:.+\)$/,
-    /^\* (\*\*(.+):\*\*)?(.+)() \(\[(.+)\]\(https:.+\)$/,
+    /^\* (\*\*(.+):\*\*)?(.+)\((\[#\d+\]\(.+\))\) \(\[.+\]\(https:.+\/(.+)\)\)$/,
+    /^\* (\*\*(.+):\*\*)?(.+)(https:\/\/github\.com.+) \(\[.+\]\(https:.+\/(.+)\)\)$/,
+    /^\* (\*\*(.+):\*\*)?(.+)() \(\[.+\]\(https:.+\/(.+)\)\)$/,
 ];

+let commitUserLookup = {};
+const commitUserFile = path.join(__dirname, 'commit-user-lookup.json');
+if (fs.existsSync(commitUserFile)) {
+    commitUserLookup = JSON.parse(fs.readFileSync(commitUserFile, 'utf8'));
+}
+
 for (const changelog of changelogs) {
    for (const line of changelog.contents) {
        const releaseMatch = line.match(releaseRe);
@@ -42,16 +48,18 @@ for (const changelog of changelogs) {
        } else if (line.startsWith('* **ignore:**')) {
            continue;
        } else if (changeMatch) {
-            const localContext = changeMatch[2] ? changeMatch[2] : context;
+            let localContext = changeMatch[2] ? changeMatch[2] : context;
            if (!changes[localContext]) throw new Error(`Unknown context: ${localContext}`);

-            let user = execSync(`curl -s https://api.github.com/repos/${changelog.project}/commits/${changeMatch[5]} | jq -r '.author.login'`).toString().trim();
-
+            const commitUserKey = `${changelog.project}-${changeMatch[5]} `;
+            let user = commitUserKey in commitUserLookup ? commitUserLookup[commitUserKey] :
+                execSync(`curl -s https://api.github.com/repos/${changelog.project}/commits/${changeMatch[5]} | jq -r '.author.login'`).toString().trim();
+            if (user !== 'null') commitUserLookup[commitUserKey] = user;
            const messages = [];
            let message = changeMatch[3].trim();
            if (message.endsWith('.')) message = message.substring(0, message.length - 1);

-            const otherUser = message.match(/\[@(.+)\]\(https:\/\/github.com\/.+\)/);
+            const otherUser = message.match(/\[@(.+)\]\(https:\/\/github.com\/.+\)/) || message.match(/@(.+)/);
            if (otherUser) {
                user = otherUser[1];
                message = message.replace(otherUser[0], '');
@@ -60,8 +68,11 @@ for (const changelog of changelogs) {
            if (localContext === 'add') {
                for (const model of message.split(',')) {
                    const definition = zhc.definitions.find((d) => d.model === model.trim());
-                    if (!definition) throw new Error(`Model '${message}' does not exist`);
-                    messages.push(`\`${definition.model}\` ${definition.vendor} ${definition.description}`);
+                    if (definition) {
+                        messages.push(`\`${definition.model}\` ${definition.vendor} ${definition.description}`);
+                    } else {
+                        changes['error'].push(`${line} (model '${model}' does not exist)`);
+                    }
                }
            } else {
                messages.push(message);
@@ -69,7 +80,10 @@ for (const changelog of changelogs) {

            let issue = changeMatch[4].trim();
            if (issue && !issue.startsWith('[#')) issue = `[#${issue.split('/').pop()}](${issue})`;
-            if (!issue) issue = '_NO_ISSUE_';
+            if (!issue) {
+                issue = '_NO_ISSUE_';
+                localContext = 'error';
+            }

            messages.forEach((m) => changes[localContext].push(`- ${issue} ${m} (@${user})`));
        } else if (line === '# Changelog' || !line) {
@@ -86,6 +100,7 @@ const names = [
    ['fixes', 'Fixes'],
    ['add', 'New supported devices'],
    ['detect', 'Fixed device detections'],
+    ['error', 'Changelog generator error'],
 ];
 for (const name of names) {
    result += `# ${name[1]}\n`;
@@ -96,4 +111,6 @@ for (const name of names) {
    result += '\n';
 }

+fs.writeFileSync(commitUserFile, JSON.stringify(commitUserLookup), 'utf-8');
+
 console.log(result.trim());
@@ -58,13 +58,13 @@ describe('Availability', () => {
        jest.useRealTimers();
    })

-    it('Should publish availabilty on startup for device where it is enabled for', async () => {
+    it('Should publish availability on startup for device where it is enabled for', async () => {
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb_color/availability',
-            'online', {retain: true, qos: 0}, expect.any(Function));
+            'online', {retain: true, qos: 1}, expect.any(Function));
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/remote/availability',
-            'online', {retain: true, qos: 0}, expect.any(Function));
+            'online', {retain: true, qos: 1}, expect.any(Function));
        expect(MQTT.publish).not.toHaveBeenCalledWith('zigbee2mqtt/bulb_color_2/availability',
-            'online', {retain: true, qos: 0}, expect.any(Function));
+            'online', {retain: true, qos: 1}, expect.any(Function));
    });

    it('Should publish offline for active device when not seen for 10 minutes', async () => {
@@ -77,7 +77,7 @@ describe('Availability', () => {
        expect(devices.bulb_color.ping).toHaveBeenCalledTimes(1);
        expect(devices.bulb_color.ping).toHaveBeenNthCalledWith(1, true);
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb_color/availability',
-            'offline', {retain: true, qos: 0}, expect.any(Function));
+            'offline', {retain: true, qos: 1}, expect.any(Function));
    });

    it('Shouldnt do anything for a device when availability: false is set for device', async () => {
@@ -93,7 +93,7 @@ describe('Availability', () => {
        await advancedTime(utils.hours(26));
        expect(devices.remote.ping).toHaveBeenCalledTimes(0);
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/remote/availability',
-            'offline', {retain: true, qos: 0}, expect.any(Function));
+            'offline', {retain: true, qos: 1}, expect.any(Function));
    });

    it('Should reset ping timer when device last seen changes for active device', async () => {
@@ -111,7 +111,7 @@ describe('Availability', () => {
        expect(devices.bulb_color.ping).toHaveBeenCalledTimes(1);
        expect(devices.bulb_color.ping).toHaveBeenNthCalledWith(1, true);
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb_color/availability',
-            'offline', {retain: true, qos: 0}, expect.any(Function));
+            'offline', {retain: true, qos: 1}, expect.any(Function));
    });

    it('Should ping again when first ping fails', async () => {
@@ -132,7 +132,7 @@ describe('Availability', () => {
        expect(devices.bulb_color.ping).toHaveBeenNthCalledWith(1, true);
        expect(devices.bulb_color.ping).toHaveBeenNthCalledWith(2, false);
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb_color/availability',
-            'offline', {retain: true, qos: 0}, expect.any(Function));
+            'offline', {retain: true, qos: 1}, expect.any(Function));
    });

    it('Should reset ping timer when device last seen changes for passive device', async () => {
@@ -150,7 +150,7 @@ describe('Availability', () => {
        await advancedTime(utils.hours(3));
        expect(devices.remote.ping).toHaveBeenCalledTimes(0);
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/remote/availability',
-            'offline', {retain: true, qos: 0}, expect.any(Function));
+            'offline', {retain: true, qos: 1}, expect.any(Function));
    });

    it('Should immediately mark device as online when it lastSeen changes', async () => {
@@ -158,13 +158,13 @@ describe('Availability', () => {

        await advancedTime(utils.minutes(15));
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb_color/availability',
-            'offline', {retain: true, qos: 0}, expect.any(Function));
+            'offline', {retain: true, qos: 1}, expect.any(Function));

        devices.bulb_color.lastSeen = Date.now();
        await zigbeeHerdsman.events.lastSeenChanged({device: devices.bulb_color});
        await flushPromises();
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb_color/availability',
-            'online', {retain: true, qos: 0}, expect.any(Function));
+            'online', {retain: true, qos: 1}, expect.any(Function));
    });

    it('Should allow to change availability timeout via device options', async () => {
@@ -236,7 +236,7 @@ describe('Availability', () => {
        expect(devices.bulb_color.ping).toHaveBeenCalledTimes(0);
    });

-    it('Should to enable availabilty for just one device', async () => {
+    it('Should to enable availability for just one device', async () => {
        settings.set(['availability'], false);
        settings.set(['devices', devices.bulb_color.ieeeAddr, 'availability'], true);

@@ -283,22 +283,22 @@ describe('Availability', () => {
        await flushPromises();

        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb_color/availability',
-            null, {retain: true, qos: 0}, expect.any(Function));
+            null, {retain: true, qos: 1}, expect.any(Function));
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb_new_name/availability',
-            'online', {retain: true, qos: 0}, expect.any(Function));
+            'online', {retain: true, qos: 1}, expect.any(Function));
        await advancedTime(utils.hours(12));
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb_new_name/availability',
-            'offline', {retain: true, qos: 0}, expect.any(Function));
+            'offline', {retain: true, qos: 1}, expect.any(Function));
    });

-    it('Should publish availabiltiy payload in JSON format', async () => {
+    it('Should publish availability payload in JSON format', async () => {
        settings.set(['advanced', 'legacy_availability_payload'], false);
        await resetExtension();
        MQTT.publish.mockClear();
        await advancedTime(utils.hours(26));
        expect(devices.remote.ping).toHaveBeenCalledTimes(0);
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/remote/availability',
-            stringify({state: 'offline'}), {retain: true, qos: 0}, expect.any(Function));
+            stringify({state: 'offline'}), {retain: true, qos: 1}, expect.any(Function));
    });

    it('Deprecated - should allow to block via advanced.availability_blocklist', async () => {
@@ -328,20 +328,20 @@ describe('Availability', () => {
        expect(devices.bulb_color.ping).toHaveBeenCalledTimes(1);
    });

-    it('Should publish availabilty for groups', async () => {
+    it('Should publish availability for groups', async () => {
        settings.set(['devices', devices.bulb_color_2.ieeeAddr, 'availability'], true);
        await resetExtension();
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/group_tradfri_remote/availability',
-            'online', {retain: true, qos: 0}, expect.any(Function));
+            'online', {retain: true, qos: 1}, expect.any(Function));
        MQTT.publish.mockClear();
        await advancedTime(utils.minutes(12));
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/group_tradfri_remote/availability',
-            'offline', {retain: true, qos: 0}, expect.any(Function));
+            'offline', {retain: true, qos: 1}, expect.any(Function));
        MQTT.publish.mockClear();
        devices.bulb_color_2.lastSeen = Date.now();
        await zigbeeHerdsman.events.lastSeenChanged({device: devices.bulb_color_2});
        await flushPromises();
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/group_tradfri_remote/availability',
-            'online', {retain: true, qos: 0}, expect.any(Function));
+            'online', {retain: true, qos: 1}, expect.any(Function));
    });
 });
@@ -52,7 +52,7 @@ describe('Controller', () => {
        expect(logger.info).toHaveBeenCalledWith('remote (0x0017880104e45517): 324131092621 - Philips Hue dimmer switch (EndDevice)');
        expect(logger.info).toHaveBeenCalledWith('0x0017880104e45518 (0x0017880104e45518): Not supported (EndDevice)');
        expect(MQTT.connect).toHaveBeenCalledTimes(1);
-        expect(MQTT.connect).toHaveBeenCalledWith("mqtt://localhost", {"will": {"payload": "offline", "retain": true, "topic": "zigbee2mqtt/bridge/state", "qos": 1}});
+        expect(MQTT.connect).toHaveBeenCalledWith("mqtt://localhost", {"will": {"payload": Buffer.from("offline"), "retain": true, "topic": "zigbee2mqtt/bridge/state", "qos": 1}});
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bulb', stringify({"state":"ON","brightness":50,"color_temp":370,"linkquality":99}),{ retain: true, qos: 0 }, expect.any(Function));
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/remote', stringify({"brightness":255}), { retain: true, qos: 0 }, expect.any(Function));
    });
@@ -88,7 +88,7 @@ describe('Controller', () => {
        await flushPromises();
        expect(MQTT.connect).toHaveBeenCalledTimes(1);
        const expected = {
-            "will": {"payload": "offline", "retain": true, "topic": "zigbee2mqtt/bridge/state", "qos": 1},
+            "will": {"payload": Buffer.from("offline"), "retain": true, "topic": "zigbee2mqtt/bridge/state", "qos": 1},
            keepalive: 30,
            ca: Buffer.from([99, 97]),
            key: Buffer.from([107, 101, 121]),
@@ -103,14 +103,17 @@ describe('Controller', () => {
        expect(MQTT.connect).toHaveBeenCalledWith("mqtt://localhost", expected);
    });

-    it('Should generate network_key and pan_id when set to GENERATE', async () => {
+    it('Should generate network_key, pan_id and ext_pan_id when set to GENERATE', async () => {
        settings.set(['advanced', 'network_key'], 'GENERATE');
        settings.set(['advanced', 'pan_id'], 'GENERATE');
+        settings.set(['advanced', 'ext_pan_id'], 'GENERATE');
        await controller.start();
        await flushPromises();
        expect(zigbeeHerdsman.constructor.mock.calls[0][0].network.networkKey.length).toStrictEqual(16);
+        expect(zigbeeHerdsman.constructor.mock.calls[0][0].network.extendedPanID.length).toStrictEqual(8);
        expect(zigbeeHerdsman.constructor.mock.calls[0][0].network.panID).toStrictEqual(expect.any(Number));
        expect(data.read().advanced.network_key.length).toStrictEqual(16);
+        expect(data.read().advanced.ext_pan_id.length).toStrictEqual(8);
        expect(data.read().advanced.pan_id).toStrictEqual(expect.any(Number));
    });

@@ -640,7 +643,7 @@ describe('Controller', () => {
        await flushPromises();
        expect(MQTT.connect).toHaveBeenCalledTimes(1);
        const expected = {
-            "will": { "payload": "offline", "retain": false, "topic": "zigbee2mqtt/bridge/state", "qos": 1 },
+            "will": { "payload": Buffer.from("offline"), "retain": false, "topic": "zigbee2mqtt/bridge/state", "qos": 1 },
        }
        expect(MQTT.connect).toHaveBeenCalledWith("mqtt://localhost", expected);
    });
@@ -660,7 +663,7 @@ describe('Controller', () => {
        MQTT.publish.mockClear();
        MQTT.events['connect']();
        await flushPromises();
-        await MQTT.events.message('zigbee2mqtt/bridge/state', 'online');
+        await MQTT.events.message('zigbee2mqtt/bridge/info', 'dummy');
        jest.runOnlyPendingTimers();
        expect(MQTT.publish).toHaveBeenCalledTimes(1);
        expect(MQTT.publish).toHaveBeenCalledWith('zigbee2mqtt/bridge/state', expect.any(String), { retain: true, qos: 0 }, expect.any(Function));
@@ -1,5 +1,5 @@
 const data = require('./stub/data');
-require('./stub/logger');
+const logger = require('./stub/logger');
 require('./stub/zigbeeHerdsman');
 const MQTT = require('./stub/mqtt');
 const settings = require('../lib/util/settings');
@@ -233,6 +233,10 @@ describe('Frontend', () => {
        mockWSClient.events.message(null, false);
        await flushPromises();

+        // Error
+        mockWSClient.events.error(new Error('This is an error'));
+        expect(logger.error).toHaveBeenCalledWith('WebSocket error: This is an error');
+
        // Received message on socket
        expect(mockWSClient.implementation.send).toHaveBeenCalledTimes(1);
        expect(mockWSClient.implementation.send).toHaveBeenCalledWith(stringify({topic: 'bulb_color', payload: {state: 'ON', power_on_behavior:null, linkquality: null, update_available: null, update: {state: null, installed_version: -1, latest_version: -1}}}));
@@ -13,6 +13,7 @@ describe('HomeAssistant extension', () => {
    let version;
    let controller;
    let extension;
+    let origin;

    let resetExtension = async () => {
        await controller.enableDisableExtension(false, 'HomeAssistant');
@@ -32,6 +33,7 @@ describe('HomeAssistant extension', () => {

    beforeAll(async () => {
        version = await require('../lib/util/utils').default.getZigbee2MQTTVersion();
+        origin = {name: 'Zigbee2MQTT', sw: version.version, url: 'https://www.zigbee2mqtt.io'}
        version = `Zigbee2MQTT ${version.version}`;
        jest.useFakeTimers();
        settings.set(['homeassistant'], true);
@@ -58,10 +60,8 @@ describe('HomeAssistant extension', () => {
            configs.forEach((c) => {
                const id = c['type'] + '/' + c['object_id'];
                if (cfg_type_object_ids.includes(id)) {
-                    if (typeof d.exposes == 'function') {
-                        // A dynamic function must exposes all possible attributes for the docs
-                        console.warn(`${d.model} dynamic exposes contains duplicated ${id}`)
-                    } else {
+                    // A dynamic function must exposes all possible attributes for the docs
+                    if (typeof d.exposes != 'function') {
                        duplicated.push(d.model);
                    }
                } else {
@@ -91,7 +91,7 @@ describe('HomeAssistant extension', () => {
            "max_mireds": 454,
            "min_mireds": 250,
            "json_attributes_topic":"zigbee2mqtt/ha_discovery_group",
-            "name":"ha_discovery_group",
+            "name":null,
            "schema":"json",
            "state_topic":"zigbee2mqtt/ha_discovery_group",
            "supported_color_modes":[
@@ -111,13 +111,15 @@ describe('HomeAssistant extension', () => {
                "stop_effect",
                "stop_hue_effect",
            ],
-            "unique_id":"9_light_zigbee2mqtt"
+            "object_id":"ha_discovery_group",
+            "unique_id":"9_light_zigbee2mqtt",
+            'origin': origin,
        };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/light/1221051039810110150109113116116_9/light/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -130,18 +132,20 @@ describe('HomeAssistant extension', () => {
               "sw_version": version,
            },
            "json_attributes_topic":"zigbee2mqtt/ha_discovery_group",
-            "name":"ha_discovery_group",
+            "name":null,
            "payload_off":"OFF",
            "payload_on":"ON",
            "state_topic":"zigbee2mqtt/ha_discovery_group",
+            "object_id":"ha_discovery_group",
            "unique_id":"9_switch_zigbee2mqtt",
+            'origin': origin,
            "value_template":"{{ value_json.state }}"
         };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/switch/1221051039810110150109113116116_9/switch/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -152,8 +156,9 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.temperature }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_temperature',
+            'object_id': 'weather_sensor_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor',
@@ -168,7 +173,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -179,8 +184,9 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.humidity }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_humidity',
+            'object_id': 'weather_sensor_humidity',
            'unique_id': '0x0017880104e45522_humidity_zigbee2mqtt',
+            'origin': origin,
            'enabled_by_default': true,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
@@ -195,19 +201,20 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/humidity/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

        payload = {
            'unit_of_measurement': 'hPa',
-            'device_class': 'pressure',
+            'device_class': 'atmospheric_pressure',
            'state_class': 'measurement',
            'value_template': '{{ value_json.pressure }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_pressure',
+            'object_id': 'weather_sensor_pressure',
            'unique_id': '0x0017880104e45522_pressure_zigbee2mqtt',
+            'origin': origin,
            'enabled_by_default': true,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
@@ -222,7 +229,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/pressure/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -233,8 +240,9 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.battery }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_battery',
+            'object_id': 'weather_sensor_battery',
            'unique_id': '0x0017880104e45522_battery_zigbee2mqtt',
+            'origin': origin,
            'enabled_by_default': true,
            'entity_category': 'diagnostic',
            'device': {
@@ -250,7 +258,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/battery/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -263,8 +271,10 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.linkquality }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_linkquality',
+            'name': 'Linkquality',
+            'object_id': 'weather_sensor_linkquality',
            'unique_id': '0x0017880104e45522_linkquality_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor',
@@ -278,7 +288,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/linkquality/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -295,18 +305,20 @@ describe('HomeAssistant extension', () => {
                "sw_version": null
            },
            "json_attributes_topic":"zigbee2mqtt/wall_switch_double",
-            "name":"wall_switch_double_left",
+            "name":"Left",
            "payload_off":"OFF",
            "payload_on":"ON",
            "state_topic":"zigbee2mqtt/wall_switch_double",
+            "object_id":"wall_switch_double_left",
            "unique_id":"0x0017880104e45542_switch_left_zigbee2mqtt",
+            'origin': origin,
            "value_template":"{{ value_json.state_left }}"
        };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/switch/0x0017880104e45542/switch_left/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -323,18 +335,20 @@ describe('HomeAssistant extension', () => {
                "sw_version": null
            },
            "json_attributes_topic":"zigbee2mqtt/wall_switch_double",
-            "name":"wall_switch_double_right",
+            "name":"Right",
            "payload_off":"OFF",
            "payload_on":"ON",
            "state_topic":"zigbee2mqtt/wall_switch_double",
+            "object_id":"wall_switch_double_right",
            "unique_id":"0x0017880104e45542_switch_right_zigbee2mqtt",
+            'origin': origin,
            "value_template":"{{ value_json.state_right }}"
        };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/switch/0x0017880104e45542/switch_right/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -366,16 +380,18 @@ describe('HomeAssistant extension', () => {
                "stop_effect"
            ],
            "json_attributes_topic":"zigbee2mqtt/bulb",
-            "name":"bulb",
+            "name":null,
            "schema":"json",
            "state_topic":"zigbee2mqtt/bulb",
+            "object_id":"bulb",
            "unique_id":"0x000b57fffec6a5b2_light_zigbee2mqtt",
+            'origin': origin,
        };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/light/0x000b57fffec6a5b2/light/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -402,8 +418,9 @@ describe('HomeAssistant extension', () => {
            'value_template': "{{ value_json.temperature }}",
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_temperature',
+            'object_id': 'weather_sensor_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor',
@@ -417,7 +434,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -428,8 +445,9 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.humidity }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_humidity',
+            'object_id': 'weather_sensor_humidity',
            'unique_id': '0x0017880104e45522_humidity_zigbee2mqtt',
+            'origin': origin,
            'enabled_by_default': true,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
@@ -444,20 +462,21 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/humidity/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

        payload = {
            'unit_of_measurement': 'hPa',
-            'device_class': 'pressure',
+            'device_class': 'atmospheric_pressure',
            'state_class': 'measurement',
            'value_template': '{{ value_json.pressure }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_pressure',
            'enabled_by_default': true,
+            'object_id': 'weather_sensor_pressure',
            'unique_id': '0x0017880104e45522_pressure_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor',
@@ -471,7 +490,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/pressure/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -512,9 +531,10 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.temperature }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_temperature',
            'enabled_by_default': true,
+            'object_id': 'weather_sensor_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor',
@@ -530,7 +550,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -541,7 +561,6 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.humidity }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_humidity',
            'enabled_by_default': true,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
@@ -550,15 +569,17 @@ describe('HomeAssistant extension', () => {
                'model': 'custom model',
                'manufacturer': 'Not from Xiaomi',
            },
+            'origin': origin,
            'availability': [{topic: 'zigbee2mqtt/bridge/state'}],
            'expire_after': 30,
            'icon': 'mdi:test',
+            'object_id': 'weather_sensor_humidity'
        };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/humidity/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -584,8 +605,9 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.temperature }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'Weather Sensor temperature',
+            'object_id': 'weather_sensor_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'Weather Sensor',
@@ -600,7 +622,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -611,8 +633,9 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.humidity }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'Weather Sensor humidity',
+            'object_id': 'weather_sensor_humidity',
            'unique_id': '0x0017880104e45522_humidity_zigbee2mqtt',
+            'origin': origin,
            'enabled_by_default': true,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
@@ -627,7 +650,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/humidity/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -669,14 +692,16 @@ describe('HomeAssistant extension', () => {
            "payload_off": "OFF",
            "payload_on": "ON",
            "state_topic": "zigbee2mqtt/my_switch",
+            "object_id": "my_switch",
            "unique_id": "0x0017880104e45541_light_zigbee2mqtt",
+            'origin': origin,
            "value_template": "{{ value_json.state }}"
        }

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/light/0x0017880104e45541/light/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -732,8 +757,10 @@ describe('HomeAssistant extension', () => {
            "speed_range_min":1,
            "speed_range_max":4,
            "json_attributes_topic":"zigbee2mqtt/fan",
-            "name":"fan",
+            "name":null,
+            "object_id": "fan",
            "unique_id":"0x0017880104e45548_fan_zigbee2mqtt",
+            'origin': origin,
            "device":{
               "identifiers":[
                  "zigbee2mqtt_0x0017880104e45548"
@@ -749,7 +776,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/fan/0x0017880104e45548/fan/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -799,19 +826,21 @@ describe('HomeAssistant extension', () => {
                "auto",
                "off"
            ],
-            "name":"TS0601_thermostat",
+            "name":null,
            "temp_step":0.5,
            "temperature_command_topic":"zigbee2mqtt/TS0601_thermostat/set/current_heating_setpoint",
            "temperature_state_template":"{{ value_json.current_heating_setpoint }}",
            "temperature_state_topic":"zigbee2mqtt/TS0601_thermostat",
            "temperature_unit":"C",
-            "unique_id":"0x0017882104a44559_climate_zigbee2mqtt"
+            "object_id": "ts0601_thermostat",
+            "unique_id":"0x0017882104a44559_climate_zigbee2mqtt",
+            'origin': origin,
        };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/climate/0x0017882104a44559/climate/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -831,8 +860,10 @@ describe('HomeAssistant extension', () => {
            state_closed: 'CLOSE',
            state_stopped: 'STOP',
            json_attributes_topic: 'zigbee2mqtt/smart vent',
-            name: 'smart vent',
+            name: null,
+            object_id: 'smart_vent',
            unique_id: '0x0017880104e45551_cover_zigbee2mqtt',
+            'origin': origin,
            device:
            {
                identifiers: [ 'zigbee2mqtt_0x0017880104e45551' ],
@@ -847,7 +878,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/cover/0x0017880104e45551/cover/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -862,7 +893,7 @@ describe('HomeAssistant extension', () => {
                "sw_version": null
            },
            "json_attributes_topic": "zigbee2mqtt/zigfred_plus/l6",
-            "name": "zigfred_plus_l6",
+            "name": "L6",
            "position_template": "{{ value_json.position }}",
            "position_topic": "zigbee2mqtt/zigfred_plus/l6",
            "set_position_template": "{ \"position_l6\": {{ position }} }",
@@ -874,14 +905,16 @@ describe('HomeAssistant extension', () => {
            "tilt_command_topic": "zigbee2mqtt/zigfred_plus/l6/set/tilt",
            "tilt_status_template": "{{ value_json.tilt }}",
            "tilt_status_topic": "zigbee2mqtt/zigfred_plus/l6",
+            "object_id": "zigfred_plus_l6",
            "unique_id": "0xf4ce368a38be56a1_cover_l6_zigbee2mqtt",
+            'origin': origin,
            "value_template": "{{ value_json.state }}"
        }

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/cover/0xf4ce368a38be56a1/cover_l6/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -900,8 +933,9 @@ describe('HomeAssistant extension', () => {
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
            'enabled_by_default': true,
-            'name': 'weather_sensor_temperature',
+            'object_id': 'weather_sensor_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor',
@@ -915,7 +949,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'my_custom_discovery_topic/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1027,8 +1061,9 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.temperature }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_temperature',
+            'object_id': 'weather_sensor_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor',
@@ -1042,7 +1077,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payloadHA),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1082,7 +1117,7 @@ describe('HomeAssistant extension', () => {
        await flushPromises();
        expect(MQTT.publish).toHaveBeenCalledWith(
            'zigbee2mqtt/bulb',
-            stringify({"state":"ON","brightness":50,"color_temp":370,"linkquality":99,"power_on_behavior":null, "update_available": null, "update": {"state": null, "installed_version": -1, "latest_version": -1}}),
+            stringify({"state":"ON","color_options":null,"brightness":50,"color_temp":370,"linkquality":99,"power_on_behavior":null, "update_available": null, "update": {"state": null, "installed_version": -1, "latest_version": -1}}),
            { retain: true, qos: 0 },
            expect.any(Function)
        );
@@ -1112,7 +1147,7 @@ describe('HomeAssistant extension', () => {
        await flushPromises();
        expect(MQTT.publish).toHaveBeenCalledWith(
            'zigbee2mqtt/bulb',
-            stringify({"state":"ON","brightness":50,"color_temp":370,"linkquality":99,"power_on_behavior":null, "update_available": null, "update": {"state": null, "installed_version": -1, "latest_version": -1}}),
+            stringify({"state":"ON","color_options":null,"brightness":50,"color_temp":370,"linkquality":99,"power_on_behavior":null, "update_available": null, "update": {"state": null, "installed_version": -1, "latest_version": -1}}),
            { retain: true, qos: 0 },
            expect.any(Function)
        );
@@ -1163,8 +1198,9 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.temperature }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_temperature',
+            'object_id': 'weather_sensor_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor',
@@ -1179,7 +1215,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1192,31 +1228,31 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            null,
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/humidity/config',
            null,
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/pressure/config',
            null,
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/battery/config',
            null,
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/linkquality/config',
            null,
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1245,7 +1281,8 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.temperature }}',
            'state_topic': 'zigbee2mqtt/weather_sensor_renamed',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor_renamed',
-            'name': 'weather_sensor_renamed_temperature',
+            'object_id': 'weather_sensor_renamed_temperature',
+            'origin': origin,
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
@@ -1260,14 +1297,14 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            null,
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -1279,6 +1316,7 @@ describe('HomeAssistant extension', () => {
                "subtype":"double",
                "payload":"double",
                "topic":"zigbee2mqtt/weather_sensor_renamed/action",
+                'origin': origin,
                "device":{
                    "identifiers":[
                        "zigbee2mqtt_0x0017880104e45522"
@@ -1289,7 +1327,7 @@ describe('HomeAssistant extension', () => {
                    "manufacturer":"Xiaomi"
                }
            }),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1315,7 +1353,7 @@ describe('HomeAssistant extension', () => {
            "json_attributes_topic":"zigbee2mqtt/ha_discovery_group_new",
            "max_mireds": 454,
            "min_mireds": 250,
-            "name":"ha_discovery_group_new",
+            "name":null,
            "schema":"json",
            "state_topic":"zigbee2mqtt/ha_discovery_group_new",
            "supported_color_modes":[
@@ -1335,20 +1373,22 @@ describe('HomeAssistant extension', () => {
                "stop_effect",
                "stop_hue_effect",
            ],
-            "unique_id":"9_light_zigbee2mqtt"
+            "object_id":"ha_discovery_group_new",
+            "unique_id":"9_light_zigbee2mqtt",
+            'origin': origin,
         };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/light/1221051039810110150109113116116_9/light/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/light/1221051039810110150109113116116_9/light/config',
            null,
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1361,7 +1401,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).not.toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            null,
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -1373,8 +1413,9 @@ describe('HomeAssistant extension', () => {
            'value_template': '{{ value_json.temperature }}',
            'state_topic': 'zigbee2mqtt/weather_sensor_renamed',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor_renamed',
-            'name': 'weather_sensor_renamed_temperature',
+            'object_id': 'weather_sensor_renamed_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor_renamed',
@@ -1388,7 +1429,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1401,8 +1442,10 @@ describe('HomeAssistant extension', () => {
            "enabled_by_default": false,
            "state_topic":"zigbee2mqtt/bulb",
            "json_attributes_topic":"zigbee2mqtt/bulb",
-            "name":"bulb update available",
+            "name":null,
+            "object_id":"bulb_update_available",
            "unique_id":"0x000b57fffec6a5b2_update_available_zigbee2mqtt",
+            'origin': origin,
            "device":{
                "identifiers":[
                    "zigbee2mqtt_0x000b57fffec6a5b2"
@@ -1420,7 +1463,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/binary_sensor/0x000b57fffec6a5b2/update_available/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1444,6 +1487,7 @@ describe('HomeAssistant extension', () => {
            "subtype":"single",
            "payload":"single",
            "topic":"zigbee2mqtt/button/action",
+            "origin": origin,
            "device":{
                "identifiers":[
                    "zigbee2mqtt_0x0017880104e45520"
@@ -1458,7 +1502,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/device_automation/0x0017880104e45520/action_single/config',
            stringify(discoverPayloadAction),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -1468,6 +1512,7 @@ describe('HomeAssistant extension', () => {
            "subtype":"single",
            "payload":"single",
            "topic":"zigbee2mqtt/button/click",
+            "origin": origin,
            "device":{
                "identifiers":[
                    "zigbee2mqtt_0x0017880104e45520"
@@ -1482,7 +1527,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/device_automation/0x0017880104e45520/click_single/config',
            stringify(discoverPayloadClick),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -1528,14 +1573,14 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).not.toHaveBeenCalledWith(
            'homeassistant/device_automation/0x0017880104e45520/action_single/config',
            stringify(discoverPayloadAction),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

        expect(MQTT.publish).not.toHaveBeenCalledWith(
            'homeassistant/device_automation/0x0017880104e45520/click_single/config',
            stringify(discoverPayloadClick),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -1632,6 +1677,7 @@ describe('HomeAssistant extension', () => {
            "subtype":"single",
            "payload":"single",
            "topic":"zigbee2mqtt/button/action",
+            "origin": origin,
            "device":{
                "identifiers":[
                    "zigbee2mqtt_0x0017880104e45520"
@@ -1646,7 +1692,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/device_automation/0x0017880104e45520/action_single/config',
            stringify(discoverPayload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );

@@ -1711,7 +1757,7 @@ describe('HomeAssistant extension', () => {
        await MQTT.events.message('homeassistant/light/1221051039810110150109113116116_91231/light/config', stringify({availability: [{topic: 'zigbee2mqtt/bridge/state'}]}));
        await flushPromises();
        expect(MQTT.publish).toHaveBeenCalledTimes(1);
-        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/light/1221051039810110150109113116116_91231/light/config', null, {qos: 0, retain: true}, expect.any(Function));
+        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/light/1221051039810110150109113116116_91231/light/config', null, {qos: 1, retain: true}, expect.any(Function));

        // Existing group -> dont clear
        MQTT.publish.mockClear();
@@ -1724,21 +1770,21 @@ describe('HomeAssistant extension', () => {
        await MQTT.events.message('homeassistant/light/9/light/config', stringify({availability: [{topic: 'zigbee2mqtt/bridge/state'}]}));
        await flushPromises();
        expect(MQTT.publish).toHaveBeenCalledTimes(1);
-        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/light/9/light/config', null, {qos: 0, retain: true}, expect.any(Function));
+        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/light/9/light/config', null, {qos: 1, retain: true}, expect.any(Function));

        // Existing group, non existing config ->  clear
        MQTT.publish.mockClear();
        await MQTT.events.message('homeassistant/light/1221051039810110150109113116116_9/switch/config', stringify({availability: [{topic: 'zigbee2mqtt/bridge/state'}]}));
        await flushPromises();
        expect(MQTT.publish).toHaveBeenCalledTimes(1);
-        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/light/1221051039810110150109113116116_9/switch/config', null, {qos: 0, retain: true}, expect.any(Function));
+        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/light/1221051039810110150109113116116_9/switch/config', null, {qos: 1, retain: true}, expect.any(Function));

        // Non-existing device -> clear
        MQTT.publish.mockClear();
        await MQTT.events.message('homeassistant/sensor/0x123/temperature/config', stringify({availability: [{topic: 'zigbee2mqtt/bridge/state'}]}));
        await flushPromises();
        expect(MQTT.publish).toHaveBeenCalledTimes(1);
-        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/sensor/0x123/temperature/config', null, {qos: 0, retain: true}, expect.any(Function));
+        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/sensor/0x123/temperature/config', null, {qos: 1, retain: true}, expect.any(Function));

        // Existing device -> don't clear
        MQTT.publish.mockClear();
@@ -1757,7 +1803,7 @@ describe('HomeAssistant extension', () => {
        await MQTT.events.message('homeassistant/sensor/0x000b57fffec6a5b2/update_available/config', stringify({availability: [{topic: 'zigbee2mqtt/bridge/state'}]}));
        await flushPromises();
        expect(MQTT.publish).toHaveBeenCalledTimes(1);
-        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/sensor/0x000b57fffec6a5b2/update_available/config', null, {qos: 0, retain: true}, expect.any(Function));
+        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/sensor/0x000b57fffec6a5b2/update_available/config', null, {qos: 1, retain: true}, expect.any(Function));

        // Non-existing device but invalid payload -> clear
        MQTT.publish.mockClear();
@@ -1784,11 +1830,11 @@ describe('HomeAssistant extension', () => {

        await MQTT.events.message('homeassistant/sensor/0x000b57fffec6a5b2/update_available/config', stringify({availability: [{topic: 'zigbee2mqtt/bridge/state'}]}));
        await flushPromises();
-        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/sensor/0x000b57fffec6a5b2/update_available/config', null, {qos: 0, retain: true}, expect.any(Function));
+        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/sensor/0x000b57fffec6a5b2/update_available/config', null, {qos: 1, retain: true}, expect.any(Function));
        MQTT.publish.mockClear();
        await MQTT.events.message('homeassistant/device_automation/0x000b57fffec6a5b2/action_button_3_single/config', stringify({topic: 'zigbee2mqtt/0x000b57fffec6a5b2/availability'}));
        await flushPromises();
-        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/device_automation/0x000b57fffec6a5b2/action_button_3_single/config', null, {qos: 0, retain: true}, expect.any(Function));
+        expect(MQTT.publish).toHaveBeenCalledWith('homeassistant/device_automation/0x000b57fffec6a5b2/action_button_3_single/config', null, {qos: 1, retain: true}, expect.any(Function));
    });

    it('Should not have Home Assistant legacy entity attributes when disabled', async () => {
@@ -1804,8 +1850,9 @@ describe('HomeAssistant extension', () => {
            'state_class': 'measurement',
            'value_template': '{{ value_json.temperature }}',
            'state_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_temperature',
+            'object_id': 'weather_sensor_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'enabled_by_default': true,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
@@ -1820,7 +1867,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1844,7 +1891,7 @@ describe('HomeAssistant extension', () => {
            "json_attributes_topic":"zigbee2mqtt/ha_discovery_group",
            "max_mireds": 454,
            "min_mireds": 250,
-            "name":"ha_discovery_group",
+            "name":null,
            "schema":"json",
            "state_topic":"zigbee2mqtt/ha_discovery_group",
            "supported_color_modes":[
@@ -1864,13 +1911,15 @@ describe('HomeAssistant extension', () => {
                "stop_effect",
                "stop_hue_effect",
            ],
-            "unique_id":"9_light_zigbee2mqtt"
+            "object_id":"ha_discovery_group",
+            "unique_id":"9_light_zigbee2mqtt",
+            'origin': origin,
         };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/light/1221051039810110150109113116116_9/light/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1893,7 +1942,7 @@ describe('HomeAssistant extension', () => {
            "max_mireds": 454,
            "min_mireds": 250,
            "json_attributes_topic":"zigbee2mqtt/ha_discovery_group",
-            "name":"ha_discovery_group",
+            "name":null,
            "schema":"json",
            "state_topic":"zigbee2mqtt/ha_discovery_group",
            "supported_color_modes":[
@@ -1913,13 +1962,15 @@ describe('HomeAssistant extension', () => {
                "stop_effect",
                "stop_hue_effect",
            ],
-            "unique_id":"9_light_zigbee2mqtt"
+            "object_id":"ha_discovery_group",
+            "unique_id":"9_light_zigbee2mqtt",
+            'origin': origin,
        };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/light/1221051039810110150109113116116_9/light/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -1961,19 +2012,21 @@ describe('HomeAssistant extension', () => {
            "json_attributes_topic":"zigbee2mqtt/bulb",
            "max_mireds":454,
            "min_mireds":250,
-            "name":"bulb",
+            "name":null,
            "schema":"json",
            "state_topic":"zigbee2mqtt/bulb",
            "supported_color_modes":[
               "color_temp"
            ],
-            "unique_id":"0x000b57fffec6a5b2_light_zigbee2mqtt"
+            "object_id":"bulb",
+            "unique_id":"0x000b57fffec6a5b2_light_zigbee2mqtt",
+            'origin': origin,
        };

        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/light/0x000b57fffec6a5b2/light/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -2000,9 +2053,11 @@ describe('HomeAssistant extension', () => {
            "enabled_by_default":false,
            "icon":"mdi:clock",
            "json_attributes_topic":"zigbee2mqtt/bulb",
-            "name":"bulb last seen",
+            "name":"Last seen",
            "state_topic":"zigbee2mqtt/bulb",
+            "object_id": "bulb_last_seen",
            "unique_id":"0x000b57fffec6a5b2_last_seen_zigbee2mqtt",
+            'origin': origin,
            "value_template":"{{ value_json.last_seen }}",
            "device_class": "timestamp",
            "entity_category": "diagnostic"
@@ -2011,7 +2066,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x000b57fffec6a5b2/last_seen/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -2032,8 +2087,9 @@ describe('HomeAssistant extension', () => {
            'value_template': "{{ value_json.temperature }}",
            'state_topic': 'zigbee2mqtt/weather_sensor',
            'json_attributes_topic': 'zigbee2mqtt/weather_sensor',
-            'name': 'weather_sensor_temperature',
+            'object_id': 'weather_sensor_temperature',
            'unique_id': '0x0017880104e45522_temperature_zigbee2mqtt',
+            'origin': origin,
            'device': {
                'identifiers': ['zigbee2mqtt_0x0017880104e45522'],
                'name': 'weather_sensor',
@@ -2048,7 +2104,7 @@ describe('HomeAssistant extension', () => {
        expect(MQTT.publish).toHaveBeenCalledWith(
            'homeassistant/sensor/0x0017880104e45522/temperature/config',
            stringify(payload),
-            { retain: true, qos: 0 },
+            { retain: true, qos: 1 },
            expect.any(Function),
        );
    });
@@ -102,7 +102,7 @@ describe('Networkmap', () => {
        let call = MQTT.publish.mock.calls[0];
        expect(call[0]).toStrictEqual('zigbee2mqtt/bridge/networkmap/raw');

-        const expected =  {"links":[{"depth":1,"linkquality":120,"lqi":120,"relationship":2,"routes":[],"source":{"ieeeAddr":"0x000b57fffec6a5b3","networkAddress":40399},"sourceIeeeAddr":"0x000b57fffec6a5b3","sourceNwkAddr":40399,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":1,"linkquality":92,"lqi":92,"relationship":2,"routes":[{"destinationAddress":6540,"nextHop":40369,"status":"ACTIVE"}],"source":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"sourceIeeeAddr":"0x000b57fffec6a5b2","sourceNwkAddr":40369,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":1,"linkquality":92,"lqi":92,"relationship":2,"routes":[],"source":{"ieeeAddr":"0x0017880104e45511","networkAddress":1114},"sourceIeeeAddr":"0x0017880104e45511","sourceNwkAddr":1114,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":2,"linkquality":110,"lqi":110,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x000b57fffec6a5b3","networkAddress":40399},"sourceIeeeAddr":"0x000b57fffec6a5b3","sourceNwkAddr":40399,"target":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"targetIeeeAddr":"0x000b57fffec6a5b2"},{"depth":2,"linkquality":100,"lqi":100,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x0017880104e45559","networkAddress":6540},"sourceIeeeAddr":"0x0017880104e45559","sourceNwkAddr":6540,"target":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"targetIeeeAddr":"0x000b57fffec6a5b2"},{"depth":2,"linkquality":130,"lqi":130,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x0017880104e45521","networkAddress":6538},"sourceIeeeAddr":"0x0017880104e45521","sourceNwkAddr":6538,"target":{"ieeeAddr":"0x0017880104e45559","networkAddress":6540},"targetIeeeAddr":"0x0017880104e45559"}],"nodes":[{"definition":null,"failed":[],"friendlyName":"Coordinator","ieeeAddr":"0x00124b00120144ae","lastSeen":1000,"modelID":null,"networkAddress":0,"type":"Coordinator"},{"definition":{"description":"TRADFRI LED bulb E26/E27 980 lumen, dimmable, white spectrum, opal white","model":"LED1545G12","supports":"light (state, brightness, color_temp, color_temp_startup), effect, power_on_behavior, linkquality","vendor":"IKEA"},"failed":[],"friendlyName":"bulb","ieeeAddr":"0x000b57fffec6a5b2","lastSeen":1000,"modelID":"TRADFRI bulb E27 WS opal 980lm","networkAddress":40369,"type":"Router"},{"definition":{"description":"Hue Go","model":"7146060PH","supports":"light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality","vendor":"Philips"},"failed":[],"friendlyName":"bulb_color","ieeeAddr":"0x000b57fffec6a5b3","lastSeen":1000,"modelID":"LLC020","networkAddress":40399,"type":"Router"},{"definition":{"description":"Aqara double key wireless wall switch (2016 model)","model":"WXKG02LM_rev1","supports":"battery, action, voltage, power_outage_count, linkquality","vendor":"Xiaomi"},"friendlyName":"button_double_key","ieeeAddr":"0x0017880104e45521","lastSeen":1000,"modelID":"lumi.sensor_86sw2.es1","networkAddress":6538,"type":"EndDevice"},{"definition":null,"failed":["lqi","routingTable"],"friendlyName":"0x0017880104e45525","ieeeAddr":"0x0017880104e45525","lastSeen":1000,"manufacturerName":"Boef","modelID":"notSupportedModelID","networkAddress":6536,"type":"Router"},{"definition":{"description":"[CC2530 router](http://ptvo.info/cc2530-based-zigbee-coordinator-and-router-112/)","model":"CC2530.ROUTER","supports":"led, linkquality","vendor":"Custom devices (DiY)"},"failed":[],"friendlyName":"cc2530_router","ieeeAddr":"0x0017880104e45559","lastSeen":1000,"modelID":"lumi.router","networkAddress":6540,"type":"Router"},{"definition":{"description": "external","model":"external_converter_device","supports":"linkquality","vendor":"external"},"friendlyName":"0x0017880104e45511","ieeeAddr":"0x0017880104e45511","lastSeen":1000,"modelID":"external_converter_device","networkAddress":1114,"type":"EndDevice"}]};
+        const expected =  {"links":[{"depth":1,"linkquality":120,"lqi":120,"relationship":2,"routes":[],"source":{"ieeeAddr":"0x000b57fffec6a5b3","networkAddress":40399},"sourceIeeeAddr":"0x000b57fffec6a5b3","sourceNwkAddr":40399,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":1,"linkquality":92,"lqi":92,"relationship":2,"routes":[{"destinationAddress":6540,"nextHop":40369,"status":"ACTIVE"}],"source":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"sourceIeeeAddr":"0x000b57fffec6a5b2","sourceNwkAddr":40369,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":1,"linkquality":92,"lqi":92,"relationship":2,"routes":[],"source":{"ieeeAddr":"0x0017880104e45511","networkAddress":1114},"sourceIeeeAddr":"0x0017880104e45511","sourceNwkAddr":1114,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":2,"linkquality":110,"lqi":110,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x000b57fffec6a5b3","networkAddress":40399},"sourceIeeeAddr":"0x000b57fffec6a5b3","sourceNwkAddr":40399,"target":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"targetIeeeAddr":"0x000b57fffec6a5b2"},{"depth":2,"linkquality":100,"lqi":100,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x0017880104e45559","networkAddress":6540},"sourceIeeeAddr":"0x0017880104e45559","sourceNwkAddr":6540,"target":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"targetIeeeAddr":"0x000b57fffec6a5b2"},{"depth":2,"linkquality":130,"lqi":130,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x0017880104e45521","networkAddress":6538},"sourceIeeeAddr":"0x0017880104e45521","sourceNwkAddr":6538,"target":{"ieeeAddr":"0x0017880104e45559","networkAddress":6540},"targetIeeeAddr":"0x0017880104e45559"}],"nodes":[{"definition":null,"failed":[],"friendlyName":"Coordinator","ieeeAddr":"0x00124b00120144ae","lastSeen":1000,"modelID":null,"networkAddress":0,"type":"Coordinator"},{"definition":{"description":"TRADFRI LED bulb E26/E27 980 lumen, dimmable, white spectrum, opal white","model":"LED1545G12","supports":"light (state, brightness, color_temp, color_temp_startup), effect, power_on_behavior, color_options, linkquality","vendor":"IKEA"},"failed":[],"friendlyName":"bulb","ieeeAddr":"0x000b57fffec6a5b2","lastSeen":1000,"modelID":"TRADFRI bulb E27 WS opal 980lm","networkAddress":40369,"type":"Router"},{"definition":{"description":"Hue Go","model":"7146060PH","supports":"light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality","vendor":"Philips"},"failed":[],"friendlyName":"bulb_color","ieeeAddr":"0x000b57fffec6a5b3","lastSeen":1000,"modelID":"LLC020","networkAddress":40399,"type":"Router"},{"definition":{"description":"Aqara double key wireless wall switch (2016 model)","model":"WXKG02LM_rev1","supports":"battery, action, voltage, power_outage_count, linkquality","vendor":"Xiaomi"},"friendlyName":"button_double_key","ieeeAddr":"0x0017880104e45521","lastSeen":1000,"modelID":"lumi.sensor_86sw2.es1","networkAddress":6538,"type":"EndDevice"},{"definition":null,"failed":["lqi","routingTable"],"friendlyName":"0x0017880104e45525","ieeeAddr":"0x0017880104e45525","lastSeen":1000,"manufacturerName":"Boef","modelID":"notSupportedModelID","networkAddress":6536,"type":"Router"},{"definition":{"description":"[CC2530 router](http://ptvo.info/cc2530-based-zigbee-coordinator-and-router-112/)","model":"CC2530.ROUTER","supports":"led, linkquality","vendor":"Custom devices (DiY)"},"failed":[],"friendlyName":"cc2530_router","ieeeAddr":"0x0017880104e45559","lastSeen":1000,"modelID":"lumi.router","networkAddress":6540,"type":"Router"},{"definition":{"description": "external","model":"external_converter_device","supports":"linkquality","vendor":"external"},"friendlyName":"0x0017880104e45511","ieeeAddr":"0x0017880104e45511","lastSeen":1000,"modelID":"external_converter_device","networkAddress":1114,"type":"EndDevice"}]};
        expect(JSON.parse(call[1])).toStrictEqual(expected);

        /**
@@ -276,7 +276,7 @@ describe('Networkmap', () => {
        let call = MQTT.publish.mock.calls[0];
        expect(call[0]).toStrictEqual('zigbee2mqtt/bridge/response/networkmap');

-        const expected = {"data":{"routes":true,"type":"raw","value":{"links":[{"depth":1,"linkquality":120,"lqi":120,"relationship":2,"routes":[],"source":{"ieeeAddr":"0x000b57fffec6a5b3","networkAddress":40399},"sourceIeeeAddr":"0x000b57fffec6a5b3","sourceNwkAddr":40399,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":1,"linkquality":92,"lqi":92,"relationship":2,"routes":[{"destinationAddress":6540,"nextHop":40369,"status":"ACTIVE"}],"source":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"sourceIeeeAddr":"0x000b57fffec6a5b2","sourceNwkAddr":40369,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":1,"linkquality":92,"lqi":92,"relationship":2,"routes":[],"source":{"ieeeAddr":"0x0017880104e45511","networkAddress":1114},"sourceIeeeAddr":"0x0017880104e45511","sourceNwkAddr":1114,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":2,"linkquality":110,"lqi":110,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x000b57fffec6a5b3","networkAddress":40399},"sourceIeeeAddr":"0x000b57fffec6a5b3","sourceNwkAddr":40399,"target":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"targetIeeeAddr":"0x000b57fffec6a5b2"},{"depth":2,"linkquality":100,"lqi":100,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x0017880104e45559","networkAddress":6540},"sourceIeeeAddr":"0x0017880104e45559","sourceNwkAddr":6540,"target":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"targetIeeeAddr":"0x000b57fffec6a5b2"},{"depth":2,"linkquality":130,"lqi":130,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x0017880104e45521","networkAddress":6538},"sourceIeeeAddr":"0x0017880104e45521","sourceNwkAddr":6538,"target":{"ieeeAddr":"0x0017880104e45559","networkAddress":6540},"targetIeeeAddr":"0x0017880104e45559"}],"nodes":[{"definition":null,"failed":[],"friendlyName":"Coordinator","ieeeAddr":"0x00124b00120144ae","lastSeen":1000,"modelID":null,"networkAddress":0,"type":"Coordinator"},{"definition":{"description":"TRADFRI LED bulb E26/E27 980 lumen, dimmable, white spectrum, opal white","model":"LED1545G12","supports":"light (state, brightness, color_temp, color_temp_startup), effect, power_on_behavior, linkquality","vendor":"IKEA"},"failed":[],"friendlyName":"bulb","ieeeAddr":"0x000b57fffec6a5b2","lastSeen":1000,"modelID":"TRADFRI bulb E27 WS opal 980lm","networkAddress":40369,"type":"Router"},{"definition":{"description":"Hue Go","model":"7146060PH","supports":"light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality","vendor":"Philips"},"failed":[],"friendlyName":"bulb_color","ieeeAddr":"0x000b57fffec6a5b3","lastSeen":1000,"modelID":"LLC020","networkAddress":40399,"type":"Router"},{"definition":{"description":"Aqara double key wireless wall switch (2016 model)","model":"WXKG02LM_rev1","supports":"battery, action, voltage, power_outage_count, linkquality","vendor":"Xiaomi"},"friendlyName":"button_double_key","ieeeAddr":"0x0017880104e45521","lastSeen":1000,"modelID":"lumi.sensor_86sw2.es1","networkAddress":6538,"type":"EndDevice"},{"definition":null,"failed":["lqi","routingTable"],"friendlyName":"0x0017880104e45525","ieeeAddr":"0x0017880104e45525","lastSeen":1000,"manufacturerName":"Boef","modelID":"notSupportedModelID","networkAddress":6536,"type":"Router"},{"definition":{"description":"[CC2530 router](http://ptvo.info/cc2530-based-zigbee-coordinator-and-router-112/)","model":"CC2530.ROUTER","supports":"led, linkquality","vendor":"Custom devices (DiY)"},"failed":[],"friendlyName":"cc2530_router","ieeeAddr":"0x0017880104e45559","lastSeen":1000,"modelID":"lumi.router","networkAddress":6540,"type":"Router"},{"definition":{"description":"external","model":"external_converter_device","supports":"linkquality","vendor":"external"},"friendlyName":"0x0017880104e45511","ieeeAddr":"0x0017880104e45511","lastSeen":1000,"modelID":"external_converter_device","networkAddress":1114,"type":"EndDevice"}]}},"status":"ok"};
+        const expected = {"data":{"routes":true,"type":"raw","value":{"links":[{"depth":1,"linkquality":120,"lqi":120,"relationship":2,"routes":[],"source":{"ieeeAddr":"0x000b57fffec6a5b3","networkAddress":40399},"sourceIeeeAddr":"0x000b57fffec6a5b3","sourceNwkAddr":40399,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":1,"linkquality":92,"lqi":92,"relationship":2,"routes":[{"destinationAddress":6540,"nextHop":40369,"status":"ACTIVE"}],"source":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"sourceIeeeAddr":"0x000b57fffec6a5b2","sourceNwkAddr":40369,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":1,"linkquality":92,"lqi":92,"relationship":2,"routes":[],"source":{"ieeeAddr":"0x0017880104e45511","networkAddress":1114},"sourceIeeeAddr":"0x0017880104e45511","sourceNwkAddr":1114,"target":{"ieeeAddr":"0x00124b00120144ae","networkAddress":0},"targetIeeeAddr":"0x00124b00120144ae"},{"depth":2,"linkquality":110,"lqi":110,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x000b57fffec6a5b3","networkAddress":40399},"sourceIeeeAddr":"0x000b57fffec6a5b3","sourceNwkAddr":40399,"target":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"targetIeeeAddr":"0x000b57fffec6a5b2"},{"depth":2,"linkquality":100,"lqi":100,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x0017880104e45559","networkAddress":6540},"sourceIeeeAddr":"0x0017880104e45559","sourceNwkAddr":6540,"target":{"ieeeAddr":"0x000b57fffec6a5b2","networkAddress":40369},"targetIeeeAddr":"0x000b57fffec6a5b2"},{"depth":2,"linkquality":130,"lqi":130,"relationship":1,"routes":[],"source":{"ieeeAddr":"0x0017880104e45521","networkAddress":6538},"sourceIeeeAddr":"0x0017880104e45521","sourceNwkAddr":6538,"target":{"ieeeAddr":"0x0017880104e45559","networkAddress":6540},"targetIeeeAddr":"0x0017880104e45559"}],"nodes":[{"definition":null,"failed":[],"friendlyName":"Coordinator","ieeeAddr":"0x00124b00120144ae","lastSeen":1000,"modelID":null,"networkAddress":0,"type":"Coordinator"},{"definition":{"description":"TRADFRI LED bulb E26/E27 980 lumen, dimmable, white spectrum, opal white","model":"LED1545G12","supports":"light (state, brightness, color_temp, color_temp_startup), effect, power_on_behavior, color_options, linkquality","vendor":"IKEA"},"failed":[],"friendlyName":"bulb","ieeeAddr":"0x000b57fffec6a5b2","lastSeen":1000,"modelID":"TRADFRI bulb E27 WS opal 980lm","networkAddress":40369,"type":"Router"},{"definition":{"description":"Hue Go","model":"7146060PH","supports":"light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality","vendor":"Philips"},"failed":[],"friendlyName":"bulb_color","ieeeAddr":"0x000b57fffec6a5b3","lastSeen":1000,"modelID":"LLC020","networkAddress":40399,"type":"Router"},{"definition":{"description":"Aqara double key wireless wall switch (2016 model)","model":"WXKG02LM_rev1","supports":"battery, action, voltage, power_outage_count, linkquality","vendor":"Xiaomi"},"friendlyName":"button_double_key","ieeeAddr":"0x0017880104e45521","lastSeen":1000,"modelID":"lumi.sensor_86sw2.es1","networkAddress":6538,"type":"EndDevice"},{"definition":null,"failed":["lqi","routingTable"],"friendlyName":"0x0017880104e45525","ieeeAddr":"0x0017880104e45525","lastSeen":1000,"manufacturerName":"Boef","modelID":"notSupportedModelID","networkAddress":6536,"type":"Router"},{"definition":{"description":"[CC2530 router](http://ptvo.info/cc2530-based-zigbee-coordinator-and-router-112/)","model":"CC2530.ROUTER","supports":"led, linkquality","vendor":"Custom devices (DiY)"},"failed":[],"friendlyName":"cc2530_router","ieeeAddr":"0x0017880104e45559","lastSeen":1000,"modelID":"lumi.router","networkAddress":6540,"type":"Router"},{"definition":{"description":"external","model":"external_converter_device","supports":"linkquality","vendor":"external"},"friendlyName":"0x0017880104e45511","ieeeAddr":"0x0017880104e45511","lastSeen":1000,"modelID":"external_converter_device","networkAddress":1114,"type":"EndDevice"}]}},"status":"ok"};
        const actual = JSON.parse(call[1]);
        expect(actual).toStrictEqual(expected);
    });
@@ -252,7 +252,7 @@ describe('OTA update', () => {
        const mapped = zigbeeHerdsmanConverters.findByDevice(device)
        mockClear(mapped);
        mapped.ota.isUpdateAvailable.mockReturnValueOnce({available: true, currentFileVersion: 10, otaFileVersion: 12});
-        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10};
+        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10, meta: {zclTransactionSequenceNumber: 10}};
        logger.info.mockClear();
        await zigbeeHerdsman.events.message(payload);
        await flushPromises();
@@ -260,7 +260,7 @@ describe('OTA update', () => {
        expect(mapped.ota.isUpdateAvailable).toHaveBeenCalledWith(device, logger, {"imageType": 12382});
        expect(logger.info).toHaveBeenCalledWith(`Update available for 'bulb'`);
        expect(device.endpoints[0].commandResponse).toHaveBeenCalledTimes(1);
-        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 0x98});
+        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 0x98}, undefined, 10);

        // Should not request again when device asks again after a short time
        await zigbeeHerdsman.events.message(payload);
@@ -286,14 +286,14 @@ describe('OTA update', () => {
        const mapped = zigbeeHerdsmanConverters.findByDevice(device)
        mockClear(mapped);
        mapped.ota.isUpdateAvailable.mockImplementationOnce(() => {throw new Error('Nothing to find here')})
-        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10};
+        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10, meta: {zclTransactionSequenceNumber: 10}};
        logger.info.mockClear();
        await zigbeeHerdsman.events.message(payload);
        await flushPromises();
        expect(mapped.ota.isUpdateAvailable).toHaveBeenCalledTimes(1);
        expect(mapped.ota.isUpdateAvailable).toHaveBeenCalledWith(device, logger, {"imageType": 12382});
        expect(device.endpoints[0].commandResponse).toHaveBeenCalledTimes(1);
-        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 0x98});
+        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 0x98}, undefined, 10);
        expect(MQTT.publish).toHaveBeenCalledWith(
            'zigbee2mqtt/bulb',
            stringify({"update_available":false,"update":{"state":"idle"}}),
@@ -308,14 +308,14 @@ describe('OTA update', () => {
        const mapped = zigbeeHerdsmanConverters.findByDevice(device)
        mockClear(mapped);
        mapped.ota.isUpdateAvailable.mockReturnValueOnce({available: false, currentFileVersion: 13, otaFileVersion: 13});
-        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10};
+        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10, meta: {zclTransactionSequenceNumber: 10}};
        logger.info.mockClear();
        await zigbeeHerdsman.events.message(payload);
        await flushPromises();
        expect(mapped.ota.isUpdateAvailable).toHaveBeenCalledTimes(1);
        expect(mapped.ota.isUpdateAvailable).toHaveBeenCalledWith(device, logger, {"imageType": 12382});
        expect(device.endpoints[0].commandResponse).toHaveBeenCalledTimes(1);
-        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 0x98});
+        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 0x98}, undefined, 10);
        expect(MQTT.publish).toHaveBeenCalledWith(
            'zigbee2mqtt/bulb',
            stringify({"update_available":false,"update":{"state":"idle","installed_version": 13, "latest_version": 13}}),
@@ -330,7 +330,7 @@ describe('OTA update', () => {
        const mapped = zigbeeHerdsmanConverters.findByDevice(device)
        mockClear(mapped);
        mapped.ota.isUpdateAvailable.mockReturnValueOnce({available: true, currentFileVersion: 10, otaFileVersion: 13});
-        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10};
+        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10, meta: {zclTransactionSequenceNumber: 10}};
        logger.info.mockClear();
        await zigbeeHerdsman.events.message(payload);
        await flushPromises();
@@ -340,22 +340,22 @@ describe('OTA update', () => {
    it('Should respond with NO_IMAGE_AVAILABLE when not supporting OTA', async () => {
        const device = zigbeeHerdsman.devices.HGZB04D;
        const data = {imageType: 12382};
-        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10};
+        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10, meta: {zclTransactionSequenceNumber: 10}};
        await zigbeeHerdsman.events.message(payload);
        await flushPromises();
        expect(device.endpoints[0].commandResponse).toHaveBeenCalledTimes(1);
-        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 152});
+        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 152}, undefined, 10);
    });

    it('Should respond with NO_IMAGE_AVAILABLE when not supporting OTA and device has no OTA endpoint to standard endpoint', async () => {
        const device = zigbeeHerdsman.devices.SV01;
        const data = {imageType: 12382};
-        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10};
+        const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10, meta: {zclTransactionSequenceNumber: 10}};
        logger.error.mockClear();
        await zigbeeHerdsman.events.message(payload);
        await flushPromises();
        expect(device.endpoints[0].commandResponse).toHaveBeenCalledTimes(1);
-        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 152});
+        expect(device.endpoints[0].commandResponse).toHaveBeenCalledWith("genOta", "queryNextImageResponse", {"status": 152}, undefined, 10);
    });

    it('Legacy api: Should OTA update a device', async () => {
@@ -71,12 +71,7 @@ describe('Publish', () => {
    });

    it('Should corretly handle mallformed messages', async () => {
-        await MQTT.events.message('zigbee2mqtt/foo', undefined);
-        await MQTT.events.message('zigbee2mqtt/foo', null);
        await MQTT.events.message('zigbee2mqtt/foo', "");
-
-        await MQTT.events.message('zigbee2mqtt/bulb_color/set', undefined);
-        await MQTT.events.message('zigbee2mqtt/bulb_color/set', null);
        await MQTT.events.message('zigbee2mqtt/bulb_color/set', "");
        await flushPromises();
        expectNothingPublished();
@@ -964,7 +959,7 @@ describe('Publish', () => {
        await MQTT.events.message('zigbee2mqtt/bulb_color/set', stringify(payload));
        await flushPromises();
        expect(endpoint.command).toHaveBeenCalledTimes(1);
-        expect(endpoint.command.mock.calls[0]).toEqual(["lightingColorCtrl", "enhancedMoveToHueAndSaturation", {"direction": 0, "enhancehue": 44877, "saturation": 200, "transtime": 0,}, {}]);
+        expect(endpoint.command.mock.calls[0]).toEqual(["lightingColorCtrl", "enhancedMoveToHueAndSaturation", {"direction": 0, "enhancehue": 45510, "saturation": 127, "transtime": 0,}, {}]);
        expect(MQTT.publish).toHaveBeenCalledTimes(1);
        expect(MQTT.publish.mock.calls[0][0]).toStrictEqual('zigbee2mqtt/bulb_color');
        expect(JSON.parse(MQTT.publish.mock.calls[0][1])).toStrictEqual({"color":{"hue":250,"saturation":50}, "color_mode": "hs"});
@@ -299,7 +299,7 @@ describe('Receive', () => {

    it('Should publish 1 message when converted twice', async () => {
        const device = zigbeeHerdsman.devices.RTCGQ11LM;
-        const data = {'65281': {'1': 3045, '3': 19, '4': 17320, '5': 35, '6': [0, 3], '10': 51107, '11': 381, '100': 0}}
+        const data = {'65281': {'1': 3045, '3': 19, '5': 35, '6': [0, 3], '11': 381, '100': 0}}
        const payload = {data, cluster: 'genBasic', device, endpoint: device.getEndpoint(1), type: 'attributeReport', linkquality: 10};
        await zigbeeHerdsman.events.message(payload);
        await flushPromises();
@@ -682,6 +682,18 @@ describe('Settings', () => {
        }).toThrow(new Error("Device '0x123' already exists"));
    });

+    it('Should not allow any string values for ext_pan_id', () => {
+        write(configurationFile, {
+            ...minimalConfig,
+            advanced: {ext_pan_id: 'NOT_GENERATE'},
+        });
+
+        settings.reRead();
+
+        const error = `advanced.ext_pan_id: should be array or 'GENERATE' (is 'NOT_GENERATE')`;
+        expect(settings.validate()).toEqual(expect.arrayContaining([error]));
+    });
+
    it('Should not allow any string values for network_key', () => {
        write(configurationFile, {
            ...minimalConfig,
@@ -776,8 +788,7 @@ describe('Settings', () => {

    it('Should throw error when yaml file does not exist', () => {
        settings.testing.clear();
-        const error = `ENOENT: no such file or directory, open '${configurationFile}'`;
-        expect(settings.validate()).toEqual(expect.arrayContaining([error]));
+        expect(settings.validate()[0].startsWith(`ENOENT: no such file or directory, open `)).toBeTruthy();
    });

    it('Configuration shouldnt be valid when invalid QOS value is used', async () => {
@@ -214,6 +214,7 @@ const mock = {
    touchlinkIdentify: jest.fn(),
    start: jest.fn(),
    backup: jest.fn(),
+    coordinatorCheck: jest.fn(),
    isStopping: jest.fn(),
    permitJoin: jest.fn(),
    addInstallCode: jest.fn(),
@@ -1,6 +1,7 @@
 const utils = require('../lib/util/utils').default;
 const version = require('../package.json').version;
 const versionHerdsman = require('../node_modules/zigbee-herdsman/package.json').version;
+const versionHerdsmanConverters = require('../node_modules/zigbee-herdsman-converters/package.json').version;

 describe('Utils', () => {
    it('Object has properties', () => {
@@ -22,8 +23,8 @@ describe('Utils', () => {
    })

    it('Check dependency version', async () => {
-        var dependency = 'zigbee-herdsman';
-        expect(await utils.getDependencyVersion(dependency)).toStrictEqual({"version": versionHerdsman});
+        expect(await utils.getDependencyVersion('zigbee-herdsman')).toStrictEqual({"version": versionHerdsman});
+        expect(await utils.getDependencyVersion('zigbee-herdsman-converters')).toStrictEqual({"version": versionHerdsmanConverters});
    })

    it('To local iso string', async () => {
@@ -15,10 +15,14 @@
        "rootDir": "lib",
        "inlineSourceMap": true,
        "resolveJsonModule": true,
-        "experimentalDecorators": true
+        "experimentalDecorators": true,
+        "incremental": true
    },
    "include": [
        "lib/**/*",
        "lib/util/settings.schema.json"
    ],
+    "exclude": [
+        "node_modules"
+    ],
 }
@@ -17,6 +17,9 @@ fi
 echo "Creating backup of configuration..."
 cp -R data data-backup

+echo "Checking out changes to package-lock.json..."
+git checkout package-lock.json
+
 echo "Updating..."
 git pull