@qihoo/tuitui-openclaw-channel 1.0.15 → 1.0.17

package/package.json

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

package/src/channel.ts

@@ -24,8 +24,27 @@ const isConfigured = (account: any)=> !!(account?.appId && account?.appSecret);
 
 const wsReadyStates = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'] as const;
 let wsNumber = 0;
+const checkTuiTuiConfig = async (apiRuntime: any) => {
+  const cfg = await apiRuntime.config.loadConfig();
+  const channels = cfg?.channels || {};
+  const currChannel = channels?.[CHANNEL_ID] || {};
+  if (currChannel?.appId === undefined && !currChannel.accounts) {
+    await apiRuntime.config.writeConfigFile({
+      ...cfg,
+      channels: {
+        ...channels,
+        [CHANNEL_ID]: {
+          ...currChannel,
+          ...baseFildsDefault,
+          appSecret: undefined,
+        }
+      }
+    });
+  }
+};
 
 export function createTuiTuiChannelPlugin(apiRuntime: any) {
+  checkTuiTuiConfig(apiRuntime);
   return {
     id: CHANNEL_ID,
     meta: {
@@ -44,16 +63,15 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
     config: {
       listAccountIds: (cfg: any) => {
         const base = cfg?.channels?.[CHANNEL_ID];
-        if (!base) return [];
         const ids = new Set<string>();
-        if (isEnabled(base.enabled)) ids.add(DEFAULT_ACCOUNT_ID);
-        if (base.accounts) for (const k in base.accounts) ids.add(k);
+        ids.add(DEFAULT_ACCOUNT_ID);
+        if (base?.accounts) for (const k in base.accounts) ids.add(k);
         return Array.from(ids);
       },
 
       resolveAccount,
 
-      defaultAccountId: (_cfg: any) => DEFAULT_ACCOUNT_ID,
+      defaultAccountId: () => DEFAULT_ACCOUNT_ID,
 
       isEnabled,
 
@@ -102,11 +120,18 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
     },
 
     status: {
+      defaultRuntime: {
+        accountId: DEFAULT_ACCOUNT_ID,
+        running: false,
+        lastStartAt: null,
+        lastStopAt: null,
+        lastError: null,
+      },
       buildAccountSnapshot: (params: any) => {
         const account = params.account;
         return {
           ...params.runtime,
-          accountId: params.accountId ?? account?.accountId ?? DEFAULT_ACCOUNT_ID,
+          accountId: params.accountId || account?.accountId || DEFAULT_ACCOUNT_ID,
           enabled: isEnabled(account?.enabled),
           configured: isConfigured(account),
         };
@@ -220,7 +245,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
         wsNumber++;
         const wsId = `${wsNumber}-${Date.now()}`;
         const wsEvtIds = new Set<string>();
-        let wsRetryTimerId = 0;
+        let wsRetryTimerId: any = 0;
 
         const wsUrl = `wss://im.live.360.cn:8282/robot/callback/ws?auth=${account.appId}.${account.appSecret}`;
         const defSendMsg = (msg: any) => {

package/src/confs.ts

@@ -13,8 +13,8 @@ export const capabilities = {
 
 /*** 一些配置字段设定信息 ***/
 const baseFields = {
-  appId: { type: 'string' } ,
-  appSecret: { type: 'string' },
+  appId: { type: 'string', default: '' } ,
+  appSecret: { type: 'string', default: '' },
   dmPolicy: {
     type: 'string',
     default: 'pairing',
@@ -22,6 +22,7 @@ const baseFields = {
   },
   allowFrom: {
     type: 'array',
+    default: [],
     items: { type: 'string' }
   },
   groupPolicy: {
@@ -35,6 +36,7 @@ const baseFields = {
   },
   groupAllowFrom: {
     type: 'array',
+    default: [],
     items: { type: 'string' }
   },
   channelContext: {

package/src/histories.ts

@@ -1,8 +1,70 @@
-import {
-  DEFAULT_GROUP_HISTORY_LIMIT,
-  recordPendingHistoryEntryIfEnabled,
-  type HistoryEntry,
-} from "openclaw/plugin-sdk/reply-history";
+const DEFAULT_GROUP_HISTORY_LIMIT = 50;
+const MAX_HISTORY_KEYS = 1000;
+type HistoryEntry = {
+  sender: string;
+  body: string;
+  timestamp?: number;
+  messageId?: string;
+};
+
+function evictOldHistoryKeys<T>(
+  historyMap: Map<string, T[]>,
+  maxKeys: number = MAX_HISTORY_KEYS,
+): void {
+  if (historyMap.size <= maxKeys) {
+    return;
+  }
+  const keysToDelete = historyMap.size - maxKeys;
+  const iterator = historyMap.keys();
+  for (let i = 0; i < keysToDelete; i++) {
+    const key = iterator.next().value;
+    if (key !== undefined) {
+      historyMap.delete(key);
+    }
+  }
+}
+
+function appendHistoryEntry<T extends HistoryEntry>(params: {
+  historyMap: Map<string, T[]>;
+  historyKey: string;
+  entry: T;
+  limit: number;
+}): T[] {
+  const { historyMap, historyKey, entry } = params;
+  if (params.limit <= 0) {
+    return [];
+  }
+  const history = historyMap.get(historyKey) ?? [];
+  history.push(entry);
+  while (history.length > params.limit) {
+    history.shift();
+  }
+  if (historyMap.has(historyKey)) {
+    // Refresh insertion order so eviction keeps recently used histories.
+    historyMap.delete(historyKey);
+  }
+  historyMap.set(historyKey, history);
+  // Evict oldest keys if map exceeds max size to prevent unbounded memory growth
+  evictOldHistoryKeys(historyMap);
+  return history;
+}
+
+function recordPendingHistoryEntryIfEnabled<T extends HistoryEntry>(params: {
+  historyMap: Map<string, T[]>;
+  historyKey: string;
+  entry?: T | null;
+  limit: number;
+}): T[] {
+  if (!params.entry || params.limit <= 0) {
+    return [];
+  }
+  return appendHistoryEntry({
+    historyMap: params.historyMap,
+    historyKey: params.historyKey,
+    entry: params.entry,
+    limit: params.limit,
+  });
+}
 
 // 每个 accountId 独立的 group history map，防止多账户冲突
 const accountGroupHistories = new Map<string, Map<string, HistoryEntry[]>>();
@@ -10,7 +72,7 @@ const accountGroupHistories = new Map<string, Map<string, HistoryEntry[]>>();
 /**
  * 记录没有被@，被忽略的群消息到对应 account 的 pending history 中
  */
-export async function addUnmentionedHistory(apiRuntime, accountId: string, chatId: string, tuituiUserName: any, tuituiAccount: string, text: any, timestamp :any) {
+export async function addUnmentionedHistory(apiRuntime: any, accountId: string, chatId: string, tuituiUserName: any, tuituiAccount: string, text: any, timestamp :any) {
   const cfg = await apiRuntime.config.loadConfig();
   const senderDesc = tuituiUserName ? `${tuituiUserName} (${tuituiAccount})` : tuituiAccount;
 

package/src/outbound.ts

@@ -376,7 +376,7 @@ function getTargets(chatId: string, chatType: ChatType): TuiTuiToTargets {
 
 function replaceSingleNewlines(content: string): string {
   // 匹配单个换行符，前后都不是换行符
-  return content.replace(/([^\n])\n([^\n])/g, '$1\n\n$2');
+  return content.replace(/([^\n|])\n([^\n|])/g, '$1\n\n$2');
 }
 
 /*