acp-ts 1.1.6 → 1.1.7

package/dist/agentcp.d.ts

@@ -132,6 +132,10 @@ declare class AgentCP implements IAgentCP {
      * 添加群组到本地存储
      */
     addGroupToStore(groupId: string, name: string): void;
+    /**
+     * 将加入的群组注册到 Home AP（内部方法）
+     */
+    registerGroupToHomeAP(groupId: string, groupUrl: string, role?: string): Promise<void>;
     /**
      * 从本地存储删除群组
      */

package/dist/agentcp.js

@@ -412,8 +412,28 @@ class AgentCP {
             onGroupInvite(groupId, groupAddress, invitedBy) {
                 console.log(`[Group][DefaultHandler] onGroupInvite: group=${groupId} address=${groupAddress} invitedBy=${invitedBy}`);
             },
-            onJoinApproved(groupId, groupAddress) {
+            onJoinApproved: (groupId, groupAddress) => {
                 console.log(`[Group][DefaultHandler] onJoinApproved: group=${groupId} address=${groupAddress}`);
+                (async () => {
+                    try {
+                        if (!this.groupOps || !this._groupTargetAid) {
+                            console.warn(`[Group][DefaultHandler] onJoinApproved skipped: groupOps or targetAid not available`);
+                            return;
+                        }
+                        let groupName = groupId;
+                        try {
+                            const info = await this.groupOps.getGroupInfo(this._groupTargetAid, groupId);
+                            groupName = info.name || groupId;
+                        }
+                        catch (_) { }
+                        this.addGroupToStore(groupId, groupName);
+                        const groupUrl = groupAddress || `https://${this._groupTargetAid}/${groupId}`;
+                        await this.registerGroupToHomeAP(groupId, groupUrl);
+                    }
+                    catch (e) {
+                        console.error(`[Group][DefaultHandler] onJoinApproved processing failed: group=${groupId}`, e.message);
+                    }
+                })();
             },
             onJoinRejected(groupId, reason) {
                 console.log(`[Group][DefaultHandler] onJoinRejected: group=${groupId} reason=${reason}`);
@@ -533,6 +553,20 @@ class AgentCP {
             return;
         this.groupMessageStore.getOrCreateGroup(groupId, this._groupTargetAid, name);
     }
+    /**
+     * 将加入的群组注册到 Home AP（内部方法）
+     */
+    async registerGroupToHomeAP(groupId, groupUrl, role = 'member') {
+        if (!this.groupOps || !this._groupTargetAid)
+            return;
+        try {
+            await this.groupOps.registerMembership(this._groupTargetAid, groupId, groupUrl, this._groupTargetAid, this._groupSessionId, role);
+            console.log(`[Group] registerGroupToHomeAP success: group=${groupId}`);
+        }
+        catch (e) {
+            console.error(`[Group] registerGroupToHomeAP failed: group=${groupId}`, e.message);
+        }
+    }
     /**
      * 从本地存储删除群组
      */

package/dist/server.js

@@ -241,6 +241,27 @@ async function ensureGroupClient(instance) {
         },
         onJoinApproved(groupId, groupAddress) {
             console.log(`[Group] onJoinApproved: group=${groupId} address=${groupAddress}`);
+            // 审核通过：获取群信息、添加本地存储、注册到 Home AP
+            (async () => {
+                try {
+                    if (!instance.agentCP.groupOps) {
+                        console.warn(`[Group] onJoinApproved skipped: groupOps not available`);
+                        return;
+                    }
+                    let groupName = groupId;
+                    try {
+                        const info = await instance.agentCP.groupOps.getGroupInfo(instance.groupTargetAid, groupId);
+                        groupName = info.name || groupId;
+                    }
+                    catch (_) { }
+                    instance.agentCP.addGroupToStore(groupId, groupName);
+                    const groupUrl = groupAddress || `https://${instance.groupTargetAid}/${groupId}`;
+                    await instance.agentCP.registerGroupToHomeAP(groupId, groupUrl);
+                }
+                catch (e) {
+                    console.error(`[Group] onJoinApproved processing failed: group=${groupId}`, e.message);
+                }
+            })();
         },
         onJoinRejected(groupId, reason) {
             console.log(`[Group] onJoinRejected: group=${groupId} reason=${reason}`);
@@ -453,19 +474,19 @@ const indexHtml = `<!DOCTYPE html>
         .container { background: white; padding: 32px; border-radius: 12px; box-shadow: 0 4px 20px rgba(0,0,0,0.1); max-width: 560px; width: 100%; }
         h1 { color: #333; margin-bottom: 24px; text-align: center; font-size: 22px; }
         .hint { text-align: center; color: #999; font-size: 13px; margin-bottom: 20px; }
-        .create-section { margin-bottom: 24px; }
-        .create-section .aid-input-row { display: flex; gap: 8px; margin-bottom: 10px; align-items: center; }
+        .create-section { margin-bottom: 24px; display: flex; flex-direction: column; gap: 12px; }
+        .create-section .aid-input-row { display: flex; gap: 8px; align-items: center; }
         .create-section .aid-input-row input { flex: 1; padding: 10px 14px; border: 1px solid #ddd; border-radius: 8px; font-size: 14px; min-width: 0; }
         .create-section .aid-input-row input:focus { outline: none; border-color: #007bff; }
         .create-section .aid-input-row .dot-separator { color: #999; font-size: 16px; flex-shrink: 0; }
-        .create-section .aid-input-row select { 
-            padding: 10px 30px 10px 14px; 
-            border: 1px solid #ddd; 
-            border-radius: 8px; 
-            font-size: 14px; 
-            background: white; 
-            flex-shrink: 0; 
-            cursor: pointer; 
+        .create-section .aid-input-row select {
+            padding: 10px 30px 10px 14px;
+            border: 1px solid #ddd;
+            border-radius: 8px;
+            font-size: 14px;
+            background: white;
+            flex-shrink: 0;
+            cursor: pointer;
             appearance: none;
             -webkit-appearance: none;
             -moz-appearance: none;
@@ -475,6 +496,9 @@ const indexHtml = `<!DOCTYPE html>
             background-size: 10px auto;
         }
         .create-section .aid-input-row select:focus { outline: none; border-color: #007bff; }
+        .create-section .extra-fields { display: flex; gap: 8px; }
+        .create-section .extra-fields input { flex: 1; padding: 10px 14px; border: 1px solid #ddd; border-radius: 8px; font-size: 14px; min-width: 0; }
+        .create-section .extra-fields input:focus { outline: none; border-color: #007bff; }
         .btn { display: block; width: 100%; padding: 12px; border: none; border-radius: 8px; font-size: 15px; cursor: pointer; transition: background 0.2s; }
         .btn-primary { background: #007bff; color: white; }
         .btn-primary:hover { background: #0056b3; }
@@ -520,9 +544,9 @@ const indexHtml = `<!DOCTYPE html>
                 <span class="dot-separator">.</span>
                 <select id="apSelect"></select>
             </div>
-            <div style="display:flex;gap:8px;margin-top:8px;">
-                <input type="text" id="aidNickname" placeholder="昵称（选填）" style="flex:1;padding:8px 12px;border:1px solid #ddd;border-radius:6px;font-size:14px;">
-                <input type="text" id="aidDescription" placeholder="描述（选填）" style="flex:2;padding:8px 12px;border:1px solid #ddd;border-radius:6px;font-size:14px;">
+            <div class="extra-fields">
+                <input type="text" id="aidNickname" placeholder="昵称（选填）">
+                <input type="text" id="aidDescription" placeholder="描述（选填）" style="flex:2;">
             </div>
             <button class="btn btn-primary" onclick="createAid()">注册 AID</button>
         </div>
@@ -901,6 +925,7 @@ const chatHtml = `<!DOCTYPE html>
                 <div class="group-actions">
                     <div class="gbtn" onclick="showCreateGroupModal()">创建群组</div>
                     <div class="gbtn" onclick="showJoinGroupModal()">加入群组</div>
+                    <div class="gbtn" onclick="showMyGroups()">我的群</div>
                 </div>
                 <div class="group-list" id="groupList"><div style="padding:20px;text-align:center;color:#999;font-size:12px;">暂无群组</div></div>
             </div>
@@ -1003,6 +1028,15 @@ const chatHtml = `<!DOCTYPE html>
             </div>
         </div>
     </div>
+    <div class="modal-overlay" id="myGroupsModal">
+        <div class="modal" style="max-width:560px;">
+            <h3>我的群</h3>
+            <div id="myGroupsContent" style="max-height:420px;overflow-y:auto;margin-bottom:16px;font-size:13px;"></div>
+            <div class="modal-btns">
+                <button class="mbtn mbtn-cancel" onclick="hideMyGroupsModal()">关闭</button>
+            </div>
+        </div>
+    </div>
     <script>
         var S = { aid:'', sid:null, sessions:[], status:'disconnected', expanded:{}, sidebarOpen:true, aidList:[], closed:false, tab:'p2p', activeGroupId:null, groups:[], groupMsgs:[], groupTargetAid:'', isGroupCreator:false };
         var D = {};
@@ -1782,6 +1816,39 @@ const chatHtml = `<!DOCTYPE html>
             } catch(e){ alert('退出失败: '+e.message); }
         }
 
+        // ============================================================
+        // 我的群 Functions
+        // ============================================================
+        function showMyGroupsModal(){ $('myGroupsModal').classList.add('show'); }
+        function hideMyGroupsModal(){ $('myGroupsModal').classList.remove('show'); }
+        async function showMyGroups(){
+            showMyGroupsModal();
+            $('myGroupsContent').innerHTML='<div style="text-align:center;padding:20px;color:#999;">加载中...</div>';
+            try {
+                var r=await fetch('/api/group/my-groups');
+                var d=await r.json();
+                if(!d.success){ $('myGroupsContent').innerHTML='<div style="text-align:center;padding:20px;color:#e74c3c;">'+escH(d.error||'获取失败')+'</div>'; return; }
+                var groups=d.groups||[];
+                if(!groups.length){ $('myGroupsContent').innerHTML='<div style="text-align:center;padding:20px;color:#999;">暂无群组</div>'; return; }
+                var html='<table style="width:100%;border-collapse:collapse;font-size:12px;">';
+                html+='<tr style="background:#f8fafc;"><th style="padding:8px 6px;text-align:left;border-bottom:1px solid #e2e8f0;">群名称</th><th style="padding:8px 6px;text-align:left;border-bottom:1px solid #e2e8f0;">群ID</th><th style="padding:8px 6px;text-align:center;border-bottom:1px solid #e2e8f0;">角色</th><th style="padding:8px 6px;text-align:center;border-bottom:1px solid #e2e8f0;">状态</th></tr>';
+                groups.forEach(function(g){
+                    var statusText=g.status===1?'正常':g.status===0?'待审核':'未知('+g.status+')';
+                    var statusColor=g.status===1?'#10b981':g.status===0?'#f59e0b':'#94a3b8';
+                    var shortId=g.group_id.length>16?g.group_id.substring(0,16)+'...':g.group_id;
+                    html+='<tr style="border-bottom:1px solid #f1f5f9;cursor:pointer;" onmouseover="this.style.background=\\'#f0f9ff\\'" onmouseout="this.style.background=\\'\\'">';
+                    html+='<td style="padding:8px 6px;font-weight:500;">'+escH(g.name||g.group_id)+'</td>';
+                    html+='<td style="padding:8px 6px;color:#64748b;" title="'+escH(g.group_id)+'">'+escH(shortId)+'</td>';
+                    html+='<td style="padding:8px 6px;text-align:center;">'+escH(g.role||'-')+'</td>';
+                    html+='<td style="padding:8px 6px;text-align:center;"><span style="color:'+statusColor+';font-weight:500;">'+escH(statusText)+'</span></td>';
+                    html+='</tr>';
+                });
+                html+='</table>';
+                html+='<div style="margin-top:8px;font-size:11px;color:#94a3b8;text-align:right;">共 '+d.total+' 个群组</div>';
+                $('myGroupsContent').innerHTML=html;
+            } catch(e){ $('myGroupsContent').innerHTML='<div style="text-align:center;padding:20px;color:#e74c3c;">请求失败: '+escH(e.message)+'</div>'; }
+        }
+
         // 扩展轮询：群组模式下也轮询群消息
         var _origPoll=poll;
         poll=async function(){
@@ -2389,6 +2456,9 @@ async function handleRequest(req, res) {
                 }
                 catch (_) { }
                 instance.agentCP.addGroupToStore(groupId, groupName);
+                // 注册到 Home AP
+                const registrationUrl = `https://${targetAid}/${groupId}`;
+                await instance.agentCP.registerGroupToHomeAP(groupId, registrationUrl);
                 sendJson(res, { success: true, group_id: groupId });
             }
             else {
@@ -2454,6 +2524,31 @@ async function handleRequest(req, res) {
         }
         return;
     }
+    if (pathname === '/api/group/my-groups' && method === 'GET') {
+        try {
+            const instance = await ensureOnline();
+            await ensureGroupClient(instance);
+            const ops = instance.agentCP.groupOps;
+            const target = instance.groupTargetAid;
+            const result = await ops.listMyGroups(target);
+            // 尝试获取每个群的详细信息（名称等）
+            const groups = [];
+            for (const m of result.groups) {
+                let name = m.group_id;
+                try {
+                    const info = await ops.getGroupInfo(target, m.group_id);
+                    name = info.name || m.group_id;
+                }
+                catch (_) { }
+                groups.push(Object.assign(Object.assign({}, m), { name }));
+            }
+            sendJson(res, { success: true, groups, total: result.total });
+        }
+        catch (e) {
+            sendJson(res, { success: false, error: e.message, groups: [] });
+        }
+        return;
+    }
     if (pathname === '/api/group/leave' && method === 'POST') {
         try {
             const body = await parseBody(req);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acp-ts",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "基于 ACP智能体通信协议 的智能体通信库，提供智能体身份管理和实时通信功能",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",