@openbrt/audioctl 0.1.6 → 0.1.7

package/README.md

@@ -52,6 +52,8 @@ npm exec --package @openbrt/audioctl -- audioctl bind 123456 --name codex
 ```
 
 Credentials are saved to `~/.config/weclawbot/audio-mqtt.json` by default.
+`audioctl` serializes concurrent commands that use the same local MQTT
+credentials, because the broker may require an exact MQTT client id.
 
 ## Commands
 

package/agent-plugin.json

@@ -7,6 +7,7 @@
   "description": "Bind and drive WeClawBot-compatible audio, voice, and ambient I/O devices from user-owned AI agents.",
   "transport": "weclawbot.link/mqtt",
   "user_contract": "用户只需要给出设备身份和目标；agent 负责选择合法平台 API、通过 agent 自己的连接器/OAuth/secret store 获取平台身份、构建最小权限脚本/队列、推送到设备 VM、诊断和报告结果。",
+  "runtime_note": "audioctl 会在本机自动串行化同一 MQTT 绑定凭据的并发控制命令，避免多个 agent 工具进程使用同一个 broker client_id 时互相踢下线。",
   "separation_of_concerns": {
     "provisioning": "蓝牙/Wi-Fi 配网只负责设备入网、发现和 weclawbot.link 绑定，不承载音乐平台授权，也不决定设备用途。",
     "music_platform_auth": "音乐平台授权属于 agent 侧能力，由 agent 的连接器、OAuth、secret store 或用户明确提供的运行环境凭据完成。",

package/lib/index.mjs

@@ -719,24 +719,26 @@ export async function publishAudioControl(credentials, control, options = {}) {
     throw new Error("status_topic_missing");
   }
   const timeoutMs = Math.max(1000, Number(options.timeoutMs) || 12_000);
-  const client = connectMqtt(profile, { timeoutMs });
-  try {
-    await onceConnected(client, timeoutMs);
-    if (options.wait === false) {
+  return withMqttClientLock(profile.clientId, timeoutMs, async () => {
+    const client = connectMqtt(profile, { timeoutMs });
+    try {
+      await onceConnected(client, timeoutMs);
+      if (options.wait === false) {
+        await publishJson(client, profile.controlTopic, control);
+        return { ok: true, published: true, applied: null };
+      }
+      await subscribe(client, profile.statusTopic);
+      const statusPromise = waitForStatus(client, {
+        correlationId: control.id,
+        timeoutMs,
+      });
       await publishJson(client, profile.controlTopic, control);
-      return { ok: true, published: true, applied: null };
+      const status = await statusPromise;
+      return { ok: status.kind === "applied", published: true, applied: true, status };
+    } finally {
+      client.end(true);
     }
-    await subscribe(client, profile.statusTopic);
-    const statusPromise = waitForStatus(client, {
-      correlationId: control.id,
-      timeoutMs,
-    });
-    await publishJson(client, profile.controlTopic, control);
-    const status = await statusPromise;
-    return { ok: status.kind === "applied", published: true, applied: true, status };
-  } finally {
-    client.end(true);
-  }
+  });
 }
 
 export function remediationForStatus(status) {
@@ -993,6 +995,48 @@ function waitForStatus(client, options) {
   });
 }
 
+async function withMqttClientLock(clientId, timeoutMs, task) {
+  const lockRoot = path.join(os.tmpdir(), "openbrt-audioctl-locks");
+  await fs.mkdir(lockRoot, { recursive: true, mode: 0o700 });
+  const lockName = crypto
+    .createHash("sha256")
+    .update(String(clientId || "default"))
+    .digest("hex")
+    .slice(0, 24);
+  const lockDirectory = path.join(lockRoot, `${lockName}.lock`);
+  const started = Date.now();
+  while (true) {
+    try {
+      await fs.mkdir(lockDirectory, { mode: 0o700 });
+      break;
+    } catch (error) {
+      if (error?.code !== "EEXIST") throw error;
+      try {
+        const stats = await fs.stat(lockDirectory);
+        if (Date.now() - stats.mtimeMs > Math.max(60_000, timeoutMs * 3)) {
+          await fs.rm(lockDirectory, { recursive: true, force: true });
+          continue;
+        }
+      } catch {
+        // Race with another process removing the lock. Try again.
+      }
+      if (Date.now() - started > timeoutMs) {
+        throw new Error("mqtt_client_busy");
+      }
+      await sleep(120);
+    }
+  }
+  try {
+    return await task();
+  } finally {
+    await fs.rm(lockDirectory, { recursive: true, force: true });
+  }
+}
+
+function sleep(milliseconds) {
+  return new Promise((resolve) => setTimeout(resolve, milliseconds));
+}
+
 function shellToken(value) {
   const text = string(value) || "agent";
   if (/^[A-Za-z0-9_./:@+-]+$/u.test(text)) return text;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openbrt/audioctl",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Generic WeClawBot audio/voice endpoint control CLI and AI-agent plugin.",
   "type": "module",
   "license": "MIT",