shoonya-sdk 0.5.0 → 0.5.1

package/dist/shoonya-sdk.cjs

@@ -84,6 +84,7 @@ var Logger = class {
   logPath = "";
   maxSize = 0;
   fileName = "";
+  logging = false;
   /**
    *
    * @param logFileName name to prepend the logs file with
@@ -96,6 +97,8 @@ var Logger = class {
     this.checkPathExistance();
   }
   log(msg, logType = "DEBUG") {
+    if (!this.logging)
+      return;
     const content = `${logType}:[${(/* @__PURE__ */ new Date()).toISOString()}]:${msg}
 `;
     (0, import_node_fs.appendFileSync)(this.logPath, content);
@@ -252,6 +255,7 @@ var RetryManager = class extends import_events.EventEmitter {
 };
 
 // src/shoonya-sdk.ts
+var import_promises = require("timers/promises");
 var Shoonya = class extends RetryManager {
   static {
     __name(this, "Shoonya");
@@ -259,7 +263,6 @@ var Shoonya = class extends RetryManager {
   accessToken;
   userId;
   logger;
-  logging = false;
   httpBaseUrl = "https://api.shoonya.com/NorenWClientTP/";
   wsBaseUrl = "wss://api.shoonya.com/NorenWSTP/";
   ws;
@@ -286,7 +289,6 @@ var Shoonya = class extends RetryManager {
     this.userId = "";
     this.accessToken = "";
     this.accountId = this.userId;
-    this.logging = logging;
     this.reconnectTimeout = { timer: null, timeout: reconnectTimeout };
     this.heartbeatTimeout = { timer: null, timeout: heartbeatTimeout };
     if (logging) {
@@ -295,29 +297,65 @@ var Shoonya = class extends RetryManager {
         1024 * 100
         //1KB * 100 = 100KB
       );
+      this.logger.logging = logging;
     }
-    this.on("resub", (token) => {
-      this.subscribeUnsafe([token]);
+    this.on("resub", async (token) => {
+      for (let i = this.scripList.length - 1; i >= 0; i--) {
+        const t = this.scripList[i];
+        if (t === token) {
+          this.unsubscribe([token]);
+          this.scripList.splice(i, 1);
+          await this.login({
+            apiKey: this.apiKey,
+            password: this.password,
+            twoFa: this.twoFa,
+            userId: this.userId
+          });
+          const msg = {
+            t: "c",
+            uid: this.userId,
+            actid: this.accountId,
+            source: "API",
+            susertoken: this.accessToken
+          };
+          this.ws.send(JSON.stringify(msg));
+          await (0, import_promises.setTimeout)(100);
+          this.subscribe([token]);
+          this.logger.log("Resubscribed to" + token);
+          break;
+        }
+      }
     });
   }
   async request(path, body) {
     const jData = `jData=${JSON.stringify(body.data)}${body.key ? "&jKey=" + body.key : ""}`;
     try {
-      const data = await fetch(this.httpBaseUrl + paths[path], {
+      const req = await fetch(this.httpBaseUrl + paths[path], {
         method: "POST",
         body: jData,
-        keepalive: true
-      }).then((res) => {
-        return res.json();
+        keepalive: false
       });
+      let data = await req.json();
+      if ("emsg" in data && data.emsg.includes("Session Expired")) {
+        await this.login({
+          apiKey: this.apiKey,
+          password: this.password,
+          twoFa: this.twoFa,
+          userId: this.userId
+        });
+        const newJData = `jData=${JSON.stringify(body.data)}${body.key ? "&jKey=" + this.accessToken : ""}`;
+        const newReq = await fetch(this.httpBaseUrl + paths[path], {
+          method: "POST",
+          body: newJData,
+          keepalive: false
+        });
+        data = await newReq.json();
+      }
       return data;
     } catch (err) {
-      if (this.logging) {
-        const errMessage = "Failed to fetch data from api while performing: " + path;
-        this.logger.log(errMessage, "ERROR");
-        console.error(errMessage);
-      }
-      console.error(err);
+      const errMessage = `Error: ${err?.message} in ${path}`;
+      this.logger.log(errMessage, "ERROR");
+      console.error(errMessage);
     }
   }
   // Rest API
@@ -347,12 +385,10 @@ var Shoonya = class extends RetryManager {
       this.twoFa = rawCred.twoFa;
       return req;
     } catch (err) {
-      if (this.logging) {
-        const fallBackMessage = "Attempted to login but it failed";
-        const errMessage = err?.message || fallBackMessage;
-        this.logger.log(errMessage, "ERROR");
-        console.error(errMessage);
-      }
+      const fallBackMessage = "Attempted to login but it failed";
+      const errMessage = err?.message || fallBackMessage;
+      this.logger.log(errMessage, "ERROR");
+      console.error(errMessage);
       console.error("Login Failed", err);
     }
   }
@@ -730,11 +766,11 @@ var Shoonya = class extends RetryManager {
             await this.login(cred);
             this.connectWS();
             this.emit("open", "opened ws connection");
-            this.logging && this.logger.log("Token Refreshed");
+            this.logger.log("Token successfully refreshed");
           } catch (err) {
             console.error(err);
             const errMessage = `Token refreshing failed. ERR: ${err.message}`;
-            this.logging && this.logger.log(errMessage, "ERROR");
+            this.logger.log(errMessage, "ERROR");
             this.getWSState().OPEN && this.ws.close();
             this.emit("stopped", errMessage);
           }
@@ -746,7 +782,7 @@ var Shoonya = class extends RetryManager {
       const result = JSON.parse(e.data.toString());
       this.lastWsMsgAt = /* @__PURE__ */ new Date();
       if (result.t === "dk") {
-        this.logging && this.logger.log(`Subscribed to ${result.ts}. Listening...`);
+        this.logger.log(`Subscribed to ${result.ts}. Listening...`);
       }
       if (result.lp && result.t === "df") {
         this.resetTimerForToken(result.tk, result.e);
@@ -759,7 +795,7 @@ var Shoonya = class extends RetryManager {
         clearTimeout(this.connectTimer);
         this.connectTimer = setTimeout(() => {
           this.emit("connect", e);
-          this.logging && this.logger.log("Connected with Shoonya API! Streaming Data...");
+          this.logger.log("Connected with Shoonya API! Streaming Data...");
           this.subscribeAgain(this.scripList);
         }, 3e3);
         return;
@@ -783,13 +819,13 @@ var Shoonya = class extends RetryManager {
         if (day in [5, 6])
           return;
         const err = "API have stopped to respond! there could be a problem with API or market has closed";
-        this.logging && this.logger.log(err, "WARN");
+        this.logger.log(err, "WARN");
         this.emit("stopped", err);
         this.getWSState().OPEN && this.ws.close();
       }, 6e4 * 60 * 18 - 1e4);
     });
     this.ws.addEventListener("error", (e) => {
-      this.logging && this.logger.log("some error in ws");
+      this.logger.log("some error in ws");
       this.emit("error", e);
       this.getWSState().OPEN && this.ws.close();
     });
@@ -834,6 +870,7 @@ var Shoonya = class extends RetryManager {
     for (const val of distinctScrips) {
       this.scripList.push(val);
     }
+    this.logger.log(JSON.stringify(msg));
     this.ws && this.ws.send(JSON.stringify(msg));
   }
   unsubscribe(scripList) {
@@ -849,6 +886,13 @@ var Shoonya = class extends RetryManager {
       }
     }
   }
+  /**
+   * Unsubscribe All while removing the tokens from this.scripList
+   */
+  unsubscribeAllWhileClearing() {
+    this.unsubscribe(this.scripList);
+    return this.scripList.splice(0);
+  }
   /**
    * This method will not check if token is already subscribed or not before sending subscribe request
    *
@@ -888,7 +932,7 @@ var Shoonya = class extends RetryManager {
     if (this.getWSState().OPEN || this.getWSState().CONNECTING) {
       clearInterval(this.heartbeatTimeout.timer);
       this.ws.close();
-      this.logging && this.logger.log("Websocket Connection with Shoonya API is now closed!");
+      this.logger.log("Websocket Connection with Shoonya API is now closed!");
       this.emit("close");
     }
   }

package/dist/shoonya-sdk.d.cts

@@ -280,6 +280,7 @@ declare class Logger {
     logPath: string;
     maxSize: number;
     fileName: string;
+    logging: boolean;
     /**
      *
      * @param logFileName name to prepend the logs file with
@@ -340,7 +341,6 @@ declare class Shoonya extends RetryManager {
     accessToken: string;
     userId: string;
     logger: Logger;
-    private logging;
     private readonly httpBaseUrl;
     private readonly wsBaseUrl;
     private ws;
@@ -507,6 +507,10 @@ declare class Shoonya extends RetryManager {
      */
     subscribe(scripList: string[]): void;
     unsubscribe(scripList: string[]): void;
+    /**
+     * Unsubscribe All while removing the tokens from this.scripList
+     */
+    unsubscribeAllWhileClearing(): string[];
     /**
      * This method will not check if token is already subscribed or not before sending subscribe request
      *

package/dist/shoonya-sdk.d.ts

@@ -280,6 +280,7 @@ declare class Logger {
     logPath: string;
     maxSize: number;
     fileName: string;
+    logging: boolean;
     /**
      *
      * @param logFileName name to prepend the logs file with
@@ -340,7 +341,6 @@ declare class Shoonya extends RetryManager {
     accessToken: string;
     userId: string;
     logger: Logger;
-    private logging;
     private readonly httpBaseUrl;
     private readonly wsBaseUrl;
     private ws;
@@ -507,6 +507,10 @@ declare class Shoonya extends RetryManager {
      */
     subscribe(scripList: string[]): void;
     unsubscribe(scripList: string[]): void;
+    /**
+     * Unsubscribe All while removing the tokens from this.scripList
+     */
+    unsubscribeAllWhileClearing(): string[];
     /**
      * This method will not check if token is already subscribed or not before sending subscribe request
      *

package/dist/shoonya-sdk.js

@@ -58,6 +58,7 @@ var Logger = class {
   logPath = "";
   maxSize = 0;
   fileName = "";
+  logging = false;
   /**
    *
    * @param logFileName name to prepend the logs file with
@@ -70,6 +71,8 @@ var Logger = class {
     this.checkPathExistance();
   }
   log(msg, logType = "DEBUG") {
+    if (!this.logging)
+      return;
     const content = `${logType}:[${(/* @__PURE__ */ new Date()).toISOString()}]:${msg}
 `;
     appendFileSync(this.logPath, content);
@@ -226,6 +229,7 @@ var RetryManager = class extends EventEmitter {
 };
 
 // src/shoonya-sdk.ts
+import { setTimeout as wait } from "timers/promises";
 var Shoonya = class extends RetryManager {
   static {
     __name(this, "Shoonya");
@@ -233,7 +237,6 @@ var Shoonya = class extends RetryManager {
   accessToken;
   userId;
   logger;
-  logging = false;
   httpBaseUrl = "https://api.shoonya.com/NorenWClientTP/";
   wsBaseUrl = "wss://api.shoonya.com/NorenWSTP/";
   ws;
@@ -260,7 +263,6 @@ var Shoonya = class extends RetryManager {
     this.userId = "";
     this.accessToken = "";
     this.accountId = this.userId;
-    this.logging = logging;
     this.reconnectTimeout = { timer: null, timeout: reconnectTimeout };
     this.heartbeatTimeout = { timer: null, timeout: heartbeatTimeout };
     if (logging) {
@@ -269,29 +271,65 @@ var Shoonya = class extends RetryManager {
         1024 * 100
         //1KB * 100 = 100KB
       );
+      this.logger.logging = logging;
     }
-    this.on("resub", (token) => {
-      this.subscribeUnsafe([token]);
+    this.on("resub", async (token) => {
+      for (let i = this.scripList.length - 1; i >= 0; i--) {
+        const t = this.scripList[i];
+        if (t === token) {
+          this.unsubscribe([token]);
+          this.scripList.splice(i, 1);
+          await this.login({
+            apiKey: this.apiKey,
+            password: this.password,
+            twoFa: this.twoFa,
+            userId: this.userId
+          });
+          const msg = {
+            t: "c",
+            uid: this.userId,
+            actid: this.accountId,
+            source: "API",
+            susertoken: this.accessToken
+          };
+          this.ws.send(JSON.stringify(msg));
+          await wait(100);
+          this.subscribe([token]);
+          this.logger.log("Resubscribed to" + token);
+          break;
+        }
+      }
     });
   }
   async request(path, body) {
     const jData = `jData=${JSON.stringify(body.data)}${body.key ? "&jKey=" + body.key : ""}`;
     try {
-      const data = await fetch(this.httpBaseUrl + paths[path], {
+      const req = await fetch(this.httpBaseUrl + paths[path], {
         method: "POST",
         body: jData,
-        keepalive: true
-      }).then((res) => {
-        return res.json();
+        keepalive: false
       });
+      let data = await req.json();
+      if ("emsg" in data && data.emsg.includes("Session Expired")) {
+        await this.login({
+          apiKey: this.apiKey,
+          password: this.password,
+          twoFa: this.twoFa,
+          userId: this.userId
+        });
+        const newJData = `jData=${JSON.stringify(body.data)}${body.key ? "&jKey=" + this.accessToken : ""}`;
+        const newReq = await fetch(this.httpBaseUrl + paths[path], {
+          method: "POST",
+          body: newJData,
+          keepalive: false
+        });
+        data = await newReq.json();
+      }
       return data;
     } catch (err) {
-      if (this.logging) {
-        const errMessage = "Failed to fetch data from api while performing: " + path;
-        this.logger.log(errMessage, "ERROR");
-        console.error(errMessage);
-      }
-      console.error(err);
+      const errMessage = `Error: ${err?.message} in ${path}`;
+      this.logger.log(errMessage, "ERROR");
+      console.error(errMessage);
     }
   }
   // Rest API
@@ -321,12 +359,10 @@ var Shoonya = class extends RetryManager {
       this.twoFa = rawCred.twoFa;
       return req;
     } catch (err) {
-      if (this.logging) {
-        const fallBackMessage = "Attempted to login but it failed";
-        const errMessage = err?.message || fallBackMessage;
-        this.logger.log(errMessage, "ERROR");
-        console.error(errMessage);
-      }
+      const fallBackMessage = "Attempted to login but it failed";
+      const errMessage = err?.message || fallBackMessage;
+      this.logger.log(errMessage, "ERROR");
+      console.error(errMessage);
       console.error("Login Failed", err);
     }
   }
@@ -704,11 +740,11 @@ var Shoonya = class extends RetryManager {
             await this.login(cred);
             this.connectWS();
             this.emit("open", "opened ws connection");
-            this.logging && this.logger.log("Token Refreshed");
+            this.logger.log("Token successfully refreshed");
           } catch (err) {
             console.error(err);
             const errMessage = `Token refreshing failed. ERR: ${err.message}`;
-            this.logging && this.logger.log(errMessage, "ERROR");
+            this.logger.log(errMessage, "ERROR");
             this.getWSState().OPEN && this.ws.close();
             this.emit("stopped", errMessage);
           }
@@ -720,7 +756,7 @@ var Shoonya = class extends RetryManager {
       const result = JSON.parse(e.data.toString());
       this.lastWsMsgAt = /* @__PURE__ */ new Date();
       if (result.t === "dk") {
-        this.logging && this.logger.log(`Subscribed to ${result.ts}. Listening...`);
+        this.logger.log(`Subscribed to ${result.ts}. Listening...`);
       }
       if (result.lp && result.t === "df") {
         this.resetTimerForToken(result.tk, result.e);
@@ -733,7 +769,7 @@ var Shoonya = class extends RetryManager {
         clearTimeout(this.connectTimer);
         this.connectTimer = setTimeout(() => {
           this.emit("connect", e);
-          this.logging && this.logger.log("Connected with Shoonya API! Streaming Data...");
+          this.logger.log("Connected with Shoonya API! Streaming Data...");
           this.subscribeAgain(this.scripList);
         }, 3e3);
         return;
@@ -757,13 +793,13 @@ var Shoonya = class extends RetryManager {
         if (day in [5, 6])
           return;
         const err = "API have stopped to respond! there could be a problem with API or market has closed";
-        this.logging && this.logger.log(err, "WARN");
+        this.logger.log(err, "WARN");
         this.emit("stopped", err);
         this.getWSState().OPEN && this.ws.close();
       }, 6e4 * 60 * 18 - 1e4);
     });
     this.ws.addEventListener("error", (e) => {
-      this.logging && this.logger.log("some error in ws");
+      this.logger.log("some error in ws");
       this.emit("error", e);
       this.getWSState().OPEN && this.ws.close();
     });
@@ -808,6 +844,7 @@ var Shoonya = class extends RetryManager {
     for (const val of distinctScrips) {
       this.scripList.push(val);
     }
+    this.logger.log(JSON.stringify(msg));
     this.ws && this.ws.send(JSON.stringify(msg));
   }
   unsubscribe(scripList) {
@@ -823,6 +860,13 @@ var Shoonya = class extends RetryManager {
       }
     }
   }
+  /**
+   * Unsubscribe All while removing the tokens from this.scripList
+   */
+  unsubscribeAllWhileClearing() {
+    this.unsubscribe(this.scripList);
+    return this.scripList.splice(0);
+  }
   /**
    * This method will not check if token is already subscribed or not before sending subscribe request
    *
@@ -862,7 +906,7 @@ var Shoonya = class extends RetryManager {
     if (this.getWSState().OPEN || this.getWSState().CONNECTING) {
       clearInterval(this.heartbeatTimeout.timer);
       this.ws.close();
-      this.logging && this.logger.log("Websocket Connection with Shoonya API is now closed!");
+      this.logger.log("Websocket Connection with Shoonya API is now closed!");
       this.emit("close");
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoonya-sdk",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Wrapper around Shoonya API",
   "main": "dist/shoonya-sdk.js",
   "module": "dist/shoonya-sdk.mjs",