fix: ui process blocked by sendText/sendFile

internal/transfer/client.go

@@ -21,7 +21,7 @@ import (
 
 func (s *Service) SendFiles(target *discovery.Peer, targetIP string, filePaths []string) {
 	for _, filePath := range filePaths {
-		go s.SendFile(target, targetIP, filePath)
+		s.SendFile(target, targetIP, filePath)
 	}
 }
 
@@ -30,13 +30,6 @@ func (s *Service) SendFile(target *discovery.Peer, targetIP string, filePath str
 	ctx, cancel := context.WithCancel(context.Background())
 	s.cancelMap.Store(taskID, cancel)
 
-	// 任务结束后清理 ctx
-	defer func() {
-		s.cancelMap.Delete(taskID)
-		cancel()
-		s.NotifyTransferListUpdate()
-	}()
-
 	file, err := os.Open(filePath)
 	if err != nil {
 		slog.Error("Failed to open file", "path", filePath, "error", err, "component", "transfer-client")
@@ -63,6 +56,14 @@ func (s *Service) SendFile(target *discovery.Peer, targetIP string, filePath str
 
 	s.StoreTransferToList(task)
 
+	go func() {
+		// 任务结束后清理 ctx
+		defer func() {
+			s.cancelMap.Delete(taskID)
+			cancel()
+			s.NotifyTransferListUpdate()
+		}()
+
 		askResp, err := s.ask(ctx, target, targetIP, task)
 		if err != nil {
 			if errors.Is(err, context.Canceled) {
@@ -81,6 +82,7 @@ func (s *Service) SendFile(target *discovery.Peer, targetIP string, filePath str
 			task.Status = TransferStatusRejected
 			return
 		}
+	}()
 }
 
 func (s *Service) SendFolder(target *discovery.Peer, targetIP string, folderPath string) {
@@ -147,13 +149,6 @@ func (s *Service) SendText(target *discovery.Peer, targetIP string, text string)
 	ctx, cancel := context.WithCancel(context.Background())
 	s.cancelMap.Store(taskID, cancel)
 
-	// 任务结束后清理 ctx
-	defer func() {
-		s.cancelMap.Delete(taskID)
-		cancel()
-		s.NotifyTransferListUpdate()
-	}()
-
 	r := bytes.NewReader([]byte(text))
 	task := NewTransfer(
 		taskID,
@@ -168,6 +163,14 @@ func (s *Service) SendText(target *discovery.Peer, targetIP string, text string)
 
 	s.StoreTransferToList(task)
 
+	go func() {
+		// 任务结束后清理 ctx
+		defer func() {
+			s.cancelMap.Delete(taskID)
+			cancel()
+			s.NotifyTransferListUpdate()
+		}()
+
 		askResp, err := s.ask(ctx, target, targetIP, task)
 		if err != nil {
 			if errors.Is(err, context.Canceled) {
@@ -186,6 +189,7 @@ func (s *Service) SendText(target *discovery.Peer, targetIP string, text string)
 			task.Status = TransferStatusRejected
 			return
 		}
+	}()
 }
 
 // ask 向接收端发送传输请求

internal/transfer/history.go

@@ -34,12 +34,10 @@ func (s *Service) LoadHistory() {
 		return
 	}
 	defer file.Close()
-	var history []Transfer
+	var history []*Transfer
 	err = json.NewDecoder(file).Decode(&history)
 	if err != nil {
 		return
 	}
-	for _, item := range history {
+	s.StoreTransfersToList(history)
-		s.StoreTransferToList(&item)
-	}
 }

internal/transfer/service.go

@@ -96,6 +96,13 @@ func (s *Service) CancelTransfer(transferID string) {
 	}
 }
 
+func (s *Service) StoreTransfersToList(transfers []*Transfer) {
+	for _, transfer := range transfers {
+		s.transferList.Store(transfer.ID, transfer)
+	}
+	s.NotifyTransferListUpdate()
+}
+
 func (s *Service) StoreTransferToList(transfer *Transfer) {
 	s.transferList.Store(transfer.ID, transfer)
 	s.NotifyTransferListUpdate()