@izhimu/qq 0.5.0 → 0.6.0

package/dist/src/types/index.d.ts

@@ -1,7 +1,39 @@
-/**
- * NapCat WebSocket API Types
- * Based on NapCat OneBot 11 implementation
- */
+import type { OpenClawConfig, PluginRuntime } from "openclaw/plugin-sdk/core";
+export interface QQAccount {
+    accountId: string;
+    wsUrl: string;
+    token?: string;
+    accessToken?: string;
+    enabled: boolean;
+    markdownFormat: boolean;
+    messageDirect: QQAllowConfig;
+    messageGroup: QQGroupConfig;
+    messageGroupsCustom: Record<string, QQGroupConfig>;
+}
+export interface InboundMessage {
+    targetId: string;
+    messageId: string;
+    senderId: string;
+    senderName?: string;
+    text: string;
+    timestamp: number;
+    isGroup: boolean;
+    groupId?: string;
+    wasMentioned?: boolean;
+    replyToId?: string;
+    hasMedia?: boolean;
+    media?: DispatchMessageMedia;
+    authorization?: {
+        isAuthorizedSender: boolean;
+        denialReason?: string;
+    };
+}
+export interface ProcessInboundParams {
+    cfg: OpenClawConfig;
+    account: QQAccount;
+    runtime: PluginRuntime;
+    msg: InboundMessage;
+}
 export interface NapCatReq<T = unknown> {
     action: NapCatAction;
     params?: T;
@@ -26,6 +58,39 @@ export interface NapCatMetaEvent extends NapCatEvent {
     meta_event_type: 'lifecycle' | 'heartbeat';
     sub_type?: 'connect' | 'disconnect' | 'enable' | 'disable';
 }
+/**
+ * NapCat 消息事件类型
+ */
+export interface NapCatMessageEvent extends NapCatEvent {
+    post_type: "message";
+    message_type: "group" | "private";
+    message: NapCatMessage[];
+    raw_message: string;
+    user_id: number;
+    group_id?: number;
+    message_id?: number;
+    time: number;
+    sender?: {
+        nickname?: string;
+        card?: string;
+    };
+}
+/**
+ * NapCat 通知事件类型
+ */
+export interface NapCatNoticeEvent extends NapCatEvent {
+    post_type: "notice";
+    notice_type: "poke" | "notify";
+    sub_type?: string;
+    user_id: number;
+    target_id: number;
+    group_id?: number;
+    time: number;
+    raw_info?: Array<{
+        type: string;
+        txt?: string;
+    }>;
+}
 export type NapCatMessage = NapCatTextSegment | NapCatAtSegment | NapCatImageSegment | NapCatReplySegment | NapCatFaceSegment | NapCatRecordSegment | NapCatFileSegment | NapCatJsonSegment | NapCatUnknownSegment | NapCatVideoSegment;
 export interface NapCatTextSegment {
     type: 'text';
@@ -100,9 +165,7 @@ export type ConnectionState = 'disconnected' | 'connecting' | 'connected' | 'fai
 export interface ConnectionStatus {
     state: ConnectionState;
     lastConnected?: number;
-    lastAttempted?: number;
     error?: string;
-    reconnectAttempts?: number;
 }
 export type OpenClawMessage = OpenClawTextContent | OpenClawAtContent | OpenClawImageContent | OpenClawReplyContent | OpenClawAudioContent | OpenClawJsonContent | OpenClawFileContent | OpenClawVideoContent;
 export interface OpenClawTextContent {
@@ -276,15 +339,6 @@ export interface DispatchMessageParams {
     timestamp: number;
     targetId?: string;
 }
-export interface QQConfig {
-    wsUrl: string;
-    accessToken?: string;
-    enabled: boolean;
-    markdownFormat: boolean;
-    messageDirect: QQAllowConfig;
-    messageGroup: QQGroupConfig;
-    messageGroupsCustom: Record<string, QQGroupConfig>;
-}
 export interface QQGroupConfig extends QQAllowConfig {
     requireMention: boolean;
     requirePoke: boolean;
@@ -296,15 +350,6 @@ export interface QQAllowConfig {
     allowFrom: string[];
     denyFrom: string[];
 }
-export type QQProbe = {
-    ok: boolean;
-    status?: number | null;
-    error?: string | null;
-};
-export type QQSession = {
-    abortController?: AbortController;
-    aborted?: boolean;
-};
 export type QQLoginInfo = {
     userId: string;
     nickname: string;

package/dist/src/types/index.js

@@ -1,5 +1,4 @@
-/**
- * NapCat WebSocket API Types
- * Based on NapCat OneBot 11 implementation
- */
 export {};
+// =============================================================================
+// Event Handler Types
+// =============================================================================

package/dist/src/utils/cqcode.d.ts

@@ -21,13 +21,4 @@ export declare class CQCodeUtils {
      * @param text 原始消息字符串
      */
     static parse(text: string): CQNode[];
-    /**
-     * 辅助方法：从解析结果中提取所有纯文本内容（去除 CQ 码）
-     * 场景：用于生成通知摘要、日志记录等
-     */
-    static getTextOnly(nodes: CQNode[]): string;
-    /**
-     * 辅助方法：判断消息是否提及了某个 QQ
-     */
-    static isMentioned(nodes: CQNode[], qq: string | number): boolean;
 }

package/dist/src/utils/cqcode.js

@@ -82,21 +82,4 @@ export class CQCodeUtils {
         }
         return nodes;
     }
-    /**
-     * 辅助方法：从解析结果中提取所有纯文本内容（去除 CQ 码）
-     * 场景：用于生成通知摘要、日志记录等
-     */
-    static getTextOnly(nodes) {
-        return nodes
-            .filter(node => node.type === 'text')
-            .map(node => node.data.text)
-            .join('');
-    }
-    /**
-     * 辅助方法：判断消息是否提及了某个 QQ
-     */
-    static isMentioned(nodes, qq) {
-        const targetQQ = String(qq);
-        return nodes.some(node => node.type === 'at' && (node.data.qq === targetQQ || node.data.qq === 'all'));
-    }
 }

package/dist/src/utils/index.d.ts

@@ -12,17 +12,8 @@ export declare function generateMessageId(): string;
  * Uses UUID for thread-safe and collision-free ID generation
  */
 export declare function generateEchoId(): string;
-/**
- * Convert NapCat integer message ID to string
- */
-export declare function messageIdToString(messageId: number | string): string;
-/**
- * Map common QQ face IDs to emoji
- */
-export declare const FACE_ID_TO_EMOJI: Record<string, string>;
 /**
  * Get emoji for QQ face ID
- * For unknown IDs, shows the ID for reference
  */
 export declare function getEmojiForFaceId(faceId: string): string;
 /**
@@ -37,14 +28,6 @@ export declare function extractImageUrl(data: {
     url?: string;
     file?: string;
 }): string | undefined;
-/**
- * Calculate exponential backoff delay
- */
-export declare function calculateBackoff(attempt: number, baseMs?: number, maxMs?: number): number;
-/**
- * Chunk an array into smaller arrays
- */
-export declare function chunk<T>(array: T[], size: number): T[][];
 /**
  * Get a human-readable message for a WebSocket close code
  */

package/dist/src/utils/index.js

@@ -20,145 +20,31 @@ export function generateEchoId() {
     return `echo-${randomUUID()}`;
 }
 // =============================================================================
-// Message ID Conversion
-// =============================================================================
-/**
- * Convert NapCat integer message ID to string
- */
-export function messageIdToString(messageId) {
-    return String(messageId);
-}
-// =============================================================================
 // Face/Emoji Mapping
 // =============================================================================
 /**
- * Map common QQ face IDs to emoji
+ * QQ 表情 ID 到 emoji 的映射数组（下标即 ID）
  */
-export const FACE_ID_TO_EMOJI = {
-    '0': '😊',
-    '1': '😅',
-    '2': '☺️',
-    '3': '😄',
-    '4': '😁',
-    '5': '😆',
-    '6': '😃',
-    '7': '😂',
-    '8': '🤣',
-    '9': '😊',
-    '10': '😍',
-    '11': '🥰',
-    '12': '😘',
-    '13': '😗',
-    '14': '😙',
-    '15': '😚',
-    '16': '🥲',
-    '17': '🙂',
-    '18': '🙃',
-    '19': '😉',
-    '20': '😌',
-    '21': '😍',
-    '22': '🥰',
-    '23': '😘',
-    '24': '😗',
-    '25': '😙',
-    '26': '😚',
-    '27': '😋',
-    '28': '😛',
-    '29': '😝',
-    '30': '😜',
-    '31': '🤪',
-    '32': '🤨',
-    '33': '🧐',
-    '34': '🤓',
-    '35': '😎',
-    '36': '🤩',
-    '37': '🥳',
-    '38': '😏',
-    '39': '😒',
-    '40': '😞',
-    '41': '😔',
-    '42': '😟',
-    '43': '😕',
-    '44': '🙁',
-    '45': '😣',
-    '46': '😖',
-    '47': '😫',
-    '48': '😩',
-    '49': '🥺',
-    '50': '😢',
-    '51': '😭',
-    '52': '😤',
-    '53': '😠',
-    '54': '😡',
-    '55': '🤬',
-    '56': '🤯',
-    '57': '😳',
-    '58': '🥵',
-    '59': '🥶',
-    '60': '😱',
-    '61': '😨',
-    '62': '😰',
-    '63': '😥',
-    '64': '😓',
-    '65': '🤗',
-    '66': '🤔',
-    '67': '🤭',
-    '68': '🤫',
-    '69': '🤥',
-    '70': '😶',
-    '71': '😐',
-    '72': '😑',
-    '73': '😬',
-    '74': '🙄',
-    '75': '😯',
-    '76': '😦',
-    '77': '😧',
-    '78': '😮',
-    '79': '😲',
-    '80': '🥱',
-    '81': '😴',
-    '82': '🤤',
-    '83': '😪',
-    '84': '😵',
-    '85': '🤐',
-    '86': '🥴',
-    '87': '🤢',
-    '88': '🤮',
-    '89': '🤧',
-    '90': '😷',
-    '91': '🤒',
-    '92': '🤕',
-    '93': '🤑',
-    '94': '🤠',
-    '95': '😈',
-    '96': '👿',
-    '97': '👹',
-    '98': '👺',
-    '99': '🤡',
-    '100': '💩',
-    '101': '👻',
-    '102': '💀',
-    '103': '☠️',
-    '104': '👽',
-    '105': '👾',
-    '106': '🤖',
-    '107': '🎃',
-    '108': '😺',
-    '109': '😸',
-    '110': '😹',
-    '111': '😻',
-    '112': '😼',
-    '113': '😽',
-    '114': '🙀',
-    '115': '😿',
-    '116': '😾',
-};
+const FACE_EMOJI_ARRAY = [
+    '😊', '😅', '☺️', '😄', '😁', '😆', '😃', '😂', '🤣', '😊', // 0-9
+    '😍', '🥰', '😘', '😗', '😙', '😚', '🥲', '🙂', '🙃', '😉', // 10-19
+    '😌', '😍', '🥰', '😘', '😗', '😙', '😚', '😋', '😛', '😝', // 20-29
+    '😜', '🤪', '🤨', '🧐', '🤓', '😎', '🤩', '🥳', '😏', '😒', // 30-39
+    '😞', '😔', '😟', '😕', '🙁', '😣', '😖', '😫', '😩', '🥺', // 40-49
+    '😢', '😭', '😤', '😠', '😡', '🤬', '🤯', '😳', '🥵', '🥶', // 50-59
+    '😱', '😨', '😰', '😥', '😓', '🤗', '🤔', '🤭', '🤫', '🤥', // 60-69
+    '😶', '😐', '😑', '😬', '🙄', '😯', '😦', '😧', '😮', '😲', // 70-79
+    '🥱', '😴', '🤤', '😪', '😵', '🤐', '🥴', '🤢', '🤮', '🤧', // 80-89
+    '😷', '🤒', '🤕', '🤑', '🤠', '😈', '👿', '👹', '👺', '🤡', // 90-99
+    '💩', '👻', '💀', '☠️', '👽', '👾', '🤖', '🎃', '😺', '😸', // 100-109
+    '😹', '😻', '😼', '😽', '🙀', '😿', '😾', // 110-116
+];
 /**
  * Get emoji for QQ face ID
- * For unknown IDs, shows the ID for reference
  */
 export function getEmojiForFaceId(faceId) {
-    return FACE_ID_TO_EMOJI[faceId] || `[表情:${faceId}]`;
+    const id = parseInt(faceId, 10);
+    return FACE_EMOJI_ARRAY[id] ?? `[表情:${faceId}]`;
 }
 // =============================================================================
 // URL Validation
@@ -189,29 +75,6 @@ export function extractImageUrl(data) {
     return undefined;
 }
 // =============================================================================
-// Delay Helpers
-// =============================================================================
-/**
- * Calculate exponential backoff delay
- */
-export function calculateBackoff(attempt, baseMs = 1000, maxMs = 30000) {
-    const delay = baseMs * Math.pow(2, attempt);
-    return Math.min(delay, maxMs);
-}
-// =============================================================================
-// Array Helpers
-// =============================================================================
-/**
- * Chunk an array into smaller arrays
- */
-export function chunk(array, size) {
-    const chunks = [];
-    for (let i = 0; i < array.length; i += size) {
-        chunks.push(array.slice(i, i + size));
-    }
-    return chunks;
-}
-// =============================================================================
 // WebSocket Helpers
 // =============================================================================
 /**

package/dist/src/utils/log.js

@@ -1,6 +1,7 @@
-import { getRuntime } from "../core/runtime.js";
+import { DEBUG_MODE } from "../core/config";
+import { getQQRuntime } from "../runtime.js";
 function log() {
-    return getRuntime()?.logging.getChildLogger({ module: 'channel/qq' }) ?? console;
+    return getQQRuntime()?.logging.getChildLogger({ module: 'channel/qq' }) ?? console;
 }
 function param(args) {
     if (args.length === 0)
@@ -9,7 +10,9 @@ function param(args) {
 }
 export class Logger {
     static debug(category, message, ...args) {
-        log().debug?.(`[${category}] ${message}${param(args)}`);
+        if (DEBUG_MODE) {
+            log().debug?.(`[${category}] ${message}${param(args)}`);
+        }
     }
     static info(category, message, ...args) {
         log().info?.(`[${category}] ${message}${param(args)}`);

package/dist/src/utils/markdown.d.ts

@@ -6,6 +6,11 @@ export declare class MarkdownToText {
      * 主入口：将 Markdown 转换为纯文本
      */
     convert(markdown: string): string;
+    /**
+     * 转换 Markdown 表格为可读文本
+     * 支持对齐和多行表格
+     */
+    private convertTables;
     /**
      * 保护代码块 (```)
      * 生成 Key 格式：%%MD-MASK-BLOCK-0

package/dist/src/utils/markdown.js

@@ -58,11 +58,8 @@ export class MarkdownToText {
         text = text.replace(/^(\s*)-\s\[x]\s/gim, '$1✅ '); // 完成的任务
         text = text.replace(/^(\s*)-\s\[\s]\s/gim, '$1⬜ '); // 未完成的任务
         text = text.replace(/^(\s*)[-*+]\s+(.*)$/gm, '$1• $2'); // 列表项变圆点
-        // 3.7 表格 (Tables) -> 空格分隔
-        text = text.replace(/^\s*\|?[\s\-:|]+\|?\s*$/gm, ''); // 移除 |---|---| 分隔行
-        text = text.replace(/^\|(.*)\|$/gm, (_match, content) => {
-            return content.split('|').map((s) => s.trim()).join('  ');
-        });
+        // 3.7 表格 (Tables) -> 结构化文本
+        text = this.convertTables(text);
         // ============================================================
         // 阶段 4: 行内格式 (Inline Formatting)
         // ============================================================
@@ -84,6 +81,61 @@ export class MarkdownToText {
         text = text.replace(/\n{3,}/g, '\n\n').trim();
         return text;
     }
+    /**
+     * 转换 Markdown 表格为可读文本
+     * 支持对齐和多行表格
+     */
+    convertTables(text) {
+        // 匹配整个表格块（连续的表格行）
+        const tableRegex = /^(\|.+\|[\n\r]?)+/gm;
+        return text.replace(tableRegex, (tableBlock) => {
+            const lines = tableBlock.trim().split(/\r?\n/);
+            if (lines.length < 2)
+                return tableBlock; // 至少需要表头和分隔行
+            // 解析所有行
+            const rows = [];
+            let separatorIndex = -1;
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i].trim();
+                if (!line.startsWith('|') || !line.endsWith('|'))
+                    continue;
+                const cells = line.slice(1, -1).split('|').map((c) => c.trim());
+                // 检测分隔行 (|---|---|)
+                if (cells.every((c) => /^[-:]+$/.test(c))) {
+                    separatorIndex = i;
+                    continue;
+                }
+                rows.push(cells);
+            }
+            if (rows.length === 0)
+                return tableBlock;
+            // 计算每列最大宽度
+            const colCount = Math.max(...rows.map((r) => r.length));
+            const colWidths = [];
+            for (let col = 0; col < colCount; col++) {
+                colWidths[col] = Math.max(...rows.map((r) => (r[col] || '').length), 3 // 最小宽度
+                );
+            }
+            // 构建格式化输出
+            const result = [];
+            const separator = '│';
+            const horizontalLine = '─'.repeat(colWidths.reduce((a, b) => a + b, 0) + colCount - 1);
+            rows.forEach((row, rowIndex) => {
+                // 填充单元格并对齐
+                const formattedCells = row.map((cell, colIndex) => {
+                    const width = colWidths[colIndex] || 3;
+                    return (cell || '').padEnd(width);
+                });
+                // 添加行内容
+                result.push(formattedCells.join(separator));
+                // 在表头后添加分隔线
+                if (separatorIndex !== -1 && rowIndex === 0) {
+                    result.push(horizontalLine);
+                }
+            });
+            return '\n' + result.join('\n') + '\n';
+        });
+    }
     /**
      * 保护代码块 (```)
      * 生成 Key 格式：%%MD-MASK-BLOCK-0

package/openclaw.plugin.json

@@ -1,8 +1,9 @@
 {
   "id": "qq",
-  "name": "QQ",
+  "kind": "channel",
   "channels": ["qq"],
-  "description": "QQ channel plugin for OpenClaw using NapCat WebSocket API",
+  "name": "QQ",
+  "description": "QQ Chat channel plugin",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izhimu/qq",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "A QQ channel plugin for OpenClaw using NapCat WebSocket",
   "type": "module",
   "main": "dist/index.js",
@@ -31,17 +31,16 @@
   "author": "izhimu",
   "license": "MIT",
   "openclaw": {
-    "extensions": [
-      "./dist/index.js"
-    ],
-    "install": {
-      "npmSpec": "@izhimu/qq",
-      "localPath": "extensions/qq",
-      "defaultChoice": "npm"
+    "extensions": ["./dist/index.js"],
+    "setupEntry": "",
+    "channel": {
+      "id": "qq",
+      "label": "QQ",
+      "blurb": "Connect OpenClaw to QQ Chat"
     }
   },
   "peerDependencies": {
-    "openclaw": "^2026.3.1"
+    "openclaw": "^2026.3.22"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -49,14 +48,13 @@
     }
   },
   "dependencies": {
-    "p-limit": "^7.3.0",
     "ws": "^8.19.0",
     "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
     "@types/ws": "^8.18.0",
-    "openclaw": "^2026.3.1",
+    "openclaw": "^2026.3.22",
     "typescript": "^5.0.0"
   }
 }

package/dist/src/onboarding.d.ts

@@ -1,10 +0,0 @@
-/**
- * QQ NapCat CLI Onboarding Adapter
- *
- * 提供 openclaw onboard 命令的交互式配置支持
- */
-import type { ChannelOnboardingAdapter } from "openclaw/plugin-sdk";
-/**
- * QQ NapCat Onboarding Adapter
- */
-export declare const qqOnboardingAdapter: ChannelOnboardingAdapter;

package/dist/src/onboarding.js

@@ -1,98 +0,0 @@
-import { CHANNEL_ID, resolveQQAccount } from "./core/config.js";
-/**
- * QQ NapCat Onboarding Adapter
- */
-export const qqOnboardingAdapter = {
-    channel: CHANNEL_ID,
-    getStatus: async (ctx) => {
-        const { cfg } = ctx;
-        const config = cfg.channels?.[CHANNEL_ID];
-        const configured = Boolean(config.wsUrl);
-        return {
-            channel: CHANNEL_ID,
-            configured,
-            statusLines: configured
-                ? ["QQ (NapCat): 已配置"]
-                : ["QQ (NapCat): 未配置"],
-            selectionHint: configured ? "已配置" : "未配置",
-            quickstartScore: configured ? 1 : 10,
-        };
-    },
-    configure: async (ctx) => {
-        const { cfg, prompter } = ctx;
-        let next = cfg;
-        const resolvedAccount = resolveQQAccount({ cfg });
-        const accountConfigured = Boolean(resolvedAccount.wsUrl);
-        // 显示帮助
-        if (!accountConfigured) {
-            await prompter.note([
-                "1) 确保已安装 NapCat: https://github.com/NapNeko/NapCatQQ",
-                "2) 在 NapCat 配置中启用 WebSocket (正向 WS)",
-                "3) 默认地址: ws://localhost:3001",
-                "4) 如需访问控制，可设置 accessToken",
-                "",
-                "NapCat 文档: https://napneko.github.io/",
-            ].join("\n"), "QQ NapCat 配置");
-        }
-        let wsUrl = null;
-        let accessToken = null;
-        // 检查是否已配置
-        if (accountConfigured) {
-            const keep = await prompter.confirm({
-                message: "QQ NapCat 已配置，是否保留当前配置？",
-                initialValue: true,
-            });
-            if (!keep) {
-                wsUrl = String(await prompter.text({
-                    message: "请输入 NapCat WebSocket URL",
-                    placeholder: "ws://localhost:3001",
-                    initialValue: resolvedAccount.wsUrl,
-                    validate: (value) => (value?.trim() ? undefined : "WebSocket URL 不能为空"),
-                })).trim();
-                accessToken = String(await prompter.text({
-                    message: "请输入 Access Token (可选，直接回车跳过)",
-                    placeholder: "留空表示不使用 token",
-                    initialValue: resolvedAccount.accessToken || undefined,
-                })).trim();
-            }
-        }
-        else {
-            // 新配置
-            wsUrl = String(await prompter.text({
-                message: "请输入 NapCat WebSocket URL",
-                placeholder: "ws://localhost:3001",
-                validate: (value) => (value?.trim() ? undefined : "WebSocket URL 不能为空"),
-            })).trim();
-            accessToken = String(await prompter.text({
-                message: "请输入 Access Token (可选，直接回车跳过)",
-                placeholder: "留空表示不使用 token",
-            })).trim();
-        }
-        // 应用配置
-        if (wsUrl) {
-            next = {
-                ...next,
-                channels: {
-                    ...next.channels,
-                    qq: {
-                        ...next.channels?.[CHANNEL_ID],
-                        enabled: true,
-                        wsUrl,
-                        ...(accessToken ? { accessToken } : {}),
-                    },
-                },
-            };
-        }
-        return { cfg: next };
-    },
-    disable: (cfg) => ({
-        ...cfg,
-        channels: {
-            ...cfg.channels,
-            qq: {
-                ...cfg.channels?.[CHANNEL_ID],
-                enabled: false,
-            }
-        },
-    }),
-};