v1.12.3 (#248)

## [Version 1.12.3](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.12.3) (2022-02-05) ## What's Changed - Housekeeping and updated dependencies. **Full Changelog**: v1.12.2...v1.12.3
OpenWonderLabs · Feb 5, 2022 · 6544fe7 · 6544fe7
1 parent 1695cb6
commit 6544fe7
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. This project uses [Semantic Versioning](https://semver.org/)
 
+## [Version 1.12.3](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.12.3) (2022-02-05)
+
+## What's Changed
+
+- Housekeeping and updated dependencies.
+
+**Full Changelog**: https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v1.12.2...v1.12.3
+
 ## [Version 1.12.2](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.12.2) (2022-02-02)
 
 ## What's Changed

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge SwitchBot",
   "name": "@switchbot/homebridge-switchbot",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "description": "The [Homebridge](https://homebridge.io) SwitchBot plugin allows you to access your [SwitchBot](https://www.switch-bot.com) device(s) from HomeKit.",
   "author": "SwitchBot <[email protected]> (https://github.com/SwitchBot)",
   "license": "ISC",
@@ -59,7 +59,7 @@
     "rxjs": "^7.5.2"
   },
   "devDependencies": {
-    "@types/node": "^17.0.14",
+    "@types/node": "^17.0.15",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
     "eslint": "^8.8.0",

diff --git a/src/device/bot.ts b/src/device/bot.ts
@@ -455,7 +455,7 @@ export class Bot {
       .deviceId!.match(/.{1,2}/g)!
       .join(':')
       .toLowerCase();
-    this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.debugLog(`Bot: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     // Start to monitor advertisement packets
     if (switchbot === false) {
       this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection: ${switchbot}`);
@@ -561,7 +561,6 @@ export class Bot {
       await this.openAPIpushChanges();
     }
     interval(5000)
-      .pipe(skipWhile(() => this.botUpdateInProgress))
       .pipe(take(1))
       .subscribe(async () => {
         await this.refreshStatus();

diff --git a/src/device/colorbulb.ts b/src/device/colorbulb.ts
@@ -68,9 +68,7 @@ export class ColorBulb {
     this.Hue = 0;
     this.Brightness = 0;
     this.Saturation = 0;
-    if (device.deviceType === 'Color Bulb') {
-      this.ColorTemperature = 140;
-    }
+    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
@@ -125,22 +123,18 @@ export class ColorBulb {
       .onSet(this.BrightnessSet.bind(this));
 
     // handle ColorTemperature events using the ColorTemperature characteristic
-    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`);
-    }
+    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));
 
     // handle Hue events using the Hue characteristic
     this.lightBulbService
@@ -251,17 +245,16 @@ export class ColorBulb {
     }
 
     // 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!);
+    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 = Number(mired);
 
-        this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
-      }
+      this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
     }
+
   }
 
   async refreshStatus(): Promise<void> {
@@ -271,9 +264,8 @@ export class ColorBulb {
       this.power = this.deviceStatus.body.power;
       this.color = this.deviceStatus.body.color;
       this.brightness = this.deviceStatus.body.brightness;
-      if (this.device.deviceType === 'Color Bulb') {
-        this.colorTemperature = this.deviceStatus.body.colorTemperature;
-      }
+      this.colorTemperature = this.deviceStatus.body.colorTemperature;
+
       this.parseStatus();
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
@@ -337,7 +329,7 @@ export class ColorBulb {
       }
 
       // Push ColorTemperature Update
-      if (this.On && this.device.deviceType === 'Color Bulb') {
+      if (this.On) {
         await this.pushColorTemperatureChanges();
       }
 
@@ -491,13 +483,11 @@ export class ColorBulb {
       this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Brightness, this.Brightness);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
     }
-    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.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(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
@@ -518,9 +508,7 @@ export class ColorBulb {
     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);
-    }
+    this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, e);
     //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
   }
 
@@ -619,9 +607,7 @@ export class ColorBulb {
   async HueSet(value: CharacteristicValue): Promise<void> {
     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.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
 
     this.Hue = value;
     this.doColorBulbUpdate.next();
@@ -633,9 +619,7 @@ export class ColorBulb {
   async SaturationSet(value: CharacteristicValue): Promise<void> {
     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.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, 140);
 
     this.Saturation = value;
     this.doColorBulbUpdate.next();

diff --git a/src/device/contact.ts b/src/device/contact.ts
@@ -265,7 +265,7 @@ export class Contact {
       .deviceId!.match(/.{1,2}/g)!
       .join(':')
       .toLowerCase();
-    this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.debugLog(`Contact Sensor: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     // Start to monitor advertisement packets
     if (switchbot !== false) {
       switchbot

diff --git a/src/device/curtain.ts b/src/device/curtain.ts
@@ -477,9 +477,8 @@ export class Curtain {
     } else {
       await this.openAPIpushChanges();
     }
-    interval(5000)
-      .pipe(skipWhile(() => this.curtainUpdateInProgress))
-      .pipe(take(1))
+    interval(this.updateRate * 1000)
+      .pipe(take(2))
       .subscribe(async () => {
         await this.refreshStatus();
       });

diff --git a/src/device/humidifier.ts b/src/device/humidifier.ts
@@ -286,7 +286,7 @@ export class Humidifier {
       .deviceId!.match(/.{1,2}/g)!
       .join(':')
       .toLowerCase();
-    this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.debugLog(`Humidifier: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     // Start to monitor advertisement packets
     if (switchbot !== false) {
       switchbot
@@ -395,7 +395,6 @@ export class Humidifier {
     await this.openAPIpushChanges();
     //}
     interval(5000)
-      .pipe(skipWhile(() => this.humidifierUpdateInProgress))
       .pipe(take(1))
       .subscribe(async () => {
         await this.refreshStatus();
@@ -410,7 +409,7 @@ export class Humidifier {
       .deviceId!.match(/.{1,2}/g)!
       .join(':')
       .toLowerCase();
-    this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.debugLog(`Humidifier: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     if (switchbot !== false) {
       switchbot
         .discover({ model: 'e', quick: true, id: this.device.bleMac })

diff --git a/src/device/lock.ts b/src/device/lock.ts
@@ -171,7 +171,6 @@ export class Lock {
       this.accessory.context.On = this.LockTargetStateCached;
     }
     interval(5000)
-      .pipe(skipWhile(() => this.lockUpdateInProgress))
       .pipe(take(1))
       .subscribe(async () => {
         await this.refreshStatus();

diff --git a/src/device/meter.ts b/src/device/meter.ts
@@ -238,7 +238,7 @@ export class Meter {
       .deviceId!.match(/.{1,2}/g)!
       .join(':')
       .toLowerCase();
-    this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.debugLog(`Meter: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     // Start to monitor advertisement packets
     if (switchbot !== false) {
       switchbot

diff --git a/src/device/motion.ts b/src/device/motion.ts
@@ -217,7 +217,7 @@ export class Motion {
       .deviceId!.match(/.{1,2}/g)!
       .join(':')
       .toLowerCase();
-    this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.debugLog(`Motion Sensor: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     // Start to monitor advertisement packets
     if (switchbot !== false) {
       switchbot

diff --git a/src/device/plug.ts b/src/device/plug.ts
@@ -168,7 +168,6 @@ export class Plug {
       this.accessory.context.On = this.OnCached;
     }
     interval(5000)
-      .pipe(skipWhile(() => this.plugUpdateInProgress))
       .pipe(take(1))
       .subscribe(async () => {
         await this.refreshStatus();