jim800121chen
3c6971febd
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>
39 lines
813 B
Go
39 lines
813 B
Go
package ws
|
|
|
|
import (
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/gorilla/websocket"
|
|
)
|
|
|
|
func FlashProgressHandler(hub *Hub) gin.HandlerFunc {
|
|
return func(c *gin.Context) {
|
|
deviceID := c.Param("id")
|
|
conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
|
|
if err != nil {
|
|
return
|
|
}
|
|
defer conn.Close()
|
|
|
|
client := &Client{Conn: conn, Send: make(chan []byte, 20)}
|
|
room := "flash:" + deviceID
|
|
sub := &Subscription{Client: client, Room: room}
|
|
hub.RegisterSync(sub)
|
|
defer hub.Unregister(sub)
|
|
|
|
// Read pump — drain incoming messages; close handled by outer defer
|
|
go func() {
|
|
for {
|
|
if _, _, err := conn.ReadMessage(); err != nil {
|
|
break
|
|
}
|
|
}
|
|
}()
|
|
|
|
for msg := range client.Send {
|
|
if err := conn.WriteMessage(websocket.TextMessage, msg); err != nil {
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|