Support multiple server

relay/client/manager.go

@@ -2,74 +2,88 @@ package client
 
 import (
 	"context"
+	"fmt"
 	"net"
-	"sync"
-	"time"
-
-	log "github.com/sirupsen/logrus"
 )
 
+// Manager todo: thread safe
 type Manager struct {
 	ctx        context.Context
 	srvAddress string
 	peerID     string
 
-	reconnectTime time.Duration
+	relayClient *Client
 
-	mu     sync.Mutex
-	client *Client
+	relayClients map[string]*Client
 }
 
 func NewManager(ctx context.Context, serverAddress string, peerID string) *Manager {
 	return &Manager{
-		ctx:           ctx,
-		srvAddress:    serverAddress,
-		peerID:        peerID,
-		reconnectTime: 5 * time.Second,
+		ctx:          ctx,
+		srvAddress:   serverAddress,
+		peerID:       peerID,
+		relayClients: make(map[string]*Client),
 	}
 }
 
-func (m *Manager) Serve() {
-	ok := m.mu.TryLock()
-	if !ok {
-		return
+func (m *Manager) Serve() error {
+	m.relayClient = NewClient(m.ctx, m.srvAddress, m.peerID)
+	err := m.relayClient.Connect()
+	if err != nil {
+		return err
 	}
+	return nil
+}
 
-	m.client = NewClient(m.ctx, m.srvAddress, m.peerID)
-
-	go func() {
-		defer m.mu.Unlock()
-
-		// todo this is not thread safe
-		for {
-			select {
-			case <-m.ctx.Done():
-				return
-			default:
-				m.connect()
-			}
-
-			select {
-			case <-m.ctx.Done():
-				return
-			case <-time.After(2 * time.Second): //timeout
-			}
-		}
-	}()
+func (m *Manager) RelayAddress() (net.Addr, error) {
+	if m.relayClient == nil {
+		return nil, fmt.Errorf("relay client not connected")
+	}
+	return m.relayClient.RelayRemoteAddress()
 }
 
 func (m *Manager) OpenConn(peerKey string) (net.Conn, error) {
-	// todo m.client nil check
-	return m.client.OpenConn(peerKey)
+	if m.relayClient == nil {
+		return nil, fmt.Errorf("relay client not connected")
+	}
+
+	rAddr, err := m.relayClient.RelayRemoteAddress()
+	if err != nil {
+		return nil, fmt.Errorf("relay client not connected")
+	}
+
+	return m.OpenConnTo(rAddr.String(), peerKey)
 }
 
-// connect is blocking
-func (m *Manager) connect() {
-	err := m.client.Connect()
-	if err != nil {
-		if m.ctx.Err() != nil {
-			return
-		}
-		log.Errorf("connection error with '%s': %s", m.srvAddress, err)
+func (m *Manager) OpenConnTo(serverAddress, peerKey string) (net.Conn, error) {
+	if m.relayClient == nil {
+		return nil, fmt.Errorf("relay client not connected")
 	}
+	rAddr, err := m.relayClient.RelayRemoteAddress()
+	if err != nil {
+		return nil, fmt.Errorf("relay client not connected")
+	}
+
+	if rAddr.String() == serverAddress {
+		return m.relayClient.OpenConn(peerKey)
+	}
+
+	relayClient, ok := m.relayClients[serverAddress]
+	if ok {
+		return relayClient.OpenConn(peerKey)
+	}
+
+	relayClient = NewClient(m.ctx, serverAddress, m.peerID)
+	err = relayClient.ConnectWithoutReconnect()
+	if err != nil {
+		return nil, err
+	}
+
+	conn, err := relayClient.OpenConn(peerKey)
+	if err != nil {
+		return nil, err
+	}
+
+	m.relayClients[serverAddress] = relayClient
+	return conn, nil
 }