vrpc 3.0.3 → 3.1.1

package/vrpc/VrpcClient.js

@@ -59,7 +59,7 @@ class VrpcClient extends EventEmitter {
    *
    * @constructor
    * @param {Object} options
-   * @param {String} [options.username='<user>@<hostname>-<platform>-js'] MQTT username
+   * @param {String} [options.username] MQTT username
    * @param {String} [options.password] MQTT password (if no token is provided)
    * @param {String} [options.token] Access token
    * @param {String} options.domain Sets the domain
@@ -68,6 +68,8 @@ class VrpcClient extends EventEmitter {
    * @param {Number} [options.timeout=6000] Maximum time in ms to wait for a RPC answer
    * @param {Object} [options.log=console] Log object (must support debug, info, warn, and error level)
    * @param {Boolean} [options.bestEffort=false] If true, message will be sent with best effort, i.e. no caching if offline
+   * @param {String} [options.mqttClientId='<generated()>'] Explicitly sets the mqtt client id
+   * @param {String} [options.identity] Explicitly sets a vrpc client identity
    * @example
    * const client = new VrpcClient({
    *   domain: 'vrpc',
@@ -77,13 +79,15 @@ class VrpcClient extends EventEmitter {
   constructor ({
     token,
     password,
-    username = VrpcClient._generateUserName(),
+    username,
     domain,
     agent = '*',
     broker = 'mqtts://vrpc.io:8883',
     timeout = 6 * 1000,
     log = 'console',
-    bestEffort = false
+    bestEffort = false,
+    mqttClientId = null,
+    identity = null
   } = {}) {
     super()
     // domain sanity check
@@ -99,6 +103,12 @@ class VrpcClient extends EventEmitter {
         'The agent must NOT contain any of those characters: "+", "/", "#"'
       )
     }
+    // identity sanity check
+    if (identity && identity.match(/[+/#$]/)) {
+      throw new Error(
+        'The identity must NOT contain any of those characters: "+", "/", "#", "$"'
+      )
+    }
     this._token = token
     this._username = username
     this._password = password
@@ -106,10 +116,11 @@ class VrpcClient extends EventEmitter {
     this._domain = domain
     this._broker = broker
     this._timeout = timeout
+    this._identity = identity
     this._qos = this._qos = bestEffort ? 0 : 1
 
     this._instance = nanoid(8)
-    this._mqttClientId = this._createMqttClientId()
+    this._mqttClientId = mqttClientId || this._createMqttClientId()
     this._vrpcClientId = this._createVrpcClientId()
     this._agents = {}
     this._eventEmitter = new EventEmitter()
@@ -152,7 +163,7 @@ class VrpcClient extends EventEmitter {
     let username = this._username
     let password = this._password
     if (this._token) {
-      username = username || VrpcClient._generateUserName()
+      username = username || this._generateUserName()
       password = this._token
     }
     const options = {
@@ -324,7 +335,7 @@ class VrpcClient extends EventEmitter {
       f: isIsolated ? '__createIsolated__' : '__createShared__',
       a: [instance, ...args],
       i: `${this._instance}-${this._invokeId++ % Number.MAX_SAFE_INTEGER}`,
-      s: `${this._domain}/${os.hostname()}/${this._instance}`,
+      s: this._vrpcClientId,
       v: VRPC_PROTOCOL_VERSION
     }
     const proxy = await this._getProxy(agent, className, json)
@@ -371,7 +382,7 @@ class VrpcClient extends EventEmitter {
       f: '__delete__',
       a: [instance],
       i: `${this._instance}-${this._invokeId++ % Number.MAX_SAFE_INTEGER}`,
-      s: `${this._domain}/${os.hostname()}/${this._instance}`,
+      s: this._vrpcClientId,
       v: VRPC_PROTOCOL_VERSION
     }
     const topic = `${this._domain}/${agent}/${className}/__static__/__delete__`
@@ -660,14 +671,13 @@ class VrpcClient extends EventEmitter {
     return new Promise(resolve => this._client.end(false, {}, resolve))
   }
 
-  static _generateUserName () {
-    return `${os.userInfo().username}@${os.hostname()}-${os.platform()}-js`
+  _generateUserName () {
+    return `${this._domain}:client@${os.hostname()}-${os.platform()}-js`
   }
 
   _createMqttClientId () {
     const clientInfo =
       os.arch() +
-      JSON.stringify(os.cpus()) +
       os.homedir() +
       os.hostname() +
       JSON.stringify(os.networkInterfaces()) +
@@ -685,7 +695,8 @@ class VrpcClient extends EventEmitter {
   }
 
   _createVrpcClientId () {
-    return `${this._domain}/${os.hostname()}/${this._instance}`
+    const identity = this._identity || this._instance
+    return `${this._domain}/${os.hostname()}/${identity}`
   }
 
   _mqttPublish (topic, message, options) {
@@ -698,6 +709,12 @@ class VrpcClient extends EventEmitter {
           this._log.warn(
             `Could not publish MQTT message because: ${err.message}`
           )
+          if (err.message === 'client disconnecting') {
+            // Workaround for an already reported bug in MQTT.js (#1284)
+            this._log.info('Forcing reconnect now...')
+            this._client.disconnecting = false
+            this._client.end(true, {}, () => this._client.reconnect())
+          }
         }
       }
     )
@@ -710,9 +727,44 @@ class VrpcClient extends EventEmitter {
       (err, granted) => {
         if (err) {
           this._log.warn(
-            `Could not subscribe to topic: ${topic} because: ${err.message}`
+            `Could not subscribe to topic(s): '${topic}', because: ${err.message}`
           )
+          if (err.message === 'client disconnecting') {
+            // Workaround for an already reported bug in MQTT.js (#1284)
+            this._log.info('Forcing reconnect now...')
+            this._client.disconnecting = false
+            this._client.end(true, {}, () => this._client.reconnect())
+          }
         } else {
+          const topicArray = Array.isArray(topic) ? topic : [topic]
+          const erroneousGranted = granted
+            .filter(x => x.qos === 128)
+            .map(x => x.topic)
+          if (erroneousGranted.length > 0) {
+            err = new Error(
+              `Could not subscribe all ${topicArray.length} topic(s) but got error qos=128 on following ${erroneousGranted.length} topic(s): ${erroneousGranted}`
+            )
+            err.code = 'SUBSCRIBE_FAILED'
+            err.subscribeOptions = options
+            this._log.error(err)
+            this.emit('error', err)
+          }
+          const reducedQos = granted.filter(x => x.qos < this._qos)
+          if (reducedQos.length > 0) {
+            err = new Error(
+              `Could not subscribe all ${
+                topicArray.length
+              } topic(s) at desired qos=${
+                this._qos
+              } but got reduced qos on following ${
+                reducedQos.length
+              } topic(s): ${JSON.stringify(reducedQos)}`
+            )
+            err.code = 'SUBSCRIBE_REDUCED_QOS'
+            err.subscribeOptions = options
+            this._log.warn(err)
+            this.emit('error', err)
+          }
           if (granted.length === 0) {
             this._log.debug(`Already subscribed to: ${topic}`)
           }

package/vrpc/VrpcNative.js

@@ -106,12 +106,28 @@ class VrpcNative {
           if (functionName.startsWith('vrpcOn')) {
             const id = `__f__${context}-${functionName}`
             wrapped.push(id)
-            eventEmitter.on(id, a => x.apply(null, a))
+            eventEmitter.on(id, a => {
+              try {
+                x.apply(null, a)
+              } catch (err) {
+                console.error(
+                  `[VrpcNative ${context}-${functionName}]: Failed to execute callback, because: ${err.message}`
+                )
+              }
+            })
           } else {
             const id = `__f__${context}-${functionName}-${i}-${invokeId++ %
               Number.MAX_SAFE_INTEGER}`
             wrapped.push(id)
-            eventEmitter.once(id, a => x.apply(null, a))
+            eventEmitter.once(id, a => {
+              try {
+                x.apply(null, a)
+              } catch (err) {
+                console.error(
+                  `[VrpcNative ${context}-${functionName}]: Failed to execute callback, because: ${err.message}`
+                )
+              }
+            })
           }
         } else if (VrpcNative._isEmitter(x)) {
           const { emitter, event } = x
@@ -273,12 +289,28 @@ class VrpcNative {
         if (functionName.startsWith('vrpcOn')) {
           const id = `__f__${className}-${functionName}:${args[0]}`
           wrapped.push(id)
-          this._eventEmitter.on(id, a => x.apply(null, a))
+          this._eventEmitter.on(id, a => {
+            try {
+              x.apply(null, a)
+            } catch (err) {
+              console.error(
+                `[VrpcNative ${className}-${functionName}]: Failed to execute callback, because: ${err.message}`
+              )
+            }
+          })
         } else {
           const id = `__f__${className}-${functionName}-${i}-${invokeId++ %
             Number.MAX_SAFE_INTEGER}`
           wrapped.push(id)
-          this._eventEmitter.once(id, a => x.apply(null, a))
+          this._eventEmitter.once(id, a => {
+            try {
+              x.apply(null, a)
+            } catch (err) {
+              console.error(
+                `[VrpcNative ${className}-${functionName}]: Failed to execute callback, because: ${err.message}`
+              )
+            }
+          })
         }
       } else if (VrpcNative._isEmitter(x)) {
         const { emitter, event } = x