@zhin.js/adapter-qq 6.0.0 → 6.0.1

package/src/webhook.ts

@@ -3,7 +3,7 @@
  */
 import path from 'node:path';
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { Bot, ReceiverMode } from 'qq-official-bot';
+import { Bot, ReceiverMode, type Sendable } from 'qq-official-bot';
 import type { HttpHost, HttpRouteRegistration } from '@zhin.js/host-http';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import type { ResolvedQqHttpConfig } from './protocol.js';
@@ -46,19 +46,13 @@ export async function handleQqWebhookRequest(
     return;
   }
   try {
-    let parsedBody: unknown;
-    const raw = await readRequestBodyText(request);
-    if (raw) {
-      try {
-        parsedBody = JSON.parse(raw);
-      } catch {
-        parsedBody = undefined;
-      }
-    }
+    // 不预消费请求流：库的验签必须基于原始字节（JSON.parse → JSON.stringify
+    // 会改变空白/转义/键序导致 401），body 留 undefined 让库自己读流；
+    // 预消费还会让非 JSON body 时库监听已结束的 end 事件而挂死。
     await bot.middleware({
       req: request,
       res: response,
-      request: { body: parsedBody },
+      request: { body: undefined },
     }, async () => undefined);
   } catch (error) {
     logger.error('QQ webhook error:', error);
@@ -103,10 +97,10 @@ export function defaultCreateHttpBot(config: ResolvedQqHttpConfig): QqHttpBotTra
     removeAllListeners: () => {
       bot.removeAllListeners(undefined as never);
     },
-    sendPrivateMessage: (userId, message) => bot.sendPrivateMessage(userId, message),
-    sendGroupMessage: (groupId, message) => bot.sendGroupMessage(groupId, message),
-    sendGuildMessage: (channelId, message) => bot.sendGuildMessage(channelId, message),
-    sendDirectMessage: (guildId, message) => bot.sendDirectMessage(guildId, message),
+    sendPrivateMessage: (userId, message) => bot.sendPrivateMessage(userId, message as Sendable),
+    sendGroupMessage: (groupId, message) => bot.sendGroupMessage(groupId, message as Sendable),
+    sendGuildMessage: (channelId, message) => bot.sendGuildMessage(channelId, message as Sendable),
+    sendDirectMessage: (guildId, message) => bot.sendDirectMessage(guildId, message as Sendable),
     getGuilds: () => bot.guildService.getList(),
     getChannels: (guildId) => bot.channelService.getList(guildId),
     getChannelInfo: (channelId) => bot.channelService.getInfo(channelId),

package/src/ws.ts

@@ -2,8 +2,9 @@
  * QQ WebSocket transport: bot factory and inbound message normalization.
  */
 import path from 'node:path';
-import { Bot, ReceiverMode } from 'qq-official-bot';
+import { Bot, ReceiverMode, type Sendable } from 'qq-official-bot';
 import { getLevel, toLog4jsLevel } from '@zhin.js/logger';
+import type { QqOutboundMessage } from './outbound.js';
 import type { QqChannelKind, QqInboundMessage, ResolvedQqWebsocketConfig } from './protocol.js';
 
 /** Minimal bot surface used by the endpoint (real qq-official-bot or test mock). */
@@ -12,10 +13,10 @@ export interface QqBotTransport {
   stop(): Promise<void>;
   on(event: string, listener: (...args: unknown[]) => void): void;
   removeAllListeners(): void;
-  sendPrivateMessage(userId: string, message: string): Promise<unknown>;
-  sendGroupMessage(groupId: string, message: string): Promise<unknown>;
-  sendGuildMessage(channelId: string, message: string): Promise<unknown>;
-  sendDirectMessage?(guildId: string, message: string): Promise<unknown>;
+  sendPrivateMessage(userId: string, message: QqOutboundMessage): Promise<unknown>;
+  sendGroupMessage(groupId: string, message: QqOutboundMessage): Promise<unknown>;
+  sendGuildMessage(channelId: string, message: QqOutboundMessage): Promise<unknown>;
+  sendDirectMessage?(guildId: string, message: QqOutboundMessage): Promise<unknown>;
   getGuilds(): Promise<unknown[]>;
   getChannels(guildId: string): Promise<unknown[]>;
   getChannelInfo(channelId: string): Promise<unknown>;
@@ -38,6 +39,32 @@ export interface QqBotTransport {
 
 export type CreateQqBot = (config: ResolvedQqWebsocketConfig) => QqBotTransport;
 
+interface QqOfficialBotLifecycle {
+  stop(): Promise<unknown>;
+  readonly sessionManager: {
+    userClose: boolean;
+    readonly connectionManager?: { destroy(): void };
+    readonly authManager?: { destroy(): void };
+  };
+}
+
+/**
+ * qq-official-bot 1.2.x keeps a second `userClose` flag in Connection.
+ * Session.stop() does not update it, so a normal shutdown is treated as an
+ * unexpected disconnect and starts a reconnect loop. Destroy both managers at
+ * the SDK boundary until upstream exposes a complete public shutdown method.
+ */
+export async function stopQqOfficialBot(bot: QqOfficialBotLifecycle): Promise<void> {
+  const session = bot.sessionManager;
+  session.userClose = true;
+  session.connectionManager?.destroy();
+  try {
+    await bot.stop();
+  } finally {
+    session.authManager?.destroy();
+  }
+}
+
 export function bindQqBotInboundEvents(
   bot: QqBotTransport,
   admitRaw: (raw: unknown) => void,
@@ -142,17 +169,17 @@ export function defaultCreateBot(config: ResolvedQqWebsocketConfig): QqBotTransp
 
   return {
     start: () => bot.start().then(() => undefined),
-    stop: () => bot.stop().then(() => undefined),
+    stop: () => stopQqOfficialBot(bot as unknown as QqOfficialBotLifecycle),
     on: (event, listener) => {
       bot.on(event as never, listener as never);
     },
     removeAllListeners: () => {
       bot.removeAllListeners(undefined as never);
     },
-    sendPrivateMessage: (userId, message) => bot.sendPrivateMessage(userId, message),
-    sendGroupMessage: (groupId, message) => bot.sendGroupMessage(groupId, message),
-    sendGuildMessage: (channelId, message) => bot.sendGuildMessage(channelId, message),
-    sendDirectMessage: (guildId, message) => bot.sendDirectMessage(guildId, message),
+    sendPrivateMessage: (userId, message) => bot.sendPrivateMessage(userId, message as Sendable),
+    sendGroupMessage: (groupId, message) => bot.sendGroupMessage(groupId, message as Sendable),
+    sendGuildMessage: (channelId, message) => bot.sendGuildMessage(channelId, message as Sendable),
+    sendDirectMessage: (guildId, message) => bot.sendDirectMessage(guildId, message as Sendable),
     getGuilds: () => bot.guildService.getList(),
     getChannels: (guildId) => bot.channelService.getList(guildId),
     getChannelInfo: (channelId) => bot.channelService.getInfo(channelId),