@switchbot/homebridge-switchbot 3.8.3-beta.15 → 3.8.3-beta.17

package/src/platform.ts

@@ -133,16 +133,16 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     this.switchBotAPI.on('log', (log) => {
       switch (log.level) {
         case LogLevel.ERROR:
-          this.errorLog(`[${log.level.toUpperCase()}] ${log.message}`)
+          this.errorLog(log.message)
           break
         case LogLevel.WARN:
-          this.warnLog(`[${log.level.toUpperCase()}] ${log.message}`)
+          this.warnLog(log.message)
           break
         case LogLevel.DEBUG:
-          this.debugLog(`[${log.level.toUpperCase()}] ${log.message}`)
+          this.debugLog(log.message)
           break
         default:
-          this.infoLog(`[${log.level.toUpperCase()}] ${log.message}`)
+          this.infoLog(log.message)
       }
     })
     // import fakegato-history module and EVE characteristics
@@ -474,16 +474,15 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
     while (retryCount < maxRetries) {
       try {
-        const { devicesAPI, statusCode } = await this.switchBotAPI.getDevices()
-        await this.debugWarnLog(`statusCode: ${statusCode}`)
-        await this.debugWarnLog(`devicesAPI: ${JSON.stringify(devicesAPI)}`)
+        const { responseBody } = await this.switchBotAPI.getDevices()
+        await this.debugWarnLog(`devicesAPI: ${JSON.stringify(responseBody)}`)
 
-        if (this.isSuccessfulResponse(statusCode, devicesAPI.statusCode)) {
-          await this.handleDevices(devicesAPI.body.deviceList)
-          await this.handleIRDevices(devicesAPI.body.infraredRemoteList)
+        if (this.isSuccessfulResponse(responseBody.statusCode)) {
+          await this.handleDevices(responseBody.body.deviceList)
+          await this.handleIRDevices(responseBody.body.infraredRemoteList)
           break
         } else {
-          await this.handleErrorResponse(statusCode, devicesAPI.statusCode, retryCount, maxRetries, delayBetweenRetries)
+          await this.handleErrorResponse(responseBody.statusCode, retryCount, maxRetries, delayBetweenRetries)
           retryCount++
         }
       } catch (e: any) {
@@ -516,8 +515,8 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     }
   }
 
-  private isSuccessfulResponse(statusCode: number, apiStatusCode: number): boolean {
-    return (statusCode === 200 || statusCode === 100) && (apiStatusCode === 200 || apiStatusCode === 100)
+  private isSuccessfulResponse(apiStatusCode: number): boolean {
+    return (apiStatusCode === 200 || apiStatusCode === 100)
   }
 
   private async handleDevices(deviceLists: any[]) {
@@ -582,11 +581,10 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     })
   }
 
-  private async handleErrorResponse(statusCode: number, apiStatusCode: number, retryCount: number, maxRetries: number, delayBetweenRetries: number) {
-    await this.statusCode(statusCode)
+  private async handleErrorResponse(apiStatusCode: number, retryCount: number, maxRetries: number, delayBetweenRetries: number) {
     await this.statusCode(apiStatusCode)
-    if (statusCode === 500) {
-      this.infoLog(`statusCode: ${statusCode} Attempt ${retryCount + 1} of ${maxRetries}`)
+    if (apiStatusCode === 500) {
+      this.infoLog(`statusCode: ${apiStatusCode} Attempt ${retryCount + 1} of ${maxRetries}`)
       await sleep(delayBetweenRetries)
     }
   }
@@ -2547,18 +2545,14 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     }
   }
 
-  async retryRequest(deviceId: string, deviceMaxRetries: number, deviceDelayBetweenRetries: number): Promise<{ body: any, statusCode: number }> {
+  async retryRequest(deviceId: string, deviceMaxRetries: number, deviceDelayBetweenRetries: number): Promise<{ body: any }> {
     let retryCount = 0
     const maxRetries = deviceMaxRetries
     const delayBetweenRetries = deviceDelayBetweenRetries
     while (retryCount < maxRetries) {
       try {
-        const { body, statusCode } = await this.switchBotAPI.getDeviceStatus(deviceId)
-        if (statusCode === 200 || statusCode === 100) {
-          return { body, statusCode }
-        } else {
-          await this.debugLog(`Received status code: ${statusCode}`)
-        }
+        const { body } = await this.switchBotAPI.getDeviceStatus(deviceId)
+        return body
       } catch (error: any) {
         await this.errorLog(`Error making request: ${error.message}`)
       }
@@ -2566,7 +2560,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       await this.debugLog(`Retry attempt ${retryCount} of ${maxRetries}`)
       await sleep(delayBetweenRetries)
     }
-    return { body: null, statusCode: -1 }
+    return { body: null }
   }
 
   // BLE Connection