@qihoo/tuitui-openclaw-channel 1.0.22 → 1.0.23

package/package.json

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

package/src/deduplicator.ts

@@ -0,0 +1,121 @@
+export class StringDeduplicator {
+  private items = new Map<string, number>(); // 存储元素和其首次插入时间（秒级时间戳）
+  private readonly maxSize: number;
+  private readonly expireTime: number | null; // 过期时间（秒），null 表示永不过期
+
+  /**
+   * 字符串去重器
+   * @param maxSize - 最大缓存元素数量，默认1000
+   * @param expireTime - 过期时间（秒），默认null（永不过期）。例如：300表示5分钟
+   */
+  constructor(maxSize: number = 1000, expireTime: number | null = null) {
+    if (maxSize <= 0) {
+      throw new Error(`[StringDeduplicator] maxSize must be positive, got ${maxSize}`);
+    }
+    if (expireTime !== null && expireTime <= 0) {
+      throw new Error(`[StringDeduplicator] expireTime must be positive or null, got ${expireTime}`);
+    }
+    this.maxSize = maxSize;
+    this.expireTime = expireTime;
+  }
+
+  /**
+   * 检查并记录字符串
+   * @returns true 表示在有效时间内首次出现（可处理），false 表示重复或已过期
+   */
+  checkAndRecord(item: string): boolean {
+    if (item === undefined || item === null) {
+      throw new Error('[StringDeduplicator] item cannot be null or undefined');
+    }
+
+    const now = Date.now() / 1000; // 转换为秒级时间戳
+
+    // 检查是否已存在
+    const firstSeenTime = this.items.get(item);
+    if (firstSeenTime !== undefined) {
+      // 如果设置了过期时间，检查是否过期
+      if (this.expireTime !== null && now - firstSeenTime >= this.expireTime) {
+        // 已过期，移除旧记录，重新添加
+        this.items.delete(item);
+      } else if (this.expireTime === null || now - firstSeenTime < this.expireTime) {
+        // 未过期（或永不过期模式），重复
+        return false;
+      }
+    }
+
+    // 添加新记录
+    this.items.set(item, now);
+    this.enforceSizeLimit();
+    this.cleanupExpired();
+    return true; // 首次出现或已过期后重新出现
+  }
+
+  /**
+   * 清理过期的条目
+   */
+  private cleanupExpired(): void {
+    if (this.expireTime === null) return;
+
+    const now = Date.now() / 1000;
+    for (const [item, timestamp] of this.items.entries()) {
+      if (now - timestamp >= this.expireTime) {
+        this.items.delete(item);
+      }
+    }
+  }
+
+  /**
+   * 确保不超过最大大小，删除最老的条目
+   */
+  private enforceSizeLimit(): void {
+    if (this.items.size <= this.maxSize) return;
+
+    // 因为每次 checkAndRecord 最多插入1个元素，所以只需删除1个最老的
+    const iterator = this.items.entries();
+    const oldestEntry = iterator.next().value;
+    if (oldestEntry) {
+      const [oldestItem] = oldestEntry;
+      this.items.delete(oldestItem);
+    }
+  }
+
+  // 可选：手动清理
+  clear(): void {
+    this.items.clear();
+  }
+
+  // 可选：检查是否存在（不记录）
+  has(item: string): boolean {
+    const firstSeenTime = this.items.get(item);
+    if (firstSeenTime === undefined) return false;
+    // 如果设置了过期时间，检查是否过期
+    if (this.expireTime !== null) {
+      return (Date.now() / 1000) - firstSeenTime < this.expireTime;
+    }
+    return true;
+  }
+
+  // 可选：获取当前大小
+  size(): number {
+    // 懒清理：每10次size调用执行一次完整清理
+    if (Math.random() < 0.1) {
+      this.cleanupExpired();
+    }
+    return this.items.size;
+  }
+
+  // 可选：删除指定项
+  delete(item: string): boolean {
+    return this.items.delete(item);
+  }
+
+  // 可选：获取过期时间（秒）
+  getExpireTime(): number | null {
+    return this.expireTime;
+  }
+
+  // 可选：获取最大大小
+  getMaxSize(): number {
+    return this.maxSize;
+  }
+}

package/src/inbound.ts

@@ -20,13 +20,15 @@ import {
   sendMediaMsg,
   teamsBuildChatId,
   teamsParseChatId,
+  get_announcement,
 } from "./outbound";
 import { parseChatMessageBody } from './inbound_body_parse';
 import { parseAllowFroms } from './utils';
-import {
-  addUnmentionedHistory,
-  popUnmentionedHistories,
-} from "./histories";
+import { addUnmentionedHistory, popUnmentionedHistories } from "./histories";
+import { StringDeduplicator } from "./deduplicator"
+
+// 会话上下文注入排重
+let _session_ctx_injected = new StringDeduplicator(1000, 3600);
 
 /** 子函数共享的可变上下文，子函数直接修改字段，外层读取结果 */
 interface ChatPayload {
@@ -352,9 +354,17 @@ async function parse_teams_post(payload: ChatPayload, msgData: any, account: Inb
       }
     }
 
-    // 解决机器人不知道自己是谁的问题
-    if(payload.botName) {
-      payload.text += `\n你在当前session中的名字叫: ${payload.botName} \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}`;
+      }
     }
   }  
 

package/src/outbound.ts

@@ -591,15 +591,18 @@ function parseSessionKey(str: string): string {
 }
 
 // TODO: 支持群公告
-export async function get_announcement(account: any, sessionKey: string = ""): Promise<any> {
-  const channel_id = parseSessionKey(sessionKey);
-  if(!channel_id) {
-    return {"announcement": ""};
+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 = parseSessionKey(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": announcement};
+  return announcement;
 }