shoonya-sdk 1.1.1 → 1.1.2

package/dist/index.cjs

@@ -141,7 +141,7 @@ var Tokens = class {
   }
 };
 var tokens = new Tokens();
-async function refreshAccessToken() {
+async function refreshAccessToken(retryCount = 3) {
   const userCred = tokens.getCred();
   const cred = {
     apkversion: "1.0.0",
@@ -153,14 +153,23 @@ async function refreshAccessToken() {
     imei: userCred?.imei || "api",
     source: "API"
   };
-  try {
-    const req = await request("login", { data: cred });
-    tokens.updateAccessToken(req.susertoken);
-  } catch (err) {
-    let errMsg = "Couldn't Refresh the Access Token. ";
-    err instanceof Error && (errMsg += `Error: ${err.message}`);
-    throw new Error(`Couldn't Refresh the Access Token. Error: ${errMsg}`);
+  let errorMsg = "";
+  for (let i = 0; i < retryCount; i++) {
+    try {
+      const req = await request("login", { data: cred });
+      tokens.updateAccessToken(req.susertoken);
+      return;
+    } catch (err) {
+      let errMsg = "Couldn't Refresh the Access Token. ";
+      if (err instanceof Error) {
+        errMsg += `Error: ${err.message}`;
+      }
+      errorMsg += `${errMsg}, `;
+    }
   }
+  throw new Error(
+    `Attempted to refresh access token ${retryCount} times. but failed. Errors: ${errorMsg}`
+  );
 }
 __name(refreshAccessToken, "refreshAccessToken");
 
@@ -754,8 +763,6 @@ var WebsocketClient = class extends import_events.EventEmitter {
   }
   wsBaseUrl = "wss://api.shoonya.com/NorenWSTP/";
   ws;
-  reconnectInterval;
-  reconnectTimer;
   subscribedTokens = [];
   logger;
   retryCount = 0;
@@ -768,7 +775,6 @@ var WebsocketClient = class extends import_events.EventEmitter {
   constructor(params) {
     super();
     const {
-      reconnectInterval = 3e4,
       dailyRefreshTime = "09:13+05:30",
       cred,
       logging = false,
@@ -790,7 +796,6 @@ var WebsocketClient = class extends import_events.EventEmitter {
     if (!storedCred.userId) {
       tokens.updateCred(cred);
     }
-    this.reconnectInterval = reconnectInterval;
     if (this.validateTimezoneString(dailyRefreshTime)) {
       const dt = this.parseDailyRefreshTime(dailyRefreshTime);
       this.refreshEveryMorning(dt);
@@ -806,7 +811,7 @@ var WebsocketClient = class extends import_events.EventEmitter {
     this.ws = new import_ws.WebSocket(this.wsBaseUrl);
     this.ws.on("message", this.wsMessageEvent);
     this.ws.on("open", this.wsOpenEvent);
-    this.ws.on("close", this.wsCloseEventV2);
+    this.ws.on("close", this.wsCloseEvent);
     this.ws.on("error", this.wsErrorEvent);
   }
   wsOpenEvent = async () => {
@@ -827,11 +832,11 @@ var WebsocketClient = class extends import_events.EventEmitter {
   wsMessageEvent = (msg) => {
     const result = JSON.parse(msg.toString());
     if (result.t === "ck" && result.s.toLowerCase() === "ok") {
-      console.log("Connected with Shoonya Websocket.");
-      this.logger.log("|WSClient| Connected with Shoonya WS.");
-      clearInterval(this.reconnectTimer);
-      this.emit("connected");
-      this.resubscribe();
+      setTimeout(() => {
+        this.logger.log("|WSClient| Connected with Shoonya WS.");
+        this.emit("connected");
+        this.resubscribe();
+      }, 3e3);
     }
     if (result.t === "dk") {
       this.logger.log(`Subscribed to ${result.ts}.`);
@@ -858,44 +863,17 @@ var WebsocketClient = class extends import_events.EventEmitter {
     this.emit("error", error);
     this.ws.close(0);
   };
-  wsCloseEvent = async (code) => {
-    if (code === 1) {
-      try {
-        await refreshAccessToken();
-        this.logger.log("Access Token Refreshed");
-      } catch (err) {
-        err instanceof Error && this.logger.log(err.message, "ERROR");
-      }
-      this.emit("tokenRefresh");
-      this.connect();
-      return;
-    }
-    if (code !== 0) {
-      let retryAttempts = 0;
-      clearInterval(this.reconnectTimer);
-      this.reconnectTimer = setInterval(() => {
-        retryAttempts++;
-        this.logger.log(
-          `Disconnected with error code ${code}. Attempt ${retryAttempts} to reconnect....`
-        );
-        this.connect();
-        if (this.maxRetryAttempt === retryAttempts) {
-          this.logger.log("Max Retry Attempt Reached. Stopped Retrying.");
-          clearInterval(this.reconnectInterval);
-        }
-      }, this.reconnectInterval);
-      return;
-    }
-    this.logger.log("|WSClient| Connection Closed Successfully");
-    this.emit("close");
-  };
-  wsCloseEventV2 = async (code, reason) => {
+  wsCloseEvent = async (code, reason) => {
+    this.logger.log(
+      `WS Close Event: code: ${code}, reason: ${reason.toString()}`
+    );
     if (code === 0) {
       this.logger.log("Websocket closed gracefully");
       return;
     }
     if (code === 1) {
       try {
+        this.logger.log("Trying to refresh the Access Token");
         await refreshAccessToken();
         this.logger.log("Access Token Refreshed");
       } catch (err) {
@@ -903,6 +881,7 @@ var WebsocketClient = class extends import_events.EventEmitter {
           `Failed to update access token. Err: ${err.message}`,
           "ERROR"
         );
+        console.error("Failed to refresh access token", err);
       }
       this.emit("tokenRefresh");
       this.connect();
@@ -920,7 +899,11 @@ var WebsocketClient = class extends import_events.EventEmitter {
     console.log(`Attempt #${this.retryCount} to reconnect again`);
     this.connect();
   };
-  subscribe(scrips) {
+  subscribe(scrips, feedType = "Depth") {
+    const t = this.validateFeedType(feedType);
+    if (!t) {
+      return cc.red("Feed Type should be either Depth or Touchline");
+    }
     const scripList = Array.isArray(scrips) ? scrips : [scrips];
     const distinctScrips = checkTwoArrayOverlaps(
       this.subscribedTokens,
@@ -952,7 +935,7 @@ var WebsocketClient = class extends import_events.EventEmitter {
   }
   resubscribe() {
     if (this.subscribedTokens.length) {
-      const tokensToSub = this.subscribedTokens;
+      const tokensToSub = Array.from(new Set(this.subscribedTokens));
       this.subscribedTokens = [];
       this.subscribe(tokensToSub);
     }
@@ -960,6 +943,12 @@ var WebsocketClient = class extends import_events.EventEmitter {
   send(msg) {
     if (this.ws && this.ws.readyState === this.ws.OPEN) {
       this.ws.send(JSON.stringify(msg));
+    } else {
+      this.logger.log(
+        `didn't send the message ${JSON.stringify(
+          msg
+        )} due to ws connection being closed`
+      );
     }
   }
   refreshEveryMorning = (dt) => {
@@ -971,10 +960,11 @@ var WebsocketClient = class extends import_events.EventEmitter {
       const currentMin = date.getUTCMinutes();
       const currentHour = date.getUTCHours();
       if (lastMin !== min && hour === currentHour && min === currentMin) {
-        this.logger.log("refreshing access token");
-        this.ws.close(1);
+        this.logger.log(
+          `refreshing access token at ${currentHour}:${currentMin} - ${lastMin}`
+        );
         lastMin = min;
-        return;
+        return this.ws.close(1, "Reconnection");
       }
       lastMin = -1;
     }, 5e4);
@@ -1016,6 +1006,12 @@ var WebsocketClient = class extends import_events.EventEmitter {
     }
     return true;
   };
+  validateFeedType(feedType) {
+    if (feedType === "Depth" || feedType === "Touchline") {
+      return feedType === "Depth" ? "d" : "t";
+    }
+    return null;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.d.cts

@@ -882,6 +882,7 @@ declare class RestClient {
 type LoggerType = "UNIFIED" | "SEPARATE";
 
 type DailyTimeString = `${number}:${number}${"+" | "-"}${number}:${number}`;
+type FeedType = "Touchline" | "Depth";
 interface Events {
     open: () => void;
     connected: () => void;
@@ -903,8 +904,6 @@ declare interface WebsocketClient {
 declare class WebsocketClient extends EventEmitter {
     private wsBaseUrl;
     private ws;
-    private reconnectInterval;
-    private reconnectTimer;
     private subscribedTokens;
     private logger;
     private retryCount;
@@ -927,8 +926,7 @@ declare class WebsocketClient extends EventEmitter {
     private wsMessageEvent;
     private wsErrorEvent;
     private wsCloseEvent;
-    private wsCloseEventV2;
-    subscribe(scrips: string | string[]): void;
+    subscribe(scrips: string | string[], feedType?: FeedType): void;
     unsubscribe(scrips: string | string[]): void;
     close(): void;
     private resubscribe;
@@ -936,6 +934,7 @@ declare class WebsocketClient extends EventEmitter {
     private refreshEveryMorning;
     private parseDailyRefreshTime;
     private validateTimezoneString;
+    private validateFeedType;
 }
 
-export { AddScripToWatchlist, BaseType, BaseTypeFail, BaseTypeSuccess, BaseTypeWithoutTime, BasketMargin, CancelOrder, ChangePassword, DailyTimeString, DepthSubscriptionUpdate, ExchMessage, Exchange, ExitSNOOrder, ForgotPassword, GetClientDetails, GetHSToken, GetLimitsParam, GetListOfPredefinedMW, GetListOfPredefinedMWScrip, GetSecurityInfo, GetTokenExpiry, GetUserDetails, GetWatchlist, GetWatchlistNames, HistoricData, Holdings, IndexList, Limits, Login, LoginWithDevicePin, LogoutResponse, MakeKeysRequired, ModifyOrder, OptionChain, Order, OrderBook, OrderInput, OrderMargin, Path, PlaceOrder, PositionBook, ProductConversion, ProductType, RemoveScripFromWatchlist, RestClient, ScripInfo, SearchScrip, Segment, SetDevicePin, SingleOrderHistory, SingleOrderStatus, TopIndexList, TopIndexListNames, TradeBook, UserCred, ValidateHSToken, WebsocketClient, getQuotes, paths };
+export { AddScripToWatchlist, BaseType, BaseTypeFail, BaseTypeSuccess, BaseTypeWithoutTime, BasketMargin, CancelOrder, ChangePassword, DailyTimeString, DepthSubscriptionUpdate, ExchMessage, Exchange, ExitSNOOrder, FeedType, ForgotPassword, GetClientDetails, GetHSToken, GetLimitsParam, GetListOfPredefinedMW, GetListOfPredefinedMWScrip, GetSecurityInfo, GetTokenExpiry, GetUserDetails, GetWatchlist, GetWatchlistNames, HistoricData, Holdings, IndexList, Limits, Login, LoginWithDevicePin, LogoutResponse, MakeKeysRequired, ModifyOrder, OptionChain, Order, OrderBook, OrderInput, OrderMargin, Path, PlaceOrder, PositionBook, ProductConversion, ProductType, RemoveScripFromWatchlist, RestClient, ScripInfo, SearchScrip, Segment, SetDevicePin, SingleOrderHistory, SingleOrderStatus, TopIndexList, TopIndexListNames, TradeBook, UserCred, ValidateHSToken, WebsocketClient, getQuotes, paths };

package/dist/index.d.ts

@@ -882,6 +882,7 @@ declare class RestClient {
 type LoggerType = "UNIFIED" | "SEPARATE";
 
 type DailyTimeString = `${number}:${number}${"+" | "-"}${number}:${number}`;
+type FeedType = "Touchline" | "Depth";
 interface Events {
     open: () => void;
     connected: () => void;
@@ -903,8 +904,6 @@ declare interface WebsocketClient {
 declare class WebsocketClient extends EventEmitter {
     private wsBaseUrl;
     private ws;
-    private reconnectInterval;
-    private reconnectTimer;
     private subscribedTokens;
     private logger;
     private retryCount;
@@ -927,8 +926,7 @@ declare class WebsocketClient extends EventEmitter {
     private wsMessageEvent;
     private wsErrorEvent;
     private wsCloseEvent;
-    private wsCloseEventV2;
-    subscribe(scrips: string | string[]): void;
+    subscribe(scrips: string | string[], feedType?: FeedType): void;
     unsubscribe(scrips: string | string[]): void;
     close(): void;
     private resubscribe;
@@ -936,6 +934,7 @@ declare class WebsocketClient extends EventEmitter {
     private refreshEveryMorning;
     private parseDailyRefreshTime;
     private validateTimezoneString;
+    private validateFeedType;
 }
 
-export { AddScripToWatchlist, BaseType, BaseTypeFail, BaseTypeSuccess, BaseTypeWithoutTime, BasketMargin, CancelOrder, ChangePassword, DailyTimeString, DepthSubscriptionUpdate, ExchMessage, Exchange, ExitSNOOrder, ForgotPassword, GetClientDetails, GetHSToken, GetLimitsParam, GetListOfPredefinedMW, GetListOfPredefinedMWScrip, GetSecurityInfo, GetTokenExpiry, GetUserDetails, GetWatchlist, GetWatchlistNames, HistoricData, Holdings, IndexList, Limits, Login, LoginWithDevicePin, LogoutResponse, MakeKeysRequired, ModifyOrder, OptionChain, Order, OrderBook, OrderInput, OrderMargin, Path, PlaceOrder, PositionBook, ProductConversion, ProductType, RemoveScripFromWatchlist, RestClient, ScripInfo, SearchScrip, Segment, SetDevicePin, SingleOrderHistory, SingleOrderStatus, TopIndexList, TopIndexListNames, TradeBook, UserCred, ValidateHSToken, WebsocketClient, getQuotes, paths };
+export { AddScripToWatchlist, BaseType, BaseTypeFail, BaseTypeSuccess, BaseTypeWithoutTime, BasketMargin, CancelOrder, ChangePassword, DailyTimeString, DepthSubscriptionUpdate, ExchMessage, Exchange, ExitSNOOrder, FeedType, ForgotPassword, GetClientDetails, GetHSToken, GetLimitsParam, GetListOfPredefinedMW, GetListOfPredefinedMWScrip, GetSecurityInfo, GetTokenExpiry, GetUserDetails, GetWatchlist, GetWatchlistNames, HistoricData, Holdings, IndexList, Limits, Login, LoginWithDevicePin, LogoutResponse, MakeKeysRequired, ModifyOrder, OptionChain, Order, OrderBook, OrderInput, OrderMargin, Path, PlaceOrder, PositionBook, ProductConversion, ProductType, RemoveScripFromWatchlist, RestClient, ScripInfo, SearchScrip, Segment, SetDevicePin, SingleOrderHistory, SingleOrderStatus, TopIndexList, TopIndexListNames, TradeBook, UserCred, ValidateHSToken, WebsocketClient, getQuotes, paths };

package/dist/index.js

@@ -106,7 +106,7 @@ var Tokens = class {
   }
 };
 var tokens = new Tokens();
-async function refreshAccessToken() {
+async function refreshAccessToken(retryCount = 3) {
   const userCred = tokens.getCred();
   const cred = {
     apkversion: "1.0.0",
@@ -118,14 +118,23 @@ async function refreshAccessToken() {
     imei: userCred?.imei || "api",
     source: "API"
   };
-  try {
-    const req = await request("login", { data: cred });
-    tokens.updateAccessToken(req.susertoken);
-  } catch (err) {
-    let errMsg = "Couldn't Refresh the Access Token. ";
-    err instanceof Error && (errMsg += `Error: ${err.message}`);
-    throw new Error(`Couldn't Refresh the Access Token. Error: ${errMsg}`);
+  let errorMsg = "";
+  for (let i = 0; i < retryCount; i++) {
+    try {
+      const req = await request("login", { data: cred });
+      tokens.updateAccessToken(req.susertoken);
+      return;
+    } catch (err) {
+      let errMsg = "Couldn't Refresh the Access Token. ";
+      if (err instanceof Error) {
+        errMsg += `Error: ${err.message}`;
+      }
+      errorMsg += `${errMsg}, `;
+    }
   }
+  throw new Error(
+    `Attempted to refresh access token ${retryCount} times. but failed. Errors: ${errorMsg}`
+  );
 }
 __name(refreshAccessToken, "refreshAccessToken");
 
@@ -726,8 +735,6 @@ var WebsocketClient = class extends EventEmitter {
   }
   wsBaseUrl = "wss://api.shoonya.com/NorenWSTP/";
   ws;
-  reconnectInterval;
-  reconnectTimer;
   subscribedTokens = [];
   logger;
   retryCount = 0;
@@ -740,7 +747,6 @@ var WebsocketClient = class extends EventEmitter {
   constructor(params) {
     super();
     const {
-      reconnectInterval = 3e4,
       dailyRefreshTime = "09:13+05:30",
       cred,
       logging = false,
@@ -762,7 +768,6 @@ var WebsocketClient = class extends EventEmitter {
     if (!storedCred.userId) {
       tokens.updateCred(cred);
     }
-    this.reconnectInterval = reconnectInterval;
     if (this.validateTimezoneString(dailyRefreshTime)) {
       const dt = this.parseDailyRefreshTime(dailyRefreshTime);
       this.refreshEveryMorning(dt);
@@ -778,7 +783,7 @@ var WebsocketClient = class extends EventEmitter {
     this.ws = new WebSocket(this.wsBaseUrl);
     this.ws.on("message", this.wsMessageEvent);
     this.ws.on("open", this.wsOpenEvent);
-    this.ws.on("close", this.wsCloseEventV2);
+    this.ws.on("close", this.wsCloseEvent);
     this.ws.on("error", this.wsErrorEvent);
   }
   wsOpenEvent = async () => {
@@ -799,11 +804,11 @@ var WebsocketClient = class extends EventEmitter {
   wsMessageEvent = (msg) => {
     const result = JSON.parse(msg.toString());
     if (result.t === "ck" && result.s.toLowerCase() === "ok") {
-      console.log("Connected with Shoonya Websocket.");
-      this.logger.log("|WSClient| Connected with Shoonya WS.");
-      clearInterval(this.reconnectTimer);
-      this.emit("connected");
-      this.resubscribe();
+      setTimeout(() => {
+        this.logger.log("|WSClient| Connected with Shoonya WS.");
+        this.emit("connected");
+        this.resubscribe();
+      }, 3e3);
     }
     if (result.t === "dk") {
       this.logger.log(`Subscribed to ${result.ts}.`);
@@ -830,44 +835,17 @@ var WebsocketClient = class extends EventEmitter {
     this.emit("error", error);
     this.ws.close(0);
   };
-  wsCloseEvent = async (code) => {
-    if (code === 1) {
-      try {
-        await refreshAccessToken();
-        this.logger.log("Access Token Refreshed");
-      } catch (err) {
-        err instanceof Error && this.logger.log(err.message, "ERROR");
-      }
-      this.emit("tokenRefresh");
-      this.connect();
-      return;
-    }
-    if (code !== 0) {
-      let retryAttempts = 0;
-      clearInterval(this.reconnectTimer);
-      this.reconnectTimer = setInterval(() => {
-        retryAttempts++;
-        this.logger.log(
-          `Disconnected with error code ${code}. Attempt ${retryAttempts} to reconnect....`
-        );
-        this.connect();
-        if (this.maxRetryAttempt === retryAttempts) {
-          this.logger.log("Max Retry Attempt Reached. Stopped Retrying.");
-          clearInterval(this.reconnectInterval);
-        }
-      }, this.reconnectInterval);
-      return;
-    }
-    this.logger.log("|WSClient| Connection Closed Successfully");
-    this.emit("close");
-  };
-  wsCloseEventV2 = async (code, reason) => {
+  wsCloseEvent = async (code, reason) => {
+    this.logger.log(
+      `WS Close Event: code: ${code}, reason: ${reason.toString()}`
+    );
     if (code === 0) {
       this.logger.log("Websocket closed gracefully");
       return;
     }
     if (code === 1) {
       try {
+        this.logger.log("Trying to refresh the Access Token");
         await refreshAccessToken();
         this.logger.log("Access Token Refreshed");
       } catch (err) {
@@ -875,6 +853,7 @@ var WebsocketClient = class extends EventEmitter {
           `Failed to update access token. Err: ${err.message}`,
           "ERROR"
         );
+        console.error("Failed to refresh access token", err);
       }
       this.emit("tokenRefresh");
       this.connect();
@@ -892,7 +871,11 @@ var WebsocketClient = class extends EventEmitter {
     console.log(`Attempt #${this.retryCount} to reconnect again`);
     this.connect();
   };
-  subscribe(scrips) {
+  subscribe(scrips, feedType = "Depth") {
+    const t = this.validateFeedType(feedType);
+    if (!t) {
+      return cc.red("Feed Type should be either Depth or Touchline");
+    }
     const scripList = Array.isArray(scrips) ? scrips : [scrips];
     const distinctScrips = checkTwoArrayOverlaps(
       this.subscribedTokens,
@@ -924,7 +907,7 @@ var WebsocketClient = class extends EventEmitter {
   }
   resubscribe() {
     if (this.subscribedTokens.length) {
-      const tokensToSub = this.subscribedTokens;
+      const tokensToSub = Array.from(new Set(this.subscribedTokens));
       this.subscribedTokens = [];
       this.subscribe(tokensToSub);
     }
@@ -932,6 +915,12 @@ var WebsocketClient = class extends EventEmitter {
   send(msg) {
     if (this.ws && this.ws.readyState === this.ws.OPEN) {
       this.ws.send(JSON.stringify(msg));
+    } else {
+      this.logger.log(
+        `didn't send the message ${JSON.stringify(
+          msg
+        )} due to ws connection being closed`
+      );
     }
   }
   refreshEveryMorning = (dt) => {
@@ -943,10 +932,11 @@ var WebsocketClient = class extends EventEmitter {
       const currentMin = date.getUTCMinutes();
       const currentHour = date.getUTCHours();
       if (lastMin !== min && hour === currentHour && min === currentMin) {
-        this.logger.log("refreshing access token");
-        this.ws.close(1);
+        this.logger.log(
+          `refreshing access token at ${currentHour}:${currentMin} - ${lastMin}`
+        );
         lastMin = min;
-        return;
+        return this.ws.close(1, "Reconnection");
       }
       lastMin = -1;
     }, 5e4);
@@ -988,6 +978,12 @@ var WebsocketClient = class extends EventEmitter {
     }
     return true;
   };
+  validateFeedType(feedType) {
+    if (feedType === "Depth" || feedType === "Touchline") {
+      return feedType === "Depth" ? "d" : "t";
+    }
+    return null;
+  }
 };
 export {
   RestClient,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoonya-sdk",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Wrapper around Shoonya API",
   "main": "dist/index.cjs",
   "module": "dist/index.js",