fix: network prepare

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.7.1",
+  "version": "4.7.4",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.1",
+  "version": "4.7.4",
   "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",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.1';
+export const napCatVersion = '4.7.4';

src/shell/base.ts

@@ -119,7 +119,6 @@ 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));
     });
     // 连接服务
 
@@ -137,7 +136,11 @@ async function handleLogin(
         });
 
     };
-
+    loginListener.onLoginConnected = () => {
+        waitForNetworkConnection(loginService, logger).then(() => {
+            handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
+        });
+    }
     loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
         WebUiDataRuntime.setQQLoginQrcodeURL(qrcodeUrl);
 
@@ -171,10 +174,9 @@ async function handleLogin(
     loginListener.onLoginFailed = (...args) => {
         logger.logError('[Core] [Login] Login Error , ErrInfo: ', JSON.stringify(args));
     };
+
     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 +291,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++;