@qihoo/tuitui-openclaw-channel 1.0.32 → 1.0.34

package/README.md

@@ -10,20 +10,15 @@
   <a href="https://github.com/openclaw/openclaw"><img alt="OpenClaw" src="https://img.shields.io/badge/OpenClaw-%3E%3D2026.3.13-0A7CFF"></a>
 </p>
 
-针对 OpenClaw 的推推机器人 Channel 渠道插件，基于 WebSocket 订阅模式接收消息、基于 HTTP API 发送消息，无需公网 IP。
+OpenClaw 的推推机器人 Channel 渠道插件
 
 ## 功能特性
 
-- WebSocket 订阅模式，无需 Webhook 和公网环境依赖
 - 支持私聊、群聊和 @机器人、团队帖子等
-- 支持文本、图片、语音、视频、文件、帖子
-- 支持多 Agent、多机器人绑定、状态检测同步
-
-## 文档入口
-
-- 推推的公开网站：<https://tuitui.cn>
-- 了解推推机器人：<https://easydoc.soft.360.cn/doc?project=38ed795130e25371ef319aeb60d5b4fa&doc=d1f11ba4cac8886301ede97079df824e&config=menu_toc>
-
+- 支持文本、图片、语音、视频、文件、频道帖子
+- 支持多 Agent + 多机器人绑定
+- 支持安全控制（私聊模式与白名单、群聊模式与白名单）
+- WebSocket 订阅模式，个人电脑可用，无需 Webhook 和公网ip依赖
 
 ## 安装与配置指南
 
@@ -32,30 +27,33 @@
 龙虾+推推插件配置指南
 
 ### 什么是龙虾推推channel插件
-在openclaw上安装推推插件后，可以通过推推与你的openclaw聊天。无需公网ip个人电脑也可以用。
+在openclaw上安装推推插件后，可以通过推推与你的openclaw聊天。
 
 ### 第一步、创建你的专属推推机器人
 推推搜索 推推机器人助手，和它私聊。使用 /创建 可自助创建一个机器人，得到appid和secret后用。
 另外你也可以对它使用 /改头像 指令。
 
 ### 第二步、安装openclaw 推推插件
+在终端命令行运行命令
+
 `openclaw plugins install @qihoo/tuitui-openclaw-channel`
-（如果以前你装过推推插件zip包内测版，需要先把原来的目录删了，不然装不上）
 
-有可能会遇到 clawHub 429 报错、npm install failed Error: package.json missing openclaw.hooks 等。
-均为下载环节不稳定导致，可以多试几次或参考下文的“本地源码链接安装”。
+如果遇到 clawHub 429 报错、npm install failed Error: package.json missing openclaw.hooks 等。
+均为下载连接npm仓库不稳定导致，可以多试几次。
 
 ### 第三步、配置插件。
-打开龙虾dashboard页面，频道->Tuitui，在appid和secret填入第一步获取的，并找到 Enabled 开启，下方点保存。
+打开龙虾dashboard页面，频道->Tuitui，在appid和secret填入第一步获取的密钥，下方点保存。
 
 ### 第四步、与你的机器人聊天
 
 私聊你的龙虾机器人，会提示配对。复制提示消息末尾的那行指令，龙虾主人在终端执行你复制的那行命令，然后就能聊了。
 
-群聊的话，你把机器人拉到群能力。需要@机器人触发。第一次会提示主人配置群白名单，主人复制群id在dashboard上配置白名单以后就能聊了。
+如果不想配对，可以在dashboard中把Dm Policy切换为allowlist，然后从Allow From为你的账号添加白名单。
+
+群聊的话，你把机器人拉到群里。需要@机器人触发。主人可以直接使用。其他人@机器人会提示让主人配置白名单，主人复制群id在dashboard上配置白名单以后就能聊了。
 
 ## 插件升级
-后续如果更新，可以用下述命令升级
+后续如果更新，可以用下述命令升级插件
 `openclaw plugins update tuitui-openclaw-channel`
 
 ## 安全备忘
@@ -87,3 +85,8 @@ openclaw plugins install -l .
 }
 ```
 
+
+## 参考文档
+
+- 推推的公开网站：<https://tuitui.cn>
+- 了解推推机器人：<https://easydoc.soft.360.cn/doc?project=38ed795130e25371ef319aeb60d5b4fa&doc=d1f11ba4cac8886301ede97079df824e&config=menu_toc>

package/package.json

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

package/src/chat_base.ts

@@ -9,6 +9,8 @@ export type ChatType = typeof CHAT_TYPE_DIRECT | typeof CHAT_TYPE_GROUP | typeof
 
 export function guessChatType(chatId: string): ChatType {
   if (chatId.startsWith("teams_")) return CHAT_TYPE_CHANNEL;
+  const isMobileNumber = /^1[3-9]\d{9}$/.test(chatId);
+  if (isMobileNumber) return CHAT_TYPE_DIRECT; // fix: 部分租户号为手机号被误猜测为群id的问题。大陆手机号格式
   if (/^\d+$/.test(chatId)) return CHAT_TYPE_GROUP;
   return CHAT_TYPE_DIRECT;
 }

package/src/filespace.ts

@@ -1,5 +1,5 @@
 import { CHANNEL_ID } from "./const";
-import { tuituiRobotApi, downloadUrl, tuituiRobotUpload} from "./robot_api"
+import { tuituiRobotApi, tuituiRobotUpload} from "./robot_api"
 import {CHAT_TYPE_CHANNEL, parseSessionKey} from "./chat_base"
 import {getChannelInfoByChannelId} from "./robot_helper"
 
@@ -120,7 +120,7 @@ async function ensureFolderPath(
 
   // 构建父目录ID映射，便于查找
   const parentIdToNodes = new Map<string, any[]>();
-  allNodes.forEach(node => {
+  allNodes.forEach((node: any) => {
     const parentId = node.parent_id || "";
     if (!parentIdToNodes.has(parentId)) {
       parentIdToNodes.set(parentId, []);

package/src/inbound.ts

@@ -13,14 +13,8 @@
 import type { TuiTuiInboundMessage, TuiTuiOutboundDeliverOptions } from './types';
 import { CHANNEL_ID } from './const';
 import {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,ChatType,teamsParseChatId,teamsBuildChatId} from "./chat_base"
-import {
-  tuituiEmojiReaction,
-  sendTextMsg,
-  sendPageMsg,
-  sendMediaMsg,
-  get_announcement,
-  get_team_members,
-} from "./outbound";
+import {tuituiEmojiReaction, sendTextMsg, sendPageMsg, sendMediaMsg } from "./outbound";
+import { teams_get_members, teams_get_members_text, teams_get_announcement } from "./teams_api"
 import { parseChatMessageBody } from './inbound_body_parse';
 import { parseAllowFroms } from './utils';
 import { addUnmentionedHistory, popUnmentionedHistories } from "./histories";
@@ -139,7 +133,7 @@ async function dispatchReply(ctx: any, cfg: any, account: InboundAccount, payloa
       },
 
       onReplyStart: () => {
-        log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, Agent reply started for ${payload.tuituiAccount ?? payload.tuituiUid}`);
+        log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, Agent is typing to ${payload.tuituiAccount}`);
       },
     },
   });
@@ -207,7 +201,7 @@ async function isChannelCoordAuthorized(tuituiAccount: string, apiRuntime: any,
 
   // 当前 thread 中有白名单用户发帖，则协调员继承该权限
   const [members, posts] = await Promise.all([
-    get_team_members(account, team_id),
+    teams_get_members(account, team_id),
     getPostChainByChatId(account, chat_id),
   ]);
   if (!members?.length || !posts?.length) return false;
@@ -387,20 +381,7 @@ async function parse_teams_post(payload: ChatPayload, msgData: any, account: Inb
         payload.text += `[文件] ${file?.name} : ${file?.url} \n`;
       }
     }
-
-    if(_session_ctx_injected.checkAndRecord(accountId + "_" + payload.chatId)) {
-      // 注入上下文
-      // 解决机器人不知道自己是谁的问题
-      if(payload.botName) {
-        payload.text += `\n[备忘]\n你在当前session中的名字叫: ${payload.botName}\n 如果有人@这个名字，就是在命令你`;
-      }
-      // 公告
-      const annnouncement = await get_announcement(account, channel_id, false);
-      if(annnouncement) {
-        payload.text += `\n[当前公告内容如下--有需要时可参考]\n${annnouncement}`;
-      }
-    }
-  }  
+  }
 
   if (!msgData.at_me && account.requireMention) {
     log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore teams post (not mentioned), add to history ${chatId} -> ${payload.text}`);
@@ -408,6 +389,26 @@ async function parse_teams_post(payload: ChatPayload, msgData: any, account: Inb
     return false;
   }
 
+  if(_session_ctx_injected.checkAndRecord(accountId + "_" + payload.chatId)) {
+    // 注入上下文
+    // 解决机器人不知道自己是谁的问题
+    if(payload.botName) {
+      payload.text += `\n\n*** 参考信息: 你在当前session中的名字叫: ${payload.botName} 如果有人@这个名字，就是在命令你 ***\n`;
+    }
+    // 公告
+    const annnouncement = await teams_get_announcement(account, channel_id, false);
+    if(annnouncement) {
+      payload.text += "\n\n*** 参考信息: 当前公告内容如下 ***\n";
+      payload.text += "```\n" + annnouncement + "\n```";
+    }
+
+    // 成员
+    const members = await teams_get_members_text(account, team_id);
+    if(members) {
+      payload.text += "\n\n*** 参考信息: 当前团队成员清单如下，每行一个成员名。如果需要询问成员、或者发送给成员时，需要用 @名字 的语法；并且@时必须从如下清单中匹配到最接近的，禁止@不存在的成员 ***\n";
+      payload.text += "```\n" + members + "\n```";
+    }
+  }
 
   // 私聊白名单对团队仍然生效，限制特定人@时，可以不配置groupAllowFrom，而是配置 allowFrom
   if(await isAllowAccount(tuituiAccount, apiRuntime, account)){

package/src/monitor.ts

@@ -15,10 +15,12 @@ import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/account-id';
 import { CHANNEL_ID } from './const';
 import { tuituiRobotApi } from './robot_api';
 import {parseChannelIdBySessionKey} from "./chat_base"
+import { monitorEnabledDefault } from './accounts';
 
 // 批量上报参数
 const BATCH_MAX_SIZE    = 100;       // 达到此条数立即 flush
 const BATCH_INTERVAL_MS = 5_000;    // 定时 flush 间隔（ms）
+const PAYLOAD_SIZE_LIMIT = 100 * 1024; // 单条 payload 兜底截断：100 KB
 
 // ─────────────────────────────────────────────────────────────
 // 上报载荷结构
@@ -109,6 +111,11 @@ function enqueue(target: MonitorTarget, payload: MonitorPayload): void {
     batchQueues.set(target.accountId, queue);
   }
 
+  // 兜底：data 字段超过 100 KB 时暴力截断
+  if (payload.data.length > PAYLOAD_SIZE_LIMIT) {
+    payload.data = payload.data.slice(0, PAYLOAD_SIZE_LIMIT) + '...[truncated]';
+  }
+
   queue.items.push(payload);
 
   // 达到上限，立即 flush
@@ -149,23 +156,30 @@ function resolveMonitorTargets(cfg: any): MonitorTarget[] {
     accountAgentId.get(accountId) ?? 'main';
 
   // 默认账户
-  if (channelCfg.monitorEnabled === true) {
-    targets.push({
-      accountId: DEFAULT_ACCOUNT_ID,
-      appId: channelCfg.appId || '',
-      appSecret: channelCfg.appSecret || '',
-      agentId: resolveAgentId(DEFAULT_ACCOUNT_ID),
-    });
+  if ((channelCfg.monitorEnabled ?? monitorEnabledDefault) === true) {
+    const appId = channelCfg.appId || '';
+    const appSecret = channelCfg.appSecret || '';
+    if (appId && appSecret) {
+      targets.push({
+        accountId: DEFAULT_ACCOUNT_ID,
+        appId,
+        appSecret,
+        agentId: resolveAgentId(DEFAULT_ACCOUNT_ID),
+      });
+    }
   }
 
   // 子账户
   if (channelCfg.accounts) {
     for (const [accountId, acct] of Object.entries(channelCfg.accounts) as [string, any][]) {
-      if (acct?.monitorEnabled !== true) continue;
+      if ((acct?.monitorEnabled ?? monitorEnabledDefault) !== true) continue;
+      const appId = acct?.appId || channelCfg.appId || '';
+      const appSecret = acct?.appSecret || channelCfg.appSecret || '';
+      if (!appId || !appSecret) continue;
       targets.push({
         accountId,
-        appId: acct?.appId || channelCfg.appId || '',
-        appSecret: acct?.appSecret || channelCfg.appSecret || '',
+        appId,
+        appSecret,
         agentId: resolveAgentId(accountId),
       });
     }
@@ -227,6 +241,11 @@ function trimData(eventType: MonitorEventType, data: unknown): unknown {
   const d = data as any;
   switch (eventType) {
     case 'agent_end':
+      if (Array.isArray(d?.messages)) {
+        return { ...d, messages: d.messages.slice(-10).map(truncateContent) };
+      }
+      return d;
+
     // case 'before_prompt_build':
     // case 'before_agent_start':
     case 'before_compaction':

package/src/outbound.ts

@@ -216,30 +216,3 @@ export async function sendMediaMsg(
     await postTuituiMsg(account, msg, auditCtx);
   }
 }
-
-
-// TODO: 支持群公告
-export async function get_announcement(account: any, id: any, id_is_session: boolean = true): Promise<any> {
-  let channel_id = id;
-  if(id_is_session) {
-    channel_id = parseChannelIdBySessionKey(id);
-    if(!channel_id) {
-      return "";
-    }
-  }
-  
-  const payload = {channel_id: channel_id};
-  const body = await tuituiRobotApi(account, '/teams/channel/info', payload);
-  //console.log("info", data);
-  const announcement = body?.datas?.info?.announcement;
-  return announcement;
-}
-
-
-export async function get_team_members(account: any, team_id: string): Promise<any> {
-  const payload = {team_id: team_id};
-  const body = await tuituiRobotApi(account, '/teams/member/list', payload);
-  const members = body?.datas?.members;
-  //console.log("info", members);
-  return members;
-}

package/src/robot_api.ts

@@ -1,6 +1,5 @@
 import { readFileSync, existsSync, statSync } from 'node:fs';
 import { basename } from 'node:path';
-import { fetchWithSsrFGuard } from 'openclaw/plugin-sdk/tlon';
 import { CHANNEL_ID } from "./const";
 import { TUITUI_SSRF_POLICY, getTuituiApiHost } from "./env"
 
@@ -34,8 +33,8 @@ export async function tuituiRobotApi(account: any, api: string, payload: any, lo
     fetch_fun = _fetchForm;
   }
 
-  const { response, release } = await fetch_fun(url, payload);
   try {
+    const response = await fetch_fun(url, payload);
     const bodyText = await response.text();
 
     if (!response.ok) {
@@ -52,41 +51,26 @@ export async function tuituiRobotApi(account: any, api: string, payload: any, lo
     console.error(`[${CHANNEL_ID}] ${api} error:`, err);
     throw err;
   } finally {
-    await release();
     if (log) {
-      const endTime = Date.now(); // 记录结束时间
-      const duration = endTime - startTime; // 计算耗时
+      const endTime = Date.now();
+      const duration = endTime - startTime;
       console.log(`[${CHANNEL_ID}] ${api} response took ${duration}ms`);
     }
   }
 }
 
-function _fetch(opts: any): Promise<any> {
-  return fetchWithSsrFGuard({
-    policy: TUITUI_SSRF_POLICY,
-    ...opts,
-  })
-}
-function _fetchJson(url: string, json: any, auditCtx: string = "tuitui.api.call"): Promise<any> {
-  return _fetch({
-    url,
-    init: {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(json),
-    },
-    auditCtx
+function _fetchJson(url: string, json: any): Promise<Response> {
+  return fetch(url, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(json),
   });
 }
 
-function _fetchForm(url: string, form: any, auditCtx: string = "tuitui.api.call"): Promise<any> {
-  return _fetch({
-    url,
-    init: {
-      method: 'POST',
-      body: form,
-    },
-    auditCtx
+function _fetchForm(url: string, form: any): Promise<Response> {
+  return fetch(url, {
+    method: 'POST',
+    body: form,
   });
 }
 
@@ -96,10 +80,29 @@ function _fetchForm(url: string, form: any, auditCtx: string = "tuitui.api.call"
  * @returns Object with buffer, filename and content type
  */
 export async function downloadUrl(url: string): Promise<{ buffer: ArrayBuffer; filename: string; contentType: string }> {
-  const { response, release } = await _fetch({
+  console.log(`[${CHANNEL_ID}] downloadUrl prepair ssrf`);
+
+  let fetchWithSsrFGuard: any;
+  try {
+    const ssrfRuntimeImport: any = await import('openclaw/plugin-sdk/ssrf-runtime');
+    fetchWithSsrFGuard = (ssrfRuntimeImport.default ?? ssrfRuntimeImport).fetchWithSsrFGuard;
+  } catch {
+    try {
+      fetchWithSsrFGuard = (await import('openclaw/plugin-sdk/tlon')).fetchWithSsrFGuard;
+    } catch {}
+  }
+
+  if (!fetchWithSsrFGuard) {
+    throw new Error(`[${CHANNEL_ID}] fetchWithSsrFGuard() API import failed`);
+  }
+
+  console.log(`[${CHANNEL_ID}] downloadUrl start ${url}`);
+
+  const { response, release } = await fetchWithSsrFGuard({
+    policy: TUITUI_SSRF_POLICY,
     url,
     init: { method: 'GET' },
-    auditCtx: "tuitui.download"
+    auditContext: "tuitui.download",
   });
 
   try {
@@ -127,6 +130,8 @@ export async function downloadUrl(url: string): Promise<{ buffer: ArrayBuffer; f
       if (match) filename = decodeURIComponent(match[1]);
     }
 
+    console.log(`[${CHANNEL_ID}] downloadUrl ok`);
+
     return { buffer, filename, contentType };
   } finally {
     await release();

package/src/teams_api.ts

@@ -0,0 +1,38 @@
+
+import { CHANNEL_ID } from "./const";
+import { tuituiRobotApi, tuituiRobotUpload } from "./robot_api"
+import { CHAT_TYPE_GROUP, CHAT_TYPE_DIRECT, CHAT_TYPE_CHANNEL, ChatType, teamsParseChatId, parseChannelIdBySessionKey } from "./chat_base";
+
+// TODO: 支持群公告
+export async function teams_get_announcement(account: any, id: any, id_is_session: boolean = true): Promise<any> {
+  let channel_id = id;
+  if(id_is_session) {
+    channel_id = parseChannelIdBySessionKey(id);
+    if(!channel_id) {
+      return "";
+    }
+  }
+  
+  const payload = {channel_id: channel_id};
+  const body = await tuituiRobotApi(account, '/teams/channel/info', payload);
+  //console.log("info", data);
+  const announcement = body?.datas?.info?.announcement;
+  return announcement;
+}
+
+
+export async function teams_get_members(account: any, team_id: string): Promise<any> {
+  const payload = {team_id: team_id};
+  const body = await tuituiRobotApi(account, '/teams/member/list', payload);
+  const members = body?.datas?.members;
+  //console.log("info", members);
+  return members;
+}
+
+export async function teams_get_members_text(account: any, team_id: string): Promise<string> {
+  const members = await teams_get_members(account, team_id);
+  if (!members?.length) return "";
+
+  return members.map((m: any) => String(m?.name ?? "")).join("\n");
+}
+

package/src/tools.ts

@@ -3,7 +3,8 @@ import type { OpenClawPluginToolContext } from "openclaw/plugin-sdk/core";
 import { resolveAccount } from "./accounts"
 import { Type } from "@sinclair/typebox";
 import { CHANNEL_ID } from './const';
-import {sendTextMsg, get_announcement} from "./outbound"
+import {sendTextMsg} from "./outbound"
+import { teams_get_announcement } from "./teams_api"
 import {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,guessChatType, teamsBuildChatId} from "./chat_base"
 import {getChatRecord, getChannelInfoById} from "./chat_record"
 import {file_space_list, file_space_add} from "./filespace"
@@ -108,7 +109,7 @@ const tuitui_get_announcement_factory = (ctx: OpenClawPluginToolContext) => {
       if(!account || !account.enabled || !account.appId || !account.appSecret) {
         return tool_errmsg(`invalid tuitui account ${ctx.agentAccountId}`);
       }
-      return await get_announcement(account, ctx.sessionKey);
+      return await teams_get_announcement(account, ctx.sessionKey);
     },
   };
 };

package/tsconfig.json

@@ -0,0 +1,34 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022"],
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "declaration": true,
+    "outDir": "./dist",
+    "rootDir": "./",
+    "removeComments": false,
+    "sourceMap": true,
+    "inlineSources": true,
+    "importHelpers": true,
+    "resolveJsonModule": true,
+    "baseUrl": ".",
+    "paths": {
+      "openclaw/*": ["node_modules/openclaw/dist/*"]
+    }
+  },
+  "include": [
+    "index.ts",
+    "src/**/*",
+    "openclaw.plugin.json"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}