reformat

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

lib/utils/accounts/account.dart

@@ -63,20 +63,25 @@ class LoginAccount implements Account {
 
   @override
   Map<String, dynamic>? toJson() => {
-        'cookies': cookieJar.toJson(),
-        'accessKey': accessKey,
-        'refresh': refresh,
-        'type': type.map((i) => i.index).toList()
-      };
+    'cookies': cookieJar.toJson(),
+    'accessKey': accessKey,
+    'refresh': refresh,
+    'type': type.map((i) => i.index).toList(),
+  };
 
   late final String _midStr = cookieJar
-      .domainCookies['bilibili.com']!['/']!['DedeUserID']!.cookie.value;
+      .domainCookies['bilibili.com']!['/']!['DedeUserID']!
+      .cookie
+      .value;
 
   late final Box<LoginAccount> _box = Accounts.account;
 
-  LoginAccount(this.cookieJar, this.accessKey, this.refresh,
-      [Set<AccountType>? type])
-      : type = type ?? {} {
+  LoginAccount(
+    this.cookieJar,
+    this.accessKey,
+    this.refresh, [
+    Set<AccountType>? type,
+  ]) : type = type ?? {} {
     cookieJar.setBuvid3();
   }
 
@@ -84,7 +89,8 @@ class LoginAccount implements Account {
     cookieJar = BiliCookieJar.fromJson(json['cookies'])..setBuvid3();
     accessKey = json['accessKey'];
     refresh = json['refresh'];
-    type = (json['type'] as Iterable?)
+    type =
+        (json['type'] as Iterable?)
             ?.map((i) => AccountType.values[i])
             .toSet() ??
         {};
@@ -164,8 +170,7 @@ extension BiliCookieJar on DefaultCookieJar {
   }
 
   List<Cookie> toList() =>
-      domainCookies['bilibili.com']?['/']
-          ?.entries
+      domainCookies['bilibili.com']?['/']?.entries
           .map((i) => i.value.cookie)
           .toList() ??
       [];
@@ -173,7 +178,8 @@ extension BiliCookieJar on DefaultCookieJar {
   void setBuvid3() {
     domainCookies['bilibili.com'] ??= {'/': {}};
     domainCookies['bilibili.com']!['/']!['buvid3'] ??= SerializableCookie(
-        Cookie('buvid3', IdUtils.genBuvid3())..setBiliDomain());
+      Cookie('buvid3', IdUtils.genBuvid3())..setBiliDomain(),
+    );
   }
 
   static DefaultCookieJar fromJson(Map json) =>
@@ -181,7 +187,9 @@ extension BiliCookieJar on DefaultCookieJar {
         ..domainCookies['bilibili.com'] = {
           '/': {
             for (var i in json.entries)
-              i.key: SerializableCookie(Cookie(i.key, i.value)..setBiliDomain())
+              i.key: SerializableCookie(
+                Cookie(i.key, i.value)..setBiliDomain(),
+              ),
           },
         };
 
@@ -191,7 +199,8 @@ extension BiliCookieJar on DefaultCookieJar {
           '/': {
             for (var i in cookies)
               i['name']!: SerializableCookie(
-                  Cookie(i['name']!, i['value']!)..setBiliDomain()),
+                Cookie(i['name']!, i['value']!)..setBiliDomain(),
+              ),
           },
         };
 }

lib/utils/accounts/account_manager/account_mgr.dart

@@ -37,7 +37,7 @@ class AccountManager extends Interceptor {
       Api.liveRoomDmPrefetch,
       Api.searchByType,
       Api.dynSearch,
-      Api.searchArchive
+      Api.searchArchive,
     },
     AccountType.recommend: {
       Api.recommendListWeb,
@@ -53,7 +53,7 @@ class AccountManager extends Interceptor {
       Api.searchTrending,
       Api.searchRecommend,
     },
-    AccountType.video: {Api.ugcUrl, Api.pgcUrl}
+    AccountType.video: {Api.ugcUrl, Api.pgcUrl},
   };
 
   static const loginApi = {
@@ -103,8 +103,9 @@ class AccountManager extends Interceptor {
       options.headers.addAll(account.headers);
     } else if (path == Api.heartBeat) {
       return handler.reject(
-          DioException.requestCancelled(requestOptions: options, reason: null),
-          false);
+        DioException.requestCancelled(requestOptions: options, reason: null),
+        false,
+      );
     }
 
     // app端不需要管理cookie
@@ -112,16 +113,17 @@ class AccountManager extends Interceptor {
       // if (kDebugMode) debugPrint('is app: ${options.path}');
       // bytes是grpc响应
       if (options.responseType != ResponseType.bytes) {
-        final dataPtr = (options.method == 'POST' && options.data is Map
-                ? options.data as Map
-                : options.queryParameters)
-            .cast<String, dynamic>();
+        final dataPtr =
+            (options.method == 'POST' && options.data is Map
+                    ? options.data as Map
+                    : options.queryParameters)
+                .cast<String, dynamic>();
         if (dataPtr.isNotEmpty) {
           if (!account.accessKey.isNullOrEmpty) {
             dataPtr['access_key'] = account.accessKey!;
           }
-          dataPtr['ts'] ??=
-              (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString();
+          dataPtr['ts'] ??= (DateTime.now().millisecondsSinceEpoch ~/ 1000)
+              .toString();
           AppSign.appSign(dataPtr);
           // if (kDebugMode) debugPrint(dataPtr.toString());
         }
@@ -133,27 +135,31 @@ class AccountManager extends Interceptor {
         handler.next(options);
         return;
       }
-      account.cookieJar.loadForRequest(options.uri).then((cookies) {
-        final previousCookies =
-            options.headers[HttpHeaders.cookieHeader] as String?;
-        final newCookies = getCookies([
-          ...?previousCookies
-              ?.split(';')
-              .where((e) => e.isNotEmpty)
-              .map((c) => Cookie.fromSetCookieValue(c)),
-          ...cookies,
-        ]);
-        options.headers[HttpHeaders.cookieHeader] =
-            newCookies.isNotEmpty ? newCookies : '';
-        handler.next(options);
-      }).catchError((dynamic e, StackTrace s) {
-        final err = DioException(
-          requestOptions: options,
-          error: e,
-          stackTrace: s,
-        );
-        handler.reject(err, true);
-      });
+      account.cookieJar
+          .loadForRequest(options.uri)
+          .then((cookies) {
+            final previousCookies =
+                options.headers[HttpHeaders.cookieHeader] as String?;
+            final newCookies = getCookies([
+              ...?previousCookies
+                  ?.split(';')
+                  .where((e) => e.isNotEmpty)
+                  .map((c) => Cookie.fromSetCookieValue(c)),
+              ...cookies,
+            ]);
+            options.headers[HttpHeaders.cookieHeader] = newCookies.isNotEmpty
+                ? newCookies
+                : '';
+            handler.next(options);
+          })
+          .catchError((dynamic e, StackTrace s) {
+            final err = DioException(
+              requestOptions: options,
+              error: e,
+              stackTrace: s,
+            );
+            handler.reject(err, true);
+          });
     }
   }
 
@@ -163,9 +169,9 @@ class AccountManager extends Interceptor {
     if (path.startsWith(HttpString.appBaseUrl) || _skipCookie(path)) {
       return handler.next(response);
     } else {
-      _saveCookies(response)
-          .whenComplete(() => handler.next(response))
-          .catchError(
+      _saveCookies(
+        response,
+      ).whenComplete(() => handler.next(response)).catchError(
         (dynamic e, StackTrace s) {
           final error = DioException(
             requestOptions: response.requestOptions,
@@ -185,9 +191,9 @@ class AccountManager extends Interceptor {
     }
     if (err.response != null &&
         !err.response!.requestOptions.path.startsWith(HttpString.appBaseUrl)) {
-      _saveCookies(err.response!)
-          .whenComplete(() => handler.next(err))
-          .catchError(
+      _saveCookies(
+        err.response!,
+      ).whenComplete(() => handler.next(err)).catchError(
         (dynamic e, StackTrace s) {
           final error = DioException(
             requestOptions: err.response!.requestOptions,
@@ -225,7 +231,8 @@ class AccountManager extends Interceptor {
   }
 
   Future<void> _saveCookies(Response response) async {
-    final Account account = response.requestOptions.extra['account'] ??
+    final Account account =
+        response.requestOptions.extra['account'] ??
         _findAccount(response.requestOptions.path);
     final setCookies = response.headers[HttpHeaders.setCookieHeader];
     if (setCookies == null || setCookies.isEmpty) {
@@ -266,9 +273,12 @@ class AccountManager extends Interceptor {
 
   Account _findAccount(String path) => loginApi.contains(path)
       ? AnonymousAccount()
-      : Accounts.get(AccountType.values.firstWhere(
-          (i) => apiTypeSet[i]?.contains(path) == true,
-          orElse: () => AccountType.main));
+      : Accounts.get(
+          AccountType.values.firstWhere(
+            (i) => apiTypeSet[i]?.contains(path) == true,
+            orElse: () => AccountType.main,
+          ),
+        );
 
   static Future<String> dioError(DioException error) async {
     switch (error.type) {