refactor: re-impl sdk3rd

internal/pkg/sdk3rd/cdnfly/api.go

@@ -1,43 +0,0 @@
-package cdnfly
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-)
-
-func (c *Client) GetSite(req *GetSiteRequest) (*GetSiteResponse, error) {
-	if req.Id == "" {
-		return nil, fmt.Errorf("cdnfly api error: invalid parameter: Id")
-	}
-
-	resp := &GetSiteResponse{}
-	err := c.sendRequestWithResult(http.MethodGet, fmt.Sprintf("/v1/sites/%s", url.PathEscape(req.Id)), req, resp)
-	return resp, err
-}
-
-func (c *Client) UpdateSite(req *UpdateSiteRequest) (*UpdateSiteResponse, error) {
-	if req.Id == "" {
-		return nil, fmt.Errorf("cdnfly api error: invalid parameter: Id")
-	}
-
-	resp := &UpdateSiteResponse{}
-	err := c.sendRequestWithResult(http.MethodPut, fmt.Sprintf("/v1/sites/%s", url.PathEscape(req.Id)), req, resp)
-	return resp, err
-}
-
-func (c *Client) CreateCertificate(req *CreateCertificateRequest) (*CreateCertificateResponse, error) {
-	resp := &CreateCertificateResponse{}
-	err := c.sendRequestWithResult(http.MethodPost, "/v1/certs", req, resp)
-	return resp, err
-}
-
-func (c *Client) UpdateCertificate(req *UpdateCertificateRequest) (*UpdateCertificateResponse, error) {
-	if req.Id == "" {
-		return nil, fmt.Errorf("cdnfly api error: invalid parameter: Id")
-	}
-
-	resp := &UpdateCertificateResponse{}
-	err := c.sendRequestWithResult(http.MethodPut, fmt.Sprintf("/v1/certs/%s", url.PathEscape(req.Id)), req, resp)
-	return resp, err
-}

internal/pkg/sdk3rd/cdnfly/api_create_cert.go

@@ -0,0 +1,41 @@
+package cdnfly
+
+import (
+	"context"
+	"net/http"
+)
+
+type CreateCertRequest struct {
+	Name        *string `json:"name,omitempty"`
+	Description *string `json:"des,omitempty"`
+	Type        *string `json:"type,omitempty"`
+	Cert        *string `json:"cert,omitempty"`
+	Key         *string `json:"key,omitempty"`
+}
+
+type CreateCertResponse struct {
+	apiResponseBase
+
+	Data string `json:"data"`
+}
+
+func (c *Client) CreateCert(req *CreateCertRequest) (*CreateCertResponse, error) {
+	return c.CreateCertWithContext(context.Background(), req)
+}
+
+func (c *Client) CreateCertWithContext(ctx context.Context, req *CreateCertRequest) (*CreateCertResponse, error) {
+	httpreq, err := c.newRequest(http.MethodPost, "/certs")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &CreateCertResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/cdnfly/api_get_site.go

@@ -0,0 +1,43 @@
+package cdnfly
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+)
+
+type GetSiteResponse struct {
+	apiResponseBase
+
+	Data *struct {
+		Id          int64  `json:"id"`
+		Name        string `json:"name"`
+		Domain      string `json:"domain"`
+		HttpsListen string `json:"https_listen"`
+	} `json:"data,omitempty"`
+}
+
+func (c *Client) GetSite(siteId string) (*GetSiteResponse, error) {
+	return c.GetSiteWithContext(context.Background(), siteId)
+}
+
+func (c *Client) GetSiteWithContext(ctx context.Context, siteId string) (*GetSiteResponse, error) {
+	if siteId == "" {
+		return nil, fmt.Errorf("sdkerr: unset siteId")
+	}
+
+	httpreq, err := c.newRequest(http.MethodGet, fmt.Sprintf("/sites/%s", url.PathEscape(siteId)))
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetContext(ctx)
+	}
+
+	result := &GetSiteResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/cdnfly/api_update_cert.go

@@ -0,0 +1,46 @@
+package cdnfly
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+)
+
+type UpdateCertRequest struct {
+	Name        *string `json:"name,omitempty"`
+	Description *string `json:"des,omitempty"`
+	Type        *string `json:"type,omitempty"`
+	Cert        *string `json:"cert,omitempty"`
+	Key         *string `json:"key,omitempty"`
+	Enable      *bool   `json:"enable,omitempty"`
+}
+
+type UpdateCertResponse struct {
+	apiResponseBase
+}
+
+func (c *Client) UpdateCert(certId string, req *UpdateCertRequest) (*UpdateCertResponse, error) {
+	return c.UpdateCertWithContext(context.Background(), certId, req)
+}
+
+func (c *Client) UpdateCertWithContext(ctx context.Context, certId string, req *UpdateCertRequest) (*UpdateCertResponse, error) {
+	if certId == "" {
+		return nil, fmt.Errorf("sdkerr: unset certId")
+	}
+
+	httpreq, err := c.newRequest(http.MethodPut, fmt.Sprintf("/certs/%s", url.PathEscape(certId)))
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &UpdateCertResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/cdnfly/api_update_site.go

@@ -0,0 +1,42 @@
+package cdnfly
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+)
+
+type UpdateSiteRequest struct {
+	HttpsListen *string `json:"https_listen,omitempty"`
+	Enable      *bool   `json:"enable,omitempty"`
+}
+
+type UpdateSiteResponse struct {
+	apiResponseBase
+}
+
+func (c *Client) UpdateSite(siteId string, req *UpdateSiteRequest) (*UpdateSiteResponse, error) {
+	return c.UpdateSiteWithContext(context.Background(), siteId, req)
+}
+
+func (c *Client) UpdateSiteWithContext(ctx context.Context, siteId string, req *UpdateSiteRequest) (*UpdateSiteResponse, error) {
+	if siteId == "" {
+		return nil, fmt.Errorf("sdkerr: unset siteId")
+	}
+
+	httpreq, err := c.newRequest(http.MethodPut, fmt.Sprintf("/sites/%s", url.PathEscape(siteId)))
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &UpdateSiteResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}

internal/pkg/sdk3rd/cdnfly/client.go

@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"net/http"
+	"net/url"
 	"strings"
 	"time"
 
@@ -15,72 +15,95 @@ type Client struct {
 	client *resty.Client
 }
 
-func NewClient(serverUrl, apiKey, apiSecret string) *Client {
+func NewClient(serverUrl, apiKey, apiSecret string) (*Client, error) {
+	if serverUrl == "" {
+		return nil, fmt.Errorf("sdkerr: unset serverUrl")
+	}
+	if _, err := url.Parse(serverUrl); err != nil {
+		return nil, fmt.Errorf("sdkerr: invalid serverUrl: %w", err)
+	}
+	if apiKey == "" {
+		return nil, fmt.Errorf("sdkerr: unset apiKey")
+	}
+	if apiSecret == "" {
+		return nil, fmt.Errorf("sdkerr: unset apiSecret")
+	}
+
 	client := resty.New().
-		SetBaseURL(strings.TrimRight(serverUrl, "/")).
+		SetBaseURL(strings.TrimRight(serverUrl, "/")+"/v1").
+		SetHeader("Accept", "application/json").
+		SetHeader("Content-Type", "application/json").
 		SetHeader("User-Agent", "certimate").
 		SetHeader("API-Key", apiKey).
 		SetHeader("API-Secret", apiSecret)
 
-	return &Client{
-		client: client,
-	}
+	return &Client{client}, nil
 }
 
-func (c *Client) WithTimeout(timeout time.Duration) *Client {
+func (c *Client) SetTimeout(timeout time.Duration) *Client {
 	c.client.SetTimeout(timeout)
 	return c
 }
 
-func (c *Client) WithTLSConfig(config *tls.Config) *Client {
+func (c *Client) SetTLSConfig(config *tls.Config) *Client {
 	c.client.SetTLSClientConfig(config)
 	return c
 }
 
-func (c *Client) sendRequest(method string, path string, params interface{}) (*resty.Response, error) {
-	req := c.client.R()
-	if strings.EqualFold(method, http.MethodGet) {
-		qs := make(map[string]string)
-		if params != nil {
-			temp := make(map[string]any)
-			jsonb, _ := json.Marshal(params)
-			json.Unmarshal(jsonb, &temp)
-			for k, v := range temp {
-				if v != nil {
-					qs[k] = fmt.Sprintf("%v", v)
-				}
-			}
-		}
-
-		req = req.SetQueryParams(qs)
-	} else {
-		req = req.SetHeader("Content-Type", "application/json").SetBody(params)
+func (c *Client) newRequest(method string, path string) (*resty.Request, error) {
+	if method == "" {
+		return nil, fmt.Errorf("sdkerr: unset method")
+	}
+	if path == "" {
+		return nil, fmt.Errorf("sdkerr: unset path")
 	}
 
-	resp, err := req.Execute(method, path)
+	req := c.client.R()
+	req.Method = method
+	req.URL = path
+	return req, nil
+}
+
+func (c *Client) doRequest(req *resty.Request) (*resty.Response, error) {
+	if req == nil {
+		return nil, fmt.Errorf("sdkerr: nil request")
+	}
+
+	// WARN:
+	//   PLEASE DO NOT USE `req.SetResult` or `req.SetError` HERE! USE `doRequestWithResult` INSTEAD.
+
+	resp, err := req.Send()
 	if err != nil {
-		return resp, fmt.Errorf("cdnfly api error: failed to send request: %w", err)
+		return resp, fmt.Errorf("sdkerr: failed to send request: %w", err)
 	} else if resp.IsError() {
-		return resp, fmt.Errorf("cdnfly api error: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
+		return resp, fmt.Errorf("sdkerr: unexpected status code: %d, resp: %s", resp.StatusCode(), resp.String())
 	}
 
 	return resp, nil
 }
 
-func (c *Client) sendRequestWithResult(method string, path string, params interface{}, result BaseResponse) error {
-	resp, err := c.sendRequest(method, path, params)
+func (c *Client) doRequestWithResult(req *resty.Request, res apiResponse) (*resty.Response, error) {
+	if req == nil {
+		return nil, fmt.Errorf("sdkerr: nil request")
+	}
+
+	resp, err := c.doRequest(req)
 	if err != nil {
 		if resp != nil {
-			json.Unmarshal(resp.Body(), &result)
+			json.Unmarshal(resp.Body(), &res)
 		}
-		return err
+		return resp, err
 	}
 
-	if err := json.Unmarshal(resp.Body(), &result); err != nil {
-		return fmt.Errorf("cdnfly api error: failed to unmarshal response: %w", err)
-	} else if errcode := result.GetCode(); errcode != "" && errcode != "0" {
-		return fmt.Errorf("cdnfly api error: code='%s', message='%s'", errcode, result.GetMessage())
+	if len(resp.Body()) != 0 {
+		if err := json.Unmarshal(resp.Body(), &res); err != nil {
+			return resp, fmt.Errorf("sdkerr: failed to unmarshal response: %w", err)
+		} else {
+			if tcode := res.GetCode(); tcode != "" && tcode != "0" {
+				return resp, fmt.Errorf("sdkerr: code='%s', message='%s'", tcode, res.GetMessage())
+			}
+		}
 	}
 
-	return nil
+	return resp, nil
 }

internal/pkg/sdk3rd/cdnfly/models.go

@@ -1,84 +0,0 @@
-package cdnfly
-
-import "fmt"
-
-type BaseResponse interface {
-	GetCode() string
-	GetMessage() string
-}
-
-type baseResponse struct {
-	Code    any    `json:"code"`
-	Message string `json:"msg"`
-}
-
-func (r *baseResponse) GetCode() string {
-	if r.Code == nil {
-		return ""
-	}
-
-	if code, ok := r.Code.(int); ok {
-		return fmt.Sprintf("%d", code)
-	}
-
-	if code, ok := r.Code.(string); ok {
-		return code
-	}
-
-	return ""
-}
-
-func (r *baseResponse) GetMessage() string {
-	return r.Message
-}
-
-type GetSiteRequest struct {
-	Id string `json:"-"`
-}
-
-type GetSiteResponse struct {
-	baseResponse
-	Data *struct {
-		Id          int64  `json:"id"`
-		Name        string `json:"name"`
-		Domain      string `json:"domain"`
-		HttpsListen string `json:"https_listen"`
-	} `json:"data,omitempty"`
-}
-
-type UpdateSiteRequest struct {
-	Id          string  `json:"-"`
-	HttpsListen *string `json:"https_listen,omitempty"`
-	Enable      *bool   `json:"enable,omitempty"`
-}
-
-type UpdateSiteResponse struct {
-	baseResponse
-}
-
-type CreateCertificateRequest struct {
-	Name        string  `json:"name"`
-	Description *string `json:"des,omitempty"`
-	Type        string  `json:"type"`
-	Cert        string  `json:"cert"`
-	Key         string  `json:"key"`
-}
-
-type CreateCertificateResponse struct {
-	baseResponse
-	Data string `json:"data"`
-}
-
-type UpdateCertificateRequest struct {
-	Id          string  `json:"-"`
-	Name        *string `json:"name,omitempty"`
-	Description *string `json:"des,omitempty"`
-	Type        *string `json:"type,omitempty"`
-	Cert        *string `json:"cert,omitempty"`
-	Key         *string `json:"key,omitempty"`
-	Enable      *bool   `json:"enable,omitempty"`
-}
-
-type UpdateCertificateResponse struct {
-	baseResponse
-}

internal/pkg/sdk3rd/cdnfly/types.go

@@ -0,0 +1,46 @@
+package cdnfly
+
+import (
+	"bytes"
+	"encoding/json"
+	"strconv"
+)
+
+type apiResponse interface {
+	GetCode() string
+	GetMessage() string
+}
+
+type apiResponseBase struct {
+	Code    json.RawMessage `json:"code"`
+	Message string          `json:"msg"`
+}
+
+func (r *apiResponseBase) GetCode() string {
+	if r.Code == nil {
+		return ""
+	}
+
+	decoder := json.NewDecoder(bytes.NewReader(r.Code))
+	token, err := decoder.Token()
+	if err != nil {
+		return ""
+	}
+
+	switch t := token.(type) {
+	case string:
+		return t
+	case float64:
+		return strconv.FormatFloat(t, 'f', -1, 64)
+	case json.Number:
+		return t.String()
+	default:
+		return ""
+	}
+}
+
+func (r *apiResponseBase) GetMessage() string {
+	return r.Message
+}
+
+var _ apiResponse = (*apiResponseBase)(nil)