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

package/src/device/bot.ts

@@ -115,6 +115,7 @@ export class Bot extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+
     // default placeholders
     this.getBotConfigSettings(device);
 
@@ -140,6 +141,9 @@ export class Bot extends deviceBase {
 
     // deviceType
     if (this.botDeviceType === 'switch') {
+      // Set category
+      accessory.category = this.hap.Categories.SWITCH
+      ;
       // Initialize Switch Service
       accessory.context.Switch = accessory.context.Switch ?? {};
       this.Switch = {
@@ -171,6 +175,9 @@ export class Bot extends deviceBase {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'garagedoor') {
+      // Set category
+      accessory.category = this.hap.Categories.GARAGE_DOOR_OPENER;
+
       // Initialize GarageDoor Service
       accessory.context.GarageDoor = accessory.context.GarageDoor ?? {};
       this.GarageDoor = {
@@ -207,6 +214,9 @@ export class Bot extends deviceBase {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'door') {
+      // Set category
+      accessory.category = this.hap.Categories.DOOR;
+
       // Initialize Door Service
       accessory.context.Door = accessory.context.Door ?? {};
       this.Door = {
@@ -243,6 +253,9 @@ export class Bot extends deviceBase {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'window') {
+      // Set category
+      accessory.category = this.hap.Categories.WINDOW;
+
       // Initialize Window Service
       accessory.context.Window = accessory.context.Window ?? {};
       this.Window = {
@@ -279,6 +292,9 @@ export class Bot extends deviceBase {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'windowcovering') {
+      // Set category
+      accessory.category = this.hap.Categories.WINDOW_COVERING;
+
       // Initialize WindowCovering Service
       accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
       this.WindowCovering = {
@@ -315,6 +331,9 @@ export class Bot extends deviceBase {
       this.removeGarageDoorService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'lock') {
+      // Set category
+      accessory.category = this.hap.Categories.DOOR_LOCK;
+
       // Initialize Lock Service
       accessory.context.LockMechanism = accessory.context.LockMechanism ?? {};
       this.LockMechanism = {
@@ -345,6 +364,9 @@ export class Bot extends deviceBase {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'faucet') {
+      // Set category
+      accessory.category = this.hap.Categories.FAUCET;
+
       // Initialize Faucet Service
       accessory.context.Faucet = accessory.context.Faucet ?? {};
       this.Faucet = {
@@ -375,6 +397,9 @@ export class Bot extends deviceBase {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'fan') {
+      // Set category
+      accessory.category = this.hap.Categories.FAN;
+
       // Initialize Fan Service
       accessory.context.Fan = accessory.context.Fan ?? {};
       this.Fan = {
@@ -405,6 +430,9 @@ export class Bot extends deviceBase {
       this.removeWindowCoveringService(accessory);
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'stateful') {
+      // Set category
+      accessory.category = this.hap.Categories.PROGRAMMABLE_SWITCH;
+
       // Initialize StatefulProgrammableSwitch Service
       accessory.context.StatefulProgrammableSwitch = accessory.context.StatefulProgrammableSwitch ?? {};
       this.StatefulProgrammableSwitch = {
@@ -436,6 +464,9 @@ export class Bot extends deviceBase {
       this.removeGarageDoorService(accessory);
       this.removeWindowCoveringService(accessory);
     } else {
+      // Set category
+      accessory.category = this.hap.Categories.OUTLET;
+
       // Initialize Switch property
       accessory.context.Outlet = accessory.context.Outlet ?? {};
       this.Outlet = {
@@ -676,7 +707,7 @@ export class Bot extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: botWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: botWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/ceilinglight.ts

@@ -55,6 +55,9 @@ export class CeilingLight extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.LIGHTBULB;
+
     // default placeholders
     this.adaptiveLighting(device);
 
@@ -331,7 +334,7 @@ export class CeilingLight extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: ceilingLightWebhookContext | ceilingLightProWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: ceilingLightWebhookContext | ceilingLightProWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/colorbulb.ts

@@ -55,6 +55,9 @@ export class ColorBulb extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.LIGHTBULB;
+
     // default placeholders
     this.adaptiveLighting(device);
 
@@ -352,7 +355,7 @@ export class ColorBulb extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: colorBulbWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: colorBulbWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/contact.ts

@@ -65,6 +65,9 @@ export class Contact extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.SENSOR;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doContactUpdate = new Subject();
     this.contactUpdateInProgress = false;
@@ -342,7 +345,7 @@ export class Contact extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: contactSensorWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: contactSensorWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/curtain.ts

@@ -63,6 +63,8 @@ export class Curtain extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.WINDOW_COVERING;
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doCurtainUpdate = new Subject();
@@ -483,7 +485,7 @@ export class Curtain extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: curtainWebhookContext | curtain3WebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: curtainWebhookContext | curtain3WebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/device.ts

@@ -5,17 +5,14 @@
 
 import { hostname } from 'os';
 import { request } from 'undici';
-import asyncmqtt from 'async-mqtt';
-import { createServer } from 'http';
+import { Devices } from '../settings.js';
 import { BlindTiltMappingMode, sleep } from '../utils.js';
-import { Devices, deleteWebhook, queryWebhook, setupWebhook, updateWebhook } from '../settings.js';
 import { SwitchBotModel, SwitchBotBLEModel, SwitchBotBLEModelName, SwitchBotBLEModelFriendlyName } from 'node-switchbot';
 
 import type { MqttClient } from 'mqtt';
 import type { device } from '../types/devicelist.js';
 import type { ad } from '../types/bledevicestatus.js';
 import type { SwitchBotPlatform } from '../platform.js';
-import type { Server, IncomingMessage, ServerResponse } from 'http';
 import type { SwitchBotPlatformConfig, devicesConfig } from '../settings.js';
 import type { API, CharacteristicValue, HAP, Logging, PlatformAccessory, Service } from 'homebridge';
 
@@ -41,10 +38,6 @@ export abstract class deviceBase {
   protected deviceModel!: SwitchBotModel;
   protected deviceBLEModel!: SwitchBotBLEModel;
 
-  // Webhook
-  protected readonly webhookEventHandler: { [x: string]: (context: any) => void } = {};
-  protected webhookEventListener: Server | null = null;
-
   // MQTT
   protected deviceMqttURL!: string;
   protected deviceMqttOptions!: any;
@@ -59,8 +52,6 @@ export abstract class deviceBase {
   //MQTT stuff
   protected mqttClient: MqttClient | null = null;
 
-
-
   constructor(
     protected readonly platform: SwitchBotPlatform,
     protected accessory: PlatformAccessory,
@@ -82,8 +73,6 @@ export abstract class deviceBase {
     this.getDeviceContext(accessory, device);
     this.getDeviceScanDuration(accessory, device);
     this.getMqttSettings(device);
-    this.setupMqtt(device);
-    this.setupwebhook();
 
     // Set accessory information
     accessory
@@ -91,7 +80,7 @@ export abstract class deviceBase {
       .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
       .setCharacteristic(this.hap.Characteristic.AppMatchingIdentifier, 'id1087374760')
       .setCharacteristic(this.hap.Characteristic.Name, device.deviceName ?? accessory.displayName)
-      //.setCharacteristic(this.hap.Characteristic.ConfiguredName, device.deviceName ?? accessory.displayName)
+      .setCharacteristic(this.hap.Characteristic.ConfiguredName, String(device.deviceName ?? accessory.displayName))
       .setCharacteristic(this.hap.Characteristic.Model, device.model ?? accessory.context.model)
       .setCharacteristic(this.hap.Characteristic.ProductData, device.deviceId ?? accessory.context.deviceId)
       .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId);
@@ -203,6 +192,12 @@ export abstract class deviceBase {
     if (device.mqttURL !== '') {
       deviceConfig['mqttURL'] = device.mqttURL;
     }
+    if (device.mqttOptions) {
+      deviceConfig['mqttOptions'] = device.mqttOptions;
+    }
+    if (device.mqttPubOptions) {
+      deviceConfig['mqttPubOptions'] = device.mqttPubOptions;
+    }
     if (device.maxRetries !== 0) {
       deviceConfig['maxRetries'] = device.maxRetries;
     }
@@ -304,7 +299,7 @@ export abstract class deviceBase {
    */
   async mqttPublish(message: string, topic?: string) {
     const mac = this.device.deviceId?.toLowerCase().match(/[\s\S]{1,2}/g)?.join(':');
-    const options = this.device.mqttPubOptions ?? {};
+    const options = this.deviceMqttPubOptions ?? {};
     const mqttTopic = topic ? `/${topic}` : '';
     const mqttMessageTopic = topic ? `${topic}/` : '';
     this.mqttClient?.publish(`homebridge-switchbot/${this.device.deviceType}/${mac}${mqttTopic}`, `${message}`, options);
@@ -328,187 +323,6 @@ export abstract class deviceBase {
       + ` ${mqttPubOptions} mqttPubOptions: ${JSON.stringify(this.deviceMqttPubOptions)}`);
   }
 
-  /*
-   * Setup MQTT hadler if URL is specified.
-   */
-  async setupMqtt(device: device & devicesConfig): Promise<void> {
-    if (device.mqttURL) {
-      try {
-        const { connectAsync } = asyncmqtt;
-        this.mqttClient = await connectAsync(device.mqttURL, device.mqttOptions || {});
-        this.debugLog('MQTT connection has been established successfully.');
-        this.mqttClient.on('error', (e: Error) => {
-          this.errorLog(`Failed to publish MQTT messages. ${e}`);
-        });
-      } catch (e) {
-        this.mqttClient = null;
-        this.errorLog(`Failed to establish MQTT connection. ${e}`);
-      }
-    }
-  }
-
-  async setupDeviceMqtt(): Promise<void> {
-    if (this.config.options?.mqttURL) {
-      try {
-        const { connectAsync } = asyncmqtt;
-        this.mqttClient = await connectAsync(this.config.options?.mqttURL, this.config.options.mqttOptions || {});
-        await this.debugLog('MQTT connection has been established successfully.');
-        this.mqttClient.on('error', async (e: Error) => {
-          await this.errorLog(`Failed to publish MQTT messages. ${e}`);
-        });
-        if (!this.config.options?.webhookURL) {
-          // receive webhook events via MQTT
-          await this.infoLog(`Webhook is configured to be received through ${this.config.options.mqttURL}/homebridge-switchbot/webhook.`);
-          this.mqttClient.subscribe('homebridge-switchbot/webhook/+');
-          this.mqttClient.on('message', async (topic: string, message) => {
-            try {
-              await this.debugLog(`Received Webhook via MQTT: ${topic}=${message}`);
-              const context = JSON.parse(message.toString());
-              this.webhookEventHandler[context.deviceMac]?.(context);
-            } catch (e: any) {
-              await this.errorLog(`Failed to handle webhook event. Error:${e}`);
-            }
-          });
-        }
-      } catch (e) {
-        this.mqttClient = null;
-        await this.errorLog(`Failed to establish MQTT connection. ${e}`);
-      }
-    }
-  }
-
-  async setupwebhook() {
-    //webhook configuration
-    if (this.config.options?.webhookURL) {
-      const url = this.config.options?.webhookURL;
-
-      try {
-        const xurl = new URL(url);
-        const port = Number(xurl.port);
-        const path = xurl.pathname;
-        this.webhookEventListener = createServer((request: IncomingMessage, response: ServerResponse) => {
-          try {
-            if (request.url === path && request.method === 'POST') {
-              request.on('data', async (data) => {
-                try {
-                  const body = JSON.parse(data);
-                  await this.debugLog(`Received Webhook: ${JSON.stringify(body)}`);
-                  if (this.config.options?.mqttURL) {
-                    const mac = body.context.deviceMac
-                      ?.toLowerCase()
-                      .match(/[\s\S]{1,2}/g)
-                      ?.join(':');
-                    const options = this.config.options?.mqttPubOptions || {};
-                    this.mqttClient?.publish(`homebridge-switchbot/webhook/${mac}`, `${JSON.stringify(body.context)}`, options);
-                  }
-                  this.webhookEventHandler[body.context.deviceMac]?.(body.context);
-                } catch (e: any) {
-                  this.errorLog(`Failed to handle webhook event. Error:${e}`);
-                }
-              });
-              response.writeHead(200, { 'Content-Type': 'text/plain' });
-              response.end('OK');
-            }
-            // else {
-            //   response.writeHead(403, {'Content-Type': 'text/plain'});
-            //   response.end(`NG`);
-            // }
-          } catch (e: any) {
-            this.errorLog(`Failed to handle webhook event. Error:${e}`);
-          }
-        }).listen(port ? port : 80);
-      } catch (e: any) {
-        this.errorLog(`Failed to create webhook listener. Error:${e.message}`);
-        return;
-      }
-
-      try {
-        const { body, statusCode } = await request(setupWebhook, {
-          method: 'POST',
-          headers: this.platform.generateHeaders(),
-          body: JSON.stringify({
-            'action': 'setupWebhook',
-            'url': url,
-            'deviceList': 'ALL',
-          }),
-        });
-        const response: any = await body.json();
-        await this.debugLog(`setupWebhook: url:${url}`);
-        await this.debugLog(`setupWebhook: body:${JSON.stringify(response)}`);
-        await this.debugLog(`setupWebhook: statusCode:${statusCode}`);
-        if (statusCode !== 200 || response?.statusCode !== 100) {
-          this.errorLog(`Failed to configure webhook. Existing webhook well be overridden. HTTP:${statusCode} API:${response?.statusCode} `
-            + `message:${response?.message}`);
-        }
-      } catch (e: any) {
-        this.errorLog(`Failed to configure webhook. Error: ${e.message}`);
-      }
-
-      try {
-        const { body, statusCode } = await request(updateWebhook, {
-          method: 'POST', headers: this.platform.generateHeaders(), body: JSON.stringify({
-            'action': 'updateWebhook',
-            'config': {
-              'url': url,
-              'enable': true,
-            },
-          }),
-        });
-        const response: any = await body.json();
-        await this.debugLog(`updateWebhook: url:${url}`);
-        await this.debugLog(`updateWebhook: body:${JSON.stringify(response)}`);
-        await this.debugLog(`updateWebhook: statusCode:${statusCode}`);
-        if (statusCode !== 200 || response?.statusCode !== 100) {
-          this.errorLog(`Failed to update webhook. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-        }
-      } catch (e: any) {
-        this.errorLog(`Failed to update webhook. Error:${e.message}`);
-      }
-
-      try {
-        const { body, statusCode } = await request(queryWebhook, {
-          method: 'POST',
-          headers: this.platform.generateHeaders(),
-          body: JSON.stringify({
-            'action': 'queryUrl',
-          }),
-        });
-        const response: any = await body.json();
-        await this.debugLog(`queryWebhook: body:${JSON.stringify(response)}`);
-        await this.debugLog(`queryWebhook: statusCode:${statusCode}`);
-        if (statusCode !== 200 || response?.statusCode !== 100) {
-          this.errorLog(`Failed to query webhook. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-        } else {
-          this.infoLog(`Listening webhook on ${response?.body?.urls[0]}`);
-        }
-      } catch (e: any) {
-        this.errorLog(`Failed to query webhook. Error:${e}`);
-      }
-
-      this.api.on('shutdown', async () => {
-        try {
-          const { body, statusCode } = await request(deleteWebhook, {
-            method: 'POST',
-            headers: this.platform.generateHeaders(),
-            body: JSON.stringify({
-              'action': 'deleteWebhook',
-              'url': url,
-            }),
-          });
-          const response: any = await body.json();
-          await this.debugLog(`deleteWebhook: url:${url}, body:${JSON.stringify(response)}, statusCode:${statusCode}`);
-          if (statusCode !== 200 || response?.statusCode !== 100) {
-            this.errorLog(`Failed to delete webhook. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-          } else {
-            this.infoLog('Unregistered webhook to close listening.');
-          }
-        } catch (e: any) {
-          this.errorLog(`Failed to delete webhook. Error:${e.message}`);
-        }
-      });
-    }
-  }
-
   /*
    * Setup EVE history graph feature if enabled.
    */

package/src/device/fan.ts

@@ -58,6 +58,9 @@ export class Fan extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.FAN;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doFanUpdate = new Subject();
     this.fanUpdateInProgress = false;
@@ -369,7 +372,7 @@ export class Fan extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: batteryCirculatorFanWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: batteryCirculatorFanWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/hub.ts

@@ -55,6 +55,9 @@ export class Hub extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.SENSOR;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doHubUpdate = new Subject();
     this.hubUpdateInProgress = false;
@@ -333,7 +336,7 @@ export class Hub extends deviceBase {
   async registerWebhook(): Promise<void> {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: hub2WebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: hub2WebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/humidifier.ts

@@ -58,6 +58,9 @@ export class Humidifier extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.AIR_HUMIDIFIER;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doHumidifierUpdate = new Subject();
     this.humidifierUpdateInProgress = false;
@@ -373,7 +376,7 @@ export class Humidifier extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: humidifierWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: humidifierWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/iosensor.ts

@@ -61,6 +61,9 @@ export class IOSensor extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.SENSOR;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doIOSensorUpdate = new Subject();
     this.ioSensorUpdateInProgress = false;
@@ -326,7 +329,7 @@ export class IOSensor extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: outdoorMeterWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: outdoorMeterWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/lightstrip.ts

@@ -55,6 +55,9 @@ export class StripLight extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.LIGHTBULB;
+
     // Adaptive Lighting
     this.adaptiveLighting(device);
     // this is subject we use to track when we need to POST changes to the SwitchBot API
@@ -356,7 +359,7 @@ export class StripLight extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: stripLightWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: stripLightWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/lock.ts

@@ -61,6 +61,9 @@ export class Lock extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.DOOR_LOCK;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doLockUpdate = new Subject();
     this.lockUpdateInProgress = false;
@@ -353,7 +356,7 @@ export class Lock extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: lockWebhookContext | lockProWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: lockWebhookContext | lockProWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/meter.ts

@@ -56,6 +56,9 @@ export class Meter extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.SENSOR;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doMeterUpdate = new Subject();
     this.meterUpdateInProgress = false;
@@ -320,7 +323,7 @@ export class Meter extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: meterWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: meterWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/meterplus.ts

@@ -61,6 +61,9 @@ export class MeterPlus extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.SENSOR;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doMeterUpdate = new Subject();
     this.meterUpdateInProgress = false;
@@ -321,7 +324,7 @@ export class MeterPlus extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: meterPlusWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: meterPlusWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/motion.ts

@@ -60,6 +60,9 @@ export class Motion extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.SENSOR;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doMotionUpdate = new Subject();
     this.motionUbpdateInProgress = false;
@@ -292,7 +295,7 @@ export class Motion extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: motionSensorWebhookContext) => {
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: motionSensorWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);
           this.webhookContext = context;

package/src/device/plug.ts

@@ -40,6 +40,9 @@ export class Plug extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.OUTLET;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doPlugUpdate = new Subject();
     this.plugUpdateInProgress = false;
@@ -204,7 +207,7 @@ export class Plug extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: plugWebhookContext | plugMiniUSWebhookContext
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: plugWebhookContext | plugMiniUSWebhookContext
         | plugMiniJPWebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);

package/src/device/robotvacuumcleaner.ts

@@ -54,6 +54,9 @@ export class RobotVacuumCleaner extends deviceBase {
     device: device & devicesConfig,
   ) {
     super(platform, accessory, device);
+    // Set category
+    accessory.category = this.hap.Categories.OTHER;
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doRobotVacuumCleanerUpdate = new Subject();
     this.robotVacuumCleanerUpdateInProgress = false;
@@ -304,7 +307,7 @@ export class RobotVacuumCleaner extends deviceBase {
   async registerWebhook() {
     if (this.device.webhook) {
       await this.debugLog('is listening webhook.');
-      this.webhookEventHandler[this.device.deviceId] = async (context: robotVacuumCleanerS1WebhookContext
+      this.platform.webhookEventHandler[this.device.deviceId] = async (context: robotVacuumCleanerS1WebhookContext
         | robotVacuumCleanerS1PlusWebhookContext | floorCleaningRobotS10WebhookContext) => {
         try {
           await this.debugLog(`received Webhook: ${JSON.stringify(context)}`);