Context support for 2Captcha

Author: Matthew17-21

captchatools-go/twocaptcha.go

@@ -2,6 +2,7 @@ package captchatoolsgo
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -43,8 +44,13 @@ type twocaptchaResponse struct {
 }
 
 func (t Twocaptcha) GetToken(additional ...*AdditionalData) (*CaptchaAnswer, error) {
-	return t.getCaptchaAnswer(additional...)
+	return t.getCaptchaAnswer(context.Background(), additional...)
 }
+
+func (t Twocaptcha) GetTokenWithContext(ctx context.Context, additional ...*AdditionalData) (*CaptchaAnswer, error) {
+	return t.getCaptchaAnswer(ctx, additional...)
+}
+
 func (t Twocaptcha) GetBalance() (float32, error) {
 	return t.getBalance()
 }
@@ -79,7 +85,7 @@ func (t Twocaptcha) getID(data *AdditionalData) (string, error) {
 }
 
 // This method gets the captcha token from the Capmonster API
-func (t Twocaptcha) getCaptchaAnswer(additional ...*AdditionalData) (*CaptchaAnswer, error) {
+func (t Twocaptcha) getCaptchaAnswer(ctx context.Context, additional ...*AdditionalData) (*CaptchaAnswer, error) {
 	var data *AdditionalData = nil
 	if len(additional) > 0 {
 		data = additional[0]
@@ -99,8 +105,12 @@ func (t Twocaptcha) getCaptchaAnswer(additional ...*AdditionalData) (*CaptchaAns
 		queueID,
 	)
 	for i := 0; i < 100; i++ {
-		resp, err := http.Get(urlToAnswer)
+		req, _ := http.NewRequestWithContext(ctx, "GET", urlToAnswer, nil)
+		resp, err := makeRequest(req)
 		if err != nil {
+			if errors.Is(err, context.DeadlineExceeded) {
+				return nil, fmt.Errorf("getCaptchaAnswer error: %w", err)
+			}
 			time.Sleep(3 * time.Second)
 			continue
 		}

captchatools-go/twocaptcha_test.go

@@ -1,9 +1,13 @@
 package captchatoolsgo
 
 import (
+	"context"
+	"errors"
 	"fmt"
+	"net/http"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/joho/godotenv"
 )
@@ -132,7 +136,7 @@ func Test2CaptchaGetV2(t *testing.T) {
 	for _, c := range configs {
 		t.Run(c.Name, func(t *testing.T) {
 			a := &Twocaptcha{c.Config}
-			_, err := a.getCaptchaAnswer()
+			_, err := a.getCaptchaAnswer(context.Background())
 			if err != nil && !c.ExpectError {
 				t.Fatalf(`getID() Error: %v , wanted: %v`, err, nil)
 			}
@@ -187,7 +191,7 @@ func Test2CaptchaGetV2Additional(t *testing.T) {
 	for _, c := range configs {
 		t.Run(c.Name, func(t *testing.T) {
 			a := &Twocaptcha{c.Config}
-			_, err := a.getCaptchaAnswer(c.AdditionalData)
+			_, err := a.getCaptchaAnswer(context.Background(), c.AdditionalData)
 			if err != nil && !c.ExpectError {
 				t.Fatalf(`getID() Error: %v , wanted: %v`, err, nil)
 			}
@@ -215,7 +219,7 @@ func Test2CaptchaGetV3(t *testing.T) {
 	for _, c := range configs {
 		t.Run(c.Name, func(t *testing.T) {
 			a := &Twocaptcha{c.Config}
-			_, err := a.getCaptchaAnswer()
+			_, err := a.getCaptchaAnswer(context.Background())
 			if err != nil && !c.ExpectError {
 				t.Fatalf(`getID() Error: %v , wanted: %v`, err, nil)
 			}
@@ -244,7 +248,7 @@ func Test2CaptchaGetImage(t *testing.T) {
 	for _, c := range configs {
 		t.Run(c.Name, func(t *testing.T) {
 			a := &Twocaptcha{c.Config}
-			answer, err := a.getCaptchaAnswer(&AdditionalData{B64Img: c.Image})
+			answer, err := a.getCaptchaAnswer(context.Background(), &AdditionalData{B64Img: c.Image})
 			if err != nil && !c.ExpectError {
 				t.Fatalf(`getID() Error: %v , wanted: %v`, err, nil)
 			}
@@ -255,3 +259,24 @@ func Test2CaptchaGetImage(t *testing.T) {
 		})
 	}
 }
+
+// go test -v -run ^TestSometing$ github.com/Matthew17-21/Captcha-Tools/captchatools-go
+func TestSometing(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 25*time.Second)
+	defer cancel()
+
+	reqToMake, _ := http.NewRequestWithContext(ctx, "GET", "https://httpbin.org/delay/10", nil)
+	c := http.Client{
+		Timeout: 5 * time.Second,
+	}
+
+	_, err := c.Do(reqToMake)
+	if err != nil {
+		fmt.Println(errors.Is(err, context.Canceled))
+		fmt.Println(errors.Is(err, context.DeadlineExceeded))
+		fmt.Printf("%v || %T\n", err, err)
+		return
+	}
+	t.Fatal("Not supposed to be any error")
+
+}