feat: INP2P v0.1.0 — complete P2P tunneling system
Core modules (M1-M6): - pkg/protocol: message format, encoding, NAT type enums - pkg/config: server/client config structs, env vars, validation - pkg/auth: CRC64 token, TOTP gen/verify, one-time relay tokens - pkg/nat: UDP/TCP STUN client and server - pkg/signal: WSS message dispatch, sync request/response - pkg/punch: UDP/TCP hole punching + priority chain - pkg/mux: stream multiplexer (7B frame: StreamID+Flags+Len) - pkg/tunnel: mux-based port forwarding with stats - pkg/relay: relay manager with TOTP auth + session bridging - internal/server: signaling server (login/heartbeat/report/coordinator) - internal/client: client (NAT detect/login/punch/relay/reconnect) - cmd/inp2ps + cmd/inp2pc: main entrypoints with graceful shutdown All tests pass: 16 tests across 5 packages Code: 3559 lines core + 861 lines tests = 19 source files
This commit is contained in:
471
internal/client/client.go
Normal file
471
internal/client/client.go
Normal file
@@ -0,0 +1,471 @@
|
||||
// Package client implements the inp2pc P2P client.
|
||||
package client
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/url"
|
||||
"os"
|
||||
"runtime"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/gorilla/websocket"
|
||||
"github.com/openp2p-cn/inp2p/pkg/auth"
|
||||
"github.com/openp2p-cn/inp2p/pkg/config"
|
||||
"github.com/openp2p-cn/inp2p/pkg/nat"
|
||||
"github.com/openp2p-cn/inp2p/pkg/protocol"
|
||||
"github.com/openp2p-cn/inp2p/pkg/punch"
|
||||
"github.com/openp2p-cn/inp2p/pkg/relay"
|
||||
"github.com/openp2p-cn/inp2p/pkg/signal"
|
||||
"github.com/openp2p-cn/inp2p/pkg/tunnel"
|
||||
)
|
||||
|
||||
// Client is the INP2P client node.
|
||||
type Client struct {
|
||||
cfg config.ClientConfig
|
||||
conn *signal.Conn
|
||||
natType protocol.NATType
|
||||
publicIP string
|
||||
tunnels map[string]*tunnel.Tunnel // peerNode → tunnel
|
||||
tMu sync.RWMutex
|
||||
relayMgr *relay.Manager
|
||||
quit chan struct{}
|
||||
wg sync.WaitGroup
|
||||
}
|
||||
|
||||
// New creates a new client.
|
||||
func New(cfg config.ClientConfig) *Client {
|
||||
c := &Client{
|
||||
cfg: cfg,
|
||||
natType: protocol.NATUnknown,
|
||||
tunnels: make(map[string]*tunnel.Tunnel),
|
||||
quit: make(chan struct{}),
|
||||
}
|
||||
|
||||
if cfg.RelayEnabled {
|
||||
c.relayMgr = relay.NewManager(cfg.RelayPort, true, cfg.SuperRelay, cfg.MaxRelayLoad, cfg.Token)
|
||||
}
|
||||
|
||||
return c
|
||||
}
|
||||
|
||||
// Run is the main client loop. Connects, authenticates, and maintains the connection.
|
||||
func (c *Client) Run() error {
|
||||
for {
|
||||
if err := c.connectAndRun(); err != nil {
|
||||
log.Printf("[client] disconnected: %v, reconnecting in 5s...", err)
|
||||
}
|
||||
|
||||
select {
|
||||
case <-c.quit:
|
||||
return nil
|
||||
case <-time.After(5 * time.Second):
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Client) connectAndRun() error {
|
||||
// 1. NAT Detection
|
||||
log.Printf("[client] detecting NAT type via %s...", c.cfg.ServerHost)
|
||||
natResult := nat.Detect(
|
||||
c.cfg.ServerHost,
|
||||
c.cfg.STUNUDP1, c.cfg.STUNUDP2,
|
||||
c.cfg.STUNTCP1, c.cfg.STUNTCP2,
|
||||
)
|
||||
c.natType = natResult.Type
|
||||
c.publicIP = natResult.PublicIP
|
||||
log.Printf("[client] NAT type=%s, publicIP=%s", c.natType, c.publicIP)
|
||||
|
||||
// 2. WSS Connect
|
||||
scheme := "ws"
|
||||
if !c.cfg.Insecure {
|
||||
scheme = "wss"
|
||||
}
|
||||
u := url.URL{Scheme: scheme, Host: fmt.Sprintf("%s:%d", c.cfg.ServerHost, c.cfg.ServerPort), Path: "/ws"}
|
||||
|
||||
dialer := websocket.Dialer{
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: c.cfg.Insecure},
|
||||
}
|
||||
ws, _, err := dialer.Dial(u.String(), nil)
|
||||
if err != nil {
|
||||
return fmt.Errorf("ws connect: %w", err)
|
||||
}
|
||||
|
||||
c.conn = signal.NewConn(ws)
|
||||
defer c.conn.Close()
|
||||
|
||||
// Start ReadLoop in background BEFORE sending login
|
||||
// (so waiter can receive the LoginRsp)
|
||||
readErr := make(chan error, 1)
|
||||
go func() {
|
||||
readErr <- c.conn.ReadLoop()
|
||||
}()
|
||||
|
||||
// 3. Login
|
||||
loginReq := protocol.LoginReq{
|
||||
Node: c.cfg.Node,
|
||||
Token: c.cfg.Token,
|
||||
User: c.cfg.User,
|
||||
Version: config.Version,
|
||||
NATType: c.natType,
|
||||
ShareBandwidth: c.cfg.ShareBandwidth,
|
||||
RelayEnabled: c.cfg.RelayEnabled,
|
||||
SuperRelay: c.cfg.SuperRelay,
|
||||
PublicIP: c.publicIP,
|
||||
}
|
||||
|
||||
rspData, err := c.conn.Request(
|
||||
protocol.MsgLogin, protocol.SubLoginReq, loginReq,
|
||||
protocol.MsgLogin, protocol.SubLoginRsp,
|
||||
10*time.Second,
|
||||
)
|
||||
if err != nil {
|
||||
return fmt.Errorf("login: %w", err)
|
||||
}
|
||||
|
||||
var loginRsp protocol.LoginRsp
|
||||
if err := protocol.DecodePayload(rspData, &loginRsp); err != nil {
|
||||
return fmt.Errorf("decode login rsp: %w", err)
|
||||
}
|
||||
if loginRsp.Error != 0 {
|
||||
return fmt.Errorf("login rejected: %s", loginRsp.Detail)
|
||||
}
|
||||
|
||||
log.Printf("[client] login ok: node=%s, user=%s", loginRsp.Node, loginRsp.User)
|
||||
|
||||
// 4. Send ReportBasic
|
||||
c.sendReportBasic()
|
||||
|
||||
// 5. Register handlers
|
||||
c.registerHandlers()
|
||||
|
||||
// 6. Start heartbeat
|
||||
c.wg.Add(1)
|
||||
go c.heartbeatLoop()
|
||||
|
||||
// 7. Start relay if enabled
|
||||
if c.relayMgr != nil {
|
||||
if err := c.relayMgr.Start(); err != nil {
|
||||
log.Printf("[client] relay start failed: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// 8. Auto-run configured apps
|
||||
for _, app := range c.cfg.Apps {
|
||||
if app.Enabled {
|
||||
go c.connectApp(app)
|
||||
}
|
||||
}
|
||||
|
||||
// 9. Wait for disconnect
|
||||
return <-readErr
|
||||
}
|
||||
|
||||
func (c *Client) sendReportBasic() {
|
||||
hostname, _ := os.Hostname()
|
||||
report := protocol.ReportBasic{
|
||||
OS: runtime.GOOS,
|
||||
LanIP: getLocalIP(),
|
||||
Version: config.Version,
|
||||
HasIPv4: 1,
|
||||
}
|
||||
_ = hostname // for future use
|
||||
c.conn.Write(protocol.MsgReport, protocol.SubReportBasic, report)
|
||||
}
|
||||
|
||||
func (c *Client) registerHandlers() {
|
||||
// Handle connection coordination from server
|
||||
c.conn.OnMessage(protocol.MsgPush, protocol.SubPushConnectReq, func(data []byte) error {
|
||||
var req protocol.ConnectReq
|
||||
if err := protocol.DecodePayload(data, &req); err != nil {
|
||||
return err
|
||||
}
|
||||
log.Printf("[client] connect request: %s → %s (punch)", req.From, req.To)
|
||||
go c.handlePunchRequest(req)
|
||||
return nil
|
||||
})
|
||||
|
||||
// Handle peer online notification
|
||||
c.conn.OnMessage(protocol.MsgPush, protocol.SubPushNodeOnline, func(data []byte) error {
|
||||
var msg struct {
|
||||
Node string `json:"node"`
|
||||
}
|
||||
protocol.DecodePayload(data, &msg)
|
||||
log.Printf("[client] peer online: %s, retrying apps", msg.Node)
|
||||
// Retry apps targeting this node
|
||||
for _, app := range c.cfg.Apps {
|
||||
if app.Enabled && app.PeerNode == msg.Node {
|
||||
go c.connectApp(app)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
// Handle edit app push
|
||||
c.conn.OnMessage(protocol.MsgPush, protocol.SubPushEditApp, func(data []byte) error {
|
||||
var app protocol.AppConfig
|
||||
if err := protocol.DecodePayload(data, &app); err != nil {
|
||||
return err
|
||||
}
|
||||
log.Printf("[client] edit app push: %s → %s:%d", app.AppName, app.PeerNode, app.DstPort)
|
||||
go c.connectApp(config.AppConfig{
|
||||
AppName: app.AppName,
|
||||
Protocol: app.Protocol,
|
||||
SrcPort: app.SrcPort,
|
||||
PeerNode: app.PeerNode,
|
||||
DstHost: app.DstHost,
|
||||
DstPort: app.DstPort,
|
||||
Enabled: true,
|
||||
})
|
||||
return nil
|
||||
})
|
||||
|
||||
// Handle relay connect request (when this node acts as relay)
|
||||
if c.relayMgr != nil {
|
||||
c.conn.OnMessage(protocol.MsgPush, protocol.SubPushRelayOffer, func(data []byte) error {
|
||||
var req struct {
|
||||
From string `json:"from"`
|
||||
To string `json:"to"`
|
||||
Token uint64 `json:"token"`
|
||||
}
|
||||
if err := protocol.DecodePayload(data, &req); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Verify TOTP
|
||||
if !auth.VerifyTOTP(req.Token, c.cfg.Token, time.Now().Unix()) {
|
||||
log.Printf("[client] relay request from %s denied: TOTP mismatch", req.From)
|
||||
return nil
|
||||
}
|
||||
|
||||
log.Printf("[client] accepting relay: %s → %s", req.From, req.To)
|
||||
return nil
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Client) heartbeatLoop() {
|
||||
defer c.wg.Done()
|
||||
ticker := time.NewTicker(time.Duration(config.HeartbeatInterval) * time.Second)
|
||||
defer ticker.Stop()
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-ticker.C:
|
||||
if err := c.conn.Write(protocol.MsgHeartbeat, protocol.SubHeartbeatPing, nil); err != nil {
|
||||
log.Printf("[client] heartbeat send failed: %v", err)
|
||||
return
|
||||
}
|
||||
case <-c.quit:
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// connectApp establishes a tunnel for an app config.
|
||||
func (c *Client) connectApp(app config.AppConfig) {
|
||||
log.Printf("[client] connecting app %s: :%d → %s:%d", app.AppName, app.SrcPort, app.PeerNode, app.DstPort)
|
||||
|
||||
// Check if we already have a tunnel
|
||||
c.tMu.RLock()
|
||||
if t, ok := c.tunnels[app.PeerNode]; ok && t.IsAlive() {
|
||||
c.tMu.RUnlock()
|
||||
// Tunnel exists, just add the port forward
|
||||
if err := t.ListenAndForward(app.Protocol, app.SrcPort, app.DstHost, app.DstPort); err != nil {
|
||||
log.Printf("[client] listen error for %s: %v", app.AppName, err)
|
||||
}
|
||||
return
|
||||
}
|
||||
c.tMu.RUnlock()
|
||||
|
||||
// Request connection coordination from server
|
||||
req := protocol.ConnectReq{
|
||||
From: c.cfg.Node,
|
||||
To: app.PeerNode,
|
||||
Protocol: app.Protocol,
|
||||
SrcPort: app.SrcPort,
|
||||
DstHost: app.DstHost,
|
||||
DstPort: app.DstPort,
|
||||
}
|
||||
|
||||
rspData, err := c.conn.Request(
|
||||
protocol.MsgPush, protocol.SubPushConnectReq, req,
|
||||
protocol.MsgPush, protocol.SubPushConnectRsp,
|
||||
15*time.Second,
|
||||
)
|
||||
if err != nil {
|
||||
log.Printf("[client] connect coordination failed for %s: %v", app.PeerNode, err)
|
||||
c.tryRelay(app)
|
||||
return
|
||||
}
|
||||
|
||||
var rsp protocol.ConnectRsp
|
||||
protocol.DecodePayload(rspData, &rsp)
|
||||
if rsp.Error != 0 {
|
||||
log.Printf("[client] connect denied: %s", rsp.Detail)
|
||||
c.tryRelay(app)
|
||||
return
|
||||
}
|
||||
|
||||
// Attempt punch
|
||||
result := punch.Connect(punch.Config{
|
||||
PeerIP: rsp.Peer.IP,
|
||||
PeerPort: rsp.Peer.Port,
|
||||
PeerNAT: rsp.Peer.NATType,
|
||||
SelfNAT: c.natType,
|
||||
IsInitiator: true,
|
||||
})
|
||||
|
||||
if result.Error != nil {
|
||||
log.Printf("[client] punch failed for %s: %v", app.PeerNode, result.Error)
|
||||
c.tryRelay(app)
|
||||
c.reportConnect(app, protocol.ReportConnect{
|
||||
PeerNode: app.PeerNode, Error: result.Error.Error(),
|
||||
NATType: c.natType, PeerNATType: rsp.Peer.NATType,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// Punch success — create tunnel
|
||||
t := tunnel.New(app.PeerNode, result.Conn, result.Mode, result.RTT, true)
|
||||
c.tMu.Lock()
|
||||
c.tunnels[app.PeerNode] = t
|
||||
c.tMu.Unlock()
|
||||
|
||||
if err := t.ListenAndForward(app.Protocol, app.SrcPort, app.DstHost, app.DstPort); err != nil {
|
||||
log.Printf("[client] listen error: %v", err)
|
||||
}
|
||||
|
||||
c.reportConnect(app, protocol.ReportConnect{
|
||||
PeerNode: app.PeerNode, LinkMode: result.Mode,
|
||||
RTT: int(result.RTT.Milliseconds()),
|
||||
NATType: c.natType, PeerNATType: rsp.Peer.NATType,
|
||||
})
|
||||
|
||||
log.Printf("[client] tunnel established: %s via %s (rtt=%s)", app.PeerNode, result.Mode, result.RTT)
|
||||
}
|
||||
|
||||
// tryRelay attempts to use a relay node.
|
||||
func (c *Client) tryRelay(app config.AppConfig) {
|
||||
log.Printf("[client] trying relay for %s", app.PeerNode)
|
||||
|
||||
rspData, err := c.conn.Request(
|
||||
protocol.MsgRelay, protocol.SubRelayNodeReq,
|
||||
protocol.RelayNodeReq{PeerNode: app.PeerNode},
|
||||
protocol.MsgRelay, protocol.SubRelayNodeRsp,
|
||||
10*time.Second,
|
||||
)
|
||||
if err != nil {
|
||||
log.Printf("[client] relay request failed: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
var rsp protocol.RelayNodeRsp
|
||||
protocol.DecodePayload(rspData, &rsp)
|
||||
if rsp.Error != 0 {
|
||||
log.Printf("[client] no relay available for %s", app.PeerNode)
|
||||
return
|
||||
}
|
||||
|
||||
log.Printf("[client] relay via %s (%s mode), connecting...", rsp.RelayName, rsp.Mode)
|
||||
|
||||
// Connect to relay node
|
||||
result := punch.AttemptDirect(punch.Config{
|
||||
PeerIP: rsp.RelayIP,
|
||||
PeerPort: rsp.RelayPort,
|
||||
})
|
||||
if result.Error != nil {
|
||||
log.Printf("[client] relay connect failed: %v", result.Error)
|
||||
return
|
||||
}
|
||||
|
||||
t := tunnel.New(app.PeerNode, result.Conn, "relay-"+rsp.Mode, result.RTT, true)
|
||||
c.tMu.Lock()
|
||||
c.tunnels[app.PeerNode] = t
|
||||
c.tMu.Unlock()
|
||||
|
||||
if err := t.ListenAndForward(app.Protocol, app.SrcPort, app.DstHost, app.DstPort); err != nil {
|
||||
log.Printf("[client] relay listen error: %v", err)
|
||||
}
|
||||
|
||||
c.reportConnect(app, protocol.ReportConnect{
|
||||
PeerNode: app.PeerNode, LinkMode: "relay", RelayNode: rsp.RelayName,
|
||||
})
|
||||
|
||||
log.Printf("[client] relay tunnel established: %s via %s", app.PeerNode, rsp.RelayName)
|
||||
}
|
||||
|
||||
func (c *Client) handlePunchRequest(req protocol.ConnectReq) {
|
||||
log.Printf("[client] handling punch from %s, NAT=%s", req.From, req.Peer.NATType)
|
||||
|
||||
result := punch.Connect(punch.Config{
|
||||
PeerIP: req.Peer.IP,
|
||||
PeerPort: req.Peer.Port,
|
||||
PeerNAT: req.Peer.NATType,
|
||||
SelfNAT: c.natType,
|
||||
IsInitiator: false,
|
||||
})
|
||||
|
||||
rsp := protocol.ConnectRsp{
|
||||
From: c.cfg.Node,
|
||||
To: req.From,
|
||||
}
|
||||
|
||||
if result.Error != nil {
|
||||
rsp.Error = 1
|
||||
rsp.Detail = result.Error.Error()
|
||||
log.Printf("[client] punch from %s failed: %v", req.From, result.Error)
|
||||
} else {
|
||||
rsp.Peer = protocol.PunchParams{
|
||||
IP: c.publicIP,
|
||||
NATType: c.natType,
|
||||
}
|
||||
log.Printf("[client] punch from %s OK via %s", req.From, result.Mode)
|
||||
|
||||
// Create tunnel for the incoming connection
|
||||
t := tunnel.New(req.From, result.Conn, result.Mode, result.RTT, false)
|
||||
c.tMu.Lock()
|
||||
c.tunnels[req.From] = t
|
||||
c.tMu.Unlock()
|
||||
}
|
||||
|
||||
c.conn.Write(protocol.MsgPush, protocol.SubPushConnectRsp, rsp)
|
||||
}
|
||||
|
||||
func (c *Client) reportConnect(app config.AppConfig, rc protocol.ReportConnect) {
|
||||
rc.Protocol = app.Protocol
|
||||
rc.SrcPort = app.SrcPort
|
||||
rc.DstPort = app.DstPort
|
||||
rc.DstHost = app.DstHost
|
||||
rc.Version = config.Version
|
||||
rc.ShareBandwidth = c.cfg.ShareBandwidth
|
||||
c.conn.Write(protocol.MsgReport, protocol.SubReportConnect, rc)
|
||||
}
|
||||
|
||||
// Stop shuts down the client.
|
||||
func (c *Client) Stop() {
|
||||
close(c.quit)
|
||||
if c.conn != nil {
|
||||
c.conn.Close()
|
||||
}
|
||||
if c.relayMgr != nil {
|
||||
c.relayMgr.Stop()
|
||||
}
|
||||
c.tMu.Lock()
|
||||
for _, t := range c.tunnels {
|
||||
t.Close()
|
||||
}
|
||||
c.tMu.Unlock()
|
||||
c.wg.Wait()
|
||||
}
|
||||
|
||||
// ─── helpers ───
|
||||
|
||||
func getLocalIP() string {
|
||||
// Simple heuristic: find the first non-loopback IPv4
|
||||
addrs, _ := os.Hostname()
|
||||
_ = addrs
|
||||
return "0.0.0.0" // placeholder, will be properly implemented
|
||||
}
|
||||
79
internal/client/client_test.go
Normal file
79
internal/client/client_test.go
Normal file
@@ -0,0 +1,79 @@
|
||||
package client
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/openp2p-cn/inp2p/internal/server"
|
||||
"github.com/openp2p-cn/inp2p/pkg/config"
|
||||
"github.com/openp2p-cn/inp2p/pkg/nat"
|
||||
)
|
||||
|
||||
func TestClientLogin(t *testing.T) {
|
||||
// Server
|
||||
sCfg := config.DefaultServerConfig()
|
||||
sCfg.WSPort = 29400
|
||||
sCfg.STUNUDP1 = 29482
|
||||
sCfg.STUNUDP2 = 29484
|
||||
sCfg.STUNTCP1 = 29480
|
||||
sCfg.STUNTCP2 = 29481
|
||||
sCfg.Token = 777
|
||||
|
||||
stunQuit := make(chan struct{})
|
||||
defer close(stunQuit)
|
||||
go nat.ServeUDPSTUN(sCfg.STUNUDP1, stunQuit)
|
||||
go nat.ServeUDPSTUN(sCfg.STUNUDP2, stunQuit)
|
||||
go nat.ServeTCPSTUN(sCfg.STUNTCP1, stunQuit)
|
||||
go nat.ServeTCPSTUN(sCfg.STUNTCP2, stunQuit)
|
||||
|
||||
srv := server.New(sCfg)
|
||||
srv.StartCleanup()
|
||||
mux := http.NewServeMux()
|
||||
mux.HandleFunc("/ws", srv.HandleWS)
|
||||
go http.ListenAndServe(fmt.Sprintf(":%d", sCfg.WSPort), mux)
|
||||
time.Sleep(300 * time.Millisecond)
|
||||
|
||||
// Client
|
||||
cCfg := config.DefaultClientConfig()
|
||||
cCfg.ServerHost = "127.0.0.1"
|
||||
cCfg.ServerPort = 29400
|
||||
cCfg.Node = "testClient"
|
||||
cCfg.Token = 777
|
||||
cCfg.Insecure = true
|
||||
cCfg.RelayEnabled = true
|
||||
cCfg.STUNUDP1 = 29482
|
||||
cCfg.STUNUDP2 = 29484
|
||||
cCfg.STUNTCP1 = 29480
|
||||
cCfg.STUNTCP2 = 29481
|
||||
|
||||
c := New(cCfg)
|
||||
|
||||
// Run in background, should connect within 8 seconds
|
||||
connected := make(chan struct{})
|
||||
go func() {
|
||||
// We'll just let it run for a bit
|
||||
c.Run()
|
||||
}()
|
||||
|
||||
// Wait for login
|
||||
time.Sleep(8 * time.Second)
|
||||
|
||||
nodes := srv.GetOnlineNodes()
|
||||
log.Printf("Online nodes: %d", len(nodes))
|
||||
for _, n := range nodes {
|
||||
log.Printf(" - %s (NAT=%s, relay=%v)", n.Name, n.NATType, n.RelayEnabled)
|
||||
}
|
||||
|
||||
if len(nodes) == 1 && nodes[0].Name == "testClient" {
|
||||
close(connected)
|
||||
log.Println("✅ Client connected successfully!")
|
||||
} else {
|
||||
t.Fatalf("Expected testClient online, got %d nodes", len(nodes))
|
||||
}
|
||||
|
||||
c.Stop()
|
||||
srv.Stop()
|
||||
}
|
||||
Reference in New Issue
Block a user