@switchbot/homebridge-switchbot 2.14.0 → 3.0.0-beta.0

package/dist/device/colorbulb.d.ts

@@ -1,7 +1,7 @@
 import { Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
-import { device, devicesConfig, deviceStatus, serviceData } from '../settings';
-import { Service, PlatformAccessory, CharacteristicValue, ControllerConstructor, Controller, ControllerServiceMap } from 'homebridge';
+import { device, devicesConfig, deviceStatus, serviceData, SwitchBotPlatformConfig } from '../settings';
+import { Service, PlatformAccessory, CharacteristicValue, ControllerConstructor, Controller, ControllerServiceMap, API, Logging, HAP } from 'homebridge';
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
@@ -11,6 +11,10 @@ export declare class ColorBulb {
     private readonly platform;
     private accessory;
     device: device & devicesConfig;
+    readonly api: API;
+    readonly log: Logging;
+    readonly config: SwitchBotPlatformConfig;
+    protected readonly hap: HAP;
     lightBulbService: Service;
     On: CharacteristicValue;
     Hue: CharacteristicValue;
@@ -44,8 +48,8 @@ export declare class ColorBulb {
     cacheKelvin: number;
     colorBulbUpdateInProgress: boolean;
     doColorBulbUpdate: Subject<void>;
-    private readonly BLE;
     private readonly OpenAPI;
+    private readonly BLE;
     constructor(platform: SwitchBotPlatform, accessory: PlatformAccessory, device: device & devicesConfig);
     /**
      * Parse the device status from the SwitchBot api
@@ -120,8 +124,8 @@ export declare class ColorBulb {
     apiError(e: any): void;
     context(): Promise<void>;
     refreshRate(device: device & devicesConfig): Promise<void>;
-    config(device: device & devicesConfig): Promise<void>;
-    logs(device: device & devicesConfig): Promise<void>;
+    deviceConfig(device: device & devicesConfig): Promise<void>;
+    deviceLogs(device: device & devicesConfig): Promise<void>;
     /**
      * Logging for Device
      */

package/dist/device/colorbulb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"colorbulb.d.ts","sourceRoot":"","sources":["../../src/device/colorbulb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"colorbulb.d.ts","sourceRoot":"","sources":["../../src/device/colorbulb.ts"],"names":[],"mappings":"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"}

package/dist/device/colorbulb.js

@@ -1,63 +1,116 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ColorBulb = void 0;
-const undici_1 = require("undici");
-const utils_1 = require("../utils");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const settings_1 = require("../settings");
+import { request } from 'undici';
+import { sleep } from '../utils';
+import { interval, Subject } from 'rxjs';
+import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
+import { hs2rgb, rgb2hs, m2hs, Devices } from '../settings';
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
  * Each accessory may expose multiple services of different service types.
  */
-class ColorBulb {
+export class ColorBulb {
+    platform;
+    accessory;
+    device;
+    api;
+    log;
+    config;
+    hap;
+    // Services
+    lightBulbService;
+    // Characteristic Values
+    On;
+    Hue;
+    Saturation;
+    Brightness;
+    FirmwareRevision;
+    ColorTemperature;
+    // OpenAPI Status
+    OpenAPI_On;
+    OpenAPI_RGB;
+    OpenAPI_Brightness;
+    OpenAPI_FirmwareRevision;
+    OpenAPI_ColorTemperature;
+    // BLE Status
+    BLE_Red;
+    BLE_On;
+    BLE_Blue;
+    BLE_Power;
+    BLE_Green;
+    BLE_Delay;
+    BLE_WifiRssi;
+    BLE_Brightness;
+    BLE_ColorTemperature;
+    // BLE Others
+    BLE_IsConnected;
+    // Config
+    set_minStep;
+    scanDuration;
+    deviceLogging;
+    deviceRefreshRate;
+    adaptiveLightingShift;
+    // Adaptive Lighting
+    AdaptiveLightingController;
+    minKelvin;
+    maxKelvin;
+    // Others
+    cacheKelvin;
+    // Updates
+    colorBulbUpdateInProgress;
+    doColorBulbUpdate;
+    // Connection
+    OpenAPI;
+    BLE;
     constructor(platform, accessory, device) {
         this.platform = platform;
         this.accessory = accessory;
         this.device = device;
+        this.api = this.platform.api;
+        this.log = this.platform.log;
+        this.config = this.platform.config;
+        this.hap = this.api.hap;
         // Connection
         this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
         this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
         // default placeholders
-        this.logs(device);
+        this.deviceLogs(device);
         this.scan(device);
         this.refreshRate(device);
         this.adaptiveLighting(device);
         this.context();
-        this.config(device);
+        this.deviceConfig(device);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
-        this.doColorBulbUpdate = new rxjs_1.Subject();
+        this.doColorBulbUpdate = new Subject();
         this.colorBulbUpdateInProgress = false;
         // Retrieve initial values and updateHomekit
         this.refreshStatus();
         // set accessory information
         accessory
-            .getService(this.platform.Service.AccessoryInformation)
-            .setCharacteristic(this.platform.Characteristic.Manufacturer, 'SwitchBot')
-            .setCharacteristic(this.platform.Characteristic.Model, 'W1401400')
-            .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId)
-            .setCharacteristic(this.platform.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
+            .getService(this.hap.Service.AccessoryInformation)
+            .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
+            .setCharacteristic(this.hap.Characteristic.Model, 'W1401400')
+            .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
+            .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
         // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
         // you can create multiple services for each accessory
         const lightBulbService = `${accessory.displayName} ${device.deviceType}`;
-        (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb)
-            || accessory.addService(this.platform.Service.Lightbulb)), lightBulbService;
+        (this.lightBulbService = accessory.getService(this.hap.Service.Lightbulb)
+            || accessory.addService(this.hap.Service.Lightbulb)), lightBulbService;
         if (this.adaptiveLightingShift === -1 && this.accessory.context.adaptiveLighting) {
             this.accessory.removeService(this.lightBulbService);
-            this.lightBulbService = this.accessory.addService(this.platform.Service.Lightbulb);
+            this.lightBulbService = this.accessory.addService(this.hap.Service.Lightbulb);
             this.accessory.context.adaptiveLighting = false;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting}`);
         }
-        this.lightBulbService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
-        if (!this.lightBulbService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-            this.lightBulbService.addCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.displayName);
+        this.lightBulbService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
+        if (!this.lightBulbService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
+            this.lightBulbService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
         }
         // handle on / off events using the On characteristic
-        this.lightBulbService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
+        this.lightBulbService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
         // handle Brightness events using the Brightness characteristic
         this.lightBulbService
-            .getCharacteristic(this.platform.Characteristic.Brightness)
+            .getCharacteristic(this.hap.Characteristic.Brightness)
             .setProps({
             minStep: this.minStep(device),
             minValue: 0,
@@ -70,7 +123,7 @@ class ColorBulb {
             .onSet(this.BrightnessSet.bind(this));
         // handle ColorTemperature events using the ColorTemperature characteristic
         this.lightBulbService
-            .getCharacteristic(this.platform.Characteristic.ColorTemperature)
+            .getCharacteristic(this.hap.Characteristic.ColorTemperature)
             .setProps({
             minValue: 140,
             maxValue: 500,
@@ -82,7 +135,7 @@ class ColorBulb {
             .onSet(this.ColorTemperatureSet.bind(this));
         // handle Hue events using the Hue characteristic
         this.lightBulbService
-            .getCharacteristic(this.platform.Characteristic.Hue)
+            .getCharacteristic(this.hap.Characteristic.Hue)
             .setProps({
             minValue: 0,
             maxValue: 360,
@@ -94,7 +147,7 @@ class ColorBulb {
             .onSet(this.HueSet.bind(this));
         // handle Hue events using the Hue characteristic
         this.lightBulbService
-            .getCharacteristic(this.platform.Characteristic.Saturation)
+            .getCharacteristic(this.hap.Characteristic.Saturation)
             .setProps({
             minValue: 0,
             maxValue: 100,
@@ -117,8 +170,8 @@ class ColorBulb {
         // Update Homekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
-        (0, rxjs_1.interval)(this.deviceRefreshRate * 1000)
-            .pipe((0, operators_1.skipWhile)(() => this.colorBulbUpdateInProgress))
+        interval(this.deviceRefreshRate * 1000)
+            .pipe(skipWhile(() => this.colorBulbUpdateInProgress))
             .subscribe(async () => {
             await this.refreshStatus();
         });
@@ -141,8 +194,8 @@ class ColorBulb {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
-                    const [hue, saturation] = (0, settings_1.rgb2hs)(Number(red), Number(green), Number(blue));
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` + ` hs: ${JSON.stringify((0, settings_1.rgb2hs)(Number(red), Number(green), Number(blue)))}`);
+                    const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` + ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
                     // Hue
                     this.Hue = hue;
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
@@ -161,9 +214,9 @@ class ColorBulb {
         // Watch for Bulb change events
         // We put in a debounce of 100ms so we don't make duplicate calls
         this.doColorBulbUpdate
-            .pipe((0, operators_1.tap)(() => {
+            .pipe(tap(() => {
             this.colorBulbUpdateInProgress = true;
-        }), (0, operators_1.debounceTime)(this.platform.config.options.pushRate * 1000))
+        }), debounceTime(this.platform.config.options.pushRate * 1000))
             .subscribe(async () => {
             try {
                 await this.pushChanges();
@@ -212,9 +265,9 @@ class ColorBulb {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${this.BLE_Red}`);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${this.BLE_Green}`);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${this.BLE_Blue}`);
-        const [hue, saturation] = (0, settings_1.rgb2hs)(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue));
+        const [hue, saturation] = rgb2hs(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue));
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
-            ` hs: ${JSON.stringify((0, settings_1.rgb2hs)(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue)))}`);
+            ` hs: ${JSON.stringify(rgb2hs(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue)))}`);
         // Hue
         this.Hue = hue;
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
@@ -249,8 +302,8 @@ class ColorBulb {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
-            const [hue, saturation] = (0, settings_1.rgb2hs)(Number(red), Number(green), Number(blue));
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` + ` hs: ${JSON.stringify((0, settings_1.rgb2hs)(Number(red), Number(green), Number(blue)))}`);
+            const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` + ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
             // Hue
             this.Hue = hue;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
@@ -337,7 +390,7 @@ class ColorBulb {
                     }
                 };
                 // Wait
-                return await (0, utils_1.sleep)(this.scanDuration * 1000);
+                return await sleep(this.scanDuration * 1000);
             })
                 .then(async () => {
                 // Stop to monitor
@@ -357,7 +410,7 @@ class ColorBulb {
     async openAPIRefreshStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
         try {
-            const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/status`, {
+            const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/status`, {
                 headers: this.platform.generateHeaders(),
             });
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} body: ${JSON.stringify(body)}`);
@@ -414,9 +467,9 @@ class ColorBulb {
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, pushChanges will not happen.`);
         }
         // Refresh the status from the API
-        (0, rxjs_1.interval)(15000)
-            .pipe((0, operators_1.skipWhile)(() => this.colorBulbUpdateInProgress))
-            .pipe((0, operators_1.take)(1))
+        interval(15000)
+            .pipe(skipWhile(() => this.colorBulbUpdateInProgress))
+            .pipe(take(1))
             .subscribe(async () => {
             await this.refreshStatus();
         });
@@ -554,7 +607,7 @@ class ColorBulb {
         if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
-            const [red, green, blue] = (0, settings_1.hs2rgb)(Number(this.Hue), Number(this.Saturation));
+            const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
             const switchbot = await this.platform.connectBLE();
             // Convert to BLE Address
@@ -605,7 +658,7 @@ class ColorBulb {
             });
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
-                const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/commands`, {
+                const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
                     body: bodyChange,
                     method: 'POST',
                     headers: this.platform.generateHeaders(),
@@ -655,7 +708,7 @@ class ColorBulb {
         if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
-            const [red, green, blue] = (0, settings_1.hs2rgb)(Number(this.Hue), Number(this.Saturation));
+            const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
             const bodyChange = JSON.stringify({
                 command: 'setColor',
@@ -664,7 +717,7 @@ class ColorBulb {
             });
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
-                const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/commands`, {
+                const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
                     body: bodyChange,
                     method: 'POST',
                     headers: this.platform.generateHeaders(),
@@ -708,7 +761,7 @@ class ColorBulb {
             });
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
-                const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/commands`, {
+                const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
                     body: bodyChange,
                     method: 'POST',
                     headers: this.platform.generateHeaders(),
@@ -750,7 +803,7 @@ class ColorBulb {
             });
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
-                const { body, statusCode, headers } = await (0, undici_1.request)(`${settings_1.Devices}/${this.device.deviceId}/commands`, {
+                const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/commands`, {
                     body: bodyChange,
                     method: 'POST',
                     headers: this.platform.generateHeaders(),
@@ -833,9 +886,9 @@ class ColorBulb {
             return;
         }
         // Updating the hue/sat to the corresponding values mimics native adaptive lighting
-        const hs = (0, settings_1.m2hs)(value);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, hs[0]);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, hs[1]);
+        const hs = m2hs(value);
+        this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Hue, hs[0]);
+        this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Saturation, hs[1]);
         this.ColorTemperature = value;
         this.doColorBulbUpdate.next();
     }
@@ -852,7 +905,7 @@ class ColorBulb {
         else {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
         }
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+        this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
         this.Hue = value;
         this.doColorBulbUpdate.next();
     }
@@ -869,7 +922,7 @@ class ColorBulb {
         else {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
         }
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+        this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
         this.Saturation = value;
         this.doColorBulbUpdate.next();
     }
@@ -880,7 +933,7 @@ class ColorBulb {
         }
         else {
             this.accessory.context.On = this.On;
-            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.On, this.On);
+            this.lightBulbService.updateCharacteristic(this.hap.Characteristic.On, this.On);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
         }
         // Brightness
@@ -889,7 +942,7 @@ class ColorBulb {
         }
         else {
             this.accessory.context.Brightness = this.Brightness;
-            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Brightness, this.Brightness);
+            this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Brightness, this.Brightness);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
         }
         // ColorTemperature
@@ -898,7 +951,7 @@ class ColorBulb {
         }
         else {
             this.accessory.context.ColorTemperature = this.ColorTemperature;
-            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, this.ColorTemperature);
+            this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, this.ColorTemperature);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
         }
         // Hue
@@ -907,7 +960,7 @@ class ColorBulb {
         }
         else {
             this.accessory.context.Hue = this.Hue;
-            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, this.Hue);
+            this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Hue, this.Hue);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
         }
         // Saturation
@@ -916,7 +969,7 @@ class ColorBulb {
         }
         else {
             this.accessory.context.Saturation = this.Saturation;
-            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, this.Saturation);
+            this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Saturation, this.Saturation);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
         }
     }
@@ -952,7 +1005,7 @@ class ColorBulb {
                 switchbot.onadvertisement = (ad) => {
                     this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
                 };
-                await (0, utils_1.sleep)(10000);
+                await sleep(10000);
                 // Stop to monitor
                 await switchbot.stopScan();
             })();
@@ -978,7 +1031,7 @@ class ColorBulb {
             }
             this.infoLog(e);
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Retrying`);
-            await (0, utils_1.sleep)(1000);
+            await sleep(1000);
             return this.retry({ max: max - 1, fn });
         });
     }
@@ -1055,11 +1108,11 @@ class ColorBulb {
         }
     }
     apiError(e) {
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.On, e);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, e);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Brightness, e);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, e);
-        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, e);
+        this.lightBulbService.updateCharacteristic(this.hap.Characteristic.On, e);
+        this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Hue, e);
+        this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Brightness, e);
+        this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Saturation, e);
+        this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, e);
     }
     async context() {
         if (this.On === undefined) {
@@ -1109,7 +1162,7 @@ class ColorBulb {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
         }
     }
-    async config(device) {
+    async deviceConfig(device) {
         let config = {};
         if (device.colorbulb) {
             config = device.colorbulb;
@@ -1139,7 +1192,7 @@ class ColorBulb {
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
         }
     }
-    async logs(device) {
+    async deviceLogs(device) {
         if (this.platform.debugMode) {
             this.deviceLogging = this.accessory.context.logging = 'debugMode';
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
@@ -1203,5 +1256,4 @@ class ColorBulb {
         return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
     }
 }
-exports.ColorBulb = ColorBulb;
 //# sourceMappingURL=colorbulb.js.map