From 96e50a22dbb93928bf3f9dd940f45fdc1647ecda Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Thu, 31 Aug 2023 07:21:15 +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

---
 .../acgist/taoyao/client/signal/Taoyao.java   |  2 +-
 taoyao-client-web/src/components/Taoyao.js    | 65 ++++++++++---------
 .../protocol/room/RoomClientListProtocol.java |  5 +-
 3 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/signal/Taoyao.java b/taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/signal/Taoyao.java
index 05bccd4..20fde80 100644
--- a/taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/signal/Taoyao.java
+++ b/taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/signal/Taoyao.java
@@ -962,7 +962,7 @@ public final class Taoyao implements ITaoyao {
         final String roomId = MapUtils.get(body, "roomId");
         final Room room     = this.rooms.get(roomId);
         if(room == null) {
-            Log.w(Taoyao.class.getSimpleName(), "无效房间：" + roomId);
+            Log.w(Taoyao.class.getSimpleName(), "房间终端列表（无效房间）：" + roomId);
             return;
         }
         room.newRemoteClientFromRoomClientList(body);
diff --git a/taoyao-client-web/src/components/Taoyao.js b/taoyao-client-web/src/components/Taoyao.js
index eff163f..5ee1c13 100644
--- a/taoyao-client-web/src/components/Taoyao.js
+++ b/taoyao-client-web/src/components/Taoyao.js
@@ -2220,7 +2220,6 @@ class Taoyao extends RemoteClient {
       }
     } else {
       me.dataConsumers.forEach(dataConsumer => {
-        console.info(dataConsumer);
         dataConsumer.send(data);
       })
     }
@@ -2242,19 +2241,6 @@ class Taoyao extends RemoteClient {
     }
   }
 
-  /**
-   * @param {*} roomId 房间ID
-   * 
-   * @returns 设备列表
-   */
-  async roomClientList(roomId) {
-    const me       = this;
-    const response = await me.request(protocol.buildMessage("room::client::list", {
-      roomId: roomId || me.roomId
-    }));
-    return response.body;
-  }
-
   /**
    * 房间广播信令
    * 
@@ -2289,23 +2275,6 @@ class Taoyao extends RemoteClient {
     return response.body;
   }
 
-  /**
-   * 房间终端列表信令
-   *
-   * @param {*} message 信令消息
-   */
-  defaultRoomClientList(message) {
-    const me          = this;
-    const { clients } = message.body;
-    clients.forEach((v) => {
-      if (v.clientId === me.clientId) {
-        // 忽略自己
-      } else {
-        me.remoteClients.set(v.clientId, new RemoteClient(v));
-      }
-    });
-  }
-
   /**
    * 媒体回调
    * 
@@ -2849,6 +2818,38 @@ class Taoyao extends RemoteClient {
     }
   }
 
+  /**
+   * 房间终端列表信令
+   * 
+   * @param {*} roomId 房间ID
+   * 
+   * @returns 设备列表
+   */
+  async roomClientList(roomId) {
+    const response = await this.request(protocol.buildMessage("room::client::list", {
+      roomId: roomId || this.roomId
+    }));
+    return response.body;
+  }
+
+  /**
+   * 房间终端列表信令
+   *
+   * @param {*} message 信令消息
+   */
+  defaultRoomClientList(message) {
+    const {
+      clients
+    } = message.body;
+    clients.forEach(v => {
+      if (v.clientId === this.clientId) {
+        // 忽略自己
+      } else {
+        this.remoteClients.set(v.clientId, new RemoteClient(v));
+      }
+    });
+  }
+
   /**
    * 关闭房间信令
    */
@@ -2870,7 +2871,7 @@ class Taoyao extends RemoteClient {
     if (roomId !== this.roomId) {
       return;
     }
-    console.info("关闭房间", roomId);
+    console.debug("关闭房间", roomId);
     this.closeRoomMedia();
   }
 
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListProtocol.java
index 3dae4d2..3263cba 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListProtocol.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListProtocol.java
@@ -53,7 +53,10 @@ import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
         ]
         """
     },
-    flow = "终端=>信令服务->终端"
+    flow = {
+        "终端=>信令服务->终端",
+        "终端=[进入房间]>信令服务->终端",
+    }
 )
 public class RoomClientListProtocol extends ProtocolRoomAdapter implements ApplicationListener<RoomEnterEvent> {