feat: better edge case handling

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "3.4.9",
+  "version": "3.4.11",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.4.9';
+export const napCatVersion = '3.4.11';

src/core/packet/client/client.ts

@@ -58,12 +58,9 @@ export abstract class PacketClient {
     private async sendCommand(cmd: string, data: string, trace_id: string, rsp: boolean = false, timeout: number = 20000, sendcb: (json: RecvPacketData) => void = () => {
     }): Promise<RecvPacketData> {
         return new Promise<RecvPacketData>((resolve, reject) => {
-            if (rsp) {
+            const timeoutHandle = setTimeout(() => {
-                this.registerCallback(trace_id, 'recv', async (json: RecvPacketData) => {
+                reject(new Error(`sendCommand timed out after ${timeout} ms for ${cmd} with trace_id ${trace_id}`));
-                    clearTimeout(timeoutHandle);
+            }, timeout);
-                    resolve(json);
-                });
-            }
             this.registerCallback(trace_id, 'send', async (json: RecvPacketData) => {
                 sendcb(json);
                 if (!rsp) {
@@ -71,10 +68,13 @@ export abstract class PacketClient {
                     resolve(json);
                 }
             });
+            if (rsp) {
+                this.registerCallback(trace_id, 'recv', async (json: RecvPacketData) => {
+                    clearTimeout(timeoutHandle);
+                    resolve(json);
+                });
+            }
             this.sendCommandImpl(cmd, data, trace_id);
-            const timeoutHandle = setTimeout(() => {
-                reject(new Error(`sendCommand timed out after ${timeout} ms for ${cmd} with trace_id ${trace_id}`));
-            }, timeout);
         });
     }
 

src/core/packet/client/nativeClient.ts

@@ -51,7 +51,7 @@ export class NativePacketClient extends PacketClient {
                 //此时为recv 调用callback
                 const trace_id = this.sendEvent.get(seq);
                 const callback = this.cb.get(trace_id + 'recv');
-                console.log('callback:', callback, trace_id);
+                // console.log('callback:', callback, trace_id);
                 callback?.({ seq, cmd, hex_data });
             }
 

src/core/packet/session.ts

@@ -17,7 +17,7 @@ const clientPriority: clientPriority = {
 
 export class PacketSession {
     readonly logger: LogWrapper;
-    readonly client: PacketClient;
+    readonly client: PacketClient ;
     readonly packer: PacketPacker;
     readonly highwaySession: PacketHighwaySession;
 
@@ -30,17 +30,28 @@ export class PacketSession {
 
     private newClient(core: NapCatCore): PacketClient {
         const prefer = core.configLoader.configData.packetBackend;
+        let client: PacketClient | null;
         switch (prefer) {
         case "native":
-            return new NativePacketClient(core);
+            this.logger.log("[Core] [Packet] 使用指定的 NativePacketClient 作为后端");
+            client = new NativePacketClient(core);
+            break;
         case "frida":
-            return new wsPacketClient(core);
+            this.logger.log("[Core] [Packet] 使用指定的 FridaPacketClient 作为后端");
+            client = new wsPacketClient(core);
+            break;
         case "auto":
         case undefined:
-            return this.judgeClient(core);
+            client = this.judgeClient(core);
+            break;
         default:
-            throw new Error(`[Core] [Packet] 未知的Packet后端类型 ${prefer}，请检查配置文件！`);
+            this.logger.logError(`[Core] [Packet] 未知的Packet后端类型 ${prefer}，请检查配置文件！`);
+            client = null;
         }
+        if (!(client && client.check(core))) {
+            throw new Error("[Core] [Packet] 无可用的后端，NapCat.Packet将不会加载！");
+        }
+        return client;
     }
 
     private judgeClient(core: NapCatCore): PacketClient {

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V3.4.9", "napcat-update-button", "secondary")
+          SettingButton("V3.4.11", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([