@zhin.js/adapter-qq 6.0.5 → 6.0.6

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @zhin.js/adapter-qq
 
+## 6.0.6
+
+### Patch Changes
+
+- d52f3c5: fix: QQ 适配器群聊误识别为私聊、game-kit 启动崩溃、全面补齐 recallMessage
+
+  - fix(cli): `resolveChannelType` 增加 `metadata.channelKind` 检查，修复 QQ/Discord/KOOK 群聊消息被误分类为私聊
+  - fix(game-kit): `createHostGameDb` 改用延迟代理模型，避免数据库启动前解析模型导致崩溃
+  - feat(qq): 实现 `recallMessage`，解析复合 messageId 路由到对应 SDK 撤回方法；`normalizeQqMessage` 增加 `message_type` 缺失时的回退检测
+  - feat(slack): 实现 `recallMessage`，利用已有 compound ref 和 `chat.delete` API
+  - feat(onebot11): 两个 endpoint 类实现 `recallMessage`（`delete_msg`）
+  - feat(onebot12): 两个 endpoint 类实现 `recallMessage`（`delete_message`）
+  - feat(napcat): 三个 endpoint 类实现 `recallMessage`（`delete_msg`）
+  - feat(discord): 两个 endpoint 类实现 `recallMessage`；`send()` 改为返回 `channelId:snowflake` 复合 ID
+  - feat(telegram): 实现 `recallMessage`（`deleteMessage`）；`send()` 改为返回 `chatId:messageId` 复合 ID
+  - feat(kook): 两个 endpoint 类实现 `recallMessage`，利用 kook-client `recallMsg` API
+  - feat(lark): 实现 `recallMessage`（`DELETE /im/v1/messages/{id}`）
+  - feat(wecom): 实现 `recallMessage`（`POST /cgi-bin/message/recall`）
+
 ## 6.0.5
 
 ### Patch Changes

package/lib/endpoint.d.ts

@@ -30,6 +30,7 @@ export declare class QqWebsocketEndpoint implements EndpointInstance {
         readonly target: string;
         readonly payload: unknown;
     }): Promise<string>;
+    recallMessage(messageId: string): Promise<void>;
     /** Test / internal: admit a message when open. */
     admit(msg: QqInboundMessage): void;
     getGuilds(): Promise<unknown[]>;
@@ -63,6 +64,7 @@ export declare class QqHttpEndpoint implements EndpointInstance {
         readonly target: string;
         readonly payload: unknown;
     }): Promise<string>;
+    recallMessage(messageId: string): Promise<void>;
     admit(msg: QqInboundMessage): void;
     getGuilds(): Promise<unknown[]>;
     getChannels(guildId: string): Promise<unknown[]>;

package/lib/endpoint.js

@@ -1,7 +1,7 @@
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { formatOutbound } from './outbound.js';
 import { registerQqAgentEndpoint } from './qq-agent-deps.js';
-import { formatInboundContent, formatInboundTarget, parseSendTarget, resolveOutboundMessageId, senderDisplayName, } from './protocol.js';
+import { formatInboundContent, formatInboundTarget, parseCompoundMessageId, parseSendTarget, resolveOutboundMessageId, senderDisplayName, } from './protocol.js';
 import { defaultCreateHttpBot, registerQqWebhookRoutes, } from './webhook.js';
 import { bindQqBotInboundEvents, defaultCreateBot, normalizeQqMessage, } from './ws.js';
 const logger = getLogger('qq');
@@ -99,6 +99,30 @@ export class QqWebsocketEndpoint {
         }));
         return messageId;
     }
+    async recallMessage(messageId) {
+        const { kind, channelId, qqMsgId } = parseCompoundMessageId(messageId);
+        const bot = this.#requireBot();
+        switch (kind) {
+            case 'private':
+                await bot.recallPrivateMessage?.(channelId, qqMsgId);
+                break;
+            case 'group':
+                await bot.recallGroupMessage?.(channelId, qqMsgId);
+                break;
+            case 'channel':
+                await bot.recallGuildMessage?.(channelId, qqMsgId);
+                break;
+            case 'direct':
+                await bot.recallDirectMessage?.(channelId, qqMsgId);
+                break;
+        }
+        logger.debug(formatCompact({
+            op: 'qq_recall',
+            endpoint: this.#options.config.name,
+            kind,
+            messageId,
+        }));
+    }
     /** Test / internal: admit a message when open. */
     admit(msg) {
         if (!this.#open)
@@ -255,6 +279,30 @@ export class QqHttpEndpoint {
         }
         return `${parsed.kind}-${parsed.id}:${resolveOutboundMessageId(result)}`;
     }
+    async recallMessage(messageId) {
+        const { kind, channelId, qqMsgId } = parseCompoundMessageId(messageId);
+        const bot = this.#requireBot();
+        switch (kind) {
+            case 'private':
+                await bot.recallPrivateMessage?.(channelId, qqMsgId);
+                break;
+            case 'group':
+                await bot.recallGroupMessage?.(channelId, qqMsgId);
+                break;
+            case 'channel':
+                await bot.recallGuildMessage?.(channelId, qqMsgId);
+                break;
+            case 'direct':
+                await bot.recallDirectMessage?.(channelId, qqMsgId);
+                break;
+        }
+        logger.debug(formatCompact({
+            op: 'qq_recall',
+            endpoint: this.#options.config.name,
+            kind,
+            messageId,
+        }));
+    }
     admit(msg) {
         if (!this.#open)
             return;

package/lib/protocol.d.ts

@@ -92,5 +92,13 @@ export declare function formatInboundContent(msg: QqInboundMessage): string;
  * Segment canonicalization is intentionally not done here.
  */
 export declare function formatOutboundText(payload: unknown): string;
+/**
+ * Parse a compound messageId produced by `send()`: `kind-channelId:qqMsgId`.
+ */
+export declare function parseCompoundMessageId(messageId: string): {
+    kind: QqChannelKind;
+    channelId: string;
+    qqMsgId: string;
+};
 /** 从 QQ API SendResult / 审核回包中解析出站消息 ID */
 export declare function resolveOutboundMessageId(result: unknown): string;

package/lib/protocol.js

@@ -120,6 +120,23 @@ export function formatOutboundText(payload) {
         .filter(Boolean)
         .join('');
 }
+/**
+ * Parse a compound messageId produced by `send()`: `kind-channelId:qqMsgId`.
+ */
+export function parseCompoundMessageId(messageId) {
+    const hyphen = messageId.indexOf('-');
+    if (hyphen <= 0)
+        throw new Error(`invalid QQ messageId format: ${messageId}`);
+    const kind = messageId.slice(0, hyphen);
+    if (kind !== 'private' && kind !== 'group' && kind !== 'channel' && kind !== 'direct') {
+        throw new Error(`invalid QQ messageId kind: ${kind}`);
+    }
+    const rest = messageId.slice(hyphen + 1);
+    const colon = rest.indexOf(':');
+    if (colon <= 0)
+        throw new Error(`invalid QQ messageId format: ${messageId}`);
+    return { kind, channelId: rest.slice(0, colon), qqMsgId: rest.slice(colon + 1) };
+}
 /** 从 QQ API SendResult / 审核回包中解析出站消息 ID */
 export function resolveOutboundMessageId(result) {
     if (!result || typeof result !== 'object') {

package/lib/webhook.js

@@ -74,6 +74,10 @@ export function defaultCreateHttpBot(config) {
         sendGroupMessage: (groupId, message) => bot.sendGroupMessage(groupId, message),
         sendGuildMessage: (channelId, message) => bot.sendGuildMessage(channelId, message),
         sendDirectMessage: (guildId, message) => bot.sendDirectMessage(guildId, message),
+        recallPrivateMessage: (userId, messageId) => bot.recallPrivateMessage(userId, messageId),
+        recallGroupMessage: (groupId, messageId) => bot.recallGroupMessage(groupId, messageId),
+        recallGuildMessage: (channelId, messageId) => bot.recallGuildMessage(channelId, messageId),
+        recallDirectMessage: (guildId, messageId) => bot.recallDirectMessage(guildId, messageId),
         getGuilds: () => bot.guildService.getList(),
         getChannels: (guildId) => bot.channelService.getList(guildId),
         getChannelInfo: (channelId) => bot.channelService.getInfo(channelId),

package/lib/ws.d.ts

@@ -10,6 +10,10 @@ export interface QqBotTransport {
     sendGroupMessage(groupId: string, message: QqOutboundMessage): Promise<unknown>;
     sendGuildMessage(channelId: string, message: QqOutboundMessage): Promise<unknown>;
     sendDirectMessage?(guildId: string, message: QqOutboundMessage): Promise<unknown>;
+    recallPrivateMessage?(userId: string, messageId: string): Promise<unknown>;
+    recallGroupMessage?(groupId: string, messageId: string): Promise<unknown>;
+    recallGuildMessage?(channelId: string, messageId: string): Promise<unknown>;
+    recallDirectMessage?(guildId: string, messageId: string): Promise<unknown>;
     getGuilds(): Promise<unknown[]>;
     getChannels(guildId: string): Promise<unknown[]>;
     getChannelInfo(channelId: string): Promise<unknown>;

package/lib/ws.js

@@ -34,13 +34,17 @@ export function normalizeQqMessage(raw) {
         return null;
     let channelKind = 'private';
     let channelId = '';
-    if (msg.message_type === 'guild') {
+    const isGroup = msg.message_type === 'group'
+        || (msg.message_type == null && (msg.group_id != null || msg.group_openid != null));
+    const isGuild = msg.message_type === 'guild'
+        || (msg.message_type == null && !isGroup && msg.guild_id != null && msg.channel_id != null);
+    if (isGuild) {
         channelKind = msg.sub_type === 'direct' ? 'direct' : 'channel';
         channelId = channelKind === 'direct'
             ? String(msg.guild_id ?? '')
             : String(msg.channel_id ?? '');
     }
-    else if (msg.message_type === 'group') {
+    else if (isGroup) {
         channelKind = 'group';
         channelId = String(msg.group_id ?? msg.group_openid ?? '');
     }
@@ -117,6 +121,10 @@ export function defaultCreateBot(config) {
         sendGroupMessage: (groupId, message) => bot.sendGroupMessage(groupId, message),
         sendGuildMessage: (channelId, message) => bot.sendGuildMessage(channelId, message),
         sendDirectMessage: (guildId, message) => bot.sendDirectMessage(guildId, message),
+        recallPrivateMessage: (userId, messageId) => bot.recallPrivateMessage(userId, messageId),
+        recallGroupMessage: (groupId, messageId) => bot.recallGroupMessage(groupId, messageId),
+        recallGuildMessage: (channelId, messageId) => bot.recallGuildMessage(channelId, messageId),
+        recallDirectMessage: (guildId, messageId) => bot.recallDirectMessage(guildId, messageId),
         getGuilds: () => bot.guildService.getList(),
         getChannels: (guildId) => bot.channelService.getList(guildId),
         getChannelInfo: (channelId) => bot.channelService.getInfo(channelId),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-qq",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "Zhin.js QQ Official adapter for Plugin Runtime (WebSocket gateway)",
   "type": "module",
   "main": "./lib/index.js",

package/src/endpoint.ts

@@ -15,6 +15,7 @@ import { registerQqAgentEndpoint } from './qq-agent-deps.js';
 import {
   formatInboundContent,
   formatInboundTarget,
+  parseCompoundMessageId,
   parseSendTarget,
   resolveOutboundMessageId,
   senderDisplayName,
@@ -149,6 +150,31 @@ export class QqWebsocketEndpoint implements EndpointInstance {
     return messageId;
   }
 
+  async recallMessage(messageId: string): Promise<void> {
+    const { kind, channelId, qqMsgId } = parseCompoundMessageId(messageId);
+    const bot = this.#requireBot();
+    switch (kind) {
+      case 'private':
+        await bot.recallPrivateMessage?.(channelId, qqMsgId);
+        break;
+      case 'group':
+        await bot.recallGroupMessage?.(channelId, qqMsgId);
+        break;
+      case 'channel':
+        await bot.recallGuildMessage?.(channelId, qqMsgId);
+        break;
+      case 'direct':
+        await bot.recallDirectMessage?.(channelId, qqMsgId);
+        break;
+    }
+    logger.debug(formatCompact({
+      op: 'qq_recall',
+      endpoint: this.#options.config.name,
+      kind,
+      messageId,
+    }));
+  }
+
   /** Test / internal: admit a message when open. */
   admit(msg: QqInboundMessage): void {
     if (!this.#open) return;
@@ -329,6 +355,31 @@ export class QqHttpEndpoint implements EndpointInstance {
     return `${parsed.kind}-${parsed.id}:${resolveOutboundMessageId(result)}`;
   }
 
+  async recallMessage(messageId: string): Promise<void> {
+    const { kind, channelId, qqMsgId } = parseCompoundMessageId(messageId);
+    const bot = this.#requireBot();
+    switch (kind) {
+      case 'private':
+        await bot.recallPrivateMessage?.(channelId, qqMsgId);
+        break;
+      case 'group':
+        await bot.recallGroupMessage?.(channelId, qqMsgId);
+        break;
+      case 'channel':
+        await bot.recallGuildMessage?.(channelId, qqMsgId);
+        break;
+      case 'direct':
+        await bot.recallDirectMessage?.(channelId, qqMsgId);
+        break;
+    }
+    logger.debug(formatCompact({
+      op: 'qq_recall',
+      endpoint: this.#options.config.name,
+      kind,
+      messageId,
+    }));
+  }
+
   admit(msg: QqInboundMessage): void {
     if (!this.#open) return;
     const target = formatInboundTarget(msg);

package/src/protocol.ts

@@ -219,6 +219,26 @@ export function formatOutboundText(payload: unknown): string {
     .join('');
 }
 
+/**
+ * Parse a compound messageId produced by `send()`: `kind-channelId:qqMsgId`.
+ */
+export function parseCompoundMessageId(messageId: string): {
+  kind: QqChannelKind;
+  channelId: string;
+  qqMsgId: string;
+} {
+  const hyphen = messageId.indexOf('-');
+  if (hyphen <= 0) throw new Error(`invalid QQ messageId format: ${messageId}`);
+  const kind = messageId.slice(0, hyphen);
+  if (kind !== 'private' && kind !== 'group' && kind !== 'channel' && kind !== 'direct') {
+    throw new Error(`invalid QQ messageId kind: ${kind}`);
+  }
+  const rest = messageId.slice(hyphen + 1);
+  const colon = rest.indexOf(':');
+  if (colon <= 0) throw new Error(`invalid QQ messageId format: ${messageId}`);
+  return { kind, channelId: rest.slice(0, colon), qqMsgId: rest.slice(colon + 1) };
+}
+
 /** 从 QQ API SendResult / 审核回包中解析出站消息 ID */
 export function resolveOutboundMessageId(result: unknown): string {
   if (!result || typeof result !== 'object') {

package/src/webhook.ts

@@ -101,6 +101,10 @@ export function defaultCreateHttpBot(config: ResolvedQqHttpConfig): QqHttpBotTra
     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),
+    recallPrivateMessage: (userId, messageId) => bot.recallPrivateMessage(userId, messageId),
+    recallGroupMessage: (groupId, messageId) => bot.recallGroupMessage(groupId, messageId),
+    recallGuildMessage: (channelId, messageId) => bot.recallGuildMessage(channelId, messageId),
+    recallDirectMessage: (guildId, messageId) => bot.recallDirectMessage(guildId, messageId),
     getGuilds: () => bot.guildService.getList(),
     getChannels: (guildId) => bot.channelService.getList(guildId),
     getChannelInfo: (channelId) => bot.channelService.getInfo(channelId),

package/src/ws.ts

@@ -17,6 +17,10 @@ export interface QqBotTransport {
   sendGroupMessage(groupId: string, message: QqOutboundMessage): Promise<unknown>;
   sendGuildMessage(channelId: string, message: QqOutboundMessage): Promise<unknown>;
   sendDirectMessage?(guildId: string, message: QqOutboundMessage): Promise<unknown>;
+  recallPrivateMessage?(userId: string, messageId: string): Promise<unknown>;
+  recallGroupMessage?(groupId: string, messageId: string): Promise<unknown>;
+  recallGuildMessage?(channelId: string, messageId: string): Promise<unknown>;
+  recallDirectMessage?(guildId: string, messageId: string): Promise<unknown>;
   getGuilds(): Promise<unknown[]>;
   getChannels(guildId: string): Promise<unknown[]>;
   getChannelInfo(channelId: string): Promise<unknown>;
@@ -97,12 +101,18 @@ export function normalizeQqMessage(raw: unknown): QqInboundMessage | null {
 
   let channelKind: QqChannelKind = 'private';
   let channelId = '';
-  if (msg.message_type === 'guild') {
+
+  const isGroup = msg.message_type === 'group'
+    || (msg.message_type == null && (msg.group_id != null || msg.group_openid != null));
+  const isGuild = msg.message_type === 'guild'
+    || (msg.message_type == null && !isGroup && msg.guild_id != null && msg.channel_id != null);
+
+  if (isGuild) {
     channelKind = msg.sub_type === 'direct' ? 'direct' : 'channel';
     channelId = channelKind === 'direct'
       ? String(msg.guild_id ?? '')
       : String(msg.channel_id ?? '');
-  } else if (msg.message_type === 'group') {
+  } else if (isGroup) {
     channelKind = 'group';
     channelId = String(msg.group_id ?? msg.group_openid ?? '');
   } else {
@@ -180,6 +190,10 @@ export function defaultCreateBot(config: ResolvedQqWebsocketConfig): QqBotTransp
     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),
+    recallPrivateMessage: (userId, messageId) => bot.recallPrivateMessage(userId, messageId),
+    recallGroupMessage: (groupId, messageId) => bot.recallGroupMessage(groupId, messageId),
+    recallGuildMessage: (channelId, messageId) => bot.recallGuildMessage(channelId, messageId),
+    recallDirectMessage: (guildId, messageId) => bot.recallDirectMessage(guildId, messageId),
     getGuilds: () => bot.guildService.getList(),
     getChannels: (guildId) => bot.channelService.getList(guildId),
     getChannelInfo: (channelId) => bot.channelService.getInfo(channelId),