@switchbot/homebridge-switchbot 2.1.4-beta.0 → 2.2.0-beta.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge SwitchBot",
   "name": "@switchbot/homebridge-switchbot",
-  "version": "2.1.4-beta.0",
+  "version": "2.2.0-beta.0",
   "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 <support@wondertechlabs.com> (https://github.com/SwitchBot)",
   "license": "ISC",
@@ -72,7 +72,7 @@
     "eslint-plugin-prettier": "4.2.1",
     "homebridge": "^1.5.0",
     "nodemon": "^2.0.20",
-    "npm-check-updates": "^16.3.11",
+    "npm-check-updates": "^16.3.13",
     "prettier": "2.7.1",
     "rimraf": "^3.0.2",
     "ts-node": "^10.9.1",
@@ -80,6 +80,6 @@
   },
   "optionalDependencies": {
     "@abandonware/noble": "^1.9.2-15",
-    "node-switchbot": "^1.5.0"
+    "node-switchbot": "^1.6.0-beta.4"
   }
 }

package/src/device/colorbulb.ts

@@ -40,6 +40,12 @@ export class ColorBulb {
   state: serviceData['state'];
   delay: serviceData['delay'];
   wifiRssi: serviceData['wifiRssi'];
+  brightnessBLE: serviceData['brightness'];
+  sequence: any;//serviceData['sequence'];
+  preset: any;//serviceData['preset'];
+  color_mode: any;//serviceData['color_mode'];
+  speed: any;//serviceData['speed'];
+  loop_index: any;//serviceData['loop_index'];
 
   // Config
   set_minStep?: number;
@@ -293,9 +299,9 @@ export class ColorBulb {
   async refreshStatus(): Promise<void> {
     if (!this.device.enableCloudService && this.OpenAPI) {
       this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus enableCloudService: ${this.device.enableCloudService}`);
-    } else/*if (this.BLE) {
+    } else if (this.BLE) {
       await this.BLERefreshStatus();
-    } else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
+    } else if (this.OpenAPI && this.platform.config.credentials?.token) {
       await this.openAPIRefreshStatus();
     } else {
       await this.offlineOff();
@@ -329,13 +335,14 @@ export class ColorBulb {
             + ` BLE Address Found: ${this.address}`);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${superStringify(ad.serviceData)}`);
             this.serviceData = ad.serviceData;
-            //this.state = ad.serviceData.state;
-            //this.delay = ad.serviceData.delay;
-            //this.timer = ad.serviceData.timer;
-            //this.syncUtcTime = ad.serviceData.syncUtcTime;
-            //this.wifiRssi = ad.serviceData.wifiRssi;
-            //this.overload = ad.serviceData.overload;
-            //this.currentPower = ad.serviceData.currentPower;
+            this.state = ad.serviceData.state;
+            this.sequence = ad.serviceData.sequence_number;
+            this.brightnessBLE = ad.serviceData.brightness;
+            this.delay = ad.serviceData.delay;
+            this.preset = ad.serviceData.preset;
+            this.color_mode = ad.serviceData.color_mode;
+            this.speed = ad.serviceData.speed;
+            this.loop_index = ad.serviceData.loop_index;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${superStringify(ad.serviceData)}`);
             /*this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +

package/src/irdevice/airconditioner.ts

@@ -36,9 +36,10 @@ export class AirConditioner {
   static MODE_HEAT: number;
 
   // Config
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   deviceLogging!: string;
   hide_automode?: boolean;
-  pushOn?: boolean;
 
   private readonly valid12 = [1, 2];
   private readonly valid012 = [0, 1, 2];
@@ -47,8 +48,9 @@ export class AirConditioner {
     // default placeholders
     this.logs({ device });
     this.config({ device });
-    this.pushOnChanges({ device });
     this.context({ device });
+    this.allowPushOnChanges({ device });
+    this.allowPushOffChanges({ device });
 
     // set accessory information
     accessory
@@ -163,7 +165,7 @@ export class AirConditioner {
    * AirConditioner:        "command"       "highSpeed"      "default"	        =        fan speed to high
    */
   async pushAirConditionerOnChanges(): Promise<void> {
-    if (this.Active !== this.platform.Characteristic.Active.ACTIVE || this.pushOn) {
+    if (this.Active === this.platform.Characteristic.Active.INACTIVE || this.allowPushOn) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -176,14 +178,16 @@ export class AirConditioner {
   }
 
   async pushAirConditionerOffChanges(): Promise<void> {
-    const commandType: string = await this.commandType();
-    const command: string = await this.commandOff();
-    const body = superStringify({
-      'command': command,
-      'parameter': 'default',
-      'commandType': commandType,
-    });
-    await this.pushChanges(body);
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE || this.allowPushOff) {
+      const commandType: string = await this.commandType();
+      const command: string = await this.commandOff();
+      const body = superStringify({
+        'command': command,
+        'parameter': 'default',
+        'commandType': commandType,
+      });
+      await this.pushChanges(body);
+    }
   }
 
   async pushAirConditionerStatusChanges(): Promise<void> {
@@ -339,7 +343,7 @@ export class AirConditioner {
       this.pushAirConditionerOffChanges();
     } else {
       this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} pushAirConditionerOnChanges, Active: ${this.Active}`);
-      if (this.pushOn) {
+      if (this.allowPushOn) {
         this.pushAirConditionerOnChanges();
       } else {
         this.pushAirConditionerStatusChanges();
@@ -561,6 +565,22 @@ export class AirConditioner {
     }
   }
 
+  async allowPushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOn) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
+  async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOff) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
   async commandType(): Promise<string> {
     let commandType: string;
     if (this.device.customize) {
@@ -682,6 +702,21 @@ export class AirConditioner {
     if (device.external !== undefined) {
       config['external'] = device.external;
     }
+    if (device.customOn !== undefined) {
+      config['customOn'] = device.customOn;
+    }
+    if (device.customOff !== undefined) {
+      config['customOff'] = device.customOff;
+    }
+    if (device.customize !== undefined) {
+      config['customize'] = device.customize;
+    }
+    if (device.allowPushOn !== undefined) {
+      config['allowPushOn'] = device.allowPushOn;
+    }
+    if (device.allowPushOff !== undefined) {
+      config['allowPushOff'] = device.allowPushOff;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
@@ -703,15 +738,6 @@ export class AirConditioner {
     }
   }
 
-
-  async pushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
-    if (device.irair?.pushOn) {
-      this.pushOn = true;
-    } else {
-      this.pushOn = false;
-    }
-  }
-
   /**
    * Logging for Device
    */

package/src/irdevice/airpurifier.ts

@@ -37,14 +37,17 @@ export class AirPurifier {
   static PURIFYING_AIR: number;
 
   // Config
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   deviceLogging!: string;
-  allowPush?: boolean;
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: irdevice & irDevicesConfig) {
     // default placeholders
     this.logs(device);
     this.config(device);
     this.context();
+    this.allowPushOnChanges({ device });
+    this.allowPushOffChanges({ device });
 
     // set accessory information
     accessory
@@ -131,7 +134,7 @@ export class AirPurifier {
    * AirPurifier:        "command"       "highSpeed"      "default"	        =        fan speed to high
    */
   async pushAirPurifierOnChanges(): Promise<void> {
-    if (this.Active !== 1 || this.allowPush) {
+    if (this.Active !== 1) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -146,7 +149,7 @@ export class AirPurifier {
   async pushAirPurifierOffChanges(): Promise<void> {
     const commandType: string = await this.commandType();
     const command: string = await this.commandOff();
-    if (this.Active !== 0 || this.allowPush) {
+    if (this.Active !== 0) {
       const body = superStringify({
         'command': command,
         'parameter': 'default',
@@ -272,6 +275,22 @@ export class AirPurifier {
     }
   }
 
+  async allowPushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOn) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
+  async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOff) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
   async commandType(): Promise<string> {
     let commandType: string;
     if (this.device.customize) {
@@ -383,6 +402,21 @@ export class AirPurifier {
     if (device.external !== undefined) {
       config['external'] = device.external;
     }
+    if (device.customOn !== undefined) {
+      config['customOn'] = device.customOn;
+    }
+    if (device.customOff !== undefined) {
+      config['customOff'] = device.customOff;
+    }
+    if (device.customize !== undefined) {
+      config['customize'] = device.customize;
+    }
+    if (device.allowPushOn !== undefined) {
+      config['allowPushOn'] = device.allowPushOn;
+    }
+    if (device.allowPushOff !== undefined) {
+      config['allowPushOff'] = device.allowPushOff;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/camera.ts

@@ -19,14 +19,17 @@ export class Camera {
   On!: CharacteristicValue;
 
   // Config
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   deviceLogging!: string;
-  allowPush?: boolean;
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: irdevice & irDevicesConfig) {
     // default placeholders
     this.logs(device);
     this.config(device);
     this.context();
+    this.allowPushOnChanges({ device });
+    this.allowPushOffChanges({ device });
 
     // set accessory information
     accessory
@@ -81,7 +84,7 @@ export class Camera {
    * Camera -        "command"       "channelSub"      "default"	        =        previous channel
    */
   async pushOnChanges(): Promise<void> {
-    if (this.On || this.allowPush) {
+    if (this.On) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -96,7 +99,7 @@ export class Camera {
   async pushOffChanges(): Promise<void> {
     const commandType: string = await this.commandType();
     const command: string = await this.commandOff();
-    if (!this.On || this.allowPush) {
+    if (!this.On) {
       const body = superStringify({
         'command': command,
         'parameter': 'default',
@@ -169,6 +172,22 @@ export class Camera {
     }
   }
 
+  async allowPushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOn) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
+  async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOff) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
   async commandType(): Promise<string> {
     let commandType: string;
     if (this.device.customize) {
@@ -272,6 +291,21 @@ export class Camera {
     if (device.external !== undefined) {
       config['external'] = device.external;
     }
+    if (device.customOn !== undefined) {
+      config['customOn'] = device.customOn;
+    }
+    if (device.customOff !== undefined) {
+      config['customOff'] = device.customOff;
+    }
+    if (device.customize !== undefined) {
+      config['customize'] = device.customize;
+    }
+    if (device.allowPushOn !== undefined) {
+      config['allowPushOn'] = device.allowPushOn;
+    }
+    if (device.allowPushOff !== undefined) {
+      config['allowPushOff'] = device.allowPushOff;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/fan.ts

@@ -29,14 +29,17 @@ export class Fan {
   minStep?: number;
   minValue?: number;
   maxValue?: number;
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   deviceLogging!: string;
-  allowPush?: boolean;
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: irdevice & irDevicesConfig) {
     // default placeholders
     this.logs(device);
     this.config(device);
     this.context();
+    this.allowPushOnChanges({ device });
+    this.allowPushOffChanges({ device });
 
     // set accessory information
     accessory
@@ -171,7 +174,7 @@ export class Fan {
    * Fan -        "command"       "highSpeed"      "default"	        =        fan speed to high
    */
   async pushFanOnChanges(): Promise<void> {
-    if (this.Active !== 1 || this.allowPush) {
+    if (this.Active !== 1) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -184,16 +187,14 @@ export class Fan {
   }
 
   async pushFanOffChanges(): Promise<void> {
-    if (this.Active === 1 || this.allowPush) {
-      const commandType: string = await this.commandType();
-      const command: string = await this.commandOff();
-      const body = superStringify({
-        'command': command,
-        'parameter': 'default',
-        'commandType': commandType,
-      });
-      await this.pushTVChanges(body);
-    }
+    const commandType: string = await this.commandType();
+    const command: string = await this.commandOff();
+    const body = superStringify({
+      'command': command,
+      'parameter': 'default',
+      'commandType': commandType,
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushFanSpeedUpChanges(): Promise<void> {
@@ -300,6 +301,22 @@ export class Fan {
     }
   }
 
+  async allowPushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOn) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
+  async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOff) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
   async commandType(): Promise<string> {
     let commandType: string;
     if (this.device.customize) {
@@ -406,6 +423,21 @@ export class Fan {
     if (device.external !== undefined) {
       config['external'] = device.external;
     }
+    if (device.customOn !== undefined) {
+      config['customOn'] = device.customOn;
+    }
+    if (device.customOff !== undefined) {
+      config['customOff'] = device.customOff;
+    }
+    if (device.customize !== undefined) {
+      config['customize'] = device.customize;
+    }
+    if (device.allowPushOn !== undefined) {
+      config['allowPushOn'] = device.allowPushOn;
+    }
+    if (device.allowPushOff !== undefined) {
+      config['allowPushOff'] = device.allowPushOff;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/light.ts

@@ -19,14 +19,17 @@ export class Light {
   On!: CharacteristicValue;
 
   // Config
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   deviceLogging!: string;
-  allowPush?: boolean;
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: irdevice & irDevicesConfig) {
     // default placeholders
     this.logs(device);
     this.config(device);
     this.context();
+    this.allowPushOnChanges({ device });
+    this.allowPushOffChanges({ device });
 
     // set accessory information
     accessory
@@ -81,7 +84,7 @@ export class Light {
    * Light -       "command"       "channelSub"      "default"	        =        previous channel
    */
   async pushLightOnChanges(): Promise<void> {
-    if (this.On || this.allowPush) {
+    if (this.On) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -94,7 +97,7 @@ export class Light {
   }
 
   async pushLightOffChanges(): Promise<void> {
-    if (!this.On || this.allowPush) {
+    if (!this.On) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
       const body = superStringify({
@@ -188,6 +191,22 @@ export class Light {
     }
   }
 
+  async allowPushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOn) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
+  async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOff) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
   async commandType(): Promise<string> {
     let commandType: string;
     if (this.device.customize) {
@@ -291,6 +310,21 @@ export class Light {
     if (device.external !== undefined) {
       config['external'] = device.external;
     }
+    if (device.customOn !== undefined) {
+      config['customOn'] = device.customOn;
+    }
+    if (device.customOff !== undefined) {
+      config['customOff'] = device.customOff;
+    }
+    if (device.customize !== undefined) {
+      config['customize'] = device.customize;
+    }
+    if (device.allowPushOn !== undefined) {
+      config['allowPushOn'] = device.allowPushOn;
+    }
+    if (device.allowPushOff !== undefined) {
+      config['allowPushOff'] = device.allowPushOff;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/other.ts

@@ -19,9 +19,10 @@ export class Others {
   Active!: CharacteristicValue;
 
   // Config
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   deviceLogging!: string;
   otherDeviceType?: string;
-  allowPush?: boolean;
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: irdevice & irDevicesConfig) {
     // default placeholders
@@ -29,6 +30,8 @@ export class Others {
     this.deviceType(device);
     this.config(device);
     this.context();
+    this.allowPushOnChanges({ device });
+    this.allowPushOffChanges({ device });
 
     // set accessory information
     accessory
@@ -90,7 +93,7 @@ export class Others {
    */
   async pushOnChanges(): Promise<void> {
     if (this.device.customize) {
-      if (!this.Active || this.allowPush) {
+      if (!this.Active) {
         const commandType: string = await this.commandType();
         const command: string = await this.commandOn();
         const body = superStringify({
@@ -107,7 +110,7 @@ export class Others {
 
   async pushOffChanges(): Promise<void> {
     if (this.device.customize) {
-      if (this.Active || this.allowPush) {
+      if (this.Active) {
         const commandType: string = await this.commandType();
         const command: string = await this.commandOff();
         const body = superStringify({
@@ -184,6 +187,22 @@ export class Others {
     }
   }
 
+  async allowPushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOn) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
+  async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOff) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
   async commandType(): Promise<string> {
     let commandType: string;
     if (this.device.customize) {
@@ -299,6 +318,21 @@ export class Others {
     if (device.external !== undefined) {
       config['external'] = device.external;
     }
+    if (device.customOn !== undefined) {
+      config['customOn'] = device.customOn;
+    }
+    if (device.customOff !== undefined) {
+      config['customOff'] = device.customOff;
+    }
+    if (device.customize !== undefined) {
+      config['customize'] = device.customize;
+    }
+    if (device.allowPushOn !== undefined) {
+      config['allowPushOn'] = device.allowPushOn;
+    }
+    if (device.allowPushOff !== undefined) {
+      config['allowPushOff'] = device.allowPushOff;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }