feat: new http client

Author: katallaxie

.env.local

@@ -0,0 +1,2 @@
+ACS_ENDPOINT_URL=
+ACS_KEY=

acs.go

@@ -11,18 +11,20 @@ import (
 
 // Client is the client for the ACS API.
 type Client struct {
-	c        *client.Client
 	SMS      *sms.Service
 	Call     *calls.Service
 	Identity *identities.Service
 }
 
 // New creates a new Client.
 func New(endpointURL, key string, c *http.Client) *Client {
-	base := client.New(endpointURL, key, c)
+	base := client.New().
+		Client(c).
+		Base(endpointURL).
+		QueryStruct(client.DefaultVersion).
+		SignProvider(client.NewHMacSigner(key))
 
 	return &Client{
-		c:        base,
 		SMS:      sms.NewService(base),
 		Identity: identities.NewService(base),
 		Call:     calls.NewService(base),

calls/calls.go

@@ -2,6 +2,7 @@ package calls
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/go-resty/resty/v2"
 	"github.com/zeiss/go-acs/client"
@@ -130,14 +131,24 @@ const (
 	TranscriptionTransportTypeWebsocket TranscriptionTransportType = "websocket"
 )
 
-// WithAuthToken sets the auth token.
-func WithAuthToken(token string) Opt {
-	return func(r *resty.Request) {
-		r.SetAuthToken(token)
+// CreateCall creates a call.
+func (s *Service) CreateCall(ctx context.Context, key string, body *CreateCallRequest) error {
+	res, err := s.client.New().Post("/calling/callConnections").BodyJSON(body).ReceiveSuccess(ctx, nil)
+	if err != nil {
+		return err
 	}
+
+	fmt.Println(res)
+
+	return nil
 }
 
-// CreateCall creates a call.
-func (s *Service) CreateCall(ctx context.Context, key string, req *CreateCallRequest, opts ...client.Opt) error {
-	return s.client.Post(ctx, key, "/calling/callConnections", "api-version=2024-06-15-preview", req, nil, opts...)
+// CallHangUp is the method for recognizing call.
+func (s *Service) CallHangUp(ctx context.Context, id string) error {
+	_, err := s.client.New().Delete(fmt.Sprintf("/calling/callConnections/%s", id)).ReceiveSuccess(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }

calls/events.go

@@ -3,8 +3,6 @@ package calls
 import (
 	"context"
 	"fmt"
-
-	"github.com/zeiss/go-acs/client"
 )
 
 // CallMediaPlayRequest is the body for playing media.
@@ -83,6 +81,11 @@ const (
 )
 
 // CallMediaPlay is the call media play.
-func (s *Service) CallMediaPlay(ctx context.Context, id string, key string, req *CallMediaPlayRequest, opts ...client.Opt) error {
-	return s.client.Post(ctx, key, fmt.Sprintf("/calling/callConnections/%s:play", id), "api-version=2024-06-15-preview", req, nil, opts...)
+func (s *Service) CallMediaPlay(ctx context.Context, id string, key string, body *CallMediaPlayRequest) error {
+	_, err := s.client.New().Post(fmt.Sprintf("/calling/callConnections/%s:play", id)).BodyJSON(body).ReceiveSuccess(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }

calls/hangup.go

@@ -3,8 +3,6 @@ package calls
 import (
 	"context"
 	"fmt"
-
-	"github.com/zeiss/go-acs/client"
 )
 
 // CallRecognizeRequest is the body for recognizing call.
@@ -117,6 +115,11 @@ type SpeechOptions struct {
 }
 
 // CallMediaRecognize is used to recognize the call.
-func (s *Service) CallMediaRecognize(ctx context.Context, id string, key string, req *CallRecognizeRequest, opts ...client.Opt) error {
-	return s.client.Post(ctx, key, fmt.Sprintf("/calling/callConnections/%s:recognize", id), "api-version=2024-06-15-preview", req, nil, opts...)
+func (s *Service) CallMediaRecognize(ctx context.Context, id string, key string, body *CallRecognizeRequest) error {
+	_, err := s.client.New().Post(fmt.Sprintf("/calling/callConnections/%s:recognize", id)).BodyJSON(body).ReceiveSuccess(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }

calls/play.go

@@ -0,0 +1,68 @@
+package client
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+	"strings"
+
+	goquery "github.com/google/go-querystring/query"
+)
+
+// BodyProvider provides Body content for http.Request attachment.
+type BodyProvider interface {
+	// ContentType returns the Content-Type of the body.
+	ContentType() string
+	// Body returns the io.Reader body.
+	Body() (io.Reader, error)
+}
+
+// bodyProvider provides the wrapped body value as a Body for reqests.
+type bodyProvider struct {
+	body io.Reader
+}
+
+func (p bodyProvider) ContentType() string {
+	return ""
+}
+
+func (p bodyProvider) Body() (io.Reader, error) {
+	return p.body, nil
+}
+
+// jsonBodyProvider encodes a JSON tagged struct value as a Body for requests.
+// See https://golang.org/pkg/encoding/json/#MarshalIndent for details.
+type jsonBodyProvider struct {
+	payload interface{}
+}
+
+func (p jsonBodyProvider) ContentType() string {
+	return jsonContentType
+}
+
+func (p jsonBodyProvider) Body() (io.Reader, error) {
+	buf := &bytes.Buffer{}
+	err := json.NewEncoder(buf).Encode(p.payload)
+	if err != nil {
+		return nil, err
+	}
+	return buf, nil
+}
+
+// formBodyProvider encodes a url tagged struct value as Body for requests.
+// See https://godoc.org/github.com/google/go-querystring/query for details.
+type formBodyProvider struct {
+	payload interface{}
+}
+
+func (p formBodyProvider) ContentType() string {
+	return formContentType
+}
+
+func (p formBodyProvider) Body() (io.Reader, error) {
+	values, err := goquery.Values(p.payload)
+	if err != nil {
+		return nil, err
+	}
+	return strings.NewReader(values.Encode()), nil
+}