fix: resolve spot and futures symbols via shared resolver

Introduce a shared token symbol resolver for spot and futures lookups while keeping alpha lookup independent, restoring prefix/remap handling and preserving spot-only fallback behavior.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

internal/data/imarket.go

@@ -13,6 +13,7 @@ type IMarket interface {
 	// Alpha token methods
 	IsAlphaToken(symbol string) bool
 	GetAlphaToken(symbol string) (market.AlphaTokenInfo, bool)
+	GetAlphaPrice(symbol string) (float64, bool)
 
 	// Trading pair methods
 	IsSpotPair(symbol string) bool

internal/data/market/alpha_tokens.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/url"
 	"strconv"
 	"time"
 
@@ -60,6 +61,17 @@ type AlphaTokenResponse struct {
 	Data          []AlphaTokenInfo `json:"data"`
 }
 
+type AlphaTickerData struct {
+	Price string `json:"price"`
+}
+
+type AlphaTickerResponse struct {
+	Code          string          `json:"code"`
+	Message       *string         `json:"message"`
+	MessageDetail *string         `json:"messageDetail"`
+	Data          AlphaTickerData `json:"data"`
+}
+
 // GetPrice returns the price as float64
 func (a *AlphaTokenInfo) GetPrice() float64 {
 	price, err := strconv.ParseFloat(a.Price, 64)
@@ -150,3 +162,37 @@ func (ms *MarketData) IsAlphaToken(symbol string) bool {
 	_, exists := ms.GetAlphaToken(symbol)
 	return exists
 }
+
+func (ms *MarketData) GetAlphaPrice(symbol string) (float64, bool) {
+	const alphaTickerURL = "https://www.binance.com/bapi/defi/v1/public/alpha-trade/ticker"
+
+	client := &http.Client{Timeout: 5 * time.Second}
+	endpoint := alphaTickerURL + "?" + url.Values{"symbol": []string{symbol}}.Encode()
+
+	resp, err := client.Get(endpoint)
+	if err != nil {
+		log.Error().Err(err).Str("symbol", symbol).Msg("Failed to fetch Alpha ticker")
+		return 0, false
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return 0, false
+	}
+
+	var tickerResp AlphaTickerResponse
+	if err := json.NewDecoder(resp.Body).Decode(&tickerResp); err != nil {
+		return 0, false
+	}
+
+	if tickerResp.Code != "000000" {
+		return 0, false
+	}
+
+	price, err := strconv.ParseFloat(tickerResp.Data.Price, 64)
+	if err != nil || price <= 0 {
+		return 0, false
+	}
+
+	return price, true
+}

internal/helper/binancex/resolver.go

@@ -0,0 +1,35 @@
+package binancex
+
+import (
+	"strings"
+
+	"me.thuanle/bbot/internal/data"
+)
+
+func Token2FutureSymbols(token string) []string {
+	return Token2Symbols(token)
+}
+
+func Token2SpotSymbols(token string) []string {
+	futureSymbols := Token2FutureSymbols(token)
+	spots := make([]string, 0, len(futureSymbols)+1)
+	seen := make(map[string]struct{}, len(futureSymbols)+1)
+
+	for _, futureSymbol := range futureSymbols {
+		spotSymbol := Future2SpotSymbol(futureSymbol)
+		if _, ok := seen[spotSymbol]; ok {
+			continue
+		}
+		seen[spotSymbol] = struct{}{}
+		spots = append(spots, spotSymbol)
+	}
+
+	spotOnly := strings.ToUpper(token) + "USDT"
+	if data.Market.IsSpotPair(spotOnly) {
+		if _, ok := seen[spotOnly]; !ok {
+			spots = append(spots, spotOnly)
+		}
+	}
+
+	return spots
+}

internal/helper/binancex/resolver_test.go

@@ -0,0 +1,91 @@
+package binancex
+
+import (
+	"testing"
+
+	"me.thuanle/bbot/internal/data"
+	"me.thuanle/bbot/internal/data/market"
+)
+
+type resolverMarketStub struct {
+	spotPairs    map[string]bool
+	futuresPairs map[string]bool
+}
+
+func (m *resolverMarketStub) GetFuturePrice(symbol string) (float64, float64, int64, bool) {
+	return 0, 0, 0, false
+}
+func (m *resolverMarketStub) GetAllPremiumIndex() (map[string]market.PremiumIndex, error) {
+	return nil, nil
+}
+func (m *resolverMarketStub) GetAllFundRate() (map[string]float64, map[string]int64) { return nil, nil }
+func (m *resolverMarketStub) GetSpotPrice(symbol string) (float64, bool)              { return 0, false }
+func (m *resolverMarketStub) GetMarginInterestRates() map[string]float64              { return nil }
+func (m *resolverMarketStub) IsAlphaToken(symbol string) bool                          { return false }
+func (m *resolverMarketStub) GetAlphaToken(symbol string) (market.AlphaTokenInfo, bool) {
+	return market.AlphaTokenInfo{}, false
+}
+func (m *resolverMarketStub) IsSpotPair(symbol string) bool    { return m.spotPairs[symbol] }
+func (m *resolverMarketStub) IsFuturesPair(symbol string) bool { return m.futuresPairs[symbol] }
+func (m *resolverMarketStub) RefreshTradingPairCache() error   { return nil }
+
+func TestToken2FutureSymbols_ResolvesPrefixAndSuffix(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &resolverMarketStub{
+		futuresPairs: map[string]bool{
+			"1000PEPEUSDT": true,
+			"1000PEPEUSDC": true,
+		},
+	}
+
+	syms := Token2FutureSymbols("pepe")
+	if len(syms) == 0 {
+		t.Fatalf("expected future symbols for PEPE")
+	}
+
+	foundUSDT := false
+	foundUSDC := false
+	for _, sym := range syms {
+		if sym == "1000PEPEUSDT" {
+			foundUSDT = true
+		}
+		if sym == "1000PEPEUSDC" {
+			foundUSDC = true
+		}
+	}
+
+	if !foundUSDT || !foundUSDC {
+		t.Fatalf("expected both 1000PEPEUSDT and 1000PEPEUSDC, got %+v", syms)
+	}
+}
+
+func TestToken2SpotSymbols_AppliesExplicitRemap(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &resolverMarketStub{
+		futuresPairs: map[string]bool{"LUNA2USDT": true},
+		spotPairs:    map[string]bool{"LUNAUSDT": true},
+	}
+
+	spots := Token2SpotSymbols("luna2")
+	if len(spots) != 1 || spots[0] != "LUNAUSDT" {
+		t.Fatalf("expected [LUNAUSDT], got %+v", spots)
+	}
+}
+
+func TestToken2SpotSymbols_SpotOnlyFallback(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &resolverMarketStub{
+		spotPairs: map[string]bool{"ABCUSDT": true},
+	}
+
+	spots := Token2SpotSymbols("abc")
+	if len(spots) != 1 || spots[0] != "ABCUSDT" {
+		t.Fatalf("expected [ABCUSDT], got %+v", spots)
+	}
+}

internal/services/tele/commands/token.go

@@ -62,68 +62,57 @@ func showStickerMode(context telebot.Context, token string) {
 	}
 }
 
-func OnTokenInfoByToken(context telebot.Context, token string) error {
-	token = strings.ToUpper(token)
-	showStickerMode(context, token)
-
-	var (
-		hasAlpha, hasAlpha24h bool
-		alphaPrice, alpha24h  float64
-		hasFuture, hasSpot    bool
-		futurePrice           float64
-		fundingRate           float64
-		fundingTime           int64
-		spotPrice             float64
-	)
+func collectRichTokenData(token string) buildRichTokenMessageArgs {
+	a := buildRichTokenMessageArgs{Token: token}
 
 	if alphaToken, ok := data.Market.GetAlphaToken(token); ok {
-		hasAlpha = true
-		alphaPrice = alphaToken.GetPrice()
-		hasAlpha24h = true
-		alpha24h = alphaToken.GetPercentChange24h()
+		a.HasAlpha = true
+		a.HasAlpha24h = true
+		a.Alpha24h = alphaToken.GetPercentChange24h()
+		if alphaPrice, ok := data.Market.GetAlphaPrice(token + "USDT"); ok {
+			a.AlphaPrice = alphaPrice
+		} else {
+			a.AlphaPrice = alphaToken.GetPrice()
+		}
 	}
 
-	symbols := binancex.Token2Symbols(token)
-	if len(symbols) > 0 {
-		fp, fr, ft, ok := data.Market.GetFuturePrice(symbols[0])
-		if ok {
-			hasFuture = true
-			futurePrice = fp
-			fundingRate = fr
-			fundingTime = ft
-
-			sSymbol := binancex.Future2SpotSymbol(symbols[0])
-			if sp, ok := data.Market.GetSpotPrice(sSymbol); ok {
-				hasSpot = true
-				spotPrice = sp
+	futureSymbols := binancex.Token2FutureSymbols(token)
+	for _, futureSymbol := range futureSymbols {
+		if fp, fr, ft, ok := data.Market.GetFuturePrice(futureSymbol); ok {
+			a.HasFuture = true
+			a.FuturePrice = fp
+			a.FundingRate = fr
+			a.FundingTimeMs = ft
+			break
 		}
 	}
+
+	spotSymbols := binancex.Token2SpotSymbols(token)
+	for _, spotSymbol := range spotSymbols {
+		if sp, ok := data.Market.GetSpotPrice(spotSymbol); ok {
+			a.HasSpot = true
+			a.SpotPrice = sp
+			break
+		}
 	}
 
 	marginRates := data.Market.GetMarginInterestRates()
-	marginAPR := marginRates[token] * 365 * 100
-	hasMarginAPR := marginRates[token] != 0
+	a.MarginAPRPercent = marginRates[token] * 365 * 100
+	a.HasMarginAPR = marginRates[token] != 0
 
-	if !hasSpot && !hasFuture && !hasAlpha {
+	return a
+}
+
+func OnTokenInfoByToken(context telebot.Context, token string) error {
+	token = strings.ToUpper(token)
+	showStickerMode(context, token)
+
+	args := collectRichTokenData(token)
+	if !args.HasSpot && !args.HasFuture && !args.HasAlpha {
 		return nil
 	}
 
-	msg := view.RenderRichTokenMessage(buildRichTokenMessageInput(buildRichTokenMessageArgs{
-		Token:            token,
-		HasSpot:          hasSpot,
-		SpotPrice:        spotPrice,
-		HasFuture:        hasFuture,
-		FuturePrice:      futurePrice,
-		FundingRate:      fundingRate,
-		FundingTimeMs:    fundingTime,
-		HasAlpha:         hasAlpha,
-		AlphaPrice:       alphaPrice,
-		HasAlpha24h:      hasAlpha24h,
-		Alpha24h:         alpha24h,
-		HasMarginAPR:     hasMarginAPR,
-		MarginAPRPercent: marginAPR,
-	}))
-
+	msg := view.RenderRichTokenMessage(buildRichTokenMessageInput(args))
 	_ = chat.ReplyMessage(context, msg)
 	return nil
 }

internal/services/tele/commands/token_test.go

@@ -1,6 +1,11 @@
 package commands
 
-import "testing"
+import (
+	"testing"
+
+	"me.thuanle/bbot/internal/data"
+	"me.thuanle/bbot/internal/data/market"
+)
 
 func TestBuildRichTokenMessageInput_AllSources(t *testing.T) {
 	in := buildRichTokenMessageInput(buildRichTokenMessageArgs{
@@ -40,3 +45,179 @@ func TestBuildRichTokenMessageInput_OnlyAlpha(t *testing.T) {
 		t.Fatalf("did not expect spot/future flags true: %+v", in)
 	}
 }
+
+type marketStub struct {
+	spotPairs    map[string]bool
+	futuresPairs map[string]bool
+	spotPrices   map[string]float64
+	futurePrices map[string]struct {
+		price float64
+		rate  float64
+		time  int64
+	}
+	alphaTokens map[string]market.AlphaTokenInfo
+	alphaPrices map[string]float64
+	marginRates map[string]float64
+}
+
+func (m *marketStub) GetFuturePrice(symbol string) (float64, float64, int64, bool) {
+	v, ok := m.futurePrices[symbol]
+	if !ok {
+		return 0, 0, 0, false
+	}
+	return v.price, v.rate, v.time, true
+}
+func (m *marketStub) GetAllPremiumIndex() (map[string]market.PremiumIndex, error) { return nil, nil }
+func (m *marketStub) GetAllFundRate() (map[string]float64, map[string]int64)      { return nil, nil }
+func (m *marketStub) GetSpotPrice(symbol string) (float64, bool) {
+	v, ok := m.spotPrices[symbol]
+	return v, ok
+}
+func (m *marketStub) GetMarginInterestRates() map[string]float64 { return m.marginRates }
+func (m *marketStub) IsAlphaToken(symbol string) bool {
+	_, ok := m.alphaTokens[symbol]
+	return ok
+}
+func (m *marketStub) GetAlphaToken(symbol string) (market.AlphaTokenInfo, bool) {
+	v, ok := m.alphaTokens[symbol]
+	return v, ok
+}
+func (m *marketStub) GetAlphaPrice(symbol string) (float64, bool) {
+	v, ok := m.alphaPrices[symbol]
+	return v, ok
+}
+func (m *marketStub) IsSpotPair(symbol string) bool    { return m.spotPairs[symbol] }
+func (m *marketStub) IsFuturesPair(symbol string) bool { return m.futuresPairs[symbol] }
+func (m *marketStub) RefreshTradingPairCache() error   { return nil }
+
+func TestCollectRichTokenData_SpotOnlyReachable(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		spotPairs:  map[string]bool{"ABCUSDT": true},
+		spotPrices: map[string]float64{"ABCUSDT": 1.23},
+	}
+
+	args := collectRichTokenData("ABC")
+	if !args.HasSpot {
+		t.Fatalf("expected spot to be reachable for spot-only token: %+v", args)
+	}
+	if args.HasFuture || args.HasAlpha {
+		t.Fatalf("did not expect future/alpha for spot-only token: %+v", args)
+	}
+}
+
+func TestCollectRichTokenData_FutureFailureStillKeepsSpot(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		spotPairs: map[string]bool{
+			"ETHUSDT": true,
+		},
+		futuresPairs: map[string]bool{
+			"ETHUSDT": true,
+		},
+		spotPrices: map[string]float64{
+			"ETHUSDT": 3245,
+		},
+		futurePrices: map[string]struct {
+			price float64
+			rate  float64
+			time  int64
+		}{},
+	}
+
+	args := collectRichTokenData("ETH")
+	if !args.HasSpot {
+		t.Fatalf("expected spot to remain available when future lookup fails: %+v", args)
+	}
+	if args.HasFuture {
+		t.Fatalf("did not expect future when future lookup fails: %+v", args)
+	}
+}
+
+func TestCollectRichTokenData_UsesSharedResolverMapping(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		spotPairs: map[string]bool{
+			"LUNAUSDT": true,
+		},
+		futuresPairs: map[string]bool{
+			"LUNA2USDT": true,
+		},
+		spotPrices: map[string]float64{
+			"LUNAUSDT": 0.49,
+		},
+		futurePrices: map[string]struct {
+			price float64
+			rate  float64
+			time  int64
+		}{
+			"LUNA2USDT": {price: 0.50, rate: 0.0001, time: 1740000000000},
+		},
+	}
+
+	args := collectRichTokenData("LUNA2")
+	if !args.HasFuture || !args.HasSpot {
+		t.Fatalf("expected both future and mapped spot, got %+v", args)
+	}
+	if args.SpotPrice != 0.49 {
+		t.Fatalf("expected mapped spot price 0.49, got %f", args.SpotPrice)
+	}
+}
+
+func TestCollectRichTokenData_PrefixFutureMapsToSpot(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		spotPairs: map[string]bool{
+			"PEPEUSDT": true,
+		},
+		futuresPairs: map[string]bool{
+			"1000PEPEUSDT": true,
+		},
+		spotPrices: map[string]float64{
+			"PEPEUSDT": 0.000012,
+		},
+		futurePrices: map[string]struct {
+			price float64
+			rate  float64
+			time  int64
+		}{
+			"1000PEPEUSDT": {price: 0.000013, rate: 0.0002, time: 1740000000000},
+		},
+	}
+
+	args := collectRichTokenData("PEPE")
+	if !args.HasFuture || !args.HasSpot {
+		t.Fatalf("expected both future and mapped spot for prefixed contract, got %+v", args)
+	}
+}
+
+func TestCollectRichTokenData_AlphaUsesSymbolPrice(t *testing.T) {
+	orig := data.Market
+	defer func() { data.Market = orig }()
+
+	data.Market = &marketStub{
+		alphaTokens: map[string]market.AlphaTokenInfo{
+			"ABC": {Symbol: "ABC", PercentChange24h: "12.4", Price: "0.1"},
+		},
+		alphaPrices: map[string]float64{"ABCUSDT": 0.1234},
+	}
+
+	args := collectRichTokenData("ABC")
+	if !args.HasAlpha {
+		t.Fatalf("expected alpha to be available: %+v", args)
+	}
+	if !args.HasAlpha24h {
+		t.Fatalf("expected alpha 24h to be available: %+v", args)
+	}
+	if args.AlphaPrice != 0.1234 {
+		t.Fatalf("expected alpha price from symbol lookup, got %.4f", args.AlphaPrice)
+	}
+}