feat: 十轮网关优化 - 安全加固/可观测性/性能/可靠性
CI / lint (push) Has been cancelled
CI / test (push) Has been cancelled
CI / build (push) Has been cancelled
CI / security-scan (push) Has been cancelled

- SSE Keepalive Ping (15s心跳防止代理断连)
- Timing HTTP 头 (X-Timing-Queue/Inference/Total-Ms)
- Adapter Request-ID 传播到后端
- Session 清理日志回调
- Server 安全加固 (ReadHeaderTimeout/MaxHeaderBytes 防 slowloris)
- Usage Tracker 数据保留清理 (retentionDays + 定期清理)
- Config Reload 后 Adapter Registry 更新 (RegisterIfAbsent + RWMutex)
- Rate Limiter 空闲 Bucket 清理 (30分钟过期)
- Shutdown Drain 超时可配置 (ShutdownDrainSeconds)
- Config 模型字段校验增强 (provider/endpoint/actual_model)
- Auth 过期 Key 自动清理 (5分钟扫描)
- Admin API Rate Limiting
- Adapter Health Check 独立超时 (每个 adapter 3s)
- TCP 连接阶段超时 (DialContext 5s + KeepAlive 30s)
- 幂等键缓存、审计日志、Gzip 中间件、CORS Expose Headers
- Backpressure 响应头、熔断器 Prometheus 指标
- 连接池优化、Trace-ID 全链路传播
This commit is contained in:
selfrelease
2026-08-03 15:43:11 +08:00
parent e7e98271d4
commit da9c8334d8
27 changed files with 3002 additions and 309 deletions
+376 -25
View File
@@ -5,12 +5,14 @@ import (
"encoding/json"
"fmt"
"net/http"
"strconv"
"strings"
"time"
"github.com/edgeai/gateway/internal/adapter"
"github.com/edgeai/gateway/internal/auth"
"github.com/edgeai/gateway/internal/config"
"github.com/edgeai/gateway/internal/connector"
ctxasm "github.com/edgeai/gateway/internal/context"
"github.com/edgeai/gateway/internal/handler"
"github.com/edgeai/gateway/internal/middleware"
@@ -47,12 +49,39 @@ func (s *Server) handleChatCompletions(w http.ResponseWriter, r *http.Request) {
return
}
// 参数范围校验
if req.Temperature != nil && (*req.Temperature < 0 || *req.Temperature > 2) {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrInvalidRequest, "temperature must be between 0 and 2", requestID))
return
}
if req.TopP != nil && (*req.TopP < 0 || *req.TopP > 1) {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrInvalidRequest, "top_p must be between 0 and 1", requestID))
return
}
if req.MaxOutputTokens < 0 {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrInvalidRequest, "max_output_tokens must be non-negative", requestID))
return
}
if len(req.Messages) > s.cfg.Context.MaxSessionMessages {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrContextTooLarge, fmt.Sprintf("messages count exceeds max %d", s.cfg.Context.MaxSessionMessages), requestID))
return
}
// 幂等性检查(仅非流式请求支持幂等)
if !req.Stream && req.IdempotencyKey != "" && identity != nil {
if s.checkIdempotency(w, req.IdempotencyKey, identity.AppID) {
return
}
}
// Check model permission
if identity != nil && !auth.CheckModelPermission(identity, req.Model) {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrPermissionDenied, "model not allowed for this application", requestID))
return
}
// Per-app 限流由全局 RateLimit 中间件处理,此处不再重复检查
// Resolve logical model
target, err := s.modelMap.Resolve(req.Model)
if err != nil {
@@ -60,6 +89,13 @@ func (s *Server) handleChatCompletions(w http.ResponseWriter, r *http.Request) {
return
}
// 校验 max_output_tokens 不超过模型配置上限
if req.MaxOutputTokens > 0 && target.MaxOutputTokens > 0 && req.MaxOutputTokens > target.MaxOutputTokens {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrInvalidRequest,
fmt.Sprintf("max_output_tokens %d exceeds model limit %d", req.MaxOutputTokens, target.MaxOutputTokens), requestID))
return
}
// Get adapter
adapterInst, err := s.registry.Get(target.Provider)
if err != nil {
@@ -75,6 +111,7 @@ func (s *Server) handleChatCompletions(w http.ResponseWriter, r *http.Request) {
// Backpressure check: reject low-priority requests under high load
s.backpressure.Update(s.scheduler.RunningCount(), s.scheduler.QueueLength())
w.Header().Set("X-Backpressure-Level", fmt.Sprintf("%d", s.backpressure.Level()))
if !s.backpressure.ShouldAccept(priority) {
reason := s.backpressure.RejectReason(priority)
s.metrics.IncRequest("backpressure_rejected")
@@ -85,9 +122,19 @@ func (s *Server) handleChatCompletions(w http.ResponseWriter, r *http.Request) {
// Circuit breaker check
if !s.breaker.AllowRequest() {
s.metrics.IncRequest("circuit_open")
s.metrics.SetBreakerState(1) // open
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrModelUnavailable, "circuit breaker open, please retry later", requestID))
return
}
// 同步熔断器状态到 Prometheus 指标
switch s.breaker.State() {
case "open":
s.metrics.SetBreakerState(1)
case "half_open":
s.metrics.SetBreakerState(2)
default:
s.metrics.SetBreakerState(0)
}
// Create task
taskID := uuid.New().String()
@@ -103,9 +150,21 @@ func (s *Server) handleChatCompletions(w http.ResponseWriter, r *http.Request) {
s.metrics.SetQueueLength(s.scheduler.QueueLength())
// 解析 per-request 超时覆盖
var overrides map[string]int
if req.Timeouts != nil {
overrides = map[string]int{
"queue_ms": req.Timeouts.QueueMs,
"first_token_ms": req.Timeouts.FirstTokenMs,
"inference_ms": req.Timeouts.InferenceMs,
"total_ms": req.Timeouts.TotalMs,
}
}
resolvedTimeouts := s.timeoutMgr.ResolveTimeouts(&s.cfg.Timeouts, overrides)
// Wait for task to be dequeued
queueStart := time.Now()
ctx, cancel := context.WithTimeout(r.Context(), time.Duration(s.cfg.Timeouts.DefaultQueueMs)*time.Millisecond)
ctx, cancel := context.WithTimeout(r.Context(), time.Duration(resolvedTimeouts.QueueMs)*time.Millisecond)
defer cancel()
dequeued, err := s.scheduler.GetNext(ctx)
@@ -127,12 +186,25 @@ func (s *Server) handleChatCompletions(w http.ResponseWriter, r *http.Request) {
// Build adapter request — assemble context if session_id provided
messages := req.Messages
if req.SessionID != "" {
sess, err := s.sessions.Get(req.SessionID)
if err == nil && sess != nil {
// 会话访问隔离:校验 session 属于当前 app
var sess *session.Session
var sessErr error
if identity != nil {
sess, sessErr = s.sessions.GetForApp(req.SessionID, identity.AppID)
} else {
sess, sessErr = s.sessions.Get(req.SessionID)
}
if sessErr == nil && sess != nil {
// Load session history and assemble context
history := s.loadSessionHistory(sess)
if len(history) > 0 {
assembler := ctxasm.NewAssembler(&s.cfg.Context)
// 注入摘要器,启用真实 LLM 摘要(受配置控制)
if s.cfg.Context.EnableLLMSummary {
summaryGen := ctxasm.NewAdapterSummaryGenerator(adapterInst, target.ActualModel, s.cfg.Context.SummaryMaxTokens)
summarizer := ctxasm.NewSummarizer(summaryGen, time.Duration(s.cfg.Context.SummaryTimeoutSeconds)*time.Second)
assembler.SetSummarizer(summarizer)
}
result := assembler.Assemble(history, req.Messages, target.ContextWindow, target.MaxOutputTokens, req.ContextPolicy)
messages = result.Messages
}
@@ -155,13 +227,20 @@ func (s *Server) handleChatCompletions(w http.ResponseWriter, r *http.Request) {
}
if req.Stream {
s.handleStreaming(w, r, adapterInst, adapterReq, dequeued, requestID, target, req.Model)
s.handleStreaming(w, r, adapterInst, adapterReq, dequeued, requestID, target, req.Model, req.SessionID, req.Messages, identity.AppID, resolvedTimeouts)
} else {
s.handleNonStreaming(w, r, adapterInst, adapterReq, dequeued, requestID, target, req.Model)
// 非流式请求:如果带有幂等键,捕获响应用于缓存
if req.IdempotencyKey != "" && identity != nil {
crw := &captureResponseWriter{ResponseWriter: w}
s.handleNonStreaming(crw, r, adapterInst, adapterReq, dequeued, requestID, target, req.Model, req.SessionID, req.Messages, identity.AppID, resolvedTimeouts)
s.storeIdempotencyResult(req.IdempotencyKey, identity.AppID, crw.statusCode, crw.body)
} else {
s.handleNonStreaming(w, r, adapterInst, adapterReq, dequeued, requestID, target, req.Model, req.SessionID, req.Messages, identity.AppID, resolvedTimeouts)
}
}
}
func (s *Server) handleStreaming(w http.ResponseWriter, r *http.Request, adapterInst adapter.ModelAdapter, req *adapter.ChatRequest, tk *task.Task, requestID string, _ *router.ModelTarget, logicalModel string) {
func (s *Server) handleStreaming(w http.ResponseWriter, r *http.Request, adapterInst adapter.ModelAdapter, req *adapter.ChatRequest, tk *task.Task, requestID string, target *router.ModelTarget, logicalModel string, sessionID string, originalMessages []api.Message, appID string, tc *connector.TimeoutConfig) {
sse := handler.NewSSEWriter(w)
if sse == nil {
s.scheduler.Complete(tk.ID)
@@ -172,21 +251,120 @@ func (s *Server) handleStreaming(w http.ResponseWriter, r *http.Request, adapter
tk.Transition(task.StateStreaming)
inferenceStart := time.Now()
ch, err := adapterInst.ChatCompletionStream(r.Context(), req)
// 流式超时控制:使用 per-request 解析后的 inference timeout
streamCtx, streamCancel := context.WithTimeout(r.Context(), time.Duration(tc.InferenceMs)*time.Millisecond)
defer streamCancel()
ch, err := adapterInst.ChatCompletionStream(streamCtx, req)
if err != nil {
s.scheduler.Complete(tk.ID)
tk.Transition(task.StateFailed)
s.metrics.IncTask("failed")
// 发送 SSE 错误事件
sse.WriteChunk(map[string]any{
"id": requestID,
"object": "chat.completion.chunk",
"model": logicalModel,
"choices": []map[string]any{
{
"index": 0,
"delta": map[string]any{},
"finish_reason": "error",
},
},
"error": map[string]string{
"code": handler.ErrModelUnavailable,
"message": err.Error(),
},
})
sse.WriteDone()
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrModelUnavailable, err.Error(), requestID))
return
}
inputTokens, outputTokens, err := handler.StreamChatCompletion(sse, ch, requestID, tk.ID, logicalModel)
inputTokens, outputTokens, fullContent, err := handler.StreamChatCompletion(sse, ch, requestID, tk.ID, logicalModel, func() {
tk.FirstTokenMs = int(time.Since(inferenceStart) / time.Millisecond)
s.metrics.ObserveFirstTokenLatency(int64(tk.FirstTokenMs))
})
if err != nil {
s.logger.Error("streaming error", observability.F().Event("stream_error").TaskID(tk.ID).Reason(err.Error()))
tk.Transition(task.StateFailed)
s.metrics.IncTask("failed")
s.breaker.RecordError()
// 检查是否客户端断开
if r.Context().Err() != nil {
s.logger.Info("client disconnected during streaming",
observability.F().Event("client_disconnect").TaskID(tk.ID))
tk.Cancel("client disconnected")
s.metrics.IncCancellation()
} else {
s.logger.Error("streaming error", observability.F().Event("stream_error").TaskID(tk.ID).Reason(err.Error()))
// 尝试非流式 fallback 降级
fallbackResp, fbErr := s.tryOverloadFallback(r.Context(), req, target, logicalModel)
if fbErr == nil && fallbackResp != nil {
tk.Degraded = true
tk.InferenceMs = int(time.Since(inferenceStart) / time.Millisecond)
tk.TotalMs = int(time.Since(tk.CreatedAt) / time.Millisecond)
s.metrics.ObserveGatewayLatency(int64(tk.TotalMs))
tk.Transition(task.StateCompleted)
s.metrics.IncTask("completed")
s.metrics.IncRequest("stream_fallback")
s.metrics.IncDegraded()
s.metrics.AddTokens(fallbackResp.InputTokens, fallbackResp.OutputTokens)
s.breaker.RecordSuccess()
s.scheduler.Complete(tk.ID)
s.metrics.SetRunningTasks(s.scheduler.RunningCount())
s.metrics.SetQueueLength(s.scheduler.QueueLength())
s.usageTracker.Record(appID, fallbackResp.InputTokens, fallbackResp.OutputTokens, false)
// 将降级结果作为单个 SSE chunk 发送
sse.WriteChunk(map[string]any{
"id": requestID,
"object": "chat.completion.chunk",
"model": logicalModel,
"choices": []map[string]any{
{
"index": 0,
"delta": map[string]any{
"content": fallbackResp.Content,
},
"finish_reason": fallbackResp.FinishReason,
},
},
"usage": map[string]int{
"input_tokens": fallbackResp.InputTokens,
"output_tokens": fallbackResp.OutputTokens,
"total_tokens": fallbackResp.InputTokens + fallbackResp.OutputTokens,
},
"degraded": true,
})
sse.WriteDone()
if sessionID != "" && fallbackResp.Content != "" {
s.saveSessionMessages(sessionID, originalMessages, fallbackResp.Content)
}
return
}
// fallback 也失败,发送 SSE 错误事件
sse.WriteChunk(map[string]any{
"id": requestID,
"object": "chat.completion.chunk",
"model": logicalModel,
"choices": []map[string]any{
{
"index": 0,
"delta": map[string]any{},
"finish_reason": "error",
},
},
"error": map[string]string{
"code": handler.ErrInferenceTimeout,
"message": err.Error(),
},
})
sse.WriteDone()
tk.Transition(task.StateFailed)
s.metrics.IncTask("failed")
s.breaker.RecordError()
}
} else {
tk.Transition(task.StateCompleted)
s.metrics.IncTask("completed")
@@ -196,15 +374,30 @@ func (s *Server) handleStreaming(w http.ResponseWriter, r *http.Request, adapter
tk.InferenceMs = int(time.Since(inferenceStart) / time.Millisecond)
tk.TotalMs = int(time.Since(tk.CreatedAt) / time.Millisecond)
// 记录延迟指标
s.metrics.ObserveGatewayLatency(int64(tk.TotalMs))
s.metrics.AddTokens(inputTokens, outputTokens)
s.scheduler.Complete(tk.ID)
s.metrics.SetRunningTasks(s.scheduler.RunningCount())
s.metrics.SetQueueLength(s.scheduler.QueueLength())
s.metrics.IncRequest("stream_ok")
if err != nil {
s.metrics.IncRequest("stream_error")
} else {
s.metrics.IncRequest("stream_ok")
}
// 记录 per-app 用量
s.usageTracker.Record(appID, inputTokens, outputTokens, err != nil)
// 保存对话到 session
if sessionID != "" && fullContent != "" {
s.saveSessionMessages(sessionID, originalMessages, fullContent)
}
}
func (s *Server) handleNonStreaming(w http.ResponseWriter, r *http.Request, adapterInst adapter.ModelAdapter, req *adapter.ChatRequest, tk *task.Task, requestID string, target *router.ModelTarget, logicalModel string) {
ctx, cancel := context.WithTimeout(r.Context(), time.Duration(s.cfg.Timeouts.DefaultInferenceMs)*time.Millisecond)
func (s *Server) handleNonStreaming(w http.ResponseWriter, r *http.Request, adapterInst adapter.ModelAdapter, req *adapter.ChatRequest, tk *task.Task, requestID string, target *router.ModelTarget, logicalModel string, sessionID string, originalMessages []api.Message, appID string, tc *connector.TimeoutConfig) {
ctx, cancel := context.WithTimeout(r.Context(), time.Duration(tc.InferenceMs)*time.Millisecond)
defer cancel()
inferenceStart := time.Now()
@@ -228,9 +421,16 @@ func (s *Server) handleNonStreaming(w http.ResponseWriter, r *http.Request, adap
s.metrics.SetRunningTasks(s.scheduler.RunningCount())
s.metrics.SetQueueLength(s.scheduler.QueueLength())
// 记录 per-app 用量(降级请求)
s.usageTracker.Record(appID, fallbackResp.InputTokens, fallbackResp.OutputTokens, false)
chatResp := handler.BuildChatResponse(requestID, tk.ID, logicalModel, fallbackResp)
chatResp.Degraded = true
chatResp.Timing = s.buildTiming(tk)
// 通过 HTTP 头暴露关键 timing 指标
w.Header().Set("X-Timing-Queue-Ms", strconv.Itoa(tk.QueueMs))
w.Header().Set("X-Timing-Inference-Ms", strconv.Itoa(tk.InferenceMs))
w.Header().Set("X-Timing-Total-Ms", strconv.Itoa(tk.TotalMs))
handler.WriteJSON(w, http.StatusOK, chatResp)
return
}
@@ -253,6 +453,9 @@ func (s *Server) handleNonStreaming(w http.ResponseWriter, r *http.Request, adap
tk.InferenceMs = int(time.Since(inferenceStart) / time.Millisecond)
tk.TotalMs = int(time.Since(tk.CreatedAt) / time.Millisecond)
// 记录延迟指标
s.metrics.ObserveGatewayLatency(int64(tk.TotalMs))
tk.Transition(task.StateCompleted)
s.metrics.IncTask("completed")
s.metrics.IncRequest("ok")
@@ -262,9 +465,21 @@ func (s *Server) handleNonStreaming(w http.ResponseWriter, r *http.Request, adap
s.metrics.SetRunningTasks(s.scheduler.RunningCount())
s.metrics.SetQueueLength(s.scheduler.QueueLength())
// 记录 per-app 用量
s.usageTracker.Record(appID, resp.InputTokens, resp.OutputTokens, false)
chatResp := handler.BuildChatResponse(requestID, tk.ID, logicalModel, resp)
chatResp.Timing = s.buildTiming(tk)
// 通过 HTTP 头暴露关键 timing 指标,便于客户端和监控系统采集
w.Header().Set("X-Timing-Queue-Ms", strconv.Itoa(tk.QueueMs))
w.Header().Set("X-Timing-Inference-Ms", strconv.Itoa(tk.InferenceMs))
w.Header().Set("X-Timing-Total-Ms", strconv.Itoa(tk.TotalMs))
handler.WriteJSON(w, http.StatusOK, chatResp)
// 保存对话到 session
if sessionID != "" {
s.saveSessionMessages(sessionID, originalMessages, resp.Content)
}
}
// tryOverloadFallback attempts fallback strategies when the primary model fails.
@@ -314,10 +529,18 @@ func (s *Server) handleModels(w http.ResponseWriter, r *http.Request) {
models := s.modelMap.List()
data := make([]api.ModelInfo, len(models))
for i, m := range models {
target, err := s.modelMap.Resolve(m)
if err != nil {
data[i] = api.ModelInfo{ID: m, Object: "model", OwnedBy: "edgeai-gateway"}
continue
}
data[i] = api.ModelInfo{
ID: m,
Object: "model",
OwnedBy: "edgeai-gateway",
ID: m,
Object: "model",
OwnedBy: "edgeai-gateway",
Provider: target.Provider,
ContextWindow: target.ContextWindow,
MaxOutputTokens: target.MaxOutputTokens,
}
}
@@ -366,8 +589,46 @@ func (s *Server) handleSessions(w http.ResponseWriter, r *http.Request) {
handler.WriteJSON(w, http.StatusCreated, resp)
case http.MethodGet:
// List sessions (simplified: return empty for now)
handler.WriteJSON(w, http.StatusOK, map[string]any{"sessions": []any{}})
// 列出当前 app 的会话(支持分页)
appID := ""
if identity != nil {
appID = identity.AppID
}
page := 1
pageSize := 20
if v := r.URL.Query().Get("page"); v != "" {
if n, err := strconv.Atoi(v); err == nil && n > 0 {
page = n
}
}
if v := r.URL.Query().Get("page_size"); v != "" {
if n, err := strconv.Atoi(v); err == nil && n > 0 && n <= 100 {
pageSize = n
}
}
offset := (page - 1) * pageSize
sessions, err := s.sessions.ListByApp(appID, pageSize, offset)
if err != nil {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrInternalError, err.Error(), requestID))
return
}
// 脱敏:不返回 messages 全文,只返回元信息
items := make([]map[string]any, 0, len(sessions))
for _, sess := range sessions {
items = append(items, map[string]any{
"session_id": sess.ID,
"application_id": sess.ApplicationID,
"user_id": sess.UserID,
"message_count": len(sess.Messages),
"created_at": sess.CreatedAt.Format(time.RFC3339),
"last_active": sess.LastActive.Format(time.RFC3339),
})
}
handler.WriteJSON(w, http.StatusOK, map[string]any{
"sessions": items,
"page": page,
"page_size": pageSize,
})
default:
handler.WriteError(w, handler.NewGatewayError(handler.ErrInvalidRequest, "method not allowed"))
@@ -376,11 +637,19 @@ func (s *Server) handleSessions(w http.ResponseWriter, r *http.Request) {
func (s *Server) handleSessionByID(w http.ResponseWriter, r *http.Request) {
requestID := middleware.GetRequestID(r.Context())
identity := auth.GetAppIdentityFromRequest(r)
sessionID := strings.TrimPrefix(r.URL.Path, "/v1/sessions/")
switch r.Method {
case http.MethodGet:
sess, err := s.sessions.Get(sessionID)
// 会话访问隔离:校验 session 属于当前 app
var sess *session.Session
var err error
if identity != nil {
sess, err = s.sessions.GetForApp(sessionID, identity.AppID)
} else {
sess, err = s.sessions.Get(sessionID)
}
if err != nil || sess == nil {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrInvalidRequest, "session not found", requestID))
return
@@ -388,9 +657,17 @@ func (s *Server) handleSessionByID(w http.ResponseWriter, r *http.Request) {
handler.WriteJSON(w, http.StatusOK, sess)
case http.MethodDelete:
if err := s.sessions.Delete(sessionID); err != nil {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrInternalError, err.Error(), requestID))
return
// 会话访问隔离:校验 session 属于当前 app
if identity != nil {
if err := s.sessions.DeleteForApp(sessionID, identity.AppID); err != nil {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrInvalidRequest, err.Error(), requestID))
return
}
} else {
if err := s.sessions.Delete(sessionID); err != nil {
handler.WriteError(w, handler.NewGatewayErrorWithID(handler.ErrInternalError, err.Error(), requestID))
return
}
}
handler.WriteJSON(w, http.StatusOK, map[string]string{"status": "deleted"})
@@ -407,6 +684,28 @@ func (s *Server) loadSessionHistory(sess *session.Session) []api.Message {
return sess.Messages
}
// saveSessionMessages 将用户消息和助手回复保存到会话历史。
// 当配置了 MaxSessionMessages 时,自动裁剪最旧消息以防止无限增长。
func (s *Server) saveSessionMessages(sessionID string, userMessages []api.Message, assistantContent string) {
if sessionID == "" {
return
}
maxMsgs := s.cfg.Context.MaxSessionMessages
for _, msg := range userMessages {
if err := s.sessions.AddMessageWithLimit(sessionID, msg, maxMsgs); err != nil {
s.logger.Error("failed to save user message to session",
observability.F().Event("session_save_error").Reason(err.Error()))
}
}
if assistantContent != "" {
assistantMsg := api.Message{Role: "assistant", Content: assistantContent}
if err := s.sessions.AddMessageWithLimit(sessionID, assistantMsg, maxMsgs); err != nil {
s.logger.Error("failed to save assistant message to session",
observability.F().Event("session_save_error").Reason(err.Error()))
}
}
}
// buildTiming constructs Timing metadata from a task.
func (s *Server) buildTiming(tk *task.Task) *api.Timing {
return &api.Timing{
@@ -422,7 +721,59 @@ func (s *Server) handleTasks(w http.ResponseWriter, r *http.Request) {
handler.WriteError(w, handler.NewGatewayError(handler.ErrInvalidRequest, "method not allowed"))
return
}
handler.WriteJSON(w, http.StatusOK, map[string]any{"tasks": []any{}})
// 分页参数
page := 1
pageSize := 20
if v := r.URL.Query().Get("page"); v != "" {
if n, err := strconv.Atoi(v); err == nil && n > 0 {
page = n
}
}
if v := r.URL.Query().Get("page_size"); v != "" {
if n, err := strconv.Atoi(v); err == nil && n > 0 && n <= 100 {
pageSize = n
}
}
offset := (page - 1) * pageSize
// 状态过滤
status := r.URL.Query().Get("status")
tasks, total := s.scheduler.ListTasks(status, pageSize, offset)
items := make([]map[string]any, 0, len(tasks))
for _, tk := range tasks {
item := map[string]any{
"task_id": tk.ID,
"request_id": tk.RequestID,
"session_id": tk.SessionID,
"state": string(tk.GetState()),
"priority": int(tk.Priority),
"logical_model": tk.LogicalModel,
"stream": tk.Stream,
"created_at": tk.CreatedAt.Format(time.RFC3339),
"degraded": tk.Degraded,
}
if tk.StartedAt != nil {
item["started_at"] = tk.StartedAt.Format(time.RFC3339)
}
if tk.CompletedAt != nil {
item["completed_at"] = tk.CompletedAt.Format(time.RFC3339)
}
if tk.ErrorMessage != "" {
item["error_message"] = tk.ErrorMessage
}
item["timing"] = s.buildTiming(tk)
items = append(items, item)
}
handler.WriteJSON(w, http.StatusOK, map[string]any{
"tasks": items,
"total": total,
"page": page,
"page_size": pageSize,
})
}
func (s *Server) handleTaskByID(w http.ResponseWriter, r *http.Request) {