@qihoo/tuitui-openclaw-channel 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qihoo/tuitui-openclaw-channel",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "maintainers": [
     {
       "name": "huzunjie",

package/src/channel.ts

@@ -12,7 +12,7 @@ import {
   deleteAccountFromConfigSection,
   buildChannelConfigSchema,
 } from 'openclaw/plugin-sdk';
-import type { TuiTuiInboundMessage } from './types';
+import type { TuiTuiInboundMessage, TuiTuiOutboundDeliverOptions } from './types';
 import {
   CHANNEL_ID,
   CHANNEL_NAME,
@@ -48,7 +48,58 @@ const isConfigured = (account: any)=> Boolean(
 );
 
 const isToGroup = (chatId: string) => /^\d+$/.test(chatId);
-
+const arrLowerCaseTrim = (arr: any[]) => arr.filter((v: any) => !!v).map((v: any) => String(v).toLowerCase().trim())
+const configSchema = buildChannelConfigSchema(
+  z
+    .object({
+      enabled: z.boolean().optional().describe('开启或关闭'),
+      appId: z.string().min(1).describe('推推机器人身份 AppId（你可以推推搜索【推推机器人助手】，和它聊天自助申请推推机器人）'),
+      appSecret: z.string().min(1).describe('推推机器人密钥 Secret'),
+      // 私聊策略（默认 pairing）
+      dmPolicy: z
+        .enum(['pairing', 'allowlist', 'open', 'disabled'])
+        .optional()
+        .default('pairing')
+        .describe('私聊策略：pairing=配对（默认）；allowlist=白名单；open=允许所有（不安全）；disabled=禁用私聊',),
+      // 私聊允许列表（当 dmPolicy=allowlist 生效；pairing 下也可显式允许）
+      allowFrom: z
+        .array(z.string())
+        .optional()
+        .describe('私聊白名单（dmPolicy=allowlist 时生效；pairing 下可用于显式放行用户）'),
+
+      // 群组策略
+      groupPolicy: z
+        .enum(['allowlist', 'disabled'])
+        .default('allowlist')
+        .describe('群聊策略：allowlist=白名单；disabled=禁用群聊',),
+      // 仅在 allowlist 生效的群组 ID 列表
+      groupAllowFrom: z
+        .array(z.string())
+        .optional()
+        .describe('群组白名单（仅在 groupPolicy=allowlist 生效）'),
+      // 每个群组的覆盖配置
+      /*
+      groups: z
+        .record(
+          z.string(),
+          z
+            .object({
+              requireMention: z
+                .boolean()
+                .optional()
+                .describe('该群组是否需要 @ 机器人才触发 Agent（默认 true）'),
+              shouldReply: z
+                .boolean()
+                .optional()
+                .describe('该群组是否允许 Agent 回复（默认 true）'),
+            })
+            .passthrough(),
+        )
+        .optional()
+        .describe('群组级覆盖配置'),
+        */
+    }) as any,
+);
 export function createTuiTuiChannelPlugin(apiRuntime: any) {
   return {
     id: CHANNEL_ID,
@@ -77,57 +128,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
 
     reload: { configPrefixes: [`channels.${CHANNEL_ID}`] },
 
-    configSchema: buildChannelConfigSchema(
-      z
-        .object({
-          enabled: z.boolean().optional().describe('开启或关闭'),
-          appId: z.string().min(1).describe('推推机器人身份 AppId（你可以推推搜索【推推机器人助手】，和它聊天自助申请推推机器人）'),
-          appSecret: z.string().min(1).describe('推推机器人密钥 Secret'),
-          // 私聊策略（默认 pairing）
-          dmPolicy: z
-            .enum(['pairing', 'allowlist', 'open', 'disabled'])
-            .optional()
-            .default('pairing')
-            .describe('私聊策略：pairing=配对（默认）；allowlist=白名单；open=允许所有（不安全）；disabled=禁用私聊',),
-          // 私聊允许列表（当 dmPolicy=allowlist 生效；pairing 下也可显式允许）
-          allowFrom: z
-            .array(z.string())
-            .optional()
-            .describe('私聊白名单（dmPolicy=allowlist 时生效；pairing 下可用于显式放行用户）'),
-
-          // 群组策略
-          groupPolicy: z
-            .enum(['allowlist', 'disabled'])
-            .default('allowlist')
-            .describe('群聊策略：allowlist=白名单；disabled=禁用群聊',),
-          // 仅在 allowlist 生效的群组 ID 列表
-          groupAllowFrom: z
-            .array(z.string())
-            .optional()
-            .describe('群组白名单（仅在 groupPolicy=allowlist 生效）'),
-          // 每个群组的覆盖配置
-          /*
-          groups: z
-            .record(
-              z.string(),
-              z
-                .object({
-                  requireMention: z
-                    .boolean()
-                    .optional()
-                    .describe('该群组是否需要 @ 机器人才触发 Agent（默认 true）'),
-                  shouldReply: z
-                    .boolean()
-                    .optional()
-                    .describe('该群组是否允许 Agent 回复（默认 true）'),
-                })
-                .passthrough(),
-            )
-            .optional()
-            .describe('群组级覆盖配置'),
-            */
-        }) as any,
-    ),
+    configSchema,
 
     config: {
       listAccountIds: (cfg: any) => {
@@ -273,7 +274,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
         return { channel: CHANNEL_ID, messageId: `tuitui-text-${Date.now()}`, chatId };
       },
 
-      sendCustom: async ({ cfg, to, payload, accountId, account, chatType, groupId, log }: any) => {
+      sendCustom: async ({ cfg, to, payload, accountId, account, chatType, groupId }: any) => {
         account = account || resolveAccount(cfg, accountId);
         checkAccount(account, 'send custom message');
 
@@ -292,13 +293,13 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
         return { channel: CHANNEL_ID, messageId: `tuitui-page-${Date.now()}`, chatId };
       },
 
-      sendMedia: async ({ cfg, to, mediaUrl, accountId, account, log }: any) => {
+      sendMedia: async ({ cfg, to, mediaUrl, accountId, account }: any) => {
         account = account || resolveAccount(cfg, accountId);
         checkAccount(account, 'send media');
 
         const chatId = String(to || '').trim();
         // Determine if this is a group message based on 'to' being all digits (group) or not (direct)
-        await sendMediaMsg(account, chatId, isToGroup(chatId), mediaUrl);
+        await sendMediaMsg(account, chatId, isToGroup(chatId), mediaUrl, 'tuitui.send.media');
 
         return { channel: CHANNEL_ID, messageId: `tuitui-media-${Date.now()}`, chatId };
       },
@@ -386,8 +387,8 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
             const msg = json.body as TuiTuiInboundMessage;
             const msgData = msg.data;
             let userAccount: string | undefined = msg.user_account;
-            let userUid: string | undefined = msg.uid;
-            let userName: string | undefined = msg.user_name;
+            let msgUid: string | undefined = msg.uid;
+            let msgUname: string | undefined = msg.user_name;
             let chatType: 'direct' | 'group';
             const chatTypeIsDirect = wsEvent === 'single_chat';
             const chatTypeIsGroup = wsEvent === 'group_chat';
@@ -404,9 +405,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
               chatType = 'direct';
               text = buildMessageBody(msgData);
 
-              log?.debug?.(
-                `[${CHANNEL_ID}] inbound single_chat user_account=${String(userAccount)} uid=${String(userUid)} user_name=${String(msg.user_name)}`,
-              );
+              log?.debug?.(`[${CHANNEL_ID}] inbound single_chat user_account=${userAccount} uid=${msgUid} user_name=${msgUname}`);
 
               const msgType = msgData.msg_type;
               // Extract media URLs for image/voice/file messages
@@ -423,7 +422,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
                 replyToId = msgData.ref.msgid;
               }
 
-              if (!userAccount && !userUid) {
+              if (!userAccount && !msgUid) {
                 log?.info?.(`[${CHANNEL_ID}] Missing user_account or uid in single_chat event`);
                 return;
               }
@@ -433,41 +432,24 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
               groupId = msgData.group_id;
               groupName = msgData.group_name;
 
-              log?.debug?.(
-                `[${CHANNEL_ID}] inbound group_chat user_account=${String(userAccount)} uid=${String(userUid)} user_name=${String(msg.user_name)} group_id=${String(groupId)}`,
-              );
+              log?.debug?.(`[${CHANNEL_ID}] inbound group_chat user_account=${userAccount} uid=${msgUid} user_name=${msgUname} group_id=${groupId}`);
 
               // Group policy gating and @mention requirements
               const groupPolicy = String(account.groupPolicy ?? "allowlist").toLowerCase();
               const groupAllowFromRaw = Array.isArray(account.groupAllowFrom) ? account.groupAllowFrom : [];
-              const normalizedGroupAllowFrom = groupAllowFromRaw
-                .filter((v: unknown) => v != null)
-                .map((v: unknown) => String(v).trim())
-                .filter(Boolean);
-              log?.debug?.(
-                `[${CHANNEL_ID}] groupPolicy=${groupPolicy} groupId=${String(groupId)} groupAllowFrom=${JSON.stringify(normalizedGroupAllowFrom)} at_me=${JSON.stringify(msgData.at_me)} at=${JSON.stringify(msgData.at)}`,
-              );
-
-              if (groupPolicy === 'disabled') {
-                log?.info?.('Groups disabled');
-                return;
-              }
-     
+              const normalizedGroupAllowFrom = arrLowerCaseTrim(groupAllowFromRaw);
+              log?.debug?.(`[${CHANNEL_ID}] groupPolicy=${groupPolicy} groupId=${groupId} groupAllowFrom=${JSON.stringify(normalizedGroupAllowFrom)} at_me=${JSON.stringify(msgData.at_me)} at=${JSON.stringify(msgData.at)}`);
 
+              if (groupPolicy === 'disabled') return log?.info?.('Groups disabled');
+     
               // 群消息处理策略
               const groupCfg = account.groups?.[String(groupId)];
 
               // @机器人触发策略
-              let requireMention = true;
-              if (groupCfg && typeof groupCfg.requireMention === 'boolean') {
-                requireMention = groupCfg.requireMention;
-              }
+              const requireMention = typeof groupCfg?.requireMention === 'boolean' ? groupCfg.requireMention : true;
 
               // 是否需要回复
-              let shouldReply = true;
-              if (groupCfg !== undefined && typeof groupCfg.shouldReply === 'boolean') {
-                shouldReply = groupCfg.shouldReply;
-              }
+              let shouldReply = typeof groupCfg?.shouldReply === 'boolean' ? groupCfg.shouldReply : true;
 
               if (!userAccount || !groupId) {
                 log?.info?.(`[${CHANNEL_ID}] Missing user_account or group_id in group_chat event`);
@@ -515,14 +497,10 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
             // DM access gating (pairing/allowlist/open/disabled)
             const dmPolicy = String(account.dmPolicy ?? 'pairing').toLowerCase();
             const configuredAllowFrom = Array.isArray(account.allowFrom) ? account.allowFrom : [];
-            const normalizedAllowFrom = configuredAllowFrom
-              .filter((v: unknown) => !!v)
-              .map((v: unknown) => String(v).toLowerCase().trim());
+            const normalizedAllowFrom = arrLowerCaseTrim(configuredAllowFrom);
             // 只使用 userAccount 作为匹配依据，因为用户希望 allowFrom 匹配 user_account
             const senderForPolicy = userAccount ? String(userAccount).toLowerCase().trim() : '';
-            log?.debug?.(
-              `[${CHANNEL_ID}] dmPolicy=${dmPolicy} userAccount=${String(userAccount)} userUid=${String(userUid)} senderForPolicy=${senderForPolicy} allowFrom=${JSON.stringify(normalizedAllowFrom)}`,
-            );
+            log?.debug?.(`[${CHANNEL_ID}] dmPolicy=${dmPolicy} userAccount=${userAccount} msgUid=${msgUid} senderForPolicy=${senderForPolicy} allowFrom=${JSON.stringify(normalizedAllowFrom)}`);
 
             if (chatTypeIsDirect) {
               if (dmPolicy === 'disabled') {
@@ -533,20 +511,14 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
               if (dmPolicy !== 'open') {
                 // Merge pairing-store entries unless policy is allowlist-only
                 let storeAllowFrom: string[] = [];
-                try {
-                  if (dmPolicy !== 'allowlist') {
-                    const entries = await apiRuntime?.channel?.pairing?.readAllowFromStore?.({
+                if (dmPolicy !== 'allowlist') {
+                  try {
+                    const res = await apiRuntime?.channel?.pairing?.readAllowFromStore?.({
                       channel: CHANNEL_ID,
                       accountId: account.accountId,
                     });
-                    if (Array.isArray(entries)) {
-                      storeAllowFrom = entries
-                        .filter((v: unknown) => !!v)
-                        .map((v: unknown) => String(v).toLowerCase().trim());
-                    }
-                  }
-                } catch {
-                  storeAllowFrom = [];
+                    if (Array.isArray(res)) storeAllowFrom = arrLowerCaseTrim(res);
+                  } catch {}
                 }
 
                 // 只检查 userAccount 是否在 allowFrom 或 storeAllowFrom 中
@@ -556,9 +528,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
                 if (!isAllowed) {
                   if (dmPolicy === 'pairing') {
                     try {
-                      log?.debug?.(
-                        `[${CHANNEL_ID}] pairing flow: checking if pairing request exists for sender=${senderForPolicy}`,
-                      );
+                      log?.debug?.(`[${CHANNEL_ID}] pairing flow: checking if pairing request exists for sender=${senderForPolicy}`);
                       const req = await apiRuntime?.channel?.pairing?.upsertPairingRequest?.({
                         channel: CHANNEL_ID,
                         accountId: account.accountId,
@@ -591,9 +561,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
                   }
 
                   // dmPolicy=allowlist and sender not allowed
-                  log?.warn?.(
-                    `[${CHANNEL_ID}] Blocked unauthorized sender (allowlist): sender=${senderForPolicy} allowFrom=${JSON.stringify(normalizedAllowFrom)}`,
-                  );
+                  log?.warn?.(`[${CHANNEL_ID}] Blocked unauthorized sender (allowlist): sender=${senderForPolicy} allowFrom=${JSON.stringify(normalizedAllowFrom)}`);
                   return;
                 }
               }
@@ -603,22 +571,13 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
             await tuituiEmojiReaction(account, chatTypeIsGroup ? groupId : userAccount, chatTypeIsGroup, msgData.msgid, '收到');
 
             // Build MsgContext
-            // 优先使用 userAccount，如果为空则降级使用 userUid
-            const senderId = userAccount || userUid || 'unknown';
+            // 优先使用 userAccount，如果为空则降级使用 msgUid
+            const senderId = userAccount || msgUid || 'unknown';
             // 确保 accountId 有有效值，优先使用 account.accountId，其次使用 ctx 中的 accountId，最后使用 DEFAULT_ACCOUNT_ID
 
             const effectiveAccountId = String(account.accountId || accountId || DEFAULT_ACCOUNT_ID || 'default');
-            const sessionKey = chatTypeIsGroup
-              ? `${CHANNEL_ID}:${effectiveAccountId}:${groupId}`
-              : `${CHANNEL_ID}:${effectiveAccountId}:${senderId}`;
-            console.log(`[${CHANNEL_ID}] effectiveAccountId infos: 
-              account.accountId : ${account.accountId}, 
-              accountId: ${accountId}, 
-              DEFAULT_ACCOUNT_ID: ${DEFAULT_ACCOUNT_ID}, 
-              chatType: ${chatType},
-              sessionKey: ${sessionKey},
-              effectiveAccountId: ${effectiveAccountId},
-            `);
+            const sessionKey = `${CHANNEL_ID}:${effectiveAccountId}:${chatTypeIsGroup ? groupId : userAccount}`;
+            console.log(`[${CHANNEL_ID}] effectiveAccountId infos:  account.accountId : ${account.accountId},  accountId: ${accountId},  DEFAULT_ACCOUNT_ID: ${DEFAULT_ACCOUNT_ID},  chatType: ${chatType}, sessionKey: ${sessionKey}, effectiveAccountId: ${effectiveAccountId}`);
 
             const msgCtx: any = {
               Body: text || ' ',
@@ -632,7 +591,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
               ChatType: chatType,
               Surface: CHANNEL_ID,
               Provider: CHANNEL_ID,
-              SenderName: msg.user_name || String(senderId),
+              SenderName: msgUname || String(senderId),
             };
 
             // Add group-specific fields
@@ -652,23 +611,11 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
               log?.error?.(`[${CHANNEL_ID}] TuiTuiRuntime error，未能发送回复。`);
               return;
             }
-            const currentCfg = await apiRuntime.config.loadConfig();
             await apiRuntime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
               ctx: msgCtx,
-              cfg: currentCfg,
+              cfg: await apiRuntime.config.loadConfig(),
               dispatcherOptions: {
-                deliver: async (payload: {
-                  text?: string;
-                  body?: string;
-                  mediaUrl?: string;
-                  mediaUrls?: string[];
-                  custom?: {
-                    msgtype: string;
-                    tousers?: string[];
-                    togroups?: string[];
-                    [key: string]: any;
-                  };
-                }) => {
+                deliver: async (payload: TuiTuiOutboundDeliverOptions) => {
 
                   // 如果设置了 suppressReply 标志，则不发送回复
                   if (suppressReply) {
@@ -692,7 +639,8 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
                     // Handle media messages
                     const mediaUrl = payload.mediaUrl || payload.mediaUrls?.[0];
                     if (mediaUrl) {
-                      await sendMediaMsg(account, chatTarget, chatTypeIsGroup, mediaUrl, 'tuitui.deliver.media');
+                      const at = chatTypeIsGroup && userAccount ? [userAccount] : [];
+                      await sendMediaMsg(account, chatTarget, chatTypeIsGroup, mediaUrl, 'tuitui.deliver.media', at);
                     }
                     return;
                   }
@@ -700,19 +648,20 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
                   const replyText = payload?.text || payload?.body;
                   if (replyText) {
                     // at 使用 userAccount（群聊 @ 用户）
-                    const atList = chatTypeIsGroup && userAccount ? [userAccount] : [];
+                    const at = chatTypeIsGroup && userAccount ? [userAccount] : [];
                     // 群消息回复时不再使用 reference_msgid 避免并发时引用错乱，依靠 @ 来提醒用户
-                    await sendTextMsg(account, chatTarget, chatTypeIsGroup, replyText, 'tuitui.deliver.text', atList);
+                    await sendTextMsg(account, chatTarget, chatTypeIsGroup, replyText, 'tuitui.deliver.text', at);
                   }
                 },
                 onReplyStart: () => {
-                  log?.info?.(`[${CHANNEL_ID}] Agent reply started for ${userAccount ?? userUid}`);
+                  log?.info?.(`[${CHANNEL_ID}] Agent reply started for ${userAccount ?? msgUid}`);
                 },
               },
             });
           });
           
           const onErrOrClose = () => {
+            if (ws && ws.readyState !== WebSocket.CLOSED) ws.close(); // 关闭超时链接，防止产生多个
             _setStatus({ running: false, connected: false });
             _sendMsg = defSendMsg;
             if (!abortSignal?.aborted) {

package/src/types.ts

@@ -115,3 +115,16 @@ export interface TuiTuiGroupEmojiReactionTarget {
   group?: string;
   msgid?: string;
 }
+
+export interface TuiTuiOutboundDeliverOptions {
+  text?: string;
+  body?: string;
+  mediaUrl?: string;
+  mediaUrls?: string[];
+  custom?: {
+    msgtype: string;
+    tousers?: string[];
+    togroups?: string[];
+    [key: string]: any;
+  };
+}

package/src/utils.ts

@@ -225,10 +225,8 @@ export async function uploadFileToTuiTui(fileSrc: string, account: any, type: 'i
 export function buildMessageBody(data: TuiTuiMessageData): string {
   const parts: string[] = [];
 
-  const txt = data.text?.trim();
-  const pushTxt = () => txt && parts.push(txt);
-  const pushImgs = () => {
-    const imgs = data.images;
+  const pushTxt = () => parts.push(data.text || '');
+  const pushImgs = (imgs: string[] | undefined, parts: string[]) => {
     if (!imgs) return;
     const imgLen = imgs?.length || 0;
     if (imgLen === 0) return;
@@ -246,10 +244,10 @@ export function buildMessageBody(data: TuiTuiMessageData): string {
       break;
     case 'mixed':
       pushTxt();
-      pushImgs();
+      pushImgs(data.images, parts);
       break;
     case 'image':
-      pushImgs();
+      pushImgs(data.images, parts);
       break;
     case 'voice':
       if (data.voice) parts.push(`[语音] ${data.voice}`);
@@ -262,14 +260,16 @@ export function buildMessageBody(data: TuiTuiMessageData): string {
   // Handle reference/reply
   const { ref } = data;
   if (ref && ref.is_me) {
-    const { msg_type, text, images } = ref;
+    const { msg_type } = ref;
     let refContent = `[${msg_type}]`;
     switch (msg_type) {
       case 'text':
-        refContent = text || '';
+        refContent = ref.text || '';
         break;
       case 'image':
-        refContent = images?.length ? `[图片]` : '[图片]';
+        const refParts: string[] = [];
+        pushImgs(ref.images, refParts);
+        refContent = refParts.join("\n") || '[图片]';
         break;
     }
     parts.unshift(`[引用机器人消息]\n> ${refContent}`);
@@ -367,6 +367,7 @@ export async function sendMediaMsg(
   isGroup: boolean,
   mediaUrl: string,
   auditCtx: string = 'tuitui.send.media',
+  at?: string[],
 ): Promise<void> {
   if (!target) return console.error(`[${CHANNEL_ID}] sendMediaMsg Error ${auditCtx}: Missing "target"`);
   // Check if mediaUrl looks like an image
@@ -384,7 +385,7 @@ export async function sendMediaMsg(
     isImage
       ? { ...targets, msgtype: 'image', image: { media_id } }
       : { ...targets, msgtype: 'attachment', attachment: { media_id } };
-
+  if (at && at.length > 0) msg.at = at;
   console.log(`[${CHANNEL_ID}] sendMediaMsg ${auditCtx} - `, msg);
 
   await postTuituiMsg(account, msg, auditCtx);