diff --git a/.env b/.env index d3ad9ed..742e66e 100644 --- a/.env +++ b/.env @@ -6,4 +6,9 @@ REDIS_PASSWORD= PORT=12080 # [Node] 用于指定节点 -NODE_ID=ecs1 \ No newline at end of file +NODE_ID=ecs1 + +# 日志系统配置 +# LOG_DIR=.\\ws-logs # 日志目录,默认 ./logs +# LOG_ROTATE_FREQ=hourly # 轮转频率,可选: daily/hourly/10min +LOG_PREFIX=ws-server # 日志文件前缀 \ No newline at end of file diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..cadf5a3 --- /dev/null +++ b/build.bat @@ -0,0 +1,109 @@ +@echo off +setlocal enabledelayedexpansion + +:: ============================================= +:: Project Build Script - Optimized for Windows +:: Builds Linux and Windows executables +:: Outputs to dist directory with timestamped filenames +:: ============================================= + +:: Project name +set PROJECT=xk-websocket + +:: Fix Windows time format issue (hour might be single digit) +set HOUR=%time:~0,2% +if "%HOUR:~0,1%"==" " set HOUR=0%HOUR:~1,1% +set MIN=%time:~3,2% +set SEC=%time:~6,2% +set MSEC=%time:~9,2% + +:: Create precise timestamp (YYYY-MM-DD_HH-MM-SS) +set DATE_STAMP=%date:~0,4%-%date:~5,2%-%date:~8,2% +set TIME_STAMP=%HOUR%-%MIN%-%SEC% +set TIMESTAMP=%DATE_STAMP%_%TIME_STAMP% + +:: Target directory +set DIST_DIR=dist + +echo. +echo [1/5] Preparing build environment... +if not exist "%DIST_DIR%" ( + mkdir "%DIST_DIR%" + echo Created directory: %DIST_DIR% +) else ( + echo Directory exists: %DIST_DIR% +) + +echo. +echo [2/5] Setting build info... +echo Project name: %PROJECT% +echo Build time: %TIMESTAMP% + +echo. +echo [3/5] Building Linux version... +set GOOS=linux +set GOARCH=amd64 +go build -o "%DIST_DIR%\%PROJECT%-linux-%TIMESTAMP%" +if %errorlevel% neq 0 ( + echo. + echo ERROR: Linux build failed! + exit /b 1 +) + +echo. +echo [4/5] Building Windows version... +set GOOS=windows +set GOARCH=amd64 +go build -o "%DIST_DIR%\%PROJECT%-windows-%TIMESTAMP%.exe" +if %errorlevel% neq 0 ( + echo. + echo ERROR: Windows build failed! + exit /b 1 +) + +echo. +echo [5/5] Build successful! +echo. +echo Output directory: %cd%\%DIST_DIR%\ +echo Generated files: +echo 1. %PROJECT%-linux-%TIMESTAMP% +echo 2. %PROJECT%-windows-%TIMESTAMP%.exe +echo. + +:: Add cleanup option +:clean_prompt +echo Clean up old build files? [Y/N] +set /p CLEAN_OLD= +if /i "%CLEAN_OLD%"=="Y" ( + call :clean_old_builds + goto :end +) +if /i "%CLEAN_OLD%"=="N" ( + goto :end +) +echo Please enter Y or N +goto :clean_prompt + +:clean_old_builds +echo. +echo Cleaning old build files... +set KEEP_PATTERN=*%TIMESTAMP%* +for %%f in ("%DIST_DIR%\%PROJECT%-*") do ( + if not "%%~nxf"=="%PROJECT%-linux-%TIMESTAMP%" ( + if not "%%~nxf"=="%PROJECT%-windows-%TIMESTAMP%.exe" ( + echo Deleting: %%f + del /q "%%f" + ) + ) +) +echo Cleanup complete! Kept latest build files. +goto :eof + +:end +echo. +echo Run instructions: +echo Linux: .\%DIST_DIR%\%PROJECT%-linux-%TIMESTAMP% --nodeId=node1 --port=12081 +echo Windows: .\%DIST_DIR%\%PROJECT%-windows-%TIMESTAMP%.exe --nodeId=win1 --port=12080 +echo. + +endlocal \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..9ce08bb --- /dev/null +++ b/build.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +# 项目名称 +PROJECT="xk-websocket" + +# 设置时间格式 +TIMESTAMP=$(date +"%Y-%m-%d_%H-%M-%S") + +# 创建目标目录 +DIST_DIR="dist" +mkdir -p $DIST_DIR + +# 清理旧构建 +echo "🧹 清理旧构建文件..." +find $DIST_DIR -name "${PROJECT}-*" -delete + +echo "🚀 开始构建 ${PROJECT}..." +echo "⏰ 构建时间: $TIMESTAMP" + +# 构建 Linux 版本 +echo "🐧 构建 Linux (amd64) 版本..." +GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o $DIST_DIR/${PROJECT}-linux-amd64-${TIMESTAMP} . + +# 构建 Linux ARM 版本 (适合树莓派) +echo "🍓 构建 Linux (arm64) 版本..." +GOOS=linux GOARCH=arm64 go build -ldflags "-s -w" -o $DIST_DIR/${PROJECT}-linux-arm64-${TIMESTAMP} . + +# 构建 Windows 版本 +echo "🪟 构建 Windows (amd64) 版本..." +GOOS=windows GOARCH=amd64 go build -ldflags "-s -w" -o $DIST_DIR/${PROJECT}-windows-amd64-${TIMESTAMP}.exe . + +# 压缩文件 +echo "📦 压缩构建文件..." +pushd $DIST_DIR >/dev/null + +# Linux amd64 +tar -czf ${PROJECT}-linux-amd64-${TIMESTAMP}.tar.gz ${PROJECT}-linux-amd64-${TIMESTAMP} +rm ${PROJECT}-linux-amd64-${TIMESTAMP} + +# Linux arm64 +tar -czf ${PROJECT}-linux-arm64-${TIMESTAMP}.tar.gz ${PROJECT}-linux-arm64-${TIMESTAMP} +rm ${PROJECT}-linux-arm64-${TIMESTAMP} + +# Windows +zip -q ${PROJECT}-windows-amd64-${TIMESTAMP}.zip ${PROJECT}-windows-amd64-${TIMESTAMP}.exe +rm ${PROJECT}-windows-amd64-${TIMESTAMP}.exe + +popd >/dev/null + +echo "✅ 构建完成!" +echo "📁 输出目录: $DIST_DIR" +echo "📦 生成文件:" +ls -lh $DIST_DIR/*${TIMESTAMP}* \ No newline at end of file diff --git a/controller/websocket_controller.go b/controller/websocket_controller.go index 0e4af5a..acca9a4 100644 --- a/controller/websocket_controller.go +++ b/controller/websocket_controller.go @@ -13,8 +13,8 @@ import ( "github.com/gin-gonic/gin" "github.com/go-redis/redis/v8" "github.com/gorilla/websocket" - "xk-websocket/models" // 替换为实际路径 - "xk-websocket/utils" // 导入新的utils包 + "xk-websocket/models" + "xk-websocket/utils" ) var upgrader = websocket.Upgrader{ @@ -46,17 +46,51 @@ func NewWebSocketController() *WebSocketController { // ConfigureSystem 配置系统参数 func (c *WebSocketController) ConfigureSystem() { c.NodeID = utils.GetEnv("NODE_ID", "local") - c.Port = utils.GetEnv("PORT", "12080") + + // 只有当端口未设置时才从环境变量获取 + if c.Port == "" { + c.Port = utils.GetEnv("PORT", "12080") + log.Printf("📡📡📡📡📡📡📡📡 使用环境变量设置端口: %s", c.Port) + } + log.SetPrefix(fmt.Sprintf("[Node:%s] ", c.NodeID)) log.SetFlags(log.LstdFlags | log.Lmicroseconds) c.configureLogger() + + // 必须先初始化 Redis 客户端 + c.InitRedisClient() + + // 注册节点到Redis + go c.registerNode() // 现在 RedisCli 已初始化 +} + +// 注册节点到Redis +func (c *WebSocketController) registerNode() { + // 添加空值检查 + if c.RedisCli == nil { + log.Println("⚠️ Redis客户端未初始化,节点注册已取消") + return + } + + for { + key := fmt.Sprintf("websocket:nodes:%s", c.NodeID) + value := fmt.Sprintf("%s:%s", utils.GetOutboundIP(), c.Port) + + if err := c.RedisCli.Set(c.RedisCtx, key, value, 30*time.Second).Err(); err != nil { + log.Printf("⚠️ 节点注册失败: %v", err) + } else { + log.Printf("📌📌📌📌📌📌📌📌 节点已注册: %s = %s", key, value) + } + + time.Sleep(20 * time.Second) + } } // 配置日志记录器 func (c *WebSocketController) configureLogger() { logDir := utils.GetEnv("LOG_DIR", "./logs") if err := os.MkdirAll(logDir, 0755); err != nil { - log.Fatalf("❌❌ 创建日志目录失败: %v", err) + log.Fatalf("❌❌❌❌ 创建日志目录失败: %v", err) } logFreq := utils.GetEnv("LOG_ROTATE_FREQ", "daily") @@ -84,7 +118,7 @@ func (c *WebSocketController) InitRedisClient() { }) if err := c.checkRedisConnection(); err != nil { - log.Fatalf("❌❌ Redis连接失败: %v", err) + log.Fatalf("❌❌❌❌ Redis连接失败: %v", err) } } @@ -97,15 +131,16 @@ func (c *WebSocketController) checkRedisConnection() error { // PrintStartupInfo 打印启动信息 func (c *WebSocketController) PrintStartupInfo() { hostname, _ := os.Hostname() - log.Printf("🚀🚀 WebSocket服务启动: NodeID=%s", c.NodeID) - log.Printf("🌐🌐 监听端口: %s", c.Port) - log.Printf("📡📡 Redis地址: %s", utils.GetEnv("REDIS_ADDR", "localhost:6379")) - log.Printf("💻💻 主机: %s", hostname) - log.Printf("🕒🕒🕒 启动时间: %s", time.Now().Format("2006-01-02 15:04:05")) - log.Printf("🔔🔔 支持消息类型: \n 0:文本\n 1:图片\n 2:音频\n 3:视频\n 4:处方\n 5:病例\n 6:视频通话") - log.Printf("🔑🔑 用户绑定键: \n %s\n %s", models.ClientUserKey, models.UserClientKey) - log.Printf("📬📬 新增接口: POST /send-to-user (直接通过用户ID发送消息)") - log.Println("🔗🔗 等待客户端连接...") + log.Printf("🚀🚀🚀🚀 WebSocket服务启动: NodeID=%s", c.NodeID) + log.Printf("🌐🌐🌐🌐 监听端口: %s", c.Port) + log.Printf("📡📡📡📡 Redis地址: %s", utils.GetEnv("REDIS_ADDR", "localhost:6379")) + log.Printf("💻💻💻💻 主机: %s", hostname) + log.Printf("🕒🕒🕒🕒🕒🕒🕒🕒🕒 启动时间: %s", time.Now().Format("2006-01-02 15:04:05")) + log.Printf("🔔🔔🔔🔔 支持消息类型: \n 0:文本\n 1:图片\n 2:音频\n 3:视频\n 4:处方\n 5:病例\n 6:视频通话") + log.Printf("🔑🔑🔑🔑 用户绑定键: \n %s\n %s", models.ClientUserKey, models.UserClientKey) + log.Printf("📬📬📬📬 新增接口: POST /send-to-user (直接通过用户ID发送消息)") + log.Printf("🔗🔗🔗🔗 集群节点注册: %s:%s", utils.GetOutboundIP(), c.Port) + log.Println("🔗🔗🔗🔗 等待客户端连接...") } // HealthHandler 健康检查处理器 @@ -113,6 +148,7 @@ func (c *WebSocketController) HealthHandler(ctx *gin.Context) { ctx.JSON(http.StatusOK, gin.H{ "status": "ok", "node": c.NodeID, + "port": c.Port, "time": time.Now().Format(time.RFC3339), }) } @@ -121,7 +157,7 @@ func (c *WebSocketController) HealthHandler(ctx *gin.Context) { func (c *WebSocketController) HandleWebSocket(ctx *gin.Context) { start := time.Now() clientIP := ctx.ClientIP() - log.Printf("👤👤 客户端连接中: IP=%s", clientIP) + log.Printf("👤👤👤👤 客户端连接中: IP=%s", clientIP) conn, err := upgrader.Upgrade(ctx.Writer, ctx.Request, nil) if err != nil { @@ -152,7 +188,7 @@ func (c *WebSocketController) HandleWebSocket(ctx *gin.Context) { messageType, message, err := conn.ReadMessage() if err != nil { if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway) { - log.Printf("❌❌ 连接意外断开: %v | ClientID=%s", err, clientID) + log.Printf("❌❌❌❌ 连接意外断开: %v | ClientID=%s", err, clientID) } else { log.Printf("⚠️ 连接正常关闭: ClientID=%s", clientID) } @@ -167,16 +203,16 @@ func (c *WebSocketController) HandleWebSocket(ctx *gin.Context) { // 处理客户端消息 func (c *WebSocketController) handleClientMessage(senderID string, message []byte) { - log.Printf("📥📥 收到客户端消息: \n SenderID=%s \n Size=%d bytes", senderID, len(message)) + log.Printf("📥📥📥📥 收到客户端消息: \n SenderID=%s \n Size=%d bytes", senderID, len(message)) var payload models.SendMessagePayload if err := json.Unmarshal(message, &payload); err == nil && payload.RequestType != "" { - log.Printf("📦📦 解析JSON消息成功: Type=%s", payload.RequestType) + log.Printf("📦📦📦📦 解析JSON消息成功: Type=%s", payload.RequestType) if payload.RequestType == "bind" && payload.SenderUserID != "" { - log.Printf("🔗🔗 处理绑定请求: \n ClientID=%s \n UserID=%s", senderID, payload.SenderUserID) + log.Printf("🔗🔗🔗🔗 处理绑定请求: \n ClientID=%s \n UserID=%s", senderID, payload.SenderUserID) if err := c.bindClientToUser(senderID, payload.SenderUserID); err != nil { - log.Printf("❌❌ 绑定失败: %v", err) + log.Printf("❌❌❌❌ 绑定失败: %v", err) } else { log.Printf("✅ 绑定成功: \n ClientID=%s \n UserID=%s", senderID, payload.SenderUserID) } @@ -185,7 +221,7 @@ func (c *WebSocketController) handleClientMessage(senderID string, message []byt if payload.RequestType == "send_message" { if payload.TargetClientID != "" { - log.Printf("📨📨 处理客户端发起的发送请求: \n TargetID=%s \n MsgType=%d", + log.Printf("📨📨📨📨 处理客户端发起的发送请求: \n TargetID=%s \n MsgType=%d", payload.TargetClientID, payload.MessageType) clientMsg := models.ClientReceivedMessage{ @@ -203,7 +239,7 @@ func (c *WebSocketController) handleClientMessage(senderID string, message []byt } if payload.ReceiverUserID != "" { - log.Printf("📨📨 处理客户端发起的用户发送请求: \n ReceiverUserID=%s \n MsgType=%d", + log.Printf("📨📨📨📨 处理客户端发起的用户发送请求: \n ReceiverUserID=%s \n MsgType=%d", payload.ReceiverUserID, payload.MessageType) clientMsg := models.ClientReceivedMessage{ @@ -224,7 +260,7 @@ func (c *WebSocketController) handleClientMessage(senderID string, message []byt var clientMsg models.ClientReceivedMessage if err := json.Unmarshal(message, &clientMsg); err == nil && clientMsg.ReceiverID != "" { - log.Printf("📨📨 处理客户端封装消息: \n TargetID=%s \n MsgType=%d", + log.Printf("📨📨📨📨 处理客户端封装消息: \n TargetID=%s \n MsgType=%d", clientMsg.ReceiverID, clientMsg.MessageType) clientMsg.SenderID = senderID @@ -255,7 +291,7 @@ func (c *WebSocketController) SendMessageHandler(ctx *gin.Context) { } if payload.RequestType == "send_message" { - log.Printf("📤📤 处理API发送请求: \n SenderUser=%s \n MsgType=%d", + log.Printf("📤📤📤📤 处理API发送请求: \n SenderUser=%s \n MsgType=%d", payload.SenderUserID, payload.MessageType) clientMsg := models.ClientReceivedMessage{ @@ -272,11 +308,11 @@ func (c *WebSocketController) SendMessageHandler(ctx *gin.Context) { var sendErr error if payload.TargetClientID != "" { - log.Printf("🎯🎯 目标类型: ClientID | Target=%s", payload.TargetClientID) + log.Printf("🎯🎯🎯🎯 目标类型: ClientID | Target=%s", payload.TargetClientID) sendErr = c.sendMessageToClient(payload.TargetClientID, clientMsg) result = fmt.Sprintf("消息已发送到ClientID: %s", payload.TargetClientID) } else if payload.ReceiverUserID != "" { - log.Printf("🎯🎯 目标类型: UserID | ReceiverUser=%s", payload.ReceiverUserID) + log.Printf("🎯🎯🎯🎯 目标类型: UserID | ReceiverUser=%s", payload.ReceiverUserID) sendErr = c.sendMessageToUser(payload.ReceiverUserID, clientMsg) result = fmt.Sprintf("消息已发送到UserID: %s", payload.ReceiverUserID) } else { @@ -314,10 +350,10 @@ func (c *WebSocketController) BindHandler(ctx *gin.Context) { return } - log.Printf("🔗🔗 处理用户绑定请求: \n UserID=%s \n ClientID=%s", req.UserID, req.ClientID) + log.Printf("🔗🔗🔗🔗 处理用户绑定请求: \n UserID=%s \n ClientID=%s", req.UserID, req.ClientID) if err := c.bindClientToUser(req.ClientID, req.UserID); err != nil { - log.Printf("❌❌ 绑定失败: %v", err) + log.Printf("❌❌❌❌ 绑定失败: %v", err) ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) return } @@ -349,7 +385,7 @@ func (c *WebSocketController) SendToUserHandler(ctx *gin.Context) { return } - log.Printf("📤📤 处理API用户发送请求: \n SenderUser=%s → ReceiverUser=%s \n MsgType=%d", + log.Printf("📤📤📤📤 处理API用户发送请求: \n SenderUser=%s → ReceiverUser=%s \n MsgType=%d", payload.SenderUserID, payload.ReceiverUserID, payload.MessageType) clientMsg := models.ClientReceivedMessage{ @@ -392,14 +428,14 @@ func (c *WebSocketController) bindClientToUser(clientID, userID string) error { log.Printf("⚠️ 设置过期时间失败: %v", err) } - log.Printf("🔗🔗 用户绑定成功: \n ClientID=%s → UserID=%s", clientID, userID) + log.Printf("🔗🔗🔗🔗 用户绑定成功: \n ClientID=%s → UserID=%s", clientID, userID) return nil } // 通过用户ID发送消息 func (c *WebSocketController) sendMessageToUser(userID string, msg models.ClientReceivedMessage) error { start := time.Now() - log.Printf("👤👤 通过用户ID发送消息: UserID=%s", userID) + log.Printf("👤👤👤👤 通过用户ID发送消息: UserID=%s", userID) userClientKey := fmt.Sprintf("%s:%s", models.UserClientKey, userID) clientIDs, err := c.RedisCli.SMembers(c.RedisCtx, userClientKey).Result() @@ -411,7 +447,7 @@ func (c *WebSocketController) sendMessageToUser(userID string, msg models.Client return fmt.Errorf("用户未绑定任何客户端") } - log.Printf("📡📡 找到 %d 个关联的客户端: UserID=%s", len(clientIDs), userID) + log.Printf("📡📡📡📡 找到 %d 个关联的客户端: UserID=%s", len(clientIDs), userID) var successCount, failCount int var lastError error @@ -421,7 +457,7 @@ func (c *WebSocketController) sendMessageToUser(userID string, msg models.Client targetMsg.ReceiverID = clientID if err := c.sendMessageToClient(clientID, targetMsg); err != nil { - log.Printf("❌❌ 发送消息到客户端失败: \n ClientID=%s \n %v", clientID, err) + log.Printf("❌❌❌❌ 发送消息到客户端失败: \n ClientID=%s \n %v", clientID, err) failCount++ lastError = err } else { @@ -429,7 +465,7 @@ func (c *WebSocketController) sendMessageToUser(userID string, msg models.Client } } - log.Printf("📬📬 消息发送完成: \n 成功 %d \n 失败 %d \n UserID=%s \n Duration=%s", + log.Printf("📬📬📬📬 消息发送完成: \n 成功 %d \n 失败 %d \n UserID=%s \n Duration=%s", successCount, failCount, userID, time.Since(start)) if failCount > 0 { @@ -444,16 +480,16 @@ func (c *WebSocketController) sendMessageToClient(clientID string, msg models.Cl msgJSON, err := json.Marshal(msg) if err != nil { - log.Printf("❌❌ 消息序列化失败: %v", err) + log.Printf("❌❌❌❌ 消息序列化失败: %v", err) return fmt.Errorf("内部错误") } if conn := c.getClient(clientID); conn != nil { - log.Printf("📤📤 向本地客户端发送消息: \n ClientID=%s \n MsgType=%d \n Size=%d bytes", + log.Printf("📤📤📤📤 向本地客户端发送消息: \n ClientID=%s \n MsgType=%d \n Size=%d bytes", clientID, msg.MessageType, len(msgJSON)) if err := conn.WriteMessage(websocket.TextMessage, msgJSON); err != nil { - log.Printf("❌❌ 发送消息失败: %v | ClientID=%s", err, clientID) + log.Printf("❌❌❌❌ 发送消息失败: %v | ClientID=%s", err, clientID) c.removeClient(clientID) return fmt.Errorf("发送消息失败") } @@ -463,7 +499,7 @@ func (c *WebSocketController) sendMessageToClient(clientID string, msg models.Cl return nil } - log.Printf("🌐🌐 向远程节点转发消息: ClientID=%s", clientID) + log.Printf("🌐🌐🌐🌐 向远程节点转发消息: ClientID=%s", clientID) redisMsg := models.RedisMessage{ SenderNodeID: c.NodeID, @@ -473,16 +509,16 @@ func (c *WebSocketController) sendMessageToClient(clientID string, msg models.Cl redisMsgJSON, err := json.Marshal(redisMsg) if err != nil { - log.Printf("❌❌ Redis消息序列化失败: %v", err) + log.Printf("❌❌❌❌ Redis消息序列化失败: %v", err) return fmt.Errorf("内部错误") } if err := c.RedisCli.Publish(c.RedisCtx, "ws_messages", redisMsgJSON).Err(); err != nil { - log.Printf("❌❌ 发布消息到Redis失败: %v", err) + log.Printf("❌❌❌❌ 发布消息到Redis失败: %v", err) return fmt.Errorf("无法转发消息") } - log.Printf("📡📡 消息已转发到Redis: \n ClientID=%s \n Size=%d bytes \n Duration=%s", + log.Printf("📡📡📡📡 消息已转发到Redis: \n ClientID=%s \n Size=%d bytes \n Duration=%s", clientID, len(redisMsgJSON), time.Since(start)) return nil } @@ -493,28 +529,28 @@ func (c *WebSocketController) SubscribeToRedis() { defer pubsub.Close() ch := pubsub.Channel() - log.Println("🔔🔔 开始监听Redis消息...") + log.Println("🔔🔔🔔🔔 开始监听Redis消息...") for msg := range ch { start := time.Now() var redisMsg models.RedisMessage if err := json.Unmarshal([]byte(msg.Payload), &redisMsg); err != nil { - log.Printf("❌❌ 解析Redis消息失败: %v", err) + log.Printf("❌❌❌❌ 解析Redis消息失败: %v", err) continue } - log.Printf("📥📥 收到Redis消息: \n Sender=%s \n ClientID=%s \n Size=%d bytes", + log.Printf("📥📥📥📥 收到Redis消息: \n Sender=%s \n ClientID=%s \n Size=%d bytes", redisMsg.SenderNodeID, redisMsg.ClientID, len(msg.Payload)) if redisMsg.SenderNodeID == c.NodeID { - log.Println("ℹℹ️ 忽略本节点转发的消息") + log.Println("ℹℹℹℹ️ 忽略本节点转发的消息") continue } if conn := c.getClient(redisMsg.ClientID); conn != nil { if err := conn.WriteMessage(websocket.TextMessage, []byte(redisMsg.Message)); err != nil { - log.Printf("❌❌ 处理Redis消息失败: %v | ClientID=%s", err, redisMsg.ClientID) + log.Printf("❌❌❌❌ 处理Redis消息失败: %v | ClientID=%s", err, redisMsg.ClientID) c.removeClient(redisMsg.ClientID) continue } diff --git a/main.go b/main.go index f13503e..0131a19 100644 --- a/main.go +++ b/main.go @@ -1,19 +1,85 @@ package main import ( + "flag" "log" - //"os" - //"time" + "os" + "runtime/debug" + "time" - "xk-websocket/controller" // 替换为实际路径 - "xk-websocket/route" // 替换为实际路径 + "xk-websocket/controller" + "xk-websocket/route" + "xk-websocket/utils" "github.com/gin-gonic/gin" ) +func ensureLogDir(logDir string) { + if _, err := os.Stat(logDir); os.IsNotExist(err) { + log.Printf("📂 日志目录不存在,正在创建: %s", logDir) + if err := os.MkdirAll(logDir, 0755); err != nil { + log.Fatalf("❌ 无法创建日志目录: %v", err) + } + log.Printf("✅ 日志目录创建成功: %s", logDir) + } +} + +func setupLogger() { + // 设置日志目录(优先级:环境变量 > 默认值) + logDir := os.Getenv("LOG_DIR") + if logDir == "" { + logDir = "logs" // 默认日志目录 + } + + // 确保日志目录存在 + ensureLogDir(logDir) + + // 设置日志轮转频率 + logFreq := os.Getenv("LOG_ROTATE_FREQ") + if logFreq == "" { + logFreq = "daily" // 默认每天轮转 + } + + // 创建文件日志写入器 + logger := log.Default() + fileWriter := utils.NewDailyFileWriter(logDir, logFreq, logger, "xk-websocket") + + // 同时输出到控制台和文件 + log.SetOutput(fileWriter) +} + func main() { + // 初始化日志系统(必须放在最先) + setupLogger() + defer func() { + if r := recover(); r != nil { + log.Printf("❌ 程序崩溃: %v", r) + debug.PrintStack() + log.Println("程序将在10秒后退出...") + time.Sleep(10 * time.Second) + } + }() + + log.Println("🚀 启动 WebSocket 服务...") + + // 添加命令行参数解析 + var port, nodeID string + flag.StringVar(&port, "port", "", "运行端口号") + flag.StringVar(&nodeID, "nodeId", "", "节点标识符") + flag.Parse() + // 初始化控制器 wsCtrl := controller.NewWebSocketController() + + // 设置参数优先级 + if nodeID != "" { + wsCtrl.NodeID = nodeID + } + if port != "" { + wsCtrl.Port = port + } + + // 配置系统 wsCtrl.ConfigureSystem() wsCtrl.InitRedisClient() wsCtrl.PrintStartupInfo() @@ -25,14 +91,14 @@ func main() { route.SetupRoutes(router, wsCtrl) // 启动Redis消息订阅 - go wsCtrl.SubscribeToRedis() // 注意这里改为大写S的SubscribeToRedis + go wsCtrl.SubscribeToRedis() // 启动HTTP服务 - addr := "127.0.0.1:" + wsCtrl.Port - log.Printf("🔌🔌 服务地址: http://%s", addr) - log.Printf("🔌🔌 WebSocket连接地址: ws://%s/ws", addr) + addr := "0.0.0.0:" + wsCtrl.Port + log.Printf("🌐 监听地址: %s", addr) + log.Printf("🔌 WebSocket连接地址: ws://%s/ws", addr) if err := router.Run(addr); err != nil { - log.Fatalf("❌❌ 服务启动失败: %v", err) + log.Fatalf("❌ 服务启动失败: %v", err) } } diff --git a/utils/logger.go b/utils/logger.go index 1043794..97703ad 100644 --- a/utils/logger.go +++ b/utils/logger.go @@ -1,93 +1,121 @@ package utils import ( - "fmt" "log" "os" - "sync" + "path/filepath" "time" ) +// DailyFileWriter 日志文件写入器 type DailyFileWriter struct { - currentFile *os.File - mu sync.Mutex - logDir string - frequency string - currentDate string - currentSlot int - logger *log.Logger - nodeID string + Dir string + Freq string + Prefix string + File *os.File + Current string + Logger *log.Logger } -func NewDailyFileWriter(logDir, frequency string, logger *log.Logger, nodeID string) *DailyFileWriter { - return &DailyFileWriter{ - logDir: logDir, - frequency: frequency, - logger: logger, - nodeID: nodeID, +// NewDailyFileWriter 创建每日日志写入器 +func NewDailyFileWriter(dir, freq string, logger *log.Logger, prefix string) *DailyFileWriter { + writer := &DailyFileWriter{ + Dir: dir, + Freq: freq, + Prefix: prefix, + Logger: logger, + } + writer.rotate() + return writer +} + +func (w *DailyFileWriter) getLogFileName() string { + baseName := w.Prefix + "-" + + switch w.Freq { + case "daily": + return baseName + time.Now().Format("2006-01-02") + ".log" + case "hourly": + return baseName + time.Now().Format("2006-01-02-15") + ".log" + default: // 默认按分钟(适合开发) + return baseName + time.Now().Format("2006-01-02-15-04") + ".log" } } -func (w *DailyFileWriter) Write(p []byte) (n int, err error) { - w.mu.Lock() - defer w.mu.Unlock() +func (w *DailyFileWriter) rotate() { + filename := w.getLogFileName() + filePath := filepath.Join(w.Dir, filename) - now := time.Now() - if w.needRotate(now) { - if err := w.rotateFile(now); err != nil { - w.logger.Printf("❌❌ 日志文件切换失败: %v", err) - return 0, err + // 如果已经打开了相同的文件,则不需要重新打开 + if w.Current == filePath { + return + } + + // 关闭当前文件(如果存在) + if w.File != nil { + w.File.Close() + } + + // 确保目录存在(双重保障) + if err := os.MkdirAll(w.Dir, 0755); err != nil { + // 如果创建目录失败,尝试使用备用目录 + if w.Dir != "logs" { + w.Logger.Printf("⚠️ 无法创建日志目录 %s,尝试使用备用目录: %v", w.Dir, err) + w.Dir = "logs" + if err := os.MkdirAll(w.Dir, 0755); err != nil { + w.Logger.Fatalf("❌ 无法创建备用日志目录: %v", err) + } + } else { + w.Logger.Fatalf("❌ 无法创建日志目录: %v", err) } } - if w.currentFile == nil { - if err := w.rotateFile(now); err != nil { - return 0, err - } - } - - return w.currentFile.Write(p) -} - -func (w *DailyFileWriter) needRotate(now time.Time) bool { - currentDate := now.Format("2006-01-02") - if w.frequency == "daily" { - return w.currentDate != currentDate - } else if w.frequency == "10min" { - currentSlot := (now.Hour()*60 + now.Minute()) / 10 - return w.currentDate != currentDate || w.currentSlot != currentSlot - } - return false -} - -func (w *DailyFileWriter) rotateFile(now time.Time) error { - if w.currentFile != nil { - w.currentFile.Close() - } - - dateStr := now.Format("2006-01-02") - var slotStr string - if w.frequency == "10min" { - slot := (now.Hour()*60 + now.Minute()) / 10 - slotStr = fmt.Sprintf("%03d", slot) - } else { - slotStr = "000" - } - - if err := os.MkdirAll(w.logDir, 0755); err != nil { - return fmt.Errorf("创建日志目录失败: %w", err) - } - - filename := fmt.Sprintf("%s/xk-websocket-%s-%s.log", w.logDir, dateStr, slotStr) - file, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) + // 打开文件(如果文件不存在则创建) + file, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666) if err != nil { - return fmt.Errorf("打开日志文件失败: %w", err) + // 如果打开文件失败,尝试使用系统临时目录作为备选 + fallbackPath := filepath.Join(os.TempDir(), "xk-websocket-logs", filename) + w.Logger.Printf("⚠️ 无法打开日志文件 %s,尝试备选路径: %s (%v)", filePath, fallbackPath, err) + + // 确保备选目录存在 + if err := os.MkdirAll(filepath.Dir(fallbackPath), 0755); err != nil { + w.Logger.Fatalf("❌ 无法创建备选日志目录: %v", err) + } + + file, err = os.OpenFile(fallbackPath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666) + if err != nil { + w.Logger.Fatalf("❌ 无法打开备选日志文件: %v", err) + } } - w.currentFile = file - w.currentDate = dateStr - if w.frequency == "10min" { - w.currentSlot = (now.Hour()*60 + now.Minute()) / 10 + w.File = file + w.Current = filePath +} + +// Write 实现io.Writer接口 +func (w *DailyFileWriter) Write(p []byte) (n int, err error) { + // 检查是否需要轮转日志 + needRotate := false + switch w.Freq { + case "daily": + needRotate = time.Now().Day() != time.Now().Add(-time.Second).Day() + case "hourly": + needRotate = time.Now().Hour() != time.Now().Add(-time.Second).Hour() + default: // 每分钟轮转(开发模式) + needRotate = true + } + + if needRotate { + w.rotate() + } + + return w.File.Write(p) +} + +// Close 关闭日志文件 +func (w *DailyFileWriter) Close() error { + if w.File != nil { + return w.File.Close() } return nil } diff --git a/utils/network.go b/utils/network.go new file mode 100644 index 0000000..e4bb22e --- /dev/null +++ b/utils/network.go @@ -0,0 +1,17 @@ +package utils + +import ( + "net" +) + +// GetOutboundIP 获取本机的出口IP地址 +func GetOutboundIP() string { + conn, err := net.Dial("udp", "8.8.8.8:80") + if err != nil { + return "127.0.0.1" + } + defer conn.Close() + + localAddr := conn.LocalAddr().(*net.UDPAddr) + return localAddr.IP.String() +}