@switchbot/homebridge-switchbot 4.1.1-beta.0 → 4.1.1-beta.10

package/src/irdevice/fan.ts

@@ -83,7 +83,7 @@ export class IRFan extends irdeviceBase {
   }
 
   async SwingModeSet(value: CharacteristicValue): Promise<void> {
-    await this.debugLog(`SwingMode: ${value}`)
+    this.debugLog(`SwingMode: ${value}`)
     if (value > this.Fan.SwingMode) {
       this.Fan.SwingMode = 1
       await this.pushFanOnChanges()
@@ -98,7 +98,7 @@ export class IRFan extends irdeviceBase {
   }
 
   async RotationSpeedSet(value: CharacteristicValue): Promise<void> {
-    await this.debugLog(`RotationSpeed: ${value}`)
+    this.debugLog(`RotationSpeed: ${value}`)
     if (value > this.Fan.RotationSpeed) {
       this.Fan.RotationSpeed = 1
       this.pushFanSpeedUpChanges()
@@ -112,7 +112,7 @@ export class IRFan extends irdeviceBase {
   }
 
   async ActiveSet(value: CharacteristicValue): Promise<void> {
-    await this.debugLog(`Active: ${value}`)
+    this.debugLog(`Active: ${value}`)
 
     this.Fan.Active = value
     if (this.Fan.Active === this.hap.Characteristic.Active.ACTIVE) {
@@ -132,7 +132,7 @@ export class IRFan extends irdeviceBase {
    * Fan -        "command"       "highSpeed"      "default"          =        fan speed to high
    */
   async pushFanOnChanges(): Promise<void> {
-    await this.debugLog(`pushFanOnChanges Active: ${this.Fan.Active}, disablePushOn: ${this.disablePushOn}`)
+    this.debugLog(`pushFanOnChanges Active: ${this.Fan.Active}, disablePushOn: ${this.disablePushOn}`)
     if (this.Fan.Active === this.hap.Characteristic.Active.ACTIVE && !this.disablePushOn) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
@@ -146,7 +146,7 @@ export class IRFan extends irdeviceBase {
   }
 
   async pushFanOffChanges(): Promise<void> {
-    await this.debugLog(`pushLightOffChanges Active: ${this.Fan.Active}, disablePushOff: ${this.disablePushOff}`)
+    this.debugLog(`pushLightOffChanges Active: ${this.Fan.Active}, disablePushOff: ${this.disablePushOff}`)
     if (this.Fan.Active === this.hap.Characteristic.Active.INACTIVE && !this.disablePushOff) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
@@ -187,12 +187,12 @@ export class IRFan extends irdeviceBase {
   }
 
   async pushChanges(bodyChange: any): Promise<void> {
-    await this.debugLog('pushChanges')
+    this.debugLog('pushChanges')
     if (this.device.connectionType === 'OpenAPI') {
-      await this.infoLog(`Sending request to SwitchBot API, body: ${JSON.stringify(bodyChange)}`)
+      this.infoLog(`Sending request to SwitchBot API, body: ${JSON.stringify(bodyChange)}`)
       try {
-        const { body } = await this.pushChangeRequest(bodyChange)
-        const deviceStatus: any = await body
+        const response = await this.pushChangeRequest(bodyChange)
+        const deviceStatus: any = response.body
         await this.pushStatusCodes(deviceStatus)
         if (await this.successfulStatusCodes(deviceStatus)) {
           await this.successfulPushChange(deviceStatus, bodyChange)
@@ -205,12 +205,12 @@ export class IRFan extends irdeviceBase {
         await this.pushChangeError(e)
       }
     } else {
-      await this.warnLog(`Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`)
+      this.warnLog(`Connection Type: ${this.device.connectionType}, commands will not be sent to OpenAPI`)
     }
   }
 
   async updateHomeKitCharacteristics(): Promise<void> {
-    await this.debugLog('updateHomeKitCharacteristics')
+    this.debugLog('updateHomeKitCharacteristics')
     // Active
     await this.updateCharacteristic(this.Fan.Service, this.hap.Characteristic.Active, this.Fan.Active, 'Active')
     // SwingMode

package/src/irdevice/irdevice.ts

@@ -51,16 +51,16 @@ export abstract class irdeviceBase {
   async getDeviceLogSettings(device: irdevice & irDevicesConfig): Promise<void> {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debugMode'
-      await this.debugWarnLog(`Using Debug Mode Logging: ${this.deviceLogging}`)
+      this.debugWarnLog(`Using Debug Mode Logging: ${this.deviceLogging}`)
     } else if (device.logging) {
       this.deviceLogging = this.accessory.context.logging = device.logging
-      await this.debugWarnLog(`Using Device Config Logging: ${this.deviceLogging}`)
+      this.debugWarnLog(`Using Device Config Logging: ${this.deviceLogging}`)
     } else if (this.config.logging) {
       this.deviceLogging = this.accessory.context.logging = this.config.logging
-      await this.debugWarnLog(`Using Platform Config Logging: ${this.deviceLogging}`)
+      this.debugWarnLog(`Using Platform Config Logging: ${this.deviceLogging}`)
     } else {
       this.deviceLogging = this.accessory.context.logging = 'standard'
-      await this.debugWarnLog(`Logging Not Set, Using: ${this.deviceLogging}`)
+      this.debugWarnLog(`Logging Not Set, Using: ${this.deviceLogging}`)
     }
   }
 
@@ -116,7 +116,7 @@ export abstract class irdeviceBase {
 
     const deviceFirmwareVersion = device.firmware ?? accessory.context.version ?? this.platform.version ?? '0.0.0'
     const version = deviceFirmwareVersion.toString()
-    await this.debugLog(`version: ${version?.replace(/^V|-.*$/g, '')}`)
+    this.debugLog(`version: ${version?.replace(/^V|-.*$/g, '')}`)
     let deviceVersion: string
     if (version?.includes('.') === false) {
       const replace = version?.replace(/^V|-.*$/g, '')
@@ -158,19 +158,19 @@ export abstract class irdeviceBase {
    */
   async updateCharacteristic(Service: Service, Characteristic: any, CharacteristicValue: CharacteristicValue | undefined, CharacteristicName: string): Promise<void> {
     if (CharacteristicValue === undefined) {
-      await this.debugLog(`${CharacteristicName}: ${CharacteristicValue}`)
+      this.debugLog(`${CharacteristicName}: ${CharacteristicValue}`)
     } else {
       Service.updateCharacteristic(Characteristic, CharacteristicValue)
-      await this.debugLog(`updateCharacteristic ${CharacteristicName}: ${CharacteristicValue}`)
-      await this.debugWarnLog(`${CharacteristicName} context before: ${this.accessory.context[CharacteristicName]}`)
+      this.debugLog(`updateCharacteristic ${CharacteristicName}: ${CharacteristicValue}`)
+      this.debugWarnLog(`${CharacteristicName} context before: ${this.accessory.context[CharacteristicName]}`)
       this.accessory.context[CharacteristicName] = CharacteristicValue
-      await this.debugWarnLog(`${CharacteristicName} context after: ${this.accessory.context[CharacteristicName]}`)
+      this.debugWarnLog(`${CharacteristicName} context after: ${this.accessory.context[CharacteristicName]}`)
     }
   }
 
   async pushStatusCodes(deviceStatus: any) {
-    await this.debugWarnLog(`deviceStatus: ${JSON.stringify(deviceStatus)}`)
-    await this.debugWarnLog(`deviceStatus statusCode: ${deviceStatus.statusCode}`)
+    this.debugWarnLog(`deviceStatus: ${JSON.stringify(deviceStatus)}`)
+    this.debugWarnLog(`deviceStatus statusCode: ${deviceStatus.statusCode}`)
   }
 
   async successfulPushChange(deviceStatus: any, bodyChange: any) {

package/src/irdevice/light.ts

@@ -111,7 +111,7 @@ export class Light extends irdeviceBase {
   }
 
   async OnSet(value: CharacteristicValue): Promise<void> {
-    await this.debugLog(`On: ${value}`)
+    this.debugLog(`On: ${value}`)
 
     this.LightBulb!.On = value
     if (this.LightBulb?.On) {
@@ -128,7 +128,7 @@ export class Light extends irdeviceBase {
   }
 
   async ProgrammableSwitchOutputStateSetOn(value: CharacteristicValue): Promise<void> {
-    await this.debugLog(`On: ${value}`)
+    this.debugLog(`On: ${value}`)
 
     this.ProgrammableSwitchOn!.ProgrammableSwitchOutputState = value
     if (this.ProgrammableSwitchOn?.ProgrammableSwitchOutputState === 1) {
@@ -142,7 +142,7 @@ export class Light extends irdeviceBase {
   }
 
   async ProgrammableSwitchOutputStateSetOff(value: CharacteristicValue): Promise<void> {
-    await this.debugLog(`On: ${value}`)
+    this.debugLog(`On: ${value}`)
 
     this.ProgrammableSwitchOff!.ProgrammableSwitchOutputState = value
     if (this.ProgrammableSwitchOff?.ProgrammableSwitchOutputState === 1) {
@@ -166,7 +166,7 @@ export class Light extends irdeviceBase {
    * Light -       "command"       "channelSub"      "default"          =        previous channel
    */
   async pushLightOnChanges(On: boolean): Promise<void> {
-    await this.debugLog(`pushLightOnChanges On: ${On}, disablePushOn: ${this.disablePushOn}`)
+    this.debugLog(`pushLightOnChanges On: ${On}, disablePushOn: ${this.disablePushOn}`)
     if (On === true && this.disablePushOn === false) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOn()
@@ -180,7 +180,7 @@ export class Light extends irdeviceBase {
   }
 
   async pushLightOffChanges(On: boolean): Promise<void> {
-    await this.debugLog(`pushLightOffChanges On: ${On}, disablePushOff: ${this.disablePushOff}`)
+    this.debugLog(`pushLightOffChanges On: ${On}, disablePushOff: ${this.disablePushOff}`)
     if (On === false && this.disablePushOff === false) {
       const commandType: string = await this.commandType()
       const command: string = await this.commandOff()
@@ -196,10 +196,10 @@ export class Light extends irdeviceBase {
   async pushChanges(bodyChange: any, On: boolean): Promise<void> {
     this.debugLog('pushChanges')
     if (this.device.connectionType === 'OpenAPI') {
-      await this.infoLog(`Sending request to SwitchBot API, body: ${JSON.stringify(bodyChange)}`)
+      this.infoLog(`Sending request to SwitchBot API, body: ${JSON.stringify(bodyChange)}`)
       try {
-        const { body } = await this.pushChangeRequest(bodyChange)
-        const deviceStatus: any = await body
+        const response = await this.pushChangeRequest(bodyChange)
+        const deviceStatus: any = response.body
         await this.pushStatusCodes(deviceStatus)
         if (await this.successfulStatusCodes(deviceStatus)) {
           await this.successfulPushChange(deviceStatus, bodyChange)
@@ -218,7 +218,7 @@ export class Light extends irdeviceBase {
   }
 
   async updateHomeKitCharacteristics(): Promise<void> {
-    await this.debugLog('updateHomeKitCharacteristics')
+    this.debugLog('updateHomeKitCharacteristics')
     if (!(this.device as irLightConfig).stateless && this.LightBulb?.Service) {
       // On
       await this.updateCharacteristic(this.LightBulb.Service, this.hap.Characteristic.On, this.LightBulb.On, 'On')