修复服务退出超时问题

server/fwd/fwd.go

@@ -27,7 +27,6 @@ type Service struct {
 	cancel context.CancelFunc
 
 	userConnMap sync.Map
-	ctrlConnMap sync.Map
 
 	fwdLesWg   utils.CountWaitGroup
 	ctrlConnWg utils.CountWaitGroup
@@ -42,11 +41,11 @@ func New(config *Config) *Service {
 
 	ctx, cancel := context.WithCancel(context.Background())
 	return &Service{
-		Config:      config,
-		ctx:         ctx,
-		cancel:      cancel,
+		Config: config,
+		ctx:    ctx,
+		cancel: cancel,
+
 		userConnMap: sync.Map{},
-		ctrlConnMap: sync.Map{},
 
 		fwdLesWg:   utils.CountWaitGroup{},
 		ctrlConnWg: utils.CountWaitGroup{},
@@ -101,7 +100,6 @@ func (s *Service) Run() {
 	}
 
 	wg.Wait()
-	// 协程建立有先后顺序，不能乱，否则会泄露
 	s.dataConnWg.Wait()
 	s.ctrlConnWg.Wait()
 	s.fwdLesWg.Wait()
@@ -115,13 +113,6 @@ func (s *Service) Run() {
 	})
 	s.userConnMap.Clear()
 
-	s.ctrlConnMap.Range(func(key, value any) bool {
-		conn := value.(net.Conn)
-		utils.Close(conn)
-		return true
-	})
-	s.ctrlConnMap.Clear()
-
 	s.ctrlConnWg.Wait()
 	slog.Debug("控制通道连接已关闭")
 	s.dataConnWg.Wait()

server/server.go

@@ -38,17 +38,15 @@ func Start() {
 	osQuit := make(chan os.Signal)
 	signal.Notify(osQuit, os.Interrupt, syscall.SIGTERM)
 
-	errQuit := make(chan struct{})
-	defer close(errQuit)
-
 	// 启动服务
 	slog.Info("启动服务")
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
 	wg := sync.WaitGroup{}
-
 	wg.Add(1)
+	errQuit := make(chan struct{}, 1)
+	defer close(errQuit)
 	go func() {
 		defer wg.Done()
 		err := startFwdServer(ctx)
@@ -72,14 +70,14 @@ func Start() {
 	timeout, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
+	wg.Wait()
+
 	select {
 	case <-utils.ChanWgWait(timeout, &wg):
 		slog.Info("服务已退出")
 	case <-timeout.Done():
 		slog.Warn("退出超时，强制退出")
 	}
-
-	time.Sleep(3 * time.Second)
 }
 
 func startFwdServer(ctx context.Context) error {