@switchbot/homebridge-switchbot 5.0.0-beta.26 → 5.0.0-beta.28

package/src/homebridge-ui/server.ts

@@ -37,6 +37,43 @@ class PluginUiServer extends HomebridgePluginUiServer {
         return []
       }
     })
+    // Provide Matter cached accessories if Homebridge stores them separately.
+    this.onRequest('getCachedMatterAccessories', () => {
+      try {
+        const plugin = 'homebridge-switchbot'
+        const devicesToReturn: any[] = []
+
+        const accFile = `${this.homebridgeStoragePath}/accessories/cachedAccessories`
+        const matterFile = `${this.homebridgeStoragePath}/accessories/cachedMatterAccessories`
+
+        const readAndCollect = (filePath: string) => {
+          if (!fs.existsSync(filePath)) {
+            return
+          }
+          try {
+            const parsed: any[] = JSON.parse(fs.readFileSync(filePath, 'utf8'))
+            parsed.forEach((entry: any) => {
+              // Entry shape varies between Homebridge versions; try common locations
+              const pluginName = entry.plugin || entry?.accessory?.plugin || entry?.accessory?.pluginName
+              const acc = entry.accessory ?? entry
+              if (pluginName === plugin) {
+                devicesToReturn.push(acc as never)
+              }
+            })
+          } catch {
+            // ignore parse errors for a single file
+          }
+        }
+
+        // Read both canonical files (some Homebridge versions use one or the other)
+        readAndCollect(accFile)
+        readAndCollect(matterFile)
+
+        return devicesToReturn
+      } catch {
+        return []
+      }
+    })
     this.ready()
   }
 }

package/src/platform-hap.ts

@@ -144,6 +144,20 @@ export class SwitchBotHAPPlatform implements DynamicPlatformPlugin {
       devices: config.devices as { deviceId: string }[],
     }
 
+    // Determine platform logging preference (match HAP behaviour as closely as
+    // possible using config values. We default to 'standard' when unspecified.)
+    this.platformLogging = (this.config.options?.logging === 'debug' || this.config.options?.logging === 'standard' || this.config.options?.logging === 'none')
+      ? this.config.options.logging
+      : 'standard'
+
+    // Unconditional diagnostic using the raw Homebridge `log` so it always
+    // appears regardless of the platform logging helpers' gating logic.
+    try {
+      this.log.debug?.(`[SwitchBot HAP] effective platformLogging=${String(this.platformLogging)}`)
+    } catch (e: any) {
+      // swallow any logging errors — diagnostics are best-effort
+    }
+
     // Normalize deviceConfig to remove UI-inserted defaults (lots of false/empty values)
     try {
       if ((this.config as any).options) {

package/src/platform-matter.ts

@@ -65,7 +65,8 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
   private webhookEventListener: Server | null = null
   private webhookEventHandler: { [x: string]: (context: any) => void } = {}
   // Platform logging toggle (can be controlled via UI or config)
-  private platformLogging?: boolean
+  // Use same shape as HAP platform: string values like 'debug', 'debugMode', 'standard', or 'none'
+  private platformLogging?: string
 
   // Platform-provided logging helpers (attached in constructor)
   infoLog!: (...args: any[]) => void
@@ -84,6 +85,20 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
     public readonly config: SwitchBotPlatformConfig,
     public readonly api: API,
   ) {
+    // Determine platform logging preference (match HAP behaviour as closely as
+    // possible using config values. We default to 'standard' when unspecified.)
+    this.platformLogging = (this.config.options?.logging === 'debug' || this.config.options?.logging === 'standard' || this.config.options?.logging === 'none')
+      ? this.config.options.logging
+      : 'standard'
+
+    // Unconditional diagnostic using the raw Homebridge `log` so it always
+    // appears regardless of the platform logging helpers' gating logic.
+    try {
+      this.log.debug?.(`[SwitchBot Matter] effective platformLogging=${String(this.platformLogging)}`)
+    } catch (e: any) {
+      // swallow any logging errors — diagnostics are best-effort
+    }
+
     // Attach platform-wide logging helpers from utils so Matter and device
     // classes can use consistent logging methods (infoLog/debugLog/etc.)
     const _pl = createPlatformLogger(async () => (this as any).platformLogging, this.log)
@@ -727,7 +742,15 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
                 } else if (percentage < 40) {
                   batChargeLevel = 1
                 }
-                await this.api.matter.updateAccessoryState(uuidLocal, 'powerSource', { batPercentRemaining, batChargeLevel })
+                try {
+                  await this.api.matter.updateAccessoryState(uuidLocal, 'powerSource', { batPercentRemaining, batChargeLevel })
+                } catch (updateError: any) {
+                  // Silently skip if powerSource cluster doesn't exist on this device
+                  const msg = String(updateError?.message ?? updateError)
+                  if (!msg.includes('does not exist') && !msg.includes('not found')) {
+                    throw updateError
+                  }
+                }
               } catch (e: any) {
                 this.debugLog(`Failed to update battery state for ${dev.deviceId}: ${e?.message ?? e}`)
               }
@@ -896,6 +919,7 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
         // Immediate one-shot to populate initial state
         ;(async () => {
           try {
+            this.infoLog(`Performing initial OpenAPI refresh for ${dev.deviceId}`)
             const { response, statusCode } = await this.switchBotAPI!.getDeviceStatus(dev.deviceId, this.config.credentials?.token, this.config.credentials?.secret)
             const respAny: any = response
             const body = respAny?.body ?? respAny
@@ -908,14 +932,18 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             if (statusCode === 100 || statusCode === 200) {
               const status = body?.status ?? body
               await this.applyStatusToAccessory(uuid, dev, status)
+              this.infoLog(`Initial OpenAPI refresh succeeded for ${dev.deviceId}`)
+            } else {
+              this.warnLog(`Initial OpenAPI refresh returned unexpected statusCode=${statusCode} for ${dev.deviceId}`)
             }
           } catch (e: any) {
-            this.debugLog(`Initial OpenAPI refresh failed for ${dev.deviceId}: ${e?.message ?? e}`)
+            this.errorLog(`Initial OpenAPI refresh failed for ${dev.deviceId}: ${e?.message ?? e}`)
           }
         })()
 
         const timer = setInterval(async () => {
           try {
+            this.debugLog(`Performing periodic OpenAPI refresh for ${dev.deviceId}`)
             const { response, statusCode } = await this.switchBotAPI!.getDeviceStatus(dev.deviceId, this.config.credentials?.token, this.config.credentials?.secret)
             const respAny: any = response
             const body = respAny?.body ?? respAny
@@ -928,9 +956,11 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
             if (statusCode === 100 || statusCode === 200) {
               const status = body?.status ?? body
               await this.applyStatusToAccessory(uuid, dev, status)
+            } else {
+              this.debugLog(`Periodic OpenAPI refresh returned unexpected statusCode=${statusCode} for ${dev.deviceId}`)
             }
           } catch (e: any) {
-            this.debugLog(`Periodic OpenAPI refresh failed for ${dev.deviceId}: ${e?.message ?? e}`)
+            this.errorLog(`Periodic OpenAPI refresh failed for ${dev.deviceId}: ${e?.message ?? e}`)
           }
         }, Number(refreshRateSec) * 1000)
 
@@ -1013,9 +1043,11 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
       const url = this.config.options?.webhookURL
       try {
         this.switchBotAPI?.setupWebhook(url)
+        this.infoLog(`Webhook configured for URL: ${url}`)
         // Listen for webhook events
         this.switchBotAPI?.on('webhookEvent', (body: any) => {
           try {
+            this.infoLog(`Received webhook event for device: ${body.context.deviceMac}`)
             if (this.config.options?.mqttURL) {
               const mac = body.context.deviceMac?.toLowerCase().match(/[\s\S]{1,2}/g)?.join(':')
               const options = this.config.options?.mqttPubOptions || {}
@@ -1236,7 +1268,18 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
           // some accessories expose updateState that accepts cluster and attributes
           await instance.updateState(cluster, attributes)
         } else {
-          await this.api.matter.updateAccessoryState(uuidLocal, cluster, attributes)
+          try {
+            await this.api.matter.updateAccessoryState(uuidLocal, cluster, attributes)
+          } catch (updateError: any) {
+            // Silently ignore "does not exist" errors for clusters that aren't
+            // supported by this device type (e.g., powerSource on WindowBlind).
+            const msg = String(updateError?.message ?? updateError)
+            if (msg.includes('does not exist') || msg.includes('not found')) {
+              this.debugLog(`Cluster ${cluster} not available on ${dev.deviceId}, skipping update`)
+              return
+            }
+            throw updateError
+          }
         }
       } catch (e: any) {
         this.debugLog(`safeUpdate failed for ${dev.deviceId} cluster=${cluster}: ${e?.message ?? e}`)