[*] 日常优化

acgist · Oct 30, 2023 · 644bb56 · 644bb56
1 parent 720dd02
commit 644bb56
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 37 deletions.
diff --git a/...l-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomManager.java b/...l-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomManager.java
@@ -9,6 +9,7 @@
 
 import com.acgist.taoyao.boot.annotation.Manager;
 import com.acgist.taoyao.boot.config.Constant;
+import com.acgist.taoyao.boot.model.Header;
 import com.acgist.taoyao.boot.model.Message;
 import com.acgist.taoyao.boot.model.MessageCodeException;
 import com.acgist.taoyao.boot.service.IdService;
@@ -76,38 +77,6 @@ public List<RoomStatus> getStatus() {
             .toList();
     }
 
-    /**
-     * 重建房间
-     * 
-     * @param mediaClient 媒体服务终端
-     * @param message     消息
-     */
-    public void recreate(Client mediaClient, Message message) {
-        this.rooms.stream()
-        .filter(room -> mediaClient.getClientId().equals(room.getMediaClient().getClientId()))
-        .forEach(room -> {
-            log.info("重建房间：{}", room.getRoomId());
-            final Message clone = message.cloneWithoutBody();
-            clone.getHeader().setId(this.idService.buildId());
-            clone.setBody(Map.of(Constant.ROOM_ID, room.getRoomId()));
-            // 异步发送防止线程卡死
-            mediaClient.push(clone);
-            // 同步需要添加异步注解
-//          mediaClient.request(clone);
-            // 更新媒体服务
-            room.setMediaClient(mediaClient);
-            if(room.getPassword() != null) {
-                clone.setBody(Map.of(
-                    Constant.ROOM_ID,  room.getRoomId(),
-                    Constant.PASSWORD, room.getPassword()
-                ));
-            }
-            room.getClients().forEach((client, wrapper) -> {
-                client.push(clone);
-            });
-        });
-    }
-
     /**
      * 创建房间
      * 
@@ -123,8 +92,8 @@ public Room create(String name, String password, String mediaClientId, Message m
         if(mediaClient == null) {
             throw MessageCodeException.of("无效媒体服务：" + mediaClientId);
         }
-        final String roomId         = this.idService.buildUuid();
-        final Room room             = new Room(roomId, password, mediaClient, this);
+        final String roomId = this.idService.buildUuid();
+        final Room room = new Room(roomId, password, mediaClient, this);
         final RoomStatus roomStatus = room.getRoomStatus();
         roomStatus.setName(name);
         roomStatus.setRoomId(roomId);
@@ -137,13 +106,46 @@ public Room create(String name, String password, String mediaClientId, Message m
         this.rooms.add(room);
         return room;
     }
+
+    /**
+     * 重建房间
+     * 
+     * @param mediaClient 媒体服务终端
+     * @param message     消息
+     */
+    public void recreate(Client mediaClient, Message message) {
+        this.rooms.stream()
+        .filter(room -> mediaClient.getClientId().equals(room.getMediaClient().getClientId()))
+        .forEach(room -> {
+            log.info("重建房间：{}", room.getRoomId());
+            final Header header = message.getHeader();
+            header.setId(this.idService.buildId());
+            message.setBody(Map.of(Constant.ROOM_ID, room.getRoomId()));
+            // 异步发送防止线程卡死
+            mediaClient.push(message);
+            // 同步需要添加异步注解
+//          mediaClient.request(message);
+            // 更新媒体服务
+            room.setMediaClient(mediaClient);
+            if(room.getPassword() != null) {
+                message.setBody(Map.of(
+                    Constant.ROOM_ID,  room.getRoomId(),
+                    Constant.PASSWORD, room.getPassword()
+                ));
+            }
+            room.getClients().forEach((client, wrapper) -> {
+                client.push(message);
+            });
+        });
+    }
 
     /**
-     * 离开房间
+     * 离开所有房间
      * 
      * @param client 终端
      */
     public void leave(Client client) {
+        log.info("终端离开所有房间：{}", client.getClientId());
         this.rooms.forEach(v -> v.leave(client));
     }
 
@@ -153,6 +155,7 @@ public void leave(Client client) {
      * @param room 房间
      */
     public void remove(Room room) {
+        log.info("移除房间：{}", room.getRoomId());
         this.rooms.remove(room);
     }
 

diff --git a/...al-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/Session.java b/...al-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/Session.java
@@ -45,7 +45,7 @@ public Session(String id, Client source, Client target) {
      * @return 是否通过
      */
     public boolean authenticate(Client client) {
-        return this.source == client || this.target == client;
+        return this.hasClient(client);
     }
 
     /**

diff --git a/...aoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java b/...aoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java
@@ -57,7 +57,6 @@ public RoomCreateProtocol() {
     @Override
     public void onApplicationEvent(MediaServerRegisterEvent event) {
         this.roomManager.recreate(event.getClient(), this.build());
-
     }
 
     @Override