vrpc 3.5.0 → 3.5.2

package/browser/vrpc.js.LICENSE.txt

@@ -1 +1,10 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*! https://mths.be/punycode v1.4.1 by @mathias */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vrpc",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "description": "Variadic Remote Procedure Calls",
   "main": "index.js",
   "directories": {
@@ -73,7 +73,7 @@
     "buffer": "^6.0.3",
     "caller": "^1.1.0",
     "json-stringify-safe": "^5.0.1",
-    "mqtt": "^5.14.1",
+    "mqtt": "^4.3.7",
     "nanoid": "^3.3.8",
     "process": "^0.11.10"
   },

package/vrpc/VrpcAdapter.js

@@ -547,11 +547,6 @@ class VrpcAdapter {
       return
     }
     const unwrapped = VrpcAdapter._unwrapArguments(json)
-    if (!unwrapped) {
-      // this call must be skipped (event emitter stuff)
-      json.r = true
-      return
-    }
     // Check whether context is a registered class
     const entry = VrpcAdapter._functionRegistry.get(json.c)
     if (entry !== undefined) {
@@ -680,9 +675,6 @@ class VrpcAdapter {
               eventId: arg,
               event: args[0]
             })
-            if (!listener) {
-              return null // skip call as listener is already registered
-            }
             unwrapped.push(listener)
             // event un-registration
           } else if (func === 'off' || func === 'removeListener') {
@@ -691,9 +683,6 @@ class VrpcAdapter {
               instanceId: context,
               eventId: arg
             })
-            if (!listener) {
-              return null // skip call as others are still interested
-            }
             unwrapped.push(listener)
           } else {
             this._mustTrackClient = true
@@ -759,8 +748,6 @@ class VrpcAdapter {
       return VrpcAdapter._listeners[instanceId][eventId].listener
     }
     VrpcAdapter._listeners[instanceId][eventId].clients.push(clientId)
-    // if "event" is defined we are calling against a plain EventEmitter and
-    // have to skip this call as we have registered internally
     return VrpcAdapter._listeners[instanceId][eventId].listener
   }
 

package/vrpc/VrpcClient.js

@@ -135,6 +135,7 @@ class VrpcClient extends EventEmitter {
     this._cachedSubscriptions = {}
     this._proxies = {}
     this._callbackIds = new WeakMap()
+    this._emitterListener = new WeakMap()
     if (log === 'console') {
       this._log = console
       this._log.debug = () => {}
@@ -187,6 +188,11 @@ class VrpcClient extends EventEmitter {
     }
     if (username === undefined) delete options.username
     if (password === undefined) delete options.password
+
+    this.on('error', err => {
+      this._log.debug(`Encountered MQTT error: ${err.message}`)
+    })
+
     this._client = mqtt.connect(this._broker, options)
 
     // Persistent lifecycle handlers
@@ -210,10 +216,6 @@ class VrpcClient extends EventEmitter {
       this.emit('error', err)
     })
 
-    this.on('error', err => {
-      this._log.debug(`Encountered MQTT error: ${err.message}`)
-    })
-
     this._client.on('connect', () => {
       // This will give us an overview of all remotely available classes
       const agent = this._agent === '*' ? '+' : this._agent
@@ -1222,12 +1224,24 @@ class VrpcClient extends EventEmitter {
       // special case of an EventEmitter provided as argument
       if (this._isEmitter(x)) {
         const { emitter, event } = x
+        let callback = (...args) => emitter.emit(event, ...args)
+        if (this._emitterListener.has(emitter)) {
+          const eventMap = this._emitterListener.get(emitter)
+          if (eventMap.has(event)) {
+            callback = eventMap.get(event)
+          } else {
+            eventMap.set(event, callback)
+          }
+        } else {
+          this._emitterListener.set(emitter, new Map([[event, callback]]))
+        }
+
         const id = this._onRemoteEvent({
           agent,
           className,
           instance,
           event,
-          callback: (...args) => emitter.emit(event, ...args)
+          callback
         })
         wrapped.push(id)
         continue