@switchbot/homebridge-switchbot 5.0.0-beta.1 → 5.0.0-beta.3

package/src/devices-matter/WindowBlindAccessory.ts

@@ -8,50 +8,48 @@ import type { API, Logger, MatterRequests } from 'homebridge'
 import { BaseMatterAccessory } from './BaseMatterAccessory.js'
 
 export class WindowBlindAccessory extends BaseMatterAccessory {
-  constructor(api: API, log: Logger) {
-    const serialNumber = 'BLIND-001'
+  constructor(api: API, log: Logger, opts?: Partial<import('./BaseMatterAccessory').BaseMatterAccessoryConfig & { deviceId?: string }>) {
+    const serialNumber = opts?.serialNumber ?? 'BLIND-001'
 
-    super(api, log, {
-      uuid: api.matter.uuid.generate(serialNumber),
-      displayName: 'Window Blind',
-      deviceType: api.matter.deviceTypes.WindowCovering,
-      serialNumber,
-      manufacturer: 'Homebridge Matter',
-      model: 'HB-MATTER-BLIND-WINDOW',
-      firmwareRevision: '2.0.0',
-      hardwareRevision: '1.0.0',
-
-      clusters: {
-        windowCovering: {
-          targetPositionLiftPercent100ths: 5000,
-          currentPositionLiftPercent100ths: 5000,
-          operationalStatus: {
-            global: 0,
-            lift: 0,
-            tilt: 0,
-          },
-          endProductType: 0,
-          configStatus: {
-            operational: true,
-            onlineReserved: true,
-            liftMovementReversed: false,
-            liftPositionAware: true,
-            tiltPositionAware: false,
-            liftEncoderControlled: true,
-            tiltEncoderControlled: false,
-          },
+    const clusters = opts?.clusters ?? {
+      windowCovering: {
+        targetPositionLiftPercent100ths: 5000,
+        currentPositionLiftPercent100ths: 5000,
+        operationalStatus: { global: 0, lift: 0, tilt: 0 },
+        endProductType: 0,
+        configStatus: {
+          operational: true,
+          onlineReserved: true,
+          liftMovementReversed: false,
+          liftPositionAware: true,
+          tiltPositionAware: false,
+          liftEncoderControlled: true,
+          tiltEncoderControlled: false,
         },
       },
+    }
 
-      handlers: {
-        windowCovering: {
-          goToLiftPercentage: async (request: MatterRequests.GoToLiftPercentage) =>
-            this.handleGoToLift(request),
-          upOrOpen: async () => this.handleUpOrOpen(),
-          downOrClose: async () => this.handleDownOrClose(),
-          stopMotion: async () => this.handleStop(),
-        },
+    const handlers = opts?.handlers ?? {
+      windowCovering: {
+        goToLiftPercentage: async (request: MatterRequests.GoToLiftPercentage) => this.handleGoToLift(request),
+        upOrOpen: async () => this.handleUpOrOpen(),
+        downOrClose: async () => this.handleDownOrClose(),
+        stopMotion: async () => this.handleStop(),
       },
+    }
+
+    super(api, log, {
+      uuid: opts?.uuid ?? api.matter.uuid.generate(serialNumber),
+      displayName: opts?.displayName ?? 'Window Blind',
+      deviceType: api.matter.deviceTypes.WindowCovering,
+      serialNumber,
+      manufacturer: opts?.manufacturer ?? 'Homebridge Matter',
+      model: opts?.model ?? 'HB-MATTER-BLIND-WINDOW',
+      firmwareRevision: opts?.firmwareRevision ?? '2.0.0',
+      hardwareRevision: opts?.hardwareRevision ?? '1.0.0',
+      clusters,
+      handlers,
+      context: { deviceId: opts?.deviceId, ...(opts?.context ?? {}) },
     })
 
     this.logInfo('initialized.')

package/src/platform-matter.ts

@@ -5,9 +5,12 @@ import type {
   MatterAccessory,
   SerializedMatterAccessory,
 } from 'homebridge'
+import type { bodyChange, device } from 'node-switchbot'
 
 import type { SwitchBotPlatformConfig } from './settings.js'
 
+import { SwitchBotBLE, SwitchBotOpenAPI } from 'node-switchbot'
+
 import {
   ColorLightAccessory,
   ColorTemperatureLightAccessory,
@@ -32,7 +35,7 @@ import {
   WindowBlindAccessory,
 } from './devices-matter/index.js'
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js'
-import { cleanDeviceConfig } from './utils.js'
+import { cleanDeviceConfig, sleep } from './utils.js'
 
 /**
  * MatterPlatform
@@ -47,6 +50,11 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
 
   // Track restored Matter cached accessories
   public readonly matterAccessories: Map<string, SerializedMatterAccessory> = new Map()
+  // node-switchbot clients
+  private switchBotAPI?: SwitchBotOpenAPI
+  private switchBotBLE?: SwitchBotBLE
+  // discovered devices cache
+  private discoveredDevices: device[] = []
 
   constructor(
     public readonly log: Logging,
@@ -87,10 +95,93 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     // Register Matter accessories when Homebridge has finished launching
     this.api.on('didFinishLaunching', () => {
       this.log.debug('Executed didFinishLaunching callback')
+      // Initialize SwitchBot API clients
+      try {
+        if (this.config.credentials?.token && this.config.credentials?.secret) {
+          this.switchBotAPI = new SwitchBotOpenAPI(this.config.credentials.token, this.config.credentials.secret, this.config.options?.hostname)
+          // forward basic logs
+          if (!this.config.options?.disableLogsforOpenAPI && this.switchBotAPI?.on) {
+            this.switchBotAPI.on('log', (l: any) => this.log.debug('[SwitchBot OpenAPI]', l.message))
+          }
+        } else {
+          this.log.debug('SwitchBot OpenAPI credentials not provided; cloud devices will be skipped')
+        }
+      } catch (e: any) {
+        this.log.error('Failed to initialize SwitchBot OpenAPI:', e?.message ?? e)
+      }
+
+      try {
+        this.switchBotBLE = new SwitchBotBLE()
+        if (!this.config.options?.disableLogsforBLE && this.switchBotBLE?.on) {
+          this.switchBotBLE.on('log', (l: any) => this.log.debug('[SwitchBot BLE]', l.message))
+        }
+      } catch (e: any) {
+        this.log.error('Failed to initialize SwitchBot BLE client:', e?.message ?? e)
+      }
+
+      // perform device discovery from SwitchBot OpenAPI (if configured)
+      void this.discoverDevices()
+
       this.registerMatterAccessories()
     })
   }
 
+  /**
+   * Discover devices via SwitchBot OpenAPI and cache them for later use
+   */
+  private async discoverDevices(): Promise<void> {
+    if (!this.switchBotAPI) {
+      this.log.debug('SwitchBot OpenAPI not configured; skipping discovery')
+      return
+    }
+
+    try {
+      const { response, statusCode } = await this.switchBotAPI.getDevices()
+      this.log.debug(`SwitchBot getDevices response status: ${statusCode}`)
+      if (statusCode === 100 || statusCode === 200) {
+        const deviceList = Array.isArray(response?.body?.deviceList) ? response.body.deviceList : []
+        this.discoveredDevices = deviceList
+        this.log.info(`Discovered ${deviceList.length} SwitchBot device(s) from OpenAPI`)
+        for (const d of deviceList) {
+          this.log.debug(`  - ${d.deviceName} (${d.deviceType}) id=${d.deviceId}`)
+        }
+      } else {
+        this.log.warn(`SwitchBot getDevices returned status ${statusCode}`)
+      }
+    } catch (e: any) {
+      this.log.error('Failed to discover SwitchBot devices:', e?.message ?? e)
+    }
+  }
+
+  /**
+   * Retry wrapper for control commands using SwitchBot OpenAPI
+   */
+  async retryCommand(deviceObj: device, bodyChange: bodyChange, maxRetries = 1, delayBetweenRetries = 1000): Promise<{ response: any, statusCode: number }> {
+    let retryCount = 0
+    while (retryCount < maxRetries) {
+      try {
+        if (!this.switchBotAPI) {
+          throw new Error('SwitchBot OpenAPI not initialized')
+        }
+        const { response, statusCode } = await this.switchBotAPI.controlDevice(
+          deviceObj.deviceId,
+          bodyChange.command,
+          bodyChange.parameter,
+          bodyChange.commandType as import('node-switchbot').commandType | undefined,
+          this.config.credentials?.token,
+          this.config.credentials?.secret,
+        )
+        return { response, statusCode }
+      } catch (e: any) {
+        this.log.debug(`retryCommand error: ${e?.message ?? e}`)
+      }
+      retryCount++
+
+      await sleep(delayBetweenRetries)
+    }
+    return { response: {}, statusCode: 500 }
+  }
+
   /**
    * Required for DynamicPlatformPlugin
    * Called when homebridge restores cached accessories from disk at startup