@switchbot/homebridge-switchbot 1.14.3-beta.0 → 1.15.1-beta.0

package/src/device/plug.ts

@@ -21,9 +21,16 @@ export class Plug {
   // BLE Others
   connected?: boolean;
   switchbot!: switchbot;
+  address!: ad['address'];
   SwitchToOpenAPI?: boolean;
   serviceData!: serviceData;
-  address!: ad['address'];
+  state: serviceData['state'];
+  delay: serviceData['delay'];
+  timer: serviceData['timer'];
+  wifiRssi: serviceData['wifiRssi'];
+  overload: serviceData['overload'];
+  syncUtcTime: serviceData['syncUtcTime'];
+  currentPower: serviceData['currentPower'];
 
   // Config
   scanDuration!: number;
@@ -33,13 +40,6 @@ export class Plug {
   // Updates
   plugUpdateInProgress!: boolean;
   doPlugUpdate!: Subject<void>;
-  state: serviceData['state'];
-  delay: serviceData['delay'];
-  timer: serviceData['timer'];
-  syncUtcTime: serviceData['syncUtcTime'];
-  wifiRssi: serviceData['wifiRssi'];
-  overload: serviceData['overload'];
-  currentPower: serviceData['currentPower'];
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: device & devicesConfig) {
     // default placeholders
@@ -87,7 +87,7 @@ export class Plug {
     // see https://developers.homebridge.io/#/service/Outlet
 
     // create handlers for required characteristics
-    this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
+    this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
 
     // Update Homekit
     this.updateHomeKitCharacteristics();
@@ -271,7 +271,7 @@ export class Plug {
   }
 
   async BLEconnection(switchbot: any): Promise<void> {
-    this.errorLog(`Plug: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchPlug: ${switchbot}`);
+    this.errorLog(`Plug: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
     if (this.platform.config.credentials?.openToken) {
       this.warnLog(`Plug: ${this.accessory.displayName} Using OpenAPI Connection`);
       this.SwitchToOpenAPI = true;
@@ -326,9 +326,12 @@ export class Plug {
       .toLowerCase();
     this.debugLog(`Plug: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     switchbot
-      .discover({ model: this.BLEmodel, quick: true, id: this.device.bleMac })
+      .discover({
+        model: this.BLEmodel(),
+        id: this.device.bleMac,
+      })
       .then((device_list: any) => {
-        this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
+        this.infoLog(`Plug: ${this.accessory.displayName} On: ${this.On}`);
         return this.turnOnOff(device_list);
       })
       .then(() => {
@@ -336,10 +339,6 @@ export class Plug {
         this.On = false;
         this.OnCached = this.On;
         this.accessory.context.On = this.OnCached;
-        setTimeout(() => {
-          this.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
-          this.debugLog(`Plug: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
-        }, 500);
       })
       .catch(async (e: any) => {
         this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
@@ -374,36 +373,39 @@ export class Plug {
     });
   }
 
-  private async openAPIpushChanges() {
-    if (this.On !== this.OnCached) {
-      const payload = {
-        commandType: 'command',
-        parameter: 'default',
-      } as payload;
+  async openAPIpushChanges() {
+    if (this.platform.config.credentials?.openToken) {
+      if (this.On !== this.OnCached) {
+        this.debugLog(`Plug: ${this.accessory.displayName} OpenAPI pushChanges`);
+        const payload = {
+          commandType: 'command',
+          parameter: 'default',
+        } as payload;
 
-      if (this.On) {
-        payload.command = 'turnOn';
-      } else {
-        payload.command = 'turnOff';
-      }
+        if (this.On) {
+          payload.command = 'turnOn';
+        } else {
+          payload.command = 'turnOff';
+        }
 
-      this.infoLog(
-        `Plug: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
-        ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
-      );
+        this.infoLog(
+          `Plug: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},` +
+            ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`,
+        );
 
-      // Make the API request
-      const push: any = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
-      this.debugLog(`Plug: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
-      this.statusCode(push);
-      this.OnCached = this.On;
-      this.accessory.context.On = this.OnCached;
+        // Make the API request
+        const push: any = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
+        this.debugLog(`Plug: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
+        this.statusCode(push);
+        this.OnCached = this.On;
+        this.accessory.context.On = this.OnCached;
+      }
+      interval(5000)
+        .pipe(take(1))
+        .subscribe(async () => {
+          await this.refreshStatus();
+        });
     }
-    interval(5000)
-      .pipe(take(1))
-      .subscribe(async () => {
-        await this.refreshStatus();
-      });
   }
 
   async updateHomeKitCharacteristics(): Promise<void> {
@@ -463,7 +465,7 @@ export class Plug {
   /**
    * Handle requests to set the value of the "On" characteristic
    */
-  async OnSet(value: CharacteristicValue): Promise<void> {
+  async handleOnSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`Plug: ${this.accessory.displayName} - Set On: ${value}`);
 
     this.On = value;

package/src/device/striplight.ts

@@ -81,7 +81,8 @@ export class StripLight {
       .setCharacteristic(this.platform.Characteristic.Model, 'W1701100')
       .setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId!)
       .setCharacteristic(this.platform.Characteristic.FirmwareRevision, this.FirmwareRevision(accessory, device))
-      .getCharacteristic(this.platform.Characteristic.FirmwareRevision).updateValue(this.FirmwareRevision(accessory, device));
+      .getCharacteristic(this.platform.Characteristic.FirmwareRevision)
+      .updateValue(this.FirmwareRevision(accessory, device));
 
     // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
     // you can create multiple services for each accessory
@@ -195,9 +196,7 @@ export class StripLight {
       this.debugLog(`Strip Light: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
 
       const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
-      this.debugLog(
-        `Strip Light: ${this.accessory.displayName} hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`,
-      );
+      this.debugLog(`Strip Light: ${this.accessory.displayName} hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
 
       // Hue
       this.Hue = hue;
@@ -223,8 +222,7 @@ export class StripLight {
       this.errorLog(`Strip Light: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Strip Light: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
-            ` Error Message: ${JSON.stringify(e.message)}`,
+          `Strip Light: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -281,8 +279,7 @@ export class StripLight {
       this.errorLog(`Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
-            ` Error Message: ${JSON.stringify(e.message)}`,
+          `Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -325,8 +322,7 @@ export class StripLight {
       this.errorLog(`Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
-            ` Error Message: ${JSON.stringify(e.message)}`,
+          `Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
       this.apiError(e);
@@ -354,16 +350,14 @@ export class StripLight {
         this.BrightnessCached = this.Brightness;
       } else {
         this.debugLog(
-          `Strip Light: ${this.accessory.displayName} No Changes.` +
-            `Brightness: ${this.Brightness}, BrightnessCached: ${this.BrightnessCached}`,
+          `Strip Light: ${this.accessory.displayName} No Changes.` + `Brightness: ${this.Brightness}, BrightnessCached: ${this.BrightnessCached}`,
         );
       }
     } catch (e: any) {
       this.errorLog(`Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
       if (this.deviceLogging.includes('debug')) {
         this.errorLog(
-          `Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
-            ` Error Message: ${JSON.stringify(e.message)}`,
+          `Strip Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
         );
       }
       this.apiError(e);