unetjs 2.0.2 → 2.0.5

package/dist/cjs/unet.cjs

@@ -1,4 +1,4 @@
-/* unet.js v2.0.2 2022-06-10T03:18:03.319Z */
+/* unet.js v2.0.5 2022-06-15T07:40:54.241Z */
 
 'use strict';
 
@@ -22,30 +22,32 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-/* fjage.js v1.9.1-rc6 */
+/* fjage.js v1.10.1 */
 
-/* global window self */
+const isBrowser =
+  typeof window !== "undefined" && typeof window.document !== "undefined";
 
-const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
+const isNode =
+  typeof process !== "undefined" &&
+  process.versions != null &&
+  process.versions.node != null;
 
-/* eslint-disable no-restricted-globals */
-const isWebWorker = typeof self === 'object'
-  && self.constructor
-  && self.constructor.name === 'DedicatedWorkerGlobalScope';
-/* eslint-enable no-restricted-globals */
-
-const isNode = typeof process !== 'undefined'
-  && process.versions != null
-  && process.versions.node != null;
+const isWebWorker =
+  typeof self === "object" &&
+  self.constructor &&
+  self.constructor.name === "DedicatedWorkerGlobalScope";
 
 /**
  * @see https://github.com/jsdom/jsdom/releases/tag/12.0.0
  * @see https://github.com/jsdom/jsdom/issues/1537
  */
-/* eslint-disable no-undef */
-const isJsDom = () => (typeof window !== 'undefined' && window.name === 'nodejs')
-  || navigator.userAgent.includes('Node.js')
-  || navigator.userAgent.includes('jsdom');
+const isJsDom =
+  (typeof window !== "undefined" && window.name === "nodejs") ||
+  (typeof navigator !== "undefined" &&
+    (navigator.userAgent.includes("Node.js") ||
+      navigator.userAgent.includes("jsdom")));
+
+typeof Deno !== "undefined" && typeof Deno.core !== "undefined";
 
 const SOCKET_OPEN = 'open';
 const SOCKET_OPENING = 'opening';
@@ -641,9 +643,9 @@ class Message {
 
 /**
  * A gateway for connecting to a fjage master container. The new version of the constructor
- * uses an options object instead of individual parameters. The old version with 
- * 
- * 
+ * uses an options object instead of individual parameters. The old version with
+ *
+ *
  * @class
  * @param {Object} opts
  * @param {string} [opts.hostname="localhost"] - hostname/ip address of the master container to connect to
@@ -664,7 +666,7 @@ class Gateway {
     if (typeof opts === 'string' || opts instanceof String){
       opts = {
         'hostname': opts,
-        'port' : port || gObj.location.port, 
+        'port' : port || gObj.location.port,
         'pathname' : pathname,
         'timeout' : timeout
       };
@@ -833,7 +835,7 @@ class Gateway {
       return 'inReplyTo' in msg && msg.inReplyTo == filter;
     } else if (Object.prototype.hasOwnProperty.call(filter, 'msgID')) {
       return 'inReplyTo' in msg && msg.inReplyTo == filter.msgID;
-    } else if (filter.__proto__.name == 'Message') {
+    } else if (filter.__proto__.name == 'Message' || filter.__proto__.__proto__.name == 'Message') {
       return filter.__clazz__ == msg.__clazz__;
     } else if (typeof filter == 'function') {
       return filter(msg);
@@ -860,13 +862,13 @@ class Gateway {
     if (f.length ) return f[0];
     return null;
   }
-  
+
   /** @private */
   _addGWCache(gw){
     if (!gObj.fjage || !gObj.fjage.gateways) return;
     gObj.fjage.gateways.push(gw);
   }
-  
+
   /** @private */
   _removeGWCache(gw){
     if (!gObj.fjage || !gObj.fjage.gateways) return;
@@ -1069,7 +1071,7 @@ class Gateway {
   }
 
   /**
-   * Sends a request and waits for a response. This method returns a {Promise} which resolves when a response 
+   * Sends a request and waits for a response. This method returns a {Promise} which resolves when a response
    * is received or if no response is received after the timeout.
    *
    * @param {string} msg - message to send
@@ -1082,10 +1084,10 @@ class Gateway {
   }
 
   /**
-   * Returns a response message received by the gateway. This method returns a {Promise} which resolves when 
+   * Returns a response message received by the gateway. This method returns a {Promise} which resolves when
    * a response is received or if no response is received after the timeout.
    *
-   * @param {function} [filter=] - original message to which a response is expected, or a MessageClass of the type 
+   * @param {function} [filter=] - original message to which a response is expected, or a MessageClass of the type
    * of message to match, or a closure to use to match against the message
    * @param {number} [timeout=0] - timeout in milliseconds
    * @returns {Promise<?Message>} - received response message, null on timeout
@@ -1145,7 +1147,7 @@ const Services = {
  * @param {string} name - fully qualified name of the message class to be created
  * @param {class} [parent=Message] - class of the parent MessageClass to inherit from
  * @returns {function} - constructor for the unqualified message class
- * @example 
+ * @example
  * const ParameterReq = MessageClass('org.arl.fjage.param.ParameterReq');
  * let pReq = new ParameterReq()
  */
@@ -1182,7 +1184,7 @@ function _guid(len) {
     s += s4();
   return s;
 }
-  
+
 // convert from base 64 to array
 /** @private */
 function _b64toArray(base64, dtype, littleEndian=true) {
@@ -1553,7 +1555,9 @@ class CachingAgentID extends AgentID {
     if (this.greedy && !(Array.isArray(params) && params.includes('name')) && params != 'name') {
       let rsp = await super.get(null, index, timeout);
       this._updateCache(null, rsp, index);
-      if (Array.isArray(params)) {
+      if (!rsp) return Array.isArray(params) ? new Array(params.length).fill(null) : null;
+      if (!params) return rsp;
+      else if (Array.isArray(params)) {
         return params.map(p => {
           let f = Object.keys(rsp).find(rv => this._toNamed(rv) === p);
           return f ? rsp[f] : null;

package/dist/esm/unet.js

@@ -1,29 +1,31 @@
-/* unet.js v2.0.2 2022-06-10T03:18:03.319Z */
+/* unet.js v2.0.5 2022-06-15T07:40:54.241Z */
 
-/* fjage.js v1.9.1-rc6 */
+/* fjage.js v1.10.1 */
 
-/* global window self */
+const isBrowser =
+  typeof window !== "undefined" && typeof window.document !== "undefined";
 
-const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
+const isNode =
+  typeof process !== "undefined" &&
+  process.versions != null &&
+  process.versions.node != null;
 
-/* eslint-disable no-restricted-globals */
-const isWebWorker = typeof self === 'object'
-  && self.constructor
-  && self.constructor.name === 'DedicatedWorkerGlobalScope';
-/* eslint-enable no-restricted-globals */
-
-const isNode = typeof process !== 'undefined'
-  && process.versions != null
-  && process.versions.node != null;
+const isWebWorker =
+  typeof self === "object" &&
+  self.constructor &&
+  self.constructor.name === "DedicatedWorkerGlobalScope";
 
 /**
  * @see https://github.com/jsdom/jsdom/releases/tag/12.0.0
  * @see https://github.com/jsdom/jsdom/issues/1537
  */
-/* eslint-disable no-undef */
-const isJsDom = () => (typeof window !== 'undefined' && window.name === 'nodejs')
-  || navigator.userAgent.includes('Node.js')
-  || navigator.userAgent.includes('jsdom');
+const isJsDom =
+  (typeof window !== "undefined" && window.name === "nodejs") ||
+  (typeof navigator !== "undefined" &&
+    (navigator.userAgent.includes("Node.js") ||
+      navigator.userAgent.includes("jsdom")));
+
+typeof Deno !== "undefined" && typeof Deno.core !== "undefined";
 
 const SOCKET_OPEN = 'open';
 const SOCKET_OPENING = 'opening';
@@ -619,9 +621,9 @@ class Message {
 
 /**
  * A gateway for connecting to a fjage master container. The new version of the constructor
- * uses an options object instead of individual parameters. The old version with 
- * 
- * 
+ * uses an options object instead of individual parameters. The old version with
+ *
+ *
  * @class
  * @param {Object} opts
  * @param {string} [opts.hostname="localhost"] - hostname/ip address of the master container to connect to
@@ -642,7 +644,7 @@ class Gateway {
     if (typeof opts === 'string' || opts instanceof String){
       opts = {
         'hostname': opts,
-        'port' : port || gObj.location.port, 
+        'port' : port || gObj.location.port,
         'pathname' : pathname,
         'timeout' : timeout
       };
@@ -811,7 +813,7 @@ class Gateway {
       return 'inReplyTo' in msg && msg.inReplyTo == filter;
     } else if (Object.prototype.hasOwnProperty.call(filter, 'msgID')) {
       return 'inReplyTo' in msg && msg.inReplyTo == filter.msgID;
-    } else if (filter.__proto__.name == 'Message') {
+    } else if (filter.__proto__.name == 'Message' || filter.__proto__.__proto__.name == 'Message') {
       return filter.__clazz__ == msg.__clazz__;
     } else if (typeof filter == 'function') {
       return filter(msg);
@@ -838,13 +840,13 @@ class Gateway {
     if (f.length ) return f[0];
     return null;
   }
-  
+
   /** @private */
   _addGWCache(gw){
     if (!gObj.fjage || !gObj.fjage.gateways) return;
     gObj.fjage.gateways.push(gw);
   }
-  
+
   /** @private */
   _removeGWCache(gw){
     if (!gObj.fjage || !gObj.fjage.gateways) return;
@@ -1047,7 +1049,7 @@ class Gateway {
   }
 
   /**
-   * Sends a request and waits for a response. This method returns a {Promise} which resolves when a response 
+   * Sends a request and waits for a response. This method returns a {Promise} which resolves when a response
    * is received or if no response is received after the timeout.
    *
    * @param {string} msg - message to send
@@ -1060,10 +1062,10 @@ class Gateway {
   }
 
   /**
-   * Returns a response message received by the gateway. This method returns a {Promise} which resolves when 
+   * Returns a response message received by the gateway. This method returns a {Promise} which resolves when
    * a response is received or if no response is received after the timeout.
    *
-   * @param {function} [filter=] - original message to which a response is expected, or a MessageClass of the type 
+   * @param {function} [filter=] - original message to which a response is expected, or a MessageClass of the type
    * of message to match, or a closure to use to match against the message
    * @param {number} [timeout=0] - timeout in milliseconds
    * @returns {Promise<?Message>} - received response message, null on timeout
@@ -1123,7 +1125,7 @@ const Services = {
  * @param {string} name - fully qualified name of the message class to be created
  * @param {class} [parent=Message] - class of the parent MessageClass to inherit from
  * @returns {function} - constructor for the unqualified message class
- * @example 
+ * @example
  * const ParameterReq = MessageClass('org.arl.fjage.param.ParameterReq');
  * let pReq = new ParameterReq()
  */
@@ -1160,7 +1162,7 @@ function _guid(len) {
     s += s4();
   return s;
 }
-  
+
 // convert from base 64 to array
 /** @private */
 function _b64toArray(base64, dtype, littleEndian=true) {
@@ -1531,7 +1533,9 @@ class CachingAgentID extends AgentID {
     if (this.greedy && !(Array.isArray(params) && params.includes('name')) && params != 'name') {
       let rsp = await super.get(null, index, timeout);
       this._updateCache(null, rsp, index);
-      if (Array.isArray(params)) {
+      if (!rsp) return Array.isArray(params) ? new Array(params.length).fill(null) : null;
+      if (!params) return rsp;
+      else if (Array.isArray(params)) {
         return params.map(p => {
           let f = Object.keys(rsp).find(rv => this._toNamed(rv) === p);
           return f ? rsp[f] : null;

package/dist/unetjs.js

@@ -4,30 +4,32 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.unet = {}));
 })(this, (function (exports) { 'use strict';
 
-  /* fjage.js v1.9.1-rc6 */
+  /* fjage.js v1.10.1 */
 
-  /* global window self */
+  const isBrowser =
+    typeof window !== "undefined" && typeof window.document !== "undefined";
 
-  const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
+  const isNode =
+    typeof process !== "undefined" &&
+    process.versions != null &&
+    process.versions.node != null;
 
-  /* eslint-disable no-restricted-globals */
-  const isWebWorker = typeof self === 'object'
-    && self.constructor
-    && self.constructor.name === 'DedicatedWorkerGlobalScope';
-  /* eslint-enable no-restricted-globals */
-
-  const isNode = typeof process !== 'undefined'
-    && process.versions != null
-    && process.versions.node != null;
+  const isWebWorker =
+    typeof self === "object" &&
+    self.constructor &&
+    self.constructor.name === "DedicatedWorkerGlobalScope";
 
   /**
    * @see https://github.com/jsdom/jsdom/releases/tag/12.0.0
    * @see https://github.com/jsdom/jsdom/issues/1537
    */
-  /* eslint-disable no-undef */
-  const isJsDom = () => (typeof window !== 'undefined' && window.name === 'nodejs')
-    || navigator.userAgent.includes('Node.js')
-    || navigator.userAgent.includes('jsdom');
+  const isJsDom =
+    (typeof window !== "undefined" && window.name === "nodejs") ||
+    (typeof navigator !== "undefined" &&
+      (navigator.userAgent.includes("Node.js") ||
+        navigator.userAgent.includes("jsdom")));
+
+  typeof Deno !== "undefined" && typeof Deno.core !== "undefined";
 
   const SOCKET_OPEN = 'open';
   const SOCKET_OPENING = 'opening';
@@ -623,9 +625,9 @@
 
   /**
    * A gateway for connecting to a fjage master container. The new version of the constructor
-   * uses an options object instead of individual parameters. The old version with 
-   * 
-   * 
+   * uses an options object instead of individual parameters. The old version with
+   *
+   *
    * @class
    * @param {Object} opts
    * @param {string} [opts.hostname="localhost"] - hostname/ip address of the master container to connect to
@@ -646,7 +648,7 @@
       if (typeof opts === 'string' || opts instanceof String){
         opts = {
           'hostname': opts,
-          'port' : port || gObj.location.port, 
+          'port' : port || gObj.location.port,
           'pathname' : pathname,
           'timeout' : timeout
         };
@@ -815,7 +817,7 @@
         return 'inReplyTo' in msg && msg.inReplyTo == filter;
       } else if (Object.prototype.hasOwnProperty.call(filter, 'msgID')) {
         return 'inReplyTo' in msg && msg.inReplyTo == filter.msgID;
-      } else if (filter.__proto__.name == 'Message') {
+      } else if (filter.__proto__.name == 'Message' || filter.__proto__.__proto__.name == 'Message') {
         return filter.__clazz__ == msg.__clazz__;
       } else if (typeof filter == 'function') {
         return filter(msg);
@@ -842,13 +844,13 @@
       if (f.length ) return f[0];
       return null;
     }
-    
+
     /** @private */
     _addGWCache(gw){
       if (!gObj.fjage || !gObj.fjage.gateways) return;
       gObj.fjage.gateways.push(gw);
     }
-    
+
     /** @private */
     _removeGWCache(gw){
       if (!gObj.fjage || !gObj.fjage.gateways) return;
@@ -1051,7 +1053,7 @@
     }
 
     /**
-     * Sends a request and waits for a response. This method returns a {Promise} which resolves when a response 
+     * Sends a request and waits for a response. This method returns a {Promise} which resolves when a response
      * is received or if no response is received after the timeout.
      *
      * @param {string} msg - message to send
@@ -1064,10 +1066,10 @@
     }
 
     /**
-     * Returns a response message received by the gateway. This method returns a {Promise} which resolves when 
+     * Returns a response message received by the gateway. This method returns a {Promise} which resolves when
      * a response is received or if no response is received after the timeout.
      *
-     * @param {function} [filter=] - original message to which a response is expected, or a MessageClass of the type 
+     * @param {function} [filter=] - original message to which a response is expected, or a MessageClass of the type
      * of message to match, or a closure to use to match against the message
      * @param {number} [timeout=0] - timeout in milliseconds
      * @returns {Promise<?Message>} - received response message, null on timeout
@@ -1127,7 +1129,7 @@
    * @param {string} name - fully qualified name of the message class to be created
    * @param {class} [parent=Message] - class of the parent MessageClass to inherit from
    * @returns {function} - constructor for the unqualified message class
-   * @example 
+   * @example
    * const ParameterReq = MessageClass('org.arl.fjage.param.ParameterReq');
    * let pReq = new ParameterReq()
    */
@@ -1164,7 +1166,7 @@
       s += s4();
     return s;
   }
-    
+
   // convert from base 64 to array
   /** @private */
   function _b64toArray(base64, dtype, littleEndian=true) {
@@ -1535,7 +1537,9 @@
       if (this.greedy && !(Array.isArray(params) && params.includes('name')) && params != 'name') {
         let rsp = await super.get(null, index, timeout);
         this._updateCache(null, rsp, index);
-        if (Array.isArray(params)) {
+        if (!rsp) return Array.isArray(params) ? new Array(params.length).fill(null) : null;
+        if (!params) return rsp;
+        else if (Array.isArray(params)) {
           return params.map(p => {
             let f = Object.keys(rsp).find(rv => this._toNamed(rv) === p);
             return f ? rsp[f] : null;