qidao-openclaw-plugin 1.1.3 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qidao-openclaw-plugin",
-  "version": "1.1.3",
+  "version": "1.2.2",
   "type": "module",
   "main": "./src/index.js",
   "description": "OpenClaw 栖岛聊天 Channel 插件 - 连接到栖岛聊天服务",

package/src/index.js

@@ -1,14 +1,11 @@
 /**
  * 栖岛聊天 OpenClaw Channel 插件
- * 严格按照官方文档实现: https://docs.openclaw.ai/tools/plugin
  */
 
 import { QidaoChannel } from './qidao-channel.js';
 
-// 存储所有账户的连接实例
-const accountConnections = new Map();
+let connection = null;
 
-// Channel 定义
 const qidaoChannel = {
   id: 'qidao',
   
@@ -16,7 +13,7 @@ const qidaoChannel = {
     id: 'qidao',
     label: '栖岛聊天',
     selectionLabel: '栖岛聊天 (Qidao Chat)',
-    blurb: '连接到栖岛聊天服务，支持实时消息收发',
+    blurb: '连接到栖岛聊天服务',
   },
   
   capabilities: {
@@ -24,48 +21,38 @@ const qidaoChannel = {
   },
   
   config: {
-    listAccountIds: (cfg) => {
-      const accounts = cfg.channels?.qidao?.accounts ?? {};
-      return Object.keys(accounts);
-    },
+    listAccountIds: () => ['default'],
     
-    resolveAccount: (cfg, accountId) => {
-      const accounts = cfg.channels?.qidao?.accounts ?? {};
-      const account = accounts[accountId ?? 'default'];
-      
-      if (!account) {
-        return { accountId };
-      }
+    resolveAccount: (cfg) => {
+      const qidaoConfig = cfg.channels?.qidao ?? {};
       
       return {
-        accountId: accountId ?? 'default',
-        enabled: account.enabled ?? true,
-        chatId: account.chatId,
-        userId: account.userId,
-        serverUrl: account.serverUrl ?? 'wss://oc.qidao.chat/ws',
+        accountId: 'default',
+        enabled: qidaoConfig.enabled ?? false,
+        chatId: qidaoConfig.chatId,
+        userId: qidaoConfig.userId,
+        serverUrl: qidaoConfig.serverUrl ?? 'wss://oc.qidao.chat/ws',
       };
     },
   },
   
-  // 添加 setup 配置向导
-  setup: {
+  onboarding: {
     configure: async ({ cfg, prompter }) => {
-      const accounts = cfg.channels?.qidao?.accounts ?? {};
-      const defaultAccount = accounts.default ?? {};
+      const qidaoConfig = cfg.channels?.qidao ?? {};
       
       const chatId = await prompter.text({
         message: '请输入栖岛 Chat ID:',
-        default: defaultAccount.chatId?.toString(),
+        default: qidaoConfig.chatId?.toString() || '',
       });
       
       const userId = await prompter.text({
         message: '请输入栖岛 User ID (可选):',
-        default: defaultAccount.userId?.toString() || '',
+        default: qidaoConfig.userId?.toString() || '',
       });
       
       const serverUrl = await prompter.text({
         message: '请输入服务器地址:',
-        default: defaultAccount.serverUrl || 'wss://oc.qidao.chat/ws',
+        default: qidaoConfig.serverUrl || 'wss://oc.qidao.chat/ws',
       });
       
       const newCfg = {
@@ -73,14 +60,10 @@ const qidaoChannel = {
         channels: {
           ...cfg.channels,
           qidao: {
-            accounts: {
-              default: {
-                enabled: true,
-                chatId: parseInt(chatId),
-                userId: userId ? parseInt(userId) : undefined,
-                serverUrl,
-              },
-            },
+            enabled: true,
+            chatId: parseInt(chatId),
+            userId: userId ? parseInt(userId) : undefined,
+            serverUrl,
           },
         },
       };
@@ -92,109 +75,82 @@ const qidaoChannel = {
   outbound: {
     deliveryMode: 'direct',
     
-    sendText: async ({ text, accountId, chatId }) => {
-      const connection = accountConnections.get(accountId ?? 'default');
-      
+    sendText: async ({ text, chatId }) => {
       if (!connection || !connection.isConnected()) {
-        return { 
-          ok: false, 
-          error: '未连接到栖岛服务' 
-        };
+        return { ok: false, error: '未连接到栖岛服务' };
       }
       
       if (!chatId) {
-        return {
-          ok: false,
-          error: '未指定chatId'
-        };
+        return { ok: false, error: '未指定chatId' };
       }
       
       try {
         await connection.sendMessage(parseInt(chatId), text);
         return { ok: true };
       } catch (error) {
-        return { 
-          ok: false, 
-          error: error.message 
-        };
+        return { ok: false, error: error.message };
       }
     },
   },
 };
 
-// 插件注册函数
 export default function register(api) {
   api.logger.info('栖岛聊天插件加载中...');
   
-  // 注册 Channel
   api.registerChannel({ plugin: qidaoChannel });
   
-  // 异步初始化连接
   setImmediate(async () => {
     try {
       const cfg = api.getGatewayConfig?.() || {};
-      const accounts = cfg.channels?.qidao?.accounts ?? {};
+      const account = qidaoChannel.config.resolveAccount(cfg);
       
-      for (const [accountId, accountConfig] of Object.entries(accounts)) {
-        if (accountConfig.enabled === false) {
-          api.logger.info(`栖岛账户 ${accountId} 已禁用`);
-          continue;
-        }
-        
-        if (!accountConfig.chatId) {
-          api.logger.warn(`栖岛账户 ${accountId} 缺少chatId配置`);
-          continue;
-        }
-        
-        const serverUrl = accountConfig.serverUrl ?? 'wss://oc.qidao.chat/ws';
-        
-        api.logger.info(`连接栖岛账户: ${accountId} (chatId: ${accountConfig.chatId})`);
-        
-        try {
-          const connection = new QidaoChannel({
-            serverUrl,
-            chatId: accountConfig.chatId,
-            userId: accountConfig.userId,
-          });
-          
-          // 监听连接事件
-          connection.on('connect', () => {
-            api.logger.info(`栖岛账户 ${accountId} 已连接`);
-          });
-          
-          connection.on('disconnect', () => {
-            api.logger.warn(`栖岛账户 ${accountId} 已断开`);
-          });
-          
-          connection.on('error', (error) => {
-            api.logger.error(`栖岛账户 ${accountId} 错误: ${error.message}`);
-          });
-          
-          // 监听栖岛消息，转发给OpenClaw
-          connection.on('message', (message) => {
-            api.logger.debug(`栖岛账户 ${accountId} 收到消息:`, message);
-            
-            if (message.type === 'new_message') {
-              api.ingestMessage({
-                channelId: 'qidao',
-                accountId: accountId,
-                senderId: message.senderId.toString(),
-                senderName: message.senderName,
-                text: message.messageText,
-                timestamp: message.timestamp,
-                chatType: message.chatType === 0 ? 'direct' : 'group',
-                chatId: message.chatId.toString(),
-              });
-            }
+      if (!account.enabled) {
+        api.logger.info('栖岛聊天未启用');
+        return;
+      }
+      
+      if (!account.chatId) {
+        api.logger.warn('栖岛聊天缺少chatId配置');
+        return;
+      }
+      
+      api.logger.info(`连接栖岛聊天 (chatId: ${account.chatId})`);
+      
+      connection = new QidaoChannel({
+        serverUrl: account.serverUrl,
+        chatId: account.chatId,
+        userId: account.userId,
+      });
+      
+      connection.on('connect', () => {
+        api.logger.info('栖岛聊天已连接');
+      });
+      
+      connection.on('disconnect', () => {
+        api.logger.warn('栖岛聊天已断开');
+      });
+      
+      connection.on('error', (error) => {
+        api.logger.error(`栖岛聊天错误: ${error.message}`);
+      });
+      
+      connection.on('message', (message) => {
+        if (message.type === 'new_message') {
+          api.ingestMessage({
+            channelId: 'qidao',
+            accountId: 'default',
+            senderId: message.senderId.toString(),
+            senderName: message.senderName,
+            text: message.messageText,
+            timestamp: message.timestamp,
+            chatType: message.chatType === 0 ? 'direct' : 'group',
+            chatId: message.chatId.toString(),
           });
-          
-          await connection.connect();
-          accountConnections.set(accountId, connection);
-          
-        } catch (error) {
-          api.logger.error(`栖岛账户 ${accountId} 连接失败: ${error.message}`);
         }
-      }
+      });
+      
+      await connection.connect();
+      
     } catch (error) {
       api.logger.error(`栖岛聊天插件初始化失败: ${error.message}`);
     }