Add timeout to request, using context

Author: Max-Sum

README.md

@@ -294,6 +294,7 @@ server = http://<user>:<pass>@<server host>:<server port>
                        # 服务器的API地址，可以设置https或http
 heartbeat_interval = 5 # [可选] 心跳间隔，保持到服务器的连接，默认为30s。
 skip_verify = false    # [可选] 跳过TLS检测，如果服务器使用的是自签证书，可以使用该项。
+request_timeout = 5    # [可选] 访问API的时间限制，默认为5s。
 
 [ssh]                  # 一个section为一个对外暴露的服务
 type = tcp             # 服务类型，目前支持tcp/http/https

client.go

@@ -33,7 +33,7 @@ func NewServiceClient(svc Service, clientCfg *ClientCommonConf) *ServiceClient {
 		svc: svc,
 		cfg: clientCfg,
 		client: &http.Client{
-			Timeout: 5 * time.Second,
+			Timeout: time.Duration(clientCfg.RequestTimeout * int64(time.Second)),
 		},
 		stopCh: make(chan struct{}),
 	}
@@ -51,7 +51,7 @@ func NewServiceClient(svc Service, clientCfg *ClientCommonConf) *ServiceClient {
 	}
 	if c.listenProxy() {
 		c.pClient = &http.Client{
-			Timeout: 5 * time.Second,
+			Timeout: time.Duration(clientCfg.RequestTimeout * int64(time.Second)),
 			Transport: &http.Transport{
 				Proxy:               nil,
 				DialContext:         c.DialProxyAddr,
@@ -297,13 +297,29 @@ func (c *ServiceClient) refreshAPI(ctx context.Context) error {
 }
 
 // Use the binded address to dial
-func (c *ServiceClient) DialBindAddr(_ context.Context, network string, addr string) (net.Conn, error) {
-	return reuse.Dial("tcp", c.listener.Addr().String(), addr)
+func (c *ServiceClient) DialBindAddr(ctx context.Context, network string, addr string) (net.Conn, error) {
+	nla, err := reuse.ResolveAddr(network, c.listener.Addr().String())
+	if err != nil {
+		return nil, fmt.Errorf("failed to resolve local addr: %w", err)
+	}
+	d := net.Dialer{
+		Control:   reuse.Control,
+		LocalAddr: nla,
+	}
+	return d.DialContext(ctx, network, addr)
 }
 
 // Use the binded address to dial
-func (c *ServiceClient) DialProxyAddr(_ context.Context, network string, addr string) (net.Conn, error) {
-	return reuse.Dial("tcp", c.pListener.Addr().String(), addr)
+func (c *ServiceClient) DialProxyAddr(ctx context.Context, network string, addr string) (net.Conn, error) {
+	nla, err := reuse.ResolveAddr(network, c.pListener.Addr().String())
+	if err != nil {
+		return nil, fmt.Errorf("failed to resolve local addr: %w", err)
+	}
+	d := net.Dialer{
+		Control:   reuse.Control,
+		LocalAddr: nla,
+	}
+	return d.DialContext(ctx, network, addr)
 }
 
 func (c *ServiceClient) Start(force bool) error {

config.go

@@ -14,6 +14,9 @@ type ClientCommonConf struct {
 	// before the connection is terminated, in seconds. It is not recommended
 	// to change this value. By default, this value is 90.
 	HeartbeatTimeout int64 `ini:"heartbeat_timeout" json:"heartbeat_timeout"`
+	// RequestTimeout specifies the timeout for any API request in seconds.
+	// By default, this value is 5.
+	RequestTimeout int64 `ini:"request_timeout" json:"request_timeout"`
 }
 
 func GetDefaultClientConf() ClientCommonConf {
@@ -22,6 +25,7 @@ func GetDefaultClientConf() ClientCommonConf {
 		SkipTLSVerify:     false,
 		HeartbeatInterval: 30,
 		HeartbeatTimeout:  90,
+		RequestTimeout:    5,
 	}
 }
 

server.go

@@ -39,9 +39,9 @@ type Server struct {
 	httpMux       map[string]*ServiceReflector
 	httpsMux      map[string]*ServiceReflector
 	connGroup     sync.WaitGroup
+	listenerGroup sync.WaitGroup
 	conns         map[*net.Conn]struct{}
 	listeners     map[*net.Listener]struct{}
-	listenerGroup sync.WaitGroup
 }
 
 func NewServer(user, pass string, tlsConf *tls.Config) *Server {