@switchbot/homebridge-switchbot 2.8.1-beta.1 → 2.8.1-beta.11

package/src/platform.ts

@@ -300,12 +300,18 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         const { body, statusCode, headers } = await request(Devices, {
           headers: this.generateHeaders(),
         });
-        if (statusCode === 200) {
-          const devicesAPI: any = await body.json();
+        this.debugWarnLog(`body: ${JSON.stringify(body)}`);
+        this.debugWarnLog(`statusCode: ${JSON.stringify(statusCode)}`);
+        this.debugWarnLog(`headers: ${JSON.stringify(headers)}`);
+        const devicesAPI: any = await body.json();
+        if ((statusCode === 200 || statusCode === 100) && devicesAPI.statusCode === 200) {
           this.debugLog(`Devices: ${JSON.stringify(devicesAPI.body)}`);
-          this.debugLog(`Headers: ${JSON.stringify(headers)}`);
           // SwitchBot Devices
+          this.debugWarnLog(`devicesAPI: ${JSON.stringify(devicesAPI)}`);
+          this.debugWarnLog(`devicesAPI Length: ${devicesAPI.length}`);
           const deviceLists = devicesAPI.body.deviceList;
+          this.debugWarnLog(`DeviceLists: ${JSON.stringify(deviceLists)}`);
+          this.debugWarnLog(`DeviceLists Length: ${deviceLists.length}`);
           if (!this.config.options?.devices) {
             this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
             if (deviceLists.length === 0) {
@@ -323,25 +329,29 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
             }
           } else if (this.config.credentials?.token && this.config.options.devices) {
             this.debugLog(`SwitchBot Device Config Set: ${JSON.stringify(this.config.options?.devices)}`);
-            const deviceConfigs = this.config.options?.devices;
-
-            const mergeBydeviceId = (a1: { deviceId: string }[], a2: any[]) =>
-              a1.map((itm: { deviceId: string }) => ({
-                ...a2.find(
-                  (item: { deviceId: string }) =>
-                    item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
-                ),
-                ...itm,
-              }));
-
-            const devices = mergeBydeviceId(deviceLists, deviceConfigs);
-            this.debugLog(`SwitchBot Devices: ${JSON.stringify(devices)}`);
-            for (const device of devices) {
-              if (device.deviceType) {
-                if (device.configDeviceName) {
-                  device.deviceName = device.configDeviceName;
+            if (deviceLists.length === 0) {
+              this.debugLog(`SwitchBot API Currently Doesn't Have Any Devices With Cloud Services Enabled: ${JSON.stringify(devicesAPI.body)}`);
+            } else {
+              const deviceConfigs = this.config.options?.devices;
+
+              const mergeBydeviceId = (a1: { deviceId: string }[], a2: any[]) =>
+                a1.map((itm: { deviceId: string }) => ({
+                  ...a2.find(
+                    (item: { deviceId: string }) =>
+                      item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item,
+                  ),
+                  ...itm,
+                }));
+
+              const devices = mergeBydeviceId(deviceLists, deviceConfigs);
+              this.debugLog(`SwitchBot Devices: ${JSON.stringify(devices)}`);
+              for (const device of devices) {
+                if (device.deviceType) {
+                  if (device.configDeviceName) {
+                    device.deviceName = device.configDeviceName;
+                  }
+                  this.createDevice(device);
                 }
-                this.createDevice(device);
               }
             }
           } else {
@@ -388,7 +398,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
             this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
           }
         } else {
-          this.statusCode(statusCode);
+          this.statusCode(devicesAPI.statusCode);
         }
       } catch (e: any) {
         this.debugErrorLog(
@@ -2184,7 +2194,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.debugLog(`Request successful, statusCode: ${statusCode}`);
         break;
       default:
-        this.infoLog(`Unknown statusCode, statusCode: ${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
+        this.errorLog(`Unknown statusCode, statusCode: ${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
     }
   }