hb-nb-tools 1.1.13 → 2.0.0-1

package/cli/nb.js

@@ -5,9 +5,6 @@
 // Command line interface to Nuki bridge HTTP API.
 // Copyright © 2018-2024 Erik Baauw. All rights reserved.
 
-'use strict'
+import { NbTool } from 'hb-nb-tools/NbTool'
 
-const { NbTool } = require('../index')
-const pkgJson = require('../package.json')
-
-new NbTool(pkgJson).main()
+new NbTool(import.meta.dirname).main()

package/lib/NbClient.js

@@ -3,11 +3,15 @@
 //
 // Homebridge NB Tools.
 
-'use strict'
+import { createHash, randomInt } from 'node:crypto'
+import tweetnacl from 'tweetnacl'
 
-const crypto = require('crypto')
-const { HttpClient, JsonFormatter, OptionParser, toHexString } = require('hb-lib-tools')
-const { secretbox, randomBytes } = require('tweetnacl')
+import { toHexString } from 'hb-lib-tools'
+import { HttpClient } from 'hb-lib-tools/HttpClient'
+import { JsonFormatter } from 'hb-lib-tools/JsonFormatter'
+import { OptionParser } from 'hb-lib-tools/OptionParser'
+
+const { secretbox, randomBytes } = tweetnacl
 
 class NbClient extends HttpClient {
   static get DeviceTypes () {
@@ -191,17 +195,17 @@ class NbClient extends HttpClient {
         const ts = date.slice(0, 19) + 'Z'
         if (this._params.encryption === 'encryptedToken') {
           if (this._key == null) {
-            const hash = crypto.createHash('sha256')
+            const hash = createHash('sha256')
             hash.update(this._params.token)
             this._key = hash.digest()
           }
-          const rnr = crypto.randomInt(10000)
+          const rnr = 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')
+          const hash = createHash('sha256')
           const rnr = Number(date[18] + date.slice(20, 23))
           hash.update([ts, rnr, this._params.token].join(','))
           suffix = separator + 'ts=' + ts + '&rnr=' + rnr +
@@ -213,4 +217,4 @@ class NbClient extends HttpClient {
   }
 }
 
-module.exports = NbClient
+export { NbClient }

package/lib/NbDiscovery.js

@@ -3,10 +3,8 @@
 //
 // Homebridge NB Tools.
 
-'use strict'
-
-const hbLibTools = require('hb-lib-tools')
-const { HttpClient, OptionParser } = hbLibTools
+import { HttpClient } from 'hb-lib-tools/HttpClient'
+import { OptionParser } from 'hb-lib-tools/OptionParser'
 
 class NbDiscovery extends HttpClient {
   constructor (params = {}) {
@@ -54,4 +52,4 @@ class NbDiscovery extends HttpClient {
   }
 }
 
-module.exports = NbDiscovery
+export { NbDiscovery }

package/lib/NbListener.js

@@ -3,20 +3,20 @@
 //
 // Homebridge NB Tools.
 
-'use strict'
+import { EventEmitter } from 'node:events'
+import { createServer } from 'node:http'
 
-const events = require('events')
-const http = require('http')
-const NbClient = require('./NbClient')
-const { OptionParser } = require('hb-lib-tools')
+import { OptionParser } from 'hb-lib-tools/OptionParser'
 
-class NbListener extends events.EventEmitter {
+import { NbClient } from 'hb-nb-tools/NbClient'
+
+class NbListener extends EventEmitter {
   constructor (port = 0) {
     super()
     this._myPort = port
     this._clients = {}
     this._clientsByName = {}
-    this._server = http.createServer((request, response) => {
+    this._server = createServer((request, response) => {
       let buffer = ''
       request.on('data', (data) => {
         buffer += data
@@ -106,4 +106,4 @@ class NbListener extends events.EventEmitter {
   }
 }
 
-module.exports = NbListener
+export { NbListener }

package/lib/NbTool.js

@@ -3,14 +3,15 @@
 //
 // Command line interface to Nuki bridge HTTP API.
 
-'use strict'
+import { CommandLineParser } from 'hb-lib-tools/CommandLineParser'
+import { CommandLineTool } from 'hb-lib-tools/CommandLineTool'
+import { JsonFormatter } from 'hb-lib-tools/JsonFormatter'
+import { OptionParser } from 'hb-lib-tools/OptionParser'
 
-const NbClient = require('./NbClient')
-const NbDiscovery = require('./NbDiscovery')
-const NbListener = require('./NbListener')
-const hbLibTools = require('hb-lib-tools')
+import { NbClient } from 'hb-nb-tools/NbClient'
+import { NbDiscovery } from 'hb-nb-tools/NbDiscovery'
+import { NbListener } from 'hb-nb-tools/NbListener'
 
-const { CommandLineParser, CommandLineTool, JsonFormatter, OptionParser } = hbLibTools
 const { b, u } = CommandLineTool
 const { UsageError } = CommandLineParser
 
@@ -641,4 +642,4 @@ class NbTool extends CommandLineTool {
   }
 }
 
-module.exports = NbTool
+export { NbTool }

package/package.json

@@ -3,7 +3,11 @@
   "description": "Homebridge NB Tools",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "1.1.13",
+  "version": "2.0.0-1",
+  "type": "module",
+  "exports": {
+    "./*": "./lib/*.js"
+  },
   "keywords": [
     "nuki",
     "smart-lock",
@@ -17,7 +21,7 @@
     "node": "^20||^18"
   },
   "dependencies": {
-    "hb-lib-tools": "~1.2.4",
+    "hb-lib-tools": "~2.0.0-1",
     "tweetnacl": "~1.0.3"
   },
   "scripts": {

package/index.js

@@ -1,38 +0,0 @@
-// hb-nb-tools/index.js
-//
-// Homebridge NB Tools.
-// Copyright © 2017-2024 Erik Baauw. All rights reserved.
-
-'use strict'
-
-/** Homebridge NB Tools.
-  *
-  * @module hbNbTools
-  */
-class hbNbTools {
-  /** Colour conversions.
-    * <br>See {@link NbClient}.
-    * @type {Class}
-    * @memberof module:hbNbTools
-    */
-  static get NbClient () { return require('./lib/NbClient') }
-
-  /** Parser and validator for command-line arguments.
-    * <br>See {@link NbDiscovery}.
-    * @type {Class}
-    * @memberof module:hbNbTools
-    */
-  static get NbDiscovery () { return require('./lib/NbDiscovery') }
-
-  /** Command-line tool.
-    * <br>See {@link NbListener}.
-    * @type {Class}
-    * @memberof module:hbNbTools
-    */
-  static get NbListener () { return require('./lib/NbListener') }
-
-  // Command-line tools.
-  static get NbTool () { return require('./lib/NbTool') }
-}
-
-module.exports = hbNbTools