@izhimu/qq 0.5.1 → 0.6.0

package/dist/src/core/event-handler.d.ts

@@ -0,0 +1,42 @@
+/**
+ * QQ Event Handler Module
+ *
+ * 统一事件处理入口，提供：
+ * - 事件上下文构建 (buildEventContext)
+ * - 统一授权检查 (checkEventAuthorization)
+ * - 事件处理器工厂 (createQQEventHandler)
+ */
+import type { NapCatEvent, InboundMessage } from "../types";
+import type { QQAccount } from "../types";
+/**
+ * 构建入站消息
+ * @param account
+ * @param event
+ */
+export declare function buildInboundMessage(account: QQAccount, event: NapCatEvent): Promise<InboundMessage | null>;
+/**
+ * 检查事件是否被授权
+ */
+export declare function isEventAuthorized(ctx: InboundMessage): boolean;
+/**
+ * 创建 QQ 事件处理器
+ *
+ * 这是统一的事件处理入口点，负责：
+ * 1. 构建事件上下文
+ * 2. 执行授权检查
+ * 3. 更新状态
+ * 4. 路由到具体处理器
+ *
+ * @example
+ * ```typescript
+ * const handler = createQQEventHandler({
+ *   runtime,
+ *   cfg: context.cfg,
+ *   accountId: context.accountId,
+ *   connection,
+ * });
+ *
+ * connection.on("event", handler);
+ * ```
+ */
+export declare function createQQEventHandler(account: QQAccount, handler: (msg: InboundMessage) => Promise<void>): (event: NapCatEvent) => Promise<void>;

package/dist/src/core/event-handler.js

@@ -0,0 +1,171 @@
+/**
+ * QQ Event Handler Module
+ *
+ * 统一事件处理入口，提供：
+ * - 事件上下文构建 (buildEventContext)
+ * - 统一授权检查 (checkEventAuthorization)
+ * - 事件处理器工厂 (createQQEventHandler)
+ */
+import { resolveQQCommandAuthorization, getQQConfigByChatType } from "./auth.js";
+import { inboundMessageAdapter, formatContentToText, hasMediaContent, extractMedia, } from "../adapters/message.js";
+import { generateMessageId, Logger as log } from "../utils/index.js";
+/**
+ * 构建入站消息
+ * @param account
+ * @param event
+ */
+export async function buildInboundMessage(account, event) {
+    // 处理消息事件
+    if (event.post_type === "message") {
+        return buildMessageEventContext(event, account);
+    }
+    // 处理通知事件
+    if (event.post_type === "notice") {
+        const noticeEvent = event;
+        const isPokeEvent = noticeEvent.notice_type === "poke" ||
+            (noticeEvent.notice_type === "notify" && noticeEvent.sub_type === "poke");
+        if (isPokeEvent) {
+            return buildPokeEventContext(noticeEvent, account);
+        }
+    }
+    // 不支持的事件类型
+    log.debug("event-handler", `Unhandled event type: ${event.post_type}`);
+    return null;
+}
+/**
+ * 构建消息事件上下文
+ */
+async function buildMessageEventContext(event, account) {
+    // 过滤空消息
+    if (!event.raw_message || event.raw_message.trim() === "") {
+        log.debug("event-handler", "Ignored empty message");
+        return null;
+    }
+    const isGroup = event.message_type === "group";
+    const senderId = event.user_id.toString();
+    const groupId = event.group_id?.toString();
+    // 获取配置并进行授权检查
+    const qqConfig = getQQConfigByChatType(isGroup, groupId, account);
+    const authorization = resolveQQCommandAuthorization({
+        senderId,
+        qqConfig,
+    });
+    // 解析消息内容
+    const content = await inboundMessageAdapter(event.message);
+    const plainText = formatContentToText(content);
+    const media = hasMediaContent(content) ? extractMedia(content) : undefined;
+    return {
+        targetId: account.accountId,
+        messageId: event.message_id?.toString() ?? generateMessageId(),
+        senderId,
+        senderName: event.sender?.nickname || event.sender?.card,
+        text: plainText,
+        timestamp: event.time * 1000,
+        isGroup,
+        groupId,
+        hasMedia: !!media,
+        media,
+        authorization: {
+            isAuthorizedSender: authorization.isAuthorizedSender,
+            denialReason: authorization.denialReason,
+        },
+    };
+}
+/**
+ * 构建戳一戳事件上下文
+ */
+function buildPokeEventContext(event, account) {
+    const isGroup = !!event.group_id;
+    const senderId = event.user_id.toString();
+    const groupId = event.group_id?.toString();
+    // 获取配置并进行授权检查
+    const qqConfig = getQQConfigByChatType(isGroup, groupId, account);
+    const authorization = resolveQQCommandAuthorization({
+        senderId,
+        qqConfig,
+    });
+    // 提取戳一戳动作文本
+    const actionText = extractPokeActionText(event.raw_info);
+    const pokeContent = `[动作]${actionText || "戳了戳"}`;
+    return {
+        targetId: event.target_id.toString(),
+        messageId: generateMessageId(),
+        senderId,
+        senderName: senderId,
+        text: pokeContent,
+        timestamp: event.time * 1000,
+        isGroup,
+        groupId,
+        hasMedia: false,
+        authorization: {
+            isAuthorizedSender: authorization.isAuthorizedSender,
+            denialReason: authorization.denialReason,
+        },
+    };
+}
+/**
+ * 提取戳一戳动作文本
+ */
+function extractPokeActionText(rawInfo) {
+    if (!rawInfo)
+        return "戳了戳";
+    const actionItem = rawInfo.find((item) => item.type === "nor" && item.txt);
+    return actionItem?.txt || "戳了戳";
+}
+// =============================================================================
+// Authorization Check
+// =============================================================================
+/**
+ * 检查事件是否被授权
+ */
+export function isEventAuthorized(ctx) {
+    if (!ctx.authorization) {
+        return false;
+    }
+    if (!ctx.authorization.isAuthorizedSender) {
+        log.info("event-handler", `Authorization denied for ${ctx.senderId}: ${ctx.authorization.denialReason}`);
+        return false;
+    }
+    return true;
+}
+// =============================================================================
+// Event Handler Factory
+// =============================================================================
+/**
+ * 创建 QQ 事件处理器
+ *
+ * 这是统一的事件处理入口点，负责：
+ * 1. 构建事件上下文
+ * 2. 执行授权检查
+ * 3. 更新状态
+ * 4. 路由到具体处理器
+ *
+ * @example
+ * ```typescript
+ * const handler = createQQEventHandler({
+ *   runtime,
+ *   cfg: context.cfg,
+ *   accountId: context.accountId,
+ *   connection,
+ * });
+ *
+ * connection.on("event", handler);
+ * ```
+ */
+export function createQQEventHandler(account, handler) {
+    return async (event) => {
+        log.debug("event-handler", `Received event: ${event.post_type}`);
+        // 1. 构建事件上下文
+        const msg = await buildInboundMessage(account, event);
+        if (!msg) {
+            return;
+        }
+        // 2. 授权检查
+        if (!isEventAuthorized(msg)) {
+            return;
+        }
+        // 3. 路由到具体处理器 - 调用 dispatchMessage
+        await handler(msg);
+        return;
+    };
+}

package/dist/src/core/request.d.ts

@@ -1,27 +1,22 @@
-import type { GetFileReq, GetFileResp, GetMsgReq, GetMsgResp, GetStatusResp, GetLoginInfoResp, NapCatResp, SendMsgReq, SendMsgResp, SetInputStatusReq, GetFriendListResp, GetGroupListResp } from "../types";
+import type { GetFileReq, GetFileResp, GetMsgReq, GetMsgResp, GetStatusResp, GetLoginInfoResp, NapCatResp, SendMsgReq, SendMsgResp, SetInputStatusReq, GetFriendListResp, GetGroupListResp, NapCatEvent, QQAccount, InboundMessage } from "../types";
 /**
  * 事件监听
- * @param event
  */
-export declare function eventListener(event: any): Promise<void>;
+export declare function eventListener(account: QQAccount, event: NapCatEvent, handler: (msg: InboundMessage) => Promise<void>): Promise<void>;
 /**
- * 发送消息（带限流）
- * @param params
+ * 发送消息
  */
 export declare function sendMsg(params: SendMsgReq): Promise<NapCatResp<SendMsgResp>>;
 /**
  * 获取消息
- * @param params
  */
 export declare function getMsg(params: GetMsgReq): Promise<NapCatResp<GetMsgResp>>;
 /**
  * 获取文件
- * @param params
  */
 export declare function getFile(params: GetFileReq): Promise<NapCatResp<GetFileResp>>;
 /**
  * 设置输入状态
- * @param params
  */
 export declare function setInputStatus(params: SetInputStatusReq): Promise<NapCatResp<void>>;
 /**

package/dist/src/core/request.js

@@ -1,171 +1,58 @@
-import pLimit from 'p-limit';
 import { Logger as log } from "../utils/index.js";
-import { setContextStatus, getContext, getConnection } from "./runtime.js";
-import { handleGroupMessage, handlePrivateMessage, handlePokeEvent } from "./dispatch.js";
-import { failResp } from "./connection.js";
-/**
- * Rate limiter for sendMsg requests
- * Limits concurrent messages to prevent API throttling
- */
-const sendMsgLimiter = pLimit(1);
+import { createQQEventHandler } from "./event-handler.js";
+import { sendRequest } from "./connection.js";
 /**
  * 事件监听
- * @param event
  */
-export async function eventListener(event) {
+export async function eventListener(account, event, handler) {
     log.debug("request", `Received event: ${event.post_type}`);
-    const context = getContext();
-    if (!context) {
-        log.warn("request", `No gateway context`);
-        return;
-    }
-    const connection = getConnection();
-    if (!connection) {
-        log.warn("request", `No connection available`);
-        return;
-    }
-    switch (event.post_type) {
-        case "message":
-            // 过滤空消息
-            if (!event.raw_message || event.raw_message === '') {
-                log.debug("request", `Ignored empty message`);
-                break;
-            }
-            setContextStatus({
-                lastInboundAt: Date.now(),
-            });
-            if (event.message_type === "group" && event.group_id) {
-                await handleGroupMessage({
-                    time: event.time,
-                    self_id: event.self_id,
-                    message_id: event.message_id ?? 0,
-                    group_id: event.group_id,
-                    user_id: event.user_id,
-                    message: event.message ?? [],
-                    raw_message: event.raw_message ?? '',
-                    sender: event.sender,
-                });
-            }
-            else if (event.message_type === "private") {
-                await handlePrivateMessage({
-                    time: event.time,
-                    self_id: event.self_id,
-                    message_id: event.message_id ?? 0,
-                    user_id: event.user_id,
-                    message: event.message ?? [],
-                    raw_message: event.raw_message ?? '',
-                    sender: event.sender,
-                });
-            }
-            break;
-        case "notice":
-            if (event.target_id) {
-                const isPokeEvent = event.notice_type === "poke" ||
-                    (event.notice_type === "notify" && event.sub_type === "poke");
-                if (isPokeEvent) {
-                    await handlePokeEvent({
-                        user_id: event.user_id,
-                        target_id: event.target_id,
-                        group_id: event.group_id,
-                        raw_info: event.raw_info,
-                    });
-                }
-            }
-            break;
-        default:
-            log.debug("request", `Unhandled event type: ${event.post_type}`);
-    }
+    await createQQEventHandler(account, handler)(event);
 }
 /**
- * 发送消息（带限流）
- * @param params
+ * 发送消息
  */
 export async function sendMsg(params) {
-    const connection = getConnection();
-    if (!connection) {
-        log.warn("request", `No connection available`);
-        return failResp();
-    }
-    // 使用限流器控制并发，避免触发 NapCat API 限流
-    return sendMsgLimiter(() => connection.sendRequest("send_msg", params));
+    return sendRequest("send_msg", params);
 }
 /**
  * 获取消息
- * @param params
  */
 export async function getMsg(params) {
-    const connection = getConnection();
-    if (!connection) {
-        log.warn("request", `No connection available`);
-        return failResp();
-    }
-    return connection.sendRequest("get_msg", params);
+    return sendRequest("get_msg", params);
 }
 /**
  * 获取文件
- * @param params
  */
 export async function getFile(params) {
-    const connection = getConnection();
-    if (!connection) {
-        log.warn("request", `No connection available`);
-        return failResp();
-    }
-    return connection.sendRequest("get_file", params);
+    return sendRequest("get_file", params);
 }
 /**
  * 设置输入状态
- * @param params
  */
 export async function setInputStatus(params) {
-    const connection = getConnection();
-    if (!connection) {
-        log.warn("request", `No connection available`);
-        return failResp();
-    }
-    return connection.sendRequest("set_input_status", params);
+    return sendRequest("set_input_status", params);
 }
 /**
  * 获取状态
  */
 export async function getStatus() {
-    const connection = getConnection();
-    if (!connection) {
-        log.warn("request", `No connection available`);
-        return failResp();
-    }
-    return connection.sendRequest("get_status");
+    return sendRequest("get_status");
 }
 /**
  * 获取登录信息
  */
 export async function getLoginInfo() {
-    const connection = getConnection();
-    if (!connection) {
-        log.warn("request", `No connection available`);
-        return failResp();
-    }
-    return connection.sendRequest("get_login_info");
+    return sendRequest("get_login_info");
 }
 /**
  * 获取好友列表
  */
 export async function getFriendList() {
-    const connection = getConnection();
-    if (!connection) {
-        log.warn("request", `No connection available`);
-        return failResp();
-    }
-    return connection.sendRequest("get_friend_list");
+    return sendRequest("get_friend_list");
 }
 /**
  * 获取群列表
  */
 export async function getGroupList() {
-    const connection = getConnection();
-    if (!connection) {
-        log.warn("request", `No connection available`);
-        return failResp();
-    }
-    return connection.sendRequest("get_group_list");
+    return sendRequest("get_group_list");
 }

package/dist/src/core/runtime.d.ts

@@ -2,21 +2,12 @@
  * Plugin Runtime Storage
  * Stores the PluginRuntime for access in gateway handlers
  */
-import type { ChannelAccountSnapshot, ChannelGatewayContext, HistoryEntry, PluginRuntime } from "openclaw/plugin-sdk";
-import { QQConfig, QQLoginInfo, QQSession } from "../types";
+import type { HistoryEntry } from "openclaw/plugin-sdk/reply-history";
+import { QQLoginInfo } from "../types";
 import { ConnectionManager } from "./connection.js";
-export declare function setRuntime(next: PluginRuntime): void;
-export declare function getRuntime(): PluginRuntime | null;
-export declare function setContext(next: ChannelGatewayContext<QQConfig>): void;
-export declare function getContext(): ChannelGatewayContext<QQConfig> | null;
-export declare function clearContext(): void;
-export declare function setContextStatus(next: Omit<ChannelAccountSnapshot, 'accountId'>): void;
 export declare function setConnection(next: ConnectionManager): void;
 export declare function getConnection(): ConnectionManager | null;
 export declare function clearConnection(): void;
-export declare function getSession(sessionKey: string): QQSession;
-export declare function updateSession(sessionKey: string, session: QQSession): void;
-export declare function clearSession(sessionKey: string): void;
 export declare function setLoginInfo(next: QQLoginInfo): void;
 export declare function getLoginInfo(): QQLoginInfo;
 export declare const historyCache: Map<string, HistoryEntry[]>;

package/dist/src/core/runtime.js

@@ -3,34 +3,6 @@
  * Stores the PluginRuntime for access in gateway handlers
  */
 // =============================================================================
-// Runtime
-// =============================================================================
-let runtime = null;
-export function setRuntime(next) {
-    runtime = next;
-}
-export function getRuntime() {
-    return runtime;
-}
-// =============================================================================
-// Context
-// =============================================================================
-let context = null;
-export function setContext(next) {
-    context = next;
-}
-export function getContext() {
-    return context;
-}
-export function clearContext() {
-    context = null;
-}
-export function setContextStatus(next) {
-    if (context) {
-        context.setStatus(next);
-    }
-}
-// =============================================================================
 // Connection
 // =============================================================================
 let connection = null;
@@ -44,25 +16,6 @@ export function clearConnection() {
     connection = null;
 }
 // =============================================================================
-// Session
-// =============================================================================
-const sessionMap = new Map();
-export function getSession(sessionKey) {
-    let session = sessionMap.get(sessionKey);
-    if (session) {
-        return session;
-    }
-    session = {};
-    sessionMap.set(sessionKey, session);
-    return session;
-}
-export function updateSession(sessionKey, session) {
-    sessionMap.set(sessionKey, session);
-}
-export function clearSession(sessionKey) {
-    sessionMap.delete(sessionKey);
-}
-// =============================================================================
 // LoginInfo
 // =============================================================================
 const loginInfo = {

package/dist/src/runtime.d.ts

@@ -0,0 +1,3 @@
+import type { PluginRuntime } from "openclaw/plugin-sdk/core";
+declare const setQQRuntime: (next: PluginRuntime) => void, getQQRuntime: () => PluginRuntime;
+export { getQQRuntime, setQQRuntime };

package/dist/src/runtime.js

@@ -0,0 +1,3 @@
+import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
+const { setRuntime: setQQRuntime, getRuntime: getQQRuntime } = createPluginRuntimeStore("QQ runtime not initialized");
+export { getQQRuntime, setQQRuntime };

package/dist/src/setup-surface.d.ts

@@ -0,0 +1,2 @@
+import type { ChannelSetupWizard } from "openclaw/plugin-sdk/setup";
+export declare const qqSetupWizard: ChannelSetupWizard;

package/dist/src/setup-surface.js

@@ -0,0 +1,59 @@
+import { createStandardChannelSetupStatus, applySetupAccountConfigPatch } from "openclaw/plugin-sdk/setup";
+import { QQ_CHANNEL, listQQAccountIds, resolveQQAccount } from "./core/config";
+export const qqSetupWizard = {
+    channel: QQ_CHANNEL,
+    status: createStandardChannelSetupStatus({
+        channelLabel: "QQ Chat",
+        configuredLabel: "configured",
+        unconfiguredLabel: "needs service account",
+        configuredHint: "configured",
+        unconfiguredHint: "needs auth",
+        includeStatusLine: true,
+        resolveConfigured: ({ cfg }) => listQQAccountIds(cfg).some((accountId) => resolveQQAccount({ cfg, accountId }).token !== "none"),
+    }),
+    introNote: {
+        title: "QQ Chat setup",
+        lines: [
+            "1) 确保已安装 NapCat: https://github.com/NapNeko/NapCatQQ",
+            "2) 在 NapCat 配置中启用 WebSocket (正向 WS)",
+            "3) 默认地址: ws://localhost:3001",
+            "4) 如需访问控制，可设置 token",
+            "",
+            "NapCat 文档: https://napneko.github.io/",
+        ]
+    },
+    credentials: [],
+    textInputs: [
+        {
+            inputKey: "url",
+            message: "请输入 NapCat WebSocket URL",
+            placeholder: "ws://localhost:3001",
+            shouldPrompt: ({ currentValue }) => !currentValue,
+            validate: ({ value }) => (value ? undefined : "Required"),
+            normalizeValue: ({ value }) => String(value).trim(),
+            applySet: async ({ cfg, accountId, value }) => applySetupAccountConfigPatch({
+                cfg,
+                channelKey: QQ_CHANNEL,
+                accountId,
+                patch: {
+                    wsUrl: value,
+                }
+            }),
+        }, {
+            inputKey: "token",
+            message: "请输入 Access Token",
+            placeholder: "ws://localhost:3001",
+            shouldPrompt: ({ currentValue }) => !currentValue,
+            validate: ({ value }) => (value ? undefined : "Required"),
+            normalizeValue: ({ value }) => String(value).trim(),
+            applySet: async ({ cfg, accountId, value }) => applySetupAccountConfigPatch({
+                cfg,
+                channelKey: QQ_CHANNEL,
+                accountId,
+                patch: {
+                    wsUrl: value,
+                }
+            }),
+        }
+    ]
+};