修复连接超时问题

server/fwd/dispatcher/dispatch.go

@@ -86,12 +86,15 @@ func (s *Server) Run() error {
 		errCh <- err
 	}()
 
+	err = nil
 	select {
 	case <-s.ctx.Done():
-		return nil
-	case err := <-errCh:
-		return err
+	case err = <-errCh:
 	}
+
+	close(s.Conn)
+
+	return err
 }
 
 func (s *Server) acceptHttp(ls net.Listener) error {

server/fwd/fwd.go

@@ -61,7 +61,7 @@ func (s *Service) Close() {
 func (s *Service) Run() {
 	slog.Info("启动 fwd 服务")
 
-	errQuit := make(chan struct{})
+	errQuit := make(chan struct{}, 2)
 	defer close(errQuit)
 
 	wg := sync.WaitGroup{}
@@ -234,16 +234,22 @@ func (s *Service) startDataTun() error {
 	}
 	defer utils.Close(ls)
 
-	// 处理连接
-	connCh := utils.ChanConnAccept(s.ctx, ls)
+	go func() {
+		<-s.ctx.Done()
+		utils.Close(ls)
+	}()
+
 	for {
+		conn, err := ls.Accept()
+		if err != nil {
+			return errors.Wrap(err, "监听数据通道失败")
+		}
+
 		select {
 		case <-s.ctx.Done():
+			utils.Close(conn)
 			return nil
-		case conn, ok := <-connCh:
-			if !ok {
-				return errors.New("获取连接失败")
-			}
+		default:
 			s.dataConnWg.Add(1)
 			go func() {
 				defer s.dataConnWg.Done()
@@ -258,7 +264,6 @@ func (s *Service) startDataTun() error {
 }
 
 func (s *Service) processDataConn(client net.Conn) error {
-	slog.Info("客户端准备接收数据 " + client.RemoteAddr().String())
 
 	// 读取 tag
 	var tag string
@@ -326,11 +331,7 @@ func (s *Service) processDataConn(client net.Conn) error {
 		defer wg.Done()
 		_, err := io.Copy(user, client)
 		if err != nil {
-			if errors.Is(err, net.ErrClosed) {
-
-			} else {
-				// slog.Error("数据转发失败 client->user", "err", err, "errType", reflect.TypeOf(err))
-			}
+			slog.Error("数据转发失败 client->user", "err", err, "errType")
 		}
 	}()