Merge pull request #31 from NodePassProject/main

Enhance Logging, Handshake Protocols, and UDP Session Management

Author: yosebyte

cmd/nodepass/core.go

@@ -24,7 +24,7 @@ func coreDispatch(parsedURL *url.URL) {
 	case "client":
 		core = internal.NewClient(parsedURL, logger)
 	default:
-		logger.Fatal("Unknown core: %v", scheme)
+		logger.Error("Unknown core: %v", scheme)
 		getExitInfo()
 	}
 

cmd/nodepass/main.go

@@ -30,7 +30,7 @@ func getParsedURL(args []string) *url.URL {
 
 	parsedURL, err := url.Parse(args[1])
 	if err != nil {
-		logger.Fatal("URL parse: %v", err)
+		logger.Error("URL parse: %v", err)
 		getExitInfo()
 	}
 
@@ -49,9 +49,6 @@ func initLogLevel(level string) {
 	case "error":
 		logger.SetLogLevel(logs.Error)
 		logger.Error("Init log level: ERROR")
-	case "fatal":
-		logger.SetLogLevel(logs.Fatal)
-		logger.Fatal("Init log level: FATAL")
 	default:
 		logger.SetLogLevel(logs.Info)
 		logger.Info("Init log level: INFO")
@@ -79,7 +76,7 @@ func getExitInfo() {
 │ <core>   │ server | client | master  │ Operating mode       │
 │ <tunnel> │ host:port (IP | domain)   │ Tunnel address       │
 │ <target> │ host:port | API prefix    │ Target addr | prefix │
-│ <log>    │ debug | info | warn | ... │ Default level info   │
+│ <log>    │ debug | warn | error      │ Default level info   │
 │ * <tls>  │ 0 off | 1 on | 2 verify   │ Default TLS code-0   │
 │ * <crt>  │ <path/to/crt.pem>         │ Custom certificate   │
 │ * <key>  │ <path/to/key.pem>         │ Custom private key   │

docs/en/configuration.md

@@ -10,7 +10,7 @@ NodePass provides five log verbosity levels that control the amount of informati
 - `info`: General operational information (default) - shows startup, shutdown, and key events
 - `warn`: Warning conditions - only shows potential issues that don't affect core functionality
 - `error`: Error conditions - shows only problems that affect functionality
-- `fatal`: Critical conditions - shows only severe errors that cause termination
+- `event`: Event recording - shows important operational events and traffic statistics
 
 You can set the log level in the command URL:
 

docs/en/usage.md

@@ -25,7 +25,7 @@ Where:
 - `<core>`: Specifies the operating mode (`server`, `client`, or `master`)
 - `<tunnel_addr>`: The tunnel endpoint address for control channel communications 
 - `<target_addr>`: The destination address for business data with bidirectional flow support (or API prefix in master mode)
-- `<level>`: Log verbosity level (`debug`, `info`, `warn`, `error`, or `fatal`)
+- `<level>`: Log verbosity level (`debug`, `info`, `warn`, `error`, or `event`)
 - `<mode>`: TLS security level for data channels (`0`, `1`, or `2`) - server/master modes only
 - `<cert_file>`: Path to certificate file (when `tls=2`) - server/master modes only
 - `<key_file>`: Path to private key file (when `tls=2`) - server/master modes only
@@ -46,7 +46,7 @@ nodepass server://<tunnel_addr>/<target_addr>?log=<level>&tls=<mode>&crt=<cert_f
 
 - `tunnel_addr`: Address for the TCP tunnel endpoint (control channel) that clients will connect to (e.g., 10.1.0.1:10101)
 - `target_addr`: The destination address for business data with bidirectional flow support (e.g., 10.1.0.1:8080)
-- `log`: Log level (debug, info, warn, error, fatal)
+- `log`: Log level (debug, info, warn, error, event)
 - `tls`: TLS encryption mode for the target data channel (0, 1, 2)
   - `0`: No TLS encryption (plain TCP/UDP)
   - `1`: Self-signed certificate (automatically generated)
@@ -94,7 +94,7 @@ nodepass client://<tunnel_addr>/<target_addr>?log=<level>
 
 - `tunnel_addr`: Address of the NodePass server's tunnel endpoint to connect to (e.g., 10.1.0.1:10101)
 - `target_addr`: The destination address for business data with bidirectional flow support (e.g., 127.0.0.1:8080)
-- `log`: Log level (debug, info, warn, error, fatal)
+- `log`: Log level (debug, info, warn, error, event)
 
 #### How Client Mode Works
 
@@ -140,7 +140,7 @@ nodepass master://<api_addr>[<prefix>]?log=<level>&tls=<mode>&crt=<cert_file>&ke
 
 - `api_addr`: Address where the API service will listen (e.g., 0.0.0.0:9090)
 - `prefix`: Optional API prefix path (e.g., /management). Default is `/api`
-- `log`: Log level (debug, info, warn, error, fatal)
+- `log`: Log level (debug, info, warn, error, event)
 - `tls`: TLS encryption mode for the API service (0, 1, 2)
   - `0`: No TLS encryption (HTTP)
   - `1`: Self-signed certificate (HTTPS with auto-generated cert)

docs/zh/configuration.md

@@ -10,7 +10,7 @@ NodePass提供五种日志详细级别，控制显示的信息量：
 - `info`：一般操作信息(默认) - 显示启动、关闭和关键事件
 - `warn`：警告条件 - 仅显示不影响核心功能的潜在问题
 - `error`：错误条件 - 仅显示影响功能的问题
-- `fatal`：致命条件 - 仅显示导致终止的严重错误
+- `event`：事件记录 - 显示重要的操作事件和流量统计
 
 您可以在命令URL中设置日志级别：
 

docs/zh/usage.md

@@ -14,7 +14,7 @@ nodepass <core>://<tunnel_addr>/<target_addr>?log=<level>&tls=<mode>&crt=<cert_f
 - `<core>`：指定操作模式（`server`、`client`或`master`）
 - `<tunnel_addr>`：控制通道通信的隧道端点地址
 - `<target_addr>`：业务数据的目标地址，支持双向模式（或在master模式下的API前缀）
-- `<level>`：日志详细级别（`debug`、`info`、`warn`、`error`或`fatal`）
+- `<level>`：日志详细级别（`debug`、`info`、`warn`、`error`或`event`）
 - `<mode>`：数据通道的TLS安全级别（`0`、`1`或`2`）- 仅适用于server/master模式
 - `<cert_file>`：证书文件路径（当`tls=2`时）- 仅适用于server/master模式
 - `<key_file>`：私钥文件路径（当`tls=2`时）- 仅适用于server/master模式
@@ -35,7 +35,7 @@ nodepass server://<tunnel_addr>/<target_addr>?log=<level>&tls=<mode>&crt=<cert_f
 
 - `tunnel_addr`：TCP隧道端点地址（控制通道），客户端将连接到此处(例如, 10.1.0.1:10101)
 - `target_addr`：业务数据的目标地址，支持双向数据流模式(例如, 10.1.0.1:8080)
-- `log`：日志级别(debug, info, warn, error, fatal)
+- `log`：日志级别(debug, info, warn, error, event)
 - `tls`：目标数据通道的TLS加密模式 (0, 1, 2)
   - `0`：无TLS加密（明文TCP/UDP）
   - `1`：自签名证书（自动生成）
@@ -83,7 +83,7 @@ nodepass client://<tunnel_addr>/<target_addr>?log=<level>
 
 - `tunnel_addr`：要连接的NodePass服务端隧道端点地址(例如, 10.1.0.1:10101)
 - `target_addr`：业务数据的目标地址，支持双向数据流模式(例如, 127.0.0.1:8080)
-- `log`：日志级别(debug, info, warn, error, fatal)
+- `log`：日志级别(debug, info, warn, error, event)
 
 #### 客户端模式工作原理
 
@@ -132,7 +132,7 @@ nodepass master://<api_addr>[<prefix>]?log=<level>&tls=<mode>&crt=<cert_file>&ke
 
 - `api_addr`：API服务监听的地址（例如，0.0.0.0:9090）
 - `prefix`：可选的API前缀路径（例如，/management）。默认为`/api`
-- `log`：日志级别(debug, info, warn, error, fatal)
+- `log`：日志级别(debug, info, warn, error, event)
 - `tls`：API服务的TLS加密模式(0, 1, 2)
   - `0`：无TLS加密（HTTP）
   - `1`：自签名证书（带自动生成证书的HTTPS）

go.mod

@@ -5,6 +5,6 @@ go 1.24.3
 require (
 	github.com/NodePassProject/cert v1.0.0
 	github.com/NodePassProject/conn v1.0.0
-	github.com/NodePassProject/logs v1.0.0
+	github.com/NodePassProject/logs v1.0.1
 	github.com/NodePassProject/pool v1.0.5
 )

go.sum

@@ -2,7 +2,7 @@ github.com/NodePassProject/cert v1.0.0 h1:cBNNvR+ja22AgNlUmeGWLcCM1vmnLTqpbCQ4Hd
 github.com/NodePassProject/cert v1.0.0/go.mod h1:4EJDS3GozJ74dtICJ/xcq42WKKvF0tiTM9/M7Q9NF9c=
 github.com/NodePassProject/conn v1.0.0 h1:rN0wf/N3gB8BJJ2ZwD6ij/ZKgd6CDRY/MeEZ40BJ98U=
 github.com/NodePassProject/conn v1.0.0/go.mod h1:mWe3Rylunp6Sx4v6pkSGgYZe2R+I/O+7nZ2od0yJ3aQ=
-github.com/NodePassProject/logs v1.0.0 h1:twRwCQinXjWu7c4sbiLVYWTMsaTOOFLubjMQx3ScXX0=
-github.com/NodePassProject/logs v1.0.0/go.mod h1:ocFTMNXBTnQFJFAhF+qobAzu7+y+wYPik7D+a1jPfis=
+github.com/NodePassProject/logs v1.0.1 h1:WDHY1DcTO+7NydBzuRpxhEw6pWYayBdDjjZzU1uDKac=
+github.com/NodePassProject/logs v1.0.1/go.mod h1:ocFTMNXBTnQFJFAhF+qobAzu7+y+wYPik7D+a1jPfis=
 github.com/NodePassProject/pool v1.0.5 h1:7mztspS8MUOu2btSVev954bU2ujR8tqotsMh1upHBtc=
 github.com/NodePassProject/pool v1.0.5/go.mod h1:kdRAEDK45j/+iHH4kRTpXt/wI28NIguJ13n/5NDXxkw=

internal/client.go

@@ -148,6 +148,7 @@ func (c *Client) tunnelHandshake() error {
 	if err != nil {
 		return err
 	}
+
 	tunnelSignal := string(xor(bytes.TrimSuffix(rawTunnelURL, []byte{'\n'})))
 	c.logger.Debug("Tunnel signal <- : %v <- %v", tunnelSignal, c.tunnelTCPConn.RemoteAddr())
 
@@ -156,13 +157,21 @@ func (c *Client) tunnelHandshake() error {
 	if err != nil {
 		return err
 	}
-
-	// 设置数据流向
 	c.dataFlow = tunnelURL.Host
-
-	// 设置TLS代码
 	c.tlsCode = tunnelURL.Fragment
 
-	c.logger.Debug("Tunnel handshaked: %v <-> %v", c.tunnelTCPConn.LocalAddr(), c.tunnelTCPConn.RemoteAddr())
+	// 反馈给服务端
+	start := time.Now()
+	if _, err := c.tunnelTCPConn.Write([]byte{'\n'}); err != nil {
+		return err
+	}
+
+	// 等待服务端确认握手完成
+	_, err = c.tunnelTCPConn.Read(make([]byte, 1))
+	if err != nil {
+		return err
+	}
+	c.logger.Event("Tunnel handshaked: %v <-> %v in %vms",
+		c.tunnelTCPConn.LocalAddr(), c.tunnelTCPConn.RemoteAddr(), time.Since(start).Milliseconds())
 	return nil
 }