@switchbot/homebridge-switchbot 4.3.2-beta.9 → 4.3.3

package/dist/platform.js

@@ -5,7 +5,6 @@ import fakegato from 'fakegato-history';
 import { EveHomeKitTypes } from 'homebridge-lib/EveHomeKitTypes';
 import { LogLevel, SwitchBotBLE, SwitchBotModel, SwitchBotOpenAPI } from 'node-switchbot';
 import { queueScheduler } from 'rxjs';
-import { AirPurifier } from './device/airpurifier.js';
 import { BlindTilt } from './device/blindtilt.js';
 import { Bot } from './device/bot.js';
 import { CeilingLight } from './device/ceilinglight.js';
@@ -23,11 +22,12 @@ import { MeterPlus } from './device/meterplus.js';
 import { MeterPro } from './device/meterpro.js';
 import { Motion } from './device/motion.js';
 import { Plug } from './device/plug.js';
+import { Presence } from './device/presence.js';
 import { RelaySwitch } from './device/relayswitch.js';
 import { RobotVacuumCleaner } from './device/robotvacuumcleaner.js';
 import { WaterDetector } from './device/waterdetector.js';
 import { AirConditioner } from './irdevice/airconditioner.js';
-import { AirPurifierIR } from './irdevice/airpurifier.js';
+import { AirPurifier } from './irdevice/airpurifier.js';
 import { Camera } from './irdevice/camera.js';
 import { IRFan } from './irdevice/fan.js';
 import { Light } from './irdevice/light.js';
@@ -202,7 +202,7 @@ export class SwitchBotPlatform {
                             this.webhookEventHandler[context.deviceMac]?.(context);
                         }
                         catch (e) {
-                            this.errorLog(`Failed to handle webhook event. Error:${e.message ?? e}`);
+                            this.errorLog(`Failed to handle webhook event. Error: ${e.message ?? e}`);
                         }
                     });
                 }
@@ -230,14 +230,14 @@ export class SwitchBotPlatform {
                 });
             }
             catch (e) {
-                this.errorLog(`Failed to setup webhook. Error:${e.message ?? e}`);
+                this.errorLog(`Failed to setup webhook. Error: ${e.message ?? e}`);
             }
             this.api.on('shutdown', async () => {
                 try {
                     this.switchBotAPI.deleteWebhook(url);
                 }
                 catch (e) {
-                    this.errorLog(`Failed to delete webhook. Error:${e.message ?? e}`);
+                    this.errorLog(`Failed to delete webhook. Error: ${e.message ?? e}`);
                 }
             });
         }
@@ -289,7 +289,7 @@ export class SwitchBotPlatform {
                         await this.switchBotBLE.startScan();
                     }
                     catch (e) {
-                        this.errorLog(`Failed to start BLE scanning. Error:${e.message ?? e}`);
+                        this.errorLog(`Failed to start BLE scanning. Error: ${e.message ?? e}`);
                     }
                     // Set an event handler to monitor advertisement packets
                     this.switchBotBLE.onadvertisement = async (ad) => {
@@ -297,7 +297,7 @@ export class SwitchBotPlatform {
                             this.bleEventHandler[ad.address]?.(ad.serviceData);
                         }
                         catch (e) {
-                            this.errorLog(`Failed to handle BLE event. Error:${e.message ?? e}`);
+                            this.errorLog(`Failed to handle BLE event. Error: ${e.message ?? e}`);
                         }
                     };
                 })();
@@ -307,7 +307,7 @@ export class SwitchBotPlatform {
                         this.infoLog('Stopped BLE scanning to close listening.');
                     }
                     catch (e) {
-                        this.errorLog(`Failed to stop Platform BLE scanning. Error:${e.message ?? e}`);
+                        this.errorLog(`Failed to stop Platform BLE scanning. Error: ${e.message ?? e}`);
                     }
                 });
             }
@@ -536,17 +536,19 @@ export class SwitchBotPlatform {
             'Humidifier': this.createHumidifier.bind(this),
             'Humidifier2': this.createHumidifier.bind(this),
             'Hub 2': this.createHub2.bind(this),
+            'Hub 3': this.createHub2.bind(this),
             'Bot': this.createBot.bind(this),
             'Relay Switch 1': this.createRelaySwitch.bind(this),
             'Relay Switch 1PM': this.createRelaySwitch.bind(this),
             'Meter': this.createMeter.bind(this),
             'MeterPlus': this.createMeterPlus.bind(this),
             'Meter Plus (JP)': this.createMeterPlus.bind(this),
-            'MeterPro': this.createMeterPro.bind(this),
+            'Meter Pro': this.createMeterPro.bind(this),
             'MeterPro(CO2)': this.createMeterPro.bind(this),
             'WoIOSensor': this.createIOSensor.bind(this),
             'Water Detector': this.createWaterDetector.bind(this),
             'Motion Sensor': this.createMotion.bind(this),
+            'Presence Sensor': this.createPresence.bind(this),
             'Contact Sensor': this.createContact.bind(this),
             'Curtain': this.createCurtain.bind(this),
             'Curtain3': this.createCurtain.bind(this),
@@ -570,10 +572,6 @@ export class SwitchBotPlatform {
             'Ceiling Light Pro': this.createCeilingLight.bind(this),
             'Strip Light': this.createStripLight.bind(this),
             'Battery Circulator Fan': this.createFan.bind(this),
-            'Air Purifier PM2.5': this.createAirPurifier.bind(this),
-            'Air Purifier Table PM2.5': this.createAirPurifier.bind(this),
-            'Air Purifier VOC': this.createAirPurifier.bind(this),
-            'Air Purifier Table VOC': this.createAirPurifier.bind(this),
         };
         if (deviceTypeHandlers[device.deviceType]) {
             this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
@@ -607,8 +605,8 @@ export class SwitchBotPlatform {
             'DIY Air Conditioner': this.createAirConditioner.bind(this),
             'Light': this.createLight.bind(this),
             'DIY Light': this.createLight.bind(this),
-            'Air Purifier': this.createAirPurifierIR.bind(this),
-            'DIY Air Purifier': this.createAirPurifierIR.bind(this),
+            'Air Purifier': this.createAirPurifier.bind(this),
+            'DIY Air Purifier': this.createAirPurifier.bind(this),
             'Water Heater': this.createWaterHeater.bind(this),
             'DIY Water Heater': this.createWaterHeater.bind(this),
             'Vacuum Cleaner': this.createVacuumCleaner.bind(this),
@@ -1232,6 +1230,66 @@ export class SwitchBotPlatform {
             this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
+    async createPresence(device) {
+        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.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.PresenceSensor;
+                existingAccessory.displayName = device.configDeviceName
+                    ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
+                    : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
+                existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
+                this.api.updatePlatformAccessories([existingAccessory]);
+                // create the accessory handler for the restored accessory
+                // this is imported from `platformAccessory.ts`
+                new Presence(this, existingAccessory, device);
+                this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${existingAccessory.UUID})`);
+            }
+            else {
+                this.unregisterPlatformAccessories(existingAccessory);
+            }
+        }
+        else if (await this.registerDevice(device)) {
+            // create a new accessory
+            const accessory = new this.api.platformAccessory(device.configDeviceName
+                ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
+                : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', 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.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.PresenceSensor;
+            accessory.displayName = device.configDeviceName
+                ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
+                : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
+            accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
+            // create the accessory handler for the newly create accessory
+            // this is imported from `platformAccessory.ts`
+            new Presence(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}`);
+        }
+    }
     async createContact(device) {
         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
@@ -1808,66 +1866,6 @@ export class SwitchBotPlatform {
             this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
-    async createAirPurifier(device) {
-        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.device = device;
-                existingAccessory.context.deviceId = device.deviceId;
-                existingAccessory.context.deviceType = device.deviceType;
-                existingAccessory.context.model = SwitchBotModel.BatteryCirculatorFan;
-                existingAccessory.displayName = device.configDeviceName
-                    ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
-                    : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
-                existingAccessory.context.connectionType = await this.connectionType(device);
-                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
-                this.api.updatePlatformAccessories([existingAccessory]);
-                // create the accessory handler for the restored accessory
-                // this is imported from `platformAccessory.ts`
-                new AirPurifier(this, existingAccessory, device);
-                this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${existingAccessory.UUID})`);
-            }
-            else {
-                this.unregisterPlatformAccessories(existingAccessory);
-            }
-        }
-        else if (await this.registerDevice(device)) {
-            // create a new accessory
-            const accessory = new this.api.platformAccessory(device.configDeviceName
-                ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
-                : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', 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.deviceId = device.deviceId;
-            accessory.context.deviceType = device.deviceType;
-            accessory.context.model = SwitchBotModel.BatteryCirculatorFan;
-            accessory.displayName = device.configDeviceName
-                ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
-                : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
-            accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
-            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
-            this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
-            // create the accessory handler for the newly create accessory
-            // this is imported from `platformAccessory.ts`
-            new AirPurifier(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}`);
-        }
-    }
     async createRobotVacuumCleaner(device) {
         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
@@ -2173,7 +2171,7 @@ export class SwitchBotPlatform {
             this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
-    async createAirPurifierIR(device) {
+    async createAirPurifier(device) {
         const uuid = this.api.hap.uuid.generate(`${device.deviceId}-${device.remoteType}`);
         // 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
@@ -2194,7 +2192,7 @@ export class SwitchBotPlatform {
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
-                new AirPurifierIR(this, existingAccessory, device);
+                new AirPurifier(this, existingAccessory, device);
                 this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${existingAccessory.UUID})`);
             }
             else {
@@ -2221,7 +2219,7 @@ export class SwitchBotPlatform {
             this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
-            new AirPurifierIR(this, accessory, device);
+            new AirPurifier(this, accessory, device);
             this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
             // publish device externally or link the accessory to your platform
             this.externalOrPlatform(device, accessory);
@@ -2636,6 +2634,7 @@ export class SwitchBotPlatform {
                 hubDeviceId: '',
                 version: 0,
                 deviceName: '',
+                enableCloudService: false,
             }, statusCode: 500 };
     }
     async retryCommand(device, bodyChange, deviceMaxRetries, deviceDelayBetweenRetries) {