mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-07-19 12:03:37 +00:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
c635496677 | ||
![]() |
8753ecfd92 | ||
![]() |
5eda1f2870 | ||
![]() |
d5a60074f7 |
@@ -4,7 +4,7 @@
|
||||
"name": "NapCatQQ",
|
||||
"slug": "NapCat.Framework",
|
||||
"description": "高性能的 OneBot 11 协议实现",
|
||||
"version": "4.7.1",
|
||||
"version": "4.7.3",
|
||||
"icon": "./logo.png",
|
||||
"authors": [
|
||||
{
|
||||
|
@@ -2,7 +2,7 @@
|
||||
"name": "napcat",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"version": "4.7.1",
|
||||
"version": "4.7.3",
|
||||
"scripts": {
|
||||
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
||||
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
||||
|
@@ -1 +1 @@
|
||||
export const napCatVersion = '4.7.1';
|
||||
export const napCatVersion = '4.7.3';
|
||||
|
@@ -119,7 +119,9 @@ async function handleLogin(
|
||||
let inner_resolve: (value: SelfInfo) => void;
|
||||
let selfInfo: Promise<SelfInfo> = new Promise((resolve) => {
|
||||
inner_resolve = resolve;
|
||||
handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
|
||||
waitForNetworkConnection(loginService, logger).then(() => {
|
||||
handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
|
||||
});
|
||||
});
|
||||
// 连接服务
|
||||
|
||||
@@ -173,8 +175,6 @@ async function handleLogin(
|
||||
};
|
||||
loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
|
||||
loginService.connect();
|
||||
await waitForNetworkConnection(loginService, logger);
|
||||
// 等待网络
|
||||
return await selfInfo;
|
||||
}
|
||||
async function handleLoginInner(context: { isLogined: boolean }, logger: LogWrapper, loginService: NodeIKernelLoginService, quickLoginUin: string | undefined, historyLoginList: LoginListItem[]) {
|
||||
@@ -289,7 +289,7 @@ async function waitForNetworkConnection(loginService: NodeIKernelLoginService, l
|
||||
let network_ok = false;
|
||||
let tryCount = 0;
|
||||
while (!network_ok) {
|
||||
network_ok = loginService.getMsfStatus() === 0;
|
||||
network_ok = loginService.getMsfStatus() !== 3;// win 11 0连接 1未连接
|
||||
logger.log('等待网络连接...');
|
||||
await sleep(500);
|
||||
tryCount++;
|
||||
|
Reference in New Issue
Block a user