Support passing context in Call

soap.go

@@ -2,6 +2,7 @@ package gosoap
 
 import (
 	"bytes"
+	"context"
 	"encoding/xml"
 	"errors"
 	"fmt"
@@ -100,19 +101,29 @@ type Client struct {
 	config               *Config
 }
 
+// Call call's the method m with Params p
+func (c *Client) CallContext(ctx context.Context, m string, p SoapParams) (res *Response, err error) {
+	return c.Do(ctx, NewRequest(m, p))
+}
+
 // Call call's the method m with Params p
 func (c *Client) Call(m string, p SoapParams) (res *Response, err error) {
-	return c.Do(NewRequest(m, p))
+	return c.CallContext(context.Background(), m, p)
 }
 
 // CallByStruct call's by struct
-func (c *Client) CallByStruct(s RequestStruct) (res *Response, err error) {
+func (c *Client) CallByStructContext(ctx context.Context, s RequestStruct) (res *Response, err error) {
 	req, err := NewRequestByStruct(s)
 	if err != nil {
 		return nil, err
 	}
 
-	return c.Do(req)
+	return c.Do(ctx, req)
+}
+
+// CallByStruct call's by struct
+func (c *Client) CallByStruct(s RequestStruct) (res *Response, err error) {
+	return c.CallByStructContext(context.Background(), s)
 }
 
 func (c *Client) waitAndRefreshDefinitions(d time.Duration) {
@@ -145,7 +156,7 @@ func (c *Client) SetWSDL(wsdl string) {
 }
 
 // Do Process Soap Request
-func (c *Client) Do(req *Request) (res *Response, err error) {
+func (c *Client) Do(ctx context.Context, req *Request) (res *Response, err error) {
 	c.onDefinitionsRefresh.Wait()
 	c.onRequest.Add(1)
 	defer c.onRequest.Done()
@@ -185,7 +196,7 @@ func (c *Client) Do(req *Request) (res *Response, err error) {
 		return nil, err
 	}
 
-	b, err := p.doRequest(c.Definitions.Services[0].Ports[0].SoapAddresses[0].Location)
+	b, err := p.doRequest(ctx, c.Definitions.Services[0].Ports[0].SoapAddresses[0].Location)
 	if err != nil {
 		return nil, ErrorWithPayload{err, p.Payload}
 	}
@@ -221,8 +232,8 @@ type process struct {
 
 // doRequest makes new request to the server using the c.Method, c.URL and the body.
 // body is enveloped in Do method
-func (p *process) doRequest(url string) ([]byte, error) {
-	req, err := http.NewRequest("POST", url, bytes.NewBuffer(p.Payload))
+func (p *process) doRequest(ctx context.Context, url string) ([]byte, error) {
+	req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewBuffer(p.Payload))
 	if err != nil {
 		return nil, err
 	}

soap_test.go

@@ -1,12 +1,16 @@
 package gosoap
 
 import (
+	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"log"
 	"net/http"
+	"net/http/httptest"
 	"regexp"
 	"testing"
+	"time"
 )
 
 var (
@@ -291,22 +295,37 @@ func TestProcess_doRequest(t *testing.T) {
 		},
 	}
 
-	_, err := c.doRequest("")
+	_, err := c.doRequest(context.Background(), "")
 	if err == nil {
 		t.Errorf("body is empty")
 	}
 
-	_, err = c.doRequest("://teste.")
+	_, err = c.doRequest(context.Background(), "://teste.")
 	if err == nil {
 		t.Errorf("invalid WSDL")
 	}
 
-	_, err = c.doRequest("https://google.com/non-existent-url")
+	_, err = c.doRequest(context.Background(), "https://google.com/non-existent-url")
 	if err == nil {
 		t.Errorf("err can't be nil")
 	}
 
 	if err != nil && err.Error() != "unexpected status code: 404 Not Found" {
 		t.Errorf("unexpected error: %s", err)
 	}
+
+	doneC := make(chan struct{})
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		<-doneC
+	}))
+	defer ts.Close()
+
+	ctx, cancelF := context.WithTimeout(context.Background(), time.Second)
+	defer cancelF()
+	_, err = c.doRequest(ctx, ts.URL)
+
+	if !errors.Is(err, context.DeadlineExceeded) {
+		t.Errorf("request didn't timeout")
+	}
+	close(doneC)
 }