hb-nb-tools 2.0.6 → 2.0.8

package/lib/NbTool.js

@@ -18,7 +18,7 @@ const { UsageError } = CommandLineParser
 const usage = {
   nb: `${b('nb')} [${b('-hVD')}] [${b('-H')} ${u('hostname')}[${b(':')}${u('port')}]] [${b('-T')} ${u('token')}] [${b('-E')} [${b('none')}|${b('hasedToken')}|${b('encryptedToken')}]] [${b('-t')} ${u('timeout')}] ${u('command')} [${u('argument')} ...]`,
 
-  discover: `${b('discover')} [${b('-h')}] [${b('-t')} ${u('timeout')}]`,
+  discover: `${b('discover')} [${b('-h')}]`,
 
   auth: `${b('auth')} [${b('-h')}]`,
   info: `${b('info')} [${b('-h')}]`,
@@ -316,6 +316,7 @@ class NbTool extends CommandLineTool {
     const clargs = {
       options: {
         host: process.env.NB_HOST,
+        timeout: 5,
         token: process.env.NB_TOKEN
       }
     }
@@ -365,7 +366,41 @@ class NbTool extends CommandLineTool {
       this.usage = usage.nb
       const clargs = this.parseArguments()
       this.jsonFormatter = new JsonFormatter({ sortKeys: true })
-      if (clargs.command !== 'discover') {
+      if (clargs.command === 'discover') {
+        this.nbDiscovery = new NbDiscovery({
+          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')}.`)
         }
@@ -425,44 +460,8 @@ class NbTool extends CommandLineTool {
   }
 
   async discover (...args) {
-    const options = {}
-    this.parser
-      .option('t', 'timeout', (value, key) => {
-        options.timeout = OptionParser.toInt('timeout', value, 1, 60, true)
-      })
-      .parse(...args)
-    const nbDiscovery = new NbDiscovery(options)
-    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
-        )
-      })
-    const bridges = await nbDiscovery.discover()
+    this.parser.parse(...args)
+    const bridges = await this.nbDiscovery.discover()
     this.print(this.jsonFormatter.stringify(bridges))
   }
 
@@ -517,7 +516,7 @@ class NbTool extends CommandLineTool {
         nukiId = OptionParser.toInt('nukiId', value, 0, Infinity, true)
       })
       .parameter('deviceType', (value) => {
-        deviceType = OptionParser.toInt('deviceType', value, 0, 2, true)
+        deviceType = OptionParser.toInt('deviceType', value, 0, 4, true)
       })
       .parse(...args)
     const response = await this.client.lockState(nukiId, deviceType)
@@ -532,7 +531,7 @@ class NbTool extends CommandLineTool {
         nukiId = OptionParser.toInt('nukiId', value, 0, Infinity, true)
       })
       .parameter('deviceType', (value) => {
-        deviceType = OptionParser.toInt('deviceType', value, 0, 2, true)
+        deviceType = OptionParser.toInt('deviceType', value, 0, 4, true)
       })
       .parse(...args)
     const response = await this.client.lock(nukiId, deviceType)
@@ -547,7 +546,7 @@ class NbTool extends CommandLineTool {
         nukiId = OptionParser.toInt('nukiId', value, 0, Infinity, true)
       })
       .parameter('deviceType', (value) => {
-        deviceType = OptionParser.toInt('deviceType', value, 0, 2, true)
+        deviceType = OptionParser.toInt('deviceType', value, 0, 4, true)
       })
       .parse(...args)
     const response = await this.client.unlock(nukiId, deviceType)
@@ -563,7 +562,7 @@ class NbTool extends CommandLineTool {
         nukiId = OptionParser.toInt('nukiId', value, 0, Infinity, true)
       })
       .parameter('deviceType', (value) => {
-        deviceType = OptionParser.toInt('deviceType', value, 0, 2, true)
+        deviceType = OptionParser.toInt('deviceType', value, 0, 4, true)
       })
       .parameter('action', (value) => {
         action = OptionParser.toInt('action', value, 1, 5, true)

package/package.json

@@ -6,7 +6,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "type": "module",
   "exports": {
     "./*": "./lib/*.js"
@@ -24,7 +24,7 @@
     "node": "^22||^20||^18"
   },
   "dependencies": {
-    "hb-lib-tools": "~2.0.6",
+    "hb-lib-tools": "~2.1.2",
     "tweetnacl": "~1.0.3"
   },
   "scripts": {