@switchbot/homebridge-switchbot 3.5.0-beta.9 → 3.5.0

package/dist/platform.js

@@ -1,22 +1,26 @@
-import { PLATFORM_NAME, PLUGIN_NAME, Devices } from './settings.js';
+/* Copyright(C) 2017-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * platform.ts: @switchbot/homebridge-switchbot platform class.
+ */
+import { Hub } from './device/hub.js';
 import { Bot } from './device/bot.js';
 import { Plug } from './device/plug.js';
 import { Lock } from './device/lock.js';
 import { Meter } from './device/meter.js';
 import { Motion } from './device/motion.js';
-import { Hub } from './device/hub.js';
 import { Contact } from './device/contact.js';
 import { Curtain } from './device/curtain.js';
 import { IOSensor } from './device/iosensor.js';
-import { WaterDetector } from './device/waterdetector.js';
 import { MeterPlus } from './device/meterplus.js';
 import { ColorBulb } from './device/colorbulb.js';
-import { CeilingLight } from './device/ceilinglight.js';
 import { StripLight } from './device/lightstrip.js';
 import { Humidifier } from './device/humidifier.js';
+import { CeilingLight } from './device/ceilinglight.js';
+import { WaterDetector } from './device/waterdetector.js';
 import { RobotVacuumCleaner } from './device/robotvacuumcleaner.js';
+import { Fan } from './device/fan.js';
 import { TV } from './irdevice/tv.js';
-import { Fan } from './irdevice/fan.js';
+import { IRFan } from './irdevice/fan.js';
 import { Light } from './irdevice/light.js';
 import { Others } from './irdevice/other.js';
 import { Camera } from './irdevice/camera.js';
@@ -25,15 +29,17 @@ import { AirPurifier } from './irdevice/airpurifier.js';
 import { WaterHeater } from './irdevice/waterheater.js';
 import { VacuumCleaner } from './irdevice/vacuumcleaner.js';
 import { AirConditioner } from './irdevice/airconditioner.js';
-import * as http from 'http';
 import { Buffer } from 'buffer';
 import { request } from 'undici';
+import asyncmqtt from 'async-mqtt';
+import { sleep } from './utils.js';
+import { createServer } from 'http';
 import { queueScheduler } from 'rxjs';
 import fakegato from 'fakegato-history';
-import asyncmqtt from 'async-mqtt';
 import crypto, { randomUUID } from 'crypto';
 import { readFileSync, writeFileSync } from 'fs';
-import hbLib from 'homebridge-lib';
+import { EveHomeKitTypes } from 'homebridge-lib/EveHomeKitTypes';
+import { PLATFORM_NAME, PLUGIN_NAME, Devices, setupWebhook, updateWebhook, deleteWebhook, queryWebhook } from './settings.js';
 /**
  * HomebridgePlatform
  * This class is the main constructor for your plugin, this is where you should
@@ -46,6 +52,8 @@ export class SwitchBotPlatform {
     version;
     Logging;
     debugMode;
+    maxRetries;
+    delayBetweenRetries;
     platformConfig;
     platformLogging;
     config;
@@ -55,6 +63,7 @@ export class SwitchBotPlatform {
     eve;
     webhookEventHandler = {};
     constructor(log, config, api) {
+        // initialize
         this.accessories = [];
         this.api = api;
         this.log = log;
@@ -69,10 +78,11 @@ export class SwitchBotPlatform {
             credentials: config.credentials,
             options: config.options,
         };
-        this.platformLogging = this.config.options?.logging ?? 'standard';
-        this.platformConfigOptions();
-        this.platformLogs();
+        // Plugin Configuration
+        this.getPlatformConfigSettings();
+        this.getPlatformLogSettings();
         this.getVersion();
+        // Finish initializing the platform
         this.debugLog(`Finished initializing platform: ${config.name}`);
         // verify the config
         try {
@@ -85,7 +95,6 @@ export class SwitchBotPlatform {
             return;
         }
         // import fakegato-history module and EVE characteristics
-        const { EveHomeKitTypes } = hbLib;
         this.fakegatoAPI = fakegato(api);
         this.eve = new EveHomeKitTypes(api);
         // When this event is fired it means Homebridge has restored all cached accessories from disk.
@@ -100,7 +109,6 @@ export class SwitchBotPlatform {
                     await this.updateToken();
                 }
                 else if (this.config.credentials?.token && !this.config.credentials?.secret) {
-                    // eslint-disable-next-line no-useless-escape
                     this.errorLog('"secret" config is not populated, you must populate then please restart Homebridge.');
                 }
                 else {
@@ -154,7 +162,7 @@ export class SwitchBotPlatform {
                 const xurl = new URL(url);
                 const port = Number(xurl.port);
                 const path = xurl.pathname;
-                this.webhookEventListener = http.createServer((request, response) => {
+                this.webhookEventListener = createServer((request, response) => {
                     try {
                         if (request.url === path && request.method === 'POST') {
                             request.on('data', async (data) => {
@@ -193,7 +201,7 @@ export class SwitchBotPlatform {
                 return;
             }
             try {
-                const { body, statusCode } = await request('https://api.switch-bot.com/v1.1/webhook/setupWebhook', {
+                const { body, statusCode } = await request(setupWebhook, {
                     method: 'POST',
                     headers: this.generateHeaders(),
                     body: JSON.stringify({
@@ -215,10 +223,8 @@ export class SwitchBotPlatform {
                 this.errorLog(`Failed to configure webhook. Error: ${e.message}`);
             }
             try {
-                const { body, statusCode } = await request('https://api.switch-bot.com/v1.1/webhook/updateWebhook', {
-                    method: 'POST',
-                    headers: this.generateHeaders(),
-                    body: JSON.stringify({
+                const { body, statusCode } = await request(updateWebhook, {
+                    method: 'POST', headers: this.generateHeaders(), body: JSON.stringify({
                         'action': 'updateWebhook',
                         'config': {
                             'url': url,
@@ -238,7 +244,7 @@ export class SwitchBotPlatform {
                 this.errorLog(`Failed to update webhook. Error:${e.message}`);
             }
             try {
-                const { body, statusCode } = await request('https://api.switch-bot.com/v1.1/webhook/queryWebhook', {
+                const { body, statusCode } = await request(queryWebhook, {
                     method: 'POST',
                     headers: this.generateHeaders(),
                     body: JSON.stringify({
@@ -260,7 +266,7 @@ export class SwitchBotPlatform {
             }
             this.api.on('shutdown', async () => {
                 try {
-                    const { body, statusCode } = await request('https://api.switch-bot.com/v1.1/webhook/deleteWebhook', {
+                    const { body, statusCode } = await request(deleteWebhook, {
                         method: 'POST',
                         headers: this.generateHeaders(),
                         body: JSON.stringify({
@@ -355,6 +361,21 @@ export class SwitchBotPlatform {
             this.config.options.pushRate = 0.1;
             this.debugWarnLog('Using Default Push Rate.');
         }
+        if (!this.config.options.maxRetries) {
+            this.config.options.maxRetries = 5;
+            this.debugWarnLog('Using Default Max Retries.');
+        }
+        else {
+            this.maxRetries = this.config.options.maxRetries;
+        }
+        if (!this.config.options.delayBetweenRetries) {
+            // default 3 seconds
+            this.config.options.delayBetweenRetries = 3000;
+            this.debugWarnLog('Using Default Delay Between Retries.');
+        }
+        else {
+            this.delayBetweenRetries = this.config.options.delayBetweenRetries * 1000;
+        }
         if (!this.config.credentials && !this.config.options) {
             this.debugWarnLog('Missing Credentials');
         }
@@ -399,13 +420,11 @@ export class SwitchBotPlatform {
             }
             // Move openToken to token
             if (!this.config.credentials.secret) {
-                // 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" cconfig has been moved to the "token" config');
-                // eslint-disable-next-line no-useless-escape
+                this.warnLog('This plugin has been updated to use OpenAPI v1.1, config is set with openToken,'
+                    + ' "openToken" cconfig has been moved to the "token" config');
                 this.errorLog('"secret" config is not populated, you must populate then please restart Homebridge.');
             }
             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.');
             }
@@ -451,114 +470,129 @@ export class SwitchBotPlatform {
      */
     async discoverDevices() {
         if (this.config.credentials?.token) {
-            try {
-                const { body, statusCode } = await request(Devices, {
-                    headers: this.generateHeaders(),
-                });
-                this.debugWarnLog(`statusCode: ${statusCode}`);
-                const devicesAPI = await body.json();
-                this.debugWarnLog(`devicesAPI: ${JSON.stringify(devicesAPI)}`);
-                this.debugWarnLog(`devicesAPI Body: ${JSON.stringify(devicesAPI.body)}`);
-                this.debugWarnLog(`devicesAPI StatusCode: ${devicesAPI.statusCode}`);
-                if ((statusCode === 200 || statusCode === 100) && (devicesAPI.statusCode === 200 || devicesAPI.statusCode === 100)) {
-                    this.debugErrorLog(`statusCode: ${statusCode} & devicesAPI StatusCode: ${devicesAPI.statusCode}`);
-                    // SwitchBot Devices
-                    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) {
-                            this.debugLog(`SwitchBot API Currently Doesn't Have Any Devices With Cloud Services Enabled: ${JSON.stringify(devicesAPI.body)}`);
+            let retryCount = 0;
+            const maxRetries = this.maxRetries; // Maximum number of retries
+            const delayBetweenRetries = this.delayBetweenRetries; // Delay between retries in milliseconds
+            this.debugWarnLog(`Retry Count: ${retryCount}`);
+            this.debugWarnLog(`Max Retries: ${maxRetries}`);
+            this.debugWarnLog(`Delay Between Retries: ${delayBetweenRetries}`);
+            while (retryCount < maxRetries) {
+                try {
+                    const { body, statusCode } = await request(Devices, {
+                        headers: this.generateHeaders(),
+                    });
+                    this.debugWarnLog(`statusCode: ${statusCode}`);
+                    const devicesAPI = await body.json();
+                    this.debugWarnLog(`devicesAPI: ${JSON.stringify(devicesAPI)}`);
+                    this.debugWarnLog(`devicesAPI Body: ${JSON.stringify(devicesAPI.body)}`);
+                    this.debugWarnLog(`devicesAPI StatusCode: ${devicesAPI.statusCode}`);
+                    if ((statusCode === 200 || statusCode === 100) && (devicesAPI.statusCode === 200 || devicesAPI.statusCode === 100)) {
+                        this.debugErrorLog(`statusCode: ${statusCode} & devicesAPI StatusCode: ${devicesAPI.statusCode}`);
+                        // SwitchBot Devices
+                        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) {
+                                this.debugLog(`SwitchBot API Currently Doesn't Have Any Devices With Cloud Services Enabled: ${JSON.stringify(devicesAPI.body)}`);
+                            }
+                            else {
+                                const devices = deviceLists.map((v) => v);
+                                for (const device of devices) {
+                                    if (device.deviceType) {
+                                        if (device.configDeviceName) {
+                                            device.deviceName = device.configDeviceName;
+                                        }
+                                        this.createDevice(device);
+                                    }
+                                }
+                            }
                         }
-                        else {
-                            const devices = deviceLists.map((v) => v);
-                            for (const device of devices) {
-                                if (device.deviceType) {
-                                    if (device.configDeviceName) {
-                                        device.deviceName = device.configDeviceName;
+                        else if (this.config.credentials?.token && this.config.options.devices) {
+                            this.debugLog(`SwitchBot Device Config 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 deviceConfigs = this.config.options?.devices;
+                                const mergeBydeviceId = (a1, a2) => a1.map((itm) => ({
+                                    ...a2.find((item) => 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) {
+                                        device.deviceType = device.configDeviceType;
+                                        this.errorLog(`API has displaying no deviceType: ${device.deviceType}, So using configDeviceType: ${device.configDeviceType}`);
+                                    }
+                                    if (device.deviceType) {
+                                        if (device.configDeviceName) {
+                                            device.deviceName = device.configDeviceName;
+                                        }
+                                        this.createDevice(device);
                                     }
-                                    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)}`);
-                        if (deviceLists.length === 0) {
-                            this.debugLog(`SwitchBot API Currently Doesn't Have Any Devices With Cloud Services Enabled: ${JSON.stringify(devicesAPI.body)}`);
+                        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 {
-                            const deviceConfigs = this.config.options?.devices;
-                            const mergeBydeviceId = (a1, a2) => a1.map((itm) => ({
-                                ...a2.find((item) => 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)}`);
+                            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) => v);
                             for (const device of devices) {
-                                if (!device.deviceType) {
-                                    device.deviceType = device.configDeviceType;
-                                    this.errorLog(`API has displaying no deviceType: ${device.deviceType}, So using configDeviceType: ${device.configDeviceType}`);
-                                }
-                                if (device.deviceType) {
-                                    if (device.configDeviceName) {
-                                        device.deviceName = device.configDeviceName;
-                                    }
-                                    this.createDevice(device);
+                                if (device.remoteType) {
+                                    this.createIRDevice(device);
                                 }
                             }
                         }
-                    }
-                    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) => v);
-                        for (const device of devices) {
-                            if (device.remoteType) {
+                        else {
+                            this.debugLog(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+                            const irDeviceConfig = this.config.options?.irdevices;
+                            const mergeIRBydeviceId = (a1, a2) => a1.map((itm) => ({
+                                ...a2.find((item) => 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, a2) => a1.map((itm) => ({
-                            ...a2.find((item) => 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}`);
                         }
-                    }
-                    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}`);
+                        }
+                        break;
                     }
                     else {
-                        this.debugLog(`Total IR Devices Found: ${devicesAPI.body.infraredRemoteList.length}`);
+                        this.statusCode(statusCode);
+                        this.statusCode(devicesAPI.statusCode);
+                        if (statusCode === 500) {
+                            retryCount++;
+                            this.infoLog(`statusCode: ${statusCode} Attempt ${retryCount} of ${maxRetries}`);
+                            await sleep(delayBetweenRetries);
+                        }
                     }
                 }
-                else {
-                    this.statusCode(statusCode);
-                    this.statusCode(devicesAPI.statusCode);
+                catch (e) {
+                    retryCount++;
+                    this.debugErrorLog(`Failed to Discover Devices, Error Message: ${JSON.stringify(e.message)}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
+                    this.debugErrorLog(`Failed to Discover Devices, Error: ${e}`);
                 }
             }
-            catch (e) {
-                this.debugErrorLog(`Failed to Discover Devices, Error Message: ${JSON.stringify(e.message)}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
-                this.debugErrorLog(`Failed to Discover Devices, Error: ${e}`);
-            }
         }
         else if (!this.config.credentials?.token && this.config.options?.devices) {
             this.debugLog(`SwitchBot Device Manual Config Set: ${JSON.stringify(this.config.options?.devices)}`);
@@ -650,6 +684,7 @@ export class SwitchBotPlatform {
             case 'WoSweeperMini':
             case 'Robot Vacuum Cleaner S1':
             case 'Robot Vacuum Cleaner S1 Plus':
+            case 'Robot Vacuum Cleaner S10':
                 this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
                 this.createRobotVacuumCleaner(device);
                 break;
@@ -662,17 +697,17 @@ export class SwitchBotPlatform {
                 this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
                 this.createStripLight(device);
                 break;
-            case 'Indoor Cam':
+            case 'Battery Circulator Fan':
                 this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}`);
-                this.warnLog(`Device: ${device.deviceName} with Device Type: ${device.deviceType}, is currently not supported.`);
+                this.createFan(device);
                 break;
             case 'Remote':
-                this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId} is Not Supported.`);
+            case 'Indoor Cam':
+            case 'remote with screen+':
+                this.debugLog(`Discovered ${device.deviceType}: ${device.deviceId}, is currently not supported, device: ${JSON.stringify(device)}`);
                 break;
             default:
-                this.warnLog(`Device: ${device.deviceName} with Device Type: ${device.deviceType}, is currently not supported.`);
-                // eslint-disable-next-line max-len
-                this.warnLog('Submit Feature Requests Here: ' + 'https://tinyurl.com/SwitchBotFeatureRequest');
+                this.warnLog(`Device: ${device.deviceName} with Device Type: ${device.deviceType}, is currently not supported.`, +`Submit Feature Requests Here: https://tinyurl.com/SwitchBotFeatureRequest, device: ${JSON.stringify(device)}`);
         }
     }
     createIRDevice(device) {
@@ -704,7 +739,7 @@ export class SwitchBotPlatform {
             case 'Fan':
             case 'DIY Fan':
                 this.debugLog(`Discovered ${device.remoteType}: ${device.deviceId}`);
-                this.createFan(device);
+                this.createIRFan(device);
                 break;
             case 'Air Conditioner':
             case 'DIY Air Conditioner':
@@ -759,7 +794,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -787,7 +822,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -816,7 +851,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -844,11 +879,11 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
-            // accessory.context.FirmwareRevision = findaccessories.accessoryAttribute.softwareRevision;
+            // accessory.context.version = findaccessories.accessoryAttribute.softwareRevision;
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Bot(this, accessory, device);
@@ -874,7 +909,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -902,7 +937,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -932,7 +967,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -960,7 +995,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -990,7 +1025,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1018,7 +1053,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1047,7 +1082,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1075,7 +1110,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1104,7 +1139,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1132,7 +1167,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1161,7 +1196,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1189,7 +1224,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1218,7 +1253,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1246,7 +1281,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1275,7 +1310,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1315,7 +1350,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1344,7 +1379,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1384,7 +1419,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1413,7 +1448,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1441,7 +1476,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1470,7 +1505,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1498,7 +1533,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1527,7 +1562,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1555,7 +1590,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1584,7 +1619,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1612,7 +1647,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1641,7 +1676,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1669,7 +1704,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1685,6 +1720,63 @@ export class SwitchBotPlatform {
             this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
         }
     }
+    async createFan(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.model = device.deviceType;
+                existingAccessory.context.deviceID = device.deviceId;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
+                if (device.firmware) {
+                    existingAccessory.context.version = 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 Fan(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;
+            if (device.firmware) {
+                accessory.context.version = 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 Fan(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
@@ -1698,7 +1790,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1726,7 +1818,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.deviceType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
             accessory.context.connectionType = await this.connectionType(device);
@@ -1752,7 +1844,9 @@ export class SwitchBotPlatform {
             existingAccessory.context.model = device.remoteType;
             existingAccessory.context.deviceID = device.deviceId;
             existingAccessory.displayName = device.configDeviceName || device.deviceName;
-            existingAccessory.context.FirmwareRevision = device.firmware;
+            if (device.version && !device.firmware) {
+                existingAccessory.context.version = device.version;
+            }
             existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
             this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
             existingAccessory.context.connectionType = device.connectionType;
@@ -1775,7 +1869,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.remoteType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `IR: ${device.remoteType}`;
             accessory.context.connectionType = device.connectionType;
@@ -1790,7 +1884,7 @@ export class SwitchBotPlatform {
             this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
         }
     }
-    async createFan(device) {
+    async createIRFan(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
@@ -1803,7 +1897,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1811,7 +1905,7 @@ export class SwitchBotPlatform {
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
-                new Fan(this, existingAccessory, device);
+                new IRFan(this, existingAccessory, device);
                 this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${existingAccessory.UUID})`);
             }
             else {
@@ -1831,13 +1925,13 @@ export class SwitchBotPlatform {
             accessory.context.model = device.remoteType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `IR: ${device.remoteType}`;
             accessory.context.connectionType = device.connectionType;
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
-            new Fan(this, accessory, device);
+            new IRFan(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.externalOrPlatformIR(device, accessory);
@@ -1860,7 +1954,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1888,7 +1982,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.remoteType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `IR: ${device.remoteType}`;
             accessory.context.connectionType = device.connectionType;
@@ -1917,7 +2011,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -1945,7 +2039,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.remoteType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `IR: ${device.remoteType}`;
             accessory.context.connectionType = device.connectionType;
@@ -1974,7 +2068,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -2002,7 +2096,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.remoteType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `IR: ${device.remoteType}`;
             accessory.context.connectionType = device.connectionType;
@@ -2031,7 +2125,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -2059,7 +2153,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.remoteType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `IR: ${device.remoteType}`;
             accessory.context.connectionType = device.connectionType;
@@ -2088,7 +2182,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -2116,7 +2210,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.remoteType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `IR: ${device.remoteType}`;
             accessory.context.connectionType = device.connectionType;
@@ -2145,7 +2239,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -2173,7 +2267,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.remoteType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `IR: ${device.remoteType}`;
             accessory.context.connectionType = device.connectionType;
@@ -2202,7 +2296,7 @@ export class SwitchBotPlatform {
                 existingAccessory.context.deviceID = device.deviceId;
                 existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 if (device.firmware) {
-                    existingAccessory.context.FirmwareRevision = device.firmware;
+                    existingAccessory.context.version = device.firmware;
                 }
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
@@ -2230,7 +2324,7 @@ export class SwitchBotPlatform {
             accessory.context.model = device.remoteType;
             accessory.context.deviceID = device.deviceId;
             if (device.firmware) {
-                accessory.context.FirmwareRevision = device.firmware;
+                accessory.context.version = device.firmware;
             }
             accessory.context.deviceType = `IR: ${device.remoteType}`;
             accessory.context.connectionType = device.connectionType;
@@ -2250,8 +2344,8 @@ export class SwitchBotPlatform {
         switch (device.deviceType) {
             case 'Curtain':
             case 'Curtain3':
-                this.debugWarnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, curtainDevicesIds: ${device.curtainDevicesIds}, master: ` +
-                    `${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}, connectionType: ${device.connectionType}`);
+                this.debugWarnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, curtainDevicesIds: ${device.curtainDevicesIds}, master: `
+                    + `${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}, connectionType: ${device.connectionType}`);
                 break;
             default:
                 this.debugWarnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, blindTiltDevicesIds: ${device.blindTiltDevicesIds}, master:`
@@ -2261,35 +2355,36 @@ export class SwitchBotPlatform {
         if (device.master && device.group) {
             // OpenAPI: Master Curtains/Blind Tilt in Group
             registerCurtain = true;
-            this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] device.master: ${device.master}, device.group: ${device.group}` +
-                ` connectionType; ${device.connectionType}`);
+            this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] device.master: ${device.master}, device.group: ${device.group}`
+                + ` connectionType; ${device.connectionType}`);
             this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
         }
         else if (!device.master && device.curtain?.disable_group) {
             //!device.group && device.connectionType === 'BLE'
             // OpenAPI: Non-Master Curtains/Blind Tilts that has Disable Grouping Checked
             registerCurtain = true;
-            this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] device.master: ${device.master}, disable_group: ` +
-                `${device.curtain?.disable_group}, connectionType; ${device.connectionType}`);
+            this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] device.master: ${device.master}, disable_group: `
+                + `${device.curtain?.disable_group}, connectionType; ${device.connectionType}`);
             this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
         }
         else if (device.master && !device.group) {
             // OpenAPI: Master Curtains/Blind Tilts not in Group
             registerCurtain = true;
-            this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] device.master: ${device.master}, device.group: ${device.group}` +
-                ` connectionType; ${device.connectionType}`);
+            this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] device.master: ${device.master}, device.group: ${device.group}`
+                + ` connectionType; ${device.connectionType}`);
             this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
         }
         else if (device.connectionType === 'BLE') {
             // BLE: Curtains/Blind Tilt
             registerCurtain = true;
-            this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] connectionType: ${device.connectionType}, ` + ` group: ${device.group}`);
+            this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] connectionType: ${device.connectionType}, `
+                + ` group: ${device.group}`);
             this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
         }
         else {
             registerCurtain = false;
-            this.debugErrorLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] disable_group: ${device.curtain?.disable_group},` +
-                ` device.master: ${device.master}, device.group: ${device.group}`);
+            this.debugErrorLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] disable_group: ${device.curtain?.disable_group},`
+                + ` device.master: ${device.master}, device.group: ${device.group}`);
             this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}, device.connectionType: ${device.connectionType}`);
         }
         return registerCurtain;
@@ -2388,8 +2483,8 @@ export class SwitchBotPlatform {
         }
         else {
             registerDevice = false;
-            this.debugErrorLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, hide_device: ` +
-                `${device.hide_device},  will not display in HomeKit`);
+            this.debugErrorLog(`Device: ${device.deviceName} connectionType: ${device.connectionType}, hide_device: `
+                + `${device.hide_device},  will not display in HomeKit`);
         }
         return registerDevice;
     }
@@ -2436,7 +2531,7 @@ export class SwitchBotPlatform {
                 this.errorLog(`Device not found, statusCode: ${statusCode}`);
                 break;
             case 160:
-                this.errorLog(`Command is not supported, statusCode: ${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
+                this.errorLog(`Command is not supported, statusCode: ${statusCode}, Submit Bugs Here: https://tinyurl.com/SwitchBotBug`);
                 break;
             case 161:
                 this.errorLog(`Device is offline, statusCode: ${statusCode}`);
@@ -2492,6 +2587,29 @@ export class SwitchBotPlatform {
                 this.errorLog(`Unknown statusCode, statusCode: ${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
         }
     }
+    async retryRequest(deviceMaxRetries, deviceDelayBetweenRetries, url, options) {
+        let retryCount = 0;
+        const maxRetries = deviceMaxRetries;
+        const delayBetweenRetries = deviceDelayBetweenRetries;
+        while (retryCount < maxRetries) {
+            try {
+                const { body, statusCode } = await request(url, options);
+                if (statusCode === 200 || statusCode === 100) {
+                    return { body, statusCode };
+                }
+                else {
+                    this.debugLog(`Received status code: ${statusCode}`);
+                }
+            }
+            catch (error) {
+                this.errorLog(`Error making request: ${error.message}`);
+            }
+            retryCount++;
+            this.debugLog(`Retry attempt ${retryCount} of ${maxRetries}`);
+            await sleep(delayBetweenRetries);
+        }
+        return { body: null, statusCode: -1 };
+    }
     // BLE Connection
     async connectBLE() {
         let switchbot;
@@ -2510,7 +2628,7 @@ export class SwitchBotPlatform {
         this.debugLog(`Plugin Version: ${json.version}`);
         this.version = json.version;
     }
-    async platformConfigOptions() {
+    async getPlatformConfigSettings() {
         const platformConfig = {};
         if (this.config.options) {
             if (this.config.options.logging) {
@@ -2519,16 +2637,37 @@ export class SwitchBotPlatform {
             if (this.config.options.refreshRate) {
                 platformConfig.refreshRate = this.config.options.refreshRate;
             }
+            if (this.config.options.updateRate) {
+                platformConfig.updateRate = this.config.options.updateRate;
+            }
             if (this.config.options.pushRate) {
                 platformConfig.pushRate = this.config.options.pushRate;
             }
+            if (this.config.options.maxRetries) {
+                this.maxRetries = this.config.options.maxRetries;
+                platformConfig.maxRetries = this.config.options.maxRetries;
+            }
+            else {
+                this.maxRetries = 3;
+                this.debugWarnLog('Using Default Max Retries');
+                platformConfig.maxRetries = this.maxRetries;
+            }
+            if (this.config.options.delayBetweenRetries) {
+                this.delayBetweenRetries = this.config.options.delayBetweenRetries * 1000;
+                platformConfig.delayBetweenRetries = this.config.options.delayBetweenRetries;
+            }
+            else {
+                this.delayBetweenRetries = 3000;
+                this.debugWarnLog('Using Default Delay Between Retries');
+                platformConfig.delayBetweenRetries = this.delayBetweenRetries / 1000;
+            }
             if (Object.entries(platformConfig).length !== 0) {
                 this.debugLog(`Platform Config: ${JSON.stringify(platformConfig)}`);
             }
             this.platformConfig = platformConfig;
         }
     }
-    async platformLogs() {
+    async getPlatformLogSettings() {
         this.debugMode = process.argv.includes('-D') || process.argv.includes('--debug');
         if (this.config.options?.logging === 'debug' || this.config.options?.logging === 'standard' || this.config.options?.logging === 'none') {
             this.platformLogging = this.config.options.logging;
@@ -2552,6 +2691,18 @@ export class SwitchBotPlatform {
             this.log.info(String(...log));
         }
     }
+    successLog(...log) {
+        if (this.enablingPlatformLogging()) {
+            this.log.success(String(...log));
+        }
+    }
+    debugSuccessLog(...log) {
+        if (this.enablingPlatformLogging()) {
+            if (this.platformLogging?.includes('debug')) {
+                this.log.success('[DEBUG]', String(...log));
+            }
+        }
+    }
     warnLog(...log) {
         if (this.enablingPlatformLogging()) {
             this.log.warn(String(...log));