@pear-protocol/symmio-client 0.3.15 → 0.3.16

package/dist/react/index.js

@@ -75,6 +75,7 @@ var RECONNECT_DELAYS = [1e3, 2e3, 4e3, 8e3, 16e3, 3e4];
 var IDLE_CLOSE_DELAY_MS = 3e4;
 var STALE_CONNECTION_MS = 3e4;
 var STALE_CHECK_INTERVAL_MS = 1e4;
+var RECONNECT_RESET_MS = 6e4;
 var STABLE_QUOTES = ["USDT0", "USDT", "USDC", "USDE", "USDH", "USD"];
 function normalizeBaseSymbol(symbol) {
   const normalized = symbol.toUpperCase().trim();
@@ -126,6 +127,7 @@ var BinanceWsManager = class {
   reconnectTimer = null;
   idleCloseTimer = null;
   staleCheckTimer = null;
+  reconnectResetTimer = null;
   intentionalClose = false;
   pendingSubscribes = /* @__PURE__ */ new Set();
   lastMessageAt = 0;
@@ -164,6 +166,7 @@ var BinanceWsManager = class {
     const wrappedCb = (raw) => {
       cb({
         symbol: normalizeBaseSymbol(raw.s),
+        binanceSymbol: raw.s,
         markPrice: parseFloat(raw.p),
         indexPrice: parseFloat(raw.i),
         time: raw.E,
@@ -185,6 +188,7 @@ var BinanceWsManager = class {
       cb(
         extractTickers(raw).map((entry) => ({
           symbol: normalizeBaseSymbol(entry.s),
+          binanceSymbol: entry.s,
           markPrice: parseFloat(entry.p),
           indexPrice: parseFloat(entry.i),
           time: entry.E,
@@ -204,6 +208,7 @@ var BinanceWsManager = class {
     this.clearReconnectTimer();
     this.clearIdleCloseTimer();
     this.clearStaleCheckTimer();
+    this.clearReconnectResetTimer();
     this.pendingSubscribes.clear();
     if (this.ws) {
       this.ws.close();
@@ -257,9 +262,9 @@ var BinanceWsManager = class {
     this.intentionalClose = false;
     this.ws = new WebSocket(BINANCE_WS_URL);
     this.ws.onopen = () => {
-      this.reconnectAttempt = 0;
       this.lastMessageAt = Date.now();
       this.startStaleCheck();
+      this.scheduleReconnectReset();
       const activeStreams = Array.from(
         /* @__PURE__ */ new Set([...this.streams.keys(), ...this.pendingSubscribes])
       );
@@ -272,6 +277,7 @@ var BinanceWsManager = class {
       try {
         const data = JSON.parse(event.data);
         this.lastMessageAt = Date.now();
+        this.resetReconnectAttempt();
         this.handleMessage(data);
       } catch {
       }
@@ -281,6 +287,7 @@ var BinanceWsManager = class {
       this.intentionalClose = false;
       this.ws = null;
       this.clearStaleCheckTimer();
+      this.clearReconnectResetTimer();
       if (this.streams.size === 0) {
         return;
       }
@@ -374,6 +381,17 @@ var BinanceWsManager = class {
       this.ws.close();
     }, STALE_CHECK_INTERVAL_MS);
   }
+  scheduleReconnectReset() {
+    this.clearReconnectResetTimer();
+    this.reconnectResetTimer = setTimeout(() => {
+      this.reconnectResetTimer = null;
+      this.resetReconnectAttempt();
+    }, RECONNECT_RESET_MS);
+  }
+  resetReconnectAttempt() {
+    this.reconnectAttempt = 0;
+    this.clearReconnectResetTimer();
+  }
   clearReconnectTimer() {
     if (!this.reconnectTimer) return;
     clearTimeout(this.reconnectTimer);
@@ -389,6 +407,11 @@ var BinanceWsManager = class {
     clearInterval(this.staleCheckTimer);
     this.staleCheckTimer = null;
   }
+  clearReconnectResetTimer() {
+    if (!this.reconnectResetTimer) return;
+    clearTimeout(this.reconnectResetTimer);
+    this.reconnectResetTimer = null;
+  }
 };
 var BINANCE_WS_SINGLETON_KEY = "__pearBinanceWsManager__";
 function getBinanceWsManager() {
@@ -406,15 +429,8 @@ var refCounts = /* @__PURE__ */ new Map();
 var streamSymbols = /* @__PURE__ */ new Map();
 var allMarkPricesRefCount = 0;
 var allMarkPricesUnsubscribe = null;
-var STABLE_QUOTES2 = ["USDT0", "USDT", "USDC", "USDE", "USDH", "USD"];
-function normalizeBinanceSymbol(symbol) {
-  const normalized = symbol.toUpperCase().trim();
-  for (const quote of STABLE_QUOTES2) {
-    if (normalized.endsWith(quote) && normalized.length > quote.length) {
-      return normalized.slice(0, -quote.length);
-    }
-  }
-  return normalized;
+function normalizeBinanceSymbolKey(symbol) {
+  return symbol.toUpperCase().trim();
 }
 function getNextRefCount(binanceSymbol) {
   return (refCounts.get(binanceSymbol) ?? 0) + 1;
@@ -449,7 +465,7 @@ var useBinanceMarkPriceStore = zustand.create((set) => ({
   fundingRates: {},
   nextFundingTimes: {},
   subscribeSymbol: (symmSymbol, rawBinanceSymbol) => {
-    const binanceSymbol = normalizeBinanceSymbol(rawBinanceSymbol);
+    const binanceSymbol = normalizeBinanceSymbolKey(rawBinanceSymbol);
     const nextRefCount = getNextRefCount(binanceSymbol);
     refCounts.set(binanceSymbol, nextRefCount);
     addMappedSymbol(binanceSymbol, symmSymbol);
@@ -461,8 +477,10 @@ var useBinanceMarkPriceStore = zustand.create((set) => ({
           let nextFundingRates = null;
           let nextFundingTimes = null;
           entries.forEach((entry) => {
-            const canonicalSymbol = normalizeBinanceSymbol(entry.symbol);
-            const mappedSymbols = streamSymbols.get(canonicalSymbol);
+            const binanceSymbolKey = normalizeBinanceSymbolKey(
+              entry.binanceSymbol ?? entry.symbol
+            );
+            const mappedSymbols = streamSymbols.get(binanceSymbolKey);
             if (!mappedSymbols || mappedSymbols.size === 0) return;
             nextMarkPrices ??= { ...state.markPrices };
             nextFundingRates ??= { ...state.fundingRates };
@@ -487,7 +505,7 @@ var useBinanceMarkPriceStore = zustand.create((set) => ({
     allMarkPricesRefCount += 1;
   },
   unsubscribeSymbol: (symmSymbol, rawBinanceSymbol) => {
-    const binanceSymbol = normalizeBinanceSymbol(rawBinanceSymbol);
+    const binanceSymbol = normalizeBinanceSymbolKey(rawBinanceSymbol);
     const removedSubscription = removeMappedSymbol(binanceSymbol, symmSymbol);
     if (!removedSubscription) {
       return;
@@ -527,6 +545,7 @@ var useBinanceMarkPriceStore = zustand.create((set) => ({
 }));
 
 // src/react/hooks/use-binance-ws.ts
+var BOOTSTRAP_RETRY_DELAYS_MS = [1e3, 2e3, 5e3];
 function useBinanceWs(params) {
   const { symmCoreClient, chainId } = params;
   const subscribeSymbol = useBinanceMarkPriceStore((state) => state.subscribeSymbol);
@@ -537,7 +556,8 @@ function useBinanceWs(params) {
     }
     let cancelled = false;
     let subscribedPairs = [];
-    const run = async () => {
+    let retryTimer = null;
+    const run = async (attempt = 0) => {
       try {
         const result = await symmCoreClient.markets.listSymmHedger({ chainId });
         if (cancelled) {
@@ -557,11 +577,22 @@ function useBinanceWs(params) {
           subscribeSymbol(symbol, binanceSymbol);
         });
       } catch {
+        const delay = BOOTSTRAP_RETRY_DELAYS_MS[attempt];
+        if (cancelled || delay == null) {
+          return;
+        }
+        retryTimer = setTimeout(() => {
+          retryTimer = null;
+          void run(attempt + 1);
+        }, delay);
       }
     };
     void run();
     return () => {
       cancelled = true;
+      if (retryTimer) {
+        clearTimeout(retryTimer);
+      }
       subscribedPairs.forEach(([symbol, binanceSymbol]) => {
         unsubscribeSymbol(symbol, binanceSymbol);
       });
@@ -25895,15 +25926,24 @@ function readTimestamp(source) {
   const parsed = Number(timestamp);
   return Number.isFinite(parsed) ? parsed : void 0;
 }
+function hasAccountDataShape(value) {
+  return isRecord(value) && ("equity" in value || "maintenanceMargin" in value || "availableForOrder" in value || "totalLocked" in value);
+}
 function getSymmAccountData(response) {
   if (!isRecord(response)) {
     return void 0;
   }
   const data = response.data;
   if (isRecord(data)) {
-    return data;
+    if (hasAccountDataShape(data.accountData)) {
+      return data.accountData;
+    }
+    if (hasAccountDataShape(data)) {
+      return data;
+    }
+    return void 0;
   }
-  if ("equity" in response || "maintenanceMargin" in response || "availableForOrder" in response || "totalLocked" in response) {
+  if (hasAccountDataShape(response)) {
     return response;
   }
   return void 0;