@switchbot/homebridge-switchbot 2.5.3-beta.13 → 2.5.3-beta.15

package/src/device/meterplus.ts

@@ -32,6 +32,7 @@ export class MeterPlus {
   StatusLowBattery?: CharacteristicValue;
 
   // OpenAPI Others
+  Battery: deviceStatus['battery'];
   Temperature: deviceStatus['temperature'];
   Humidity: deviceStatus['humidity'];
   deviceStatus!: any; //deviceStatusResponse;
@@ -356,11 +357,9 @@ export class MeterPlus {
           try {
             this.deviceStatus = JSON.parse(rawData);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus: ${superStringify(this.deviceStatus)}`);
-            if (this.device.deviceType === 'WoIOSensor') {
-              this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus: ${superStringify(this.deviceStatus)}`);
-            }
             this.Humidity = this.deviceStatus.body.humidity!;
             this.Temperature = this.deviceStatus.body.temperature!;
+            this.Battery = this.deviceStatus.body.battery!;
             this.parseStatus();
             this.updateHomeKitCharacteristics();
           } catch (e: any) {

package/src/platform.ts

@@ -5,6 +5,7 @@ import { Meter } from './device/meter';
 import { Motion } from './device/motion';
 import { Contact } from './device/contact';
 import { Curtain } from './device/curtain';
+import { IOSensor } from './device/iosensor';
 import { MeterPlus } from './device/meterplus';
 import { ColorBulb } from './device/colorbulb';
 import { CeilingLight } from './device/ceilinglight';
@@ -423,10 +424,13 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.createMeter(device);
         break;
       case 'MeterPlus':
-      case 'WoIOSensor':
         this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
         this.createMeterPlus(device);
         break;
+      case 'WoIOSensor':
+        this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
+        this.createIOSensor(device);
+        break;
       case 'Motion Sensor':
         this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
         this.createMotion(device);
@@ -782,6 +786,62 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     }
   }
 
+  private async createIOSensor(device: device & devicesConfig) {
+    const uuid = this.api.hap.uuid.generate(`${device.deviceId}-${device.deviceType}`);
+
+    // see if an accessory with the same uuid has already been registered and restored from
+    // the cached devices we stored in the `configureAccessory` method above
+    const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
+
+    if (existingAccessory) {
+      // the accessory already exists
+      if (await this.registerDevice(device)) {
+        // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
+        existingAccessory.context.model = device.deviceType;
+        existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.configDeviceName || device.deviceName;
+        existingAccessory.context.firmwareRevision = device.firmware;
+        existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+        this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+        existingAccessory.context.connectionType = await this.connectionType(device);
+        this.api.updatePlatformAccessories([existingAccessory]);
+        // create the accessory handler for the restored accessory
+        // this is imported from `platformAccessory.ts`
+        new IOSensor(this, existingAccessory, device);
+        this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${existingAccessory.UUID})`);
+      } else {
+        this.unregisterPlatformAccessories(existingAccessory);
+      }
+    } else if (await this.registerDevice(device)) {
+      // the accessory does not yet exist, so we need to create it
+      if (!device.external) {
+        this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+      }
+
+      // create a new accessory
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
+
+      // store a copy of the device object in the `accessory.context`
+      // the `context` property can be used to store any data about the accessory you may need
+      accessory.context.device = device;
+      accessory.context.model = device.deviceType;
+      accessory.context.deviceID = device.deviceId;
+      accessory.context.firmwareRevision = device.firmware;
+      accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+      accessory.context.connectionType = await this.connectionType(device);
+      // create the accessory handler for the newly create accessory
+      // this is imported from `platformAccessory.ts`
+      new IOSensor(this, accessory, device);
+      this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
+
+      // publish device externally or link the accessory to your platform
+      this.externalOrPlatform(device, accessory);
+      this.accessories.push(accessory);
+    } else {
+      this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+    }
+  }
+
   private async createMotion(device: device & devicesConfig) {
     const uuid = this.api.hap.uuid.generate(`${device.deviceId}-${device.deviceType}`);
 

package/src/settings.ts

@@ -259,8 +259,8 @@ calibrate?:	boolean;	//determines if device has been calibrated or not. (Used by
 group?:	boolean; //determines if a device is paired with or grouped with another device or not. (Used by the following deviceTypes: Curtain, Blind Tilt)
 moving?:	boolean;	//determines if a device is moving or not. (Used by the following deviceTypes: Curtain, Blind Tilt)
 slidePosition?:	number;//the current position (0-100) the percentage of the distance between the calibrated open position and closed position. (Used by the following deviceTypes: Curtain, Blind Tilt)
-temperature?:	number;	//temperature in celsius (Used by the following deviceTypes: Meter, Meter Plus, Humidifier)
-humidity?:	number;	//humidity percentage. (Used by the following deviceTypes: Meter, Meter Plus, Humidifier)
+temperature?:	number;	//temperature in celsius (Used by the following deviceTypes: Meter, Meter Plus, Humidifier, IOSensor)
+humidity?:	number;	//humidity percentage. (Used by the following deviceTypes: Meter, Meter Plus, Humidifier, IOSensor)
 lockState?:	string;	//determines if locked or not. (Used by the following deviceTypes: Lock)
 doorState?:	string;	//determines if the door is closed or not. (Used by the following deviceTypes: Lock)
 moveDetected?:	boolean;	//determines if motion is detected. (Used by the following deviceTypes: Motion Sensor, Contact Sensor)
@@ -274,7 +274,7 @@ electricCurrent?:	number;	//the current of the device at the moment, measured in
 color?:	string;	//the color value, RGB "255:255:255". (Used by the following deviceTypes: Strip Light, Color Bulb)
 workingStatus?:	string;	//the working status of the device. StandBy, Clearing, Paused, GotoChargeBase, Charging, ChargeDone, Dormant, InTrouble, InRemoteControl, or InDustCollecting. (Used by the following deviceTypes: Robot Vacuum Cleaner S1, Robot Vacuum Cleaner S1 Plus)
 onlineStatus?:	string;	//the connection status of the device. online or offline. (Used by the following deviceTypes: Robot Vacuum Cleaner S1, Robot Vacuum Cleaner S1 Plus)
-battery?:	number;	//the current battery level. (Used by the following deviceTypes: Robot Vacuum Cleaner S1, Robot Vacuum Cleaner S1 Plus, Blind Tilt)
+battery?:	number;	//the current battery level. (Used by the following deviceTypes: Robot Vacuum Cleaner S1, Robot Vacuum Cleaner S1 Plus, Blind Tilt, IOSensor)
 deviceName?:	string;	//device name. (Used by the following deviceTypes: Robot Vacuum Cleaner S1 Plus)
 nebulizationEfficiency?:	number;	//atomization efficiency percentage. (Used by the following deviceTypes: Humidifier)
 auto?:	boolean;	//determines if a Humidifier is in Auto Mode or not. (Used by the following deviceTypes: Humidifier)