@pear-protocol/hyperliquid-sdk 0.0.9 → 0.0.10

package/dist/index.js

@@ -2642,21 +2642,17 @@ const useHyperliquidWebSocket = ({ wsUrl, address }) => {
         accountSummary: null,
     });
     const [lastError, setLastError] = require$$0.useState(null);
+    const [lastSubscribedAddress, setLastSubscribedAddress] = require$$0.useState(null);
     // WebSocket connection
-    const { lastMessage, readyState, sendMessage } = useWebSocket(address ? wsUrl : null, // Only connect when address is set
-    {
+    const { readyState, sendMessage } = useWebSocket(wsUrl, {
         shouldReconnect: () => true,
         reconnectAttempts: 5,
         reconnectInterval: 3000,
-    });
-    const isConnected = readyState === dist.ReadyState.OPEN;
-    // Handle incoming WebSocket messages
-    require$$0.useEffect(() => {
-        if (lastMessage !== null) {
+        onMessage: (event) => {
             try {
-                const message = JSON.parse(lastMessage.data);
-                // Handle subscription responses
-                if ('success' in message || 'error' in message) {
+                const message = JSON.parse(event.data);
+                // Handle subscription responses (only if they don't have channel data)
+                if (('success' in message || 'error' in message) && !('channel' in message)) {
                     if (message.error) {
                         setLastError(message.error);
                     }
@@ -2668,30 +2664,42 @@ const useHyperliquidWebSocket = ({ wsUrl, address }) => {
                 // Handle channel data messages
                 if ('channel' in message && 'data' in message) {
                     const dataMessage = message;
+                    // Validate data exists and is not null/undefined
+                    if (dataMessage.data === null || dataMessage.data === undefined) {
+                        return;
+                    }
                     switch (dataMessage.channel) {
                         case 'trade-histories':
-                            setData(prev => ({
-                                ...prev,
-                                tradeHistories: dataMessage.data
-                            }));
+                            if (Array.isArray(dataMessage.data)) {
+                                setData(prev => ({
+                                    ...prev,
+                                    tradeHistories: dataMessage.data
+                                }));
+                            }
                             break;
                         case 'open-positions':
-                            setData(prev => ({
-                                ...prev,
-                                openPositions: dataMessage.data
-                            }));
+                            if (Array.isArray(dataMessage.data)) {
+                                setData(prev => ({
+                                    ...prev,
+                                    openPositions: dataMessage.data
+                                }));
+                            }
                             break;
                         case 'open-orders':
-                            setData(prev => ({
-                                ...prev,
-                                openOrders: dataMessage.data
-                            }));
+                            if (Array.isArray(dataMessage.data)) {
+                                setData(prev => ({
+                                    ...prev,
+                                    openOrders: dataMessage.data
+                                }));
+                            }
                             break;
                         case 'account-summary':
-                            setData(prev => ({
-                                ...prev,
-                                accountSummary: dataMessage.data
-                            }));
+                            if (typeof dataMessage.data === 'object' && dataMessage.data !== null) {
+                                setData(prev => ({
+                                    ...prev,
+                                    accountSummary: dataMessage.data
+                                }));
+                            }
                             break;
                     }
                 }
@@ -2700,34 +2708,47 @@ const useHyperliquidWebSocket = ({ wsUrl, address }) => {
                 setLastError(`Failed to parse message: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
-    }, [lastMessage]);
-    // Handle address changes - subscribe/unsubscribe
+    });
+    const isConnected = readyState === dist.ReadyState.OPEN;
+    // Handle subscription management
     require$$0.useEffect(() => {
-        if (isConnected && address) {
+        if (isConnected && address && address !== lastSubscribedAddress) {
+            // Unsubscribe from previous address if exists
+            if (lastSubscribedAddress) {
+                sendMessage(JSON.stringify({
+                    action: 'unsubscribe',
+                    address: lastSubscribedAddress
+                }));
+            }
             // Subscribe to new address
             sendMessage(JSON.stringify({
                 action: 'subscribe',
                 address: address
             }));
-            // Clear previous data
-            setData({
-                tradeHistories: null,
-                openPositions: null,
-                openOrders: null,
-                accountSummary: null,
-            });
+            setLastSubscribedAddress(address);
             setLastError(null);
         }
-        else if (isConnected && !address) {
-            // Clear data when address is removed
+        else if (isConnected && !address && lastSubscribedAddress) {
+            // Send unsubscribe action when address is removed
+            sendMessage(JSON.stringify({
+                action: 'unsubscribe',
+                address: lastSubscribedAddress
+            }));
+            setLastSubscribedAddress(null);
+        }
+    }, [isConnected, address, lastSubscribedAddress, sendMessage]);
+    // Clear data when address changes
+    require$$0.useEffect(() => {
+        if (address !== lastSubscribedAddress) {
             setData({
                 tradeHistories: null,
                 openPositions: null,
                 openOrders: null,
                 accountSummary: null,
             });
+            setLastError(null);
         }
-    }, [isConnected, address, sendMessage]);
+    }, [address, lastSubscribedAddress]);
     return {
         data,
         connectionStatus: readyState,
@@ -2743,7 +2764,7 @@ const useHyperliquidNativeWebSocket = ({ address }) => {
     const [subscribedAddress, setSubscribedAddress] = require$$0.useState(null);
     const pingIntervalRef = require$$0.useRef(null);
     // WebSocket connection to HyperLiquid native API
-    const { lastMessage, readyState, sendJsonMessage } = useWebSocket('wss://api.hyperliquid.xyz/ws', {
+    const { readyState, sendJsonMessage } = useWebSocket('wss://api.hyperliquid.xyz/ws', {
         shouldReconnect: () => true,
         reconnectAttempts: 5,
         reconnectInterval: 3000,
@@ -2751,6 +2772,41 @@ const useHyperliquidNativeWebSocket = ({ address }) => {
         onClose: () => { },
         onError: (event) => console.error('[HyperLiquid WS] Connection error:', event),
         onReconnectStop: () => console.error('[HyperLiquid WS] Reconnection stopped after 5 attempts'),
+        onMessage: (event) => {
+            try {
+                const message = JSON.parse(event.data);
+                // Handle subscription responses
+                if ('success' in message || 'error' in message) {
+                    if (message.error) {
+                        console.error('[HyperLiquid WS] Subscription error:', message.error);
+                        setLastError(message.error);
+                    }
+                    else {
+                        setLastError(null);
+                    }
+                    return;
+                }
+                // Handle channel data messages
+                if ('channel' in message && 'data' in message) {
+                    const response = message;
+                    switch (response.channel) {
+                        case 'webData2':
+                            setWebData2(response.data);
+                            break;
+                        case 'allMids':
+                            setAllMids(response.data);
+                            break;
+                        default:
+                            console.warn(`[HyperLiquid WS] Unknown channel: ${response.channel}`);
+                    }
+                }
+            }
+            catch (error) {
+                const errorMessage = `Failed to parse message: ${error instanceof Error ? error.message : String(error)}`;
+                console.error('[HyperLiquid WS] Parse error:', errorMessage, 'Raw message:', event.data);
+                setLastError(errorMessage);
+            }
+        }
     });
     const isConnected = readyState === dist.ReadyState.OPEN;
     // Setup ping mechanism
@@ -2816,44 +2872,6 @@ const useHyperliquidNativeWebSocket = ({ address }) => {
             setWebData2(null);
         }
     }, [isConnected, address, subscribedAddress, sendJsonMessage]);
-    // Handle incoming WebSocket messages
-    require$$0.useEffect(() => {
-        if (!lastMessage)
-            return;
-        try {
-            const message = JSON.parse(lastMessage.data);
-            // Handle subscription responses
-            if ('success' in message || 'error' in message) {
-                if (message.error) {
-                    console.error('[HyperLiquid WS] Subscription error:', message.error);
-                    setLastError(message.error);
-                }
-                else {
-                    setLastError(null);
-                }
-                return;
-            }
-            // Handle channel data messages
-            if ('channel' in message && 'data' in message) {
-                const response = message;
-                switch (response.channel) {
-                    case 'webData2':
-                        setWebData2(response.data);
-                        break;
-                    case 'allMids':
-                        setAllMids(response.data);
-                        break;
-                    default:
-                        console.warn(`[HyperLiquid WS] Unknown channel: ${response.channel}`);
-                }
-            }
-        }
-        catch (error) {
-            const errorMessage = `Failed to parse message: ${error instanceof Error ? error.message : String(error)}`;
-            console.error('[HyperLiquid WS] Parse error:', errorMessage, 'Raw message:', lastMessage.data);
-            setLastError(errorMessage);
-        }
-    }, [lastMessage]);
     return {
         webData2,
         allMids,
@@ -3184,32 +3202,24 @@ class PositionProcessor {
         };
     }
     calculateEntryRatio(syncResults) {
+        var _a, _b;
         const longResults = syncResults.filter(result => result.asset.side === PositionSide.LONG);
         const shortResults = syncResults.filter(result => result.asset.side === PositionSide.SHORT);
         if (longResults.length === 0 || shortResults.length === 0)
             return 0;
-        const longValue = longResults.reduce((sum, result) => {
-            return sum + (Number(result.asset.size || 0) * Number(result.asset.entryPrice || 0));
-        }, 0);
-        const shortValue = shortResults.reduce((sum, result) => {
-            return sum + (Number(result.asset.size || 0) * Number(result.asset.entryPrice || 0));
-        }, 0);
-        return shortValue > 0 ? longValue / shortValue : 0;
+        const longEntryPrice = ((_a = longResults[0]) === null || _a === void 0 ? void 0 : _a.asset.entryPrice) ? Number(longResults[0].asset.entryPrice) : 0;
+        const shortEntryPrice = ((_b = shortResults[0]) === null || _b === void 0 ? void 0 : _b.asset.entryPrice) ? Number(shortResults[0].asset.entryPrice) : 0;
+        return shortEntryPrice > 0 ? longEntryPrice / shortEntryPrice : 0;
     }
     calculateMarkRatio(syncResults) {
+        var _a, _b;
         const longResults = syncResults.filter(result => result.asset.side === PositionSide.LONG);
         const shortResults = syncResults.filter(result => result.asset.side === PositionSide.SHORT);
         if (longResults.length === 0 || shortResults.length === 0)
             return 0;
-        const longValue = longResults.reduce((sum, result) => {
-            const currentPrice = this.getMarketPrice(result.asset.coin);
-            return sum + (result.actualSize * currentPrice);
-        }, 0);
-        const shortValue = shortResults.reduce((sum, result) => {
-            const currentPrice = this.getMarketPrice(result.asset.coin);
-            return sum + (result.actualSize * currentPrice);
-        }, 0);
-        return shortValue > 0 ? longValue / shortValue : 0;
+        const longMarkPrice = ((_a = longResults[0]) === null || _a === void 0 ? void 0 : _a.asset.coin) ? this.getMarketPrice(longResults[0].asset.coin) : 0;
+        const shortMarkPrice = ((_b = shortResults[0]) === null || _b === void 0 ? void 0 : _b.asset.coin) ? this.getMarketPrice(shortResults[0].asset.coin) : 0;
+        return shortMarkPrice > 0 ? longMarkPrice / shortMarkPrice : 0;
     }
     calculateNetFundingFromSyncResults(syncResults) {
         const netFunding = syncResults.reduce((sum, result) => {
@@ -3352,17 +3362,24 @@ const useCalculatedAccountSummary = (platformAccountSummary, platformOpenOrders,
 };
 
 /**
- * Hook to access trade histories
+ * Hook to access trade histories with loading state
  */
 const useTradeHistories = () => {
     const context = require$$0.useContext(PearHyperliquidContext);
     if (!context) {
         throw new Error('useTradeHistories must be used within a PearHyperliquidProvider');
     }
-    return context.data.tradeHistories;
+    const isLoading = require$$0.useMemo(() => {
+        // Loading is true initially and becomes false once we get the first data
+        return context.data.tradeHistories === null && context.isConnected;
+    }, [context.data.tradeHistories, context.isConnected]);
+    return {
+        data: context.data.tradeHistories,
+        isLoading
+    };
 };
 /**
- * Hook to access open positions with real-time calculations
+ * Hook to access open positions with real-time calculations and loading state
  */
 const useOpenPositions = () => {
     const context = require$$0.useContext(PearHyperliquidContext);
@@ -3371,20 +3388,38 @@ const useOpenPositions = () => {
     }
     // Use calculated positions that sync platform data with HyperLiquid real-time data
     const calculatedPositions = useCalculatedOpenPositions(context.data.openPositions, context.webData2, context.allMids);
-    return calculatedPositions;
+    const isLoading = require$$0.useMemo(() => {
+        // Loading is true initially and becomes false only when:
+        // 1. WebSocket has open-positions data
+        // 2. webData2 and allMids are ready (required for calculations)
+        // 3. Connection is established
+        return (context.isConnected &&
+            (context.data.openPositions === null || !context.webData2 || !context.allMids));
+    }, [context.data.openPositions, context.webData2, context.allMids, context.isConnected]);
+    return {
+        data: calculatedPositions,
+        isLoading
+    };
 };
 /**
- * Hook to access open orders
+ * Hook to access open orders with loading state
  */
 const useOpenOrders = () => {
     const context = require$$0.useContext(PearHyperliquidContext);
     if (!context) {
         throw new Error('useOpenOrders must be used within a PearHyperliquidProvider');
     }
-    return context.data.openOrders;
+    const isLoading = require$$0.useMemo(() => {
+        // Loading is true initially and becomes false once we get the first data
+        return context.data.openOrders === null && context.isConnected;
+    }, [context.data.openOrders, context.isConnected]);
+    return {
+        data: context.data.openOrders,
+        isLoading
+    };
 };
 /**
- * Hook to access account summary with real-time calculations
+ * Hook to access account summary with real-time calculations and loading state
  */
 const useAccountSummary = () => {
     var _a, _b, _c, _d;
@@ -3394,7 +3429,14 @@ const useAccountSummary = () => {
     }
     // Use calculated account summary that syncs platform data with HyperLiquid real-time data
     const calculatedAccountSummary = useCalculatedAccountSummary(context.data.accountSummary, context.data.openOrders, context.webData2, (_b = (_a = context.data.accountSummary) === null || _a === void 0 ? void 0 : _a.agentWallet) === null || _b === void 0 ? void 0 : _b.address, (_d = (_c = context.data.accountSummary) === null || _c === void 0 ? void 0 : _c.agentWallet) === null || _d === void 0 ? void 0 : _d.status);
-    return calculatedAccountSummary;
+    const isLoading = require$$0.useMemo(() => {
+        // Loading is true initially and becomes false once we get the first data
+        return context.data.accountSummary === null && context.isConnected;
+    }, [context.data.accountSummary, context.isConnected]);
+    return {
+        data: calculatedAccountSummary,
+        isLoading
+    };
 };
 
 exports.AccountSummaryCalculator = AccountSummaryCalculator;