@switchbot/homebridge-switchbot 0.2.0-alpha.2 → 1.0.1-beta.2

package/src/platform.ts

@@ -16,17 +16,18 @@ import { Meter } from './devices/meters';
 import { Motion } from './devices/motion';
 import { Contact } from './devices/contact';
 import { Curtain } from './devices/curtains';
+import { ColorBulb } from './devices/colorbulb';
 import { IndoorCam } from './devices/indoorcam';
 import { Humidifier } from './devices/humidifiers';
 import { TV } from './irdevices/tvs';
 import { Fan } from './irdevices/fans';
 import { Light } from './irdevices/lights';
-import { Camera } from './irdevices/cameras';
 import { Others } from './irdevices/others';
+import { Camera } from './irdevices/cameras';
+import { AirPurifier } from './irdevices/airpurifiers';
 import { WaterHeater } from './irdevices/waterheaters';
 import { VacuumCleaner } from './irdevices/vacuumcleaners';
 import { AirConditioner } from './irdevices/airconditioners';
-import { AirPurifier } from './irdevices/airpurifiers';
 
 /**
  * HomebridgePlatform
@@ -121,8 +122,8 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     // Device Config
     if (this.config.options.devices) {
       for (const deviceConfig of this.config.options.devices!) {
-        if (!deviceConfig.type) {
-          this.log.error('The devices config section is missing the "Type" in the config, Check Your Conifg.');
+        if (!deviceConfig.hide_device && !deviceConfig.deviceType) {
+          this.log.error('The devices config section is missing the "Device Type" in the config, Check Your Conifg.');
         }
         if (!deviceConfig.deviceId) {
           this.log.error('The devices config section is missing the "Device ID" in the config, Check Your Conifg.');
@@ -130,6 +131,18 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       }
     }
 
+    // IR Device Config
+    if (this.config.options.irdevices) {
+      for (const irDeviceConfig of this.config.options.irdevices!) {
+        if (!irDeviceConfig.hide_device && !irDeviceConfig.remoteType) {
+          this.log.error('The devices config section is missing the "Device Type" in the config, Check Your Conifg.');
+        }
+        if (!irDeviceConfig.deviceId) {
+          this.log.error('The devices config section is missing the "Device ID" in the config, Check Your Conifg.');
+        }
+      }
+    }
+
     if (this.config.options!.refreshRate! < 30) {
       throw new Error('Refresh Rate must be above 30 (30 seconds).');
     }
@@ -162,25 +175,22 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   async discoverDevices() {
     try {
       const devicesAPI: any = (await this.axios.get(DeviceURL)).data;
-
       this.deviceListInfo(devicesAPI);
       this.debug(JSON.stringify(devicesAPI));
-      this.log.info('Total SwitchBot Devices Found:', devicesAPI.body.deviceList.length);
-      this.log.info('Total IR Devices Found:', devicesAPI.body.infraredRemoteList.length);
 
+      // SwitchBot Devices
+      this.log.info('Total SwitchBot Devices Found:', devicesAPI.body.deviceList.length);
       const deviceLists = devicesAPI.body.deviceList;
       if (!this.config.options?.devices) {
-        this.debug(`Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
+        this.debug(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
         const devices = deviceLists.map((v: any) => v);
         for (const device of devices) {
           if (device.deviceType) {
             this.createDevice(device);
-          } else {
-            this.createIRDevice(device);
           }
         }
       } else {
-        this.debug(`Config Set: ${JSON.stringify(this.config.options?.devices)}`);
+        this.debug(`SwitchBot Device Config Set: ${JSON.stringify(this.config.options?.devices)}`);
         const deviceConfigs = this.config.options?.devices;
 
         const mergeBydeviceId = (a1: { deviceId: string; }[], a2: any[]) =>
@@ -190,11 +200,38 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
           }));
 
         const devices = mergeBydeviceId(deviceLists, deviceConfigs);
-        this.debug(JSON.stringify(devices));
+        this.debug(`SwitchBot Devices: ${JSON.stringify(devices)}`);
         for (const device of devices) {
           if (device.deviceType) {
             this.createDevice(device);
-          } else {
+          }
+        }
+      }
+      // IR Devices
+      this.log.info('Total IR Devices Found:', devicesAPI.body.infraredRemoteList.length);
+      const irDeviceLists = devicesAPI.body.infraredRemoteList;
+      if (!this.config.options?.irdevices) {
+        this.debug(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+        const devices = irDeviceLists.map((v: any) => v);
+        for (const device of devices) {
+          if (device.remoteType) {
+            this.createIRDevice(device);
+          }
+        }
+      } else {
+        this.debug(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+        const irDeviceConfig = this.config.options?.irdevices;
+
+        const mergeIRBydeviceId = (a1: { deviceId: string; }[], a2: any[]) =>
+          a1.map((itm: { deviceId: string; }) => ({
+            ...a2.find((item: { deviceId: string; }) => (item.deviceId === itm.deviceId) && item),
+            ...itm,
+          }));
+
+        const devices = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
+        this.debug(`IR Devices: ${JSON.stringify(devices)}`);
+        for (const device of devices) {
+          if (device.remoteType) {
             this.createIRDevice(device);
           }
         }
@@ -241,6 +278,10 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.debug(`Discovered ${device.deviceType}: ${device.deviceId}`);
         this.createPlug(device);
         break;
+      case 'Color Bulb':
+        this.debug(`Discovered ${device.deviceType}: ${device.deviceId}`);
+        this.createColorBulb(device);
+        break;
       case 'IndoorCam':
         this.debug(`Discovered ${device.deviceType}: ${device.deviceId}`);
         this.createIndoorCam(device);
@@ -382,7 +423,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       if (!device.hide_device && device.enableCloudService) {
         this.log.info(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
 
-        this.log.error(JSON.stringify(device.bot?.mode));
+        this.debug(JSON.stringify(device.bot?.mode));
         if (!device.bot?.mode) {
           this.log.error('You must set your Bot to Press or Switch Mode');
         }
@@ -405,7 +446,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       // the accessory does not yet exist, so we need to create it
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
-      this.log.error(JSON.stringify(device.bot?.mode));
+      this.debug(JSON.stringify(device.bot?.mode));
       if (!device.bot?.mode) {
         this.log.error('You must set your Bot to Press or Switch Mode');
       }
@@ -652,9 +693,14 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   }
 
   private isCurtainGrouped(device: device & devicesConfig) {
+    this.debug(`deviceId: ${device.deviceId}, curtainDevicesIds: ${device.curtainDevicesIds},`
+      + ` master: ${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}`);
+
     if (device.group && !device.curtain?.disable_group) {
+      this.debug(`[Curtain Config] disable_group: ${device.curtain?.disable_group}`);
       return device.master && !device.hide_device && device.enableCloudService;
     } else {
+      this.debug(`[Curtain Config] disable_group: ${device.curtain?.disable_group}, UnGrouping ${device.master}`);
       return !device.hide_device && device.enableCloudService;
     }
   }
@@ -712,6 +758,59 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     }
   }
 
+  private async createColorBulb(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 (!device.hide_device && device.enableCloudService) {
+        this.log.info(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+
+        // 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.deviceName;
+        existingAccessory.context.firmwareRevision = this.version;
+        await this.connectionTypeExistingAccessory(device, existingAccessory);
+        this.api.updatePlatformAccessories([existingAccessory]);
+        // create the accessory handler for the restored accessory
+        // this is imported from `platformAccessory.ts`
+        new ColorBulb(this, existingAccessory, device);
+        this.debug(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${existingAccessory.UUID})`);
+      } else {
+        this.unregisterPlatformAccessories(existingAccessory);
+      }
+    } else if (!device.hide_device && device.enableCloudService) {
+      // the accessory does not yet exist, so we need to create it
+      this.log.info(`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 = this.version;
+      await this.connectionTypeExistingAccessory(device, accessory);
+      // create the accessory handler for the newly create accessory
+      // this is imported from `platformAccessory.ts`
+      new ColorBulb(this, accessory, device);
+      this.debug(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
+
+      // link the accessory to your platform
+      this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
+      this.accessories.push(accessory);
+    } else {
+      this.device(`Unable to Register new device: ${device.deviceName} ${device.deviceType} - ${device.deviceId}`);
+    }
+  }
+
   private async createIndoorCam(device: device & devicesConfig) {
     const uuid = this.api.hap.uuid.generate(`${device.deviceId}-${device.deviceType}`);
 
@@ -780,7 +879,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       existingAccessory.context.deviceID = device.deviceId;
       existingAccessory.displayName = device.deviceName;
       existingAccessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, existingAccessory);
+      existingAccessory.context.connectionType = 'OpenAPI';
       this.api.updatePlatformAccessories([existingAccessory]);
       // create the accessory handler for the restored accessory
       // this is imported from `platformAccessory.ts`
@@ -799,7 +898,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.model = device.remoteType;
       accessory.context.deviceID = device.deviceId;
       accessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, accessory);
+      accessory.context.connectionType = 'OpenAPI';
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
       new TV(this, accessory, device);
@@ -835,7 +934,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         existingAccessory.context.deviceID = device.deviceId;
         existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
-        await this.connectionTypeExistingAccessory(device, existingAccessory);
+        existingAccessory.context.connectionType = 'OpenAPI';
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
         // this is imported from `platformAccessory.ts`
@@ -857,7 +956,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.model = device.remoteType;
       accessory.context.deviceID = device.deviceId;
       accessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, accessory);
+      accessory.context.connectionType = 'OpenAPI';
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
       new Fan(this, accessory, device);
@@ -880,7 +979,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
     if (existingAccessory) {
       // the accessory already exists
-      if (device.hubDeviceId) {
+      if (!device.hide_device && device.hubDeviceId) {
         this.log.info(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
 
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
@@ -888,7 +987,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         existingAccessory.context.deviceID = device.deviceId;
         existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
-        await this.connectionTypeExistingAccessory(device, existingAccessory);
+        existingAccessory.context.connectionType = 'OpenAPI';
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
         // this is imported from `platformAccessory.ts`
@@ -897,7 +996,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       } else {
         this.unregisterPlatformAccessories(existingAccessory);
       }
-    } else if (device.hubDeviceId) {
+    } else if (!device.hide_device && device.hubDeviceId) {
       // the accessory does not yet exist, so we need to create it
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
@@ -910,7 +1009,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.model = device.remoteType;
       accessory.context.deviceID = device.deviceId;
       accessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, accessory);
+      accessory.context.connectionType = 'OpenAPI';
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
       new Light(this, accessory, device);
@@ -933,7 +1032,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
     if (existingAccessory) {
       // the accessory already exists
-      if (device.hubDeviceId) {
+      if (!device.hide_device && device.hubDeviceId) {
         this.log.info(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
 
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
@@ -941,7 +1040,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         existingAccessory.context.deviceID = device.deviceId;
         existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
-        await this.connectionTypeExistingAccessory(device, existingAccessory);
+        existingAccessory.context.connectionType = 'OpenAPI';
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
         // this is imported from `platformAccessory.ts`
@@ -950,7 +1049,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       } else {
         this.unregisterPlatformAccessories(existingAccessory);
       }
-    } else if (device.hubDeviceId) {
+    } else if (!device.hide_device && device.hubDeviceId) {
       // the accessory does not yet exist, so we need to create it
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
@@ -963,7 +1062,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.model = device.remoteType;
       accessory.context.deviceID = device.deviceId;
       accessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, accessory);
+      accessory.context.connectionType = 'OpenAPI';
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
       new AirConditioner(this, accessory, device);
@@ -986,7 +1085,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
     if (existingAccessory) {
       // the accessory already exists
-      if (device.hubDeviceId) {
+      if (!device.hide_device && device.hubDeviceId) {
         this.log.info(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
 
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
@@ -994,7 +1093,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         existingAccessory.context.deviceID = device.deviceId;
         existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
-        await this.connectionTypeExistingAccessory(device, existingAccessory);
+        existingAccessory.context.connectionType = 'OpenAPI';
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
         // this is imported from `platformAccessory.ts`
@@ -1003,7 +1102,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       } else {
         this.unregisterPlatformAccessories(existingAccessory);
       }
-    } else if (device.hubDeviceId) {
+    } else if (!device.hide_device && device.hubDeviceId) {
       // the accessory does not yet exist, so we need to create it
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
@@ -1016,7 +1115,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.model = device.remoteType;
       accessory.context.deviceID = device.deviceId;
       accessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, accessory);
+      accessory.context.connectionType = 'OpenAPI';
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
       new AirPurifier(this, accessory, device);
@@ -1039,7 +1138,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
     if (existingAccessory) {
       // the accessory already exists
-      if (device.hubDeviceId) {
+      if (!device.hide_device && device.hubDeviceId) {
         this.log.info(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
 
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
@@ -1047,7 +1146,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         existingAccessory.context.deviceID = device.deviceId;
         existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
-        await this.connectionTypeExistingAccessory(device, existingAccessory);
+        existingAccessory.context.connectionType = 'OpenAPI';
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
         // this is imported from `platformAccessory.ts`
@@ -1056,7 +1155,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       } else {
         this.unregisterPlatformAccessories(existingAccessory);
       }
-    } else if (device.hubDeviceId) {
+    } else if (!device.hide_device && device.hubDeviceId) {
       // the accessory does not yet exist, so we need to create it
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
@@ -1069,7 +1168,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.model = device.remoteType;
       accessory.context.deviceID = device.deviceId;
       accessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, accessory);
+      accessory.context.connectionType = 'OpenAPI';
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
       new WaterHeater(this, accessory, device);
@@ -1092,7 +1191,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
     if (existingAccessory) {
       // the accessory already exists
-      if (device.hubDeviceId) {
+      if (!device.hide_device && device.hubDeviceId) {
         this.log.info(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
 
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
@@ -1100,7 +1199,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         existingAccessory.context.deviceID = device.deviceId;
         existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
-        await this.connectionTypeExistingAccessory(device, existingAccessory);
+        existingAccessory.context.connectionType = 'OpenAPI';
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
         // this is imported from `platformAccessory.ts`
@@ -1109,7 +1208,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       } else {
         this.unregisterPlatformAccessories(existingAccessory);
       }
-    } else if (device.hubDeviceId) {
+    } else if (!device.hide_device && device.hubDeviceId) {
       // the accessory does not yet exist, so we need to create it
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
@@ -1122,7 +1221,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.model = device.remoteType;
       accessory.context.deviceID = device.deviceId;
       accessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, accessory);
+      accessory.context.connectionType = 'OpenAPI';
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
       new VacuumCleaner(this, accessory, device);
@@ -1145,7 +1244,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
     if (existingAccessory) {
       // the accessory already exists
-      if (device.hubDeviceId) {
+      if (!device.hide_device && device.hubDeviceId) {
         this.log.info(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
 
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
@@ -1153,7 +1252,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         existingAccessory.context.deviceID = device.deviceId;
         existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
-        await this.connectionTypeExistingAccessory(device, existingAccessory);
+        existingAccessory.context.connectionType = 'OpenAPI';
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
         // this is imported from `platformAccessory.ts`
@@ -1162,7 +1261,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       } else {
         this.unregisterPlatformAccessories(existingAccessory);
       }
-    } else if (device.hubDeviceId) {
+    } else if (!device.hide_device && device.hubDeviceId) {
       // the accessory does not yet exist, so we need to create it
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
@@ -1175,7 +1274,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.model = device.remoteType;
       accessory.context.deviceID = device.deviceId;
       accessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, accessory);
+      accessory.context.connectionType = 'OpenAPI';
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
       new Camera(this, accessory, device);
@@ -1198,7 +1297,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
     if (existingAccessory) {
       // the accessory already exists
-      if (device.hubDeviceId) {
+      if (!device.hide_device && device.hubDeviceId) {
         this.log.info(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
 
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
@@ -1206,7 +1305,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         existingAccessory.context.deviceID = device.deviceId;
         existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
-        await this.connectionTypeExistingAccessory(device, existingAccessory);
+        existingAccessory.context.connectionType = 'OpenAPI';
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
         // this is imported from `platformAccessory.ts`
@@ -1215,7 +1314,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       } else {
         this.unregisterPlatformAccessories(existingAccessory);
       }
-    } else if (device.hubDeviceId) {
+    } else if (!device.hide_device && device.hubDeviceId) {
       // the accessory does not yet exist, so we need to create it
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
@@ -1228,7 +1327,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       accessory.context.model = device.remoteType;
       accessory.context.deviceID = device.deviceId;
       accessory.context.firmwareRevision = this.version;
-      await this.connectionTypeExistingAccessory(device, accessory);
+      accessory.context.connectionType = 'OpenAPI';
       // create the accessory handler for the newly create accessory
       // this is imported from `platformAccessory.ts`
       new Others(this, accessory, device);
@@ -1243,7 +1342,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   }
 
   public async connectionTypeNewAccessory(
-    device: irdevice & devicesConfig,
+    device: device & devicesConfig,
     accessory: PlatformAccessory) {
     if (device.ble) {
       accessory.context.connectionType = 'BLE';
@@ -1253,7 +1352,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   }
 
   public async connectionTypeExistingAccessory(
-    device: irdevice & devicesConfig,
+    device: device & devicesConfig,
     existingAccessory: PlatformAccessory,
   ) {
     if (device.ble) {

package/src/settings.ts

@@ -1,4 +1,4 @@
-import { PlatformConfig } from 'homebridge';
+import { MacAddress, PlatformConfig } from 'homebridge';
 /**
  * This is the name of the platform that users will use to register the plugin in the Homebridge config.json
  */
@@ -34,20 +34,17 @@ export type options = {
   pushRate?: number;
   debug?: string;
   devices?: Array<devicesConfig>;
+  irdevices?: Array<irDevicesConfig>;
 };
 
-export interface devicesConfig extends device, irdevice {
-  id: any;
+export interface devicesConfig extends device {
   type?: string;
   deviceId: string;
   bot?: bot;
   meter?: meter;
   humidifier?: humidifier;
   curtain?: curtain;
-  bulb?: bulb;
-  fan?: irfan;
-  irair?: irair;
-  other?: other;
+  colorbulb?: colorbulb;
   ble?: string;
   hide_device?: boolean;
 }
@@ -60,6 +57,7 @@ export type meter = {
 
 export type bot = {
   mode?: string;
+  deviceType?: string;
 };
 
 export type humidifier = {
@@ -75,10 +73,20 @@ export type curtain = {
   set_minStep?: number;
 };
 
-export type bulb = {
+export type colorbulb = {
   set_minStep?: number;
 };
 
+export interface irDevicesConfig extends irdevice {
+  type?: string;
+  deviceId: string;
+  irfan?: irfan;
+  irair?: irair;
+  irtv?: irtv;
+  other?: other;
+  hide_device?: boolean;
+}
+
 export type irfan = {
   swing_mode?: boolean;
   rotation_speed?: boolean;
@@ -109,6 +117,10 @@ export type irair = {
   hide_automode?: boolean;
 };
 
+export type irtv = {
+  disable_power?: boolean;
+};
+
 export type other = {
   deviceType?: string;
   commandOn?: string;
@@ -228,3 +240,63 @@ export type deviceStatus = {
   //only available for Humidifier devices. determines if the water tank empty or not
   lackWater?: boolean;
 };
+
+export type ad = {
+  serviceData: serviceData;
+};
+
+export type serviceData = {
+  //Model of BLE SwitchBot Device
+  model: string,
+  //Model Name of BLE SwitchBot Device
+  modelName: string
+  //Mode for Bot either Press or Switch
+  mode?: boolean;
+  //Bot State
+  state?: string;
+  //Battery percentage left on Bot, Meter, Motion, Contact, and Curtain
+  battery?: number;
+  //Humidifier's humidity level percentage
+  percentage?: boolean | string;
+  //Humidifier's humidity level percentage
+  onState?: boolean;
+  //Humidifier's AutoMode
+  autoMode?: boolean;
+  //Meter Temperature Levels
+  temperature?: {
+    c: number,
+    f: number
+  };
+  // Fahrenheit enabled for Meter
+  fahrenheit: boolean;
+  // Humidity level for Meter
+  humidity?: number,
+  //Motion Detected for Contact or Motion Sensors
+  movement?: boolean,
+  //Motion ((lightLevel == 1) ? 'dark' : ((lightLevel == 2) ? 'bright' : 'unknown'))
+  //Contact ((lightLevel == 0) ? 'dark' : 'bright')
+  //Curtain (light sensor level (1-10))
+  //Light Level
+  lightLevel?: number | string;
+  //Contact DoorState
+  doorState?: number | string;
+  //Is Curtain Calibrated
+  calibration?: boolean;
+  //Current Curtain Positon %
+  position?: number;
+};
+
+export type switchbot = {
+  discover: (
+    arg0:
+      {
+        duration?: any;
+        model: string;
+        quick: boolean;
+        id?: MacAddress;
+      }
+  ) => Promise<any>;
+  wait: (
+    arg0: number
+  ) => any;
+};

package/dist/devices/bulb.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bulb.d.ts","sourceRoot":"","sources":["../../src/devices/bulb.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,EAAa,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D;;;;GAIG;AACH,qBAAa,IAAI;IAgCb,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,SAAS;IACV,MAAM,EAAE,MAAM,GAAG,aAAa;IAhCvC,OAAO,EAAG,OAAO,CAAC;IAGlB,EAAE,EAAG,mBAAmB,CAAC;IACzB,UAAU,EAAG,mBAAmB,CAAC;IACjC,gBAAgB,EAAG,mBAAmB,CAAC;IAGvC,YAAY,EAAE,GAAG,CAAC;IAClB,SAAS,EAAG;QACV,QAAQ,EAAE,CACR,IAAI,EACF;YACE,QAAQ,EAAE,GAAG,CAAC;YACd,KAAK,EAAE,MAAM,CAAC;YACd,KAAK,EAAE,OAAO,CAAC;YACf,EAAE,EAAE,UAAU,CAAC;SAChB,KACA,OAAO,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,EAAE,CACJ,IAAI,EAAE,MAAM,KACT,GAAG,CAAC;KACV,CAAC;IAGF,oBAAoB,EAAG,OAAO,CAAC;IAC/B,YAAY,MAAC;IACb,WAAW,EAAE,GAAG,CAAC;gBAGE,QAAQ,EAAE,iBAAiB,EACpC,SAAS,EAAE,iBAAiB,EAC7B,MAAM,EAAE,MAAM,GAAG,aAAa;IAyGvC,OAAO,CAAC,OAAO;IASf,WAAW;IAaL,aAAa;IAcnB;;;;;KAKC;IACK,WAAW;IA8BjB,4BAA4B;IAqBrB,QAAQ,CAAC,CAAC,EAAE,GAAG;IAOtB,OAAO,CAAC,UAAU;IA8BlB;;OAEG;IACH,KAAK,CAAC,KAAK,EAAE,mBAAmB;IAOhC;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,mBAAmB;IAOxC;;OAEG;IACH,mBAAmB,CAAC,KAAK,EAAE,mBAAmB;CAM/C"}