fix(doq): no keep-alive made no sense here

client/client.go

@@ -279,7 +279,6 @@ func createClient(scheme, host, port, path string, opts Options) (DNSClient, err
 			Host:      host,
 			Port:      port,
 			DNSSEC:    opts.DNSSEC,
-			KeepAlive: opts.KeepAlive,
 		}
 		logger.Debug("Creating DoQ client with config: %+v", config)
 		return doq.New(config)

common/protocols/doq/doq.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io"
 	"net"
-	"sync"
 	"time"
 
 	"github.com/afonsofrancof/sdns-proxy/common/logger"
@@ -21,7 +20,6 @@ type Config struct {
 	Port   string
 	Debug  bool
 	DNSSEC bool
-	KeepAlive bool
 }
 
 type Client struct {
@@ -32,11 +30,10 @@ type Client struct {
 	quicTransport *quic.Transport
 	quicConfig    *quic.Config
 	config        Config
-	connMutex     sync.Mutex
 }
 
 func New(config Config) (*Client, error) {
-	logger.Debug("Creating DoQ client: %s:%s (KeepAlive: %v)", config.Host, config.Port, config.KeepAlive)
+	logger.Debug("Creating DoQ client: %s:%s", config.Host, config.Port)
 
 	tlsConfig := &tls.Config{
 		ServerName:         config.Host,
@@ -65,7 +62,9 @@ func New(config Config) (*Client, error) {
 		MaxIdleTimeout: 30 * time.Second,
 	}
 
-	client := &Client{
+	logger.Debug("DoQ client created: %s:%s (DNSSEC: %v)", config.Host, config.Port, config.DNSSEC)
+
+	return &Client{
 		targetAddr:    targetAddr,
 		tlsConfig:     tlsConfig,
 		udpConn:       udpConn,
@@ -73,52 +72,18 @@ func New(config Config) (*Client, error) {
 		quicTransport: &quicTransport,
 		quicConfig:    &quicConfig,
 		config:        config,
-	}
-
-	// If keep-alive is enabled, establish connection now
-	if config.KeepAlive {
-		if err := client.ensureConnection(); err != nil {
-			logger.Error("DoQ failed to establish initial connection: %v", err)
-			client.Close()
-			return nil, fmt.Errorf("failed to establish initial connection: %w", err)
-		}
-	}
-
-	logger.Debug("DoQ client created: %s:%s (DNSSEC: %v, KeepAlive: %v)", config.Host, config.Port, config.DNSSEC, config.KeepAlive)
-	return client, nil
+	}, nil
 }
 
 func (c *Client) Close() {
 	logger.Debug("Closing DoQ client")
-	c.connMutex.Lock()
-	defer c.connMutex.Unlock()
-	
-	if c.quicConn != nil {
-		c.quicConn.CloseWithError(0, "client shutdown")
-		c.quicConn = nil
-	}
 	if c.udpConn != nil {
 		c.udpConn.Close()
 	}
 }
 
-func (c *Client) ensureConnection() error {
-	c.connMutex.Lock()
-	defer c.connMutex.Unlock()
-
-	// Check if existing connection is still valid
-	if c.quicConn != nil {
-		select {
-		case <-c.quicConn.Context().Done():
-			logger.Debug("DoQ connection closed, reconnecting")
-			c.quicConn = nil
-		default:
-			// Connection is still valid
-			return nil
-		}
-	}
-
-	logger.Debug("Establishing DoQ connection to %s", c.targetAddr)
+func (c *Client) OpenConnection() error {
+	logger.Debug("Opening DoQ connection to %s", c.targetAddr)
 	quicConn, err := c.quicTransport.DialEarly(context.Background(), c.targetAddr, c.tlsConfig, c.quicConfig)
 	if err != nil {
 		logger.Error("DoQ connection failed to %s: %v", c.targetAddr, err)
@@ -136,19 +101,10 @@ func (c *Client) Query(msg *dns.Msg) (*dns.Msg, error) {
 		logger.Debug("DoQ query: %s %s to %s", question.Name, dns.TypeToString[question.Qtype], c.targetAddr)
 	}
 
-	// Ensure we have a connection (either persistent or new)
-	if c.config.KeepAlive {
-		if err := c.ensureConnection(); err != nil {
-			return nil, fmt.Errorf("doq: failed to ensure connection: %w", err)
-		}
-	} else {
-		// For non-keepalive mode, create a fresh connection for each query
-		c.connMutex.Lock()
-		c.quicConn = nil // Force new connection
-		c.connMutex.Unlock()
-		
-		if err := c.ensureConnection(); err != nil {
-			return nil, fmt.Errorf("doq: failed to create connection: %w", err)
+	if c.quicConn == nil {
+		err := c.OpenConnection()
+		if err != nil {
+			return nil, err
 		}
 	}
 
@@ -163,33 +119,18 @@ func (c *Client) Query(msg *dns.Msg) (*dns.Msg, error) {
 		return nil, fmt.Errorf("doq: failed to pack message: %w", err)
 	}
 
-	// Open a stream for this query
-	c.connMutex.Lock()
-	quicConn := c.quicConn
-	c.connMutex.Unlock()
-	
-	quicStream, err := quicConn.OpenStream()
+	var quicStream quic.Stream
+	quicStream, err = c.quicConn.OpenStream()
 	if err != nil {
-		logger.Error("DoQ failed to open stream: %v", err)
-		
-		// If keep-alive is enabled, try to reconnect once
-		if c.config.KeepAlive {
-			logger.Debug("DoQ stream failed with keep-alive, attempting reconnect")
-			if reconnectErr := c.ensureConnection(); reconnectErr != nil {
-				return nil, fmt.Errorf("doq: failed to reconnect: %w", reconnectErr)
+		logger.Debug("DoQ stream failed, reconnecting: %v", err)
+		err = c.OpenConnection()
+		if err != nil {
+			return nil, err
 		}
-			
-			c.connMutex.Lock()
-			quicConn = c.quicConn
-			c.connMutex.Unlock()
-			
-			quicStream, err = quicConn.OpenStream()
+		quicStream, err = c.quicConn.OpenStream()
 		if err != nil {
 			logger.Error("DoQ failed to open stream after reconnect: %v", err)
-				return nil, fmt.Errorf("doq: failed to open stream after reconnect: %w", err)
-			}
-		} else {
-			return nil, fmt.Errorf("doq: failed to open stream: %w", err)
+			return nil, err
 		}
 	}
 
@@ -243,15 +184,5 @@ func (c *Client) Query(msg *dns.Msg) (*dns.Msg, error) {
 		logger.Debug("DoQ response from %s: %d answers", c.targetAddr, len(recvMsg.Answer))
 	}
 
-	// Close the connection if not using keep-alive
-	if !c.config.KeepAlive {
-		c.connMutex.Lock()
-		if c.quicConn != nil {
-			c.quicConn.CloseWithError(0, "query complete")
-			c.quicConn = nil
-		}
-		c.connMutex.Unlock()
-	}
-
 	return recvMsg, nil
 }