nsekit 0.3.0 → 0.3.2

package/dist/index.js

@@ -19448,8 +19448,9 @@ class InstrumentMaster {
     if (local.ok)
       return local;
     if (brokerInstruments.capabilities.searchAPI && brokerInstruments.searchAPI) {
-      const { symbol } = this.parseInput(input);
-      const apiResult = await brokerInstruments.searchAPI(symbol);
+      const { exchange, symbol } = this.parseInput(input);
+      const inferredExchange = exchange ?? (/-(?:CE|PE|FUT)-/.test(symbol) ? "NFO" : undefined);
+      const apiResult = await brokerInstruments.searchAPI(symbol, inferredExchange);
       if (apiResult.ok && apiResult.value.length > 0) {
         for (const entry of apiResult.value)
           this.mergeEntry(brokerId, entry);
@@ -20192,8 +20193,8 @@ function safeSide(raw) {
 }
 function parseTimestamp(ts) {
   if (!ts)
-    return Date.now();
-  return new Date(ts).getTime();
+    return 0;
+  return new Date(ts).getTime() || 0;
 }
 function inferInstrumentType(symbol, exchange) {
   if (exchange === "NSE" || exchange === "BSE")
@@ -21012,7 +21013,7 @@ var VALIDITY_FROM_SHOONYA = {
   IOC: "IOC"
 };
 var SHOONYA_API_BASE = "https://api.shoonya.com/NorenWClientTP";
-var SHOONYA_WS_URL = "wss://api.shoonya.com/NorenWSTP";
+var SHOONYA_WS_URL = "wss://api.shoonya.com/NorenWSTP/";
 var SHOONYA_INSTRUMENTS_BASE = "https://api.shoonya.com/";
 var SHOONYA_INSTRUMENT_FILES = {
   NSE: "NSE_symbols.txt.zip",
@@ -21169,13 +21170,18 @@ function inferSide2(qty) {
 }
 function parseTimestamp2(ts) {
   if (!ts)
-    return Date.now();
+    return 0;
   const asNum = Number(ts);
   if (!isNaN(asNum) && asNum > 1000000000000)
     return asNum;
   if (!isNaN(asNum) && asNum > 1e9)
     return asNum * 1000;
-  return new Date(ts).getTime() || Date.now();
+  const shoonya = ts.match(/^(\d{2}:\d{2}:\d{2})\s+(\d{2})-(\d{2})-(\d{4})$/);
+  if (shoonya) {
+    const [, time, dd, mm, yyyy] = shoonya;
+    return new Date(`${yyyy}-${mm}-${dd}T${time}`).getTime() || 0;
+  }
+  return new Date(ts).getTime() || 0;
 }
 function toOrderParams2(unified, uid, actid) {
   const params = {
@@ -21203,17 +21209,21 @@ function fromPosition2(pos) {
   const buyQty = num(pos.daybuyqty);
   const sellQty = num(pos.daysellqty);
   const realizedPnl = num(pos.rpnl);
-  const unrealizedPnl = num(pos.urmtom);
+  const ltp = num(pos.lp);
+  const entryPrice = num(pos.upldprc);
+  const avgPrice = entryPrice > 0 ? entryPrice : num(pos.netavgprc);
+  const unrealizedPnl = entryPrice > 0 ? (ltp - entryPrice) * netQty : num(pos.urmtom);
+  const tradingSymbol = pos.tsym.replace(/-EQ$|-BE$|-BL$|-IL$|-IQ$/, "");
   return {
     broker: "finvasia",
-    tradingSymbol: pos.tsym,
+    tradingSymbol,
     exchange: safeExchange2(pos.exch),
     side: inferSide2(netQty),
     quantity: Math.abs(netQty),
     buyQty,
     sellQty,
-    avgPrice: num(pos.netavgprc),
-    ltp: num(pos.lp),
+    avgPrice,
+    ltp,
     pnl: realizedPnl + unrealizedPnl,
     realizedPnl,
     unrealizedPnl,
@@ -21250,7 +21260,7 @@ function fromTick2(tick, symbolLookup) {
   return {
     broker: "finvasia",
     token: tick.tk,
-    tradingSymbol: symbolLookup ?? tick.tk,
+    tradingSymbol: symbolLookup ?? tick.ts ?? tick.tk,
     ltp: num(tick.lp),
     open: num(tick.o),
     high: num(tick.h),
@@ -21265,15 +21275,17 @@ function fromTick2(tick, symbolLookup) {
     timestamp: parseTimestamp2(tick.ft)
   };
 }
-function fromHolding2(holding) {
+function fromHolding2(holding, ltp = 0) {
   const first = holding.exch_tsym?.[0];
   const qty = num(holding.holdqty) + num(holding.dpqty) + num(holding.npoadqty) + num(holding.btstqty) - num(holding.usedqty);
   const avgPrice = num(holding.upldprc);
-  const ltp = num(holding.lp);
+  ltp = num(holding.lp) || num(holding.c) || ltp;
   const pnl = (ltp - avgPrice) * qty;
+  const rawSymbol = first?.tsym ?? "";
+  const tradingSymbol = rawSymbol.replace(/-EQ$|-BE$|-BL$|-IL$|-IQ$/, "");
   return {
     broker: "finvasia",
-    tradingSymbol: first?.tsym ?? "",
+    tradingSymbol,
     exchange: safeExchange2(first?.exch ?? "NSE"),
     isin: holding.isin ?? "",
     quantity: qty,
@@ -21312,6 +21324,7 @@ function fromQuote2(quote) {
 }
 
 // src/brokers/finvasia/finvasia-socket.ts
+import WS from "ws";
 var subIdCounter3 = 0;
 function nextSubId3() {
   subIdCounter3 += 1;
@@ -21329,21 +21342,24 @@ class FinvasiaSocket {
   reconnectAttempts = 0;
   maxReconnects = 5;
   reconnectTimer = null;
-  constructor(userId, accessToken) {
+  onAuthFailed;
+  constructor(userId, accessToken, onAuthFailed) {
     this.userId = userId;
     this.accessToken = accessToken;
+    this.onAuthFailed = onAuthFailed;
   }
   connect() {
     if (this.state === "CONNECTED" || this.state === "CONNECTING")
       return;
     this.state = "CONNECTING";
     try {
-      this.ws = new WebSocket(SHOONYA_WS_URL);
+      this.ws = new WS(SHOONYA_WS_URL);
     } catch {
       this.state = "DISCONNECTED";
       return;
     }
-    this.ws.onopen = () => {
+    this.ws.on("open", () => {
+      console.log(`[FinvasiaSocket] WS open, sending auth for uid=${this.userId}`);
       const authMsg = JSON.stringify({
         t: "c",
         uid: this.userId,
@@ -21352,18 +21368,23 @@ class FinvasiaSocket {
         source: "API"
       });
       this.ws.send(authMsg);
-    };
-    this.ws.onmessage = (event) => {
+    });
+    this.ws.on("message", (raw) => {
       try {
-        const data = JSON.parse(String(event.data));
+        const text = raw.toString();
+        console.log(`[FinvasiaSocket] WS msg: ${text.slice(0, 200)}`);
+        const data = JSON.parse(text);
         this.handleMessage(data);
       } catch {}
-    };
-    this.ws.onclose = () => {
+    });
+    this.ws.on("close", (code, reason) => {
+      console.error(`[FinvasiaSocket] WS closed: code=${code}, reason=${reason.toString()}`);
       this.state = "DISCONNECTED";
       this.attemptReconnect();
-    };
-    this.ws.onerror = () => {};
+    });
+    this.ws.on("error", (err) => {
+      console.error(`[FinvasiaSocket] WS error:`, err.message);
+    });
   }
   disconnect() {
     this.clearReconnectTimer();
@@ -21375,6 +21396,18 @@ class FinvasiaSocket {
     this.state = "DISCONNECTED";
     this.subscribedTokens.clear();
   }
+  reconnect(newToken) {
+    this.clearReconnectTimer();
+    if (newToken)
+      this.accessToken = newToken;
+    this.reconnectAttempts = 0;
+    if (this.ws) {
+      this.ws.close();
+      this.ws = null;
+    }
+    this.state = "DISCONNECTED";
+    this.connect();
+  }
   subscribe(tokens, callback, symbolMap) {
     const sub = {
       id: nextSubId3(),
@@ -21385,7 +21418,11 @@ class FinvasiaSocket {
     for (const t of tokens) {
       this.subscribedTokens.add(t);
       if (symbolMap?.has(t)) {
-        this.tokenToSymbol.set(t, symbolMap.get(t));
+        const sym = symbolMap.get(t);
+        this.tokenToSymbol.set(t, sym);
+        const sep = t.indexOf("|");
+        if (sep !== -1)
+          this.tokenToSymbol.set(t.slice(sep + 1), sym);
       }
     }
     if (this.ws && this.state === "CONNECTED") {
@@ -21418,6 +21455,10 @@ class FinvasiaSocket {
   setSymbolMap(map) {
     for (const [token, symbol] of map) {
       this.tokenToSymbol.set(token, symbol);
+      const sep = token.indexOf("|");
+      if (sep !== -1) {
+        this.tokenToSymbol.set(token.slice(sep + 1), symbol);
+      }
     }
   }
   handleMessage(data) {
@@ -21429,14 +21470,26 @@ class FinvasiaSocket {
         if (this.subscribedTokens.size > 0) {
           this.sendSubscribe(Array.from(this.subscribedTokens));
         }
+      } else {
+        console.error(`[FinvasiaSocket] Auth rejected (ck NOT_OK) \u2014 token invalid, stopping reconnect`);
+        this.reconnectAttempts = this.maxReconnects;
+        this.state = "DISCONNECTED";
+        this.onAuthFailed?.();
       }
       return;
     }
     if (type === "tf" || type === "tk" || type === "dk" || type === "df") {
       const tick = data;
-      const tokenKey = tick.tk;
-      const symbol = this.tokenToSymbol.get(tokenKey);
+      const rawToken = tick.tk;
+      const exch = data["e"] ?? "";
+      const fullKey = exch ? `${exch}|${rawToken}` : rawToken;
+      if (tick.ts && !this.tokenToSymbol.has(fullKey)) {
+        this.tokenToSymbol.set(fullKey, tick.ts);
+        this.tokenToSymbol.set(rawToken, tick.ts);
+      }
+      const symbol = this.tokenToSymbol.get(fullKey) ?? this.tokenToSymbol.get(rawToken);
       const unified = fromTick2(tick, symbol);
+      unified.token = fullKey;
       this.dispatchTick(unified);
       return;
     }
@@ -21487,6 +21540,27 @@ class FinvasiaSocket {
 }
 
 // src/brokers/finvasia/finvasia-instruments.ts
+import { inflateRawSync } from "zlib";
+function extractTextFromZip(buffer) {
+  const bytes = new Uint8Array(buffer);
+  if (bytes.length < 30 || bytes[0] !== 80 || bytes[1] !== 75 || bytes[2] !== 3 || bytes[3] !== 4) {
+    return new TextDecoder().decode(buffer);
+  }
+  const view = new DataView(buffer);
+  const compressionMethod = view.getUint16(8, true);
+  const compressedSize = view.getUint32(18, true);
+  const filenameLength = view.getUint16(26, true);
+  const extraFieldLength = view.getUint16(28, true);
+  const dataOffset = 30 + filenameLength + extraFieldLength;
+  const compressedData = new Uint8Array(buffer, dataOffset, compressedSize);
+  if (compressionMethod === 0) {
+    return new TextDecoder().decode(compressedData);
+  }
+  if (compressionMethod === 8) {
+    return new TextDecoder().decode(inflateRawSync(compressedData));
+  }
+  throw new Error(`Unsupported ZIP compression method: ${compressionMethod}`);
+}
 var COL2 = {
   EXCHANGE: 0,
   TOKEN: 1,
@@ -21499,6 +21573,18 @@ var COL2 = {
   STRIKE: 8,
   OPTION_TYPE: 9
 };
+var HEADER_MAP = {
+  Exchange: "exchange",
+  Token: "token",
+  LotSize: "lot_size",
+  Symbol: "symbol",
+  TradingSymbol: "trading_symbol",
+  Expiry: "expiry",
+  Instrument: "instrument_type",
+  OptionType: "option_type",
+  StrikePrice: "strike",
+  TickSize: "tick_size"
+};
 var EXCHANGE_MAP2 = {
   NSE: "NSE",
   BSE: "BSE",
@@ -21558,7 +21644,7 @@ class FinvasiaInstruments {
         const response = await fetch(url);
         if (!response.ok)
           continue;
-        const text = await response.text();
+        const text = extractTextFromZip(await response.arrayBuffer());
         const lines = text.split(`
 `);
         let headers = null;
@@ -21566,10 +21652,10 @@ class FinvasiaInstruments {
           const trimmed = line.trim();
           if (!trimmed)
             continue;
-          const fields = trimmed.split("|");
+          const fields = trimmed.split(",");
           if (!headers) {
             if (fields[0] === "Exchange" || fields[0] === "exch") {
-              headers = fields;
+              headers = fields.map((h) => HEADER_MAP[h] ?? h.toLowerCase());
               continue;
             }
             headers = [];
@@ -21685,6 +21771,7 @@ class FinvasiaBroker {
   };
   session = null;
   socket = null;
+  credentials = null;
   instrumentsImpl;
   _iMaster;
   constructor(options) {
@@ -21696,6 +21783,7 @@ class FinvasiaBroker {
     const result = await authenticate2(creds);
     if (!result.ok)
       return result;
+    this.credentials = creds;
     this.session = result.value;
     this.instrumentsImpl.setCredentials(this.session.userId, this.session.accessToken);
     return result;
@@ -21756,20 +21844,28 @@ class FinvasiaBroker {
   async modifyOrder(orderId, params) {
     try {
       const uid = this.session?.userId ?? "";
-      const payload = {
+      const histRaw = await this.post("SingleOrdHist", {
         uid,
         norenordno: orderId
+      });
+      if (!Array.isArray(histRaw) || histRaw.length === 0) {
+        return Err(new Error(`Cannot modify order ${orderId}: order not found`));
+      }
+      const latestOrder = histRaw[histRaw.length - 1];
+      const payload = {
+        uid,
+        norenordno: orderId,
+        exch: latestOrder.exch,
+        tsym: latestOrder.tsym,
+        prctyp: latestOrder.prctyp,
+        prc: String(params.price ?? latestOrder.prc),
+        qty: String(params.quantity ?? latestOrder.qty),
+        ret: params.validity ?? latestOrder.ret
       };
-      if (params.price !== undefined)
-        payload["prc"] = String(params.price);
-      if (params.quantity !== undefined)
-        payload["qty"] = String(params.quantity);
       if (params.triggerPrice !== undefined)
         payload["trgprc"] = String(params.triggerPrice);
       if (params.type !== undefined)
         payload["prctyp"] = params.type;
-      if (params.validity !== undefined)
-        payload["ret"] = params.validity;
       const res = await this.post("ModifyOrder", payload);
       if (res.stat !== "Ok") {
         return Err(new Error(`Order modification failed: ${res.emsg ?? "Unknown error"}`));
@@ -21839,7 +21935,7 @@ class FinvasiaBroker {
   async getPositions() {
     try {
       const uid = this.session?.userId ?? "";
-      const raw = await this.post("PositionBook", { uid });
+      const raw = await this.post("PositionBook", { uid, actid: uid });
       if (!Array.isArray(raw))
         return Ok([]);
       return Ok(raw.map(fromPosition2));
@@ -21984,6 +22080,10 @@ class FinvasiaBroker {
     this.ensureSocket();
     return this.socket.subscribe(tokens, cb);
   }
+  setSymbolMap(map) {
+    this.ensureSocket();
+    this.socket.setSymbolMap(map);
+  }
   unsubscribeTicks(sub) {
     if (this.socket) {
       this.socket.unsubscribe(sub);
@@ -22091,9 +22191,30 @@ class FinvasiaBroker {
       return;
     if (!this.session)
       throw new Error("Cannot create socket without an active session");
-    this.socket = new FinvasiaSocket(this.session.userId, this.session.accessToken);
+    this.socket = new FinvasiaSocket(this.session.userId, this.session.accessToken, () => {
+      this.handleSocketAuthFailed();
+    });
     this.socket.connect();
   }
+  handleSocketAuthFailed() {
+    if (!this.credentials) {
+      console.error("[FinvasiaBroker] Socket auth failed but no credentials stored \u2014 cannot re-authenticate");
+      return;
+    }
+    console.log("[FinvasiaBroker] Socket auth failed, re-authenticating...");
+    authenticate2(this.credentials).then((result) => {
+      if (!result.ok) {
+        console.error("[FinvasiaBroker] Re-authentication failed:", result.error instanceof Error ? result.error.message : result.error);
+        return;
+      }
+      this.session = result.value;
+      this.instrumentsImpl.setCredentials(this.session.userId, this.session.accessToken);
+      console.log("[FinvasiaBroker] Re-authenticated successfully, reconnecting socket");
+      this.socket?.reconnect(this.session.accessToken);
+    }).catch((err) => {
+      console.error("[FinvasiaBroker] Re-authentication exception:", err instanceof Error ? err.message : err);
+    });
+  }
 }
 // src/brokers/dhan/dhan-constants.ts
 var EXCHANGE_TO_DHAN = {
@@ -22113,7 +22234,7 @@ var EXCHANGE_FROM_DHAN = {
   NSE_CURRENCY: "CDS"
 };
 var PRODUCT_TO_DHAN = {
-  INTRADAY: "INTRA",
+  INTRADAY: "INTRADAY",
   DELIVERY: "CNC",
   NORMAL: "MARGIN"
 };
@@ -22163,6 +22284,7 @@ var VALIDITY_FROM_DHAN = {
   IOC: "IOC"
 };
 var DHAN_API_BASE = "https://api.dhan.co/v2";
+var DHAN_AUTH_BASE = "https://auth.dhan.co";
 var DHAN_WS_URL = "wss://api-feed.dhan.co";
 var DHAN_INSTRUMENTS_URL = "https://images.dhan.co/api-data/api-scrip-master.csv";
 var CANDLE_INTERVAL_TO_DHAN = {
@@ -22208,6 +22330,79 @@ async function authenticate3(creds) {
     return Err(err instanceof Error ? err : new Error(String(err)));
   }
 }
+async function generateConsent(creds) {
+  const { apiKey: appId, apiSecret: appSecret, userId: clientId } = creds;
+  if (!appId)
+    return Err(new Error("Missing apiKey (App ID) in credentials"));
+  if (!appSecret)
+    return Err(new Error("Missing apiSecret (App Secret) in credentials"));
+  if (!clientId)
+    return Err(new Error("Missing userId (Dhan Client ID) in credentials"));
+  try {
+    const response = await fetch(`${DHAN_AUTH_BASE}/app/generate-consent?client_id=${clientId}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        app_id: appId,
+        app_secret: appSecret
+      },
+      body: JSON.stringify({})
+    });
+    if (!response.ok) {
+      const body = await response.text();
+      return Err(new Error(`Dhan generate-consent failed (${response.status}): ${body}`));
+    }
+    const data = await response.json();
+    if (!data.consentAppId) {
+      return Err(new Error(data.message ?? "Failed to generate consent \u2014 no consentAppId returned"));
+    }
+    const loginUrl = `${DHAN_AUTH_BASE}/login/consentApp-login?consentAppId=${data.consentAppId}`;
+    return Ok({ consentAppId: data.consentAppId, loginUrl });
+  } catch (err) {
+    return Err(err instanceof Error ? err : new Error(String(err)));
+  }
+}
+async function consumeConsent(creds, tokenId) {
+  const { apiKey: appId, apiSecret: appSecret, userId: clientId } = creds;
+  if (!appId)
+    return Err(new Error("Missing apiKey (App ID) in credentials"));
+  if (!appSecret)
+    return Err(new Error("Missing apiSecret (App Secret) in credentials"));
+  if (!tokenId)
+    return Err(new Error("Missing tokenId from callback"));
+  try {
+    const response = await fetch(`${DHAN_AUTH_BASE}/app/consumeApp-consent?tokenId=${encodeURIComponent(tokenId)}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        app_id: appId,
+        app_secret: appSecret
+      },
+      body: JSON.stringify({})
+    });
+    if (!response.ok) {
+      const body = await response.text();
+      return Err(new Error(`Dhan consumeApp-consent failed (${response.status}): ${body}`));
+    }
+    const data = await response.json();
+    if (!data.accessToken) {
+      return Err(new Error(data.message ?? "Failed to get access token \u2014 no accessToken returned"));
+    }
+    const thirtyDaysMs = 30 * 24 * 60 * 60 * 1000;
+    const session = {
+      accessToken: data.accessToken,
+      refreshToken: undefined,
+      expiresAt: Date.now() + thirtyDaysMs,
+      ttlSeconds: 30 * 24 * 60 * 60,
+      brokerId: "dhan",
+      userId: clientId ?? "",
+      metadata: { authMode: "oauth" }
+    };
+    return Ok(session);
+  } catch (err) {
+    return Err(err instanceof Error ? err : new Error(String(err)));
+  }
+}
 async function refreshSession3(_session) {
   return Err(new Error("Dhan does not support token refresh. Generate a new access token from the Dhan developer portal."));
 }
@@ -22238,10 +22433,10 @@ function safeSide3(raw) {
 }
 function parseTimestamp3(ts) {
   if (!ts)
-    return Date.now();
+    return 0;
   if (typeof ts === "number")
     return ts > 1000000000000 ? ts : ts * 1000;
-  return new Date(ts).getTime() || Date.now();
+  return new Date(ts).getTime() || 0;
 }
 function inferInstrumentType3(exchangeSegment, tradingSymbol) {
   if (exchangeSegment === "NSE_EQ" || exchangeSegment === "BSE_EQ")
@@ -22350,6 +22545,7 @@ function fromTick3(tick, symbolLookup) {
 function fromHolding3(holding, ltp = 0) {
   const qty = holding.totalQty ?? holding.availableQty;
   const avgPrice = holding.avgCostPrice;
+  ltp = holding.lastTradedPrice ?? ltp;
   const pnl = (ltp - avgPrice) * qty;
   return {
     broker: "dhan",
@@ -22391,11 +22587,29 @@ function fromQuote3(quote, symbol, exchange) {
 }
 
 // src/brokers/dhan/dhan-socket.ts
+import WS2 from "ws";
 var subIdCounter4 = 0;
 function nextSubId4() {
   subIdCounter4 += 1;
   return `dsub_${subIdCounter4}`;
 }
+var EXCH_SEG_FROM_BYTE = {
+  0: "IDX_I",
+  1: "NSE_EQ",
+  2: "NSE_FNO",
+  3: "NSE_CURRENCY",
+  4: "BSE_EQ",
+  5: "MCX_COMM",
+  7: "BSE_CURRENCY",
+  8: "BSE_FNO"
+};
+function splitToken(token) {
+  const sep = token.includes("|") ? "|" : ":";
+  const idx = token.indexOf(sep);
+  if (idx === -1)
+    return ["NSE_EQ", token];
+  return [token.slice(0, idx), token.slice(idx + 1)];
+}
 
 class DhanSocket {
   ws = null;
@@ -22419,36 +22633,36 @@ class DhanSocket {
     this.state = "CONNECTING";
     try {
       const url = `${DHAN_WS_URL}?version=2&token=${this.accessToken}&clientId=${this.clientId}&authType=2`;
-      this.ws = new WebSocket(url);
-      this.ws.binaryType = "arraybuffer";
+      this.ws = new WS2(url);
     } catch {
       this.state = "DISCONNECTED";
       return;
     }
-    this.ws.onopen = () => {
+    this.ws.on("open", () => {
       this.state = "CONNECTED";
       this.reconnectAttempts = 0;
       this.startHeartbeat();
       if (this.subscribedTokens.size > 0) {
         this.sendSubscribe(Array.from(this.subscribedTokens));
       }
-    };
-    this.ws.onmessage = (event) => {
+    });
+    this.ws.on("message", (raw, isBinary) => {
       try {
-        if (event.data instanceof ArrayBuffer) {
-          this.handleBinaryMessage(event.data);
+        if (isBinary) {
+          const buf = raw instanceof ArrayBuffer ? Buffer.from(raw) : Buffer.isBuffer(raw) ? raw : Array.isArray(raw) ? Buffer.concat(raw) : Buffer.from(raw);
+          this.handleBinaryMessage(buf);
         } else {
-          const data = JSON.parse(String(event.data));
+          const data = JSON.parse(raw.toString());
           this.handleJsonMessage(data);
         }
       } catch {}
-    };
-    this.ws.onclose = () => {
+    });
+    this.ws.on("close", () => {
       this.state = "DISCONNECTED";
       this.stopHeartbeat();
       this.attemptReconnect();
-    };
-    this.ws.onerror = () => {};
+    });
+    this.ws.on("error", () => {});
   }
   disconnect() {
     this.clearReconnectTimer();
@@ -22506,39 +22720,100 @@ class DhanSocket {
       this.tokenToSymbol.set(token, symbol);
     }
   }
-  handleBinaryMessage(buffer) {
-    const view = new DataView(buffer);
-    if (buffer.byteLength < 48)
+  handleBinaryMessage(data) {
+    if (data.length < 8)
       return;
-    try {
+    const responseCode = data.readUInt8(0);
+    const exchSegByte = data.readUInt8(3);
+    const securityId = data.readInt32LE(4);
+    const exchangeSegment = EXCH_SEG_FROM_BYTE[exchSegByte] ?? "NSE_EQ";
+    const fullKey = `${exchangeSegment}:${securityId}`;
+    if (responseCode === 1 && data.length >= 32) {
+      const ltp = data.readFloatLE(8);
+      const ltt = data.readInt32LE(12);
+      const open = data.readFloatLE(16);
+      const close = data.readFloatLE(20);
+      const high = data.readFloatLE(24);
+      const low = data.readFloatLE(28);
       const tick = {
-        securityId: view.getInt32(0, true),
-        LTP: view.getFloat32(4, true),
-        open: view.getFloat32(8, true),
-        high: view.getFloat32(12, true),
-        low: view.getFloat32(16, true),
-        close: view.getFloat32(20, true),
-        volume: view.getInt32(24, true),
-        OI: view.getInt32(28, true),
-        bestBidPrice: view.getFloat32(32, true),
-        bestAskPrice: view.getFloat32(36, true),
-        bestBidQty: view.getInt32(40, true),
-        bestAskQty: view.getInt32(44, true),
-        exchangeSegment: "",
-        timestamp: Date.now()
+        securityId,
+        LTP: ltp,
+        open,
+        high,
+        low,
+        close,
+        volume: 0,
+        bestBidPrice: 0,
+        bestAskPrice: 0,
+        bestBidQty: 0,
+        bestAskQty: 0,
+        exchangeSegment,
+        timestamp: ltt > 0 ? ltt * 1000 : Date.now()
       };
-      const tokenStr = String(tick.securityId);
-      const symbol = this.tokenToSymbol.get(tokenStr);
+      const symbol = this.tokenToSymbol.get(fullKey) ?? this.tokenToSymbol.get(String(securityId));
       const unified = fromTick3(tick, symbol);
+      unified.token = fullKey;
       this.dispatchTick(unified);
-    } catch {}
+    } else if (responseCode === 2 && data.length >= 16) {
+      const ltp = data.readFloatLE(8);
+      const ltt = data.readInt32LE(12);
+      const tick = {
+        securityId,
+        LTP: ltp,
+        open: 0,
+        high: 0,
+        low: 0,
+        close: 0,
+        volume: 0,
+        bestBidPrice: 0,
+        bestAskPrice: 0,
+        bestBidQty: 0,
+        bestAskQty: 0,
+        exchangeSegment,
+        timestamp: ltt > 0 ? ltt * 1000 : Date.now()
+      };
+      const symbol = this.tokenToSymbol.get(fullKey) ?? this.tokenToSymbol.get(String(securityId));
+      const unified = fromTick3(tick, symbol);
+      unified.token = fullKey;
+      this.dispatchTick(unified);
+    } else if (responseCode === 4 && data.length >= 50) {
+      const ltp = data.readFloatLE(8);
+      const ltt = data.readInt32LE(14);
+      const volume = data.readInt32LE(22);
+      const totalSellQty = data.readInt32LE(26);
+      const totalBuyQty = data.readInt32LE(30);
+      const open = data.readFloatLE(34);
+      const close = data.readFloatLE(38);
+      const high = data.readFloatLE(42);
+      const low = data.readFloatLE(46);
+      const tick = {
+        securityId,
+        LTP: ltp,
+        open,
+        high,
+        low,
+        close,
+        volume,
+        bestBidPrice: 0,
+        bestAskPrice: 0,
+        bestBidQty: totalBuyQty,
+        bestAskQty: totalSellQty,
+        exchangeSegment,
+        timestamp: ltt > 0 ? ltt * 1000 : Date.now()
+      };
+      const symbol = this.tokenToSymbol.get(fullKey) ?? this.tokenToSymbol.get(String(securityId));
+      const unified = fromTick3(tick, symbol);
+      unified.token = fullKey;
+      this.dispatchTick(unified);
+    }
   }
   handleJsonMessage(data) {
     if (data["type"] === "ticker_data") {
       const tick = data;
-      const tokenStr = String(tick.securityId);
-      const symbol = this.tokenToSymbol.get(tokenStr);
+      const fullKey = tick.exchangeSegment ? `${tick.exchangeSegment}:${tick.securityId}` : String(tick.securityId);
+      const symbol = this.tokenToSymbol.get(fullKey) ?? this.tokenToSymbol.get(String(tick.securityId));
       const unified = fromTick3(tick, symbol);
+      unified.token = fullKey;
       this.dispatchTick(unified);
     }
   }
@@ -22546,10 +22821,10 @@ class DhanSocket {
     if (!this.ws || this.state !== "CONNECTED")
       return;
     const instruments = tokens.map((t) => {
-      const parts = t.split(":");
+      const [segment, id] = splitToken(t);
       return {
-        ExchangeSegment: parts[0] ?? "NSE_EQ",
-        SecurityId: parts[1] ?? parts[0]
+        ExchangeSegment: segment,
+        SecurityId: id
       };
     });
     const request = {
@@ -22563,10 +22838,10 @@ class DhanSocket {
     if (!this.ws || this.state !== "CONNECTED")
       return;
     const instruments = tokens.map((t) => {
-      const parts = t.split(":");
+      const [segment, id] = splitToken(t);
       return {
-        ExchangeSegment: parts[0] ?? "NSE_EQ",
-        SecurityId: parts[1] ?? parts[0]
+        ExchangeSegment: segment,
+        SecurityId: id
       };
     });
     const request = {
@@ -22590,7 +22865,7 @@ class DhanSocket {
     this.heartbeatTimer = setInterval(() => {
       if (this.ws && this.state === "CONNECTED") {
         try {
-          this.ws.send(JSON.stringify({ RequestCode: 12 }));
+          this.ws.ping();
         } catch {}
       }
     }, 30000);
@@ -22632,6 +22907,15 @@ var DHAN_EXCHANGE_MAP = {
   NFO: "NFO",
   MCX: "MCX"
 };
+function resolveDhanExchange(exchId, segment) {
+  if (segment === "D")
+    return exchId === "BSE" ? "BFO" : "NFO";
+  if (segment === "C")
+    return "CDS";
+  if (segment === "M")
+    return "MCX";
+  return exchId === "BSE" ? "BSE" : "NSE";
+}
 function mapInstrumentType3(instName, optionType) {
   const opt = optionType?.toUpperCase();
   if (opt === "CE")
@@ -22773,14 +23057,16 @@ class DhanInstruments {
     const securityId = fields["SEM_SMST_SECURITY_ID"] ?? fields["securityId"] ?? "";
     const tradingSymbol = fields["SEM_TRADING_SYMBOL"] ?? fields["tradingSymbol"] ?? "";
     const customSymbol = fields["SEM_CUSTOM_SYMBOL"] ?? fields["customSymbol"] ?? tradingSymbol;
-    const exchangeRaw = fields["SEM_EXM_EXCH_ID"] ?? fields["SEM_SEGMENT"] ?? fields["exchangeSegment"] ?? "NSE_EQ";
+    const exchId = fields["SEM_EXM_EXCH_ID"] ?? "";
+    const segment = fields["SEM_SEGMENT"] ?? "";
+    const exchangeSegment = fields["exchangeSegment"] ?? "";
     const instNameRaw = fields["SEM_INSTRUMENT_NAME"] ?? fields["instrumentType"] ?? "EQUITY";
     const optionType = fields["SEM_OPTION_TYPE"] ?? fields["optionType"] ?? "";
     const lotSizeRaw = fields["SEM_LOT_UNITS"] ?? fields["lotSize"] ?? "1";
     const tickSizeRaw = fields["SEM_TICK_SIZE"] ?? fields["tickSize"] ?? "0.05";
     const expiryRaw = fields["SEM_EXPIRY_DATE"] ?? fields["expiryDate"] ?? "";
     const strikeRaw = fields["SEM_STRIKE_PRICE"] ?? fields["strikePrice"] ?? "";
-    const exchange = DHAN_EXCHANGE_MAP[exchangeRaw] ?? EXCHANGE_FROM_DHAN[exchangeRaw] ?? "NSE";
+    const exchange = exchId && segment ? resolveDhanExchange(exchId, segment) : DHAN_EXCHANGE_MAP[exchangeSegment] ?? EXCHANGE_FROM_DHAN[exchangeSegment] ?? "NSE";
     const instrumentType = mapInstrumentType3(instNameRaw, optionType);
     return {
       tradingSymbol,
@@ -22837,6 +23123,7 @@ class DhanBroker {
   session = null;
   socket = null;
   clientId = "";
+  oauthCreds = null;
   instrumentsImpl;
   _iMaster;
   constructor(options) {
@@ -22864,6 +23151,24 @@ class DhanBroker {
       return null;
     return new Date(this.session.expiresAt);
   }
+  async generateConsent(creds) {
+    this.oauthCreds = creds;
+    this.clientId = creds.userId ?? "";
+    return generateConsent(creds);
+  }
+  async consumeConsent(tokenId) {
+    if (!this.oauthCreds) {
+      return Err(new Error("Call generateConsent() before consumeConsent()"));
+    }
+    const result = await consumeConsent(this.oauthCreds, tokenId);
+    if (!result.ok)
+      return result;
+    this.session = result.value;
+    this.clientId = this.oauthCreds.userId ?? "";
+    this.instrumentsImpl.setCredentials(this.clientId, this.session.accessToken);
+    this.oauthCreds = null;
+    return result;
+  }
   async sync(force) {
     return this._iMaster.syncBroker(this.id, this.instruments, force);
   }
@@ -22883,9 +23188,11 @@ class DhanBroker {
           if (!asyncResolved.ok) {
             return Err(new Error(`Cannot resolve "${params.tradingSymbol}". Either run broker.sync() first to use unified nsekit symbols, or provide exchange and the broker-native tradingSymbol directly.`));
           }
-          resolvedParams = { ...params, exchange: asyncResolved.value.exchange };
+          const nativeId = asyncResolved.value.brokerTokens.dhan?.securityId ?? params.tradingSymbol;
+          resolvedParams = { ...params, exchange: asyncResolved.value.exchange, tradingSymbol: nativeId };
         } else {
-          resolvedParams = { ...params, exchange: resolved.value.exchange };
+          const nativeId = resolved.value.brokerTokens.dhan?.securityId ?? params.tradingSymbol;
+          resolvedParams = { ...params, exchange: resolved.value.exchange, tradingSymbol: nativeId };
         }
       }
       const dhanParams = toOrderParams3(resolvedParams, this.clientId);
@@ -22902,20 +23209,18 @@ class DhanBroker {
   }
   async modifyOrder(orderId, params) {
     try {
+      const rawOrder = await this.request("GET", `/orders/${orderId}`);
+      const original = Array.isArray(rawOrder) ? rawOrder[0] : rawOrder;
       const payload = {
         dhanClientId: this.clientId,
-        orderId
+        orderId,
+        orderType: params.type ? ORDER_TYPE_TO_DHAN[params.type] ?? original.orderType : original.orderType,
+        validity: params.validity ?? original.validity ?? "DAY",
+        quantity: params.quantity ?? original.quantity,
+        price: params.price ?? original.price
       };
-      if (params.price !== undefined)
-        payload["price"] = params.price;
-      if (params.quantity !== undefined)
-        payload["quantity"] = params.quantity;
       if (params.triggerPrice !== undefined)
         payload["triggerPrice"] = params.triggerPrice;
-      if (params.type !== undefined)
-        payload["orderType"] = params.type;
-      if (params.validity !== undefined)
-        payload["validity"] = params.validity;
       const res = await this.request("PUT", `/orders/${orderId}`, payload);
       return Ok({
         orderId: res.orderId ?? orderId,
@@ -22982,7 +23287,11 @@ class DhanBroker {
         return Ok([]);
       return Ok(raw.map((h) => fromHolding3(h)));
     } catch (err) {
-      return Err(err instanceof Error ? err : new Error(String(err)));
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg.includes("No holdings available") || msg.includes("DH-1111")) {
+        return Ok([]);
+      }
+      return Err(err instanceof Error ? err : new Error(msg));
     }
   }
   async getLTP(symbols) {
@@ -23124,6 +23433,10 @@ class DhanBroker {
     this.ensureSocket();
     return this.socket.subscribe(tokens, cb);
   }
+  setSymbolMap(map) {
+    this.ensureSocket();
+    this.socket.setSymbolMap(map);
+  }
   unsubscribeTicks(sub) {
     if (this.socket) {
       this.socket.unsubscribe(sub);