api_connect_nodejs 2.0.12 → 2.0.13

package/conf/settings.ini

@@ -10,7 +10,7 @@ BasePathReport = https://nc.nuvamawealth.com/app-report/equity/
 EquityContractURL = https://nc.nuvamawealth.com/app/toccontracts/instruments.zip
 MFContractURL = https://nc.nuvamawealth.com/app/toccontracts/mfInstruments.zip
 
-ApiIdKey = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcHAiOjAsImZmIjoiVyIsImJkIjoid2ViLXBjIiwibmJmIjoxNzEwNzUzMjIzLCJzcmMiOiJlbXRtdyIsImF2IjoiMi4wLjEyIiwiYXBwaWQiOiI3MTI5YzEzOGFmZjk4NjMyZWRhMjU3ZDFhNjMzZTIwNCIsImlzcyI6ImVtdCIsImV4cCI6MTcxMDc4NjYwMCwiaWF0IjoxNzEwNzUzNTIzfQ.6qtvIewJcvfeKUJmFxRtz06x0xgSFAVW7qXvcgUfulo
+ApiIdKey = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcHAiOjAsImZmIjoiVyIsImJkIjoid2ViLXBjIiwibmJmIjoxNzE5NTU5MTcyLCJzcmMiOiJlbXRtdyIsImF2IjoiMi4wLjEzIiwiYXBwaWQiOiIyNGI0OTUyNmUwNjRjOWQwOTU3NmUyYjk1ZDg0M2M3NSIsImlzcyI6ImVtdCIsImV4cCI6MTcxOTU5OTQwMCwiaWF0IjoxNzE5NTU5NDcyfQ.cwtG6ceohsEmbpQNiqrS8IjV4lmA0KM8RvLuy1eDX4E
 TlsVersion = 1.2
 LogLevel = All
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api_connect_nodejs",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "Command to run :",
   "main": "index.js",
   "directories": {

package/src/feed/feed.js

@@ -15,6 +15,7 @@ class Feed {
   constructor() {
     this.sock = new net.Socket();
     this.status = false;
+    const heartBeatTimer = 0;
     this.init();
     this.requestsList = {};
   }
@@ -29,54 +30,9 @@ class Feed {
     try {
       this.sock.connect(port, hostName, () => {
         this.clearIntervalConnect();
-        console.log("connected to server!");
         log4js.debug("connected to server!");
       });
-    } catch (error) {
-      console.log("connect error is " + error);
-      log4js.debug("connect error is " + error);
-      this.reconnect();
-    }
-  };
-
-  clearIntervalConnect = () => {
-    if (false === this.status) return;
-    clearInterval(this.status);
-    this.status = false;
-  };
-
-  reconnect = () => {
-    console.log("reconnecting...");
-    log4js.debug("reconnecting...");
-
-    if (this.status) return;
-    this.status = setInterval(() => {
-      this.sock.removeAllListeners();
-      this.connect();
-    }, 3000);
-  };
 
-  subsribe = (streamingConstants, request, callBack) => {
-    const requestObj = {
-      request: request,
-      callback: callBack,
-    };
-    this.requestsList[streamingConstants] = requestObj;
-    this.readWriteStreamData(requestObj);
-  };
-
-  unsubsribe = (streamingConstants, request) => {
-    const requestObj = {
-      request: request,
-      callback: this.requestsList[streamingConstants].callback,
-    };
-    this.readWriteStreamData(requestObj);
-    delete this.requestsList[streamingConstants];
-  };
-
-  readWriteStreamData = (requestObj) => {
-    try {
-      this.sock.write(JSON.stringify(requestObj.request) + "\n");
       this.sock.on("data", (data) => {
         try {
           let result = data.toString();
@@ -131,13 +87,12 @@ class Feed {
       });
 
       this.sock.on("end", (val) => {
-        console.log("Connection ended ");
         this.reconnect();
       });
 
       this.sock.on("error", (err) => {
         log4js.debug("connection error " + err);
-        requestObj.callback(err, null, null);
+        // requestObj.callback(err, null, null);
         this.reconnect();
       });
 
@@ -145,9 +100,70 @@ class Feed {
         log4js.debug("connection closed " + val);
         this.reconnect();
       });
+
+    } catch (error) {
+      log4js.debug("connect error is " + error);
+      this.reconnect();
+    }
+  };
+
+  clearIntervalConnect = () => {
+    if (false === this.status) return;
+    clearInterval(this.status);
+    this.status = false;
+  };
+
+  reconnect = () => {
+    log4js.debug("reconnecting...");
+
+    if (this.status) return;
+    this.status = setInterval(() => {
+      this.sock.removeAllListeners();
+      this.connect();
+    }, 3000);
+  };
+
+  subsribe = (streamingConstants, request, callBack, heartBeatFeed = false) => {
+    const requestObj = {
+      request: request,
+      callback: callBack,
+    };
+    this.requestsList[streamingConstants] = requestObj;
+    this.readWriteStreamData(requestObj, heartBeatFeed);
+    this.checkAndStartHeartBeat()
+  };
+
+  unsubsribe = (streamingConstants, request, heartBeatFeed = false) => {
+    const requestObj = {
+      request: request,
+      callback: this.requestsList[streamingConstants].callback,
+    };
+    this.readWriteStreamData(requestObj, heartBeatFeed);
+    delete this.requestsList[streamingConstants];
+  };
+
+  readWriteStreamData = (requestObj, heartBeatFeed= false) => {
+
+    try {
+      if(heartBeatFeed) {
+        this.sock.write("{}" + "\n");
+      } else {
+        this.sock.write(JSON.stringify(requestObj.request) + "\n");
+      }
+
     } catch (error) {
       console.log({ error });
     }
+  }
+
+  checkAndStartHeartBeat = () => {
+
+    if(this.heartBeatTimer) {
+      // Clearing the interval timer
+      clearInterval(this.heartBeatTimer);
+    }
+
+    this.heartBeatTimer = setInterval(this.readWriteStreamData, 90000, undefined, true);
   };
 }