@switchbot/homebridge-switchbot 3.7.1-beta.24 → 3.7.1-beta.26

package/package.json

@@ -2,7 +2,7 @@
   "name": "@switchbot/homebridge-switchbot",
   "displayName": "SwitchBot",
   "type": "module",
-  "version": "3.7.1-beta.24",
+  "version": "3.7.1-beta.26",
   "description": "The SwitchBot plugin allows you to access your SwitchBot device(s) from HomeKit.",
   "author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
   "contributors": [

package/src/device/bot.ts

@@ -775,13 +775,8 @@ export class Bot extends deviceBase {
    * Handle requests to set the "On" characteristic
    */
   async OnSet(value: CharacteristicValue): Promise<void> {
-    if (this.On === undefined) {
-      this.On = false
-      this.accessory.context.On = this.On
-    } else {
-      this.On = this.accessory.context.On
-    }
-
+    this.On = this.accessory.context.On ?? false
+    this.accessory.context.On = this.On
     const deviceTypeActions: { [key: string]: () => Promise<void> } = {
       switch: async () => {
         if (this.Switch) {
@@ -842,10 +837,8 @@ export class Bot extends deviceBase {
         }
       },
     }
-
     const action = deviceTypeActions[this.botDeviceType] || deviceTypeActions.default
     await action()
-
     this.accessory.context.On = this.On
     this.doBotUpdate.next()
   }
@@ -1135,48 +1128,47 @@ export class Bot extends deviceBase {
 
   async getBotConfigSettings(device: device & devicesConfig) {
     // Bot Device Type
-    this.botDeviceType = this.accessory.context.botDeviceType === device.bot?.deviceType
-      ? this.accessory.context.botDeviceType
-      : device.bot?.deviceType ?? 'outlet'
-    const botDeviceType = this.accessory.context.botDeviceType
-      ? `Using Device Type: ${this.botDeviceType}, from Accessory Cache.`
-      : device.bot?.deviceType
-        ? `Using Device Type: ${this.botDeviceType}`
-        : `No Device Type Set, deviceType: ${this.device.bot?.deviceType}, Using default deviceType: ${this.botDeviceType}`
+    this.botDeviceType = device.bot?.deviceType ?? 'outlet'
+    const botDeviceType = device.bot?.deviceType
+      ? `Using Device Type: ${this.botDeviceType}`
+      : `No Device Type Set, deviceType: ${this.device.bot?.deviceType}, Using default deviceType: ${this.botDeviceType}`
     await this.debugWarnLog(botDeviceType)
     this.accessory.context.botDeviceType = this.botDeviceType
     // Bot Mode
-    this.botMode = this.accessory.context.botMode ?? device.bot?.mode ?? 'switch'
-    const botMode = this.accessory.context.botMode
-      ? `Using Bot Mode: ${this.botMode}, from Accessory Cache.`
-      : device.bot?.mode ? `Using Bot Mode: ${this.botMode}` : `No Bot Mode Set, Using default Bot Mode: ${this.botMode}`
-    await this.debugWarnLog(botMode)
+    this.botMode = device.bot?.mode ?? 'switch'
+    if (!device.bot?.mode) {
+      this.botMode = 'switch'
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} does not have bot mode set in the Plugin's SwitchBot Device Settings, defaulting to "${this.botMode}" mode. You may experience issues.`)
+    } else if (['switch', 'press', 'multipress'].includes(device.bot.mode)) {
+      this.botMode = device.bot.mode
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`)
+    } else {
+      throw new Error(`${this.device.deviceType}: ${this.accessory.displayName} Invalid Bot Mode: ${device.bot.mode}`)
+    }
+    const botModeLog = device.bot?.mode
+      ? `Using Bot Mode: ${this.botMode}`
+      : `No Bot Mode Set, Using default Bot Mode: ${this.botMode}`
+    await this.debugWarnLog(botModeLog)
     this.accessory.context.botMode = this.botMode
     // Bot Double Press
-    this.doublePress = this.accessory.context.doublePress ?? device.bot?.doublePress ?? 1
-    const doublePress = this.accessory.context.doublePress
-      ? `Using Double Press: ${this.doublePress}, from Accessory Cache.`
-      : device.bot?.doublePress
-        ? `Using Double Press: ${this.doublePress}`
-        : `No Double Press Set, Using default Double Press: ${this.doublePress}`
+    this.doublePress = device.bot?.doublePress ?? 1
+    const doublePress = device.bot?.doublePress
+      ? `Using Double Press: ${this.doublePress}`
+      : `No Double Press Set, Using default Double Press: ${this.doublePress}`
     await this.debugWarnLog(doublePress)
     this.accessory.context.doublePress = this.doublePress
     // Bot Press PushRate
-    this.pushRatePress = this.accessory.context.pushRatePress ?? device.bot?.pushRatePress ?? 15
-    const pushRatePress = this.accessory.context.pushRatePress
-      ? `Using Push Rate Press: ${this.pushRatePress}, from Accessory Cache.`
-      : device.bot?.pushRatePress
-        ? `Using Bot Push Rate Press: ${this.pushRatePress}`
-        : `No Push Rate Press Set, Using default Push Rate Press: ${this.pushRatePress}`
+    this.pushRatePress = device.bot?.pushRatePress ?? 15
+    const pushRatePress = device.bot?.pushRatePress
+      ? `Using Bot Push Rate Press: ${this.pushRatePress}`
+      : `No Push Rate Press Set, Using default Push Rate Press: ${this.pushRatePress}`
     await this.debugWarnLog(pushRatePress)
     this.accessory.context.pushRatePress = this.pushRatePress
     // Bot Allow Push
-    this.allowPush = this.accessory.context.allowPush ?? device.bot?.allowPush ?? false
-    const allowPush = this.accessory.context.allowPush
-      ? `Using Allow Push: ${this.allowPush}, from Accessory Cache.`
-      : device.bot?.allowPush
-        ? `Using Allow Push: ${this.allowPush}`
-        : `No Allow Push Set, Using default Allow Push: ${this.allowPush}`
+    this.allowPush = device.bot?.allowPush ?? false
+    const allowPush = device.bot?.allowPush
+      ? `Using Allow Push: ${this.allowPush}`
+      : `No Allow Push Set, Using default Allow Push: ${this.allowPush}`
     await this.debugWarnLog(allowPush)
     this.accessory.context.allowPush = this.allowPush
     // Bot Multi Press Count

package/src/device/curtain.ts

@@ -191,19 +191,13 @@ export class Curtain extends deviceBase {
       }
     } else {
       accessory.context.OpenModeSwitch = accessory.context.OpenModeSwitch ?? {}
-      if (this.OpenModeSwitch?.Service) {
-        const OpenModeSwitch = this.accessory.getService(this.OpenModeSwitch.Name)
-        this.OpenModeSwitch = {
-          Name: `${accessory.displayName} Silent Open Mode`,
-          Service: OpenModeSwitch as Service,
-          On: accessory.context.OpenModeSwitch.On ?? false,
-        }
-      } else {
-        this.OpenModeSwitch = {
-          Name: `${accessory.displayName} Silent Open Mode`,
-          Service: accessory.addService(this.hap.Service.Switch, this.OpenModeSwitch?.Name, this.OpenModeSwitch?.Name) as Service,
-          On: accessory.context.OpenModeSwitch.On ?? false,
-        }
+      this.debugLog('Adding Open Mode Switch Service')
+      const name = `${accessory.displayName} Silent Open Mode`
+      const uuid = this.api.hap.uuid.generate(name)
+      this.OpenModeSwitch = {
+        Name: name,
+        Service: accessory.getService(name) ?? accessory.addService(this.hap.Service.Switch, name, uuid) as Service,
+        On: accessory.context.OpenModeSwitch.On ?? false,
       }
       accessory.context.OpenModeSwitch = this.OpenModeSwitch as object
 
@@ -225,19 +219,13 @@ export class Curtain extends deviceBase {
       }
     } else {
       accessory.context.CloseModeSwitch = accessory.context.CloseModeSwitch ?? {}
-      if (this.CloseModeSwitch?.Service) {
-        const CloseModeSwitch = this.accessory.getService(this.CloseModeSwitch.Name)
-        this.CloseModeSwitch = {
-          Name: `${accessory.displayName} Silent Close Mode`,
-          Service: CloseModeSwitch as Service,
-          On: accessory.context.CloseModeSwitch.On ?? false,
-        }
-      } else {
-        this.CloseModeSwitch = {
-          Name: `${accessory.displayName} Silent Close Mode`,
-          Service: accessory.addService(this.hap.Service.Switch, this.CloseModeSwitch?.Name, this.CloseModeSwitch?.Name) as Service,
-          On: accessory.context.CloseModeSwitch.On ?? false,
-        }
+      this.debugLog('Adding Close Mode Switch Service')
+      const name = `${accessory.displayName} Silent Close Mode`
+      const uuid = this.api.hap.uuid.generate(name)
+      this.CloseModeSwitch = {
+        Name: name,
+        Service: this.accessory.getService(name) ?? accessory.addService(this.hap.Service.Switch, name, uuid) as Service,
+        On: accessory.context.CloseModeSwitch.On ?? false,
       }
       accessory.context.CloseModeSwitch = this.CloseModeSwitch as object
 
@@ -330,7 +318,7 @@ export class Curtain extends deviceBase {
   /*
    * Setup EVE history features for curtain devices.
    */
-  async setupHistoryService(): Promise < void> {
+  async setupHistoryService(): Promise<void> {
     if (this.device.history !== true) {
       return
     }

package/src/platform.ts

@@ -31,7 +31,7 @@ import { queueScheduler } from 'rxjs'
 import { request } from 'undici'
 
 import { BlindTilt } from './device/blindtilt.js'
-import { Bot } from './device/bot-old.js'
+import { Bot } from './device/bot.js'
 import { CeilingLight } from './device/ceilinglight.js'
 import { ColorBulb } from './device/colorbulb.js'
 import { Contact } from './device/contact.js'

package/dist/device/bot-old.d.ts

@@ -1,132 +0,0 @@
-import type { API, CharacteristicValue, HAP, Logging, PlatformAccessory, Service } from 'homebridge';
-import type { SwitchBotPlatform } from '../platform.js';
-import type { devicesConfig, SwitchBotPlatformConfig } from '../settings.js';
-import type { botServiceData as serviceData } from '../types/bledevicestatus.js';
-import type { device } from '../types/devicelist.js';
-import type { botStatus as deviceStatus } from '../types/devicestatus.js';
-import { Subject } from 'rxjs';
-/**
- * Platform Accessory
- * An instance of this class is created for each accessory your platform registers
- * Each accessory may expose multiple services of different service types.
- */
-export declare class Bot {
-    private readonly platform;
-    private accessory;
-    device: device & devicesConfig;
-    readonly api: API;
-    readonly log: Logging;
-    readonly config: SwitchBotPlatformConfig;
-    protected readonly hap: HAP;
-    fanService?: Service;
-    doorService?: Service;
-    lockService?: Service;
-    faucetService?: Service;
-    windowService?: Service;
-    switchService?: Service;
-    outletService?: Service;
-    batteryService: Service;
-    garageDoorService?: Service;
-    windowCoveringService?: Service;
-    statefulProgrammableSwitchService?: Service;
-    On: CharacteristicValue;
-    BatteryLevel: CharacteristicValue;
-    FirmwareRevision: CharacteristicValue;
-    StatusLowBattery: CharacteristicValue;
-    OpenAPI_On: deviceStatus['power'];
-    OpenAPI_BatteryLevel: deviceStatus['battery'];
-    OpenAPI_FirmwareRevision: deviceStatus['version'];
-    BLE_On: serviceData['state'];
-    BLE_Mode: serviceData['mode'];
-    BLE_BatteryLevel: serviceData['battery'];
-    BLE_IsConnected?: boolean;
-    botMode: string;
-    allowPush?: boolean;
-    doublePress: number;
-    scanDuration: number;
-    botDeviceType: string;
-    pushRatePress: number;
-    deviceLogging: string;
-    multiPressCount: number;
-    deviceRefreshRate: number;
-    botUpdateInProgress: boolean;
-    doBotUpdate: Subject<void>;
-    private readonly OpenAPI;
-    private readonly BLE;
-    constructor(platform: SwitchBotPlatform, accessory: PlatformAccessory, device: device & devicesConfig);
-    /**
-     * Parse the device status from the SwitchBot api
-     */
-    parseStatus(): Promise<void>;
-    BLEparseStatus(): Promise<void>;
-    openAPIparseStatus(): Promise<void>;
-    /**
-     * Asks the SwitchBot API for the latest device information
-     */
-    refreshStatus(): Promise<void>;
-    BLERefreshStatus(): Promise<void>;
-    openAPIRefreshStatus(): Promise<void>;
-    /**
-     * Pushes the requested changes to the SwitchBot API
-     * deviceType  commandType   Command     command parameter   Description
-     * Bot   -    "command"     "turnOff"   "default"    =        set to OFF state
-     * Bot   -    "command"     "turnOn"    "default"    =        set to ON state
-     * Bot   -    "command"     "press"     "default"    =        trigger press
-     */
-    pushChanges(): Promise<void>;
-    BLEpushChanges(): Promise<void>;
-    openAPIpushChanges(): Promise<void>;
-    /**
-     * Handle requests to set the "On" characteristic
-     */
-    OnSet(value: CharacteristicValue): Promise<void>;
-    /**
-     * Updates the status for each of the HomeKit Characteristics
-     */
-    updateHomeKitCharacteristics(): Promise<void>;
-    removeOutletService(accessory: PlatformAccessory): Promise<void>;
-    removeGarageDoorService(accessory: PlatformAccessory): Promise<void>;
-    removeDoorService(accessory: PlatformAccessory): Promise<void>;
-    removeLockService(accessory: PlatformAccessory): Promise<void>;
-    removeFaucetService(accessory: PlatformAccessory): Promise<void>;
-    removeFanService(accessory: PlatformAccessory): Promise<void>;
-    removeWindowService(accessory: PlatformAccessory): Promise<void>;
-    removeWindowCoveringService(accessory: PlatformAccessory): Promise<void>;
-    removeStatefulProgrammableSwitchService(accessory: PlatformAccessory): Promise<void>;
-    removeSwitchService(accessory: PlatformAccessory): Promise<void>;
-    private DoublePress;
-    stopScanning(switchbot: any): Promise<void>;
-    getCustomBLEAddress(switchbot: any): Promise<void>;
-    BLEPushConnection(): Promise<void>;
-    BLERefreshConnection(switchbot: any): Promise<void>;
-    retry({ max, fn }: {
-        max: number;
-        fn: {
-            (): any;
-            (): Promise<any>;
-        };
-    }): Promise<null>;
-    maxRetry(): number;
-    PressOrSwitch(device: device & devicesConfig): Promise<void>;
-    allowPushChanges(device: device & devicesConfig): Promise<void>;
-    scan(device: device & devicesConfig): Promise<void>;
-    statusCode(statusCode: number): Promise<void>;
-    offlineOff(): Promise<void>;
-    apiError(e: any): Promise<void>;
-    deviceType(device: device & devicesConfig): Promise<void>;
-    deviceContext(): Promise<void>;
-    refreshRate(device: device & devicesConfig): Promise<void>;
-    deviceConfig(device: device & devicesConfig): Promise<void>;
-    deviceLogs(device: device & devicesConfig): Promise<void>;
-    /**
-     * Logging for Device
-     */
-    infoLog(...log: any[]): void;
-    warnLog(...log: any[]): void;
-    debugWarnLog(...log: any[]): void;
-    errorLog(...log: any[]): void;
-    debugErrorLog(...log: any[]): void;
-    debugLog(...log: any[]): void;
-    enablingDeviceLogging(): boolean;
-}
-//# sourceMappingURL=bot-old.d.ts.map

package/dist/device/bot-old.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bot-old.d.ts","sourceRoot":"","sources":["../../src/device/bot-old.ts"],"names":[],"mappings":"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"}