fix(onebot): relax packet status check for send poke (#1945)

Author: y4ho0

packages/napcat-core/apis/packet.ts

@@ -36,7 +36,7 @@ export class NTQQPacketApi {
       })
       .catch((err) => {
         this.logger.logError(err);
-        this.errStack.push(err);
+        this.pushError(err);
         return false;
       })) && this.pkt?.available;
   }
@@ -46,7 +46,15 @@ export class NTQQPacketApi {
   }
 
   get clientLogStack () {
-    return this.pkt?.clientLogStack + '\n' + this.errStack.join('\n');
+    return [this.pkt?.clientLogStack, ...this.errStack].filter(Boolean).join('\n');
+  }
+
+  private pushError (error: unknown) {
+    if (error instanceof Error) {
+      this.errStack.push(error.stack || error.message);
+      return;
+    }
+    this.errStack.push(String(error));
   }
 
   async InitSendPacket (qqVer: string) {
@@ -67,10 +75,17 @@ export class NTQQPacketApi {
     }
     this.pkt = new PacketClientSession(this.core);
     await this.pkt.init(process.pid, table.recv, table.send);
+    if (!this.pkt.available) {
+      const err = '[Core] [Packet] NativePacketClient 初始化失败，PacketBackend 发包能力不可用！';
+      this.logger.logError(err);
+      this.errStack.push(err);
+      return false;
+    }
     try {
       await this.pkt.operation.FetchRkey(3000);
     } catch (error) {
       this.logger.logError('测试Packet状态异常', error);
+      this.pushError(error);
       return false;
     }
     return true;

packages/napcat-core/packet/client/nativeClient.ts

@@ -39,12 +39,17 @@ export class NativePacketClient {
 
   async init (_pid: number, recv: string, send: string): Promise<void> {
     const isNewQQ = this.napcore.basicInfo.requireMinNTQQBuild('40824');
-    if (isNewQQ) {
-      const success = this.napi2nativeLoader.initHook(send, recv);
-      if (success) {
-        this.available = true;
-      }
+    if (!isNewQQ) {
+      this.logStack.pushLogWarn('[PacketClient] 当前 QQ 版本低于 NativePacketClient 要求，跳过 Hook 初始化');
+      return;
     }
+    const success = this.napi2nativeLoader.initHook(send, recv);
+    if (success) {
+      this.available = true;
+      this.logStack.pushLogInfo(`[PacketClient] NativePacketClient Hook 初始化成功 platform=${process.platform}.${process.arch}`);
+      return;
+    }
+    this.logStack.pushLogError(`[PacketClient] NativePacketClient Hook 初始化失败 platform=${process.platform}.${process.arch} send=${send} recv=${recv}`);
   }
 
   async sendPacket (

packages/napcat-onebot/action/packet/GetPacketStatus.ts

@@ -4,14 +4,31 @@ import { Type } from '@sinclair/typebox';
 
 export abstract class GetPacketStatusDepends<PT, RT> extends OneBotAction<PT, RT> {
   protected override async check (payload: PT): Promise<BaseCheckResult> {
+    const schemaResult = await super.check(payload);
+    if (!schemaResult.valid) return schemaResult;
     if (!this.core.apis.PacketApi.packetStatus) {
       return {
         valid: false,
         message: 'packetBackend不可用，请参照文档 https://napneko.github.io/config/advanced 和启动日志检查packetBackend状态或进行配置！' +
           '错误堆栈信息：' + this.core.apis.PacketApi.clientLogStack,
       };
     }
-    return await super.check(payload);
+    return { valid: true };
+  }
+}
+
+export abstract class PacketSendAvailableDepends<PT, RT> extends OneBotAction<PT, RT> {
+  protected override async check (payload: PT): Promise<BaseCheckResult> {
+    const schemaResult = await super.check(payload);
+    if (!schemaResult.valid) return schemaResult;
+    if (!this.core.apis.PacketApi.available) {
+      return {
+        valid: false,
+        message: 'packetBackend发包能力不可用，请参照文档 https://napneko.github.io/config/advanced 和启动日志检查packetBackend状态或进行配置！' +
+          '错误堆栈信息：' + this.core.apis.PacketApi.clientLogStack,
+      };
+    }
+    return { valid: true };
   }
 }
 

packages/napcat-onebot/action/packet/SendPoke.ts

@@ -1,5 +1,5 @@
 import { ActionName } from '@/napcat-onebot/action/router';
-import { GetPacketStatusDepends } from '@/napcat-onebot/action/packet/GetPacketStatus';
+import { PacketSendAvailableDepends } from '@/napcat-onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 import { PacketActionsExamples } from '../example/PacketActionsExamples';
@@ -11,7 +11,7 @@ export const SendPokePayloadSchema = Type.Object({
 });
 
 export type SendPokePayload = Static<typeof SendPokePayloadSchema>;
-export class SendPokeBase extends GetPacketStatusDepends<SendPokePayload, void> {
+export class SendPokeBase extends PacketSendAvailableDepends<SendPokePayload, void> {
   override payloadSchema = SendPokePayloadSchema;
   override returnSchema = Type.Null();
   override actionSummary = '发送戳一戳';