vrpc 3.3.1 → 3.4.0

package/package.json

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

package/vrpc/VrpcClient.js

@@ -1081,8 +1081,6 @@ class VrpcClient extends EventEmitter {
             event,
             callback
           })
-          // indicate that no network call is required
-          if (id === null) return null
           wrapped.push(id)
           continue
         } else if (
@@ -1098,8 +1096,6 @@ class VrpcClient extends EventEmitter {
             event,
             callback
           })
-          // indicate that no network call is required
-          if (id === null) return null
           wrapped.push(id)
           continue
         } else {
@@ -1123,8 +1119,6 @@ class VrpcClient extends EventEmitter {
           event,
           callback: (...args) => emitter.emit(event, ...args)
         })
-        // indicate that no network call is required
-        if (id === null) return null
         wrapped.push(id)
         continue
       }
@@ -1153,8 +1147,7 @@ class VrpcClient extends EventEmitter {
     }
     // otherwise just add the new callback-handler pair
     this._cachedSubscriptions[topic].push({ callback, handler })
-    // indicate that no network call is required
-    return null
+    return id
   }
 
   _offRemoteEvent ({ agent, className, instance, event, callback }) {
@@ -1177,8 +1170,7 @@ class VrpcClient extends EventEmitter {
         delete this._cachedSubscriptions[topic]
         return id
       }
-      // indicate that no network call is required
-      return null
+      return id
     } else {
       this._log.warn(`Can not unsubscribe from non-existing event: ${event}`)
     }
@@ -1225,7 +1217,8 @@ class VrpcClient extends EventEmitter {
 
   _isEmitter (variable) {
     return (
-      variable && typeof variable === 'object' &&
+      variable &&
+      typeof variable === 'object' &&
       variable.hasOwnProperty('emitter') &&
       variable.hasOwnProperty('event') &&
       typeof variable.emitter === 'object' &&

package/vrpc/VrpcPersistor.js

@@ -38,7 +38,6 @@ SOFTWARE.
 */
 
 const VrpcAdapter = require('./VrpcAdapter')
-const Storage = require('@heisenware/storage')
 
 /**
  * Provides a persistence layer for VRPC instances.
@@ -55,19 +54,21 @@ class VrpcPersistor {
    *
    * @param {object} options Configuration options for the persistor.
    * @param {VrpcAgent} options.agentInstance The VRPC agent whose instances should be persisted.
-   * @param {object} [options.log] Optional logger object (e.g., console) with info, warn, and error methods.
    * @param {string} [options.dir] Optional directory for storage. Defaults to a path derived from the agent's name.
+   * @param {object} [options.log] Optional logger object (e.g. console) with info, warn, and error methods.
    */
-  constructor ({ agentInstance, log, dir }) {
-    this._agentInstance = agentInstance
+  constructor ({ agentInstance, dir, log = console }) {
+    let Storage
+    try {
+      Storage = require('@heisenware/storage')
+    } catch (err) {
+      throw new Error(
+        "The '@heisenware/storage' package is required to use VrpcPersistor. Please install it (`npm i @heisenware/storage`) and add it to your project's dependencies."
+      )
+    }
 
-    // Define a no-operation function for the default logger.
-    const noop = () => {}
-    // Create a default logger that does nothing.
-    const defaultLogger = { info: noop, warn: noop, error: noop }
-    // Merge the user-provided logger with the default.
-    // This makes the log property optional and prevents crashes if methods are missing.
-    this._log = Object.assign({}, defaultLogger, log)
+    this._agentInstance = agentInstance
+    this._log = log
 
     this._dir =
       dir ||