fix(fjage.js): fixing addConnListener function in fjage.js

org-arl · Dec 11, 2023 · 69f8215 · 69f8215
1 parent 7af81a6
commit 69f8215
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 60 deletions.
diff --git a/docs/jsdoc/index.html b/docs/jsdoc/index.html
diff --git a/gateways/js/dist/esm/fjage.js b/gateways/js/dist/esm/fjage.js
@@ -1,4 +1,4 @@
-/* fjage.js v1.11.0 */
+/* fjage.js v1.11.1 */
 
 const isBrowser =
   typeof window !== "undefined" && typeof window.document !== "undefined";
@@ -75,7 +75,7 @@ class TCPconnector {
       }
     }else {
       this._sockSetup(host, port);
-    }  
+    }
   }
 
   _sockSetup(host, port){
@@ -162,7 +162,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
@@ -842,6 +842,7 @@ class Gateway {
         this.connector.write('{"alive": true}');
         this._update_watch();
       }
+      this._sendEvent('conn', state);
     });
     return conn;
   }

diff --git a/gateways/js/dist/fjage.js b/gateways/js/dist/fjage.js
diff --git a/gateways/js/package-lock.json b/gateways/js/package-lock.json
diff --git a/gateways/js/package.json b/gateways/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fjage",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "JS Gateway for fjåge",
   "main": "./dist/cjs/fjage.cjs",
   "exports": {

diff --git a/gateways/js/src/fjage.js b/gateways/js/src/fjage.js
@@ -488,6 +488,7 @@ export class Gateway {
         this.connector.write('{"alive": true}');
         this._update_watch();
       }
+      this._sendEvent('conn', state);
     });
     return conn;
   }

diff --git a/gateways/js/test/spec/fjage.spec.js b/gateways/js/test/spec/fjage.spec.js
@@ -251,6 +251,22 @@ describe('A Gateway', function () {
     }
     expect(rxed).not.toContain(false);
   });
+
+  it('should generate trigger connListener when the underlying transport is disconnected/reconnected', async function() {
+    const gw = new Gateway(gwOpts);
+    let spy = jasmine.createSpy('connListener');
+    gw.addConnListener(spy);
+    await delay(300);
+    spy.calls.reset();
+    gw.connector._reconnectTime = 300;
+    gw.connector.sock.close();
+    await delay(100);
+    expect(spy).toHaveBeenCalledWith(false);
+    spy.calls.reset();
+    await delay(500);
+    expect(spy).toHaveBeenCalledWith(true);
+    gw.connector._reconnectTime = 5000;
+  });
 });
 
 describe('An AgentID', function () {