@bolloon/bolloon-agent 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli.js",

package/src/web/server.ts

@@ -71,6 +71,7 @@ interface SessionMessage {
 
 interface Session {
   channelId: string;
+  sessionId: string;
   messages: SessionMessage[];
   lastUpdated: string;
 }
@@ -103,8 +104,10 @@ async function saveChannels(channels: Channel[]): Promise<void> {
   });
 }
 
-async function loadSession(channelId: string): Promise<Session | null> {
-  const sessionPath = path.join(SESSION_CACHE_PATH, `${channelId}.json`);
+async function loadSession(channelId: string, sessionId?: string): Promise<Session | null> {
+  // sessionId is optional for backward compatibility; if provided, load specific session
+  const key = sessionId ? `${channelId}:${sessionId}` : channelId;
+  const sessionPath = path.join(SESSION_CACHE_PATH, `${key}.json`);
   try {
     const data = await fs.readFile(sessionPath, 'utf-8');
     return JSON.parse(data);
@@ -114,7 +117,8 @@ async function loadSession(channelId: string): Promise<Session | null> {
 }
 
 async function saveSession(session: Session): Promise<void> {
-  const sessionPath = path.join(SESSION_CACHE_PATH, `${session.channelId}.json`);
+  const key = session.sessionId ? `${session.channelId}:${session.sessionId}` : session.channelId;
+  const sessionPath = path.join(SESSION_CACHE_PATH, `${key}.json`);
   await fs.writeFile(sessionPath, JSON.stringify(session, null, 2));
 }
 
@@ -541,6 +545,7 @@ export async function createWebServer(port: number = 3000) {
     // 获取频道信息，包括真实 DID 和完整 DID 文档
     const channels = await loadChannels();
     const channel = channels.find(c => c.id === channelId);
+    const currentSessionId = channel?.currentSessionId || 'default';
     const realChannelDid = channelDid || channel?.did || '';
     const realChannelName = channel?.name || '';
     const realChannelDidDoc = channel?.didDocument;
@@ -568,7 +573,7 @@ export async function createWebServer(port: number = 3000) {
         }
       };
 
-      console.log(`[消息处理] 开始处理用户消息, channelId: ${channelId}`);
+      console.log(`[消息处理] 开始处理用户消息, channelId: ${channelId}, sessionId: ${currentSessionId}`);
 
       // 将真实 DID 作为上下文前缀，让 AI 使用真实的 DID 而不是自己编造的
       const contextHint = realChannelDid ? `[系统上下文] 当前频道名称: ${realChannelName}, 你的真实 DID: ${realChannelDid}\n\n` : '';
@@ -576,8 +581,9 @@ export async function createWebServer(port: number = 3000) {
 
       broadcast({ type: 'ai', content: fullResponse }, channelId);
 
-      const existingSession = await loadSession(channelId);
-      const session: Session = existingSession || { channelId, messages: [], lastUpdated: new Date().toISOString() };
+      const existingSession = await loadSession(channelId, currentSessionId);
+      const session: Session = existingSession || { channelId, sessionId: currentSessionId, messages: [], lastUpdated: new Date().toISOString() };
+      session.sessionId = currentSessionId;
       session.messages.push({ id: crypto.randomUUID(), type: 'user' as const, content: text, timestamp: new Date().toISOString() });
       session.messages.push({ id: crypto.randomUUID(), type: 'ai' as const, content: fullResponse, timestamp: new Date().toISOString() });
       session.lastUpdated = new Date().toISOString();
@@ -707,7 +713,7 @@ app.get('/channels', async (_req, res) => {
       console.log(`[创建频道] 先保存频道 ID: ${id}`);
       channels.push(channel);
       await saveChannels(channels);
-      await saveSession({ channelId: id, messages: [], lastUpdated: new Date().toISOString() });
+      await saveSession({ channelId: id, sessionId: 'default', messages: [], lastUpdated: new Date().toISOString() });
       res.json(channel);
 
       // 后台生成 DID
@@ -907,6 +913,7 @@ app.get('/channels', async (_req, res) => {
     try {
       const channels = await loadChannels();
       const channel = channels.find(c => c.id === channelId);
+      const currentSessionId = channel?.currentSessionId || 'default';
       const realChannelDid = channel?.did || '';
       const realChannelName = channel?.name || '';
       const realChannelDidDoc = channel?.didDocument;
@@ -933,7 +940,7 @@ app.get('/channels', async (_req, res) => {
       broadcast({ type: 'ai', content: fullResponse }, channelId);
 
       // 更新 session
-      const existingSession = await loadSession(channelId);
+      const existingSession = await loadSession(channelId, currentSessionId);
       if (existingSession && existingSession.messages.length > 0) {
         // 移除最后一个 AI 消息，替换为新的
         const lastAiIndex = existingSession.messages.map((m: any) => m.type).lastIndexOf('ai');
@@ -1699,26 +1706,18 @@ app.get('/channels', async (_req, res) => {
         return;
       }
 
-      // 通过 P2P 发送消息
-      if (p2pCommunicator) {
-        const payload = JSON.stringify({
-          from: 'bolloon-web',
-          content: message,
-          timestamp: Date.now()
-        });
-
-        // 找到连接并发送
-        const connections = p2pCommunicator.getConnections();
-        for (const conn of connections) {
-          if (conn.publicKey.includes(targetPeerId) || targetPeerId.includes(conn.publicKey.substring(0, 16))) {
-            conn.send(payload);
-            res.json({ ok: true, sent: true });
-            return;
-          }
+      // 通过 P2P 发送消息（如果可用）
+      try {
+        const comm = p2pCommunicator as any;
+        if (comm && typeof comm.send === 'function') {
+          await comm.send(message, targetPeerId);
+          res.json({ ok: true, sent: true });
+          return;
         }
-      }
+      } catch {}
 
-      res.json({ ok: true, sent: false, message: '对方不在线，消息已加入队列' });
+      // 如果 P2P 不可用，消息已在上面加入队列
+      res.json({ ok: true, queued: true, message: '消息已加入队列，等待对方上线' });
     } catch (err: any) {
       res.status(500).json({ error: err.message });
     }