feat: 实验性连接信息导出与会话恢复,重写关于页
- SessionShare:把 userId / JSESSIONID / token 打成 Base64(JSON),Cookie 只保留 JSESSIONID 一项,粘贴时容忍换行与空白,QR 令牌与乱码解不出来 - 主页底部新增「导出连接信息」卡片,标记实验性:内容未加密,字符串在手即可操作账号 - 登录页识别到连接信息时把登录按钮换成「恢复会话」,不必再扫 QR 令牌 - 恢复优先沿用导入的 JSESSIONID(不重发 UserLoginApi,免得顶掉机台上的登录), Cookie 失效才退回用 token 登录;验证 Cookie 时顺手拉到的 GetUserDataApi 结果 直接交给主页展示,省一次请求 - 仅凭 Cookie 恢复的会话没有 loginId / loginDateTime,_gameLogin 保持 null, 票据与风险页照旧提示「尚未登录游戏服务器」,主页顶部给出说明横幅 - 关于页改用 AppCard / SectionTitle 脚手架,补基本信息与风险提示,把过时的 「jsQR (web)」致谢换成原生 MethodChannel(QR 解码早已不走 web 库)
This commit is contained in:
1 parent
4dddfdc00c
commit
5d16984e4e
9 files changed
+772
-190
No files matched your search
@@ -3,6 +3,20 @@ import 'package:flutter/foundation.dart';
|
||||
import '../config/title_server_config.dart';
|
||||
import '../services/api_service.dart';
|
||||
import '../services/title_api_service.dart';
|
||||
import 'session_share.dart';
|
||||
import 'user_data.dart';
|
||||
|
||||
/// [SessionModel.restoreFromShare] 的结果。
|
||||
class SessionRestoreResult {
|
||||
/// `true` 表示沿用了连接信息里的 JSESSIONID;`false` 表示用令牌重新登录,
|
||||
/// 拿到了一份新 Cookie。
|
||||
final bool reusedCookie;
|
||||
|
||||
/// 沿用旧会话时顺带拉到的用户数据(HomePage 直接展示,省一次请求)。
|
||||
final UserDataBean? userData;
|
||||
|
||||
const SessionRestoreResult({required this.reusedCookie, this.userData});
|
||||
}
|
||||
|
||||
class SessionModel extends ChangeNotifier {
|
||||
static final SessionModel instance = SessionModel._();
|
||||
@@ -48,10 +62,7 @@ class SessionModel extends ChangeNotifier {
|
||||
return login;
|
||||
}
|
||||
|
||||
Future<void> logoutGame({
|
||||
required int userId,
|
||||
String? cookies,
|
||||
}) async {
|
||||
Future<void> logoutGame({required int userId, String? cookies}) async {
|
||||
final login = _gameLogin;
|
||||
if (login == null) return;
|
||||
final config = TitleServerConfigHolder().config;
|
||||
@@ -75,6 +86,51 @@ class SessionModel extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// 实验性:导出连接信息(用户 ID + JSESSIONID + 令牌)。
|
||||
SessionShare exportConnectionInfo({
|
||||
required int userId,
|
||||
required String token,
|
||||
}) => SessionShare(userId: userId, token: token, cookie: _cookies);
|
||||
|
||||
/// 实验性:用连接信息恢复会话。
|
||||
///
|
||||
/// 带着可用的 JSESSIONID 时沿用这个会话继续交互,不重发 `UserLoginApi`;
|
||||
/// 没有 Cookie 或 Cookie 已失效,才退回去用令牌登录一次拿新 Cookie。
|
||||
Future<SessionRestoreResult> restoreFromShare(SessionShare share) async {
|
||||
final cookie = share.jsessionid;
|
||||
if (cookie != null) {
|
||||
final userData = await _probeCookieSession(share.userId, cookie);
|
||||
if (userData != null) {
|
||||
// _gameLogin 保持 null:这次没有 UserLoginApi,拿不到 loginId /
|
||||
// loginDateTime,写入类功能页照旧提示「尚未登录游戏服务器」。
|
||||
notifyListeners();
|
||||
return SessionRestoreResult(reusedCookie: true, userData: userData);
|
||||
}
|
||||
}
|
||||
|
||||
if (!share.hasToken) {
|
||||
throw const TitleApiException('连接信息里的 Cookie 已失效,且没有可用于重新登录的令牌');
|
||||
}
|
||||
await loginGame(userId: share.userId, token: share.token);
|
||||
return const SessionRestoreResult(reusedCookie: false);
|
||||
}
|
||||
|
||||
/// 用导入的 Cookie 试拉一次 GetUserDataApi,会话不可用时返回 `null`。
|
||||
Future<UserDataBean?> _probeCookieSession(int userId, String cookie) async {
|
||||
final service = TitleApiService.fromHolder(cookies: cookie);
|
||||
if (service == null) return null;
|
||||
try {
|
||||
final json = await service.getUserData(userId);
|
||||
// 会话失效时服务器仍可能回一个不含 userData 的包,不能当成登录成功。
|
||||
if (json['userData'] is! Map) return null;
|
||||
final userData = UserDataBean.fromJson(json);
|
||||
updateCookies(service.cookies);
|
||||
return userData;
|
||||
} on TitleApiException {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
void updateCookies(String? cookies) {
|
||||
if (cookies != null && cookies.isNotEmpty) {
|
||||
_cookies = cookies;
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
import 'dart:convert';
|
||||
|
||||
/// 实验性:一次登录的可搬运快照(用户 ID + JSESSIONID Cookie + 令牌),
|
||||
/// 编码方式是 Base64(JSON),用于在别的设备上恢复会话、免重新扫码。
|
||||
///
|
||||
/// 没有任何加密,字符串在谁手里谁就能操作这个账号,只适合自己传递。
|
||||
class SessionShare {
|
||||
static const String _kind = 'ichino.session';
|
||||
static const int _version = 1;
|
||||
|
||||
final int userId;
|
||||
final String token;
|
||||
|
||||
/// 原始 Cookie 串,可能是 `JSESSIONID=...`,也可能带别的字段。
|
||||
final String? cookie;
|
||||
|
||||
const SessionShare({required this.userId, required this.token, this.cookie});
|
||||
|
||||
/// 只取 `JSESSIONID`:传输层后续请求就靠它维持会话
|
||||
/// (见 `TitleApiService._captureCookiesFromResponse`)。
|
||||
String? get jsessionid {
|
||||
final raw = cookie;
|
||||
if (raw == null) return null;
|
||||
for (final part in raw.split(';')) {
|
||||
final pair = part.trim();
|
||||
final eq = pair.indexOf('=');
|
||||
if (eq <= 0) continue;
|
||||
if (pair.substring(0, eq).toUpperCase() != 'JSESSIONID') continue;
|
||||
final value = pair.substring(eq + 1).trim();
|
||||
return value.isEmpty ? null : 'JSESSIONID=$value';
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
bool get hasCookie => jsessionid != null;
|
||||
bool get hasToken => token.isNotEmpty;
|
||||
|
||||
String encode() {
|
||||
final map = <String, dynamic>{
|
||||
'kind': _kind,
|
||||
'version': _version,
|
||||
'userId': userId,
|
||||
'token': token,
|
||||
'cookie': jsessionid,
|
||||
};
|
||||
return base64Encode(utf8.encode(jsonEncode(map)));
|
||||
}
|
||||
|
||||
/// 不是连接信息时返回 `null`——登录页靠它区分 QR 令牌和会话快照。
|
||||
static SessionShare? tryDecode(String input) {
|
||||
var text = input.replaceAll(RegExp(r'\s'), '');
|
||||
if (text.length < 16) return null;
|
||||
final pad = text.length % 4;
|
||||
if (pad != 0) text += '=' * (4 - pad);
|
||||
|
||||
try {
|
||||
final decoded = jsonDecode(utf8.decode(base64Decode(text)));
|
||||
if (decoded is! Map<String, dynamic>) return null;
|
||||
if (decoded['kind'] != _kind) return null;
|
||||
if ((decoded['version'] as num?)?.toInt() != _version) return null;
|
||||
|
||||
final share = SessionShare(
|
||||
userId: (decoded['userId'] as num?)?.toInt() ?? 0,
|
||||
token: decoded['token'] as String? ?? '',
|
||||
cookie: decoded['cookie'] as String?,
|
||||
);
|
||||
// 两头都空的话这串信息什么都恢复不了。
|
||||
if (share.userId <= 0 || (!share.hasCookie && !share.hasToken)) {
|
||||
return null;
|
||||
}
|
||||
return share;
|
||||
} catch (_) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user