diff --git a/README.md b/README.md index b01c9a3..73b6711 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 桃夭 -桃夭是套`WebRTC`信令服务，使用`Mediasoup`提供媒体服务，支持直播会议两种场景。 +桃夭是套基于`Mediasoup`开发的`WebRTC`音视频信令服务 ## 模块 @@ -8,7 +8,7 @@ |:--|:--|:--| |taoyao-client|终端示例|Web端终端示例| |taoyao-media-server|媒体服务|Mediasoup媒体服务| -|taoyao-signal-server|信令服务|直播会议业务逻辑| +|taoyao-signal-server|信令服务|信令业务逻辑| ## 部署 @@ -44,7 +44,7 @@ * 录制（Recorder） * 音频：降噪、混音、变声 * 视频：水印、美颜、AI识别 -* 一个信令服务多个媒体服务 -* 信令服务集群 * 信令直传 +* 信令服务集群 * 媒体交互式启动 +* 一个信令服务多个媒体服务 diff --git a/docs/sequence/Client.iuml b/docs/sequence/Client.iuml index 55a4d83..40056e2 100644 --- a/docs/sequence/Client.iuml +++ b/docs/sequence/Client.iuml @@ -30,7 +30,7 @@ Signal -> ClientA: 关闭ClientA通道 deactivate ClientA Signal -> ClientB: ClientA下线 Signal -> ClientC: ClientA下线 -Signal -> Signal: 释放ClientA资源（直播、会议、媒体） +Signal -> Signal: 释放ClientA资源（会议、媒体） deactivate Signal @enduml \ No newline at end of file diff --git a/docs/sequence/Kurento.iuml b/docs/sequence/Kurento.iuml deleted file mode 100644 index e69de29..0000000 diff --git a/docs/sequence/Live.iuml b/docs/sequence/Live.iuml deleted file mode 100644 index 2138d47..0000000 --- a/docs/sequence/Live.iuml +++ /dev/null @@ -1,32 +0,0 @@ -@startuml - -title WebRTC-Mesh - -actor ClientA as ClientA -participant "Signal" as Signal -actor ClientB as ClientB -actor ClientC as ClientC - -autonumber - -ClientA -> Signal: 进入房间 -activate ClientA -activate Signal -Signal -> ClientB: ClientA进入房间 -activate ClientB -ClientB -> Signal: 订阅ClientA -Signal -> ClientA: ClientB订阅ClientA -ClientA -> Signal: ClientA发布ClientB -Signal -> ClientB: ClientA发布 -deactivate ClientB -Signal -> ClientC: ClientA进入房间 -activate ClientC -ClientC -> Signal: 订阅ClientA -Signal -> ClientA: ClientC订阅ClientA -ClientA -> Signal: ClientA发布ClientC -Signal -> ClientC: ClientA发布 -deactivate ClientC -deactivate Signal -deactivate ClientA - -@enduml \ No newline at end of file diff --git a/docs/sequence/Media.iuml b/docs/sequence/Media.iuml deleted file mode 100644 index 2138d47..0000000 --- a/docs/sequence/Media.iuml +++ /dev/null @@ -1,32 +0,0 @@ -@startuml - -title WebRTC-Mesh - -actor ClientA as ClientA -participant "Signal" as Signal -actor ClientB as ClientB -actor ClientC as ClientC - -autonumber - -ClientA -> Signal: 进入房间 -activate ClientA -activate Signal -Signal -> ClientB: ClientA进入房间 -activate ClientB -ClientB -> Signal: 订阅ClientA -Signal -> ClientA: ClientB订阅ClientA -ClientA -> Signal: ClientA发布ClientB -Signal -> ClientB: ClientA发布 -deactivate ClientB -Signal -> ClientC: ClientA进入房间 -activate ClientC -ClientC -> Signal: 订阅ClientA -Signal -> ClientA: ClientC订阅ClientA -ClientA -> Signal: ClientA发布ClientC -Signal -> ClientC: ClientA发布 -deactivate ClientC -deactivate Signal -deactivate ClientA - -@enduml \ No newline at end of file diff --git a/docs/sequence/Mesh.iuml b/docs/sequence/Mesh.iuml deleted file mode 100644 index dec8a79..0000000 --- a/docs/sequence/Mesh.iuml +++ /dev/null @@ -1,34 +0,0 @@ -@startuml - -title WebRTC-Mesh - -actor ClientA as ClientA -participant "Signal" as Signal -actor ClientB as ClientB -actor ClientC as ClientC - -autonumber - -ClientA -> Signal: 进入房间 - -activate ClientA -activate Signal -Signal -> ClientB: ClientA进入房间 -activate ClientB -ClientB -> Signal: 订阅ClientA -Signal -> ClientA: ClientB订阅ClientA -ClientA --> Signal: ClientA发布ClientB -Signal --> ClientB: ClientA发布 -deactivate ClientB - -Signal -> ClientC: ClientA进入房间 -activate ClientC -ClientC -> Signal: 订阅ClientA -Signal -> ClientA: ClientC订阅ClientA -ClientA --> Signal: ClientA发布ClientC -Signal --> ClientC: ClientA发布 -deactivate ClientC -deactivate Signal -deactivate ClientA - -@enduml \ No newline at end of file diff --git a/docs/sequence/Moon.iuml b/docs/sequence/Moon.iuml deleted file mode 100644 index 2138d47..0000000 --- a/docs/sequence/Moon.iuml +++ /dev/null @@ -1,32 +0,0 @@ -@startuml - -title WebRTC-Mesh - -actor ClientA as ClientA -participant "Signal" as Signal -actor ClientB as ClientB -actor ClientC as ClientC - -autonumber - -ClientA -> Signal: 进入房间 -activate ClientA -activate Signal -Signal -> ClientB: ClientA进入房间 -activate ClientB -ClientB -> Signal: 订阅ClientA -Signal -> ClientA: ClientB订阅ClientA -ClientA -> Signal: ClientA发布ClientB -Signal -> ClientB: ClientA发布 -deactivate ClientB -Signal -> ClientC: ClientA进入房间 -activate ClientC -ClientC -> Signal: 订阅ClientA -Signal -> ClientA: ClientC订阅ClientA -ClientA -> Signal: ClientA发布ClientC -Signal -> ClientC: ClientA发布 -deactivate ClientC -deactivate Signal -deactivate ClientA - -@enduml \ No newline at end of file diff --git a/taoyao-client/src/static/css/style.css b/taoyao-client/src/static/css/style.css index 78ad777..f2ce5c2 100644 --- a/taoyao-client/src/static/css/style.css +++ b/taoyao-client/src/static/css/style.css @@ -21,9 +21,6 @@ input[type=text]:focus,textarea:focus,input[type=text]:hover,textarea:hover{bord input::-webkit-calendar-picker-indicator{color:#1155AA;background:none;} /**容器*/ .taoyao{text-align:center;} -/**直播*/ -.taoyao .live > .video{width:100%;height:100%;} -.taoyao .live .handler{position:fixed;width:100%;bottom:2rem;font-size:2rem;} /**会议*/ .taoyao .handler a{cursor:pointer;} .taoyao > .handler{font-size:2rem;padding:1rem 0;width:100%;} diff --git a/taoyao-client/src/static/index.html b/taoyao-client/src/static/index.html index 0b8b9ed..a0352b8 100644 --- a/taoyao-client/src/static/index.html +++ b/taoyao-client/src/static/index.html @@ -2,17 +2,127 @@ -桃夭 +会议 + + - - 直播 - 会议 +
+
+ + + + + +
+
+
+
+ +
+
+ + + +
+
+
+
+ +
+
+ + + + +
+
+
+
+ \ No newline at end of file diff --git a/taoyao-client/src/static/javascript/taoyao.js b/taoyao-client/src/static/javascript/taoyao.js index 06e1171..d7ca9ac 100644 --- a/taoyao-client/src/static/javascript/taoyao.js +++ b/taoyao-client/src/static/javascript/taoyao.js @@ -69,9 +69,6 @@ const signalConfig = { }; /** 信令协议 */ const signalProtocol = { - /** 直播信令 */ - live: { - }, /** 媒体信令 */ media: { /** 发布 */ diff --git a/taoyao-client/src/static/live.html b/taoyao-client/src/static/live.html deleted file mode 100644 index 3c54656..0000000 --- a/taoyao-client/src/static/live.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - -直播 - - - - - -
-
-
-
-
- - - - - -
-
-
- - - \ No newline at end of file diff --git a/taoyao-client/src/static/meeting.html b/taoyao-client/src/static/meeting.html deleted file mode 100644 index a0352b8..0000000 --- a/taoyao-client/src/static/meeting.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - -会议 - - - - - - -
-
- - - - - -
-
-
-
- -
-
- - - -
-
-
-
- -
-
- - - - -
-
-
-
- - - \ No newline at end of file diff --git a/taoyao-signal-server/README.md b/taoyao-signal-server/README.md index 551ea44..5cae215 100644 --- a/taoyao-signal-server/README.md +++ b/taoyao-signal-server/README.md @@ -11,13 +11,21 @@ |taoyao-signal|信令|信令服务| |taoyao-server|服务|启动服务| -### 直播 +### 会议模式 -直播、连麦、监控、视频同看 +所有人员均能视频通话对讲 -### 会议 +### 对讲模式 -会议模式、广播模式、单人对讲 +两个人员之间对讲 + +### 广播模式 + +单个人员能够讲话并且能够听到其他人员讲话，其他人员之间不能讲话。 + +### 本地视频模式 + +使用本地文件作为音频视频信息 ## 模块关系 diff --git a/taoyao-signal-server/pom.xml b/taoyao-signal-server/pom.xml index 885e259..da16192 100644 --- a/taoyao-signal-server/pom.xml +++ b/taoyao-signal-server/pom.xml @@ -17,7 +17,7 @@ https://gitee.com/acgist/taoyao taoyao - 桃夭：桃夭是套`WebRTC`信令服务，使用`Mediasoup`提供媒体服务，支持直播会议两种场景。 + 桃夭：桃夭是套基于`Mediasoup`开发的`WebRTC`音视频信令服务 2022 diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SpringDocAutoConfiguration.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SpringDocAutoConfiguration.java index 07ee513..360b3a8 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SpringDocAutoConfiguration.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/SpringDocAutoConfiguration.java @@ -36,16 +36,7 @@ public class SpringDocAutoConfiguration { private Integer port; @Autowired private TaoyaoProperties taoyaoProperties; - - @Bean - public GroupedOpenApi liveApi() { - return GroupedOpenApi.builder() - .group("live") - .displayName("直播") - .packagesToScan("com.acgist.taoyao.live") - .build(); - } - + @Bean public GroupedOpenApi meetingApi() { return GroupedOpenApi.builder() diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/Live.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/Live.java deleted file mode 100644 index 540609c..0000000 --- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/Live.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.acgist.taoyao.media.live; - -import java.util.List; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - -/** - * 直播 - * - * @author acgist - */ -@Getter -@Setter -@Schema(title = "直播", description = "直播") -public class Live { - - /** - * 直播标识 - */ - @Schema(title = "直播标识", description = "直播标识") - private String id; - /** - * 直播名称 - */ - @Schema(title = "直播名称", description = "直播名称") - private String name; - /** - * 直播密码 - */ - @Schema(title = "直播密码", description = "直播密码") - private String password; - /** - * 终端会话标识列表 - */ - @Schema(title = "终端会话标识列表", description = "终端会话标识列表") - private List sns; - /** - * 创建终端标识 - */ - @Schema(title = "创建终端标识", description = "创建终端标识") - private String creator; - - /** - * 新增终端会话标识 - * - * @param sn 终端会话标识 - */ - public void addSn(String sn) { - synchronized (this.sns) { - if(this.sns.contains(sn)) { - return; - } - this.sns.add(sn); - } - } - -} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveListenerAdapter.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveListenerAdapter.java deleted file mode 100644 index 37b29dc..0000000 --- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveListenerAdapter.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.acgist.taoyao.media.live; - -import org.springframework.beans.factory.annotation.Autowired; - -import com.acgist.taoyao.signal.event.ApplicationEventAdapter; -import com.acgist.taoyao.signal.listener.ApplicationListenerAdapter; - -/** - * 直播事件监听适配器 - * - * @param 事件泛型 - * - * @author acgist - */ -public abstract class LiveListenerAdapter extends ApplicationListenerAdapter { - - @Autowired - protected LiveManager liveManager; - -} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveManager.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveManager.java deleted file mode 100644 index 4dc1cd4..0000000 --- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/LiveManager.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.acgist.taoyao.media.live; - -import com.acgist.taoyao.boot.annotation.Manager; - -/** - * 直播管理 - * - * @author acgist - */ -@Manager -public class LiveManager { - -} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/controller/LiveController.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/controller/LiveController.java deleted file mode 100644 index 5ab0ce3..0000000 --- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/media/live/controller/LiveController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.acgist.taoyao.media.live.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -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.media.live.Live; - -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; - -/** - * 直播 - * - * @author acgist - */ -@Tag(name = "直播", description = "直播管理") -@RestController -@RequestMapping("/live") -public class LiveController { - - @Operation(summary = "直播列表", description = "直播列表") - @GetMapping("/list") - @ApiResponse(content = @Content(schema = @Schema(implementation = Live.class))) - public Message list() { - return Message.success(); - } - - @Operation(summary = "直播状态", description = "直播状态") - @GetMapping("/status/{id}") - public Message status(@PathVariable String id) { - return Message.success(); - } - - @Operation(summary = "直播终端列表", description = "直播终端列表") - @GetMapping("/list/client") - public Message listClient() { - return Message.success(); - } - -} diff --git a/taoyao-signal-server/taoyao-signal/README.md b/taoyao-signal-server/taoyao-signal/README.md index 004f1e7..f68fd2b 100644 --- a/taoyao-signal-server/taoyao-signal/README.md +++ b/taoyao-signal-server/taoyao-signal/README.md @@ -281,20 +281,6 @@ 响应所有终端状态列表 -## 直播信令（3000~3999） - -### 开启直播信令（3000） - -### 关闭直播信令（3001） - -### 直播广播信令（3002） - -### 直播终端列表信令（3997） - -### 直播状态信令（3998） - -### 直播列表信令（3999） - ## 会议信令（4000~4999） ### 创建会议信令（4000） diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/client/ClientRegisterListener.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/client/ClientRegisterListener.java index 979c43c..d7b70ab 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/client/ClientRegisterListener.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/client/ClientRegisterListener.java @@ -14,7 +14,7 @@ import com.acgist.taoyao.signal.protocol.client.ClientOnlineProtocol; /** * 终端注册监听 * - * TODO：如果已经在会议、直播中，自动推流。 + * TODO：如果已经在会议中，自动推流。 * * @author acgist */ diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Protocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Protocol.java index 81cdab5..9a06489 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Protocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Protocol.java @@ -8,10 +8,11 @@ import com.acgist.taoyao.signal.event.ApplicationEventAdapter; /** * 信令 * + * TODO：改为字符 + * * 1000~1999：平台信令 * 2000~2999：终端信令 * 3000~3999：会议信令 - * 4000~4999：直播信令 * 5000~5999：媒体信令 * 6000~6999：媒体信令（Mediasoup） * diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveClientListProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveClientListProtocol.java deleted file mode 100644 index 9cb97d4..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveClientListProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.live; - -public class LiveClientListProtocol { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveCloseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveCloseProtocol.java deleted file mode 100644 index f731a81..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveCloseProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.live; - -public class LiveCloseProtocol { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveListProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveListProtocol.java deleted file mode 100644 index 11e719f..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveListProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.live; - -public class LiveListProtocol { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveRegisterProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveRegisterProtocol.java deleted file mode 100644 index 5a36a07..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveRegisterProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.live; - -public class LiveRegisterProtocol { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveStatusProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveStatusProtocol.java deleted file mode 100644 index f5ef4a9..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/live/LiveStatusProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.live; - -public class LiveStatusProtocol { - -}