hb-nb-tools 1.1.0 → 1.1.2

package/README.md

@@ -1,3 +1,5 @@
+<span align="center">
+
 # Homebridge NB Tools
 [![Downloads](https://img.shields.io/npm/dt/hb-nb-tools.svg)](https://www.npmjs.com/package/hb-nb-tools)
 [![Version](https://img.shields.io/npm/v/hb-nb-tools.svg)](https://www.npmjs.com/package/hb-nb-tools)

package/cli/nb.js

@@ -8,5 +8,6 @@
 'use strict'
 
 const { NbTool } = require('../index')
+const pkgJson = require('../package.json')
 
-new NbTool(require('../package.json')).main()
+new NbTool(pkgJson).main()

package/lib/NbClient.js

@@ -8,11 +8,7 @@
 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 { secretbox, randomBytes } = require('tweetnacl')
 
 class NbClient extends HttpClient {
   static get DeviceTypes () {
@@ -106,7 +102,7 @@ class NbClient extends HttpClient {
 
   constructor (params = {}) {
     const _params = {
-      encryption: sodiumPlus == null ? 'hashedToken' : 'encryptedToken',
+      encryption: 'encryptedToken',
       port: 8080,
       timeout: 5
     }
@@ -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/NbTool.js

@@ -9,7 +9,6 @@ const NbClient = require('./NbClient')
 const NbDiscovery = require('./NbDiscovery')
 const NbListener = require('./NbListener')
 const hbLibTools = require('hb-lib-tools')
-const packageJson = require('../package.json')
 
 const { CommandLineParser, CommandLineTool, JsonFormatter, OptionParser } = hbLibTools
 const { b, u } = CommandLineTool
@@ -416,7 +415,7 @@ class NbTool extends CommandLineTool {
       }
       this.name = 'nb ' + clargs.command
       this.usage = `${b('nb')} ${usage[clargs.command]}`
-      this.parser = new CommandLineParser(packageJson)
+      this.parser = new CommandLineParser(this.pkgJson)
       this.parser.help('h', 'help', help[clargs.command])
       await this[clargs.command](clargs.args)
     } catch (error) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "hb-nb-tools",
-  "description": "Homebridge NB Command-Line Tools",
+  "description": "Homebridge NB Tools",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "keywords": [
     "nuki",
     "smart-lock",
@@ -17,10 +17,8 @@
     "node": "^18.16.0"
   },
   "dependencies": {
-    "hb-lib-tools": "~1.0.8"
-  },
-  "optionalDependencies": {
-    "sodium-plus": "~0.9.0"
+    "hb-lib-tools": "~1.0.9",
+    "tweetnacl": "~1.0.3"
   },
   "scripts": {
     "prepare": "standard",