@pear-protocol/symmio-client 0.3.28 → 0.3.29

package/dist/react/index.mjs

@@ -1,6 +1,6 @@
 'use client';
 import { createContext, useContext, useMemo, useCallback, useState, useEffect, useRef } from 'react';
-import { createSymmSDK, TpslStatus, HedgerClient, isAuthExpiredError, isNetworkError, isInsufficientMarginError, isRateLimitedError, isTimeoutError } from '@pear-protocol/symm-core';
+import { createSymmSDK, TpslStatus, HedgerClient, isAuthExpiredError, isNetworkError, isInsufficientMarginError, isRateLimitedError, isTimeoutError, formatChannel } from '@pear-protocol/symm-core';
 import { create } from 'zustand';
 import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query';
 import { jsx } from 'react/jsx-runtime';
@@ -697,7 +697,7 @@ function useSymmWs(params = {}) {
   const isConnected = useSymmWsStore((state) => state.isConnected);
   const setConnected = useSymmWsStore((state) => state.setConnected);
   const symmCoreClient = params.symmCoreClient ?? ctx?.symmCoreClient ?? null;
-  const accountAddress = params.accountAddress ?? ctx?.address;
+  const accountAddress = params.accountAddress ?? ctx?.accountAddress;
   const chainId = params.chainId ?? ctx?.chainId ?? 42161;
   useEffect(() => {
     if (!symmCoreClient || !accountAddress) {
@@ -707,14 +707,61 @@ function useSymmWs(params = {}) {
     const ws = symmCoreClient.ws;
     const addr = accountAddress;
     let cancelled = false;
+    const subscribedChannelKeys = /* @__PURE__ */ new Set();
     addWsOwner(ws);
-    const removeOnConnect = ws.onConnect(() => setConnected(true));
-    const removeOnDisconnect = ws.onDisconnect(() => setConnected(false));
     const subscriptions = [];
     const addSubscription = (channel, handler) => {
-      ws.subscribe(channel, addr, chainId, handler);
       subscriptions.push({ channel, handler });
     };
+    const sendWsMessage = (message) => {
+      if (!ws.isConnected()) return;
+      ws.ws?.send(JSON.stringify(message));
+    };
+    const getHandlers = (channelKey) => {
+      const internals = ws;
+      if (!internals.subscriptions) {
+        internals.subscriptions = /* @__PURE__ */ new Map();
+      }
+      let handlers = internals.subscriptions.get(channelKey);
+      if (!handlers) {
+        handlers = /* @__PURE__ */ new Set();
+        internals.subscriptions.set(channelKey, handlers);
+      }
+      return handlers;
+    };
+    const subscribeAll = () => {
+      subscriptions.forEach(({ channel, handler }) => {
+        const channelKey = formatChannel(channel, addr, chainId);
+        getHandlers(channelKey).add(handler);
+        if (!subscribedChannelKeys.has(channelKey)) {
+          sendWsMessage({ type: "subscribe", channel: channelKey });
+          subscribedChannelKeys.add(channelKey);
+        }
+      });
+    };
+    const unsubscribeAll = (sendUnsubscribe) => {
+      subscriptions.forEach(({ channel, handler }) => {
+        const channelKey = formatChannel(channel, addr, chainId);
+        const internals = ws;
+        const handlers = internals.subscriptions?.get(channelKey);
+        handlers?.delete(handler);
+        if (handlers?.size === 0) {
+          internals.subscriptions?.delete(channelKey);
+        }
+        if (sendUnsubscribe && subscribedChannelKeys.has(channelKey)) {
+          sendWsMessage({ type: "unsubscribe", channel: channelKey });
+        }
+        subscribedChannelKeys.delete(channelKey);
+      });
+    };
+    const removeOnConnect = ws.onConnect(() => {
+      setConnected(true);
+      subscribeAll();
+    });
+    const removeOnDisconnect = ws.onDisconnect(() => {
+      unsubscribeAll(false);
+      setConnected(false);
+    });
     addSubscription("positions", () => {
       queryClient.invalidateQueries({ queryKey: symmKeys.positionsRoot });
     });
@@ -756,10 +803,11 @@ function useSymmWs(params = {}) {
       queryClient.invalidateQueries({ queryKey: symmKeys.positionsRoot });
       queryClient.invalidateQueries({ queryKey: symmKeys.portfolioRoot });
     });
-    void connectShared(ws).then(() => {
+    connectShared(ws).then(() => {
       if (cancelled) return;
       if (ws.isConnected()) {
         setConnected(true);
+        subscribeAll();
       }
     }).catch(() => {
       if (cancelled) return;
@@ -769,15 +817,13 @@ function useSymmWs(params = {}) {
       cancelled = true;
       removeOnConnect();
       removeOnDisconnect();
-      subscriptions.forEach(({ channel, handler }) => {
-        ws.unsubscribe(channel, addr, chainId, handler);
-      });
+      unsubscribeAll(true);
       if (removeWsOwner(ws) === 0) {
         ws.disconnect();
         setConnected(false);
       }
     };
-  }, [symmCoreClient, accountAddress, chainId, queryClient, setConnected]);
+  }, [symmCoreClient, accountAddress, chainId]);
   return { isConnected };
 }
 function trimTrailingSlashes(value) {
@@ -786,6 +832,7 @@ function trimTrailingSlashes(value) {
 function SymmProvider({
   chainId = 42161,
   address,
+  accountAddress,
   walletClient,
   symmCoreConfig = {
     apiUrl: "https://nginx-server-staging.up.railway.app",
@@ -814,10 +861,11 @@ function SymmProvider({
       symmCoreClient,
       chainId,
       address,
+      accountAddress,
       walletClient,
       symmioConfig
     }),
-    [symmCoreClient, chainId, address, walletClient, symmioConfig]
+    [symmCoreClient, chainId, address, accountAddress, walletClient, symmioConfig]
   );
   useBinanceWs({
     symmCoreClient,
@@ -825,7 +873,7 @@ function SymmProvider({
   });
   useSymmWs({
     symmCoreClient,
-    accountAddress: address,
+    accountAddress,
     chainId
   });
   return /* @__PURE__ */ jsx(SymmContext.Provider, { value, children });