homebridge-nb 1.4.21 → 1.4.23

package/config.schema.json

@@ -23,6 +23,31 @@
           "type": "integer"
         }
       },
+      "encryption": {
+        "description": "Encryption for Nuki bridge token.  Default: Encrypted.",
+        "type": "string",
+        "required": true,
+        "oneOf": [
+          {
+            "title": "None",
+            "enum": [
+              "none"
+            ]
+          },
+          {
+            "title": "Hashed Token",
+            "enum": [
+              "hashedToken"
+            ]
+          },
+          {
+            "title": "Encrypted Token",
+            "enum": [
+              "encryptedToken"
+            ]
+          }
+        ]
+      },
       "latch": {
         "description": "Expose a second <i>Lock Mechanism</i> service to unlatch a Smart Lock.",
         "type": "boolean"
@@ -83,6 +108,7 @@
             }
           ]
         },
+        "encryption",
         "openerResetTimeout",
         "port",
         "removeStaleAccessories",

package/lib/NbAccessory/Bridge.js

@@ -43,6 +43,7 @@ class Bridge extends AccessoryDelegate {
     this.dummyService = new ServiceDelegate.Dummy(this)
 
     this.client = new NbClient({
+      encryption: platform.config.encryption,
       host: this.context.host,
       timeout: platform.config.timeout,
       token: this.context.token
@@ -146,13 +147,13 @@ class Bridge extends AccessoryDelegate {
       }
     }
     this.context.callbackUrl = await this.platform.addClient(this.client)
+    this.debug('initialised')
+    this.emit('initialised')
     this.initialBeat = beat
     try {
       await this.heartbeat(beat)
     } catch (error) {}
     this.on('heartbeat', this.heartbeat)
-    this.debug('initialised')
-    this.emit('initialised')
   }
 
   async checkSubscription () {

package/lib/NbPlatform.js

@@ -24,6 +24,7 @@ class NbPlatform extends Platform {
     super(log, configJson, homebridge)
     this.config = {
       devices: [],
+      encryption: 'encryptedToken',
       openerResetTimeout: 500,
       timeout: 15
     }
@@ -32,6 +33,10 @@ class NbPlatform extends Platform {
       .stringKey('platform')
       .stringKey('name')
       .arrayKey('devices')
+      .enumKey('encryption')
+      .enumKeyValue('encryption', 'none')
+      .enumKeyValue('encryption', 'hashedToken')
+      .enumKeyValue('encryption', 'encryptedToken')
       .boolKey('latch')
       .intKey('port', 0, 65535)
       .intKey('openerResetTimeout', 0, 2000) // milliseconds
@@ -173,9 +178,10 @@ class NbPlatform extends Platform {
     }
     const host = bridge.ip + ':' + bridge.port
     if (this.bridges[id] == null) {
-      const name = 'Nuki_Bridge_' + id
+      const name = 'Nuki Bridge ' + id
       this.debug('%s: found bridge %s at %s', name, id, host)
       const client = new NbClient({
+        encryption: this.config.encryption,
         host,
         timeout: 60
       })
@@ -242,9 +248,26 @@ class NbPlatform extends Platform {
     }
     switch (className) {
       case 'Bridge':
-        context.id = id
-        context.name = name
-        this.bridges[id] = new NbAccessory.Bridge(this, context)
+        {
+          context.id = id
+          // Dirty hack en lieu of patching cachedAccessories
+          let needPatch = false
+          if (name.startsWith('Nuki_Bridge_')) {
+            name = name.replace(/_/g, ' ')
+            needPatch = true
+          }
+          // End hack
+          context.name = name
+          this.bridges[id] = new NbAccessory.Bridge(this, context)
+          // Dirty hack en lieu of patching cachedAccessories
+          if (needPatch) {
+            this.bridges[id]._accessory._associatedHAPAccessory.displayName = name
+            this.bridges[id]._context.name = name
+            this.bridges[id].service.values.configuredName = name
+            this.bridges[id].dummyService.values.configuredName = name
+          }
+          // End hack
+        }
         break
       case 'SmartLock':
       case 'DoorSensor':

package/package.json

@@ -3,8 +3,11 @@
   "description": "Homebridge plugin for Nuki Bridge",
   "displayName": "Homebridge NB",
   "author": "Erik Baauw",
+  "maintainers": [
+    "ebaauw"
+  ],
   "license": "Apache-2.0",
-  "version": "1.4.21",
+  "version": "1.4.23",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -19,13 +22,13 @@
     "nb": "cli/nb.js"
   },
   "engines": {
-    "homebridge": "^1.8.3",
+    "homebridge": "^1.8.4||^2.0.0-beta",
     "node": "^20||^18",
     "nuki": "2.18.0"
   },
   "dependencies": {
-    "homebridge-lib": "~7.0.4",
-    "hb-nb-tools": "~2.0.3"
+    "homebridge-lib": "~7.0.5",
+    "hb-nb-tools": "~2.0.5"
   },
   "scripts": {
     "prepare": "standard",