vrpc 3.0.0-alpha.1 → 3.0.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vrpc",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "description": "Variadic Remote Procedure Calls",
   "main": "index.js",
   "directories": {

package/vrpc/VrpcAdapter.js

@@ -429,6 +429,7 @@ class VrpcAdapter {
   }
 
   static _call (json) {
+    const before = Object.keys(VrpcAdapter._listeners).length
     switch (json.f) {
       case '__createIsolated__':
         VrpcAdapter._handleCreateIsolated(json)
@@ -445,6 +446,10 @@ class VrpcAdapter {
       default:
         VrpcAdapter._handleCall(json)
     }
+    const after = Object.keys(VrpcAdapter._listeners).length
+    // if we took a listener on board we must tell our caller such that
+    // things can be cleaned up later.
+    return after > before
   }
 
   static _handleCreateIsolated (json) {
@@ -596,6 +601,18 @@ class VrpcAdapter {
     delete VrpcAdapter._listeners[clientId]
   }
 
+  static _unregisterEventListenersOfInstance (instance) {
+    for (const [key, value] of Object.entries(VrpcAdapter._listeners)) {
+      VrpcAdapter._listeners[key] = value.filter(({ i, e, f }) => {
+        if (instance === i) {
+          VrpcAdapter.getInstance(i).removeListener(e, f)
+          return false
+        }
+        return true
+      })
+    }
+  }
+
   static _validate (schema, params) {
     if (!VrpcAdapter._ajv) {
       VrpcAdapter._ajv = new Ajv({ useDefaults: true })
@@ -646,7 +663,7 @@ class VrpcAdapter {
       // do not even trigger a callback for already offline clients
       if (json.s && !VrpcAdapter._listeners[json.s]) return
       const a = instanceId ? [instanceId, ...innerArgs] : [...innerArgs]
-      VrpcAdapter._callback({ ...json, a, i: id })
+      VrpcAdapter._callback({ a, s: json.s, f: json.f, i: id })
     }
     return wrapper
   }

package/vrpc/VrpcAgent.js

@@ -169,7 +169,7 @@ class VrpcAgent extends EventEmitter {
       .createHash('md5')
       .update(this._domain + this._agent)
       .digest('hex')
-      .substr(0, 18)
+      .substr(0, 20)
     let username = this._username
     let password = this._password
     if (this._token) {
@@ -181,7 +181,7 @@ class VrpcAgent extends EventEmitter {
       password,
       keepalive: 30,
       connectTimeout: 10 * 1000,
-      clientId: `vrpca${md5}`,
+      clientId: `va3${md5}`,
       rejectUnauthorized: false,
       will: {
         topic: `${this._baseTopic}/__agentInfo__`,
@@ -516,7 +516,11 @@ class VrpcAgent extends EventEmitter {
       json.f = method
 
       // Mutates json and adds return value
-      VrpcAdapter._call(json)
+      const mustTrack = VrpcAdapter._call(json)
+
+      if (mustTrack) {
+        this._mqttSubscribe(`${json.s}/__clientInfo__`)
+      }
 
       // Intersecting life-cycle functions
       switch (method) {
@@ -616,6 +620,7 @@ class VrpcAgent extends EventEmitter {
   _unregisterInstance (instanceId, clientId) {
     const entryIsolated = this._isolatedInstances.get(clientId)
     if (entryIsolated && entryIsolated.has(instanceId)) {
+      VrpcAdapter._unregisterEventListenersOfInstance(instanceId)
       entryIsolated.delete(instanceId)
       if (entryIsolated.length === 0) {
         this._isolatedInstances.delete(clientId)
@@ -628,6 +633,7 @@ class VrpcAgent extends EventEmitter {
     this._sharedInstances.forEach(async v => {
       if (v.has(instanceId)) {
         found = true
+        VrpcAdapter._unregisterEventListenersOfInstance(instanceId)
         v.delete(instanceId)
         if (v.length === 0) {
           this._sharedInstances.delete(clientId)

package/vrpc/VrpcClient.js

@@ -810,9 +810,8 @@ class VrpcClient extends EventEmitter {
       .createHash('md5')
       .update(clientInfo)
       .digest('hex')
-      .substr(0, 13)
-    // FIXME (3.x): use vrpcp -> vrpcc
-    return `vc${this._instance}${md5}` // 2 + 8 + 13 = 23 (max clientId)
+      .substr(0, 12)
+    return `vc3${this._instance}${md5}` // 3 + 8 + 12 = 23 (max clientId)
   }
 
   _createVrpcClientId () {