refactor: WARP

common/cloudflare/api.go

@@ -10,31 +10,26 @@ import (
 	"time"
 
 	"github.com/tidwall/gjson"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
-type CloudeflareApi struct {
+type CloudflareApi struct {
 	client http.Client
 }
 
-func NewCloudeflareApi(opts ...CloudflareApiOption) *CloudeflareApi {
-	api := &CloudeflareApi{http.Client{Timeout: 30 * time.Second}}
+func NewCloudflareApi(opts ...CloudflareApiOption) *CloudflareApi {
+	api := &CloudflareApi{http.Client{Timeout: 30 * time.Second}}
 	for _, opt := range opts {
 		opt(api)
 	}
 	return api
 }
 
-func (api *CloudeflareApi) CreateProfile(ctx context.Context) (*CloudflareProfile, error) {
-	privateKey, err := wgtypes.GeneratePrivateKey()
-	if err != nil {
-		return nil, err
-	}
+func (api *CloudflareApi) CreateProfile(ctx context.Context, publicKey string) (*CloudflareProfile, error) {
 	request, err := http.NewRequest("POST", "https://api.cloudflareclient.com/v0i1909051800/reg", strings.NewReader(
 		fmt.Sprintf(
 			"{\"install_id\":\"\",\"tos\":\"%s\",\"key\":\"%s\",\"fcm_token\":\"\",\"type\":\"ios\",\"locale\":\"en_US\"}",
 			time.Now().Format("2006-01-02T15:04:05.000Z"),
-			privateKey.PublicKey().String(),
+			publicKey,
 		),
 	))
 	if err != nil {
@@ -53,6 +48,27 @@ func (api *CloudeflareApi) CreateProfile(ctx context.Context) (*CloudflareProfil
 		return nil, err
 	}
 	profile := new(CloudflareProfile)
-	profile.Config.PrivateKey = privateKey.String()
+	return profile, json.NewDecoder(strings.NewReader(gjson.Get(string(content), "result").Raw)).Decode(profile)
+}
+
+func (api *CloudflareApi) GetProfile(ctx context.Context, authToken string, id string) (*CloudflareProfile, error) {
+	request, err := http.NewRequest("GET", "https://api.cloudflareclient.com/v0i1909051800/reg/"+id, nil)
+	if err != nil {
+		return nil, err
+	}
+	request.Header.Set("Authorization", "Bearer "+authToken)
+	response, err := api.client.Do(request.WithContext(ctx))
+	if err != nil {
+		return nil, err
+	}
+	defer response.Body.Close()
+	if response.StatusCode != 200 {
+		return nil, fmt.Errorf("status code is not 200")
+	}
+	content, err := io.ReadAll(response.Body)
+	if err != nil {
+		return nil, err
+	}
+	profile := new(CloudflareProfile)
 	return profile, json.NewDecoder(strings.NewReader(gjson.Get(string(content), "result").Raw)).Decode(profile)
 }

common/cloudflare/option.go

@@ -6,10 +6,10 @@ import (
 	"net/http"
 )
 
-type CloudflareApiOption func(api *CloudeflareApi)
+type CloudflareApiOption func(api *CloudflareApi)
 
 func WithDialContext(dialContext func(ctx context.Context, network, addr string) (net.Conn, error)) CloudflareApiOption {
-	return func(api *CloudeflareApi) {
+	return func(api *CloudflareApi) {
 		api.client.Transport = &http.Transport{
 			DialContext: dialContext,
 		}

common/cloudflare/profile.go

@@ -15,7 +15,7 @@ type CloudflareProfile struct {
 		PremiumData              int       `json:"premium_data"`
 		Quota                    int       `json:"quota"`
 		Usage                    int       `json:"usage"`
-		WarpPlus                 bool      `json:"warp_plus"`
+		WARPPlus                 bool      `json:"warp_plus"`
 		ReferralCount            int       `json:"referral_count"`
 		ReferralRenewalCountdown int       `json:"referral_renewal_countdown"`
 		Role                     string    `json:"role"`
@@ -23,9 +23,14 @@ type CloudflareProfile struct {
 		TTL                      time.Time `json:"ttl"`
 	} `json:"account"`
 	Config struct {
-		ClientID   string `json:"client_id"`
-		PrivateKey string `json:"private_key"`
-		Peers      []struct {
+		ClientID  string `json:"client_id"`
+		Interface struct {
+			Addresses struct {
+				V4 string `json:"v4"`
+				V6 string `json:"v6"`
+			} `json:"addresses"`
+		} `json:"interface"`
+		Peers []struct {
 			PublicKey string `json:"public_key"`
 			Endpoint  struct {
 				V4    string `json:"v4"`
@@ -34,12 +39,6 @@ type CloudflareProfile struct {
 				Ports []int  `json:"ports"`
 			} `json:"endpoint"`
 		} `json:"peers"`
-		Interface struct {
-			Addresses struct {
-				V4 string `json:"v4"`
-				V6 string `json:"v6"`
-			} `json:"addresses"`
-		} `json:"interface"`
 		Services struct {
 			HTTPProxy string `json:"http_proxy"`
 		} `json:"services"`
@@ -49,7 +48,7 @@ type CloudflareProfile struct {
 		} `json:"metrics"`
 	} `json:"config"`
 	Token           string    `json:"token"`
-	WarpEnabled     bool      `json:"warp_enabled"`
+	WARPEnabled     bool      `json:"warp_enabled"`
 	WaitlistEnabled bool      `json:"waitlist_enabled"`
 	Created         time.Time `json:"created"`
 	Updated         time.Time `json:"updated"`