KTeam/kt-template-online-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复QQBot扫码二维码获取

Browse Source
This commit is contained in:
sunlei 2026-06-01 18:09:40 +08:00
parent 6ed1eecb9a
commit beec106f4f
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qqbot/account/qqbot-napcat-login.service.ts
View File

@ -167,7 +167,9 @@ export class QqbotNapcatLoginService {
return this.completeLogin(session, container);
}
let qrcode = loginStatus.qrcodeurl || '';
let qrcode = this.isExpiredQrcodeStatus(loginStatus)
? ''
: loginStatus.qrcodeurl || '';
if (!qrcode) {
await this.callRefreshQrcode(container, true);
qrcode = await this.getQrcode(container, true);
@ -334,7 +336,7 @@ export class QqbotNapcatLoginService {
'/api/QQLogin/GetQQLoginQrcode',
);
if (!data.qrcode) {
throwVbenError('NapCat 未返回登录二维码');
return this.getQrcodeFromStatus(container);
}
return data.qrcode;
} catch (err) {
@ -342,11 +344,22 @@ export class QqbotNapcatLoginService {
const status = await this.getLoginStatus(container);
return status.qrcodeurl || '';
}
if (this.isQrcodePending(err)) {
return this.getQrcodeFromStatus(container);
}
throw err;
}
});
}
private async getQrcodeFromStatus(container: QqbotNapcatRuntime) {
const status = await this.getLoginStatus(container);
if (status.qrcodeurl && !this.isExpiredQrcodeStatus(status)) {
return status.qrcodeurl;
}
throwVbenError('NapCat 未返回登录二维码');
}
private async postNapcat<T>(
container: QqbotNapcatRuntime,
path: string,
@ -480,10 +493,25 @@ export class QqbotNapcatLoginService {
'ECONNRESET',
'ETIMEDOUT',
'NapCat 请求超时',
'NapCat 未返回登录二维码',
'QRCode Get Error',
'socket hang up',
].some((keyword) => message.includes(keyword));
}
private isQrcodePending(err: unknown) {
const message = this.getErrorMessage(err);
return message.includes('QRCode Get Error');
}
private isExpiredQrcodeStatus(status: NapcatLoginStatus) {
const message = status.loginError || '';
return (
message.includes('二维码') &&
(message.includes('过期') || message.includes('失效'))
);
}
private async executeNapcatRequest<T>(
retry: boolean,
action: () => Promise<T>,