Merge pull request #44 from justjam2013/fix-sensor-trigger

Fixed companion sensor triggering

package.json

@@ -2,7 +2,7 @@
   "name": "homebridge-virtual-accessories",
   "displayName": "Virtual Accessories for Homebridge",
   "type": "module",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Virtual accessories for Homebridge.",
   "author": "justjam2013",
   "license": "Apache-2.0",

src/accessories/virtualAccessorySwitch.ts

@@ -136,17 +136,17 @@ export class Switch extends Accessory {
       this.resetTimer!.startTimer();
     }
 
-    if (this.accessoryConfiguration.accessoryHasCompanionSensor) {
-      this.states.SensorState = this.determineSensorState();
-
-      this.companionSensor!.triggerCompanionSensorState(this.states.SensorState, this);
-    }
-
     if (this.accessoryConfiguration.accessoryIsStateful) {
       this.saveState(this.storagePath, this.stateStorageKey, this.states.SwitchState);
     }
 
     this.platform.log.info(`[${this.accessoryConfiguration.accessoryName}] Setting State: ${Switch.getStateName(this.states.SwitchState)}`);
+
+    if (this.accessoryConfiguration.accessoryHasCompanionSensor) {
+      this.states.SensorState = this.determineSensorState();
+
+      this.companionSensor!.triggerCompanionSensorState(this.states.SensorState, this);
+    }
   }
 
   setCompanionSwitchState(value: boolean) {

src/sensors/virtualSensor.ts

@@ -104,7 +104,7 @@ export abstract class VirtualSensor extends Accessory {
   /**
    * Handle requests to get the current value of the "Sensor State" characteristic
    */
-  handleSensorStateGet() {
+  async handleSensorStateGet() {
     const sensorState = this.states.SensorState;
 
     this.platform.log.debug(`[${this.accessoryConfiguration.accessoryName}] Getting Sensor Current State: ${this.getStateName(sensorState)}`);
@@ -115,7 +115,7 @@ export abstract class VirtualSensor extends Accessory {
   /**
    * This method is called by the accessory that has this sensor as a companion
    */
-  triggerCompanionSensorState(sensorState: number, accessory: Accessory) {
+  async triggerCompanionSensorState(sensorState: number, accessory: Accessory) {
     if (!this.isCompanionSensor) {
       throw new NotCompanionError(`${this.accessoryConfiguration.accessoryName} is not a companion sensor`);
     } else if (accessory.accessory.UUID !== this.accessory.UUID) {