mirror of
https://github.com/MatrixSeven/file-transfer-go.git
synced 2026-03-06 23:29:42 +08:00
feat:文件传输优化
This commit is contained in:
@@ -186,6 +186,78 @@ func (h *Handler) UpdateRoomFilesHandler(w http.ResponseWriter, r *http.Request)
|
||||
json.NewEncoder(w).Encode(response)
|
||||
}
|
||||
|
||||
// CreateTextRoomHandler 创建文字传输房间API
|
||||
func (h *Handler) CreateTextRoomHandler(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
http.Error(w, "方法不允许", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
var req struct {
|
||||
Text string `json:"text"`
|
||||
}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, "解析请求失败", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if req.Text == "" {
|
||||
http.Error(w, "文本内容不能为空", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if len(req.Text) > 50000 {
|
||||
http.Error(w, "文本内容过长,最大支持50,000字符", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
// 创建文字传输房间
|
||||
code := h.p2pService.CreateTextRoom(req.Text)
|
||||
|
||||
response := map[string]interface{}{
|
||||
"success": true,
|
||||
"code": code,
|
||||
"message": "文字传输房间创建成功",
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(response)
|
||||
}
|
||||
|
||||
// GetTextContentHandler 获取文字内容API
|
||||
func (h *Handler) GetTextContentHandler(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodGet {
|
||||
http.Error(w, "方法不允许", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
// 从URL路径中提取code
|
||||
path := r.URL.Path
|
||||
code := path[len("/api/get-text-content/"):]
|
||||
|
||||
if code == "" || len(code) != 6 {
|
||||
http.Error(w, "请提供正确的6位房间码", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
// 获取文字内容
|
||||
text, exists := h.p2pService.GetTextContent(code)
|
||||
if !exists {
|
||||
http.Error(w, "房间不存在或已过期", http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
|
||||
response := map[string]interface{}{
|
||||
"success": true,
|
||||
"text": text,
|
||||
"message": "文字内容获取成功",
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(response)
|
||||
}
|
||||
|
||||
// HandleP2PWebSocket 处理P2P WebSocket连接
|
||||
func (h *Handler) HandleP2PWebSocket(w http.ResponseWriter, r *http.Request) {
|
||||
h.p2pService.HandleWebSocket(w, r)
|
||||
|
||||
@@ -16,12 +16,14 @@ import (
|
||||
)
|
||||
|
||||
type FileTransferRoom struct {
|
||||
ID string
|
||||
Code string // 取件码
|
||||
Files []models.FileTransferInfo // 待传输文件信息
|
||||
Clients map[string]*models.ClientInfo // 所有连接的客户端 (客户端ID -> ClientInfo)
|
||||
CreatedAt time.Time // 创建时间
|
||||
mutex sync.RWMutex
|
||||
ID string
|
||||
Code string // 取件码
|
||||
Files []models.FileTransferInfo // 待传输文件信息
|
||||
Clients map[string]*models.ClientInfo // 所有连接的客户端 (客户端ID -> ClientInfo)
|
||||
CreatedAt time.Time // 创建时间
|
||||
TextContent string // 文字内容
|
||||
IsTextRoom bool // 是否是文字传输房间
|
||||
mutex sync.RWMutex
|
||||
}
|
||||
|
||||
type P2PService struct {
|
||||
@@ -77,6 +79,42 @@ func (p *P2PService) GetRoomByCode(code string) (*FileTransferRoom, bool) {
|
||||
return room, exists
|
||||
}
|
||||
|
||||
// CreateTextRoom 创建文字传输房间并返回取件码
|
||||
func (p *P2PService) CreateTextRoom(text string) string {
|
||||
code := generatePickupCode()
|
||||
|
||||
p.roomsMux.Lock()
|
||||
defer p.roomsMux.Unlock()
|
||||
|
||||
room := &FileTransferRoom{
|
||||
ID: "text_room_" + code,
|
||||
Code: code,
|
||||
Files: []models.FileTransferInfo{}, // 文字房间不需要文件
|
||||
Clients: make(map[string]*models.ClientInfo),
|
||||
CreatedAt: time.Now(),
|
||||
TextContent: text,
|
||||
IsTextRoom: true,
|
||||
}
|
||||
|
||||
p.rooms[code] = room
|
||||
log.Printf("创建文字传输房间,取件码: %s,文字长度: %d", code, len(text))
|
||||
|
||||
return code
|
||||
}
|
||||
|
||||
// GetTextContent 根据取件码获取文字内容
|
||||
func (p *P2PService) GetTextContent(code string) (string, bool) {
|
||||
p.roomsMux.RLock()
|
||||
defer p.roomsMux.RUnlock()
|
||||
|
||||
room, exists := p.rooms[code]
|
||||
if !exists || !room.IsTextRoom {
|
||||
return "", false
|
||||
}
|
||||
|
||||
return room.TextContent, true
|
||||
}
|
||||
|
||||
// generateClientID 生成客户端唯一标识
|
||||
func generateClientID() string {
|
||||
b := make([]byte, 8)
|
||||
@@ -202,6 +240,15 @@ func (p *P2PService) HandleWebSocket(w http.ResponseWriter, r *http.Request) {
|
||||
case "file-info", "file-chunk", "file-complete":
|
||||
// 处理文件传输相关消息,直接转发给接收方
|
||||
p.forwardMessage(room, clientID, msg)
|
||||
case "text-update":
|
||||
// 处理实时文字更新
|
||||
p.handleTextUpdate(room, clientID, msg)
|
||||
case "text-send":
|
||||
// 处理文字发送
|
||||
p.handleTextSend(room, clientID, msg)
|
||||
case "image-send":
|
||||
// 处理图片发送
|
||||
p.handleImageSend(room, clientID, msg)
|
||||
default:
|
||||
// 转发消息到对应的客户端
|
||||
p.forwardMessage(room, clientID, msg)
|
||||
@@ -539,3 +586,50 @@ func (p *P2PService) UpdateRoomFiles(code string, files []models.FileTransferInf
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
// handleTextUpdate 处理实时文字更新
|
||||
func (p *P2PService) handleTextUpdate(room *FileTransferRoom, senderID string, msg models.VideoMessage) {
|
||||
log.Printf("处理文字更新: 来自客户端 %s", senderID)
|
||||
|
||||
// 转发文字更新给房间内其他所有客户端
|
||||
room.mutex.RLock()
|
||||
defer room.mutex.RUnlock()
|
||||
|
||||
for clientID, client := range room.Clients {
|
||||
if clientID != senderID { // 不发送给发送者自己
|
||||
if err := client.Connection.WriteJSON(msg); err != nil {
|
||||
log.Printf("转发文字更新失败 %s: %v", clientID, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// handleTextSend 处理文字发送
|
||||
func (p *P2PService) handleTextSend(room *FileTransferRoom, senderID string, msg models.VideoMessage) {
|
||||
log.Printf("处理文字发送: 来自客户端 %s", senderID)
|
||||
|
||||
// 转发文字发送给房间内所有客户端
|
||||
room.mutex.RLock()
|
||||
defer room.mutex.RUnlock()
|
||||
|
||||
for _, client := range room.Clients {
|
||||
if err := client.Connection.WriteJSON(msg); err != nil {
|
||||
log.Printf("转发文字发送失败 %s: %v", client.ID, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// handleImageSend 处理图片发送
|
||||
func (p *P2PService) handleImageSend(room *FileTransferRoom, senderID string, msg models.VideoMessage) {
|
||||
log.Printf("处理图片发送: 来自客户端 %s", senderID)
|
||||
|
||||
// 转发图片发送给房间内所有客户端
|
||||
room.mutex.RLock()
|
||||
defer room.mutex.RUnlock()
|
||||
|
||||
for _, client := range room.Clients {
|
||||
if err := client.Connection.WriteJSON(msg); err != nil {
|
||||
log.Printf("转发图片发送失败 %s: %v", client.ID, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user