Merge pull request #393 from yxxyun/dev

Update quarkuc extractor
2026-05-08 01:10:35 +00:00 · 2025-02-22 06:23:02 +01:00 · 2025-02-22 06:23:02 +01:00 · ee07314b14
commit ee07314b14
parent f841c1adde 721f0dbace
3 changed files with 122 additions and 108 deletions
--- a/lib/eval/model/m_bridge.dart
+++ b/lib/eval/model/m_bridge.dart
@ -350,31 +350,38 @@ class MBridge {
        .videosFromUrl(url, newHeaders, prefix: prefix, suffix: suffix);
  }

-  static Future<List<Map<String, String>>> quarkFilesExtractor(
-      List<String> url, String cookie) async {
-    QuarkUcExtractor quark = QuarkUcExtractor();
-    await quark.initCloudDrive(cookie, CloudDriveType.quark);
-    return await quark.videoFilesFromUrl(url);
+  static final Map<CloudDriveType, QuarkUcExtractor> _extractorCache = {};
+
+  static QuarkUcExtractor _getExtractor(String cookie, CloudDriveType type) {
+    if (!_extractorCache.containsKey(type)) {
+      QuarkUcExtractor extractor = QuarkUcExtractor();
+      extractor.initCloudDrive(cookie, type);
+      _extractorCache[type] = extractor;
+    }
+    return _extractorCache[type]!;
  }

-  static Future<List<Map<String, String>>> ucFilesExtractor(
+  static Future<List<Map<String, String>>> quarkFilesExtractor(
      List<String> url, String cookie) async {
-    QuarkUcExtractor uc = QuarkUcExtractor();
-    await uc.initCloudDrive(cookie, CloudDriveType.uc);
-    return await uc.videoFilesFromUrl(url);
+    var quark = _getExtractor(cookie, CloudDriveType.quark);
+    return await quark.videoFilesFromUrl(url);
  }

  static Future<List<Video>> quarkVideosExtractor(
      String url, String cookie) async {
-    QuarkUcExtractor quark = QuarkUcExtractor();
-    await quark.initCloudDrive(cookie, CloudDriveType.quark);
+    var quark = _getExtractor(cookie, CloudDriveType.quark);
    return await quark.videosFromUrl(url);
  }

+  static Future<List<Map<String, String>>> ucFilesExtractor(
+      List<String> url, String cookie) async {
+    var uc = _getExtractor(cookie, CloudDriveType.uc);
+    return await uc.videoFilesFromUrl(url);
+  }
+
  static Future<List<Video>> ucVideosExtractor(
      String url, String cookie) async {
-    QuarkUcExtractor uc = QuarkUcExtractor();
-    await uc.initCloudDrive(cookie, CloudDriveType.uc);
+    var uc = _getExtractor(cookie, CloudDriveType.uc);
    return await uc.videosFromUrl(url);
  }

--- a/lib/services/anime_extractors/quarkuc_extractor.dart
+++ b/lib/services/anime_extractors/quarkuc_extractor.dart
@ -12,48 +12,62 @@ enum CloudDriveType {

 class QuarkUcExtractor {
  late CloudDriveType cloudDriveType;
-  String apiUrl = ""; //"https://drive-pc.quark.cn/1/clouddrive/";
-  String cookie = "";
+  String apiUrl = "";
+  // String cookie = "";
+  String refererUrl = "";
+  String ua = "";
+  String host = "";
  Map<String, dynamic> shareTokenCache = {};
-  String pr = ""; //"pr=ucpro&fr=pc";
+  String pr = "";
  final List<String> subtitleExts = ['.srt', '.ass', '.scc', '.stl', '.ttml'];
  Map<String, String> saveFileIdCaches = {};
  String? saveDirId;
  final String saveDirName = 'TV';
+  String _lastCookie = "";

  Future<void> initCloudDrive(
      String cookie, CloudDriveType cloudDriveType) async {
-    this.cookie = cookie;
    this.cloudDriveType = cloudDriveType;
    if (cloudDriveType == CloudDriveType.quark) {
      apiUrl = "https://drive-pc.quark.cn/1/clouddrive/";
      pr = "pr=ucpro&fr=pc";
+      ua =
+          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) quark-cloud-drive/2.5.20 Chrome/100.0.4896.160 Electron/18.3.5.4-b478491100 Safari/537.36 Channel/pckk_other_ch";
+      refererUrl = "https://pan.quark.cn/";
+      host = "https://quark.cn";
+      _lastCookie = "https://quarkcookie.last";
    } else {
      apiUrl = "https://pc-api.uc.cn/1/clouddrive/";
      pr = "pr=UCBrowser&fr=pc";
+      ua =
+          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) uc-cloud-drive/2.5.20 Chrome/100.0.4896.160 Electron/18.3.5.4-b478491100 Safari/537.36 Channel/pckk_other_ch";
+      refererUrl = "https://drive.uc.cn/";
+      host = "https://uc.cn";
+      _lastCookie = "https://uccookie.last";
+    }
+    if (cookie.isNotEmpty && getLastCookie() != cookie) {
+      MClient.setCookie(host, ua, null, cookie: cookie);
+      MClient.setCookie(_lastCookie, ua, null, cookie: cookie);
    }
  }

+  String getLastCookie() {
+    var cookie = MClient.getCookiesPref(_lastCookie);
+    return cookie.isNotEmpty ? cookie.values.first : "";
+  }
+
+  String getCurrentCookie() {
+    var cookie = MClient.getCookiesPref(host);
+    return cookie.isNotEmpty ? cookie.values.first : "";
+  }
+
  Map<String, String> getHeaders() {
-    if (cloudDriveType == CloudDriveType.quark) {
-      return {
-        'User-Agent':
-            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) quark-cloud-drive/2.5.20 Chrome/100.0.4896.160 Electron/18.3.5.4-b478491100 Safari/537.36 Channel/pckk_other_ch',
-        'Referer': 'https://pan.quark.cn/',
-        "Content-Type": "application/json",
-        "Cookie": cookie,
-        "Host": "drive-pc.quark.cn"
-      };
-    } else {
-      return {
-        'User-Agent':
-            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) uc-cloud-drive/2.5.20 Chrome/100.0.4896.160 Electron/18.3.5.4-b478491100 Safari/537.36 Channel/pckk_other_ch',
-        'Referer': 'https://drive.uc.cn/',
-        "Content-Type": "application/json",
-        "Cookie": cookie,
-        "Host": "pc-api.uc.cn"
-      };
-    }
+    return {
+      'User-Agent': ua,
+      'Referer': refererUrl,
+      "Content-Type": "application/json",
+      "Cookie": getCurrentCookie(),
+    };
  }

  Future<Map<String, dynamic>> api(
@ -67,18 +81,42 @@ class QuarkUcExtractor {
    } else {
      resp = await client.get(Uri.parse(apiUrl + url), headers: getHeaders());
    }
+    // if (resp.headers['set-cookie'] != null) {
+    //   print('headers: ${resp.headers}');
+    //   final puus = resp.headers['set-cookie']!
+    //       .split(';;;')
+    //       .join()
+    //       .split(';')
+    //       .firstWhere((element) => element.startsWith('__puus='),
+    //           orElse: () => '');
+    //   if (puus.isNotEmpty) {
+    //     final newPuus = puus.split('=')[1];
+    //     var cookie = getCurrentCookie();
+    //     if (cookie != null && cookie.contains('__puus=')) {
+    //       cookie =
+    //           cookie.replaceFirst(RegExp(r'__puus=[^;]+'), '__puus=$newPuus');
+    //     }
+    //     MClient.setCookie(host, ua, cookie: cookie);
+    //   }
+    // }
+    // 处理 set-cookie
    if (resp.headers['set-cookie'] != null) {
-      final puus = resp.headers['set-cookie']!
-          .split(';;;')
-          .join()
-          .split(';')
-          .firstWhere((element) => element.startsWith('__puus='),
-              orElse: () => '');
-      if (puus.isNotEmpty) {
-        final newPuus = puus.split('=')[1];
+      final cookies = resp.headers['set-cookie']!.split(';;;');
+      for (var cookie in cookies) {
        if (cookie.contains('__puus=')) {
-          cookie =
-              cookie.replaceFirst(RegExp(r'__puus=[^;]+'), '__puus=$newPuus');
+          final newPuus = cookie.split(';')[0]; // 获取新的 __puus
+          var currentCookie = getCurrentCookie();
+          if (currentCookie.isNotEmpty) {
+            // 更新 __puus
+            if (currentCookie.contains('__puus=')) {
+              currentCookie =
+                  currentCookie.replaceFirst(RegExp(r'__puus=[^;]+'), newPuus);
+            } else {
+              currentCookie = '$currentCookie; $newPuus';
+            }
+            MClient.setCookie(host, ua, null, cookie: currentCookie);
+          }
+          break;
        }
      }
    }
@ -102,10 +140,6 @@ class QuarkUcExtractor {
    return null;
  }

-  List<String> getPlayFormtList() {
-    return ["4k", "2k", "super", "high", "normal", "low", "原画"];
-  }
-
  Future<void> getShareToken(Map<String, String> shareData) async {
    if (!shareTokenCache.containsKey(shareData['shareId'])) {
      shareTokenCache.remove(shareData['shareId']);
@ -305,8 +339,8 @@ class QuarkUcExtractor {
    return null;
  }

-  Future<String?> getLiveTranscoding(String shareId, String stoken,
-      String fileId, String fileToken, String quality) async {
+  Future<List<Map<String, String>>?> getLiveTranscoding(
+      String shareId, String stoken, String fileId, String fileToken) async {
    if (!saveFileIdCaches.containsKey(fileId)) {
      final saveFileId = await save(shareId, stoken, fileId, fileToken, true);
      if (saveFileId == null) return null;
@ -322,13 +356,14 @@ class QuarkUcExtractor {
        'post');
    if (transcoding['data'] != null &&
        transcoding['data']['video_list'] != null) {
+      List<Map<String, String>> qualityOptions = [];
      for (final video in transcoding['data']['video_list']) {
-        if (video['resolution'] == quality) {
-          return video['video_info']['url'];
-        }
+        qualityOptions.add({
+          'url': video['video_info']['url'],
+          'quality': video['resolution']
+        });
      }
-      // 如果没有找到匹配的质量,返回null
-      return null;
+      return qualityOptions;
    }
    return null;
  }
@ -362,12 +397,6 @@ class QuarkUcExtractor {
      await getFilesByShareUrl(i + 1, shareUrl, videoItems, subItems);
    }

-    // if (videoItems.isNotEmpty) {
-    //   print('获取播放链接成功,分享链接为:${shareUrlList.join("\t")}');
-    // } else {
-    //   print('获取播放链接失败,检查分享链接为:${shareUrlList.join("\t")}');
-    // }
-
    return await getVodFile(videoItems, subItems, typeName);
  }

@ -396,48 +425,26 @@ class QuarkUcExtractor {
    String fileToken = parts[2];
    String shareId = parts[3];
    String stoken = parts[4];
-    String type = parts[0];
+    // String type = parts[0];
    List<String> subtitleParts = parts.length > 5 ? parts[5].split('+') : [];
 // 获取可用的质量列表
-    List<String> qualities = getPlayFormtList();
+    //List<String> qualities = getPlayFormtList();
    List<Video> videos = [];
-    if (type == "uc") {
-      var headers = getHeaders();
-      headers.remove('Host');
-      headers.remove('Content-Type');
-      String? url = (await getDownload(
-          shareId, stoken, fileId, fileToken, true))?['download_url'];
-      if (url != null) {
-        videos.add(Video(url, "原画", url, headers: headers));
-      }
-    } else {
-      String? originalUrl = (await getLiveTranscoding(
-              shareId, stoken, fileId, fileToken, "4k")) ??
-          (await getLiveTranscoding(
-              shareId, stoken, fileId, fileToken, 'super'));
-      var headers = getHeaders();
-      headers.remove('Host');
-      headers.remove('Content-Type');
-      for (String quality in qualities) {
-        if (quality == "原画") {
-          String? url = (await getDownload(
-              shareId, stoken, fileId, fileToken, true))?['download_url'];
-          if (url != null) {
-            videos
-                .add(Video(url, quality, originalUrl ?? '', headers: headers));
-          }
-        } else {
-          String? url = await getLiveTranscoding(
-              shareId, stoken, fileId, fileToken, quality);
-          if (url != null) {
-            videos.add(Video(
-              url,
-              quality,
-              originalUrl ?? '',
-              headers: headers,
-            ));
-          }
-        }
+
+    String? originalUrl;
+    List<Map<String, String>>? qualityOptions =
+        await getLiveTranscoding(shareId, stoken, fileId, fileToken);
+    originalUrl = qualityOptions?[0]['url'];
+    var headers = getHeaders();
+    headers.remove('Content-Type');
+    if (qualityOptions != null) {
+      for (Map<String, String> qualityOption in qualityOptions) {
+        videos.add(Video(
+          qualityOption['url'] ?? '',
+          qualityOption['quality'] ?? '',
+          originalUrl ?? '',
+          headers: headers,
+        ));
      }
    }

@ -450,7 +457,7 @@ class QuarkUcExtractor {
          String subName = subParts[0];
          String subFileId = subParts[2];
          var subDownload =
-              await getDownload(shareId, stoken, subFileId, '', true);
+              await getDownload(shareId, stoken, subFileId, '', false);
          String? subUrl = subDownload?['download_url'];
          if (subUrl != null) {
            subtitles.add(Track(file: subUrl, label: subName));
--- a/lib/services/http/m_client.dart
+++ b/lib/services/http/m_client.dart
@ -73,12 +73,12 @@ class MClient {
      flutter_inappwebview.InAppWebViewController? webViewController,
      {String? cookie}) async {
    List<String> cookies = [];
-    if (Platform.isLinux) {
+    // if incoming cookie is not empty, use it first
+    if (cookie != null && cookie.isNotEmpty) {
      cookies = cookie
-              ?.split(RegExp('(?<=)(,)(?=[^;]+?=)'))
-              .where((cookie) => cookie.isNotEmpty)
-              .toList() ??
-          [];
+          .split(RegExp('(?<=)(,)(?=[^;]+?=)'))
+          .where((cookie) => cookie.isNotEmpty)
+          .toList();
    } else {
      cookies = (await flutter_inappwebview.CookieManager.instance(
                  webViewEnvironment: webViewEnvironment)