feat(semi-auto): 重构客户资料收集与虎牙绑定确认流程
- 客户资料页按设计稿重构,区服固定四项下拉,游戏编号/角色名校验 - 虎牙登录与绑定页统一深色样式,扫码页新增改用手机号登录 - 待确认角色 UID 改用 huyaUid,不再展示虎牙加密 roleId - 绑定确认新增两侧角色比对,不一致禁止确认,会话过期引导重新登录 - 新增迁移 168/169 与角色绑定单测,脚本换行符固定为 LF
This commit is contained in:
@@ -12,6 +12,7 @@ import path from 'node:path'
|
||||
import { runtimeConfig } from '../../../config/runtime.js'
|
||||
import { createHttpError } from '../../../utils/http.js'
|
||||
import { logWarn } from '../../../utils/logger.js'
|
||||
import { resolveBindingRoleId } from '../binding-role-id.js'
|
||||
import type {
|
||||
ConnectorBindingSession,
|
||||
ConnectorBrowserTicket,
|
||||
@@ -62,10 +63,12 @@ type NativeBindingStatus = ConnectorBindingSession['status']
|
||||
type NativeBindState = {
|
||||
status: NativeBindingStatus
|
||||
qrImage: string
|
||||
qrUrl: string
|
||||
qrToken: string
|
||||
expiresAtMs: number
|
||||
account: string
|
||||
role: string
|
||||
roleId: string
|
||||
channel: string
|
||||
hasExistingBinding: boolean
|
||||
rebindRequested: boolean
|
||||
@@ -135,10 +138,12 @@ function defaultBindingState(): NativeBindState {
|
||||
return {
|
||||
status: 'not_started',
|
||||
qrImage: '',
|
||||
qrUrl: '',
|
||||
qrToken: '',
|
||||
expiresAtMs: 0,
|
||||
account: '',
|
||||
role: '',
|
||||
roleId: '',
|
||||
channel: '',
|
||||
hasExistingBinding: false,
|
||||
rebindRequested: false,
|
||||
@@ -223,18 +228,29 @@ function smsBehavior(page = 'https://www.huya.com/g'): { behavior: string; page:
|
||||
function parseRole(response: HuyaBindResponse | null): {
|
||||
account: string
|
||||
role: string
|
||||
roleId: string
|
||||
channel: string
|
||||
} {
|
||||
if (!response || response.status !== 200) return { account: '', role: '', channel: '' }
|
||||
if (!response || response.status !== 200) {
|
||||
return { account: '', role: '', roleId: '', channel: '' }
|
||||
}
|
||||
const data: HuyaGameAccountData = response.accountData
|
||||
const account = data.gameAccount.nick || data.gameRole.roleName
|
||||
const role = data.gameRole.roleName
|
||||
const channel = [data.gameRole.platName, data.gameRole.areaName].filter(Boolean).join(' · ')
|
||||
return { account, role, channel }
|
||||
// 虎牙 checkUserBindGameAccount 的 gameRole.roleId 就是平台侧角色 ID;
|
||||
// 该字段一直存在于 RPC 响应里,之前被丢弃,导致客户页无法做两侧角色比对。
|
||||
const roleId = String(data.gameRole.roleId || '').trim()
|
||||
return { account, role, roleId, channel }
|
||||
}
|
||||
|
||||
function bindingRoleKey(role: { account: string; role: string; channel: string }): string {
|
||||
return [role.account, role.role, role.channel].join('\u0000')
|
||||
function bindingRoleKey(role: {
|
||||
account: string
|
||||
role: string
|
||||
roleId?: string
|
||||
channel: string
|
||||
}): string {
|
||||
return [role.account, role.role, role.roleId || '', role.channel].join('\u0000')
|
||||
}
|
||||
|
||||
function configValues() {
|
||||
@@ -720,6 +736,7 @@ export class HuyaNativeConnector {
|
||||
}
|
||||
session.binding.status = 'qr_pending'
|
||||
session.binding.qrImage = mini.image
|
||||
session.binding.qrUrl = urls.qrUrl
|
||||
session.binding.qrToken = mini.token
|
||||
session.binding.expiresAtMs = this.now() + BINDING_QR_TTL_MS
|
||||
session.binding.message = options.forceRebind
|
||||
@@ -1042,12 +1059,13 @@ export class HuyaNativeConnector {
|
||||
|
||||
private markRoleReady(
|
||||
session: NativeSession,
|
||||
role: { account: string; role: string; channel: string },
|
||||
role: { account: string; role: string; roleId?: string; channel: string },
|
||||
existingBinding = false,
|
||||
): void {
|
||||
session.binding.status = 'role_ready'
|
||||
session.binding.account = role.account
|
||||
session.binding.role = role.role
|
||||
session.binding.roleId = role.roleId || ''
|
||||
session.binding.channel = role.channel
|
||||
session.binding.message = existingBinding
|
||||
? '当前账号已有绑定角色,请确认直接使用'
|
||||
@@ -1131,8 +1149,10 @@ export class HuyaNativeConnector {
|
||||
status: binding.status,
|
||||
qrImage: binding.qrImage,
|
||||
qrExpiresAt: binding.expiresAtMs ? iso(binding.expiresAtMs) : '',
|
||||
qrUrl: binding.qrUrl,
|
||||
bindGameAccount: binding.account,
|
||||
bindGameRole: binding.role,
|
||||
bindGameRoleId: resolveBindingRoleId(binding.roleId, session.uid),
|
||||
bindGameChannel: binding.channel,
|
||||
hasExistingBinding: binding.hasExistingBinding,
|
||||
rebindRequested: binding.rebindRequested,
|
||||
|
||||
Reference in New Issue
Block a user