chore(dev): release 1.32.0 (#18163)

Co-authored-by: Koenkk <Koenkk@users.noreply.github.com>

.github/workflows/ci.yml

@@ -1,12 +1,6 @@
 name: ci
 
-on:
-  pull_request:
-  push:
-    branches-ignore:
-      - deps/*
-    tags:
-      - '**'
+on: [pull_request, push]
 
 permissions:
   contents: write

.github/workflows/release_please.yml

@@ -27,6 +27,8 @@ 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
@@ -38,25 +40,24 @@ jobs:
           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
         run: |
           cd z2m
-          git push --delete origin latest-dev
+          git push --delete origin latest-dev || true
           git tag latest-dev
           git push origin latest-dev
+      - name: Cache commit-user-lookup.json
+        uses: actions/cache@v3
+        with:
+          path: z2m/scripts/commit-user-lookup.json
+          key: always
       - 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
@@ -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.txt
         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
+        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@v4
       with:
-        commit_message: Promote to dev
+        commit_message: "chore: promote to dev"

.github/workflows/update_deps.yml

@@ -29,3 +29,4 @@ jobs:
         commit-message: "fix(ignore): update dependencies"
         branch: "deps/all"
         title: Update dependencies
+        token: ${{ secrets.GH_TOKEN }}

.gitignore

@@ -80,3 +80,6 @@ data/extension
 
 # Ignore config
 data/*.yaml
+
+# commit-user-lookup.json
+scripts/commit-user-lookup.json

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  ".": "1.31.0",
+  ".": "1.32.0",
   "bootstrap-sha": "b2dd21e164b457d5cd0c9d455cdb879d881c44bd"
 }

CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## [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)
 
 

README.md

@@ -58,6 +58,14 @@ 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/)

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.0 as base
+FROM alpine:3.18.2 as base
 
 WORKDIR /app
 RUN apk add --no-cache tzdata eudev tini nodejs

lib/extension/homeassistant.ts

@@ -732,6 +732,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'},
@@ -881,24 +885,41 @@ 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("") ` +
+                    `| 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: {
                         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: {
+                        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}'`);
         }

lib/extension/otaUpdate.ts

@@ -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';

lib/extension/publish.ts

@@ -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';
@@ -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) {

lib/mqtt.ts

@@ -140,7 +140,7 @@ export default class MQTT {
             this.eventBus.emitMQTTMessage({topic, message: message + ''});
         }
 
-        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;
         }

lib/types/types.d.ts

@@ -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';
@@ -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;};
         };
     }
 

lib/types/zigbee-herdsman-converters.d.ts

@@ -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};
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.31.2",
+  "version": "1.32.0",
   "description": "Zigbee to MQTT bridge using Zigbee-herdsman",
   "main": "index.js",
   "repository": {
@@ -59,33 +59,33 @@
     "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.1",
+    "zigbee-herdsman": "0.16.0",
+    "zigbee-herdsman-converters": "15.33.1",
     "zigbee2mqtt-frontend": "0.6.129"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.1",
+    "@babel/core": "^7.22.5",
     "@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",
+    "@babel/plugin-proposal-decorators": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-typescript": "^7.22.5",
     "@types/debounce": "^1.2.1",
     "@types/finalhandler": "^1.2.0",
     "@types/humanize-duration": "^3.27.1",
-    "@types/jest": "^29.5.1",
+    "@types/jest": "^29.5.2",
     "@types/js-yaml": "^4.0.5",
     "@types/object-assign-deep": "^0.4.0",
     "@types/rimraf": "^3.0.2",
-    "@types/ws": "^8.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
+    "@types/ws": "8.5.4",
+    "@typescript-eslint/eslint-plugin": "^5.59.9",
+    "@typescript-eslint/parser": "^5.59.9",
     "babel-jest": "^29.5.0",
-    "eslint": "^8.41.0",
+    "eslint": "^8.42.0",
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-jest": "^27.2.1",
     "jest": "^29.5.0",
     "tmp": "^0.2.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.1.3"
   },
   "jest": {
     "coverageThreshold": {

scripts/generateChangelog.js

@@ -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());

test/controller.test.js

@@ -660,7 +660,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));

test/publish.test.js

@@ -964,7 +964,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"});

test/receive.test.js

@@ -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();

tsconfig.json

@@ -21,4 +21,7 @@
         "lib/**/*",
         "lib/util/settings.schema.json"
     ],
+    "exclude": [
+        "node_modules"
+    ],
 }