opt: account (#1306)

* opt: account

* opt: account

* opt: live api

* opt: buvid

* Revert "opt: buvid"

This reverts commit da1ea68f8b.

* tweak

lib/grpc/grpc_req.dart

@@ -141,7 +141,7 @@ class GrpcReq {
     GeneratedMessage request,
     T Function(Uint8List) grpcParser,
   ) async {
-    final response = await Request().post(
+    final response = await Request().post<Uint8List>(
       HttpString.appBaseUrl + url,
       data: compressProtobuf(request.writeToBuffer()),
       options: options,

lib/http/api.dart

@@ -398,27 +398,6 @@ class Api {
 
   static const String pgcUpdate = '/pgc/web/follow/status/update';
 
-  // 番剧列表
-  // https://api.bilibili.com/pgc/season/index/result?
-  // st=1&
-  // order=3
-  // season_version=-1  全部-1 正片1 电影2 其他3
-  // spoken_language_type=-1  全部-1 原生1 中文配音2
-  // area=-1&
-  // is_finish=-1&
-  // copyright=-1&
-  // season_status=-1&
-  // season_month=-1&
-  // year=-1&
-  // style_id=-1&
-  // sort=0&
-  // page=1&
-  // season_type=1&
-  // pagesize=20&
-  // type=1
-  static const String pgcIndex =
-      '/pgc/season/index/result?st=1&order=3&season_version=-1&spoken_language_type=-1&area=-1&is_finish=-1&copyright=-1&season_status=-1&season_month=-1&year=-1&style_id=-1&sort=0&season_type=1&pagesize=20&type=1';
-
   // 我的追番/追剧 ?type=1&pn=1&ps=15
   static const String favPgc = '/x/space/bangumi/follow/list';
 

lib/http/live.dart

@@ -4,6 +4,7 @@ import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/login.dart';
 import 'package:PiliPlus/http/ua_type.dart';
+import 'package:PiliPlus/models/common/account_type.dart';
 import 'package:PiliPlus/models/common/live_search_type.dart';
 import 'package:PiliPlus/models_new/live/live_area_list/area_item.dart';
 import 'package:PiliPlus/models_new/live/live_area_list/area_list.dart';
@@ -20,12 +21,20 @@ import 'package:PiliPlus/models_new/live/live_search/data.dart';
 import 'package:PiliPlus/models_new/live/live_second_list/data.dart';
 import 'package:PiliPlus/models_new/live/live_superchat/data.dart';
 import 'package:PiliPlus/utils/accounts.dart';
+import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:PiliPlus/utils/app_sign.dart';
 import 'package:PiliPlus/utils/wbi_sign.dart';
 import 'package:dio/dio.dart';
 
-class LiveHttp {
+abstract final class LiveHttp {
-  static Future sendLiveMsg({roomId, msg, dmType, emoticonOptions}) async {
+  static Account get recommend => Accounts.get(AccountType.recommend);
+
+  static Future sendLiveMsg({
+    required Object roomId,
+    required Object msg,
+    Object? dmType,
+    Object? emoticonOptions,
+  }) async {
     String csrf = Accounts.main.csrf;
     var res = await Request().post(
       Api.sendLiveMsg,
@@ -165,11 +174,10 @@ class LiveHttp {
 
   static Future<LoadingState<LiveIndexData>> liveFeedIndex({
     required int pn,
-    required bool isLogin,
     bool moduleSelect = false,
   }) async {
     final params = {
-      'access_key': ?Accounts.main.accessKey,
+      'access_key': ?recommend.accessKey,
       'appkey': Constants.appKey,
       'channel': 'master',
       'actionKey': 'appkey',
@@ -187,7 +195,7 @@ class LiveHttp {
       'network': 'wifi',
       'page': pn,
       'platform': 'android',
-      if (isLogin) 'relation_page': 1,
+      if (recommend.isLogin) 'relation_page': 1,
       's_locale': 'zh_CN',
       'scale': 2,
       'statistics': Constants.statisticsApp,
@@ -245,13 +253,12 @@ class LiveHttp {
 
   static Future<LoadingState<LiveSecondData>> liveSecondList({
     required int pn,
-    required bool isLogin,
+    required Object? areaId,
-    required areaId,
+    required Object? parentAreaId,
-    required parentAreaId,
     String? sortType,
   }) async {
     final params = {
-      'access_key': ?Accounts.main.accessKey,
+      'access_key': ?recommend.accessKey,
       'appkey': Constants.appKey,
       'actionKey': 'appkey',
       'channel': 'master',
@@ -313,11 +320,9 @@ class LiveHttp {
     }
   }
 
-  static Future<LoadingState<List<AreaList>?>> liveAreaList({
+  static Future<LoadingState<List<AreaList>?>> liveAreaList() async {
-    required bool isLogin,
-  }) async {
     final params = {
-      'access_key': ?Accounts.main.accessKey,
+      'access_key': ?recommend.accessKey,
       'appkey': Constants.appKey,
       'actionKey': 'appkey',
       'build': 8430300,
@@ -352,9 +357,7 @@ class LiveHttp {
     }
   }
 
-  static Future<LoadingState<List<AreaItem>>> getLiveFavTag({
+  static Future<LoadingState<List<AreaItem>>> getLiveFavTag() async {
-    required bool isLogin,
-  }) async {
     final params = {
       'access_key': ?Accounts.main.accessKey,
       'appkey': Constants.appKey,
@@ -432,11 +435,10 @@ class LiveHttp {
   }
 
   static Future<LoadingState<List<AreaItem>?>> liveRoomAreaList({
-    required bool isLogin,
+    required Object parentid,
-    required parentid,
   }) async {
     final params = {
-      'access_key': ?Accounts.main.accessKey,
+      'access_key': ?recommend.accessKey,
       'appkey': Constants.appKey,
       'actionKey': 'appkey',
       'build': 8430300,
@@ -473,13 +475,12 @@ class LiveHttp {
   }
 
   static Future<LoadingState<LiveSearchData>> liveSearch({
-    required bool isLogin,
     required int page,
     required String keyword,
     required LiveSearchType type,
   }) async {
     final params = {
-      'access_key': ?Accounts.main.accessKey,
+      'access_key': ?recommend.accessKey,
       'appkey': Constants.appKey,
       'actionKey': 'appkey',
       'build': 8430300,

lib/http/login.dart

@@ -17,7 +17,7 @@ import 'package:encrypt/encrypt.dart';
 
 class LoginHttp {
   static final String deviceId = LoginUtils.genDeviceId();
-  static final String buvid = LoginUtils.buvid;
+  static String get buvid => LoginUtils.buvid;
   static final Map<String, String> headers = {
     'buvid': buvid,
     'env': 'prod',

lib/http/pgc.dart

@@ -62,8 +62,23 @@ class PgcHttp {
     int? indexType,
   }) async {
     var res = await Request().get(
-      Api.pgcIndex,
+      Api.pgcIndexResult,
       queryParameters: {
+        'st': 1,
+        'order': 3,
+        'season_version': -1,
+        'spoken_language_type': -1,
+        'area': -1,
+        'is_finish': -1,
+        'copyright': -1,
+        'season_status': -1,
+        'season_month': -1,
+        'year': -1,
+        'style_id': -1,
+        'sort': 0,
+        'season_type': 1,
+        'pagesize': 20,
+        'type': 1,
         'page': page,
         'index_type': ?indexType,
       },

lib/http/reply.dart

@@ -13,7 +13,7 @@ import 'package:dio/dio.dart';
 class ReplyHttp {
   static final Options options = Options(
     headers: {...Constants.baseHeaders, 'cookie': ''},
-    extra: {'account': NoAccount()},
+    extra: {'account': const NoAccount()},
   );
 
   static Future<LoadingState> replyList({

lib/pages/live/controller.dart

@@ -7,7 +7,6 @@ import 'package:PiliPlus/models_new/live/live_feed_index/data.dart';
 import 'package:PiliPlus/models_new/live/live_second_list/data.dart';
 import 'package:PiliPlus/models_new/live/live_second_list/tag.dart';
 import 'package:PiliPlus/pages/common/common_list_controller.dart';
-import 'package:PiliPlus/services/account_service.dart';
 import 'package:get/get.dart';
 
 class LiveController extends CommonListController {
@@ -17,8 +16,6 @@ class LiveController extends CommonListController {
     queryData();
   }
 
-  AccountService accountService = Get.find<AccountService>();
-
   int? count;
 
   // area
@@ -75,16 +72,12 @@ class LiveController extends CommonListController {
     if (areaIndex.value != 0) {
       return LiveHttp.liveSecondList(
         pn: page,
-        isLogin: accountService.isLogin.value,
         areaId: areaId,
         parentAreaId: parentAreaId,
         sortType: sortType,
       );
     }
-    return LiveHttp.liveFeedIndex(
+    return LiveHttp.liveFeedIndex(pn: page);
-      pn: page,
-      isLogin: accountService.isLogin.value,
-    );
   }
 
   @override
@@ -99,11 +92,7 @@ class LiveController extends CommonListController {
   }
 
   Future<void> queryTop() async {
-    final res = await LiveHttp.liveFeedIndex(
+    final res = await LiveHttp.liveFeedIndex(pn: page, moduleSelect: true);
-      pn: page,
-      isLogin: accountService.isLogin.value,
-      moduleSelect: true,
-    );
     if (res.isSuccess) {
       final data = res.data;
       topState.value = Pair(

lib/pages/live_area/controller.dart

@@ -36,12 +36,10 @@ class LiveAreaController
 
   @override
   Future<LoadingState<List<AreaList>?>> customGetData() =>
-      LiveHttp.liveAreaList(isLogin: accountService.isLogin.value);
+      LiveHttp.liveAreaList();
 
   Future<void> queryFavTags() async {
-    favState.value = await LiveHttp.getLiveFavTag(
+    favState.value = await LiveHttp.getLiveFavTag();
-      isLogin: accountService.isLogin.value,
-    );
   }
 
   Future<void> setFavTag() async {

lib/pages/live_area_detail/child/controller.dart

@@ -6,7 +6,6 @@ import 'package:PiliPlus/models_new/live/live_feed_index/card_data_list_item.dar
 import 'package:PiliPlus/models_new/live/live_second_list/data.dart';
 import 'package:PiliPlus/models_new/live/live_second_list/tag.dart';
 import 'package:PiliPlus/pages/common/common_list_controller.dart';
-import 'package:PiliPlus/services/account_service.dart';
 import 'package:get/get.dart';
 
 class LiveAreaChildController
@@ -23,8 +22,6 @@ class LiveAreaChildController
   final RxInt tagIndex = 0.obs;
   List<LiveSecondTag>? newTags;
 
-  AccountService accountService = Get.find<AccountService>();
-
   @override
   void onInit() {
     super.onInit();
@@ -53,7 +50,6 @@ class LiveAreaChildController
   Future<LoadingState<LiveSecondData>> customGetData() =>
       LiveHttp.liveSecondList(
         pn: page,
-        isLogin: accountService.isLogin.value,
         areaId: areaId,
         parentAreaId: parentAreaId,
         sortType: sortType,

lib/pages/live_area_detail/controller.dart

@@ -4,8 +4,6 @@ import 'package:PiliPlus/http/live.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models_new/live/live_area_list/area_item.dart';
 import 'package:PiliPlus/pages/common/common_list_controller.dart';
-import 'package:PiliPlus/services/account_service.dart';
-import 'package:get/get.dart';
 
 class LiveAreaDatailController
     extends CommonListController<List<AreaItem>?, AreaItem> {
@@ -15,8 +13,6 @@ class LiveAreaDatailController
 
   late int initialIndex = 0;
 
-  AccountService accountService = Get.find<AccountService>();
-
   @override
   void onInit() {
     super.onInit();
@@ -33,8 +29,5 @@ class LiveAreaDatailController
 
   @override
   Future<LoadingState<List<AreaItem>?>> customGetData() =>
-      LiveHttp.liveRoomAreaList(
+      LiveHttp.liveRoomAreaList(parentid: parentAreaId);
-        isLogin: accountService.isLogin.value,
-        parentid: parentAreaId,
-      );
 }

lib/pages/live_search/child/controller.dart

@@ -4,8 +4,6 @@ import 'package:PiliPlus/models/common/live_search_type.dart';
 import 'package:PiliPlus/models_new/live/live_search/data.dart';
 import 'package:PiliPlus/pages/common/common_list_controller.dart';
 import 'package:PiliPlus/pages/live_search/controller.dart';
-import 'package:PiliPlus/services/account_service.dart';
-import 'package:get/get.dart';
 
 class LiveSearchChildController
     extends CommonListController<LiveSearchData, dynamic> {
@@ -14,8 +12,6 @@ class LiveSearchChildController
   final LiveSearchController controller;
   final LiveSearchType searchType;
 
-  AccountService accountService = Get.find<AccountService>();
-
   @override
   void checkIsEnd(int length) {
     switch (searchType) {
@@ -48,7 +44,6 @@ class LiveSearchChildController
   @override
   Future<LoadingState<LiveSearchData>> customGetData() {
     return LiveHttp.liveSearch(
-      isLogin: accountService.isLogin.value,
       page: page,
       keyword: controller.editingController.text,
       type: searchType,

lib/pages/login/controller.dart

@@ -690,7 +690,11 @@ class LoginPageController extends GetxController
       tokenInfo['refresh_token'],
     );
     await Future.wait([account.onChange(), AnonymousAccount().delete()]);
-    Accounts.accountMode.updateAll((_, a) => a == account ? account : a);
+    for (int i = 0; i < AccountType.values.length; i++) {
+      if (Accounts.accountMode[i].mid == account.mid) {
+        Accounts.accountMode[i] = account;
+      }
+    }
     if (Accounts.main.isLogin) {
       SmartDialog.showToast('登录成功');
     } else {
@@ -704,7 +708,7 @@ class LoginPageController extends GetxController
       SmartDialog.showToast('请先登录');
       return Get.toNamed('/loginPage');
     }
-    final selectAccount = Map.of(Accounts.accountMode);
+    final selectAccount = List.of(Accounts.accountMode);
     final options = {
       AnonymousAccount(): '0',
       ...Accounts.account.toMap().map(
@@ -729,9 +733,9 @@ class LoginPageController extends GetxController
                 .map(
                   (e) => Builder(
                     builder: (context) => RadioGroup(
-                      groupValue: selectAccount[e],
+                      groupValue: selectAccount[e.index],
                       onChanged: (v) {
-                        selectAccount[e] = v!;
+                        selectAccount[e.index] = v!;
                         (context as Element).markNeedsBuild();
                       },
                       child: WrapRadioOptionsGroup<Account>(
@@ -756,9 +760,9 @@ class LoginPageController extends GetxController
           ),
           TextButton(
             onPressed: () {
-              for (var i in selectAccount.entries) {
+              for (var (i, v) in selectAccount.indexed) {
-                if (i.value != Accounts.get(i.key)) {
+                if (v != Accounts.accountMode[i]) {
-                  Accounts.set(i.key, i.value);
+                  Accounts.set(AccountType.values[i], v);
                 }
               }
               Get.back();

lib/pages/mine/controller.dart

@@ -229,7 +229,8 @@ class MineController
         }
         res == true
             ? Accounts.set(AccountType.heartbeat, AnonymousAccount())
-            : Accounts.accountMode[AccountType.heartbeat] = AnonymousAccount();
+            : Accounts.accountMode[AccountType.heartbeat.index] =
+                  AnonymousAccount();
       });
     } else {
       Accounts.set(AccountType.heartbeat, Accounts.main);

lib/pages/setting/models/privacy_settings.dart

@@ -41,11 +41,9 @@ List<SettingsModel> get privacySettings => [
         context: Get.context!,
         builder: (context) {
           return AlertDialog(
-            title: const Text('查看详情'),
+            title: const Text('账号模式详情'),
             content: SingleChildScrollView(
-              child: Text(
+              child: _getAccountDetail(context),
-                AccountManager.apiTypeSet[AccountType.heartbeat]!.join('\n'),
-              ),
             ),
             actions: [
               TextButton(
@@ -58,7 +56,26 @@ List<SettingsModel> get privacySettings => [
       );
     },
     leading: const Icon(Icons.flag_outlined),
-    title: '了解无痕模式',
+    title: '了解账号模式',
-    subtitle: '查看无痕模式作用的API列表',
+    subtitle: '查看各个账号模式作用的API列表',
   ),
 ];
+
+Widget _getAccountDetail(BuildContext context) {
+  final slivers = <Widget>[];
+  final theme = TextTheme.of(context);
+  for (var i in AccountType.values) {
+    final url = AccountManager.apiTypeSet[i];
+    if (url == null) continue;
+
+    slivers
+      ..add(Center(child: Text(i.title, style: theme.titleMedium)))
+      ..add(SelectableText(url.join('\n')));
+  }
+  return Column(
+    mainAxisSize: MainAxisSize.min,
+    crossAxisAlignment: CrossAxisAlignment.start,
+    spacing: 8,
+    children: slivers,
+  );
+}

lib/utils/accounts.dart

@@ -7,9 +7,12 @@ import 'package:hive/hive.dart';
 
 abstract class Accounts {
   static late final Box<LoginAccount> account;
-  static final Map<AccountType, Account> accountMode = {};
+  static final List<Account> accountMode = List.filled(
-  static Account get main => accountMode[AccountType.main]!;
+    AccountType.values.length,
-  static Account get heartbeat => accountMode[AccountType.heartbeat]!;
+    AnonymousAccount(),
+  );
+  static Account get main => accountMode[AccountType.main.index];
+  static Account get heartbeat => accountMode[AccountType.heartbeat.index];
   static Account get history {
     final heartbeat = Accounts.heartbeat;
     if (heartbeat is AnonymousAccount) {
@@ -70,14 +73,11 @@ abstract class Accounts {
   static Future<void> refresh() async {
     for (var a in account.values) {
       for (var t in a.type) {
-        accountMode[t] = a;
+        accountMode[t.index] = a;
       }
     }
-    for (var type in AccountType.values) {
-      accountMode[type] ??= AnonymousAccount();
-    }
     await Future.wait(
-      (accountMode.values.toSet()..retainWhere((i) => !i.activited)).map(
+      (accountMode.toSet()..removeWhere((i) => i.activited)).map(
         Request.buvidActive,
       ),
     );
@@ -85,7 +85,7 @@ abstract class Accounts {
 
   static Future<void> clear() async {
     await account.clear();
-    for (var i in AccountType.values) {
+    for (int i = 0; i < AccountType.values.length; i++) {
       accountMode[i] = AnonymousAccount();
     }
     await AnonymousAccount().delete();
@@ -100,9 +100,11 @@ abstract class Accounts {
 
   static Future<void> deleteAll(Set<Account> accounts) async {
     var isloginMain = Accounts.main.isLogin;
-    Accounts.accountMode.updateAll(
+    for (int i = 0; i < AccountType.values.length; i++) {
-      (_, a) => accounts.contains(a) ? AnonymousAccount() : a,
+      if (accounts.contains(accountMode[i])) {
-    );
+        accountMode[i] = AnonymousAccount();
+      }
+    }
     await Future.wait(accounts.map((i) => i.delete()));
     if (isloginMain && !Accounts.main.isLogin) {
       await LoginUtils.onLogoutMain();
@@ -110,8 +112,8 @@ abstract class Accounts {
   }
 
   static Future<void> set(AccountType key, Account account) async {
-    await (accountMode[key]?..type.remove(key))?.onChange();
+    await (accountMode[key.index]..type.remove(key)).onChange();
-    accountMode[key] = account..type.add(key);
+    accountMode[key.index] = account..type.add(key);
     await account.onChange();
     if (!account.activited) await Request.buvidActive(account);
     switch (key) {
@@ -129,6 +131,6 @@ abstract class Accounts {
   }
 
   static Account get(AccountType key) {
-    return accountMode[key]!;
+    return accountMode[key.index];
   }
 }

lib/utils/accounts/account.dart

@@ -5,41 +5,52 @@ import 'package:PiliPlus/utils/id_utils.dart';
 import 'package:cookie_jar/cookie_jar.dart';
 import 'package:hive/hive.dart';
 
-abstract class Account {
+sealed class Account {
-  final bool isLogin = false;
+  Map<String, dynamic>? toJson() => null;
-  late final DefaultCookieJar cookieJar;
-  String? accessKey;
-  String? refresh;
-  late final Set<AccountType> type;
 
-  final int mid = 0;
+  Future<void> onChange() => Future.value();
-  late String csrf;
-  final Map<String, String> headers = const {};
 
-  bool activited = false;
+  Set<AccountType> get type => const {};
 
-  Future<void> delete();
+  bool get activited => false;
-  Future<void> onChange();
 
-  Map<String, dynamic>? toJson();
+  set activited(bool value) => throw UnimplementedError();
+
+  String? get accessKey => throw UnimplementedError();
+
+  DefaultCookieJar get cookieJar => throw UnimplementedError();
+
+  String get csrf => throw UnimplementedError();
+
+  Future<void> delete() => throw UnimplementedError();
+
+  Map<String, String> get headers => throw UnimplementedError();
+
+  bool get isLogin => throw UnimplementedError();
+
+  int get mid => throw UnimplementedError();
+
+  String? get refresh => throw UnimplementedError();
+
+  const Account();
 }
 
 @HiveType(typeId: 9)
-class LoginAccount implements Account {
+class LoginAccount extends Account {
   @override
   final bool isLogin = true;
   @override
   @HiveField(0)
-  late final DefaultCookieJar cookieJar;
+  final DefaultCookieJar cookieJar;
   @override
   @HiveField(1)
-  String? accessKey;
+  final String? accessKey;
   @override
   @HiveField(2)
-  String? refresh;
+  final String? refresh;
   @override
   @HiveField(3)
-  late final Set<AccountType> type;
+  final Set<AccountType> type;
 
   @override
   bool activited = false;
@@ -55,14 +66,22 @@ class LoginAccount implements Account {
   };
 
   @override
-  late String csrf =
+  late final String csrf =
       cookieJar.domainCookies['bilibili.com']!['/']!['bili_jct']!.cookie.value;
 
-  @override
+  bool _hasDelete = false;
-  Future<void> delete() => _box.delete(_midStr);
 
   @override
-  Future<void> onChange() => _box.put(_midStr, this);
+  Future<void> delete() {
+    assert(_hasDelete = true);
+    return _box.delete(_midStr);
+  }
+
+  @override
+  Future<void> onChange() {
+    assert(!_hasDelete);
+    return _box.put(_midStr, this);
+  }
 
   @override
   Map<String, dynamic>? toJson() => {
@@ -88,16 +107,12 @@ class LoginAccount implements Account {
     cookieJar.setBuvid3();
   }
 
-  LoginAccount.fromJson(Map json) {
+  factory LoginAccount.fromJson(Map json) => LoginAccount(
-    cookieJar = BiliCookieJar.fromJson(json['cookies'])..setBuvid3();
+    BiliCookieJar.fromJson(json['cookies']),
-    accessKey = json['accessKey'];
+    json['accessKey'],
-    refresh = json['refresh'];
+    json['refresh'],
-    type =
+    (json['type'] as Iterable?)?.map((i) => AccountType.values[i]).toSet(),
-        (json['type'] as Iterable?)
+  );
-            ?.map((i) => AccountType.values[i])
-            .toSet() ??
-        {};
-  }
 
   @override
   int get hashCode => mid.hashCode;
@@ -107,21 +122,21 @@ class LoginAccount implements Account {
       identical(this, other) || (other is LoginAccount && mid == other.mid);
 }
 
-class AnonymousAccount implements Account {
+class AnonymousAccount extends Account {
   @override
   final bool isLogin = false;
   @override
-  late final DefaultCookieJar cookieJar;
+  final DefaultCookieJar cookieJar = DefaultCookieJar()..setBuvid3();
   @override
-  String? accessKey;
+  final String? accessKey = null;
   @override
-  String? refresh;
+  final String? refresh = null;
   @override
-  Set<AccountType> type = {};
+  final Set<AccountType> type = {};
   @override
   final int mid = 0;
   @override
-  String csrf = '';
+  final String csrf = '';
   @override
   final Map<String, String> headers = Constants.baseHeaders;
 
@@ -134,17 +149,9 @@ class AnonymousAccount implements Account {
     cookieJar.setBuvid3();
   }
 
-  @override
-  Future<void> onChange() async {}
-
-  @override
-  Map<String, dynamic>? toJson() => null;
-
   static final _instance = AnonymousAccount._();
 
-  AnonymousAccount._() {
+  AnonymousAccount._();
-    cookieJar = DefaultCookieJar(ignoreExpires: true)..setBuvid3();
-  }
 
   factory AnonymousAccount() => _instance;
 
@@ -179,8 +186,9 @@ extension BiliCookieJar on DefaultCookieJar {
       [];
 
   void setBuvid3() {
-    domainCookies['bilibili.com'] ??= {'/': {}};
+    (domainCookies['bilibili.com'] ??= {
-    domainCookies['bilibili.com']!['/']!['buvid3'] ??= SerializableCookie(
+      '/': {},
+    })['/']!['buvid3'] ??= SerializableCookie(
       Cookie('buvid3', IdUtils.genBuvid3())..setBiliDomain(),
     );
   }
@@ -208,52 +216,6 @@ extension BiliCookieJar on DefaultCookieJar {
         };
 }
 
-class NoAccount implements Account {
+final class NoAccount extends Account {
-  @override
+  const NoAccount();
-  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

@@ -51,6 +51,7 @@ class AccountManager extends Interceptor {
       Api.getSeasonDetailApi,
       Api.liveRoomDmToken,
       Api.liveRoomDmPrefetch,
+      Api.superChatMsg,
       Api.searchByType,
       Api.dynSearch,
       Api.searchArchive,
@@ -68,6 +69,18 @@ class AccountManager extends Interceptor {
       Api.liveList,
       Api.searchTrending,
       Api.searchRecommend,
+      Api.getRankApi,
+      Api.pgcRank,
+      Api.pgcSeasonRank,
+      Api.pgcIndexResult,
+      Api.popularSeriesOne,
+      Api.popularSeriesList,
+      Api.popularPrecious,
+      Api.liveAreaList,
+      Api.liveFeedIndex,
+      Api.liveSecondList,
+      Api.liveRoomAreaList,
+      Api.liveSearch,
     },
     // progress
     AccountType.video: {
@@ -118,7 +131,7 @@ class AccountManager extends Interceptor {
 
     late final Account account = options.extra['account'] ?? _findAccount(path);
 
-    if (_skipCookie(path) || account is NoAccount) return handler.next(options);
+    if (account is NoAccount || _skipCookie(path)) return handler.next(options);
 
     if (!account.isLogin && path == Api.heartBeat) {
       return handler.reject(

lib/utils/update.dart

@@ -25,7 +25,7 @@ abstract class Update {
         Api.latestApp,
         options: Options(
           headers: {'user-agent': UaType.mob.ua},
-          extra: {'account': NoAccount()},
+          extra: {'account': const NoAccount()},
         ),
       );
       if (res.data is Map || res.data.isEmpty) {