feat(delivery): stream task updates with SSE
This commit is contained in:
@@ -72,6 +72,11 @@ export interface TaskEvent {
|
|||||||
created_at: string
|
created_at: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface DeliveryTaskSnapshot {
|
||||||
|
task: DeliveryTask
|
||||||
|
events: TaskEvent[]
|
||||||
|
}
|
||||||
|
|
||||||
export const deliveryApi = {
|
export const deliveryApi = {
|
||||||
async listTargets(): Promise<DeliveryTarget[]> {
|
async listTargets(): Promise<DeliveryTarget[]> {
|
||||||
const data = await authRequest('/auth/api/v1/delivery/targets?component=mysql')
|
const data = await authRequest('/auth/api/v1/delivery/targets?component=mysql')
|
||||||
@@ -112,6 +117,14 @@ export const deliveryApi = {
|
|||||||
method: 'POST',
|
method: 'POST',
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
|
streamTask(taskId: string): EventSource {
|
||||||
|
const token = getToken()
|
||||||
|
const search = new URLSearchParams()
|
||||||
|
if (token) search.set('access_token', token)
|
||||||
|
const query = search.toString()
|
||||||
|
return new EventSource(`/auth/api/v1/delivery/tasks/${encodeURIComponent(taskId)}/stream${query ? `?${query}` : ''}`)
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
function createIdempotencyKey(payload: CreateMySQLDeliveryPayload) {
|
function createIdempotencyKey(payload: CreateMySQLDeliveryPayload) {
|
||||||
|
|||||||
@@ -332,7 +332,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { Back, CircleCheck, Promotion, Refresh } from '@element-plus/icons-vue'
|
import { Back, CircleCheck, Promotion, Refresh } from '@element-plus/icons-vue'
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
@@ -553,6 +553,7 @@ const taskRefreshing = ref(false)
|
|||||||
const taskRestoring = ref(false)
|
const taskRestoring = ref(false)
|
||||||
const seenEventIds = ref(new Set<number>())
|
const seenEventIds = ref(new Set<number>())
|
||||||
const deliveryLog = ref('[ready] 等待创建交付任务...')
|
const deliveryLog = ref('[ready] 等待创建交付任务...')
|
||||||
|
let taskEventSource: EventSource | undefined
|
||||||
|
|
||||||
const deliveryForm = reactive({
|
const deliveryForm = reactive({
|
||||||
instanceName: `mysql-${currentName.value}-billing-02`,
|
instanceName: `mysql-${currentName.value}-billing-02`,
|
||||||
@@ -674,6 +675,10 @@ onMounted(async () => {
|
|||||||
await restoreActiveTask()
|
await restoreActiveTask()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
stopTaskStream()
|
||||||
|
})
|
||||||
|
|
||||||
function handleCardClick(service: Service) {
|
function handleCardClick(service: Service) {
|
||||||
if (service.disabled) {
|
if (service.disabled) {
|
||||||
if (service.key !== 'new') ElMessage.warning(`${service.name} 功能规划中,敬请期待`)
|
if (service.key !== 'new') ElMessage.warning(`${service.name} 功能规划中,敬请期待`)
|
||||||
@@ -730,6 +735,7 @@ function startNewTask() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function resetExecutionState() {
|
function resetExecutionState() {
|
||||||
|
stopTaskStream()
|
||||||
precheckPassed.value = false
|
precheckPassed.value = false
|
||||||
running.value = false
|
running.value = false
|
||||||
deliveryDone.value = false
|
deliveryDone.value = false
|
||||||
@@ -816,6 +822,7 @@ async function createTask() {
|
|||||||
deliveryLog.value += `\n[task] ${task.id} created by ${currentName.value}`
|
deliveryLog.value += `\n[task] ${task.id} created by ${currentName.value}`
|
||||||
applyDeliveryStatus(task.status, '')
|
applyDeliveryStatus(task.status, '')
|
||||||
await refreshTaskSnapshot()
|
await refreshTaskSnapshot()
|
||||||
|
startTaskStream(task.id)
|
||||||
ElMessage.success('交付任务已创建')
|
ElMessage.success('交付任务已创建')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
running.value = false
|
running.value = false
|
||||||
@@ -909,6 +916,8 @@ async function restoreActiveTask() {
|
|||||||
applyDeliveryStatus(detail.task.status, detail.task.error_message || '')
|
applyDeliveryStatus(detail.task.status, detail.task.error_message || '')
|
||||||
if (isTerminalDeliveryStatus(detail.task.status)) {
|
if (isTerminalDeliveryStatus(detail.task.status)) {
|
||||||
activeView.value = 'result'
|
activeView.value = 'result'
|
||||||
|
} else {
|
||||||
|
startTaskStream(detail.task.id)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
ElMessage.error(error instanceof Error ? error.message : '恢复交付任务失败')
|
ElMessage.error(error instanceof Error ? error.message : '恢复交付任务失败')
|
||||||
@@ -933,6 +942,35 @@ function hydrateTaskSnapshot(task: DeliveryTask) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function startTaskStream(taskId: string) {
|
||||||
|
stopTaskStream()
|
||||||
|
taskEventSource = deliveryApi.streamTask(taskId)
|
||||||
|
taskEventSource.addEventListener('snapshot', (event) => {
|
||||||
|
try {
|
||||||
|
const data = JSON.parse((event as MessageEvent).data) as { task?: DeliveryTask; events?: TaskEvent[] }
|
||||||
|
if (!data.task) return
|
||||||
|
hydrateTaskSnapshot(data.task)
|
||||||
|
applyTaskEvents(Array.isArray(data.events) ? data.events : [])
|
||||||
|
applyDeliveryStatus(data.task.status, data.task.error_message || '')
|
||||||
|
if (isTerminalDeliveryStatus(data.task.status)) {
|
||||||
|
activeView.value = 'result'
|
||||||
|
stopTaskStream()
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
appendLog(`[stream] ${error instanceof Error ? error.message : '解析任务状态失败'}`)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
taskEventSource.onerror = () => {
|
||||||
|
if (running.value) appendLog('[stream] 实时连接中断,正在等待浏览器自动重连')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function stopTaskStream() {
|
||||||
|
if (!taskEventSource) return
|
||||||
|
taskEventSource.close()
|
||||||
|
taskEventSource = undefined
|
||||||
|
}
|
||||||
|
|
||||||
async function cancelDeployment() {
|
async function cancelDeployment() {
|
||||||
if (!deploymentId.value) return
|
if (!deploymentId.value) return
|
||||||
canceling.value = true
|
canceling.value = true
|
||||||
|
|||||||
@@ -2,7 +2,9 @@ package handler
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/subtle"
|
"crypto/subtle"
|
||||||
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -167,6 +169,55 @@ func (h *DeliveryHandler) Get(c *gin.Context) {
|
|||||||
c.JSON(http.StatusOK, gin.H{"task": task, "events": events})
|
c.JSON(http.StatusOK, gin.H{"task": task, "events": events})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *DeliveryHandler) Stream(c *gin.Context) {
|
||||||
|
claims, ok := CurrentClaims(c)
|
||||||
|
if !ok {
|
||||||
|
c.JSON(http.StatusUnauthorized, gin.H{"error": "missing current user"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
taskID := c.Param("id")
|
||||||
|
task, events, err := h.service.GetTask(c.Request.Context(), taskID, claims.UserID, claims.IsAdmin)
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
c.JSON(http.StatusNotFound, gin.H{"error": "task not found"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
updates, cancel := h.service.SubscribeTask(taskID)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
c.Header("Content-Type", "text/event-stream")
|
||||||
|
c.Header("Cache-Control", "no-cache")
|
||||||
|
c.Header("Connection", "keep-alive")
|
||||||
|
c.Header("X-Accel-Buffering", "no")
|
||||||
|
c.Status(http.StatusOK)
|
||||||
|
writeSSE(c.Writer, "snapshot", service.DeliveryTaskSnapshot{Task: task, Events: events})
|
||||||
|
c.Writer.Flush()
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-c.Request.Context().Done():
|
||||||
|
return
|
||||||
|
case snapshot, ok := <-updates:
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
writeSSE(c.Writer, "snapshot", snapshot)
|
||||||
|
c.Writer.Flush()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeSSE(w http.ResponseWriter, event string, payload any) {
|
||||||
|
raw, err := json.Marshal(payload)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = fmt.Fprintf(w, "event: %s\ndata: %s\n\n", event, raw)
|
||||||
|
}
|
||||||
|
|
||||||
// Cancel 取消交付任务
|
// Cancel 取消交付任务
|
||||||
// @Summary 取消交付任务
|
// @Summary 取消交付任务
|
||||||
// @Description 取消一个正在执行或等待中的交付任务
|
// @Description 取消一个正在执行或等待中的交付任务
|
||||||
|
|||||||
@@ -149,6 +149,7 @@ func registerAuthServerRoutes(r *gin.Engine, deps Dependencies) {
|
|||||||
protected.POST("/delivery/mysql", deliveryHandler.CreateMySQL)
|
protected.POST("/delivery/mysql", deliveryHandler.CreateMySQL)
|
||||||
protected.GET("/delivery/tasks", deliveryHandler.List)
|
protected.GET("/delivery/tasks", deliveryHandler.List)
|
||||||
protected.GET("/delivery/tasks/:id", deliveryHandler.Get)
|
protected.GET("/delivery/tasks/:id", deliveryHandler.Get)
|
||||||
|
protected.GET("/delivery/tasks/:id/stream", deliveryHandler.Stream)
|
||||||
protected.POST("/delivery/tasks/:id/cancel", deliveryHandler.Cancel)
|
protected.POST("/delivery/tasks/:id/cancel", deliveryHandler.Cancel)
|
||||||
protected.GET("/task-logs", taskLogHandler.List)
|
protected.GET("/task-logs", taskLogHandler.List)
|
||||||
protected.GET("/task-logs/:id", taskLogHandler.Get)
|
protected.GET("/task-logs/:id", taskLogHandler.Get)
|
||||||
|
|||||||
@@ -94,6 +94,11 @@ type DeliveryTaskListFilter struct {
|
|||||||
ActiveOnly bool
|
ActiveOnly bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type DeliveryTaskSnapshot struct {
|
||||||
|
Task *model.DeliveryTask `json:"task"`
|
||||||
|
Events []model.TaskEvent `json:"events"`
|
||||||
|
}
|
||||||
|
|
||||||
// targetMetadata describes the native VM候选节点池以及部署形态,由 AWX inventory hosts 动态组装。
|
// targetMetadata describes the native VM候选节点池以及部署形态,由 AWX inventory hosts 动态组装。
|
||||||
type targetMetadata struct {
|
type targetMetadata struct {
|
||||||
Topology string `json:"topology"`
|
Topology string `json:"topology"`
|
||||||
@@ -173,12 +178,14 @@ type DeliveryService struct {
|
|||||||
awx *AWXClient
|
awx *AWXClient
|
||||||
audit *AuditService
|
audit *AuditService
|
||||||
executionMu sync.Mutex
|
executionMu sync.Mutex
|
||||||
|
streamMu sync.Mutex
|
||||||
|
streams map[string]map[chan DeliveryTaskSnapshot]struct{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DeliveryService) DB() *gorm.DB { return s.db }
|
func (s *DeliveryService) DB() *gorm.DB { return s.db }
|
||||||
|
|
||||||
func NewDeliveryService(cfg config.Config, db *gorm.DB, audit *AuditService) *DeliveryService {
|
func NewDeliveryService(cfg config.Config, db *gorm.DB, audit *AuditService) *DeliveryService {
|
||||||
return &DeliveryService{db: db, cfg: cfg, awx: NewAWXClient(cfg.AWXBaseURL, cfg.AWXToken, cfg.AWXUsername, cfg.AWXPassword), audit: audit}
|
return &DeliveryService{db: db, cfg: cfg, awx: NewAWXClient(cfg.AWXBaseURL, cfg.AWXToken, cfg.AWXUsername, cfg.AWXPassword), audit: audit, streams: make(map[string]map[chan DeliveryTaskSnapshot]struct{})}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DeliveryService) ListTargets(ctx context.Context, component string) ([]DeliveryTarget, error) {
|
func (s *DeliveryService) ListTargets(ctx context.Context, component string) ([]DeliveryTarget, error) {
|
||||||
@@ -312,6 +319,7 @@ func (s *DeliveryService) CreateTask(ctx context.Context, userID uint64, isAdmin
|
|||||||
return nil, false, err
|
return nil, false, err
|
||||||
}
|
}
|
||||||
_ = s.db.WithContext(ctx).Create(&model.TaskEvent{TaskID: task.ID, ToState: model.TaskPending, Message: "delivery task created"}).Error
|
_ = s.db.WithContext(ctx).Create(&model.TaskEvent{TaskID: task.ID, ToState: model.TaskPending, Message: "delivery task created"}).Error
|
||||||
|
s.broadcastTask(ctx, task.ID)
|
||||||
return &task, false, nil
|
return &task, false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -554,6 +562,51 @@ func (s *DeliveryService) GetTask(ctx context.Context, taskID string, userID uin
|
|||||||
return &task, events, nil
|
return &task, events, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *DeliveryService) SubscribeTask(taskID string) (<-chan DeliveryTaskSnapshot, func()) {
|
||||||
|
ch := make(chan DeliveryTaskSnapshot, 8)
|
||||||
|
s.streamMu.Lock()
|
||||||
|
if s.streams[taskID] == nil {
|
||||||
|
s.streams[taskID] = make(map[chan DeliveryTaskSnapshot]struct{})
|
||||||
|
}
|
||||||
|
s.streams[taskID][ch] = struct{}{}
|
||||||
|
s.streamMu.Unlock()
|
||||||
|
cancel := func() {
|
||||||
|
s.streamMu.Lock()
|
||||||
|
if subscribers := s.streams[taskID]; subscribers != nil {
|
||||||
|
delete(subscribers, ch)
|
||||||
|
if len(subscribers) == 0 {
|
||||||
|
delete(s.streams, taskID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s.streamMu.Unlock()
|
||||||
|
close(ch)
|
||||||
|
}
|
||||||
|
return ch, cancel
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *DeliveryService) taskSnapshot(ctx context.Context, taskID string) (DeliveryTaskSnapshot, error) {
|
||||||
|
task, events, err := s.GetTask(ctx, taskID, 0, true)
|
||||||
|
if err != nil {
|
||||||
|
return DeliveryTaskSnapshot{}, err
|
||||||
|
}
|
||||||
|
return DeliveryTaskSnapshot{Task: task, Events: events}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *DeliveryService) broadcastTask(ctx context.Context, taskID string) {
|
||||||
|
snapshot, err := s.taskSnapshot(ctx, taskID)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.streamMu.Lock()
|
||||||
|
defer s.streamMu.Unlock()
|
||||||
|
for ch := range s.streams[taskID] {
|
||||||
|
select {
|
||||||
|
case ch <- snapshot:
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (s *DeliveryService) AWXJobStdout(ctx context.Context, jobID string) (string, error) {
|
func (s *DeliveryService) AWXJobStdout(ctx context.Context, jobID string) (string, error) {
|
||||||
return s.awx.JobStdout(ctx, jobID)
|
return s.awx.JobStdout(ctx, jobID)
|
||||||
}
|
}
|
||||||
@@ -781,8 +834,11 @@ func (s *DeliveryService) DispatchOnce(ctx context.Context) error {
|
|||||||
}
|
}
|
||||||
_, _, err = s.CreateExecution(ctx, task.ID, task.PayloadHash, task.IdempotencyKey)
|
_, _, err = s.CreateExecution(ctx, task.ID, task.PayloadHash, task.IdempotencyKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return s.failTask(ctx, task, model.TaskExecutionFailed, err.Error())
|
failErr := s.failTask(ctx, task, model.TaskExecutionFailed, err.Error())
|
||||||
|
s.broadcastTask(ctx, task.ID)
|
||||||
|
return failErr
|
||||||
}
|
}
|
||||||
|
s.broadcastTask(ctx, task.ID)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -883,7 +939,7 @@ func (s *DeliveryService) HandleStageEvent(ctx context.Context, taskID string, i
|
|||||||
}
|
}
|
||||||
eventState := "stage_" + stage + "_" + status
|
eventState := "stage_" + stage + "_" + status
|
||||||
|
|
||||||
return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||||
var task model.DeliveryTask
|
var task model.DeliveryTask
|
||||||
if err := tx.First(&task, "id = ?", taskID).Error; err != nil {
|
if err := tx.First(&task, "id = ?", taskID).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -922,6 +978,10 @@ func (s *DeliveryService) HandleStageEvent(ctx context.Context, taskID string, i
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
if err == nil {
|
||||||
|
s.broadcastTask(ctx, taskID)
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DeliveryService) HandleAWXJobNotification(ctx context.Context, input AWXJobNotificationInput) error {
|
func (s *DeliveryService) HandleAWXJobNotification(ctx context.Context, input AWXJobNotificationInput) error {
|
||||||
@@ -937,6 +997,7 @@ func (s *DeliveryService) HandleAWXJobNotification(ctx context.Context, input AW
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
message := awxNotificationMessage(input)
|
message := awxNotificationMessage(input)
|
||||||
|
defer s.broadcastTask(ctx, execution.TaskID)
|
||||||
switch status {
|
switch status {
|
||||||
case "pending", "waiting", "running", "new":
|
case "pending", "waiting", "running", "new":
|
||||||
return s.recordAWXEvent(ctx, execution.TaskID, status, message)
|
return s.recordAWXEvent(ctx, execution.TaskID, status, message)
|
||||||
|
|||||||
Reference in New Issue
Block a user