@switchbot/homebridge-switchbot 2.8.0-beta.2 → 2.8.0-beta.20

package/src/irdevice/waterheater.ts

@@ -1,7 +1,7 @@
+import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 import { request } from 'undici';
 import { SwitchBotPlatform } from '../platform';
-import { irDevicesConfig, irdevice, Devices } from '../settings';
-import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
+import { Devices, irDevicesConfig, irdevice } from '../settings';
 
 /**
  * Platform Accessory
@@ -27,10 +27,10 @@ export class WaterHeater {
   ) {
     // default placeholders
     this.logs({ device });
-    this.config({ device });
     this.context();
     this.disablePushOnChanges({ device });
     this.disablePushOffChanges({ device });
+    this.config({ device });
 
     // set accessory information
     accessory
@@ -121,14 +121,14 @@ export class WaterHeater {
   async pushChanges(bodyChange: any): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushChanges`);
     if (this.device.connectionType === 'OpenAPI') {
-      this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
+      this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
       try {
         const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
           body: bodyChange,
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);
@@ -303,7 +303,7 @@ export class WaterHeater {
       config['disablePushOff'] = device.disablePushOff;
     }
     if (Object.entries(config).length !== 0) {
-      this.infoLog({ log: [`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`] });
+      this.debugWarnLog({ log: [`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`] });
     }
   }
 

package/src/platform.ts

@@ -138,7 +138,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       platformConfig['pushRate'] = this.config.options.pushRate;
     }
     if (Object.entries(platformConfig).length !== 0) {
-      this.infoLog(`Platform Config: ${JSON.stringify(platformConfig)}`);
+      this.debugWarnLog(`Platform Config: ${JSON.stringify(platformConfig)}`);
     }
 
     if (this.config.options) {
@@ -245,7 +245,8 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       } else {
         // eslint-disable-next-line no-useless-escape, max-len
         this.warnLog(
-          'This plugin has been updated to use OpenAPI v1.1, config is set with openToken, "openToken" config has been moved to the "token" config, please restart Homebridge.',
+          'This plugin has been updated to use OpenAPI v1.1, config is set with openToken, '
+          + '"openToken" config has been moved to the "token" config, please restart Homebridge.',
         );
       }
 
@@ -299,18 +300,42 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         const { body, statusCode, headers } = await request(Devices, {
           headers: this.generateHeaders(),
         });
-        const devicesAPI = await body.json();
-        this.debugLog(`Devices: ${JSON.stringify(devicesAPI.body)}`);
-        this.statusCode(statusCode);
-        this.debugLog(`Headers: ${JSON.stringify(headers)}`);
-        // SwitchBot Devices
-        const deviceLists = devicesAPI.body.deviceList;
-        if (!this.config.options?.devices) {
-          this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
-          if (devicesAPI.body.length === 0) {
-            this.debugLog(`SwitchBot API Currently Doesn't Have Any Devices With Cloud Services Enabled: ${JSON.stringify(devicesAPI.body)}`);
-          } else {
-            const devices = deviceLists.map((v: any) => v);
+        if (statusCode === 200) {
+          const devicesAPI: any = await body.json();
+          this.debugLog(`Devices: ${JSON.stringify(devicesAPI.body)}`);
+          this.debugLog(`Headers: ${JSON.stringify(headers)}`);
+          // SwitchBot Devices
+          const deviceLists = devicesAPI.body.deviceList;
+          if (!this.config.options?.devices) {
+            this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
+            if (deviceLists.length === 0) {
+              this.debugLog(`SwitchBot API Currently Doesn't Have Any Devices With Cloud Services Enabled: ${JSON.stringify(devicesAPI.body)}`);
+            } else {
+              const devices = deviceLists.map((v: any) => v);
+              for (const device of devices) {
+                if (device.deviceType) {
+                  if (device.configDeviceName) {
+                    device.deviceName = device.configDeviceName;
+                  }
+                  this.createDevice(device);
+                }
+              }
+            }
+          } 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) {
@@ -319,72 +344,51 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
                 this.createDevice(device);
               }
             }
+          } else {
+            this.errorLog('SwitchBot Token Supplied, Issue with Auth.');
           }
-        } 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;
-              }
-              this.createDevice(device);
-            }
+          if (devicesAPI.body.deviceList.length !== 0) {
+            this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
+          } else {
+            this.debugLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
           }
-        } else {
-          this.errorLog('SwitchBot Token Supplied, Issue with Auth.');
-        }
-        if (devicesAPI.body.deviceList.length !== 0) {
-          this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
-        } else {
-          this.debugLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
-        }
 
-        // IR Devices
-        const irDeviceLists = devicesAPI.body.infraredRemoteList;
-        if (!this.config.options?.irdevices) {
-          this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
-          const devices = irDeviceLists.map((v: any) => v);
-          for (const device of devices) {
-            if (device.remoteType) {
+          // IR Devices
+          const irDeviceLists = devicesAPI.body.infraredRemoteList;
+          if (!this.config.options?.irdevices) {
+            this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+            const devices = irDeviceLists.map((v: any) => v);
+            for (const device of devices) {
+              if (device.remoteType) {
+                this.createIRDevice(device);
+              }
+            }
+          } else {
+            this.debugLog(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+            const irDeviceConfig = this.config.options?.irdevices;
+
+            const mergeIRBydeviceId = (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 = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
+            this.debugLog(`IR Devices: ${JSON.stringify(devices)}`);
+            for (const device of devices) {
               this.createIRDevice(device);
             }
           }
-        } else {
-          this.debugLog(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
-          const irDeviceConfig = this.config.options?.irdevices;
-
-          const mergeIRBydeviceId = (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 = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
-          this.debugLog(`IR Devices: ${JSON.stringify(devices)}`);
-          for (const device of devices) {
-            this.createIRDevice(device);
+          if (devicesAPI.body.infraredRemoteList.length !== 0) {
+            this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+          } else {
+            this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
           }
-        }
-        if (devicesAPI.body.infraredRemoteList.length !== 0) {
-          this.infoLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
         } else {
-          this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+          this.statusCode(statusCode);
         }
       } catch (e: any) {
         this.debugErrorLog(
@@ -1664,9 +1668,6 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     // the cached devices we stored in the `configureAccessory` method above
     const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
 
-    if (device.irair?.meterType && device.irair?.meterId) {
-      device.irair.meterUuid = this.api.hap.uuid.generate(`${device.irair.meterId}-${device.irair.meterType}`);
-    }
     if (existingAccessory) {
       // the accessory already exists
       if (!device.hide_device && device.hubDeviceId) {

package/src/settings.ts

@@ -286,7 +286,7 @@ export type deviceStatus = {
   childLock?: boolean; //determines if a Humidifier's safety lock is on or not. (Used by the following deviceTypes: Humidifier)
   sound?: boolean; //determines if a Humidifier is muted or not. (Used by the following deviceTypes: Humidifier)
   lackWater?: boolean; //determines if the water tank is empty or not. (Used by the following deviceTypes: Humidifier)
-  version?: number; //the version of the device. (Used by the following deviceTypes: Blind Tilt)
+  version?: number; //the version of the device. (Used by the following deviceTypes: Blind Tilt, Meter, MeterPlus, IOSensor)
   direction?: string; //the opening direction of a Blind Tilt device. (Used by the following deviceTypes: Blind Tilt)
   runStatus?: string; //'static' when not moving. (Used by the following deviceTypes: Blind Tilt)
   mode?: number; //available for  devices. the fan mode. (Used by the following deviceTypes: Smart Fan)