unetjs 2.0.10 → 3.0.0

package/README.md

@@ -63,14 +63,18 @@ The JavaScript version of the UnetSocket API allows a user to connect to a node
 
 The UnetSocket API allows a user to cache responses to parameter requests. This is useful in a scenario where the parameters aren't changing very often, and the user wants to reduce the round trip time for parameter requests.
 
+> This behaviour used to be enabled by default in unetsocket.js v2.0.0 till v2.0.10. From v3.0.0 onwards, this behaviour is **disabled** by default but a available as an option.
+
+You can use the `CachingGateway` class instead of the `Gateway` class to enable this behaviour.
+
 UnetSocket API acheives this using two mechanism, firstly, it can request ALL of the parameters from an Agent instead of just one, and then cache the responses. This is called the `greedy` mode. The greedy mode is enabled by default but can be disabled by setting the `greedy` property to `false` in the `CachingAgentID` constructor.
 
 Secondly, the UnetSocket API caches the responses to parameter requests for a limited time. If the user requests the same parameter again, the UnetSocket will return the cached response. The time to cache a response is set by the `cacheTime` property in the `CachingAgentID` constructor.
 
 ```js
-import {UnetMessages, Gateway} from 'unetjs'
-let gw = new Gateway({...});
-let nodeinfo = await gw.agentForService(Services.NODE_INFO); // returns a CachingAgentID by default.
+import {UnetMessages, CachingGateway} from 'unetjs'
+let gw = new CachingGateway({...});
+let nodeinfo = await gw.agentForService(Services.NODE_INFO); // returns a CachingAgentID
 let cLoc = nodeinfo.get('location'); // this will request all the Parameters from the Agent, and cache the responses.
 ...
 cLoc = nodeinfo.get('location', maxage=5000); // this will return the cached response if it was called within 5000ms of the original request.
@@ -79,9 +83,9 @@ cLoc = nodeinfo.get('location', maxage=0); // this will force the Gateway to req
 ```
 
 ```js
-import {UnetMessages, Gateway} from 'unetjs'
-let gw = new Gateway({...});
-let nodeinfo = await gw.agentForService(Services.NODE_INFO); // returns a CachingAgentID by default.
+import {UnetMessages, CachingGateway} from 'unetjs'
+let gw = new CachingGateway({...});
+let nodeinfo = await gw.agentForService(Services.NODE_INFO); // returns a CachingAgentID
 let nonCachingNodeInfo = await gw.agentForService(Services.NODE_INFO, false); // returns an AgentID without caching (original fjage.js functionality).
 let cLoc = nonCachingNodeInfo.get('location'); // this will request the `location` parameter from the Agent.
 ...

package/dist/cjs/unet.cjs

@@ -1,28 +1,8 @@
-/* unet.js v2.0.10 2022-07-27T05:47:35.162Z */
+/* unet.js v3.0.0 2023-12-11T11:03:52.183Z */
 
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
-
-/* fjage.js v1.10.3 */
+/* fjage.js v1.11.2 */
 
 const isBrowser =
   typeof window !== "undefined" && typeof window.document !== "undefined";
@@ -47,10 +27,13 @@ const isJsDom =
     (navigator.userAgent.includes("Node.js") ||
       navigator.userAgent.includes("jsdom")));
 
-typeof Deno !== "undefined" && typeof Deno.core !== "undefined";
+typeof Deno !== "undefined" &&
+  typeof Deno.version !== "undefined" &&
+  typeof Deno.version.deno !== "undefined";
 
 const SOCKET_OPEN = 'open';
 const SOCKET_OPENING = 'opening';
+const DEFAULT_RECONNECT_TIME$1 = 5000;       // ms, delay between retries to connect to the server.
 
 var createConnection;
 
@@ -62,17 +45,24 @@ class TCPconnector {
 
   /**
     * Create an TCPConnector to connect to a fjage master over TCP
-    * @param {Object} opts
-    * @param {String} [opts.hostname='localhost'] - ip address/hostname of the master container to connect to
-    * @param {number} opts.port - port number of the master container to connect to
+   * @param {Object} opts
+   * @param {string} [opts.hostname='localhost'] - hostname/ip address of the master container to connect to
+   * @param {number} opts.port - port number of the master container to connect to
+   * @param {string} opts.pathname - path of the master container to connect to
+   * @param {boolean} opts.keepAlive - try to reconnect if the connection is lost
+   * @param {number} [opts.reconnectTime=5000] - time before reconnection is attempted after an error
     */
   constructor(opts = {}) {
     this.url = new URL('tcp://localhost');
     let host = opts.hostname || 'localhost';
     let port = opts.port || -1;
-    this.url.hostname = opts.hostname;
-    this.url.port = opts.port;
+    this.url.hostname = host;
+    this.url.port = port;
     this._buf = '';
+    this._reconnectTime = opts.reconnectTime || DEFAULT_RECONNECT_TIME$1;
+    this._keepAlive = opts.keepAlive || true;
+    this._firstConn = true;               // if the Gateway has managed to connect to a server before
+    this._firstReConn = true;             // if the Gateway has attempted to reconnect to a server before
     this.pendingOnOpen = [];              // list of callbacks make as soon as gateway is open
     this.connListeners = [];              // external listeners wanting to listen connection events
     this._sockInit(host, port);
@@ -88,7 +78,7 @@ class TCPconnector {
   _sockInit(host, port){
     if (!createConnection){
       try {
-        Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('net')); }).then(module => {
+        import('net').then(module => {
           createConnection = module.createConnection;
           this._sockSetup(host, port);
         });
@@ -97,7 +87,7 @@ class TCPconnector {
       }
     }else {
       this._sockSetup(host, port);
-    }  
+    }
   }
 
   _sockSetup(host, port){
@@ -116,18 +106,18 @@ class TCPconnector {
   }
 
   _sockReconnect(){
-    if (this._firstConn || !this.keepAlive || this.sock.readyState == SOCKET_OPENING || this.sock.readyState == SOCKET_OPEN) return;
+    if (this._firstConn || !this._keepAlive || this.sock.readyState == SOCKET_OPENING || this.sock.readyState == SOCKET_OPEN) return;
     if (this._firstReConn) this._sendConnEvent(false);
     this._firstReConn = false;
-    if(this.debug) console.log('Reconnecting to ', this.sock.remoteAddress + ':' + this.sock.remotePort);
     setTimeout(() => {
       this.pendingOnOpen = [];
-      this._sockSetup(this.sock.url);
+      this._sockSetup(this.url.hostname, this.url.port);
     }, this._reconnectTime);
   }
 
   _onSockOpen() {
     this._sendConnEvent(true);
+    this._firstConn = false;
     this.sock.on('close', this._sockReconnect.bind(this));
     this.sock.on('data', this._processSockData.bind(this));
     this.pendingOnOpen.forEach(cb => cb());
@@ -184,7 +174,7 @@ class TCPconnector {
    * @ignore
    * @param {string} s - incoming message string
    */
-  
+
   /**
    * Add listener for connection events
    * @param {function} listener - a listener callback that is called when the connection is opened/closed
@@ -215,12 +205,16 @@ class TCPconnector {
     if (this.sock.readyState == SOCKET_OPENING) {
       this.pendingOnOpen.push(() => {
         this.sock.send('{"alive": false}\n');
-        this.sock.onclose = null;
+        this.sock.removeAllListeners('connect');
+        this.sock.removeAllListeners('error');
+        this.sock.removeAllListeners('close');
         this.sock.destroy();
       });
     } else if (this.sock.readyState == SOCKET_OPEN) {
       this.sock.send('{"alive": false}\n');
-      this.sock.onclose = null;
+      this.sock.removeAllListeners('connect');
+      this.sock.removeAllListeners('error');
+      this.sock.removeAllListeners('close');
       this.sock.destroy();
     }
   }
@@ -245,11 +239,11 @@ class WSConnector {
    */
   constructor(opts = {}) {
     this.url = new URL('ws://localhost');
-    this.url.hostname = opts.hostname;      
+    this.url.hostname = opts.hostname;
     this.url.port = opts.port;
     this.url.pathname = opts.pathname;
     this._reconnectTime = opts.reconnectTime || DEFAULT_RECONNECT_TIME;
-    this._keepAlive = opts.keepAlive;
+    this._keepAlive = opts.keepAlive || true;
     this.debug = opts.debug || false;      // debug info to be logged to console?
     this._firstConn = true;               // if the Gateway has managed to connect to a server before
     this._firstReConn = true;             // if the Gateway has attempted to reconnect to a server before
@@ -335,7 +329,7 @@ class WSConnector {
    * @ignore
    * @param {string} s - incoming message string
    */
-  
+
   /**
    * Add listener for connection events
    * @param {function} listener - a listener callback that is called when the connection is opened/closed
@@ -379,6 +373,7 @@ class WSConnector {
 
 /* global global Buffer */
 
+
 const DEFAULT_QUEUE_SIZE = 128;        // max number of old unreceived messages to store
 
 /**
@@ -706,7 +701,13 @@ class Gateway {
   _sendEvent(type, val) {
     if (Array.isArray(this.eventListeners[type])) {
       this.eventListeners[type].forEach(l => {
-        l && {}.toString.call(l) === '[object Function]' && l(val);
+        if (l && {}.toString.call(l) === '[object Function]'){
+          try {
+            l(val);
+          } catch (error) {
+            console.warn('Error in event listener : ' + error);
+          }
+        }
       });
     }
   }
@@ -735,18 +736,26 @@ class Gateway {
         var consumed = false;
         if (Array.isArray(this.eventListeners['message'])){
           for (var i = 0; i < this.eventListeners['message'].length; i++) {
-            if (this.eventListeners['message'][i](msg)) {
-              consumed = true;
-              break;
+            try {
+              if (this.eventListeners['message'][i](msg)) {
+                consumed = true;
+                break;
+              }
+            } catch (error) {
+              console.warn('Error in message listener : ' + error);
             }
           }
         }
         // iterate over internal callbacks, until one consumes the message
         for (var key in this.listener){
           // callback returns true if it has consumed the message
-          if (this.listener[key](msg)) {
-            consumed = true;
-            break;
+          try {
+            if (this.listener[key](msg)) {
+              consumed = true;
+              break;
+            }
+          } catch (error) {
+            console.warn('Error in listener : ' + error);
           }
         }
         if(!consumed) {
@@ -834,6 +843,7 @@ class Gateway {
         this.connector.write('{"alive": true}');
         this._update_watch();
       }
+      this._sendEvent('conn', state);
     });
     return conn;
   }
@@ -847,7 +857,12 @@ class Gateway {
     } else if (filter.__proto__.name == 'Message' || filter.__proto__.__proto__.name == 'Message') {
       return filter.__clazz__ == msg.__clazz__;
     } else if (typeof filter == 'function') {
-      return filter(msg);
+      try {
+        return filter(msg);
+      }catch(e){
+        console.warn('Error in filter : ' + e);
+        return false;
+      }
     } else {
       return msg instanceof filter;
     }
@@ -1117,7 +1132,7 @@ class Gateway {
       let timer;
       if (timeout > 0){
         timer = setTimeout(() => {
-          delete this.listener[lid];
+          this.listener[lid] && delete this.listener[lid];
           if (this.debug) console.log('Receive Timeout : ' + filter);
           resolve();
         }, timeout);
@@ -1125,7 +1140,7 @@ class Gateway {
       this.listener[lid] = msg => {
         if (!this._matchMessage(filter, msg)) return false;
         if(timer) clearTimeout(timer);
-        delete this.listener[lid];
+        this.listener[lid] && delete this.listener[lid];
         resolve(msg);
         return true;
       };
@@ -1724,7 +1739,7 @@ class UnetSocket {
 
   constructor(hostname, port, path='') {
     return (async () => {
-      this.gw = new CachingGateway({
+      this.gw = new Gateway({
         hostname : hostname,
         port : port,
         path : path
@@ -1984,7 +1999,8 @@ class UnetSocket {
 
 exports.AgentID = AgentID;
 exports.CachingAgentID = CachingAgentID;
-exports.Gateway = CachingGateway;
+exports.CachingGateway = CachingGateway;
+exports.Gateway = Gateway;
 exports.Message = Message;
 exports.MessageClass = MessageClass;
 exports.Performative = Performative;

package/dist/esm/unet.js

@@ -1,6 +1,6 @@
-/* unet.js v2.0.10 2022-07-27T05:47:35.162Z */
+/* unet.js v3.0.0 2023-12-11T11:03:52.183Z */
 
-/* fjage.js v1.10.3 */
+/* fjage.js v1.11.2 */
 
 const isBrowser =
   typeof window !== "undefined" && typeof window.document !== "undefined";
@@ -25,10 +25,13 @@ const isJsDom =
     (navigator.userAgent.includes("Node.js") ||
       navigator.userAgent.includes("jsdom")));
 
-typeof Deno !== "undefined" && typeof Deno.core !== "undefined";
+typeof Deno !== "undefined" &&
+  typeof Deno.version !== "undefined" &&
+  typeof Deno.version.deno !== "undefined";
 
 const SOCKET_OPEN = 'open';
 const SOCKET_OPENING = 'opening';
+const DEFAULT_RECONNECT_TIME$1 = 5000;       // ms, delay between retries to connect to the server.
 
 var createConnection;
 
@@ -40,17 +43,24 @@ class TCPconnector {
 
   /**
     * Create an TCPConnector to connect to a fjage master over TCP
-    * @param {Object} opts
-    * @param {String} [opts.hostname='localhost'] - ip address/hostname of the master container to connect to
-    * @param {number} opts.port - port number of the master container to connect to
+   * @param {Object} opts
+   * @param {string} [opts.hostname='localhost'] - hostname/ip address of the master container to connect to
+   * @param {number} opts.port - port number of the master container to connect to
+   * @param {string} opts.pathname - path of the master container to connect to
+   * @param {boolean} opts.keepAlive - try to reconnect if the connection is lost
+   * @param {number} [opts.reconnectTime=5000] - time before reconnection is attempted after an error
     */
   constructor(opts = {}) {
     this.url = new URL('tcp://localhost');
     let host = opts.hostname || 'localhost';
     let port = opts.port || -1;
-    this.url.hostname = opts.hostname;
-    this.url.port = opts.port;
+    this.url.hostname = host;
+    this.url.port = port;
     this._buf = '';
+    this._reconnectTime = opts.reconnectTime || DEFAULT_RECONNECT_TIME$1;
+    this._keepAlive = opts.keepAlive || true;
+    this._firstConn = true;               // if the Gateway has managed to connect to a server before
+    this._firstReConn = true;             // if the Gateway has attempted to reconnect to a server before
     this.pendingOnOpen = [];              // list of callbacks make as soon as gateway is open
     this.connListeners = [];              // external listeners wanting to listen connection events
     this._sockInit(host, port);
@@ -75,7 +85,7 @@ class TCPconnector {
       }
     }else {
       this._sockSetup(host, port);
-    }  
+    }
   }
 
   _sockSetup(host, port){
@@ -94,18 +104,18 @@ class TCPconnector {
   }
 
   _sockReconnect(){
-    if (this._firstConn || !this.keepAlive || this.sock.readyState == SOCKET_OPENING || this.sock.readyState == SOCKET_OPEN) return;
+    if (this._firstConn || !this._keepAlive || this.sock.readyState == SOCKET_OPENING || this.sock.readyState == SOCKET_OPEN) return;
     if (this._firstReConn) this._sendConnEvent(false);
     this._firstReConn = false;
-    if(this.debug) console.log('Reconnecting to ', this.sock.remoteAddress + ':' + this.sock.remotePort);
     setTimeout(() => {
       this.pendingOnOpen = [];
-      this._sockSetup(this.sock.url);
+      this._sockSetup(this.url.hostname, this.url.port);
     }, this._reconnectTime);
   }
 
   _onSockOpen() {
     this._sendConnEvent(true);
+    this._firstConn = false;
     this.sock.on('close', this._sockReconnect.bind(this));
     this.sock.on('data', this._processSockData.bind(this));
     this.pendingOnOpen.forEach(cb => cb());
@@ -162,7 +172,7 @@ class TCPconnector {
    * @ignore
    * @param {string} s - incoming message string
    */
-  
+
   /**
    * Add listener for connection events
    * @param {function} listener - a listener callback that is called when the connection is opened/closed
@@ -193,12 +203,16 @@ class TCPconnector {
     if (this.sock.readyState == SOCKET_OPENING) {
       this.pendingOnOpen.push(() => {
         this.sock.send('{"alive": false}\n');
-        this.sock.onclose = null;
+        this.sock.removeAllListeners('connect');
+        this.sock.removeAllListeners('error');
+        this.sock.removeAllListeners('close');
         this.sock.destroy();
       });
     } else if (this.sock.readyState == SOCKET_OPEN) {
       this.sock.send('{"alive": false}\n');
-      this.sock.onclose = null;
+      this.sock.removeAllListeners('connect');
+      this.sock.removeAllListeners('error');
+      this.sock.removeAllListeners('close');
       this.sock.destroy();
     }
   }
@@ -223,11 +237,11 @@ class WSConnector {
    */
   constructor(opts = {}) {
     this.url = new URL('ws://localhost');
-    this.url.hostname = opts.hostname;      
+    this.url.hostname = opts.hostname;
     this.url.port = opts.port;
     this.url.pathname = opts.pathname;
     this._reconnectTime = opts.reconnectTime || DEFAULT_RECONNECT_TIME;
-    this._keepAlive = opts.keepAlive;
+    this._keepAlive = opts.keepAlive || true;
     this.debug = opts.debug || false;      // debug info to be logged to console?
     this._firstConn = true;               // if the Gateway has managed to connect to a server before
     this._firstReConn = true;             // if the Gateway has attempted to reconnect to a server before
@@ -313,7 +327,7 @@ class WSConnector {
    * @ignore
    * @param {string} s - incoming message string
    */
-  
+
   /**
    * Add listener for connection events
    * @param {function} listener - a listener callback that is called when the connection is opened/closed
@@ -357,6 +371,7 @@ class WSConnector {
 
 /* global global Buffer */
 
+
 const DEFAULT_QUEUE_SIZE = 128;        // max number of old unreceived messages to store
 
 /**
@@ -684,7 +699,13 @@ class Gateway {
   _sendEvent(type, val) {
     if (Array.isArray(this.eventListeners[type])) {
       this.eventListeners[type].forEach(l => {
-        l && {}.toString.call(l) === '[object Function]' && l(val);
+        if (l && {}.toString.call(l) === '[object Function]'){
+          try {
+            l(val);
+          } catch (error) {
+            console.warn('Error in event listener : ' + error);
+          }
+        }
       });
     }
   }
@@ -713,18 +734,26 @@ class Gateway {
         var consumed = false;
         if (Array.isArray(this.eventListeners['message'])){
           for (var i = 0; i < this.eventListeners['message'].length; i++) {
-            if (this.eventListeners['message'][i](msg)) {
-              consumed = true;
-              break;
+            try {
+              if (this.eventListeners['message'][i](msg)) {
+                consumed = true;
+                break;
+              }
+            } catch (error) {
+              console.warn('Error in message listener : ' + error);
             }
           }
         }
         // iterate over internal callbacks, until one consumes the message
         for (var key in this.listener){
           // callback returns true if it has consumed the message
-          if (this.listener[key](msg)) {
-            consumed = true;
-            break;
+          try {
+            if (this.listener[key](msg)) {
+              consumed = true;
+              break;
+            }
+          } catch (error) {
+            console.warn('Error in listener : ' + error);
           }
         }
         if(!consumed) {
@@ -812,6 +841,7 @@ class Gateway {
         this.connector.write('{"alive": true}');
         this._update_watch();
       }
+      this._sendEvent('conn', state);
     });
     return conn;
   }
@@ -825,7 +855,12 @@ class Gateway {
     } else if (filter.__proto__.name == 'Message' || filter.__proto__.__proto__.name == 'Message') {
       return filter.__clazz__ == msg.__clazz__;
     } else if (typeof filter == 'function') {
-      return filter(msg);
+      try {
+        return filter(msg);
+      }catch(e){
+        console.warn('Error in filter : ' + e);
+        return false;
+      }
     } else {
       return msg instanceof filter;
     }
@@ -1095,7 +1130,7 @@ class Gateway {
       let timer;
       if (timeout > 0){
         timer = setTimeout(() => {
-          delete this.listener[lid];
+          this.listener[lid] && delete this.listener[lid];
           if (this.debug) console.log('Receive Timeout : ' + filter);
           resolve();
         }, timeout);
@@ -1103,7 +1138,7 @@ class Gateway {
       this.listener[lid] = msg => {
         if (!this._matchMessage(filter, msg)) return false;
         if(timer) clearTimeout(timer);
-        delete this.listener[lid];
+        this.listener[lid] && delete this.listener[lid];
         resolve(msg);
         return true;
       };
@@ -1702,7 +1737,7 @@ class UnetSocket {
 
   constructor(hostname, port, path='') {
     return (async () => {
-      this.gw = new CachingGateway({
+      this.gw = new Gateway({
         hostname : hostname,
         port : port,
         path : path
@@ -1960,4 +1995,4 @@ class UnetSocket {
   }
 }
 
-export { AgentID, CachingAgentID, CachingGateway as Gateway, Message, MessageClass, Performative, Protocol, Services, UnetMessages, UnetSocket, toGps, toLocal };
+export { AgentID, CachingAgentID, CachingGateway, Gateway, Message, MessageClass, Performative, Protocol, Services, UnetMessages, UnetSocket, toGps, toLocal };