hb-nb-tools 1.1.1 → 1.1.3

package/lib/NbClient.js

@@ -6,13 +6,8 @@
 'use strict'
 
 const crypto = require('crypto')
-const hbLibTools = require('hb-lib-tools')
-const { HttpClient, JsonFormatter, OptionParser } = hbLibTools
-let sodiumPlus
-try {
-  sodiumPlus = require('sodium-plus')
-} catch (error) {}
-const { CryptographyKey, SodiumPlus } = sodiumPlus || {}
+const { HttpClient, JsonFormatter, OptionParser } = require('hb-lib-tools')
+const { secretbox, randomBytes } = require('tweetnacl')
 
 class NbClient extends HttpClient {
   static get DeviceTypes () {
@@ -106,7 +101,7 @@ class NbClient extends HttpClient {
 
   constructor (params = {}) {
     const _params = {
-      encryption: sodiumPlus == null ? 'hashedToken' : 'encryptedToken',
+      encryption: 'encryptedToken',
       port: 8080,
       timeout: 5
     }
@@ -177,6 +172,7 @@ class NbClient extends HttpClient {
   }
 
   async callbackAdd (url) {
+    url = OptionParser.toString('url', url, true)
     return this._get('/callback/add', { url: encodeURIComponent(url) })
   }
 
@@ -198,15 +194,15 @@ class NbClient extends HttpClient {
         const date = new Date().toISOString()
         const ts = date.slice(0, 19) + 'Z'
         if (this._params.encryption === 'encryptedToken') {
-          if (this._sodium == null) {
+          if (this._key == null) {
             const hash = crypto.createHash('sha256')
             hash.update(this._params.token)
-            this._key = new CryptographyKey(hash.digest())
-            this._sodium = await SodiumPlus.auto()
+            this._key = hash.digest()
           }
-          const rnr = await this._sodium.randombytes_uniform(10000)
-          const nonce = await this._sodium.randombytes_buf(24)
-          const ctoken = await this._sodium.crypto_secretbox([ts, rnr].join(','), nonce, this._key)
+          const rnr = crypto.randomInt(10000)
+          const nonce = Buffer.from(randomBytes(secretbox.nonceLength))
+          const message = Buffer.from([ts, rnr].join(','), 'utf-8')
+          const ctoken = Buffer.from(secretbox(message, nonce, this._key))
           suffix = separator + 'ctoken=' + ctoken.toString('hex') + '&nonce=' + nonce.toString('hex')
         } else if (this._params.encryption === 'hashedToken') { // deprecated
           const hash = crypto.createHash('sha256')

package/lib/NbListener.js

@@ -7,6 +7,8 @@
 
 const events = require('events')
 const http = require('http')
+const NbClient = require('./NbClient')
+const { OptionParser } = require('hb-lib-tools')
 
 class NbListener extends events.EventEmitter {
   constructor (port = 0) {
@@ -84,6 +86,7 @@ class NbListener extends events.EventEmitter {
   }
 
   async addClient (nbClient) {
+    OptionParser.toInstance('nbClient', nbClient, NbClient)
     this._clients[nbClient.id] = nbClient
     this._clientsByName[nbClient.name] = nbClient
     await this._listen()
@@ -93,6 +96,7 @@ class NbListener extends events.EventEmitter {
   }
 
   async removeClient (nbClient) {
+    OptionParser.toInstance('nbClient', nbClient, NbClient)
     this.removeAllListeners(nbClient.id)
     delete this._clientsByName[nbClient.name]
     delete this._clients[nbClient.id]

package/package.json

@@ -3,7 +3,7 @@
   "description": "Homebridge NB Tools",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "keywords": [
     "nuki",
     "smart-lock",
@@ -14,13 +14,11 @@
     "nb": "cli/nb.js"
   },
   "engines": {
-    "node": "^18.16.0"
+    "node": "^18.16.1"
   },
   "dependencies": {
-    "hb-lib-tools": "~1.0.9"
-  },
-  "optionalDependencies": {
-    "sodium-plus": "~0.9.0"
+    "hb-lib-tools": "~1.0.10",
+    "tweetnacl": "~1.0.3"
   },
   "scripts": {
     "prepare": "standard",