xiaozuoassistant 0.1.93 → 0.1.95

package/bin/cli.js

@@ -164,6 +164,11 @@ function getFlagValue(name) {
 }
 
 function getRegistry() {
+  if (hasFlag('-cn')) {
+    return 'https://registry.npmmirror.com';
+  } else if (hasFlag('-en')) {
+    return 'https://registry.npmjs.org';
+  }
   return getFlagValue('--registry') || process.env.npm_config_registry || 'https://registry.npmjs.org';
 }
 
@@ -804,6 +809,9 @@ if (command === 'start') {
     console.log('  doctor  Check the health and configuration');
     console.log('  version Print package version and environment');
     console.log('  update  Update xiaozuoassistant and auto-restart if running');
+    console.log('    Options:');
+    console.log('      -cn  Use Chinese npm registry (https://registry.npmmirror.com)');
+    console.log('      -en  Use English npm registry (https://registry.npmjs.org)');
     console.log('  remove  Uninstall and delete data in current directory');
     console.log('  export  Backup local data (config, memories) to a file');
     console.log('  import  Restore data from a backup file');

package/dist/server/channels/create-channels.js

@@ -9,7 +9,7 @@ export function createChannels({ app, io, config, pluginManager }) {
         new TerminalChannel(),
         new WebChannel(io),
         ...(config.channels?.telegram?.token ? [new TelegramChannel()] : []),
-        ...(config.channels?.feishu?.appId ? [new FeishuChannel()] : []),
+        ...(config.channels?.feishu ? [new FeishuChannel()] : []),
         ...(config.channels?.dingtalk?.clientId ? [new DingTalkChannel(app)] : []),
         ...(config.channels?.wechat?.enabled ? [new WechatChannel()] : []),
         ...pluginManager.getChannels()

package/dist/server/channels/feishu.js

@@ -5,73 +5,92 @@ export class FeishuChannel extends BaseChannel {
     constructor() {
         super();
         this.name = 'feishu';
-        this.client = null;
-        this.wsClient = null;
-        this.appId = config.channels?.feishu?.appId;
-        this.appSecret = config.channels?.feishu?.appSecret;
+        this.bots = [];
     }
     async start() {
         // 每次 start 时重新读取最新配置，避免使用旧缓存
-        this.appId = config.channels?.feishu?.appId;
-        this.appSecret = config.channels?.feishu?.appSecret;
-        if (!this.appId || !this.appSecret) {
-            console.log('Feishu credentials not configured, skipping Feishu channel.');
+        const feishuConfig = config.channels?.feishu;
+        // 清空现有机器人
+        this.bots = [];
+        // 检查配置是否为数组
+        if (!Array.isArray(feishuConfig) || feishuConfig.length === 0) {
+            console.log('Feishu bots not configured, skipping Feishu channel.');
             return;
         }
-        // Initialize Lark Client for API calls
-        this.client = new lark.Client({
-            appId: this.appId,
-            appSecret: this.appSecret,
-            appType: lark.AppType.SelfBuild,
-            domain: lark.Domain.Feishu,
-        });
-        // Initialize WebSocket Client for receiving events
-        this.wsClient = new lark.WSClient({
-            appId: this.appId,
-            appSecret: this.appSecret,
-        });
-        try {
-            await this.wsClient.start({
-                eventDispatcher: new lark.EventDispatcher({}).register({
-                    'im.message.receive_v1': async (data) => {
-                        const event = data.message;
-                        if (!event || !data.sender)
-                            return;
-                        // Ignore bot messages
-                        if (data.sender.sender_type !== 'user')
-                            return;
-                        try {
-                            const content = JSON.parse(event.content).text;
-                            // Use chat_id for group chats, open_id/user_id for p2p? 
-                            // Actually message.chat_id is universal for where the message comes from.
-                            const sessionId = `feishu:${event.chat_id}`;
-                            this.emitMessage(sessionId, content);
-                        }
-                        catch (e) {
-                            console.error('[Feishu] Failed to parse message content:', e);
+        // 为每个机器人初始化客户端
+        for (const botConfig of feishuConfig) {
+            const { name, appId, appSecret } = botConfig;
+            if (!name || !appId || !appSecret) {
+                console.warn(`Feishu bot ${name || 'unknown'} missing required config, skipping.`);
+                continue;
+            }
+            try {
+                // Initialize Lark Client for API calls
+                const client = new lark.Client({
+                    appId,
+                    appSecret,
+                    appType: lark.AppType.SelfBuild,
+                    domain: lark.Domain.Feishu,
+                });
+                // Initialize WebSocket Client for receiving events
+                const wsClient = new lark.WSClient({
+                    appId,
+                    appSecret,
+                });
+                // Start WebSocket client
+                await wsClient.start({
+                    eventDispatcher: new lark.EventDispatcher({}).register({
+                        'im.message.receive_v1': async (data) => {
+                            const event = data.message;
+                            if (!event || !data.sender)
+                                return;
+                            // Ignore bot messages
+                            if (data.sender.sender_type !== 'user')
+                                return;
+                            try {
+                                const content = JSON.parse(event.content).text;
+                                // Use chat_id for group chats, open_id/user_id for p2p? 
+                                // Actually message.chat_id is universal for where the message comes from.
+                                const sessionId = `feishu:${name}:${event.chat_id}`;
+                                this.emitMessage(sessionId, content);
+                            }
+                            catch (e) {
+                                console.error(`[Feishu-${name}] Failed to parse message content:`, e);
+                            }
                         }
-                    }
-                })
-            });
-            console.log('Feishu Channel Started (WebSocket Mode)');
-        }
-        catch (error) {
-            console.error('[Feishu] Failed to start WebSocket client:', error);
+                    })
+                });
+                this.bots.push({ name, client, wsClient });
+                console.log(`Feishu Bot ${name} Started (WebSocket Mode)`);
+            }
+            catch (error) {
+                console.error(`[Feishu-${name}] Failed to start WebSocket client:`, error);
+            }
         }
     }
     async stop() {
         // There is no explicit stop method for WSClient in the current SDK version exposed clearly,
         // but typically it persists until process exit.
-        // If needed, we can just set clients to null.
-        this.wsClient = null;
-        this.client = null;
+        // If needed, we can just clear the bots array.
+        this.bots = [];
     }
     async send(sessionId, message) {
-        if (!sessionId.startsWith('feishu:') || !this.client)
+        if (!sessionId.startsWith('feishu:'))
+            return;
+        // Parse sessionId: feishu:<botName>:<chatId>
+        const parts = sessionId.split(':');
+        if (parts.length < 3)
             return;
-        const chatId = sessionId.split(':')[1];
+        const botName = parts[1];
+        const chatId = parts[2];
+        // Find the bot client
+        const bot = this.bots.find(b => b.name === botName);
+        if (!bot) {
+            console.error(`Feishu bot ${botName} not found`);
+            return;
+        }
         try {
-            await this.client.im.message.create({
+            await bot.client.im.message.create({
                 params: {
                     receive_id_type: 'chat_id',
                 },
@@ -83,7 +102,7 @@ export class FeishuChannel extends BaseChannel {
             });
         }
         catch (error) {
-            console.error(`Failed to send Feishu message to ${chatId}:`, error);
+            console.error(`[Feishu-${botName}] Failed to send message to ${chatId}:`, error);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaozuoassistant",
-  "version": "0.1.93",
+  "version": "0.1.95",
   "description": "A local-first personal AI assistant with multi-channel support and enhanced memory.",
   "author": "mantle.lau",
   "license": "MIT",