@switchbot/homebridge-switchbot 5.0.0-beta.7 → 5.0.0-beta.70

package/src/test/matter/platform-matter.unregister.test.ts

@@ -0,0 +1,39 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { SwitchBotMatterPlatform } from '../../platform-matter.js'
+import { makeApiStub, makeLogStub } from '../helpers/platform-fixtures.js'
+
+describe('removeDisabledAccessories and unregister edge cases', () => {
+  it('clears resources and unregisters accessory even with invalid timer and non-MAC deviceId', async () => {
+    // Prepare API stub
+    const unregister = vi.fn()
+    const api: any = makeApiStub({ unregisterPlatformAccessories: unregister })
+    const log: any = makeLogStub()
+    const platform = new SwitchBotMatterPlatform(log as any, { enableOnOffLight: false } as any, api)
+
+    // Build a fake serialized accessory matching the generated UUID for OnOff Light
+    const uuid = api.matter.uuid.generate('matter-onoff-light')
+    const accessory: any = { uuid, displayName: 'OnOff Light', context: { deviceId: 'NOT-A-MAC' } }
+
+    // Put invalid timer object into refreshTimers to ensure code handles it
+    const nid = (platform as any).normalizeDeviceId(accessory.context.deviceId)
+    ;(platform as any).refreshTimers.set(nid, null as any)
+    ;(platform as any).accessoryInstances.set(nid, { dummy: true })
+
+    // Insert accessory into matterAccessories so removeDisabledAccessories will see it
+    ;(platform as any).matterAccessories.set(uuid, accessory)
+
+    // Spy on clearDeviceResources
+    const spyClear = vi.spyOn(platform as any, 'clearDeviceResources')
+
+    // Call removeDisabledAccessories directly
+    await (platform as any).removeDisabledAccessories()
+
+    // Expect unregister was called and matterAccessories cleared
+    expect(unregister).toHaveBeenCalled()
+    expect((platform as any).matterAccessories.get(uuid)).toBeUndefined()
+
+    // clearDeviceResources should have been called with the accessory.deviceId
+    expect(spyClear).toHaveBeenCalledWith(accessory.context.deviceId)
+  })
+})

package/src/test/matter/platform-matter.webhook.test.ts

@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest'
+
+import { SwitchBotMatterPlatform } from '../../platform-matter.js'
+import { makeApiStub, makeLogStub } from '../helpers/platform-fixtures.js'
+
+/**
+ * Verify that Matter accessories receive the effective webhook flag
+ * in their context when a global webhook option is enabled and the
+ * per-device webhook setting is undefined.
+ */
+describe('platform-matter webhook context propagation', () => {
+  it('sets context.webhook=true when global webhook is enabled and device.webhook is undefined', async () => {
+    const api: any = makeApiStub()
+    const log: any = makeLogStub()
+
+    const platform = new SwitchBotMatterPlatform(log as any, {
+      name: 'SwitchBot',
+      options: { webhook: true },
+    } as any, api)
+
+    // Minimal device that maps to a known Matter accessory constructor
+    const dev: any = {
+      deviceId: 'DEV-WH-1',
+      deviceName: 'Webhook Plug',
+      deviceType: 'Plug',
+      // webhook intentionally undefined to test fallback
+    }
+
+    const acc = await (platform as any).createAccessoryFromDevice(dev)
+    expect(acc).toBeDefined()
+    expect((acc as any).context?.webhook).toBe(true)
+  })
+
+  it('keeps explicit device.webhook=false even when global webhook is true', async () => {
+    const api: any = makeApiStub()
+    const log: any = makeLogStub()
+
+    const platform = new SwitchBotMatterPlatform(log as any, {
+      name: 'SwitchBot',
+      options: { webhook: true },
+    } as any, api)
+
+    const dev: any = {
+      deviceId: 'DEV-WH-2',
+      deviceName: 'No Webhook Plug',
+      deviceType: 'Plug',
+      webhook: false,
+    }
+
+    const acc = await (platform as any).createAccessoryFromDevice(dev)
+    expect(acc).toBeDefined()
+    expect((acc as any).context?.webhook).toBe(false)
+  })
+})

package/src/test/utils.test.ts

@@ -0,0 +1,96 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { createPlatformProxy, detectMatter } from '../utils.js'
+
+describe('detectMatter', () => {
+  it('returns enabled true when api.isMatterEnabled is a function that returns true', () => {
+    const api: any = { isMatterEnabled: () => true }
+    const info = detectMatter(api)
+    expect(info.enabled).toBe(true)
+    expect(info.reason).toMatch(/isMatterEnabled\(\)/)
+  })
+
+  it('returns enabled true when api.isMatterEnabled is a truthy property', () => {
+    const api: any = { isMatterEnabled: true }
+    const info = detectMatter(api)
+    expect(info.enabled).toBe(true)
+    expect(info.reason).toMatch(/property present/)
+  })
+
+  it('uses server fallback when present', () => {
+    const api: any = { server: { isMatterEnabled: () => false } }
+    const info = detectMatter(api)
+    expect(info.enabled).toBe(false)
+    expect(info.reason).toMatch(/server.isMatterEnabled\(\)/)
+  })
+
+  it('returns enabled false with a reason when no API is present', () => {
+    const api: any = {}
+    const info = detectMatter(api)
+    expect(info.enabled).toBe(false)
+    expect(typeof info.reason).toBe('string')
+  })
+})
+
+describe('createPlatformProxy', () => {
+  it('selects HAP platform when Matter is disabled and delegates configureAccessory', () => {
+    class HapStub {
+      public static created = false
+      public configured: any = undefined
+      constructor(public log: any, public config: any, public api: any) {
+        HapStub.created = true
+      }
+
+      configureAccessory(acc: any) {
+        this.configured = acc
+      }
+    }
+
+    class MatterStub {
+      constructor() {
+        throw new Error('should not be constructed')
+      }
+    }
+
+    const ProxyCtor = createPlatformProxy(HapStub as any, MatterStub as any)
+    const log = { info: vi.fn() }
+    const api = { isMatterEnabled: false }
+    const proxy = new (ProxyCtor as any)(log, {}, api)
+
+    // delegate should be instance of HapStub
+    expect(HapStub.created).toBe(true)
+    expect(typeof proxy.delegate.configureAccessory).toBe('function')
+    proxy.configureAccessory('accessory')
+    expect(proxy.delegate.configured).toBe('accessory')
+    // log should mention HAP
+    expect((log.info as any).mock.calls[0][0]).toMatch(/HAP/)
+  })
+
+  it('selects Matter platform when isMatterEnabled is true', () => {
+    class HapStub2 {
+      constructor() {
+        throw new Error('should not be constructed')
+      }
+    }
+
+    class MatterStub2 {
+      public configured: any = undefined
+      constructor(public log: any, public config: any, public api: any) {}
+
+      configureMatterAccessory(acc: any) {
+        this.configured = acc
+      }
+    }
+
+    const ProxyCtor = createPlatformProxy(HapStub2 as any, MatterStub2 as any)
+    const log = { info: vi.fn() }
+    const api = { isMatterEnabled: () => true }
+    const proxy = new (ProxyCtor as any)(log, {}, api)
+
+    // delegate should be instance of MatterStub2
+    expect(typeof proxy.delegate.configureMatterAccessory).toBe('function')
+    ;(proxy as any).configureMatterAccessory('macc')
+    expect(proxy.delegate.configured).toBe('macc')
+    expect((log.info as any).mock.calls[0][0]).toMatch(/Matter/)
+  })
+})

package/src/{verifyconfig.test.ts → test/verifyconfig.test.ts}

@@ -1,5 +1,6 @@
-import { describe, expect, it, vi } from 'vitest'
-import type { SwitchBotPlatformConfig } from './settings.js'
+import type { SwitchBotPlatformConfig } from '../settings.js'
+
+import { describe, expect, it } from 'vitest'
 
 // Create a minimal mock of the SwitchBotPlatform to test verifyConfig
 class MockSwitchBotPlatform {
@@ -102,10 +103,10 @@ describe('verifyConfig fix for reboot loop', () => {
 
     // This should NOT throw an error anymore - it should log instead
     await expect(platform.verifyConfig()).resolves.not.toThrow()
-    
+
     // Verify that the error was logged instead of thrown
     expect(platform.errorLogCalls).toContain(
-      'The devices config section is missing the *Device ID* in the config. Please check your config.'
+      'The devices config section is missing the *Device ID* in the config. Please check your config.',
     )
   })
 
@@ -132,10 +133,10 @@ describe('verifyConfig fix for reboot loop', () => {
 
     // This should NOT throw an error anymore - it should log instead
     await expect(platform.verifyConfig()).resolves.not.toThrow()
-    
+
     // Verify that the error was logged instead of thrown
     expect(platform.errorLogCalls).toContain(
-      'The devices config section is missing the *Device Type* in the config. Please check your config.'
+      'The devices config section is missing the *Device Type* in the config. Please check your config.',
     )
   })
 
@@ -187,11 +188,11 @@ describe('verifyConfig fix for reboot loop', () => {
 
     // Should not throw or log device config errors with valid config
     await expect(platform.verifyConfig()).resolves.not.toThrow()
-    
+
     // Should not have device config errors
-    expect(platform.errorLogCalls.filter(msg => 
-      msg.includes('missing the *Device ID*') || 
-      msg.includes('missing the *Device Type*')
+    expect(platform.errorLogCalls.filter(msg =>
+      msg.includes('missing the *Device ID*')
+      || msg.includes('missing the *Device Type*'),
     )).toHaveLength(0)
   })
-})
+})