shoonya-sdk 0.4.2 → 0.4.4

package/dist/shoonya-sdk.d.mts

@@ -1,46 +1,5 @@
 import { EventEmitter } from 'events';
 
-declare const paths: {
-    readonly login: "QuickAuth";
-    readonly logout: "Logout";
-    readonly forgotPassword: "ForgotPassword";
-    readonly changePassword: "Changepwd";
-    readonly watchlist: "MWList";
-    readonly getWatchlist: "MarketWatch";
-    readonly searchScrip: "SearchScrip";
-    readonly userInfo: "UserDetails";
-    readonly clientInfo: "ClientDetails";
-    readonly quotes: "GetQuotes";
-    readonly addScripToWL: "AddMultiScripsToMW";
-    readonly removeScripFromWL: "DeleteMultiMWScrips";
-    readonly securityInfo: "GetSecurityInfo";
-    readonly placeOrder: "PlaceOrder";
-    readonly modifyOrder: "ModifyOrder";
-    readonly cancelOrder: "CancelOrder";
-    readonly exitSNOOrder: "ExitSNOOrder";
-    readonly historicData: "TPSeries";
-    readonly optionChain: "GetOptionChain";
-    readonly orderBook: "OrderBook";
-};
-type Path = keyof typeof paths;
-
-type LogType = "DEBUG" | "WARN" | "ERROR";
-declare class Logger {
-    logPath: string;
-    maxSize: number;
-    fileName: string;
-    /**
-     *
-     * @param logFileName name to prepend the logs file with
-     * @param size max size of file (in bytes)
-     */
-    constructor(logFileName: string, size: number);
-    log(msg: string, logType?: LogType): void;
-    private checkLogSize;
-    private deleteOldestFile;
-    private checkPathExistance;
-}
-
 type RequestDataType = {
     [key: string]: string;
 };
@@ -203,6 +162,128 @@ interface OrderBookFail {
     emsg: string;
 }
 type OrderBook = OrderBookSuccess[] | OrderBookFail;
+interface GetLimitsParam {
+    /**
+     * Product Name
+     * (Select from ‘prarr’ Array provided in User Details response, and if same is allowed for selected, exchange.
+     *  Show product display name, for user to select, and send corresponding prd in API call)
+     *
+     * ```
+     *  `C` : CNC
+     *  `M` : NRML
+     *  `I` : MIS
+     *  `B` : Bracket Order
+     *  `H` : Cover Order
+     * ```
+     */
+    prd?: "C" | "M" | "I" | "B" | "H";
+    seg?: "CM" | "FX" | "FO";
+    exch?: "NSE" | "NFO" | "BSE" | "MCX" | "CDS";
+}
+interface GetLimitsResponseFail {
+    stat: "Not_Ok";
+    emsg: string;
+}
+interface GetLimitsResponseSuccess {
+    request_time: string;
+    stat: "Ok";
+    prfname: string;
+    cash: number;
+    payin: number;
+    payout: number;
+    brkcollamt: number;
+    unclearedcash: number;
+    aux_daycash: number;
+    aux_brkcollamt: number;
+    aux_unclearedcash: number;
+    daycash: number;
+    turnoverlmt: number;
+    pendordvallmt: number;
+    remarks_amt: number;
+    remarks_text: string;
+    blk_amt: number;
+}
+interface GetSecurityInfoSuccess {
+    request_time: string;
+    stat: "Ok";
+    exch: "NFO" | "NSE" | "BSE" | "MCX" | "CDS";
+    tsym: string;
+    cname: string;
+    symname: string;
+    seg: string;
+    exd: string;
+    instname: string;
+    optt: "CE" | "PE";
+    und_exch: string;
+    und_tk: string;
+    pp: string;
+    prcftr: string;
+    ls: string;
+    ti: string;
+    mult: string;
+    weekly: string;
+    dname: string;
+    uc: string;
+    lc: string;
+    strprc: string;
+    prcftr_d: string;
+    exptime: string;
+    token: string;
+    frzqty: string;
+    delmrg: string;
+    varmrg: string;
+    expmrg: string;
+}
+interface GetSecurityInfoFail {
+    stat: "Not_Ok";
+    request_time: string;
+    emsg: string;
+}
+type GetSecurityInfoResponse = GetSecurityInfoSuccess | GetSecurityInfoFail;
+type GetTokenExpiry = "current" | "next" | "next-next" | "more-than-1-day" | "more-than-3-day" | "more-than-10-day";
+
+declare const paths: {
+    readonly login: "QuickAuth";
+    readonly logout: "Logout";
+    readonly forgotPassword: "ForgotPassword";
+    readonly changePassword: "Changepwd";
+    readonly watchlist: "MWList";
+    readonly getWatchlist: "MarketWatch";
+    readonly searchScrip: "SearchScrip";
+    readonly userInfo: "UserDetails";
+    readonly clientInfo: "ClientDetails";
+    readonly quotes: "GetQuotes";
+    readonly addScripToWL: "AddMultiScripsToMW";
+    readonly removeScripFromWL: "DeleteMultiMWScrips";
+    readonly securityInfo: "GetSecurityInfo";
+    readonly placeOrder: "PlaceOrder";
+    readonly modifyOrder: "ModifyOrder";
+    readonly cancelOrder: "CancelOrder";
+    readonly exitSNOOrder: "ExitSNOOrder";
+    readonly historicData: "TPSeries";
+    readonly optionChain: "GetOptionChain";
+    readonly orderBook: "OrderBook";
+    readonly holding: "Holdings";
+    readonly limits: "Limits";
+};
+type Path = keyof typeof paths;
+
+type LogType = "DEBUG" | "WARN" | "ERROR";
+declare class Logger {
+    logPath: string;
+    maxSize: number;
+    fileName: string;
+    /**
+     *
+     * @param logFileName name to prepend the logs file with
+     * @param size max size of file (in bytes)
+     */
+    constructor(logFileName: string, size: number);
+    log(msg: string, logType?: LogType): void;
+    private checkLogSize;
+    private deleteOldestFile;
+    private checkPathExistance;
+}
 
 type ShoonyaWSEvents = "connect" | "open" | "priceUpdate" | "orderUpdate" | "stopped" | "close" | "reconnect" | "error";
 declare interface Shoonya {
@@ -228,6 +309,7 @@ declare class Shoonya extends EventEmitter {
     private reconnectTimeout;
     private heartbeatTimeout;
     private lastWsMsgAt;
+    private autoReconnectTimeout;
     constructor(options?: {
         logging: boolean;
         /**
@@ -288,7 +370,7 @@ declare class Shoonya extends EventEmitter {
      * @returns
      */
     removeScripFromWatchList(listName: string, scrips: string[]): Promise<unknown>;
-    getSecurityInfo(exchange: string, contractToken: string): Promise<unknown>;
+    getSecurityInfo(exchange: string, contractToken: string): Promise<GetSecurityInfoResponse>;
     placeOrder(details: OrderInput): Promise<PlaceOrder>;
     modifyOrder(orderDetail: MakeKeysRequired<Partial<OrderInput>, "exch" | "norenordno" | "tsym">): Promise<unknown>;
     cancelOrder(orderNo: string): Promise<unknown>;
@@ -329,7 +411,10 @@ declare class Shoonya extends EventEmitter {
          * @default 5
          */
         count?: string;
-        optionExpiry?: "current" | "next" | "next-next" | "more-than-1-day";
+        /**
+         * @default current
+         */
+        optionExpiry?: GetTokenExpiry;
     }): Promise<{
         token: number;
         exchange: "NFO" | "MCX";
@@ -337,6 +422,21 @@ declare class Shoonya extends EventEmitter {
     }>;
     private getFormattedExpiry;
     private getNextFormattedDates;
+    /**
+     * Product Name
+     * (Select from ‘prarr’ Array provided in User Details response, and if same is allowed for selected, exchange.
+     *  Show product display name, for user to select, and send corresponding prd in API call)
+     *
+     * ```
+     *  `C` : CNC
+     *  `M` : NRML
+     *  `I` : MIS
+     *  `B` : Bracket Order
+     *  `H` : Cover Order
+     * ```
+     */
+    getAccountHolding(productName: "C" | "M" | "I" | "B" | "H"): Promise<any>;
+    getAccountLimits(params?: GetLimitsParam): Promise<GetLimitsResponseSuccess | GetLimitsResponseFail>;
     getLastWSMessage(): Date;
     getWSState(): {
         OPEN: boolean;
@@ -344,6 +444,7 @@ declare class Shoonya extends EventEmitter {
         CLOSING: boolean;
         CONNECTING: boolean;
     };
+    getSubscribedTokens(): string[];
     connectWS(): void;
     /**
      *

package/dist/shoonya-sdk.d.ts

@@ -1,46 +1,5 @@
 import { EventEmitter } from 'events';
 
-declare const paths: {
-    readonly login: "QuickAuth";
-    readonly logout: "Logout";
-    readonly forgotPassword: "ForgotPassword";
-    readonly changePassword: "Changepwd";
-    readonly watchlist: "MWList";
-    readonly getWatchlist: "MarketWatch";
-    readonly searchScrip: "SearchScrip";
-    readonly userInfo: "UserDetails";
-    readonly clientInfo: "ClientDetails";
-    readonly quotes: "GetQuotes";
-    readonly addScripToWL: "AddMultiScripsToMW";
-    readonly removeScripFromWL: "DeleteMultiMWScrips";
-    readonly securityInfo: "GetSecurityInfo";
-    readonly placeOrder: "PlaceOrder";
-    readonly modifyOrder: "ModifyOrder";
-    readonly cancelOrder: "CancelOrder";
-    readonly exitSNOOrder: "ExitSNOOrder";
-    readonly historicData: "TPSeries";
-    readonly optionChain: "GetOptionChain";
-    readonly orderBook: "OrderBook";
-};
-type Path = keyof typeof paths;
-
-type LogType = "DEBUG" | "WARN" | "ERROR";
-declare class Logger {
-    logPath: string;
-    maxSize: number;
-    fileName: string;
-    /**
-     *
-     * @param logFileName name to prepend the logs file with
-     * @param size max size of file (in bytes)
-     */
-    constructor(logFileName: string, size: number);
-    log(msg: string, logType?: LogType): void;
-    private checkLogSize;
-    private deleteOldestFile;
-    private checkPathExistance;
-}
-
 type RequestDataType = {
     [key: string]: string;
 };
@@ -203,6 +162,128 @@ interface OrderBookFail {
     emsg: string;
 }
 type OrderBook = OrderBookSuccess[] | OrderBookFail;
+interface GetLimitsParam {
+    /**
+     * Product Name
+     * (Select from ‘prarr’ Array provided in User Details response, and if same is allowed for selected, exchange.
+     *  Show product display name, for user to select, and send corresponding prd in API call)
+     *
+     * ```
+     *  `C` : CNC
+     *  `M` : NRML
+     *  `I` : MIS
+     *  `B` : Bracket Order
+     *  `H` : Cover Order
+     * ```
+     */
+    prd?: "C" | "M" | "I" | "B" | "H";
+    seg?: "CM" | "FX" | "FO";
+    exch?: "NSE" | "NFO" | "BSE" | "MCX" | "CDS";
+}
+interface GetLimitsResponseFail {
+    stat: "Not_Ok";
+    emsg: string;
+}
+interface GetLimitsResponseSuccess {
+    request_time: string;
+    stat: "Ok";
+    prfname: string;
+    cash: number;
+    payin: number;
+    payout: number;
+    brkcollamt: number;
+    unclearedcash: number;
+    aux_daycash: number;
+    aux_brkcollamt: number;
+    aux_unclearedcash: number;
+    daycash: number;
+    turnoverlmt: number;
+    pendordvallmt: number;
+    remarks_amt: number;
+    remarks_text: string;
+    blk_amt: number;
+}
+interface GetSecurityInfoSuccess {
+    request_time: string;
+    stat: "Ok";
+    exch: "NFO" | "NSE" | "BSE" | "MCX" | "CDS";
+    tsym: string;
+    cname: string;
+    symname: string;
+    seg: string;
+    exd: string;
+    instname: string;
+    optt: "CE" | "PE";
+    und_exch: string;
+    und_tk: string;
+    pp: string;
+    prcftr: string;
+    ls: string;
+    ti: string;
+    mult: string;
+    weekly: string;
+    dname: string;
+    uc: string;
+    lc: string;
+    strprc: string;
+    prcftr_d: string;
+    exptime: string;
+    token: string;
+    frzqty: string;
+    delmrg: string;
+    varmrg: string;
+    expmrg: string;
+}
+interface GetSecurityInfoFail {
+    stat: "Not_Ok";
+    request_time: string;
+    emsg: string;
+}
+type GetSecurityInfoResponse = GetSecurityInfoSuccess | GetSecurityInfoFail;
+type GetTokenExpiry = "current" | "next" | "next-next" | "more-than-1-day" | "more-than-3-day" | "more-than-10-day";
+
+declare const paths: {
+    readonly login: "QuickAuth";
+    readonly logout: "Logout";
+    readonly forgotPassword: "ForgotPassword";
+    readonly changePassword: "Changepwd";
+    readonly watchlist: "MWList";
+    readonly getWatchlist: "MarketWatch";
+    readonly searchScrip: "SearchScrip";
+    readonly userInfo: "UserDetails";
+    readonly clientInfo: "ClientDetails";
+    readonly quotes: "GetQuotes";
+    readonly addScripToWL: "AddMultiScripsToMW";
+    readonly removeScripFromWL: "DeleteMultiMWScrips";
+    readonly securityInfo: "GetSecurityInfo";
+    readonly placeOrder: "PlaceOrder";
+    readonly modifyOrder: "ModifyOrder";
+    readonly cancelOrder: "CancelOrder";
+    readonly exitSNOOrder: "ExitSNOOrder";
+    readonly historicData: "TPSeries";
+    readonly optionChain: "GetOptionChain";
+    readonly orderBook: "OrderBook";
+    readonly holding: "Holdings";
+    readonly limits: "Limits";
+};
+type Path = keyof typeof paths;
+
+type LogType = "DEBUG" | "WARN" | "ERROR";
+declare class Logger {
+    logPath: string;
+    maxSize: number;
+    fileName: string;
+    /**
+     *
+     * @param logFileName name to prepend the logs file with
+     * @param size max size of file (in bytes)
+     */
+    constructor(logFileName: string, size: number);
+    log(msg: string, logType?: LogType): void;
+    private checkLogSize;
+    private deleteOldestFile;
+    private checkPathExistance;
+}
 
 type ShoonyaWSEvents = "connect" | "open" | "priceUpdate" | "orderUpdate" | "stopped" | "close" | "reconnect" | "error";
 declare interface Shoonya {
@@ -228,6 +309,7 @@ declare class Shoonya extends EventEmitter {
     private reconnectTimeout;
     private heartbeatTimeout;
     private lastWsMsgAt;
+    private autoReconnectTimeout;
     constructor(options?: {
         logging: boolean;
         /**
@@ -288,7 +370,7 @@ declare class Shoonya extends EventEmitter {
      * @returns
      */
     removeScripFromWatchList(listName: string, scrips: string[]): Promise<unknown>;
-    getSecurityInfo(exchange: string, contractToken: string): Promise<unknown>;
+    getSecurityInfo(exchange: string, contractToken: string): Promise<GetSecurityInfoResponse>;
     placeOrder(details: OrderInput): Promise<PlaceOrder>;
     modifyOrder(orderDetail: MakeKeysRequired<Partial<OrderInput>, "exch" | "norenordno" | "tsym">): Promise<unknown>;
     cancelOrder(orderNo: string): Promise<unknown>;
@@ -329,7 +411,10 @@ declare class Shoonya extends EventEmitter {
          * @default 5
          */
         count?: string;
-        optionExpiry?: "current" | "next" | "next-next" | "more-than-1-day";
+        /**
+         * @default current
+         */
+        optionExpiry?: GetTokenExpiry;
     }): Promise<{
         token: number;
         exchange: "NFO" | "MCX";
@@ -337,6 +422,21 @@ declare class Shoonya extends EventEmitter {
     }>;
     private getFormattedExpiry;
     private getNextFormattedDates;
+    /**
+     * Product Name
+     * (Select from ‘prarr’ Array provided in User Details response, and if same is allowed for selected, exchange.
+     *  Show product display name, for user to select, and send corresponding prd in API call)
+     *
+     * ```
+     *  `C` : CNC
+     *  `M` : NRML
+     *  `I` : MIS
+     *  `B` : Bracket Order
+     *  `H` : Cover Order
+     * ```
+     */
+    getAccountHolding(productName: "C" | "M" | "I" | "B" | "H"): Promise<any>;
+    getAccountLimits(params?: GetLimitsParam): Promise<GetLimitsResponseSuccess | GetLimitsResponseFail>;
     getLastWSMessage(): Date;
     getWSState(): {
         OPEN: boolean;
@@ -344,6 +444,7 @@ declare class Shoonya extends EventEmitter {
         CLOSING: boolean;
         CONNECTING: boolean;
     };
+    getSubscribedTokens(): string[];
     connectWS(): void;
     /**
      *

package/dist/shoonya-sdk.js

@@ -63,7 +63,9 @@ var paths = {
   exitSNOOrder: "ExitSNOOrder",
   historicData: "TPSeries",
   optionChain: "GetOptionChain",
-  orderBook: "OrderBook"
+  orderBook: "OrderBook",
+  holding: "Holdings",
+  limits: "Limits"
 };
 
 // src/shoonya-sdk.ts
@@ -137,6 +139,25 @@ var Logger = class {
 };
 var logger_default = Logger;
 
+// src/utils/parser.ts
+var exampleObject = {
+  convertable: "57.3",
+  unconvertable: "So"
+};
+function parseKeysToNumber(obj) {
+  const newObj = {};
+  for (const key in obj) {
+    if (Number.isNaN(Number(obj[key]))) {
+      newObj[key] = String(obj[key]);
+    } else {
+      newObj[key] = Number(obj[key]);
+    }
+  }
+  return newObj;
+}
+__name(parseKeysToNumber, "parseKeysToNumber");
+var parsedObj = parseKeysToNumber(exampleObject);
+
 // src/shoonya-sdk.ts
 var import_totp_generator = __toESM(require("totp-generator"));
 var Shoonya = class extends import_events.EventEmitter {
@@ -161,6 +182,7 @@ var Shoonya = class extends import_events.EventEmitter {
   reconnectTimeout;
   heartbeatTimeout;
   lastWsMsgAt;
+  autoReconnectTimeout = 1e3;
   constructor(options) {
     const {
       logging = false,
@@ -357,7 +379,10 @@ var Shoonya = class extends import_events.EventEmitter {
       exch: exchange,
       token: contractToken
     };
-    return this.request("securityInfo", { data, key: this.accessToken });
+    return this.request("securityInfo", {
+      data,
+      key: this.accessToken
+    });
   }
   async placeOrder(details) {
     const data = {
@@ -459,10 +484,12 @@ var Shoonya = class extends import_events.EventEmitter {
         continue;
       if (optionExpiry === "next-next" && c < 3)
         continue;
-      if (optionExpiry === "more-than-1-day") {
+      const match = optionExpiry.match(/more-than-(\d+)-day/);
+      if (match) {
         const dateNow = (/* @__PURE__ */ new Date()).getDate();
         const optionExpiryDate = unformattedDate.getDate();
-        if (optionExpiryDate - dateNow === 0)
+        const check = parseInt(match[1], 10);
+        if (optionExpiryDate - dateNow < check)
           continue;
       }
       for (const { tsym, token } of optionChain.values) {
@@ -482,9 +509,9 @@ var Shoonya = class extends import_events.EventEmitter {
   }
   getNextFormattedDates(expiry) {
     let multiplier = 1;
-    if (expiry === "next" || expiry === "more-than-1-day")
+    if (["next", "more-than-1-day", "more-than-3-day"].includes(expiry))
       multiplier = 2;
-    if (expiry === "next-next")
+    if (["next-next", "more-than-10-day"].includes(expiry))
       multiplier = 3;
     let currentDate = /* @__PURE__ */ new Date();
     let dates = [];
@@ -496,6 +523,43 @@ var Shoonya = class extends import_events.EventEmitter {
     }
     return dates;
   }
+  /**
+   * Product Name
+   * (Select from ‘prarr’ Array provided in User Details response, and if same is allowed for selected, exchange.
+   *  Show product display name, for user to select, and send corresponding prd in API call)
+   *
+   * ```
+   *  `C` : CNC
+   *  `M` : NRML
+   *  `I` : MIS
+   *  `B` : Bracket Order
+   *  `H` : Cover Order
+   * ```
+   */
+  async getAccountHolding(productName) {
+    const data = {
+      uid: this.userId,
+      actid: this.accountId,
+      prd: productName
+    };
+    return await this.request("holding", { data, key: this.accessToken });
+  }
+  async getAccountLimits(params) {
+    const data = {
+      uid: this.userId,
+      actid: this.accountId,
+      ...params
+    };
+    const res = await this.request("limits", {
+      data,
+      key: this.accessToken
+    });
+    if (res.stat === "Not_Ok") {
+      return res;
+    }
+    const parsedObject = parseKeysToNumber(res);
+    return parsedObject;
+  }
   getLastWSMessage() {
     return this.lastWsMsgAt;
   }
@@ -507,6 +571,9 @@ var Shoonya = class extends import_events.EventEmitter {
       CONNECTING: this.ws && this.ws.readyState === this.ws.CONNECTING
     };
   }
+  getSubscribedTokens() {
+    return this.scripList;
+  }
   // WebSocket API
   connectWS() {
     if (this.getWSState().OPEN || this.getWSState().CONNECTING) {
@@ -530,6 +597,7 @@ var Shoonya = class extends import_events.EventEmitter {
       }, this.heartbeatTimeout.timeout);
       if (this.cronJobRunning) {
         this.subscribe(this.scripList);
+        this.logging && this.logger.log("Subscribed to " + JSON.stringify(this.scripList));
         return;
       }
       import_node_cron.default.schedule(
@@ -537,23 +605,17 @@ var Shoonya = class extends import_events.EventEmitter {
         async () => {
           this.cronJobRunning = true;
           try {
+            this.disconnect();
+            const { setTimeout: setTimeout2 } = await import("timers/promises");
+            await setTimeout2(this.autoReconnectTimeout);
             const cred = {
               apiKey: this.apiKey,
               password: this.password,
               twoFa: this.twoFa,
               userId: this.userId
             };
-            this.logger.log("Old access token: " + this.accessToken);
             await this.login(cred);
-            this.logger.log("New access token: " + this.accessToken);
-            let msg2 = {
-              t: "c",
-              uid: this.userId,
-              actid: this.accountId,
-              source: "API",
-              susertoken: this.accessToken
-            };
-            this.ws.send(JSON.stringify(msg2));
+            this.connectWS();
             this.emit("open", "opened ws connection");
             this.logging && this.logger.log("Token Refreshed");
           } catch (err) {

package/dist/shoonya-sdk.mjs

@@ -30,7 +30,9 @@ var paths = {
   exitSNOOrder: "ExitSNOOrder",
   historicData: "TPSeries",
   optionChain: "GetOptionChain",
-  orderBook: "OrderBook"
+  orderBook: "OrderBook",
+  holding: "Holdings",
+  limits: "Limits"
 };
 
 // src/shoonya-sdk.ts
@@ -111,6 +113,25 @@ var Logger = class {
 };
 var logger_default = Logger;
 
+// src/utils/parser.ts
+var exampleObject = {
+  convertable: "57.3",
+  unconvertable: "So"
+};
+function parseKeysToNumber(obj) {
+  const newObj = {};
+  for (const key in obj) {
+    if (Number.isNaN(Number(obj[key]))) {
+      newObj[key] = String(obj[key]);
+    } else {
+      newObj[key] = Number(obj[key]);
+    }
+  }
+  return newObj;
+}
+__name(parseKeysToNumber, "parseKeysToNumber");
+var parsedObj = parseKeysToNumber(exampleObject);
+
 // src/shoonya-sdk.ts
 import totp from "totp-generator";
 var Shoonya = class extends EventEmitter {
@@ -135,6 +156,7 @@ var Shoonya = class extends EventEmitter {
   reconnectTimeout;
   heartbeatTimeout;
   lastWsMsgAt;
+  autoReconnectTimeout = 1e3;
   constructor(options) {
     const {
       logging = false,
@@ -331,7 +353,10 @@ var Shoonya = class extends EventEmitter {
       exch: exchange,
       token: contractToken
     };
-    return this.request("securityInfo", { data, key: this.accessToken });
+    return this.request("securityInfo", {
+      data,
+      key: this.accessToken
+    });
   }
   async placeOrder(details) {
     const data = {
@@ -433,10 +458,12 @@ var Shoonya = class extends EventEmitter {
         continue;
       if (optionExpiry === "next-next" && c < 3)
         continue;
-      if (optionExpiry === "more-than-1-day") {
+      const match = optionExpiry.match(/more-than-(\d+)-day/);
+      if (match) {
         const dateNow = (/* @__PURE__ */ new Date()).getDate();
         const optionExpiryDate = unformattedDate.getDate();
-        if (optionExpiryDate - dateNow === 0)
+        const check = parseInt(match[1], 10);
+        if (optionExpiryDate - dateNow < check)
           continue;
       }
       for (const { tsym, token } of optionChain.values) {
@@ -456,9 +483,9 @@ var Shoonya = class extends EventEmitter {
   }
   getNextFormattedDates(expiry) {
     let multiplier = 1;
-    if (expiry === "next" || expiry === "more-than-1-day")
+    if (["next", "more-than-1-day", "more-than-3-day"].includes(expiry))
       multiplier = 2;
-    if (expiry === "next-next")
+    if (["next-next", "more-than-10-day"].includes(expiry))
       multiplier = 3;
     let currentDate = /* @__PURE__ */ new Date();
     let dates = [];
@@ -470,6 +497,43 @@ var Shoonya = class extends EventEmitter {
     }
     return dates;
   }
+  /**
+   * Product Name
+   * (Select from ‘prarr’ Array provided in User Details response, and if same is allowed for selected, exchange.
+   *  Show product display name, for user to select, and send corresponding prd in API call)
+   *
+   * ```
+   *  `C` : CNC
+   *  `M` : NRML
+   *  `I` : MIS
+   *  `B` : Bracket Order
+   *  `H` : Cover Order
+   * ```
+   */
+  async getAccountHolding(productName) {
+    const data = {
+      uid: this.userId,
+      actid: this.accountId,
+      prd: productName
+    };
+    return await this.request("holding", { data, key: this.accessToken });
+  }
+  async getAccountLimits(params) {
+    const data = {
+      uid: this.userId,
+      actid: this.accountId,
+      ...params
+    };
+    const res = await this.request("limits", {
+      data,
+      key: this.accessToken
+    });
+    if (res.stat === "Not_Ok") {
+      return res;
+    }
+    const parsedObject = parseKeysToNumber(res);
+    return parsedObject;
+  }
   getLastWSMessage() {
     return this.lastWsMsgAt;
   }
@@ -481,6 +545,9 @@ var Shoonya = class extends EventEmitter {
       CONNECTING: this.ws && this.ws.readyState === this.ws.CONNECTING
     };
   }
+  getSubscribedTokens() {
+    return this.scripList;
+  }
   // WebSocket API
   connectWS() {
     if (this.getWSState().OPEN || this.getWSState().CONNECTING) {
@@ -504,6 +571,7 @@ var Shoonya = class extends EventEmitter {
       }, this.heartbeatTimeout.timeout);
       if (this.cronJobRunning) {
         this.subscribe(this.scripList);
+        this.logging && this.logger.log("Subscribed to " + JSON.stringify(this.scripList));
         return;
       }
       cron.schedule(
@@ -511,23 +579,17 @@ var Shoonya = class extends EventEmitter {
         async () => {
           this.cronJobRunning = true;
           try {
+            this.disconnect();
+            const { setTimeout: setTimeout2 } = await import("timers/promises");
+            await setTimeout2(this.autoReconnectTimeout);
             const cred = {
               apiKey: this.apiKey,
               password: this.password,
               twoFa: this.twoFa,
               userId: this.userId
             };
-            this.logger.log("Old access token: " + this.accessToken);
             await this.login(cred);
-            this.logger.log("New access token: " + this.accessToken);
-            let msg2 = {
-              t: "c",
-              uid: this.userId,
-              actid: this.accountId,
-              source: "API",
-              susertoken: this.accessToken
-            };
-            this.ws.send(JSON.stringify(msg2));
+            this.connectWS();
             this.emit("open", "opened ws connection");
             this.logging && this.logger.log("Token Refreshed");
           } catch (err) {

package/package.json

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