vrpc 3.8.2 → 3.8.3

package/package.json

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

package/vrpc/VrpcAdapter.js

@@ -547,6 +547,17 @@ class VrpcAdapter {
       return
     }
     const unwrapped = VrpcAdapter._unwrapArguments(json)
+    // special case: removing a listener the adapter does not hold (the
+    // client's subscription outlived a restart of this agent, or it sent
+    // no listener at all) - nothing to remove, and the instance's
+    // EventEmitter would throw on a listener that is not a function
+    if (
+      (json.f === 'off' || json.f === 'removeListener') &&
+      typeof unwrapped[1] !== 'function'
+    ) {
+      json.r = true
+      return
+    }
     // Check whether context is a registered class
     const entry = VrpcAdapter._functionRegistry.get(json.c)
     if (entry !== undefined) {

package/vrpc/VrpcClient.js

@@ -1284,6 +1284,17 @@ class VrpcClient extends EventEmitter {
           isContinuousRemover
         ) {
           const id = await this._offRemoteEvent({ callback })
+          if (
+            !id &&
+            (functionName === 'off' || functionName === 'removeListener')
+          ) {
+            // Nothing of ours to remove - the subscription was already
+            // dropped (the instance or its agent went away and the cache
+            // was cleared, or the listener was never registered). Sending
+            // the call anyway would hand the agent a null listener, which
+            // its EventEmitter rejects. Handled locally: nothing to do.
+            return null
+          }
           wrapped.push(id || null)
           continue
         } else {