[*] 日常优化
This commit is contained in:
@@ -374,8 +374,11 @@ class Taoyao {
|
||||
on(message) {
|
||||
const me = this;
|
||||
// 解构
|
||||
const { header, body } = message;
|
||||
const { code, header, body } = message;
|
||||
const { id, signal } = header;
|
||||
if(code !== "0000") {
|
||||
console.warn("信令错误", message);
|
||||
}
|
||||
// 请求回调
|
||||
if (me.callbackMapping.has(id)) {
|
||||
try {
|
||||
|
||||
@@ -721,8 +721,11 @@ class Taoyao extends RemoteClient {
|
||||
*/
|
||||
async on(message) {
|
||||
const me = this;
|
||||
const { header, body } = message;
|
||||
const { id } = header;
|
||||
const { code, header, body } = message;
|
||||
const { id, signal } = header;
|
||||
if(code !== "0000") {
|
||||
console.warn("信令错误", message);
|
||||
}
|
||||
// 请求回调
|
||||
if (me.callbackMapping.has(id)) {
|
||||
try {
|
||||
@@ -2262,19 +2265,6 @@ class Taoyao extends RemoteClient {
|
||||
}));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {*} clientId 终端ID
|
||||
*
|
||||
* @returns 终端所有ID
|
||||
*/
|
||||
async roomClientListId(clientId) {
|
||||
const response = await this.request(protocol.buildMessage("room::client::list::id", {
|
||||
roomId : this.roomId,
|
||||
clientId: clientId
|
||||
}));
|
||||
return response.body;
|
||||
}
|
||||
|
||||
/**
|
||||
* 媒体回调
|
||||
*
|
||||
@@ -2818,6 +2808,21 @@ class Taoyao extends RemoteClient {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 房间终端ID集合信令
|
||||
*
|
||||
* @param {*} clientId 终端ID
|
||||
*
|
||||
* @returns 房间终端ID集合
|
||||
*/
|
||||
async roomClientListId(clientId) {
|
||||
const response = await this.request(protocol.buildMessage("room::client::list::id", {
|
||||
roomId : this.roomId,
|
||||
clientId: clientId
|
||||
}));
|
||||
return response.body;
|
||||
}
|
||||
|
||||
/**
|
||||
* 房间终端列表信令
|
||||
*
|
||||
|
||||
@@ -34,7 +34,7 @@ import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
|
||||
...
|
||||
}
|
||||
""",
|
||||
flow = "终端=>信令服务->终端"
|
||||
flow = "终端=>信令服务"
|
||||
)
|
||||
public class RoomClientListIdProtocol extends ProtocolRoomAdapter {
|
||||
|
||||
@@ -51,8 +51,10 @@ public class RoomClientListIdProtocol extends ProtocolRoomAdapter {
|
||||
final RoomClientId roomClientId = new RoomClientId();
|
||||
roomClientId.setRoomId(room.getRoomId());
|
||||
roomClientId.setClientId(queryClientId);
|
||||
// 数据生产者和消费者
|
||||
clientWrapper.getDataProducers().keySet().forEach(roomClientId.getDataProducers()::add);
|
||||
clientWrapper.getDataConsumers().keySet().forEach(roomClientId.getDataConsumers()::add);
|
||||
// 媒体生产者
|
||||
clientWrapper.getProducers().values().stream()
|
||||
.filter(v -> v.getKind() == Kind.AUDIO)
|
||||
.map(Producer::getProducerId)
|
||||
@@ -61,6 +63,7 @@ public class RoomClientListIdProtocol extends ProtocolRoomAdapter {
|
||||
.filter(v -> v.getKind() == Kind.VIDEO)
|
||||
.map(Producer::getProducerId)
|
||||
.forEach(roomClientId.getVideoProducers()::add);
|
||||
// 媒体生产者
|
||||
clientWrapper.getConsumers().values().stream()
|
||||
.filter(v -> v.getKind() == Kind.AUDIO)
|
||||
.map(Consumer::getConsumerId)
|
||||
|
||||
@@ -54,7 +54,7 @@ import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
|
||||
"""
|
||||
},
|
||||
flow = {
|
||||
"终端=>信令服务->终端",
|
||||
"终端=>信令服务",
|
||||
"终端=[进入房间]>信令服务->终端",
|
||||
}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user