vrpc 3.0.2 → 3.0.3

package/package.json

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

package/vrpc/VrpcAgent.js

@@ -92,9 +92,9 @@ class VrpcAgent extends EventEmitter {
    *
    * @constructor
    * @param {Object} obj
-   * @param {String} [obj.username] MQTT username (if no token is used)
+   * @param {String} [obj.username='<user>-<pathId>@<hostname>-<platform>-js'] MQTT username
    * @param {String} [obj.password] MQTT password (if no token is provided)
-   * @param {String} [obj.token] Access token as generated by: https://app.vrpc.io (only optional when using default domain and broker)
+   * @param {String} [obj.token] Access token
    * @param {String} [obj.domain='vrpc'] The domain under which the agent-provided code is reachable
    * @param {String} [obj.agent='<user>-<pathId>@<hostname>-<platform>-js'] This agent's name
    * @param {String} [obj.broker='mqtts://vrpc.io:8883'] Broker url in form: `<scheme>://<host>:<port>`
@@ -109,9 +109,9 @@ class VrpcAgent extends EventEmitter {
    * })
    */
   constructor ({
-    username,
-    password,
     token,
+    password,
+    username = VrpcAgent._generateAgentName(),
     domain = 'vrpc',
     agent = VrpcAgent._generateAgentName(),
     broker = 'mqtts://vrpc.io:8883',
@@ -173,6 +173,7 @@ class VrpcAgent extends EventEmitter {
     let username = this._username
     let password = this._password
     if (this._token) {
+      username = username || this._agent
       password = this._token
     }
     this._options = {
@@ -243,13 +244,17 @@ class VrpcAgent extends EventEmitter {
     }
   }
 
+  static _generateUserName () {
+    return `${os.userInfo().username}@${os.hostname()}-${os.platform()}-js`
+  }
+
   static _generateAgentName () {
     const { username } = os.userInfo()
     const pathId = crypto
       .createHash('md5')
       .update(path.resolve())
       .digest('hex')
-      .substr(0, 4)
+      .substring(0, 4)
     return `${username}-${pathId}@${os.hostname()}-${os.platform()}-js`
   }
 

package/vrpc/VrpcClient.js

@@ -59,9 +59,9 @@ class VrpcClient extends EventEmitter {
    *
    * @constructor
    * @param {Object} options
-   * @param {String} options.token Access token as generated by: https://app.vrpc.io
-   * @param {String} options.username MQTT username (if no token is used)
-   * @param {String} options.password MQTT password (if no token is provided)
+   * @param {String} [options.username='<user>@<hostname>-<platform>-js'] 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
    * @param {String} [options.agent="*"] Sets default agent
    * @param {String} [options.broker="mqtts://vrpc.io:8883"] Broker url in form: `<scheme>://<host>:<port>`
@@ -76,8 +76,8 @@ class VrpcClient extends EventEmitter {
    */
   constructor ({
     token,
-    username,
     password,
+    username = VrpcClient._generateUserName(),
     domain,
     agent = '*',
     broker = 'mqtts://vrpc.io:8883',
@@ -152,6 +152,7 @@ class VrpcClient extends EventEmitter {
     let username = this._username
     let password = this._password
     if (this._token) {
+      username = username || VrpcClient._generateUserName()
       password = this._token
     }
     const options = {
@@ -659,6 +660,10 @@ class VrpcClient extends EventEmitter {
     return new Promise(resolve => this._client.end(false, {}, resolve))
   }
 
+  static _generateUserName () {
+    return `${os.userInfo().username}@${os.hostname()}-${os.platform()}-js`
+  }
+
   _createMqttClientId () {
     const clientInfo =
       os.arch() +
@@ -932,7 +937,8 @@ class VrpcClient extends EventEmitter {
           if (typeof ret === 'string' && ret.substring(0, 5) === '__p__') {
             this._eventEmitter.once(ret, promiseData => {
               // TODO improve error message here, like above
-              if (promiseData.e) reject(new Error(`[vrpc ${agent}-${c}-${f}]: ${promiseData.e}`))
+              if (promiseData.e)
+                reject(new Error(`[vrpc ${agent}-${c}-${f}]: ${promiseData.e}`))
               else resolve(promiseData.r)
             })
           } else {
@@ -1067,7 +1073,9 @@ class VrpcClient extends EventEmitter {
       : `${this._domain}/${agent}/${className}/${event}`
     const id = `__e__${topic}`
     if (this._cachedSubscriptions[topic]) {
-      const index = this._cachedSubscriptions[topic].findIndex(x => x.callback === callback)
+      const index = this._cachedSubscriptions[topic].findIndex(
+        x => x.callback === callback
+      )
       if (index === -1) {
         this._log.warn(`Failed removing event listener ${id}`)
         return null