vrpc 3.12.1 → 3.13.0

package/vrpc/VrpcClient.js

@@ -546,7 +546,27 @@ class VrpcClient extends EventEmitter {
     const topic = `${this._domain}/${agent}/${className}/__static__/__delete__`
     this._mqttPublish(topic, JSON.stringify(json))
     delete this._proxies[`${agent}/${className}/${instance}`]
-    return this._handleAgentAnswer(json, agent)
+    const deleted = await this._handleAgentAnswer(json, agent)
+    // the answer and the class info that no longer lists the instance
+    // travel on different topics, and a broker need not keep their order:
+    // what this client deleted is gone for it at once
+    if (deleted === true) this._forgetInstance({ agent, className, instance })
+    return deleted
+  }
+
+  /**
+   * Takes an instance off this client's view of its agent, the way a class
+   * info without it does: listing, instanceGone, cached subscriptions. A
+   * class info that arrives later finds nothing left to remove.
+   */
+  _forgetInstance ({ agent, className, instance }) {
+    const info = this._agents[agent] && this._agents[agent].classes[className]
+    if (!info || !Array.isArray(info.instances)) return
+    if (!info.instances.includes(instance)) return
+    info.instances = info.instances.filter(x => x !== instance)
+    const domain = this._domain
+    this.emit('instanceGone', [instance], { domain, agent, className })
+    this._clearCachedSubscriptions({ lostInstance: instance, agent, className })
   }
 
   /**

package/vrpc/VrpcPersistor.js

@@ -98,6 +98,8 @@ class VrpcPersistor {
         .replace(/[^a-zA-Z0-9]/g, '-')}`
 
     this._storage = null
+    // the 'update' listener on each persisted instance, dropped on delete
+    this._updateListeners = new Map()
     this._isInitialized = this._init(Storage)
 
     this._log.info(
@@ -282,7 +284,11 @@ class VrpcPersistor {
           const obj = VrpcAdapter.getInstance(instance)
           // Ensure the object is an event emitter
           if (obj && typeof obj.on === 'function') {
-            obj.on('update', data => {
+            const listener = data => {
+              // a deleted object never rewrites the record of its name
+              // (#1705): an in-process delete announces nothing
+              const live = VrpcAdapter._instances.get(instance)
+              if (!live || live.instance !== obj) return
               this._log.info(
                 `[VrpcPersistor] Persisting update for: ${instance} (${className})`
               )
@@ -293,7 +299,9 @@ class VrpcPersistor {
                   `[VrpcPersistor] Failed persisting update of ${instance} (${className}): ${err.message}`
                 )
               )
-            })
+            }
+            obj.on('update', listener)
+            this._updateListeners.set(instance, { obj, listener })
           }
         } catch (err) {
           this._log.warn(
@@ -304,6 +312,11 @@ class VrpcPersistor {
 
       // Persist instance deletion
       VrpcAdapter.on('delete', ({ instance, className }) => {
+        const update = this._updateListeners.get(instance)
+        if (update) {
+          this._updateListeners.delete(instance)
+          update.obj.removeListener('update', update.listener)
+        }
         this._log.info(
           `[VrpcPersistor] Deleting persisted instance: ${instance} (${className})`
         )

package/vrpc/comment-parser/parser.js

@@ -230,6 +230,17 @@ function mkextract (opts) {
       indent = startPos + MARKER_START.length
     }
 
+    // a member with a computed key ([Symbol.asyncDispose]) names no remote
+    // function: the block documents it and nothing else - without this it
+    // landed on the first call in the member's body
+    if (
+      findMethod &&
+      /^\s*(static\s+)?(async\s+)?\*?\s*((get|set)\s+)?\[[^\]]+\]\s*\(/.test(line)
+    ) {
+      result = parse_block(chunk, opts)
+      findMethod = false
+    }
+
     if (findMethod) {
       const ret = line.match(/\s*function\s+(\w+)\s*\(/) ||
         line.match(/\s*(\w+)\s*=?\s*\(/)