homebridge-lib 5.1.24-1 → 5.1.24-2

package/lib/Platform.js

@@ -498,19 +498,8 @@ class Platform extends homebridgeLib.Delegate {
         id: id,
         name: name,
         logLevel: this.logLevel,
-        notExposed: true,
         context: {}
       }
-    } else {
-      // Allow for plugin to change delegate class, version, and name.
-      accessory.context.className = className
-      accessory.context.version = version
-      accessory.context.name = name
-      if (accessory.context.logLevel == null) {
-        accessory.context.logLevel = this.logLevel
-      }
-    }
-    if (accessory.context.notExposed) {
       delegate.once('initialised', () => {
         try {
           if (params.externalAccessory) {
@@ -522,11 +511,31 @@ class Platform extends homebridgeLib.Delegate {
               this._pluginName, this._platformName, [accessory]
             )
           }
-          delete accessory.context.notExposed
         } catch (error) {
-          this.error(error)
+          this.warn(error)
+          try {
+            // Make sure the accessory won't be persisted, since it will fail
+            // to be exposed again on restore, causing `configureAccessory()`
+            // not to be called.
+            this._homebridge.unregisterPlatformAccessories(
+              this._pluginName, this._platformName, [accessory]
+            )
+          } catch (error) {}
+          /** Emitted when associated accessory could not be exposed.
+            * @event AccessoryDelegate#exposeError
+            * @param {Error} error - The error trying to expose the accessory.
+            */
+          delegate.emit('exposeError', error)
         }
       })
+    } else {
+      // Allow for plugin to change delegate class, version, and name.
+      accessory.context.className = className
+      accessory.context.version = version
+      accessory.context.name = name
+      if (accessory.context.logLevel == null) {
+        accessory.context.logLevel = this.logLevel
+      }
     }
     this._accessoryDelegates[id] = delegate
     return accessory
@@ -543,14 +552,16 @@ class Platform extends homebridgeLib.Delegate {
       this.debug('remove history file %s', historyFile)
       fs.unlink(historyFile, (error) => {
         if (error) {
-          this.error(error)
+          this.warn(error)
         }
       })
     }
     this.debug('%s: remove %s %s', name, className, id)
-    this._homebridge.unregisterPlatformAccessories(
-      this._pluginName, this._platformName, [accessory]
-    )
+    try {
+      this._homebridge.unregisterPlatformAccessories(
+        this._pluginName, this._platformName, [accessory]
+      )
+    } catch (error) { this.warn(error) }
     delete this._accessoryDelegates[id]
     delete this._accessories[id]
   }

package/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.1.24-1",
+  "version": "5.1.24-2",
   "keywords": [
     "homekit",
     "homebridge"