小爱支持多台音箱

Author: linyuan.yang

packages/channel.xiaoai/src/XiaoaiAPI.ts

@@ -18,6 +18,12 @@ const MICO_USER_AGENT =
 const DEFAULT_CHUNK_LIMIT = 200;
 const CHUNK_DELAY_MS = 200;
 
+/**
+ * 401 后重新登录的最小间隔。小米 passport 对同一 (userId, deviceId, sid) 只保留最新一份
+ * serviceToken，同一账号被多处登录时会互相挤掉；不限流会形成登录风暴。
+ */
+const REAUTH_MIN_INTERVAL_MS = 30_000;
+
 export enum XiaoaiAuthMode {
   Password = 'password',
   PassToken = 'passToken',
@@ -107,75 +113,109 @@ function chunkText(text: string, limit: number = DEFAULT_CHUNK_LIMIT): string[]
 
 export class XiaoaiAPI {
   private authed?: AuthedAccount;
-  private speakerDeviceId = '';
+  private authing?: Promise<AuthedAccount>;
+  private lastAuthAt = 0;
 
   constructor(private options: XiaoaiAPIOptions) {}
 
-  setSpeakerDeviceId(deviceId: string): void {
-    this.speakerDeviceId = deviceId;
-  }
-
   async getDeviceList(): Promise<MiNADevice[]> {
-    const resp = await axios.get(`${MINA_BASE}/admin/v2/device_list`, {
-      params: { master: 1 },
-      headers: this.minaHeaders(await this.auth()),
+    return this.withAuthRetry(async (account) => {
+      const resp = await axios.get(`${MINA_BASE}/admin/v2/device_list`, {
+        params: { master: 1 },
+        headers: this.minaHeaders(account),
+      });
+      return resp.data?.data ?? [];
     });
-    return resp.data?.data ?? [];
   }
 
   async getConversations(
+    speakerDeviceId: string,
     hardware: string,
     limit = 2,
   ): Promise<MiConversation[]> {
-    if (!this.speakerDeviceId) return [];
-
-    const account = await this.auth();
-    const cookie = `userId=${account.userId}; serviceToken=${account.serviceToken}; deviceId=${this.speakerDeviceId}`;
-    const resp = await axios.get(`${USER_PROFILE_BASE}/device_profile/v2/conversation`, {
-      params: {
-        source: 'dialogu',
-        hardware,
-        limit,
-        requestId: crypto.randomUUID(),
-      },
-      headers: {
-        'User-Agent': MICO_USER_AGENT,
-        Referer: 'https://userprofile.mina.mi.com/dialogue-note/index.html',
-        Cookie: cookie,
-      },
-    });
+    if (!speakerDeviceId) return [];
+
+    return this.withAuthRetry(async (account) => {
+      const cookie = `userId=${account.userId}; serviceToken=${account.serviceToken}; deviceId=${speakerDeviceId}`;
+      const resp = await axios.get(`${USER_PROFILE_BASE}/device_profile/v2/conversation`, {
+        params: {
+          source: 'dialogu',
+          hardware,
+          limit,
+          requestId: crypto.randomUUID(),
+        },
+        headers: {
+          'User-Agent': MICO_USER_AGENT,
+          Referer: 'https://userprofile.mina.mi.com/dialogue-note/index.html',
+          Cookie: cookie,
+        },
+      });
 
-    let payload: any = resp.data?.data;
-    if (typeof payload === 'string') {
-      try {
-        payload = JSON.parse(payload);
-      } catch {
-        return [];
+      let payload: any = resp.data?.data;
+      if (typeof payload === 'string') {
+        try {
+          payload = JSON.parse(payload);
+        } catch {
+          return [];
+        }
       }
-    }
-    return payload?.records ?? [];
+      return payload?.records ?? [];
+    });
   }
 
   async speak(
+    speakerDeviceId: string,
     text: string,
     options?: XiaoaiSpeakOptions,
   ): Promise<void> {
-    if (!this.speakerDeviceId) return;
+    if (!speakerDeviceId) return;
 
     if (options?.volume) {
-      await this.setVolume(this.speakerDeviceId, options.volume);
+      await this.setVolume(speakerDeviceId, options.volume);
     }
 
     const chunks = chunkText(text, options?.chunkLimit ?? DEFAULT_CHUNK_LIMIT);
     for (let i = 0; i < chunks.length; i++) {
       if (i > 0) await sleep(CHUNK_DELAY_MS);
-      await this.textToSpeech(this.speakerDeviceId, chunks[i]);
+      await this.textToSpeech(speakerDeviceId, chunks[i]);
     }
   }
 
+  /**
+   * 请求遇到 401 时作废缓存的 serviceToken、重新登录并重试一次。
+   * 不重试其他错误：轮询侧已有指数退避。
+   */
+  private async withAuthRetry<T>(fn: (account: AuthedAccount) => Promise<T>): Promise<T> {
+    const account = await this.auth();
+    try {
+      return await fn(account);
+    } catch (e: any) {
+      if (e?.response?.status !== 401) throw e;
+      // token 已被其他并发调用换掉 → 直接拿新的重试；仍是同一份才作废重登
+      if (this.authed === account && !this.invalidate()) throw e;
+      return fn(await this.auth());
+    }
+  }
+
+  /** 作废当前 token；距上次登录不足 REAUTH_MIN_INTERVAL_MS 则拒绝，返回是否已作废。 */
+  private invalidate(): boolean {
+    if (Date.now() - this.lastAuthAt < REAUTH_MIN_INTERVAL_MS) return false;
+    this.authed = undefined;
+    return true;
+  }
+
   private async auth(): Promise<AuthedAccount> {
     if (this.authed) return this.authed;
+    // 多台音箱共用同一实例，首次轮询会并发触发登录——去重，只登录一次
+    if (this.authing) return this.authing;
 
+    this.authing = this.login().finally(() => {
+      this.authing = undefined;
+    });
+    return this.authing;
+  }
+
+  private async login(): Promise<AuthedAccount> {
     const { userId, authMode, credential } = this.options;
     const deviceId = this.options.deviceId || randomDeviceId();
     const password = authMode === XiaoaiAuthMode.Password ? credential : '';
@@ -226,6 +266,7 @@ export class XiaoaiAPI {
     const tokenUrl = `${pass.location}&clientSign=${encodeURIComponent(clientSign)}`;
     const serviceToken = await this.resolveServiceToken(tokenUrl);
     this.authed = { userId, serviceToken, deviceId };
+    this.lastAuthAt = Date.now();
     return this.authed;
   }
 
@@ -249,39 +290,34 @@ export class XiaoaiAPI {
   }
 
   private async textToSpeech(speakerDeviceId: string, text: string): Promise<void> {
-    await axios.post(
-      `${MINA_BASE}/remote/ubus`,
-      new URLSearchParams({
-        deviceId: speakerDeviceId,
-        path: 'mibrain',
-        method: 'text_to_speech',
-        message: JSON.stringify({ text, save: 0 }),
-      }).toString(),
-      {
-        headers: {
-          ...this.minaHeaders(await this.auth()),
-          'Content-Type': 'application/x-www-form-urlencoded',
-        },
-      },
-    );
+    await this.ubus(speakerDeviceId, 'mibrain', 'text_to_speech', { text, save: 0 });
   }
 
   private async setVolume(speakerDeviceId: string, volume: number): Promise<void> {
-    await axios.post(
+    await this.ubus(speakerDeviceId, 'mediaplayer', 'player_set_volume', { volume, media: 'app_ios' });
+  }
+
+  private async ubus(
+    speakerDeviceId: string,
+    path: string,
+    method: string,
+    message: Record<string, any>,
+  ): Promise<void> {
+    await this.withAuthRetry((account) => axios.post(
       `${MINA_BASE}/remote/ubus`,
       new URLSearchParams({
         deviceId: speakerDeviceId,
-        path: 'mediaplayer',
-        method: 'player_set_volume',
-        message: JSON.stringify({ volume, media: 'app_ios' }),
+        path,
+        method,
+        message: JSON.stringify(message),
       }).toString(),
       {
         headers: {
-          ...this.minaHeaders(await this.auth()),
+          ...this.minaHeaders(account),
           'Content-Type': 'application/x-www-form-urlencoded',
         },
       },
-    );
+    ));
   }
 
   private passportCookies(deviceId: string, passToken?: string): string {

packages/channel.xiaoai/src/XiaoaiService.ts

@@ -5,10 +5,11 @@ import {
 import { XiaoaiAPI, XiaoaiAuthMode } from './XiaoaiAPI';
 import { MessagePoller, type PollingMessage } from './polling';
 import { XiaoaiSessionHandler } from './XiaoaiSessionHandler';
+import type { MiNADevice } from './types';
 
 export interface XiaoaiMessageArgs extends ChannelMessageArgs {
   accountUserId: string;
-  deviceId: string;
+  /** 音箱在米家里的别名，用于组装 sessionName；deviceID 见继承来的 sessionId */
   deviceName: string;
 }
 
@@ -17,7 +18,8 @@ export interface XiaoaiServiceOptions {
   authMode: XiaoaiAuthMode;
   credential: string;
   loginDeviceId?: string;
-  deviceName: string;
+  /** 要接入的音箱名称/别名/deviceID 列表，一个频道可同时绑定多台 */
+  deviceNames: string[];
   heartbeat: number;
   textChunkLimit: number;
   volume?: number;
@@ -47,48 +49,72 @@ export class XiaoaiService implements IChannelService {
     return new XiaoaiSessionHandler(session, this);
   }
 
-  async sendTextToSession(_sessionId: string, text: string): Promise<void> {
-    await this.api.speak(text, {
+  /** sessionId 就是音箱 deviceID；校验它属于本频道已启动的音箱，避免把库里的历史值当设备用 */
+  async sendTextToSession(sessionId: string, text: string): Promise<void> {
+    if (!this.poller?.hasDevice(sessionId)) {
+      this.logger?.warn(`XiaoAi sendTextToSession: unknown session ${sessionId}`);
+      return;
+    }
+    await this.api.speak(sessionId, text, {
       chunkLimit: this.options.textChunkLimit,
       volume: this.options.volume,
     });
   }
 
   async start(): Promise<void> {
-    const { userId, deviceName } = this.options;
+    const { userId, deviceNames } = this.options;
 
     const allDevices = await this.api.getDeviceList();
+    const available = allDevices
+      .map((d) => (d.alias && d.alias !== d.name ? `${d.name} (${d.alias})` : d.name))
+      .join(', ');
 
-    // 配置值可以是米家里的名称/别名，也可以是 deviceID / miotDID
-    const matches = allDevices.filter(
-      (d) => d.name === deviceName || d.alias === deviceName
-        || d.deviceID === deviceName || d.miotDID === deviceName,
-    );
-    if (matches.length === 0) {
-      const available = allDevices
-        .map((d) => (d.alias && d.alias !== d.name ? `${d.name} (${d.alias})` : d.name))
-        .join(', ');
-      throw new Error(`Device "${deviceName}" not found. Available: ${available}`);
+    // deviceID 去重：多个配置项（名称、别名、deviceID）可能指向同一台音箱
+    const matched = new Map<string, MiNADevice>();
+    const missing: string[] = [];
+    for (const deviceName of deviceNames) {
+      // 配置值可以是米家里的名称/别名，也可以是 deviceID / miotDID
+      const matches = allDevices.filter(
+        (d) => d.name === deviceName || d.alias === deviceName
+          || d.deviceID === deviceName || d.miotDID === deviceName,
+      );
+      if (matches.length === 0) {
+        missing.push(deviceName);
+        continue;
+      }
+      if (matches.length > 1) {
+        this.logger?.warn(
+          `XiaoAi: "${deviceName}" matched ${matches.length} devices, using deviceId=${matches[0].deviceID}. `
+          + '改填 deviceID 可精确指定。',
+        );
+      }
+      matched.set(matches[0].deviceID, matches[0]);
     }
-    const matched = matches[0];
-    if (matches.length > 1) {
+
+    if (matched.size === 0) {
+      throw new Error(`Device "${deviceNames.join('", "')}" not found. Available: ${available}`);
+    }
+    // 部分匹配失败只告警：一台音箱下线/改名不应拖垮同频道其余音箱
+    if (missing.length > 0) {
       this.logger?.warn(
-        `XiaoAi: "${deviceName}" matched ${matches.length} devices, using deviceId=${matched.deviceID}. `
-        + '改填 deviceID 可精确指定。',
+        `XiaoAi: device(s) not found, skipped: "${missing.join('", "')}". Available: ${available}`,
       );
     }
-    const displayName = matched.alias || matched.name || deviceName;
 
     this.poller = new MessagePoller(
       this.api,
       this.options.heartbeat,
       (msg) => this.handleMessage(msg),
       this.logger,
     );
-    this.api.setSpeakerDeviceId(matched.deviceID);
-    this.poller.startDevice(matched.deviceID, displayName, matched.hardware);
+    const started: string[] = [];
+    for (const device of matched.values()) {
+      const displayName = device.alias || device.name || device.deviceID;
+      this.poller.startDevice(device.deviceID, displayName, device.hardware);
+      started.push(`${displayName}(deviceId=${device.deviceID}, hardware=${device.hardware})`);
+    }
     this.logger?.info(
-      `XiaoAi started: userId=${userId}, deviceName=${displayName}, deviceId=${matched.deviceID}, hardware=${matched.hardware}`,
+      `XiaoAi started: userId=${userId}, ${matched.size} device(s): ${started.join(', ')}`,
     );
   }
 
@@ -97,13 +123,11 @@ export class XiaoaiService implements IChannelService {
     const eventId = `xiaoai_${userId}_${msg.deviceId}_${msg.timestamp}`;
     if (!(await this.options.filterEvent(eventId))) return;
 
-    // 用 deviceId 而非名称：音箱在米家里改名后会话不断裂
-    const sessionId = `xiaoai:${userId}:${msg.deviceId}`;
     await this.options.onReceiveMessage(
       {
-        sessionId,
+        // 用 deviceId 而非名称做 sessionId：音箱在米家里改名后会话不断裂
+        sessionId: msg.deviceId,
         accountUserId: userId,
-        deviceId: msg.deviceId,
         deviceName: msg.deviceName,
       },
       msg.text,