From dc56658255d2fadfa4437342238285003c9e28c6 Mon Sep 17 00:00:00 2001 From: Nerivec <62446222+Nerivec@users.noreply.github.com> Date: Tue, 6 Oct 2026 16:04:57 +0200 Subject: [PATCH] fix: update zigbee-herdsman to 11.0.0 with new transport (#33116) Co-authored-by: Koen Kanters --- lib/zigbee.ts | 2 +- package.json | 4 ++-- pnpm-lock.yaml | 40 ++++++++++++++++++++++++++++++++-------- test/controller.test.ts | 2 +- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/lib/zigbee.ts b/lib/zigbee.ts index 83da498b0..68ec086cf 100644 --- a/lib/zigbee.ts +++ b/lib/zigbee.ts @@ -44,7 +44,7 @@ export default class Zigbee { databasePath: data.joinPath("database.db"), databaseBackupPath: data.joinPath("database.db.backup"), backupPath: data.joinPath("coordinator_backup.json"), - serialPort: { + transport: { baudRate: settings.get().serial.baudrate, rtscts: settings.get().serial.rtscts, path: settings.get().serial.port, diff --git a/package.json b/package.json index 1df66df6f..bd3cf9fba 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,8 @@ "winston-syslog": "^2.7.1", "winston-transport": "^4.9.0", "ws": "^8.22.0", - "zigbee-herdsman": "10.10.0", - "zigbee-herdsman-converters": "26.117.0", + "zigbee-herdsman": "11.0.0", + "zigbee-herdsman-converters": "26.117.1", "zigbee2mqtt-frontend": "0.9.21", "zigbee2mqtt-windfront": "2.15.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0ac2f0c7c..4f1cbdb5a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,11 +54,11 @@ importers: specifier: ^8.22.0 version: 8.22.0 zigbee-herdsman: - specifier: 10.10.0 - version: 10.10.0(supports-color@7.2.0) + specifier: 11.0.0 + version: 11.0.0(supports-color@7.2.0) zigbee-herdsman-converters: - specifier: 26.117.0 - version: 26.117.0(supports-color@7.2.0) + specifier: 26.117.1 + version: 26.117.1(supports-color@7.2.0) zigbee2mqtt-frontend: specifier: 0.9.21 version: 0.9.21 @@ -1275,18 +1275,26 @@ packages: utf-8-validate: optional: true - zigbee-herdsman-converters@26.117.0: - resolution: {integrity: sha512-63XvykpNhKKAfyvf9CZApeRi35Su3h5NkMbDylM0xLCsevs9JPVRrUQNXluUY7H96EqNJao/VYmL+CmrGiFoKA==} + zigbee-herdsman-converters@26.117.1: + resolution: {integrity: sha512-RdWs56XtRxBS2WBuL1C90JMe6OolLgLjDsZFfPckXElg6eZikPxXmiAVtJCtUHRWcZ6wnu4qlJz1Co0hnutznw==} engines: {node: ^22.2.0 || ^24 || <=26.2} zigbee-herdsman@10.10.0: resolution: {integrity: sha512-sd4ReEBDjC4UP7RzQjaAD0nP+WrDXaAac+ASJec0GNDcpyfbnT0qh+wJ2l8C3mw12f5eXX4nnA88A7h58QdTYA==} engines: {node: ^22.2.0 || ^24 || <=26.2} + zigbee-herdsman@11.0.0: + resolution: {integrity: sha512-WGY+rA9IlX6gaEAtQR22rDLh18T9Amcmtu9DT0xhNoBLrHRJVyQANCrwlpOEDcqMosMYUFQgLaqLTEKlfBqqqQ==} + engines: {node: ^22.2.0 || ^24 || <=26.2} + zigbee-on-host@0.2.4: resolution: {integrity: sha512-NIG6CWp+Yfn7PjqEIRvenHqpwT1U7rSkyimnFOUIFpnmxQOJKrmcwWDfn6WjbU/YIYYWSQPlj+g13icu1xwlyg==} engines: {node: ^20.19.0 || >=22.12.0} + zigbee-on-host@0.3.0: + resolution: {integrity: sha512-YamRE/RY3YeQRt/m6CzKyYYXGDkojgNXG1OpnhY6E0dUTLS8/E+KV8urZwNK3R4gNhHDpQ/icHwa44tMxNsyqQ==} + engines: {node: ^20.19.0 || >=22.12.0} + zigbee2mqtt-frontend@0.9.21: resolution: {integrity: sha512-ClHYlG7g0v/tnIsD6kycNCi1ZEKIbQuU7lGJR3WqYcDmuqEMVcHDGbRiRwYRQcZGMxkqCf7guxNsXiKnC10+kg==} engines: {node: '>=20.11'} @@ -2266,11 +2274,11 @@ snapshots: ws@8.22.0: {} - zigbee-herdsman-converters@26.117.0(supports-color@7.2.0): + zigbee-herdsman-converters@26.117.1(supports-color@7.2.0): dependencies: iconv-lite: 0.7.3 semver: 7.8.5 - zigbee-herdsman: 10.10.0(supports-color@7.2.0) + zigbee-herdsman: 11.0.0(supports-color@7.2.0) transitivePeerDependencies: - supports-color @@ -2288,8 +2296,24 @@ snapshots: transitivePeerDependencies: - supports-color + zigbee-herdsman@11.0.0(supports-color@7.2.0): + dependencies: + '@date-fns/tz': 1.5.0 + '@serialport/bindings-cpp': 13.0.1(supports-color@7.2.0) + '@serialport/parser-delimiter': 13.0.0 + '@serialport/stream': 13.0.0(supports-color@7.2.0) + bonjour-service: 1.4.4 + debounce: 3.0.0 + fast-deep-equal: 3.1.3 + slip: 1.0.2 + zigbee-on-host: 0.3.0 + transitivePeerDependencies: + - supports-color + zigbee-on-host@0.2.4: {} + zigbee-on-host@0.3.0: {} + zigbee2mqtt-frontend@0.9.21: {} zigbee2mqtt-windfront@2.15.0: {} diff --git a/test/controller.test.ts b/test/controller.test.ts index f6eeda0ec..226ba06fa 100644 --- a/test/controller.test.ts +++ b/test/controller.test.ts @@ -105,7 +105,7 @@ describe("Controller", () => { backupPath: path.join(data.mockDir, "coordinator_backup.json"), acceptJoiningDeviceHandler: expect.any(Function), adapter: {concurrent: undefined, delay: undefined, disableLED: false, transmitPower: 14}, - serialPort: {baudRate: undefined, rtscts: undefined, path: "/dev/dummy"}, + transport: {baudRate: undefined, rtscts: undefined, path: "/dev/dummy"}, }); expect(mockZHController.start).toHaveBeenCalledTimes(1); expect(mockLogger.info).toHaveBeenCalledWith(`Currently ${Object.values(devices).length - 1} devices are joined.`);