@ryantest/openclaw-qqbot 0.0.1

package/src/message-queue.ts

@@ -0,0 +1,169 @@
+import type { QueueSnapshot } from "./slash-commands.js";
+
+// 消息队列配置
+const MESSAGE_QUEUE_SIZE = 1000;
+const PER_USER_QUEUE_SIZE = 20;
+const MAX_CONCURRENT_USERS = 10;
+
+/**
+ * 消息队列项类型（用于异步处理消息，防止阻塞心跳）
+ */
+export interface QueuedMessage {
+  type: "c2c" | "guild" | "dm" | "group";
+  senderId: string;
+  senderName?: string;
+  content: string;
+  messageId: string;
+  timestamp: string;
+  channelId?: string;
+  guildId?: string;
+  groupOpenid?: string;
+  attachments?: Array<{ content_type: string; url: string; filename?: string; voice_wav_url?: string; asr_refer_text?: string }>;
+  /** 被引用消息的 refIdx（用户引用了哪条历史消息） */
+  refMsgIdx?: string;
+  /** 当前消息自身的 refIdx（供将来被引用） */
+  msgIdx?: string;
+}
+
+export interface MessageQueueContext {
+  accountId: string;
+  log?: {
+    info: (msg: string) => void;
+    error: (msg: string) => void;
+    debug?: (msg: string) => void;
+  };
+  /** 外部提供的 abort 状态检查 */
+  isAborted: () => boolean;
+}
+
+export interface MessageQueue {
+  enqueue: (msg: QueuedMessage) => void;
+  startProcessor: (handleMessageFn: (msg: QueuedMessage) => Promise<void>) => void;
+  getSnapshot: (senderPeerId: string) => QueueSnapshot;
+  getMessagePeerId: (msg: QueuedMessage) => string;
+  /** 清空指定用户的排队消息，返回被丢弃的消息数 */
+  clearUserQueue: (peerId: string) => number;
+  /** 立即执行一条消息（绕过队列），用于紧急命令 */
+  executeImmediate: (msg: QueuedMessage) => void;
+}
+
+/**
+ * 创建按用户并发的消息队列（同用户串行，跨用户并行）
+ */
+export function createMessageQueue(ctx: MessageQueueContext): MessageQueue {
+  const { accountId, log } = ctx;
+
+  const userQueues = new Map<string, QueuedMessage[]>();
+  const activeUsers = new Set<string>();
+  let messagesProcessed = 0;
+  let handleMessageFnRef: ((msg: QueuedMessage) => Promise<void>) | null = null;
+  let totalEnqueued = 0;
+
+  const getMessagePeerId = (msg: QueuedMessage): string => {
+    if (msg.type === "guild") return `guild:${msg.channelId ?? "unknown"}`;
+    if (msg.type === "group") return `group:${msg.groupOpenid ?? "unknown"}`;
+    return `dm:${msg.senderId}`;
+  };
+
+  const drainUserQueue = async (peerId: string): Promise<void> => {
+    if (activeUsers.has(peerId)) return;
+    if (activeUsers.size >= MAX_CONCURRENT_USERS) {
+      log?.info(`[qqbot:${accountId}] Max concurrent users (${MAX_CONCURRENT_USERS}) reached, ${peerId} will wait`);
+      return;
+    }
+
+    const queue = userQueues.get(peerId);
+    if (!queue || queue.length === 0) {
+      userQueues.delete(peerId);
+      return;
+    }
+
+    activeUsers.add(peerId);
+
+    try {
+      while (queue.length > 0 && !ctx.isAborted()) {
+        const msg = queue.shift()!;
+        totalEnqueued = Math.max(0, totalEnqueued - 1);
+        try {
+          if (handleMessageFnRef) {
+            await handleMessageFnRef(msg);
+            messagesProcessed++;
+          }
+        } catch (err) {
+          log?.error(`[qqbot:${accountId}] Message processor error for ${peerId}: ${err}`);
+        }
+      }
+    } finally {
+      activeUsers.delete(peerId);
+      userQueues.delete(peerId);
+      for (const [waitingPeerId, waitingQueue] of userQueues) {
+        if (activeUsers.size >= MAX_CONCURRENT_USERS) break;
+        if (waitingQueue.length > 0 && !activeUsers.has(waitingPeerId)) {
+          drainUserQueue(waitingPeerId);
+        }
+      }
+    }
+  };
+
+  const enqueue = (msg: QueuedMessage): void => {
+    const peerId = getMessagePeerId(msg);
+    let queue = userQueues.get(peerId);
+    if (!queue) {
+      queue = [];
+      userQueues.set(peerId, queue);
+    }
+
+    if (queue.length >= PER_USER_QUEUE_SIZE) {
+      const dropped = queue.shift();
+      log?.error(`[qqbot:${accountId}] Per-user queue full for ${peerId}, dropping oldest message ${dropped?.messageId}`);
+    }
+
+    totalEnqueued++;
+    if (totalEnqueued > MESSAGE_QUEUE_SIZE) {
+      log?.error(`[qqbot:${accountId}] Global queue limit reached (${totalEnqueued}), message from ${peerId} may be delayed`);
+    }
+
+    queue.push(msg);
+    log?.debug?.(`[qqbot:${accountId}] Message enqueued for ${peerId}, user queue: ${queue.length}, active users: ${activeUsers.size}`);
+
+    drainUserQueue(peerId);
+  };
+
+  const startProcessor = (handleMessageFn: (msg: QueuedMessage) => Promise<void>): void => {
+    handleMessageFnRef = handleMessageFn;
+    log?.info(`[qqbot:${accountId}] Message processor started (per-user concurrency, max ${MAX_CONCURRENT_USERS} users)`);
+  };
+
+  const getSnapshot = (senderPeerId: string): QueueSnapshot => {
+    let totalPending = 0;
+    for (const [, q] of userQueues) {
+      totalPending += q.length;
+    }
+    const senderQueue = userQueues.get(senderPeerId);
+    return {
+      totalPending,
+      activeUsers: activeUsers.size,
+      maxConcurrentUsers: MAX_CONCURRENT_USERS,
+      senderPending: senderQueue ? senderQueue.length : 0,
+    };
+  };
+
+  const clearUserQueue = (peerId: string): number => {
+    const queue = userQueues.get(peerId);
+    if (!queue || queue.length === 0) return 0;
+    const droppedCount = queue.length;
+    queue.length = 0;
+    totalEnqueued = Math.max(0, totalEnqueued - droppedCount);
+    return droppedCount;
+  };
+
+  const executeImmediate = (msg: QueuedMessage): void => {
+    if (handleMessageFnRef) {
+      handleMessageFnRef(msg).catch(err => {
+        log?.error(`[qqbot:${accountId}] Immediate execution error: ${err}`);
+      });
+    }
+  };
+
+  return { enqueue, startProcessor, getSnapshot, getMessagePeerId, clearUserQueue, executeImmediate };
+}

package/src/onboarding.ts

@@ -0,0 +1,274 @@
+/**
+ * QQBot CLI Onboarding Adapter
+ * 
+ * 提供 openclaw onboard 命令的交互式配置支持
+ */
+import type { 
+  ChannelOnboardingAdapter,
+  ChannelOnboardingStatus,
+  ChannelOnboardingStatusContext,
+  ChannelOnboardingConfigureContext,
+  ChannelOnboardingResult,
+  OpenClawConfig,
+} from "openclaw/plugin-sdk";
+import { DEFAULT_ACCOUNT_ID, listQQBotAccountIds, resolveQQBotAccount } from "./config.js";
+
+// 内部类型（用于类型安全）
+interface QQBotChannelConfig {
+  enabled?: boolean;
+  appId?: string;
+  clientSecret?: string;
+  clientSecretFile?: string;
+  name?: string;
+  imageServerBaseUrl?: string;
+  markdownSupport?: boolean;
+  allowFrom?: string[];
+  accounts?: Record<string, {
+    enabled?: boolean;
+    appId?: string;
+    clientSecret?: string;
+    clientSecretFile?: string;
+    name?: string;
+    imageServerBaseUrl?: string;
+    markdownSupport?: boolean;
+    allowFrom?: string[];
+  }>;
+}
+
+// Prompter 类型定义
+interface Prompter {
+  note: (message: string, title?: string) => Promise<void>;
+  confirm: (opts: { message: string; initialValue?: boolean }) => Promise<boolean>;
+  text: (opts: { message: string; placeholder?: string; initialValue?: string; validate?: (value: string) => string | undefined }) => Promise<string>;
+  select: <T>(opts: { message: string; options: Array<{ value: T; label: string }>; initialValue?: T }) => Promise<T>;
+}
+
+/**
+ * 解析默认账户 ID
+ */
+function resolveDefaultQQBotAccountId(cfg: OpenClawConfig): string {
+  const ids = listQQBotAccountIds(cfg);
+  return ids[0] ?? DEFAULT_ACCOUNT_ID;
+}
+
+/**
+ * QQBot Onboarding Adapter
+ */
+export const qqbotOnboardingAdapter: ChannelOnboardingAdapter = {
+  channel: "qqbot" as any,
+
+  getStatus: async (ctx: ChannelOnboardingStatusContext): Promise<ChannelOnboardingStatus> => {
+    const cfg = ctx.cfg as OpenClawConfig;
+    const configured = listQQBotAccountIds(cfg).some((accountId) => {
+      const account = resolveQQBotAccount(cfg, accountId);
+      return Boolean(account.appId && account.clientSecret);
+    });
+
+    return {
+      channel: "qqbot" as any,
+      configured,
+statusLines: [`QQ Bot: ${configured ? "已配置" : "需要 AppID 和 ClientSecret"}`],
+      selectionHint: configured ? "已配置" : "支持 QQ 群聊和私聊（流式消息）",
+      quickstartScore: configured ? 1 : 20,
+    };
+  },
+
+  configure: async (ctx: ChannelOnboardingConfigureContext): Promise<ChannelOnboardingResult> => {
+    const cfg = ctx.cfg as OpenClawConfig;
+    const prompter = ctx.prompter as Prompter;
+    const accountOverrides = ctx.accountOverrides as Record<string, string> | undefined;
+    const shouldPromptAccountIds = ctx.shouldPromptAccountIds;
+    
+    const qqbotOverride = accountOverrides?.qqbot?.trim();
+    const defaultAccountId = resolveDefaultQQBotAccountId(cfg);
+    let accountId = qqbotOverride ?? defaultAccountId;
+
+    // 是否需要提示选择账户
+    if (shouldPromptAccountIds && !qqbotOverride) {
+      const existingIds = listQQBotAccountIds(cfg);
+      if (existingIds.length > 1) {
+        accountId = await prompter.select({
+          message: "选择 QQBot 账户",
+          options: existingIds.map((id) => ({
+            value: id,
+            label: id === DEFAULT_ACCOUNT_ID ? "默认账户" : id,
+          })),
+          initialValue: accountId,
+        });
+      }
+    }
+
+    let next: OpenClawConfig = cfg;
+    const resolvedAccount = resolveQQBotAccount(next, accountId);
+    const accountConfigured = Boolean(resolvedAccount.appId && resolvedAccount.clientSecret);
+    const allowEnv = accountId === DEFAULT_ACCOUNT_ID;
+    const envAppId = typeof process !== "undefined" ? process.env?.QQBOT_APP_ID?.trim() : undefined;
+    const envSecret = typeof process !== "undefined" ? process.env?.QQBOT_CLIENT_SECRET?.trim() : undefined;
+    const canUseEnv = allowEnv && Boolean(envAppId && envSecret);
+    const hasConfigCredentials = Boolean(resolvedAccount.config.appId && resolvedAccount.config.clientSecret);
+
+    let appId: string | null = null;
+    let clientSecret: string | null = null;
+
+    // 显示帮助
+    if (!accountConfigured) {
+      await prompter.note(
+        [
+          "1) 打开 QQ 开放平台: https://q.qq.com/",
+          "2) 创建机器人应用，获取 AppID 和 ClientSecret",
+          "3) 在「开发设置」中添加沙箱成员（测试阶段）",
+          "4) 你也可以设置环境变量 QQBOT_APP_ID 和 QQBOT_CLIENT_SECRET",
+          "",
+          "文档: https://bot.q.qq.com/wiki/",
+          "",
+          "此版本支持流式消息发送！",
+        ].join("\n"),
+"QQ Bot 配置",
+      );
+    }
+
+    // 检测环境变量
+    if (canUseEnv && !hasConfigCredentials) {
+      const keepEnv = await prompter.confirm({
+        message: "检测到环境变量 QQBOT_APP_ID 和 QQBOT_CLIENT_SECRET，是否使用？",
+        initialValue: true,
+      });
+      if (keepEnv) {
+        next = {
+          ...next,
+          channels: {
+            ...next.channels,
+            qqbot: {
+              ...(next.channels?.qqbot as Record<string, unknown> || {}),
+              enabled: true,
+              allowFrom: resolvedAccount.config?.allowFrom ?? ["*"],
+            },
+          },
+        };
+      } else {
+        // 手动输入
+        appId = String(
+          await prompter.text({
+            message: "请输入 QQ Bot AppID",
+            placeholder: "例如: 102146862",
+            initialValue: resolvedAccount.appId || undefined,
+            validate: (value: string) => (value?.trim() ? undefined : "AppID 不能为空"),
+          }),
+        ).trim();
+        clientSecret = String(
+          await prompter.text({
+            message: "请输入 QQ Bot ClientSecret",
+            placeholder: "你的 ClientSecret",
+            validate: (value: string) => (value?.trim() ? undefined : "ClientSecret 不能为空"),
+          }),
+        ).trim();
+      }
+    } else if (hasConfigCredentials) {
+      // 已有配置
+      const keep = await prompter.confirm({
+        message: "QQ Bot 已配置，是否保留当前配置？",
+        initialValue: true,
+      });
+      if (!keep) {
+        appId = String(
+          await prompter.text({
+            message: "请输入 QQ Bot AppID",
+            placeholder: "例如: 102146862",
+            initialValue: resolvedAccount.appId || undefined,
+            validate: (value: string) => (value?.trim() ? undefined : "AppID 不能为空"),
+          }),
+        ).trim();
+        clientSecret = String(
+          await prompter.text({
+            message: "请输入 QQ Bot ClientSecret",
+            placeholder: "你的 ClientSecret",
+            validate: (value: string) => (value?.trim() ? undefined : "ClientSecret 不能为空"),
+          }),
+        ).trim();
+      }
+    } else {
+      // 没有配置，需要输入
+      appId = String(
+        await prompter.text({
+          message: "请输入 QQ Bot AppID",
+          placeholder: "例如: 102146862",
+          initialValue: resolvedAccount.appId || undefined,
+          validate: (value: string) => (value?.trim() ? undefined : "AppID 不能为空"),
+        }),
+      ).trim();
+      clientSecret = String(
+        await prompter.text({
+          message: "请输入 QQ Bot ClientSecret",
+          placeholder: "你的 ClientSecret",
+          validate: (value: string) => (value?.trim() ? undefined : "ClientSecret 不能为空"),
+        }),
+      ).trim();
+    }
+
+    // 默认允许所有人执行命令（用户无感知）
+    const allowFrom: string[] = resolvedAccount.config?.allowFrom ?? ["*"];
+
+    // 应用配置（markdownSupport 默认开启，如需关闭可用 set-markdown.sh）
+    if (appId && clientSecret) {
+      const existingQQBot = (next.channels?.qqbot as Record<string, unknown>) || {};
+      // 保留已有的 markdownSupport 设置，新装默认 true
+      const markdownSupport = existingQQBot.markdownSupport ?? true;
+
+      if (accountId === DEFAULT_ACCOUNT_ID) {
+        next = {
+          ...next,
+          channels: {
+            ...next.channels,
+            qqbot: {
+              ...existingQQBot,
+              enabled: true,
+              appId,
+              clientSecret,
+              markdownSupport,
+              allowFrom,
+            },
+          },
+        };
+      } else {
+        const existingAccounts = ((next.channels?.qqbot as QQBotChannelConfig)?.accounts || {});
+        const existingAccount = existingAccounts[accountId] || {};
+        const acctMarkdown = existingAccount.markdownSupport ?? true;
+
+        next = {
+          ...next,
+          channels: {
+            ...next.channels,
+            qqbot: {
+              ...existingQQBot,
+              enabled: true,
+              accounts: {
+                ...existingAccounts,
+                [accountId]: {
+                  ...existingAccount,
+                  enabled: true,
+                  appId,
+                  clientSecret,
+                  markdownSupport: acctMarkdown,
+                  allowFrom,
+                },
+              },
+            },
+          },
+        };
+      }
+    }
+
+    return { success: true, cfg: next as any, accountId };
+  },
+
+  disable: (cfg: unknown) => {
+    const config = cfg as OpenClawConfig;
+    return {
+      ...config,
+      channels: {
+        ...config.channels,
+        qqbot: { ...(config.channels?.qqbot as Record<string, unknown> || {}), enabled: false },
+      },
+    } as any;
+  },
+};