0.1.0

internal/models/peer.go

@@ -0,0 +1,6 @@
+package models
+
+type PeerManifest struct {
+	IP     string `json:"ip" form:"ip" query:"ip"`
+	PubKey string `json:"pubkey" form:"pubkey" query:"pubkey" validate:"required"`
+}

internal/peer/handlers.go

@@ -0,0 +1,28 @@
+package peer
+
+import (
+	"github.com/labstack/echo/v4"
+	"github.com/rombintu/godpn/internal/models"
+)
+
+func (s *Server) connectHandler(c echo.Context) error {
+	var peerManifest models.PeerManifest
+
+	if err := c.Bind(peerManifest); err != nil {
+		return err
+	}
+
+	peer := NewPeer(peerManifest.PubKey)
+	if err := peer.Connect(peerManifest.IP, "8080"); err != nil {
+		return err
+	}
+	defer peer.Disconnect()
+
+	// TODO
+
+	return c.JSON(200, "OK")
+}
+
+func (s *Server) peerInfo(c echo.Context) error {
+	return nil
+}

internal/peer/peer.go

@@ -0,0 +1,102 @@
+package peer
+
+import (
+	"errors"
+	"io"
+	"log/slog"
+	"net"
+	"sync"
+
+	"github.com/shadowsocks/go-shadowsocks2/core"
+)
+
+const (
+	tcpNetwork = "tcp"
+	bufferSize = 32 * 1024 // 32KB
+)
+
+// Ошибки подключения
+var (
+	ErrNotConnected = errors.New("peer is not connected")
+)
+
+type Peer struct {
+	pubKey        string
+	connEncrypted net.Conn
+	mu            sync.Mutex
+	active        bool
+}
+
+func NewPeer(pubKey string) *Peer {
+	return &Peer{
+		pubKey: pubKey,
+		active: false,
+	}
+}
+
+func (p *Peer) Connect(ip, port string) error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	if p.active {
+		return nil // Уже подключен
+	}
+
+	conn, err := net.Dial(tcpNetwork, net.JoinHostPort(ip, port))
+	if err != nil {
+		return err
+	}
+
+	cipher, err := core.PickCipher("AEAD_CHACHA20_POLY1305", []byte(p.pubKey), "")
+	if err != nil {
+		conn.Close()
+		return err
+	}
+
+	p.connEncrypted = cipher.StreamConn(conn)
+	p.active = true
+	return nil
+}
+
+func (p *Peer) Disconnect() error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	if !p.active {
+		return nil
+	}
+
+	err := p.connEncrypted.Close()
+	p.active = false
+	return err
+}
+
+func (p *Peer) Start(localClient net.Conn) error {
+	if !p.active {
+		return ErrNotConnected
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(2)
+
+	// Логика проксирования в обе стороны
+	go p.pipeData(localClient, p.connEncrypted, &wg)
+	go p.pipeData(p.connEncrypted, localClient, &wg)
+
+	wg.Wait()
+	return nil
+}
+
+func (p *Peer) pipeData(src, dst net.Conn, wg *sync.WaitGroup) {
+	defer wg.Done()
+
+	buf := make([]byte, bufferSize)
+	_, err := io.CopyBuffer(dst, src, buf)
+	if err != nil {
+		slog.Warn("pipe data error", slog.String("message", err.Error()))
+	}
+
+	// Закрываем соединения при завершении
+	src.Close()
+	dst.Close()
+}

internal/peer/server.go

@@ -0,0 +1,31 @@
+package peer
+
+import (
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
+)
+
+type Server struct {
+	router *echo.Echo
+}
+
+func NewServer() *Server {
+	return &Server{
+		router: echo.New(),
+	}
+}
+
+func (s *Server) Configure() {
+	// Middleware
+	s.router.Use(middleware.Logger())
+	s.router.Use(middleware.Recover())
+	s.router.Use(middleware.CORS())
+
+	// Роуты
+	s.router.POST("/connect", s.connectHandler)
+	s.router.GET("/info", s.peerInfo)
+}
+
+func (s *Server) Run() error {
+	return s.router.Start(":8081")
+}

internal/tracker/handlers.go

@@ -0,0 +1,72 @@
+package tracker
+
+import (
+	"net/http"
+
+	"github.com/gorilla/websocket"
+	"github.com/labstack/echo/v4"
+	"github.com/rombintu/godpn/internal/models"
+)
+
+func (s *Server) registerHandler(c echo.Context) error {
+	var peer models.PeerManifest
+	if err := c.Bind(peer); err != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid request"})
+	}
+
+	if peer.PubKey == "" {
+		return c.JSON(http.StatusBadRequest, map[string]string{"error": "pubkey is required"})
+	}
+
+	ip := c.RealIP()
+	if peer.IP != "" {
+		ip = peer.IP
+	}
+
+	s.mu.Lock()
+	s.tracker.peers[ip] = peer.PubKey
+	s.mu.Unlock()
+
+	return c.JSON(http.StatusOK, map[string]string{
+		"status": "registered",
+		"ip":     ip,
+	})
+}
+
+// Обработчик списка peers (HTTP)
+func (s *Server) listPeers(c echo.Context) error {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	return c.JSON(http.StatusOK, s.tracker.peers)
+}
+
+// WebSocket handler для реального времени
+func (s *Server) websocketHandler(c echo.Context) error {
+	upgrader := websocket.Upgrader{
+		CheckOrigin: func(r *http.Request) bool { return true },
+	}
+
+	ws, err := upgrader.Upgrade(c.Response(), c.Request(), nil)
+	if err != nil {
+		return err
+	}
+	defer ws.Close()
+
+	// Отправляем текущий список peers при подключении
+	s.mu.RLock()
+	if err := ws.WriteJSON(s.tracker.peers); err != nil {
+		s.mu.RUnlock()
+		return err
+	}
+	s.mu.RUnlock()
+
+	// Ожидаем новые сообщения (можно добавить heartbeat)
+	for {
+		_, _, err := ws.ReadMessage()
+		if err != nil {
+			break
+		}
+	}
+
+	return nil
+}

internal/tracker/server.go

@@ -0,0 +1,37 @@
+package tracker
+
+import (
+	"sync"
+
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
+)
+
+type Server struct {
+	router  *echo.Echo
+	mu      sync.RWMutex
+	tracker *Tracker
+}
+
+func NewServer() *Server {
+	return &Server{
+		router:  echo.New(),
+		tracker: NewTracker(),
+	}
+}
+
+func (s *Server) Configure() {
+	// Middleware
+	s.router.Use(middleware.Logger())
+	s.router.Use(middleware.Recover())
+	s.router.Use(middleware.CORS())
+
+	// Роуты
+	s.router.POST("/register", s.registerHandler)
+	s.router.GET("/peers", s.listPeers)
+	s.router.GET("/ws", s.websocketHandler)
+}
+
+func (s *Server) Run() error {
+	return s.router.Start(":8080")
+}

internal/tracker/tracker.go

@@ -0,0 +1,11 @@
+package tracker
+
+type Tracker struct {
+	peers map[string]string
+}
+
+func NewTracker() *Tracker {
+	return &Tracker{
+		peers: make(map[string]string),
+	}
+}