GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: async error

Browse Source
This commit is contained in:
手瓜一十雪
2025-03-16 11:55:00 +08:00
parent e27d4c4302
commit 91df57d932
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/shell/base.ts
View File

@@ -31,6 +31,7 @@ import { WebUiDataRuntime } from '@/webui/src/helper/Data';
import { napCatVersion } from '@/common/version'; import { napCatVersion } from '@/common/version';
import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener'; import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';
import { sleep } from '@/common/helper'; import { sleep } from '@/common/helper';
// NapCat Shell App ES 入口文件 // NapCat Shell App ES 入口文件
async function handleUncaughtExceptions(logger: LogWrapper) { async function handleUncaughtExceptions(logger: LogWrapper) {
process.on('uncaughtException', (err) => { process.on('uncaughtException', (err) => {
@@ -114,18 +115,20 @@ async function handleLogin(
quickLoginUin: string | undefined, quickLoginUin: string | undefined,
historyLoginList: LoginListItem[] historyLoginList: LoginListItem[]
): Promise<SelfInfo> { ): Promise<SelfInfo> {
let context = { isLogined: false };
let inner_resolve: (value: SelfInfo) => void; let inner_resolve: (value: SelfInfo) => void;
let selfInfo: Promise<SelfInfo> = new Promise((resolve) => { let selfInfo: Promise<SelfInfo> = new Promise((resolve) => {
inner_resolve = resolve; inner_resolve = resolve;
handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
}); });
// 连接服务 // 连接服务
let isLogined = false;
const loginListener = new NodeIKernelLoginListener(); const loginListener = new NodeIKernelLoginListener();
loginListener.onUserLoggedIn = (userid: string) => { loginListener.onUserLoggedIn = (userid: string) => {
logger.logError(`当前账号(${userid})已登录,无法重复登录`); logger.logError(`当前账号(${userid})已登录,无法重复登录`);
}; };
loginListener.onQRCodeLoginSucceed = async (loginResult) => { loginListener.onQRCodeLoginSucceed = async (loginResult) => {
isLogined = true; context.isLogined = true;
inner_resolve({ inner_resolve({
uid: loginResult.uid, uid: loginResult.uid,
uin: loginResult.uin, uin: loginResult.uin,
@@ -156,7 +159,7 @@ async function handleLogin(
}; };
loginListener.onQRCodeSessionFailed = (errType: number, errCode: number) => { loginListener.onQRCodeSessionFailed = (errType: number, errCode: number) => {
if (!isLogined) { if (!context.isLogined) {
logger.logError('[Core] [Login] Login Error,ErrType: ', errType, ' ErrCode:', errCode); logger.logError('[Core] [Login] Login Error,ErrType: ', errType, ' ErrCode:', errCode);
if (errType == 1 && errCode == 3) { if (errType == 1 && errCode == 3) {
// 二维码过期刷新 // 二维码过期刷新
@@ -172,6 +175,9 @@ async function handleLogin(
loginService.connect(); loginService.connect();
await waitForNetworkConnection(loginService, logger); await waitForNetworkConnection(loginService, logger);
// 等待网络 // 等待网络
return await selfInfo;
}
async function handleLoginInner(context: { isLogined: boolean }, logger: LogWrapper, loginService: NodeIKernelLoginService, quickLoginUin: string | undefined, historyLoginList: LoginListItem[]) {
WebUiDataRuntime.setQuickLoginCall(async (uin: string) => { WebUiDataRuntime.setQuickLoginCall(async (uin: string) => {
return await new Promise((resolve) => { return await new Promise((resolve) => {
if (uin) { if (uin) {
@@ -197,13 +203,13 @@ async function handleLogin(
.then(result => { .then(result => {
if (result.loginErrorInfo.errMsg) { if (result.loginErrorInfo.errMsg) {
logger.logError('快速登录错误：', result.loginErrorInfo.errMsg); logger.logError('快速登录错误：', result.loginErrorInfo.errMsg);
if (!isLogined) loginService.getQRCodePicture(); if (!context.isLogined) loginService.getQRCodePicture();
} }
}) })
.catch(); .catch();
} else { } else {
logger.logError('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式'); logger.logError('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式');
if (!isLogined) loginService.getQRCodePicture(); if (!context.isLogined) loginService.getQRCodePicture();
} }
} else { } else {
logger.log('没有 -q 指令指定快速登录，将使用二维码登录方式'); logger.log('没有 -q 指令指定快速登录，将使用二维码登录方式');
@@ -222,8 +228,6 @@ async function handleLogin(
WebUiDataRuntime.setQQQuickLoginList(list.map((item) => item.uin.toString())); WebUiDataRuntime.setQQQuickLoginList(list.map((item) => item.uin.toString()));
WebUiDataRuntime.setQQNewLoginList(list); WebUiDataRuntime.setQQNewLoginList(list);
}); });
return await selfInfo;
} }
async function initializeSession( async function initializeSession(