Merge pull request #75 from ACDR/release/3.0.1

package.json

@@ -2,7 +2,7 @@
   "license": "UNLICENSED",
   "displayName": "Yamaha AVR",
   "name": "homebridge-yamaha-avr",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "homebridge-plugin - Add a Yamaha AVR as a HomeKit Audio Receiver with Power, Input, Volume & Remote Control",
   "author": {
     "name": "ACDR",
@@ -47,6 +47,8 @@
     "watch": "npm run build && npm link && nodemon",
     "build": "rimraf ./dist && tsc",
     "prepublishOnly": "npm run lint && npm run build",
+    "publish:stable": "npm publish --tag stable",
+    "publish:beta": "npm publish --tag beta",
     "lint": "eslint src/**.ts --max-warnings=0",
     "lint:fix": "eslint src/**.ts --max-warnings=0 --fix"
   },

src/accessory.ts

@@ -44,11 +44,14 @@ export class YamahaAVRAccessory {
     private readonly accessory: PlatformAccessory<AccessoryContext>,
     private readonly zone: Zone['id'],
   ) {
-    this.cacheDirectory =
-      this.platform.config.cacheDirectory || this.platform.api.user.storagePath() + '/.yamahaAVR/' + this.zone;
+    this.cacheDirectory = this.platform.config.cacheDirectory
+      ? `${this.platform.config.cacheDirectory}/${this.zone}`.replace('//', '/')
+      : this.platform.api.user.storagePath() + '/.yamahaAVR/' + this.zone;
     this.storageService = new StorageService(this.cacheDirectory);
     this.storageService.initSync();
 
+    this.platform.log.debug('cache directory', this.cacheDirectory);
+
     // set the AVR accessory information
     this.accessory
       .getService(this.platform.Service.AccessoryInformation)!
@@ -160,7 +163,10 @@ export class YamahaAVRAccessory {
           // Update input name cache
           inputService
             .getCharacteristic(this.platform.Characteristic.ConfiguredName)
-            .onGet((): CharacteristicValue => cachedService?.ConfiguredName || input.text)
+            .onGet(async (): Promise<CharacteristicValue> => {
+              const cachedServiceGet = await this.storageService.getItem<CachedServiceData>(input.id);
+              return cachedServiceGet?.ConfiguredName || input.text;
+            })
             .onSet((name: CharacteristicValue) => {
               const currentConfiguredName = inputService.getCharacteristic(
                 this.platform.Characteristic.ConfiguredName,
@@ -187,7 +193,10 @@ export class YamahaAVRAccessory {
           // Update input visibility cache
           inputService
             .getCharacteristic(this.platform.Characteristic.TargetVisibilityState)
-            .onGet((): CharacteristicValue => cachedService?.CurrentVisibilityState || 0)
+            .onGet(async (): Promise<CharacteristicValue> => {
+              const cachedServiceGet = await this.storageService.getItem<CachedServiceData>(input.id);
+              return cachedServiceGet?.CurrentVisibilityState || 0;
+            })
             .onSet((targetVisibilityState: CharacteristicValue) => {
               const currentVisbility = inputService.getCharacteristic(
                 this.platform.Characteristic.CurrentVisibilityState,

src/pureDirectAccessory.ts

@@ -55,14 +55,7 @@ export class YamahaPureDirectAccessory {
       return;
     }
 
-    this.service.updateCharacteristic(
-      this.platform.Characteristic.ProgrammableSwitchOutputState,
-      zoneStatus.pure_direct,
-    );
-  }
-
-  async getSwitchEvent(): Promise<CharacteristicValue> {
-    return this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS;
+    this.service.updateCharacteristic(this.platform.Characteristic.On, zoneStatus.pure_direct);
   }
 
   async getState(): Promise<CharacteristicValue> {