refactor: enhance error handling with contextual messages in client and server methods

Author: yosebyte

internal/client.go

@@ -5,6 +5,7 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"fmt"
 	"io"
 	"net"
 	"net/url"
@@ -95,7 +96,7 @@ func (c *Client) start() error {
 	switch c.runMode {
 	case "1": // 单端模式
 		if err := c.initTunnelListener(); err != nil {
-			return err
+			return fmt.Errorf("start: initTunnelListener failed: %w", err)
 		}
 		return c.singleStart()
 	case "2": // 双端模式
@@ -113,14 +114,17 @@ func (c *Client) start() error {
 
 // singleStart 启动单端转发模式
 func (c *Client) singleStart() error {
-	return c.singleControl()
+	if err := c.singleControl(); err != nil {
+		return fmt.Errorf("singleStart: singleControl failed: %w", err)
+	}
+	return nil
 }
 
 // commonStart 启动双端握手模式
 func (c *Client) commonStart() error {
 	// 与隧道服务端进行握手
 	if err := c.tunnelHandshake(); err != nil {
-		return err
+		return fmt.Errorf("commonStart: tunnelHandshake failed: %w", err)
 	}
 
 	// 初始化连接池
@@ -140,19 +144,22 @@ func (c *Client) commonStart() error {
 	if c.dataFlow == "+" {
 		// 初始化目标监听器
 		if err := c.initTargetListener(); err != nil {
-			return err
+			return fmt.Errorf("commonStart: initTargetListener failed: %w", err)
 		}
 		go c.commonLoop()
 	}
-	return c.commonControl()
+	if err := c.commonControl(); err != nil {
+		return fmt.Errorf("commonStart: commonControl failed: %w", err)
+	}
+	return nil
 }
 
 // tunnelHandshake 与隧道服务端进行握手
 func (c *Client) tunnelHandshake() error {
 	// 建立隧道TCP连接
 	tunnelTCPConn, err := net.DialTimeout("tcp", c.tunnelTCPAddr.String(), tcpDialTimeout)
 	if err != nil {
-		return err
+		return fmt.Errorf("tunnelHandshake: dialTimeout failed: %w", err)
 	}
 
 	c.tunnelTCPConn = tunnelTCPConn.(*net.TCPConn)
@@ -163,27 +170,27 @@ func (c *Client) tunnelHandshake() error {
 	// 发送隧道密钥
 	_, err = c.tunnelTCPConn.Write(append(c.xor([]byte(c.tunnelKey)), '\n'))
 	if err != nil {
-		return err
+		return fmt.Errorf("tunnelHandshake: write tunnel key failed: %w", err)
 	}
 
 	// 读取隧道URL
 	rawTunnelURL, err := c.bufReader.ReadBytes('\n')
 	if err != nil {
-		return err
+		return fmt.Errorf("tunnelHandshake: readBytes failed: %w", err)
 	}
 
 	// 解析隧道URL
 	tunnelURL, err := url.Parse(string(c.xor(bytes.TrimSuffix(rawTunnelURL, []byte{'\n'}))))
 	if err != nil {
-		return err
+		return fmt.Errorf("tunnelHandshake: parse tunnel URL failed: %w", err)
 	}
 
 	// 更新客户端配置
 	if tunnelURL.Host == "" || tunnelURL.Path == "" || tunnelURL.Fragment == "" {
 		return net.UnknownNetworkError(tunnelURL.String())
 	}
 	if max, err := strconv.Atoi(tunnelURL.Host); err != nil {
-		return err
+		return fmt.Errorf("tunnelHandshake: parse max pool capacity failed: %w", err)
 	} else {
 		c.maxPoolCapacity = max
 	}

internal/server.go

@@ -6,6 +6,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
+	"fmt"
 	"io"
 	"net"
 	"net/url"
@@ -95,14 +96,14 @@ func (s *Server) start() error {
 
 	// 初始化隧道监听器
 	if err := s.initTunnelListener(); err != nil {
-		return err
+		return fmt.Errorf("start: initTunnelListener failed: %w", err)
 	}
 
 	// 运行模式判断
 	switch s.runMode {
 	case "1": // 反向模式
 		if err := s.initTargetListener(); err != nil {
-			return err
+			return fmt.Errorf("start: initTargetListener failed: %w", err)
 		}
 		s.dataFlow = "-"
 	case "2": // 正向模式
@@ -119,7 +120,7 @@ func (s *Server) start() error {
 
 	// 与客户端进行握手
 	if err := s.tunnelHandshake(); err != nil {
-		return err
+		return fmt.Errorf("start: tunnelHandshake failed: %w", err)
 	}
 
 	// 握手之后把UDP监听关掉
@@ -139,23 +140,26 @@ func (s *Server) start() error {
 	if s.dataFlow == "-" {
 		go s.commonLoop()
 	}
-	return s.commonControl()
+	if err := s.commonControl(); err != nil {
+		return fmt.Errorf("start: commonControl failed: %w", err)
+	}
+	return nil
 }
 
 // tunnelHandshake 与客户端进行握手
 func (s *Server) tunnelHandshake() error {
 	// 接受隧道连接
 	for {
 		if s.ctx.Err() != nil {
-			return s.ctx.Err()
+			return fmt.Errorf("tunnelHandshake: context error: %w", s.ctx.Err())
 		}
 
 		tunnelTCPConn, err := s.tunnelListener.Accept()
 		if err != nil {
-			s.logger.Error("Accept error: %v", err)
+			s.logger.Error("tunnelHandshake: accept error: %v", err)
 			select {
 			case <-s.ctx.Done():
-				return s.ctx.Err()
+				return fmt.Errorf("tunnelHandshake: context error: %w", s.ctx.Err())
 			case <-time.After(serviceCooldown):
 			}
 			continue
@@ -166,11 +170,11 @@ func (s *Server) tunnelHandshake() error {
 		bufReader := bufio.NewReader(tunnelTCPConn)
 		rawTunnelKey, err := bufReader.ReadString('\n')
 		if err != nil {
-			s.logger.Warn("Handshake timeout: %v", tunnelTCPConn.RemoteAddr())
+			s.logger.Warn("tunnelHandshake: handshake timeout: %v", tunnelTCPConn.RemoteAddr())
 			tunnelTCPConn.Close()
 			select {
 			case <-s.ctx.Done():
-				return s.ctx.Err()
+				return fmt.Errorf("tunnelHandshake: context error: %w", s.ctx.Err())
 			case <-time.After(serviceCooldown):
 			}
 			continue
@@ -180,11 +184,11 @@ func (s *Server) tunnelHandshake() error {
 		tunnelKey := string(s.xor(bytes.TrimSuffix([]byte(rawTunnelKey), []byte{'\n'})))
 
 		if tunnelKey != s.tunnelKey {
-			s.logger.Warn("Access denied: %v", tunnelTCPConn.RemoteAddr())
+			s.logger.Warn("tunnelHandshake: access denied: %v", tunnelTCPConn.RemoteAddr())
 			tunnelTCPConn.Close()
 			select {
 			case <-s.ctx.Done():
-				return s.ctx.Err()
+				return fmt.Errorf("tunnelHandshake: context error: %w", s.ctx.Err())
 			case <-time.After(serviceCooldown):
 			}
 			continue
@@ -210,7 +214,7 @@ func (s *Server) tunnelHandshake() error {
 
 	_, err := s.tunnelTCPConn.Write(append(s.xor([]byte(tunnelURL.String())), '\n'))
 	if err != nil {
-		return err
+		return fmt.Errorf("tunnelHandshake: write tunnel config failed: %w", err)
 	}
 
 	s.logger.Info("Tunnel signal -> : %v -> %v", tunnelURL.String(), s.tunnelTCPConn.RemoteAddr())