vrpc 3.3.2 → 3.5.0

package/browser/vrpc.js.LICENSE.txt

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vrpc",
-  "version": "3.3.2",
+  "version": "3.5.0",
   "description": "Variadic Remote Procedure Calls",
   "main": "index.js",
   "directories": {
@@ -12,13 +12,13 @@
     "build:addon": "ln -sf binding.gyp.no-auto binding.gyp && node-gyp rebuild && rm binding.gyp",
     "build:browser": "./node_modules/.bin/webpack --stats-error-details",
     "build:doc": "./node_modules/.bin/jsdoc2md -f vrpc/VrpcAdapter.js vrpc/VrpcAgent.js vrpc/VrpcClient.js vrpc/VrpcNative.js --param-list-format=list --separators > docs/api.md",
-    "test": "npm run test:adapter && npm run test:native && npm run test:agent && npm run test:client && npm run test:production && npm run test:persistor",
+    "test": "npm run test:adapter && npm run test:agent && npm run test:client && npm run test:persistor && npm run test:production",
     "test:adapter": "./node_modules/.bin/mocha tests/adapter/*.js --exit",
     "test:native": "./node_modules/.bin/mocha tests/native/*.js --exit",
-    "test:agent": "tests/agent/test.sh",
+    "test:agent": "tests/agent/test.sh" ,
     "test:client": "tests/client/test.sh",
     "test:performance": "tests/performance/test.sh",
-    "test:persistor": "./node_modules/.bin/mocha tests/persistor/*.js --exit",
+    "test:persistor": "./node_modules/.bin/mocha tests/persistor/*.js --timeout 30000 --exit",
     "test:production": "./node_modules/.bin/mocha tests/production/lifeCycleTest.js --timeout 30000 --exit && tests/production/test.sh"
   },
   "bin": {
@@ -48,18 +48,18 @@
   "homepage": "https://vrpc.io",
   "devDependencies": {
     "@heisenware/storage": "^1.2.2",
-    "chai": "^4.2.0",
-    "crypto-browserify": "^3.12.0",
-    "dockerode": "^3.2.0",
+    "chai": "^4.3.10",
+    "crypto-browserify": "^3.12.1",
+    "dockerode": "^4.0.9",
     "fs-extra": "^11.3.1",
     "jsdoc-to-markdown": "^7.0.1",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.2",
     "os-browserify": "^0.3.0",
-    "sinon": "^7.3.2",
+    "sinon": "^21.0.0",
     "stream-browserify": "^3.0.0",
     "url": "^0.11.0",
-    "webpack": "^5.24.2",
-    "webpack-cli": "^4.5.0"
+    "webpack": "^5.102.0",
+    "webpack-cli": "^6.0.1"
   },
   "files": [
     "vrpc/",
@@ -68,13 +68,13 @@
   ],
   "browser": "./browser/vrpc.js",
   "dependencies": {
-    "ajv": "^6.10.0",
+    "ajv": "^8.17.1",
     "argparse": "^2.0.1",
     "buffer": "^6.0.3",
-    "caller": "^1.0.1",
+    "caller": "^1.1.0",
     "json-stringify-safe": "^5.0.1",
-    "mqtt": "^4.2.6",
-    "nanoid": "^3.1.23",
+    "mqtt": "^5.14.1",
+    "nanoid": "^3.3.8",
     "process": "^0.11.10"
   },
   "peerDependencies": {

package/vrpc/VrpcAdapter.js

@@ -37,7 +37,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-const crypto = require('crypto')
 const path = require('path')
 const fs = require('fs')
 const Ajv = require('ajv')
@@ -760,7 +759,9 @@ class VrpcAdapter {
       return VrpcAdapter._listeners[instanceId][eventId].listener
     }
     VrpcAdapter._listeners[instanceId][eventId].clients.push(clientId)
-    return null
+    // 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
   }
 
   static _generateListener ({ eventId, instanceId, isCallAll }) {
@@ -783,8 +784,8 @@ class VrpcAdapter {
         if (Object.keys(VrpcAdapter._listeners[instanceId]).length === 0) {
           delete VrpcAdapter._listeners[instanceId]
         }
-        return listener
       }
+      return listener
     }
   }
 
@@ -794,11 +795,8 @@ class VrpcAdapter {
     Object.entries(eventIds).forEach(([ek, ev]) => {
       if (ev.event === event && ev.clients.includes(clientId)) {
         ev.clients = ev.clients.filter(x => x !== clientId)
+        VrpcAdapter.getInstance(instanceId).removeAllListeners(ev.event)
         if (ev.clients.length === 0) {
-          VrpcAdapter.getInstance(instanceId).removeListener(
-            ev.event,
-            ev.listener
-          )
           delete VrpcAdapter._listeners[instanceId][ek]
         }
       }
@@ -825,10 +823,6 @@ class VrpcAdapter {
     }
   }
 
-  static _generateId (object) {
-    return crypto.createHash('md5').update(JSON.stringify(object)).digest('hex')
-  }
-
   static _getClassEntry (className) {
     const entry = VrpcAdapter._functionRegistry.get(className)
     if (!entry) {

package/vrpc/VrpcAgent.js

@@ -1,7 +1,7 @@
 const os = require('os')
 const path = require('path')
 const mqtt = require('mqtt')
-const crypto = require('crypto')
+const { nanoid } = require('nanoid')
 const { ArgumentParser } = require('argparse')
 const EventEmitter = require('events')
 const jsonStringifySafe = require('json-stringify-safe')
@@ -57,7 +57,7 @@ class VrpcAgent extends EventEmitter {
     })
     parser.add_argument('-b', '--broker', {
       help: 'Broker url',
-      default: broker || 'mqtts://vrpc.io:8883'
+      default: broker || 'mqtts://broker.hivemq.com:8883'
     })
     parser.add_argument('-u', '--username', {
       help: 'Username',
@@ -96,7 +96,7 @@ class VrpcAgent extends EventEmitter {
    * @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>`
+   * @param {String} [obj.broker='mqtts://broker.hivemq.com:8883'] Broker url in form: `<scheme>://<host>:<port>`
    * @param {Object} [obj.log=console] Log object (must support debug, info, warn, and error level)
    * @param {String} [obj.bestEffort=true] If true, message will be sent with best effort, i.e. no caching if offline
    * @param {String} [obj.version=''] The (user-defined) version of this agent
@@ -114,7 +114,7 @@ class VrpcAgent extends EventEmitter {
     token,
     domain = 'vrpc',
     agent = VrpcAgent._generateAgentName(),
-    broker = 'mqtts://vrpc.io:8883',
+    broker = 'mqtts://broker.hivemq.com:8883',
     log = 'console',
     bestEffort = true,
     version = '',
@@ -132,12 +132,7 @@ class VrpcAgent extends EventEmitter {
     this._qos = bestEffort ? 0 : 1
     this._version = version
     this._mqttClientId =
-      mqttClientId ||
-      `va3${crypto
-        .createHash('md5')
-        .update(this._domain + this._agent)
-        .digest('hex')
-        .substring(0, 20)}`
+      mqttClientId || `va3${VrpcAgent._createHash(this._domain + this._agent)}`
     if (log === 'console') {
       this._log = console
       this._log.debug = () => {}
@@ -268,13 +263,28 @@ class VrpcAgent extends EventEmitter {
     return obj
   }
 
+  static _createHash (str, length = 20) {
+    // Extended DJB2 hash with two accumulators
+    let hash1 = 5381
+    let hash2 = 52711 // different seed
+
+    for (let i = 0; i < str.length; i++) {
+      const char = str.charCodeAt(i)
+      hash1 = (hash1 * 33) ^ char
+      hash2 = (hash2 * 33) ^ char
+    }
+
+    // Combine into longer hex string
+    const token =
+      (hash1 >>> 0).toString(16).padStart(8, '0') +
+      (hash2 >>> 0).toString(16).padStart(8, '0')
+
+    return token.slice(0, length)
+  }
+
   static _generateAgentName () {
     const { username } = os.userInfo()
-    const pathId = crypto
-      .createHash('md5')
-      .update(path.resolve())
-      .digest('hex')
-      .substring(0, 4)
+    const pathId = VrpcAgent._createHash(path.resolve, 4)
     return `${username}-${pathId}@${os.hostname()}-${os.platform()}-js`
   }
 
@@ -293,7 +303,7 @@ class VrpcAgent extends EventEmitter {
       os.type() +
       JSON.stringify(os.networkInterfaces()) +
       JSON.stringify(os.cpus().map(({ model }) => model))
-    return crypto.createHash('md5').update(uid).digest('hex')
+    return VrpcAgent._createHash(uid)
   }
 
   _validateDomain (domain) {

package/vrpc/VrpcBrowserAdapter.js

@@ -37,7 +37,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-const crypto = require('crypto')
 const Ajv = require('ajv')
 const EventEmitter = require('events')
 const { nanoid } = require('nanoid')
@@ -727,10 +726,6 @@ class VrpcAdapter {
     }
   }
 
-  static _generateId (object) {
-    return crypto.createHash('md5').update(JSON.stringify(object)).digest('hex')
-  }
-
   static _getClassEntry (className) {
     const entry = VrpcAdapter._functionRegistry.get(className)
     if (!entry) {

package/vrpc/VrpcBrowserAgent.js

@@ -1,6 +1,5 @@
 const os = require('os')
 const mqtt = require('mqtt')
-const crypto = require('crypto')
 const VrpcAdapter = require('./VrpcBrowserAdapter')
 const EventEmitter = require('events')
 const { nanoid } = require('nanoid')
@@ -13,7 +12,6 @@ const VRPC_PROTOCOL_VERSION = 3
  * @extends EventEmitter
  */
 class VrpcAgent extends EventEmitter {
-
   /**
    * Constructs an agent instance
    *
@@ -24,7 +22,7 @@ class VrpcAgent extends EventEmitter {
    * @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>`
+   * @param {String} [obj.broker='mqtts://broker.hivemq.com:8883'] Broker url in form: `<scheme>://<host>:<port>`
    * @param {Object} [obj.log=console] Log object (must support debug, info, warn, and error level)
    * @param {String} [obj.bestEffort=false] If true, message will be sent with best effort, i.e. no caching if offline
    * @param {String} [obj.version=''] The (user-defined) version of this agent
@@ -42,7 +40,7 @@ class VrpcAgent extends EventEmitter {
     token,
     domain = 'vrpc',
     agent = nanoid(8),
-    broker = 'mqtts://vrpc.io:8883',
+    broker = 'mqtts://broker.hivemq.com:8883',
     log = 'console',
     bestEffort = false,
     version = '',
@@ -61,11 +59,7 @@ class VrpcAgent extends EventEmitter {
     this._version = version
     this._mqttClientId =
       mqttClientId ||
-      `va3${crypto
-        .createHash('md5')
-        .update(this._domain + this._agent)
-        .digest('hex')
-        .substring(0, 20)}`
+      `va3${VrpcAgent._createHash(this._domain + this._agent)}`
     if (log === 'console') {
       this._log = console
       this._log.debug = () => {}
@@ -171,6 +165,25 @@ class VrpcAgent extends EventEmitter {
     }
   }
 
+  static _createHash (str, length = 20) {
+    // Extended DJB2 hash with two accumulators
+    let hash1 = 5381
+    let hash2 = 52711 // different seed
+
+    for (let i = 0; i < str.length; i++) {
+      const char = str.charCodeAt(i)
+      hash1 = (hash1 * 33) ^ char
+      hash2 = (hash2 * 33) ^ char
+    }
+
+    // Combine into longer hex string
+    const token =
+      (hash1 >>> 0).toString(16).padStart(8, '0') +
+      (hash2 >>> 0).toString(16).padStart(8, '0')
+
+    return token.slice(0, length)
+  }
+
   _validateDomain (domain) {
     if (!domain) throw new Error('The domain must be specified')
     if (domain.match(/[+/#*]/)) {
@@ -373,7 +386,7 @@ class VrpcAgent extends EventEmitter {
 
   _publishClassInfoMessage (className) {
     const json = {
-      className: className,
+      className,
       instances: this._getInstances(className),
       memberFunctions: this._getMemberFunctions(className),
       staticFunctions: this._getStaticFunctions(className),