From e8ae344d1145e62445cdb779905d63f691494abb Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Sun, 12 Feb 2023 13:13:17 +0800
Subject: [PATCH] =?UTF-8?q?[+]=20=E6=88=BF=E9=97=B4=E7=A9=BF=E8=82=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   4 +
 taoyao-client-web/src/App.vue                 |  12 +-
 taoyao-client-web/src/components/Config.js    |   3 +-
 .../src/components/SettingRoom.vue            |  18 +-
 .../src/components/SettingSignal.vue          |   2 +-
 taoyao-client-web/src/components/Taoyao.js    |  76 +++---
 taoyao-media-server/src/Config.js             |   4 +-
 taoyao-media-server/src/Server.js             |  52 ++--
 taoyao-media-server/src/Signal.js             | 238 ++++++++++++++++--
 taoyao-signal-server/README.md                |  22 --
 .../com/acgist/taoyao/boot/model/Header.java  |   7 +-
 .../taoyao/boot/property/MediaProperties.java |  10 +
 ...erties.java => MediaServerProperties.java} |   2 +-
 .../taoyao/boot/property/NodeProperties.java  |  47 ----
 .../boot/property/TaoyaoProperties.java       |   6 -
 .../boot/property/WebrtcProperties.java       |  17 --
 .../src/main/resources/application-dev.yml    |   6 +-
 .../src/main/resources/application-local.yml  |  12 +
 .../src/main/resources/application.yml        |  52 ++--
 taoyao-signal-server/taoyao-signal/README.md  |  18 +-
 .../acgist/taoyao/signal/client/Client.java   |  18 +-
 .../taoyao/signal/client/ClientAdapter.java   |  25 +-
 .../taoyao/signal/client/ClientManager.java   |  58 +++--
 .../taoyao/signal/client/ClientStatus.java    |   2 +-
 .../config/SignalAutoConfiguration.java       |   8 +-
 .../signal/controller/ClientController.java   |   6 +
 .../signal/controller/RoomController.java     |   6 +-
 .../signal/event/room/RoomCreateEvent.java    |   6 +-
 .../listener/ApplicationListenerAdapter.java  |   4 +-
 .../listener/room/RoomCreateListener.java     |  11 +-
 .../listener/room/RoomEnterListener.java      |  15 +-
 .../MediaClient.java}                         |  49 ++--
 .../MediaClientManager.java}                  |  16 +-
 .../signal/{mediasoup => media}/Peer.java     |   2 +-
 .../signal/{mediasoup => media}/Stream.java   |   6 +-
 .../{mediasoup => media}/Transport.java       |   2 +-
 .../taoyao/signal/mediasoup/Router.java       |  33 ---
 .../taoyao/signal/protocol/Constant.java      |  18 +-
 .../signal/protocol/ProtocolAdapter.java      |   4 +-
 .../signal/protocol/ProtocolManager.java      |   7 +-
 .../protocol/ProtocolMediaRoomAdapter.java    |  92 +++++++
 .../client/ClientBroadcastProtocol.java       |   4 +-
 .../client/ClientRegisterProtocol.java        |   5 +-
 .../protocol/client/ClientStatusProtocol.java |   1 +
 .../media/AudioActiveSpeakerProtocol.java     |  36 +++
 .../media/DisplayNameChangeProtocol.java      |   5 -
 .../protocol/media/MediaListProtocol.java     |   6 +-
 .../protocol/media/MediaRebootProtocol.java   |   2 +-
 .../protocol/media/MediaRegisterProtocol.java |  10 +-
 .../media/RouterRtpCapabilitiesProtocol.java  |  36 +++
 .../media/WebRtcTransportConnectProtocol.java |   5 +
 .../com/acgist/taoyao/signal/room/Room.java   |  55 +++-
 .../taoyao/signal/room/RoomManager.java       |  48 ++--
 .../acgist/taoyao/signal/room/RoomStatus.java |   2 +-
 .../service/impl/SecurityServiceImpl.java     |   4 -
 55 files changed, 788 insertions(+), 427 deletions(-)
 rename taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/{MediasoupProperties.java => MediaServerProperties.java} (97%)
 delete mode 100644 taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/NodeProperties.java
 create mode 100644 taoyao-signal-server/taoyao-server/src/main/resources/application-local.yml
 rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/{mediasoup/MediasoupClient.java => media/MediaClient.java} (87%)
 rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/{mediasoup/MediasoupClientManager.java => media/MediaClientManager.java} (65%)
 rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/{mediasoup => media}/Peer.java (93%)
 rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/{mediasoup => media}/Stream.java (90%)
 rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/{mediasoup => media}/Transport.java (91%)
 delete mode 100644 taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Router.java
 create mode 100644 taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolMediaRoomAdapter.java
 create mode 100644 taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/AudioActiveSpeakerProtocol.java
 delete mode 100644 taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/DisplayNameChangeProtocol.java
 create mode 100644 taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/RouterRtpCapabilitiesProtocol.java

diff --git a/README.md b/README.md
index 5149a78..1e6ec82 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,10 @@
 
 > 注意：只有Web实现完成信令控制，桌面还有安卓仅仅实现媒体收发。
 
+## 模式
+
+监控模式、直播模式、会议模式、屏幕共享模式
+
 ## 部署
 
 [部署文档](./docs/Deploy.md)
diff --git a/taoyao-client-web/src/App.vue b/taoyao-client-web/src/App.vue
index 7b3d2bc..ce548ef 100644
--- a/taoyao-client-web/src/App.vue
+++ b/taoyao-client-web/src/App.vue
@@ -1,7 +1,7 @@
 <!-- 桃夭 -->
 <template>
-  <SettingRoom :roomVisible="roomVisible" :taoyao="taoyao"></SettingRoom>
-  <SettingSignal :signalVisible="signalVisible" @connectSignal="connectSignal"></SettingSignal>
+  <SettingRoom :roomVisible="roomVisible" :taoyao="taoyao" @buildMedia="buildMedia"></SettingRoom>
+  <SettingSignal :signalVisible="signalVisible" @buildSignal="buildSignal"></SettingSignal>
 </template>
 
 <script>
@@ -26,10 +26,14 @@ export default {
     this.logger.info("桃夭终端开始启动");
   },
   methods: {
-    connectSignal: function() {
+    buildSignal: function() {
       let self = this;
       self.signalVisible = false;
-      self.taoyao.buildChannel(self.callback);
+      self.taoyao.buildSignal(self.callback);
+    },
+    buildMedia: function(roomId) {
+      let self = this;
+      self.taoyao.buildMedia(roomId);
     },
     /**
      * 信令回调
diff --git a/taoyao-client-web/src/components/Config.js b/taoyao-client-web/src/components/Config.js
index 9b55777..cd4cdea 100644
--- a/taoyao-client-web/src/components/Config.js
+++ b/taoyao-client-web/src/components/Config.js
@@ -28,6 +28,8 @@ const config = {
   video: {},
   // WebRTC配置
   webrtc: {},
+  // 媒体服务配置
+  mediaServerList: [],
 };
 
 /**
@@ -63,7 +65,6 @@ const protocol = {
       header: {
         v: config.version,
         id: id || this.buildId(),
-        sn: config.sn,
         signal: signal,
       },
       body: body,
diff --git a/taoyao-client-web/src/components/SettingRoom.vue b/taoyao-client-web/src/components/SettingRoom.vue
index 8d4a0ce..c498a23 100644
--- a/taoyao-client-web/src/components/SettingRoom.vue
+++ b/taoyao-client-web/src/components/SettingRoom.vue
@@ -23,12 +23,12 @@
         </el-tab-pane>
         <el-tab-pane label="创建房间" name="create">
           <el-form-item label="媒体服务">
-            <el-select v-model="room.mediasoup" placeholder="媒体服务">
+            <el-select v-model="room.mediaName" placeholder="媒体服务">
               <el-option
-                v-for="mediasoup in config.webrtc.mediasoupList"
-                :key="mediasoup.name"
-                :label="mediasoup.name"
-                :value="mediasoup.name"
+                v-for="value in config.mediaServerList"
+                :key="value.name"
+                :label="value.name"
+                :value="value.name"
               />
             </el-select>
           </el-form-item>
@@ -78,22 +78,24 @@ export default {
       this.rooms = response.body;
     },
     async setting() {
+      let roomId;
       this.localVisible = false;
       if (this.activeName === "enter") {
+        roomId = this.room.id;
         await this.taoyao.request(
           protocol.buildMessage("room::enter", {
-            sn: config.sn,
             ...this.room,
           })
         );
       } else {
-        await this.taoyao.request(
+        let response = await this.taoyao.request(
           protocol.buildMessage("room::create", {
-            sn: config.sn,
             ...this.room,
           })
         );
+        roomId = response.body.id;
       }
+      this.$emit("buildMedia", roomId);
     },
   },
 };
diff --git a/taoyao-client-web/src/components/SettingSignal.vue b/taoyao-client-web/src/components/SettingSignal.vue
index 175cd0c..c989fdb 100644
--- a/taoyao-client-web/src/components/SettingSignal.vue
+++ b/taoyao-client-web/src/components/SettingSignal.vue
@@ -46,7 +46,7 @@ export default {
   methods: {
     setting: function () {
       this.localVisible = false;
-      this.$emit("connectSignal");
+      this.$emit("buildSignal");
     },
   },
 };
diff --git a/taoyao-client-web/src/components/Taoyao.js b/taoyao-client-web/src/components/Taoyao.js
index e860a2a..e98051d 100644
--- a/taoyao-client-web/src/components/Taoyao.js
+++ b/taoyao-client-web/src/components/Taoyao.js
@@ -3,7 +3,7 @@
  */
 import { Logger } from "./Logger.js";
 import { TaoyaoClient } from "./TaoyaoClient.js";
-import * as mediasoupClient from 'mediasoup-client';
+import * as mediasoupClient from "mediasoup-client";
 import {
   config,
   protocol,
@@ -93,7 +93,8 @@ const signalChannel = {
         const battery = await navigator.getBattery();
         self.push(
           protocol.buildMessage("client::register", {
-            ip: 'localhost',
+            ip: "localhost",
+            sn: config.sn,
             signal: 100,
             battery: battery.level * 100,
             charging: battery.charging,
@@ -183,7 +184,7 @@ const signalChannel = {
   },
   /**
    * 异步请求
-   * 
+   *
    * @param {*} data 消息内容
    * @param {*} callback 注册回调
    */
@@ -198,12 +199,12 @@ const signalChannel = {
   },
   /**
    * 同步请求
-   * 
+   *
    * @param {*} data 消息内容
-   * 
+   *
    * @returns Promise
    */
-  request: async function(data) {
+  request: async function (data) {
     let self = this;
     return new Promise((resolve, reject) => {
       let callback = false;
@@ -217,7 +218,7 @@ const signalChannel = {
       self.channel.send(JSON.stringify(data));
       // 设置超时
       setTimeout(() => {
-        if(!callback) {
+        if (!callback) {
           reject("请求超时", data);
         }
       }, 5000);
@@ -244,6 +245,9 @@ const signalChannel = {
       case "client::config":
         self.defaultClientConfig(data);
         break;
+      case "client::reboot":
+        self.defaultClientReboot(data);
+        break;
       case "client::register":
         logger.info("桃夭终端注册成功");
         break;
@@ -258,10 +262,11 @@ const signalChannel = {
    * @param {*} data 消息内容
    */
   defaultClientConfig: function (data) {
-    config.webrtc = data.body.webrtc;
     config.audio = { ...config.defaultAudioConfig, ...data.body.media.audio };
     config.video = { ...config.defaultVideoConfig, ...data.body.media.video };
-    logger.info("终端配置", config.audio, config.video, config.webrtc);
+    config.webrtc = data.body.webrtc;
+    config.mediaServerList = data.body.media.mediaServerList;
+    logger.info("终端配置", config.audio, config.video, config.webrtc, config.mediaServerList);
   },
   /**
    * 默认终端重启回调
@@ -308,9 +313,9 @@ class Taoyao {
   // 视频生产者
   videoProducer = null;
   // 消费者
-	consumers = new Map();
+  consumers = new Map();
   // 数据消费者
-	dataConsumers = new Map();
+  dataConsumers = new Map();
 
   /**
    * 打开信令通道
@@ -319,45 +324,54 @@ class Taoyao {
    *
    * @returns
    */
-  buildChannel = async function (callback) {
+   buildSignal = async function (callback) {
     signalChannel.taoyao = this;
     this.signalChannel = signalChannel;
     // 不能直接this.push = this.signalChannel.push这样导致this对象错误
     this.push = function (data, pushCallback) {
       this.signalChannel.push(data, pushCallback);
     };
-    this.request = async function(data) {
+    this.request = async function (data) {
       return await this.signalChannel.request(data);
-    }
+    };
     return this.signalChannel.connect(config.signal(), callback);
   };
-  /**
-   * 设置本地媒体
-   */
-  buildLocal = function() {
-    new mediasoupClient.Device();
-  };
   /**
    * 打开媒体通道
+   * navigator.mediaDevices.getDisplayMedia();
    */
-  buildMediaTransport = function() {
+  buildMedia = async function (roomId) {
     let self = this;
     // 释放资源
-    self.close();
-
+    self.closeMedia();
+    self.mediasoupDevice = new mediasoupClient.Device();
+    const response = await this.request(protocol.buildMessage(
+      "router::rtp::capabilities",
+      { roomId }
+    ));
+    const routerRtpCapabilities = response.body;
+    console.log(self.mediasoupDevice);
+    console.log(routerRtpCapabilities);
+  };
+  /**
+   * 关闭媒体
+   */
+  closeMedia = function() {
+    let self = this;
+    if (self.sendTransport) {
+      self.sendTransport.close();
+    }
+    if (self.recvTransport) {
+      self.recvTransport.close();
+    }    
   }
   /**
    * 关闭
    */
-  close = function() {
+  close = function () {
     let self = this;
-    if(self.sendTransport) {
-      self.sendTransport.close();
-    }
-    if(self.recvTransport) {
-      self.recvTransport.close();
-    }
-    if(self.signalChannel) {
+    self.closeMedia();
+    if (self.signalChannel) {
       self.signalChannel.close();
     }
   };
diff --git a/taoyao-media-server/src/Config.js b/taoyao-media-server/src/Config.js
index 38703e2..5793c49 100644
--- a/taoyao-media-server/src/Config.js
+++ b/taoyao-media-server/src/Config.js
@@ -6,6 +6,7 @@ const os = require("os");
 module.exports = {
   // 服务名称
   name: "taoyao-media-server",
+  version: "1.0.0",
   // 交互式命令行
   command: true,
   // 日志级别
@@ -30,7 +31,8 @@ module.exports = {
     workerSize: Object.keys(os.cpus()).length,
     // Worker：https://mediasoup.org/documentation/v3/mediasoup/api/#WorkerSettings
     workerSettings: {
-      logLevel: "info",
+      // 级别：debug | warn | error | none
+      logLevel: "warn",
       logTags: [
         "bwe",
         "ice",
diff --git a/taoyao-media-server/src/Server.js b/taoyao-media-server/src/Server.js
index e50e6e1..abc5812 100644
--- a/taoyao-media-server/src/Server.js
+++ b/taoyao-media-server/src/Server.js
@@ -3,10 +3,19 @@
 const fs = require("fs");
 const ws = require("ws");
 const https = require("https");
-// const mediasoup = require("mediasoup");
+const mediasoup = require("mediasoup");
 const config = require("./Config");
 const Logger = require("./Logger");
 const Signal = require("./Signal");
+const { fail } = require("assert");
+
+// 线程名称
+process.title = config.name;
+
+// 无效信令终端列表
+const clients = [];
+// Mediasoup Worker列表
+const mediasoupWorkers = [];
 
 // HTTPS server
 let httpsServer;
@@ -15,18 +24,12 @@ let webSocketServer;
 // 日志
 const logger = new Logger();
 // 信令
-const signal = new Signal();
-// 无效信令终端列表
-const client = [];
-// Mediasoup Worker列表
-const mediasoupWorker = [];
-// 配置名称
-process.title = config.name;
+const signal = new Signal(mediasoupWorkers);
 
 /**
  * 启动Mediasoup Worker
  */
-async function buildMediasoupWorker() {
+async function buildMediasoupWorkers() {
   const { workerSize } = config.mediasoup;
   logger.info("启动Mediasoup Worker", workerSize);
   for (let i = 0; i < workerSize; i++) {
@@ -43,11 +46,11 @@ async function buildMediasoupWorker() {
       setTimeout(() => process.exit(1), 2000);
     });
     // 加入Worker队列
-    mediasoupWorker.push(worker);
+    mediasoupWorkers.push(worker);
     // 配置WebRTC服务
     if (process.env.MEDIASOUP_USE_WEBRTC_SERVER !== "false") {
       // 配置Worker端口
-      const portIncrement = mediasoupWorker.length - 1;
+      const portIncrement = mediasoupWorkers.length - 1;
       const webRtcServerOptions = JSON.parse(
         JSON.stringify(config.mediasoup.webRtcServerOptions)
       );
@@ -85,7 +88,7 @@ async function buildSignalServer() {
     logger.info("打开信令通道", session._socket.remoteAddress);
     session.datetime = Date.now();
     session.authorize = false;
-    client.push(session);
+    clients.push(session);
     session.on("close", (code) => {
       logger.info("关闭信令通道", session._socket.remoteAddress, code);
     });
@@ -93,11 +96,11 @@ async function buildSignalServer() {
       logger.error("信令通道异常", session._socket.remoteAddress, error);
     });
     session.on("message", (message) => {
-      logger.debug("处理信令消息", message);
+      logger.debug("处理信令消息", message.toString());
       try {
         signal.on(JSON.parse(message), session);
       } catch (error) {
-        logger.error("处理信令消息异常", message, error);
+        logger.error("处理信令消息异常", message.toString(), error);
       }
     });
   });
@@ -117,18 +120,23 @@ async function buildSignalServer() {
 async function buildClientInterval() {
   setInterval(() => {
     const datetime = Date.now();
-    const oldLength = client.length;
-    for (let i = 0; i < client.length; i++) {
-      const session = client[i];
+    let failSize = 0;
+    let successSize = 0;
+    for (let i = 0; i < clients.length; i++) {
+      const session = clients[i];
       // 超过五秒自动关闭
       if (datetime - session.datetime >= 5000) {
-        client.splice(i, 1);
-        session.close();
+        clients.splice(i, 1);
+        if(session.authorize) {
+          successSize++;
+        } else {
+          failSize++;
+          session.close();
+        }
         i--;
       }
     }
-    const newLength = client.length;
-    logger.info("定时清理无效信令终端", oldLength - newLength);
+    logger.info("定时清理无效信令终端", failSize, successSize, clients.length);
   }, 60 * 1000);
 }
 
@@ -170,7 +178,7 @@ async function buildCommandConsole() {
 async function main() {
   logger.debug("DEBUG").info("INFO").warn("WARN").error("ERROR");
   logger.info("开始启动", config.name);
-  // await buildMediasoupWorker();
+  await buildMediasoupWorkers();
   await buildSignalServer();
   await buildClientInterval();
   await buildCommandConsole();
diff --git a/taoyao-media-server/src/Signal.js b/taoyao-media-server/src/Signal.js
index a857f2a..33fa594 100644
--- a/taoyao-media-server/src/Signal.js
+++ b/taoyao-media-server/src/Signal.js
@@ -1,21 +1,146 @@
 const Logger = require("./Logger");
+const config = require("./Config");
+
+/**
+ * 信令协议
+ */
+ const protocol = {
+  // 当前索引
+  index: 100000,
+  // 最小索引
+  minIndex: 100000,
+  // 最大索引
+  maxIndex: 999999,
+  /**
+   * @returns 索引
+   */
+  buildId: function () {
+    if (this.index++ >= this.maxIndex) {
+      this.index = this.minIndex;
+    }
+    return Date.now() + "" + this.index;
+  },
+  /**
+   * 生成信令消息
+   *
+   * @param {*} signal 信令标识
+   * @param {*} roomId 房间标识
+   * @param {*} body 信令消息
+   * @param {*} id ID
+   *
+   * @returns 信令消息
+   */
+  buildMessage: function (signal, roomId, body = {}, id) {
+    let message = {
+      header: {
+        v: config.version,
+        id: id || this.buildId(),
+        signal: signal,
+      },
+      body: {
+        roomId,
+        ...body
+      },
+    };
+    return message;
+  },
+};
+
+/**
+ * 房间
+ */
+class Room {
+
+  // 是否关闭
+  close = false;
+  // 房间ID
+  roomId = null;
+  // 网络节流
+  networkThrottled = false;
+  // 信令
+  signal = null;
+  // WebRTCServer
+  webRtcServer = null;
+  // 路由
+  mediasoupRouter = null;
+  // 音频监控
+  audioLevelObserver = null;
+  // 音频监控
+  activeSpeakerObserver = null;
+
+  constructor({
+    roomId,
+    signal,
+    webRtcServer,
+    mediasoupRouter,
+    audioLevelObserver,
+    activeSpeakerObserver
+  }) {
+    this.close = false;
+    this.roomId = roomId;
+    this.networkThrottled = false;
+    this.signal = signal;
+    this.webRtcServer = webRtcServer;
+    this.mediasoupRouter = mediasoupRouter;
+    this.audioLevelObserver = audioLevelObserver;
+    this.activeSpeakerObserver = activeSpeakerObserver;
+    this.handleAudioLevelObserver();
+    this.handleActiveSpeakerObserver();
+  }
+
+  handleAudioLevelObserver() {
+    // 声音
+    this.audioLevelObserver.on("volumes", (volumes) => {
+      for(const value of volumes) {
+        const { producer, volume } = value;
+        this.signal.push(protocol.buildMessage(
+          "audio::active::speaker",
+          this.roomId,
+          {
+            peerId: producer.appData.peerId,
+            volume: volume
+          }
+        ));
+      }
+    });
+    // 静音
+    this.audioLevelObserver.on('silence', () => {
+      this.signal.push(protocol.buildMessage(
+        "audio::active::speaker",
+        this.roomId,
+        {
+          peerId: null
+        }
+      ));
+    });
+  }
+
+  handleActiveSpeakerObserver() {
+    this.activeSpeakerObserver.on('dominantspeaker', (dominantSpeaker) => {
+      logger.debug("dominantspeaker", dominantSpeaker.producer.id);
+    });
+  }
+
+}
 
 /**
  * 信令
  */
 class Signal {
 
+  // 房间列表
+  rooms = new Map();
   // 信令终端列表
-  client = [];
+  clients = [];
   // 日志
   logger = new Logger();
   // Mediasoup Worker列表
-  mediasoupWorker = [];
+  mediasoupWorkers = [];
   // Mediasoup Worker索引
   nextMediasoupWorkerIndex = 0;
 
-  constructor(mediasoupWorker) {
-    this.mediasoupWorker = mediasoupWorker;
+  constructor(mediasoupWorkers) {
+    this.mediasoupWorkers = mediasoupWorkers;
   }
 
   /**
@@ -33,7 +158,7 @@ class Signal {
         message?.body?.password === config.https.password
       ) {
         this.logger.debug("授权成功", session._socket.remoteAddress);
-        client.push(session);
+        this.clients.push(session);
         session.authorize = true;
         message.code = "0000";
         message.message = "授权成功";
@@ -49,6 +174,12 @@ class Signal {
     }
     // 处理信令
     switch (message.header.signal) {
+      case "router::rtp::capabilities":
+        this.routerRtpCapabilities(session, message);
+        break;
+      case "room::create":
+        this.roomCreate(session, message, message.body);
+        break;
     }
   }
 
@@ -56,30 +187,97 @@ class Signal {
    * 通知信令
    *
    * @param {*} message 消息
-   * @param {*} session websocket
+   * @param {*} session 信令通道
    */
   push(message, session) {
-    try {
-      session.send(JSON.stringify(message));
-    } catch (error) {
-      logger.error(
-        "通知信令失败",
-        session._socket.remoteAddress,
-        message,
-        error
-      );
+    if(session) {
+      try {
+        session.send(JSON.stringify(message));
+      } catch (error) {
+        logger.error(
+          "通知信令失败",
+          session._socket.remoteAddress,
+          message,
+          error
+        );
+      }
+    } else {
+      this.clients.forEach((session) => this.push(message, session));
     }
   }
 
   /**
-   * 通知信令
-   *
+   * @returns 下个Meidasoup Worker
+   */
+  nextMediasoupWorker() {
+    const worker = this.mediasoupWorkers[this.nextMediasoupWorkerIndex];
+    if (++this.nextMediasoupWorkerIndex === this.mediasoupWorkers.length) {
+      this.nextMediasoupWorkerIndex = 0;
+    }
+    return worker;
+  }
+
+  /**
+   * @param {*} message 消息
+   * 
+   * @returns 房间
+   */
+  selectRoom(message) {
+    return this.rooms.get(message.body.roomId);
+  }
+
+  /**
+   * 路由RTP能力信令
+   * 
+   * @param {*} session 信令通道
    * @param {*} message 消息
    */
-  push(message) {
-    this.client.forEach((session) => this.push(message, session));
+  routerRtpCapabilities(session, message) {
+    const room = this.selectRoom(message);
+    message.body = room.mediasoupRouter.rtpCapabilities;
+    this.push(message, session);
   }
-  
+
+  /**
+   * 创建房间信令
+   * 
+   * @param {*} session 信令通道
+   * @param {*} message 消息
+   * @param {*} body 消息主体
+   * 
+   * @returns 路由
+   */
+  async roomCreate(session, message, body) {
+    const roomId = body.roomId;
+    let room = this.rooms.get(roomId);
+    if (room) {
+      return room;
+    }
+    const mediasoupWorker = this.nextMediasoupWorker();
+    const { mediaCodecs } = config.mediasoup.routerOptions;
+    const mediasoupRouter = await mediasoupWorker.createRouter({ mediaCodecs });
+    // TODO：下面两个监控改为配置启用
+    const audioLevelObserver = await mediasoupRouter.createAudioLevelObserver({
+      maxEntries: 1,
+      threshold: -80,
+      interval: 2000
+    });
+    const activeSpeakerObserver = await mediasoupRouter.createActiveSpeakerObserver({
+      interval: 500
+    });
+    room = new Room({
+      roomId,
+      webRtcServer: mediasoupWorker.appData.webRtcServer,
+      mediasoupRouter,
+      audioLevelObserver,
+      activeSpeakerObserver
+    });
+    this.rooms.set(roomId, room);
+    this.logger.info("创建房间", roomId, room);
+    this.push(message, session);
+    return room;
+  }
+
 }
 
 module.exports = Signal;
diff --git a/taoyao-signal-server/README.md b/taoyao-signal-server/README.md
index 4632977..831f3fe 100644
--- a/taoyao-signal-server/README.md
+++ b/taoyao-signal-server/README.md
@@ -8,25 +8,3 @@
 |taoyao-boot|基础|基础模块|
 |taoyao-signal|信令|信令模块|
 |taoyao-server|服务|启动模块|
-
-## 模式
-
-### 直播模式
-
-### 监控模式
-
-### 会议模式
-
-所有人员均能视频通话对讲
-
-### 会议广播模式
-
-会议模式中只能单人讲话
-
-### 会议对讲模式
-
-会议模式中只能两个人员之间对讲
-
-### 本地视频模式
-
-使用本地文件作为音频视频来源
diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java
index f26c165..51d4355 100644
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java
@@ -34,11 +34,6 @@ public class Header implements Serializable {
 	 */
 	@Schema(title = "消息标识", description = "消息标识")
 	private String id;
-	/**
-	 * 终端标识
-	 */
-	@Schema(title = "终端标识", description = "终端标识")
-	private String sn;
 	/**
 	 * 协议标识
 	 */
@@ -47,7 +42,7 @@ public class Header implements Serializable {
 	
 	@Override
 	public Header clone() {
-		return new Header(this.v, this.id, this.sn, this.signal);
+		return new Header(this.v, this.id, this.signal);
 	}
 	
 }
diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaProperties.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaProperties.java
index 7981055..f4a53fa 100644
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaProperties.java
@@ -1,7 +1,11 @@
 package com.acgist.taoyao.boot.property;
 
+import java.util.List;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
@@ -47,10 +51,16 @@ public class MediaProperties {
 	 */
 	@Schema(title = "流畅视频", description = "流畅视频")
 	private MediaVideoProperties flowVideo;
+	/**
+	 * 媒体服务配置
+	 */
+	@Schema(title = "媒体服务配置", description = "媒体服务配置")
+	private List<MediaServerProperties> mediaServerList;
 	/**
 	 * 录像存放路径
 	 */
 	@Schema(title = "录像存放路径", description = "录像存放路径")
+	@JsonIgnore
 	private String recordStoragePath;
 
 }
diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediasoupProperties.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaServerProperties.java
similarity index 97%
rename from taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediasoupProperties.java
rename to taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaServerProperties.java
index acaaac1..bf9a690 100644
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediasoupProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/MediaServerProperties.java
@@ -14,7 +14,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Schema(title = "媒体服务配置", description = "媒体服务配置")
-public class MediasoupProperties {
+public class MediaServerProperties {
 
 	/**
 	 * 名称
diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/NodeProperties.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/NodeProperties.java
deleted file mode 100644
index 02af6e9..0000000
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/NodeProperties.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.acgist.taoyao.boot.property;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 节点配置
- * 
- * @author acgist
- */
-@Getter
-@Setter
-@Schema(title = "节点配置", description = "节点配置")
-public class NodeProperties {
-
-	/**
-	 * 主机
-	 */
-	@Schema(title = "主机", description = "主机")
-	private String host;
-	/**
-	 * 端口
-	 */
-	@Schema(title = "端口", description = "端口")
-	private Integer port;
-	/**
-	 * 用户
-	 */
-	@Schema(title = "用户", description = "用户")
-	@JsonIgnore
-	private String username;
-	/**
-	 * 密码
-	 */
-	@Schema(title = "密码", description = "密码")
-	@JsonIgnore
-	private String password;
-	/**
-	 * 服务节点ID
-	 */
-	@Schema(title = "服务节点ID", description = "服务节点ID")
-	private String serverId;
-	
-}
diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/TaoyaoProperties.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/TaoyaoProperties.java
index cc77751..01feab7 100644
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/TaoyaoProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/TaoyaoProperties.java
@@ -26,12 +26,6 @@ public class TaoyaoProperties {
 	 */
 	@Schema(title = "项目名称", description = "项目名称")
 	private String name;
-	/**
-	 * 服务节点ID
-	 * 集群使用
-	 */
-	@Schema(title = "服务节点ID", description = "服务节点ID")
-	private String nodeId;
 	/**
 	 * 超时时间
 	 */
diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/WebrtcProperties.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/WebrtcProperties.java
index 5346092..c0595ef 100644
--- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/WebrtcProperties.java
+++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/property/WebrtcProperties.java
@@ -1,7 +1,5 @@
 package com.acgist.taoyao.boot.property;
 
-import java.util.List;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,16 +17,6 @@ import lombok.Setter;
 @ConfigurationProperties(prefix = "taoyao.webrtc")
 public class WebrtcProperties {
 
-	/**
-	 * 媒体最小端口
-	 */
-	@Schema(title = "媒体最小端口", description = "媒体最小端口")
-	private Integer minPort;
-	/**
-	 * 媒体最大端口
-	 */
-	@Schema(title = "媒体最大端口", description = "媒体最大端口")
-	private Integer maxPort;
 	/**
 	 * STUN服务器
 	 */
@@ -39,10 +27,5 @@ public class WebrtcProperties {
 	 */
 	@Schema(title = "TURN服务器", description = "TURN服务器")
 	private String[] turn;
-	/**
-	 * 媒体服务配置
-	 */
-	@Schema(title = "媒体服务配置", description = "媒体服务配置")
-	private List<MediasoupProperties> mediasoupList;
 	
 }
diff --git a/taoyao-signal-server/taoyao-server/src/main/resources/application-dev.yml b/taoyao-signal-server/taoyao-server/src/main/resources/application-dev.yml
index 6df83c7..9c6f945 100644
--- a/taoyao-signal-server/taoyao-server/src/main/resources/application-dev.yml
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
 taoyao:
-  webrtc:
-    mediasoup-list:
-      - name: mediasoup-local-a
+  media:
+    media-server-list:
+      - name: media-local-a
         enabled: true
         host: 192.168.8.110
         port: 4443
diff --git a/taoyao-signal-server/taoyao-server/src/main/resources/application-local.yml b/taoyao-signal-server/taoyao-server/src/main/resources/application-local.yml
new file mode 100644
index 0000000..73efc1a
--- /dev/null
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/application-local.yml
@@ -0,0 +1,12 @@
+taoyao:
+  media:
+    media-server-list:
+      - name: media-local-a
+        enabled: true
+        host: 192.168.1.110
+        port: 4443
+        schema: wss
+        username: taoyao
+        password: taoyao
+  security:
+    permit: /v3/api-docs/**,/swagger-ui/**,/swagger-ui.html,/,/error,/index.html,/favicon.ico
\ No newline at end of file
diff --git a/taoyao-signal-server/taoyao-server/src/main/resources/application.yml b/taoyao-signal-server/taoyao-server/src/main/resources/application.yml
index 0375040..8f43312 100644
--- a/taoyao-signal-server/taoyao-server/src/main/resources/application.yml
+++ b/taoyao-signal-server/taoyao-server/src/main/resources/application.yml
@@ -20,7 +20,7 @@ server:
 #   context-path: /taoyao
 spring:
   profiles:
-    active: dev
+    active: local
   application:
     name: taoyao-signal-server
   servlet:
@@ -49,20 +49,21 @@ spring:
 taoyao:
   url: https://gitee.com/acgist/taoyao
   name: 桃夭信令服务
-  node-id: 1
-  timeout: 5000
-  max-timeout: 120000
   version: 1.0.0
   description: 桃夭WebRTC信令服务
+  timeout: 5000
+  max-timeout: 120000
   id:
     sn: 0
     max-index: 999999
   # 媒体配置
   media:
+    # 默认音频
     audio:
       format: OPUS
       sample-size: 16
       sample-rate: 32000
+    # 默认视频
     video:
       format: H264
       bitrate: 1200
@@ -92,6 +93,22 @@ taoyao:
       bitrate: 600
       frame-rate: 16
       resolution: 640*480
+    # 媒体服务配置
+    media-server-list:
+      - name: media-local-a
+        enabled: true
+        host: localhost
+        port: 4443
+        schema: wss
+        username: taoyao
+        password: taoyao
+      - name: media-local-z
+        enabled: true
+        host: localhost
+        port: 4443
+        schema: wss
+        username: taoyao
+        password: taoyao
     # 录像配置
     record-storage-path: /data/record
   # WebRTC配置
@@ -108,22 +125,6 @@ taoyao:
       - turn:127.0.0.1:8888
       - turn:127.0.0.1:8888
       - turn:127.0.0.1:8888
-    # 媒体配置
-    mediasoup-list:
-      - name: mediasoup-local-a
-        enabled: true
-        host: localhost
-        port: 4443
-        schema: wss
-        username: taoyao
-        password: taoyao
-      - name: mediasoup-local-z
-        enabled: true
-        host: localhost
-        port: 4443
-        schema: wss
-        username: taoyao
-        password: taoyao
   # 安全配置
   security:
     enabled: true
@@ -134,15 +135,6 @@ taoyao:
   # 定时任务
   scheduled:
     client: 0 * * * * ?
-  # 集群配置
-  node:
-    enabled: false
-    # 节点列表
-    node-list:
-      - host: localhost
-        port: 8888
-        username: ${taoyao.security.username:taoyao}
-        password: ${taoyao.security.username:taoyao}
   # 脚本配置
   script:
     # Linux
@@ -159,5 +151,5 @@ taoyao:
       media-shutdown: pm2 stop taoyao-media-server
       system-reboot: shutdown -s -t 0
       system-shutdown: shutdown -r -t 0
-      platform-reboot: net restart taoyao-signal-server
+      platform-reboot: net stop taoyao-signal-server & net start taoyao-signal-server
       platform-shutdown: net stop taoyao-signal-server
diff --git a/taoyao-signal-server/taoyao-signal/README.md b/taoyao-signal-server/taoyao-signal/README.md
index 275b413..3c6e56e 100644
--- a/taoyao-signal-server/taoyao-signal/README.md
+++ b/taoyao-signal-server/taoyao-signal/README.md
@@ -77,13 +77,17 @@
 # 消息流程：终端-[终端注册]>信令服务->终端
 ```
 
-### 心跳信令（client::heartbeat）
+### 终端心跳信令（client::heartbeat）
 
 ```
 # 请求主体
 {
-	"signal": "信号强度",
-	"battery": "电池电量"
+	"signal": 信号强度（0~100）,
+	"battery": 电池电量（0~100）,
+	"charging": 是否充电（true|false）
+}
+# 响应主体
+{
 }
 # 消息流程：终端->信令服务->终端
 ```
@@ -102,7 +106,7 @@
 		"signal": 信号强度（0~100）,
 		"battery": 电池电量（0~100）,
 		"charging": 是否充电（true|false）,
-		"mediasoup": "媒体服务名称",
+		"mediaName": "媒体服务名称",
 		"lastHeartbeat": "最后心跳时间"
 	},
 	...
@@ -130,7 +134,7 @@
 	"signal": 信号强度（0~100）,
 	"battery": 电池电量（0~100）,
 	"charging": 是否充电（true|false）,
-	"mediasoup": "媒体服务名称",
+	"mediaName": "媒体服务名称",
 	"lastHeartbeat": "最后心跳时间"
 }
 # 消息流程：终端-[终端注册]>信令服务-)终端
@@ -179,13 +183,13 @@
 	"signal": 信号强度（0~100）,
 	"battery": 电池电量（0~100）,
 	"charging": 是否充电（true|false）,
-	"mediasoup": "媒体服务名称",
+	"mediaName": "媒体服务名称",
 	"lastHeartbeat": "最后心跳时间"
 }
 # 消息流程：终端->信令服务->终端
 ```
 
-### 单播信令（client::unicast）
+### 终端单播信令（client::unicast）
 
 ```
 # 请求主体
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/Client.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/Client.java
index 6d48f22..52f74cd 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/Client.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/Client.java
@@ -1,7 +1,7 @@
 package com.acgist.taoyao.signal.client;
 
 import com.acgist.taoyao.boot.model.Message;
-import com.acgist.taoyao.signal.mediasoup.MediasoupClient;
+import com.acgist.taoyao.signal.media.MediaClient;
 
 /**
  * 终端会话
@@ -34,14 +34,6 @@ public interface Client extends AutoCloseable {
 	 */
 	void push(Message message);
 	
-	/**
-	 * 推送消息
-	 * 
-	 * @param sn 终端标识
-	 * @param message 消息
-	 */
-	void push(String sn, Message message);
-
 	/**
 	 * @param timeout 超时时间
 	 * 
@@ -67,13 +59,13 @@ public interface Client extends AutoCloseable {
 	boolean authorized();
 	
 	/**
-	 * @return Mediasoup终端
+	 * @return 媒体服务终端
 	 */
-	MediasoupClient mediasoupClient();
+	MediaClient mediaClient();
 	
 	/**
-	 * @param mediasoupClient Mediasoup终端
+	 * @param mediaClient 媒体服务终端
 	 */
-	void mediasoupClient(MediasoupClient mediasoupClient);
+	void mediaClient(MediaClient mediaClient);
 	
 }
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientAdapter.java
index 4a2d295..8979ff8 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientAdapter.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientAdapter.java
@@ -1,8 +1,6 @@
 package com.acgist.taoyao.signal.client;
 
-import com.acgist.taoyao.boot.model.Header;
-import com.acgist.taoyao.boot.model.Message;
-import com.acgist.taoyao.signal.mediasoup.MediasoupClient;
+import com.acgist.taoyao.signal.media.MediaClient;
 
 /**
  * 会话适配器
@@ -38,7 +36,7 @@ public abstract class ClientAdapter<T extends AutoCloseable> implements Client {
 	/**
 	 * 媒体服务终端
 	 */
-	protected MediasoupClient mediasoupClient;
+	protected MediaClient mediaClient;
 	
 	protected ClientAdapter(T instance) {
 		this.time = System.currentTimeMillis();
@@ -62,15 +60,6 @@ public abstract class ClientAdapter<T extends AutoCloseable> implements Client {
 		return this.status;
 	}
 	
-	@Override
-	public void push(String sn, Message message) {
-		final Header header = message.getHeader();
-		if(header != null) {
-			header.setSn(sn);
-		}
-		this.push(message);
-	}
-	
 	@Override
 	public boolean timeout(long timeout) {
 		return System.currentTimeMillis() - this.time > timeout;
@@ -93,14 +82,14 @@ public abstract class ClientAdapter<T extends AutoCloseable> implements Client {
 	}
 	
 	@Override
-	public MediasoupClient mediasoupClient() {
-		return this.mediasoupClient;
+	public MediaClient mediaClient() {
+		return this.mediaClient;
 	}
 	
 	@Override
-	public void mediasoupClient(MediasoupClient mediasoupClient) {
-		this.mediasoupClient = mediasoupClient;
-		this.status.setMediasoup(mediasoupClient.name());
+	public void mediaClient(MediaClient mediaClient) {
+		this.mediaClient = mediaClient;
+		this.status.setMediaName(mediaClient.name());
 	}
 	
 	@Override
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientManager.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientManager.java
index 05d0b3d..3a78dc5 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientManager.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientManager.java
@@ -1,9 +1,9 @@
 package com.acgist.taoyao.signal.client;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -54,8 +54,20 @@ public class ClientManager {
 	 */
 	public void unicast(String to, Message message) {
 		this.clients().stream()
-		.filter(v -> StringUtils.equals(to, v.sn()))
-		.forEach(v -> v.push(v.sn(), message));
+		.filter(v -> Objects.equals(to, v.sn()))
+		.forEach(v -> v.push(message));
+	}
+	
+	/**
+	 * 单播消息
+	 * 
+	 * @param to 接收终端
+	 * @param message 消息
+	 */
+	public void unicast(Client to, Message message) {
+		this.clients().stream()
+		.filter(v -> v.instance() == to)
+		.forEach(v -> v.push(message));
 	}
 	
 	/**
@@ -64,7 +76,7 @@ public class ClientManager {
 	 * @param message 消息
 	 */
 	public void broadcast(Message message) {
-		this.clients().forEach(v -> v.push(v.sn(), message));
+		this.clients().forEach(v -> v.push(message));
 	}
 	
 	/**
@@ -75,8 +87,20 @@ public class ClientManager {
 	 */
 	public void broadcast(String from, Message message) {
 		this.clients().stream()
-		.filter(v -> !StringUtils.equals(from, v.sn()))
-		.forEach(v -> v.push(v.sn(), message));
+		.filter(v -> !Objects.equals(from, v.sn()))
+		.forEach(v -> v.push(message));
+	}
+	
+	/**
+	 * 广播消息
+	 * 
+	 * @param from 发送终端
+	 * @param message 消息
+	 */
+	public void broadcast(Client from, Message message) {
+		this.clients().stream()
+		.filter(v -> v.instance() != from)
+		.forEach(v -> v.push(message));
 	}
 	
 	/**
@@ -86,7 +110,7 @@ public class ClientManager {
 	 */
 	public Client client(String sn) {
 		return this.clients().stream()
-			.filter(v -> StringUtils.equals(sn, v.sn()))
+			.filter(v -> Objects.equals(sn, v.sn()))
 			.findFirst()
 			.orElse(null);
 	}
@@ -102,16 +126,6 @@ public class ClientManager {
 			.findFirst()
 			.orElse(null);
 	}
-
-	/**
-	 * @param sn 终端标识
-	 * 
-	 * @return 终端状态
-	 */
-	public ClientStatus status(String sn) {
-		final Client client = this.client(sn);
-		return client == null ? null : client.status();
-	}
 	
 	/**
 	 * @return 所有终端会话
@@ -121,6 +135,16 @@ public class ClientManager {
 			.filter(Client::authorized)
 			.toList();
 	}
+	
+	/**
+	 * @param sn 终端标识
+	 * 
+	 * @return 终端状态
+	 */
+	public ClientStatus status(String sn) {
+		final Client client = this.client(sn);
+		return client == null ? null : client.status();
+	}
 
 	/**
 	 * @return 所有终端状态
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientStatus.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientStatus.java
index 36fdd8e..222f97a 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientStatus.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientStatus.java
@@ -47,7 +47,7 @@ public class ClientStatus {
 	 * 媒体服务名称
 	 */
 	@Schema(title = "媒体服务名称", description = "媒体服务名称")
-	private String mediasoup;
+	private String mediaName;
 	/**
 	 * 最后心跳时间
 	 */
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/config/SignalAutoConfiguration.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/config/SignalAutoConfiguration.java
index 2131a6f..642ad84 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/config/SignalAutoConfiguration.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/config/SignalAutoConfiguration.java
@@ -10,7 +10,7 @@ import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 import com.acgist.taoyao.signal.client.websocket.WebSocketSignal;
-import com.acgist.taoyao.signal.mediasoup.MediasoupClientManager;
+import com.acgist.taoyao.signal.media.MediaClientManager;
 import com.acgist.taoyao.signal.protocol.media.MediaRebootProtocol;
 import com.acgist.taoyao.signal.protocol.media.MediaShutdownProtocol;
 import com.acgist.taoyao.signal.protocol.platform.PlatformRebootProtocol;
@@ -31,7 +31,7 @@ import com.acgist.taoyao.signal.service.impl.SecurityServiceImpl;
 public class SignalAutoConfiguration {
 
 	@Autowired
-	private MediasoupClientManager mediasoupClientManager;
+	private MediaClientManager mediaClientManager;
 	
 	@Bean
 	@ConditionalOnMissingBean
@@ -52,11 +52,11 @@ public class SignalAutoConfiguration {
 	}
 	
 	@Bean
-	public CommandLineRunner mediasoupCommandLineRunner() {
+	public CommandLineRunner mediaCommandLineRunner() {
 		return new CommandLineRunner() {
 			@Override
 			public void run(String ... args) throws Exception {
-				SignalAutoConfiguration.this.mediasoupClientManager.init();
+				SignalAutoConfiguration.this.mediaClientManager.init();
 			}
 		};
 	}
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/ClientController.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/ClientController.java
index e782e93..dcfdc79 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/ClientController.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/ClientController.java
@@ -8,9 +8,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.acgist.taoyao.boot.model.Message;
 import com.acgist.taoyao.signal.client.ClientManager;
+import com.acgist.taoyao.signal.client.ClientStatus;
 import com.acgist.taoyao.signal.protocol.client.ClientRebootProtocol;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 /**
@@ -30,12 +34,14 @@ public class ClientController {
 	
 	@Operation(summary = "终端列表", description = "终端列表")
 	@GetMapping("/list")
+	@ApiResponse(content = @Content(schema = @Schema(implementation = ClientStatus.class)))
 	public Message list() {
 		return Message.success(this.clientManager.status());
 	}
 	
 	@Operation(summary = "终端状态", description = "终端状态")
 	@GetMapping("/status/{sn}")
+	@ApiResponse(content = @Content(schema = @Schema(implementation = ClientStatus.class)))
 	public Message status(@PathVariable String sn) {
 		return Message.success(this.clientManager.status(sn));
 	}
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/RoomController.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/RoomController.java
index edffbde..10e7be7 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/RoomController.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/RoomController.java
@@ -9,8 +9,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.acgist.taoyao.boot.model.Message;
+import com.acgist.taoyao.signal.client.ClientStatus;
 import com.acgist.taoyao.signal.room.Room;
 import com.acgist.taoyao.signal.room.RoomManager;
+import com.acgist.taoyao.signal.room.RoomStatus;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -33,19 +35,21 @@ public class RoomController {
 	
 	@Operation(summary = "房间列表", description = "房间列表")
 	@GetMapping("/list")
-	@ApiResponse(content = @Content(schema = @Schema(implementation = Room.class)))
+	@ApiResponse(content = @Content(schema = @Schema(implementation = RoomStatus.class)))
 	public Message list() {
 		return Message.success(this.roomManager.status());
 	}
 
 	@Operation(summary = "房间状态", description = "房间状态")
 	@GetMapping("/status/{id}")
+	@ApiResponse(content = @Content(schema = @Schema(implementation = RoomStatus.class)))
 	public Message status(@PathVariable Long id) {
 		return Message.success(this.roomManager.status(id));
 	}
 	
 	@Operation(summary = "房间终端列表", description = "房间终端列表")
 	@GetMapping("/list/client/{id}")
+	@ApiResponse(content = @Content(schema = @Schema(implementation = ClientStatus.class)))
 	public Message listClient(@PathVariable Long id) {
 		final Room room = this.roomManager.room(id);
 		return Message.success(room == null ? List.of() : room.clientStatus());
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomCreateEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomCreateEvent.java
index a64b4de..76a8921 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomCreateEvent.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomCreateEvent.java
@@ -47,10 +47,10 @@ public class RoomCreateEvent extends ApplicationEventAdapter {
 	}
 	
 	/**
-	 * @return {@link Constant#MEDIASOUP}
+	 * @return {@link Constant#MEDIA_NAME}
 	 */
-	public String getMediasoup() {
-		return this.get(Constant.MEDIASOUP);
+	public String getMediaName() {
+		return this.get(Constant.MEDIA_NAME);
 	}
 
 }
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/ApplicationListenerAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/ApplicationListenerAdapter.java
index f78a9c0..3d11809 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/ApplicationListenerAdapter.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/ApplicationListenerAdapter.java
@@ -6,7 +6,7 @@ import org.springframework.context.ApplicationListener;
 
 import com.acgist.taoyao.signal.client.ClientManager;
 import com.acgist.taoyao.signal.event.ApplicationEventAdapter;
-import com.acgist.taoyao.signal.mediasoup.MediasoupClientManager;
+import com.acgist.taoyao.signal.media.MediaClientManager;
 import com.acgist.taoyao.signal.room.RoomManager;
 
 /**
@@ -25,6 +25,6 @@ public abstract class ApplicationListenerAdapter<E extends ApplicationEventAdapt
 	@Autowired
 	protected ApplicationContext applicationContext;
 	@Autowired
-	protected MediasoupClientManager mediasoupClientManager;
+	protected MediaClientManager mediaClientManager;
 	
 }
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/room/RoomCreateListener.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/room/RoomCreateListener.java
index 01dd9c0..1f604d4 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/room/RoomCreateListener.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/room/RoomCreateListener.java
@@ -2,6 +2,7 @@ package com.acgist.taoyao.signal.listener.room;
 
 import com.acgist.taoyao.boot.annotation.EventListener;
 import com.acgist.taoyao.boot.model.Message;
+import com.acgist.taoyao.boot.model.MessageCodeException;
 import com.acgist.taoyao.signal.event.room.RoomCreateEvent;
 import com.acgist.taoyao.signal.listener.ApplicationListenerAdapter;
 import com.acgist.taoyao.signal.room.Room;
@@ -18,18 +19,20 @@ public class RoomCreateListener extends ApplicationListenerAdapter<RoomCreateEve
 	public void onApplicationEvent(RoomCreateEvent event) {
 		final Long id = event.getId();
 		if(id != null && this.roomManager.room(id) != null) {
-			// 房间已经存在
-			return;
+			throw MessageCodeException.of("房间已经存在");
 		}
+		// 广播消息
+		final Message message = event.getMessage();
+		// 创建房间
 		final Room room = this.roomManager.create(
 			event.getSn(),
 			event.getName(),
 			event.getPassword(),
-			event.getMediasoup()
+			event.getMediaName(),
+			message.cloneWidthoutBody()
 		);
 		// 进入房间
 		room.enter(event.getClient());
-		final Message message = event.getMessage();
 		message.setBody(room.getStatus());
 		this.clientManager.broadcast(message);
 	}
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/room/RoomEnterListener.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/room/RoomEnterListener.java
index ccc32b8..b28e75f 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/room/RoomEnterListener.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/room/RoomEnterListener.java
@@ -9,7 +9,7 @@ import com.acgist.taoyao.boot.model.MessageCodeException;
 import com.acgist.taoyao.signal.client.Client;
 import com.acgist.taoyao.signal.event.room.RoomEnterEvent;
 import com.acgist.taoyao.signal.listener.ApplicationListenerAdapter;
-import com.acgist.taoyao.signal.mediasoup.MediasoupClient;
+import com.acgist.taoyao.signal.media.MediaClient;
 import com.acgist.taoyao.signal.protocol.Constant;
 import com.acgist.taoyao.signal.room.Room;
 
@@ -35,12 +35,12 @@ public class RoomEnterListener extends ApplicationListenerAdapter<RoomEnterEvent
 			throw MessageCodeException.of(MessageCode.CODE_3401, "密码错误");
 		}
 		final Client client = event.getClient();
-		final MediasoupClient mediasoupClient = room.getMediasoupClient();
-		if(client.mediasoupClient() == null) {
-			client.mediasoupClient(mediasoupClient);
-		} else if(client.mediasoupClient() == mediasoupClient) {
+		final MediaClient mediaClient = room.getMediaClient();
+		if(client.mediaClient() == null) {
+			client.mediaClient(mediaClient);
+		} else if(client.mediaClient() == mediaClient) {
 		} else {
-			throw MessageCodeException.of("不在相同媒体服务：" + mediasoupClient.name());
+			throw MessageCodeException.of("不在相同媒体服务：" + mediaClient.name());
 		}
 		// 进入房间
 		room.enter(client);
@@ -50,8 +50,7 @@ public class RoomEnterListener extends ApplicationListenerAdapter<RoomEnterEvent
 			Constant.ID, room.getId(),
 			Constant.SN, sn
 		));
-		room.broadcast(client, message);
-		// TODO：推送流媒体列表
+		room.broadcast(message);
 	}
 
 }
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/MediasoupClient.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/MediaClient.java
similarity index 87%
rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/MediasoupClient.java
rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/MediaClient.java
index 54970c4..fe48554 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/MediasoupClient.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/MediaClient.java
@@ -1,4 +1,4 @@
-package com.acgist.taoyao.signal.mediasoup;
+package com.acgist.taoyao.signal.media;
 
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -30,7 +30,8 @@ import com.acgist.taoyao.boot.annotation.Client;
 import com.acgist.taoyao.boot.model.Header;
 import com.acgist.taoyao.boot.model.Message;
 import com.acgist.taoyao.boot.model.MessageCode;
-import com.acgist.taoyao.boot.property.MediasoupProperties;
+import com.acgist.taoyao.boot.model.MessageCodeException;
+import com.acgist.taoyao.boot.property.MediaServerProperties;
 import com.acgist.taoyao.boot.property.TaoyaoProperties;
 import com.acgist.taoyao.boot.utils.JSONUtils;
 import com.acgist.taoyao.signal.protocol.Protocol;
@@ -49,7 +50,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 @Client
-public class MediasoupClient {
+public class MediaClient {
 	
 	@Autowired
 	private TaskScheduler taskScheduler;
@@ -77,7 +78,7 @@ public class MediasoupClient {
 	/**
 	 * 配置
 	 */
-	private MediasoupProperties mediasoupProperties;
+	private MediaServerProperties mediaServerProperties;
 	/**
 	 * 同步消息
 	 */
@@ -86,11 +87,11 @@ public class MediasoupClient {
 	/**
 	 * 加载终端
 	 * 
-	 * @param mediasoupProperties 媒体终端配置
+	 * @param mediaServerProperties 媒体服务配置
 	 */
-	public void init(MediasoupProperties mediasoupProperties) {
-		this.mediasoupProperties = mediasoupProperties;
-		this.name = mediasoupProperties.getName();
+	public void init(MediaServerProperties mediaServerProperties) {
+		this.mediaServerProperties = mediaServerProperties;
+		this.name = mediaServerProperties.getName();
 		this.duration = this.taoyaoProperties.getTimeout();
 		this.buildClient();
 	}
@@ -106,7 +107,7 @@ public class MediasoupClient {
 	 * 连接WebSocket通道
 	 */
 	public void buildClient() {
-		final URI uri = URI.create(this.mediasoupProperties.getAddress());
+		final URI uri = URI.create(this.mediaServerProperties.getAddress());
 		log.info("连接媒体服务：{}", uri);
 		try {
 			HttpClient
@@ -159,7 +160,7 @@ public class MediasoupClient {
 		final Message response = this.syncMessage.remove(id);
 		if(response == null || message.equals(response)) {
 			log.warn("媒体服务没有响应：{}", message);
-			return this.platformErrorProtocol.build(id, MessageCode.CODE_2001, "媒体服务没有响应", response);
+			throw MessageCodeException.of(MessageCode.CODE_2001, "媒体服务没有响应");
 		}
 		return response;
 	}
@@ -179,7 +180,7 @@ public class MediasoupClient {
 		// 设置新的通道
 		this.webSocket = webSocket;
 		// 发送授权消息
-		this.send(this.mediaRegisterProtocol.build(this.mediasoupProperties));
+		this.send(this.mediaRegisterProtocol.build(this.mediaServerProperties));
 	}
 	
 	/**
@@ -204,25 +205,25 @@ public class MediasoupClient {
 			}
 			final String v = header.getV();
 			final String id = header.getId();
-			final String sn = header.getSn();
 			final String signal = header.getSignal();
-			if(v == null || id == null || sn == null || signal == null) {
+			if(v == null || id == null || signal == null) {
 				log.warn("消息格式错误（缺失头部关键参数）：{}", message);
 				return;
 			}
 			final Message request = this.syncMessage.get(id);
-			// 存在同步响应
 			if(request != null) {
+				// 同步处理
 				// 重新设置消息
 				this.syncMessage.put(id, message);
 				// 唤醒等待现场
 				synchronized (request) {
 					request.notifyAll();
 				}
+				// 同步处理不要执行回调
 			} else {
 				final Protocol protocol = this.protocolManager.protocol(signal);
-				if(protocol instanceof ProtocolMediaAdapter mediasoupProtocol) {
-					mediasoupProtocol.execute(message, this.webSocket);
+				if(protocol instanceof ProtocolMediaAdapter protocolMediaAdapter) {
+					protocolMediaAdapter.execute(message, this.webSocket);
 				} else {
 					log.warn("未知媒体服务信令：{}", data);
 				}
@@ -241,7 +242,7 @@ public class MediasoupClient {
     	public void onOpen(WebSocket webSocket) {
     		log.info("媒体服务通道打开：{}", webSocket);
     		Listener.super.onOpen(webSocket);
-    		MediasoupClient.this.open(webSocket);
+    		MediaClient.this.open(webSocket);
     	}
 		
     	@Override
@@ -254,7 +255,7 @@ public class MediasoupClient {
     	public CompletionStage<?> onText(WebSocket webSocket, CharSequence data, boolean last) {
     		log.debug("媒体服务收到消息（text）：{}-{}", webSocket, data);
     		try {
-    			MediasoupClient.this.execute(data.toString());
+    			MediaClient.this.execute(data.toString());
 			} catch (Exception e) {
 				log.error("媒体服务处理异常：{}", data, e);
 			}
@@ -267,9 +268,9 @@ public class MediasoupClient {
     		try {
     			return Listener.super.onClose(webSocket, statusCode, reason);
 			} finally {
-				MediasoupClient.this.taskScheduler.schedule(
-					MediasoupClient.this::buildClient,
-					Instant.now().plusMillis(MediasoupClient.this.retryDuration())
+				MediaClient.this.taskScheduler.schedule(
+					MediaClient.this::buildClient,
+					Instant.now().plusMillis(MediaClient.this.retryDuration())
 				);
 			}
     	}
@@ -280,9 +281,9 @@ public class MediasoupClient {
     		try {
     			Listener.super.onError(webSocket, error);
 			} finally {
-				MediasoupClient.this.taskScheduler.schedule(
-					MediasoupClient.this::buildClient,
-					Instant.now().plusMillis(MediasoupClient.this.retryDuration())
+				MediaClient.this.taskScheduler.schedule(
+					MediaClient.this::buildClient,
+					Instant.now().plusMillis(MediaClient.this.retryDuration())
 				);
 			}
     	}
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/MediasoupClientManager.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/MediaClientManager.java
similarity index 65%
rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/MediasoupClientManager.java
rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/MediaClientManager.java
index afbffb1..eac0f79 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/MediasoupClientManager.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/MediaClientManager.java
@@ -1,4 +1,4 @@
-package com.acgist.taoyao.signal.mediasoup;
+package com.acgist.taoyao.signal.media;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 
 import com.acgist.taoyao.boot.annotation.Manager;
-import com.acgist.taoyao.boot.property.WebrtcProperties;
+import com.acgist.taoyao.boot.property.MediaProperties;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -18,26 +18,26 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Slf4j
 @Manager
-public class MediasoupClientManager {
+public class MediaClientManager {
 
 	@Autowired
-	private WebrtcProperties webrtcProperties;
+	private MediaProperties mediaProperties;
 	@Autowired
 	private ApplicationContext applicationContext;
 	
 	/**
 	 * 媒体服务终端列表
 	 */
-	private Map<String, MediasoupClient> clientMap = new ConcurrentHashMap<>();
+	private Map<String, MediaClient> clientMap = new ConcurrentHashMap<>();
 	
 	/**
 	 * 加载媒体服务终端
 	 */
 	public void init() {
-		this.webrtcProperties.getMediasoupList().stream()
+		this.mediaProperties.getMediaServerList().stream()
 		.filter(v -> Boolean.TRUE.equals(v.getEnabled()))
 		.forEach(v -> {
-			final MediasoupClient client = this.applicationContext.getBean(MediasoupClient.class);
+			final MediaClient client = this.applicationContext.getBean(MediaClient.class);
 			client.init(v);
 			this.clientMap.put(client.name(), client);
 			log.info("注册媒体服务终端：{}-{}", v.getAddress(), client);
@@ -49,7 +49,7 @@ public class MediasoupClientManager {
 	 * 
 	 * @return 媒体服务终端
 	 */
-	public MediasoupClient mediasoupClient(String name) {
+	public MediaClient mediaClient(String name) {
 		return this.clientMap.get(name);
 	}
 	
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Peer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/Peer.java
similarity index 93%
rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Peer.java
rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/Peer.java
index 5fb5d56..2221a8d 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Peer.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/Peer.java
@@ -1,4 +1,4 @@
-package com.acgist.taoyao.signal.mediasoup;
+package com.acgist.taoyao.signal.media;
 
 import java.util.Map;
 
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Stream.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/Stream.java
similarity index 90%
rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Stream.java
rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/Stream.java
index 61b08ec..2d550a6 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Stream.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/Stream.java
@@ -1,4 +1,4 @@
-package com.acgist.taoyao.signal.mediasoup;
+package com.acgist.taoyao.signal.media;
 
 import java.io.Closeable;
 
@@ -60,8 +60,8 @@ public class Stream implements Closeable {
 	 * 媒体流ID
 	 * 
 	 * 媒体类型.发送终端标识.发送.房间ID：
-	 * 音频：audio.sn.sn.1000
-	 * 视频：video.sn.sn.1000
+	 * 音频：audio.sn.send.1000
+	 * 视频：video.sn.send.1000
 	 * 
 	 * 媒体类型.接收终端标识.接收.发送终端标识.房间ID：
 	 * 音频：audio.sn.recv.sn.1000
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Transport.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/Transport.java
similarity index 91%
rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Transport.java
rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/Transport.java
index 26dfdcc..d14273b 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Transport.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/media/Transport.java
@@ -1,4 +1,4 @@
-package com.acgist.taoyao.signal.mediasoup;
+package com.acgist.taoyao.signal.media;
 
 import java.io.Closeable;
 import java.util.List;
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Router.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Router.java
deleted file mode 100644
index 2877ba0..0000000
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/mediasoup/Router.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.acgist.taoyao.signal.mediasoup;
-
-import java.io.Closeable;
-import java.util.List;
-
-import com.acgist.taoyao.signal.room.Room;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 路由
- * 
- * @author acgist
- */
-@Slf4j
-public class Router implements Closeable {
-	
-	/**
-	 * 房间
-	 */
-	private Room room;
-	/**
-	 * 传输通道列表
-	 */
-	private List<Transport> transports;
-	
-	@Override
-	public void close() {
-		log.info("关闭路由：{}", this.room.getId());
-		this.transports.forEach(Transport::close);
-	}
-
-}
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Constant.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Constant.java
index e067f5c..1c41bf9 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Constant.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Constant.java
@@ -42,7 +42,7 @@ public interface Constant {
 	/**
 	 * 媒体服务名称
 	 */
-	String MEDIASOUP = "mediasoup";
+	String MEDIA_NAME = "mediaName";
 	/**
 	 * 名称
 	 */
@@ -75,5 +75,21 @@ public interface Constant {
 	 * WebRTC
 	 */
 	String WEBRTC = "webrtc";
+	/**
+	 * 房间ID
+	 */
+	String ROOM_ID = "roomId";
+	/**
+	 * 终端ID
+	 */
+	String CLIENT_ID = "clientId";
+	/**
+	 * 路由ID
+	 */
+	String ROUTER_ID = "routerId";
+	/**
+	 * 终端ID
+	 */
+	String STREAM_ID = "streamId";
 
 }
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java
index e4e4468..43acda9 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java
@@ -11,7 +11,7 @@ import com.acgist.taoyao.boot.property.TaoyaoProperties;
 import com.acgist.taoyao.boot.service.IdService;
 import com.acgist.taoyao.signal.client.ClientManager;
 import com.acgist.taoyao.signal.event.ApplicationEventAdapter;
-import com.acgist.taoyao.signal.mediasoup.MediasoupClientManager;
+import com.acgist.taoyao.signal.media.MediaClientManager;
 import com.acgist.taoyao.signal.room.RoomManager;
 
 /**
@@ -32,7 +32,7 @@ public abstract class ProtocolAdapter implements Protocol {
 	@Autowired
 	protected ApplicationContext applicationContext;
 	@Autowired
-	protected MediasoupClientManager mediasoupClientManager;
+	protected MediaClientManager mediaClientManager;
 	
 	/**
 	 * 信令名称
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java
index 9256e61..fe74133 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java
@@ -95,11 +95,10 @@ public class ProtocolManager {
 		}
 		final String v = header.getV();
 		final String id = header.getId();
-		final String sn = header.getSn();
 		final String signal = header.getSignal();
 		// 设置缓存ID
 		this.platformErrorProtocol.set(id);
-		if(v == null || id == null || sn == null || signal == null) {
+		if(v == null || id == null || signal == null) {
 			log.warn("消息格式错误（缺失头部关键参数）：{}", content);
 			client.push(this.platformErrorProtocol.build("消息格式错误（缺失头部关键参数）"));
 			return;
@@ -112,9 +111,9 @@ public class ProtocolManager {
 			return;
 		}
 		if(protocol instanceof ClientRegisterProtocol) {
-			protocol.execute(sn, client, message);
+			protocol.execute(null, client, message);
 		} else if(this.securityService.authenticate(message, client, protocol)) {
-			protocol.execute(sn, client, message);
+			protocol.execute(client.sn(), client, message);
 		} else {
 			log.warn("终端会话没有授权：{}", content);
 			client.push(this.platformErrorProtocol.build(MessageCode.CODE_3401, "终端会话没有授权"));
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolMediaRoomAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolMediaRoomAdapter.java
new file mode 100644
index 0000000..a3b1a83
--- /dev/null
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolMediaRoomAdapter.java
@@ -0,0 +1,92 @@
+package com.acgist.taoyao.signal.protocol;
+
+import java.net.http.WebSocket;
+import java.util.Map;
+
+import com.acgist.taoyao.boot.model.Message;
+import com.acgist.taoyao.boot.model.MessageCodeException;
+import com.acgist.taoyao.signal.client.Client;
+import com.acgist.taoyao.signal.room.Room;
+
+/**
+ * 房间媒体服务信令适配器
+ * 
+ * @author acgist
+ */
+public abstract class ProtocolMediaRoomAdapter extends ProtocolMediaAdapter {
+
+	protected ProtocolMediaRoomAdapter(String name, String signal) {
+		super(name, signal);
+	}
+	
+	@Override
+	public void execute(Message message, WebSocket webSocket) {
+		final Object body = message.getBody();
+		if(body instanceof Map<?, ?> map) {
+			this.execute(this.room(map), map, message, webSocket);
+		} else {
+			throw MessageCodeException.of("信令主体类型错误：" + message);
+		}
+	}
+	
+	@Override
+	public void execute(String sn, Client client, Message message) {
+		final Object body = message.getBody();
+		if(body instanceof Map<?, ?> map) {
+			this.execute(sn, this.room(map), map, client, message);
+		} else {
+			throw MessageCodeException.of("信令主体类型错误：" + message);
+		}
+	}
+	
+	/**
+	 * @param map 参数
+	 * 
+	 * @return 房间
+	 */
+	protected Room room(Map<?, ?> map) {
+		final Long roomId = this.roomId(map);
+		final Room room = this.roomManager.room(roomId);
+		if(room == null) {
+			throw MessageCodeException.of("房间无效：" + roomId);
+		}
+		return room;
+	}
+	
+	/**
+	 * @param map 参数
+	 * 
+	 * @return 房间ID
+	 */
+	protected Long roomId(Map<?, ?> map) {
+		final Object object = map.get(Constant.ROOM_ID);
+		if(object == null) {
+			return null;
+		} else if(object instanceof Long value) {
+			return value;
+		}
+		return Long.valueOf(object.toString());
+	}
+	
+	/**
+	 * 处理房间信令
+	 * 
+	 * @param room 房间
+	 * @param body 消息
+	 * @param message 信令消息
+	 * @param webSocket WebSocket
+	 */
+	public abstract void execute(Room room, Map<?, ?> body, Message message, WebSocket webSocket);
+	
+	/**
+	 * 处理终端信令
+	 * 
+	 * @param sn 终端标识
+	 * @param room 房间
+	 * @param body 消息
+	 * @param client 终端
+	 * @param message 信令消息
+	 */
+	public abstract void execute(String sn, Room room, Map<?, ?> body, Client client, Message message);
+	
+}
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientBroadcastProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientBroadcastProtocol.java
index 42bc6ca..cb7a3f5 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientBroadcastProtocol.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientBroadcastProtocol.java
@@ -16,12 +16,12 @@ public class ClientBroadcastProtocol extends ProtocolAdapter {
 	public static final String SIGNAL = "client::broadcast";
 	
 	public ClientBroadcastProtocol() {
-		super("广播信令", SIGNAL);
+		super("终端广播信令", SIGNAL);
 	}
 
 	@Override
 	public void execute(String sn, Client client, Message message) {
-		this.clientManager.broadcast(sn, message);
+		this.clientManager.broadcast(client, message);
 	}
 
 }
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java
index 7687c99..0ba5d21 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java
@@ -35,12 +35,13 @@ public class ClientRegisterProtocol extends ProtocolMapAdapter {
 
 	@Override
 	public void execute(String sn, Map<?, ?> body, Client client, Message message) {
+		final String clientSn = (String) body.get(Constant.SN);
 		final String username = (String) body.get(Constant.USERNAME);
 		final String password = (String) body.get(Constant.PASSWORD);
 		// 如果需要终端鉴权在此实现
 		if(this.securityService.authenticate(username, password)) {
-			log.info("终端注册：{}", sn);
-			client.authorize(sn);
+			log.info("终端注册：{}", clientSn);
+			client.authorize(clientSn);
 			message.setCode(MessageCode.CODE_0000);
 		} else {
 			message.setCode(MessageCode.CODE_3401);
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientStatusProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientStatusProtocol.java
index 00bbfdf..800400d 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientStatusProtocol.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientStatusProtocol.java
@@ -1,6 +1,7 @@
 package com.acgist.taoyao.signal.protocol.client;
 
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/AudioActiveSpeakerProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/AudioActiveSpeakerProtocol.java
new file mode 100644
index 0000000..af10f1f
--- /dev/null
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/AudioActiveSpeakerProtocol.java
@@ -0,0 +1,36 @@
+package com.acgist.taoyao.signal.protocol.media;
+
+import java.net.http.WebSocket;
+import java.util.Map;
+
+import com.acgist.taoyao.boot.annotation.Protocol;
+import com.acgist.taoyao.boot.model.Message;
+import com.acgist.taoyao.signal.client.Client;
+import com.acgist.taoyao.signal.protocol.ProtocolMediaRoomAdapter;
+import com.acgist.taoyao.signal.room.Room;
+
+/**
+ * 当前讲话终端信令
+ * 
+ * @author acgist
+ */
+@Protocol
+public class AudioActiveSpeakerProtocol extends ProtocolMediaRoomAdapter {
+
+	public static final String SIGNAL = "audio::active::speaker";
+	
+	public AudioActiveSpeakerProtocol() {
+		super("当前讲话终端信令", SIGNAL);
+	}
+
+	@Override
+	public void execute(Room room, Map<?, ?> body, Message message, WebSocket webSocket) {
+		room.broadcast(message);
+	}
+	
+	@Override
+	public void execute(String sn, Room room, Map<?, ?> body, Client client, Message message) {
+		// 忽略
+	}
+
+}
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/DisplayNameChangeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/DisplayNameChangeProtocol.java
deleted file mode 100644
index c21cd89..0000000
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/DisplayNameChangeProtocol.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.acgist.taoyao.signal.protocol.media;
-
-public class DisplayNameChangeProtocol {
-
-}
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaListProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaListProtocol.java
index a177c34..7967def 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaListProtocol.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaListProtocol.java
@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.acgist.taoyao.boot.annotation.Protocol;
 import com.acgist.taoyao.boot.model.Message;
-import com.acgist.taoyao.boot.property.WebrtcProperties;
+import com.acgist.taoyao.boot.property.MediaProperties;
 import com.acgist.taoyao.signal.client.Client;
 import com.acgist.taoyao.signal.protocol.ProtocolMapAdapter;
 
@@ -21,7 +21,7 @@ public class MediaListProtocol extends ProtocolMapAdapter {
 	public static final String SIGNAL = "media::list";
 	
 	@Autowired
-	private WebrtcProperties webrtcProperties;
+	private MediaProperties mediaProperties;
 	
 	public MediaListProtocol() {
 		super("媒体服务列表信令", SIGNAL);
@@ -29,7 +29,7 @@ public class MediaListProtocol extends ProtocolMapAdapter {
 
 	@Override
 	public void execute(String sn, Map<?, ?> body, Client client, Message message) {
-		message.setBody(this.webrtcProperties.getMediasoupList());
+		message.setBody(this.mediaProperties.getMediaServerList());
 		client.push(message);
 	}
 	
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRebootProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRebootProtocol.java
index f61de5d..037dc87 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRebootProtocol.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRebootProtocol.java
@@ -11,7 +11,7 @@ import com.acgist.taoyao.signal.protocol.ProtocolAdapter;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * 重启媒体服务信令
+ * 媒体服务重启信令
  * 
  * @author acgist
  */
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRegisterProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRegisterProtocol.java
index 5c91988..22ac387 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRegisterProtocol.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRegisterProtocol.java
@@ -5,7 +5,7 @@ import java.util.Map;
 
 import com.acgist.taoyao.boot.annotation.Protocol;
 import com.acgist.taoyao.boot.model.Message;
-import com.acgist.taoyao.boot.property.MediasoupProperties;
+import com.acgist.taoyao.boot.property.MediaServerProperties;
 import com.acgist.taoyao.signal.client.Client;
 import com.acgist.taoyao.signal.protocol.Constant;
 import com.acgist.taoyao.signal.protocol.ProtocolMediaAdapter;
@@ -30,14 +30,14 @@ public class MediaRegisterProtocol extends ProtocolMediaAdapter {
 	/**
 	 * 创建信令消息
 	 * 
-	 * @param mediasoup 媒体配置
+	 * @param mediaServerProperties 媒体服务配置
 	 * 
 	 * @return 信令消息
 	 */
-	public Message build(MediasoupProperties mediasoup) {
+	public Message build(MediaServerProperties mediaServerProperties) {
 		return super.build(Map.of(
-			Constant.USERNAME, mediasoup.getUsername(),
-			Constant.PASSWORD, mediasoup.getPassword()
+			Constant.USERNAME, mediaServerProperties.getUsername(),
+			Constant.PASSWORD, mediaServerProperties.getPassword()
 		));
 	}
 	
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/RouterRtpCapabilitiesProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/RouterRtpCapabilitiesProtocol.java
new file mode 100644
index 0000000..dab71f6
--- /dev/null
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/RouterRtpCapabilitiesProtocol.java
@@ -0,0 +1,36 @@
+package com.acgist.taoyao.signal.protocol.media;
+
+import java.net.http.WebSocket;
+import java.util.Map;
+
+import com.acgist.taoyao.boot.annotation.Protocol;
+import com.acgist.taoyao.boot.model.Message;
+import com.acgist.taoyao.signal.client.Client;
+import com.acgist.taoyao.signal.protocol.ProtocolMediaRoomAdapter;
+import com.acgist.taoyao.signal.room.Room;
+
+/**
+ * 路由RTP能力信令
+ * 
+ * @author acgist
+ */
+@Protocol
+public class RouterRtpCapabilitiesProtocol extends ProtocolMediaRoomAdapter {
+
+	public static final String SIGNAL = "router::rtp::capabilities";
+	
+	public RouterRtpCapabilitiesProtocol() {
+		super("路由RTP能力信令", SIGNAL);
+	}
+
+	@Override
+	public void execute(Room room, Map<?, ?> body, Message message, WebSocket webSocket) {
+		// 忽略
+	}
+
+	@Override
+	public void execute(String sn, Room room, Map<?, ?> body, Client client, Message message) {
+		client.push(room.sendSync(message));
+	}
+
+}
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/WebRtcTransportConnectProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/WebRtcTransportConnectProtocol.java
index 8a25b38..385e9dc 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/WebRtcTransportConnectProtocol.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/WebRtcTransportConnectProtocol.java
@@ -1,5 +1,10 @@
 package com.acgist.taoyao.signal.protocol.media;
 
+/**
+ * // TODO：推送流媒体列表
+ * 
+ * @author acgist
+ */
 public class WebRtcTransportConnectProtocol {
 
 }
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/Room.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/Room.java
index 037c49f..9dbfcac 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/Room.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/Room.java
@@ -1,25 +1,28 @@
 package com.acgist.taoyao.signal.room;
 
+import java.io.Closeable;
 import java.util.List;
+import java.util.Objects;
 
 import com.acgist.taoyao.boot.model.Message;
 import com.acgist.taoyao.signal.client.Client;
 import com.acgist.taoyao.signal.client.ClientStatus;
-import com.acgist.taoyao.signal.mediasoup.MediasoupClient;
+import com.acgist.taoyao.signal.media.MediaClient;
+import com.acgist.taoyao.signal.media.Transport;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 房间
  * 
  * @author acgist
  */
+@Slf4j
 @Getter
 @Setter
-@Schema(title = "房间", description = "房间")
-public class Room {
+public class Room implements Closeable {
 	
 	/**
 	 * ID
@@ -36,11 +39,15 @@ public class Room {
 	/**
 	 * 媒体服务
 	 */
-	private MediasoupClient mediasoupClient;
+	private MediaClient mediaClient;
 	/**
 	 * 终端列表
 	 */
 	private List<Client> clients;
+	/**
+	 * 传输通道列表
+	 */
+	private List<Transport> transports;
 	
 	/**
 	 * @return 终端状态列表
@@ -70,7 +77,7 @@ public class Room {
 	/**
 	 * 终端离开
 	 * 
-	 * @param sn 终端
+	 * @param client 终端
 	 */
 	public void leave(Client client) {
 		synchronized (this.clients) {
@@ -86,7 +93,19 @@ public class Room {
 	 * @param message 消息
 	 */
 	public void broadcast(Message message) {
-		this.clients.forEach(v -> v.push(v.sn(), message));
+		this.clients.forEach(v -> v.push(message));
+	}
+	
+	/**
+	 * 广播消息
+	 * 
+	 * @param from 发送终端
+	 * @param message 消息
+	 */
+	public void broadcast(String from, Message message) {
+		this.clients.stream()
+		.filter(v -> !Objects.equals(from, v.sn()))
+		.forEach(v -> v.push(message));
 	}
 	
 	/**
@@ -98,7 +117,27 @@ public class Room {
 	public void broadcast(Client from, Message message) {
 		this.clients.stream()
 		.filter(v -> v != from)
-		.forEach(v -> v.push(v.sn(), message));
+		.forEach(v -> v.push(message));
+	}
+	
+	/**
+	 * @see MediaClient#send(Message)
+	 */
+	public void send(Message message) {
+		this.mediaClient.send(message);
+	}
+	
+	/**
+	 * @see MediaClient#sendSync(Message)
+	 */
+	public Message sendSync(Message message) {
+		return this.mediaClient.sendSync(message);
+	}
+	
+	@Override
+	public void close() {
+		log.info("关闭房间：{}", this.id);
+		this.transports.forEach(Transport::close);
 	}
 	
 }
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/RoomManager.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/RoomManager.java
index c5c2a38..2f1aedc 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/RoomManager.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/RoomManager.java
@@ -1,16 +1,20 @@
 package com.acgist.taoyao.signal.room;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.acgist.taoyao.boot.annotation.Manager;
+import com.acgist.taoyao.boot.model.Message;
 import com.acgist.taoyao.boot.model.MessageCodeException;
 import com.acgist.taoyao.boot.service.IdService;
 import com.acgist.taoyao.signal.client.Client;
-import com.acgist.taoyao.signal.mediasoup.MediasoupClient;
-import com.acgist.taoyao.signal.mediasoup.MediasoupClientManager;
+import com.acgist.taoyao.signal.media.MediaClient;
+import com.acgist.taoyao.signal.media.MediaClientManager;
+import com.acgist.taoyao.signal.protocol.Constant;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -26,7 +30,7 @@ public class RoomManager {
 	@Autowired
 	private IdService idService;
 	@Autowired
-	private MediasoupClientManager mediasoupClientManager;
+	private MediaClientManager mediaClientManager;
 
 	/**
 	 * 房间列表
@@ -40,11 +44,18 @@ public class RoomManager {
 	 */
 	public Room room(Long id) {
 		return this.rooms.stream()
-			.filter(v -> v.getId().equals(id))
+			.filter(v -> Objects.equals(id, v.getId()))
 			.findFirst()
 			.orElse(null);
 	}
 	
+	/**
+	 * @return 所有房间列表
+	 */
+	public List<Room> rooms() {
+		return this.rooms;
+	}
+	
 	/**
 	 * @param id ID
 	 * 
@@ -55,13 +66,6 @@ public class RoomManager {
 		return room == null ? null : room.getStatus();
 	}
 	
-	/**
-	 * @return 所有房间列表
-	 */
-	public List<Room> rooms() {
-		return this.rooms;
-	}
-	
 	/**
 	 * @return 所有房间状态
 	 */
@@ -77,14 +81,15 @@ public class RoomManager {
 	 * @param sn 创建终端标识
 	 * @param name 名称
 	 * @param password 密码
-	 * @param mediasoup 媒体服务名称
+	 * @param mediaName 媒体服务名称
+	 * @param message 创建消息
 	 * 
 	 * @return 房间信息
 	 */
-	public Room create(String sn, String name, String password, String mediasoup) {
-		final MediasoupClient mediasoupClient = this.mediasoupClientManager.mediasoupClient(mediasoup);
-		if(mediasoupClient == null) {
-			throw MessageCodeException.of("无效媒体服务：" + mediasoup);
+	public Room create(String sn, String name, String password, String mediaName, Message message) {
+		final MediaClient mediaClient = this.mediaClientManager.mediaClient(mediaName);
+		if(mediaClient == null) {
+			throw MessageCodeException.of("无效媒体服务：" + mediaName);
 		}
 		final Long id = this.idService.buildId();
 		// 状态
@@ -92,18 +97,19 @@ public class RoomManager {
 		roomStatus.setId(id);
 		roomStatus.setName(name);
 		roomStatus.setSnSize(0L);
-		roomStatus.setMediasoup(mediasoup);
+		roomStatus.setMediaName(mediaName);
 		// 房间
 		final Room room = new Room();
 		room.setId(id);
 		room.setPassword(password);
 		room.setStatus(roomStatus);
-		room.setMediasoupClient(mediasoupClient);
+		room.setMediaClient(mediaClient);
 		room.setClients(new CopyOnWriteArrayList<>());
-		// 加入
-		this.rooms.add(room);
-		// TODO:媒体服务
+		// 创建媒体服务房间
+		message.setBody(Map.of(Constant.ROOM_ID, id));
+		mediaClient.sendSync(message);
 		log.info("创建房间：{}-{}", id, name);
+		this.rooms.add(room);
 		return room;
 	}
 	
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/RoomStatus.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/RoomStatus.java
index 2738384..f77c72c 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/RoomStatus.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/room/RoomStatus.java
@@ -32,6 +32,6 @@ public class RoomStatus {
 	 * 媒体服务名称
 	 */
 	@Schema(title = "媒体服务名称", description = "媒体服务名称")
-	private String mediasoup;
+	private String mediaName;
 	
 }
diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/service/impl/SecurityServiceImpl.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/service/impl/SecurityServiceImpl.java
index dd613cf..96ecace 100644
--- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/service/impl/SecurityServiceImpl.java
+++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/service/impl/SecurityServiceImpl.java
@@ -31,10 +31,6 @@ public class SecurityServiceImpl implements SecurityService {
 		if(!session.authorized()) {
 			return false;
 		}
-		// 信令终端鉴定
-		if(!session.sn().equals(message.getHeader().getSn())) {
-			return false;
-		}
 		// 信令权限鉴定
 		if(!protocol.authenticate(message)) {
 			return false;