Context support for Capmonster

Author: Matthew17-21

captchatools-go/capmonster.go

@@ -2,6 +2,7 @@ package captchatoolsgo
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -68,8 +69,13 @@ type capmonsterBalanceResponse struct {
 }
 
 func (c Capmonster) GetToken(additional ...*AdditionalData) (*CaptchaAnswer, error) {
-	return c.getCaptchaAnswer(additional...)
+	return c.getCaptchaAnswer(context.Background(), additional...)
 }
+
+func (c Capmonster) GetTokenWithContext(ctx context.Context, additional ...*AdditionalData) (*CaptchaAnswer, error) {
+	return c.getCaptchaAnswer(ctx, additional...)
+}
+
 func (c Capmonster) GetBalance() (float32, error) {
 	return c.getBalance()
 }
@@ -104,7 +110,7 @@ func (c Capmonster) getID(data *AdditionalData) (int, error) {
 }
 
 // This method gets the captcha token from the Capmonster API
-func (c Capmonster) getCaptchaAnswer(additional ...*AdditionalData) (*CaptchaAnswer, error) {
+func (c Capmonster) getCaptchaAnswer(ctx context.Context, additional ...*AdditionalData) (*CaptchaAnswer, error) {
 	var data *AdditionalData = nil
 	if len(additional) > 0 {
 		data = additional[0]
@@ -123,8 +129,13 @@ func (c Capmonster) getCaptchaAnswer(additional ...*AdditionalData) (*CaptchaAns
 	})
 	response := &capmonsterTokenResponse{}
 	for i := 0; i < 100; i++ {
-		resp, err := http.Post("https://api.capmonster.cloud/getTaskResult", "application/json", bytes.NewBuffer([]byte(payload)))
+		req, _ := http.NewRequestWithContext(ctx, "POST", "https://api.capmonster.cloud/getTaskResult", bytes.NewBufferString(string(payload)))
+		req.Header.Add("Content-Type", "application/json")
+		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/capmonster_test.go

@@ -1,6 +1,7 @@
 package captchatoolsgo
 
 import (
+	"context"
 	"os"
 	"testing"
 
@@ -132,7 +133,7 @@ func TestCapmonsterGetV2(t *testing.T) {
 	for _, c := range configs {
 		t.Run(c.Name, func(t *testing.T) {
 			a := &Capmonster{c.Config}
-			_, err := a.getCaptchaAnswer()
+			_, err := a.getCaptchaAnswer(context.Background())
 			if err != nil && !c.ExpectError {
 				t.Fatalf(`getID() Error: %v , wanted: %v`, err, nil)
 			}
@@ -193,7 +194,7 @@ func TestCapmonsterGetV2Additional(t *testing.T) {
 	for _, c := range configs {
 		t.Run(c.Name, func(t *testing.T) {
 			a := &Capmonster{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)
 			}
@@ -221,7 +222,7 @@ func TestCapmonsterGetV3(t *testing.T) {
 	for _, c := range configs {
 		t.Run(c.Name, func(t *testing.T) {
 			a := &Capmonster{c.Config}
-			_, err := a.getCaptchaAnswer()
+			_, err := a.getCaptchaAnswer(context.Background())
 			if err != nil && !c.ExpectError {
 				t.Fatalf(`getID() Error: %v , wanted: %v`, err, nil)
 			}
@@ -251,7 +252,7 @@ func Test2CapmonsterGetImage(t *testing.T) {
 	for _, c := range configs {
 		t.Run(c.Name, func(t *testing.T) {
 			a := &Capmonster{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)
 			}