hb-zp-tools 1.0.4 → 1.0.6

package/lib/ZpClient.js

@@ -359,6 +359,7 @@ class ZpClient extends HttpClient {
 
     this._params = _params
     this._jsonFormatter = new JsonFormatter()
+    this._zpListener = this._params.listener
     this._parser = parser
     this._props = {
       address: _params.host,
@@ -456,7 +457,6 @@ class ZpClient extends HttpClient {
       household = zpClient.household
     } else {
       this.on('message', this._handleMessage)
-      await this.open()
       await this.subscribe('/ZoneGroupTopology/Event')
       const timeout = setTimeout(() => {
         this.emit('error', new Error(
@@ -467,7 +467,7 @@ class ZpClient extends HttpClient {
         await once(this, 'gotcha')
       } catch (error) {}
       clearTimeout(timeout)
-      await this.close()
+      await this.unsubscribe('/ZoneGroupTopology/Event')
       this.removeListener('message', this._handleMessage)
     }
     if (this._zoneGroupState != null) {
@@ -975,7 +975,9 @@ class ZpClient extends HttpClient {
     * reveive the notifications.
     */
   async open () {
-    this._zpListener = this._params.listener
+    if (this._params.callbackUrl != null) {
+      return
+    }
     this._params.callbackUrl = await this._zpListener.addClient(this)
     this._zpListener.on(this.id, async (message) => {
       try {
@@ -1026,9 +1028,7 @@ class ZpClient extends HttpClient {
     * `/MediaRenderer/AVTransport/Event`.
     */
   async subscribe (url) {
-    if (this._params.callbackUrl == null) {
-      throw new SyntaxError('open() not yet called')
-    }
+    await this.open()
     const callbackUrl = this._params.callbackUrl + url
     const headers = {
       TIMEOUT: 'Second-' + this._params.subscriptionTimeout + 30
@@ -1086,6 +1086,9 @@ class ZpClient extends HttpClient {
         await this._request('UNSUBSCRIBE', url, undefined, { SID: sid })
       } catch (error) { this.error(error) }
     }
+    if (Object.keys(this._subscriptions).length === 0) {
+      await this.close()
+    }
   }
 
   async _checkBootSeq (bootSeq) {

package/lib/ZpListener.js

@@ -50,20 +50,20 @@ class ZpListener extends EventEmitter {
             response.write('<table>')
             response.write(`<caption><h3>Listening to ${Object.keys(this._clients).length} clients</h3></caption>`)
             response.write('<tr><th scope="col">ZonePlayer</th>')
-            // response.write('<th scope="col">ID</th>')
+            response.write('<th scope="col">ID</th>')
             response.write('<th scope="col">IP Address</th>')
             response.write('<th scope="col">Local IP Address</th>')
             response.write('<th scope="col">Subscriptions</th></tr>')
             const names = {}
             for (const id of Object.keys(this._clients)) {
               const zpClient = this._clients[id]
-              const name = zpClient.name == null ? zpClient.id : zpClient.name
+              const name = zpClient.zonePlayerName == null ? zpClient.id : zpClient.zonePlayerName
               names[name] = zpClient
             }
             for (const name of Object.keys(names).sort()) {
               const zpClient = names[name]
               response.write(`<tr><td>${name}</td>`)
-              // response.write(`<td>${zpClient.id}</td>`)
+              response.write(`<td>${zpClient.id}</td>`)
               response.write(`<td>${zpClient.address}</td>`)
               response.write(`<td>${zpClient.localAddress}</td>`)
               const subs = zpClient.subscriptions.map((sub) => {
@@ -151,8 +151,8 @@ class ZpListener extends EventEmitter {
     * See {@link ZpClient#subscribe subscribe()}.
     */
   async addClient (zpClient) {
-    this._clients[zpClient.id] = zpClient
     await this._listen()
+    this._clients[zpClient.id] = zpClient
     const callbackUrl = 'http://' + zpClient.localAddress + ':' + this._myPort +
       '/notify/' + zpClient.id
     return callbackUrl
@@ -166,7 +166,7 @@ class ZpListener extends EventEmitter {
     */
   async removeClient (zpClient) {
     this.removeAllListeners(zpClient.id)
-    delete this._clients[zpClient.id] // FIXME: this doesn't work?!
+    delete this._clients[zpClient.id]
     if (Object.keys(this._clients).length === 0) {
       await this._server.close()
     }

package/lib/ZpTool.js

@@ -978,7 +978,6 @@ class ZpTool extends CommandLineTool {
           )
         }
       })
-    await this.zpClient.open()
     if (clargs.topology) {
       try {
         await this.zpClient.subscribe('/ZoneGroupTopology/Event')

package/package.json

@@ -6,7 +6,7 @@
     "ebaauw"
   ],
   "license": "Apache-2.0",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "module",
   "exports": {
     "./*": "./lib/*.js"
@@ -24,7 +24,7 @@
     "node": "^22||^20||^18"
   },
   "dependencies": {
-    "hb-lib-tools": "~2.2.1",
+    "hb-lib-tools": "~2.2.2",
     "he": "^1.2.0",
     "xml2js": "~0.6.2"
   },