fix(semi-auto): 扫码后主动提交换绑并透出虎牙失败原因

This commit is contained in:
2026-11-16 14:00:17 +08:00
parent 5aa627a0ca
commit ad59c87e13
9 changed files with 475 additions and 63 deletions
@@ -202,3 +202,44 @@ test('重新扫码换绑会向 Connector 传递 force_rebind', async () => {
globalThis.fetch = originalFetch
}
})
test('提交换绑复用 Connector confirm 端点并携带 rebind 标记', async () => {
const originalFetch = globalThis.fetch
let requestUrl = ''
let requestBody: Record<string, unknown> = {}
globalThis.fetch = (async (url: string | URL | Request, init?: RequestInit) => {
requestUrl = String(url)
requestBody = JSON.parse(String(init?.body || '{}')) as Record<string, unknown>
return new Response(
JSON.stringify({
sessionId: 'session-1',
status: 'scanned',
qrImage: '',
qrExpiresAt: '',
qrUrl: '',
bindGameAccount: '微信用户',
bindGameRole: '大鲨鱼伊塞53',
bindGameRoleId: '1199608910400',
bindGameChannel: '安卓(android) · 微信',
rebindRequested: true,
rebindUnchanged: false,
rebindConfirmState: 'accepted',
rebindConfirmMessage: '',
message: '虎牙已受理换绑,正在等待角色生效',
}),
{ status: 200, headers: { 'Content-Type': 'application/json' } },
)
}) as typeof fetch
try {
const session = await connector.submitHuyaRebind('session-1', 'external')
assert.equal(
requestUrl,
'http://connector.test/api/internal/huya-semi-auto/sessions/session-1/binding/confirm',
)
assert.deepEqual(requestBody, { rebind: true })
assert.equal(session.rebindConfirmState, 'accepted')
assert.equal(session.rebindRequested, true)
} finally {
globalThis.fetch = originalFetch
}
})
@@ -103,6 +103,8 @@ export type ConnectorBindingSession = {
hasExistingBinding?: boolean
rebindRequested?: boolean
rebindUnchanged?: boolean
rebindConfirmState?: 'idle' | 'submitting' | 'accepted' | 'rejected'
rebindConfirmMessage?: string
rebindCooldownDays?: number
nextRebindAt?: string
platformChangeBindDay?: number
@@ -429,6 +431,22 @@ export async function confirmHuyaBinding(
)
}
/**
* 扫码后由项目侧主动向虎牙提交换绑确认。
* 外部 Connector 暂未提供独立端点时复用 confirm 端点(语义一致,幂等)。
*/
export async function submitHuyaRebind(
sessionId: string,
mode: SemiAutoConnectorMode = defaultSemiAutoConnectorMode(),
): Promise<ConnectorBindingSession> {
if (mode === 'embedded') return huyaNativeConnector.submitRebind(sessionId)
return callConnector<ConnectorBindingSession>(
`/api/internal/huya-semi-auto/sessions/${encodeURIComponent(sessionId)}/binding/confirm`,
{ method: 'POST', body: { rebind: true } },
mode,
)
}
export async function createHuyaBrowserTicket(
input: {
sessionId: string
@@ -54,6 +54,8 @@ const CREDENTIAL_TTL_MS = 24 * 60 * 60 * 1000
const BINDING_QR_TTL_MS = 5 * 60 * 1000
const REBIND_WINDOW_DAYS = 7
const DAY_MS = 24 * 60 * 60 * 1000
// 提交换绑后给虎牙留的生效时间;期间前端继续轮询,不提前判失败。
const REBIND_EFFECT_WINDOW_MS = 60 * 1000
const BROWSER_TICKET_TTL_MS = 2 * 60 * 1000
const MAX_SESSIONS = 500
const NATIVE_TICKET_PREFIX = 'native-ticket-'
@@ -76,6 +78,10 @@ type NativeBindState = {
rebindRequested: boolean
rebindScanned: boolean
rebindUnchanged: boolean
rebindConfirmState: 'idle' | 'submitting' | 'accepted' | 'rejected'
rebindConfirmMessage: string
rebindConfirmAt: number
rebindEffectDeadlineMs: number
rebindCooldownDays: number
nextRebindAt: string
changeBindTime: number
@@ -156,6 +162,10 @@ function defaultBindingState(): NativeBindState {
rebindRequested: false,
rebindScanned: false,
rebindUnchanged: false,
rebindConfirmState: 'idle',
rebindConfirmMessage: '',
rebindConfirmAt: 0,
rebindEffectDeadlineMs: 0,
rebindCooldownDays: 0,
nextRebindAt: '',
changeBindTime: 0,
@@ -188,8 +198,9 @@ export type RebindCooldownInput = {
}
/**
* 虎牙活动限制:每 7 个自然日允许换绑 1 次。
* changeBindTime 为上次绑定/换绑时间(秒级 Unix 时间戳),changeBindDay 作为兜底剩余天数。
* 虎牙活动提示:每 7 个自然日允许换绑 1 次。
* 这里计算的是「本次绑定后预计下次可换绑时间」,只用于文案展示,
* 不能作为本次提交换绑的前置拦截;是否允许以 confirmBindActAccount 的返回为准。
*/
export function resolveRebindCooldown(
response: RebindCooldownInput | null | undefined,
@@ -229,16 +240,16 @@ function applyRebindMeta(
session.binding.changeBindDay = Number(response?.changeBindDay || 0)
}
function rebindUnchangedMessage(
function rebindFailureMessage(
roleName: string,
cooldownDays: number,
platformMessage: string,
nextRebindAt: string,
): string {
// 优先展示虎牙原始原因(例如「7 天内只能换绑 1 次」),不要本地编造失败原因。
const raw = readString(platformMessage)
if (raw) return `换绑未成功:${raw}`
const next = rebindDateLabel(nextRebindAt)
if (cooldownDays > 0) {
return `扫码后仍识别到原绑定角色「${roleName}」;本活动 7 天内只能换绑 1 次${next ? `,预计下次换绑:${next}` : ''}`
}
return `扫码后仍识别到原绑定角色「${roleName}」,请确认微信中选择的角色或重新换绑`
return `换绑已提交,但平台仍返回原绑定角色「${roleName}」${next ? `,预计下次换绑:${next}` : ''};请稍后刷新或重新提交换绑`
}
function extractInt(value: unknown): number {
@@ -763,9 +774,9 @@ export class HuyaNativeConnector {
this.markRoleReady(session, role, hasExistingBinding && !session.binding.rebindRequested)
if (session.binding.rebindRequested) {
session.binding.message = session.binding.rebindUnchanged
? rebindUnchangedMessage(
? rebindFailureMessage(
role.role,
session.binding.rebindCooldownDays,
session.binding.rebindConfirmMessage,
session.binding.nextRebindAt,
)
: '已识别待换绑角色,请确认换绑'
@@ -833,6 +844,10 @@ export class HuyaNativeConnector {
session.binding.rebindRequested = true
session.binding.rebindScanned = false
session.binding.rebindUnchanged = false
session.binding.rebindConfirmState = 'idle'
session.binding.rebindConfirmMessage = ''
session.binding.rebindConfirmAt = 0
session.binding.rebindEffectDeadlineMs = 0
session.binding.baselineRoleKey = bindingRoleKey(role)
}
session.binding.status = 'qr_pending'
@@ -847,6 +862,40 @@ export class HuyaNativeConnector {
})
}
/**
* 扫码完成后由项目侧替客户点「确认绑定」。
* confirmBindActAccount 确认的是虎牙侧已选中的角色,必须在读取新角色之前调用;
* 若客户已在虎牙弹窗里点过确认,重复调用是幂等的。
*/
private async submitRebindLocked(session: NativeSession, rpc: HuyaRpcClient): Promise<void> {
const { bindActId, outerActId } = configValues()
const now = this.now()
session.binding.rebindConfirmState = 'submitting'
session.binding.rebindConfirmMessage = ''
session.binding.rebindConfirmAt = now
try {
const confirmed = await rpc.confirmBindActAccount({
uid: session.uid,
cookie: session.cookie,
bindActId,
outerActId,
})
if (confirmed && confirmed.status === 200) {
session.binding.rebindConfirmState = 'accepted'
session.binding.rebindEffectDeadlineMs = now + REBIND_EFFECT_WINDOW_MS
session.binding.message = '虎牙已受理换绑,正在等待角色生效'
return
}
session.binding.rebindConfirmState = 'rejected'
session.binding.rebindConfirmMessage = confirmed?.msg || '虎牙未接受本次换绑'
session.binding.message = `虎牙未接受本次换绑:${session.binding.rebindConfirmMessage}`
} catch (error) {
session.binding.rebindConfirmState = 'rejected'
session.binding.rebindConfirmMessage = errorMessage(error)
session.binding.message = `提交换绑失败:${session.binding.rebindConfirmMessage}`
}
}
async pollBinding(sessionId: string): Promise<ConnectorBindingSession> {
return this.withLock(sessionId, async () => {
const session = this.requireAuthenticatedSession(sessionId)
@@ -865,7 +914,9 @@ export class HuyaNativeConnector {
}
if (qrStatus.isScan) {
session.binding.status = 'scanned'
session.binding.message = '已扫码,等待绑定完成'
session.binding.message = session.binding.rebindRequested
? '已扫码,请在虎牙确认框中选中目标角色'
: '已扫码,等待绑定完成'
}
if (qrStatus.isScan || qrStatus.isCompleted) {
session.binding.rebindScanned = true
@@ -877,6 +928,15 @@ export class HuyaNativeConnector {
return this.bindingView(session)
}
const rpc = new HuyaRpcClient({ fetchImpl: this.fetchImpl, timeoutMs: this.rpcTimeoutMs })
// 小程序流程结束后立即由项目侧提交换绑,不再等角色自己变化。
if (
session.binding.rebindRequested &&
session.binding.rebindScanned &&
qrCompleted &&
session.binding.rebindConfirmState === 'idle'
) {
await this.submitRebindLocked(session, rpc)
}
const response = await rpc.checkUserBindGameAccount({
uid: session.uid,
cookie: session.cookie,
@@ -898,20 +958,36 @@ export class HuyaNativeConnector {
const changedRole =
!session.binding.baselineRoleKey || roleKey !== session.binding.baselineRoleKey
if (rebindRequested && !changedRole) {
if (qrCompleted || session.binding.rebindUnchanged) {
// 扫码完成但虎牙仍返回原角色:保留 rebind 状态,明确告知未换绑及冷却原因,
// 不能清空 rebindRequested,否则 confirmBinding 会误判为“使用已有绑定”。
if (session.binding.rebindConfirmState === 'rejected') {
// 虎牙明确拒绝:保留 rebind 状态并展示虎牙原文,不能清空 rebindRequested。
session.binding.rebindUnchanged = true
this.markRoleReady(session, role, hasExistingBinding)
session.binding.message = rebindUnchangedMessage(
session.binding.message = rebindFailureMessage(
role.role,
session.binding.rebindCooldownDays,
session.binding.rebindConfirmMessage,
session.binding.nextRebindAt,
)
} else {
session.binding.status = 'scanned'
session.binding.message = '已扫码,正在等待换绑角色生效'
return this.bindingView(session)
}
if (session.binding.rebindConfirmState === 'accepted') {
if (this.now() < session.binding.rebindEffectDeadlineMs) {
session.binding.status = 'scanned'
session.binding.message = '虎牙已受理换绑,正在等待角色生效'
} else {
session.binding.rebindUnchanged = true
this.markRoleReady(session, role, hasExistingBinding)
session.binding.message = rebindFailureMessage(
role.role,
session.binding.rebindConfirmMessage,
session.binding.nextRebindAt,
)
}
return this.bindingView(session)
}
session.binding.status = 'scanned'
session.binding.message = qrCompleted
? '扫码已完成,请点击「已选好角色,提交换绑」'
: '已扫码,请在虎牙确认框中选中目标角色'
return this.bindingView(session)
}
if (rebindRequested) session.binding.rebindUnchanged = false
@@ -932,6 +1008,11 @@ export class HuyaNativeConnector {
const session = this.requireAuthenticatedSession(sessionId)
const { bindActId, outerActId } = configValues()
const rpc = new HuyaRpcClient({ fetchImpl: this.fetchImpl, timeoutMs: this.rpcTimeoutMs })
const rebindRequested = session.binding.rebindRequested
if (rebindRequested && session.binding.rebindConfirmState !== 'accepted') {
// 客户点确认前再兜底提交一次,避免小程序扫码后项目没来得及自动提交。
await this.submitRebindLocked(session, rpc)
}
const response = await rpc.checkUserBindGameAccount({
uid: session.uid,
cookie: session.cookie,
@@ -945,28 +1026,30 @@ export class HuyaNativeConnector {
errorCode: 'huya_bind_role_not_ready',
})
}
const rebindRequested = session.binding.rebindRequested
applyRebindMeta(session, response, this.now())
if (
rebindRequested &&
session.binding.baselineRoleKey &&
bindingRoleKey(role) === session.binding.baselineRoleKey
) {
const cooldownDays = session.binding.rebindCooldownDays
const next = rebindDateLabel(session.binding.nextRebindAt)
// 只有虎牙实际未生效时才拦截;冷却原因以虎牙返回的原文为准。
throw createHttpError(
cooldownDays > 0
? `换绑未生效:平台仍返回原绑定角色「${role.role}」;本活动 7 天内只能换绑 1 次${next ? `,预计下次换绑:${next}` : ''}`
: `换绑未生效:平台仍返回原绑定角色「${role.role}」,请重新扫码选择正确角色`,
rebindFailureMessage(
role.role,
session.binding.rebindConfirmMessage,
session.binding.nextRebindAt,
),
{
statusCode: 409,
errorCode:
cooldownDays > 0 ? 'huya_bind_rebind_cooldown' : 'huya_bind_rebind_not_ready',
session.binding.rebindConfirmState === 'rejected'
? 'huya_bind_rebind_rejected'
: 'huya_bind_rebind_not_effective',
},
)
}
const useExistingBinding = hasExistingHuyaBinding(response) && !rebindRequested
if (!useExistingBinding) {
if (!useExistingBinding && session.binding.rebindConfirmState !== 'accepted') {
const confirmed = await rpc.confirmBindActAccount({
uid: session.uid,
cookie: session.cookie,
@@ -986,6 +1069,10 @@ export class HuyaNativeConnector {
session.binding.rebindRequested = false
session.binding.rebindScanned = false
session.binding.rebindUnchanged = false
session.binding.rebindConfirmState = 'idle'
session.binding.rebindConfirmMessage = ''
session.binding.rebindConfirmAt = 0
session.binding.rebindEffectDeadlineMs = 0
session.binding.rebindCooldownDays = 0
session.binding.nextRebindAt = ''
session.binding.baselineRoleKey = ''
@@ -998,6 +1085,54 @@ export class HuyaNativeConnector {
})
}
/** 客户手动点击「已选好角色,提交换绑」时调用。 */
async submitRebind(sessionId: string): Promise<ConnectorBindingSession> {
return this.withLock(sessionId, async () => {
const session = this.requireAuthenticatedSession(sessionId)
if (!session.binding.rebindRequested) {
throw createHttpError('当前没有待换绑的角色,请重新扫码换绑', {
statusCode: 409,
errorCode: 'huya_bind_rebind_not_requested',
})
}
const { bindActId, outerActId } = configValues()
const rpc = new HuyaRpcClient({ fetchImpl: this.fetchImpl, timeoutMs: this.rpcTimeoutMs })
await this.submitRebindLocked(session, rpc)
const response = await rpc.checkUserBindGameAccount({
uid: session.uid,
cookie: session.cookie,
bindActId,
outerActId,
})
if (response && response.status === 200) {
const role = parseRole(response)
applyRebindMeta(session, response, this.now())
if (role.role) {
const changedRole =
!session.binding.baselineRoleKey ||
bindingRoleKey(role) !== session.binding.baselineRoleKey
if (changedRole) {
session.binding.rebindUnchanged = false
this.markRoleReady(session, role, false)
session.binding.message = '已识别换绑角色,请确认换绑'
} else if (session.binding.rebindConfirmState === 'rejected') {
session.binding.rebindUnchanged = true
this.markRoleReady(session, role, hasExistingHuyaBinding(response))
session.binding.message = rebindFailureMessage(
role.role,
session.binding.rebindConfirmMessage,
session.binding.nextRebindAt,
)
} else {
session.binding.status = 'scanned'
session.binding.message = '虎牙已受理换绑,正在等待角色生效'
}
}
}
return this.bindingView(session)
})
}
async createBrowserTicket(input: {
sessionId: string
targetUrl?: string
@@ -1276,6 +1411,8 @@ export class HuyaNativeConnector {
hasExistingBinding: binding.hasExistingBinding,
rebindRequested: binding.rebindRequested,
rebindUnchanged: binding.rebindUnchanged,
rebindConfirmState: binding.rebindConfirmState,
rebindConfirmMessage: binding.rebindConfirmMessage,
rebindCooldownDays: binding.rebindCooldownDays,
nextRebindAt: binding.nextRebindAt,
platformChangeBindDay: binding.changeBindDay,
@@ -27,6 +27,7 @@ import {
revokeHuyaSession,
sendHuyaSmsCode,
startHuyaBinding,
submitHuyaRebind,
consumeHuyaBrowserTicket,
verifyHuyaSmsChallenge,
type ConnectorBindingSession,
@@ -956,6 +957,8 @@ function mapBindingUpdate(session: ConnectorBindingSession) {
hasExistingBinding: session.hasExistingBinding === true,
rebindRequested: session.rebindRequested === true,
rebindUnchanged: session.rebindUnchanged === true,
rebindConfirmState: session.rebindConfirmState || 'idle',
rebindConfirmMessage: String(session.rebindConfirmMessage || ''),
rebindCooldownDays: Number(session.rebindCooldownDays || 0),
nextRebindAt: String(session.nextRebindAt || ''),
platformChangeBindDay: Number(session.platformChangeBindDay || 0),
@@ -1139,6 +1142,8 @@ async function updateBindingTask(
verdict: comparison.verdict,
rebindRequested: mapped.rebindRequested,
rebindUnchanged: mapped.rebindUnchanged,
rebindConfirmState: mapped.rebindConfirmState,
rebindConfirmMessage: mapped.rebindConfirmMessage,
rebindCooldownDays: mapped.rebindCooldownDays,
nextRebindAt: mapped.nextRebindAt,
changeBindDay: mapped.platformChangeBindDay,
@@ -1159,6 +1164,8 @@ async function updateBindingTask(
hasExistingBinding: mapped.hasExistingBinding,
rebindRequested: mapped.rebindRequested,
rebindUnchanged: mapped.rebindUnchanged,
rebindConfirmState: mapped.rebindConfirmState,
rebindConfirmMessage: mapped.rebindConfirmMessage,
rebindCooldownDays: mapped.rebindCooldownDays,
nextRebindAt: mapped.nextRebindAt,
platformChangeBindDay: mapped.platformChangeBindDay,
@@ -1358,8 +1365,8 @@ export async function confirmPublicBinding(orderNoInput: unknown, taskIdInput: u
throw createHttpError(session.message || '换绑未生效:平台仍返回原绑定角色,请重新扫码', {
statusCode: 409,
errorCode:
Number(session.rebindCooldownDays || 0) > 0
? 'semi_auto_binding_rebind_cooldown'
session.rebindConfirmState === 'rejected'
? 'semi_auto_binding_rebind_rejected'
: 'semi_auto_binding_rebind_unchanged',
})
}
@@ -1380,6 +1387,38 @@ export async function confirmPublicBinding(orderNoInput: unknown, taskIdInput: u
return { task: mapTask(updated), binding }
}
/**
* 客户在微信里选好目标角色后,由项目侧主动向虎牙提交换绑确认。
* 与「确认绑定」不同,这一步只提交换绑,不把任务标记为已确认。
*/
export async function submitPublicRebind(orderNoInput: unknown, taskIdInput: unknown) {
const orderNo = normalizeOrderNo(orderNoInput)
const taskId = normalizeId(taskIdInput)
const task = await loadTaskForOrder(orderNo, taskId)
if (task.execution_status === 'completed' || task.execution_status === 'cancelled') {
throw createHttpError('当前订单已结束,不能提交换绑', {
statusCode: 409,
errorCode: 'semi_auto_task_closed',
})
}
if (task.platform !== 'huya') {
throw createHttpError('当前平台不需要换绑游戏角色', {
statusCode: 409,
errorCode: 'semi_auto_rebind_not_supported',
})
}
if (!task.connector_session_id || task.login_status !== 'authenticated') {
throw createHttpError('请先完成平台登录', {
statusCode: 409,
errorCode: 'semi_auto_login_required',
})
}
const session = await submitHuyaRebind(task.connector_session_id, task.connector_mode)
const binding = await updateBindingTask(task, session, 'customer')
const updated = await loadTask(task.id)
return { task: mapTask(updated), binding }
}
export async function sendPublicHuyaSmsCode(
orderNoInput: unknown,
taskIdInput: unknown,