fix: sendCommand

manifest.json

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

package.json

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

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.4.8';
+export const napCatVersion = '3.4.10';

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);
         });
     }
 

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.8", "napcat-update-button", "secondary")
+          SettingButton("V3.4.10", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([