qidao-openclaw-plugin 1.3.3 → 1.3.4

package/package.json

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

package/src/index.js

@@ -170,8 +170,164 @@ const qidaoChannel = {
       }
       
       if (!account.chatId) {
-        runtime.log?.('栖岛聊天缺少chatId配置');
-        return;
+        runtime.log?.('');
+        runtime.log?.('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+        runtime.log?.('');
+        runtime.log?.('  📱 栖岛聊天需要配置');
+        runtime.log?.('');
+        runtime.log?.('  正在启动二维码认证...');
+        runtime.log?.('');
+        runtime.log?.('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+        runtime.log?.('');
+        
+        try {
+          // 动态导入认证模块
+          const ws = (await import('ws')).default;
+          const { spawn } = await import('child_process');
+          
+          // 创建临时连接到 Server 进行认证
+          const tempWs = new ws('wss://oc.qidao.chat/ws');
+          
+          const chatId = await new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+              tempWs.close();
+              reject(new Error('连接超时'));
+            }, 10000);
+            
+            tempWs.on('open', () => {
+              clearTimeout(timeout);
+              runtime.log?.('✅ 已连接到认证服务器');
+              runtime.log?.('');
+              
+              // 请求生成二维码
+              tempWs.send(JSON.stringify({ action: 'startAuth' }));
+            });
+            
+            tempWs.on('message', async (data) => {
+              try {
+                const message = JSON.parse(data.toString());
+                
+                // 兼容Server的响应格式
+                if ((message.code === 1 && message.data && message.data.qrUrl) || 
+                    (message.action === 'authStarted')) {
+                  const code = message.data?.code || message.code;
+                  const qrUrl = message.data?.qrUrl || message.qrUrl;
+                  
+                  runtime.log?.('📱 请使用栖岛 APP 扫描二维码：');
+                  runtime.log?.('');
+                  runtime.log?.(`   ${qrUrl}`);
+                  runtime.log?.('');
+                  runtime.log?.('正在打开浏览器...');
+                  runtime.log?.('');
+                  
+                  // 打开浏览器显示二维码
+                  const openCommand = process.platform === 'win32' ? 'start' : 
+                                     process.platform === 'darwin' ? 'open' : 'xdg-open';
+                  spawn(openCommand, [qrUrl], { shell: true, detached: true });
+                  
+                  runtime.log?.('⏳ 等待扫码...');
+                  runtime.log?.('');
+                  
+                  // 开始轮询扫码状态
+                  const pollInterval = setInterval(() => {
+                    tempWs.send(JSON.stringify({ action: 'checkAuthStatus', code }));
+                  }, 2000);
+                  
+                  // 保存轮询定时器以便后续清理
+                  tempWs._pollInterval = pollInterval;
+                  tempWs._code = code;
+                  
+                } else if ((message.code === 1 && message.data && message.data.status) ||
+                           (message.action === 'authStatus')) {
+                  const status = message.data?.status || message.status;
+                  const uid = message.data?.uid || message.uid;
+                  
+                  if (status === 'success') {
+                    runtime.log?.('✅ 扫码成功！');
+                    runtime.log?.('');
+                    
+                    // 请求完成认证获取 chatId
+                    tempWs.send(JSON.stringify({ 
+                      action: 'completeAuth', 
+                      uid, 
+                      code: tempWs._code 
+                    }));
+                    
+                  } else if (status === 'waiting') {
+                    // 继续等待
+                  }
+                  
+                } else if ((message.code === 1 && message.data && message.data.chatId) ||
+                           (message.action === 'authCompleted')) {
+                  // 清理轮询定时器
+                  if (tempWs._pollInterval) {
+                    clearInterval(tempWs._pollInterval);
+                  }
+                  
+                  const receivedChatId = message.data?.chatId || message.chatId;
+                  runtime.log?.(`🎉 认证完成！您的 chatId: ${receivedChatId}`);
+                  runtime.log?.('');
+                  
+                  tempWs.close();
+                  resolve(receivedChatId);
+                  
+                } else if (message.code === 0 || message.action === 'error') {
+                  if (tempWs._pollInterval) {
+                    clearInterval(tempWs._pollInterval);
+                  }
+                  tempWs.close();
+                  const errorMsg = message.msg || message.message || '认证失败';
+                  reject(new Error(errorMsg));
+                }
+              } catch (err) {
+                runtime.error?.('处理消息失败:', err);
+                reject(err);
+              }
+            });
+            
+            tempWs.on('error', (error) => {
+              clearTimeout(timeout);
+              if (tempWs._pollInterval) {
+                clearInterval(tempWs._pollInterval);
+              }
+              reject(error);
+            });
+          });
+          
+          // 自动保存配置
+          runtime.log?.('正在保存配置...');
+          runtime.log?.('');
+          
+          const { execSync } = await import('child_process');
+          execSync(`openclaw config set channels.qidao.chatId ${chatId}`, { stdio: 'inherit' });
+          
+          runtime.log?.('');
+          runtime.log?.('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+          runtime.log?.('');
+          runtime.log?.('  ✅ 配置完成！Gateway 将自动重新连接...');
+          runtime.log?.('');
+          runtime.log?.('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+          runtime.log?.('');
+          
+          // 更新 account 对象
+          account.chatId = chatId;
+          
+        } catch (error) {
+          runtime.error?.('');
+          runtime.error?.('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+          runtime.error?.('');
+          runtime.error?.(`  ❌ 认证失败: ${error.message}`);
+          runtime.error?.('');
+          runtime.error?.('  请运行以下命令重新认证：');
+          runtime.error?.('');
+          runtime.error?.('    openclaw qidao-auth');
+          runtime.error?.('');
+          runtime.error?.('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+          runtime.error?.('');
+          
+          // 抛出错误以停止自动重试
+          throw new Error('栖岛聊天缺少chatId配置，请运行 openclaw qidao-auth 完成认证');
+        }
       }
       
       runtime.log?.(`连接栖岛聊天 (chatId: ${account.chatId})`);
@@ -198,7 +354,6 @@ const qidaoChannel = {
         if (message.type === 'new_message') {
           try {
             // 过滤掉机器人自己发送的消息，避免循环
-            // 栖岛消息中，senderId=1 是畅小猪，otherUserId=175 是机器人
             if (message.senderId === 175 || message.otherUserId === 1) {
               runtime.log?.(`跳过机器人自己的消息`);
               return;
@@ -211,7 +366,6 @@ const qidaoChannel = {
             const chatId = message.chatId.toString();
             const chatType = message.chatType === 0 ? 'direct' : 'group';
             
-            // 解析路由信息
             const route = core.channel.routing.resolveAgentRoute({
               cfg,
               channel: 'qidao',
@@ -222,7 +376,6 @@ const qidaoChannel = {
               },
             });
             
-            // 构建标准消息上下文（参考企业微信插件）
             const ctxPayload = core.channel.reply.finalizeInboundContext({
               Body: message.messageText,
               RawBody: message.messageText,
@@ -243,7 +396,6 @@ const qidaoChannel = {
               CommandAuthorized: true,
             });
             
-            // 使用 core.channel.reply.dispatchReplyWithBufferedBlockDispatcher 处理消息
             await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
               ctx: ctxPayload,
               cfg,
@@ -251,7 +403,6 @@ const qidaoChannel = {
                 deliver: async (payload, info) => {
                   runtime.log?.(`发送回复: ${payload.text.substring(0, 50)}...`);
                   
-                  // 通过 connection 发送回复
                   if (info.kind === 'final') {
                     await connection.sendMessage(message.chatId, payload.text);
                   }
@@ -269,7 +420,6 @@ const qidaoChannel = {
         }
       });
       
-      // 处理中止信号
       if (abortSignal) {
         abortSignal.addEventListener('abort', () => {
           runtime.log?.('栖岛聊天连接被中止');
@@ -282,7 +432,6 @@ const qidaoChannel = {
       
       await connection.connect();
       
-      // 返回 Promise，保持连接直到被中止
       return new Promise((resolve) => {
         if (abortSignal) {
           abortSignal.addEventListener('abort', resolve);