dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-10-06 22:37:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ignore): update zigbee-herdsman-converters to 23.6.0 (#26691)

Browse Source
This commit is contained in:
Koen Kanters
2025-03-11 21:55:32 +01:00
committed by GitHub
parent ea5e0d47a5
commit 06ba62b833
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -63,7 +63,7 @@
"winston-transport": "^4.9.0",
"ws": "^8.18.1",
"zigbee-herdsman": "3.3.2",
"zigbee-herdsman-converters": "23.4.0",
"zigbee-herdsman-converters": "23.6.0",
"zigbee2mqtt-frontend": "0.9.4"
},
"devDependencies": {
pnpm-lock.yaml
Generated
+5 -5
View File
@@ -78,8 +78,8 @@ importers:
specifier: 3.3.2
version: 3.3.2
zigbee-herdsman-converters:
specifier: 23.4.0
version: 23.4.0
specifier: 23.6.0
version: 23.6.0
zigbee2mqtt-frontend:
specifier: 0.9.4
version: 0.9.4
@@ -1818,8 +1818,8 @@ packages:
resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
engines: {node: '>=10'}
zigbee-herdsman-converters@23.4.0:
resolution: {integrity: sha512-m2BSgnLCZV6Oa53JPlVWDQSB7WzO9mkT0WlNGWstTUiBqqwMHH8g8MuLVeYS4FiCKl7/4HSLNkH7qWKusH1dVw==}
zigbee-herdsman-converters@23.6.0:
resolution: {integrity: sha512-5ysM0Djgacm2kutwjuBA8/MMWEJq+HwAn80ef8S7bCFqk1UDLec5LtoUAlcbRRIzvslYM6lYgnJ6+XkwcTwlMw==}
zigbee-herdsman@3.3.2:
resolution: {integrity: sha512-BTttXlK+vHI8KGhdh3bUSaDr2l+9A5ZcwMPSC8sDGucl5OcxKaDyY3ydJEIgnViW4iry8ntJujaojwYNNzQ/FA==}
@@ -3478,7 +3478,7 @@ snapshots:
yocto-queue@0.1.0: {}
zigbee-herdsman-converters@23.4.0:
zigbee-herdsman-converters@23.6.0:
dependencies:
buffer-crc32: 1.0.0
iconv-lite: 0.6.3
test/extensions/homeassistant.test.ts
+4 -7
View File
@@ -2,7 +2,7 @@ import * as data from '../mocks/data';
import {mockLogger} from '../mocks/logger';
import {events as mockMQTTEvents, mockMQTTPublishAsync, mockMQTTSubscribeAsync, mockMQTTUnsubscribeAsync} from '../mocks/mqtt';
import * as mockSleep from '../mocks/sleep';
import {flushPromises} from '../mocks/utils';
import {flushPromises, getZhcBaseDefinitions} from '../mocks/utils';
import {devices, groups, events as mockZHEvents} from '../mocks/zigbeeHerdsman';
import assert from 'node:assert';
@@ -83,11 +83,8 @@ describe('Extension: HomeAssistant', () => {
it('Should not have duplicate type/object_ids in a mapping', async () => {
const duplicated: string[] = [];
(await import('zigbee-herdsman-converters/devices/index')).default.forEach((baseDefinition) => {
const d = zhc.prepareDefinition(
// @ts-expect-error inferred type is wrong
baseDefinition,
);
for (const baseDefinition of await getZhcBaseDefinitions()) {
const d = zhc.prepareDefinition(baseDefinition);
const exposes = typeof d.exposes == 'function' ? d.exposes(undefined, undefined) : d.exposes;
const device = {
definition: d,
@@ -112,7 +109,7 @@ describe('Extension: HomeAssistant', () => {
cfgTypeObjectIds.push(id);
}
});
});
}
expect(duplicated).toHaveLength(0);
});
test/extensions/onEvent.test.ts
+3 -3
View File
@@ -1,7 +1,7 @@
import * as data from '../mocks/data';
import {mockLogger} from '../mocks/logger';
import {mockMQTTPublishAsync} from '../mocks/mqtt';
import {flushPromises} from '../mocks/utils';
import {flushPromises, getZhcBaseDefinitions} from '../mocks/utils';
import {devices, events as mockZHEvents} from '../mocks/zigbeeHerdsman';
import {MockInstance} from 'vitest';
@@ -19,8 +19,8 @@ describe('Extension: OnEvent', () => {
let mockLivoloOnEvent: MockInstance;
beforeAll(async () => {
const mappedLivolo = (await zhc.findByDevice(devices.LIVOLO))!;
mockLivoloOnEvent = vi.spyOn(mappedLivolo, 'onEvent');
const livoloDefinition = (await getZhcBaseDefinitions()).find((d) => d.zigbeeModel?.includes(devices.LIVOLO.modelID!))!;
mockLivoloOnEvent = vi.spyOn(livoloDefinition, 'onEvent');
});
beforeEach(async () => {
test/mocks/utils.ts
+6
View File
@@ -1,3 +1,5 @@
import type {DefinitionWithExtend} from 'zigbee-herdsman-converters';
export type EventHandler = (...args: unknown[]) => unknown;
export async function flushPromises(): Promise<void> {
@@ -12,3 +14,7 @@ export function defuseRejection<T>(promise: Promise<T>): Promise<T> {
return promise;
}
export async function getZhcBaseDefinitions(): Promise<DefinitionWithExtend[]> {
return (await import('zigbee-herdsman-converters/devices/index')).default;
}