fix: 实例详情页清除日式失效问题。

Author: Mecozea

internal/api/endpoint.go

@@ -1167,7 +1167,7 @@ func (h *EndpointHandler) refreshTunnels(endpointID int64) error {
 					if err = tx.Where("tunnel_id = ?", tunnel.ID).Delete(&models.TunnelOperationLog{}).Error; err != nil {
 						log.Warnf("[API] 删除隧道 %d 操作日志失败: %v", tunnel.ID, err)
 					}
-					
+
 					if err = tx.Delete(&models.Tunnel{}, tunnel.ID).Error; err != nil {
 						return fmt.Errorf("删除隧道失败: %v", err)
 					}
@@ -1445,9 +1445,9 @@ func (h *EndpointHandler) HandleEndpointFileLogs(c *gin.Context) {
 		return
 	}
 
-	// 转换为LogEntry格式以保持兼容性
-	var logEntries []log.LogEntry
-	for _, logLine := range logs {
+	// 转换为统一的日志格式
+	var logEntries []map[string]interface{}
+	for i, logLine := range logs {
 		if logLine != "" {
 			// 尝试解析日志行中的时间戳
 			var timestamp time.Time
@@ -1462,10 +1462,13 @@ func (h *EndpointHandler) HandleEndpointFileLogs(c *gin.Context) {
 				timestamp = targetDate // 如果没有时间戳，使用目标日期
 			}
 
-			logEntries = append(logEntries, log.LogEntry{
-				Timestamp: timestamp,
-				Content:   logLine,
-				FilePath:  fmt.Sprintf("%s.log", targetDate.Format("2006-01-02")),
+			logEntries = append(logEntries, map[string]interface{}{
+				"id":        i + 1,
+				"message":   processAnsiColors(logLine), // 处理ANSI颜色
+				"content":   processAnsiColors(logLine), // 保持向后兼容
+				"isHtml":    true,
+				"timestamp": timestamp,
+				"filePath":  fmt.Sprintf("%s.log", targetDate.Format("2006-01-02")),
 			})
 		}
 	}

internal/api/tunnel.go

@@ -72,6 +72,7 @@ func SetupTunnelRoutes(rg *gin.RouterGroup, tunnelService *tunnel.Service, sseMa
 	rg.POST("/tunnels/:id/action", tunnelHandler.HandleControlTunnel)
 	rg.GET("/tunnels/:id/details", tunnelHandler.HandleGetTunnelDetails)
 	rg.GET("/tunnels/:id/file-logs", tunnelHandler.HandleTunnelFileLogs)
+	rg.DELETE("/tunnels/:id/file-logs/clear", tunnelHandler.HandleClearTunnelFileLogs)
 	rg.GET("/tunnels/:id/traffic-trend", tunnelHandler.HandleGetTunnelTrafficTrend)
 	rg.GET("/tunnels/:id/ping-trend", tunnelHandler.HandleGetTunnelPingTrend)
 	rg.GET("/tunnels/:id/pool-trend", tunnelHandler.HandleGetTunnelPoolTrend)
@@ -1441,6 +1442,47 @@ func (h *TunnelHandler) HandleTunnelFileLogs(c *gin.Context) {
 	})
 }
 
+// HandleClearTunnelFileLogs 清空指定隧道的文件日志 (DELETE /api/tunnels/{id}/file-logs/clear)
+func (h *TunnelHandler) HandleClearTunnelFileLogs(c *gin.Context) {
+	idStr := c.Param("id")
+	if idStr == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "缺少隧道ID"})
+		return
+	}
+
+	db := h.tunnelService.DB()
+
+	// 查询隧道获得 endpointId
+	var endpointID int64
+	if err := db.QueryRow(`SELECT endpoint_id FROM tunnels WHERE instance_id = ?`, idStr).Scan(&endpointID); err != nil {
+		if err == sql.ErrNoRows {
+			c.JSON(http.StatusNotFound, gin.H{"error": "隧道不存在"})
+			return
+		}
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	// 检查是否有FileLogger
+	if h.sseManager == nil || h.sseManager.GetFileLogger() == nil {
+		c.JSON(http.StatusServiceUnavailable, gin.H{"error": "文件日志服务不可用"})
+		return
+	}
+
+	// 清空文件日志
+	err := h.sseManager.GetFileLogger().ClearLogs(endpointID, idStr)
+	if err != nil {
+		log.Warnf("[API]清空文件日志失败: %v", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "清空日志失败"})
+		return
+	}
+
+	c.JSON(http.StatusOK, map[string]interface{}{
+		"success": true,
+		"message": "文件日志已清空",
+	})
+}
+
 // processAnsiColors 将 ANSI 颜色码转换为 HTML span
 func processAnsiColors(text string) string {
 	// 移除时间戳前缀（可选）

internal/sse/service.go

@@ -490,34 +490,62 @@ func (s *Service) updateEndpointTunnelCount(endpointID int64) {
 // sendTunnelUpdateByInstanceId 根据实例ID发送隧道更新
 func (s *Service) sendTunnelUpdateByInstanceId(instanceID string, data SSEResp) {
 	s.mu.RLock()
-	defer s.mu.RUnlock()
-
 	subscribers, exists := s.tunnelSubs[instanceID]
 	if !exists {
+		s.mu.RUnlock()
 		// log.Debug("[SSE]隧道 %s 没有订阅者", instanceID)
 		return
 	}
 
+	// 创建订阅者副本，避免在遍历时修改map
+	clientList := make([]*Client, 0, len(subscribers))
+	clientIDs := make([]string, 0, len(subscribers))
+	for clientID, client := range subscribers {
+		clientList = append(clientList, client)
+		clientIDs = append(clientIDs, clientID)
+	}
+	s.mu.RUnlock()
+
 	jsonData, err := json.Marshal(data)
 	if err != nil {
 		log.Errorf("序列化隧道数据失败: %v", err)
 		return
 	}
 
-	for clientID, client := range subscribers {
+	// 记录需要删除的客户端
+	disconnectedClients := make([]string, 0)
+
+	for i, client := range clientList {
+		clientID := clientIDs[i]
 		if err := client.Send(jsonData); err != nil {
 			// 检查是否是连接断开错误，使用更合适的日志级别
 			if client.IsDisconnected() {
-				log.Warnf("[SSE]客户端 %s 连接已断开，移除订阅", clientID)
-				// 从订阅列表中移除已断开的客户端
-				delete(subscribers, clientID)
+				log.Warnf("[SSE]客户端 %s 连接已断开，标记移除订阅", clientID)
+				disconnectedClients = append(disconnectedClients, clientID)
 			} else {
 				log.Errorf("发送隧道更新给客户端 %s 失败: %v", clientID, err)
 			}
 		} else {
 			log.Debugf("[SSE]隧道 %s 的订阅者 %s 推送成功", instanceID, clientID)
 		}
 	}
+
+	// 如果有断开的客户端，获取写锁并移除它们
+	if len(disconnectedClients) > 0 {
+		s.mu.Lock()
+		if subscribers, exists := s.tunnelSubs[instanceID]; exists {
+			for _, clientID := range disconnectedClients {
+				delete(subscribers, clientID)
+				log.Infof("[SSE]已移除断开连接的客户端 %s from tunnel %s", clientID, instanceID)
+			}
+			// 如果订阅者列表为空，删除整个条目
+			if len(subscribers) == 0 {
+				delete(s.tunnelSubs, instanceID)
+				log.Debugf("[SSE]隧道 %s 无订阅者，清理订阅列表", instanceID)
+			}
+		}
+		s.mu.Unlock()
+	}
 }
 
 // setTunnelsOfflineForEndpoint 将端点的所有隧道设置为离线状态

web/src/components/layout/navbar-logo.tsx

@@ -1,4 +1,4 @@
-import { NavbarBrand, Link, cn, Badge } from "@heroui/react";
+import { NavbarBrand, Link, cn, Chip } from "@heroui/react";
 import { useTheme } from "next-themes";
 import { useIsSSR } from "@react-aria/ssr";
 
@@ -50,7 +50,7 @@ export const NavbarLogo = () => {
   // 确定badge内容和颜色
   const getBadgeProps = () => {
     if (isDev) {
-      return { content: "dev", color: "secondary" as const };
+      return { content: "dev", color: "default" as const };
     }
     if (isBeta) {
       return { content: "beta", color: "primary" as const };
@@ -62,28 +62,15 @@ export const NavbarLogo = () => {
 
   return (
     <NavbarBrand as="li" className="gap-3 max-w-fit">
-      <Link className="flex justify-start items-center gap-2" href="/">
-        {badgeProps ? (
-          <>
-            <NodePassLogo />
-            <Badge
-              content={badgeProps.content}
-              color={badgeProps.color}
-              variant="flat"
-              size="sm"
-            >
-              <p className={cn("font-bold text-foreground", fontSans.className)}>
-                NodePassDash
-              </p>
-            </Badge>
-          </>
-        ) : (
-          <>
-            <NodePassLogo />
-            <p className={cn("font-bold text-foreground", fontSans.className)}>
-              NodePassDash
-            </p>
-          </>
+      <Link className="flex justify-start items-center" href="/">
+        <NodePassLogo />
+        <p className={cn("font-bold text-foreground pl-1", fontSans.className)}>
+          NodePassDash
+        </p>
+        {badgeProps && (
+          <Chip variant="flat" color={badgeProps.color} size="sm" className="h-5 p-0 ml-1">
+            {badgeProps.content}
+          </Chip>
         )}
       </Link>
     </NavbarBrand>

web/src/components/ui/file-log-viewer.tsx

@@ -2,6 +2,7 @@
 
 import React, { useState, useEffect, useRef, useCallback } from "react";
 import { addToast } from "@heroui/toast";
+import { processAnsiColors } from "@/lib/utils/ansi";
 
 interface FileLogEntry {
   timestamp: string;
@@ -209,7 +210,7 @@ export const FileLogViewer: React.FC<FileLogViewerProps> = ({
       const lines = logContent.split("\n").filter((line) => line.length > 0);
       const newLogEntries: FileLogEntry[] = lines.map((line, index) => ({
         timestamp: new Date().toISOString(),
-        content: line,
+        content: processAnsiColors(line), // 处理ANSI颜色
         filePath: "live", // 标记为实时日志
       }));