refactor: re-impl sdk3rd

2025-06-17 10:39:39 +08:00
parent 9421da2cde
commit 299a722aa9
280 changed files with 6923 additions and 4658 deletions
--- a/internal/pkg/sdk3rd/upyun/console/api.go
+++ b/internal/pkg/sdk3rd/upyun/console/api.go
@@ -1,83 +0,0 @@
-package console
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-)
-
-func (c *Client) ensureCookieExists() error {
-	if c.loginCookie != "" {
-		return nil
-	}
-
-	req := &signinRequest{Username: c.username, Password: c.password}
-	res, err := c.sendRequest(http.MethodPost, "/accounts/signin/", req)
-	if err != nil {
-		return err
-	}
-
-	resp := &signinResponse{}
-	if err := json.Unmarshal(res.Body(), &resp); err != nil {
-		return fmt.Errorf("upyun api error: failed to unmarshal response: %w", err)
-	} else if !resp.Data.Result {
-		return errors.New("upyun console signin failed")
-	}
-
-	c.loginCookie = res.Header().Get("Set-Cookie")
-
-	return nil
-}
-
-func (c *Client) UploadHttpsCertificate(req *UploadHttpsCertificateRequest) (*UploadHttpsCertificateResponse, error) {
-	if err := c.ensureCookieExists(); err != nil {
-		return nil, err
-	}
-
-	resp := &UploadHttpsCertificateResponse{}
-	err := c.sendRequestWithResult(http.MethodPost, "/api/https/certificate/", req, resp)
-	return resp, err
-}
-
-func (c *Client) GetHttpsCertificateManager(certificateId string) (*GetHttpsCertificateManagerResponse, error) {
-	if err := c.ensureCookieExists(); err != nil {
-		return nil, err
-	}
-
-	req := &GetHttpsCertificateManagerRequest{CertificateId: certificateId}
-	resp := &GetHttpsCertificateManagerResponse{}
-	err := c.sendRequestWithResult(http.MethodGet, "/api/https/certificate/manager/", req, resp)
-	return resp, err
-}
-
-func (c *Client) UpdateHttpsCertificateManager(req *UpdateHttpsCertificateManagerRequest) (*UpdateHttpsCertificateManagerResponse, error) {
-	if err := c.ensureCookieExists(); err != nil {
-		return nil, err
-	}
-
-	resp := &UpdateHttpsCertificateManagerResponse{}
-	err := c.sendRequestWithResult(http.MethodPost, "/api/https/certificate/manager", req, resp)
-	return resp, err
-}
-
-func (c *Client) GetHttpsServiceManager(domain string) (*GetHttpsServiceManagerResponse, error) {
-	if err := c.ensureCookieExists(); err != nil {
-		return nil, err
-	}
-
-	req := &GetHttpsServiceManagerRequest{Domain: domain}
-	resp := &GetHttpsServiceManagerResponse{}
-	err := c.sendRequestWithResult(http.MethodGet, "/api/https/services/manager", req, resp)
-	return resp, err
-}
-
-func (c *Client) MigrateHttpsDomain(req *MigrateHttpsDomainRequest) (*MigrateHttpsDomainResponse, error) {
-	if err := c.ensureCookieExists(); err != nil {
-		return nil, err
-	}
-
-	resp := &MigrateHttpsDomainResponse{}
-	err := c.sendRequestWithResult(http.MethodPost, "/api/https/migrate/domain", req, resp)
-	return resp, err
-}
--- a/internal/pkg/sdk3rd/upyun/console/api_get_https_certificate_manager.go
+++ b/internal/pkg/sdk3rd/upyun/console/api_get_https_certificate_manager.go
@@ -0,0 +1,55 @@
+package console
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+)
+
+type HttpsCertificateManagerDomain struct {
+	Name       string `json:"name"`
+	Type       string `json:"type"`
+	BucketId   int64  `json:"bucket_id"`
+	BucketName string `json:"bucket_name"`
+}
+
+type GetHttpsCertificateManagerResponse struct {
+	apiResponseBase
+
+	Data *struct {
+		apiResponseBaseData
+
+		AuthenticateNum     int32                           `json:"authenticate_num"`
+		AuthenticateDomains []string                        `json:"authenticate_domain"`
+		Domains             []HttpsCertificateManagerDomain `json:"domains"`
+	} `json:"data,omitempty"`
+}
+
+func (c *Client) GetHttpsCertificateManager(certificateId string) (*GetHttpsCertificateManagerResponse, error) {
+	return c.GetHttpsCertificateManagerWithContext(context.Background(), certificateId)
+}
+
+func (c *Client) GetHttpsCertificateManagerWithContext(ctx context.Context, certificateId string) (*GetHttpsCertificateManagerResponse, error) {
+	if certificateId == "" {
+		return nil, fmt.Errorf("sdkerr: unset certificateId")
+	}
+
+	if err := c.ensureCookieExists(); err != nil {
+		return nil, err
+	}
+
+	httpreq, err := c.newRequest(http.MethodGet, "/api/https/certificate/manager/")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetQueryParam("certificate_id", certificateId)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &GetHttpsCertificateManagerResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}
--- a/internal/pkg/sdk3rd/upyun/console/api_get_https_service_manager.go
+++ b/internal/pkg/sdk3rd/upyun/console/api_get_https_service_manager.go
@@ -0,0 +1,60 @@
+package console
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+)
+
+type GetHttpsServiceManagerResponse struct {
+	apiResponseBase
+	Data *struct {
+		apiResponseBaseData
+		Status  int32                       `json:"status"`
+		Domains []HttpsServiceManagerDomain `json:"result"`
+	} `json:"data,omitempty"`
+}
+
+type HttpsServiceManagerDomain struct {
+	CertificateId string                            `json:"certificate_id"`
+	CommonName    string                            `json:"commonName"`
+	Https         bool                              `json:"https"`
+	ForceHttps    bool                              `json:"force_https"`
+	PaymentType   string                            `json:"payment_type"`
+	DomainType    string                            `json:"domain_type"`
+	Validity      HttpsServiceManagerDomainValidity `json:"validity"`
+}
+
+type HttpsServiceManagerDomainValidity struct {
+	Start int64 `json:"start"`
+	End   int64 `json:"end"`
+}
+
+func (c *Client) GetHttpsServiceManager(domain string) (*GetHttpsServiceManagerResponse, error) {
+	return c.GetHttpsServiceManagerWithContext(context.Background(), domain)
+}
+
+func (c *Client) GetHttpsServiceManagerWithContext(ctx context.Context, domain string) (*GetHttpsServiceManagerResponse, error) {
+	if domain == "" {
+		return nil, fmt.Errorf("sdkerr: unset domain")
+	}
+
+	if err := c.ensureCookieExists(); err != nil {
+		return nil, err
+	}
+
+	httpreq, err := c.newRequest(http.MethodGet, "/api/https/services/manager")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetQueryParam("domain", domain)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &GetHttpsServiceManagerResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}
--- a/internal/pkg/sdk3rd/upyun/console/api_migrate_https_domain.go
+++ b/internal/pkg/sdk3rd/upyun/console/api_migrate_https_domain.go
@@ -0,0 +1,46 @@
+package console
+
+import (
+	"context"
+	"net/http"
+)
+
+type MigrateHttpsDomainRequest struct {
+	CertificateId string `json:"crt_id"`
+	Domain        string `json:"domain_name"`
+}
+
+type MigrateHttpsDomainResponse struct {
+	apiResponseBase
+
+	Data *struct {
+		apiResponseBaseData
+
+		Status bool `json:"status"`
+	} `json:"data,omitempty"`
+}
+
+func (c *Client) MigrateHttpsDomain(req *MigrateHttpsDomainRequest) (*MigrateHttpsDomainResponse, error) {
+	return c.MigrateHttpsDomainWithContext(context.Background(), req)
+}
+
+func (c *Client) MigrateHttpsDomainWithContext(ctx context.Context, req *MigrateHttpsDomainRequest) (*MigrateHttpsDomainResponse, error) {
+	if err := c.ensureCookieExists(); err != nil {
+		return nil, err
+	}
+
+	httpreq, err := c.newRequest(http.MethodPost, "/api/https/migrate/domain")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &MigrateHttpsDomainResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}
--- a/internal/pkg/sdk3rd/upyun/console/api_update_https_certificate_manager.go
+++ b/internal/pkg/sdk3rd/upyun/console/api_update_https_certificate_manager.go
@@ -0,0 +1,48 @@
+package console
+
+import (
+	"context"
+	"net/http"
+)
+
+type UpdateHttpsCertificateManagerRequest struct {
+	CertificateId string `json:"certificate_id"`
+	Domain        string `json:"domain"`
+	Https         bool   `json:"https"`
+	ForceHttps    bool   `json:"force_https"`
+}
+
+type UpdateHttpsCertificateManagerResponse struct {
+	apiResponseBase
+
+	Data *struct {
+		apiResponseBaseData
+
+		Status bool `json:"status"`
+	} `json:"data,omitempty"`
+}
+
+func (c *Client) UpdateHttpsCertificateManager(req *UpdateHttpsCertificateManagerRequest) (*UpdateHttpsCertificateManagerResponse, error) {
+	return c.UpdateHttpsCertificateManagerWithContext(context.Background(), req)
+}
+
+func (c *Client) UpdateHttpsCertificateManagerWithContext(ctx context.Context, req *UpdateHttpsCertificateManagerRequest) (*UpdateHttpsCertificateManagerResponse, error) {
+	if err := c.ensureCookieExists(); err != nil {
+		return nil, err
+	}
+
+	httpreq, err := c.newRequest(http.MethodPost, "/api/https/certificate/manager")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &UpdateHttpsCertificateManagerResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}
--- a/internal/pkg/sdk3rd/upyun/console/api_upload_https_certificate.go
+++ b/internal/pkg/sdk3rd/upyun/console/api_upload_https_certificate.go
@@ -0,0 +1,51 @@
+package console
+
+import (
+	"context"
+	"net/http"
+)
+
+type UploadHttpsCertificateRequest struct {
+	Certificate string `json:"certificate"`
+	PrivateKey  string `json:"private_key"`
+}
+
+type UploadHttpsCertificateResponse struct {
+	apiResponseBase
+
+	Data *struct {
+		apiResponseBaseData
+
+		Status int32 `json:"status"`
+		Result struct {
+			CertificateId string `json:"certificate_id"`
+			CommonName    string `json:"commonName"`
+			Serial        string `json:"serial"`
+		} `json:"result"`
+	} `json:"data,omitempty"`
+}
+
+func (c *Client) UploadHttpsCertificate(req *UploadHttpsCertificateRequest) (*UploadHttpsCertificateResponse, error) {
+	return c.UploadHttpsCertificateWithContext(context.Background(), req)
+}
+
+func (c *Client) UploadHttpsCertificateWithContext(ctx context.Context, req *UploadHttpsCertificateRequest) (*UploadHttpsCertificateResponse, error) {
+	if err := c.ensureCookieExists(); err != nil {
+		return nil, err
+	}
+
+	httpreq, err := c.newRequest(http.MethodPost, "/api/https/certificate/")
+	if err != nil {
+		return nil, err
+	} else {
+		httpreq.SetBody(req)
+		httpreq.SetContext(ctx)
+	}
+
+	result := &UploadHttpsCertificateResponse{}
+	if _, err := c.doRequestWithResult(httpreq, result); err != nil {
+		return result, err
+	}
+
+	return result, nil
+}
--- a/internal/pkg/sdk3rd/upyun/console/client.go
+++ b/internal/pkg/sdk3rd/upyun/console/client.go
@@ -2,9 +2,10 @@ package console

 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
-	"strings"
+	"sync"
 	"time"

 	"github.com/go-resty/resty/v2"
@@ -14,18 +15,28 @@ type Client struct {
 	username string
 	password string

-	loginCookie string
+	loginCookie    string
+	loginCookieMtx sync.Mutex

 	client *resty.Client
 }

-func NewClient(username, password string) *Client {
+func NewClient(username, password string) (*Client, error) {
+	if username == "" {
+		return nil, fmt.Errorf("sdkerr: unset username")
+	}
+	if password == "" {
+		return nil, fmt.Errorf("sdkerr: unset password")
+	}
+
 	client := &Client{
 		username: username,
 		password: password,
 	}
 	client.client = resty.New().
 		SetBaseURL("https://console.upyun.com").
+		SetHeader("Accept", "application/json").
+		SetHeader("Content-Type", "application/json").
 		SetHeader("User-Agent", "certimate").
 		SetPreRequestHook(func(c *resty.Client, req *http.Request) error {
 			if client.loginCookie != "" {
@@ -35,64 +46,107 @@ func NewClient(username, password string) *Client {
 			return nil
 		})

-	return client
+	return 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) 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("upyun 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("upyun 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 interface{}) 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 resp, err
+	}
+
+	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 tdata := res.GetData(); tdata == nil {
+				return resp, fmt.Errorf("sdkerr: empty data")
+			} else if terrcode := tdata.GetErrorCode(); terrcode != 0 {
+				return resp, fmt.Errorf("sdkerr: code='%d', message='%s'", terrcode, tdata.GetMessage())
+			}
+		}
+	}
+
+	return resp, nil
+}
+
+func (c *Client) ensureCookieExists() error {
+	c.loginCookieMtx.Lock()
+	defer c.loginCookieMtx.Unlock()
+	if c.loginCookie != "" {
+		return nil
+	}
+
+	httpreq, err := c.newRequest(http.MethodPost, "/accounts/signin/")
+	if err != nil {
 		return err
+	} else {
+		httpreq.SetBody(map[string]string{
+			"username": c.username,
+			"password": c.password,
+		})
 	}

-	if err := json.Unmarshal(resp.Body(), &result); err != nil {
-		return fmt.Errorf("upyun api error: failed to unmarshal response: %w", err)
+	type signinResponse struct {
+		apiResponseBase
+		Data *struct {
+			apiResponseBaseData
+			Result bool `json:"result"`
+		} `json:"data,omitempty"`
 	}

-	tresp := &baseResponse{}
-	if err := json.Unmarshal(resp.Body(), &tresp); err != nil {
-		return fmt.Errorf("upyun api error: failed to unmarshal response: %w", err)
-	} else if tdata := tresp.GetData(); tdata == nil {
-		return fmt.Errorf("upyun api error: empty data")
-	} else if errcode := tdata.GetErrorCode(); errcode > 0 {
-		return fmt.Errorf("upyun api error: code='%d', message='%s'", errcode, tdata.GetErrorMessage())
+	result := &signinResponse{}
+	httpresp, err := c.doRequestWithResult(httpreq, result)
+	if err != nil {
+		return err
+	} else if !result.Data.Result {
+		return errors.New("sdkerr: failed to signin upyun console")
+	} else {
+		c.loginCookie = httpresp.Header().Get("Set-Cookie")
 	}

 	return nil
--- a/internal/pkg/sdk3rd/upyun/console/models.go
+++ b/internal/pkg/sdk3rd/upyun/console/models.go
@@ -1,141 +0,0 @@
-package console
-
-import (
-	"encoding/json"
-)
-
-type baseResponse struct {
-	Data *baseResponseData `json:"data,omitempty"`
-}
-
-func (r *baseResponse) GetData() *baseResponseData {
-	return r.Data
-}
-
-type baseResponseData struct {
-	ErrorCode    json.Number `json:"error_code"`
-	ErrorMessage string      `json:"message"`
-}
-
-func (r *baseResponseData) GetErrorCode() int32 {
-	if r.ErrorCode.String() == "" {
-		return 0
-	}
-
-	errcode, err := r.ErrorCode.Int64()
-	if err != nil {
-		return -1
-	}
-
-	return int32(errcode)
-}
-
-func (r *baseResponseData) GetErrorMessage() string {
-	return r.ErrorMessage
-}
-
-type signinRequest struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
-type signinResponse struct {
-	baseResponse
-	Data *struct {
-		baseResponseData
-		Result bool `json:"result"`
-	} `json:"data,omitempty"`
-}
-
-type UploadHttpsCertificateRequest struct {
-	Certificate string `json:"certificate"`
-	PrivateKey  string `json:"private_key"`
-}
-
-type UploadHttpsCertificateResponse struct {
-	baseResponse
-	Data *struct {
-		baseResponseData
-		Status int32 `json:"status"`
-		Result struct {
-			CertificateId string `json:"certificate_id"`
-			CommonName    string `json:"commonName"`
-			Serial        string `json:"serial"`
-		} `json:"result"`
-	} `json:"data,omitempty"`
-}
-
-type GetHttpsCertificateManagerRequest struct {
-	CertificateId string `json:"certificate_id"`
-}
-
-type GetHttpsCertificateManagerResponse struct {
-	baseResponse
-	Data *struct {
-		baseResponseData
-		AuthenticateNum     int32                           `json:"authenticate_num"`
-		AuthenticateDomains []string                        `json:"authenticate_domain"`
-		Domains             []HttpsCertificateManagerDomain `json:"domains"`
-	} `json:"data,omitempty"`
-}
-
-type HttpsCertificateManagerDomain struct {
-	Name       string `json:"name"`
-	Type       string `json:"type"`
-	BucketId   int64  `json:"bucket_id"`
-	BucketName string `json:"bucket_name"`
-}
-
-type UpdateHttpsCertificateManagerRequest struct {
-	CertificateId string `json:"certificate_id"`
-	Domain        string `json:"domain"`
-	Https         bool   `json:"https"`
-	ForceHttps    bool   `json:"force_https"`
-}
-
-type UpdateHttpsCertificateManagerResponse struct {
-	baseResponse
-	Data *struct {
-		baseResponseData
-		Status bool `json:"status"`
-	} `json:"data,omitempty"`
-}
-
-type GetHttpsServiceManagerRequest struct {
-	Domain string `json:"domain"`
-}
-
-type GetHttpsServiceManagerResponse struct {
-	baseResponse
-	Data *struct {
-		baseResponseData
-		Status  int32                       `json:"status"`
-		Domains []HttpsServiceManagerDomain `json:"result"`
-	} `json:"data,omitempty"`
-}
-
-type HttpsServiceManagerDomain struct {
-	CertificateId string `json:"certificate_id"`
-	CommonName    string `json:"commonName"`
-	Https         bool   `json:"https"`
-	ForceHttps    bool   `json:"force_https"`
-	PaymentType   string `json:"payment_type"`
-	DomainType    string `json:"domain_type"`
-	Validity      struct {
-		Start int64 `json:"start"`
-		End   int64 `json:"end"`
-	} `json:"validity"`
-}
-
-type MigrateHttpsDomainRequest struct {
-	CertificateId string `json:"crt_id"`
-	Domain        string `json:"domain_name"`
-}
-
-type MigrateHttpsDomainResponse struct {
-	baseResponse
-	Data *struct {
-		baseResponseData
-		Status bool `json:"status"`
-	} `json:"data,omitempty"`
-}
--- a/internal/pkg/sdk3rd/upyun/console/types.go
+++ b/internal/pkg/sdk3rd/upyun/console/types.go
@@ -0,0 +1,41 @@
+package console
+
+import (
+	"encoding/json"
+)
+
+type apiResponse interface {
+	GetData() *apiResponseBaseData
+}
+
+type apiResponseBase struct {
+	Data *apiResponseBaseData `json:"data,omitempty"`
+}
+
+func (r *apiResponseBase) GetData() *apiResponseBaseData {
+	return r.Data
+}
+
+var _ apiResponse = (*apiResponseBase)(nil)
+
+type apiResponseBaseData struct {
+	ErrorCode json.Number `json:"error_code,omitempty"`
+	Message   string      `json:"message,omitempty"`
+}
+
+func (r *apiResponseBaseData) GetErrorCode() int32 {
+	if r.ErrorCode.String() == "" {
+		return 0
+	}
+
+	errcode, err := r.ErrorCode.Int64()
+	if err != nil {
+		return -1
+	}
+
+	return int32(errcode)
+}
+
+func (r *apiResponseBaseData) GetMessage() string {
+	return r.Message
+}