agent-bridge-aun 1.0.17 → 1.0.19

package/README.md

@@ -7,5 +7,3 @@
 该插件依赖 `@agentunion/fastaun`，要求 Node.js 22.16 或更高版本。
 
 ABWeb 的 AUN 设置只展示已连接 AID，并按来源分组。插件通过 SDK 密钥库枚举 AID，再逐个建立连接；只有连接成功的身份才会显示。EvolCore 来源身份只用于连接状态检测，不订阅消息，避免重复收信；本工程创建的身份负责消息收发。连接状态检测不调用 `ec agent list/show`。将 EvolCore 身份关联到 Agent 时仍使用既有 `ec agent set/reload` 路由配置，该配置不参与连接状态检测。列表先显示已关联 Agent 的身份，各组按最近成功关联的时间倒序排列，时间相同或旧记录没有时间时按 AID 名称排序。关联时间保存在插件配置的 `binding_times` 中，刷新或重启后保留；旧记录不补造时间，再次关联成功后开始记录。
-
-AUN 独立包支持核心后台每五分钟检测更新；可信提供者在自动安装策略下会下载新副本并重载通道。

package/dist/src-ts/plugins/aun/index.js

@@ -10,7 +10,7 @@ const node_url_1 = require("node:url");
 const messages_1 = require("./messages");
 const evolcore_1 = require("./evolcore");
 const manifest = {
-    id: "aun", version: "1.0.17", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.19", type: "channel", displayName: "AUN 通道",
     entry: "dist/src-ts/plugins/aun/index.js", apiVersion: "1", process: "in-process",
     capabilities: ["channel", "channel.identity.create", "channel.receive", "channel.send", "health"],
     configSchema: "config.schema.json",
@@ -72,8 +72,8 @@ class AunPlugin {
             this.creating = true;
             try {
                 if (!this.identities.has(aid)) {
-                    // 创建身份沿用 EvolCore 的 legacy 注册流程。Owner AID 是本地归属配置，
-                    // 只有明确执行 Owner 关系绑定时才进入 aid_register_* 双签流程。
+                    // Owner AID 是本地归属配置；身份签发沿用 EvolCore 的兼容注册流程。
+                    await this.prepareTrustRoots(aid);
                     const result = await this.store.register(aid);
                     if (!result.ok)
                         throw new Error(redact(result.error?.message ?? result.error?.code ?? "AID 注册失败"));
@@ -87,8 +87,9 @@ class AunPlugin {
                     await this.persist();
                     this.context?.logger.info("AUN 身份已创建", { aid, owner });
                 }
-                const connectionError = !this.clients.has(aid) ? await this.connectAid(aid) : undefined;
-                return { aid, status: "已创建", connection: this.clients.has(aid) ? "ready" : "degraded", ...(connectionError ? { connectionError } : {}) };
+                if (!this.clients.has(aid))
+                    await this.connectAid(aid);
+                return { aid, status: "已创建", connection: this.clients.has(aid) ? "ready" : "degraded" };
             }
             finally {
                 this.creating = false;
@@ -221,6 +222,7 @@ class AunPlugin {
     }
     async connectAid(aid) {
         try {
+            await this.prepareTrustRoots(aid);
             const loaded = this.store.load(aid);
             if (!loaded.ok || !loaded.data)
                 throw new Error(loaded.error?.message ?? "本地密钥库中不存在该 AID");
@@ -243,8 +245,7 @@ class AunPlugin {
         catch (error) {
             this.status = "degraded";
             this.healthMessage = safeError(error);
-            this.context?.logger.warn("AUN 通道连接失败", { aid, error: this.healthMessage });
-            return this.healthMessage;
+            this.context?.logger.warn("AUN 通道连接失败", { error: this.healthMessage });
         }
     }
     async deactivate(_reason) {
@@ -272,9 +273,50 @@ class AunPlugin {
         return (0, node_path_1.resolve)(process.env.AUN_HOME ?? process.env.EVOLCORE_HOME ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".evolcore"));
     }
     newStore() {
-        const rootCaPath = typeof this.config.root_ca_path === "string" && this.config.root_ca_path ? this.config.root_ca_path : (0, node_path_1.join)(this.path(), "CA", "root", "root.crt");
+        const rootCaPath = this.rootCaPath();
         return new this.sdk.AIDStore({ aunPath: this.path(), encryptionSeed: typeof this.config.encryption_seed === "string" && this.config.encryption_seed ? this.config.encryption_seed : "evol", verifySsl: typeof this.config.verify_ssl === "boolean" ? this.config.verify_ssl : true, rootCaPath: (0, node_fs_1.existsSync)(rootCaPath) ? rootCaPath : undefined });
     }
+    rootCaPath() {
+        return typeof this.config.root_ca_path === "string" && this.config.root_ca_path
+            ? this.config.root_ca_path
+            : (0, node_path_1.join)(this.path(), "CA", "root", "root.crt");
+    }
+    async prepareTrustRoots(aid) {
+        const rootCaPath = this.rootCaPath();
+        if ((0, node_fs_1.existsSync)(rootCaPath))
+            return;
+        if (!this.sdk?.GatewayDiscovery) {
+            this.context?.logger.warn("AUN SDK 未提供 GatewayDiscovery，无法预先下载信任根", { aid });
+            return;
+        }
+        try {
+            const discovery = new this.sdk.GatewayDiscovery({ verifySsl: typeof this.config.verify_ssl === "boolean" ? this.config.verify_ssl : true });
+            const gatewayUrl = await discovery.discover(`https://${aid}/.well-known/aun-gateway`);
+            const gatewayHttpUrl = gatewayUrl.replace(/^wss?:/i, "https:").replace(/\/aun\/?$/i, "");
+            const response = await fetch(`${gatewayHttpUrl}/pki/chain`, { redirect: "follow", signal: AbortSignal.timeout(10_000) });
+            if (!response.ok)
+                throw new Error(`下载 Gateway CA 链失败：HTTP ${response.status}`);
+            const chain = await response.text();
+            if (!chain.includes("-----BEGIN CERTIFICATE-----"))
+                throw new Error("Gateway CA 链响应中没有证书");
+            await (0, promises_1.mkdir)((0, node_path_1.dirname)(rootCaPath), { recursive: true });
+            await (0, promises_1.writeFile)(rootCaPath, chain, { mode: 0o600 });
+            const oldStore = this.store;
+            const newStore = this.newStore();
+            this.store = newStore;
+            try {
+                await oldStore?.close();
+            }
+            catch (error) {
+                this.context?.logger.warn("关闭旧 AUN Store 失败", { error: safeError(error) });
+            }
+            this.context?.logger.info("AUN Gateway 信任根证书已下载", { aid });
+        }
+        catch (error) {
+            this.context?.logger.warn("AUN Gateway 信任根证书初始化失败", { aid, error: safeError(error) });
+            throw new Error(`AUN Gateway 信任根证书初始化失败：${safeError(error)}`);
+        }
+    }
     createAid = async (request, response) => {
         let input;
         try {

package/dist/src-ts/plugins/aun/public/app.js

@@ -15,12 +15,6 @@
     return result;
   }
   function show(message, failed = false) { status.textContent = message; status.className = failed ? "error" : ""; }
-  function notify(title, message, failed = false) {
-    show(message, failed);
-    if (window.parent !== window) window.parent.postMessage({ type: "mab:operation-result", title, message, failed }, window.location.origin);
-    else window.alert(`${title}\n${message}`);
-  }
-  const errorMessage = (error) => error instanceof Error ? error.message : String(error);
   async function load(refreshForm = true) {
     if (loading) return;
     loading = true;
@@ -37,8 +31,15 @@
         configForm.elements.encryption_seed.value = "";
       }
       list.replaceChildren();
-      const entries = [["本工程 · 已连接", identities.groups.muAgentBridge || []], ["EvolCore · 已连接", identities.groups.evolcore || []]]
-        .flatMap(([label, values], group) => values.map((aid) => ({ aid, label, group, bound: identities.bindings?.[aid] || agents.find((agent) => agent.id && agent.configAid === aid)?.id || "", time: Date.parse(identities.bindingTimes?.[aid] || "") || 0 })));
+      const entries = [];
+      const seen = new Set();
+      for (const [group, label, values] of [[0, "本工程 · 已连接", identities.groups.muAgentBridge || []], [1, "EvolCore · 已连接", identities.groups.evolcore || []]]) {
+        for (const aid of values) {
+          if (seen.has(aid)) continue;
+          seen.add(aid);
+          entries.push({ aid, label, group, bound: identities.bindings?.[aid] || agents.find((agent) => agent.id && agent.configAid === aid)?.id || "", time: Date.parse(identities.bindingTimes?.[aid] || "") || 0 });
+        }
+      }
       entries.sort((a, b) => Number(Boolean(b.bound)) - Number(Boolean(a.bound)) || a.group - b.group || b.time - a.time || a.aid.localeCompare(b.aid));
       for (const { aid, label, bound } of entries) {
           const row = document.createElement("tr");
@@ -49,29 +50,22 @@
           cell.append(select); row.append(cell); list.append(row);
       }
       if (!list.children.length) { const row = document.createElement("tr"); const cell = document.createElement("td"); cell.colSpan = 4; cell.textContent = "暂无已连接 AID"; row.append(cell); list.append(row); }
-      show(`${(identities.groups.evolcore || []).length + (identities.groups.muAgentBridge || []).length} 个已连接 AID`);
+      show(`${entries.length} 个已连接 AID`);
     } catch (error) { show(String(error), true); }
     finally { loading = false; }
   }
   async function bind(aid, pluginId) {
     try {
       await request(`/api/plugins/${encodeURIComponent(pluginId)}/aid`, "PATCH", { aid });
-      await load(); notify("关联成功", `${aid} 已关联 ${pluginId}`);
-    } catch (error) { notify("关联失败", errorMessage(error), true); }
+      await load(); show(`${aid} 已关联 ${pluginId}`);
+    } catch (error) { show(`关联失败：${String(error)}`, true); }
   }
   createForm.onsubmit = (event) => { event.preventDefault(); const aid = createForm.elements.aid.value.trim(); const owner = createForm.elements.ownerAid.value.trim();
-    show("正在创建 AID 并连接，请稍候……");
-    void request("/api/plugins/aun/aid", "POST", { aid, ownerAid: owner }).then((result) => {
-      const failed = result.connection === "degraded";
-      const message = failed ? `${aid} 已创建，但连接失败：${result.connectionError || "未提供连接失败原因，请查看运行日志"}\n身份已经保存在本地，请勿重复注册。`
-        : result.status === "等待 Owner 确认" ? `${aid} 等待 Owner 确认` : `${aid} 已创建并连接`;
-      notify(failed ? "AID 创建完成，连接失败" : "AID 创建结果", message, failed);
-      return load();
-    }).catch((error) => notify("创建 AID 失败", errorMessage(error), true));
+    void request("/api/plugins/aun/aid", "POST", { aid, ownerAid: owner }).then((result) => load().then(() => show(result.status === "等待 Owner 确认" ? `${aid} 等待 Owner 确认` : `${aid} 已创建`))).catch((error) => show(String(error), true));
   };
   configForm.onsubmit = (event) => { event.preventDefault(); const changes = { agent_plugin: configForm.elements.agent_plugin.value, allow_from: configForm.elements.allow_from.value, aun_path: configForm.elements.aun_path.value };
     if (configForm.elements.encryption_seed.value) changes.encryption_seed = configForm.elements.encryption_seed.value;
-    void request("/api/plugins/aun/settings", "POST", changes).then(() => request("/api/plugins/aun/reload", "POST")).then(() => load()).then(() => notify("保存成功", "配置已保存")).catch((error) => notify("保存配置失败", errorMessage(error), true));
+    void request("/api/plugins/aun/settings", "POST", changes).then(() => request("/api/plugins/aun/reload", "POST")).then(() => load()).then(() => show("配置已保存")).catch((error) => show(String(error), true));
   };
   find("#refresh").onclick = () => void load();
   void load();

package/dist/src-ts/plugins/aun/public/index.html

@@ -6,7 +6,7 @@
     <header><h1>AUN 身份</h1><button id="refresh" type="button">刷新</button></header>
     <p id="status" role="status"></p>
     <div class="table-scroll"><table><thead><tr><th>AID</th><th>来源</th><th>已关联 Agent</th><th>操作</th></tr></thead><tbody id="identities"></tbody></table></div>
-    <form id="create-form"><h2>创建 AID</h2><div class="fields"><label>新 AID<input name="aid" required placeholder="例如：example.agentid.cn"></label><label>Owner AID<input name="ownerAid" required placeholder="例如：owner.agentid.cn（本地归属配置）"><small class="hint">Owner AID 用于本地归属和 Agent 关联；创建身份本身沿用 AUN 的普通注册流程</small></label></div><button type="submit">创建</button></form>
+    <form id="create-form"><h2>创建 AID</h2><div class="fields"><label>新 AID<input name="aid" required placeholder="new.agentid.cn"></label><label>Owner AID<input name="ownerAid" required></label></div><button type="submit">创建</button></form>
     <form id="config-form"><h2>通道配置</h2><div class="fields"><label>默认 Agent<select name="agent_plugin"></select></label><label>允许的来源<input name="allow_from"></label><label>AUN 存储路径<input name="aun_path"></label><label>加密种子<input name="encryption_seed" type="password" autocomplete="new-password" placeholder="留空则不修改"></label></div><button type="submit">保存配置</button></form>
   </main>
   <script src="/abweb/channels/aun/app.js"></script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-bridge-aun",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "mu-agent-bridge 的 AUN 通道插件。",
   "keywords": [
     "mu-agent-bridge-plugin",

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "aun",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "type": "channel",
   "displayName": "AUN 通道",
   "entry": "dist/src-ts/plugins/aun/index.js",