@qihoo/tuitui-openclaw-channel 1.0.31 → 1.0.33

package/package.json

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

package/src/chat_base.ts

@@ -33,18 +33,38 @@ export function teamsParseChatId(chatId: string): TuiTuiTeamsTarget {
 }
 
 
-export function parseChannelIdBySessionKey(str: string): string {
-  // 检查是否包含必须的格式 "tuitui:channel:"
+export interface TuiTuiSessionKeyInfo {
+  chat_type: ChatType,
+  channel_id: string;
+  thread_id: string;
+}
+
+// 暂时只支持频道(后续可以完善)
+// 格式 agent:coder:tuitui:channel:123:thread:456
+export function parseSessionKey(str: string): TuiTuiSessionKeyInfo {
+  const info: TuiTuiSessionKeyInfo = { chat_type: CHAT_TYPE_DIRECT, channel_id: '', thread_id: '' };
+
   if (!str.includes('tuitui:channel:')) {
-      return "";
+    return info;
   }
-  
+
+  info.chat_type = CHAT_TYPE_CHANNEL;
+
   const parts = str.split(':');
   const channelIndex = parts.findIndex(part => part === 'channel');
-  
   if (channelIndex !== -1 && parts[channelIndex + 1]) {
-      return parts[channelIndex + 1];
+    info.channel_id = parts[channelIndex + 1];
   }
-  
-  return "";
+
+  const threadIndex = parts.findIndex(part => part === 'thread');
+  if (threadIndex !== -1 && parts[threadIndex + 1]) {
+    info.thread_id = parts[threadIndex + 1];
+  }
+
+  return info;
+}
+
+export function parseChannelIdBySessionKey(str: string): string {
+  const info = parseSessionKey(str);
+  return info.channel_id;
 }

package/src/chat_record.ts

@@ -1,6 +1,8 @@
 import { CHANNEL_ID } from "./const";
 import {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,ChatType, teamsParseChatId, guessChatType, teamsBuildChatId} from "./chat_base"
 import { tuituiRobotApi } from "./robot_api"
+import { parseSessionKey } from "./chat_base"
+import {getChannelInfoByChannelId} from "./robot_helper"
 import type { TuiTuiMessageData} from './types';
 
 export interface TuiTuiChatRecordMessage {
@@ -236,6 +238,7 @@ export async function getChannelInfoById(account: any, channel_id: string): Prom
 }
 
 interface TeamsPostChainItem {
+  from_uid: string;
   post_id: string;
   time: string;
   last_reply_time: string; // 只有主贴有最后回帖时间，所有的回帖更新的都是主贴的属性
@@ -261,6 +264,7 @@ function parsePost(item: any): TeamsPostChainItem[] {
   const posts: TeamsPostChainItem[] = [];
 
   posts.push({
+    from_uid: topic.from_uid ?? '', 
     post_id: topic.post_id ?? '',
     time: topic.create_time ?? '',
     last_reply_time: topic.last_reply_time ?? '',
@@ -271,6 +275,7 @@ function parsePost(item: any): TeamsPostChainItem[] {
 
   for (const post of [...replyList].reverse()) {
     posts.push({
+      from_uid: post.from_uid ?? '', 
       post_id: post.post_id ?? '',
       time: post.create_time ?? '',
       last_reply_time : '',
@@ -365,12 +370,26 @@ async function getPostChain(
 
   const datas = data.datas ?? {};
 
-  const posts = parsePost(datas)  
+  const posts = parsePost(datas)
 
   console.log(`[${CHANNEL_ID}] getPostChain result: ${posts.length} posts`, posts);
   return posts;
 }
 
+export async function getPostChainBySessionKey(
+  account: any,
+  sessionKey: string,
+): Promise<TeamsPostChainItem[]> {
+  const session_info = parseSessionKey(sessionKey);
+
+  const channelInfo = await getChannelInfoByChannelId(account, session_info.channel_id);
+  if (!channelInfo) {
+    throw new Error(`无法获取频道信息`);
+  }
+
+  return await getPostChain(account, channelInfo.team_id, session_info.channel_id, session_info.thread_id);
+}
+
 export async function getPostChainByChatId(
   account: any,
   chatId: string,

package/src/filespace.ts

@@ -1,6 +1,7 @@
 import { CHANNEL_ID } from "./const";
-import { tuituiRobotApi, downloadUrl, tuituiRobotUpload} from "./robot_api"
-import {parseChannelIdBySessionKey} from "./chat_base"
+import { tuituiRobotApi, tuituiRobotUpload} from "./robot_api"
+import {CHAT_TYPE_CHANNEL, parseSessionKey} from "./chat_base"
+import {getChannelInfoByChannelId} from "./robot_helper"
 
 export const NODE_TYPE_DIR  = '1';
 export const NODE_TYPE_FILE = '2';
@@ -51,29 +52,21 @@ export function flattenFileSpaceList(list: any[]): FileSpaceItem[] {
   }));
 }
 
-
-
-async function getChannelInfoBySessionKey(account: any, sessionKey: string) {
-  const channel_id = parseChannelIdBySessionKey(sessionKey);
-  if(!channel_id) {
-    return null;
-  }
-
-  const payload = {channel_id: channel_id};
-  const body = await tuituiRobotApi(account, '/teams/channel/info', payload);
-  return body?.datas?.info;
-}
-
 export async function file_space_list(
   account: any,
   sessionKey: string
 ): Promise<any> {
 
-  const channelInfo = await getChannelInfoBySessionKey(account, sessionKey);
-  if (!channelInfo) {
+  const session_info = parseSessionKey(sessionKey);
+  if(session_info.chat_type != CHAT_TYPE_CHANNEL) {
     throw new Error(`私聊、群聊会话不支持共享空间。仅团队频道支持。`);
   }
 
+  const channelInfo = await getChannelInfoByChannelId(account, session_info.channel_id);
+  if (!channelInfo) {
+    throw new Error(`无法获取频道信息`);
+  }
+
   const payload = {
     space_id: channelInfo.team_id,
     space_type: SPACE_TYPE_TEAM,
@@ -81,6 +74,8 @@ export async function file_space_list(
 
   const data = await tuituiRobotApi(account, '/file_space/node/list', payload);
 
+  //console.log(JSON.stringify(data));
+
   const list = data?.datas?.list;
   const flat_list = flattenFileSpaceList(list);
 
@@ -98,7 +93,8 @@ export async function file_space_list(
 async function ensureFolderPath(
   account: any,
   spaceId: string,
-  folderPath: string
+  folderPath: string,
+  source: string
 ): Promise<string> {
   // 标准化路径
   const normalizedPath = folderPath.startsWith('/') ? folderPath : '/' + folderPath;
@@ -151,6 +147,7 @@ async function ensureFolderPath(
         node_type: NODE_TYPE_DIR,
         name: folderName,
         parent_id: currentParentId,
+        source: source,
       };
 
       const createResult = await tuituiRobotApi(account, '/file_space/node/add', createFolderPayload);
@@ -184,11 +181,18 @@ export async function file_space_add(
   cloud_filepath: string,
   url_or_localpath: string,
 ): Promise<any> {
-  const channelInfo = await getChannelInfoBySessionKey(account, sessionKey);
-  if (!channelInfo) {
+  const session_info = parseSessionKey(sessionKey);
+  if(session_info.chat_type != CHAT_TYPE_CHANNEL) {
     throw new Error(`私聊、群聊会话不支持共享空间。仅团队频道支持。`);
   }
 
+  const channelInfo = await getChannelInfoByChannelId(account, session_info.channel_id);
+  if (!channelInfo) {
+    throw new Error(`无法获取频道信息`);
+  }
+
+  const source = session_info.thread_id;
+
   // 1. 解析云路径，分离目录和文件名
   const normalizedPath = cloud_filepath.startsWith('/')
     ? cloud_filepath
@@ -201,7 +205,7 @@ export async function file_space_add(
     : '';
 
   // 2. 确保目标目录存在，获取 parent_id
-  const parentId = await ensureFolderPath(account, channelInfo.team_id, folderPath);
+  const parentId = await ensureFolderPath(account, channelInfo.team_id, folderPath, source);
 
   // 3. 上传文件获取 fid
   const isImage = /^data:image\//i.test(url_or_localpath) || /\.(jpg|jpeg|png|gif)(?:$|[?#])/i.test(url_or_localpath);
@@ -219,6 +223,7 @@ export async function file_space_add(
     name: filename,
     fid: fid,
     parent_id: parentId,
+    source: source,
   };
 
   const body = await tuituiRobotApi(account, '/file_space/node/add', filePayload);

package/src/inbound.ts

@@ -19,11 +19,13 @@ import {
   sendPageMsg,
   sendMediaMsg,
   get_announcement,
+  get_team_members,
 } from "./outbound";
 import { parseChatMessageBody } from './inbound_body_parse';
 import { parseAllowFroms } from './utils';
 import { addUnmentionedHistory, popUnmentionedHistories } from "./histories";
 import { StringDeduplicator } from "./deduplicator"
+import { getPostChainByChatId } from "./chat_record"
 
 // 会话上下文注入排重
 let _session_ctx_injected = new StringDeduplicator(1000, 3600);
@@ -177,19 +179,52 @@ async function sendSingleChatPairingMsg(account: any, payload: any, log: any, ap
   }
 }
 
-//目标账号是否允许私聊（私聊白名单、配对、或者open）
-async function isAllowAccount(tuituiAccount: any, apiRuntime: any, account: InboundAccount) {
-  if(!tuituiAccount) return false;
+//tuituiAccounts列表中是否存在至少1个允许私聊的用户（私聊白名单、配对、或者open）
+async function isAllowOneOfAccount(tuituiAccounts: string[], apiRuntime: any, account: InboundAccount) {
+  if(!tuituiAccounts) return false;
   const { accountId, allowFrom, dmPolicy } = account;
   if (dmPolicy === 'open') return true;
 
-  let storeAllowFrom: string[] = [];
+  // 是否包含任意一个元素
+  if (tuituiAccounts.some(item => allowFrom.includes(item))) return true;
+
   try {
-    storeAllowFrom = parseAllowFroms(
+    let storeAllowFrom = parseAllowFroms(
       await apiRuntime?.channel?.pairing?.readAllowFromStore?.({ channel: CHANNEL_ID, accountId })
     );
+    if (tuituiAccounts.some(item => storeAllowFrom.includes(item))) return true;
   } catch {}
-  return [...allowFrom, ...storeAllowFrom].includes(tuituiAccount);
+  return false;  
+}
+
+async function isAllowAccount(tuituiAccount: string, apiRuntime: any, account: InboundAccount) {
+  return await isAllowOneOfAccount([tuituiAccount], apiRuntime, account);
+}
+
+async function isChannelCoordAuthorized(tuituiAccount: string, apiRuntime: any, account: InboundAccount, team_id:string, chat_id:string) {
+  // 协调员身份校验
+  if (tuituiAccount != "bot-FiwwCeDw" && tuituiAccount != "bot-sUwUeknd") return false;
+
+  // 当前 thread 中有白名单用户发帖，则协调员继承该权限
+  const [members, posts] = await Promise.all([
+    get_team_members(account, team_id),
+    getPostChainByChatId(account, chat_id),
+  ]);
+  if (!members?.length || !posts?.length) return false;
+
+  const from_uids = posts.map((p: any) => p.from_uid).filter(Boolean);
+  if (!from_uids.length) return false;
+
+  //console.log("from_uids", from_uids);
+
+  // 将 uid 映射到 user_account
+  const from_accounts: string[] = members
+    .filter((m: any) => from_uids.includes(m.uid) && m.account)
+    .map((m: any) => String(m.account));
+  if (!from_accounts.length) return false;
+
+  //console.log("from_accounts", from_accounts);
+  return await isAllowOneOfAccount(from_accounts, apiRuntime, account);
 }
 
 
@@ -386,6 +421,12 @@ async function parse_teams_post(payload: ChatPayload, msgData: any, account: Inb
       log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore teams post (not mentioned)`);
       return false;
     }
+
+    // 频道中允许协调员@自己（且帖子里有白名单用户发帖）
+    if (await isChannelCoordAuthorized(tuituiAccount, apiRuntime, account, team_id, chatId)) {
+      return true;
+    }
+
     if (needPairingThrottle(accountId, chatId)) {
       log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, teams pairing throttled for teamsChatId=${chatId}`);
       return false;

package/src/outbound.ts

@@ -234,3 +234,12 @@ export async function get_announcement(account: any, id: any, id_is_session: boo
   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"
 
@@ -19,6 +18,8 @@ export function checkAccount(account: any, ctxTips: string = 'send text') {
 export async function tuituiRobotApi(account: any, api: string, payload: any, log: boolean = true) {
   checkAccount(account);
 
+  const startTime = Date.now(); // 记录开始时间
+
   if (log) {
     console.log(`[${CHANNEL_ID}] ${api} request`, payload);
   }
@@ -32,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) {
@@ -50,36 +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;
+      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,
   });
 }
 
@@ -89,10 +80,26 @@ 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`);
+
+  let fetchWithSsrFGuard: any;
+  try {
+    fetchWithSsrFGuard = (await import('openclaw/plugin-sdk/ssrf-runtime')).fetchWithSsrFGuard;
+  } catch {
+    try {
+      fetchWithSsrFGuard = (await import('openclaw/plugin-sdk/tlon')).fetchWithSsrFGuard;
+    } catch {
+      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 {
@@ -120,6 +127,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/robot_helper.ts

@@ -0,0 +1,7 @@
+import { tuituiRobotApi}  from "./robot_api"
+
+export async function getChannelInfoByChannelId(account: any, channel_id: string) {
+  const payload = {channel_id: channel_id};
+  const body = await tuituiRobotApi(account, '/teams/channel/info', payload);
+  return body?.datas?.info;
+}

package/src/tools.ts

@@ -2,7 +2,7 @@ import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
 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 {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,guessChatType, teamsBuildChatId} from "./chat_base"
 import {getChatRecord, getChannelInfoById} from "./chat_record"
@@ -162,6 +162,14 @@ export function registerTuituiTools(api: OpenClawPluginApi) {
     api.logger.debug?.("tuitui: Registered tool: No config available");
     return;
   }
+
+  const channels = api.config.channels || {};
+  const currChannel = channels[CHANNEL_ID] || {};
+  if (!currChannel?.appId && !currChannel?.accounts) {
+    // 无推推配置时，不需要注册工具防止污染上下文
+    // api.logger.info?.(`tuitui: ignore Registered tools`);
+    return
+  }
   
   api.registerTool(tuitui_im_get_messages_factory);
   api.registerTool(tuitui_send_channel_post_factory);