homebridge-nb 1.1.13 → 1.2.2

package/cli/nb.js

@@ -77,10 +77,12 @@ Parameters:
   Print debug messages for communication with Nuki bridge.
 
   ${b('-H')} ${u('hostname')}[${b(':')}${u('port')}], ${b('--host=')}${u('hostname')}[${b(':')}${u('port')}]
-  Connect to ${u('hostname')}${b(':8080')} or ${u('hostname')}${b(':')}${u('port')}.
+  Connect to Nuki bridge at ${u('hostname')}${b(':8080')} or ${u('hostname')}${b(':')}${u('port')}.
+  You can also specify the hostname and port in the ${b('NB_HOST')} environment variable.
 
   ${b('-T')} ${u('token')}, ${b('--token=')}${u('token')}
-  Use ${u('token')} instead of the token saved in ${b('~/.nb')}.
+  Use token ${u('token')} to connect to the Nuki bridge.
+  You can also specify the token in the ${b('NB_TOKEN')} environment variable.
 
 Commands:
   ${usage.discover}
@@ -188,8 +190,10 @@ Parameters:
 
   ${u('deviceType')}
   The type of the Nuki device (from ${b('nb list')}):
-    0: smartlock
-    2: opener`,
+    0: Smart Lock 1.0 or 2.0
+    2: Opener
+    3: Smart Door
+    4: Smart Lock 3.0`,
   lock: `${description.lock}
 
 Usage: ${usage.lock}
@@ -203,8 +207,10 @@ Parameters:
 
   ${u('deviceType')}
   The type of the Nuki device (from ${b('nb list')}):
-    0: smartlock
-    2: opener`,
+    0: Smart Lock 1.0 or 2.0
+    2: Opener
+    3: Smart Door
+    4: Smart Lock 3.0`,
   unlock: `${description.unlock}
 
 Usage: ${usage.unlock}
@@ -218,8 +224,10 @@ Parameters:
 
   ${u('deviceType')}
   The type of the Nuki device (from ${b('nb list')}):
-    0: smartlock
-    2: opener`,
+    0: Smart Lock 1.0 or 2.0
+    2: Opener
+    3: Smart Door
+    4: Smart Lock 3.0`,
   lockAction: `${description.lockAction}
 
 Usage: ${usage.lockAction}
@@ -233,12 +241,14 @@ Parameters:
 
   ${u('deviceType')}
   The type of the Nuki device (from ${b('nb list')}):
-    0: smartlock
-    2: opener
+    0: Smart Lock 1.0 or 2.0
+    2: Opener
+    3: Smart Door
+    4: Smart Lock 3.0
 
   ${u('action')}
   The action to send to the Nuki device:
-      smartlock                opener
+      Smart Lock, Smart Door   Opener
     - ------------------------ -------------------------
     1 unlock                   activate rto
     2 lock                     deactivate rto
@@ -376,7 +386,7 @@ class Main extends homebridgeLib.CommandLineTool {
             args += ' -H ' + clargs.options.host
           }
           await this.fatal(
-            `Missing token.  Run ${b('nb' + args + ' auth')} and press bridge button.`
+            `Missing token.  Set ${b('NB_TOKEN')} or specify ${b('-T')}.  Run ${b('nb' + args + ' auth')} to obtain the token.`
           )
         }
       }

package/lib/NbAccessory.js

@@ -25,6 +25,7 @@ class NbAccessory extends homebridgeLib.AccessoryDelegate {
     this.client = this.bridge.client
     this.context.bridgeId = this.bridge.id
     this.context.firmware = params.firmware
+    this.context.deviceType = params.deviceType
     this.log('Nuki %s v%s %s', params.model, params.firmware, params.id)
     this.on('identify', this.identify)
     setImmediate(() => { this.emit('initialised') })
@@ -99,6 +100,8 @@ class Bridge extends homebridgeLib.AccessoryDelegate {
         const id = event.nukiId.toString(16).toUpperCase()
         switch (event.deviceType) {
           case NbClient.DeviceTypes.SMARTLOCK:
+          case NbClient.DeviceTypes.SMARTDOOR:
+          case NbClient.DeviceTypes.SMARTLOCK3:
             if (this.smartLocks[id] != null) {
               this.smartLocks[id].update(event)
             }
@@ -123,11 +126,16 @@ class Bridge extends homebridgeLib.AccessoryDelegate {
       this.debug('now at %s', value)
       this.client.host = value
       this.context.host = value
+      this.once('heartbeat', this.init)
     }
   }
 
   async init (beat) {
-    await this.client.init()
+    try {
+      await this.client.init()
+    } catch (error) {
+      return
+    }
     if (this.context.callbackUrl) {
       this.warn('unclean shutdown - checking for stale subscriptions')
       try {
@@ -219,14 +227,18 @@ class Bridge extends homebridgeLib.AccessoryDelegate {
           const id = device.nukiId.toString(16).toUpperCase()
           switch (device.deviceType) {
             case NbClient.DeviceTypes.SMARTLOCK:
+            case NbClient.DeviceTypes.SMARTDOOR:
+            case NbClient.DeviceTypes.SMARTLOCK3:
               if (this.smartLocks[id] == null) {
                 this.addSmartLock(id, {
                   id: id,
                   name: device.name,
-                  firmware: device.firmwareVersion
+                  firmware: device.firmwareVersion,
+                  deviceType: device.deviceType
                 })
               }
               this.smartLocks[id].values.firmware = device.firmwareVersion
+              this.smartLocks[id].context.deviceType = device.deviceType
               this.smartLocks[id].update(device.lastKnownState)
               if (
                 device.lastKnownState.doorsensorState != null &&
@@ -236,10 +248,12 @@ class Bridge extends homebridgeLib.AccessoryDelegate {
                   this.addDoorSensor(id + '-S', {
                     id: id + '-S',
                     name: device.name + ' Sensor',
-                    firmware: device.firmwareVersion
+                    firmware: device.firmwareVersion,
+                    deviceType: device.deviceType
                   })
                 }
                 this.doorSensors[id + '-S'].values.firmware = device.firmwareVersion
+                this.doorSensors[id + '-S'].context.deviceType = device.deviceType
                 this.doorSensors[id + '-S'].update(device.lastKnownState)
               } else if (this.doorSensors[id + '-S'] != null) {
                 this.doorSensors[id + '-S'].destroy()
@@ -251,10 +265,12 @@ class Bridge extends homebridgeLib.AccessoryDelegate {
                 this.addOpener(id, {
                   id: id,
                   name: device.name,
-                  firmware: device.firmwareVersion
+                  firmware: device.firmwareVersion,
+                  deviceType: device.deviceType
                 })
               }
               this.openers[id].values.firmware = device.firmwareVersion
+              this.openers[id].context.deviceType = device.deviceType
               this.openers[id].update(device.lastKnownState)
               break
             default:
@@ -271,8 +287,9 @@ class Bridge extends homebridgeLib.AccessoryDelegate {
 class SmartLock extends NbAccessory {
   constructor (bridge, params) {
     params.category = bridge.Accessory.Categories.DOOR_LOCK
-    params.model = 'Smart Lock'
+    params.model = NbClient.modelName(params.deviceType, params.firmware)
     super(bridge, params)
+    this.context.deviceType = params.firmware
     this.batteryService = new homebridgeLib.ServiceDelegate.Battery(this)
     this.service = new NbService.SmartLock(this)
     if (this.platform.config.latch) {
@@ -296,10 +313,12 @@ class SmartLock extends NbAccessory {
   }
 
   async identify () {
-    const response = await this.client.lockState(
-      this.id, NbClient.DeviceTypes.SMARTLOCK
-    )
-    this.update(response.body)
+    try {
+      const response = await this.client.lockState(
+        this.id, this.context.deviceType
+      )
+      this.update(response.body)
+    } catch (error) { this.error(error) }
   }
 }
 
@@ -322,17 +341,19 @@ class DoorSensor extends NbAccessory {
   }
 
   async identify () {
-    const response = await this.client.lockState(
-      this.id, NbClient.DeviceTypes.SMARTLOCK
-    )
-    this.update(response.body)
+    try {
+      const response = await this.client.lockState(
+        this.id, this.context.deviceType
+      )
+      this.update(response.body)
+    } catch (error) { this.error(error) }
   }
 }
 
 class Opener extends NbAccessory {
   constructor (bridge, params) {
     params.category = bridge.Accessory.Categories.DOOR_LOCK
-    params.model = 'Opener'
+    params.model = NbClient.modelName(params.deviceType, params.firmware)
     super(bridge, params)
     this.batteryService = new homebridgeLib.ServiceDelegate.Battery(this)
     this.doorBellService = new NbService.DoorBell(this)
@@ -356,10 +377,12 @@ class Opener extends NbAccessory {
   }
 
   async identify () {
-    const response = await this.client.lockState(
-      this.id, NbClient.DeviceTypes.OPENER
-    )
-    this.update(response.body)
+    try {
+      const response = await this.client.lockState(
+        this.id, NbClient.DeviceTypes.OPENER
+      )
+      this.update(response.body)
+    } catch (error) { this.error(error) }
   }
 }
 

package/lib/NbClient.js

@@ -10,7 +10,12 @@ const homebridgeLib = require('homebridge-lib')
 
 class NbClient extends homebridgeLib.HttpClient {
   static get DeviceTypes () {
-    return { SMARTLOCK: 0, OPENER: 2 }
+    return {
+      SMARTLOCK: 0,
+      OPENER: 2,
+      SMARTDOOR: 3,
+      SMARTLOCK3: 4
+    }
   }
 
   static get LockStates () {
@@ -77,6 +82,22 @@ class NbClient extends homebridgeLib.HttpClient {
     }
   }
 
+  static modelName (deviceType, firmware) {
+    switch (deviceType) {
+      case NbClient.DeviceTypes.SMARTLOCK:
+        if (firmware[0] === '1') {
+          return 'Smart Lock 1.0'
+        }
+        return 'Smart Lock 2.0'
+      case NbClient.DeviceTypes.OPENER:
+        return 'Opener'
+      case NbClient.DeviceTypes.SMARTDOOR:
+        return 'Smart Door'
+      case NbClient.DeviceTypes.SMARTLOCK3:
+        return 'Smart Lock 3.0'
+    }
+  }
+
   constructor (params = {}) {
     const _params = {
       hashedToken: true,

package/lib/NbDiscovery.js

@@ -36,7 +36,7 @@ class NbDiscovery extends homebridgeLib.HttpClient {
     for (const bridge of response.body.bridges) {
       const client = new homebridgeLib.HttpClient({
         host: bridge.ip + ':' + bridge.port,
-        path: '/',
+        path: '',
         timeout: this.config.timeout,
         validStatusCodes: [200, 401]
       })
@@ -45,7 +45,7 @@ class NbDiscovery extends homebridgeLib.HttpClient {
         .on('request', (request) => { this.emit('request', request) })
         .on('response', (response) => { this.emit('response', response) })
       try {
-        await client.get('info')
+        await client.get('/info')
         bridges.push(bridge)
       } catch (error) {}
     }

package/lib/NbService.js

@@ -107,7 +107,7 @@ class SmartLock extends homebridgeLib.ServiceDelegate {
           return
         }
         const response = await nbAccessory.client.lockAction(
-          nbAccessory.id, NbClient.DeviceTypes.SMARTLOCK,
+          nbAccessory.id, nbAccessory.context.deviceType,
           value === this.Characteristics.hap.LockTargetState.UNSECURED
             ? NbClient.LockActions.UNLOCK
             : NbClient.LockActions.LOCK
@@ -124,7 +124,7 @@ class SmartLock extends homebridgeLib.ServiceDelegate {
         }
         if (value === this.Characteristics.hap.LockTargetState.UNSECURED) {
           await nbAccessory.client.lockAction(
-            nbAccessory.id, NbClient.DeviceTypes.SMARTLOCK,
+            nbAccessory.id, nbAccessory.context.deviceType,
             NbClient.LockActions.UNLATCH
           )
         }
@@ -145,7 +145,7 @@ class SmartLock extends homebridgeLib.ServiceDelegate {
             nbAccessory.update({ state: NbClient.LockStates.UNLATCHED })
           }, 3000)
           const response = await nbAccessory.client.lockAction(
-            nbAccessory.id, NbClient.DeviceTypes.SMARTLOCK,
+            nbAccessory.id, nbAccessory.context.deviceType,
             NbClient.LockActions.UNLATCH
           )
           if (response != null && response.body.success) {
@@ -235,7 +235,7 @@ class Latch extends homebridgeLib.ServiceDelegate {
             nbAccessory.update({ state: NbClient.LockStates.UNLATCHED })
           }, 3000)
           const response = await nbAccessory.client.lockAction(
-            nbAccessory.id, NbClient.DeviceTypes.SMARTLOCK,
+            nbAccessory.id, nbAccessory.context.deviceType,
             NbClient.LockActions.UNLATCH
           )
           if (response != null && response.body.success) {
@@ -394,7 +394,7 @@ class Opener extends homebridgeLib.ServiceDelegate {
         }
         if (value === this.Characteristics.hap.LockTargetState.UNSECURED) {
           const response = await nbAccessory.client.lockAction(
-            nbAccessory.id, NbClient.DeviceTypes.OPENER,
+            nbAccessory.id, nbAccessory.context.deviceType,
             NbClient.OpenerActions.OPEN
           )
           if (response != null && response.body.success) {
@@ -417,7 +417,7 @@ class Opener extends homebridgeLib.ServiceDelegate {
           return
         }
         await nbAccessory.client.lockAction(
-          nbAccessory.id, NbClient.DeviceTypes.OPENER, value
+          nbAccessory.id, nbAccessory.context.deviceType, value
             ? NbClient.OpenerActions.ACTIVATE_RTO
             : NbClient.OpenerActions.DEACTIVATE_RTO
         )
@@ -432,7 +432,7 @@ class Opener extends homebridgeLib.ServiceDelegate {
           return
         }
         await nbAccessory.client.lockAction(
-          nbAccessory.id, NbClient.DeviceTypes.OPENER, value
+          nbAccessory.id, nbAccessory.context.deviceType, value
             ? NbClient.OpenerActions.ACTIVATE_CM
             : NbClient.OpenerActions.DEACTIVATE_CM
         )

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge NB",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "1.1.13",
+  "version": "1.2.2",
   "keywords": [
     "homebridge-plugin",
     "homekit",
@@ -18,11 +18,11 @@
     "nb": "cli/nb.js"
   },
   "engines": {
-    "homebridge": "^1.3.5",
-    "node": "^16.13.0"
+    "homebridge": "^1.3.8",
+    "node": "^16.13.1"
   },
   "dependencies": {
-    "homebridge-lib": "~5.1.16"
+    "homebridge-lib": "~5.1.20"
   },
   "scripts": {
     "prepare": "standard",