⚡ Cancel use HTTP services and WebSockets
This commit is contained in:
@@ -1,156 +0,0 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/wailsapp/wails/v3/pkg/services/log"
|
||||
)
|
||||
|
||||
// HTTPService HTTP 服务
|
||||
type HTTPService struct {
|
||||
logger *log.LoggerService
|
||||
server *http.Server
|
||||
wsService *WebSocketService
|
||||
}
|
||||
|
||||
// NewHTTPService 创建 HTTP 服务
|
||||
func NewHTTPService(logger *log.LoggerService, wsService *WebSocketService) *HTTPService {
|
||||
if logger == nil {
|
||||
logger = log.New()
|
||||
}
|
||||
|
||||
return &HTTPService{
|
||||
logger: logger,
|
||||
wsService: wsService,
|
||||
}
|
||||
}
|
||||
|
||||
// StartServer 启动 HTTP 服务器
|
||||
func (hs *HTTPService) StartServer(port string) error {
|
||||
// 设置 Gin 为发布模式
|
||||
gin.SetMode(gin.ReleaseMode)
|
||||
|
||||
// 创建 Gin 路由器
|
||||
router := gin.New()
|
||||
|
||||
// 添加中间件
|
||||
router.Use(gin.Recovery())
|
||||
router.Use(hs.corsMiddleware())
|
||||
|
||||
// 设置路由
|
||||
hs.setupRoutes(router)
|
||||
|
||||
// 创建 HTTP 服务器
|
||||
hs.server = &http.Server{
|
||||
Addr: ":" + port,
|
||||
Handler: router,
|
||||
ReadTimeout: 30 * time.Second,
|
||||
WriteTimeout: 30 * time.Second,
|
||||
IdleTimeout: 60 * time.Second,
|
||||
MaxHeaderBytes: 1 << 20, // 1MB
|
||||
}
|
||||
|
||||
hs.logger.Info("HTTP: Starting server", "port", port)
|
||||
|
||||
// 启动服务器
|
||||
go func() {
|
||||
if err := hs.server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
||||
hs.logger.Error("HTTP: Server failed to start", "error", err)
|
||||
}
|
||||
}()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// setupRoutes 设置路由
|
||||
func (hs *HTTPService) setupRoutes(router *gin.Engine) {
|
||||
// WebSocket 端点
|
||||
router.GET("/ws/migration", hs.handleWebSocket)
|
||||
|
||||
// API 端点组
|
||||
api := router.Group("/api")
|
||||
{
|
||||
api.GET("/health", hs.handleHealth)
|
||||
api.GET("/ws/clients", hs.handleWSClients)
|
||||
}
|
||||
}
|
||||
|
||||
// handleWebSocket 处理 WebSocket 连接
|
||||
func (hs *HTTPService) handleWebSocket(c *gin.Context) {
|
||||
if hs.wsService == nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "WebSocket service not available"})
|
||||
return
|
||||
}
|
||||
|
||||
hs.wsService.HandleUpgrade(c.Writer, c.Request)
|
||||
}
|
||||
|
||||
// handleHealth 健康检查端点
|
||||
func (hs *HTTPService) handleHealth(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"status": "ok",
|
||||
"timestamp": time.Now().Unix(),
|
||||
"service": "voidraft-http",
|
||||
})
|
||||
}
|
||||
|
||||
// handleWSClients 获取 WebSocket 客户端数量
|
||||
func (hs *HTTPService) handleWSClients(c *gin.Context) {
|
||||
if hs.wsService == nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "WebSocket service not available"})
|
||||
return
|
||||
}
|
||||
|
||||
count := hs.wsService.GetConnectedClientsCount()
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"connected_clients": count,
|
||||
})
|
||||
}
|
||||
|
||||
// corsMiddleware CORS 中间件
|
||||
func (hs *HTTPService) corsMiddleware() gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
c.Header("Access-Control-Allow-Origin", "*")
|
||||
c.Header("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
|
||||
c.Header("Access-Control-Allow-Headers", "Origin, Content-Type, Accept, Authorization")
|
||||
c.Header("Access-Control-Allow-Credentials", "true")
|
||||
|
||||
if c.Request.Method == "OPTIONS" {
|
||||
c.AbortWithStatus(204)
|
||||
return
|
||||
}
|
||||
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
|
||||
// StopServer 停止 HTTP 服务器
|
||||
func (hs *HTTPService) StopServer() error {
|
||||
if hs.server == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
hs.logger.Info("HTTP: Stopping server...")
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
|
||||
return hs.server.Shutdown(ctx)
|
||||
}
|
||||
|
||||
// ServiceShutdown 服务关闭
|
||||
func (hs *HTTPService) ServiceShutdown() error {
|
||||
hs.logger.Info("HTTP: Service is shutting down...")
|
||||
|
||||
if err := hs.StopServer(); err != nil {
|
||||
hs.logger.Error("HTTP: Failed to stop server", "error", err)
|
||||
return err
|
||||
}
|
||||
|
||||
hs.logger.Info("HTTP: Service shutdown completed")
|
||||
return nil
|
||||
}
|
||||
@@ -32,12 +32,11 @@ type MigrationProgress struct {
|
||||
|
||||
// MigrationService 迁移服务
|
||||
type MigrationService struct {
|
||||
logger *log.LoggerService
|
||||
mu sync.RWMutex
|
||||
currentProgress MigrationProgress
|
||||
cancelFunc context.CancelFunc
|
||||
ctx context.Context
|
||||
progressBroadcaster func(MigrationProgress) // WebSocket广播函数
|
||||
logger *log.LoggerService
|
||||
mu sync.RWMutex
|
||||
currentProgress MigrationProgress
|
||||
cancelFunc context.CancelFunc
|
||||
ctx context.Context
|
||||
}
|
||||
|
||||
// NewMigrationService 创建迁移服务
|
||||
@@ -67,11 +66,6 @@ func (ms *MigrationService) updateProgress(progress MigrationProgress) {
|
||||
ms.mu.Lock()
|
||||
ms.currentProgress = progress
|
||||
ms.mu.Unlock()
|
||||
|
||||
// 通过WebSocket广播进度
|
||||
if ms.progressBroadcaster != nil {
|
||||
ms.progressBroadcaster(progress)
|
||||
}
|
||||
}
|
||||
|
||||
// MigrateDirectory 迁移目录
|
||||
@@ -407,13 +401,6 @@ func (ms *MigrationService) CancelMigration() error {
|
||||
return fmt.Errorf("No active migration to cancel")
|
||||
}
|
||||
|
||||
// SetProgressBroadcaster 设置进度广播函数
|
||||
func (ms *MigrationService) SetProgressBroadcaster(broadcaster func(MigrationProgress)) {
|
||||
ms.mu.Lock()
|
||||
defer ms.mu.Unlock()
|
||||
ms.progressBroadcaster = broadcaster
|
||||
}
|
||||
|
||||
// ServiceShutdown 服务关闭
|
||||
func (ms *MigrationService) ServiceShutdown() error {
|
||||
ms.logger.Info("Migration: Service is shutting down...")
|
||||
|
||||
@@ -15,8 +15,6 @@ type ServiceManager struct {
|
||||
systemService *SystemService
|
||||
hotkeyService *HotkeyService
|
||||
dialogService *DialogService
|
||||
websocketService *WebSocketService
|
||||
httpService *HTTPService
|
||||
trayService *TrayService
|
||||
logger *log.LoggerService
|
||||
}
|
||||
@@ -44,29 +42,11 @@ func NewServiceManager() *ServiceManager {
|
||||
// 初始化对话服务
|
||||
dialogService := NewDialogService(logger)
|
||||
|
||||
// 初始化 WebSocket 服务
|
||||
websocketService := NewWebSocketService(logger)
|
||||
|
||||
// 初始化 HTTP 服务
|
||||
httpService := NewHTTPService(logger, websocketService)
|
||||
|
||||
// 初始化托盘服务
|
||||
trayService := NewTrayService(logger, configService)
|
||||
|
||||
// 设置迁移服务的WebSocket广播
|
||||
migrationService.SetProgressBroadcaster(func(progress MigrationProgress) {
|
||||
websocketService.BroadcastMigrationProgress(progress)
|
||||
})
|
||||
|
||||
// 启动 HTTP 服务器
|
||||
err := httpService.StartServer("8899")
|
||||
if err != nil {
|
||||
logger.Error("Failed to start HTTP server", "error", err)
|
||||
panic(err)
|
||||
}
|
||||
|
||||
// 使用新的配置通知系统设置热键配置变更监听
|
||||
err = configService.SetHotkeyChangeCallback(func(enable bool, hotkey *models.HotkeyCombo) error {
|
||||
err := configService.SetHotkeyChangeCallback(func(enable bool, hotkey *models.HotkeyCombo) error {
|
||||
return hotkeyService.UpdateHotkey(enable, hotkey)
|
||||
})
|
||||
if err != nil {
|
||||
@@ -97,8 +77,6 @@ func NewServiceManager() *ServiceManager {
|
||||
systemService: systemService,
|
||||
hotkeyService: hotkeyService,
|
||||
dialogService: dialogService,
|
||||
websocketService: websocketService,
|
||||
httpService: httpService,
|
||||
trayService: trayService,
|
||||
logger: logger,
|
||||
}
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"sync"
|
||||
|
||||
"github.com/lxzan/gws"
|
||||
"github.com/wailsapp/wails/v3/pkg/services/log"
|
||||
)
|
||||
|
||||
// WebSocketService WebSocket 服务
|
||||
type WebSocketService struct {
|
||||
logger *log.LoggerService
|
||||
upgrader *gws.Upgrader
|
||||
clients map[*gws.Conn]bool
|
||||
clientsMu sync.RWMutex
|
||||
}
|
||||
|
||||
// NewWebSocketService 创建 WebSocket 服务
|
||||
func NewWebSocketService(logger *log.LoggerService) *WebSocketService {
|
||||
if logger == nil {
|
||||
logger = log.New()
|
||||
}
|
||||
|
||||
ws := &WebSocketService{
|
||||
logger: logger,
|
||||
clients: make(map[*gws.Conn]bool),
|
||||
}
|
||||
|
||||
// 创建 WebSocket 升级器
|
||||
ws.upgrader = gws.NewUpgrader(&WebSocketHandler{service: ws}, &gws.ServerOption{
|
||||
ParallelEnabled: true,
|
||||
Recovery: gws.Recovery,
|
||||
PermessageDeflate: gws.PermessageDeflate{Enabled: true},
|
||||
})
|
||||
|
||||
return ws
|
||||
}
|
||||
|
||||
// WebSocketHandler WebSocket 事件处理器
|
||||
type WebSocketHandler struct {
|
||||
service *WebSocketService
|
||||
}
|
||||
|
||||
// OnOpen 连接建立时调用
|
||||
func (h *WebSocketHandler) OnOpen(socket *gws.Conn) {
|
||||
h.service.logger.Info("WebSocket: Client connected")
|
||||
|
||||
h.service.clientsMu.Lock()
|
||||
h.service.clients[socket] = true
|
||||
h.service.clientsMu.Unlock()
|
||||
}
|
||||
|
||||
// OnClose 连接关闭时调用
|
||||
func (h *WebSocketHandler) OnClose(socket *gws.Conn, err error) {
|
||||
h.service.logger.Info("WebSocket: Client disconnected", "error", err)
|
||||
|
||||
h.service.clientsMu.Lock()
|
||||
delete(h.service.clients, socket)
|
||||
h.service.clientsMu.Unlock()
|
||||
}
|
||||
|
||||
// OnPing 收到 Ping 时调用
|
||||
func (h *WebSocketHandler) OnPing(socket *gws.Conn, payload []byte) {
|
||||
_ = socket.WritePong(nil)
|
||||
}
|
||||
|
||||
// OnPong 收到 Pong 时调用
|
||||
func (h *WebSocketHandler) OnPong(socket *gws.Conn, payload []byte) {
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
// OnMessage 收到消息时调用
|
||||
func (h *WebSocketHandler) OnMessage(socket *gws.Conn, message *gws.Message) {
|
||||
defer message.Close()
|
||||
|
||||
h.service.logger.Debug("WebSocket: Received message", "message", string(message.Bytes()))
|
||||
|
||||
}
|
||||
|
||||
// HandleUpgrade 处理 WebSocket 升级请求
|
||||
func (ws *WebSocketService) HandleUpgrade(w http.ResponseWriter, r *http.Request) {
|
||||
socket, err := ws.upgrader.Upgrade(w, r)
|
||||
if err != nil {
|
||||
ws.logger.Error("WebSocket: Failed to upgrade connection", "error", err)
|
||||
return
|
||||
}
|
||||
|
||||
// 启动读取循环（必须在 goroutine 中运行以防止阻塞）
|
||||
go func() {
|
||||
socket.ReadLoop()
|
||||
}()
|
||||
}
|
||||
|
||||
// BroadcastMessage 广播消息给所有连接的客户端
|
||||
func (ws *WebSocketService) BroadcastMessage(messageType string, data interface{}) {
|
||||
message := map[string]interface{}{
|
||||
"type": messageType,
|
||||
"data": data,
|
||||
}
|
||||
|
||||
jsonData, err := json.Marshal(message)
|
||||
if err != nil {
|
||||
ws.logger.Error("WebSocket: Failed to marshal message", "error", err)
|
||||
return
|
||||
}
|
||||
|
||||
ws.clientsMu.RLock()
|
||||
clients := make([]*gws.Conn, 0, len(ws.clients))
|
||||
for client := range ws.clients {
|
||||
clients = append(clients, client)
|
||||
}
|
||||
ws.clientsMu.RUnlock()
|
||||
|
||||
// 使用广播器进行高效广播
|
||||
broadcaster := gws.NewBroadcaster(gws.OpcodeText, jsonData)
|
||||
defer broadcaster.Close()
|
||||
|
||||
for _, client := range clients {
|
||||
if err := broadcaster.Broadcast(client); err != nil {
|
||||
ws.logger.Error("WebSocket: Failed to broadcast to client", "error", err)
|
||||
// 清理失效的连接
|
||||
ws.clientsMu.Lock()
|
||||
delete(ws.clients, client)
|
||||
ws.clientsMu.Unlock()
|
||||
}
|
||||
}
|
||||
|
||||
ws.logger.Debug("WebSocket: Broadcasted message", "type", messageType, "clients", len(clients))
|
||||
}
|
||||
|
||||
// BroadcastMigrationProgress 广播迁移进度
|
||||
func (ws *WebSocketService) BroadcastMigrationProgress(progress MigrationProgress) {
|
||||
ws.BroadcastMessage("migration_progress", progress)
|
||||
}
|
||||
|
||||
// GetConnectedClientsCount 获取连接的客户端数量
|
||||
func (ws *WebSocketService) GetConnectedClientsCount() int {
|
||||
ws.clientsMu.RLock()
|
||||
defer ws.clientsMu.RUnlock()
|
||||
return len(ws.clients)
|
||||
}
|
||||
|
||||
// ServiceShutdown 服务关闭
|
||||
func (ws *WebSocketService) ServiceShutdown() error {
|
||||
ws.logger.Info("WebSocket: Service is shutting down...")
|
||||
|
||||
// 关闭所有客户端连接
|
||||
ws.clientsMu.Lock()
|
||||
for client := range ws.clients {
|
||||
_ = client.WriteClose(1000, []byte("Server shutting down"))
|
||||
}
|
||||
ws.clients = make(map[*gws.Conn]bool)
|
||||
ws.clientsMu.Unlock()
|
||||
|
||||
ws.logger.Info("WebSocket: Service shutdown completed")
|
||||
return nil
|
||||
}
|
||||
Reference in New Issue
Block a user