mu-agent-bridge 1.0.31 → 1.0.32

package/dist/src-ts/plugin-manager.js

@@ -25,6 +25,7 @@ class PluginManager {
     options;
     controlUrl;
     plugins = new Map();
+    upgrades = new Map();
     httpRoutes = new Map();
     root;
     messages = [];
@@ -161,6 +162,22 @@ class PluginManager {
             })]);
     }
     async upgradePackage(id, packageName = `agent-bridge-${id}`, version) {
+        const pending = this.upgrades.get(id);
+        if (pending) {
+            if (pending.packageName === packageName && pending.version === version)
+                return pending.task;
+            throw new agent_1.AgentError("插件正在升级，请等待完成后再请求其他版本");
+        }
+        const task = this.performUpgrade(id, packageName, version);
+        this.upgrades.set(id, { packageName, version, task });
+        try {
+            return await task;
+        }
+        finally {
+            this.upgrades.delete(id);
+        }
+    }
+    async performUpgrade(id, packageName, version) {
         if (!/^agent-bridge-[a-z0-9-]+$/.test(packageName))
             throw new agent_1.AgentError("仅支持 agent-bridge-* npm 包名");
         if (version && !/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(version))

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

@@ -233,6 +233,7 @@ class QwenworkPlugin {
         this.healthTimer = undefined;
         this.state = "stopped";
         this.stopped = true;
+        await this.requestQueue;
         if (this.recovery)
             await this.recovery;
         for (const dispose of this.disposers.splice(0))

package/dist/tests-ts/plugin-manager.test.js

@@ -72,6 +72,41 @@ const channel_sessions_1 = require("../src-ts/channel-sessions");
         await (0, promises_1.rm)(root, { recursive: true, force: true });
     }
 });
+(0, node_test_1.default)("相同插件版本的并发升级只下载和重载一次", async () => {
+    const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-concurrent-update-"));
+    const name = "agent-bridge-demo";
+    const manager = new plugin_manager_1.PluginManager({ pluginsDir: (0, node_path_1.join)(root, "plugins"), stateDir: (0, node_path_1.join)(root, "state"),
+        versions: new version_manager_1.VersionManager({ stateDir: (0, node_path_1.join)(root, "state"), npm: async () => '"1.0.1"' }), publisherResolver: async () => "m2lihui" });
+    let release;
+    const gate = new Promise(resolve => { release = resolve; });
+    let downloads = 0;
+    let results;
+    try {
+        for (const [dir, version] of [[(0, node_path_1.join)(root, "plugins", "demo"), "1.0.0"], [(0, node_path_1.join)(root, "download", "node_modules", name), "1.0.1"]]) {
+            await (0, promises_1.mkdir)(dir, { recursive: true });
+            await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "package.json"), JSON.stringify({ name, version, agentBridge: { plugin: "./plugin.json" } }));
+            await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "plugin.json"), JSON.stringify({ id: "demo", version, entry: "index.js", apiVersion: "1", capabilities: [] }));
+            await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "index.js"), "module.exports={activate:async()=>{},deactivate:async()=>{},health:async()=>({status:'ready'})};");
+        }
+        await manager.discover();
+        await manager.start("demo");
+        manager.downloadPackage = async () => { downloads++; await gate; return (0, node_path_1.join)(root, "download"); };
+        results = Promise.allSettled([manager.upgradePackage("demo", name, "1.0.1"), manager.upgradePackage("demo", name, "1.0.1")]);
+        for (let i = 0; i < 100 && downloads === 0; i++)
+            await new Promise(resolve => setTimeout(resolve, 1));
+        await new Promise(resolve => setTimeout(resolve, 5));
+        strict_1.default.equal(downloads, 1);
+        release();
+        strict_1.default.ok((await results).every(result => result.status === "fulfilled"));
+    }
+    finally {
+        release();
+        await results;
+        if (manager.get("demo")?.instance)
+            await manager.stop("demo");
+        await (0, promises_1.rm)(root, { recursive: true, force: true });
+    }
+});
 (0, node_test_1.default)("随包插件检查独立 npm 更新，升级后重启仍选新副本，失败恢复内置版本", async () => {
     const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-bundled-update-"));
     const stateDir = (0, node_path_1.join)(root, "state");

package/dist/tests-ts/qwenwork-plugin.test.js

@@ -378,6 +378,26 @@ const cdp_client_1 = require("../src-ts/plugins/qwenwork/cdp-client");
         await plugin.deactivate("stop");
     }
 });
+(0, node_test_1.default)("千问停用等待进行中的健康检查，避免重载重复发送心跳", async () => {
+    let release;
+    const plugin = new qwenwork_1.QwenworkPlugin({ httpPort: 0, client: {
+            connect: async () => undefined, close: () => undefined, connected: () => true,
+            send: async () => undefined, direct: async () => "回复",
+            healthCheck: async () => undefined, chatHeartbeat: async () => { await new Promise(resolve => { release = resolve; }); },
+        } });
+    await plugin.activate({ config: {}, dataDir: "." });
+    const internal = plugin;
+    for (let index = 0; index < 100 && !internal.checking; index++)
+        await new Promise(resolve => setTimeout(resolve, 1));
+    const stopping = plugin.deactivate("reload");
+    let finished = false;
+    void stopping.then(() => { finished = true; });
+    await new Promise(resolve => setTimeout(resolve, 5));
+    strict_1.default.equal(finished, false);
+    release();
+    await stopping;
+    strict_1.default.equal(finished, true);
+});
 (0, node_test_1.default)("定时健康检查失败时只执行一次桌面恢复并重新连接", async () => {
     let healthy = false;
     let connected = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mu-agent-bridge",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "description": "将 AUN Agent 连接到本地桌面 AI 客户端的插件平台。",
   "main": "dist/src-ts/cli.js",
   "bin": {

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

@@ -233,6 +233,7 @@ class QwenworkPlugin {
         this.healthTimer = undefined;
         this.state = "stopped";
         this.stopped = true;
+        await this.requestQueue;
         if (this.recovery)
             await this.recovery;
         for (const dispose of this.disposers.splice(0))

package/plugins/qwenwork/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-bridge-qwenwork",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "agent-bridge 的千问办公插件。",
   "keywords": [
     "mu-agent-bridge-plugin",

package/plugins/qwenwork/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "qwenwork",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "type": "agent",
   "displayName": "千问办公",
   "entry": "dist/src-ts/plugins/qwenwork/index.js",