hb-nb-tools 2.0.23 → 2.0.25

package/lib/NbClient.js

@@ -120,17 +120,19 @@ class NbClient extends HttpClient {
     }
     const optionParser = new OptionParser(_params)
     optionParser
-      .hostKey('host')
-      .intKey('timeout', 1, 60)
-      .stringKey('token')
       .enumKey('encryption')
       .enumKeyValue('encryption', 'none')
       .enumKeyValue('encryption', 'hashedToken')
       .enumKeyValue('encryption', 'encryptedToken')
+      .instanceKey('logger')
+      .hostKey('host')
+      .intKey('timeout', 1, 60)
+      .stringKey('token')
       .parse(params)
     super({
       host: _params.hostname + ':' + _params.port,
       json: true,
+      logger: _params.logger,
       keepAlive: true,
       maxSockets: 1,
       timeout: _params.timeout
@@ -140,7 +142,7 @@ class NbClient extends HttpClient {
   }
 
   get id () { return this._params.id }
-  get name () { return 'Nuki Bridge ' + this._params.id }
+  get name () { return this._params.hostname }
   get encryption () { return this._params.encryption }
   get firmware () { return this._params.firmware }
   get token () { return this._params.token }

package/lib/NbDiscovery.js

@@ -25,13 +25,16 @@ class NbDiscovery extends HttpClient {
       timeout: 5
     }
     const optionParser = new OptionParser(config)
-    optionParser.intKey('timeout', 1, 60)
-    optionParser.parse(params)
+    optionParser
+      .instanceKey('logger')
+      .intKey('timeout', 1, 60)
+      .parse(params)
     super({
       https: true,
       host: 'api.nuki.io',
       json: true,
       keepAlive: false,
+      logger: params.logger,
       name: 'nuki server',
       path: '/discover',
       timeout: config.timeout
@@ -48,14 +51,11 @@ class NbDiscovery extends HttpClient {
     for (const bridge of response.body.bridges) {
       const client = new HttpClient({
         host: bridge.ip + ':' + bridge.port,
+        logger: this.config.logger,
         path: '',
         timeout: this.config.timeout,
         validStatusCodes: [200, 401]
       })
-      client
-        .on('error', (error) => { this.emit('error', error) })
-        .on('request', (request) => { this.emit('request', request) })
-        .on('response', (response) => { this.emit('response', response) })
       try {
         await client.get('/info')
         bridges.push(bridge)

package/lib/NbTool.js

@@ -316,6 +316,7 @@ class NbTool extends CommandLineTool {
     const clargs = {
       options: {
         host: process.env.NB_HOST,
+        logger: this,
         timeout: 5,
         token: process.env.NB_TOKEN
       }
@@ -323,13 +324,7 @@ class NbTool extends CommandLineTool {
     parser
       .help('h', 'help', help.nb)
       .version('V', 'version')
-      .flag('D', 'debug', () => {
-        if (this.debugEnabled) {
-          this.setOptions({ vdebug: true })
-        } else {
-          this.setOptions({ debug: true, chalk: true })
-        }
-      })
+      .debug('D', 'debug', this)
       .option('H', 'host', (value) => {
         OptionParser.toHost('host', value, false, true)
         clargs.options.host = value
@@ -368,38 +363,9 @@ class NbTool extends CommandLineTool {
       this.jsonFormatter = new JsonFormatter({ sortKeys: true })
       if (clargs.command === 'discover') {
         this.nbDiscovery = new NbDiscovery({
+          logger: this,
           timeout: clargs.options.timeout
         })
-        this.nbDiscovery
-          .on('error', (error) => {
-            this.log(
-              '%s: request %d: %s %s', error.request.name, error.request.id,
-              error.request.method, error.request.resource
-            )
-            this.warn(
-              '%s: request %d: error: %s', error.request.name, error.request.id, error
-            )
-          })
-          .on('request', (request) => {
-            this.debug(
-              '%s: request %d: %s %s', request.name, request.id,
-              request.method, request.resource
-            )
-            this.vdebug(
-              '%s: request %d: %s %s', request.name, request.id,
-              request.method, request.url
-            )
-          })
-          .on('response', (response) => {
-            this.vdebug(
-              '%s: request %d: response: %j', response.request.name, response.request.id,
-              response.body
-            )
-            this.debug(
-              '%s: request %d: %d %s', response.request.name, response.request.id,
-              response.statusCode, response.statusMessage
-            )
-          })
       } else {
         if (clargs.options.host == null) {
           await this.fatal(`Missing host.  Set ${b('NB_HOST')} or specify ${b('-H')}.`)
@@ -407,38 +373,7 @@ class NbTool extends CommandLineTool {
         if (clargs.command === 'auth') {
           clargs.options.timeout = 60
         }
-        const name = clargs.options.host
         this.client = new NbClient(clargs.options)
-        this.client
-          .on('error', (error) => {
-            this.log(
-              '%s: request %d: %s %s', name, error.request.id,
-              error.request.method, error.request.resource
-            )
-            this.warn(
-              '%s: request %d: error: %s', name, error.request.id, error
-            )
-          })
-          .on('request', (request) => {
-            this.debug(
-              '%s: request %d: %s %s', name, request.id,
-              request.method, request.resource
-            )
-            this.vdebug(
-              '%s: request %d: %s %s', name, request.id,
-              request.method, request.url
-            )
-          })
-          .on('response', (response) => {
-            this.vdebug(
-              '%s: request %d: response: %j', name, response.request.id,
-              response.body
-            )
-            this.debug(
-              '%s: request %d: %d %s', name, response.request.id,
-              response.statusCode, response.statusMessage
-            )
-          })
         if (clargs.options.token == null && clargs.command !== 'auth') {
           let args = ''
           if (clargs.options.host !== process.env.NB_HOST) {

package/package.json

@@ -6,7 +6,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "2.0.23",
+  "version": "2.0.25",
   "type": "module",
   "exports": {
     "./*": "./lib/*.js"
@@ -26,10 +26,10 @@
     "nb": "cli/nb.js"
   },
   "engines": {
-    "node": "^24||^22||^20"
+    "node": "^24||^22"
   },
   "dependencies": {
-    "hb-lib-tools": "~2.2.17",
+    "hb-lib-tools": "~3.0.5",
     "tweetnacl": "~1.0.3"
   },
   "scripts": {