Review 問題修復: M1(寫已關閉 channel panic): - flash service goroutine 改成先等 driver.Flash() 返回,再寫 error 訊息,最後 close - driver.Flash 返回後保證不再寫 progressCh,消除 race condition M2(FlashTask 永不清除 memory leak): - service.go 新增 CleanupTask(taskID) 公開方法 - device_handler.go 的 goroutine 在 `for range progressCh` 結束後呼叫 CleanupTask M3(同裝置重複 flash taskID 衝突): - ProgressTracker.Create 改成:舊 task 未完成時返回 nil - StartFlash 檢查 nil → 回傳 "flash already in progress" 錯誤 M4(前端 flash store 全域不區分 deviceId): - flash-store.ts 新增 activeDeviceId 欄位 - updateProgress 改接 (deviceId, progress),比對 activeDeviceId 防止混裝 - use-flash-progress.ts 的 WebSocket callback 傳入 deviceId m5(flash_ws.go 雙重 conn.Close): - read pump goroutine 移除 defer conn.Close(),由外層 defer 統一關閉 額外修復(S4): - modelPath 為空時直接回 error 而非傳無效路徑給 driver Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
183 lines
4.1 KiB
Go
183 lines
4.1 KiB
Go
package handlers
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"visiona-local/server/internal/api/ws"
|
|
"visiona-local/server/internal/device"
|
|
"visiona-local/server/internal/driver"
|
|
"visiona-local/server/internal/flash"
|
|
"visiona-local/server/internal/inference"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
type DeviceHandler struct {
|
|
deviceMgr *device.Manager
|
|
flashSvc *flash.Service
|
|
inferenceSvc *inference.Service
|
|
wsHub *ws.Hub
|
|
}
|
|
|
|
func NewDeviceHandler(
|
|
deviceMgr *device.Manager,
|
|
flashSvc *flash.Service,
|
|
inferenceSvc *inference.Service,
|
|
wsHub *ws.Hub,
|
|
) *DeviceHandler {
|
|
return &DeviceHandler{
|
|
deviceMgr: deviceMgr,
|
|
flashSvc: flashSvc,
|
|
inferenceSvc: inferenceSvc,
|
|
wsHub: wsHub,
|
|
}
|
|
}
|
|
|
|
func (h *DeviceHandler) ScanDevices(c *gin.Context) {
|
|
devices := h.deviceMgr.Rescan()
|
|
c.JSON(200, gin.H{
|
|
"success": true,
|
|
"data": gin.H{
|
|
"devices": devices,
|
|
},
|
|
})
|
|
}
|
|
|
|
func (h *DeviceHandler) ListDevices(c *gin.Context) {
|
|
devices := h.deviceMgr.ListDevices()
|
|
c.JSON(200, gin.H{
|
|
"success": true,
|
|
"data": gin.H{
|
|
"devices": devices,
|
|
},
|
|
})
|
|
}
|
|
|
|
func (h *DeviceHandler) GetDevice(c *gin.Context) {
|
|
id := c.Param("id")
|
|
session, err := h.deviceMgr.GetDevice(id)
|
|
if err != nil {
|
|
c.JSON(404, gin.H{
|
|
"success": false,
|
|
"error": gin.H{"code": "DEVICE_NOT_FOUND", "message": err.Error()},
|
|
})
|
|
return
|
|
}
|
|
c.JSON(200, gin.H{"success": true, "data": session.Driver.Info()})
|
|
}
|
|
|
|
func (h *DeviceHandler) ConnectDevice(c *gin.Context) {
|
|
id := c.Param("id")
|
|
|
|
// KL520 USB Boot flow can take ~40s: retry connect (3x2s) + firmware
|
|
// load + 5s reboot wait + reconnect retry (3x3s). Use 60s timeout.
|
|
ctx, cancel := context.WithTimeout(c.Request.Context(), 60*time.Second)
|
|
defer cancel()
|
|
|
|
errCh := make(chan error, 1)
|
|
go func() {
|
|
errCh <- h.deviceMgr.Connect(id)
|
|
}()
|
|
|
|
select {
|
|
case err := <-errCh:
|
|
if err != nil {
|
|
c.JSON(400, gin.H{
|
|
"success": false,
|
|
"error": gin.H{"code": "CONNECT_FAILED", "message": err.Error()},
|
|
})
|
|
return
|
|
}
|
|
c.JSON(200, gin.H{"success": true})
|
|
case <-ctx.Done():
|
|
c.JSON(504, gin.H{
|
|
"success": false,
|
|
"error": gin.H{"code": "CONNECT_TIMEOUT", "message": fmt.Sprintf("device connect timed out after 60s for %s", id)},
|
|
})
|
|
}
|
|
}
|
|
|
|
func (h *DeviceHandler) DisconnectDevice(c *gin.Context) {
|
|
id := c.Param("id")
|
|
if err := h.deviceMgr.Disconnect(id); err != nil {
|
|
c.JSON(400, gin.H{
|
|
"success": false,
|
|
"error": gin.H{"code": "DISCONNECT_FAILED", "message": err.Error()},
|
|
})
|
|
return
|
|
}
|
|
c.JSON(200, gin.H{"success": true})
|
|
}
|
|
|
|
func (h *DeviceHandler) FlashDevice(c *gin.Context) {
|
|
id := c.Param("id")
|
|
var req struct {
|
|
ModelID string `json:"modelId"`
|
|
}
|
|
if err := c.ShouldBindJSON(&req); err != nil {
|
|
c.JSON(400, gin.H{
|
|
"success": false,
|
|
"error": gin.H{"code": "BAD_REQUEST", "message": "modelId is required"},
|
|
})
|
|
return
|
|
}
|
|
|
|
taskID, progressCh, err := h.flashSvc.StartFlash(id, req.ModelID)
|
|
if err != nil {
|
|
c.JSON(400, gin.H{
|
|
"success": false,
|
|
"error": gin.H{"code": "FLASH_FAILED", "message": err.Error()},
|
|
})
|
|
return
|
|
}
|
|
|
|
// Forward progress to WebSocket, then cleanup task (M2 fix)
|
|
go func() {
|
|
room := "flash:" + id
|
|
for progress := range progressCh {
|
|
h.wsHub.BroadcastToRoom(room, progress)
|
|
}
|
|
h.flashSvc.CleanupTask(taskID)
|
|
}()
|
|
|
|
c.JSON(200, gin.H{"success": true, "data": gin.H{"taskId": taskID}})
|
|
}
|
|
|
|
func (h *DeviceHandler) StartInference(c *gin.Context) {
|
|
id := c.Param("id")
|
|
resultCh := make(chan *driver.InferenceResult, 10)
|
|
|
|
if err := h.inferenceSvc.Start(id, resultCh); err != nil {
|
|
c.JSON(400, gin.H{
|
|
"success": false,
|
|
"error": gin.H{"code": "INFERENCE_ERROR", "message": err.Error()},
|
|
})
|
|
return
|
|
}
|
|
|
|
// Forward results to WebSocket, enriching with device ID
|
|
go func() {
|
|
room := "inference:" + id
|
|
for result := range resultCh {
|
|
result.DeviceID = id
|
|
h.wsHub.BroadcastToRoom(room, result)
|
|
}
|
|
}()
|
|
|
|
c.JSON(200, gin.H{"success": true})
|
|
}
|
|
|
|
func (h *DeviceHandler) StopInference(c *gin.Context) {
|
|
id := c.Param("id")
|
|
if err := h.inferenceSvc.Stop(id); err != nil {
|
|
c.JSON(400, gin.H{
|
|
"success": false,
|
|
"error": gin.H{"code": "INFERENCE_ERROR", "message": err.Error()},
|
|
})
|
|
return
|
|
}
|
|
c.JSON(200, gin.H{"success": true})
|
|
}
|