mirror of
https://github.com/NoFxAiOS/nofx.git
synced 2026-07-15 00:36:56 +08:00
robustness: shared HTTP client, HTTP status checks, abort controller, streaming perf
- web.go: reuse shared binanceClient with connection pooling instead of per-request client - sentinel.go: check HTTP status code before parsing Binance ticker response - brain.go: check HTTP status codes in news scan and market brief APIs - brain.go: add cleanStaleSignals() to prevent unbounded sync.Map growth - scheduler.go: periodically clean expired pending trades - AgentChatPage.tsx: add AbortController to cancel in-flight requests - AgentChatPage.tsx: check response.ok before parsing JSON - AgentChatPage.tsx: batch word streaming (~40 frames max) to reduce re-renders - AgentChatPage.tsx: handle AbortError gracefully (remove orphan bot message)
This commit is contained in:
@@ -32,6 +32,17 @@ func NewBrain(agent *Agent, logger *slog.Logger) *Brain {
|
|||||||
|
|
||||||
func (b *Brain) Stop() { close(b.stopCh) }
|
func (b *Brain) Stop() { close(b.stopCh) }
|
||||||
|
|
||||||
|
// cleanStaleSignals removes debounce entries older than 30 minutes.
|
||||||
|
func (b *Brain) cleanStaleSignals() {
|
||||||
|
cutoff := time.Now().Add(-30 * time.Minute)
|
||||||
|
b.recentSignals.Range(func(key, value any) bool {
|
||||||
|
if t, ok := value.(time.Time); ok && t.Before(cutoff) {
|
||||||
|
b.recentSignals.Delete(key)
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func (b *Brain) HandleSignal(sig Signal) {
|
func (b *Brain) HandleSignal(sig Signal) {
|
||||||
key := fmt.Sprintf("%s:%s", sig.Type, sig.Symbol)
|
key := fmt.Sprintf("%s:%s", sig.Type, sig.Symbol)
|
||||||
if v, ok := b.recentSignals.Load(key); ok {
|
if v, ok := b.recentSignals.Load(key); ok {
|
||||||
@@ -53,11 +64,16 @@ func (b *Brain) StartNewsScan(interval time.Duration) {
|
|||||||
safe.GoNamed("brain-news-scan", func() {
|
safe.GoNamed("brain-news-scan", func() {
|
||||||
ticker := time.NewTicker(interval)
|
ticker := time.NewTicker(interval)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
cleanTick := 0
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-b.stopCh: return
|
case <-b.stopCh: return
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
b.scanNews(seen)
|
b.scanNews(seen)
|
||||||
|
cleanTick++
|
||||||
|
if cleanTick%6 == 0 { // every ~30 min
|
||||||
|
b.cleanStaleSignals()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -67,6 +83,10 @@ func (b *Brain) scanNews(seen map[string]bool) {
|
|||||||
resp, err := b.http.Get("https://min-api.cryptocompare.com/data/v2/news/?lang=EN&sortOrder=latest")
|
resp, err := b.http.Get("https://min-api.cryptocompare.com/data/v2/news/?lang=EN&sortOrder=latest")
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
b.logger.Debug("news API non-200", "status", resp.StatusCode)
|
||||||
|
return
|
||||||
|
}
|
||||||
body, err := io.ReadAll(io.LimitReader(resp.Body, 1024*1024)) // 1MB limit
|
body, err := io.ReadAll(io.LimitReader(resp.Body, 1024*1024)) // 1MB limit
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
|
|
||||||
@@ -148,8 +168,9 @@ func (b *Brain) sendBrief(hour int) {
|
|||||||
resp, err := b.http.Get(fmt.Sprintf("https://fapi.binance.com/fapi/v1/ticker/24hr?symbol=%s", sym))
|
resp, err := b.http.Get(fmt.Sprintf("https://fapi.binance.com/fapi/v1/ticker/24hr?symbol=%s", sym))
|
||||||
if err != nil { continue }
|
if err != nil { continue }
|
||||||
body, readErr := io.ReadAll(io.LimitReader(resp.Body, 64*1024)) // 64KB limit
|
body, readErr := io.ReadAll(io.LimitReader(resp.Body, 64*1024)) // 64KB limit
|
||||||
|
statusOK := resp.StatusCode == http.StatusOK
|
||||||
resp.Body.Close()
|
resp.Body.Close()
|
||||||
if readErr != nil { continue }
|
if readErr != nil || !statusOK { continue }
|
||||||
var t map[string]string
|
var t map[string]string
|
||||||
if err := json.Unmarshal(body, &t); err != nil { continue }
|
if err := json.Unmarshal(body, &t); err != nil { continue }
|
||||||
if sym == "BTCUSDT" { btcPrice = t["lastPrice"]; btcChg = t["priceChangePercent"] }
|
if sym == "BTCUSDT" { btcPrice = t["lastPrice"]; btcChg = t["priceChangePercent"] }
|
||||||
|
|||||||
@@ -43,10 +43,14 @@ func (s *Scheduler) Start(ctx context.Context) {
|
|||||||
lastCheck = now
|
lastCheck = now
|
||||||
}
|
}
|
||||||
// Clean stale chat history every hour (sessions idle > 24h)
|
// Clean stale chat history every hour (sessions idle > 24h)
|
||||||
|
// and expired pending trades
|
||||||
if now.Sub(lastCleanup) > 1*time.Hour {
|
if now.Sub(lastCleanup) > 1*time.Hour {
|
||||||
if s.agent.history != nil {
|
if s.agent.history != nil {
|
||||||
s.agent.history.CleanOld(24 * time.Hour)
|
s.agent.history.CleanOld(24 * time.Hour)
|
||||||
}
|
}
|
||||||
|
if s.agent.pending != nil {
|
||||||
|
s.agent.pending.CleanExpired()
|
||||||
|
}
|
||||||
lastCleanup = now
|
lastCleanup = now
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -116,6 +116,10 @@ func (s *Sentinel) check(symbol string) {
|
|||||||
resp, err := s.http.Get(fmt.Sprintf("https://fapi.binance.com/fapi/v1/ticker/24hr?symbol=%s", symbol))
|
resp, err := s.http.Get(fmt.Sprintf("https://fapi.binance.com/fapi/v1/ticker/24hr?symbol=%s", symbol))
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
s.logger.Debug("sentinel ticker non-200", "symbol", symbol, "status", resp.StatusCode)
|
||||||
|
return
|
||||||
|
}
|
||||||
body, err := io.ReadAll(io.LimitReader(resp.Body, 256*1024)) // 256KB limit
|
body, err := io.ReadAll(io.LimitReader(resp.Body, 256*1024)) // 256KB limit
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
var t map[string]interface{}
|
var t map[string]interface{}
|
||||||
|
|||||||
14
agent/web.go
14
agent/web.go
@@ -17,6 +17,17 @@ var validSymbolRe = regexp.MustCompile(`^[A-Za-z0-9\-_]{1,20}$`)
|
|||||||
// validIntervalRe matches only valid kline intervals (e.g. 1m, 5m, 1h, 4h, 1d, 1w).
|
// validIntervalRe matches only valid kline intervals (e.g. 1m, 5m, 1h, 4h, 1d, 1w).
|
||||||
var validIntervalRe = regexp.MustCompile(`^[0-9]{1,2}[mhHdDwWM]$`)
|
var validIntervalRe = regexp.MustCompile(`^[0-9]{1,2}[mhHdDwWM]$`)
|
||||||
|
|
||||||
|
// binanceClient is a shared HTTP client for proxying Binance API requests.
|
||||||
|
// Reused across requests to benefit from connection pooling.
|
||||||
|
var binanceClient = &http.Client{
|
||||||
|
Timeout: 10 * time.Second,
|
||||||
|
Transport: &http.Transport{
|
||||||
|
MaxIdleConns: 20,
|
||||||
|
MaxIdleConnsPerHost: 10,
|
||||||
|
IdleConnTimeout: 90 * time.Second,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
// WebHandler provides HTTP endpoints for the NOFXi agent.
|
// WebHandler provides HTTP endpoints for the NOFXi agent.
|
||||||
type WebHandler struct {
|
type WebHandler struct {
|
||||||
agent *Agent
|
agent *Agent
|
||||||
@@ -105,8 +116,7 @@ func (w *WebHandler) HandleTicker(rw http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func proxyBinance(rw http.ResponseWriter, url string) {
|
func proxyBinance(rw http.ResponseWriter, url string) {
|
||||||
client := &http.Client{Timeout: 10 * time.Second}
|
resp, err := binanceClient.Get(url)
|
||||||
resp, err := client.Get(url)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeJSON(rw, 502, map[string]string{"error": "upstream request failed"})
|
writeJSON(rw, 502, map[string]string{"error": "upstream request failed"})
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ export function AgentChatPage() {
|
|||||||
const [loading, setLoading] = useState(false)
|
const [loading, setLoading] = useState(false)
|
||||||
const messagesEndRef = useRef<HTMLDivElement>(null)
|
const messagesEndRef = useRef<HTMLDivElement>(null)
|
||||||
const chatInputRef = useRef<ChatInputHandle>(null)
|
const chatInputRef = useRef<ChatInputHandle>(null)
|
||||||
|
const abortRef = useRef<AbortController | null>(null)
|
||||||
|
|
||||||
// Sidebar section collapse state
|
// Sidebar section collapse state
|
||||||
const [sections, setSections] = useState({
|
const [sections, setSections] = useState({
|
||||||
@@ -98,6 +99,11 @@ export function AgentChatPage() {
|
|||||||
setLoading(true)
|
setLoading(true)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
// Abort any in-flight request
|
||||||
|
abortRef.current?.abort()
|
||||||
|
const controller = new AbortController()
|
||||||
|
abortRef.current = controller
|
||||||
|
|
||||||
const res = await fetch('/api/agent/chat', {
|
const res = await fetch('/api/agent/chat', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
@@ -105,15 +111,22 @@ export function AgentChatPage() {
|
|||||||
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||||
},
|
},
|
||||||
body: JSON.stringify({ message: text, lang: language }),
|
body: JSON.stringify({ message: text, lang: language }),
|
||||||
|
signal: controller.signal,
|
||||||
})
|
})
|
||||||
|
if (!res.ok) {
|
||||||
|
const errData = await res.json().catch(() => ({}))
|
||||||
|
throw new Error(errData.error || `Server error (${res.status})`)
|
||||||
|
}
|
||||||
const data = await res.json()
|
const data = await res.json()
|
||||||
const responseText = data.response || data.error || 'No response'
|
const responseText = data.response || data.error || 'No response'
|
||||||
|
|
||||||
// Simulate streaming by revealing text progressively
|
// Simulate streaming by revealing text in chunks (batched to reduce renders)
|
||||||
const words = responseText.split(/(\s+)/)
|
const words = responseText.split(/(\s+)/)
|
||||||
|
const chunkSize = Math.max(3, Math.ceil(words.length / 40)) // ~40 frames max
|
||||||
let displayed = ''
|
let displayed = ''
|
||||||
for (let i = 0; i < words.length; i++) {
|
for (let i = 0; i < words.length; i += chunkSize) {
|
||||||
displayed += words[i]
|
const chunk = words.slice(i, i + chunkSize).join('')
|
||||||
|
displayed += chunk
|
||||||
const current = displayed
|
const current = displayed
|
||||||
setMessages((prev) =>
|
setMessages((prev) =>
|
||||||
prev.map((m) =>
|
prev.map((m) =>
|
||||||
@@ -129,8 +142,8 @@ export function AgentChatPage() {
|
|||||||
: m
|
: m
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
if (i < words.length - 1) {
|
if (i + chunkSize < words.length) {
|
||||||
await new Promise((r) => setTimeout(r, 10))
|
await new Promise((r) => setTimeout(r, 20))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Mark streaming done
|
// Mark streaming done
|
||||||
@@ -138,21 +151,26 @@ export function AgentChatPage() {
|
|||||||
prev.map((m) => (m.id === botId ? { ...m, streaming: false } : m))
|
prev.map((m) => (m.id === botId ? { ...m, streaming: false } : m))
|
||||||
)
|
)
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
setMessages((prev) =>
|
if (e.name === 'AbortError') {
|
||||||
prev.map((m) =>
|
// Request was cancelled (e.g. user sent a new message), clean up silently
|
||||||
m.id === botId
|
setMessages((prev) => prev.filter((m) => m.id !== botId))
|
||||||
? {
|
} else {
|
||||||
...m,
|
setMessages((prev) =>
|
||||||
text: '⚠️ Error: ' + e.message,
|
prev.map((m) =>
|
||||||
time: new Date().toLocaleTimeString([], {
|
m.id === botId
|
||||||
hour: '2-digit',
|
? {
|
||||||
minute: '2-digit',
|
...m,
|
||||||
}),
|
text: '⚠️ Error: ' + e.message,
|
||||||
streaming: false,
|
time: new Date().toLocaleTimeString([], {
|
||||||
}
|
hour: '2-digit',
|
||||||
: m
|
minute: '2-digit',
|
||||||
|
}),
|
||||||
|
streaming: false,
|
||||||
|
}
|
||||||
|
: m
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
}
|
||||||
}
|
}
|
||||||
setLoading(false)
|
setLoading(false)
|
||||||
chatInputRef.current?.focus()
|
chatInputRef.current?.focus()
|
||||||
|
|||||||
Reference in New Issue
Block a user