Prevent accessories from being registered twice

raymondelooff · Apr 23, 2017 · 01f154d · 01f154d
1 parent 7ecb20c
commit 01f154d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/lib/HueAccessory/Factory.js b/lib/HueAccessory/Factory.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const PLATFORM_VERSION = require('../../package.json').version;
+
 const HueError = require('../HueError');
 
 let Accessory;
@@ -27,6 +29,8 @@ class Factory {
     const uuid = UUIDGen.generate(hueAccessory.uniqueId);
     const accessory = new Accessory(hueAccessory.name, uuid);
     accessory.context.uniqueId = hueAccessory.uniqueId;
+    accessory.context.platformVersion = PLATFORM_VERSION;
+    accessory.context.cached = false;
 
     return accessory;
   }

diff --git a/lib/HuePlatform.js b/lib/HuePlatform.js
@@ -10,6 +10,7 @@ const DEFAULT_CONFIG = {
 
 const OS = require('os');
 const Huejay = require('huejay');
+const PLATFORM_VERSION = require('../package.json').version;
 const AccessoryFactory = require('./HueAccessory/Factory');
 
 /**
@@ -28,8 +29,7 @@ class HuePlatform {
 
     this.accessoryFactory = new AccessoryFactory(Accessory, Service, Characteristic, UUIDGen, log);
 
-    const version = require('../package.json').version;
-    this.log.info('HuePlatform version: ' + version);
+    this.log.info('HuePlatform version: ' + PLATFORM_VERSION);
 
     this.api.on('didFinishLaunching', this.initialize.bind(this));
   }
@@ -54,7 +54,7 @@ class HuePlatform {
 
   _removeUnusableCachedAccessories() {
     for (const accessory of this.cachedAccessories) {
-      if (accessory.context.uniqueId === undefined) {
+      if (accessory.context.uniqueId === undefined || accessory.context.platformVersion === undefined || accessory.context.platformVersion !== PLATFORM_VERSION) {
         this.log.debug(`Unregistering accessory '${accessory.displayName}'...`);
         this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
       }
@@ -136,15 +136,14 @@ class HuePlatform {
   }
 
   _registerPlatformAccessory(accessory) {
-    this.log.debug(`Registering accessory '${accessory.displayName}', updating reachability...`);
+    if (!accessory.context.cached) {
+      this.log.debug(`Registering accessory '${accessory.displayName}'...`);
+      accessory.context.cached = true;
 
-    accessory.updateReachability(true);
-
-    try {
       this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
-    } catch (err) {
-      this.log.debug(`Platform accessory '${accessory.displayName}' already registered...`);
     }
+
+    accessory.updateReachability(true);
   }
 
   _authenticateClients(callback) {
@@ -315,5 +314,6 @@ class HuePlatform {
 module.exports = {
   pluginName: PLUGIN_NAME,
   platformName: PLATFORM_NAME,
+  platformVersion: PLATFORM_VERSION,
   HuePlatform
 };