fix: 在和相册请求中添加上下文参数以支持取消操作

Signed-off-by: MadDogOwner <xiaoran@xrgzs.top>

Author: xrgzs

drivers/139/driver.go

@@ -428,7 +428,7 @@ func (d *Yun139) Rename(ctx context.Context, srcObj model.Obj, newName string) e
 				"path":         path.Join(srcObj.GetPath(), srcObj.GetID()),
 			}
 			var resp ModifyCloudDocV2Resp
-			_, err = d.andAlbumRequest(pathname, data, &resp)
+			_, err = d.andAlbumRequest(ctx, pathname, data, &resp)
 			if err != nil {
 				return err
 			}
@@ -516,7 +516,7 @@ func (d *Yun139) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 		}
 
 		var resp base.Json // Assuming a generic JSON response for success/failure
-		_, err = d.andAlbumRequest(pathname, body, &resp)
+		_, err = d.andAlbumRequest(ctx, pathname, body, &resp)
 		// For now, we assume no error means success.
 	default:
 		err = errs.NotImplement

drivers/139/util.go

@@ -1067,7 +1067,7 @@ func sortedJsonStringify(obj interface{}) (string, error) {
 }
 
 // yun139EncryptedRequest handles the common encrypted request/response flow.
-func (d *Yun139) yun139EncryptedRequest(url string, body interface{}, headers map[string]string, aesKeyHex string, resp interface{}) ([]byte, error) {
+func (d *Yun139) yun139EncryptedRequest(ctx context.Context, url string, body interface{}, headers map[string]string, aesKeyHex string, resp interface{}) ([]byte, error) {
 	// 1. Decode AES key
 	aesKey, err := hex.DecodeString(aesKeyHex)
 	if err != nil {
@@ -1094,6 +1094,7 @@ func (d *Yun139) yun139EncryptedRequest(url string, body interface{}, headers ma
 
 	// 4. Make the request
 	res, err := base.RestyClient.R().
+		SetContext(ctx).
 		SetHeaders(headers).
 		SetBody(payload).
 		Post(url)
@@ -1177,7 +1178,7 @@ func (d *Yun139) step3_third_party_login(dycpwd string) (string, error) {
 	}
 
 	// 使用通用加密请求函数
-	decryptedLayer1StrBytes, err := d.yun139EncryptedRequest(ssoLoginURL, ssoRequestBodyRaw, ssoLoginHeaders, KEY_HEX_1, nil)
+	decryptedLayer1StrBytes, err := d.yun139EncryptedRequest(context.TODO(), ssoLoginURL, ssoRequestBodyRaw, ssoLoginHeaders, KEY_HEX_1, nil)
 	if err != nil {
 		return "", fmt.Errorf("step3 encrypted request failed: %w", err)
 	}
@@ -1251,7 +1252,7 @@ func (d *Yun139) loginWithPassword() (string, error) {
 	return newAuth, nil
 }
 
-func (d *Yun139) andAlbumRequest(pathname string, body interface{}, resp interface{}) ([]byte, error) {
+func (d *Yun139) andAlbumRequest(ctx context.Context, pathname string, body interface{}, resp interface{}) ([]byte, error) {
 	url := "https://group.yun.139.com/hcy/family/adapter/andAlbum/openApi" + pathname
 
 	headers := map[string]string{
@@ -1269,7 +1270,7 @@ func (d *Yun139) andAlbumRequest(pathname string, body interface{}, resp interfa
 		"accept-encoding":     "gzip",
 	}
 
-	return d.yun139EncryptedRequest(url, body, headers, KEY_HEX_1, resp)
+	return d.yun139EncryptedRequest(ctx, url, body, headers, KEY_HEX_1, resp)
 }
 
 func (d *Yun139) handleMetaGroupCopy(ctx context.Context, srcObj, dstDir model.Obj) error {
@@ -1298,7 +1299,7 @@ func (d *Yun139) handleMetaGroupCopy(ctx context.Context, srcObj, dstDir model.O
 	}
 
 	var resp base.Json
-	_, err := d.andAlbumRequest(pathname, body, &resp)
+	_, err := d.andAlbumRequest(ctx, pathname, body, &resp)
 	return err
 }