@switchbot/homebridge-switchbot 2.0.0-beta.1 → 2.0.0-beta.10

package/src/device/bot.ts

@@ -29,7 +29,6 @@ export class Bot {
 
   // Characteristic Values
   On!: CharacteristicValue;
-  OnCached!: CharacteristicValue;
   BatteryLevel!: CharacteristicValue;
   StatusLowBattery!: CharacteristicValue;
 
@@ -388,16 +387,14 @@ export class Bot {
     this.debugLog(`Bot: ${this.accessory.displayName} BLE parseStatus`);
     // BLEmode (true if Switch Mode) | (false if Press Mode)
     if (this.mode) {
-      this.OnCached = this.On;
-      this.accessory.context.On = this.OnCached;
+      this.accessory.context.On = this.On;
       if (this.On === undefined) {
         this.On = Boolean(this.state);
       }
       this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, mode: ${this.mode}, On: ${this.On}`);
     } else {
       this.On = false;
-      this.OnCached = this.On;
-      this.accessory.context.On = this.OnCached;
+      this.accessory.context.On = this.On;
       this.debugLog(`Bot: ${this.accessory.displayName} Press Mode, mode: ${this.mode}, On: ${this.On}`);
     }
 
@@ -421,20 +418,9 @@ export class Bot {
       this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI parseStatus`);
       if (this.botMode === 'press') {
         this.On = false;
-        this.OnCached = this.On;
-        this.accessory.context.On = this.OnCached;
+        this.accessory.context.On = this.On;
       } else {
-        /*if (this.power === 'on') {
-          this.On = true;
-          this.OnCached = this.On;
-          this.accessory.context.On = this.OnCached;
-        } else {
-          this.On = false;
-          this.OnCached = this.On;
-          this.accessory.context.On = this.OnCached;
-        }*/
-        this.OnCached = this.On;
-        this.accessory.context.On = this.OnCached;
+        this.accessory.context.On = this.On;
         if (this.On === undefined) {
           this.On = false;
         }
@@ -635,8 +621,8 @@ export class Bot {
   }
 
   async BLEpushChanges(): Promise<void> {
-    this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.OnCached}`);
-    if (this.On !== this.OnCached || this.allowPush) {
+    this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
+    if (this.On !== this.accessory.context.On || this.allowPush) {
       this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges`);
       const switchbot = await this.platform.connectBLE();
       // Convert to BLE Address
@@ -656,9 +642,7 @@ export class Bot {
           })
           .then(() => {
             this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
-            this.On = false;
-            this.OnCached = this.On;
-            this.accessory.context.On = this.OnCached;
+            this.accessory.context.On = this.On;
             setTimeout(() => {
               if (this.device.bot?.deviceType === 'switch') {
                 this.switchService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
@@ -694,8 +678,7 @@ export class Bot {
           })
           .then(() => {
             this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
-            this.OnCached = this.On;
-            this.accessory.context.On = this.OnCached;
+            this.accessory.context.On = this.On;
           })
           .catch(async (e: any) => {
             this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
@@ -717,8 +700,7 @@ export class Bot {
         throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
       }
     }
-    this.OnCached = this.On;
-    this.accessory.context.On = this.OnCached;
+    this.accessory.context.On = this.On;
   }
 
   async turnOnOff(device_list: any): Promise<any> {
@@ -737,7 +719,7 @@ export class Bot {
   async openAPIpushChanges(): Promise<void> {
     if (this.platform.config.credentials?.token) {
       try {
-        if (this.On !== this.OnCached || this.allowPush) {
+        if (this.On !== this.accessory.context.On || this.allowPush) {
           this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI pushChanges`);
           // Make Push On request to the API
           const t = Date.now();
@@ -797,8 +779,7 @@ export class Bot {
           req.write(body);
           req.end();
           this.debugLog(`Bot: ${this.accessory.displayName} openAPIpushChanges: ${JSON.stringify(req)}`);
-          this.OnCached = this.On;
-          this.accessory.context.On = this.OnCached;
+          this.accessory.context.On = this.On;
         }
       } catch (e: any) {
         this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
@@ -989,16 +970,19 @@ export class Bot {
         this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
       }
     }
+    this.accessory.context.On = this.On;
     if (this.device.ble) {
       if (this.BatteryLevel === undefined) {
         this.debugLog(`Bot: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
       } else {
+        this.accessory.context.BatteryLevel = this.BatteryLevel;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
         this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
       }
       if (this.StatusLowBattery === undefined) {
         this.debugLog(`Bot: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
       } else {
+        this.accessory.context.StatusLowBattery = this.StatusLowBattery;
         this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
         this.debugLog(`Bot: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
       }

package/src/device/colorbulb.ts

@@ -19,15 +19,10 @@ export class ColorBulb {
 
   // Characteristic Values
   On!: CharacteristicValue;
-  OnCached!: CharacteristicValue;
   Hue!: CharacteristicValue;
-  HueCached!: CharacteristicValue;
   Saturation!: CharacteristicValue;
-  SaturationCached!: CharacteristicValue;
   Brightness!: CharacteristicValue;
-  BrightnessCached!: CharacteristicValue;
   ColorTemperature?: CharacteristicValue;
-  ColorTemperatureCached?: CharacteristicValue;
 
   // OpenAPI Others
   power: deviceStatus['power'];
@@ -317,10 +312,7 @@ export class ColorBulb {
         })
         .then(() => {
           // Set an event hander
-          this.errorLog(`Color Bulb: ${this.accessory.displayName} then switchbot: ${JSON.stringify(switchbot)}`);
           switchbot.onadvertisement = (ad: any) => {
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} switchbot: ${JSON.stringify(switchbot.onadvertisement)}`);
-            this.errorLog(`Color Bulb: ${this.accessory.displayName} ad: ${JSON.stringify(ad)}`);
             this.address = ad.address;
             if (this.deviceLogging.includes('debug')) {
               this.infoLog(this.address);
@@ -328,6 +320,7 @@ export class ColorBulb {
               this.infoLog(`Color Bulb: ${this.accessory.displayName} BLE Address Found: ${this.address}`);
               this.infoLog(`Color Bulb: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac}`);
             }
+            this.debugLog(`Color Bulb: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
             this.serviceData = ad.serviceData;
             //this.state = ad.serviceData.state;
             //this.delay = ad.serviceData.delay;
@@ -416,7 +409,7 @@ export class ColorBulb {
     }
   }
 
-  private async openAPIRefreshStatus() {
+  async openAPIRefreshStatus() {
     try {
       const t = Date.now();
       const nonce = 'requestID';
@@ -487,7 +480,7 @@ export class ColorBulb {
    */
   async pushChanges(): Promise<void> {
     try {
-      if (this.On !== this.OnCached) {
+      if (this.On !== this.accessory.context.On) {
         // Make Push On request to the API
         const t = Date.now();
         const nonce = 'requestID';
@@ -537,17 +530,15 @@ export class ColorBulb {
         req.write(body);
         req.end();
         this.debugLog(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(req)}`);
-        this.OnCached = this.On;
-        this.accessory.context.On = this.OnCached;
       }
       // Push Brightness Update
       if (this.On) {
-        //await this.pushBrightnessChanges();
+        await this.pushBrightnessChanges();
       }
 
       // Push ColorTemperature Update
       if (this.On) {
-        //await this.pushColorTemperatureChanges();
+        await this.pushColorTemperatureChanges();
       }
 
       // Push Hue & Saturation Update
@@ -567,7 +558,7 @@ export class ColorBulb {
 
   async pushHueSaturationChanges(): Promise<void> {
     try {
-      if (this.Hue !== this.HueCached || this.Saturation !== this.SaturationCached) {
+      if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
         this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
         this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
 
@@ -615,12 +606,11 @@ export class ColorBulb {
         req.write(body);
         req.end();
         this.debugLog(`Color Bulb: ${this.accessory.displayName} pushHueSaturationChanges: ${JSON.stringify(req)}`);
-        this.HueCached = this.Hue;
-        this.SaturationCached = this.Saturation;
       } else {
         this.debugLog(
           `Color Bulb: ${this.accessory.displayName} No Changes.` +
-            `Hue: ${this.Hue}, HueCached: ${this.HueCached}, Saturation: ${this.Saturation}, SaturationCached: ${this.SaturationCached}`,
+            `Hue: ${this.Hue}, HueCached: ${this.accessory.context.Hue}, Saturation: ${this.Saturation},`
+            +` SaturationCached: ${this.accessory.context.Saturation}`,
         );
       }
     } catch (e: any) {
@@ -636,7 +626,7 @@ export class ColorBulb {
 
   async pushColorTemperatureChanges(): Promise<void> {
     try {
-      if (this.ColorTemperature !== this.ColorTemperatureCached) {
+      if (this.ColorTemperature !== this.accessory.context.ColorTemperature) {
         const kelvin = Math.round(1000000 / Number(this.ColorTemperature));
         this.cacheKelvin = kelvin;
 
@@ -682,11 +672,11 @@ export class ColorBulb {
         req.end();
 
         this.debugLog(`Color Bulb: ${this.accessory.displayName} pushColorTemperatureChanges: ${JSON.stringify(req)}`);
-        this.ColorTemperatureCached = this.ColorTemperature;
+        this.accessory.context.ColorTemperature = this.ColorTemperature;
       } else {
         this.debugLog(
           `Color Bulb: ${this.accessory.displayName} No Changes.` +
-            `ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.ColorTemperatureCached}`,
+            `ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`,
         );
       }
     } catch (e: any) {
@@ -702,7 +692,7 @@ export class ColorBulb {
 
   async pushBrightnessChanges(): Promise<void> {
     try {
-      if (this.Brightness !== this.BrightnessCached) {
+      if (this.Brightness !== this.accessory.context.Brightness) {
         // Make Push On request to the API
         const t = Date.now();
         const nonce = 'requestID';
@@ -744,10 +734,10 @@ export class ColorBulb {
         req.write(body);
         req.end();
         this.debugLog(`Color Bulb: ${this.accessory.displayName} pushBrightnessChanges: ${JSON.stringify(req)}`);
-        this.BrightnessCached = this.Brightness;
       } else {
         this.debugLog(
-          `Color Bulb: ${this.accessory.displayName} No Changes.` + `Brightness: ${this.Brightness}, BrightnessCached: ${this.BrightnessCached}`,
+          `Color Bulb: ${this.accessory.displayName} No Changes.` + `Brightness: ${this.Brightness}, `
+          +`BrightnessCached: ${this.accessory.context.Brightness}`,
         );
       }
     } catch (e: any) {
@@ -765,30 +755,36 @@ export class ColorBulb {
     if (this.On === undefined) {
       this.debugLog(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
     } else {
+      this.accessory.context.On = this.On;
       this.lightBulbService.updateCharacteristic(this.platform.Characteristic.On, this.On);
       this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
     }
     if (this.Brightness === undefined) {
       this.debugLog(`Color Bulb: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
     } else {
+      this.accessory.context.Brightness = this.Brightness;
       this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Brightness, this.Brightness);
       this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
     }
     if (this.ColorTemperature === undefined) {
       this.debugLog(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
     } else {
+
+      this.accessory.context.ColorTemperature = this.ColorTemperature;
       this.lightBulbService.updateCharacteristic(this.platform.Characteristic.ColorTemperature, this.ColorTemperature);
       this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
     }
     if (this.Hue === undefined) {
       this.debugLog(`Color Bulb: ${this.accessory.displayName} Hue: ${this.Hue}`);
     } else {
+      this.accessory.context.Hue = this.Hue;
       this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Hue, this.Hue);
       this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
     }
     if (this.Saturation === undefined) {
       this.debugLog(`Color Bulb: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
     } else {
+      this.accessory.context.Saturation = this.Saturation;
       this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, this.Saturation);
       this.debugLog(`Color Bulb: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
     }
@@ -879,7 +875,7 @@ export class ColorBulb {
     // Check and increase/decrease kelvin to range of device
     const k = Math.min(Math.max(kelvin, this.minKelvin), this.maxKelvin);
 
-    if (!this.OnCached || this.cacheKelvin === k) {
+    if (!this.accessory.context.On || this.cacheKelvin === k) {
       return;
     }
 

package/src/device/curtain.ts

@@ -436,7 +436,6 @@ export class Curtain {
     this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     this.getCustomBLEAddress(switchbot);
     // Start to monitor advertisement packets
-    this.errorLog(`Color Bulb: ${this.accessory.displayName} switchbot: ${JSON.stringify(switchbot)}`);
     if (switchbot !== false) {
       switchbot
         .startScan({

package/src/device/meter.ts

@@ -23,14 +23,10 @@ export class Meter {
 
   // Characteristic Values
   CurrentRelativeHumidity!: CharacteristicValue;
-  CurrentRelativeHumidityCached!: CharacteristicValue;
   CurrentTemperature?: CharacteristicValue;
-  CurrentTemperatureCached?: CharacteristicValue;
   BatteryLevel?: CharacteristicValue;
   ChargingState?: CharacteristicValue;
   StatusLowBattery?: CharacteristicValue;
-  Active!: CharacteristicValue;
-  WaterLevel!: CharacteristicValue;
 
   // OpenAPI Others
   Temperature: deviceStatus['temperature'];

package/src/device/meterplus.ts

@@ -20,14 +20,10 @@ export class MeterPlus {
 
   // Characteristic Values
   CurrentRelativeHumidity!: CharacteristicValue;
-  CurrentRelativeHumidityCached!: CharacteristicValue;
   CurrentTemperature?: CharacteristicValue;
-  CurrentTemperatureCached?: CharacteristicValue;
   BatteryLevel?: CharacteristicValue;
   ChargingState?: CharacteristicValue;
   StatusLowBattery?: CharacteristicValue;
-  Active!: CharacteristicValue;
-  WaterLevel!: CharacteristicValue;
 
   // OpenAPI Others
   Temperature: deviceStatus['temperature'];

package/src/device/plug.ts

@@ -14,7 +14,6 @@ export class Plug {
 
   // Characteristic Values
   On!: CharacteristicValue;
-  OnCached!: CharacteristicValue;
 
   // OpenAPI Others
   power: deviceStatus['power'];
@@ -355,7 +354,7 @@ export class Plug {
   }
 
   async BLEpushChanges(): Promise<void> {
-    this.debugLog(`Plug: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.OnCached}`);
+    this.debugLog(`Plug: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
     this.debugLog(`Plug: ${this.accessory.displayName} BLE pushChanges`);
     const switchbot = await this.platform.connectBLE();
     // Convert to BLE Address
@@ -376,8 +375,6 @@ export class Plug {
       .then(() => {
         this.debugLog(`Plug: ${this.accessory.displayName} Done.`);
         this.On = false;
-        this.OnCached = this.On;
-        this.accessory.context.On = this.OnCached;
       })
       .catch(async (e: any) => {
         this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
@@ -395,8 +392,6 @@ export class Plug {
         }
         this.apiError(e);
       });
-    this.OnCached = this.On;
-    this.accessory.context.On = this.OnCached;
   }
 
   async turnOnOff(device_list: any): Promise<any> {
@@ -414,7 +409,7 @@ export class Plug {
 
   async openAPIpushChanges() {
     if (this.platform.config.credentials?.token) {
-      if (this.On !== this.OnCached) {
+      if (this.On !== this.accessory.context.On) {
         // Make Push On request to the API
         this.debugLog(`Plug: ${this.accessory.displayName} OpenAPI pushChanges`);
         const t = Date.now();
@@ -465,8 +460,6 @@ export class Plug {
         req.write(body);
         req.end();
         this.debugLog(`Plug: ${this.accessory.displayName} openAPIpushChanges: ${JSON.stringify(req)}`);
-        this.OnCached = this.On;
-        this.accessory.context.On = this.OnCached;
       }
       interval(5000)
         .pipe(take(1))
@@ -480,6 +473,7 @@ export class Plug {
     if (this.On === undefined) {
       this.debugLog(`Plug: ${this.accessory.displayName} On: ${this.On}`);
     } else {
+      this.accessory.context.On = this.On;
       this.outletService.updateCharacteristic(this.platform.Characteristic.On, this.On);
       this.debugLog(`Plug: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
     }