@qihoo/tuitui-openclaw-channel 1.0.8 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qihoo/tuitui-openclaw-channel",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "maintainers": [
     {
       "name": "huzunjie",
@@ -18,7 +18,6 @@
   "description": "TuiTui channel plugin for OpenClaw",
   "type": "module",
   "dependencies": {
-    "zod": "^4.3.6",
     "ws": "^8.13.0"
   },
   "openclaw": {

package/src/channel.ts

@@ -5,12 +5,10 @@
  * Supports single chat (text, image, voice, file) and group chat with @mentions.
  */
 import WebSocket from 'ws';
-import { z } from 'zod';
 import {
   DEFAULT_ACCOUNT_ID,
   setAccountEnabledInConfigSection,
   deleteAccountFromConfigSection,
-  buildChannelConfigSchema,
 } from 'openclaw/plugin-sdk';
 import type { TuiTuiInboundMessage, TuiTuiOutboundDeliverOptions } from './types';
 import {
@@ -24,86 +22,33 @@ import {
   sendMediaMsg,
 } from "./utils";
 
-function resolveAccount(cfg: any, accountId?: string | null) {
+import { capabilities, configSchema } from './confs';
+
+const isEnabled = (val: any) => val === undefined || !!val;
+const isConfigured = (account: any)=> !!(account?.appId && account?.appSecret);
+const resolveAccount = (cfg: any, accountId?: string | null) => {
   const channelConfig = cfg?.channels?.[CHANNEL_ID] || {};
   const targetId = accountId || DEFAULT_ACCOUNT_ID;
   const acct = targetId === DEFAULT_ACCOUNT_ID ? channelConfig : channelConfig.accounts?.[targetId];
   return {
     accountId: targetId,
-    enabled: acct?.enabled || false,
+    enabled: isEnabled(acct?.enabled),
     appId: acct?.appId as string | undefined,
     appSecret: acct?.appSecret as string | undefined,
     dmPolicy: acct?.dmPolicy || 'pairing',
     allowFrom: acct?.allowFrom || [],
     // 群组策略与白名单、群组级覆盖
     groupPolicy: (acct?.groupPolicy as string | undefined) ?? 'allowlist',
-    groupAllowFrom: acct.groupAllowFrom || [],
+    groupAllowFrom: acct?.groupAllowFrom || [],
     groups: (acct?.groups as Record<string, { requireMention?: boolean, shouldReply?: boolean }> | undefined) ?? {},
   };
-}
-
-const isConfigured = (account: any)=> Boolean(
-  String(account?.appId ?? '').trim() &&
-  String(account?.appSecret ?? '').trim()
-);
-
+};
 const isToGroup = (chatId: string) => /^\d+$/.test(chatId);
-const arrLowerCaseTrim = (arr: any[]) => arr.filter((v: any) => !!v).map((v: any) => String(v).toLowerCase().trim())
-const configSchema = buildChannelConfigSchema(
-  z
-    .object({
-      enabled: z.boolean().optional().describe('开启或关闭'),
-      appId: z.string().min(1).describe('推推机器人身份 AppId（你可以推推搜索【推推机器人助手】，和它聊天自助申请推推机器人）'),
-      appSecret: z.string().min(1).describe('推推机器人密钥 Secret'),
-      // 私聊策略（默认 pairing）
-      dmPolicy: z
-        .enum(['pairing', 'allowlist', 'open', 'disabled'])
-        .optional()
-        .default('pairing')
-        .describe('私聊策略：pairing=配对（默认）；allowlist=白名单；open=允许所有（不安全）；disabled=禁用私聊',),
-      // 私聊允许列表（当 dmPolicy=allowlist 生效；pairing 下也可显式允许）
-      allowFrom: z
-        .array(z.string())
-        .optional()
-        .describe('私聊白名单（dmPolicy=allowlist 时生效；pairing 下可用于显式放行用户）'),
-
-      // 群组策略
-      groupPolicy: z
-        .enum(['allowlist', 'disabled'])
-        .default('allowlist')
-        .describe('群聊策略：allowlist=白名单；disabled=禁用群聊',),
-      // 仅在 allowlist 生效的群组 ID 列表
-      groupAllowFrom: z
-        .array(z.string())
-        .optional()
-        .describe('群组白名单（仅在 groupPolicy=allowlist 生效）'),
-      // 每个群组的覆盖配置
-      /*
-      groups: z
-        .record(
-          z.string(),
-          z
-            .object({
-              requireMention: z
-                .boolean()
-                .optional()
-                .describe('该群组是否需要 @ 机器人才触发 Agent（默认 true）'),
-              shouldReply: z
-                .boolean()
-                .optional()
-                .describe('该群组是否允许 Agent 回复（默认 true）'),
-            })
-            .passthrough(),
-        )
-        .optional()
-        .describe('群组级覆盖配置'),
-        */
-    }) as any,
-);
+const arrLowerCaseTrim = (arr: any[]) => arr.filter((v: any) => !!v).map((v: any) => String(v).toLowerCase().trim());
+
 export function createTuiTuiChannelPlugin(apiRuntime: any) {
   return {
     id: CHANNEL_ID,
-
     meta: {
       id: CHANNEL_ID,
       label: CHANNEL_NAME,
@@ -113,29 +58,16 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
       blurb: `Connect to ${CHANNEL_NAME} bot via WebSocket`,
       order: 100,
     },
-
-    capabilities: {
-      chatTypes: ['direct' as const, 'group' as const],
-      media: true,
-      threads: false,
-      reactions: false,
-      edit: false,
-      unsend: false,
-      reply: true,
-      effects: false,
-      blockStreaming: false,
-    },
-
-    reload: { configPrefixes: [`channels.${CHANNEL_ID}`] },
-
+    capabilities,
     configSchema,
+    reload: { configPrefixes: [`channels.${CHANNEL_ID}`] },
 
     config: {
       listAccountIds: (cfg: any) => {
         const base = cfg?.channels?.[CHANNEL_ID];
         if (!base) return [];
         const ids = new Set<string>();
-        if (base.enabled) ids.add(DEFAULT_ACCOUNT_ID);
+        if (isEnabled(base.enabled)) ids.add(DEFAULT_ACCOUNT_ID);
         if (base.accounts) for (const k in base.accounts) ids.add(k);
         return Array.from(ids);
       },
@@ -144,13 +76,13 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
 
       defaultAccountId: (_cfg: any) => DEFAULT_ACCOUNT_ID,
 
-      isEnabled: (account: any) => account?.enabled !== false,
+      isEnabled,
 
       isConfigured,
 
       describeAccount: (account: any) => ({
         accountId: account?.accountId || DEFAULT_ACCOUNT_ID,
-        enabled: account?.enabled !== false,
+        enabled: isEnabled(account?.enabled),
         configured: isConfigured(account),
       }),
 
@@ -180,7 +112,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
               ...cfg.channels,
               [CHANNEL_ID]: {
                 ...(cfg?.channels?.[CHANNEL_ID] ?? {}),
-                enabled: false,
+                enabled: true,
                 appId: undefined,
                 appSecret: undefined,
               },
@@ -215,7 +147,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
         return {
           ...params.runtime,
           accountId: params.accountId ?? account?.accountId ?? DEFAULT_ACCOUNT_ID,
-          enabled: account?.enabled !== false,
+          enabled: isEnabled(account?.enabled),
           configured: isConfigured(account),
         };
       },
@@ -314,7 +246,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
         };
         const account = resolveAccount(cfg, accountId);
 
-        if (!account.enabled) {
+        if (!isEnabled(account.enabled)) {
           log?.info?.(`[${CHANNEL_ID}] account ${accountId} is disabled, skipping`);
           return _setStatus();
         }
@@ -576,8 +508,24 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
             // 确保 accountId 有有效值，优先使用 account.accountId，其次使用 ctx 中的 accountId，最后使用 DEFAULT_ACCOUNT_ID
 
             const effectiveAccountId = String(account.accountId || accountId || DEFAULT_ACCOUNT_ID || 'default');
-            const sessionKey = `${CHANNEL_ID}:${effectiveAccountId}:${chatTypeIsGroup ? groupId : userAccount}`;
-            console.log(`[${CHANNEL_ID}] effectiveAccountId infos:  account.accountId : ${account.accountId},  accountId: ${accountId},  DEFAULT_ACCOUNT_ID: ${DEFAULT_ACCOUNT_ID},  chatType: ${chatType}, sessionKey: ${sessionKey}, effectiveAccountId: ${effectiveAccountId}`);
+            const chatId = chatTypeIsGroup ? String(groupId) : String(senderId);
+
+            // 关于 sessionKey 格式的解释
+            // https://docs.openclaw.ai/channels/channel-routing
+            // 但 sessionKey 一般不要自己拼字符串，需要用系统api识别(根据 bindings)
+            const route = apiRuntime.channel.routing.resolveAgentRoute({
+              cfg: await apiRuntime.config.loadConfig(),
+              channel: CHANNEL_ID,
+              accountId: account.accountId,
+              peer: {
+                  kind: chatTypeIsGroup ? 'group' : 'direct',
+                  id: chatId,
+              },
+            });
+
+            const sessionKey = route.sessionKey;
+            console.log(`[${CHANNEL_ID}] chatType: ${chatType}, chatId ${chatId}, senderId: ${senderId}, accountId: ${accountId}, DEFAULT_ACCOUNT_ID: ${DEFAULT_ACCOUNT_ID}, effectiveAccountId: ${effectiveAccountId}`);
+            console.log(`[${CHANNEL_ID}] dispatching to agent session=${sessionKey}`);
 
             const msgCtx: any = {
               Body: text || ' ',
@@ -587,11 +535,13 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
               SessionKey: String(sessionKey).replace(/\//g, '_'),
               AccountId: effectiveAccountId,
               OriginatingChannel: CHANNEL_ID,
-              OriginatingTo: chatTypeIsGroup ? String(groupId) : String(senderId),
+              OriginatingTo: chatId,
               ChatType: chatType,
               Surface: CHANNEL_ID,
               Provider: CHANNEL_ID,
               SenderName: msgUname || String(senderId),
+              MsgUname: msgUname,
+              UserAccount: userAccount,
             };
 
             // Add group-specific fields
@@ -666,7 +616,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
             _sendMsg = defSendMsg;
             if (!abortSignal?.aborted) {
               log?.warn?.(`[${CHANNEL_ID}] WebSocket Restart`);
-              startWebSocket(); // 重启
+              setTimeout(startWebSocket, 10e3); // 10秒后尝试重启
             }
           };
           ws.on('close', () => {

package/src/confs.ts

@@ -0,0 +1,90 @@
+/*** 一些配置字段设定信息 ***/
+const fieldsConf = {
+  enabled: { type: 'boolean', default: true },
+  appId: { type: 'string' } ,
+  appSecret: { type: 'string' },
+  dmPolicy: {
+    type: 'string',
+    default: 'pairing',
+    enum: ['pairing', 'allowlist', 'open', 'disabled'],
+  },
+  allowFrom: {
+    type: 'array',
+    items: { type: 'string' }
+  },
+  groupPolicy: {
+    type: 'string',
+    default: 'allowlist',
+    enum: ['allowlist', 'disabled']
+  },
+  groupAllowFrom: {
+    type: 'array',
+    items: { type: 'string' }
+  },
+};
+
+export const configSchema = {
+  schema: {
+    type: 'object',
+    additionalProperties: false,
+    properties: {
+      ...fieldsConf,
+      /* 基础配置信息中，准备 accounts 配置支持多账户管理，以备后续允许用户配置多个推推机器人账号
+      accounts: {
+        type: 'object',
+        additionalProperties: {
+          type: 'object',
+          additionalProperties: false,
+          properties: { ...fieldsConf },
+        },
+      },*/
+    },
+  },
+  uiHints: {
+    // 基础配置（优先显示）
+    enabled: { order: 1, help: '开启或关闭' },
+    appId: {
+      help: '推推机器人身份 AppId（你可以推推搜索【推推机器人助手】，和它聊天自助申请推推机器人）',
+      order: 2,
+    },
+    appSecret: {
+      help: '推推机器人密钥 Secret（推推机器人的 App Secret）',
+      order: 3,
+    },
+    // 高级配置
+    dmPolicy: {
+      help: '私聊策略（pairing=配对（默认）；allowlist=白名单；open=允许所有（不安全）；disabled=禁用私聊）',
+      order: 10,
+    },
+    allowFrom: {
+      help: '私聊白名单（dmPolicy=allowlist 时生效；pairing 下可用于显式放行用户）',
+      order: 11,
+    },
+    groupPolicy: {
+      help: '群聊策略（allowlist=白名单；disabled=禁用群聊）',
+      order: 12,
+    },
+    groupAllowFrom: {
+      help: '群组白名单（仅在 groupPolicy=allowlist 生效）',
+      order: 13,
+    },
+    /* 基础配置信息中，准备 accounts 配置支持多账户管理，以备后续允许用户配置多个推推机器人账号
+    accounts: {
+      help: 'Accounts（多账户配置）',
+      order: 30,
+      advanced: true
+    },*/
+  },
+};
+
+export const capabilities = {
+  chatTypes: ['direct' as const, 'group' as const],
+  media: true,
+  threads: false,
+  reactions: false,
+  edit: false,
+  unsend: false,
+  reply: true,
+  effects: false,
+  blockStreaming: false,
+};