From 67d3f05fd7d7b1f2ed789ecf0e69b06fe269313e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 07:57:31 +0000
Subject: [PATCH 01/46] chore: promote to dev

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 407050de6d..61a89ee8ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "zigbee2mqtt",
-    "version": "1.41.0",
+    "version": "1.41.0-dev",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
diff --git a/package.json b/package.json
index 465a8f7cc0..816053a497 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zigbee2mqtt",
-    "version": "1.41.0",
+    "version": "1.41.0-dev",
     "description": "Zigbee to MQTT bridge using Zigbee-herdsman",
     "main": "index.js",
     "repository": {

From c078ccb13606a0893a19f25378197be70c0127f6 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <mag@icus.se>
Date: Sat, 2 Nov 2024 19:56:57 +0100
Subject: [PATCH 02/46] fix: Home Assistant: remove the diagnostic category
 classification for power (#24575)

Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
---
 lib/extension/homeassistant.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index c83791203e..611cf3c9d3 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -255,9 +255,9 @@ const NUMERIC_DISCOVERY_LOOKUP: {[s: string]: KeyValue} = {
     pm25: {device_class: 'pm25', state_class: 'measurement'},
     people: {state_class: 'measurement', icon: 'mdi:account-multiple'},
     position: {icon: 'mdi:valve', state_class: 'measurement'},
-    power: {device_class: 'power', entity_category: 'diagnostic', state_class: 'measurement'},
-    power_phase_b: {device_class: 'power', entity_category: 'diagnostic', state_class: 'measurement'},
-    power_phase_c: {device_class: 'power', entity_category: 'diagnostic', state_class: 'measurement'},
+    power: {device_class: 'power', state_class: 'measurement'},
+    power_phase_b: {device_class: 'power', state_class: 'measurement'},
+    power_phase_c: {device_class: 'power', state_class: 'measurement'},
     power_factor: {device_class: 'power_factor', enabled_by_default: false, entity_category: 'diagnostic', state_class: 'measurement'},
     power_outage_count: {icon: 'mdi:counter', enabled_by_default: false},
     precision: {entity_category: 'config', icon: 'mdi:decimal-comma-increase'},

From 848f250dbb7e0142c7e702dab97536b8be749f5b Mon Sep 17 00:00:00 2001
From: Der Mundschenk & Compagnie <mundschenk-at@users.noreply.github.com>
Date: Sun, 3 Nov 2024 14:54:42 +0100
Subject: [PATCH 03/46] feat: Add experimental support for Home Assistant
 `event` entities (#24233)

* Expose new event entity for actions

* Unify exposed actions for HA

* Fix event tests

* Only add event entities wen homeassistant/experimental_event_entities is true

---------

Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
---
 lib/extension/homeassistant.ts | 98 ++++++++++++++++++++++++++++++++--
 lib/types/types.d.ts           |  1 +
 lib/util/settings.schema.json  |  6 +++
 lib/util/settings.ts           |  8 ++-
 test/homeassistant.test.js     | 89 ++++++++++++++++++++++++++++++
 test/settings.test.js          |  1 +
 6 files changed, 199 insertions(+), 4 deletions(-)

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index 611cf3c9d3..a80b42318a 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -29,6 +29,17 @@ interface Discovered {
     discovered: boolean;
 }
 
+interface ActionData {
+    action: string;
+    button?: string;
+    scene?: string;
+    region?: string;
+}
+
+const ACTION_BUTTON_PATTERN: string = '^(?<button>[a-z]+)_(?<action>(?:press|hold)(?:_release)?)$';
+const ACTION_SCENE_PATTERN: string = '^(?<action>recall|scene)_(?<scene>[0-2][0-9]{0,2})$';
+const ACTION_REGION_PATTERN: string = '^region_(?<region>[1-9]|10)_(?<action>enter|leave|occupied|unoccupied)$';
+
 const SENSOR_CLICK: Readonly<DiscoveryEntry> = {
     type: 'sensor',
     object_id: 'click',
@@ -435,6 +446,7 @@ export default class HomeAssistant extends Extension {
     private statusTopic: string;
     private entityAttributes: boolean;
     private legacyTrigger: boolean;
+    private experimentalEventEntities: boolean;
     // @ts-expect-error initialized in `start`
     private zigbee2MQTTVersion: string;
     // @ts-expect-error initialized in `start`
@@ -466,6 +478,7 @@ export default class HomeAssistant extends Extension {
         this.statusTopic = haSettings.status_topic;
         this.entityAttributes = haSettings.legacy_entity_attributes;
         this.legacyTrigger = haSettings.legacy_triggers;
+        this.experimentalEventEntities = haSettings.experimental_event_entities;
         if (haSettings.discovery_topic === settings.get().mqtt.base_topic) {
             throw new Error(`'homeassistant.discovery_topic' cannot not be equal to the 'mqtt.base_topic' (got '${settings.get().mqtt.base_topic}')`);
         }
@@ -1146,6 +1159,45 @@ export default class HomeAssistant extends Extension {
                     });
                 }
 
+                /**
+                 * If enum attribute does not have SET access and is named 'action', then expose
+                 * as EVENT entity. Wildcard actions like `recall_*` are currently not supported.
+                 */
+                if (
+                    this.experimentalEventEntities &&
+                    firstExpose.access & ACCESS_STATE &&
+                    !(firstExpose.access & ACCESS_SET) &&
+                    firstExpose.property == 'action'
+                ) {
+                    discoveryEntries.push({
+                        type: 'event',
+                        object_id: firstExpose.property,
+                        mockProperties: [{property: firstExpose.property, value: null}],
+                        discovery_payload: {
+                            name: endpoint ? /* istanbul ignore next */ `${firstExpose.label} ${endpoint}` : firstExpose.label,
+                            state_topic: true,
+                            event_types: this.prepareActionEventTypes(firstExpose.values),
+
+                            // TODO: Implement parsing for all event types.
+                            value_template:
+                                `{%- set buttons = value_json.action|regex_findall_index(${ACTION_BUTTON_PATTERN.replaceAll(/\?<([a-z]+)>/g, '?P<$1>')}) -%}` +
+                                `{%- set scenes = value_json.action|regex_findall_index(${ACTION_SCENE_PATTERN.replaceAll(/\?<([a-z]+)>/g, '?P<$1>')}) -%}` +
+                                `{%- set regions = value_json.action|regex_findall_index(${ACTION_REGION_PATTERN.replaceAll(/\?<([a-z]+)>/g, '?P<$1>')}) -%}` +
+                                `{%- if buttons -%}\n` +
+                                `   {%- set d = dict(event_type = "{{buttons[1]}}", button = "{{buttons[0]}}_button" -%}\n` +
+                                `{%- elif scenes -%}\n` +
+                                `   {%- set d = dict(event_type = "{{scenes[0]}}", scene = "{{scenes[1]}}" -%}\n` +
+                                `{%- elif regions -%}\n` +
+                                `   {%- set d = dict(event_type = "region_{{regions[1]}}", region = "{{regions[0]}}" -%}\n` +
+                                `{%- else -%}\n` +
+                                `   {%- set d = dict(event_type = "{{value_json.action}}" ) -%}\n` +
+                                `{%- endif -%}\n` +
+                                `{{d|to_json}}`,
+                            ...ENUM_DISCOVERY_LOOKUP[firstExpose.name],
+                        },
+                    });
+                }
+
                 /**
                  * If enum attribute has SET access then expose as SELECT entity too.
                  * Note: currently both sensor and select are discovered, this is to avoid
@@ -1253,9 +1305,12 @@ export default class HomeAssistant extends Extension {
             if (['binary_sensor', 'sensor'].includes(d.type) && d.discovery_payload.entity_category === 'config') {
                 d.discovery_payload.entity_category = 'diagnostic';
             }
-        });
 
-        discoveryEntries.forEach((d) => {
+            // Event entities cannot have an entity_category set.
+            if (d.type === 'event' && d.discovery_payload.entity_category) {
+                delete d.discovery_payload.entity_category;
+            }
+
             // Let Home Assistant generate entity name when device_class is present
             if (d.discovery_payload.device_class) {
                 delete d.discovery_payload.name;
@@ -1537,7 +1592,7 @@ export default class HomeAssistant extends Extension {
         }
 
         if (!this.legacyTrigger) {
-            configs = configs.filter((c) => c.object_id !== 'action' && c.object_id !== 'click');
+            configs = configs.filter((c) => (c.object_id !== 'action' && c.object_id !== 'click') || c.type == 'event');
         }
 
         // deep clone of the config objects
@@ -2167,4 +2222,41 @@ export default class HomeAssistant extends Extension {
 
         return bridge;
     }
+
+    private parseActionValue(action: string): ActionData {
+        const buttons = action.match(ACTION_BUTTON_PATTERN);
+        if (buttons?.groups?.action) {
+            //console.log('Recognized button actions', buttons.groups);
+            return {...buttons.groups, action: buttons.groups.action};
+        }
+
+        const scenes = action.match(ACTION_SCENE_PATTERN);
+        if (scenes?.groups?.action) {
+            //console.log('Recognized scene actions', scenes.groups);
+            return {...scenes.groups, action: scenes.groups.action};
+        }
+
+        const regions = action.match(ACTION_REGION_PATTERN);
+        if (regions?.groups?.action) {
+            return {...regions.groups, action: 'region_' + regions.groups.action};
+        }
+
+        const sceneWildcard = action.match(/^(?<action>recall|scene)_\*$/);
+        if (sceneWildcard?.groups?.action) {
+            logger.debug('Found scene wildcard action ' + sceneWildcard.groups.action);
+            return {action: sceneWildcard.groups.action, scene: 'wildcard'};
+        }
+
+        const regionWildcard = action.match(/^region_\*_(?<action>enter|leave|occupied|unoccupied)$/);
+        if (regionWildcard?.groups?.action) {
+            logger.debug('Found region wildcard action ' + regionWildcard.groups.action);
+            return {action: 'region_' + regionWildcard.groups.action, region: 'wildcard'};
+        }
+
+        return {action};
+    }
+
+    private prepareActionEventTypes(values: zhc.Enum['values']): string[] {
+        return utils.arrayUnique(values.map((v) => this.parseActionValue(v.toString()).action).filter((v) => !v.includes('*')));
+    }
 }
diff --git a/lib/types/types.d.ts b/lib/types/types.d.ts
index 20656165ba..8aa313c7ff 100644
--- a/lib/types/types.d.ts
+++ b/lib/types/types.d.ts
@@ -118,6 +118,7 @@ declare global {
             status_topic: string;
             legacy_entity_attributes: boolean;
             legacy_triggers: boolean;
+            experimental_event_entities: boolean;
         };
         permit_join: boolean;
         availability?: {
diff --git a/lib/util/settings.schema.json b/lib/util/settings.schema.json
index 0585d48e6a..afe0dbf96e 100644
--- a/lib/util/settings.schema.json
+++ b/lib/util/settings.schema.json
@@ -40,6 +40,12 @@
                             "description": "Home Assistant status topic",
                             "requiresRestart": true,
                             "examples": ["homeassistant/status"]
+                        },
+                        "experimental_event_entities": {
+                            "type": "boolean",
+                            "title": "Home Assistant experimental event entities",
+                            "description": "Home Assistant experimental event entities, when enabled Zigbee2MQTT will add event entities for exposed actions. The events and attributes are currently deemed experimental and subject to change.",
+                            "default": false
                         }
                     }
                 }
diff --git a/lib/util/settings.ts b/lib/util/settings.ts
index 9437dbd291..588fb98cf7 100644
--- a/lib/util/settings.ts
+++ b/lib/util/settings.ts
@@ -136,7 +136,13 @@ function loadSettingsWithDefaults(): void {
     }
 
     if (_settingsWithDefaults.homeassistant) {
-        const defaults = {discovery_topic: 'homeassistant', status_topic: 'hass/status', legacy_entity_attributes: true, legacy_triggers: true};
+        const defaults = {
+            discovery_topic: 'homeassistant',
+            status_topic: 'hass/status',
+            legacy_entity_attributes: true,
+            legacy_triggers: true,
+            experimental_event_entities: false,
+        };
         const sLegacy = {};
         if (_settingsWithDefaults.advanced) {
             for (const key of [
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index 55e746d1d2..8b364d9e47 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -89,6 +89,9 @@ describe('HomeAssistant extension', () => {
     });
 
     it('Should discover devices and groups', async () => {
+        settings.set(['homeassistant'], {experimental_event_entities: true});
+        await resetExtension();
+
         let payload;
 
         payload = {
@@ -404,6 +407,52 @@ describe('HomeAssistant extension', () => {
             {retain: true, qos: 1},
             expect.any(Function),
         );
+
+        payload = {
+            availability: [{topic: 'zigbee2mqtt/bridge/state'}],
+            device: {
+                identifiers: ['zigbee2mqtt_0x0017880104e45520'],
+                manufacturer: 'Aqara',
+                model: 'Wireless mini switch (WXKG11LM)',
+                name: 'button',
+                sw_version: null,
+                via_device: 'zigbee2mqtt_bridge_0x00124b00120144ae',
+            },
+            event_types: ['single', 'double', 'triple', 'quadruple', 'hold', 'release'],
+            icon: 'mdi:gesture-double-tap',
+            json_attributes_topic: 'zigbee2mqtt/button',
+            name: 'Action',
+            object_id: 'button_action',
+            origin: origin,
+            state_topic: 'zigbee2mqtt/button',
+            unique_id: '0x0017880104e45520_action_zigbee2mqtt',
+            // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
+            value_template:
+                '{%- set buttons = value_json.action|regex_findall_index(^(?P<button>[a-z]+)_(?P<action>(?:press|hold)(?:_release)?)$) -%}{%- set scenes = value_json.action|regex_findall_index(^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$) -%}{%- set regions = value_json.action|regex_findall_index(^region_(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$) -%}{%- if buttons -%}\n   {%- set d = dict(event_type = "{{buttons[1]}}", button = "{{buttons[0]}}_button" -%}\n{%- elif scenes -%}\n   {%- set d = dict(event_type = "{{scenes[0]}}", scene = "{{scenes[1]}}" -%}\n{%- elif regions -%}\n   {%- set d = dict(event_type = "region_{{regions[1]}}", region = "{{regions[0]}}" -%}\n{%- else -%}\n   {%- set d = dict(event_type = "{{value_json.action}}" ) -%}\n{%- endif -%}\n{{d|to_json}}',
+        };
+
+        expect(MQTT.publish).toHaveBeenCalledWith(
+            'homeassistant/event/0x0017880104e45520/action/config',
+            stringify(payload),
+            {retain: true, qos: 1},
+            expect.any(Function),
+        );
+    });
+
+    it.each([
+        ['recall_1', {action: 'recall', scene: '1'}],
+        ['recall_*', {action: 'recall', scene: 'wildcard'}],
+        ['on', {action: 'on'}],
+        ['on_1', {action: 'on_1'}],
+        ['release_left', {action: 'release_left'}],
+        ['region_1_enter', {action: 'region_enter', region: '1'}],
+        ['region_*_leave', {action: 'region_leave', region: 'wildcard'}],
+        ['left_press', {action: 'press', button: 'left'}],
+        ['left_press_release', {action: 'press_release', button: 'left'}],
+        ['right_hold', {action: 'hold', button: 'right'}],
+        ['right_hold_release', {action: 'hold_release', button: 'right'}],
+    ])('Should parse action names correctly', (action, expected) => {
+        expect(extension.parseActionValue(action)).toStrictEqual(expected);
     });
 
     it('Should not discovery devices which are already discovered', async () => {
@@ -1915,6 +1964,46 @@ describe('HomeAssistant extension', () => {
         expect(MQTT.publish).toHaveBeenCalledTimes(3);
     });
 
+    it('Should enable experimental event entities', async () => {
+        settings.set(['homeassistant'], {experimental_event_entities: true});
+        settings.set(['devices', '0x0017880104e45520'], {
+            legacy: false,
+            friendly_name: 'button',
+            retain: false,
+        });
+        await resetExtension();
+
+        const payload = {
+            availability: [{topic: 'zigbee2mqtt/bridge/state'}],
+            device: {
+                identifiers: ['zigbee2mqtt_0x0017880104e45520'],
+                manufacturer: 'Aqara',
+                model: 'Wireless mini switch (WXKG11LM)',
+                name: 'button',
+                sw_version: null,
+                via_device: 'zigbee2mqtt_bridge_0x00124b00120144ae',
+            },
+            event_types: ['single', 'double', 'triple', 'quadruple', 'hold', 'release'],
+            icon: 'mdi:gesture-double-tap',
+            json_attributes_topic: 'zigbee2mqtt/button',
+            name: 'Action',
+            object_id: 'button_action',
+            origin: origin,
+            state_topic: 'zigbee2mqtt/button',
+            unique_id: '0x0017880104e45520_action_zigbee2mqtt',
+            // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
+            value_template:
+                '{%- set buttons = value_json.action|regex_findall_index(^(?P<button>[a-z]+)_(?P<action>(?:press|hold)(?:_release)?)$) -%}{%- set scenes = value_json.action|regex_findall_index(^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$) -%}{%- set regions = value_json.action|regex_findall_index(^region_(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$) -%}{%- if buttons -%}\n   {%- set d = dict(event_type = "{{buttons[1]}}", button = "{{buttons[0]}}_button" -%}\n{%- elif scenes -%}\n   {%- set d = dict(event_type = "{{scenes[0]}}", scene = "{{scenes[1]}}" -%}\n{%- elif regions -%}\n   {%- set d = dict(event_type = "region_{{regions[1]}}", region = "{{regions[0]}}" -%}\n{%- else -%}\n   {%- set d = dict(event_type = "{{value_json.action}}" ) -%}\n{%- endif -%}\n{{d|to_json}}',
+        };
+
+        expect(MQTT.publish).toHaveBeenCalledWith(
+            'homeassistant/event/0x0017880104e45520/action/config',
+            stringify(payload),
+            {retain: true, qos: 1},
+            expect.any(Function),
+        );
+    });
+
     it('Should republish payload to postfix topic with lightWithPostfix config', async () => {
         MQTT.publish.mockClear();
 
diff --git a/test/settings.test.js b/test/settings.test.js
index 3e07752419..98772d3088 100644
--- a/test/settings.test.js
+++ b/test/settings.test.js
@@ -1026,6 +1026,7 @@ describe('Settings', () => {
         settings.reRead();
         expect(settings.get().homeassistant).toStrictEqual({
             discovery_topic: 'new',
+            experimental_event_entities: false,
             legacy_entity_attributes: true,
             legacy_triggers: true,
             status_topic: 'olds',

From a6bfab793464ee4331481ee891c0a01bd475ff1f Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sun, 3 Nov 2024 15:34:04 +0100
Subject: [PATCH 04/46] Update zigbee-herdsman-converters to 20.39.2 (#24609)

* fix(ignore): update zigbee-herdsman-converters to 20.39.2

* u
---
 lib/extension/publish.ts |  4 +++-
 package-lock.json        | 10 +++++-----
 package.json             |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/extension/publish.ts b/lib/extension/publish.ts
index 2c25083d85..925bc0bd76 100644
--- a/lib/extension/publish.ts
+++ b/lib/extension/publish.ts
@@ -259,7 +259,9 @@ export default class Publish extends Extension {
             if (usedConverters[endpointOrGroupID] === undefined) usedConverters[endpointOrGroupID] = [];
             /* istanbul ignore next */
             // Match any key if the toZigbee converter defines no key.
-            const converter = converters.find((c) => (!c.key || c.key.includes(key)) && (!c.endpoint || c.endpoint == endpointName));
+            const converter = converters.find(
+                (c) => (!c.key || c.key.includes(key)) && (!c.endpoints || (endpointName && c.endpoints.includes(endpointName))),
+            );
 
             if (parsedTopic.type === 'set' && converter && usedConverters[endpointOrGroupID].includes(converter)) {
                 // Use a converter for set only once
diff --git a/package-lock.json b/package-lock.json
index 61a89ee8ac..673ba73a37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
     "packages": {
         "": {
             "name": "zigbee2mqtt",
-            "version": "1.41.0",
+            "version": "1.41.0-dev",
             "license": "GPL-3.0",
             "dependencies": {
                 "ajv": "^8.17.1",
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.7",
-                "zigbee-herdsman-converters": "20.38.0",
+                "zigbee-herdsman-converters": "20.39.2",
                 "zigbee2mqtt-frontend": "0.7.4"
             },
             "bin": {
@@ -8628,9 +8628,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.38.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.38.0.tgz",
-            "integrity": "sha512-6mIuvcSvV+jMVks8w8w87+nkHwzHRAaENGDQ3xBFlLn76bWZtHrsA/y8qnxhlDQhh+XZn5K6ttupU0UVC97mfQ==",
+            "version": "20.39.2",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.39.2.tgz",
+            "integrity": "sha512-dR5EkHRvYEtk+v+ucOTOl9F1w6xdHfjqBr28VEYnPZXXNh4YQIQ+5bIyeL8xMR4rUZ3Yr0uG89yrhQ7xP1hIUQ==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 816053a497..f428e2c268 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.7",
-        "zigbee-herdsman-converters": "20.38.0",
+        "zigbee-herdsman-converters": "20.39.2",
         "zigbee2mqtt-frontend": "0.7.4"
     },
     "devDependencies": {

From 84cc92f91a020c86d5ae3938c635512cd106cd67 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sun, 3 Nov 2024 16:00:30 +0100
Subject: [PATCH 05/46] fix(ignore): update dependencies (#24614)

---
 package-lock.json | 322 +++++++++++++++++++++++++---------------------
 package.json      |  16 +--
 2 files changed, 181 insertions(+), 157 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 673ba73a37..7f3378cdfa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
                 "source-map-support": "^0.5.21",
                 "throttleit": "^2.1.0",
                 "uri-js": "^4.4.1",
-                "winston": "^3.15.0",
+                "winston": "^3.16.0",
                 "winston-syslog": "^2.7.1",
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
@@ -45,27 +45,27 @@
                 "@babel/plugin-proposal-decorators": "^7.25.9",
                 "@babel/preset-env": "^7.26.0",
                 "@babel/preset-typescript": "^7.26.0",
-                "@eslint/core": "^0.7.0",
-                "@eslint/js": "^9.13.0",
+                "@eslint/core": "^0.8.0",
+                "@eslint/js": "^9.14.0",
                 "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
                 "@types/eslint__js": "^8.42.3",
                 "@types/finalhandler": "^1.2.3",
                 "@types/humanize-duration": "^3.27.4",
                 "@types/jest": "^29.5.14",
                 "@types/js-yaml": "^4.0.9",
-                "@types/node": "^22.8.1",
+                "@types/node": "^22.8.6",
                 "@types/object-assign-deep": "^0.4.3",
-                "@types/readable-stream": "4.0.16",
+                "@types/readable-stream": "4.0.18",
                 "@types/sd-notify": "^2.8.2",
-                "@types/ws": "8.5.12",
+                "@types/ws": "8.5.13",
                 "babel-jest": "^29.7.0",
-                "eslint": "^9.13.0",
+                "eslint": "^9.14.0",
                 "eslint-config-prettier": "^9.1.0",
                 "jest": "^29.7.0",
                 "prettier": "^3.3.3",
                 "tmp": "^0.2.3",
                 "typescript": "^5.6.3",
-                "typescript-eslint": "^8.11.0"
+                "typescript-eslint": "^8.12.2"
             },
             "engines": {
                 "node": "^18 || ^20 || ^22"
@@ -89,9 +89,9 @@
             }
         },
         "node_modules/@babel/code-frame": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.0.tgz",
-            "integrity": "sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==",
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+            "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -104,9 +104,9 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.0.tgz",
-            "integrity": "sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==",
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+            "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -155,13 +155,13 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.0.tgz",
-            "integrity": "sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==",
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+            "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.26.0",
+                "@babel/parser": "^7.26.2",
                 "@babel/types": "^7.26.0",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
@@ -495,9 +495,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.26.1",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.1.tgz",
-            "integrity": "sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==",
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
+            "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2021,9 +2021,9 @@
             }
         },
         "node_modules/@eslint-community/regexpp": {
-            "version": "4.11.2",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.2.tgz",
-            "integrity": "sha512-2WwyTYNVaMNUWPZTOJdkax9iqTdirrApgTbk+Qoq5EPX6myqZvG8QGFRgdKmkjKVG6/G/a565vpPauHk0+hpBA==",
+            "version": "4.12.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+            "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2046,9 +2046,9 @@
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz",
-            "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==",
+            "version": "0.8.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.8.0.tgz",
+            "integrity": "sha512-ncQZoR8YJtXIrBuJo1vDlIIR8+uoyYj2tRXE/RbZ3KHWYXNLcPeOgNKRBzXSZ/yQbVObVS8JGbhzvpifU+eQqw==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -2117,9 +2117,9 @@
             "license": "MIT"
         },
         "node_modules/@eslint/js": {
-            "version": "9.13.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz",
-            "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==",
+            "version": "9.14.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.14.0.tgz",
+            "integrity": "sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2137,9 +2137,9 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.1.tgz",
-            "integrity": "sha512-HFZ4Mp26nbWk9d/BpvP0YNL6W4UoZF0VFcTw/aPPA8RpOxeFQgK+ClABGgAUXs9Y/RGX/l1vOmrqz1MQt9MNuw==",
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.2.tgz",
+            "integrity": "sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -2164,9 +2164,9 @@
             }
         },
         "node_modules/@humanfs/core": {
-            "version": "0.19.0",
-            "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz",
-            "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==",
+            "version": "0.19.1",
+            "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+            "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -2174,19 +2174,33 @@
             }
         },
         "node_modules/@humanfs/node": {
-            "version": "0.16.5",
-            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz",
-            "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==",
+            "version": "0.16.6",
+            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+            "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@humanfs/core": "^0.19.0",
+                "@humanfs/core": "^0.19.1",
                 "@humanwhocodes/retry": "^0.3.0"
             },
             "engines": {
                 "node": ">=18.18.0"
             }
         },
+        "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
         "node_modules/@humanwhocodes/module-importer": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -2202,9 +2216,9 @@
             }
         },
         "node_modules/@humanwhocodes/retry": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.0.tgz",
+            "integrity": "sha512-xnRgu9DxZbkWak/te3fcytNyp8MTbuiZIaueg2rgEvBuN55n04nwLYLU9TX/VVlusc9L2ZNXi99nUFNkHXtr5g==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -3102,9 +3116,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.8.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
-            "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==",
+            "version": "22.8.6",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.6.tgz",
+            "integrity": "sha512-tosuJYKrIqjQIlVCM4PEGxOmyg3FCPa/fViuJChnGeEIhjA46oy8FMVoF9su1/v8PNs2a8Q0iFNyOx0uOF91nw==",
             "license": "MIT",
             "dependencies": {
                 "undici-types": "~6.19.8"
@@ -3118,9 +3132,9 @@
             "license": "MIT"
         },
         "node_modules/@types/readable-stream": {
-            "version": "4.0.16",
-            "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.16.tgz",
-            "integrity": "sha512-Fvp+8OcU8PyV90KTk5tR/rI8OjD3MP5NUow5rjOsZo+9zxf4p4soJtK9j4V6yeG30TH6rZxqRaP4JLa8lNNTNQ==",
+            "version": "4.0.18",
+            "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.18.tgz",
+            "integrity": "sha512-21jK/1j+Wg+7jVw1xnSwy/2Q1VgVjWuFssbYGTREPUBeZ+rqVFl2udq0IkxzPC0ZhOzVceUbyIACFZKLqKEBlA==",
             "license": "MIT",
             "dependencies": {
                 "@types/node": "*",
@@ -3148,9 +3162,9 @@
             "license": "MIT"
         },
         "node_modules/@types/ws": {
-            "version": "8.5.12",
-            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
-            "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
+            "version": "8.5.13",
+            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
+            "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
             "license": "MIT",
             "dependencies": {
                 "@types/node": "*"
@@ -3174,17 +3188,17 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.11.0.tgz",
-            "integrity": "sha512-KhGn2LjW1PJT2A/GfDpiyOfS4a8xHQv2myUagTM5+zsormOmBlYsnQ6pobJ8XxJmh6hnHwa2Mbe3fPrDJoDhbA==",
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
+            "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.11.0",
-                "@typescript-eslint/type-utils": "8.11.0",
-                "@typescript-eslint/utils": "8.11.0",
-                "@typescript-eslint/visitor-keys": "8.11.0",
+                "@typescript-eslint/scope-manager": "8.12.2",
+                "@typescript-eslint/type-utils": "8.12.2",
+                "@typescript-eslint/utils": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.12.2",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.3.1",
                 "natural-compare": "^1.4.0",
@@ -3208,16 +3222,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.11.0.tgz",
-            "integrity": "sha512-lmt73NeHdy1Q/2ul295Qy3uninSqi6wQI18XwSpm8w0ZbQXUpjCAWP1Vlv/obudoBiIjJVjlztjQ+d/Md98Yxg==",
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
+            "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.11.0",
-                "@typescript-eslint/types": "8.11.0",
-                "@typescript-eslint/typescript-estree": "8.11.0",
-                "@typescript-eslint/visitor-keys": "8.11.0",
+                "@typescript-eslint/scope-manager": "8.12.2",
+                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/typescript-estree": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.12.2",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -3237,14 +3251,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.11.0.tgz",
-            "integrity": "sha512-Uholz7tWhXmA4r6epo+vaeV7yjdKy5QFCERMjs1kMVsLRKIrSdM6o21W2He9ftp5PP6aWOVpD5zvrvuHZC0bMQ==",
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
+            "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.11.0",
-                "@typescript-eslint/visitor-keys": "8.11.0"
+                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.12.2"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3255,14 +3269,14 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.11.0.tgz",
-            "integrity": "sha512-ItiMfJS6pQU0NIKAaybBKkuVzo6IdnAhPFZA/2Mba/uBjuPQPet/8+zh5GtLHwmuFRShZx+8lhIs7/QeDHflOg==",
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz",
+            "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.11.0",
-                "@typescript-eslint/utils": "8.11.0",
+                "@typescript-eslint/typescript-estree": "8.12.2",
+                "@typescript-eslint/utils": "8.12.2",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^1.3.0"
             },
@@ -3280,9 +3294,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.11.0.tgz",
-            "integrity": "sha512-tn6sNMHf6EBAYMvmPUaKaVeYvhUsrE6x+bXQTxjQRp360h1giATU0WvgeEys1spbvb5R+VpNOZ+XJmjD8wOUHw==",
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz",
+            "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -3294,14 +3308,14 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.11.0.tgz",
-            "integrity": "sha512-yHC3s1z1RCHoCz5t06gf7jH24rr3vns08XXhfEqzYpd6Hll3z/3g23JRi0jM8A47UFKNc3u/y5KIMx8Ynbjohg==",
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz",
+            "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/types": "8.11.0",
-                "@typescript-eslint/visitor-keys": "8.11.0",
+                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.12.2",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -3349,16 +3363,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.11.0.tgz",
-            "integrity": "sha512-CYiX6WZcbXNJV7UNB4PLDIBtSdRmRI/nb0FMyqHPTQD1rMjA0foPLaPUV39C/MxkTd/QKSeX+Gb34PPsDVC35g==",
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz",
+            "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.11.0",
-                "@typescript-eslint/types": "8.11.0",
-                "@typescript-eslint/typescript-estree": "8.11.0"
+                "@typescript-eslint/scope-manager": "8.12.2",
+                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/typescript-estree": "8.12.2"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3372,13 +3386,13 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.11.0.tgz",
-            "integrity": "sha512-EaewX6lxSjRJnc+99+dqzTeoDZUfyrA52d2/HRrkI830kgovWsmIiTfmr0NZorzqic7ga+1bS60lRBUgR3n/Bw==",
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz",
+            "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.11.0",
+                "@typescript-eslint/types": "8.12.2",
                 "eslint-visitor-keys": "^3.4.3"
             },
             "engines": {
@@ -3415,9 +3429,9 @@
             }
         },
         "node_modules/acorn": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
-            "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+            "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
             "dev": true,
             "license": "MIT",
             "bin": {
@@ -3948,9 +3962,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001672",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001672.tgz",
-            "integrity": "sha512-XhW1vRo1ob6aeK2w3rTohwTPBLse/rvjq+s3RTSBwnlZqoFFjx9cHsShJjAIbLsLjyoacaTxpLZy9v3gg6zypw==",
+            "version": "1.0.30001677",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz",
+            "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==",
             "dev": true,
             "funding": [
                 {
@@ -4189,13 +4203,13 @@
             "license": "MIT"
         },
         "node_modules/core-js-compat": {
-            "version": "3.38.1",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
-            "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
+            "version": "3.39.0",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+            "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "browserslist": "^4.23.3"
+                "browserslist": "^4.24.2"
             },
             "funding": {
                 "type": "opencollective",
@@ -4378,9 +4392,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.47",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.47.tgz",
-            "integrity": "sha512-zS5Yer0MOYw4rtK2iq43cJagHZ8sXN0jDHDKzB+86gSBSAI4v07S97mcq+Gs2vclAxSh1j7vOAHxSVgduiiuVQ==",
+            "version": "1.5.50",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz",
+            "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==",
             "dev": true,
             "license": "ISC"
         },
@@ -4458,22 +4472,22 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.13.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.13.0.tgz",
-            "integrity": "sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==",
+            "version": "9.14.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.14.0.tgz",
+            "integrity": "sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
-                "@eslint-community/regexpp": "^4.11.0",
+                "@eslint-community/regexpp": "^4.12.1",
                 "@eslint/config-array": "^0.18.0",
                 "@eslint/core": "^0.7.0",
                 "@eslint/eslintrc": "^3.1.0",
-                "@eslint/js": "9.13.0",
+                "@eslint/js": "9.14.0",
                 "@eslint/plugin-kit": "^0.2.0",
-                "@humanfs/node": "^0.16.5",
+                "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
-                "@humanwhocodes/retry": "^0.3.1",
+                "@humanwhocodes/retry": "^0.4.0",
                 "@types/estree": "^1.0.6",
                 "@types/json-schema": "^7.0.15",
                 "ajv": "^6.12.4",
@@ -4481,9 +4495,9 @@
                 "cross-spawn": "^7.0.2",
                 "debug": "^4.3.2",
                 "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^8.1.0",
-                "eslint-visitor-keys": "^4.1.0",
-                "espree": "^10.2.0",
+                "eslint-scope": "^8.2.0",
+                "eslint-visitor-keys": "^4.2.0",
+                "espree": "^10.3.0",
                 "esquery": "^1.5.0",
                 "esutils": "^2.0.2",
                 "fast-deep-equal": "^3.1.3",
@@ -4532,9 +4546,9 @@
             }
         },
         "node_modules/eslint-scope": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
-            "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+            "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -4549,9 +4563,9 @@
             }
         },
         "node_modules/eslint-visitor-keys": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz",
-            "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -4561,6 +4575,16 @@
                 "url": "https://opencollective.com/eslint"
             }
         },
+        "node_modules/eslint/node_modules/@eslint/core": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz",
+            "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
         "node_modules/eslint/node_modules/ajv": {
             "version": "6.12.6",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -4635,15 +4659,15 @@
             }
         },
         "node_modules/espree": {
-            "version": "10.2.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz",
-            "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==",
+            "version": "10.3.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+            "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "acorn": "^8.12.0",
+                "acorn": "^8.14.0",
                 "acorn-jsx": "^5.3.2",
-                "eslint-visitor-keys": "^4.1.0"
+                "eslint-visitor-keys": "^4.2.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7006,9 +7030,9 @@
             }
         },
         "node_modules/path-scurry/node_modules/lru-cache": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz",
-            "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==",
+            "version": "11.0.2",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz",
+            "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==",
             "license": "ISC",
             "engines": {
                 "node": "20 || >=22"
@@ -7292,9 +7316,9 @@
             "license": "MIT"
         },
         "node_modules/regjsparser": {
-            "version": "0.11.1",
-            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz",
-            "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==",
+            "version": "0.11.2",
+            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz",
+            "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -8057,9 +8081,9 @@
             }
         },
         "node_modules/ts-api-utils": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-            "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz",
+            "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -8070,9 +8094,9 @@
             }
         },
         "node_modules/tslib": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-            "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
             "license": "0BSD"
         },
         "node_modules/type-check": {
@@ -8132,15 +8156,15 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.11.0.tgz",
-            "integrity": "sha512-cBRGnW3FSlxaYwU8KfAewxFK5uzeOAp0l2KebIlPDOT5olVi65KDG/yjBooPBG0kGW/HLkoz1c/iuBFehcS3IA==",
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.12.2.tgz",
+            "integrity": "sha512-UbuVUWSrHVR03q9CWx+JDHeO6B/Hr9p4U5lRH++5tq/EbFq1faYZe50ZSBePptgfIKLEti0aPQ3hFgnPVcd8ZQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.11.0",
-                "@typescript-eslint/parser": "8.11.0",
-                "@typescript-eslint/utils": "8.11.0"
+                "@typescript-eslint/eslint-plugin": "8.12.2",
+                "@typescript-eslint/parser": "8.12.2",
+                "@typescript-eslint/utils": "8.12.2"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8316,9 +8340,9 @@
             }
         },
         "node_modules/winston": {
-            "version": "3.15.0",
-            "resolved": "https://registry.npmjs.org/winston/-/winston-3.15.0.tgz",
-            "integrity": "sha512-RhruH2Cj0bV0WgNL+lOfoUBI4DVfdUNjVnJGVovWZmrcKtrFTTRzgXYK2O9cymSGjrERCtaAeHwMNnUWXlwZow==",
+            "version": "3.16.0",
+            "resolved": "https://registry.npmjs.org/winston/-/winston-3.16.0.tgz",
+            "integrity": "sha512-xz7+cyGN5M+4CmmD4Npq1/4T+UZaz7HaeTlAruFUTjk79CNMq+P6H30vlE4z0qfqJ01VHYQwd7OZo03nYm/+lg==",
             "license": "MIT",
             "dependencies": {
                 "@colors/colors": "^1.6.0",
diff --git a/package.json b/package.json
index f428e2c268..d83c61456c 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
         "source-map-support": "^0.5.21",
         "throttleit": "^2.1.0",
         "uri-js": "^4.4.1",
-        "winston": "^3.15.0",
+        "winston": "^3.16.0",
         "winston-syslog": "^2.7.1",
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
@@ -70,27 +70,27 @@
         "@babel/plugin-proposal-decorators": "^7.25.9",
         "@babel/preset-env": "^7.26.0",
         "@babel/preset-typescript": "^7.26.0",
-        "@eslint/core": "^0.7.0",
-        "@eslint/js": "^9.13.0",
+        "@eslint/core": "^0.8.0",
+        "@eslint/js": "^9.14.0",
         "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
         "@types/eslint__js": "^8.42.3",
         "@types/finalhandler": "^1.2.3",
         "@types/humanize-duration": "^3.27.4",
         "@types/jest": "^29.5.14",
         "@types/js-yaml": "^4.0.9",
-        "@types/node": "^22.8.1",
+        "@types/node": "^22.8.6",
         "@types/object-assign-deep": "^0.4.3",
-        "@types/readable-stream": "4.0.16",
+        "@types/readable-stream": "4.0.18",
         "@types/sd-notify": "^2.8.2",
-        "@types/ws": "8.5.12",
+        "@types/ws": "8.5.13",
         "babel-jest": "^29.7.0",
-        "eslint": "^9.13.0",
+        "eslint": "^9.14.0",
         "eslint-config-prettier": "^9.1.0",
         "jest": "^29.7.0",
         "prettier": "^3.3.3",
         "tmp": "^0.2.3",
         "typescript": "^5.6.3",
-        "typescript-eslint": "^8.11.0"
+        "typescript-eslint": "^8.12.2"
     },
     "overrides": {
         "zigbee-herdsman-converters": {

From 0c2cc10ad8fd8de1ac88566f8ca1a0d131b1055b Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Mon, 4 Nov 2024 11:56:25 +0100
Subject: [PATCH 06/46] fix(ignore): update zigbee2mqtt-frontend to 0.7.5
 (#24631)

Co-authored-by: nurikk <1525421+nurikk@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f3378cdfa..1368cb45e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.7",
                 "zigbee-herdsman-converters": "20.39.2",
-                "zigbee2mqtt-frontend": "0.7.4"
+                "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
                 "zigbee2mqtt": "cli.js"
@@ -8668,9 +8668,9 @@
             }
         },
         "node_modules/zigbee2mqtt-frontend": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.7.4.tgz",
-            "integrity": "sha512-skWNYxThSa6Ywn7aRB0ZvRKWifpqbku4+vUM5BbXiNaXYxCCbU0b3pN258Ahxt3NsLtYk2zBdYoQcXuBZxmJxw==",
+            "version": "0.7.5",
+            "resolved": "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.7.5.tgz",
+            "integrity": "sha512-CKKldVBl3aF8889MCNpWopMlHfuKAdCpVoPGKfZuntWhTdPq3kRwvBOUZkvTWotvA+Q4MEDV2BD5gnWj5Z7nWA==",
             "license": "GPL-3.0",
             "engines": {
                 "node": ">=18"
diff --git a/package.json b/package.json
index d83c61456c..c0bf9e06c9 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.7",
         "zigbee-herdsman-converters": "20.39.2",
-        "zigbee2mqtt-frontend": "0.7.4"
+        "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {
         "@babel/core": "^7.26.0",

From 87cee1aea6eace2efb31a2d30551b5ea32187e95 Mon Sep 17 00:00:00 2001
From: Boris Dolgov <boris@dolgov.name>
Date: Mon, 4 Nov 2024 20:57:25 +0100
Subject: [PATCH 07/46] fix: Replace connect-gzip-static with
 express-static-gzip to become compatible with Node 23 (#24619)

Old versions of connect-gzip-static are not compatible with node 23,
new versions of connect-gzip-static are not compatible with node 18,
but we want to support both. express-static-gzip is compatible with
all versions.
---
 lib/extension/frontend.ts           |  16 ++--
 lib/types/zigbee2mqtt-frontend.d.ts |   5 +-
 package-lock.json                   | 117 ++++++++++++----------------
 package.json                        |   5 +-
 test/frontend.test.js               |  24 ++++--
 5 files changed, 83 insertions(+), 84 deletions(-)

diff --git a/lib/extension/frontend.ts b/lib/extension/frontend.ts
index a1e057d3f5..b1a040f832 100644
--- a/lib/extension/frontend.ts
+++ b/lib/extension/frontend.ts
@@ -9,7 +9,7 @@ import {posix} from 'path';
 import {parse} from 'url';
 
 import bind from 'bind-decorator';
-import gzipStatic, {RequestHandler} from 'connect-gzip-static';
+import expressStaticGzip, {RequestHandler} from 'express-static-gzip';
 import finalhandler from 'finalhandler';
 import stringify from 'json-stable-stringify-without-jsonify';
 import WebSocket from 'ws';
@@ -73,13 +73,16 @@ export default class Frontend extends Extension {
     override async start(): Promise<void> {
         /* istanbul ignore next */
         const options = {
-            setHeaders: (res: ServerResponse, path: string): void => {
-                if (path.endsWith('index.html')) {
-                    res.setHeader('Cache-Control', 'no-store');
-                }
+            enableBrotli: true,
+            serveStatic: {
+                setHeaders: (res: ServerResponse, path: string): void => {
+                    if (path.endsWith('index.html')) {
+                        res.setHeader('Cache-Control', 'no-store');
+                    }
+                },
             },
         };
-        this.fileServer = gzipStatic(frontend.getPath(), options);
+        this.fileServer = expressStaticGzip(frontend.getPath(), options);
         this.wss = new WebSocket.Server({noServer: true, path: posix.join(this.baseUrl, 'api')});
 
         this.wss.on('connection', this.onWebSocketConnection);
@@ -133,6 +136,7 @@ export default class Frontend extends Extension {
         // This is necessary for the browser to resolve relative assets paths correctly.
         request.originalUrl = request.url;
         request.url = '/' + newUrl;
+        request.path = request.url;
 
         this.fileServer(request, response, fin);
     }
diff --git a/lib/types/zigbee2mqtt-frontend.d.ts b/lib/types/zigbee2mqtt-frontend.d.ts
index fff7b51d29..a38c2f128f 100644
--- a/lib/types/zigbee2mqtt-frontend.d.ts
+++ b/lib/types/zigbee2mqtt-frontend.d.ts
@@ -5,11 +5,12 @@ declare module 'zigbee2mqtt-frontend' {
 declare module 'http' {
     interface IncomingMessage {
         originalUrl?: string;
+        path?: string;
     }
 }
 
-declare module 'connect-gzip-static' {
+declare module 'express-static-gzip' {
     import {IncomingMessage, ServerResponse} from 'http';
     export type RequestHandler = (req: IncomingMessage, res: ServerResponse, finalhandler: (err: unknown) => void) => void;
-    export default function gzipStatic(root: string, options?: Record<string, unknown>): RequestHandler;
+    export default function expressStaticGzip(root: string, options?: Record<string, unknown>): RequestHandler;
 }
diff --git a/package-lock.json b/package-lock.json
index 1368cb45e9..bd0da0dfcc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,8 +11,8 @@
             "dependencies": {
                 "ajv": "^8.17.1",
                 "bind-decorator": "^1.0.11",
-                "connect-gzip-static": "3.0.1",
                 "debounce": "^2.2.0",
+                "express-static-gzip": "^2.1.8",
                 "fast-deep-equal": "^3.1.3",
                 "finalhandler": "^1.3.1",
                 "git-last-commit": "^1.0.1",
@@ -57,6 +57,7 @@
                 "@types/object-assign-deep": "^0.4.3",
                 "@types/readable-stream": "4.0.18",
                 "@types/sd-notify": "^2.8.2",
+                "@types/serve-static": "^1.15.7",
                 "@types/ws": "8.5.13",
                 "babel-jest": "^29.7.0",
                 "eslint": "^9.14.0",
@@ -68,7 +69,7 @@
                 "typescript-eslint": "^8.12.2"
             },
             "engines": {
-                "node": "^18 || ^20 || ^22"
+                "node": "^18 || ^20 || ^22 || ^23"
             },
             "optionalDependencies": {
                 "sd-notify": "^2.8.0"
@@ -2149,20 +2150,6 @@
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
-        "node_modules/@folder/readdir": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@folder/readdir/-/readdir-3.1.0.tgz",
-            "integrity": "sha512-mqkVdQ77BcCOWur/dxoPxjJS2eJg8Eqqx1Dgdc/qbTeGI5UMPDLmT0peGEjxLdlnD9SvhMnpJuiyaYl2btdT6A==",
-            "funding": [
-                "https://github.com/sponsors/jonschlinkert",
-                "https://paypal.me/jonathanschlinkert",
-                "https://jonschlinkert.dev/sponsor"
-            ],
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/@humanfs/core": {
             "version": "0.19.1",
             "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -3056,6 +3043,13 @@
                 "@types/node": "*"
             }
         },
+        "node_modules/@types/http-errors": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+            "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@types/humanize-duration": {
             "version": "3.27.4",
             "resolved": "https://registry.npmjs.org/@types/humanize-duration/-/humanize-duration-3.27.4.tgz",
@@ -3115,6 +3109,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@types/mime": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+            "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@types/node": {
             "version": "22.8.6",
             "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.6.tgz",
@@ -3148,6 +3149,29 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@types/send": {
+            "version": "0.17.4",
+            "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+            "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/mime": "^1",
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/serve-static": {
+            "version": "1.15.7",
+            "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+            "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/http-errors": "*",
+                "@types/node": "*",
+                "@types/send": "*"
+            }
+        },
         "node_modules/@types/stack-utils": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
@@ -4182,19 +4206,6 @@
                 "node": ">= 6"
             }
         },
-        "node_modules/connect-gzip-static": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/connect-gzip-static/-/connect-gzip-static-3.0.1.tgz",
-            "integrity": "sha512-VVqi1fJ4uZK8aIrb1BN9n7tsRAbc3BhkIo/mz1VuNhYC2KDuP1ZgCDapjYIfT3mcGgWzyUr04kv7nmnGOnCvWg==",
-            "license": "MIT",
-            "dependencies": {
-                "@folder/readdir": "^3.1.0",
-                "debug": "~2||~3||~4",
-                "parseurl": "~1",
-                "send": "~0",
-                "serve-static": "~1"
-            }
-        },
         "node_modules/convert-source-map": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
@@ -4813,6 +4824,15 @@
                 "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
+        "node_modules/express-static-gzip": {
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.8.tgz",
+            "integrity": "sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==",
+            "license": "MIT",
+            "dependencies": {
+                "serve-static": "^1.16.2"
+            }
+        },
         "node_modules/fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -7563,45 +7583,6 @@
                 "node": ">=10"
             }
         },
-        "node_modules/send": {
-            "version": "0.19.1",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.19.1.tgz",
-            "integrity": "sha512-p4rRk4f23ynFEfcD9LA0xRYngj+IyGiEYyqqOak8kaN0TvNmuxC2dcVeBn62GpCeR2CpWqyHCNScTP91QbAVFg==",
-            "license": "MIT",
-            "dependencies": {
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "destroy": "1.2.0",
-                "encodeurl": "~2.0.0",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "http-errors": "2.0.0",
-                "mime": "1.6.0",
-                "ms": "2.1.3",
-                "on-finished": "2.4.1",
-                "range-parser": "~1.2.1",
-                "statuses": "2.0.1"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/send/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "license": "MIT",
-            "dependencies": {
-                "ms": "2.0.0"
-            }
-        },
-        "node_modules/send/node_modules/debug/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-            "license": "MIT"
-        },
         "node_modules/serve-static": {
             "version": "1.16.2",
             "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
diff --git a/package.json b/package.json
index c0bf9e06c9..43a3847d5f 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
         "url": "git+https://github.com/Koenkk/zigbee2mqtt.git"
     },
     "engines": {
-        "node": "^18 || ^20 || ^22"
+        "node": "^18 || ^20 || ^22 || ^23"
     },
     "keywords": [
         "xiaomi",
@@ -39,8 +39,8 @@
     "dependencies": {
         "ajv": "^8.17.1",
         "bind-decorator": "^1.0.11",
-        "connect-gzip-static": "3.0.1",
         "debounce": "^2.2.0",
+        "express-static-gzip": "^2.1.8",
         "fast-deep-equal": "^3.1.3",
         "finalhandler": "^1.3.1",
         "git-last-commit": "^1.0.1",
@@ -82,6 +82,7 @@
         "@types/object-assign-deep": "^0.4.3",
         "@types/readable-stream": "4.0.18",
         "@types/sd-notify": "^2.8.2",
+        "@types/serve-static": "^1.15.7",
         "@types/ws": "8.5.13",
         "babel-jest": "^29.7.0",
         "eslint": "^9.14.0",
diff --git a/test/frontend.test.js b/test/frontend.test.js
index 6a13c6de3a..e7321b3e81 100644
--- a/test/frontend.test.js
+++ b/test/frontend.test.js
@@ -86,7 +86,7 @@ jest.mock('https', () => ({
     Agent: jest.fn(),
 }));
 
-jest.mock('connect-gzip-static', () =>
+jest.mock('express-static-gzip', () =>
     jest.fn().mockImplementation((path) => {
         mockNodeStatic.variables.path = path;
         return mockNodeStatic.implementation;
@@ -321,7 +321,11 @@ describe('Frontend', () => {
 
         mockHTTP.variables.onRequest({url: '/file.txt'}, 2);
         expect(mockNodeStatic.implementation).toHaveBeenCalledTimes(1);
-        expect(mockNodeStatic.implementation).toHaveBeenCalledWith({originalUrl: '/file.txt', url: '/file.txt'}, 2, expect.any(Function));
+        expect(mockNodeStatic.implementation).toHaveBeenCalledWith(
+            {originalUrl: '/file.txt', url: '/file.txt', path: '/file.txt'},
+            2,
+            expect.any(Function),
+        );
     });
 
     it('Static server', async () => {
@@ -367,14 +371,18 @@ describe('Frontend', () => {
 
         mockHTTP.variables.onRequest({url: '/z2m'}, 2);
         expect(mockNodeStatic.implementation).toHaveBeenCalledTimes(1);
-        expect(mockNodeStatic.implementation).toHaveBeenCalledWith({originalUrl: '/z2m', url: '/'}, 2, expect.any(Function));
+        expect(mockNodeStatic.implementation).toHaveBeenCalledWith({originalUrl: '/z2m', url: '/', path: '/'}, 2, expect.any(Function));
         expect(mockFinalHandler.implementation).not.toHaveBeenCalledWith();
 
         mockNodeStatic.implementation.mockReset();
         expect(mockFinalHandler.implementation).not.toHaveBeenCalledWith();
         mockHTTP.variables.onRequest({url: '/z2m/file.txt'}, 2);
         expect(mockNodeStatic.implementation).toHaveBeenCalledTimes(1);
-        expect(mockNodeStatic.implementation).toHaveBeenCalledWith({originalUrl: '/z2m/file.txt', url: '/file.txt'}, 2, expect.any(Function));
+        expect(mockNodeStatic.implementation).toHaveBeenCalledWith(
+            {originalUrl: '/z2m/file.txt', url: '/file.txt', path: '/file.txt'},
+            2,
+            expect.any(Function),
+        );
         expect(mockFinalHandler.implementation).not.toHaveBeenCalledWith();
 
         mockNodeStatic.implementation.mockReset();
@@ -393,7 +401,11 @@ describe('Frontend', () => {
 
         mockHTTP.variables.onRequest({url: '/z2m-more++/c0mplex.url'}, 2);
         expect(mockNodeStatic.implementation).toHaveBeenCalledTimes(1);
-        expect(mockNodeStatic.implementation).toHaveBeenCalledWith({originalUrl: '/z2m-more++/c0mplex.url', url: '/'}, 2, expect.any(Function));
+        expect(mockNodeStatic.implementation).toHaveBeenCalledWith(
+            {originalUrl: '/z2m-more++/c0mplex.url', url: '/', path: '/'},
+            2,
+            expect.any(Function),
+        );
         expect(mockFinalHandler.implementation).not.toHaveBeenCalledWith();
 
         mockNodeStatic.implementation.mockReset();
@@ -401,7 +413,7 @@ describe('Frontend', () => {
         mockHTTP.variables.onRequest({url: '/z2m-more++/c0mplex.url/file.txt'}, 2);
         expect(mockNodeStatic.implementation).toHaveBeenCalledTimes(1);
         expect(mockNodeStatic.implementation).toHaveBeenCalledWith(
-            {originalUrl: '/z2m-more++/c0mplex.url/file.txt', url: '/file.txt'},
+            {originalUrl: '/z2m-more++/c0mplex.url/file.txt', url: '/file.txt', path: '/file.txt'},
             2,
             expect.any(Function),
         );

From 1558a5d8ace136ac1469f34502901d368603cbd1 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Mon, 4 Nov 2024 22:07:13 +0100
Subject: [PATCH 08/46] fix(ignore): update zigbee-herdsman-converters to
 20.40.0 (#24644)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bd0da0dfcc..eded26f5da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.7",
-                "zigbee-herdsman-converters": "20.39.2",
+                "zigbee-herdsman-converters": "20.40.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8633,9 +8633,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.39.2",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.39.2.tgz",
-            "integrity": "sha512-dR5EkHRvYEtk+v+ucOTOl9F1w6xdHfjqBr28VEYnPZXXNh4YQIQ+5bIyeL8xMR4rUZ3Yr0uG89yrhQ7xP1hIUQ==",
+            "version": "20.40.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.40.0.tgz",
+            "integrity": "sha512-GHETMc4FdOhal7RaVOehxRsQp1YGTxDmHrD62dAqlVCt5yXkk97NTZb2jMV8ysBIkYyH5u1jF4rh5R9TQjxiEw==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 43a3847d5f..a29e169151 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.7",
-        "zigbee-herdsman-converters": "20.39.2",
+        "zigbee-herdsman-converters": "20.40.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From f2e5d59c3582ec12e1717c9c28520d54c593dd0e Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Tue, 5 Nov 2024 22:16:36 +0100
Subject: [PATCH 09/46] fix(ignore): update zigbee-herdsman-converters to
 20.41.0 (#24656)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eded26f5da..0146a6ab37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.7",
-                "zigbee-herdsman-converters": "20.40.0",
+                "zigbee-herdsman-converters": "20.41.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8633,9 +8633,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.40.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.40.0.tgz",
-            "integrity": "sha512-GHETMc4FdOhal7RaVOehxRsQp1YGTxDmHrD62dAqlVCt5yXkk97NTZb2jMV8ysBIkYyH5u1jF4rh5R9TQjxiEw==",
+            "version": "20.41.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.41.0.tgz",
+            "integrity": "sha512-bAl+zXSxTCkrWz+0Vh63Br2b9vrQn8X24C7V0nKLJ03/HN7N+bUtk40crq0iIhuTu3XVT2/BNRahLMT4YDNU1Q==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index a29e169151..b8b174f198 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.7",
-        "zigbee-herdsman-converters": "20.40.0",
+        "zigbee-herdsman-converters": "20.41.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 7267d27779c854a216279b28b27551310b9cee97 Mon Sep 17 00:00:00 2001
From: Boris Dolgov <boris@dolgov.name>
Date: Wed, 6 Nov 2024 21:11:02 +0100
Subject: [PATCH 10/46] fix: Temporarily disable serving compressed index file.
 (#24657)

express-static-gzip does not handle redirects with custom base URLs
properly. As index.html file is only 5KB, compression is not critical
for it.
---
 lib/extension/frontend.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/extension/frontend.ts b/lib/extension/frontend.ts
index b1a040f832..20ad3f107b 100644
--- a/lib/extension/frontend.ts
+++ b/lib/extension/frontend.ts
@@ -74,7 +74,10 @@ export default class Frontend extends Extension {
         /* istanbul ignore next */
         const options = {
             enableBrotli: true,
+            // TODO: https://github.com/Koenkk/zigbee2mqtt/issues/24654 - enable compressed index serving when express-static-gzip is fixed.
+            index: false,
             serveStatic: {
+                index: 'index.html',
                 setHeaders: (res: ServerResponse, path: string): void => {
                     if (path.endsWith('index.html')) {
                         res.setHeader('Cache-Control', 'no-store');

From b5d4a253b4ef5b4930f8d84e878e2343cc0b38df Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 6 Nov 2024 21:47:04 +0100
Subject: [PATCH 11/46] fix(ignore): update zigbee-herdsman-converters to
 20.42.0 (#24666)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0146a6ab37..7fdc1c89cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.7",
-                "zigbee-herdsman-converters": "20.41.0",
+                "zigbee-herdsman-converters": "20.42.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8633,9 +8633,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.41.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.41.0.tgz",
-            "integrity": "sha512-bAl+zXSxTCkrWz+0Vh63Br2b9vrQn8X24C7V0nKLJ03/HN7N+bUtk40crq0iIhuTu3XVT2/BNRahLMT4YDNU1Q==",
+            "version": "20.42.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.42.0.tgz",
+            "integrity": "sha512-A7OGXxkvc8HGblP+brYSetwf5fH/Huo0/5mvqTSewaNBWQE01x+eTM4QXadFmLcvQpFAbp8+Ml58Y4THyFY0qA==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index b8b174f198..7ec0af6c92 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.7",
-        "zigbee-herdsman-converters": "20.41.0",
+        "zigbee-herdsman-converters": "20.42.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From a353acc8e3e98bf9ea3a935c1ee179aed335ff58 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 7 Nov 2024 20:53:05 +0100
Subject: [PATCH 12/46] fix(ignore): update zigbee-herdsman-converters to
 20.43.0 (#24680)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7fdc1c89cd..d587db243f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.7",
-                "zigbee-herdsman-converters": "20.42.0",
+                "zigbee-herdsman-converters": "20.43.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8633,9 +8633,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.42.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.42.0.tgz",
-            "integrity": "sha512-A7OGXxkvc8HGblP+brYSetwf5fH/Huo0/5mvqTSewaNBWQE01x+eTM4QXadFmLcvQpFAbp8+Ml58Y4THyFY0qA==",
+            "version": "20.43.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.43.0.tgz",
+            "integrity": "sha512-Ee04thsRBx5w97YtLuYc0anryVzBAtotW6Uz4VdByD/4YztKrHiSSs1z1VxjP3KObjkeAuQ+R5RdjG9t1Yyn/g==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 7ec0af6c92..733d46951a 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.7",
-        "zigbee-herdsman-converters": "20.42.0",
+        "zigbee-herdsman-converters": "20.43.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 928635f1daea6e3e80afc30ff1eca3bc83de7f97 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sun, 10 Nov 2024 15:11:17 +0100
Subject: [PATCH 13/46] fix(ignore): update dependencies (#24702)

---
 package-lock.json | 211 +++++++++++++++++++++++-----------------------
 package.json      |   6 +-
 2 files changed, 108 insertions(+), 109 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d587db243f..cf0246933a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -47,13 +47,13 @@
                 "@babel/preset-typescript": "^7.26.0",
                 "@eslint/core": "^0.8.0",
                 "@eslint/js": "^9.14.0",
-                "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
+                "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
                 "@types/eslint__js": "^8.42.3",
                 "@types/finalhandler": "^1.2.3",
                 "@types/humanize-duration": "^3.27.4",
                 "@types/jest": "^29.5.14",
                 "@types/js-yaml": "^4.0.9",
-                "@types/node": "^22.8.6",
+                "@types/node": "^22.9.0",
                 "@types/object-assign-deep": "^0.4.3",
                 "@types/readable-stream": "4.0.18",
                 "@types/sd-notify": "^2.8.2",
@@ -66,7 +66,7 @@
                 "prettier": "^3.3.3",
                 "tmp": "^0.2.3",
                 "typescript": "^5.6.3",
-                "typescript-eslint": "^8.12.2"
+                "typescript-eslint": "^8.13.0"
             },
             "engines": {
                 "node": "^18 || ^20 || ^22 || ^23"
@@ -2203,9 +2203,9 @@
             }
         },
         "node_modules/@humanwhocodes/retry": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.0.tgz",
-            "integrity": "sha512-xnRgu9DxZbkWak/te3fcytNyp8MTbuiZIaueg2rgEvBuN55n04nwLYLU9TX/VVlusc9L2ZNXi99nUFNkHXtr5g==",
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
+            "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -2217,17 +2217,16 @@
             }
         },
         "node_modules/@ianvs/prettier-plugin-sort-imports": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.3.1.tgz",
-            "integrity": "sha512-ZHwbyjkANZOjaBm3ZosADD2OUYGFzQGxfy67HmGZU94mHqe7g1LCMA7YYKB1Cq+UTPCBqlAYapY0KXAjKEw8Sg==",
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.4.0.tgz",
+            "integrity": "sha512-f4/e+/ANGk3tHuwRW0uh2YuBR50I4h1ZjGQ+5uD8sWfinHTivQsnieR5cz24t8M6Vx4rYvZ5v/IEKZhYpzQm9Q==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@babel/core": "^7.24.0",
-                "@babel/generator": "^7.23.6",
-                "@babel/parser": "^7.24.0",
-                "@babel/traverse": "^7.24.0",
-                "@babel/types": "^7.24.0",
+                "@babel/generator": "^7.26.2",
+                "@babel/parser": "^7.26.2",
+                "@babel/traverse": "^7.25.9",
+                "@babel/types": "^7.26.0",
                 "semver": "^7.5.2"
             },
             "peerDependencies": {
@@ -3117,9 +3116,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.8.6",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.6.tgz",
-            "integrity": "sha512-tosuJYKrIqjQIlVCM4PEGxOmyg3FCPa/fViuJChnGeEIhjA46oy8FMVoF9su1/v8PNs2a8Q0iFNyOx0uOF91nw==",
+            "version": "22.9.0",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
+            "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
             "license": "MIT",
             "dependencies": {
                 "undici-types": "~6.19.8"
@@ -3212,17 +3211,17 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.12.2",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
-            "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.13.0.tgz",
+            "integrity": "sha512-nQtBLiZYMUPkclSeC3id+x4uVd1SGtHuElTxL++SfP47jR0zfkZBJHc+gL4qPsgTuypz0k8Y2GheaDYn6Gy3rg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.12.2",
-                "@typescript-eslint/type-utils": "8.12.2",
-                "@typescript-eslint/utils": "8.12.2",
-                "@typescript-eslint/visitor-keys": "8.12.2",
+                "@typescript-eslint/scope-manager": "8.13.0",
+                "@typescript-eslint/type-utils": "8.13.0",
+                "@typescript-eslint/utils": "8.13.0",
+                "@typescript-eslint/visitor-keys": "8.13.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.3.1",
                 "natural-compare": "^1.4.0",
@@ -3246,16 +3245,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.12.2",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
-            "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.13.0.tgz",
+            "integrity": "sha512-w0xp+xGg8u/nONcGw1UXAr6cjCPU1w0XVyBs6Zqaj5eLmxkKQAByTdV/uGgNN5tVvN/kKpoQlP2cL7R+ajZZIQ==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.12.2",
-                "@typescript-eslint/types": "8.12.2",
-                "@typescript-eslint/typescript-estree": "8.12.2",
-                "@typescript-eslint/visitor-keys": "8.12.2",
+                "@typescript-eslint/scope-manager": "8.13.0",
+                "@typescript-eslint/types": "8.13.0",
+                "@typescript-eslint/typescript-estree": "8.13.0",
+                "@typescript-eslint/visitor-keys": "8.13.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -3275,14 +3274,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.12.2",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
-            "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.13.0.tgz",
+            "integrity": "sha512-XsGWww0odcUT0gJoBZ1DeulY1+jkaHUciUq4jKNv4cpInbvvrtDoyBH9rE/n2V29wQJPk8iCH1wipra9BhmiMA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.12.2",
-                "@typescript-eslint/visitor-keys": "8.12.2"
+                "@typescript-eslint/types": "8.13.0",
+                "@typescript-eslint/visitor-keys": "8.13.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3293,14 +3292,14 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.12.2",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz",
-            "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.13.0.tgz",
+            "integrity": "sha512-Rqnn6xXTR316fP4D2pohZenJnp+NwQ1mo7/JM+J1LWZENSLkJI8ID8QNtlvFeb0HnFSK94D6q0cnMX6SbE5/vA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.12.2",
-                "@typescript-eslint/utils": "8.12.2",
+                "@typescript-eslint/typescript-estree": "8.13.0",
+                "@typescript-eslint/utils": "8.13.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^1.3.0"
             },
@@ -3318,9 +3317,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.12.2",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz",
-            "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",
+            "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -3332,14 +3331,14 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.12.2",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz",
-            "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.13.0.tgz",
+            "integrity": "sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/types": "8.12.2",
-                "@typescript-eslint/visitor-keys": "8.12.2",
+                "@typescript-eslint/types": "8.13.0",
+                "@typescript-eslint/visitor-keys": "8.13.0",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -3387,16 +3386,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.12.2",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz",
-            "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.13.0.tgz",
+            "integrity": "sha512-A1EeYOND6Uv250nybnLZapeXpYMl8tkzYUxqmoKAWnI4sei3ihf2XdZVd+vVOmHGcp3t+P7yRrNsyyiXTvShFQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.12.2",
-                "@typescript-eslint/types": "8.12.2",
-                "@typescript-eslint/typescript-estree": "8.12.2"
+                "@typescript-eslint/scope-manager": "8.13.0",
+                "@typescript-eslint/types": "8.13.0",
+                "@typescript-eslint/typescript-estree": "8.13.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3410,13 +3409,13 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.12.2",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz",
-            "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.13.0.tgz",
+            "integrity": "sha512-7N/+lztJqH4Mrf0lb10R/CbI1EaAMMGyF5y0oJvFoAhafwgiRA7TXyd8TFn8FC8k5y2dTsYogg238qavRGNnlw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/types": "8.13.0",
                 "eslint-visitor-keys": "^3.4.3"
             },
             "engines": {
@@ -3986,9 +3985,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001677",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz",
-            "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==",
+            "version": "1.0.30001679",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz",
+            "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==",
             "dev": true,
             "funding": [
                 {
@@ -4256,9 +4255,9 @@
             }
         },
         "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "version": "7.0.5",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
+            "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
             "license": "MIT",
             "dependencies": {
                 "path-key": "^3.1.0",
@@ -4403,9 +4402,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.50",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz",
-            "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==",
+            "version": "1.5.55",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz",
+            "integrity": "sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg==",
             "dev": true,
             "license": "ISC"
         },
@@ -7583,37 +7582,7 @@
                 "node": ">=10"
             }
         },
-        "node_modules/serve-static": {
-            "version": "1.16.2",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
-            "license": "MIT",
-            "dependencies": {
-                "encodeurl": "~2.0.0",
-                "escape-html": "~1.0.3",
-                "parseurl": "~1.3.3",
-                "send": "0.19.0"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/serve-static/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "license": "MIT",
-            "dependencies": {
-                "ms": "2.0.0"
-            }
-        },
-        "node_modules/serve-static/node_modules/debug/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-            "license": "MIT"
-        },
-        "node_modules/serve-static/node_modules/send": {
+        "node_modules/send": {
             "version": "0.19.0",
             "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
             "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
@@ -7637,7 +7606,22 @@
                 "node": ">= 0.8.0"
             }
         },
-        "node_modules/serve-static/node_modules/send/node_modules/encodeurl": {
+        "node_modules/send/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/send/node_modules/debug/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "license": "MIT"
+        },
+        "node_modules/send/node_modules/encodeurl": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
             "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
@@ -7646,6 +7630,21 @@
                 "node": ">= 0.8"
             }
         },
+        "node_modules/serve-static": {
+            "version": "1.16.2",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+            "license": "MIT",
+            "dependencies": {
+                "encodeurl": "~2.0.0",
+                "escape-html": "~1.0.3",
+                "parseurl": "~1.3.3",
+                "send": "0.19.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
         "node_modules/setimmediate": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
@@ -8137,15 +8136,15 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.12.2",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.12.2.tgz",
-            "integrity": "sha512-UbuVUWSrHVR03q9CWx+JDHeO6B/Hr9p4U5lRH++5tq/EbFq1faYZe50ZSBePptgfIKLEti0aPQ3hFgnPVcd8ZQ==",
+            "version": "8.13.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.13.0.tgz",
+            "integrity": "sha512-vIMpDRJrQd70au2G8w34mPps0ezFSPMEX4pXkTzUkrNbRX+36ais2ksGWN0esZL+ZMaFJEneOBHzCgSqle7DHw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.12.2",
-                "@typescript-eslint/parser": "8.12.2",
-                "@typescript-eslint/utils": "8.12.2"
+                "@typescript-eslint/eslint-plugin": "8.13.0",
+                "@typescript-eslint/parser": "8.13.0",
+                "@typescript-eslint/utils": "8.13.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/package.json b/package.json
index 733d46951a..bf8c181976 100644
--- a/package.json
+++ b/package.json
@@ -72,13 +72,13 @@
         "@babel/preset-typescript": "^7.26.0",
         "@eslint/core": "^0.8.0",
         "@eslint/js": "^9.14.0",
-        "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
+        "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
         "@types/eslint__js": "^8.42.3",
         "@types/finalhandler": "^1.2.3",
         "@types/humanize-duration": "^3.27.4",
         "@types/jest": "^29.5.14",
         "@types/js-yaml": "^4.0.9",
-        "@types/node": "^22.8.6",
+        "@types/node": "^22.9.0",
         "@types/object-assign-deep": "^0.4.3",
         "@types/readable-stream": "4.0.18",
         "@types/sd-notify": "^2.8.2",
@@ -91,7 +91,7 @@
         "prettier": "^3.3.3",
         "tmp": "^0.2.3",
         "typescript": "^5.6.3",
-        "typescript-eslint": "^8.12.2"
+        "typescript-eslint": "^8.13.0"
     },
     "overrides": {
         "zigbee-herdsman-converters": {

From 32e2637594add5c6fa8f8bfccc28b0f759a5d873 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sun, 10 Nov 2024 20:39:18 +0100
Subject: [PATCH 14/46] fix(ignore): update zigbee-herdsman-converters to
 20.44.0 (#24715)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cf0246933a..8d2d345d67 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.7",
-                "zigbee-herdsman-converters": "20.43.0",
+                "zigbee-herdsman-converters": "20.44.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8632,9 +8632,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.43.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.43.0.tgz",
-            "integrity": "sha512-Ee04thsRBx5w97YtLuYc0anryVzBAtotW6Uz4VdByD/4YztKrHiSSs1z1VxjP3KObjkeAuQ+R5RdjG9t1Yyn/g==",
+            "version": "20.44.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.44.0.tgz",
+            "integrity": "sha512-UO5o/hZ3+vCegcpPMuITvSK1VIMtz4eYOjNNiFtJGp4kLJKhEcgcvjWn3IxDv1k/ReK1fFFuAPmFklPolhxKHQ==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index bf8c181976..94d4a70c40 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.7",
-        "zigbee-herdsman-converters": "20.43.0",
+        "zigbee-herdsman-converters": "20.44.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 22e13c52b96152a24d735791c313b8c6c2cf68e7 Mon Sep 17 00:00:00 2001
From: Der Mundschenk & Compagnie <mundschenk-at@users.noreply.github.com>
Date: Mon, 11 Nov 2024 21:10:20 +0100
Subject: [PATCH 15/46] fix: Home Assistant `event` entities, part 2 (#24717)

* Add Philips Hue Tap dial rotation

* Add support for Hue Tap buttons

* Refactor action parsing
---
 lib/extension/homeassistant.ts | 109 ++++++++++++++++++++-------------
 test/homeassistant.test.js     |   9 ++-
 2 files changed, 75 insertions(+), 43 deletions(-)

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index a80b42318a..3d8febd529 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -36,9 +36,13 @@ interface ActionData {
     region?: string;
 }
 
-const ACTION_BUTTON_PATTERN: string = '^(?<button>[a-z]+)_(?<action>(?:press|hold)(?:_release)?)$';
-const ACTION_SCENE_PATTERN: string = '^(?<action>recall|scene)_(?<scene>[0-2][0-9]{0,2})$';
-const ACTION_REGION_PATTERN: string = '^region_(?<region>[1-9]|10)_(?<action>enter|leave|occupied|unoccupied)$';
+const ACTION_PATTERNS: string[] = [
+    '^(?<button>(?:button_)?[a-z0-9]+)_(?<action>(?:press|hold)(?:_release)?)$',
+    '^(?<action>recall|scene)_(?<scene>[0-2][0-9]{0,2})$',
+    '^(?<actionPrefix>region_)(?<region>[1-9]|10)_(?<action>enter|leave|occupied|unoccupied)$',
+    '^(?<action>dial_rotate)_(?<direction>left|right)_(?<speed>step|slow|fast)$',
+    '^(?<action>brightness_step)(?:_(?<direction>up|down))?$',
+];
 
 const SENSOR_CLICK: Readonly<DiscoveryEntry> = {
     type: 'sensor',
@@ -455,6 +459,7 @@ export default class HomeAssistant extends Extension {
     private bridge: Bridge;
     // @ts-expect-error initialized in `start`
     private bridgeIdentifier: string;
+    private actionValueTemplate: string;
 
     constructor(
         zigbee: Zigbee,
@@ -482,6 +487,8 @@ export default class HomeAssistant extends Extension {
         if (haSettings.discovery_topic === settings.get().mqtt.base_topic) {
             throw new Error(`'homeassistant.discovery_topic' cannot not be equal to the 'mqtt.base_topic' (got '${settings.get().mqtt.base_topic}')`);
         }
+
+        this.actionValueTemplate = this.getActionValueTemplate();
     }
 
     override async start(): Promise<void> {
@@ -1177,22 +1184,7 @@ export default class HomeAssistant extends Extension {
                             name: endpoint ? /* istanbul ignore next */ `${firstExpose.label} ${endpoint}` : firstExpose.label,
                             state_topic: true,
                             event_types: this.prepareActionEventTypes(firstExpose.values),
-
-                            // TODO: Implement parsing for all event types.
-                            value_template:
-                                `{%- set buttons = value_json.action|regex_findall_index(${ACTION_BUTTON_PATTERN.replaceAll(/\?<([a-z]+)>/g, '?P<$1>')}) -%}` +
-                                `{%- set scenes = value_json.action|regex_findall_index(${ACTION_SCENE_PATTERN.replaceAll(/\?<([a-z]+)>/g, '?P<$1>')}) -%}` +
-                                `{%- set regions = value_json.action|regex_findall_index(${ACTION_REGION_PATTERN.replaceAll(/\?<([a-z]+)>/g, '?P<$1>')}) -%}` +
-                                `{%- if buttons -%}\n` +
-                                `   {%- set d = dict(event_type = "{{buttons[1]}}", button = "{{buttons[0]}}_button" -%}\n` +
-                                `{%- elif scenes -%}\n` +
-                                `   {%- set d = dict(event_type = "{{scenes[0]}}", scene = "{{scenes[1]}}" -%}\n` +
-                                `{%- elif regions -%}\n` +
-                                `   {%- set d = dict(event_type = "region_{{regions[1]}}", region = "{{regions[0]}}" -%}\n` +
-                                `{%- else -%}\n` +
-                                `   {%- set d = dict(event_type = "{{value_json.action}}" ) -%}\n` +
-                                `{%- endif -%}\n` +
-                                `{{d|to_json}}`,
+                            value_template: this.actionValueTemplate,
                             ...ENUM_DISCOVERY_LOOKUP[firstExpose.name],
                         },
                     });
@@ -2224,39 +2216,74 @@ export default class HomeAssistant extends Extension {
     }
 
     private parseActionValue(action: string): ActionData {
-        const buttons = action.match(ACTION_BUTTON_PATTERN);
-        if (buttons?.groups?.action) {
-            //console.log('Recognized button actions', buttons.groups);
-            return {...buttons.groups, action: buttons.groups.action};
+        // Handle standard actions.
+        for (const p of ACTION_PATTERNS) {
+            const m = action.match(p);
+            if (m?.groups?.action) {
+                return this.buildAction(m.groups);
+            }
         }
 
-        const scenes = action.match(ACTION_SCENE_PATTERN);
-        if (scenes?.groups?.action) {
-            //console.log('Recognized scene actions', scenes.groups);
-            return {...scenes.groups, action: scenes.groups.action};
+        // Handle wildcard actions.
+        let m = action.match(/^(?<action>recall|scene)_\*(?:_(?<endpoint>e1|e2|s1|s2))?$/);
+        if (m?.groups?.action) {
+            logger.debug('Found scene wildcard action ' + m.groups.action);
+            return this.buildAction(m.groups, {scene: 'wildcard'});
         }
 
-        const regions = action.match(ACTION_REGION_PATTERN);
-        if (regions?.groups?.action) {
-            return {...regions.groups, action: 'region_' + regions.groups.action};
+        m = action.match(/^(?<actionPrefix>region_)\*_(?<action>enter|leave|occupied|unoccupied)$/);
+        if (m?.groups?.action) {
+            logger.debug('Found region wildcard action ' + m.groups.action);
+            return this.buildAction(m.groups, {region: 'wildcard'});
         }
 
-        const sceneWildcard = action.match(/^(?<action>recall|scene)_\*$/);
-        if (sceneWildcard?.groups?.action) {
-            logger.debug('Found scene wildcard action ' + sceneWildcard.groups.action);
-            return {action: sceneWildcard.groups.action, scene: 'wildcard'};
-        }
+        // If nothing matches, keep the plain action value.
+        return {action};
+    }
 
-        const regionWildcard = action.match(/^region_\*_(?<action>enter|leave|occupied|unoccupied)$/);
-        if (regionWildcard?.groups?.action) {
-            logger.debug('Found region wildcard action ' + regionWildcard.groups.action);
-            return {action: 'region_' + regionWildcard.groups.action, region: 'wildcard'};
-        }
+    private buildAction(groups: {[key: string]: string}, props: {[key: string]: string} = {}): ActionData {
+        utils.removeNullPropertiesFromObject(groups);
 
-        return {action};
+        let a: string = groups.action;
+        if (groups?.actionPrefix) {
+            a = groups.actionPrefix + a;
+            delete groups.actionPrefix;
+        }
+        return {...groups, action: a, ...props};
     }
 
     private prepareActionEventTypes(values: zhc.Enum['values']): string[] {
         return utils.arrayUnique(values.map((v) => this.parseActionValue(v.toString()).action).filter((v) => !v.includes('*')));
     }
+
+    private parseGroupsFromRegex(pattern: string): string[] {
+        return [...pattern.matchAll(/\(\?<([a-zA-Z]+)>/g)].map((v) => v[1]);
+    }
+
+    private getActionValueTemplate(): string {
+        // TODO: Implement parsing for all event types.
+        const patterns = ACTION_PATTERNS.map((v) => {
+            return `{"pattern": '${v.replaceAll(/\?<([a-zA-Z]+)>/g, '?P<$1>')}', "groups": [${this.parseGroupsFromRegex(v)
+                .map((g) => `"${g}"`)
+                .join(', ')}]}`;
+        }).join(',\n');
+
+        const value_template =
+            `{% set patterns = [\n${patterns}\n] %}\n` +
+            `{% set ns = namespace(r=[('event_type', value_json.action)]) %}\n` +
+            `{% for p in patterns %}\n` +
+            `  {% set m = value_json.action|regex_findall(p.pattern) %}\n` +
+            `  {% if m[0] is undefined %}{% continue %}{% endif %}\n` +
+            `  {% for key, value in zip(p.groups, m[0]) %}\n` +
+            `    {% set ns.r = ns.r + [(key, value)] %}\n` +
+            `  {% endfor %}\n` +
+            `{% endfor %}\n` +
+            `{% if ns.r|selectattr(0, 'eq', 'actionPrefix')|first is defined %}\n` +
+            `  {% set ns.r = ns.r|rejectattr(0, 'eq', 'action')|list + [('action', ns.r|selectattr(0, 'eq', 'actionPrefix')|map(attribute=1)|first + ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n` +
+            `{% endif %}\n` +
+            `{% set ns.r = ns.r + [('event_type', ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n` +
+            `{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix'))|to_json}}`;
+
+        return value_template;
+    }
 }
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index 8b364d9e47..8fb2f95a0f 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -428,7 +428,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                '{%- set buttons = value_json.action|regex_findall_index(^(?P<button>[a-z]+)_(?P<action>(?:press|hold)(?:_release)?)$) -%}{%- set scenes = value_json.action|regex_findall_index(^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$) -%}{%- set regions = value_json.action|regex_findall_index(^region_(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$) -%}{%- if buttons -%}\n   {%- set d = dict(event_type = "{{buttons[1]}}", button = "{{buttons[0]}}_button" -%}\n{%- elif scenes -%}\n   {%- set d = dict(event_type = "{{scenes[0]}}", scene = "{{scenes[1]}}" -%}\n{%- elif regions -%}\n   {%- set d = dict(event_type = "region_{{regions[1]}}", region = "{{regions[0]}}" -%}\n{%- else -%}\n   {%- set d = dict(event_type = "{{value_json.action}}" ) -%}\n{%- endif -%}\n{{d|to_json}}',
+                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set ns = namespace(r=[(\'event_type\', value_json.action)]) %}\n{% for p in patterns %}\n  {% set m = value_json.action|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -451,6 +451,11 @@ describe('HomeAssistant extension', () => {
         ['left_press_release', {action: 'press_release', button: 'left'}],
         ['right_hold', {action: 'hold', button: 'right'}],
         ['right_hold_release', {action: 'hold_release', button: 'right'}],
+        ['button_4_hold_release', {action: 'hold_release', button: 'button_4'}],
+        ['dial_rotate_left_step', {action: 'dial_rotate', direction: 'left', speed: 'step'}],
+        ['dial_rotate_right_fast', {action: 'dial_rotate', direction: 'right', speed: 'fast'}],
+        ['brightness_step_up', {action: 'brightness_step', direction: 'up'}],
+        ['brightness_stop', {action: 'brightness_stop'}],
     ])('Should parse action names correctly', (action, expected) => {
         expect(extension.parseActionValue(action)).toStrictEqual(expected);
     });
@@ -1993,7 +1998,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                '{%- set buttons = value_json.action|regex_findall_index(^(?P<button>[a-z]+)_(?P<action>(?:press|hold)(?:_release)?)$) -%}{%- set scenes = value_json.action|regex_findall_index(^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$) -%}{%- set regions = value_json.action|regex_findall_index(^region_(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$) -%}{%- if buttons -%}\n   {%- set d = dict(event_type = "{{buttons[1]}}", button = "{{buttons[0]}}_button" -%}\n{%- elif scenes -%}\n   {%- set d = dict(event_type = "{{scenes[0]}}", scene = "{{scenes[1]}}" -%}\n{%- elif regions -%}\n   {%- set d = dict(event_type = "region_{{regions[1]}}", region = "{{regions[0]}}" -%}\n{%- else -%}\n   {%- set d = dict(event_type = "{{value_json.action}}" ) -%}\n{%- endif -%}\n{{d|to_json}}',
+                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set ns = namespace(r=[(\'event_type\', value_json.action)]) %}\n{% for p in patterns %}\n  {% set m = value_json.action|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(

From b8c3104aa1baaf03c3db7954bc92b5ac71d985c4 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Tue, 12 Nov 2024 21:23:45 +0100
Subject: [PATCH 16/46] fix(ignore): update zigbee-herdsman-converters to
 20.45.0 (#24733)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8d2d345d67..5de910a7b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.7",
-                "zigbee-herdsman-converters": "20.44.0",
+                "zigbee-herdsman-converters": "20.45.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8632,9 +8632,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.44.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.44.0.tgz",
-            "integrity": "sha512-UO5o/hZ3+vCegcpPMuITvSK1VIMtz4eYOjNNiFtJGp4kLJKhEcgcvjWn3IxDv1k/ReK1fFFuAPmFklPolhxKHQ==",
+            "version": "20.45.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.45.0.tgz",
+            "integrity": "sha512-wu2ttFv2dBvpohHVO2LinZTz15HPDv25P8UxOcsqr3mx0/lKU3HDvZocLFbwNKoUQvNZol9t83Q+RFLBVxaoww==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 94d4a70c40..40928bc644 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.7",
-        "zigbee-herdsman-converters": "20.44.0",
+        "zigbee-herdsman-converters": "20.45.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 2a1ab78f7ab49e50fc9e6008aea9e4fad456825c Mon Sep 17 00:00:00 2001
From: Nerivec <62446222+Nerivec@users.noreply.github.com>
Date: Wed, 13 Nov 2024 21:01:37 +0100
Subject: [PATCH 17/46] chore: Update codeql config (#24751)

* Update codeql config

* Fix prettier
---
 .github/workflows/codeql.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index dd4567b055..6d36a800c2 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -17,7 +17,10 @@ jobs:
               uses: actions/checkout@v4
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v3
-            - name: Autobuild
-              uses: github/codeql-action/autobuild@v3
+              with:
+                  languages: javascript-typescript
+                  build-mode: autobuild
             - name: Perform CodeQL Analysis
               uses: github/codeql-action/analyze@v3
+              with:
+                  category: '/language:javascript-typescript'

From 6e04f7b03e8c7f0493007ce1d9d359f819088557 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 13 Nov 2024 21:49:13 +0100
Subject: [PATCH 18/46] fix(ignore): update zigbee-herdsman-converters to
 20.46.0 (#24762)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5de910a7b0..d11c39299a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.7",
-                "zigbee-herdsman-converters": "20.45.0",
+                "zigbee-herdsman-converters": "20.46.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8632,9 +8632,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.45.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.45.0.tgz",
-            "integrity": "sha512-wu2ttFv2dBvpohHVO2LinZTz15HPDv25P8UxOcsqr3mx0/lKU3HDvZocLFbwNKoUQvNZol9t83Q+RFLBVxaoww==",
+            "version": "20.46.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.46.0.tgz",
+            "integrity": "sha512-vJdYq1KC2zxPI+VE6sKBh0fLdH/tDaLDKCI8z93ySYI1LNESnNcvVeqOBRr6uiUJeXB2davuuLr3WAKWrzS6AQ==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 40928bc644..91946595f4 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.7",
-        "zigbee-herdsman-converters": "20.45.0",
+        "zigbee-herdsman-converters": "20.46.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From f7e7115f79e608abe85edb966baf52e8d9d5a313 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 13 Nov 2024 21:53:01 +0100
Subject: [PATCH 19/46] chore: attempt to fix codeql.yaml

---
 .github/workflows/codeql.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 6d36a800c2..ffdf5f7ade 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -19,7 +19,7 @@ jobs:
               uses: github/codeql-action/init@v3
               with:
                   languages: javascript-typescript
-                  build-mode: autobuild
+                  build-mode: none
             - name: Perform CodeQL Analysis
               uses: github/codeql-action/analyze@v3
               with:

From 2a9bbb21ba5c22bf32d702f02b60084c4e12f140 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 13 Nov 2024 21:56:59 +0100
Subject: [PATCH 20/46] fix(ignore): update zigbee-herdsman to 2.1.8 (#24763)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d11c39299a..57e469eb26 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,7 @@
                 "winston-syslog": "^2.7.1",
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
-                "zigbee-herdsman": "2.1.7",
+                "zigbee-herdsman": "2.1.8",
                 "zigbee-herdsman-converters": "20.46.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
@@ -8616,9 +8616,9 @@
             }
         },
         "node_modules/zigbee-herdsman": {
-            "version": "2.1.7",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-2.1.7.tgz",
-            "integrity": "sha512-Je1XsF+CIx2Ai1IYyjGenB58VqWXvTbY770dVyPwU+mUTG+hrbsF/rV9fybBzNkgg4EhJbbheIBBWfnqcRlfBQ==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-2.1.8.tgz",
+            "integrity": "sha512-TJB8FSs/B/h6N2c4yOQ7zWBpOLPca1XVJ0VNK7d1QYmNAzLlNRREbv0kcVnxh+LMwaKrnRNvfH6rXLVv5ZpLEA==",
             "license": "MIT",
             "dependencies": {
                 "@serialport/bindings-cpp": "^12.0.1",
diff --git a/package.json b/package.json
index 91946595f4..aa1d7c5a19 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "winston-syslog": "^2.7.1",
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
-        "zigbee-herdsman": "2.1.7",
+        "zigbee-herdsman": "2.1.8",
         "zigbee-herdsman-converters": "20.46.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },

From 36e452b0f3284eb5ab872fb2d0aab04bbdfe4cee Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 14 Nov 2024 21:36:53 +0100
Subject: [PATCH 21/46] fix(ignore): update zigbee-herdsman-converters to
 20.47.0 (#24772)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 57e469eb26..8bba4cbf56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.8",
-                "zigbee-herdsman-converters": "20.46.0",
+                "zigbee-herdsman-converters": "20.47.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8632,9 +8632,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.46.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.46.0.tgz",
-            "integrity": "sha512-vJdYq1KC2zxPI+VE6sKBh0fLdH/tDaLDKCI8z93ySYI1LNESnNcvVeqOBRr6uiUJeXB2davuuLr3WAKWrzS6AQ==",
+            "version": "20.47.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.47.0.tgz",
+            "integrity": "sha512-uoIsruaivgnzEewQRnH/xzOSDm4MoO2ELmTfYYt32+MBBNaIOyAPIXvuJydKPk88i9Dlf4HfcY20PPpaGbqQUQ==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index aa1d7c5a19..8ffd115457 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.8",
-        "zigbee-herdsman-converters": "20.46.0",
+        "zigbee-herdsman-converters": "20.47.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 152ad12508724be23f1792238e4bc37f48413ec0 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Mon, 18 Nov 2024 21:05:50 +0100
Subject: [PATCH 22/46] fix(ignore): update zigbee-herdsman to 2.1.9 (#24819)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8bba4cbf56..9bcefd5ed9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,7 @@
                 "winston-syslog": "^2.7.1",
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
-                "zigbee-herdsman": "2.1.8",
+                "zigbee-herdsman": "2.1.9",
                 "zigbee-herdsman-converters": "20.47.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
@@ -8616,9 +8616,9 @@
             }
         },
         "node_modules/zigbee-herdsman": {
-            "version": "2.1.8",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-2.1.8.tgz",
-            "integrity": "sha512-TJB8FSs/B/h6N2c4yOQ7zWBpOLPca1XVJ0VNK7d1QYmNAzLlNRREbv0kcVnxh+LMwaKrnRNvfH6rXLVv5ZpLEA==",
+            "version": "2.1.9",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-2.1.9.tgz",
+            "integrity": "sha512-MXutgNp83F84sjhNfGPangv0uJD8zRtpRMjd7Xrr6hmKUgBwvdN/xQ/SfqpOarIqJaUNSO5T0Q2N13XPw2ukzQ==",
             "license": "MIT",
             "dependencies": {
                 "@serialport/bindings-cpp": "^12.0.1",
diff --git a/package.json b/package.json
index 8ffd115457..ceaa0e0f4a 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "winston-syslog": "^2.7.1",
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
-        "zigbee-herdsman": "2.1.8",
+        "zigbee-herdsman": "2.1.9",
         "zigbee-herdsman-converters": "20.47.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },

From b1508ae52f91a7a5e294edf188838e7b0f2281b1 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Mon, 18 Nov 2024 22:06:11 +0100
Subject: [PATCH 23/46] Update zigbee-herdsman-converters to 20.48.0 (#24820)

* fix(ignore): update zigbee-herdsman-converters to 20.48.0

* u
---
 package-lock.json   |  8 ++++----
 package.json        |  2 +-
 test/bridge.test.js | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9bcefd5ed9..50f1680d5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.47.0",
+                "zigbee-herdsman-converters": "20.48.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8632,9 +8632,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.47.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.47.0.tgz",
-            "integrity": "sha512-uoIsruaivgnzEewQRnH/xzOSDm4MoO2ELmTfYYt32+MBBNaIOyAPIXvuJydKPk88i9Dlf4HfcY20PPpaGbqQUQ==",
+            "version": "20.48.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.48.0.tgz",
+            "integrity": "sha512-qQaX2p9sk5291uY7l7enNbZXsg7ubg+MODMEkNuERGLzEJNMpVUB2t/5vanPdZEULLKidRrqSx91h18ouORy5Q==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index ceaa0e0f4a..1810ba5aa4 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.47.0",
+        "zigbee-herdsman-converters": "20.48.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {
diff --git a/test/bridge.test.js b/test/bridge.test.js
index fec0407ca1..b26d79b56c 100644
--- a/test/bridge.test.js
+++ b/test/bridge.test.js
@@ -338,8 +338,8 @@ describe('Bridge', () => {
                                                 label: 'Current level startup',
                                                 name: 'current_level_startup',
                                                 presets: [
-                                                    {description: 'Use minimum permitted value', name: 'minimum', value: 0},
-                                                    {description: 'Use previous value', name: 'previous', value: 255},
+                                                    {description: 'Use minimum permitted value', name: 'minimum', value: 'minimum'},
+                                                    {description: 'Use previous value', name: 'previous', value: 'previous'},
                                                 ],
                                                 property: 'current_level_startup',
                                                 type: 'numeric',
@@ -1931,8 +1931,8 @@ describe('Bridge', () => {
                                                 label: 'Current level startup',
                                                 name: 'current_level_startup',
                                                 presets: [
-                                                    {description: 'Use minimum permitted value', name: 'minimum', value: 0},
-                                                    {description: 'Use previous value', name: 'previous', value: 255},
+                                                    {description: 'Use minimum permitted value', name: 'minimum', value: 'minimum'},
+                                                    {description: 'Use previous value', name: 'previous', value: 'previous'},
                                                 ],
                                                 property: 'current_level_startup',
                                                 type: 'numeric',
@@ -2340,8 +2340,8 @@ describe('Bridge', () => {
                                                 label: 'Current level startup',
                                                 name: 'current_level_startup',
                                                 presets: [
-                                                    {description: 'Use minimum permitted value', name: 'minimum', value: 0},
-                                                    {description: 'Use previous value', name: 'previous', value: 255},
+                                                    {description: 'Use minimum permitted value', name: 'minimum', value: 'minimum'},
+                                                    {description: 'Use previous value', name: 'previous', value: 'previous'},
                                                 ],
                                                 property: 'current_level_startup',
                                                 type: 'numeric',

From 5859947207adf8597436971706cdff101c1effbe Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Tue, 19 Nov 2024 20:43:54 +0100
Subject: [PATCH 24/46] fix(ignore): update zigbee-herdsman-converters to
 20.49.1 (#24830)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 50f1680d5d..bf1bb93a29 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.48.0",
+                "zigbee-herdsman-converters": "20.49.1",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8632,9 +8632,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.48.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.48.0.tgz",
-            "integrity": "sha512-qQaX2p9sk5291uY7l7enNbZXsg7ubg+MODMEkNuERGLzEJNMpVUB2t/5vanPdZEULLKidRrqSx91h18ouORy5Q==",
+            "version": "20.49.1",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.49.1.tgz",
+            "integrity": "sha512-YJDYdhpZRPS7vPBW8s3zqiuv+3MBV9HPhGPR4V4wv9JZIIgnbzG2W9Lb6v3+wVz17HfWhifVCYoG/j1Aip6bbw==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 1810ba5aa4..4cc9af85a5 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.48.0",
+        "zigbee-herdsman-converters": "20.49.1",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 988984a1ae069d90ce1f67c165dd76c4edafa656 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 20 Nov 2024 21:27:28 +0100
Subject: [PATCH 25/46] fix(ignore): update zigbee-herdsman-converters to
 20.50.0 (#24843)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bf1bb93a29..24ad13c43b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.49.1",
+                "zigbee-herdsman-converters": "20.50.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8632,9 +8632,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.49.1",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.49.1.tgz",
-            "integrity": "sha512-YJDYdhpZRPS7vPBW8s3zqiuv+3MBV9HPhGPR4V4wv9JZIIgnbzG2W9Lb6v3+wVz17HfWhifVCYoG/j1Aip6bbw==",
+            "version": "20.50.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.50.0.tgz",
+            "integrity": "sha512-oLyqlw9asiz/Vte6J5tGY5HoTgUTigKICSSQY7zk6SD33MqliTFOqLZDhzOZJd4LwAM+JwRSZf/4cBoTJ76lvw==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 4cc9af85a5..5eff4edec0 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.49.1",
+        "zigbee-herdsman-converters": "20.50.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 82a026e02e0ecc662cf8302ff3005793cb66a23f Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 21 Nov 2024 21:58:55 +0100
Subject: [PATCH 26/46] fix(ignore): update zigbee-herdsman-converters to
 20.51.0 (#24856)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 24ad13c43b..39e4bd8041 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.50.0",
+                "zigbee-herdsman-converters": "20.51.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8632,9 +8632,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.50.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.50.0.tgz",
-            "integrity": "sha512-oLyqlw9asiz/Vte6J5tGY5HoTgUTigKICSSQY7zk6SD33MqliTFOqLZDhzOZJd4LwAM+JwRSZf/4cBoTJ76lvw==",
+            "version": "20.51.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.51.0.tgz",
+            "integrity": "sha512-AtEapWqQtkLOGLrj9BLtOP+oCWPn9jlLVCM1mx6trCB4Ws0g7HiXL5zyOoHWzpwrzUTVonklialKZ8U8R/qqyg==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 5eff4edec0..081f9eabd1 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.50.0",
+        "zigbee-herdsman-converters": "20.51.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 1e77893f759908bafc373b047b6409d227516759 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Fri, 22 Nov 2024 21:55:41 +0100
Subject: [PATCH 27/46] fix(ignore): update zigbee-herdsman-converters to
 20.52.0 (#24874)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 39e4bd8041..90a00ba8c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.8.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.51.0",
+                "zigbee-herdsman-converters": "20.52.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8632,9 +8632,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.51.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.51.0.tgz",
-            "integrity": "sha512-AtEapWqQtkLOGLrj9BLtOP+oCWPn9jlLVCM1mx6trCB4Ws0g7HiXL5zyOoHWzpwrzUTVonklialKZ8U8R/qqyg==",
+            "version": "20.52.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.52.0.tgz",
+            "integrity": "sha512-H4ESvxAfuHSSeFycwl0iA7d+GL+wKxjiZacKEo9DdBm5vN9S43FBhHl4wRDy/paW9rmU1XRqiG/fzB2vjBUoSg==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 081f9eabd1..5fea9a7d99 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.8.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.51.0",
+        "zigbee-herdsman-converters": "20.52.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From ca6493528db3ffb374068e837ec0151f079a6ac8 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sun, 24 Nov 2024 22:01:37 +0100
Subject: [PATCH 28/46] fix(ignore): Update dependencies (#24894)

---
 lib/util/logger.ts |   2 +-
 package-lock.json  | 388 ++++++++++++++++++++-------------------------
 package.json       |  20 +--
 3 files changed, 180 insertions(+), 230 deletions(-)

diff --git a/lib/util/logger.ts b/lib/util/logger.ts
index 055972a88f..4fbdf3903d 100644
--- a/lib/util/logger.ts
+++ b/lib/util/logger.ts
@@ -114,7 +114,7 @@ class Logger {
 
             const options: KeyValue = {
                 app_name: 'Zigbee2MQTT',
-                format: winston.format.printf((info) => info.message),
+                format: winston.format.printf((info) => info.message as string),
                 ...settings.get().advanced.log_syslog,
             };
 
diff --git a/package-lock.json b/package-lock.json
index 90a00ba8c8..dcf4507323 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
                 "ajv": "^8.17.1",
                 "bind-decorator": "^1.0.11",
                 "debounce": "^2.2.0",
-                "express-static-gzip": "^2.1.8",
+                "express-static-gzip": "^2.2.0",
                 "fast-deep-equal": "^3.1.3",
                 "finalhandler": "^1.3.1",
                 "git-last-commit": "^1.0.1",
@@ -22,16 +22,16 @@
                 "jszip": "^3.10.1",
                 "mkdir-recursive": "^0.4.0",
                 "moment": "^2.30.1",
-                "mqtt": "^5.10.1",
+                "mqtt": "^5.10.2",
                 "object-assign-deep": "^0.4.0",
                 "rimraf": "^6.0.1",
                 "semver": "^7.6.3",
                 "source-map-support": "^0.5.21",
                 "throttleit": "^2.1.0",
                 "uri-js": "^4.4.1",
-                "winston": "^3.16.0",
+                "winston": "^3.17.0",
                 "winston-syslog": "^2.7.1",
-                "winston-transport": "^4.8.0",
+                "winston-transport": "^4.9.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
                 "zigbee-herdsman-converters": "20.52.0",
@@ -45,28 +45,28 @@
                 "@babel/plugin-proposal-decorators": "^7.25.9",
                 "@babel/preset-env": "^7.26.0",
                 "@babel/preset-typescript": "^7.26.0",
-                "@eslint/core": "^0.8.0",
-                "@eslint/js": "^9.14.0",
+                "@eslint/core": "^0.9.0",
+                "@eslint/js": "^9.15.0",
                 "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
                 "@types/eslint__js": "^8.42.3",
                 "@types/finalhandler": "^1.2.3",
                 "@types/humanize-duration": "^3.27.4",
                 "@types/jest": "^29.5.14",
                 "@types/js-yaml": "^4.0.9",
-                "@types/node": "^22.9.0",
+                "@types/node": "^22.9.3",
                 "@types/object-assign-deep": "^0.4.3",
                 "@types/readable-stream": "4.0.18",
                 "@types/sd-notify": "^2.8.2",
                 "@types/serve-static": "^1.15.7",
                 "@types/ws": "8.5.13",
                 "babel-jest": "^29.7.0",
-                "eslint": "^9.14.0",
+                "eslint": "^9.15.0",
                 "eslint-config-prettier": "^9.1.0",
                 "jest": "^29.7.0",
                 "prettier": "^3.3.3",
                 "tmp": "^0.2.3",
-                "typescript": "^5.6.3",
-                "typescript-eslint": "^8.13.0"
+                "typescript": "^5.7.2",
+                "typescript-eslint": "^8.15.0"
             },
             "engines": {
                 "node": "^18 || ^20 || ^22 || ^23"
@@ -287,9 +287,9 @@
             }
         },
         "node_modules/@babel/helper-define-polyfill-provider": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
-            "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+            "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2032,9 +2032,9 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
-            "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
+            "version": "0.19.0",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz",
+            "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -2047,9 +2047,9 @@
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.8.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.8.0.tgz",
-            "integrity": "sha512-ncQZoR8YJtXIrBuJo1vDlIIR8+uoyYj2tRXE/RbZ3KHWYXNLcPeOgNKRBzXSZ/yQbVObVS8JGbhzvpifU+eQqw==",
+            "version": "0.9.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz",
+            "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -2057,9 +2057,9 @@
             }
         },
         "node_modules/@eslint/eslintrc": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
-            "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
+            "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2118,9 +2118,9 @@
             "license": "MIT"
         },
         "node_modules/@eslint/js": {
-            "version": "9.14.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.14.0.tgz",
-            "integrity": "sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==",
+            "version": "9.15.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz",
+            "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2138,9 +2138,9 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.2.tgz",
-            "integrity": "sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==",
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
+            "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -3116,9 +3116,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.9.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
-            "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
+            "version": "22.9.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.3.tgz",
+            "integrity": "sha512-F3u1fs/fce3FFk+DAxbxc78DF8x0cY09RRL8GnXLmkJ1jvx3TtPdWoTT5/NiYfI5ASqXBmfqJi9dZ3gxMx4lzw==",
             "license": "MIT",
             "dependencies": {
                 "undici-types": "~6.19.8"
@@ -3211,17 +3211,17 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.13.0.tgz",
-            "integrity": "sha512-nQtBLiZYMUPkclSeC3id+x4uVd1SGtHuElTxL++SfP47jR0zfkZBJHc+gL4qPsgTuypz0k8Y2GheaDYn6Gy3rg==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.15.0.tgz",
+            "integrity": "sha512-+zkm9AR1Ds9uLWN3fkoeXgFppaQ+uEVtfOV62dDmsy9QCNqlRHWNEck4yarvRNrvRcHQLGfqBNui3cimoz8XAg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.13.0",
-                "@typescript-eslint/type-utils": "8.13.0",
-                "@typescript-eslint/utils": "8.13.0",
-                "@typescript-eslint/visitor-keys": "8.13.0",
+                "@typescript-eslint/scope-manager": "8.15.0",
+                "@typescript-eslint/type-utils": "8.15.0",
+                "@typescript-eslint/utils": "8.15.0",
+                "@typescript-eslint/visitor-keys": "8.15.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.3.1",
                 "natural-compare": "^1.4.0",
@@ -3245,16 +3245,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.13.0.tgz",
-            "integrity": "sha512-w0xp+xGg8u/nONcGw1UXAr6cjCPU1w0XVyBs6Zqaj5eLmxkKQAByTdV/uGgNN5tVvN/kKpoQlP2cL7R+ajZZIQ==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.15.0.tgz",
+            "integrity": "sha512-7n59qFpghG4uazrF9qtGKBZXn7Oz4sOMm8dwNWDQY96Xlm2oX67eipqcblDj+oY1lLCbf1oltMZFpUso66Kl1A==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.13.0",
-                "@typescript-eslint/types": "8.13.0",
-                "@typescript-eslint/typescript-estree": "8.13.0",
-                "@typescript-eslint/visitor-keys": "8.13.0",
+                "@typescript-eslint/scope-manager": "8.15.0",
+                "@typescript-eslint/types": "8.15.0",
+                "@typescript-eslint/typescript-estree": "8.15.0",
+                "@typescript-eslint/visitor-keys": "8.15.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -3274,14 +3274,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.13.0.tgz",
-            "integrity": "sha512-XsGWww0odcUT0gJoBZ1DeulY1+jkaHUciUq4jKNv4cpInbvvrtDoyBH9rE/n2V29wQJPk8iCH1wipra9BhmiMA==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.15.0.tgz",
+            "integrity": "sha512-QRGy8ADi4J7ii95xz4UoiymmmMd/zuy9azCaamnZ3FM8T5fZcex8UfJcjkiEZjJSztKfEBe3dZ5T/5RHAmw2mA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.13.0",
-                "@typescript-eslint/visitor-keys": "8.13.0"
+                "@typescript-eslint/types": "8.15.0",
+                "@typescript-eslint/visitor-keys": "8.15.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3292,14 +3292,14 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.13.0.tgz",
-            "integrity": "sha512-Rqnn6xXTR316fP4D2pohZenJnp+NwQ1mo7/JM+J1LWZENSLkJI8ID8QNtlvFeb0HnFSK94D6q0cnMX6SbE5/vA==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.15.0.tgz",
+            "integrity": "sha512-UU6uwXDoI3JGSXmcdnP5d8Fffa2KayOhUUqr/AiBnG1Gl7+7ut/oyagVeSkh7bxQ0zSXV9ptRh/4N15nkCqnpw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.13.0",
-                "@typescript-eslint/utils": "8.13.0",
+                "@typescript-eslint/typescript-estree": "8.15.0",
+                "@typescript-eslint/utils": "8.15.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^1.3.0"
             },
@@ -3310,6 +3310,9 @@
                 "type": "opencollective",
                 "url": "https://opencollective.com/typescript-eslint"
             },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0"
+            },
             "peerDependenciesMeta": {
                 "typescript": {
                     "optional": true
@@ -3317,9 +3320,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",
-            "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.15.0.tgz",
+            "integrity": "sha512-n3Gt8Y/KyJNe0S3yDCD2RVKrHBC4gTUcLTebVBXacPy091E6tNspFLKRXlk3hwT4G55nfr1n2AdFqi/XMxzmPQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -3331,14 +3334,14 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.13.0.tgz",
-            "integrity": "sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.15.0.tgz",
+            "integrity": "sha512-1eMp2JgNec/niZsR7ioFBlsh/Fk0oJbhaqO0jRyQBMgkz7RrFfkqF9lYYmBoGBaSiLnu8TAPQTwoTUiSTUW9dg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/types": "8.13.0",
-                "@typescript-eslint/visitor-keys": "8.13.0",
+                "@typescript-eslint/types": "8.15.0",
+                "@typescript-eslint/visitor-keys": "8.15.0",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -3386,16 +3389,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.13.0.tgz",
-            "integrity": "sha512-A1EeYOND6Uv250nybnLZapeXpYMl8tkzYUxqmoKAWnI4sei3ihf2XdZVd+vVOmHGcp3t+P7yRrNsyyiXTvShFQ==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.15.0.tgz",
+            "integrity": "sha512-k82RI9yGhr0QM3Dnq+egEpz9qB6Un+WLYhmoNcvl8ltMEededhh7otBVVIDDsEEttauwdY/hQoSsOv13lxrFzQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.13.0",
-                "@typescript-eslint/types": "8.13.0",
-                "@typescript-eslint/typescript-estree": "8.13.0"
+                "@typescript-eslint/scope-manager": "8.15.0",
+                "@typescript-eslint/types": "8.15.0",
+                "@typescript-eslint/typescript-estree": "8.15.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3406,17 +3409,22 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.13.0.tgz",
-            "integrity": "sha512-7N/+lztJqH4Mrf0lb10R/CbI1EaAMMGyF5y0oJvFoAhafwgiRA7TXyd8TFn8FC8k5y2dTsYogg238qavRGNnlw==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.15.0.tgz",
+            "integrity": "sha512-h8vYOulWec9LhpwfAdZf2bjr8xIp0KNKnpgqSz0qqYYKAW/QZKw3ktRndbiAtUz4acH4QLQavwZBYCc0wulA/Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.13.0",
-                "eslint-visitor-keys": "^3.4.3"
+                "@typescript-eslint/types": "8.15.0",
+                "eslint-visitor-keys": "^4.2.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3426,19 +3434,6 @@
                 "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            }
-        },
         "node_modules/abort-controller": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
@@ -3647,14 +3642,14 @@
             }
         },
         "node_modules/babel-plugin-polyfill-corejs2": {
-            "version": "0.4.11",
-            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
-            "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+            "version": "0.4.12",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+            "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/compat-data": "^7.22.6",
-                "@babel/helper-define-polyfill-provider": "^0.6.2",
+                "@babel/helper-define-polyfill-provider": "^0.6.3",
                 "semver": "^6.3.1"
             },
             "peerDependencies": {
@@ -3686,13 +3681,13 @@
             }
         },
         "node_modules/babel-plugin-polyfill-regenerator": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
-            "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
+            "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-define-polyfill-provider": "^0.6.2"
+                "@babel/helper-define-polyfill-provider": "^0.6.3"
             },
             "peerDependencies": {
                 "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -3849,9 +3844,9 @@
             }
         },
         "node_modules/bonjour-service": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
-            "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+            "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
             "license": "MIT",
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
@@ -3985,9 +3980,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001679",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz",
-            "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==",
+            "version": "1.0.30001683",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001683.tgz",
+            "integrity": "sha512-iqmNnThZ0n70mNwvxpEC2nBJ037ZHZUoBI5Gorh1Mw6IlEAZujEoU1tXA628iZfzm7R9FvFzxbfdgml82a3k8Q==",
             "dev": true,
             "funding": [
                 {
@@ -4255,9 +4250,9 @@
             }
         },
         "node_modules/cross-spawn": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
-            "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
             "license": "MIT",
             "dependencies": {
                 "path-key": "^3.1.0",
@@ -4402,9 +4397,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.55",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz",
-            "integrity": "sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg==",
+            "version": "1.5.64",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz",
+            "integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==",
             "dev": true,
             "license": "ISC"
         },
@@ -4482,27 +4477,27 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.14.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.14.0.tgz",
-            "integrity": "sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==",
+            "version": "9.15.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz",
+            "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.12.1",
-                "@eslint/config-array": "^0.18.0",
-                "@eslint/core": "^0.7.0",
-                "@eslint/eslintrc": "^3.1.0",
-                "@eslint/js": "9.14.0",
-                "@eslint/plugin-kit": "^0.2.0",
+                "@eslint/config-array": "^0.19.0",
+                "@eslint/core": "^0.9.0",
+                "@eslint/eslintrc": "^3.2.0",
+                "@eslint/js": "9.15.0",
+                "@eslint/plugin-kit": "^0.2.3",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
-                "@humanwhocodes/retry": "^0.4.0",
+                "@humanwhocodes/retry": "^0.4.1",
                 "@types/estree": "^1.0.6",
                 "@types/json-schema": "^7.0.15",
                 "ajv": "^6.12.4",
                 "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.2",
+                "cross-spawn": "^7.0.5",
                 "debug": "^4.3.2",
                 "escape-string-regexp": "^4.0.0",
                 "eslint-scope": "^8.2.0",
@@ -4521,8 +4516,7 @@
                 "lodash.merge": "^4.6.2",
                 "minimatch": "^3.1.2",
                 "natural-compare": "^1.4.0",
-                "optionator": "^0.9.3",
-                "text-table": "^0.2.0"
+                "optionator": "^0.9.3"
             },
             "bin": {
                 "eslint": "bin/eslint.js"
@@ -4585,16 +4579,6 @@
                 "url": "https://opencollective.com/eslint"
             }
         },
-        "node_modules/eslint/node_modules/@eslint/core": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz",
-            "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
         "node_modules/eslint/node_modules/ajv": {
             "version": "6.12.6",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -4824,11 +4808,12 @@
             }
         },
         "node_modules/express-static-gzip": {
-            "version": "2.1.8",
-            "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.8.tgz",
-            "integrity": "sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==",
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.2.0.tgz",
+            "integrity": "sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==",
             "license": "MIT",
             "dependencies": {
+                "parseurl": "^1.3.3",
                 "serve-static": "^1.16.2"
             }
         },
@@ -5028,9 +5013,9 @@
             }
         },
         "node_modules/flatted": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-            "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
+            "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
             "dev": true,
             "license": "ISC"
         },
@@ -6439,9 +6424,9 @@
             "license": "MIT"
         },
         "node_modules/logform": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz",
-            "integrity": "sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz",
+            "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==",
             "license": "MIT",
             "dependencies": {
                 "@colors/colors": "1.6.0",
@@ -6624,9 +6609,9 @@
             }
         },
         "node_modules/mqtt": {
-            "version": "5.10.1",
-            "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.10.1.tgz",
-            "integrity": "sha512-hXCOki8sANoQ7w+2OzJzg6qMBxTtrH9RlnVNV8panLZgnl+Gh0J/t4k6r8Az8+C7y3KAcyXtn0mmLixyUom8Sw==",
+            "version": "5.10.2",
+            "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.10.2.tgz",
+            "integrity": "sha512-Q8NrMXB6FwQ2DulGONeDb6BtFHxyQHmXWzDrSC724iyofxLleq/wuZmztV3kg1Kda9I7l0oHP+FKesowoFxyUg==",
             "license": "MIT",
             "dependencies": {
                 "@types/readable-stream": "^4.0.5",
@@ -6637,7 +6622,7 @@
                 "help-me": "^5.0.0",
                 "lru-cache": "^10.0.1",
                 "minimist": "^1.2.8",
-                "mqtt-packet": "^9.0.0",
+                "mqtt-packet": "^9.0.1",
                 "number-allocator": "^1.0.14",
                 "readable-stream": "^4.4.2",
                 "reinterval": "^1.1.0",
@@ -6656,9 +6641,9 @@
             }
         },
         "node_modules/mqtt-packet": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.0.tgz",
-            "integrity": "sha512-8v+HkX+fwbodsWAZIZTI074XIoxVBOmPeggQuDFCGg1SqNcC+uoRMWu7J6QlJPqIUIJXmjNYYHxBBLr1Y/Df4w==",
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.1.tgz",
+            "integrity": "sha512-koZF1V/X2RZUI6uD9wN5OK1JxxcG1ofAR4H3LjCw1FkeKzruZQ26aAA6v2m1lZyWONZIR5wMMJFrZJDRNzbiQw==",
             "license": "MIT",
             "dependencies": {
                 "bl": "^6.0.8",
@@ -7310,16 +7295,16 @@
             }
         },
         "node_modules/regexpu-core": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
-            "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+            "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "regenerate": "^1.4.2",
                 "regenerate-unicode-properties": "^10.2.0",
                 "regjsgen": "^0.8.0",
-                "regjsparser": "^0.11.0",
+                "regjsparser": "^0.12.0",
                 "unicode-match-property-ecmascript": "^2.0.0",
                 "unicode-match-property-value-ecmascript": "^2.1.0"
             },
@@ -7335,9 +7320,9 @@
             "license": "MIT"
         },
         "node_modules/regjsparser": {
-            "version": "0.11.2",
-            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz",
-            "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==",
+            "version": "0.12.0",
+            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+            "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -7800,9 +7785,9 @@
             }
         },
         "node_modules/streamx": {
-            "version": "2.20.1",
-            "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz",
-            "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==",
+            "version": "2.20.2",
+            "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.2.tgz",
+            "integrity": "sha512-aDGDLU+j9tJcUdPGOaHmVF1u/hhI+CsGkT02V3OKlHDV7IukOI+nTWAGkiZEKCO35rWN1wIr4tS7YFr1f4qSvA==",
             "license": "MIT",
             "dependencies": {
                 "fast-fifo": "^1.3.2",
@@ -7987,13 +7972,6 @@
             "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
             "license": "MIT"
         },
-        "node_modules/text-table": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/throttleit": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-2.1.0.tgz",
@@ -8122,9 +8100,9 @@
             "license": "MIT"
         },
         "node_modules/typescript": {
-            "version": "5.6.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
-            "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
+            "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -8136,15 +8114,15 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.13.0.tgz",
-            "integrity": "sha512-vIMpDRJrQd70au2G8w34mPps0ezFSPMEX4pXkTzUkrNbRX+36ais2ksGWN0esZL+ZMaFJEneOBHzCgSqle7DHw==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.15.0.tgz",
+            "integrity": "sha512-wY4FRGl0ZI+ZU4Jo/yjdBu0lVTSML58pu6PgGtJmCufvzfV565pUF6iACQt092uFOd49iLOTX/sEVmHtbSrS+w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.13.0",
-                "@typescript-eslint/parser": "8.13.0",
-                "@typescript-eslint/utils": "8.13.0"
+                "@typescript-eslint/eslint-plugin": "8.15.0",
+                "@typescript-eslint/parser": "8.15.0",
+                "@typescript-eslint/utils": "8.15.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8153,6 +8131,9 @@
                 "type": "opencollective",
                 "url": "https://opencollective.com/typescript-eslint"
             },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0"
+            },
             "peerDependenciesMeta": {
                 "typescript": {
                     "optional": true
@@ -8320,22 +8301,22 @@
             }
         },
         "node_modules/winston": {
-            "version": "3.16.0",
-            "resolved": "https://registry.npmjs.org/winston/-/winston-3.16.0.tgz",
-            "integrity": "sha512-xz7+cyGN5M+4CmmD4Npq1/4T+UZaz7HaeTlAruFUTjk79CNMq+P6H30vlE4z0qfqJ01VHYQwd7OZo03nYm/+lg==",
+            "version": "3.17.0",
+            "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz",
+            "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==",
             "license": "MIT",
             "dependencies": {
                 "@colors/colors": "^1.6.0",
                 "@dabh/diagnostics": "^2.0.2",
                 "async": "^3.2.3",
                 "is-stream": "^2.0.0",
-                "logform": "^2.6.0",
+                "logform": "^2.7.0",
                 "one-time": "^1.0.0",
                 "readable-stream": "^3.4.0",
                 "safe-stable-stringify": "^2.3.1",
                 "stack-trace": "0.0.x",
                 "triple-beam": "^1.3.0",
-                "winston-transport": "^4.7.0"
+                "winston-transport": "^4.9.0"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -8362,13 +8343,13 @@
             }
         },
         "node_modules/winston-transport": {
-            "version": "4.8.0",
-            "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.8.0.tgz",
-            "integrity": "sha512-qxSTKswC6llEMZKgCQdaWgDuMJQnhuvF5f2Nk3SNXc4byfQ+voo2mX1Px9dkNOuR8p0KAjfPG29PuYUSIb+vSA==",
+            "version": "4.9.0",
+            "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz",
+            "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==",
             "license": "MIT",
             "dependencies": {
-                "logform": "^2.6.1",
-                "readable-stream": "^4.5.2",
+                "logform": "^2.7.0",
+                "readable-stream": "^3.6.2",
                 "triple-beam": "^1.3.0"
             },
             "engines": {
@@ -8376,48 +8357,17 @@
             }
         },
         "node_modules/winston-transport/node_modules/readable-stream": {
-            "version": "4.5.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
-            "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
             "license": "MIT",
             "dependencies": {
-                "abort-controller": "^3.0.0",
-                "buffer": "^6.0.3",
-                "events": "^3.3.0",
-                "process": "^0.11.10",
-                "string_decoder": "^1.3.0"
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            }
-        },
-        "node_modules/winston-transport/node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
-        },
-        "node_modules/winston-transport/node_modules/string_decoder": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-            "license": "MIT",
-            "dependencies": {
-                "safe-buffer": "~5.2.0"
+                "node": ">= 6"
             }
         },
         "node_modules/winston/node_modules/readable-stream": {
diff --git a/package.json b/package.json
index 5fea9a7d99..8ccff0ad11 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
         "ajv": "^8.17.1",
         "bind-decorator": "^1.0.11",
         "debounce": "^2.2.0",
-        "express-static-gzip": "^2.1.8",
+        "express-static-gzip": "^2.2.0",
         "fast-deep-equal": "^3.1.3",
         "finalhandler": "^1.3.1",
         "git-last-commit": "^1.0.1",
@@ -50,16 +50,16 @@
         "jszip": "^3.10.1",
         "mkdir-recursive": "^0.4.0",
         "moment": "^2.30.1",
-        "mqtt": "^5.10.1",
+        "mqtt": "^5.10.2",
         "object-assign-deep": "^0.4.0",
         "rimraf": "^6.0.1",
         "semver": "^7.6.3",
         "source-map-support": "^0.5.21",
         "throttleit": "^2.1.0",
         "uri-js": "^4.4.1",
-        "winston": "^3.16.0",
+        "winston": "^3.17.0",
         "winston-syslog": "^2.7.1",
-        "winston-transport": "^4.8.0",
+        "winston-transport": "^4.9.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
         "zigbee-herdsman-converters": "20.52.0",
@@ -70,28 +70,28 @@
         "@babel/plugin-proposal-decorators": "^7.25.9",
         "@babel/preset-env": "^7.26.0",
         "@babel/preset-typescript": "^7.26.0",
-        "@eslint/core": "^0.8.0",
-        "@eslint/js": "^9.14.0",
+        "@eslint/core": "^0.9.0",
+        "@eslint/js": "^9.15.0",
         "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
         "@types/eslint__js": "^8.42.3",
         "@types/finalhandler": "^1.2.3",
         "@types/humanize-duration": "^3.27.4",
         "@types/jest": "^29.5.14",
         "@types/js-yaml": "^4.0.9",
-        "@types/node": "^22.9.0",
+        "@types/node": "^22.9.3",
         "@types/object-assign-deep": "^0.4.3",
         "@types/readable-stream": "4.0.18",
         "@types/sd-notify": "^2.8.2",
         "@types/serve-static": "^1.15.7",
         "@types/ws": "8.5.13",
         "babel-jest": "^29.7.0",
-        "eslint": "^9.14.0",
+        "eslint": "^9.15.0",
         "eslint-config-prettier": "^9.1.0",
         "jest": "^29.7.0",
         "prettier": "^3.3.3",
         "tmp": "^0.2.3",
-        "typescript": "^5.6.3",
-        "typescript-eslint": "^8.13.0"
+        "typescript": "^5.7.2",
+        "typescript-eslint": "^8.15.0"
     },
     "overrides": {
         "zigbee-herdsman-converters": {

From 790373b896efdb6d9ccb5c29c97812db7445c6a3 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sun, 24 Nov 2024 22:29:37 +0100
Subject: [PATCH 29/46] fix(ignore): Update zigbee-herdsman-converters to
 20.53.0 (#24906)

Co-authored-by: Ilya Kirov <kirovilya@gmail.com>
---
 lib/eventBus.ts          |  5 +++++
 lib/extension/onEvent.ts |  6 ++++--
 lib/extension/receive.ts | 10 +++++-----
 package-lock.json        | 10 +++++-----
 package.json             |  2 +-
 test/onEvent.test.js     | 20 ++++++++++++++++++--
 6 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/lib/eventBus.ts b/lib/eventBus.ts
index 027106c277..13110547c9 100644
--- a/lib/eventBus.ts
+++ b/lib/eventBus.ts
@@ -196,6 +196,11 @@ export default class EventBus {
         this.on('stateChange', callback, key);
     }
 
+    public emitExposesAndDevicesChanged(device: Device): void {
+        this.emitDevicesChanged();
+        this.emitExposesChanged({device});
+    }
+
     private on<K extends keyof EventBusMap>(event: K, callback: EventBusListener<K>, key: ListenerKey): void {
         if (!this.callbacksByExtension[key.constructor.name]) {
             this.callbacksByExtension[key.constructor.name] = [];
diff --git a/lib/extension/onEvent.ts b/lib/extension/onEvent.ts
index f666195d91..53d6a34f09 100644
--- a/lib/extension/onEvent.ts
+++ b/lib/extension/onEvent.ts
@@ -41,11 +41,13 @@ export default class OnEvent extends Extension {
     private async callOnEvent(device: Device, type: zhc.OnEventType, data: KeyValue): Promise<void> {
         if (device.options.disabled) return;
         const state = this.state.get(device);
-        await zhc.onEvent(type, data, device.zh);
+        const deviceExposesChanged = (): void => this.eventBus.emitExposesAndDevicesChanged(data.device);
+
+        await zhc.onEvent(type, data, device.zh, {deviceExposesChanged});
 
         if (device.definition?.onEvent) {
             const options: KeyValue = device.options;
-            await device.definition.onEvent(type, data, device.zh, options, state);
+            await device.definition.onEvent(type, data, device.zh, options, state, {deviceExposesChanged});
         }
     }
 }
diff --git a/lib/extension/receive.ts b/lib/extension/receive.ts
index 2d8dc23a3a..5cb3584e86 100755
--- a/lib/extension/receive.ts
+++ b/lib/extension/receive.ts
@@ -156,12 +156,12 @@ export default class Receive extends Extension {
             }
         };
 
-        const deviceExposesChanged = (): void => {
-            this.eventBus.emitDevicesChanged();
-            this.eventBus.emitExposesChanged({device: data.device});
+        const meta = {
+            device: data.device.zh,
+            logger,
+            state: this.state.get(data.device),
+            deviceExposesChanged: (): void => this.eventBus.emitExposesAndDevicesChanged(data.device),
         };
-
-        const meta = {device: data.device.zh, logger, state: this.state.get(data.device), deviceExposesChanged: deviceExposesChanged};
         let payload: KeyValue = {};
         for (const converter of converters) {
             try {
diff --git a/package-lock.json b/package-lock.json
index dcf4507323..9e3e94c7d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.9.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.52.0",
+                "zigbee-herdsman-converters": "20.53.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8582,9 +8582,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.52.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.52.0.tgz",
-            "integrity": "sha512-H4ESvxAfuHSSeFycwl0iA7d+GL+wKxjiZacKEo9DdBm5vN9S43FBhHl4wRDy/paW9rmU1XRqiG/fzB2vjBUoSg==",
+            "version": "20.53.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.53.0.tgz",
+            "integrity": "sha512-Hk+15guAGmFozWMBs+vncoGh34kjNfIaFWg8LMuafTaXPqGLPpWco3NQqT/GHgXiDu/wolKZi4y/6J5JdO8s3g==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
@@ -8594,7 +8594,7 @@
                 "semver": "^7.6.3",
                 "tar-stream": "^3.1.7",
                 "uri-js": "^4.4.1",
-                "zigbee-herdsman": "^2.1.7"
+                "zigbee-herdsman": "^2.1.9"
             }
         },
         "node_modules/zigbee2mqtt-frontend": {
diff --git a/package.json b/package.json
index 8ccff0ad11..6a7ae029b4 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.52.0",
+        "zigbee-herdsman-converters": "20.53.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {
diff --git a/test/onEvent.test.js b/test/onEvent.test.js
index 66385f9797..b84dbccfde 100644
--- a/test/onEvent.test.js
+++ b/test/onEvent.test.js
@@ -67,7 +67,21 @@ describe('On event', () => {
         await zigbeeHerdsman.events.deviceAnnounce({device});
         await flushPromises();
         expect(mockOnEvent).toHaveBeenCalledTimes(1);
-        expect(mockOnEvent).toHaveBeenCalledWith('deviceAnnounce', {device}, device, settings.getDevice(device.ieeeAddr), {});
+        expect(mockOnEvent).toHaveBeenCalledWith(
+            'deviceAnnounce',
+            {device},
+            device,
+            settings.getDevice(device.ieeeAddr),
+            {},
+            {
+                deviceExposesChanged: expect.any(Function),
+            },
+        );
+
+        // Test deviceExposesChanged
+        MQTT.publish.mockClear();
+        console.log(mockOnEvent.mock.calls[0][5].deviceExposesChanged());
+        expect(MQTT.publish.mock.calls[0][0]).toStrictEqual('zigbee2mqtt/bridge/devices');
     });
 
     it('Should call index onEvent with zigbee event', async () => {
@@ -75,6 +89,8 @@ describe('On event', () => {
         await zigbeeHerdsman.events.deviceAnnounce({device});
         await flushPromises();
         expect(zigbeeHerdsmanConverters.onEvent).toHaveBeenCalledTimes(1);
-        expect(zigbeeHerdsmanConverters.onEvent).toHaveBeenCalledWith('deviceAnnounce', {device}, device);
+        expect(zigbeeHerdsmanConverters.onEvent).toHaveBeenCalledWith('deviceAnnounce', {device}, device, {
+            deviceExposesChanged: expect.any(Function),
+        });
     });
 });

From 267d800122902edbe29f655916329c0f1c5fbfa4 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Mon, 25 Nov 2024 20:26:00 +0100
Subject: [PATCH 30/46] Update zigbee-herdsman-converters to 20.54.0 (#24920)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9e3e94c7d5..fcd8fab4c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.9.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.53.0",
+                "zigbee-herdsman-converters": "20.54.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8582,9 +8582,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.53.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.53.0.tgz",
-            "integrity": "sha512-Hk+15guAGmFozWMBs+vncoGh34kjNfIaFWg8LMuafTaXPqGLPpWco3NQqT/GHgXiDu/wolKZi4y/6J5JdO8s3g==",
+            "version": "20.54.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.54.0.tgz",
+            "integrity": "sha512-nicFIk6Ja/nLkDIjbvdgapUdGItf1Cw53AKe3Pr/+xVPoP3h81MSVNlXIxm/Dyc4UgPUkGylIEvePuTtv9hCEg==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 6a7ae029b4..3ad9b36c88 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.53.0",
+        "zigbee-herdsman-converters": "20.54.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 5ca4cf4acd758b9c8163c3f8d07cb9903d91e118 Mon Sep 17 00:00:00 2001
From: Der Mundschenk & Compagnie <mundschenk-at@users.noreply.github.com>
Date: Wed, 27 Nov 2024 08:11:07 +0100
Subject: [PATCH 31/46] fix: Home Assistant: template errors when `action` key
 is missing or empty in state payload (#24931)

---
 lib/extension/homeassistant.ts | 5 +++--
 test/homeassistant.test.js     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index 3d8febd529..8937d871ca 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -2270,9 +2270,10 @@ export default class HomeAssistant extends Extension {
 
         const value_template =
             `{% set patterns = [\n${patterns}\n] %}\n` +
-            `{% set ns = namespace(r=[('event_type', value_json.action)]) %}\n` +
+            `{% set action_value = value_json.action|default(None) %}\n` +
+            `{% set ns = namespace(r=[('action', action_value)]) %}\n` +
             `{% for p in patterns %}\n` +
-            `  {% set m = value_json.action|regex_findall(p.pattern) %}\n` +
+            `  {% set m = action_value|regex_findall(p.pattern) %}\n` +
             `  {% if m[0] is undefined %}{% continue %}{% endif %}\n` +
             `  {% for key, value in zip(p.groups, m[0]) %}\n` +
             `    {% set ns.r = ns.r + [(key, value)] %}\n` +
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index 8fb2f95a0f..ce72125d89 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -428,7 +428,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set ns = namespace(r=[(\'event_type\', value_json.action)]) %}\n{% for p in patterns %}\n  {% set m = value_json.action|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
+                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set action_value = value_json.action|default(None) %}\n{% set ns = namespace(r=[(\'action\', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1998,7 +1998,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set ns = namespace(r=[(\'event_type\', value_json.action)]) %}\n{% for p in patterns %}\n  {% set m = value_json.action|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
+                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set action_value = value_json.action|default(None) %}\n{% set ns = namespace(r=[(\'action\', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(

From 5e47a21673f879d8db74a05cb754c89df00b63f7 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 27 Nov 2024 20:41:38 +0100
Subject: [PATCH 32/46] Update zigbee-herdsman-converters to 20.55.0 (#24939)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fcd8fab4c6..9cde845a87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.9.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.54.0",
+                "zigbee-herdsman-converters": "20.55.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8582,9 +8582,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.54.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.54.0.tgz",
-            "integrity": "sha512-nicFIk6Ja/nLkDIjbvdgapUdGItf1Cw53AKe3Pr/+xVPoP3h81MSVNlXIxm/Dyc4UgPUkGylIEvePuTtv9hCEg==",
+            "version": "20.55.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.55.0.tgz",
+            "integrity": "sha512-tNolwxQgHatySz4AD2kUTw3dKKAl69EpmeDyooxU8hqMePMe68VwIU/Slj1NdATCoJnG/xQMkfVMQ9dKazY5vA==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 3ad9b36c88..c76a69feb3 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.54.0",
+        "zigbee-herdsman-converters": "20.55.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 2c52c9884ce62ea98316f19eace6fef617af7301 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 28 Nov 2024 20:56:10 +0100
Subject: [PATCH 33/46] Update zigbee-herdsman-converters to 20.56.0 (#24952)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9cde845a87..e89b240f48 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.9.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.55.0",
+                "zigbee-herdsman-converters": "20.56.0",
                 "zigbee2mqtt-frontend": "0.7.5"
             },
             "bin": {
@@ -8582,9 +8582,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.55.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.55.0.tgz",
-            "integrity": "sha512-tNolwxQgHatySz4AD2kUTw3dKKAl69EpmeDyooxU8hqMePMe68VwIU/Slj1NdATCoJnG/xQMkfVMQ9dKazY5vA==",
+            "version": "20.56.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.56.0.tgz",
+            "integrity": "sha512-MiYPSwDhe1I+u/wOZQaGOWHJm0TTTRiFiu5KACY2NmaiXbC2SqUGoG2VTRCgFnzNfK501SdW0CjHoBH1xmki0w==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index c76a69feb3..f52b31c2dd 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.55.0",
+        "zigbee-herdsman-converters": "20.56.0",
         "zigbee2mqtt-frontend": "0.7.5"
     },
     "devDependencies": {

From 6351f4618e2e79ef63f36b4e8e804b0cf70cfda0 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 28 Nov 2024 21:44:30 +0100
Subject: [PATCH 34/46] Update zigbee2mqtt-frontend to 0.7.6 (#24955)

Co-authored-by: nurikk <1525421+nurikk@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e89b240f48..330d4fb58b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
                 "zigbee-herdsman-converters": "20.56.0",
-                "zigbee2mqtt-frontend": "0.7.5"
+                "zigbee2mqtt-frontend": "0.7.6"
             },
             "bin": {
                 "zigbee2mqtt": "cli.js"
@@ -8598,9 +8598,9 @@
             }
         },
         "node_modules/zigbee2mqtt-frontend": {
-            "version": "0.7.5",
-            "resolved": "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.7.5.tgz",
-            "integrity": "sha512-CKKldVBl3aF8889MCNpWopMlHfuKAdCpVoPGKfZuntWhTdPq3kRwvBOUZkvTWotvA+Q4MEDV2BD5gnWj5Z7nWA==",
+            "version": "0.7.6",
+            "resolved": "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.7.6.tgz",
+            "integrity": "sha512-eBZk50vKKT0GCV6mDJlgVkPoNBEMUog3xpbG4L23NrfAAr3ysbVM217kOHOIrj8582WCrS2lapH8OukwPLaHIQ==",
             "license": "GPL-3.0",
             "engines": {
                 "node": ">=18"
diff --git a/package.json b/package.json
index f52b31c2dd..9ba3740921 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
         "zigbee-herdsman-converters": "20.56.0",
-        "zigbee2mqtt-frontend": "0.7.5"
+        "zigbee2mqtt-frontend": "0.7.6"
     },
     "devDependencies": {
         "@babel/core": "^7.26.0",

From d82d782bac0deda328e7025f9a2bcbd50fecf857 Mon Sep 17 00:00:00 2001
From: Der Mundschenk & Compagnie <mundschenk-at@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:26:33 +0100
Subject: [PATCH 35/46] fix(ignore): Prevent incorrect `event_type` due to
 duplicate keys (#24954)

---
 lib/extension/homeassistant.ts | 2 +-
 test/homeassistant.test.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index 8937d871ca..f5bfe1e234 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -2276,7 +2276,7 @@ export default class HomeAssistant extends Extension {
             `  {% set m = action_value|regex_findall(p.pattern) %}\n` +
             `  {% if m[0] is undefined %}{% continue %}{% endif %}\n` +
             `  {% for key, value in zip(p.groups, m[0]) %}\n` +
-            `    {% set ns.r = ns.r + [(key, value)] %}\n` +
+            `    {% set ns.r = ns.r|rejectattr(0, 'eq', key)|list + [(key, value)] %}\n` +
             `  {% endfor %}\n` +
             `{% endfor %}\n` +
             `{% if ns.r|selectattr(0, 'eq', 'actionPrefix')|first is defined %}\n` +
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index ce72125d89..bee5fb819e 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -428,7 +428,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set action_value = value_json.action|default(None) %}\n{% set ns = namespace(r=[(\'action\', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
+                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set action_value = value_json.action|default(None) %}\n{% set ns = namespace(r=[(\'action\', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, \'eq\', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1998,7 +1998,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set action_value = value_json.action|default(None) %}\n{% set ns = namespace(r=[(\'action\', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
+                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set action_value = value_json.action|default(None) %}\n{% set ns = namespace(r=[(\'action\', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, \'eq\', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(

From 7047aef7f7810225e80d923e6c45d5922562e12b Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Fri, 29 Nov 2024 20:43:30 +0100
Subject: [PATCH 36/46] fix(ignore): Fix `Cannot read properties of undefined
 (reading 'clients')` https://github.com/Koenkk/zigbee2mqtt/issues/24957

---
 lib/extension/frontend.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/extension/frontend.ts b/lib/extension/frontend.ts
index 20ad3f107b..471a193edb 100644
--- a/lib/extension/frontend.ts
+++ b/lib/extension/frontend.ts
@@ -117,11 +117,11 @@ export default class Frontend extends Extension {
 
     override async stop(): Promise<void> {
         await super.stop();
-        this.wss.clients.forEach((client) => {
+        this.wss?.clients.forEach((client) => {
             client.send(stringify({topic: 'bridge/state', payload: 'offline'}));
             client.terminate();
         });
-        this.wss.close();
+        this.wss?.close();
 
         await new Promise((resolve) => this.server.close(resolve));
     }

From 826547a8e14beabfced2d9da408fa1d7a8e8a015 Mon Sep 17 00:00:00 2001
From: Der Mundschenk & Compagnie <mundschenk-at@users.noreply.github.com>
Date: Sat, 30 Nov 2024 13:46:31 +0100
Subject: [PATCH 37/46] fix(ignore): Prevent empty events from being published
 to HA (#24969)

Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
---
 lib/extension/homeassistant.ts | 4 ++--
 test/homeassistant.test.js     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index f5bfe1e234..c6e0f8c75b 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -2270,7 +2270,7 @@ export default class HomeAssistant extends Extension {
 
         const value_template =
             `{% set patterns = [\n${patterns}\n] %}\n` +
-            `{% set action_value = value_json.action|default(None) %}\n` +
+            `{% set action_value = value_json.action|default('') %}\n` +
             `{% set ns = namespace(r=[('action', action_value)]) %}\n` +
             `{% for p in patterns %}\n` +
             `  {% set m = action_value|regex_findall(p.pattern) %}\n` +
@@ -2283,7 +2283,7 @@ export default class HomeAssistant extends Extension {
             `  {% set ns.r = ns.r|rejectattr(0, 'eq', 'action')|list + [('action', ns.r|selectattr(0, 'eq', 'actionPrefix')|map(attribute=1)|first + ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n` +
             `{% endif %}\n` +
             `{% set ns.r = ns.r + [('event_type', ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n` +
-            `{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix'))|to_json}}`;
+            `{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix')|reject('eq', ('event_type', '')))|to_json}}`;
 
         return value_template;
     }
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index bee5fb819e..6c73857352 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -428,7 +428,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set action_value = value_json.action|default(None) %}\n{% set ns = namespace(r=[(\'action\', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, \'eq\', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
+                "{% set patterns = [\n{\"pattern\": '^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$', \"groups\": [\"button\", \"action\"]},\n{\"pattern\": '^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$', \"groups\": [\"action\", \"scene\"]},\n{\"pattern\": '^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$', \"groups\": [\"actionPrefix\", \"region\", \"action\"]},\n{\"pattern\": '^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$', \"groups\": [\"action\", \"direction\", \"speed\"]},\n{\"pattern\": '^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$', \"groups\": [\"action\", \"direction\"]}\n] %}\n{% set action_value = value_json.action|default('') %}\n{% set ns = namespace(r=[('action', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, 'eq', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, 'eq', 'actionPrefix')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, 'eq', 'action')|list + [('action', ns.r|selectattr(0, 'eq', 'actionPrefix')|map(attribute=1)|first + ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [('event_type', ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix')|reject('eq', ('event_type', '')))|to_json}}",
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1998,7 +1998,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                '{% set patterns = [\n{"pattern": \'^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$\', "groups": ["button", "action"]},\n{"pattern": \'^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$\', "groups": ["action", "scene"]},\n{"pattern": \'^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$\', "groups": ["actionPrefix", "region", "action"]},\n{"pattern": \'^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$\', "groups": ["action", "direction", "speed"]},\n{"pattern": \'^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$\', "groups": ["action", "direction"]}\n] %}\n{% set action_value = value_json.action|default(None) %}\n{% set ns = namespace(r=[(\'action\', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, \'eq\', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, \'eq\', \'actionPrefix\')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, \'eq\', \'action\')|list + [(\'action\', ns.r|selectattr(0, \'eq\', \'actionPrefix\')|map(attribute=1)|first + ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [(\'event_type\', ns.r|selectattr(0, \'eq\', \'action\')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, \'in\', \'action, actionPrefix\'))|to_json}}',
+                "{% set patterns = [\n{\"pattern\": '^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$', \"groups\": [\"button\", \"action\"]},\n{\"pattern\": '^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$', \"groups\": [\"action\", \"scene\"]},\n{\"pattern\": '^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$', \"groups\": [\"actionPrefix\", \"region\", \"action\"]},\n{\"pattern\": '^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$', \"groups\": [\"action\", \"direction\", \"speed\"]},\n{\"pattern\": '^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$', \"groups\": [\"action\", \"direction\"]}\n] %}\n{% set action_value = value_json.action|default('') %}\n{% set ns = namespace(r=[('action', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, 'eq', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, 'eq', 'actionPrefix')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, 'eq', 'action')|list + [('action', ns.r|selectattr(0, 'eq', 'actionPrefix')|map(attribute=1)|first + ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [('event_type', ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix')|reject('eq', ('event_type', '')))|to_json}}",
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(

From 4690fe1a55b4d6a2a8ad39c21c157b67a41d5f62 Mon Sep 17 00:00:00 2001
From: Der Mundschenk & Compagnie <mundschenk-at@users.noreply.github.com>
Date: Sat, 30 Nov 2024 21:09:09 +0100
Subject: [PATCH 38/46] fix(ignore): Ignore `None` actions for HA events
 (#24972)

---
 lib/extension/homeassistant.ts | 2 +-
 test/homeassistant.test.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/extension/homeassistant.ts b/lib/extension/homeassistant.ts
index c6e0f8c75b..63c085aefe 100644
--- a/lib/extension/homeassistant.ts
+++ b/lib/extension/homeassistant.ts
@@ -2283,7 +2283,7 @@ export default class HomeAssistant extends Extension {
             `  {% set ns.r = ns.r|rejectattr(0, 'eq', 'action')|list + [('action', ns.r|selectattr(0, 'eq', 'actionPrefix')|map(attribute=1)|first + ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n` +
             `{% endif %}\n` +
             `{% set ns.r = ns.r + [('event_type', ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n` +
-            `{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix')|reject('eq', ('event_type', '')))|to_json}}`;
+            `{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix')|reject('eq', ('event_type', None))|reject('eq', ('event_type', '')))|to_json}}`;
 
         return value_template;
     }
diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js
index 6c73857352..8475290db8 100644
--- a/test/homeassistant.test.js
+++ b/test/homeassistant.test.js
@@ -428,7 +428,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                "{% set patterns = [\n{\"pattern\": '^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$', \"groups\": [\"button\", \"action\"]},\n{\"pattern\": '^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$', \"groups\": [\"action\", \"scene\"]},\n{\"pattern\": '^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$', \"groups\": [\"actionPrefix\", \"region\", \"action\"]},\n{\"pattern\": '^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$', \"groups\": [\"action\", \"direction\", \"speed\"]},\n{\"pattern\": '^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$', \"groups\": [\"action\", \"direction\"]}\n] %}\n{% set action_value = value_json.action|default('') %}\n{% set ns = namespace(r=[('action', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, 'eq', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, 'eq', 'actionPrefix')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, 'eq', 'action')|list + [('action', ns.r|selectattr(0, 'eq', 'actionPrefix')|map(attribute=1)|first + ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [('event_type', ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix')|reject('eq', ('event_type', '')))|to_json}}",
+                "{% set patterns = [\n{\"pattern\": '^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$', \"groups\": [\"button\", \"action\"]},\n{\"pattern\": '^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$', \"groups\": [\"action\", \"scene\"]},\n{\"pattern\": '^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$', \"groups\": [\"actionPrefix\", \"region\", \"action\"]},\n{\"pattern\": '^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$', \"groups\": [\"action\", \"direction\", \"speed\"]},\n{\"pattern\": '^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$', \"groups\": [\"action\", \"direction\"]}\n] %}\n{% set action_value = value_json.action|default('') %}\n{% set ns = namespace(r=[('action', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, 'eq', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, 'eq', 'actionPrefix')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, 'eq', 'action')|list + [('action', ns.r|selectattr(0, 'eq', 'actionPrefix')|map(attribute=1)|first + ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [('event_type', ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix')|reject('eq', ('event_type', None))|reject('eq', ('event_type', '')))|to_json}}",
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(
@@ -1998,7 +1998,7 @@ describe('HomeAssistant extension', () => {
             unique_id: '0x0017880104e45520_action_zigbee2mqtt',
             // Needs to be updated whenever one of the ACTION_*_PATTERN constants changes.
             value_template:
-                "{% set patterns = [\n{\"pattern\": '^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$', \"groups\": [\"button\", \"action\"]},\n{\"pattern\": '^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$', \"groups\": [\"action\", \"scene\"]},\n{\"pattern\": '^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$', \"groups\": [\"actionPrefix\", \"region\", \"action\"]},\n{\"pattern\": '^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$', \"groups\": [\"action\", \"direction\", \"speed\"]},\n{\"pattern\": '^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$', \"groups\": [\"action\", \"direction\"]}\n] %}\n{% set action_value = value_json.action|default('') %}\n{% set ns = namespace(r=[('action', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, 'eq', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, 'eq', 'actionPrefix')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, 'eq', 'action')|list + [('action', ns.r|selectattr(0, 'eq', 'actionPrefix')|map(attribute=1)|first + ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [('event_type', ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix')|reject('eq', ('event_type', '')))|to_json}}",
+                "{% set patterns = [\n{\"pattern\": '^(?P<button>(?:button_)?[a-z0-9]+)_(?P<action>(?:press|hold)(?:_release)?)$', \"groups\": [\"button\", \"action\"]},\n{\"pattern\": '^(?P<action>recall|scene)_(?P<scene>[0-2][0-9]{0,2})$', \"groups\": [\"action\", \"scene\"]},\n{\"pattern\": '^(?P<actionPrefix>region_)(?P<region>[1-9]|10)_(?P<action>enter|leave|occupied|unoccupied)$', \"groups\": [\"actionPrefix\", \"region\", \"action\"]},\n{\"pattern\": '^(?P<action>dial_rotate)_(?P<direction>left|right)_(?P<speed>step|slow|fast)$', \"groups\": [\"action\", \"direction\", \"speed\"]},\n{\"pattern\": '^(?P<action>brightness_step)(?:_(?P<direction>up|down))?$', \"groups\": [\"action\", \"direction\"]}\n] %}\n{% set action_value = value_json.action|default('') %}\n{% set ns = namespace(r=[('action', action_value)]) %}\n{% for p in patterns %}\n  {% set m = action_value|regex_findall(p.pattern) %}\n  {% if m[0] is undefined %}{% continue %}{% endif %}\n  {% for key, value in zip(p.groups, m[0]) %}\n    {% set ns.r = ns.r|rejectattr(0, 'eq', key)|list + [(key, value)] %}\n  {% endfor %}\n{% endfor %}\n{% if ns.r|selectattr(0, 'eq', 'actionPrefix')|first is defined %}\n  {% set ns.r = ns.r|rejectattr(0, 'eq', 'action')|list + [('action', ns.r|selectattr(0, 'eq', 'actionPrefix')|map(attribute=1)|first + ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{% endif %}\n{% set ns.r = ns.r + [('event_type', ns.r|selectattr(0, 'eq', 'action')|map(attribute=1)|first)] %}\n{{dict.from_keys(ns.r|rejectattr(0, 'in', 'action, actionPrefix')|reject('eq', ('event_type', None))|reject('eq', ('event_type', '')))|to_json}}",
         };
 
         expect(MQTT.publish).toHaveBeenCalledWith(

From 57ee303cda1ef1973e5d79f8b39e6ccaf5df11ee Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sat, 30 Nov 2024 21:21:19 +0100
Subject: [PATCH 39/46] Update zigbee-herdsman-converters to 20.57.0 (#24977)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 330d4fb58b..b60603ee01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.9.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.56.0",
+                "zigbee-herdsman-converters": "20.57.0",
                 "zigbee2mqtt-frontend": "0.7.6"
             },
             "bin": {
@@ -8582,9 +8582,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.56.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.56.0.tgz",
-            "integrity": "sha512-MiYPSwDhe1I+u/wOZQaGOWHJm0TTTRiFiu5KACY2NmaiXbC2SqUGoG2VTRCgFnzNfK501SdW0CjHoBH1xmki0w==",
+            "version": "20.57.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.57.0.tgz",
+            "integrity": "sha512-XbkYujgcpKqsdkb9HnhmbjvzfoGUQ7dGJfMMy13SS+8ivw4P8QZMW4Qxu0ToXBfcMw+Ag8tG5VckebYhN9NcxA==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 9ba3740921..6f972aef60 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.56.0",
+        "zigbee-herdsman-converters": "20.57.0",
         "zigbee2mqtt-frontend": "0.7.6"
     },
     "devDependencies": {

From 59d0eb4534012e436703689d3e5815b3c9855787 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sun, 1 Dec 2024 14:30:48 +0100
Subject: [PATCH 40/46] Update zigbee-herdsman-converters to 20.58.0 (#24987)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b60603ee01..edb4ec4a79 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
                 "winston-transport": "^4.9.0",
                 "ws": "^8.18.0",
                 "zigbee-herdsman": "2.1.9",
-                "zigbee-herdsman-converters": "20.57.0",
+                "zigbee-herdsman-converters": "20.58.0",
                 "zigbee2mqtt-frontend": "0.7.6"
             },
             "bin": {
@@ -8582,9 +8582,9 @@
             }
         },
         "node_modules/zigbee-herdsman-converters": {
-            "version": "20.57.0",
-            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.57.0.tgz",
-            "integrity": "sha512-XbkYujgcpKqsdkb9HnhmbjvzfoGUQ7dGJfMMy13SS+8ivw4P8QZMW4Qxu0ToXBfcMw+Ag8tG5VckebYhN9NcxA==",
+            "version": "20.58.0",
+            "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-20.58.0.tgz",
+            "integrity": "sha512-TqBdR0W7PRO4M+s1IjcmakuIMdG3I+9daK/10kLw1oAwSW/JZEav094HgPn+a4AdMk2FW9m8LhCRtyKVJC4y8w==",
             "license": "MIT",
             "dependencies": {
                 "axios": "^1.7.7",
diff --git a/package.json b/package.json
index 6f972aef60..ebb3977e3b 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "winston-transport": "^4.9.0",
         "ws": "^8.18.0",
         "zigbee-herdsman": "2.1.9",
-        "zigbee-herdsman-converters": "20.57.0",
+        "zigbee-herdsman-converters": "20.58.0",
         "zigbee2mqtt-frontend": "0.7.6"
     },
     "devDependencies": {

From 861cba63b34f34072131df1b13f771d5ec49330d Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sun, 1 Dec 2024 14:33:44 +0100
Subject: [PATCH 41/46] chore(dev): release 1.42.0 (#24569)

---
 .release-please-manifest.json |  2 +-
 CHANGELOG.md                  | 39 +++++++++++++++++++++++++++++++++++
 package-lock.json             |  4 ++--
 package.json                  |  2 +-
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 40e12a0b7e..29251e73d1 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "1.41.0"
+    ".": "1.42.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24802adbe5..7c9fdce6ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # Changelog
 
+## [1.42.0](https://github.com/Koenkk/zigbee2mqtt/compare/1.41.0...1.42.0) (2024-12-01)
+
+
+### Features
+
+* Add experimental support for Home Assistant `event` entities ([#24233](https://github.com/Koenkk/zigbee2mqtt/issues/24233)) ([848f250](https://github.com/Koenkk/zigbee2mqtt/commit/848f250dbb7e0142c7e702dab97536b8be749f5b))
+
+
+### Bug Fixes
+
+* Home Assistant `event` entities, part 2 ([#24717](https://github.com/Koenkk/zigbee2mqtt/issues/24717)) ([22e13c5](https://github.com/Koenkk/zigbee2mqtt/commit/22e13c52b96152a24d735791c313b8c6c2cf68e7))
+* Home Assistant: remove the diagnostic category classification for power ([#24575](https://github.com/Koenkk/zigbee2mqtt/issues/24575)) ([c078ccb](https://github.com/Koenkk/zigbee2mqtt/commit/c078ccb13606a0893a19f25378197be70c0127f6))
+* Home Assistant: template errors when `action` key is missing or empty in state payload ([#24931](https://github.com/Koenkk/zigbee2mqtt/issues/24931)) ([5ca4cf4](https://github.com/Koenkk/zigbee2mqtt/commit/5ca4cf4acd758b9c8163c3f8d07cb9903d91e118))
+* **ignore:** Fix `Cannot read properties of undefined (reading 'clients')` https://github.com/Koenkk/zigbee2mqtt/issues/24957 ([7047aef](https://github.com/Koenkk/zigbee2mqtt/commit/7047aef7f7810225e80d923e6c45d5922562e12b))
+* **ignore:** Ignore `None` actions for HA events ([#24972](https://github.com/Koenkk/zigbee2mqtt/issues/24972)) ([4690fe1](https://github.com/Koenkk/zigbee2mqtt/commit/4690fe1a55b4d6a2a8ad39c21c157b67a41d5f62))
+* **ignore:** Prevent empty events from being published to HA ([#24969](https://github.com/Koenkk/zigbee2mqtt/issues/24969)) ([826547a](https://github.com/Koenkk/zigbee2mqtt/commit/826547a8e14beabfced2d9da408fa1d7a8e8a015))
+* **ignore:** Prevent incorrect `event_type` due to duplicate keys ([#24954](https://github.com/Koenkk/zigbee2mqtt/issues/24954)) ([d82d782](https://github.com/Koenkk/zigbee2mqtt/commit/d82d782bac0deda328e7025f9a2bcbd50fecf857))
+* **ignore:** update dependencies ([#24614](https://github.com/Koenkk/zigbee2mqtt/issues/24614)) ([84cc92f](https://github.com/Koenkk/zigbee2mqtt/commit/84cc92f91a020c86d5ae3938c635512cd106cd67))
+* **ignore:** update dependencies ([#24702](https://github.com/Koenkk/zigbee2mqtt/issues/24702)) ([928635f](https://github.com/Koenkk/zigbee2mqtt/commit/928635f1daea6e3e80afc30ff1eca3bc83de7f97))
+* **ignore:** Update dependencies ([#24894](https://github.com/Koenkk/zigbee2mqtt/issues/24894)) ([ca64935](https://github.com/Koenkk/zigbee2mqtt/commit/ca6493528db3ffb374068e837ec0151f079a6ac8))
+* **ignore:** update zigbee-herdsman to 2.1.8 ([#24763](https://github.com/Koenkk/zigbee2mqtt/issues/24763)) ([2a9bbb2](https://github.com/Koenkk/zigbee2mqtt/commit/2a9bbb21ba5c22bf32d702f02b60084c4e12f140))
+* **ignore:** update zigbee-herdsman to 2.1.9 ([#24819](https://github.com/Koenkk/zigbee2mqtt/issues/24819)) ([152ad12](https://github.com/Koenkk/zigbee2mqtt/commit/152ad12508724be23f1792238e4bc37f48413ec0))
+* **ignore:** update zigbee-herdsman-converters to 20.40.0 ([#24644](https://github.com/Koenkk/zigbee2mqtt/issues/24644)) ([1558a5d](https://github.com/Koenkk/zigbee2mqtt/commit/1558a5d8ace136ac1469f34502901d368603cbd1))
+* **ignore:** update zigbee-herdsman-converters to 20.41.0 ([#24656](https://github.com/Koenkk/zigbee2mqtt/issues/24656)) ([f2e5d59](https://github.com/Koenkk/zigbee2mqtt/commit/f2e5d59c3582ec12e1717c9c28520d54c593dd0e))
+* **ignore:** update zigbee-herdsman-converters to 20.42.0 ([#24666](https://github.com/Koenkk/zigbee2mqtt/issues/24666)) ([b5d4a25](https://github.com/Koenkk/zigbee2mqtt/commit/b5d4a253b4ef5b4930f8d84e878e2343cc0b38df))
+* **ignore:** update zigbee-herdsman-converters to 20.43.0 ([#24680](https://github.com/Koenkk/zigbee2mqtt/issues/24680)) ([a353acc](https://github.com/Koenkk/zigbee2mqtt/commit/a353acc8e3e98bf9ea3a935c1ee179aed335ff58))
+* **ignore:** update zigbee-herdsman-converters to 20.44.0 ([#24715](https://github.com/Koenkk/zigbee2mqtt/issues/24715)) ([32e2637](https://github.com/Koenkk/zigbee2mqtt/commit/32e2637594add5c6fa8f8bfccc28b0f759a5d873))
+* **ignore:** update zigbee-herdsman-converters to 20.45.0 ([#24733](https://github.com/Koenkk/zigbee2mqtt/issues/24733)) ([b8c3104](https://github.com/Koenkk/zigbee2mqtt/commit/b8c3104aa1baaf03c3db7954bc92b5ac71d985c4))
+* **ignore:** update zigbee-herdsman-converters to 20.46.0 ([#24762](https://github.com/Koenkk/zigbee2mqtt/issues/24762)) ([6e04f7b](https://github.com/Koenkk/zigbee2mqtt/commit/6e04f7b03e8c7f0493007ce1d9d359f819088557))
+* **ignore:** update zigbee-herdsman-converters to 20.47.0 ([#24772](https://github.com/Koenkk/zigbee2mqtt/issues/24772)) ([36e452b](https://github.com/Koenkk/zigbee2mqtt/commit/36e452b0f3284eb5ab872fb2d0aab04bbdfe4cee))
+* **ignore:** update zigbee-herdsman-converters to 20.49.1 ([#24830](https://github.com/Koenkk/zigbee2mqtt/issues/24830)) ([5859947](https://github.com/Koenkk/zigbee2mqtt/commit/5859947207adf8597436971706cdff101c1effbe))
+* **ignore:** update zigbee-herdsman-converters to 20.50.0 ([#24843](https://github.com/Koenkk/zigbee2mqtt/issues/24843)) ([988984a](https://github.com/Koenkk/zigbee2mqtt/commit/988984a1ae069d90ce1f67c165dd76c4edafa656))
+* **ignore:** update zigbee-herdsman-converters to 20.51.0 ([#24856](https://github.com/Koenkk/zigbee2mqtt/issues/24856)) ([82a026e](https://github.com/Koenkk/zigbee2mqtt/commit/82a026e02e0ecc662cf8302ff3005793cb66a23f))
+* **ignore:** update zigbee-herdsman-converters to 20.52.0 ([#24874](https://github.com/Koenkk/zigbee2mqtt/issues/24874)) ([1e77893](https://github.com/Koenkk/zigbee2mqtt/commit/1e77893f759908bafc373b047b6409d227516759))
+* **ignore:** Update zigbee-herdsman-converters to 20.53.0 ([#24906](https://github.com/Koenkk/zigbee2mqtt/issues/24906)) ([790373b](https://github.com/Koenkk/zigbee2mqtt/commit/790373b896efdb6d9ccb5c29c97812db7445c6a3))
+* **ignore:** update zigbee2mqtt-frontend to 0.7.5 ([#24631](https://github.com/Koenkk/zigbee2mqtt/issues/24631)) ([0c2cc10](https://github.com/Koenkk/zigbee2mqtt/commit/0c2cc10ad8fd8de1ac88566f8ca1a0d131b1055b))
+* Replace connect-gzip-static with express-static-gzip to become compatible with Node 23 ([#24619](https://github.com/Koenkk/zigbee2mqtt/issues/24619)) ([87cee1a](https://github.com/Koenkk/zigbee2mqtt/commit/87cee1aea6eace2efb31a2d30551b5ea32187e95))
+* Temporarily disable serving compressed index file. ([#24657](https://github.com/Koenkk/zigbee2mqtt/issues/24657)) ([7267d27](https://github.com/Koenkk/zigbee2mqtt/commit/7267d27779c854a216279b28b27551310b9cee97))
+
 ## [1.41.0](https://github.com/Koenkk/zigbee2mqtt/compare/1.40.2...1.41.0) (2024-10-31)
 
 
diff --git a/package-lock.json b/package-lock.json
index edb4ec4a79..62963f26ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "zigbee2mqtt",
-    "version": "1.41.0-dev",
+    "version": "1.42.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "zigbee2mqtt",
-            "version": "1.41.0-dev",
+            "version": "1.42.0",
             "license": "GPL-3.0",
             "dependencies": {
                 "ajv": "^8.17.1",
diff --git a/package.json b/package.json
index ebb3977e3b..f36df0b9bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zigbee2mqtt",
-    "version": "1.41.0-dev",
+    "version": "1.42.0",
     "description": "Zigbee to MQTT bridge using Zigbee-herdsman",
     "main": "index.js",
     "repository": {

From 5b907f2f77490cfcff1a39f5b731d508d0344663 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Tue, 3 Dec 2024 22:05:55 +0100
Subject: [PATCH 42/46] chore: fix update_dep(s)

---
 .github/workflows/update_dep.yml  |  7 +++++--
 .github/workflows/update_deps.yml | 13 +++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/update_dep.yml b/.github/workflows/update_dep.yml
index 9d5b980a7e..5c750bad9c 100644
--- a/.github/workflows/update_dep.yml
+++ b/.github/workflows/update_dep.yml
@@ -17,11 +17,14 @@ jobs:
               with:
                   ref: dev
                   token: ${{ secrets.GH_TOKEN }}
+            - uses: pnpm/action-setup@v4
+              with:
+                  version: 9
             - uses: actions/setup-node@v4
               with:
                   node-version: 20
-                  cache: npm
-            - run: npm install ${{ github.event.client_payload.package }}@${{ github.event.client_payload.version }} --save-exact
+                  cache: pnpm
+            - run: pnpm install ${{ github.event.client_payload.package }}@${{ github.event.client_payload.version }} --save-exact
             - uses: peter-evans/create-pull-request@v7
               id: cpr
               with:
diff --git a/.github/workflows/update_deps.yml b/.github/workflows/update_deps.yml
index ef98dd4a66..42cbea5f01 100644
--- a/.github/workflows/update_deps.yml
+++ b/.github/workflows/update_deps.yml
@@ -18,17 +18,18 @@ jobs:
               with:
                   ref: dev
                   token: ${{ secrets.GH_TOKEN }}
+            - uses: pnpm/action-setup@v4
+              with:
+                  version: 9
             - uses: actions/setup-node@v4
               with:
                   node-version: 20
-                  cache: npm
-            # connect-gzip-static@4.0.0 requires Node 20 >=
-            - run: npx npm-check-updates -u -x connect-gzip-static
-            - run: rm -f package-lock.json
-            - run: npm install
+                  cache: pnpm
+            - run: |
+                  pnpm up --latest
             - uses: peter-evans/create-pull-request@v7
               with:
                   commit-message: 'fix(ignore): update dependencies'
                   branch: 'deps/all'
-                  title: Update dependencies
+                  title: 'fix(ignore): update dependencies'
                   token: ${{ secrets.GH_TOKEN }}

From d943b31372ec5ef644c4982bbb28b57f069ad90f Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 5 Dec 2024 21:06:37 +0100
Subject: [PATCH 43/46] chore: fix update_dep.yml

---
 .github/workflows/update_dep.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update_dep.yml b/.github/workflows/update_dep.yml
index 5c750bad9c..3e3db3ad82 100644
--- a/.github/workflows/update_dep.yml
+++ b/.github/workflows/update_dep.yml
@@ -24,7 +24,7 @@ jobs:
               with:
                   node-version: 20
                   cache: pnpm
-            - run: pnpm install ${{ github.event.client_payload.package }}@${{ github.event.client_payload.version }} --save-exact
+            - run: pnpm install ${{ github.event.client_payload.package }}@${{ github.event.client_payload.version }} --save-exact --no-frozen-lockfile
             - uses: peter-evans/create-pull-request@v7
               id: cpr
               with:

From f8ff89d44261fec85a1ff271d100441fc22a30ae Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 5 Dec 2024 21:07:30 +0100
Subject: [PATCH 44/46] Revert "chore: fix update_dep.yml"

This reverts commit d943b31372ec5ef644c4982bbb28b57f069ad90f.
---
 .github/workflows/update_dep.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update_dep.yml b/.github/workflows/update_dep.yml
index 3e3db3ad82..5c750bad9c 100644
--- a/.github/workflows/update_dep.yml
+++ b/.github/workflows/update_dep.yml
@@ -24,7 +24,7 @@ jobs:
               with:
                   node-version: 20
                   cache: pnpm
-            - run: pnpm install ${{ github.event.client_payload.package }}@${{ github.event.client_payload.version }} --save-exact --no-frozen-lockfile
+            - run: pnpm install ${{ github.event.client_payload.package }}@${{ github.event.client_payload.version }} --save-exact
             - uses: peter-evans/create-pull-request@v7
               id: cpr
               with:

From 7dc92d4b6c40fc1d439aee6a1550daa375929a97 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 5 Dec 2024 21:11:31 +0100
Subject: [PATCH 45/46] chore: fix update_dep.yml

---
 .github/workflows/update_dep.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update_dep.yml b/.github/workflows/update_dep.yml
index 5c750bad9c..ef4198db6b 100644
--- a/.github/workflows/update_dep.yml
+++ b/.github/workflows/update_dep.yml
@@ -24,7 +24,9 @@ jobs:
               with:
                   node-version: 20
                   cache: pnpm
-            - run: pnpm install ${{ github.event.client_payload.package }}@${{ github.event.client_payload.version }} --save-exact
+            - run: |
+                  pnpm install ${{ github.event.client_payload.package }}@${{ github.event.client_payload.version }} --save-exact
+                  pnpm install --no-frozen-lockfile
             - uses: peter-evans/create-pull-request@v7
               id: cpr
               with:

From bc6eccf6152c4cd91e75309f7ea0b8ad4e8835d4 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Tue, 10 Dec 2024 21:28:01 +0100
Subject: [PATCH 46/46] chore: update stale

---
 .github/workflows/stale.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index bad5333634..4d32e476b5 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -14,7 +14,7 @@ jobs:
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 30 days'
                   stale-pr-message: 'This pull request is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 30 days'
-                  days-before-stale: 180
-                  days-before-close: 30
+                  days-before-stale: 60
+                  days-before-close: 7
                   exempt-issue-labels: dont-stale
                   operations-per-run: 500