feat: refactor resolver in separate package

pkg/models/models.go

@@ -0,0 +1,40 @@
+package models
+
+import "time"
+
+const (
+	// DefaultTLSPort specifies the default port for a DNS server connecting over TCP over TLS
+	DefaultTLSPort = "853"
+	// DefaultUDPPort specifies the default port for a DNS server connecting over UDP
+	DefaultUDPPort = "53"
+	// DefaultTCPPort specifies the default port for a DNS server connecting over TCP
+	DefaultTCPPort = "53"
+	UDPResolver    = "udp"
+	DOHResolver    = "doh"
+	TCPResolver    = "tcp"
+	DOTResolver    = "dot"
+)
+
+// QueryFlags is used store the query params
+// supplied by the user.
+type QueryFlags struct {
+	QNames           []string      `koanf:"query"`
+	QTypes           []string      `koanf:"type"`
+	QClasses         []string      `koanf:"class"`
+	Nameservers      []string      `koanf:"nameserver"`
+	UseIPv4          bool          `koanf:"ipv4"`
+	UseIPv6          bool          `koanf:"ipv6"`
+	DisplayTimeTaken bool          `koanf:"time"`
+	ShowJSON         bool          `koanf:"json"`
+	UseSearchList    bool          `koanf:"search"`
+	Ndots            int           `koanf:"ndots"`
+	Color            bool          `koanf:"color"`
+	Timeout          time.Duration `koanf:"timeout"`
+}
+
+// Nameserver represents the type of Nameserver
+// along with the server address.
+type Nameserver struct {
+	Address string
+	Type    string
+}

pkg/resolvers/resolver.go

@@ -4,16 +4,20 @@ import (
 	"time"
 
 	"github.com/miekg/dns"
+	"github.com/mr-karan/doggo/pkg/models"
 	"github.com/sirupsen/logrus"
 )
 
 // Options represent a set of common options
 // to configure a Resolver.
 type Options struct {
-	SearchList []string
-	Ndots      int
-	Timeout    time.Duration
-	Logger     *logrus.Logger
+	Nameservers []models.Nameserver
+	UseIPv4     bool
+	UseIPv6     bool
+	SearchList  []string
+	Ndots       int
+	Timeout     time.Duration
+	Logger      *logrus.Logger
 }
 
 // Resolver implements the configuration for a DNS
@@ -59,3 +63,70 @@ type Authority struct {
 	RTT        string `json:"rtt"`
 	Nameserver string `json:"nameserver"`
 }
+
+// LoadResolvers loads differently configured
+// resolvers based on a list of nameserver.
+func LoadResolvers(opts Options) ([]Resolver, error) {
+	var resolverOpts = Options{
+		Timeout:    opts.Timeout,
+		Ndots:      opts.Ndots,
+		SearchList: opts.SearchList,
+		Logger:     opts.Logger,
+	}
+	// for each nameserver, initialise the correct resolver
+	rslvrs := make([]Resolver, 0, len(opts.Nameservers))
+	for _, ns := range opts.Nameservers {
+		if ns.Type == models.DOHResolver {
+			opts.Logger.Debug("initiating DOH resolver")
+			rslvr, err := NewDOHResolver(ns.Address, resolverOpts)
+			if err != nil {
+				return rslvrs, err
+			}
+			rslvrs = append(rslvrs, rslvr)
+		}
+		if ns.Type == models.DOTResolver {
+			opts.Logger.Debug("initiating DOT resolver")
+			rslvr, err := NewClassicResolver(ns.Address,
+				ClassicResolverOpts{
+					IPv4Only: opts.UseIPv4,
+					IPv6Only: opts.UseIPv6,
+					UseTLS:   true,
+					UseTCP:   true,
+				}, resolverOpts)
+
+			if err != nil {
+				return rslvrs, err
+			}
+			rslvrs = append(rslvrs, rslvr)
+		}
+		if ns.Type == models.TCPResolver {
+			opts.Logger.Debug("initiating TCP resolver")
+			rslvr, err := NewClassicResolver(ns.Address,
+				ClassicResolverOpts{
+					IPv4Only: opts.UseIPv4,
+					IPv6Only: opts.UseIPv6,
+					UseTLS:   false,
+					UseTCP:   true,
+				}, resolverOpts)
+			if err != nil {
+				return rslvrs, err
+			}
+			rslvrs = append(rslvrs, rslvr)
+		}
+		if ns.Type == models.UDPResolver {
+			opts.Logger.Debug("initiating UDP resolver")
+			rslvr, err := NewClassicResolver(ns.Address,
+				ClassicResolverOpts{
+					IPv4Only: opts.UseIPv4,
+					IPv6Only: opts.UseIPv6,
+					UseTLS:   false,
+					UseTCP:   false,
+				}, resolverOpts)
+			if err != nil {
+				return rslvrs, err
+			}
+			rslvrs = append(rslvrs, rslvr)
+		}
+	}
+	return rslvrs, nil
+}

pkg/utils/logger.go

@@ -0,0 +1,13 @@
+package utils
+
+import "github.com/sirupsen/logrus"
+
+// InitLogger initializes logger.
+func InitLogger() *logrus.Logger {
+	logger := logrus.New()
+	logger.SetFormatter(&logrus.TextFormatter{
+		FullTimestamp:          true,
+		DisableLevelTruncation: true,
+	})
+	return logger
+}