@switchbot/homebridge-switchbot 5.0.0-beta.64 → 5.0.0-beta.66

package/src/devices-matter/RoboticVacuumAccessory.ts

@@ -270,13 +270,18 @@ export class RoboticVacuumAccessory extends BaseMatterAccessory {
           stop: async () => this.handleStop(),
           start: async () => this.handleStart(),
           goHome: async () => this.handleGoHome(),
+          // Always register resume handler, log warning if not supported
+          resume: async () => {
+            if (capabilities.resume) {
+              await this.handleResume()
+            } else {
+              this.logWarn(`Resume operation is not supported for model: ${this.model}`)
+            }
+          },
         }
         if (capabilities.pause) {
           opHandlers.pause = async () => this.handlePause()
         }
-        if (capabilities.resume) {
-          opHandlers.resume = async () => this.handleResume()
-        }
         return {
           rvcRunMode: { changeToMode: async (request: MatterRequests.ChangeToMode) => this.handleChangeRunMode(request) },
           rvcCleanMode: { changeToMode: async (request: MatterRequests.ChangeToMode) => this.handleChangeCleanMode(request) },
@@ -456,7 +461,15 @@ export class RoboticVacuumAccessory extends BaseMatterAccessory {
 
   private async handleResume(): Promise<void> {
     this.logInfo('resume requested.')
-    await this.handleStart()
+    try {
+      this.logInfo(`[OpenAPI] Sending resume command`)
+      await this.sendOpenAPICommand('resume')
+      this.logInfo(`[OpenAPI] resume command sent`)
+    } catch (e: any) {
+      this.logWarn(`OpenAPI resume failed: ${String(e?.message ?? e)}`)
+    }
+    this.updateRunMode(1)
+    this.updateOperationalState(1)
   }
 
   private async handleGoHome(): Promise<void> {

package/src/devices-matter/VenetianBlindAccessory.ts

@@ -58,7 +58,7 @@ export class VenetianBlindAccessory extends BaseMatterAccessory {
     this.logInfo('initialized.')
   }
 
-  private async handleGoToLift(request: MatterRequests.GoToLiftPercentage): Promise<void> {
+  public async handleGoToLift(request: MatterRequests.GoToLiftPercentage): Promise<void> {
     this.logInfo(`GoToLiftPercentage request: ${JSON.stringify(request)}`)
 
     // Matter uses 0=open, 10000=closed, so invert to get open percentage
@@ -68,7 +68,7 @@ export class VenetianBlindAccessory extends BaseMatterAccessory {
     // TODO: await myBlindAPI.setPosition(openPercent)
   }
 
-  private async handleGoToTilt(request: MatterRequests.GoToTiltPercentage): Promise<void> {
+  public async handleGoToTilt(request: MatterRequests.GoToTiltPercentage): Promise<void> {
     this.logInfo(`GoToTiltPercentage request: ${JSON.stringify(request)}`)
 
     // Matter tilt: 0=horizontal/open (0deg), 10000=vertical/closed (90deg)
@@ -77,17 +77,17 @@ export class VenetianBlindAccessory extends BaseMatterAccessory {
     // TODO: await myBlindAPI.setTiltAngle(degrees)
   }
 
-  private async handleUpOrOpen(): Promise<void> {
+  public async handleUpOrOpen(): Promise<void> {
     this.logInfo('opened blind.')
     // TODO: await myBlindAPI.open()
   }
 
-  private async handleDownOrClose(): Promise<void> {
+  public async handleDownOrClose(): Promise<void> {
     this.logInfo('closed blind.')
     // TODO: await myBlindAPI.close()
   }
 
-  private async handleStop(): Promise<void> {
+  public async handleStop(): Promise<void> {
     this.logInfo('stopped blind.')
     // TODO: await myBlindAPI.stop()
   }

package/src/devices-matter/WindowBlindAccessory.ts

@@ -55,28 +55,71 @@ export class WindowBlindAccessory extends BaseMatterAccessory {
     this.logInfo('initialized.')
   }
 
-  private async handleGoToLift(request: MatterRequests.GoToLiftPercentage): Promise<void> {
+  public async handleGoToLift(request: MatterRequests.GoToLiftPercentage): Promise<void> {
     this.logInfo(`GoToLiftPercentage request: ${JSON.stringify(request)}`)
     // Matter uses 0=open, 10000=closed, so invert to get open percentage
     const closedPercent = request.liftPercent100thsValue / 100
-    const openPercent = (100 - closedPercent).toFixed(0)
-    this.logInfo(`moved to ${openPercent}% open.`)
-    // TODO: await myBlindAPI.setPosition(openPercent)
+    // SwitchBot API expects position: 0=open, 100=closed
+    const position = Math.max(0, Math.min(100, closedPercent))
+    // Default to performance mode (ff), index is always 0
+    const mode = 'ff' // or '01' for silent mode if needed
+    const parameter = `0,${mode},${position}`
+    this.logInfo(`Sending setPosition to OpenAPI: parameter=${parameter}`)
+    try {
+      if (this.context?.sendOpenAPI) {
+        await this.sendOpenAPICommand('setPosition', parameter)
+        this.logInfo('OpenAPI setPosition command sent.')
+      } else {
+        this.logWarn('OpenAPI sender not available in context.')
+      }
+    } catch (e: any) {
+      this.logWarn(`OpenAPI setPosition failed: ${String(e?.message ?? e)}`)
+    }
   }
 
-  private async handleUpOrOpen(): Promise<void> {
+  public async handleUpOrOpen(): Promise<void> {
     this.logInfo('opened blind.')
-    // TODO: await myBlindAPI.open()
+    try {
+      // Send open command to SwitchBot OpenAPI
+      if (this.context?.sendOpenAPI) {
+        await this.sendOpenAPICommand('turnOn')
+        this.logInfo('OpenAPI open command sent.')
+      } else {
+        this.logWarn('OpenAPI sender not available in context.')
+      }
+    } catch (e: any) {
+      this.logWarn(`OpenAPI open failed: ${String(e?.message ?? e)}`)
+    }
   }
 
-  private async handleDownOrClose(): Promise<void> {
+  public async handleDownOrClose(): Promise<void> {
     this.logInfo('closed blind.')
-    // TODO: await myBlindAPI.close()
+    try {
+      // Send close command to SwitchBot OpenAPI
+      if (this.context?.sendOpenAPI) {
+        await this.sendOpenAPICommand('turnOff')
+        this.logInfo('OpenAPI close command sent.')
+      } else {
+        this.logWarn('OpenAPI sender not available in context.')
+      }
+    } catch (e: any) {
+      this.logWarn(`OpenAPI close failed: ${String(e?.message ?? e)}`)
+    }
   }
 
-  private async handleStop(): Promise<void> {
+  public async handleStop(): Promise<void> {
     this.logInfo('stopped blind.')
-    // TODO: await myBlindAPI.stop()
+    try {
+      // Send pause command to SwitchBot OpenAPI
+      if (this.context?.sendOpenAPI) {
+        await this.sendOpenAPICommand('pause')
+        this.logInfo('OpenAPI pause command sent.')
+      } else {
+        this.logWarn('OpenAPI sender not available in context.')
+      }
+    } catch (e: any) {
+      this.logWarn(`OpenAPI pause failed: ${String(e?.message ?? e)}`)
+    }
   }
 
   public updateLiftPosition(openPercent: number): void {

package/src/platform-matter.ts

@@ -2344,13 +2344,31 @@ export class SwitchBotMatterPlatform implements DynamicPlatformPlugin {
 
     // Window Blind
     if (this.config.enableWindowBlind !== false) {
-      const device = new WindowBlindAccessory(this.api, this.log)
+      const device = new WindowBlindAccessory(this.api, this.log, {
+        handlers: {
+          windowCovering: {
+            goToLiftPercentage: async request => device?.handleGoToLift?.(request),
+            upOrOpen: async () => device?.handleUpOrOpen?.(),
+            downOrClose: async () => device?.handleDownOrClose?.(),
+            stopMotion: async () => device?.handleStop?.(),
+          },
+        },
+      })
       accessories.push(device.toAccessory())
     }
 
     // Venetian Blind
     if (this.config.enableVenetianBlind !== false) {
-      const device = new VenetianBlindAccessory(this.api, this.log)
+      const device = new VenetianBlindAccessory(this.api, this.log, {
+        handlers: {
+          windowCovering: {
+            goToLiftPercentage: async request => device?.handleGoToLift?.(request),
+            upOrOpen: async () => device?.handleUpOrOpen?.(),
+            downOrClose: async () => device?.handleDownOrClose?.(),
+            stopMotion: async () => device?.handleStop?.(),
+          },
+        },
+      })
       accessories.push(device.toAccessory())
     }
 

package/src/settings.ts

@@ -88,11 +88,27 @@ export interface options {
    * When false (default), reset at UTC midnight. Default: false.
    */
   dailyApiResetAtLocalMidnight?: boolean
-  // Matter platform batch refresh options
+  /**
+   * When true, resets the daily API request counter to zero. This is useful for testing purposes.
+   */
+  resetDailyApiCounter?: boolean
+  /**
+   * When set, configures the batch refresh rate (in milliseconds) for Matter devices.  Default: 5000 ms.
+   */
   matterBatchRefreshRate?: number
+  /**
+   * When true, enables batch processing for Matter devices.  Default: false.
+   */
   matterBatchConcurrency?: number
+  /**
+   * When true, enables batch processing for Matter devices. Default: false.
+   */
   matterBatchEnabled?: boolean
+  /**
+   * When set, adds a random delay (jitter) to batch requests to avoid thundering herd problems.
+   */
   matterBatchJitter?: number
+  newFeatureEnabled?: boolean
 };
 
 export type devicesConfig = botConfig | relaySwitch1Config | relaySwitch1PMConfig | meterConfig | meterProConfig | indoorOutdoorSensorConfig | humidifierConfig | curtainConfig | blindTiltConfig | contactConfig | motionConfig | waterDetectorConfig | plugConfig | colorBulbConfig | stripLightConfig | ceilingLightConfig | lockConfig | hubConfig