From 295693cba50474a441a5a30e9086dd75bc8d25da Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Fri, 22 Sep 2023 07:47:56 +0800
Subject: [PATCH] =?UTF-8?q?[*]=20=E6=97=A5=E5=B8=B8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 taoyao-client-media/src/Taoyao.js             | 21 ++++++++--------
 taoyao-client-web/src/components/Taoyao.js    | 25 +++++++++----------
 .../media/MediaConsumerStatusProtocol.java    |  7 ++++++
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/taoyao-client-media/src/Taoyao.js b/taoyao-client-media/src/Taoyao.js
index 7f35109..aa0c59d 100644
--- a/taoyao-client-media/src/Taoyao.js
+++ b/taoyao-client-media/src/Taoyao.js
@@ -1107,23 +1107,22 @@ class Taoyao {
    * @param {*} body    消息主体
    */
   async mediaConsumerStatus(message, body) {
-    const me = this;
     const {
       roomId,
       consumerId,
     } = body;
-    const room     = me.rooms.get(roomId);
+    const room     = this.rooms.get(roomId);
     const consumer = room?.consumers.get(consumerId);
-    if(consumer) {
-      console.debug("查询消费者状态", consumerId);
-      message.body = {
-        ...body,
-        status: await consumer.getStats()
-      };
-      me.push(message);
-    } else {
-      console.debug("查询消费者状态（无效）", consumerId);
+    if(!consumer) {
+      console.debug("查询消费者状态（消费者无效）", roomId, consumerId);
+      return;
     }
+    console.debug("查询消费者状态", consumerId);
+    message.body = {
+      ...body,
+      status: await consumer.getStats()
+    };
+    this.push(message);
   }
 
   /**
diff --git a/taoyao-client-web/src/components/Taoyao.js b/taoyao-client-web/src/components/Taoyao.js
index 74440d1..a143923 100644
--- a/taoyao-client-web/src/components/Taoyao.js
+++ b/taoyao-client-web/src/components/Taoyao.js
@@ -1697,19 +1697,6 @@ class Taoyao extends RemoteClient {
     }));
   }
 
-  /**
-   * 查询消费者状态信令
-   * 
-   * @param {*} consumerId 消费者ID
-   */
-  async mediaConsumerStatus(consumerId) {
-    const me = this;
-    return await me.request(protocol.buildMessage('media::consumer::status', {
-      roomId: me.roomId,
-      consumerId
-    }));
-  }
-
   /**
    * 消费媒体信令
    * 
@@ -1816,6 +1803,18 @@ class Taoyao extends RemoteClient {
     }
   }
 
+  /**
+   * 查询消费者状态信令
+   * 
+   * @param {*} consumerId 消费者ID
+   */
+  async mediaConsumerStatus(consumerId) {
+    return await this.request(protocol.buildMessage("media::consumer::status", {
+      consumerId,
+      roomId: this.roomId,
+    }));
+  }
+
   /**
    * 消费数据信令
    * 
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerStatusProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerStatusProtocol.java
index a8b6b40..52e56be 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerStatusProtocol.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerStatusProtocol.java
@@ -22,6 +22,13 @@ import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
         "roomId"    : "房间ID",
         "consumerId": "消费者ID"
     }
+    {
+        "roomId"    : "房间ID",
+        "consumerId": "消费者ID",
+        "status"    : [
+            ...状态信息
+        ]
+    }
     """,
     flow = "终端=>信令服务->媒体服务"
 )