homebridge-nb 1.4.0 → 1.4.2

package/config.schema.json

@@ -13,6 +13,16 @@
         "required": true,
         "default": "Nuki"
       },
+      "devices": {
+        "title": "Device",
+        "description": "Whitelisted Nuki devices (default: all).<br>Make sure to include the Nuki bridge to which the device is connected.",
+        "type": "array",
+        "items": {
+          "title": "Device",
+          "description": "Nuki ID of the device.",
+          "type": "integer"
+        }
+      },
       "latch": {
         "description": "Expose a second <i>Lock Mechanism</i> service to unlatch a Smart Lock.",
         "type": "boolean"
@@ -45,6 +55,30 @@
       "title": "Advanced Settings",
       "description": "Don't change these, unless you understand what you're doing.",
       "items": [
+        {
+          "type": "help",
+          "helpvalue": "Devices"
+        },
+        {
+          "nodescription": true,
+          "notitle": true,
+          "key": "devices",
+          "type": "array",
+          "items": [
+            {
+              "type": "div",
+              "displayFlex": true,
+              "flex-direction": "row",
+              "items": [
+                {
+                  "key": "devices[]",
+                  "required": true,
+                  "flex": "1 1 50px"
+                }
+              ]
+            }
+          ]
+        },
         "openerResetTimeout",
         "timeout",
         "port"

package/lib/NbAccessory.js

@@ -250,6 +250,9 @@ class Bridge extends homebridgeLib.AccessoryDelegate {
             continue
           }
           const id = device.nukiId.toString(16).toUpperCase()
+          if (!this.platform.isWhitelisted(id)) {
+            continue
+          }
           switch (device.deviceType) {
             case NbClient.DeviceTypes.SMARTLOCK:
             case NbClient.DeviceTypes.SMARTDOOR:

package/lib/NbPlatform.js

@@ -9,11 +9,13 @@ const events = require('events')
 const homebridgeLib = require('homebridge-lib')
 const NbAccessory = require('./NbAccessory')
 const { NbClient, NbDiscovery, NbListener } = require('hb-nb-tools')
+const { timeout } = homebridgeLib
 
 class NbPlatform extends homebridgeLib.Platform {
   constructor (log, configJson, homebridge) {
     super(log, configJson, homebridge)
     this.config = {
+      devices: [],
       openerResetTimeout: 500,
       timeout: 15
     }
@@ -21,6 +23,7 @@ class NbPlatform extends homebridgeLib.Platform {
     optionParser
       .stringKey('platform')
       .stringKey('name')
+      .arrayKey('devices')
       .boolKey('latch')
       .intKey('port', 0, 65535)
       .intKey('openerResetTimeout', 0, 2000) // milliseconds
@@ -30,6 +33,22 @@ class NbPlatform extends homebridgeLib.Platform {
       })
     try {
       optionParser.parse(configJson)
+      const validDevices = []
+      for (const i in this.config.devices) {
+        try {
+          const device = homebridgeLib.OptionParser.toInt(
+            `devices[${i}]`, this.config.devices[i], 0x10000000, 0xFFFFFFFF, true
+          )
+          validDevices.push(device.toString(16).toUpperCase())
+        } catch (error) {
+          if (error instanceof homebridgeLib.OptionParser.UserInputError) {
+            this.warn(error)
+          } else {
+            this.error(error)
+          }
+        }
+      }
+      this.config.devices = validDevices
       this.bridges = {}
       this.discovery = new NbDiscovery({
         timeout: this.config.timeout
@@ -128,11 +147,18 @@ class NbPlatform extends homebridgeLib.Platform {
     }
   }
 
+  isWhitelisted (id) {
+    return this.config.devices.length === 0 || this.config.devices.includes(id)
+  }
+
   async foundBridge (bridge) {
     if (bridge.ip == null || bridge.port == null) {
       return
     }
     const id = bridge.bridgeId.toString(16).toUpperCase()
+    if (!this.isWhitelisted(id)) {
+      return
+    }
     const host = bridge.ip + ':' + bridge.port
     if (this.bridges[id] == null) {
       const name = 'Bridge_' + id
@@ -175,8 +201,12 @@ class NbPlatform extends homebridgeLib.Platform {
         try {
           this.log('%s: press Nuki bridge button to obtain token', name)
           await client.auth()
+          if (client.token == null) {
+            this.warn('Nuki bridge button not pressed')
+          }
         } catch (error) {
           this.warn(error)
+          await timeout(30000)
         }
       }
       await client.init()
@@ -194,6 +224,9 @@ class NbPlatform extends homebridgeLib.Platform {
   }
 
   accessoryRestored (className, version, id, name, context) {
+    if (!this.isWhitelisted(id.split('-')[0])) {
+      return
+    }
     switch (className) {
       case 'Bridge':
         context.id = id

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge NB",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -18,13 +18,13 @@
     "nb": "cli/nb.js"
   },
   "engines": {
-    "homebridge": "^1.6.0",
-    "node": "^18.15.0",
+    "homebridge": "^1.6.1",
+    "node": "^18.16.0",
     "nuki": "2.15.0"
   },
   "dependencies": {
-    "homebridge-lib": "~6.3.13",
-    "hb-nb-tools": "~1.0.0"
+    "homebridge-lib": "~6.3.15",
+    "hb-nb-tools": "~1.1.0"
   },
   "scripts": {
     "prepare": "standard",