fix #887

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

lib/utils/accounts/account.dart

@@ -1,3 +1,4 @@
+import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
@@ -48,9 +49,11 @@ class LoginAccount implements Account {
 
   @override
   late final Map<String, String> headers = {
+    ...Constants.baseHeaders,
     'x-bili-mid': _midStr,
     'x-bili-aurora-eid': IdUtils.genAuroraEid(mid),
   };
+
   @override
   late String csrf =
       cookieJar.domainCookies['bilibili.com']!['/']!['bili_jct']!.cookie.value;
@@ -120,7 +123,7 @@ class AnonymousAccount implements Account {
   @override
   String csrf = '';
   @override
-  final Map<String, String> headers = const {};
+  final Map<String, String> headers = Constants.baseHeaders;
 
   @override
   bool activited = false;
@@ -204,3 +207,53 @@ extension BiliCookieJar on DefaultCookieJar {
           },
         };
 }
+
+class NoAccount implements Account {
+  @override
+  String? accessKey;
+
+  @override
+  bool activited = false;
+
+  @override
+  DefaultCookieJar cookieJar = DefaultCookieJar();
+
+  @override
+  String csrf = '';
+
+  @override
+  String? refresh;
+
+  @override
+  Set<AccountType> type = const {};
+
+  @override
+  Future<void> delete() {
+    return Future.value();
+  }
+
+  @override
+  final Map<String, String> headers = const {};
+
+  @override
+  bool isLogin = false;
+
+  @override
+  int mid = 0;
+
+  @override
+  Future<void> onChange() {
+    return Future.value();
+  }
+
+  @override
+  Map<String, dynamic>? toJson() {
+    return null;
+  }
+
+  NoAccount._();
+
+  static final _instance = NoAccount._();
+
+  factory NoAccount() => _instance;
+}

lib/utils/accounts/account_manager/account_mgr.dart

@@ -95,19 +95,19 @@ class AccountManager extends Interceptor {
   void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
     final path = options.path;
 
-    if (_skipCookie(path)) return handler.next(options);
+    late final Account account = options.extra['account'] ?? _findAccount(path);
 
-    final Account account = options.extra['account'] ?? _findAccount(path);
+    if (_skipCookie(path) || account is NoAccount) return handler.next(options);
 
-    if (account.isLogin) {
-      options.headers.addAll(account.headers);
-    } else if (path == Api.heartBeat) {
+    if (!account.isLogin && path == Api.heartBeat) {
       return handler.reject(
         DioException.requestCancelled(requestOptions: options, reason: null),
         false,
       );
     }
 
+    options.headers.addAll(account.headers);
+
     // app端不需要管理cookie
     if (path.startsWith(HttpString.appBaseUrl)) {
       // if (kDebugMode) debugPrint('is app: ${options.path}');
@@ -130,11 +130,6 @@ class AccountManager extends Interceptor {
       }
       return handler.next(options);
     } else {
-      if (account is AnonymousAccount && options.extra['checkReply'] == true) {
-        options.headers[HttpHeaders.cookieHeader] = '';
-        handler.next(options);
-        return;
-      }
       account.cookieJar
           .loadForRequest(options.uri)
           .then((cookies) {

lib/utils/update.dart

@@ -3,10 +3,12 @@ import 'dart:io' show Platform;
 import 'package:PiliPlus/build_config.dart';
 import 'package:PiliPlus/http/api.dart';
 import 'package:PiliPlus/http/init.dart';
+import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/storage_key.dart';
 import 'package:device_info_plus/device_info_plus.dart';
+import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -17,7 +19,13 @@ class Update {
     if (kDebugMode) return;
     SmartDialog.dismiss();
     try {
-      final res = await Request().get(Api.latestApp, uaType: 'mob');
+      final res = await Request().get(
+        Api.latestApp,
+        options: Options(
+          headers: {'user-agent': Request.headerUa()},
+          extra: {'account': NoAccount()},
+        ),
+      );
       if (res.data is Map || res.data.isEmpty) {
         if (!isAuto) {
           SmartDialog.showToast('检查更新失败，GitHub接口未返回数据，请检查网络');