Merge pull request #9454 from okatu-loli/fix/139-work-issue

fix(139): recover personal host for personal_new requests

Author: okatu-loli

drivers/139/driver.go

@@ -47,28 +47,12 @@ func (d *Yun139) Init(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-
-		// Query Route Policy
-		var resp QueryRoutePolicyResp
-		_, err = d.requestRoute(base.Json{
-			"userInfo": base.Json{
-				"userType":    1,
-				"accountType": 1,
-				"accountName": d.Account},
-			"modAddrType": 1,
-		}, &resp)
-		if err != nil {
-			return err
-		}
-		for _, policyItem := range resp.Data.RoutePolicyList {
-			if policyItem.ModName == "personal" {
-				d.PersonalCloudHost = policyItem.HttpsUrl
-				break
+		if d.Addition.Type == MetaPersonalNew {
+			err = d.ensurePersonalCloudHost()
+			if err != nil {
+				return err
 			}
 		}
-		if len(d.PersonalCloudHost) == 0 {
-			return fmt.Errorf("PersonalCloudHost is empty")
-		}
 
 		d.cron = cron.NewCron(time.Hour * 12)
 		d.cron.Do(func() {

drivers/139/util.go

@@ -215,6 +215,46 @@ func (d *Yun139) requestRoute(data interface{}, resp interface{}) ([]byte, error
 	return res.Body(), nil
 }
 
+func (d *Yun139) ensurePersonalCloudHost() error {
+	if d.ref != nil {
+		return d.ref.ensurePersonalCloudHost()
+	}
+	if d.PersonalCloudHost != "" {
+		return nil
+	}
+	if len(d.Authorization) == 0 {
+		return fmt.Errorf("authorization is empty")
+	}
+	if d.Account == "" {
+		if err := d.refreshToken(); err != nil {
+			return err
+		}
+	}
+
+	var resp QueryRoutePolicyResp
+	_, err := d.requestRoute(base.Json{
+		"userInfo": base.Json{
+			"userType":    1,
+			"accountType": 1,
+			"accountName": d.Account,
+		},
+		"modAddrType": 1,
+	}, &resp)
+	if err != nil {
+		return err
+	}
+	for _, policyItem := range resp.Data.RoutePolicyList {
+		if policyItem.ModName == "personal" && policyItem.HttpsUrl != "" {
+			d.PersonalCloudHost = strings.TrimRight(policyItem.HttpsUrl, "/")
+			break
+		}
+	}
+	if d.PersonalCloudHost == "" {
+		return fmt.Errorf("personal cloud host is empty")
+	}
+	return nil
+}
+
 func (d *Yun139) post(pathname string, data interface{}, resp interface{}) ([]byte, error) {
 	return d.request(pathname, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(data)
@@ -449,6 +489,9 @@ func unicode(str string) string {
 }
 
 func (d *Yun139) personalRequest(pathname string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
+	if err := d.ensurePersonalCloudHost(); err != nil {
+		return nil, err
+	}
 	url := d.getPersonalCloudHost() + pathname
 	req := base.RestyClient.R()
 	randStr := random.String(16)