move server address to constructor

README.md

@@ -20,14 +20,14 @@ go get github.com/tantalor93/doh-go
 ## Examples
 ```
 // create client with default settings
-c := doh.NewClient()
+c := doh.NewClient("https://1.1.1.1/dns-query")
 
 // prepare payload
 msg := dns.Msg{}
 msg.SetQuestion("google.com.", dns.TypeA)
 
 // send DNS query to Cloudflare Server over DoH using POST method
-r, err := c.SendViaPost(context.Background(), "https://1.1.1.1/dns-query", &msg)
+r, err := c.SendViaPost(context.Background(), &msg)
 if err != nil {
     panic(err)
 }

doh/client.go

@@ -12,12 +12,14 @@ import (
 
 // Client encapsulates and provides logic for querying DNS servers over DoH.
 type Client struct {
+	addr   string
 	client *http.Client
 }
 
 // NewClient creates new Client instance with standard net/http client.
-func NewClient(opts ...Option) *Client {
+func NewClient(addr string, opts ...Option) *Client {
 	client := &Client{
+		addr:   addr,
 		client: &http.Client{},
 	}
 	for _, opt := range opts {
@@ -26,44 +28,44 @@ func NewClient(opts ...Option) *Client {
 	return client
 }
 
-// SendViaPost sends DNS message to the given DNS server over DoH using POST method, see https://datatracker.ietf.org/doc/html/rfc8484#section-4.1
-func (dc *Client) SendViaPost(ctx context.Context, server string, msg *dns.Msg) (*dns.Msg, error) {
+// SendViaPost sends DNS message using HTTP POST method, see https://datatracker.ietf.org/doc/html/rfc8484#section-4.1
+func (c *Client) SendViaPost(ctx context.Context, msg *dns.Msg) (*dns.Msg, error) {
 	pack, err := msg.Pack()
 	if err != nil {
 		return nil, err
 	}
 
-	request, err := http.NewRequest("POST", server, bytes.NewReader(pack))
+	request, err := http.NewRequest("POST", c.addr, bytes.NewReader(pack))
 	if err != nil {
 		return nil, err
 	}
 	request = request.WithContext(ctx)
 	request.Header.Set("Accept", "application/dns-message")
 	request.Header.Set("content-type", "application/dns-message")
 
-	return dc.send(request)
+	return c.send(request)
 }
 
-// SendViaGet sends DNS message to the given DNS server over DoH using GET method, see https://datatracker.ietf.org/doc/html/rfc8484#section-4.1
-func (dc *Client) SendViaGet(ctx context.Context, server string, msg *dns.Msg) (*dns.Msg, error) {
+// SendViaGet sends DNS message using HTTP GET method, see https://datatracker.ietf.org/doc/html/rfc8484#section-4.1
+func (c *Client) SendViaGet(ctx context.Context, msg *dns.Msg) (*dns.Msg, error) {
 	pack, err := msg.Pack()
 	if err != nil {
 		return nil, err
 	}
 
-	url := fmt.Sprint(server, "?dns=", base64.RawURLEncoding.EncodeToString(pack))
+	url := fmt.Sprint(c.addr, "?dns=", base64.RawURLEncoding.EncodeToString(pack))
 	request, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, err
 	}
 	request = request.WithContext(ctx)
 	request.Header.Set("Accept", "application/dns-message")
 
-	return dc.send(request)
+	return c.send(request)
 }
 
-func (dc *Client) send(r *http.Request) (*dns.Msg, error) {
-	resp, err := dc.client.Do(r)
+func (c *Client) send(r *http.Request) (*dns.Msg, error) {
+	resp, err := c.client.Do(r)
 	if err != nil {
 		return nil, err
 	}

doh/client_test.go

@@ -82,9 +82,9 @@ func Test_SendViaPost(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			client := doh.NewClient()
+			client := doh.NewClient(ts.URL)
 
-			got, err := client.SendViaPost(context.Background(), ts.URL, tt.msg)
+			got, err := client.SendViaPost(context.Background(), tt.msg)
 
 			if tt.wantErr != nil {
 				require.ErrorAs(t, err, tt.wantErr, "SendViaPost() error")
@@ -162,9 +162,9 @@ func Test_SendViaGet(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			client := doh.NewClient()
+			client := doh.NewClient(ts.URL)
 
-			got, err := client.SendViaGet(context.Background(), ts.URL, tt.msg)
+			got, err := client.SendViaGet(context.Background(), tt.msg)
 
 			if tt.wantErr != nil {
 				require.ErrorAs(t, err, tt.wantErr, "SendViaPost() error")