Jerry/crystelf-admin
1
0
Fork 0
mirror of https://github.com/crystelf/crystelf-admin.git synced 2025-12-05 13:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:修复某些登录问题

Browse Source
This commit is contained in:
Jerry 2025-10-01 00:51:12 +08:00
parent 4a6bde2d0c
commit dcbab7d7ea
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/login.js
View File

@ -212,38 +212,41 @@ export default class LoginService extends plugin {
*/ */
async doLogin(e, session) { async doLogin(e, session) {
try { try {
const redis = global.redis;
//if (!redis) return e.reply('未找到全局redis服务..', true);
const { qq, method, nickname } = session; const { qq, method, nickname } = session;
e.reply(`开始使用 ${method} 登录 QQ[${qq}]`, true); e.reply(`开始使用 ${method} 登录 QQ[${qq}]`, true);
let loginInstance; let loginInstance;
if (method === 'nc') { if (method === 'nc') {
loginInstance = new NapcatService(); loginInstance = new NapcatService();
} else { } else {
loginInstance = new LgrService(); loginInstance = new LgrService();
} }
const qrPath = await loginInstance.login(qq, nickname); const qrPath = await loginInstance.login(qq, nickname);
const loginTimers = new Map();
if (qrPath && qrPath !== 'none') { if (qrPath && qrPath !== 'none') {
await e.reply(segment.image(`file:///${qrPath}`), true); await e.reply(segment.image(`file:///${qrPath}`), true);
const timerKey = `login:timer:${qq}`; const timerKey = `login:timer:${qq}`;
await redis.set(timerKey, 'pending', 120); if (loginTimers.has(timerKey)) {
clearTimeout(loginTimers.get(timerKey).timeout);
clearInterval(loginTimers.get(timerKey).check);
loginTimers.delete(timerKey);
}
const check = setInterval(async () => { const check = setInterval(async () => {
const status = await loginInstance.checkStatus(qq); const status = await loginInstance.checkStatus(qq);
if (status) { if (status) {
clearInterval(check); clearInterval(check);
await redis.del(timerKey); clearTimeout(timerObj.timeout);
loginTimers.delete(timerKey);
return e.reply(`QQ[${qq}] 登录成功!`, true); return e.reply(`QQ[${qq}] 登录成功!`, true);
} }
const ttl = await redis.ttl(timerKey);
if (ttl <= 0) {
clearInterval(check);
await loginInstance.disconnect(nickname);
return e.reply(`QQ[${qq}] 登录超时,已断开,请重新发起登录..`, true);
}
}, 5000); }, 5000);
const timeout = setTimeout(async () => {
clearInterval(check);
loginTimers.delete(timerKey);
await loginInstance.disconnect(nickname);
return e.reply(`QQ[${qq}] 登录超时,已断开,请重新发起登录..`, true);
}, 120 * 1000);
const timerObj = { check, timeout };
loginTimers.set(timerKey, timerObj);
} else { } else {
const status = await loginInstance.checkStatus(qq); const status = await loginInstance.checkStatus(qq);
if (status) { if (status) {