perp-cli 0.4.9 → 0.4.10

package/dist/commands/account.js

@@ -101,30 +101,21 @@ function pac(adapter) {
 }
 export function registerAccountCommands(program, getAdapter, isJson, getAdapterForExchange) {
     const account = program.command("account").description("Account commands");
-    account
-        .command("balance")
-        .alias("info")
-        .description("Account overview: perp balance, spot holdings, and 24h funding")
-        .action(async () => {
-        const adapter = await getAdapter();
-        const exName = adapter.name.toLowerCase();
-        // Fetch perp balance + funding in parallel
+    async function fetchExchangeBalance(exName, adapter) {
+        const name = exName.toLowerCase();
         const [bal, fundingPayments] = await Promise.all([
             adapter.getBalance(),
             adapter.getFundingPayments(200).catch(() => []),
         ]);
-        // Spot balances (HL and LT only)
         let spotBalances = [];
         try {
-            if (exName === "hyperliquid") {
+            if (name === "hyperliquid") {
                 const { HyperliquidSpotAdapter } = await import("../exchanges/hyperliquid-spot.js");
                 const hlSpot = new HyperliquidSpotAdapter(adapter);
                 await hlSpot.init();
                 const raw = await hlSpot.getSpotBalances();
-                // Get spot prices for USD valuation
                 const markets = await hlSpot.getSpotMarkets();
                 const priceMap = new Map(markets.map(m => [m.baseToken.toUpperCase(), Number(m.markPrice)]));
-                // HL spot API returns token names with -SPOT suffix (e.g., "HYPE-SPOT", "USDC-SPOT")
                 const stripSuffix = (t) => t.replace(/-SPOT$/i, "").toUpperCase();
                 spotBalances = raw
                     .filter(b => Number(b.total) > 0)
@@ -136,7 +127,7 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
                     };
                 });
             }
-            else if (exName === "lighter") {
+            else if (name === "lighter") {
                 const { LighterAdapter } = await import("../exchanges/lighter.js");
                 const { LighterSpotAdapter } = await import("../exchanges/lighter-spot.js");
                 const ltSpot = new LighterSpotAdapter(adapter);
@@ -155,33 +146,30 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
             }
         }
         catch { /* spot not available */ }
-        // 24h funding summary
         const cutoff24h = Date.now() - 24 * 60 * 60 * 1000;
         const recent = fundingPayments.filter(f => f.time >= cutoff24h);
         const funding24h = recent.reduce((sum, f) => sum + Number(f.payment), 0);
-        // Total spot value
         const totalSpotUsd = spotBalances.reduce((s, b) => s + (b.valueUsd ?? 0), 0);
-        if (isJson()) {
-            return printJson(jsonOk({
-                perp: bal,
-                spot: spotBalances,
-                funding24h,
-                fundingPayments24h: recent.length,
-                totalSpotValueUsd: totalSpotUsd,
-                totalAccountValueUsd: Number(bal.equity) + totalSpotUsd,
-            }));
-        }
-        // ── Perp Balance ──
+        return {
+            exchange: name,
+            perp: bal,
+            spot: spotBalances,
+            funding24h,
+            fundingPayments24h: recent.length,
+            totalSpotValueUsd: totalSpotUsd,
+            totalAccountValueUsd: Number(bal.equity) + totalSpotUsd,
+        };
+    }
+    function printSingleBalance(exName, r) {
         console.log(chalk.cyan.bold(`\n  ${exName.toUpperCase()} Account Balance\n`));
         console.log(chalk.white.bold("  Perp Account"));
-        console.log(`    Equity:       $${formatUsd(bal.equity)}`);
-        console.log(`    Available:    $${formatUsd(bal.available)}`);
-        console.log(`    Margin Used:  $${formatUsd(bal.marginUsed)}`);
-        console.log(`    Unreal. PnL:  ${formatPnl(bal.unrealizedPnl)}`);
-        // ── Spot Holdings ──
-        if (spotBalances.length > 0) {
+        console.log(`    Equity:       $${formatUsd(r.perp.equity)}`);
+        console.log(`    Available:    $${formatUsd(r.perp.available)}`);
+        console.log(`    Margin Used:  $${formatUsd(r.perp.marginUsed)}`);
+        console.log(`    Unreal. PnL:  ${formatPnl(r.perp.unrealizedPnl)}`);
+        if (r.spot.length > 0) {
             console.log(chalk.white.bold("\n  Spot Holdings"));
-            const rows = spotBalances.map(b => [
+            const rows = r.spot.map(b => [
                 chalk.white.bold(b.token),
                 b.total,
                 b.available,
@@ -190,21 +178,100 @@ export function registerAccountCommands(program, getAdapter, isJson, getAdapterF
             ]);
             console.log(makeTable(["Token", "Total", "Available", "Held", "Value"], rows));
         }
-        else if (exName === "hyperliquid" || exName === "lighter") {
-            console.log(chalk.gray("\n  No spot holdings.\n"));
-        }
-        // ── Funding 24h ──
         console.log(chalk.white.bold("  Funding (24h)"));
-        console.log(`    Payments:     ${recent.length}`);
-        console.log(`    Total:        ${formatPnl(funding24h)}`);
-        // ── Total ──
-        const totalValue = Number(bal.equity) + totalSpotUsd;
-        if (totalSpotUsd > 0) {
+        console.log(`    Payments:     ${r.fundingPayments24h}`);
+        console.log(`    Total:        ${formatPnl(r.funding24h)}`);
+        if (r.totalSpotValueUsd > 0) {
             console.log(chalk.white.bold("\n  Total"));
-            console.log(`    Perp Equity:  $${formatUsd(bal.equity)}`);
-            console.log(`    Spot Value:   $${formatUsd(totalSpotUsd)}`);
-            console.log(`    Total Value:  $${formatUsd(totalValue)}`);
+            console.log(`    Perp Equity:  $${formatUsd(r.perp.equity)}`);
+            console.log(`    Spot Value:   $${formatUsd(r.totalSpotValueUsd)}`);
+            console.log(`    Total Value:  $${formatUsd(r.totalAccountValueUsd)}`);
         }
+    }
+    account
+        .command("balance")
+        .alias("info")
+        .description("Account overview: perp balance, spot holdings, and 24h funding")
+        .action(async () => {
+        // Detect if user explicitly set -e (single exchange mode)
+        const explicitExchange = program.getOptionValueSource?.("exchange") === "cli";
+        // Multi-exchange mode: show all exchanges
+        if (!explicitExchange && getAdapterForExchange) {
+            const results = [];
+            const errors = {};
+            await Promise.all(EXCHANGES.map(async (ex) => {
+                try {
+                    const adapter = await getAdapterForExchange(ex);
+                    results.push(await fetchExchangeBalance(ex, adapter));
+                }
+                catch (err) {
+                    errors[ex] = err instanceof Error ? err.message : String(err);
+                }
+            }));
+            // Sort by equity desc
+            results.sort((a, b) => b.totalAccountValueUsd - a.totalAccountValueUsd);
+            if (isJson()) {
+                const grandTotal = results.reduce((s, r) => s + r.totalAccountValueUsd, 0);
+                return printJson(jsonOk({
+                    exchanges: results,
+                    errors: Object.keys(errors).length > 0 ? errors : undefined,
+                    totalEquity: results.reduce((s, r) => s + Number(r.perp.equity), 0),
+                    totalSpotValueUsd: results.reduce((s, r) => s + r.totalSpotValueUsd, 0),
+                    totalAccountValueUsd: grandTotal,
+                    totalFunding24h: results.reduce((s, r) => s + r.funding24h, 0),
+                }));
+            }
+            console.log(chalk.cyan.bold("\n  All Exchanges — Account Balance\n"));
+            // Summary table
+            const balRows = results.map(r => [
+                chalk.white.bold(r.exchange),
+                `$${formatUsd(r.perp.equity)}`,
+                `$${formatUsd(r.perp.available)}`,
+                `$${formatUsd(r.perp.marginUsed)}`,
+                r.totalSpotValueUsd > 0 ? `$${formatUsd(r.totalSpotValueUsd)}` : chalk.gray("-"),
+                formatPnl(r.funding24h),
+                `$${formatUsd(r.totalAccountValueUsd)}`,
+            ]);
+            const grandEquity = results.reduce((s, r) => s + Number(r.perp.equity), 0);
+            const grandSpot = results.reduce((s, r) => s + r.totalSpotValueUsd, 0);
+            const grandFunding = results.reduce((s, r) => s + r.funding24h, 0);
+            const grandTotal = results.reduce((s, r) => s + r.totalAccountValueUsd, 0);
+            balRows.push([
+                chalk.cyan.bold("TOTAL"),
+                chalk.cyan.bold(`$${formatUsd(grandEquity)}`),
+                "",
+                "",
+                grandSpot > 0 ? chalk.cyan.bold(`$${formatUsd(grandSpot)}`) : "",
+                formatPnl(grandFunding),
+                chalk.cyan.bold(`$${formatUsd(grandTotal)}`),
+            ]);
+            console.log(makeTable(["Exchange", "Equity", "Available", "Margin", "Spot", "Funding 24h", "Total"], balRows));
+            // Spot details per exchange
+            for (const r of results) {
+                if (r.spot.length > 0) {
+                    console.log(chalk.white.bold(`  ${r.exchange.toUpperCase()} Spot Holdings`));
+                    const rows = r.spot.map(b => [
+                        chalk.white.bold(b.token),
+                        b.total,
+                        b.valueUsd ? `$${formatUsd(b.valueUsd)}` : chalk.gray("-"),
+                    ]);
+                    console.log(makeTable(["Token", "Total", "Value"], rows));
+                }
+            }
+            // Errors
+            for (const [ex, msg] of Object.entries(errors)) {
+                console.log(chalk.gray(`  ${ex}: ${msg}`));
+            }
+            console.log();
+            return;
+        }
+        // Single exchange mode (explicit -e or no getAdapterForExchange)
+        const adapter = await getAdapter();
+        const exName = adapter.name.toLowerCase();
+        const result = await fetchExchangeBalance(exName, adapter);
+        if (isJson())
+            return printJson(jsonOk(result));
+        printSingleBalance(exName, result);
         console.log();
     });
     account

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perp-cli",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Multi-DEX Perpetual Futures CLI - Pacifica, Hyperliquid, Lighter",
   "bin": {
     "perp": "dist/index.js",