@switchbot/homebridge-switchbot 1.10.2-beta.8 → 1.12.0

package/dist/device/colorbulb.js

@@ -28,7 +28,9 @@ class ColorBulb {
         this.Hue = 0;
         this.Brightness = 0;
         this.Saturation = 0;
-        this.ColorTemperature = 140;
+        if (device.deviceType === 'Color Bulb') {
+            this.ColorTemperature = 140;
+        }
         this.minKelvin = 2000;
         this.maxKelvin = 9000;
         // this is subject we use to track when we need to POST changes to the SwitchBot API
@@ -40,28 +42,28 @@ class ColorBulb {
         accessory
             .getService(this.platform.Service.AccessoryInformation)
             .setCharacteristic(this.platform.Characteristic.Manufacturer, 'SwitchBot')
-            .setCharacteristic(this.platform.Characteristic.Model, 'SWITCHBOT-COLORBULB-W1401400')
+            .setCharacteristic(this.platform.Characteristic.Model, this.model(device))
             .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId);
         // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
         // you can create multiple services for each accessory
-        (this.service = accessory.getService(this.platform.Service.Lightbulb) || accessory.addService(this.platform.Service.Lightbulb)),
-            `${accessory.displayName} Light Bulb`;
+        (this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb) || accessory.addService(this.platform.Service.Lightbulb)),
+            `${accessory.displayName} ${device.deviceType}`;
         if (this.adaptiveLightingShift === -1 && this.accessory.context.adaptiveLighting) {
-            this.accessory.removeService(this.service);
-            this.service = this.accessory.addService(this.platform.Service.Lightbulb);
+            this.accessory.removeService(this.lightBulbService);
+            this.lightBulbService = this.accessory.addService(this.platform.Service.Lightbulb);
             this.accessory.context.adaptiveLighting = false;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting}`);
+            this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting}`);
         }
         // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
         // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
         // accessory.getService('NAME') ?? accessory.addService(this.platform.Service.Outlet, 'NAME', 'USER_DEFINED_SUBTYPE');
         // set the service name, this is what is displayed as the default name on the Home app
         // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-        this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+        this.lightBulbService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
         // handle on / off events using the On characteristic
-        this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
+        this.lightBulbService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
         // handle Brightness events using the Brightness characteristic
-        this.service
+        this.lightBulbService
             .getCharacteristic(this.platform.Characteristic.Brightness)
             .setProps({
             minStep: this.minStep(device),
@@ -74,19 +76,25 @@ class ColorBulb {
         })
             .onSet(this.BrightnessSet.bind(this));
         // handle ColorTemperature events using the ColorTemperature characteristic
-        this.service
-            .getCharacteristic(this.platform.Characteristic.ColorTemperature)
-            .setProps({
-            minValue: 140,
-            maxValue: 500,
-            validValueRanges: [140, 500],
-        })
-            .onGet(() => {
-            return this.ColorTemperature;
-        })
-            .onSet(this.ColorTemperatureSet.bind(this));
+        if (device.deviceType === 'Color Bulb') {
+            this.debugLog(`Color Bulb: ${accessory.displayName} Add ColorTemperature Characteristic`);
+            this.lightBulbService
+                .getCharacteristic(this.platform.Characteristic.ColorTemperature)
+                .setProps({
+                minValue: 140,
+                maxValue: 500,
+                validValueRanges: [140, 500],
+            })
+                .onGet(() => {
+                return this.ColorTemperature;
+            })
+                .onSet(this.ColorTemperatureSet.bind(this));
+        }
+        else {
+            this.debugLog(`Color Bulb: ${accessory.displayName} ColorTemperature Characteristic Not Added`);
+        }
         // handle Hue events using the Hue characteristic
-        this.service
+        this.lightBulbService
             .getCharacteristic(this.platform.Characteristic.Hue)
             .setProps({
             minValue: 0,
@@ -98,7 +106,7 @@ class ColorBulb {
         })
             .onSet(this.HueSet.bind(this));
         // handle Hue events using the Hue characteristic
-        this.service
+        this.lightBulbService
             .getCharacteristic(this.platform.Characteristic.Saturation)
             .setProps({
             minValue: 0,
@@ -109,14 +117,14 @@ class ColorBulb {
             return this.Saturation;
         })
             .onSet(this.SaturationSet.bind(this));
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
+        this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
         if (this.adaptiveLightingShift !== -1) {
-            this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.service, {
+            this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.lightBulbService, {
                 customTemperatureAdjustment: this.adaptiveLightingShift,
             });
             this.accessory.configureController(this.AdaptiveLightingController);
             this.accessory.context.adaptiveLighting = true;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},` +
+            this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},` +
                 ` adaptiveLightingShift: ${this.adaptiveLightingShift}`);
         }
         // Update Homekit
@@ -124,8 +132,8 @@ class ColorBulb {
         // Start an update interval
         (0, rxjs_1.interval)(this.deviceRefreshRate * 1000)
             .pipe((0, operators_1.skipWhile)(() => this.colorBulbUpdateInProgress))
-            .subscribe(() => {
-            this.refreshStatus();
+            .subscribe(async () => {
+            await this.refreshStatus();
         });
         // Watch for Bulb change events
         // We put in a debounce of 100ms so we don't make duplicate calls
@@ -138,19 +146,19 @@ class ColorBulb {
                 await this.pushChanges();
             }
             catch (e) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges`);
+                this.errorLog(`${device.deviceType}: ${this.accessory.displayName} failed pushChanges`);
                 if (this.deviceLogging === 'debug') {
-                    this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                    this.errorLog(`${device.deviceType}: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
                 }
                 if (this.platform.debugMode) {
-                    this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
+                    this.errorLog(`${device.deviceType}: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
                 }
                 this.apiError(e);
             }
             this.colorBulbUpdateInProgress = false;
         });
     }
-    parseStatus() {
+    async parseStatus() {
         switch (this.power) {
             case 'on':
                 this.On = true;
@@ -158,53 +166,58 @@ class ColorBulb {
             default:
                 this.On = false;
         }
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
         // Brightness
         this.Brightness = Number(this.brightness);
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
         // Color, Hue & Brightness
         if (this.color) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} color: ${JSON.stringify(this.color)}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(this.color)}`);
             const [red, green, blue] = this.color.split(':');
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
+            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(`Color Bulb: ${this.accessory.displayName} hs: ${JSON.stringify((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)))}`);
             // Hue
             this.Hue = hue;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${this.Hue}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
             // Saturation
             this.Saturation = saturation;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
         }
         // ColorTemperature
-        if (!Number.isNaN(this.colorTemperature)) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} OpenAPI ColorTemperature: ${this.colorTemperature}`);
-            const mired = Math.round(1000000 / this.colorTemperature);
-            this.ColorTemperature = Number(mired);
-            this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+        if (this.device.deviceType === 'Color Bulb') {
+            if (!Number.isNaN(this.colorTemperature)) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI ColorTemperature: ${this.colorTemperature}`);
+                const mired = Math.round(1000000 / this.colorTemperature);
+                this.ColorTemperature = Number(mired);
+                this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+            }
         }
     }
     async refreshStatus() {
         try {
             this.deviceStatus = (await this.platform.axios.get(`${settings_1.DeviceURL}/${this.device.deviceId}/status`)).data;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
             this.power = this.deviceStatus.body.power;
             this.color = this.deviceStatus.body.color;
             this.brightness = this.deviceStatus.body.brightness;
-            this.colorTemperature = this.deviceStatus.body.colorTemperature;
+            if (this.device.deviceType === 'Color Bulb') {
+                this.colorTemperature = this.deviceStatus.body.colorTemperature;
+            }
             this.parseStatus();
             this.updateHomeKitCharacteristics();
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
             if (this.deviceLogging === 'debug') {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
+                    ` Error Message: ${JSON.stringify(e.message)}`);
             }
             if (this.platform.debugMode) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
             }
             this.apiError(e);
         }
@@ -239,11 +252,11 @@ class ColorBulb {
                 else {
                     payload.command = 'turnOff';
                 }
-                this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
                     ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
                 // Make the API request
                 const push = await this.platform.axios.post(`${settings_1.DeviceURL}/${this.device.deviceId}/commands`, payload);
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
                 this.statusCode(push);
                 this.OnCached = this.On;
                 this.accessory.context.On = this.OnCached;
@@ -253,7 +266,7 @@ class ColorBulb {
                 await this.pushBrightnessChanges();
             }
             // Push ColorTemperature Update
-            if (this.On) {
+            if (this.On && this.device.deviceType === 'Color Bulb') {
                 await this.pushColorTemperatureChanges();
             }
             // Push Hue & Saturation Update
@@ -262,12 +275,13 @@ class ColorBulb {
             }
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
             if (this.deviceLogging === 'debug') {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
+                    ` Error Message: ${JSON.stringify(e.message)}`);
             }
             if (this.platform.debugMode) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
             }
             this.apiError(e);
         }
@@ -275,36 +289,37 @@ class ColorBulb {
     async pushHueSaturationChanges() {
         try {
             if (this.Hue !== this.HueCached || this.Saturation !== this.SaturationCached) {
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.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));
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
                 const payload = {
                     commandType: 'command',
                     command: 'setColor',
                     parameter: `${red}:${green}:${blue}`,
                 };
-                this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
                     ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
                 // Make the API request
                 const push = await this.platform.axios.post(`${settings_1.DeviceURL}/${this.device.deviceId}/commands`, payload);
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
                 this.statusCode(push);
                 this.HueCached = this.Hue;
                 this.SaturationCached = this.Saturation;
             }
             else {
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} No Changes.` +
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes.` +
                     `Hue: ${this.Hue}, HueCached: ${this.HueCached}, Saturation: ${this.Saturation}, SaturationCached: ${this.SaturationCached}`);
             }
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
             if (this.deviceLogging === 'debug') {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
+                    ` Error Message: ${JSON.stringify(e.message)}`);
             }
             if (this.platform.debugMode) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
             }
             this.apiError(e);
         }
@@ -319,26 +334,27 @@ class ColorBulb {
                     command: 'setColorTemperature',
                     parameter: `${kelvin}`,
                 };
-                this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
                     ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
                 // Make the API request
                 const push = await this.platform.axios.post(`${settings_1.DeviceURL}/${this.device.deviceId}/commands`, payload);
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
                 this.statusCode(push);
                 this.ColorTemperatureCached = this.ColorTemperature;
             }
             else {
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} No Changes.` +
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes.` +
                     `ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.ColorTemperatureCached}`);
             }
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
             if (this.deviceLogging === 'debug') {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
+                    ` Error Message: ${JSON.stringify(e.message)}`);
             }
             if (this.platform.debugMode) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
             }
             this.apiError(e);
         }
@@ -351,135 +367,141 @@ class ColorBulb {
                     command: 'setBrightness',
                     parameter: `${this.Brightness}`,
                 };
-                this.infoLog(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
+                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
                     ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
                 // Make the API request
                 const push = await this.platform.axios.post(`${settings_1.DeviceURL}/${this.device.deviceId}/commands`, payload);
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
                 this.statusCode(push);
                 this.BrightnessCached = this.Brightness;
             }
             else {
-                this.debugLog(`Color Bulb: ${this.accessory.displayName} No Changes.` + `Brightness: ${this.Brightness}, BrightnessCached: ${this.BrightnessCached}`);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes.` +
+                    `Brightness: ${this.Brightness}, BrightnessCached: ${this.BrightnessCached}`);
             }
         }
         catch (e) {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
+            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
             if (this.deviceLogging === 'debug') {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
+                    ` Error Message: ${JSON.stringify(e.message)}`);
             }
             if (this.platform.debugMode) {
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
             }
             this.apiError(e);
         }
     }
-    updateHomeKitCharacteristics() {
+    async updateHomeKitCharacteristics() {
         if (this.On === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
         }
         else {
-            this.service.updateCharacteristic(this.platform.Characteristic.On, this.On);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
+            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.On, this.On);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
         }
         if (this.Brightness === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
         }
         else {
-            this.service.updateCharacteristic(this.platform.Characteristic.Brightness, this.Brightness);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
+            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Brightness, this.Brightness);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
         }
-        if (this.ColorTemperature === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
-        }
-        else {
-            this.service.updateCharacteristic(this.platform.Characteristic.ColorTemperature, this.ColorTemperature);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
+        if (this.device.deviceType === 'Color Bulb') {
+            if (this.ColorTemperature === undefined) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+            }
+            else {
+                this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, this.ColorTemperature);
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
+            }
         }
         if (this.Hue === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${this.Hue}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
         }
         else {
-            this.service.updateCharacteristic(this.platform.Characteristic.Hue, this.Hue);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
+            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, this.Hue);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
         }
         if (this.Saturation === undefined) {
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
         }
         else {
-            this.service.updateCharacteristic(this.platform.Characteristic.Saturation, this.Saturation);
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
+            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, this.Saturation);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
         }
     }
     apiError(e) {
-        this.service.updateCharacteristic(this.platform.Characteristic.On, e);
-        this.service.updateCharacteristic(this.platform.Characteristic.Hue, e);
-        this.service.updateCharacteristic(this.platform.Characteristic.Brightness, e);
-        this.service.updateCharacteristic(this.platform.Characteristic.Saturation, e);
-        this.service.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 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);
+        if (this.device.deviceType === 'Color Bulb') {
+            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, e);
+        }
         //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
     }
     statusCode(push) {
         switch (push.data.statusCode) {
             case 151:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Command not supported by this device type.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this device type.`);
                 break;
             case 152:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Device not found.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found.`);
                 break;
             case 160:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Command is not supported.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported.`);
                 break;
             case 161:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Device is offline.`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline.`);
                 this.offlineOff();
                 break;
             case 171:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} is offline. Hub: ${this.device.hubDeviceId}`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} is offline. Hub: ${this.device.hubDeviceId}`);
                 this.offlineOff();
                 break;
             case 190:
-                this.errorLog(`Color Bulb: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
                     ` Or command: ${JSON.stringify(push.data)} format is invalid`);
                 break;
             case 100:
                 if (this.platform.debugMode) {
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} Command successfully sent.`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent.`);
                 }
                 break;
             default:
                 if (this.platform.debugMode) {
-                    this.debugLog(`Color Bulb: ${this.accessory.displayName} Unknown statusCode.`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode.`);
                 }
         }
     }
-    offlineOff() {
+    async offlineOff() {
         if (this.device.offline) {
             this.On = false;
-            this.service.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+            this.lightBulbService.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
         }
     }
     /**
      * Handle requests to set the value of the "On" characteristic
      */
-    OnSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} On: ${value}`);
+    async OnSet(value) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${value}`);
         this.On = value;
         this.doColorBulbUpdate.next();
     }
     /**
      * Handle requests to set the value of the "Brightness" characteristic
      */
-    BrightnessSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} Brightness: ${value}`);
+    async BrightnessSet(value) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${value}`);
         this.Brightness = value;
         this.doColorBulbUpdate.next();
     }
     /**
      * Handle requests to set the value of the "ColorTemperature" characteristic
      */
-    ColorTemperatureSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${value}`);
+    async ColorTemperatureSet(value) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${value}`);
         // Convert mired to kelvin to nearest 100 (SwitchBot seems to need this)
         const kelvin = Math.round(1000000 / Number(value) / 100) * 100;
         // Check and increase/decrease kelvin to range of device
@@ -489,30 +511,44 @@ class ColorBulb {
         }
         // Updating the hue/sat to the corresponding values mimics native adaptive lighting
         const hs = (0, settings_1.m2hs)(value);
-        this.service.updateCharacteristic(this.platform.Characteristic.Hue, hs[0]);
-        this.service.updateCharacteristic(this.platform.Characteristic.Saturation, hs[1]);
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, hs[0]);
+        this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, hs[1]);
         this.ColorTemperature = value;
         this.doColorBulbUpdate.next();
     }
     /**
      * Handle requests to set the value of the "Hue" characteristic
      */
-    HueSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${value}`);
-        this.service.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+    async HueSet(value) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${value}`);
+        if (this.device.deviceType === 'Color Bulb') {
+            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+        }
         this.Hue = value;
         this.doColorBulbUpdate.next();
     }
     /**
      * Handle requests to set the value of the "Saturation" characteristic
      */
-    SaturationSet(value) {
-        this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${value}`);
-        this.service.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+    async SaturationSet(value) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${value}`);
+        if (this.device.deviceType === 'Color Bulb') {
+            this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
+        }
         this.Saturation = value;
         this.doColorBulbUpdate.next();
     }
-    config(device) {
+    model(device) {
+        let model;
+        if (device.deviceType === 'Strip Light') {
+            model = 'W1701100';
+        }
+        else {
+            model = 'W1401400';
+        }
+        return model;
+    }
+    async config(device) {
         let config = {};
         if (device.colorbulb) {
             config = device.colorbulb;
@@ -533,45 +569,45 @@ class ColorBulb {
             config['offline'] = device.offline;
         }
         if (Object.entries(config).length !== 0) {
-            this.warnLog(`Color Bulb: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
         }
     }
-    refreshRate(device) {
+    async refreshRate(device) {
         if (device.refreshRate) {
             this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
         }
         else if (this.platform.config.options.refreshRate) {
             this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
         }
     }
-    logs(device) {
+    async logs(device) {
         if (this.platform.debugMode) {
             this.deviceLogging = this.accessory.context.logging = 'debugMode';
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
         }
         else if (device.logging) {
             this.deviceLogging = this.accessory.context.logging = device.logging;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
         }
         else if (this.platform.config.options?.logging) {
             this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
         }
         else {
             this.deviceLogging = this.accessory.context.logging = 'standard';
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
         }
     }
-    adaptiveLighting(device) {
+    async adaptiveLighting(device) {
         if (device.colorbulb?.adaptiveLightingShift) {
             this.adaptiveLightingShift = device.colorbulb.adaptiveLightingShift;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
         }
         else {
             this.adaptiveLightingShift = 0;
-            this.debugLog(`Color Bulb: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
         }
     }
     minStep(device) {