@switchbot/homebridge-switchbot 5.0.0-beta.4 → 5.0.0-beta.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +13 -0
- package/README.md +23 -3
- package/config.schema.json +722 -13684
- package/dist/devices-hap/device.d.ts +18 -8
- package/dist/devices-hap/device.d.ts.map +1 -1
- package/dist/devices-hap/device.js +121 -68
- package/dist/devices-hap/device.js.map +1 -1
- package/dist/devices-matter/BaseMatterAccessory.d.ts +27 -0
- package/dist/devices-matter/BaseMatterAccessory.d.ts.map +1 -1
- package/dist/devices-matter/BaseMatterAccessory.js +169 -5
- package/dist/devices-matter/BaseMatterAccessory.js.map +1 -1
- package/dist/devices-matter/ColorLightAccessory.d.ts.map +1 -1
- package/dist/devices-matter/ColorLightAccessory.js +12 -12
- package/dist/devices-matter/ColorLightAccessory.js.map +1 -1
- package/dist/devices-matter/ColorTemperatureLightAccessory.d.ts.map +1 -1
- package/dist/devices-matter/ColorTemperatureLightAccessory.js +5 -7
- package/dist/devices-matter/ColorTemperatureLightAccessory.js.map +1 -1
- package/dist/devices-matter/DimmableLightAccessory.js +9 -9
- package/dist/devices-matter/DimmableLightAccessory.js.map +1 -1
- package/dist/devices-matter/ExtendedColorLightAccessory.d.ts.map +1 -1
- package/dist/devices-matter/ExtendedColorLightAccessory.js +14 -15
- package/dist/devices-matter/ExtendedColorLightAccessory.js.map +1 -1
- package/dist/devices-matter/OnOffLightAccessory.d.ts.map +1 -1
- package/dist/devices-matter/OnOffLightAccessory.js +8 -16
- package/dist/devices-matter/OnOffLightAccessory.js.map +1 -1
- package/dist/devices-matter/OnOffOutletAccessory.d.ts +2 -0
- package/dist/devices-matter/OnOffOutletAccessory.d.ts.map +1 -1
- package/dist/devices-matter/OnOffOutletAccessory.js +10 -7
- package/dist/devices-matter/OnOffOutletAccessory.js.map +1 -1
- package/dist/devices-matter/OnOffSwitchAccessory.js +2 -2
- package/dist/devices-matter/OnOffSwitchAccessory.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +48 -1
- package/dist/homebridge-ui/server.js +53 -8
- package/dist/homebridge-ui/server.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -7
- package/dist/index.js.map +1 -1
- package/dist/irdevice/irdevice.d.ts +11 -10
- package/dist/irdevice/irdevice.d.ts.map +1 -1
- package/dist/irdevice/irdevice.js +76 -35
- package/dist/irdevice/irdevice.js.map +1 -1
- package/dist/platform-hap.d.ts +21 -15
- package/dist/platform-hap.d.ts.map +1 -1
- package/dist/platform-hap.js +246 -147
- package/dist/platform-hap.js.map +1 -1
- package/dist/platform-matter.d.ts +88 -6
- package/dist/platform-matter.d.ts.map +1 -1
- package/dist/platform-matter.js +1726 -243
- package/dist/platform-matter.js.map +1 -1
- package/dist/settings.d.ts +41 -6
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js.map +1 -1
- package/dist/test/hap/platform-hap.logging.test.d.ts +2 -0
- package/dist/test/hap/platform-hap.logging.test.d.ts.map +1 -0
- package/dist/test/hap/platform-hap.logging.test.js +33 -0
- package/dist/test/hap/platform-hap.logging.test.js.map +1 -0
- package/dist/test/hap/platform-hap.test.d.ts +2 -0
- package/dist/test/hap/platform-hap.test.d.ts.map +1 -0
- package/dist/test/hap/platform-hap.test.js +62 -0
- package/dist/test/hap/platform-hap.test.js.map +1 -0
- package/dist/test/helpers/platform-fixtures.d.ts +9 -0
- package/dist/test/helpers/platform-fixtures.d.ts.map +1 -0
- package/dist/test/helpers/platform-fixtures.js +30 -0
- package/dist/test/helpers/platform-fixtures.js.map +1 -0
- package/dist/{index.test.d.ts.map → test/index.test.d.ts.map} +1 -1
- package/dist/test/index.test.js +19 -0
- package/dist/test/index.test.js.map +1 -0
- package/dist/test/matter/devices-matter/baseMatterAccessory.test.d.ts +2 -0
- package/dist/test/matter/devices-matter/baseMatterAccessory.test.d.ts.map +1 -0
- package/dist/test/matter/devices-matter/baseMatterAccessory.test.js +71 -0
- package/dist/test/matter/devices-matter/baseMatterAccessory.test.js.map +1 -0
- package/dist/test/matter/platform-matter.additional.test.d.ts +2 -0
- package/dist/test/matter/platform-matter.additional.test.d.ts.map +1 -0
- package/dist/test/matter/platform-matter.additional.test.js +35 -0
- package/dist/test/matter/platform-matter.additional.test.js.map +1 -0
- package/dist/test/matter/platform-matter.bleparse.test.d.ts +2 -0
- package/dist/test/matter/platform-matter.bleparse.test.d.ts.map +1 -0
- package/dist/test/matter/platform-matter.bleparse.test.js +43 -0
- package/dist/test/matter/platform-matter.bleparse.test.js.map +1 -0
- package/dist/test/matter/platform-matter.cleanup.test.d.ts +2 -0
- package/dist/test/matter/platform-matter.cleanup.test.d.ts.map +1 -0
- package/dist/test/matter/platform-matter.cleanup.test.js +70 -0
- package/dist/test/matter/platform-matter.cleanup.test.js.map +1 -0
- package/dist/test/matter/platform-matter.keepstale.test.d.ts +2 -0
- package/dist/test/matter/platform-matter.keepstale.test.d.ts.map +1 -0
- package/dist/test/matter/platform-matter.keepstale.test.js +27 -0
- package/dist/test/matter/platform-matter.keepstale.test.js.map +1 -0
- package/dist/test/matter/platform-matter.logging.test.d.ts +2 -0
- package/dist/test/matter/platform-matter.logging.test.d.ts.map +1 -0
- package/dist/test/matter/platform-matter.logging.test.js +29 -0
- package/dist/test/matter/platform-matter.logging.test.js.map +1 -0
- package/dist/test/matter/platform-matter.mapping.test.d.ts +2 -0
- package/dist/test/matter/platform-matter.mapping.test.d.ts.map +1 -0
- package/dist/test/matter/platform-matter.mapping.test.js +43 -0
- package/dist/test/matter/platform-matter.mapping.test.js.map +1 -0
- package/dist/test/matter/platform-matter.openapi-mapping.test.d.ts +2 -0
- package/dist/test/matter/platform-matter.openapi-mapping.test.d.ts.map +1 -0
- package/dist/test/matter/platform-matter.openapi-mapping.test.js +84 -0
- package/dist/test/matter/platform-matter.openapi-mapping.test.js.map +1 -0
- package/dist/test/matter/platform-matter.test.d.ts +2 -0
- package/dist/test/matter/platform-matter.test.d.ts.map +1 -0
- package/dist/test/matter/platform-matter.test.js +117 -0
- package/dist/test/matter/platform-matter.test.js.map +1 -0
- package/dist/test/matter/platform-matter.unregister.test.d.ts +2 -0
- package/dist/test/matter/platform-matter.unregister.test.d.ts.map +1 -0
- package/dist/test/matter/platform-matter.unregister.test.js +30 -0
- package/dist/test/matter/platform-matter.unregister.test.js.map +1 -0
- package/dist/test/utils.test.d.ts +2 -0
- package/dist/test/utils.test.d.ts.map +1 -0
- package/dist/test/utils.test.js +95 -0
- package/dist/test/utils.test.js.map +1 -0
- package/dist/test/verifyconfig.test.d.ts.map +1 -0
- package/dist/{verifyconfig.test.js → test/verifyconfig.test.js} +2 -2
- package/dist/test/verifyconfig.test.js.map +1 -0
- package/dist/utils.d.ts +196 -3
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +656 -30
- package/dist/utils.js.map +1 -1
- package/docs/assets/main.js +2 -2
- package/docs/index.html +20 -2
- package/docs/variables/default.html +1 -1
- package/package.json +14 -14
- package/src/devices-hap/device.ts +129 -69
- package/src/devices-matter/BaseMatterAccessory.ts +176 -5
- package/src/devices-matter/ColorLightAccessory.ts +12 -12
- package/src/devices-matter/ColorTemperatureLightAccessory.ts +5 -7
- package/src/devices-matter/DimmableLightAccessory.ts +9 -9
- package/src/devices-matter/ExtendedColorLightAccessory.ts +14 -15
- package/src/devices-matter/OnOffLightAccessory.ts +8 -16
- package/src/devices-matter/OnOffOutletAccessory.ts +12 -7
- package/src/devices-matter/OnOffSwitchAccessory.ts +2 -2
- package/src/homebridge-ui/public/index.html +48 -1
- package/src/homebridge-ui/server.ts +55 -8
- package/src/index.ts +4 -7
- package/src/irdevice/irdevice.ts +74 -35
- package/src/platform-hap.ts +270 -160
- package/src/platform-matter.ts +1768 -240
- package/src/settings.ts +45 -2
- package/src/test/hap/platform-hap.logging.test.ts +36 -0
- package/src/test/hap/platform-hap.test.ts +70 -0
- package/src/test/helpers/platform-fixtures.ts +33 -0
- package/src/test/index.test.ts +24 -0
- package/src/test/matter/devices-matter/baseMatterAccessory.test.ts +88 -0
- package/src/test/matter/platform-matter.additional.test.ts +44 -0
- package/src/test/matter/platform-matter.bleparse.test.ts +47 -0
- package/src/test/matter/platform-matter.cleanup.test.ts +86 -0
- package/src/test/matter/platform-matter.keepstale.test.ts +37 -0
- package/src/test/matter/platform-matter.logging.test.ts +33 -0
- package/src/test/matter/platform-matter.mapping.test.ts +57 -0
- package/src/test/matter/platform-matter.openapi-mapping.test.ts +109 -0
- package/src/test/matter/platform-matter.test.ts +144 -0
- package/src/test/matter/platform-matter.unregister.test.ts +39 -0
- package/src/test/utils.test.ts +96 -0
- package/src/{verifyconfig.test.ts → test/verifyconfig.test.ts} +12 -11
- package/src/utils.ts +714 -32
- package/dist/index.test.js +0 -14
- package/dist/index.test.js.map +0 -1
- package/dist/verifyconfig.test.d.ts.map +0 -1
- package/dist/verifyconfig.test.js.map +0 -1
- package/src/index.test.ts +0 -19
- /package/dist/{index.test.d.ts → test/index.test.d.ts} +0 -0
- /package/dist/{verifyconfig.test.d.ts → test/verifyconfig.test.d.ts} +0 -0
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest'
|
|
2
|
+
|
|
3
|
+
import { SwitchBotMatterPlatform } from '../../platform-matter.js'
|
|
4
|
+
import { makeApiStub, makeLogStub } from '../helpers/platform-fixtures.js'
|
|
5
|
+
|
|
6
|
+
describe('platform-matter OpenAPI -> Matter mapping', () => {
|
|
7
|
+
it('maps light OpenAPI status (on/off, brightness, color, battery) to accessory instance helpers', async () => {
|
|
8
|
+
const api: any = makeApiStub()
|
|
9
|
+
const log = makeLogStub()
|
|
10
|
+
const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
|
|
11
|
+
|
|
12
|
+
const deviceId = 'LIGHT-1'
|
|
13
|
+
const nid = (platform as any).normalizeDeviceId(deviceId)
|
|
14
|
+
|
|
15
|
+
const instance = {
|
|
16
|
+
updateOnOffState: vi.fn(),
|
|
17
|
+
updateBrightness: vi.fn(),
|
|
18
|
+
updateHueSaturation: vi.fn(),
|
|
19
|
+
updateBatteryPercentage: vi.fn(),
|
|
20
|
+
}
|
|
21
|
+
;(platform as any).accessoryInstances.set(nid, instance)
|
|
22
|
+
|
|
23
|
+
const status = { power: true, brightness: 80, color: '255:128:64', battery: 92 }
|
|
24
|
+
await (platform as any).applyStatusToAccessory('uuid-light', { deviceId } as any, status)
|
|
25
|
+
|
|
26
|
+
expect(instance.updateOnOffState).toHaveBeenCalled()
|
|
27
|
+
expect(instance.updateBrightness).toHaveBeenCalled()
|
|
28
|
+
expect(instance.updateHueSaturation).toHaveBeenCalled()
|
|
29
|
+
expect(instance.updateBatteryPercentage).toHaveBeenCalled()
|
|
30
|
+
})
|
|
31
|
+
|
|
32
|
+
it('maps MeterPro OpenAPI status (temp, humid, co2, pm25, voc) to accessory instance helpers', async () => {
|
|
33
|
+
const api: any = makeApiStub()
|
|
34
|
+
const log = makeLogStub()
|
|
35
|
+
const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
|
|
36
|
+
|
|
37
|
+
const deviceId = 'METERPRO-1'
|
|
38
|
+
const nid = (platform as any).normalizeDeviceId(deviceId)
|
|
39
|
+
|
|
40
|
+
const instance = {
|
|
41
|
+
updateTemperature: vi.fn(),
|
|
42
|
+
updateHumidity: vi.fn(),
|
|
43
|
+
updateCO2: vi.fn(),
|
|
44
|
+
updatePM25: vi.fn(),
|
|
45
|
+
updateVOC: vi.fn(),
|
|
46
|
+
}
|
|
47
|
+
;(platform as any).accessoryInstances.set(nid, instance)
|
|
48
|
+
|
|
49
|
+
const status = { temp: 21.4, humid: 45, co2: 410, pm25: 12, voc: 85 }
|
|
50
|
+
await (platform as any).applyStatusToAccessory('uuid-meter', { deviceId } as any, status)
|
|
51
|
+
|
|
52
|
+
expect(instance.updateTemperature).toHaveBeenCalled()
|
|
53
|
+
expect(instance.updateHumidity).toHaveBeenCalled()
|
|
54
|
+
expect(instance.updateCO2).toHaveBeenCalled()
|
|
55
|
+
expect(instance.updatePM25).toHaveBeenCalled()
|
|
56
|
+
expect(instance.updateVOC).toHaveBeenCalled()
|
|
57
|
+
})
|
|
58
|
+
|
|
59
|
+
it('maps lock OpenAPI status to lock helper', async () => {
|
|
60
|
+
const api: any = makeApiStub()
|
|
61
|
+
const log = makeLogStub()
|
|
62
|
+
const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
|
|
63
|
+
|
|
64
|
+
const deviceId = 'LOCK-1'
|
|
65
|
+
const nid = (platform as any).normalizeDeviceId(deviceId)
|
|
66
|
+
|
|
67
|
+
const instance = { updateLockState: vi.fn() }
|
|
68
|
+
;(platform as any).accessoryInstances.set(nid, instance)
|
|
69
|
+
|
|
70
|
+
const status = { lock: true }
|
|
71
|
+
await (platform as any).applyStatusToAccessory('uuid-lock', { deviceId } as any, status)
|
|
72
|
+
|
|
73
|
+
expect(instance.updateLockState).toHaveBeenCalled()
|
|
74
|
+
})
|
|
75
|
+
|
|
76
|
+
it('maps curtain position synonyms to lift position helper', async () => {
|
|
77
|
+
const api: any = makeApiStub()
|
|
78
|
+
const log = makeLogStub()
|
|
79
|
+
const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
|
|
80
|
+
|
|
81
|
+
const deviceId = 'CURTAIN-1'
|
|
82
|
+
const nid = (platform as any).normalizeDeviceId(deviceId)
|
|
83
|
+
|
|
84
|
+
const instance = { updateLiftPosition: vi.fn() }
|
|
85
|
+
;(platform as any).accessoryInstances.set(nid, instance)
|
|
86
|
+
|
|
87
|
+
await (platform as any).applyStatusToAccessory('uuid-cur', { deviceId, deviceType: 'Curtain' } as any, { position: 25 })
|
|
88
|
+
await (platform as any).applyStatusToAccessory('uuid-cur', { deviceId, deviceType: 'Curtain' } as any, { slidePosition: 75 })
|
|
89
|
+
|
|
90
|
+
expect(instance.updateLiftPosition).toHaveBeenCalled()
|
|
91
|
+
})
|
|
92
|
+
|
|
93
|
+
it('maps robot vacuum run state / on to updateRunMode or updateOperationalState', async () => {
|
|
94
|
+
const api: any = makeApiStub()
|
|
95
|
+
const log = makeLogStub()
|
|
96
|
+
const platform = new SwitchBotMatterPlatform(log as any, {} as any, api)
|
|
97
|
+
|
|
98
|
+
const deviceId = 'RVC-1'
|
|
99
|
+
const nid = (platform as any).normalizeDeviceId(deviceId)
|
|
100
|
+
|
|
101
|
+
const instance: any = { updateRunMode: vi.fn(), updateOperationalState: vi.fn() }
|
|
102
|
+
;(platform as any).accessoryInstances.set(nid, instance)
|
|
103
|
+
|
|
104
|
+
await (platform as any).applyStatusToAccessory('uuid-rvc', { deviceId, deviceType: 'K10+' } as any, { runState: 'cleaning', power: true })
|
|
105
|
+
|
|
106
|
+
const calls = (instance.updateRunMode.mock?.calls?.length || 0) + (instance.updateOperationalState.mock?.calls?.length || 0)
|
|
107
|
+
expect(calls).toBeGreaterThan(0)
|
|
108
|
+
})
|
|
109
|
+
})
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest'
|
|
2
|
+
|
|
3
|
+
import { SwitchBotMatterPlatform } from '../../platform-matter.js'
|
|
4
|
+
import { PLATFORM_NAME, PLUGIN_NAME } from '../../settings.js'
|
|
5
|
+
import { makeApiStub, makeLogStub } from '../helpers/platform-fixtures.js'
|
|
6
|
+
|
|
7
|
+
describe('platform-matter discovered devices', () => {
|
|
8
|
+
it('uses discovered devices and registers them (platform + robotic)', async () => {
|
|
9
|
+
const mockRegister = vi.fn()
|
|
10
|
+
const api: any = makeApiStub({
|
|
11
|
+
registerPlatformAccessories: mockRegister,
|
|
12
|
+
clusterNames: { OnOff: 'OnOff', LevelControl: 'LevelControl', ColorControl: 'ColorControl' },
|
|
13
|
+
deviceTypes: { RoboticVacuumCleaner: 'rvc' },
|
|
14
|
+
})
|
|
15
|
+
|
|
16
|
+
const log: any = makeLogStub()
|
|
17
|
+
|
|
18
|
+
const config: any = {}
|
|
19
|
+
|
|
20
|
+
const platform = new SwitchBotMatterPlatform(log, config, api)
|
|
21
|
+
|
|
22
|
+
// Provide discovered devices
|
|
23
|
+
;(platform as any).discoveredDevices = [
|
|
24
|
+
{ deviceId: 'dev1', deviceName: 'Lamp', deviceType: 'Plug' },
|
|
25
|
+
{ deviceId: 'vac1', deviceName: 'Vac', deviceType: 'K10+' },
|
|
26
|
+
] as any
|
|
27
|
+
|
|
28
|
+
// Stub accessory creation to avoid instantiating full device classes
|
|
29
|
+
;(platform as any).createAccessoryFromDevice = async (dev: any) => ({ displayName: dev.deviceName, uuid: api.matter.uuid.generate(dev.deviceId) } as any)
|
|
30
|
+
|
|
31
|
+
await (platform as any).registerMatterAccessories()
|
|
32
|
+
|
|
33
|
+
// Ensure registerPlatformAccessories was called at least once
|
|
34
|
+
expect(mockRegister).toHaveBeenCalled()
|
|
35
|
+
|
|
36
|
+
// Sum total accessories registered across all calls
|
|
37
|
+
const totalRegistered = mockRegister.mock.calls.reduce((sum: number, call: any) => sum + ((call[2] && call[2].length) || 0), 0)
|
|
38
|
+
expect(totalRegistered).toBe(2)
|
|
39
|
+
|
|
40
|
+
// Verify PLUGIN_NAME and PLATFORM_NAME were used in the calls
|
|
41
|
+
for (const call of mockRegister.mock.calls) {
|
|
42
|
+
expect(call[0]).toBe(PLUGIN_NAME)
|
|
43
|
+
expect(call[1]).toBe(PLATFORM_NAME)
|
|
44
|
+
}
|
|
45
|
+
})
|
|
46
|
+
|
|
47
|
+
it('applies per-device config overrides when deviceId matches discovered device', async () => {
|
|
48
|
+
const mockRegister = vi.fn()
|
|
49
|
+
|
|
50
|
+
const api: any = {
|
|
51
|
+
matter: {
|
|
52
|
+
uuid: { generate: (s: string) => `uuid-${s}` },
|
|
53
|
+
registerPlatformAccessories: mockRegister,
|
|
54
|
+
clusterNames: { OnOff: 'OnOff', LevelControl: 'LevelControl', ColorControl: 'ColorControl' },
|
|
55
|
+
deviceTypes: { RoboticVacuumCleaner: 'rvc' },
|
|
56
|
+
},
|
|
57
|
+
isMatterAvailable: () => true,
|
|
58
|
+
isMatterEnabled: () => true,
|
|
59
|
+
on: () => {},
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
const log: any = { info: vi.fn(), warn: vi.fn(), debug: vi.fn(), error: vi.fn() }
|
|
63
|
+
|
|
64
|
+
const config: any = {
|
|
65
|
+
options: {
|
|
66
|
+
devices: [{ deviceId: 'dev1', configDeviceName: 'Configured Lamp', logging: 'debug' }],
|
|
67
|
+
},
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
const platform = new SwitchBotMatterPlatform(log, config, api)
|
|
71
|
+
|
|
72
|
+
;(platform as any).discoveredDevices = [{ deviceId: 'dev1', deviceName: 'Lamp', deviceType: 'Plug' }] as any
|
|
73
|
+
|
|
74
|
+
const seen: any[] = []
|
|
75
|
+
;(platform as any).createAccessoryFromDevice = async (dev: any) => {
|
|
76
|
+
seen.push(dev)
|
|
77
|
+
return {
|
|
78
|
+
displayName: dev.deviceName ?? dev.configDeviceName,
|
|
79
|
+
uuid: api.matter.uuid.generate(dev.deviceId),
|
|
80
|
+
} as any
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
await (platform as any).registerMatterAccessories()
|
|
84
|
+
|
|
85
|
+
// createAccessoryFromDevice should have been called once with merged config
|
|
86
|
+
expect(seen.length).toBe(1)
|
|
87
|
+
expect(seen[0].deviceId).toBe('dev1')
|
|
88
|
+
// per-device config values should be present on the merged device
|
|
89
|
+
expect(seen[0].configDeviceName).toBe('Configured Lamp')
|
|
90
|
+
expect(seen[0].logging).toBe('debug')
|
|
91
|
+
})
|
|
92
|
+
|
|
93
|
+
it('ignores config-only devices by default but includes them when allowConfigOnlyDevices=true', async () => {
|
|
94
|
+
const mockRegister = vi.fn()
|
|
95
|
+
|
|
96
|
+
const api: any = {
|
|
97
|
+
matter: {
|
|
98
|
+
uuid: { generate: (s: string) => `uuid-${s}` },
|
|
99
|
+
registerPlatformAccessories: mockRegister,
|
|
100
|
+
clusterNames: { OnOff: 'OnOff', LevelControl: 'LevelControl', ColorControl: 'ColorControl' },
|
|
101
|
+
deviceTypes: { RoboticVacuumCleaner: 'rvc' },
|
|
102
|
+
},
|
|
103
|
+
isMatterAvailable: () => true,
|
|
104
|
+
isMatterEnabled: () => true,
|
|
105
|
+
on: () => {},
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
const log: any = { info: vi.fn(), warn: vi.fn(), debug: vi.fn(), error: vi.fn() }
|
|
109
|
+
|
|
110
|
+
// config-only device (cfg1) and one discovered device (dev1)
|
|
111
|
+
const cfgOnly = { deviceId: 'cfg1', configDeviceName: 'OnlyInConfig', deviceType: 'Plug' }
|
|
112
|
+
const configDefault: any = { options: { devices: [cfgOnly] } }
|
|
113
|
+
|
|
114
|
+
const platformDefault = new SwitchBotMatterPlatform(log, configDefault, api)
|
|
115
|
+
;(platformDefault as any).discoveredDevices = [{ deviceId: 'dev1', deviceName: 'Lamp', deviceType: 'Plug' }] as any
|
|
116
|
+
const seenDefault: any[] = []
|
|
117
|
+
;(platformDefault as any).createAccessoryFromDevice = async (dev: any) => {
|
|
118
|
+
seenDefault.push(dev)
|
|
119
|
+
return {
|
|
120
|
+
displayName: dev.deviceName ?? dev.configDeviceName,
|
|
121
|
+
uuid: api.matter.uuid.generate(dev.deviceId),
|
|
122
|
+
} as any
|
|
123
|
+
}
|
|
124
|
+
await (platformDefault as any).registerMatterAccessories()
|
|
125
|
+
// Should only see discovered device (cfg1 ignored)
|
|
126
|
+
expect(seenDefault.find((d: any) => d.deviceId === 'cfg1')).toBeUndefined()
|
|
127
|
+
|
|
128
|
+
// Now opt-in to include config-only devices
|
|
129
|
+
const configOptIn: any = { options: { devices: [cfgOnly], allowConfigOnlyDevices: true } }
|
|
130
|
+
const platformOptIn = new SwitchBotMatterPlatform(log, configOptIn, api)
|
|
131
|
+
;(platformOptIn as any).discoveredDevices = [{ deviceId: 'dev1', deviceName: 'Lamp', deviceType: 'Plug' }] as any
|
|
132
|
+
const seenOptIn: any[] = []
|
|
133
|
+
;(platformOptIn as any).createAccessoryFromDevice = async (dev: any) => {
|
|
134
|
+
seenOptIn.push(dev)
|
|
135
|
+
return {
|
|
136
|
+
displayName: dev.deviceName ?? dev.configDeviceName,
|
|
137
|
+
uuid: api.matter.uuid.generate(dev.deviceId),
|
|
138
|
+
} as any
|
|
139
|
+
}
|
|
140
|
+
await (platformOptIn as any).registerMatterAccessories()
|
|
141
|
+
// Should include the config-only device now
|
|
142
|
+
expect(seenOptIn.find((d: any) => d.deviceId === 'cfg1')).toBeDefined()
|
|
143
|
+
})
|
|
144
|
+
})
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest'
|
|
2
|
+
|
|
3
|
+
import { SwitchBotMatterPlatform } from '../../platform-matter.js'
|
|
4
|
+
import { makeApiStub, makeLogStub } from '../helpers/platform-fixtures.js'
|
|
5
|
+
|
|
6
|
+
describe('removeDisabledAccessories and unregister edge cases', () => {
|
|
7
|
+
it('clears resources and unregisters accessory even with invalid timer and non-MAC deviceId', async () => {
|
|
8
|
+
// Prepare API stub
|
|
9
|
+
const unregister = vi.fn()
|
|
10
|
+
const api: any = makeApiStub({ unregisterPlatformAccessories: unregister })
|
|
11
|
+
const log: any = makeLogStub()
|
|
12
|
+
const platform = new SwitchBotMatterPlatform(log as any, { enableOnOffLight: false } as any, api)
|
|
13
|
+
|
|
14
|
+
// Build a fake serialized accessory matching the generated UUID for OnOff Light
|
|
15
|
+
const uuid = api.matter.uuid.generate('matter-onoff-light')
|
|
16
|
+
const accessory: any = { uuid, displayName: 'OnOff Light', context: { deviceId: 'NOT-A-MAC' } }
|
|
17
|
+
|
|
18
|
+
// Put invalid timer object into refreshTimers to ensure code handles it
|
|
19
|
+
const nid = (platform as any).normalizeDeviceId(accessory.context.deviceId)
|
|
20
|
+
;(platform as any).refreshTimers.set(nid, null as any)
|
|
21
|
+
;(platform as any).accessoryInstances.set(nid, { dummy: true })
|
|
22
|
+
|
|
23
|
+
// Insert accessory into matterAccessories so removeDisabledAccessories will see it
|
|
24
|
+
;(platform as any).matterAccessories.set(uuid, accessory)
|
|
25
|
+
|
|
26
|
+
// Spy on clearDeviceResources
|
|
27
|
+
const spyClear = vi.spyOn(platform as any, 'clearDeviceResources')
|
|
28
|
+
|
|
29
|
+
// Call removeDisabledAccessories directly
|
|
30
|
+
await (platform as any).removeDisabledAccessories()
|
|
31
|
+
|
|
32
|
+
// Expect unregister was called and matterAccessories cleared
|
|
33
|
+
expect(unregister).toHaveBeenCalled()
|
|
34
|
+
expect((platform as any).matterAccessories.get(uuid)).toBeUndefined()
|
|
35
|
+
|
|
36
|
+
// clearDeviceResources should have been called with the accessory.deviceId
|
|
37
|
+
expect(spyClear).toHaveBeenCalledWith(accessory.context.deviceId)
|
|
38
|
+
})
|
|
39
|
+
})
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest'
|
|
2
|
+
|
|
3
|
+
import { createPlatformProxy, detectMatter } from '../utils.js'
|
|
4
|
+
|
|
5
|
+
describe('detectMatter', () => {
|
|
6
|
+
it('returns enabled true when api.isMatterEnabled is a function that returns true', () => {
|
|
7
|
+
const api: any = { isMatterEnabled: () => true }
|
|
8
|
+
const info = detectMatter(api)
|
|
9
|
+
expect(info.enabled).toBe(true)
|
|
10
|
+
expect(info.reason).toMatch(/isMatterEnabled\(\)/)
|
|
11
|
+
})
|
|
12
|
+
|
|
13
|
+
it('returns enabled true when api.isMatterEnabled is a truthy property', () => {
|
|
14
|
+
const api: any = { isMatterEnabled: true }
|
|
15
|
+
const info = detectMatter(api)
|
|
16
|
+
expect(info.enabled).toBe(true)
|
|
17
|
+
expect(info.reason).toMatch(/property present/)
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
it('uses server fallback when present', () => {
|
|
21
|
+
const api: any = { server: { isMatterEnabled: () => false } }
|
|
22
|
+
const info = detectMatter(api)
|
|
23
|
+
expect(info.enabled).toBe(false)
|
|
24
|
+
expect(info.reason).toMatch(/server.isMatterEnabled\(\)/)
|
|
25
|
+
})
|
|
26
|
+
|
|
27
|
+
it('returns enabled false with a reason when no API is present', () => {
|
|
28
|
+
const api: any = {}
|
|
29
|
+
const info = detectMatter(api)
|
|
30
|
+
expect(info.enabled).toBe(false)
|
|
31
|
+
expect(typeof info.reason).toBe('string')
|
|
32
|
+
})
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
describe('createPlatformProxy', () => {
|
|
36
|
+
it('selects HAP platform when Matter is disabled and delegates configureAccessory', () => {
|
|
37
|
+
class HapStub {
|
|
38
|
+
public static created = false
|
|
39
|
+
public configured: any = undefined
|
|
40
|
+
constructor(public log: any, public config: any, public api: any) {
|
|
41
|
+
HapStub.created = true
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
configureAccessory(acc: any) {
|
|
45
|
+
this.configured = acc
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
class MatterStub {
|
|
50
|
+
constructor() {
|
|
51
|
+
throw new Error('should not be constructed')
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
const ProxyCtor = createPlatformProxy(HapStub as any, MatterStub as any)
|
|
56
|
+
const log = { info: vi.fn() }
|
|
57
|
+
const api = { isMatterEnabled: false }
|
|
58
|
+
const proxy = new (ProxyCtor as any)(log, {}, api)
|
|
59
|
+
|
|
60
|
+
// delegate should be instance of HapStub
|
|
61
|
+
expect(HapStub.created).toBe(true)
|
|
62
|
+
expect(typeof proxy.delegate.configureAccessory).toBe('function')
|
|
63
|
+
proxy.configureAccessory('accessory')
|
|
64
|
+
expect(proxy.delegate.configured).toBe('accessory')
|
|
65
|
+
// log should mention HAP
|
|
66
|
+
expect((log.info as any).mock.calls[0][0]).toMatch(/HAP/)
|
|
67
|
+
})
|
|
68
|
+
|
|
69
|
+
it('selects Matter platform when isMatterEnabled is true', () => {
|
|
70
|
+
class HapStub2 {
|
|
71
|
+
constructor() {
|
|
72
|
+
throw new Error('should not be constructed')
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
class MatterStub2 {
|
|
77
|
+
public configured: any = undefined
|
|
78
|
+
constructor(public log: any, public config: any, public api: any) {}
|
|
79
|
+
|
|
80
|
+
configureMatterAccessory(acc: any) {
|
|
81
|
+
this.configured = acc
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
const ProxyCtor = createPlatformProxy(HapStub2 as any, MatterStub2 as any)
|
|
86
|
+
const log = { info: vi.fn() }
|
|
87
|
+
const api = { isMatterEnabled: () => true }
|
|
88
|
+
const proxy = new (ProxyCtor as any)(log, {}, api)
|
|
89
|
+
|
|
90
|
+
// delegate should be instance of MatterStub2
|
|
91
|
+
expect(typeof proxy.delegate.configureMatterAccessory).toBe('function')
|
|
92
|
+
;(proxy as any).configureMatterAccessory('macc')
|
|
93
|
+
expect(proxy.delegate.configured).toBe('macc')
|
|
94
|
+
expect((log.info as any).mock.calls[0][0]).toMatch(/Matter/)
|
|
95
|
+
})
|
|
96
|
+
})
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import type { SwitchBotPlatformConfig } from '../settings.js'
|
|
2
|
+
|
|
3
|
+
import { describe, expect, it } from 'vitest'
|
|
3
4
|
|
|
4
5
|
// Create a minimal mock of the SwitchBotPlatform to test verifyConfig
|
|
5
6
|
class MockSwitchBotPlatform {
|
|
@@ -102,10 +103,10 @@ describe('verifyConfig fix for reboot loop', () => {
|
|
|
102
103
|
|
|
103
104
|
// This should NOT throw an error anymore - it should log instead
|
|
104
105
|
await expect(platform.verifyConfig()).resolves.not.toThrow()
|
|
105
|
-
|
|
106
|
+
|
|
106
107
|
// Verify that the error was logged instead of thrown
|
|
107
108
|
expect(platform.errorLogCalls).toContain(
|
|
108
|
-
'The devices config section is missing the *Device ID* in the config. Please check your config.'
|
|
109
|
+
'The devices config section is missing the *Device ID* in the config. Please check your config.',
|
|
109
110
|
)
|
|
110
111
|
})
|
|
111
112
|
|
|
@@ -132,10 +133,10 @@ describe('verifyConfig fix for reboot loop', () => {
|
|
|
132
133
|
|
|
133
134
|
// This should NOT throw an error anymore - it should log instead
|
|
134
135
|
await expect(platform.verifyConfig()).resolves.not.toThrow()
|
|
135
|
-
|
|
136
|
+
|
|
136
137
|
// Verify that the error was logged instead of thrown
|
|
137
138
|
expect(platform.errorLogCalls).toContain(
|
|
138
|
-
'The devices config section is missing the *Device Type* in the config. Please check your config.'
|
|
139
|
+
'The devices config section is missing the *Device Type* in the config. Please check your config.',
|
|
139
140
|
)
|
|
140
141
|
})
|
|
141
142
|
|
|
@@ -187,11 +188,11 @@ describe('verifyConfig fix for reboot loop', () => {
|
|
|
187
188
|
|
|
188
189
|
// Should not throw or log device config errors with valid config
|
|
189
190
|
await expect(platform.verifyConfig()).resolves.not.toThrow()
|
|
190
|
-
|
|
191
|
+
|
|
191
192
|
// Should not have device config errors
|
|
192
|
-
expect(platform.errorLogCalls.filter(msg =>
|
|
193
|
-
msg.includes('missing the *Device ID*')
|
|
194
|
-
msg.includes('missing the *Device Type*')
|
|
193
|
+
expect(platform.errorLogCalls.filter(msg =>
|
|
194
|
+
msg.includes('missing the *Device ID*')
|
|
195
|
+
|| msg.includes('missing the *Device Type*'),
|
|
195
196
|
)).toHaveLength(0)
|
|
196
197
|
})
|
|
197
|
-
})
|
|
198
|
+
})
|