qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] 日常优化

Browse Source
This commit is contained in:
acgist
2023-08-03 08:17:14 +08:00
parent 2a1acabcba
commit 49805077ec
7 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/ClientWrapper.java
View File

@@ -3,6 +3,7 @@ package com.acgist.taoyao.signal.party.room;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.media.DataConsumer;
@@ -118,6 +119,26 @@ public class ClientWrapper implements AutoCloseable {
.anyMatch(v -> v.getDataProducer() == dataProducer);
}
/**
* 推送消息
*
* @param message 消息
*/
public void push(Message message) {
this.client.push(message);
}
/**
* 请求消息
*
* @param message 请求
*
* @return 响应
*/
public Message request(Message message) {
return this.client.request(message);
}
@Override
public void close() {
// 注意：不要关闭终端（只是离开房间）

11
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerCloseProtocol.java
View File

@@ -27,15 +27,17 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Protocol
@Description(
memo = "关闭通过回调实现所以不能同步响应",
body = """
{
"roomId": "房间ID"
"roomId" : "房间ID"
"consumerId": "消费者ID"
}
""",
flow = {
"媒体服务->信令服务-)终端",
"终端->信令服务->媒体服务->信令服务+)终端"
"媒体服务->信令服务->终端",
"信令服务->媒体服务->信令服务->终端",
"终端->信令服务->媒体服务->信令服务->终端"
}
)
public class MediaConsumerCloseProtocol extends ProtocolRoomAdapter implements ApplicationListener<MediaConsumerCloseEvent> {
@@ -69,9 +71,8 @@ public class MediaConsumerCloseProtocol extends ProtocolRoomAdapter implements A
if(clientType.mediaClient()) {
consumer.close();
} else if(clientType.mediaServer()) {
// TODO：路由到真实消费者
consumer.remove();
room.broadcast(message);
consumer.getConsumerClient().push(message);
} else {
this.logNoAdapter(clientType);
}

18
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerPauseProtocol.java
View File

@@ -17,20 +17,23 @@ import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;
/**
* 暂停消费者信令
*
* @author acgist
*/
@Slf4j
@Protocol
@Description(
body = """
{
"roomId": "房间ID"
"roomId" : "房间ID"
"consumerId": "消费者ID"
}
""",
flow = "终端->信令服务->媒体服务->信令服务->终端"
flow = "终端=>信令服务->媒体服务"
)
public class MediaConsumerPauseProtocol extends ProtocolRoomAdapter implements ApplicationListener<MediaConsumerPauseEvent> {
@@ -54,13 +57,16 @@ public class MediaConsumerPauseProtocol extends ProtocolRoomAdapter implements A
@Override
public void execute(String clientId, ClientType clientType, Room room, Client client, Client mediaClient, Message message, Map<String, Object> body) {
final String consumerId = MapUtils.get(body, Constant.CONSUMER_ID);
final Consumer consumer = room.consumer(consumerId);
if(consumer == null) {
log.debug("消费者无效：{} - {}", consumerId, clientType);
return;
}
if(clientType.mediaClient()) {
final String consumerId = MapUtils.get(body, Constant.CONSUMER_ID);
final Consumer consumer = room.consumer(consumerId);
consumer.pause();
} else if(clientType.mediaServer()) {
// TODO：路由到真实消费者
room.broadcast(message);
consumer.getConsumerClient().push(message);
} else {
this.logNoAdapter(clientType);
}

4
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerRequestKeyFrameProtocol.java
View File

@@ -21,11 +21,11 @@ import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
@Description(
body = """
{
"roomId": "房间ID",
"roomId" : "房间ID",
"consumerId": "消费者ID"
}
""",
flow = "终端->信令服务->媒体服务->信令服务->终端"
flow = "终端->信令服务->媒体服务"
)
public class MediaConsumerRequestKeyFrameProtocol extends ProtocolRoomAdapter {

18
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerResumeProtocol.java
View File

@@ -17,20 +17,23 @@ import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;
/**
* 恢复消费者信令
*
* @author acgist
*/
@Slf4j
@Protocol
@Description(
body = """
{
"roomId": "房间ID"
"roomId" : "房间ID"
"consumerId": "消费者ID"
}
""",
flow = "终端->信令服务->媒体服务->信令服务->终端"
flow = "终端=>信令服务->媒体服务"
)
public class MediaConsumerResumeProtocol extends ProtocolRoomAdapter implements ApplicationListener<MediaConsumerResumeEvent> {
@@ -54,13 +57,16 @@ public class MediaConsumerResumeProtocol extends ProtocolRoomAdapter implements
@Override
public void execute(String clientId, ClientType clientType, Room room, Client client, Client mediaClient, Message message, Map<String, Object> body) {
final String consumerId = MapUtils.get(body, Constant.CONSUMER_ID);
final Consumer consumer = room.consumer(consumerId);
if(consumer == null) {
log.debug("消费者无效：{} - {}", consumerId, clientType);
return;
}
if(clientType.mediaClient()) {
final String consumerId = MapUtils.get(body, Constant.CONSUMER_ID);
final Consumer consumer = room.consumer(consumerId);
consumer.resume();
} else if(clientType.mediaServer()) {
// TODO：路由到真实消费者
room.broadcast(message);
consumer.getConsumerClient().push(message);
} else {
this.logNoAdapter(clientType);
}