test: update Philips light fixtures for hue_native_control

Updates z2m test fixtures to match the new exposes and options added by
the Hue native control changes in zigbee-herdsman-converters patch-1:
- effect enum gains 9 new values and switches to STATE_SET access
- new effect_speed and effect_color exposes
- new hue_native_control and effect_color_mode options

Affects only Philips LLC020 (bulb_color / bulb_color_2) fixtures and the
ha_discovery_group that contains it.

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
             - uses: actions/checkout@v6
               if: ((github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push') == false
 
-            - uses: pnpm/action-setup@v4
+            - uses: pnpm/action-setup@v5
 
             - uses: actions/setup-node@v6
               with:
@@ -63,14 +63,14 @@ jobs:
 
             - name: Log in to the Docker container registry
               if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
-              uses: docker/login-action@v3
+              uses: docker/login-action@v4
               with:
                   username: koenkk
                   password: ${{ secrets.DOCKER_KEY }}
 
             - name: Log in to the GitHub container registry
               if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
-              uses: docker/login-action@v3
+              uses: docker/login-action@v4
               with:
                   registry: ghcr.io
                   username: koenkk
@@ -78,20 +78,20 @@ jobs:
 
             - name: Docker setup - QEMU
               if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
-              uses: docker/setup-qemu-action@v3
+              uses: docker/setup-qemu-action@v4
               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@v3
+              uses: docker/setup-buildx-action@v4
               with:
                   version: latest
 
             - name: dev - Docker build and push
               if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
-              uses: docker/build-push-action@v6
+              uses: docker/build-push-action@v7
               with:
                   context: .
                   file: docker/Dockerfile
@@ -126,7 +126,7 @@ jobs:
 
             - name: release - Docker meta
               if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'
-              uses: docker/metadata-action@v5
+              uses: docker/metadata-action@v6
               id: meta
               with:
                   images: |
@@ -139,7 +139,7 @@ jobs:
 
             - name: release - Docker build and push
               if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'
-              uses: docker/build-push-action@v6
+              uses: docker/build-push-action@v7
               with:
                   context: .
                   file: docker/Dockerfile
@@ -222,7 +222,7 @@ jobs:
         steps:
             - uses: actions/checkout@v6
 
-            - uses: pnpm/action-setup@v4
+            - uses: pnpm/action-setup@v5
 
             - uses: actions/setup-node@v6
               with:

.github/workflows/ghcr-cleanup.yml

@@ -10,7 +10,7 @@ jobs:
 
         steps:
             - name: Delete untagged images
-              uses: actions/github-script@v8
+              uses: actions/github-script@v9
               with:
                   github-token: ${{ secrets.GH_TOKEN }}
                   script: |

.github/workflows/issue_bot.yml

@@ -31,7 +31,7 @@ jobs:
           path: zhc
 
       - name: Comment on new device support/external converter issue
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const {newDeviceSupport} = await import("${{ github.workspace }}/z2m/scripts/issueBot.mjs")

.github/workflows/release-please.yml

@@ -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: pnpm/action-setup@v4
+            - uses: pnpm/action-setup@v5
               with:
                   version: 9
 

.github/workflows/update-dependency.yml

@@ -17,7 +17,7 @@ jobs:
               with:
                   ref: dev
                   token: ${{ secrets.GH_TOKEN }}
-            - uses: pnpm/action-setup@v4
+            - uses: pnpm/action-setup@v5
             - uses: actions/setup-node@v6
               with:
                   node-version: 24

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "2.9.1"
+    ".": "2.9.2"
 }

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## [2.9.2](https://github.com/Koenkk/zigbee2mqtt/compare/2.9.1...2.9.2) (2026-03-31)
+
+
+### Bug Fixes
+
+* Export definition version ([#31270](https://github.com/Koenkk/zigbee2mqtt/issues/31270)) ([9f1eb76](https://github.com/Koenkk/zigbee2mqtt/commit/9f1eb764a62b041a7d9782066a8ffcaa3562eaad))
+* Home Assistant: fix entity names for derived weather sensors by removing `device_class` ([#31234](https://github.com/Koenkk/zigbee2mqtt/issues/31234)) ([b7b4303](https://github.com/Koenkk/zigbee2mqtt/commit/b7b43030eb8aaa144dbb5477805638d860efdd38))
+* **ignore:** bump @biomejs/biome from 2.4.4 to 2.4.5 in the minor-patch group ([#31237](https://github.com/Koenkk/zigbee2mqtt/issues/31237)) ([aefbb8b](https://github.com/Koenkk/zigbee2mqtt/commit/aefbb8be14ae5d84495278cbe9a6ca9d750553cb))
+* **ignore:** bump the minor-patch group with 2 updates ([#31411](https://github.com/Koenkk/zigbee2mqtt/issues/31411)) ([67aa509](https://github.com/Koenkk/zigbee2mqtt/commit/67aa5099df2371eb9ee220be7a8821f0d4f8b38b))
+* **ignore:** bump the minor-patch group with 3 updates ([#31295](https://github.com/Koenkk/zigbee2mqtt/issues/31295)) ([b7f1cec](https://github.com/Koenkk/zigbee2mqtt/commit/b7f1cecb49f088b7fc79dcef068034ca1d012c1d))
+* **ignore:** bump the minor-patch group with 3 updates ([#31489](https://github.com/Koenkk/zigbee2mqtt/issues/31489)) ([52b063b](https://github.com/Koenkk/zigbee2mqtt/commit/52b063bb32429e14b30319c905e596b7632bd674))
+* **ignore:** bump the minor-patch group with 3 updates ([#31559](https://github.com/Koenkk/zigbee2mqtt/issues/31559)) ([73d8ae8](https://github.com/Koenkk/zigbee2mqtt/commit/73d8ae895613af0d77f0a684f7305d688af11146))
+* **ignore:** update zigbee-herdsman to 10.0.1 ([#31383](https://github.com/Koenkk/zigbee2mqtt/issues/31383)) ([6fca374](https://github.com/Koenkk/zigbee2mqtt/commit/6fca3744c9715dd4afb7fc777cf783c84bfb91fc))
+* **ignore:** update zigbee-herdsman to 10.0.2 ([#31413](https://github.com/Koenkk/zigbee2mqtt/issues/31413)) ([075f87c](https://github.com/Koenkk/zigbee2mqtt/commit/075f87c7822c29c74fc1c4031866aca8c445c9be))
+* **ignore:** update zigbee-herdsman to 10.0.3 ([#31450](https://github.com/Koenkk/zigbee2mqtt/issues/31450)) ([6fb9d56](https://github.com/Koenkk/zigbee2mqtt/commit/6fb9d563e69c2db3b31fd0f163e5f30924047e3f))
+* **ignore:** update zigbee-herdsman to 10.0.4 ([#31478](https://github.com/Koenkk/zigbee2mqtt/issues/31478)) ([867179c](https://github.com/Koenkk/zigbee2mqtt/commit/867179c430eacf9bd66ef359b9a7435f2299d944))
+* **ignore:** update zigbee-herdsman to 10.0.5 ([#31562](https://github.com/Koenkk/zigbee2mqtt/issues/31562)) ([fb3189b](https://github.com/Koenkk/zigbee2mqtt/commit/fb3189b7431cb203092bbe235bd35194e2b44a44))
+* **ignore:** update zigbee-herdsman to 9.0.10 ([#31245](https://github.com/Koenkk/zigbee2mqtt/issues/31245)) ([d632382](https://github.com/Koenkk/zigbee2mqtt/commit/d6323825e4ae3168d52a096e7647bc7174d3cdb1))
+* **ignore:** update zigbee-herdsman to 9.0.11 ([#31257](https://github.com/Koenkk/zigbee2mqtt/issues/31257)) ([1747618](https://github.com/Koenkk/zigbee2mqtt/commit/1747618afa3948ac9fb8899d94fba8456198e4b5))
+* **ignore:** update zigbee-herdsman-converters to 26.13.0 ([#31231](https://github.com/Koenkk/zigbee2mqtt/issues/31231)) ([fc3a196](https://github.com/Koenkk/zigbee2mqtt/commit/fc3a1968f6635d246ad2d68e5c6b79d495fd96bb))
+* **ignore:** update zigbee-herdsman-converters to 26.14.0 ([#31246](https://github.com/Koenkk/zigbee2mqtt/issues/31246)) ([284d86e](https://github.com/Koenkk/zigbee2mqtt/commit/284d86e93ba8cd83139d6dd0217519f67c01e565))
+* **ignore:** update zigbee-herdsman-converters to 26.16.1 ([#31268](https://github.com/Koenkk/zigbee2mqtt/issues/31268)) ([05946b5](https://github.com/Koenkk/zigbee2mqtt/commit/05946b59552608c6ae8a8b02098552fe611f027a))
+* **ignore:** update zigbee-herdsman-converters to 26.17.0 ([#31314](https://github.com/Koenkk/zigbee2mqtt/issues/31314)) ([9143924](https://github.com/Koenkk/zigbee2mqtt/commit/91439244823d9897998a57448321d2e8af9b083f))
+* **ignore:** update zigbee-herdsman-converters to 26.18.0 ([#31362](https://github.com/Koenkk/zigbee2mqtt/issues/31362)) ([f60db2d](https://github.com/Koenkk/zigbee2mqtt/commit/f60db2d7a641ab5fccbb3a7b6a0e1e73983559ef))
+* **ignore:** update zigbee-herdsman-converters to 26.19.1 ([#31384](https://github.com/Koenkk/zigbee2mqtt/issues/31384)) ([69641d5](https://github.com/Koenkk/zigbee2mqtt/commit/69641d5467ec5e3ddfebb4ff98142d0ff990c814))
+* **ignore:** update zigbee-herdsman-converters to 26.20.0 ([#31415](https://github.com/Koenkk/zigbee2mqtt/issues/31415)) ([9f49d0e](https://github.com/Koenkk/zigbee2mqtt/commit/9f49d0ec6738ebd1ea65a3bf1aae553548217f2e))
+* **ignore:** update zigbee-herdsman-converters to 26.21.0 ([#31427](https://github.com/Koenkk/zigbee2mqtt/issues/31427)) ([e054d71](https://github.com/Koenkk/zigbee2mqtt/commit/e054d7124bd4dc5bdb18c9de4a6923b06df6b929))
+* **ignore:** update zigbee-herdsman-converters to 26.22.0 ([#31451](https://github.com/Koenkk/zigbee2mqtt/issues/31451)) ([64286eb](https://github.com/Koenkk/zigbee2mqtt/commit/64286ebb3054bc15e020aab431c1d3af76e2c914))
+* **ignore:** update zigbee-herdsman-converters to 26.23.0 ([#31462](https://github.com/Koenkk/zigbee2mqtt/issues/31462)) ([2e5e362](https://github.com/Koenkk/zigbee2mqtt/commit/2e5e3628188765cddbd4116f41703eab491670df))
+* **ignore:** update zigbee-herdsman-converters to 26.24.0 ([#31479](https://github.com/Koenkk/zigbee2mqtt/issues/31479)) ([dde637a](https://github.com/Koenkk/zigbee2mqtt/commit/dde637af2f8449ae24684fa34a32bec106c24913))
+* **ignore:** update zigbee-herdsman-converters to 26.25.0 ([#31497](https://github.com/Koenkk/zigbee2mqtt/issues/31497)) ([66985a8](https://github.com/Koenkk/zigbee2mqtt/commit/66985a8ce8d4cefbc4ddacc754e182e0b5953cea))
+* **ignore:** update zigbee-herdsman-converters to 26.26.0 ([#31510](https://github.com/Koenkk/zigbee2mqtt/issues/31510)) ([969db9a](https://github.com/Koenkk/zigbee2mqtt/commit/969db9ae85838b955e07a80f5f72f655f6beffcf))
+* **ignore:** update zigbee-herdsman-converters to 26.27.0 ([#31563](https://github.com/Koenkk/zigbee2mqtt/issues/31563)) ([62ab814](https://github.com/Koenkk/zigbee2mqtt/commit/62ab814d73b7de957fb8b28679b9dea8ae087133))
+* Match new cluster-related typing from ZH ([#31298](https://github.com/Koenkk/zigbee2mqtt/issues/31298)) ([0f781ee](https://github.com/Koenkk/zigbee2mqtt/commit/0f781ee9c03ae502745841f4dd7d6f3775c620d4))
+* Reintroduce onboarding improvements ([#31273](https://github.com/Koenkk/zigbee2mqtt/issues/31273)) ([4a83692](https://github.com/Koenkk/zigbee2mqtt/commit/4a8369295c5d6c07ff1ac66f90a35b0e8b915296))
+
 ## [2.9.1](https://github.com/Koenkk/zigbee2mqtt/compare/2.9.0...2.9.1) (2026-03-02)
 
 

biome.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://biomejs.dev/schemas/2.4.1/schema.json",
+    "$schema": "https://biomejs.dev/schemas/2.4.10/schema.json",
     "vcs": {
         "enabled": true,
         "clientKind": "git",

lib/extension/bridge.ts

@@ -900,6 +900,7 @@ export default class Bridge extends Extension {
             exposes: device.exposes(),
             supports_ota: !!device.definition.ota,
             options: device.definition.options ?? [],
+            version: device.definition.version,
             icon,
         };
 

lib/extension/configure.ts

@@ -38,7 +38,7 @@ export default class Configure extends Extension {
 
                 if (!device || !(device instanceof Device)) {
                     error = `Device '${ID}' does not exist`;
-                } else if (!device.definition || !device.definition.configure) {
+                } else if (!device.definition?.configure) {
                     error = `Device '${device.name}' cannot be configured`;
                 } else {
                     try {

lib/extension/groups.ts

@@ -168,7 +168,7 @@ export default class Groups extends Extension {
                     endpointNames &&
                     endpointNames.length >= member.ID &&
                     device.definition?.meta?.multiEndpoint &&
-                    (!device.definition.meta.multiEndpointSkip || !device.definition.meta.multiEndpointSkip.includes("state"))
+                    !device.definition.meta.multiEndpointSkip?.includes("state")
                         ? `state_${endpointNames[member.ID - 1]}`
                         : "state";
 

lib/extension/homeassistant.ts

@@ -2,7 +2,7 @@ import assert from "node:assert";
 import bind from "bind-decorator";
 import stringify from "json-stable-stringify-without-jsonify";
 import type * as zhc from "zigbee-herdsman-converters";
-
+import type {Zh} from "zigbee-herdsman-converters/lib/types";
 import logger from "../util/logger";
 import * as settings from "../util/settings";
 import utils, {assertBinaryExpose, assertEnumExpose, assertNumericExpose, isBinaryExpose, isEnumExpose, isNumericExpose} from "../util/utils";
@@ -18,6 +18,7 @@ interface DiscoveryEntry {
     type: string;
     object_id: string;
     discovery_payload: KeyValue;
+    endpoint?: Zh.Endpoint;
 }
 
 interface Discovered {
@@ -119,7 +120,7 @@ const NUMERIC_DISCOVERY_LOOKUP: {[s: string]: KeyValue} = {
     alarm_temperature_min: {device_class: "temperature", entity_category: "config", icon: "mdi:thermometer-low"},
     angle: {icon: "angle-acute"},
     angle_axis: {icon: "angle-acute"},
-    apparent_temperature: {device_class: "temperature", icon: "mdi:thermometer-lines", state_class: "measurement"},
+    apparent_temperature: {icon: "mdi:thermometer-lines", state_class: "measurement"},
     aqi: {device_class: "aqi", state_class: "measurement"},
     auto_relock_time: {entity_category: "config", icon: "mdi:timer"},
     away_preset_days: {entity_category: "config", icon: "mdi:timer"},
@@ -154,7 +155,7 @@ const NUMERIC_DISCOVERY_LOOKUP: {[s: string]: KeyValue} = {
         entity_category: "diagnostic",
         state_class: "measurement",
     },
-    dew_point: {device_class: "temperature", icon: "mdi:thermometer-water", state_class: "measurement"},
+    dew_point: {icon: "mdi:thermometer-water", state_class: "measurement"},
     distance: {device_class: "distance", state_class: "measurement"},
     duration: {entity_category: "config", icon: "mdi:timer"},
     eco2: {device_class: "volatile_organic_compounds_parts", state_class: "measurement"},
@@ -167,10 +168,10 @@ const NUMERIC_DISCOVERY_LOOKUP: {[s: string]: KeyValue} = {
     flow: {device_class: "volume_flow_rate", state_class: "measurement"},
     gas: {device_class: "gas", state_class: "total_increasing", icon: "mdi:meter-gas"},
     gas_density: {icon: "mdi:google-circles-communities", state_class: "measurement"},
-    gust_speed: {device_class: "wind_speed", icon: "mdi:weather-windy-variant", state_class: "measurement"},
+    gust_speed: {icon: "mdi:weather-windy-variant", state_class: "measurement"},
     hcho: {icon: "mdi:air-filter", state_class: "measurement"},
     heat_stress: {icon: "mdi:weather-sunny-alert", state_class: "measurement"},
-    humidex: {device_class: "temperature", icon: "mdi:thermometer-alert", state_class: "measurement"},
+    humidex: {icon: "mdi:thermometer-alert", state_class: "measurement"},
     humidity: {device_class: "humidity", state_class: "measurement"},
     humidity_calibration: {entity_category: "config", icon: "mdi:wrench-clock"},
     humidity_max: {entity_category: "config", icon: "mdi:water-percent"},
@@ -254,7 +255,7 @@ const NUMERIC_DISCOVERY_LOOKUP: {[s: string]: KeyValue} = {
         device_class: "water",
         state_class: "total_increasing",
     },
-    wind_chill: {device_class: "temperature", icon: "mdi:snowflake-thermometer", state_class: "measurement"},
+    wind_chill: {icon: "mdi:snowflake-thermometer", state_class: "measurement"},
     wind_direction: {icon: "mdi:compass-outline", state_class: "measurement"},
     wind_speed: {device_class: "wind_speed", icon: "mdi:weather-windy", state_class: "measurement"},
     x: {icon: "mdi:axis-x-arrow", state_class: "measurement"},
@@ -384,6 +385,7 @@ export class HomeAssistant extends Extension {
     private discoveryTopic: string;
     private discoveryRegex: RegExp;
     private discoveryRegexWoTopic = /(.*)\/(.*)\/(.*)\/config/;
+    private groupMemberLookup = new Map<string, string>();
     private statusTopic: string;
     private legacyActionSensor: boolean;
     private experimentalEventEntities: boolean;
@@ -459,10 +461,15 @@ export class HomeAssistant extends Extension {
         const discoverWait = 5;
         // Discover with `published = false`, this will populate `this.discovered` without publishing the discoveries.
         // This is needed for clearing outdated entries in `this.onMQTTMessage()`
+        // Discover devices before groups to populate `this.groupMemberLookup` for group discovery.
         await this.discover(this.bridge, false);
 
-        for (const e of this.zigbee.devicesAndGroupsIterator(utils.deviceNotCoordinator)) {
-            await this.discover(e, false);
+        for (const device of this.zigbee.devicesIterator(utils.deviceNotCoordinator)) {
+            await this.discover(device, false);
+        }
+
+        for (const group of this.zigbee.groupsIterator()) {
+            await this.discover(group, false);
         }
 
         logger.debug(`Discovering entities to Home Assistant in ${discoverWait}s`);
@@ -487,21 +494,16 @@ export class HomeAssistant extends Extension {
         return this.discovered[ID];
     }
 
-    private exposeToConfig(
-        exposes: zhc.Expose[],
-        entityType: "device" | "group",
-        allExposes: zhc.Expose[],
-        definition?: zhc.Definition,
-    ): DiscoveryEntry[] {
+    private exposeToConfig(exposes: zhc.Expose[], entity: Device | Group, allExposes: zhc.Expose[]): DiscoveryEntry[] {
         // For groups an array of exposes (of the same type) is passed, this is to determine e.g. what features
         // to use for a bulb (e.g. color_xy/color_temp)
-        assert(entityType === "group" || exposes.length === 1, "Multiple exposes for device not allowed");
+        assert(entity.isGroup() || exposes.length === 1, "Multiple exposes for device not allowed");
         const firstExpose = exposes[0];
-        assert(entityType === "device" || GROUP_SUPPORTED_TYPES.includes(firstExpose.type), `Unsupported expose type ${firstExpose.type} for group`);
+        assert(entity.isDevice() || GROUP_SUPPORTED_TYPES.includes(firstExpose.type), `Unsupported expose type ${firstExpose.type} for group`);
 
         const discoveryEntries: DiscoveryEntry[] = [];
-        const endpoint = entityType === "device" ? exposes[0].endpoint : undefined;
-        const getProperty = (feature: zhc.Feature): string => (entityType === "group" ? featurePropertyWithoutEndpoint(feature) : feature.property);
+        const endpointName = entity.isDevice() ? exposes[0].endpoint : undefined;
+        const getProperty = (feature: zhc.Feature): string => (entity.isGroup() ? featurePropertyWithoutEndpoint(feature) : feature.property);
 
         switch (firstExpose.type) {
             case "light": {
@@ -520,16 +522,16 @@ export class HomeAssistant extends Extension {
 
                 const discoveryEntry: DiscoveryEntry = {
                     type: "light",
-                    object_id: endpoint ? `light_${endpoint}` : "light",
+                    object_id: endpointName ? `light_${endpointName}` : "light",
                     mockProperties: [{property: state.property, value: null}],
                     discovery_payload: {
-                        name: endpoint ? utils.capitalize(endpoint) : null,
+                        name: endpointName ? utils.capitalize(endpointName) : null,
                         brightness: !!hasBrightness,
                         schema: "json",
                         command_topic: true,
                         brightness_scale: 254,
-                        command_topic_prefix: endpoint,
-                        state_topic_postfix: endpoint,
+                        command_topic_prefix: endpointName,
+                        state_topic_postfix: endpointName,
                     },
                 };
 
@@ -582,15 +584,15 @@ export class HomeAssistant extends Extension {
                 const property = getProperty(state);
                 const discoveryEntry: DiscoveryEntry = {
                     type: "switch",
-                    object_id: endpoint ? `switch_${endpoint}` : "switch",
+                    object_id: endpointName ? `switch_${endpointName}` : "switch",
                     mockProperties: [{property: property, value: null}],
                     discovery_payload: {
-                        name: endpoint ? utils.capitalize(endpoint) : null,
+                        name: endpointName ? utils.capitalize(endpointName) : null,
                         payload_off: state.value_off,
                         payload_on: state.value_on,
                         value_template: `{{ value_json.${property} }}`,
                         command_topic: true,
-                        command_topic_prefix: endpoint,
+                        command_topic_prefix: endpointName,
                     },
                 };
 
@@ -621,10 +623,10 @@ export class HomeAssistant extends Extension {
 
                 const discoveryEntry: DiscoveryEntry = {
                     type: "climate",
-                    object_id: endpoint ? `climate_${endpoint}` : "climate",
+                    object_id: endpointName ? `climate_${endpointName}` : "climate",
                     mockProperties: [],
                     discovery_payload: {
-                        name: endpoint ? utils.capitalize(endpoint) : null,
+                        name: endpointName ? utils.capitalize(endpointName) : null,
                         // Static
                         state_topic: false,
                         temperature_unit: "C",
@@ -635,7 +637,7 @@ export class HomeAssistant extends Extension {
                         // Temperature
                         current_temperature_topic: true,
                         current_temperature_template: `{{ value_json.${temperature.property} }}`,
-                        command_topic_prefix: endpoint,
+                        command_topic_prefix: endpointName,
                     },
                 };
 
@@ -704,13 +706,13 @@ export class HomeAssistant extends Extension {
                 if (tempCalibration) {
                     const discoveryEntry: DiscoveryEntry = {
                         type: "number",
-                        object_id: endpoint ? `${tempCalibration.name}_${endpoint}` : `${tempCalibration.name}`,
+                        object_id: endpointName ? `${tempCalibration.name}_${endpointName}` : `${tempCalibration.name}`,
                         mockProperties: [{property: tempCalibration.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? `${tempCalibration.label} ${endpoint}` : tempCalibration.label,
+                            name: endpointName ? `${tempCalibration.label} ${endpointName}` : tempCalibration.label,
                             value_template: `{{ value_json.${tempCalibration.property} }}`,
                             command_topic: true,
-                            command_topic_prefix: endpoint,
+                            command_topic_prefix: endpointName,
                             command_topic_postfix: tempCalibration.property,
                             device_class: "temperature_delta",
                             entity_category: "config",
@@ -729,10 +731,10 @@ export class HomeAssistant extends Extension {
                 const piHeatingDemand = (firstExpose as zhc.Climate).features.filter(isNumericExpose).find((f) => f.name === "pi_heating_demand");
                 if (piHeatingDemand) {
                     const discoveryEntry: Partial<DiscoveryEntry> = {
-                        object_id: endpoint ? `${piHeatingDemand.name}_${endpoint}` : `${piHeatingDemand.name}`,
+                        object_id: endpointName ? `${piHeatingDemand.name}_${endpointName}` : `${piHeatingDemand.name}`,
                         mockProperties: [{property: piHeatingDemand.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? `${piHeatingDemand.label} ${endpoint}` : piHeatingDemand.label,
+                            name: endpointName ? `${piHeatingDemand.label} ${endpointName}` : piHeatingDemand.label,
                             value_template: `{{ value_json.${piHeatingDemand.property} }}`,
                             ...(piHeatingDemand.unit && {unit_of_measurement: piHeatingDemand.unit}),
                             icon: "mdi:radiator",
@@ -744,7 +746,7 @@ export class HomeAssistant extends Extension {
                     if (piHeatingDemand.access & ACCESS_SET) {
                         discoveryEntry.type = "number";
                         discoveryEntry.discovery_payload.command_topic = true;
-                        discoveryEntry.discovery_payload.command_topic_prefix = endpoint;
+                        discoveryEntry.discovery_payload.command_topic_prefix = endpointName;
                         discoveryEntry.discovery_payload.command_topic_postfix = piHeatingDemand.property;
                         discoveryEntry.discovery_payload.min = piHeatingDemand.value_min;
                         discoveryEntry.discovery_payload.max = piHeatingDemand.value_max;
@@ -760,10 +762,10 @@ export class HomeAssistant extends Extension {
                 if (piCoolingDemand) {
                     const discoveryEntry: DiscoveryEntry = {
                         type: "sensor",
-                        object_id: endpoint ? /* v8 ignore next */ `${piCoolingDemand.name}_${endpoint}` : `${piCoolingDemand.name}`,
+                        object_id: endpointName ? /* v8 ignore next */ `${piCoolingDemand.name}_${endpointName}` : `${piCoolingDemand.name}`,
                         mockProperties: [{property: piCoolingDemand.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? /* v8 ignore next */ `${piCoolingDemand.label} ${endpoint}` : piCoolingDemand.label,
+                            name: endpointName ? /* v8 ignore next */ `${piCoolingDemand.label} ${endpointName}` : piCoolingDemand.label,
                             value_template: `{{ value_json.${piCoolingDemand.property} }}`,
                             ...(piCoolingDemand.unit && {unit_of_measurement: piCoolingDemand.unit}),
                             entity_category: "diagnostic",
@@ -782,10 +784,10 @@ export class HomeAssistant extends Extension {
                 if (localTemperature && !temperatureSensor && !localTemperatureSensor) {
                     const discoveryEntry: DiscoveryEntry = {
                         type: "sensor",
-                        object_id: endpoint ? `${localTemperature.name}_${endpoint}` : `${localTemperature.name}`,
+                        object_id: endpointName ? `${localTemperature.name}_${endpointName}` : `${localTemperature.name}`,
                         mockProperties: [{property: localTemperature.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? `${localTemperature.label} ${endpoint}` : localTemperature.label,
+                            name: endpointName ? `${localTemperature.label} ${endpointName}` : localTemperature.label,
                             value_template: `{{ value_json.${localTemperature.property} }}`,
                             ...(localTemperature.unit && {unit_of_measurement: localTemperature.unit}),
                             device_class: "temperature",
@@ -811,18 +813,18 @@ export class HomeAssistant extends Extension {
                 const discoveryEntry: DiscoveryEntry = {
                     type: "lock",
                     /* v8 ignore next */
-                    object_id: endpoint ? `lock_${endpoint}` : "lock",
+                    object_id: endpointName ? `lock_${endpointName}` : "lock",
                     mockProperties: [{property: state.property, value: null}],
                     discovery_payload: {
                         /* v8 ignore next */
-                        name: endpoint ? utils.capitalize(endpoint) : null,
-                        command_topic_prefix: endpoint,
+                        name: endpointName ? utils.capitalize(endpointName) : null,
+                        command_topic_prefix: endpointName,
                         command_topic: true,
                         value_template: `{{ value_json.${state.property} }}`,
                         state_locked: state.value_on,
                         state_unlocked: state.value_off,
                         /* v8 ignore next */
-                        command_topic_postfix: endpoint ? state.property : null,
+                        command_topic_postfix: endpointName ? state.property : null,
                     },
                 };
                 discoveryEntries.push(discoveryEntry);
@@ -847,13 +849,13 @@ export class HomeAssistant extends Extension {
                 const discoveryEntry: DiscoveryEntry = {
                     type: "cover",
                     mockProperties: [{property: state.property, value: null}],
-                    object_id: endpoint ? `cover_${endpoint}` : "cover",
+                    object_id: endpointName ? `cover_${endpointName}` : "cover",
                     discovery_payload: {
-                        name: endpoint ? utils.capitalize(endpoint) : null,
-                        command_topic_prefix: endpoint,
+                        name: endpointName ? utils.capitalize(endpointName) : null,
+                        command_topic_prefix: endpointName,
                         command_topic: true,
                         state_topic: true,
-                        state_topic_postfix: endpoint,
+                        state_topic_postfix: endpointName,
                     },
                 };
 
@@ -916,7 +918,7 @@ export class HomeAssistant extends Extension {
                 break;
             }
             case "fan": {
-                assert(!endpoint, "Endpoint not supported for fan type");
+                assert(!endpointName, "Endpoint not supported for fan type");
                 const discoveryEntry: DiscoveryEntry = {
                     type: "fan",
                     object_id: "fan",
@@ -952,7 +954,7 @@ export class HomeAssistant extends Extension {
                     );
                     let presets = ["on", "auto", "smart"].filter((s) => modeEmulatedSpeed.values.includes(s));
 
-                    if (definition?.model === "99432") {
+                    if (entity.isDevice() && entity.definition?.model === "99432") {
                         // The Hampton Bay 99432 fan implements 4 speeds using the ZCL
                         // hvacFanCtrl values `low`, `medium`, `high`, and `on`, and
                         // 1 preset called "Comfort Breeze" using the ZCL value `smart`.
@@ -1014,9 +1016,9 @@ export class HomeAssistant extends Extension {
                     const discoveryEntry: DiscoveryEntry = {
                         type: "switch",
                         mockProperties: [{property: firstExpose.property, value: null}],
-                        object_id: endpoint ? `switch_${firstExpose.name}_${endpoint}` : `switch_${firstExpose.name}`,
+                        object_id: endpointName ? `switch_${firstExpose.name}_${endpointName}` : `switch_${firstExpose.name}`,
                         discovery_payload: {
-                            name: endpoint ? /* v8 ignore next */ `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                            name: endpointName ? /* v8 ignore next */ `${firstExpose.label} ${endpointName}` : firstExpose.label,
                             value_template:
                                 typeof firstExpose.value_on === "boolean"
                                     ? `{% if value_json.${firstExpose.property} %}true{% else %}false{% endif %}`
@@ -1024,7 +1026,7 @@ export class HomeAssistant extends Extension {
                             payload_on: firstExpose.value_on.toString(),
                             payload_off: firstExpose.value_off.toString(),
                             command_topic: true,
-                            command_topic_prefix: endpoint,
+                            command_topic_prefix: endpointName,
                             command_topic_postfix: firstExpose.property,
                             ...(BINARY_DISCOVERY_LOOKUP[firstExpose.name] || {}),
                         },
@@ -1034,10 +1036,10 @@ export class HomeAssistant extends Extension {
                 } else {
                     const discoveryEntry: DiscoveryEntry = {
                         type: "binary_sensor",
-                        object_id: endpoint ? `${firstExpose.name}_${endpoint}` : `${firstExpose.name}`,
+                        object_id: endpointName ? `${firstExpose.name}_${endpointName}` : `${firstExpose.name}`,
                         mockProperties: [{property: firstExpose.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? /* v8 ignore next */ `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                            name: endpointName ? /* v8 ignore next */ `${firstExpose.label} ${endpointName}` : firstExpose.label,
                             value_template: `{{ value_json.${firstExpose.property} }}`,
                             payload_on: firstExpose.value_on,
                             payload_off: firstExpose.value_off,
@@ -1059,13 +1061,13 @@ export class HomeAssistant extends Extension {
                 if (allowsSet) {
                     const discoveryEntry: DiscoveryEntry = {
                         type: "number",
-                        object_id: endpoint ? `${firstExpose.name}_${endpoint}` : `${firstExpose.name}`,
+                        object_id: endpointName ? `${firstExpose.name}_${endpointName}` : `${firstExpose.name}`,
                         mockProperties: [{property: firstExpose.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                            name: endpointName ? `${firstExpose.label} ${endpointName}` : firstExpose.label,
                             value_template: `{{ value_json.${firstExpose.property} }}`,
                             command_topic: true,
-                            command_topic_prefix: endpoint,
+                            command_topic_prefix: endpointName,
                             command_topic_postfix: firstExpose.property,
                             ...(firstExpose.unit && {unit_of_measurement: firstExpose.unit}),
                             ...(firstExpose.value_step && {step: firstExpose.value_step}),
@@ -1110,10 +1112,10 @@ export class HomeAssistant extends Extension {
 
                 const discoveryEntry: DiscoveryEntry = {
                     type: "sensor",
-                    object_id: endpoint ? `${firstExpose.name}_${endpoint}` : `${firstExpose.name}`,
+                    object_id: endpointName ? `${firstExpose.name}_${endpointName}` : `${firstExpose.name}`,
                     mockProperties: [{property: firstExpose.property, value: null}],
                     discovery_payload: {
-                        name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                        name: endpointName ? `${firstExpose.label} ${endpointName}` : firstExpose.label,
                         value_template: `{{ value_json.${firstExpose.property} }}`,
                         enabled_by_default: !allowsSet,
                         ...(firstExpose.unit && {unit_of_measurement: firstExpose.unit}),
@@ -1155,7 +1157,7 @@ export class HomeAssistant extends Extension {
                             object_id: firstExpose.property,
                             mockProperties: [],
                             discovery_payload: {
-                                name: endpoint ? /* v8 ignore next */ `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                                name: endpointName ? /* v8 ignore next */ `${firstExpose.label} ${endpointName}` : firstExpose.label,
                                 state_topic: true,
                                 event_types: this.prepareActionEventTypes(firstExpose.values),
                                 value_template: this.actionValueTemplate,
@@ -1179,9 +1181,9 @@ export class HomeAssistant extends Extension {
                         object_id: firstExpose.property,
                         mockProperties: [{property: firstExpose.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? /* v8 ignore next */ `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                            name: endpointName ? /* v8 ignore next */ `${firstExpose.label} ${endpointName}` : firstExpose.label,
                             state_topic: false,
-                            command_topic_prefix: endpoint,
+                            command_topic_prefix: endpointName,
                             command_topic: true,
                             command_topic_postfix: firstExpose.property,
                             payload_press: firstExpose.values[0].toString(),
@@ -1200,10 +1202,10 @@ export class HomeAssistant extends Extension {
                         object_id: firstExpose.property,
                         mockProperties: [{property: firstExpose.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                            name: endpointName ? `${firstExpose.label} ${endpointName}` : firstExpose.label,
                             value_template: valueTemplate,
                             state_topic: !!(firstExpose.access & ACCESS_STATE),
-                            command_topic_prefix: endpoint,
+                            command_topic_prefix: endpointName,
                             command_topic: true,
                             command_topic_postfix: firstExpose.property,
                             options: firstExpose.values.map((v) => v.toString()),
@@ -1222,7 +1224,7 @@ export class HomeAssistant extends Extension {
                         object_id: firstExpose.property,
                         mockProperties: [{property: firstExpose.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                            name: endpointName ? `${firstExpose.label} ${endpointName}` : firstExpose.label,
                             value_template: valueTemplate,
                             ...ENUM_DISCOVERY_LOOKUP[firstExpose.name],
                         },
@@ -1244,12 +1246,12 @@ export class HomeAssistant extends Extension {
 
                     const discoveryEntry: DiscoveryEntry = {
                         type: "siren",
-                        object_id: endpoint ? /* v8 ignore next */ `siren_${endpoint}` : "siren",
+                        object_id: endpointName ? /* v8 ignore next */ `siren_${endpointName}` : "siren",
                         mockProperties: [{property: warningExpose.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? /* v8 ignore next */ utils.capitalize(endpoint) : null,
+                            name: endpointName ? /* v8 ignore next */ utils.capitalize(endpointName) : null,
                             command_topic: true,
-                            command_topic_prefix: endpoint,
+                            command_topic_prefix: endpointName,
                             state_topic: false,
                             optimistic: true,
                         },
@@ -1295,10 +1297,10 @@ export class HomeAssistant extends Extension {
                         object_id: firstExposeTyped.property,
                         mockProperties: [{property: firstExposeTyped.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? `${firstExposeTyped.label} ${endpoint}` : firstExposeTyped.label,
+                            name: endpointName ? `${firstExposeTyped.label} ${endpointName}` : firstExposeTyped.label,
                             state_topic: firstExposeTyped.access & ACCESS_STATE,
                             value_template: `{{ value_json.${firstExposeTyped.property} }}`,
-                            command_topic_prefix: endpoint,
+                            command_topic_prefix: endpointName,
                             command_topic: true,
                             command_topic_postfix: firstExposeTyped.property,
                             ...LIST_DISCOVERY_LOOKUP[firstExposeTyped.name],
@@ -1312,7 +1314,7 @@ export class HomeAssistant extends Extension {
                         object_id: firstExposeTyped.property,
                         mockProperties: [{property: firstExposeTyped.property, value: null}],
                         discovery_payload: {
-                            name: endpoint ? `${firstExposeTyped.label} ${endpoint}` : firstExposeTyped.label,
+                            name: endpointName ? `${firstExposeTyped.label} ${endpointName}` : firstExposeTyped.label,
                             // Truncate text if it's too long
                             // https://github.com/Koenkk/zigbee2mqtt/issues/23199
                             value_template: `{{ value_json.${firstExposeTyped.property} | default('',True) | string | truncate(254, True, '', 0) }}`,
@@ -1349,6 +1351,8 @@ export class HomeAssistant extends Extension {
             if (entry.discovery_payload.device_class) {
                 delete entry.discovery_payload.name;
             }
+
+            entry.endpoint = entity.isDevice() ? entity.endpoint(endpointName) : undefined;
         }
 
         return discoveryEntries;
@@ -1474,7 +1478,7 @@ export class HomeAssistant extends Extension {
         if (isDevice) {
             const exposes = entity.exposes(); // avoid calling it hundred of times/s
             for (const expose of exposes) {
-                configs.push(...this.exposeToConfig([expose], "device", exposes, entity.definition));
+                configs.push(...this.exposeToConfig([expose], entity, exposes));
             }
         } else if (isGroup) {
             // group
@@ -1503,7 +1507,7 @@ export class HomeAssistant extends Extension {
             }
 
             configs = ([] as DiscoveryEntry[]).concat(
-                ...Object.values(exposesByType).map((exposes) => this.exposeToConfig(exposes, "group", allExposes)),
+                ...Object.values(exposesByType).map((exposes) => this.exposeToConfig(exposes, entity, allExposes)),
             );
         } else {
             // Discover bridge config.
@@ -1656,7 +1660,33 @@ export class HomeAssistant extends Extension {
             payload.default_entity_id = `${config.type}.${payload.object_id}`;
 
             // Set unique_id
-            payload.unique_id = `${entity.options.ID}_${config.object_id}_${settings.get().mqtt.base_topic}`;
+            const uniqueId = `${entity.options.ID}_${config.object_id}_${settings.get().mqtt.base_topic}`;
+            payload.unique_id = uniqueId;
+
+            if (config.endpoint) {
+                assert(entity.isDevice());
+                const memberKey = `${config.endpoint.deviceIeeeAddress}_${config.endpoint.ID}_${config.type}`;
+                this.groupMemberLookup.set(memberKey, uniqueId);
+            }
+
+            // Add group member unique_ids for Home Assistant entity grouping
+            // This assumes that `discover()` already has been called for all devices, since it depends on the
+            // `groupMemberLookup` being populated.
+            // https://www.home-assistant.io/integrations/mqtt#grouping-entities
+            if (isGroup) {
+                const memberIds: string[] = [];
+                for (const endpoint of entity.zh.members) {
+                    const memberKey = `${endpoint.deviceIeeeAddress}_${endpoint.ID}_${config.type}`;
+                    const memberUniqueId = this.groupMemberLookup.get(memberKey);
+                    if (memberUniqueId) {
+                        memberIds.push(memberUniqueId);
+                    }
+                }
+
+                if (memberIds.length > 0) {
+                    payload.group = memberIds;
+                }
+            }
 
             // Attributes for device registry and origin
             payload.device = devicePayload;
@@ -1867,11 +1897,11 @@ export class HomeAssistant extends Extension {
             try {
                 message = JSON.parse(data.message);
                 const baseTopic = `${settings.get().mqtt.base_topic}/`;
-                if (isDeviceAutomation && (!message.topic || !message.topic.startsWith(baseTopic))) {
+                if (isDeviceAutomation && !message.topic?.startsWith(baseTopic)) {
                     return;
                 }
 
-                if (!isDeviceAutomation && (!message.availability || !message.availability[0].topic.startsWith(baseTopic))) {
+                if (!isDeviceAutomation && !message.availability?.[0].topic.startsWith(baseTopic)) {
                     return;
                 }
             } catch {

lib/extension/otaUpdate.ts

@@ -284,11 +284,11 @@ export default class OTAUpdate extends Extension {
 
                         if (payload.url) {
                             source.url = payload.url;
-                        } else if (!device.definition || !device.definition.ota) {
+                        } else if (!device.definition?.ota) {
                             error = `Device '${device.name}' does not support OTA updates`;
                             break;
                         }
-                    } else if (!device.definition || !device.definition.ota) {
+                    } else if (!device.definition?.ota) {
                         error = `Device '${device.name}' does not support OTA updates`;
                         break;
                     }
@@ -344,7 +344,7 @@ export default class OTAUpdate extends Extension {
                             source.url = writeFirmwareHexToDataDir(payload.hex.data, payload.hex.file_name, device.ieeeAddr);
                         } else if (payload.url) {
                             source.url = payload.url;
-                        } else if (!device.definition || !device.definition.ota) {
+                        } else if (!device.definition?.ota) {
                             error = `Device '${device.name}' does not support OTA updates`;
                             break;
                         }
@@ -360,7 +360,7 @@ export default class OTAUpdate extends Extension {
                         if (payload.default_maximum_data_size) {
                             dataSettings.baseSize = payload.default_maximum_data_size;
                         }
-                    } else if (!device.definition || !device.definition.ota) {
+                    } else if (!device.definition?.ota) {
                         error = `Device '${device.name}' does not support OTA updates`;
                         break;
                     }
@@ -415,11 +415,11 @@ export default class OTAUpdate extends Extension {
                             source.url = writeFirmwareHexToDataDir(payload.hex.data, payload.hex.file_name, device.ieeeAddr);
                         } else if (payload.url) {
                             source.url = payload.url;
-                        } else if (!device.definition || !device.definition.ota) {
+                        } else if (!device.definition?.ota) {
                             error = `Device '${device.name}' does not support OTA updates`;
                             break;
                         }
-                    } else if (!device.definition || !device.definition.ota) {
+                    } else if (!device.definition?.ota) {
                         error = `Device '${device.name}' does not support OTA updates`;
                         break;
                     }

lib/types/api.ts

@@ -1,7 +1,7 @@
 import type * as zigbeeHerdsman from "zigbee-herdsman/dist";
 import type {ZclPayload} from "zigbee-herdsman/dist/adapter/events";
 import type {Eui64} from "zigbee-herdsman/dist/zspec/tstypes";
-import type {ClusterDefinition, ClusterName, CustomClusters} from "zigbee-herdsman/dist/zspec/zcl/definition/tstype";
+import type {Cluster, ClusterName, CustomClusters} from "zigbee-herdsman/dist/zspec/zcl/definition/tstype";
 import type {GenericZdoResponse, RoutingTableEntry} from "zigbee-herdsman/dist/zspec/zdo/definition/tstypes";
 import type * as zigbeeHerdsmanConverter from "zigbee-herdsman-converters";
 import type {Base} from "zigbee-herdsman-converters/lib/exposes";
@@ -259,6 +259,7 @@ export interface Zigbee2MQTTDeviceDefinition {
     exposes: zigbeeHerdsmanConverter.Expose[];
     supports_ota: boolean;
     options: zigbeeHerdsmanConverter.Option[];
+    version: `0.0.${number}`;
     icon: string;
 }
 
@@ -343,7 +344,7 @@ export interface Zigbee2MQTTAPI {
     };
 
     "bridge/definitions": {
-        clusters: Readonly<Record<ClusterName, Readonly<ClusterDefinition>>>;
+        clusters: Readonly<Record<ClusterName, Cluster>>;
         custom_clusters: Record<string, CustomClusters>;
         actions: string[];
     };

lib/util/onboarding.ts

@@ -1,398 +1,98 @@
-import {existsSync, mkdirSync} from "node:fs";
+import {existsSync, mkdirSync, writeFileSync} from "node:fs";
+import type {ServerResponse} from "node:http";
 import {createServer} from "node:http";
-import {parse} from "node:querystring";
+import path from "node:path";
+import expressStaticGzip from "express-static-gzip";
+import finalhandler from "finalhandler";
+import stringify from "json-stable-stringify-without-jsonify";
+import JSZip from "jszip";
 import {findAllDevices} from "zigbee-herdsman/dist/adapter/adapterDiscovery";
+import type {OnboardData, OnboardFailureData, OnboardSubmitResponse, Zigbee2MQTTSettings} from "../types/api";
 import data from "./data";
 import * as settings from "./settings";
 import {YAMLFileException} from "./yaml";
 
-type OnboardSettings = {
-    mqtt_base_topic?: string;
-    mqtt_server?: string;
-    mqtt_user?: string;
-    mqtt_password?: string;
-    serial_port?: string;
-    serial_adapter?: Settings["serial"]["adapter"];
-    serial_baudrate?: string;
-    serial_rtscts?: "on";
-    network_channel?: string;
-    network_key?: string;
-    network_pan_id?: string;
-    network_ext_pan_id?: string;
-    frontend_enabled?: "on";
-    frontend_port?: string;
-    homeassistant_enabled?: "on";
-    log_level?: Settings["advanced"]["log_level"];
+/** same as extension/frontend */
+const FILE_SERVER_OPTIONS: expressStaticGzip.ExpressStaticGzipOptions = {
+    enableBrotli: true,
+    serveStatic: {
+        /* v8 ignore start */
+        setHeaders: (res: ServerResponse, path: string): void => {
+            if (path.endsWith("index.html")) {
+                res.setHeader("Cache-Control", "no-store");
+            }
+        },
+        /* v8 ignore stop */
+    },
 };
 
-function escapeHtml(s: string): string {
-    return s.replace(/[^0-9A-Za-z \-_.]/g, (c) => `&#${c.charCodeAt(0)};`);
-}
-
-function generateHtmlDone(frontendUrl: string | undefined): string {
-    return `
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Zigbee2MQTT Onboarding</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.classless.min.css">
-</head>
-<body>
-    <main>
-        <h1>Zigbee2MQTT Onboarding</h1>
-        <p>Settings saved.</p>
-        <p>Zigbee2MQTT is now starting...</p>
-        <small>${frontendUrl ? `Redirecting to Zigbee2MQTT frontend at <a href="${frontendUrl}">${frontendUrl}</a> in 30 seconds.` : "You can close this page."}</small>
-    </main>
-    ${frontendUrl ? `<script>setTimeout(() => { window.location.replace("${frontendUrl}"); }, 30000);</script>` : ""}
-</body>
-</html>
-`;
-}
-
-function generateHtmlForm(currentSettings: RecursivePartial<Settings>, devices: Awaited<ReturnType<typeof findAllDevices>>): string {
-    let devicesSelect = "";
-
-    if (devices.length > 0) {
-        devicesSelect += '<select id="found_device" onchange="setFoundDevice(this)">';
-        devicesSelect += '<option value="">Select a device</option>';
-
-        for (const device of devices) {
-            // just in case name has commas, remove them to not mess with `split` logic
-            const deviceStr = `${device.name.replaceAll(",", "")}, ${device.path}, ${device.adapter ?? "unknown"}`;
-
-            devicesSelect += `<option value="${deviceStr}">${deviceStr}</option>`;
-        }
-
-        devicesSelect += "</select>";
-        devicesSelect += "<small>Optionally allows to configure coordinator port and type (if known) automatically.</small>";
-    } else {
-        devicesSelect = "<small>No device found</small>";
-    }
-
-    let generateCheckbox = "";
-
-    if (
-        Array.isArray(currentSettings.advanced?.network_key) ||
-        typeof currentSettings.advanced?.pan_id === "number" ||
-        Array.isArray(currentSettings.advanced?.ext_pan_id)
-    ) {
-        generateCheckbox = `
-<label for="generate_network">
-    <input
-        type="checkbox"
-        id="generate_network"
-        onclick="setGenerate(this)"
-        ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED_NETWORK_KEY || process.env.ZIGBEE2MQTT_CONFIG_ADVANCED_PAN_ID || process.env.ZIGBEE2MQTT_CONFIG_ADVANCED_EXT_PAN_ID ? "disabled" : ""}>
-    Generate network?
-</label>
-`;
-    }
-
-    /* v8 ignore start */
-    return `
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Zigbee2MQTT Onboarding</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.classless.min.css">
-</head>
-<body>
-    <main>
-        <h1>Zigbee2MQTT Onboarding</h1>
-        <p>Set the base configuration to start Zigbee2MQTT.</p>
-        <p>Optional fields will either be ignored or fallback to defaults if not set (see appropriate documentation page for more details).</p>
-        <p>If a field is disabled, it means <a href="https://www.zigbee2mqtt.io/guide/configuration/#environment-variables" target="_blank">environment variables</a> are being used to override specific values (for example, through the Home Assistant add-on configuration page).</p>
-        <hr>
-        <form method="post">
-            <fieldset ${process.env.ZIGBEE2MQTT_CONFIG_SERIAL || process.env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT || process.env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER ? "disabled" : ""}>
-                <label for="found_device">Found Devices</label>
-                ${devicesSelect}
-            </fieldset>
-            <fieldset ${process.env.ZIGBEE2MQTT_CONFIG_SERIAL ? "disabled" : ""}>
-                <label for="serial_port">Coordinator/Adapter Port/Path</label>
-                <input
-                    type="text"
-                    id="serial_port"
-                    name="serial_port"
-                    value="${currentSettings.serial?.port ?? ""}"
-                    required
-                    ${process.env.ZIGBEE2MQTT_CONFIG_SERIAL_PORT ? "disabled" : ""}>
-                <label for="serial_adapter">Coordinator/Adapter Type/Stack/Driver</label>
-                <select id="serial_adapter" name="serial_adapter" required ${process.env.ZIGBEE2MQTT_CONFIG_SERIAL_ADAPTER ? "disabled" : ""}>
-                    <option value="zstack" ${currentSettings.serial?.adapter === "zstack" ? "selected" : ""}>zstack</option>
-                    <option value="ember" ${currentSettings.serial?.adapter === "ember" ? "selected" : ""}>ember</option>
-                    <option value="deconz" ${currentSettings.serial?.adapter === "deconz" ? "selected" : ""}>deconz</option>
-                    <option value="zigate" ${currentSettings.serial?.adapter === "zigate" ? "selected" : ""}>zigate</option>
-                    <option value="zboss" ${currentSettings.serial?.adapter === "zboss" ? "selected" : ""}>zboss</option>
-                </select>
-                <label for="serial_baudrate">Coordinator/Adapter Baudrate</label>
-                <select id="serial_baudrate" name="serial_baudrate" ${process.env.ZIGBEE2MQTT_CONFIG_SERIAL_BAUDRATE ? "disabled" : ""}>
-                    <option value="38400" ${currentSettings.serial?.baudrate === 38400 ? "selected" : ""}>38400</option>
-                    <option value="57600" ${currentSettings.serial?.baudrate === 57600 ? "selected" : ""}>57600</option>
-                    <option value="115200" ${!currentSettings.serial?.baudrate || currentSettings.serial?.baudrate === 115200 ? "selected" : ""}>115200</option>
-                    <option value="230400" ${currentSettings.serial?.baudrate === 230400 ? "selected" : ""}>230400</option>
-                    <option value="460800" ${currentSettings.serial?.baudrate === 460800 ? "selected" : ""}>460800</option>
-                    <option value="921600" ${currentSettings.serial?.baudrate === 921600 ? "selected" : ""}>921600</option>
-                </select>
-                <small>Can be ignored for networked coordinators (TCP).</small>
-                <label for="serial_rtscts">Coordinator/Adapter Hardware Flow Control ("rtscts: true")</label>
-                <input
-                    type="checkbox"
-                    id="serial_rtscts"
-                    name="serial_rtscts"
-                    ${currentSettings.serial?.rtscts ? "checked" : ""}
-                    ${process.env.ZIGBEE2MQTT_CONFIG_SERIAL_RTSCTS ? "disabled" : ""}
-                    style="margin-bottom: 1rem;">
-                <small>Can be ignored for networked coordinators (TCP).</small>
-            </fieldset>
-            <small>
-                <a href="https://www.zigbee2mqtt.io/guide/configuration/adapter-settings.html" target="_blank">https://www.zigbee2mqtt.io/guide/configuration/adapter-settings.html</a>
-            </small>
-            <hr>
-            <fieldset ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED ? "disabled" : ""}>
-                <label for="closest_wifi_channel">Closest WiFi Channel</label>
-                <input
-                    type="number"
-                    min="0"
-                    max="14"
-                    id="closest_wifi_channel"
-                    value="0"
-                    onclick="setBestZigbeeChannel(this)"
-                    ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED_CHANNEL ? "disabled" : ""}>
-                <small>Optionally set to your closest WiFi channel to pick the best value for "Network channel" below.</small>
-                <label for="network_channel">Network Channel</label>
-                <input
-                    type="number"
-                    min="11"
-                    max="26"
-                    id="network_channel"
-                    name="network_channel"
-                    value="${currentSettings.advanced?.channel ?? "25"}"
-                    required
-                    ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED_CHANNEL ? "disabled" : ""}>
-            </fieldset>
-            <fieldset ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED ? "disabled" : ""}>
-                ${generateCheckbox}
-                <label for="network_key">Network Key</label>
-                <input
-                    type="text"
-                    id="network_key"
-                    name="network_key"
-                    value="${currentSettings.advanced?.network_key ?? "GENERATE"}"
-                    pattern="^([0-9]+(,[0-9]+){15})|GENERATE$"
-                    required
-                    ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED_NETWORK_KEY ? "disabled" : ""}>
-                <label for="network_pan_id">Network PAN ID</label>
-                <input
-                    type="text"
-                    id="network_pan_id"
-                    name="network_pan_id"
-                    value="${currentSettings.advanced?.pan_id ?? "GENERATE"}"
-                    pattern="^([0-9]{1,5})|GENERATE$"
-                    required
-                    ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED_PAN_ID ? "disabled" : ""}>
-                <label for="network_ext_pan_id">Network Extended PAN ID</label>
-                <input
-                    type="text"
-                    id="network_ext_pan_id"
-                    name="network_ext_pan_id"
-                    value="${currentSettings.advanced?.ext_pan_id ?? "GENERATE"}"
-                    pattern="^([0-9]+(,[0-9]+){7})|GENERATE$"
-                    required
-                    ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED_EXT_PAN_ID ? "disabled" : ""}>
-            </fieldset>
-            <small>
-                <a href="https://www.zigbee2mqtt.io/guide/configuration/zigbee-network.html" target="_blank">https://www.zigbee2mqtt.io/guide/configuration/zigbee-network.html</a>
-            </small>
-            <hr>
-            <fieldset ${process.env.ZIGBEE2MQTT_CONFIG_MQTT ? "disabled" : ""}>
-                <label for="mqtt_base_topic">MQTT Base Topic</label>
-                <input
-                    type="text"
-                    id="mqtt_base_topic"
-                    name="mqtt_base_topic"
-                    value="${currentSettings.mqtt?.base_topic ?? "zigbee2mqtt"}"
-                    required
-                    ${process.env.ZIGBEE2MQTT_CONFIG_MQTT_BASE_TOPIC ? "disabled" : ""}>
-                <label for="mqtt_server">MQTT Server</label>
-                <input
-                    type="text"
-                    id="mqtt_server"
-                    name="mqtt_server"
-                    value="${currentSettings.mqtt?.server ?? "mqtt://localhost:1883"}"
-                    required
-                    ${process.env.ZIGBEE2MQTT_CONFIG_MQTT_SERVER ? "disabled" : ""}>
-                <label for="mqtt_user">MQTT User</label>
-                <input
-                    type="text"
-                    id="mqtt_user"
-                    name="mqtt_user"
-                    value="${currentSettings.mqtt?.user ?? ""}"
-                    ${process.env.ZIGBEE2MQTT_CONFIG_MQTT_USER ? "disabled" : ""}>
-                <small>Optional. Set only if using authentication.</small>
-                <label for="mqtt_password">MQTT Password</label>
-                <input
-                    type="password"
-                    id="mqtt_password"
-                    name="mqtt_password"
-                    value="${currentSettings.mqtt?.password ?? ""}"
-                    ${process.env.ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD ? "disabled" : ""}>
-                <small>Optional. Set only if using authentication.</small>
-            </fieldset>
-            <small>
-                <a href="https://www.zigbee2mqtt.io/guide/configuration/mqtt.html" target="_blank">https://www.zigbee2mqtt.io/guide/configuration/mqtt.html</a>
-            </small>
-            <hr>
-            <fieldset ${process.env.ZIGBEE2MQTT_CONFIG_FRONTEND ? "disabled" : ""}>
-                <label for="frontend_enabled">
-                    <input
-                        type="checkbox"
-                        id="frontend_enabled"
-                        name="frontend_enabled"
-                        ${currentSettings.frontend?.enabled ? "checked" : ""}
-                        ${process.env.ZIGBEE2MQTT_CONFIG_FRONTEND_ENABLED ? "disabled" : ""}>
-                    Frontend enabled?
-                </label>
-                <label for="frontend_port">Frontend Port</label>
-                <input
-                    type="number"
-                    min="0"
-                    max="65535"
-                    id="frontend_port"
-                    name="frontend_port"
-                    value="${currentSettings.frontend?.port ?? "8080"}"
-                    required
-                    ${process.env.ZIGBEE2MQTT_CONFIG_FRONTEND_PORT ? "disabled" : ""}>
-            </fieldset>
-            <small>
-                <a href="https://www.zigbee2mqtt.io/guide/configuration/frontend.html" target="_blank">https://www.zigbee2mqtt.io/guide/configuration/frontend.html</a>
-            </small>
-            <fieldset ${process.env.ZIGBEE2MQTT_CONFIG_HOMEASSISTANT ? "disabled" : ""}>
-                <label for="homeassistant_enabled">
-                    <input
-                        type="checkbox"
-                        id="homeassistant_enabled"
-                        name="homeassistant_enabled"
-                        ${currentSettings.homeassistant?.enabled ? "checked" : ""}
-                        ${process.env.ZIGBEE2MQTT_CONFIG_HOMEASSISTANT_ENABLED ? "disabled" : ""}>
-                    Home Assistant enabled?
-                </label>
-            </fieldset>
-            <small>
-                <a href="https://www.zigbee2mqtt.io/guide/configuration/homeassistant.html" target="_blank">https://www.zigbee2mqtt.io/guide/configuration/homeassistant.html</a>
-            </small>
-            <hr>
-            <fieldset ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED ? "disabled" : ""}>
-                <label for="log_level">Log Level</label>
-                <select id="log_level" name="log_level" ${process.env.ZIGBEE2MQTT_CONFIG_ADVANCED_LOG_LEVEL ? "disabled" : ""}>
-                    <option value="error" ${currentSettings.advanced?.log_level === "error" ? "selected" : ""}>error</option>
-                    <option value="warning" ${currentSettings.advanced?.log_level === "warning" ? "selected" : ""}>warning</option>
-                    <option value="info" ${!currentSettings.advanced?.log_level || currentSettings.advanced?.log_level === "info" ? "selected" : ""}>info</option>
-                    <option value="debug" ${currentSettings.advanced?.log_level === "debug" ? "selected" : ""}>debug</option>
-                </select>
-            </fieldset>
-            <small>
-                <a href="https://www.zigbee2mqtt.io/guide/configuration/logging.html" target="_blank">https://www.zigbee2mqtt.io/guide/configuration/logging.html</a>
-            </small>
-            <hr>
-            <input type="submit" value="Submit">
-        </form>
-    </main>
-    <script>
-        function setFoundDevice(e) {
-            if (!e.value) {
-                return;
-            }
-
-            const [, path, adapter] = e.value.split(", ");
-            const serialPortEl = document.querySelector("#serial_port");
-            serialPortEl.value = path;
-            const serialAdapterEl = document.querySelector("#serial_adapter");
-
-            if (['zstack', 'ember', 'deconz', 'zigate', 'zboss'].includes(adapter)) {
-                serialAdapterEl.value = adapter;
-            } else {
-                serialAdapterEl.value = '';
-            }
-        }
-
-        function setBestZigbeeChannel(e) {
-            const wifiChannel = parseInt(e.value, 10);
-            const networkChannelEl = document.querySelector("#network_channel");
-
-            if (wifiChannel >= 11) {
-                // WiFi 11-14
-                networkChannelEl.value = 15;
-            } else if (wifiChannel >= 6) {
-                // WiFi 6-10
-                networkChannelEl.value = 11;
-            } else {
-                // WiFi 1-5
-                networkChannelEl.value = 25;
-            }
-        }
-
-        function setGenerate(e) {
-            document.querySelector("#network_key").value = e.checked ? "GENERATE" : "${currentSettings.advanced?.network_key ?? "GENERATE"}";
-            document.querySelector("#network_pan_id").value = e.checked ? "GENERATE" : "${currentSettings.advanced?.pan_id ?? "GENERATE"}";
-            document.querySelector("#network_ext_pan_id").value = e.checked ? "GENERATE" : "${currentSettings.advanced?.ext_pan_id ?? "GENERATE"}";
-        }
-    </script>
-</body>
-</html>
-`;
-    /* v8 ignore stop */
-}
-
-function generateHtmlError(errors: string): string {
-    return `
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Zigbee2MQTT Onboarding</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.classless.min.css">
-</head>
-<body>
-    <main>
-        <h1>Zigbee2MQTT configuration is not valid</h1>
-        <p style="color: #F00;">Found the following errors:</p>
-        ${errors}
-        <hr>
-        <p>If you don't know how to solve this, read <a href="https://www.zigbee2mqtt.io/guide/configuration" target="_blank">https://www.zigbee2mqtt.io/guide/configuration</a></p>
-        <form method="post" action="/">
-            <input type="submit" value="Close">
-        </form>
-    </main>
-</body>
-</html>
-`;
-}
-
 function getServerUrl(): URL {
     return new URL(process.env.Z2M_ONBOARD_URL ?? "http://0.0.0.0:8080");
 }
 
+function getZipEntryTargetPath(entryName: string): string {
+    const normalizedEntry = entryName.replace(/\\/g, "/");
+
+    if (!normalizedEntry || normalizedEntry.startsWith("/") || normalizedEntry.includes("\0")) {
+        throw new Error(`Invalid ZIP entry path '${entryName}'`);
+    }
+
+    const basePath = path.resolve(data.getPath());
+    const targetPath = path.resolve(basePath, normalizedEntry);
+    const relativePath = path.relative(basePath, targetPath);
+
+    if (relativePath.startsWith("..") || path.isAbsolute(relativePath)) {
+        throw new Error(`Unsafe ZIP entry path '${entryName}'`);
+    }
+
+    return targetPath;
+}
+
+async function extractZipDataToDataPath(zipContent: Buffer): Promise<void> {
+    const zip = await JSZip.loadAsync(zipContent);
+
+    for (const key in zip.files) {
+        const entry = zip.files[key];
+        const targetPath = getZipEntryTargetPath(entry.name);
+
+        if (entry.dir) {
+            mkdirSync(targetPath, {recursive: true});
+
+            continue;
+        }
+
+        mkdirSync(path.dirname(targetPath), {recursive: true});
+        writeFileSync(targetPath, await entry.async("nodebuffer"));
+    }
+}
+
 async function startOnboardingServer(): Promise<boolean> {
     const currentSettings = settings.get();
     const serverUrl = getServerUrl();
     let server: ReturnType<typeof createServer> | undefined;
-    let failed = false;
+    const fileServer = expressStaticGzip((await import("zigbee2mqtt-windfront")).default.getOnboardingPath(), FILE_SERVER_OPTIONS);
 
     const success = await new Promise<boolean>((resolve) => {
         server = createServer(async (req, res) => {
+            const pathname = new URL(req.url /* v8 ignore next */ ?? "/", serverUrl).pathname;
+
+            if (req.method === "GET" && pathname === "/data") {
+                const payload: OnboardData = {
+                    page: "form",
+                    settings: currentSettings,
+                    settingsSchema: settings.schemaJson,
+                    devices: await findAllDevices(),
+                };
+
+                res.setHeader("Content-Type", "application/json");
+                res.writeHead(200);
+                res.end(stringify(payload));
+
+                return;
+            }
+
             if (req.method === "POST") {
-                if (failed) {
-                    res.end(() => {
-                        resolve(false);
-                    });
-                } else {
+                if (pathname === "/submit") {
                     let body = "";
 
                     req.on("data", (chunk) => {
@@ -400,92 +100,108 @@ async function startOnboardingServer(): Promise<boolean> {
                     });
 
                     req.on("end", () => {
-                        const result = parse(body) as unknown as OnboardSettings;
-                        const frontendEnabled = result.frontend_enabled === "on";
-                        const updatedSettings: RecursivePartial<Settings> = {
-                            mqtt: {
-                                base_topic: result.mqtt_base_topic,
-                                server: result.mqtt_server,
-                                user: result.mqtt_user || undefined, // empty string => removed
-                                password: result.mqtt_password || undefined, // empty string => removed
-                            },
-                            serial: {
-                                port: result.serial_port,
-                                adapter: result.serial_adapter,
-                                baudrate: result.serial_baudrate ? Number.parseInt(result.serial_baudrate, 10) : undefined,
-                                rtscts: result.serial_rtscts === "on",
-                            },
-                            advanced: {
-                                log_level: result.log_level,
-                                channel: result.network_channel ? Number.parseInt(result.network_channel, 10) : undefined,
-                                network_key: result.network_key
-                                    ? result.network_key === "GENERATE"
-                                        ? result.network_key
-                                        : result.network_key.split(",").map((v) => Number.parseInt(v, 10))
-                                    : undefined,
-                                pan_id: result.network_pan_id
-                                    ? result.network_pan_id === "GENERATE"
-                                        ? result.network_pan_id
-                                        : Number.parseInt(result.network_pan_id, 10)
-                                    : undefined,
-                                ext_pan_id: result.network_ext_pan_id
-                                    ? result.network_ext_pan_id === "GENERATE"
-                                        ? result.network_ext_pan_id
-                                        : result.network_ext_pan_id.split(",").map((v) => Number.parseInt(v, 10))
-                                    : undefined,
-                            },
-                            frontend: {
-                                enabled: frontendEnabled,
-                                port: result.frontend_port ? Number.parseInt(result.frontend_port, 10) : undefined,
-                            },
-                            homeassistant: {
-                                enabled: result.homeassistant_enabled === "on",
-                            },
-                        };
-
                         try {
-                            settings.apply(updatedSettings);
+                            const result = (body ? JSON.parse(body) : {}) as RecursivePartial<Zigbee2MQTTSettings>;
 
-                            // to redirect, make sure frontend "will be" enabled, and host isn't socket
+                            settings.apply(result);
+
+                            const appliedSettings = settings.get();
                             const redirect =
                                 !process.env.Z2M_ONBOARD_NO_REDIRECT &&
-                                frontendEnabled &&
-                                (!currentSettings.frontend?.host || !currentSettings.frontend.host.startsWith("/"));
-                            const protocol = currentSettings.frontend?.ssl_cert && currentSettings.frontend.ssl_key ? "https" : "http";
+                                appliedSettings.frontend.enabled &&
+                                !appliedSettings.frontend.host?.startsWith("/");
+                            const protocol = appliedSettings.frontend.ssl_cert && appliedSettings.frontend.ssl_key ? "https" : "http";
+                            const frontendUrl = redirect
+                                ? `${protocol}://${appliedSettings.frontend.host ?? "localhost"}:${appliedSettings.frontend.port}${appliedSettings.frontend.base_url}`
+                                : null;
+                            const payload: OnboardSubmitResponse = {success: true, frontendUrl};
 
-                            res.setHeader("Content-Type", "text/html");
+                            res.setHeader("Content-Type", "application/json");
                             res.writeHead(200);
-                            res.end(
-                                generateHtmlDone(
-                                    redirect
-                                        ? /* v8 ignore next */ `${protocol}://${currentSettings.frontend?.host ?? "localhost"}:${currentSettings.frontend?.port ?? "8080"}${currentSettings.frontend?.base_url ?? "/"}`
-                                        : undefined,
-                                ),
-                                () => {
-                                    resolve(true);
-                                },
-                            );
+                            res.end(stringify(payload), () => {
+                                resolve(true);
+                            });
                         } catch (error) {
                             console.error(`Failed to apply configuration: ${(error as Error).message}`);
-                            failed = true;
 
-                            if (process.env.Z2M_ONBOARD_NO_FAILURE_PAGE) {
-                                res.end(() => {
-                                    resolve(false);
-                                });
-                            } else {
-                                res.setHeader("Content-Type", "text/html");
-                                res.writeHead(406);
-                                res.end(generateHtmlError(`<p>${escapeHtml((error as Error).message)}</p>`));
-                            }
+                            const payload: OnboardSubmitResponse = {success: false, error: (error as Error).message};
+
+                            res.setHeader("Content-Type", "application/json");
+                            res.writeHead(406);
+                            res.end(stringify(payload));
                         }
                     });
+
+                    req.on("error", (error: Error) => {
+                        console.error(`Failed to parse request body: ${error.message}`);
+
+                        const payload: OnboardSubmitResponse = {success: false, error: error.message};
+
+                        res.setHeader("Content-Type", "application/json");
+                        res.writeHead(406);
+                        res.end(stringify(payload));
+                    });
+
+                    return;
+                }
+
+                if (pathname === "/submit-zip") {
+                    let body = "";
+
+                    req.on("data", (chunk) => {
+                        body += chunk;
+                    });
+
+                    req.on("end", async () => {
+                        try {
+                            if (!body) {
+                                throw new Error("Invalid ZIP payload: missing content");
+                            }
+
+                            const zipContent = Buffer.from(body, "base64");
+
+                            await extractZipDataToDataPath(zipContent);
+
+                            const payload: OnboardSubmitResponse = {success: true, frontendUrl: null};
+
+                            res.setHeader("Content-Type", "application/json");
+                            res.writeHead(200);
+                            res.end(stringify(payload), () => {
+                                resolve(true);
+                            });
+                        } catch (error) {
+                            console.error(`Failed to apply ZIP data: ${(error as Error).message}`);
+
+                            const payload: OnboardSubmitResponse = {success: false, error: (error as Error).message};
+
+                            res.setHeader("Content-Type", "application/json");
+                            res.writeHead(406);
+                            res.end(stringify(payload));
+                        }
+                    });
+
+                    req.on("error", (error: Error) => {
+                        console.error(`Failed to parse ZIP request body: ${error.message}`);
+
+                        const payload: OnboardSubmitResponse = {success: false, error: error.message};
+
+                        res.setHeader("Content-Type", "application/json");
+                        res.writeHead(406);
+                        res.end(stringify(payload));
+                    });
+
+                    return;
                 }
-            } else {
-                res.setHeader("Content-Type", "text/html");
-                res.writeHead(200);
-                res.end(generateHtmlForm(currentSettings, await findAllDevices()));
             }
+
+            const next = finalhandler(req, res);
+
+            fileServer(req, res, next);
+        });
+
+        server.on("error", (error: Error) => {
+            console.error("Failed to start onboarding server", error);
+            resolve(false);
         });
 
         server.listen(Number.parseInt(serverUrl.port, 10), serverUrl.hostname, () => {
@@ -498,21 +214,37 @@ async function startOnboardingServer(): Promise<boolean> {
     return success;
 }
 
-async function startFailureServer(errors: string): Promise<void> {
+async function startFailureServer(errors: string[]): Promise<void> {
     const serverUrl = getServerUrl();
     let server: ReturnType<typeof createServer> | undefined;
+    const fileServer = expressStaticGzip((await import("zigbee2mqtt-windfront")).default.getOnboardingPath(), FILE_SERVER_OPTIONS);
 
     await new Promise<void>((resolve) => {
         server = createServer((req, res) => {
-            if (req.method === "POST") {
+            const pathname = new URL(req.url /* v8 ignore next */ ?? "/", serverUrl).pathname;
+
+            if (req.method === "GET" && pathname === "/data") {
+                const payload: OnboardFailureData = {page: "failure", errors};
+
+                res.setHeader("Content-Type", "application/json");
+                res.writeHead(200);
+                res.end(stringify(payload));
+
+                return;
+            }
+
+            if (req.method === "POST" && pathname === "/submit") {
+                res.writeHead(200);
                 res.end(() => {
                     resolve();
                 });
-            } else {
-                res.setHeader("Content-Type", "text/html");
-                res.writeHead(406);
-                res.end(generateHtmlError(errors));
+
+                return;
             }
+
+            const next = finalhandler(req, res);
+
+            fileServer(req, res, next);
         });
 
         server.listen(Number.parseInt(serverUrl.port, 10), serverUrl.hostname, () => {
@@ -524,23 +256,19 @@ async function startFailureServer(errors: string): Promise<void> {
 }
 
 async function onSettingsErrors(errors: string[]): Promise<void> {
-    let pErrors = "";
-
     console.error("\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
     console.error("            READ THIS CAREFULLY\n");
     console.error("Refusing to start because configuration is not valid, found the following errors:");
 
     for (const error of errors) {
         console.error(`- ${error}`);
-
-        pErrors += `<p>- ${escapeHtml(error)}</p>`;
     }
 
     console.error("\nIf you don't know how to solve this, read https://www.zigbee2mqtt.io/guide/configuration");
     console.error("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n");
 
     if (!process.env.Z2M_ONBOARD_NO_SERVER && !process.env.Z2M_ONBOARD_NO_FAILURE_PAGE) {
-        await startFailureServer(pErrors);
+        await startFailureServer(errors);
     }
 }
 

lib/util/settings.schema.json

@@ -88,7 +88,7 @@
                             "title": "Pause on backoff greater than",
                             "default": 0,
                             "minimum": 0,
-                            "description": "Pause availability pings when backoff reaches over this limit until a new Zigbee message is received from the device. A value of zero disables pausing."
+                            "description": "Pause availability pings when the backoff multiplier reaches over this limit until a new Zigbee message is received from the device. A value of zero disables pausing."
                         }
                     },
                     "required": ["timeout"]

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zigbee2mqtt",
-    "version": "2.9.1",
+    "version": "2.9.2-dev",
     "description": "Zigbee to MQTT bridge using Zigbee-herdsman",
     "main": "index.js",
     "types": "dist/types/api.d.ts",
@@ -52,7 +52,7 @@
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "jszip": "^3.10.1",
-        "mqtt": "^5.15.0",
+        "mqtt": "^5.15.1",
         "object-assign-deep": "^0.4.0",
         "rimraf": "^6.1.3",
         "semver": "^7.7.4",
@@ -61,25 +61,25 @@
         "winston": "^3.19.0",
         "winston-syslog": "^2.7.1",
         "winston-transport": "^4.9.0",
-        "ws": "^8.19.0",
-        "zigbee-herdsman": "9.0.9",
-        "zigbee-herdsman-converters": "26.12.0",
+        "ws": "^8.20.0",
+        "zigbee-herdsman": "10.0.7",
+        "zigbee-herdsman-converters": "26.39.1",
         "zigbee2mqtt-frontend": "0.9.21",
-        "zigbee2mqtt-windfront": "2.9.2"
+        "zigbee2mqtt-windfront": "2.11.1"
     },
     "devDependencies": {
-        "@biomejs/biome": "^2.4.4",
+        "@biomejs/biome": "^2.4.12",
         "@types/finalhandler": "^1.2.3",
         "@types/humanize-duration": "^3.27.4",
         "@types/js-yaml": "^4.0.9",
-        "@types/node": "^24.11.0",
+        "@types/node": "^24.12.2",
         "@types/object-assign-deep": "^0.4.3",
         "@types/readable-stream": "4.0.23",
         "@types/serve-static": "^2.2.0",
         "@types/ws": "8.18.1",
         "@vitest/coverage-v8": "^3.1.1",
         "tmp": "^0.2.5",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "vitest": "^3.1.1"
     },
     "pnpm": {

pnpm-lock.yaml

@@ -5,7 +5,7 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  zigbee-herdsman: 9.0.9
+  zigbee-herdsman: 10.0.7
 
 importers:
 
@@ -42,8 +42,8 @@ importers:
         specifier: ^3.10.1
         version: 3.10.1
       mqtt:
-        specifier: ^5.15.0
-        version: 5.15.0
+        specifier: ^5.15.1
+        version: 5.15.1
       object-assign-deep:
         specifier: ^0.4.0
         version: 0.4.0
@@ -69,24 +69,24 @@ importers:
         specifier: ^4.9.0
         version: 4.9.0
       ws:
-        specifier: ^8.19.0
-        version: 8.19.0
+        specifier: ^8.20.0
+        version: 8.20.0
       zigbee-herdsman:
-        specifier: 9.0.9
-        version: 9.0.9
+        specifier: 10.0.7
+        version: 10.0.7
       zigbee-herdsman-converters:
-        specifier: 26.12.0
-        version: 26.12.0
+        specifier: 26.39.1
+        version: 26.39.1
       zigbee2mqtt-frontend:
         specifier: 0.9.21
         version: 0.9.21
       zigbee2mqtt-windfront:
-        specifier: 2.9.2
-        version: 2.9.2
+        specifier: 2.11.1
+        version: 2.11.1
     devDependencies:
       '@biomejs/biome':
-        specifier: ^2.4.4
-        version: 2.4.4
+        specifier: ^2.4.12
+        version: 2.4.12
       '@types/finalhandler':
         specifier: ^1.2.3
         version: 1.2.4
@@ -97,8 +97,8 @@ importers:
         specifier: ^4.0.9
         version: 4.0.9
       '@types/node':
-        specifier: ^24.11.0
-        version: 24.11.0
+        specifier: ^24.12.2
+        version: 24.12.2
       '@types/object-assign-deep':
         specifier: ^0.4.3
         version: 0.4.3
@@ -113,16 +113,16 @@ importers:
         version: 8.18.1
       '@vitest/coverage-v8':
         specifier: ^3.1.1
-        version: 3.2.4(vitest@3.2.4(@types/node@24.11.0))
+        version: 3.2.4(vitest@3.2.4(@types/node@24.12.2))
       tmp:
         specifier: ^0.2.5
         version: 0.2.5
       typescript:
-        specifier: ^5.9.3
-        version: 5.9.3
+        specifier: ^6.0.3
+        version: 6.0.3
       vitest:
         specifier: ^3.1.1
-        version: 3.2.4(@types/node@24.11.0)
+        version: 3.2.4(@types/node@24.12.2)
     optionalDependencies:
       unix-dgram:
         specifier: ^2.0.7
@@ -147,8 +147,8 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/runtime@7.28.6':
-    resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==}
+  '@babel/runtime@7.29.2':
+    resolution: {integrity: sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==}
     engines: {node: '>=6.9.0'}
 
   '@babel/types@7.27.6':
@@ -159,55 +159,55 @@ packages:
     resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==}
     engines: {node: '>=18'}
 
-  '@biomejs/biome@2.4.4':
-    resolution: {integrity: sha512-tigwWS5KfJf0cABVd52NVaXyAVv4qpUXOWJ1rxFL8xF1RVoeS2q/LK+FHgYoKMclJCuRoCWAPy1IXaN9/mS61Q==}
+  '@biomejs/biome@2.4.12':
+    resolution: {integrity: sha512-Rro7adQl3NLq/zJCIL98eElXKI8eEiBtoeu5TbXF/U3qbjuSc7Jb5rjUbeHHcquDWeSf3HnGP7XI5qGrlRk/pA==}
     engines: {node: '>=14.21.3'}
     hasBin: true
 
-  '@biomejs/cli-darwin-arm64@2.4.4':
-    resolution: {integrity: sha512-jZ+Xc6qvD6tTH5jM6eKX44dcbyNqJHssfl2nnwT6vma6B1sj7ZLTGIk6N5QwVBs5xGN52r3trk5fgd3sQ9We9A==}
+  '@biomejs/cli-darwin-arm64@2.4.12':
+    resolution: {integrity: sha512-BnMU4Pc3ciEVteVpZ0BK33MLr7X57F5w1dwDLDn+/iy/yTrA4Q/N2yftidFtsA4vrDh0FMXDpacNV/Tl3fbmng==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
-  '@biomejs/cli-darwin-x64@2.4.4':
-    resolution: {integrity: sha512-Dh1a/+W+SUCXhEdL7TiX3ArPTFCQKJTI1mGncZNWfO+6suk+gYA4lNyJcBB+pwvF49uw0pEbUS49BgYOY4hzUg==}
+  '@biomejs/cli-darwin-x64@2.4.12':
+    resolution: {integrity: sha512-x9uJ0bI1rJsWICp3VH8w/5PnAVD3A7SqzDpbrfoUQX1QyWrK5jSU4fRLo/wSgGeplCivbxBRKmt5Xq4/nWvq8A==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
-  '@biomejs/cli-linux-arm64-musl@2.4.4':
-    resolution: {integrity: sha512-+sPAXq3bxmFwhVFJnSwkSF5Rw2ZAJMH3MF6C9IveAEOdSpgajPhoQhbbAK12SehN9j2QrHpk4J/cHsa/HqWaYQ==}
+  '@biomejs/cli-linux-arm64-musl@2.4.12':
+    resolution: {integrity: sha512-FhfpkAAlKL6kwvcVap0Hgp4AhZmtd3YImg0kK1jd7C/aSoh4SfsB2f++yG1rU0lr8Y5MCFJrcSkmssiL9Xnnig==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-arm64@2.4.4':
-    resolution: {integrity: sha512-V/NFfbWhsUU6w+m5WYbBenlEAz8eYnSqRMDMAW3K+3v0tYVkNyZn8VU0XPxk/lOqNXLSCCrV7FmV/u3SjCBShg==}
+  '@biomejs/cli-linux-arm64@2.4.12':
+    resolution: {integrity: sha512-tOwuCuZZtKi1jVzbk/5nXmIsziOB6yqN8c9r9QM0EJYPU6DpQWf11uBOSCfFKKM4H3d9ZoarvlgMfbcuD051Pw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64-musl@2.4.4':
-    resolution: {integrity: sha512-gGvFTGpOIQDb5CQ2VC0n9Z2UEqlP46c4aNgHmAMytYieTGEcfqhfCFnhs6xjt0S3igE6q5GLuIXtdQt3Izok+g==}
+  '@biomejs/cli-linux-x64-musl@2.4.12':
+    resolution: {integrity: sha512-dwTIgZrGutzhkQCuvHynCkyW6hJxUuyZqKKO0YNfaS2GUoRO+tOvxXZqZB6SkWAOdfZTzwaw8IEdUnIkHKHoew==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64@2.4.4':
-    resolution: {integrity: sha512-R4+ZCDtG9kHArasyBO+UBD6jr/FcFCTH8QkNTOCu0pRJzCWyWC4EtZa2AmUZB5h3e0jD7bRV2KvrENcf8rndBg==}
+  '@biomejs/cli-linux-x64@2.4.12':
+    resolution: {integrity: sha512-8pFeAnLU9QdW9jCIslB/v82bI0lhBmz2ZAKc8pVMFPO0t0wAHsoEkrUQUbMkIorTRIjbqyNZHA3lEXavsPWYSw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-win32-arm64@2.4.4':
-    resolution: {integrity: sha512-trzCqM7x+Gn832zZHgr28JoYagQNX4CZkUZhMUac2YxvvyDRLJDrb5m9IA7CaZLlX6lTQmADVfLEKP1et1Ma4Q==}
+  '@biomejs/cli-win32-arm64@2.4.12':
+    resolution: {integrity: sha512-B0DLnx0vA9ya/3v7XyCaP+/lCpnbWbMOfUFFve+xb5OxyYvdHaS55YsSddr228Y+JAFk58agCuZTsqNiw2a6ig==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
-  '@biomejs/cli-win32-x64@2.4.4':
-    resolution: {integrity: sha512-gnOHKVPFAAPrpoPt2t+Q6FZ7RPry/FDV3GcpU53P3PtLNnQjBmKyN2Vh/JtqXet+H4pme8CC76rScwdjDcT1/A==}
+  '@biomejs/cli-win32-x64@2.4.12':
+    resolution: {integrity: sha512-yMckRzTyZ83hkk8iDFWswqSdU8tvZxspJKnYNh7JZr/zhZNOlzH13k4ecboU6MurKExCe2HUkH75pGI/O2JwGA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -553,8 +553,8 @@ packages:
   '@types/js-yaml@4.0.9':
     resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
 
-  '@types/node@24.11.0':
-    resolution: {integrity: sha512-fPxQqz4VTgPI/IQ+lj9r0h+fDR66bzoeMGHp8ASee+32OSGIkeASsoZuJixsQoVef1QJbeubcPBxKk22QVoWdw==}
+  '@types/node@24.12.2':
+    resolution: {integrity: sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==}
 
   '@types/object-assign-deep@0.4.3':
     resolution: {integrity: sha512-d9Gxaj5j1hzrxJ61EFEg13B4g4FgrT/DYtcDWFXPehR8DF2SUZbVMFtZIs8exkVRiqrqBpdTc/lUUZjncsPpMw==}
@@ -674,8 +674,8 @@ packages:
     resolution: {integrity: sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==}
     engines: {node: 20 || >=22}
 
-  broker-factory@3.1.13:
-    resolution: {integrity: sha512-H2VALe31mEtO/SRcNp4cUU5BAm1biwhc/JaF77AigUuni/1YT0FLCJfbUxwIEs9y6Kssjk2fmXgf+Y9ALvmKlw==}
+  broker-factory@3.1.14:
+    resolution: {integrity: sha512-L45k5HMbPIrMid0nTOZ/UPXG/c0aRuQKVrSDFIb1zOkvfiyHgYmIjc3cSiN1KwQIvRDOtKE0tfb3I9EZ3CmpQQ==}
 
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
@@ -830,8 +830,8 @@ packages:
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
-  fast-unique-numbers@9.0.26:
-    resolution: {integrity: sha512-3Mtq8p1zQinjGyWfKeuBunbuFoixG72AUkk4VvzbX4ykCW9Q4FzRaNyIlfQhUjnKw2ARVP+/CKnoyr6wfHftig==}
+  fast-unique-numbers@9.0.27:
+    resolution: {integrity: sha512-nDA9ADeINN8SA2u2wCtU+siWFTTDqQR37XvgPIDDmboWQeExz7X0mImxuaN+kJddliIqy2FpVRmnvRZ+j8i1/A==}
     engines: {node: '>=18.2.0'}
 
   fast-uri@3.1.0:
@@ -990,8 +990,8 @@ packages:
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
-  lru-cache@11.2.6:
-    resolution: {integrity: sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==}
+  lru-cache@11.2.7:
+    resolution: {integrity: sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==}
     engines: {node: 20 || >=22}
 
   magic-string@0.30.17:
@@ -1030,8 +1030,8 @@ packages:
   mqtt-packet@9.0.2:
     resolution: {integrity: sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==}
 
-  mqtt@5.15.0:
-    resolution: {integrity: sha512-KC+wAssYk83Qu5bT8YDzDYgUJxPhbLeVsDvpY2QvL28PnXYJzC2WkKruyMUgBAZaQ7h9lo9k2g4neRNUUxzgMw==}
+  mqtt@5.15.1:
+    resolution: {integrity: sha512-V1WnkGuJh3ec9QXzy5Iylw8OOBK+Xu1WhxcQ9mMpLThG+/JZIMV1PgLNRgIiqXhZnvnVLsuyxHl5A/3bHHbcAA==}
     engines: {node: '>=16.0.0'}
     hasBin: true
 
@@ -1324,8 +1324,8 @@ packages:
   typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  typescript@5.9.3:
-    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+  typescript@6.0.3:
+    resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -1440,17 +1440,17 @@ packages:
     resolution: {integrity: sha512-LZNJgPzfKR+/J3cHkxcpHKpKKvGfDZVPS4hfJCc4cCG0CgYzvlD6yE/S3CIL/Yt91ak327YCpiF/0MyeZHEHKA==}
     engines: {node: '>= 12.0.0'}
 
-  worker-factory@7.0.48:
-    resolution: {integrity: sha512-CGmBy3tJvpBPjUvb0t4PrpKubUsfkI1Ohg0/GGFU2RvA9j/tiVYwKU8O7yu7gH06YtzbeJLzdUR29lmZKn5pag==}
+  worker-factory@7.0.49:
+    resolution: {integrity: sha512-lW7tpgy6aUv2dFsQhv1yv+XFzdkCf/leoKRTGMPVK5/die6RrUjqgJHJf556qO+ZfytNG6wPXc17E8zzsOLUDw==}
 
-  worker-timers-broker@8.0.15:
-    resolution: {integrity: sha512-Te+EiVUMzG5TtHdmaBZvBrZSFNauym6ImDaCAnzQUxvjnw+oGjMT2idmAOgDy30vOZMLejd0bcsc90Axu6XPWA==}
+  worker-timers-broker@8.0.16:
+    resolution: {integrity: sha512-JyP3AvUGyPGbBGW7XiUewm2+0pN/aYo1QpVf5kdXAfkDZcN3p7NbWrG6XnyDEpDIvfHk/+LCnOW/NsuiU9riYA==}
 
-  worker-timers-worker@9.0.13:
-    resolution: {integrity: sha512-qjn18szGb1kjcmh2traAdki1eiIS5ikFo+L90nfMOvSRpuDw1hAcR1nzkP2+Hkdqz5thIRnfuWx7QSpsEUsA6Q==}
+  worker-timers-worker@9.0.14:
+    resolution: {integrity: sha512-/qF06C60sXmSLfUl7WglvrDIbspmPOM8UrG63Dnn4bi2x4/DfqHS/+dxF5B+MdHnYO5tVuZYLHdAodrKdabTIg==}
 
-  worker-timers@8.0.29:
-    resolution: {integrity: sha512-9jk0MWHhWAZ2xlJPXr45oe5UF/opdpfZrY0HtyPizWuJ+ce1M3IYk/4IIdGct3kn9Ncfs+tkZt3w1tU6KW2Fsg==}
+  worker-timers@8.0.31:
+    resolution: {integrity: sha512-ngkq5S6JuZyztom8tDgBzorLo9byhBMko/sXfgiUD945AuzKGg1GCgDMCC3NaYkicLpGKXutONM36wEX8UbBCA==}
 
   wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
@@ -1460,8 +1460,8 @@ packages:
     resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
     engines: {node: '>=12'}
 
-  ws@8.19.0:
-    resolution: {integrity: sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==}
+  ws@8.20.0:
+    resolution: {integrity: sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -1472,12 +1472,12 @@ packages:
       utf-8-validate:
         optional: true
 
-  zigbee-herdsman-converters@26.12.0:
-    resolution: {integrity: sha512-Cvla9M0+05FPuFyVb9Qzq6WWZqM7fq5Znu1OmQAdBZBfeIwnc750JKM9fTKjC4kquPIsbrekQ9sNwoJEet4YxQ==}
+  zigbee-herdsman-converters@26.39.1:
+    resolution: {integrity: sha512-CopzHV9NNwNKypQv5TozRubgpUU+OVDCrzRgGwGRtmsqHmAysxF6QBWjguigRqzs5r/P5dDcigRUlDoDZC/+gA==}
     engines: {node: '>=20.15.0'}
 
-  zigbee-herdsman@9.0.9:
-    resolution: {integrity: sha512-Q15/Kl028AznkcWlxeD9a7OIHK06rO6+981CuPRXxM+wlHl5dFIu/HZlUwcFkpDtFBBcCvJuWzqwkuXVHAG9Rw==}
+  zigbee-herdsman@10.0.7:
+    resolution: {integrity: sha512-QqKJaJryWf7IUuVNV6Dc1/qNPrs2dJANPJhRTG74nZBAsyIDn/vSyCP7g19fuEM7Cphr/0ZgCJZkHP2wKvNPMw==}
 
   zigbee-on-host@0.2.4:
     resolution: {integrity: sha512-NIG6CWp+Yfn7PjqEIRvenHqpwT1U7rSkyimnFOUIFpnmxQOJKrmcwWDfn6WjbU/YIYYWSQPlj+g13icu1xwlyg==}
@@ -1487,8 +1487,8 @@ packages:
     resolution: {integrity: sha512-ClHYlG7g0v/tnIsD6kycNCi1ZEKIbQuU7lGJR3WqYcDmuqEMVcHDGbRiRwYRQcZGMxkqCf7guxNsXiKnC10+kg==}
     engines: {node: '>=20.11'}
 
-  zigbee2mqtt-windfront@2.9.2:
-    resolution: {integrity: sha512-weP7q0hLqXRf4tc94tzl2NGxl3DXMopgCwluMD3HKQiRMyjt3F1xy3NeoJu6Q2o1644cbRg8C+SQnVQUZJVyCw==}
+  zigbee2mqtt-windfront@2.11.1:
+    resolution: {integrity: sha512-2xM01JnuCWZlb1xYkIBVFAGJ6mkuAq/DRi8kfmB8KlA77LzHuX+f85pdgDotF9WGWb4+TqxmnpifYri1Nc3K2A==}
     engines: {node: '>=22.12.0'}
 
 snapshots:
@@ -1506,7 +1506,7 @@ snapshots:
     dependencies:
       '@babel/types': 7.27.6
 
-  '@babel/runtime@7.28.6': {}
+  '@babel/runtime@7.29.2': {}
 
   '@babel/types@7.27.6':
     dependencies:
@@ -1515,39 +1515,39 @@ snapshots:
 
   '@bcoe/v8-coverage@1.0.2': {}
 
-  '@biomejs/biome@2.4.4':
+  '@biomejs/biome@2.4.12':
     optionalDependencies:
-      '@biomejs/cli-darwin-arm64': 2.4.4
-      '@biomejs/cli-darwin-x64': 2.4.4
-      '@biomejs/cli-linux-arm64': 2.4.4
-      '@biomejs/cli-linux-arm64-musl': 2.4.4
-      '@biomejs/cli-linux-x64': 2.4.4
-      '@biomejs/cli-linux-x64-musl': 2.4.4
-      '@biomejs/cli-win32-arm64': 2.4.4
-      '@biomejs/cli-win32-x64': 2.4.4
+      '@biomejs/cli-darwin-arm64': 2.4.12
+      '@biomejs/cli-darwin-x64': 2.4.12
+      '@biomejs/cli-linux-arm64': 2.4.12
+      '@biomejs/cli-linux-arm64-musl': 2.4.12
+      '@biomejs/cli-linux-x64': 2.4.12
+      '@biomejs/cli-linux-x64-musl': 2.4.12
+      '@biomejs/cli-win32-arm64': 2.4.12
+      '@biomejs/cli-win32-x64': 2.4.12
 
-  '@biomejs/cli-darwin-arm64@2.4.4':
+  '@biomejs/cli-darwin-arm64@2.4.12':
     optional: true
 
-  '@biomejs/cli-darwin-x64@2.4.4':
+  '@biomejs/cli-darwin-x64@2.4.12':
     optional: true
 
-  '@biomejs/cli-linux-arm64-musl@2.4.4':
+  '@biomejs/cli-linux-arm64-musl@2.4.12':
     optional: true
 
-  '@biomejs/cli-linux-arm64@2.4.4':
+  '@biomejs/cli-linux-arm64@2.4.12':
     optional: true
 
-  '@biomejs/cli-linux-x64-musl@2.4.4':
+  '@biomejs/cli-linux-x64-musl@2.4.12':
     optional: true
 
-  '@biomejs/cli-linux-x64@2.4.4':
+  '@biomejs/cli-linux-x64@2.4.12':
     optional: true
 
-  '@biomejs/cli-win32-arm64@2.4.4':
+  '@biomejs/cli-win32-arm64@2.4.12':
     optional: true
 
-  '@biomejs/cli-win32-x64@2.4.4':
+  '@biomejs/cli-win32-x64@2.4.12':
     optional: true
 
   '@colors/colors@1.6.0': {}
@@ -1770,7 +1770,7 @@ snapshots:
 
   '@types/finalhandler@1.2.4':
     dependencies:
-      '@types/node': 24.11.0
+      '@types/node': 24.12.2
 
   '@types/http-errors@2.0.5': {}
 
@@ -1778,7 +1778,7 @@ snapshots:
 
   '@types/js-yaml@4.0.9': {}
 
-  '@types/node@24.11.0':
+  '@types/node@24.12.2':
     dependencies:
       undici-types: 7.16.0
 
@@ -1786,20 +1786,20 @@ snapshots:
 
   '@types/readable-stream@4.0.23':
     dependencies:
-      '@types/node': 24.11.0
+      '@types/node': 24.12.2
 
   '@types/serve-static@2.2.0':
     dependencies:
       '@types/http-errors': 2.0.5
-      '@types/node': 24.11.0
+      '@types/node': 24.12.2
 
   '@types/triple-beam@1.3.5': {}
 
   '@types/ws@8.18.1':
     dependencies:
-      '@types/node': 24.11.0
+      '@types/node': 24.12.2
 
-  '@vitest/coverage-v8@3.2.4(vitest@3.2.4(@types/node@24.11.0))':
+  '@vitest/coverage-v8@3.2.4(vitest@3.2.4(@types/node@24.12.2))':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
@@ -1814,7 +1814,7 @@ snapshots:
       std-env: 3.9.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/node@24.11.0)
+      vitest: 3.2.4(@types/node@24.12.2)
     transitivePeerDependencies:
       - supports-color
 
@@ -1826,13 +1826,13 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@6.3.5(@types/node@24.11.0))':
+  '@vitest/mocker@3.2.4(vite@6.3.5(@types/node@24.12.2))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 6.3.5(@types/node@24.11.0)
+      vite: 6.3.5(@types/node@24.12.2)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -1928,12 +1928,12 @@ snapshots:
     dependencies:
       balanced-match: 4.0.2
 
-  broker-factory@3.1.13:
+  broker-factory@3.1.14:
     dependencies:
-      '@babel/runtime': 7.28.6
-      fast-unique-numbers: 9.0.26
+      '@babel/runtime': 7.29.2
+      fast-unique-numbers: 9.0.27
       tslib: 2.8.1
-      worker-factory: 7.0.48
+      worker-factory: 7.0.49
 
   buffer-from@1.1.2: {}
 
@@ -2080,9 +2080,9 @@ snapshots:
 
   fast-deep-equal@3.1.3: {}
 
-  fast-unique-numbers@9.0.26:
+  fast-unique-numbers@9.0.27:
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.29.2
       tslib: 2.8.1
 
   fast-uri@3.1.0: {}
@@ -2183,7 +2183,7 @@ snapshots:
   istanbul-lib-source-maps@5.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.4.3
+      debug: 4.4.1
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
@@ -2241,7 +2241,7 @@ snapshots:
 
   lru-cache@10.4.3: {}
 
-  lru-cache@11.2.6: {}
+  lru-cache@11.2.7: {}
 
   magic-string@0.30.17:
     dependencies:
@@ -2283,7 +2283,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mqtt@5.15.0:
+  mqtt@5.15.1:
     dependencies:
       '@types/readable-stream': 4.0.23
       '@types/ws': 8.18.1
@@ -2299,8 +2299,8 @@ snapshots:
       rfdc: 1.4.1
       socks: 2.8.7
       split2: 4.2.0
-      worker-timers: 8.0.29
-      ws: 8.19.0
+      worker-timers: 8.0.31
+      ws: 8.20.0
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -2354,7 +2354,7 @@ snapshots:
 
   path-scurry@2.0.1:
     dependencies:
-      lru-cache: 11.2.6
+      lru-cache: 11.2.7
       minipass: 7.1.2
 
   pathe@2.0.3: {}
@@ -2588,7 +2588,7 @@ snapshots:
 
   typedarray@0.0.6: {}
 
-  typescript@5.9.3: {}
+  typescript@6.0.3: {}
 
   undici-types@7.16.0: {}
 
@@ -2606,13 +2606,13 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
-  vite-node@3.2.4(@types/node@24.11.0):
+  vite-node@3.2.4(@types/node@24.12.2):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 6.3.5(@types/node@24.11.0)
+      vite: 6.3.5(@types/node@24.12.2)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -2627,7 +2627,7 @@ snapshots:
       - tsx
       - yaml
 
-  vite@6.3.5(@types/node@24.11.0):
+  vite@6.3.5(@types/node@24.12.2):
     dependencies:
       esbuild: 0.25.5
       fdir: 6.4.6(picomatch@4.0.2)
@@ -2636,14 +2636,14 @@ snapshots:
       rollup: 4.44.0
       tinyglobby: 0.2.14
     optionalDependencies:
-      '@types/node': 24.11.0
+      '@types/node': 24.12.2
       fsevents: 2.3.3
 
-  vitest@3.2.4(@types/node@24.11.0):
+  vitest@3.2.4(@types/node@24.12.2):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@6.3.5(@types/node@24.11.0))
+      '@vitest/mocker': 3.2.4(vite@6.3.5(@types/node@24.12.2))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -2661,11 +2661,11 @@ snapshots:
       tinyglobby: 0.2.14
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 6.3.5(@types/node@24.11.0)
-      vite-node: 3.2.4(@types/node@24.11.0)
+      vite: 6.3.5(@types/node@24.12.2)
+      vite-node: 3.2.4(@types/node@24.12.2)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 24.11.0
+      '@types/node': 24.12.2
     transitivePeerDependencies:
       - jiti
       - less
@@ -2718,32 +2718,32 @@ snapshots:
       triple-beam: 1.4.1
       winston-transport: 4.9.0
 
-  worker-factory@7.0.48:
+  worker-factory@7.0.49:
     dependencies:
-      '@babel/runtime': 7.28.6
-      fast-unique-numbers: 9.0.26
+      '@babel/runtime': 7.29.2
+      fast-unique-numbers: 9.0.27
       tslib: 2.8.1
 
-  worker-timers-broker@8.0.15:
+  worker-timers-broker@8.0.16:
     dependencies:
-      '@babel/runtime': 7.28.6
-      broker-factory: 3.1.13
-      fast-unique-numbers: 9.0.26
+      '@babel/runtime': 7.29.2
+      broker-factory: 3.1.14
+      fast-unique-numbers: 9.0.27
       tslib: 2.8.1
-      worker-timers-worker: 9.0.13
+      worker-timers-worker: 9.0.14
 
-  worker-timers-worker@9.0.13:
+  worker-timers-worker@9.0.14:
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.29.2
       tslib: 2.8.1
-      worker-factory: 7.0.48
+      worker-factory: 7.0.49
 
-  worker-timers@8.0.29:
+  worker-timers@8.0.31:
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.29.2
       tslib: 2.8.1
-      worker-timers-broker: 8.0.15
-      worker-timers-worker: 9.0.13
+      worker-timers-broker: 8.0.16
+      worker-timers-worker: 9.0.14
 
   wrap-ansi@7.0.0:
     dependencies:
@@ -2757,17 +2757,17 @@ snapshots:
       string-width: 5.1.2
       strip-ansi: 7.1.2
 
-  ws@8.19.0: {}
+  ws@8.20.0: {}
 
-  zigbee-herdsman-converters@26.12.0:
+  zigbee-herdsman-converters@26.39.1:
     dependencies:
       iconv-lite: 0.7.2
       semver: 7.7.4
-      zigbee-herdsman: 9.0.9
+      zigbee-herdsman: 10.0.7
     transitivePeerDependencies:
       - supports-color
 
-  zigbee-herdsman@9.0.9:
+  zigbee-herdsman@10.0.7:
     dependencies:
       '@date-fns/tz': 1.4.1
       '@serialport/bindings-cpp': 13.0.1
@@ -2785,4 +2785,4 @@ snapshots:
 
   zigbee2mqtt-frontend@0.9.21: {}
 
-  zigbee2mqtt-windfront@2.9.2: {}
+  zigbee2mqtt-windfront@2.11.1: {}

scripts/testExternalConverter.js

@@ -18,5 +18,5 @@ const sandbox = {
 };
 vm.runInNewContext(moduleCode, sandbox, moduleFakePath);
 const converter = sandbox.module.exports;
-assert(!converter.toZigbee || !converter.toZigbee.includes(undefined));
-assert(!converter.fromZigbee || !converter.fromZigbee.includes(undefined));
+assert(!converter.toZigbee?.includes(undefined));
+assert(!converter.fromZigbee?.includes(undefined));

test/controller.test.ts

@@ -112,7 +112,7 @@ describe("Controller", () => {
         expect(mockLogger.info).toHaveBeenCalledWith(
             "bulb (0x000b57fffec6a5b2): LED1545G12 - IKEA TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm (Router)",
         );
-        expect(mockLogger.info).toHaveBeenCalledWith("remote (0x0017880104e45517): 324131092621 - Philips Hue dimmer switch (EndDevice)");
+        expect(mockLogger.info).toHaveBeenCalledWith("remote (0x0017880104e45517): 324131092621 - Philips Hue dimmer switch gen 1 (EndDevice)");
         expect(mockLogger.info).toHaveBeenCalledWith("0x0017880104e45518 (0x0017880104e45518): Not supported (EndDevice)");
         expect(mockMQTTConnectAsync).toHaveBeenCalledTimes(1);
         expect(mockMQTTConnectAsync).toHaveBeenCalledWith("mqtt://localhost", {

test/extensions/bridge.test.ts

@@ -597,6 +597,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: true,
                         vendor: "IKEA",
+                        version: "0.0.0",
                     },
                     description: "this is my bulb",
                     disabled: false,
@@ -734,7 +735,7 @@ describe("Extension: Bridge", () => {
                                 values: ["off", "on", "toggle", "previous"],
                             },
                             {
-                                access: 2,
+                                access: 3,
                                 label: "Effect",
                                 name: "effect",
                                 property: "effect",
@@ -747,11 +748,40 @@ describe("Extension: Bridge", () => {
                                     "candle",
                                     "fireplace",
                                     "colorloop",
+                                    "sunset",
+                                    "sparkle",
+                                    "opal",
+                                    "glisten",
+                                    "underwater",
+                                    "cosmos",
+                                    "sunbeam",
+                                    "enchant",
+                                    "none",
                                     "finish_effect",
                                     "stop_effect",
                                     "stop_hue_effect",
                                 ],
                             },
+                            {
+                                access: 3,
+                                description: "Animation speed for the active effect (0=slowest, 1=fastest)",
+                                label: "Effect speed",
+                                name: "effect_speed",
+                                property: "effect_speed",
+                                type: "numeric",
+                                value_max: 1,
+                                value_min: 0,
+                                value_step: 0.01,
+                            },
+                            {
+                                access: 2,
+                                description:
+                                    'Set the base color of the active effect without stopping it (hex e.g. #FF4400, or JSON {"x":0.6,"y":0.3})',
+                                label: "Effect color",
+                                name: "effect_color",
+                                property: "effect_color",
+                                type: "text",
+                            },
                             {
                                 access: 1,
                                 category: "diagnostic",
@@ -767,6 +797,27 @@ describe("Extension: Bridge", () => {
                         ],
                         model: "7146060PH",
                         options: [
+                            {
+                                access: 2,
+                                description:
+                                    "Control this light using a Philips-specific protocol instead of standard Zigbee commands. When enabled, on/off, brightness, color, and color temperature are combined into single atomic commands. This is required to use the Effect color update mode. When disabled (default), standard Zigbee commands are used, which preserves the usual behavior, including simulating on/off transitions.",
+                                label: "Hue native control",
+                                name: "hue_native_control",
+                                property: "hue_native_control",
+                                type: "binary",
+                                value_off: false,
+                                value_on: true,
+                            },
+                            {
+                                access: 2,
+                                description:
+                                    "Controls what happens when color is changed while an effect is active (requires Hue native control). 'stop' (default): color change stops the effect (Hue app behavior). 'update': color change re-sends the effect with the new color.",
+                                label: "Effect color mode",
+                                name: "effect_color_mode",
+                                property: "effect_color_mode",
+                                type: "enum",
+                                values: ["stop", "update"],
+                            },
                             {
                                 access: 2,
                                 description:
@@ -778,6 +829,16 @@ describe("Extension: Bridge", () => {
                                 value_min: 0,
                                 value_step: 0.1,
                             },
+                            {
+                                access: 2,
+                                description: "State actions will also be published as 'action' when true (default false).",
+                                label: "State action",
+                                name: "state_action",
+                                property: "state_action",
+                                type: "binary",
+                                value_off: false,
+                                value_on: true,
+                            },
                             {
                                 access: 2,
                                 description:
@@ -789,19 +850,10 @@ describe("Extension: Bridge", () => {
                                 value_off: false,
                                 value_on: true,
                             },
-                            {
-                                access: 2,
-                                description: "State actions will also be published as 'action' when true (default false).",
-                                label: "State action",
-                                name: "state_action",
-                                property: "state_action",
-                                type: "binary",
-                                value_off: false,
-                                value_on: true,
-                            },
                         ],
                         supports_ota: true,
                         vendor: "Philips",
+                        version: "0.0.0",
                     },
                     disabled: false,
                     endpoints: {
@@ -831,7 +883,7 @@ describe("Extension: Bridge", () => {
                 {
                     definition: {
                         source: "native",
-                        description: "Hue dimmer switch",
+                        description: "Hue dimmer switch gen 1",
                         exposes: [
                             {
                                 access: 1,
@@ -930,6 +982,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: true,
                         vendor: "Philips",
+                        version: "0.0.0",
                     },
                     disabled: false,
                     endpoints: {
@@ -1038,6 +1091,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: false,
                         vendor: "notSupportedMfg",
+                        version: "0.0.0",
                     },
                     disabled: false,
                     endpoints: {
@@ -1143,6 +1197,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: false,
                         vendor: "Aqara",
+                        version: "0.0.0",
                     },
                     disabled: false,
                     endpoints: {
@@ -1304,6 +1359,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: false,
                         vendor: "Aqara",
+                        version: "0.0.0",
                     },
                     disabled: false,
                     endpoints: {"1": {bindings: [], clusters: {input: ["genBasic"], output: []}, configured_reportings: [], scenes: []}},
@@ -1455,6 +1511,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: true,
                         vendor: "Xiaomi",
+                        version: "0.0.0",
                     },
                     disabled: false,
                     endpoints: {"1": {bindings: [], clusters: {input: ["genBasic", "genOnOff"], output: []}, configured_reportings: [], scenes: []}},
@@ -1914,6 +1971,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: false,
                         vendor: "Siglis",
+                        version: "0.0.0",
                     },
                     disabled: false,
                     endpoints: {
@@ -2204,6 +2262,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: true,
                         vendor: "IKEA",
+                        version: "0.0.0",
                     },
                     disabled: false,
                     endpoints: {
@@ -2639,6 +2698,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: true,
                         vendor: "IKEA",
+                        version: "0.0.0",
                     },
                     friendly_name: "bulb",
                     ieee_address: "0x000b57fffec6a5b2",
@@ -2725,6 +2785,7 @@ describe("Extension: Bridge", () => {
                         ],
                         supports_ota: false,
                         vendor: "notSupportedMfg",
+                        version: "0.0.0",
                     },
                     friendly_name: "0x0017880104e45518",
                     ieee_address: "0x0017880104e45518",

test/extensions/frontend.test.ts

@@ -245,6 +245,8 @@ describe("Extension: Frontend", () => {
             stringify({
                 state: "ON",
                 effect: null,
+                effect_color: null,
+                effect_speed: null,
                 power_on_behavior: null,
                 linkquality: 20,
                 update: {state: null, installed_version: -1, latest_version: -1},
@@ -269,6 +271,8 @@ describe("Extension: Frontend", () => {
                     state: "ON",
                     power_on_behavior: null,
                     effect: null,
+                    effect_color: null,
+                    effect_speed: null,
                     linkquality: 20,
                     update: {state: null, installed_version: -1, latest_version: -1},
                 },
@@ -296,6 +300,8 @@ describe("Extension: Frontend", () => {
                     brightness: 90,
                     power_on_behavior: null,
                     effect: null,
+                    effect_color: null,
+                    effect_speed: null,
                     linkquality: 20,
                     update: {state: null, installed_version: -1, latest_version: -1},
                 },

test/extensions/homeassistant.test.ts

@@ -103,6 +103,7 @@ describe("Extension: HomeAssistant", () => {
                 definition: d,
                 isDevice: (): boolean => true,
                 isGroup: (): boolean => false,
+                endpoint: () => undefined,
                 options: {},
                 exposes: (): unknown[] => exposes,
                 zh: {endpoints: []},
@@ -124,7 +125,7 @@ describe("Extension: HomeAssistant", () => {
             }
         }
 
-        expect(duplicated).toHaveLength(0);
+        expect(duplicated).toStrictEqual([]);
     });
 
     it("Should discover devices and groups", async () => {
@@ -163,6 +164,15 @@ describe("Extension: HomeAssistant", () => {
                 "candle",
                 "fireplace",
                 "colorloop",
+                "sunset",
+                "sparkle",
+                "opal",
+                "glisten",
+                "underwater",
+                "cosmos",
+                "sunbeam",
+                "enchant",
+                "none",
                 "finish_effect",
                 "stop_effect",
                 "stop_hue_effect",
@@ -170,6 +180,7 @@ describe("Extension: HomeAssistant", () => {
             object_id: "ha_discovery_group",
             default_entity_id: "light.ha_discovery_group",
             unique_id: "9_light_zigbee2mqtt",
+            group: ["0x000b57fffec6a5b4_light_zigbee2mqtt", "0x000b57fffec6a5b7_light_zigbee2mqtt"],
             origin: origin,
         };
 
@@ -225,6 +236,7 @@ describe("Extension: HomeAssistant", () => {
             object_id: "ha_discovery_group",
             default_entity_id: "switch.ha_discovery_group",
             unique_id: "9_switch_zigbee2mqtt",
+            group: ["0x0017880104e45542_switch_right_zigbee2mqtt"],
             origin: origin,
             value_template: "{{ value_json.state }}",
         };
@@ -1558,6 +1570,8 @@ describe("Extension: HomeAssistant", () => {
                 color: {hue: 0, saturation: 100, h: 0, s: 100},
                 color_mode: "hs",
                 effect: null,
+                effect_color: null,
+                effect_speed: null,
                 linkquality: null,
                 state: null,
                 power_on_behavior: null,
@@ -1581,6 +1595,8 @@ describe("Extension: HomeAssistant", () => {
                 color: {x: 0.4576, y: 0.41},
                 color_mode: "xy",
                 effect: null,
+                effect_color: null,
+                effect_speed: null,
                 linkquality: null,
                 state: null,
                 power_on_behavior: null,
@@ -1603,6 +1619,8 @@ describe("Extension: HomeAssistant", () => {
             stringify({
                 linkquality: null,
                 effect: null,
+                effect_color: null,
+                effect_speed: null,
                 state: "ON",
                 power_on_behavior: null,
                 update: {state: null, installed_version: -1, latest_version: -1},
@@ -1965,6 +1983,15 @@ describe("Extension: HomeAssistant", () => {
                 "candle",
                 "fireplace",
                 "colorloop",
+                "sunset",
+                "sparkle",
+                "opal",
+                "glisten",
+                "underwater",
+                "cosmos",
+                "sunbeam",
+                "enchant",
+                "none",
                 "finish_effect",
                 "stop_effect",
                 "stop_hue_effect",
@@ -1972,6 +1999,7 @@ describe("Extension: HomeAssistant", () => {
             object_id: "ha_discovery_group_new",
             default_entity_id: "light.ha_discovery_group_new",
             unique_id: "9_light_zigbee2mqtt",
+            group: ["0x000b57fffec6a5b4_light_zigbee2mqtt", "0x000b57fffec6a5b7_light_zigbee2mqtt"],
             origin: origin,
         };
 
@@ -2434,6 +2462,15 @@ describe("Extension: HomeAssistant", () => {
                 "candle",
                 "fireplace",
                 "colorloop",
+                "sunset",
+                "sparkle",
+                "opal",
+                "glisten",
+                "underwater",
+                "cosmos",
+                "sunbeam",
+                "enchant",
+                "none",
                 "finish_effect",
                 "stop_effect",
                 "stop_hue_effect",
@@ -2441,6 +2478,7 @@ describe("Extension: HomeAssistant", () => {
             object_id: "ha_discovery_group",
             default_entity_id: "light.ha_discovery_group",
             unique_id: "9_light_zigbee2mqtt",
+            group: ["0x000b57fffec6a5b4_light_zigbee2mqtt", "0x000b57fffec6a5b7_light_zigbee2mqtt"],
             origin: origin,
         };
 
@@ -2479,6 +2517,15 @@ describe("Extension: HomeAssistant", () => {
                 "candle",
                 "fireplace",
                 "colorloop",
+                "sunset",
+                "sparkle",
+                "opal",
+                "glisten",
+                "underwater",
+                "cosmos",
+                "sunbeam",
+                "enchant",
+                "none",
                 "finish_effect",
                 "stop_effect",
                 "stop_hue_effect",
@@ -2486,6 +2533,7 @@ describe("Extension: HomeAssistant", () => {
             object_id: "ha_discovery_group",
             default_entity_id: "light.ha_discovery_group",
             unique_id: "9_light_zigbee2mqtt",
+            group: ["0x000b57fffec6a5b4_light_zigbee2mqtt", "0x000b57fffec6a5b7_light_zigbee2mqtt"],
             origin: origin,
         };
 

test/extensions/networkMap.test.ts

@@ -286,7 +286,7 @@ describe("Extension: NetworkMap", () => {
                                 description: "Hue Go",
                                 model: "7146060PH",
                                 supports:
-                                    "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality",
+                                    "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, effect_speed, effect_color, linkquality",
                                 vendor: "Philips",
                             },
                             failed: [],
@@ -616,7 +616,7 @@ describe("Extension: NetworkMap", () => {
                                 description: "Hue Go",
                                 model: "7146060PH",
                                 supports:
-                                    "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality",
+                                    "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, effect_speed, effect_color, linkquality",
                                 vendor: "Philips",
                             },
                             failed: [],
@@ -785,7 +785,7 @@ describe("Extension: NetworkMap", () => {
                                 description: "Hue Go",
                                 model: "7146060PH",
                                 supports:
-                                    "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality",
+                                    "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, effect_speed, effect_color, linkquality",
                                 vendor: "Philips",
                             },
                             failed: [],

tsconfig.json

@@ -11,7 +11,6 @@
         "declaration": true,
         "declarationMap": true,
         "outDir": "dist",
-        "baseUrl": ".",
         "rootDir": "lib",
         "inlineSourceMap": true,
         "resolveJsonModule": true,