@qihoo/tuitui-openclaw-channel 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qihoo/tuitui-openclaw-channel",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "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,
@@ -293,7 +293,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
         return { channel: CHANNEL_ID, messageId: `tuitui-page-${Date.now()}`, chatId };
       },
 
-      sendMedia: async ({ cfg, to, payload, mediaUrl, accountId, account }: any) => {
+      sendMedia: async ({ cfg, to, mediaUrl, accountId, account }: any) => {
         account = account || resolveAccount(cfg, accountId);
         checkAccount(account, 'send media');
 
@@ -446,16 +446,10 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
               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`);
@@ -598,6 +592,8 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
               Surface: CHANNEL_ID,
               Provider: CHANNEL_ID,
               SenderName: msgUname || String(senderId),
+              MsgUname: msgUname,
+              UserAccount: userAccount,
             };
 
             // Add group-specific fields
@@ -617,23 +613,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) {
@@ -657,7 +641,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
                     // Handle media messages
                     const mediaUrl = payload.mediaUrl || payload.mediaUrls?.[0];
                     if (mediaUrl) {
-                      const at = chatTypeIsGroup ? [msgUname] : [];
+                      const at = chatTypeIsGroup && userAccount ? [userAccount] : [];
                       await sendMediaMsg(account, chatTarget, chatTypeIsGroup, mediaUrl, 'tuitui.deliver.media', at);
                     }
                     return;
@@ -666,9 +650,9 @@ 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: () => {
@@ -679,11 +663,12 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
           });
           
           const onErrOrClose = () => {
+            if (ws && ws.readyState !== WebSocket.CLOSED) ws.close(); // 关闭超时链接，防止产生多个
             _setStatus({ running: false, connected: false });
             _sendMsg = defSendMsg;
             if (!abortSignal?.aborted) {
               log?.warn?.(`[${CHANNEL_ID}] WebSocket Restart`);
-              startWebSocket(); // 重启
+              setTimeout(startWebSocket, 10e3); // 10秒后尝试重启
             }
           };
           ws.on('close', () => {

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;
+  };
+}