[*] 日常优化

This commit is contained in:
acgist
2023-07-26 07:38:49 +08:00
parent d3a0767ec9
commit 877d230df2
84 changed files with 251 additions and 101 deletions

View File

@@ -1603,13 +1603,19 @@ class Taoyao {
sctpParameters: transport.sctpParameters,
};
me.push(message);
const { maxIncomingBitrate } = config.mediasoup.webRtcTransportOptions;
if (maxIncomingBitrate) {
try {
await transport.setMaxIncomingBitrate(maxIncomingBitrate);
} catch (error) {
console.error("设置最大传入比特率", maxIncomingBitrate);
const {
minOutgoingBitrate,
maxOutgoingBitrate,
maxIncomingBitrate,
} = config.mediasoup.webRtcTransportOptions;
if(minOutgoingBitrate) {
await transport.setMinOutgoingBitrate(minOutgoingBitrate);
}
if(maxOutgoingBitrate) {
await transport.setMaxOutgoingBitrate(maxOutgoingBitrate);
}
if(maxIncomingBitrate) {
await transport.setMaxIncomingBitrate(maxIncomingBitrate);
}
}

View File

@@ -0,0 +1,44 @@
package com.acgist.taoyao.boot.model;
import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants.ComponentModel;
import org.mapstruct.MappingTarget;
@Mapper(componentModel = ComponentModel.SPRING)
public interface MessageMapstruct {
/**
* 对象拷贝
*
* @param source 原始对象
*
* @return 目标对象
*/
Header copy(Header source);
/**
* 对象拷贝
*
* @param source 原始对象
* @param target 目标对象
*/
void copy(Header source, @MappingTarget Header target);
/**
* 对象拷贝
*
* @param source 原始对象
*
* @return 目标对象
*/
Message copy(Message source);
/**
* 对象拷贝
*
* @param source 原始对象
* @param target 目标对象
*/
void copy(Message source, @MappingTarget Message target);
}

View File

@@ -3,7 +3,7 @@ package com.acgist.taoyao;
import org.junit.jupiter.api.Test;
import com.acgist.taoyao.boot.config.FfmpegProperties;
import com.acgist.taoyao.signal.party.media.Recorder;
import com.acgist.taoyao.signal.party.room.Recorder;
public class RecorderTest {

View File

@@ -0,0 +1,27 @@
package com.acgist.taoyao.signal.client;
import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants.ComponentModel;
import org.mapstruct.MappingTarget;
@Mapper(componentModel = ComponentModel.SPRING)
public interface ClientMapstruct {
/**
* 对象拷贝
*
* @param source 原始对象
*
* @return 目标对象
*/
ClientStatus copy(ClientStatus source);
/**
* 对象拷贝
*
* @param source 原始对象
* @param target 目标对象
*/
void copy(ClientStatus source, @MappingTarget ClientStatus target);
}

View File

@@ -10,9 +10,9 @@ 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.party.media.Room;
import com.acgist.taoyao.signal.party.media.RoomManager;
import com.acgist.taoyao.signal.party.media.RoomStatus;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.party.room.RoomManager;
import com.acgist.taoyao.signal.party.room.RoomStatus;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;

View File

@@ -4,7 +4,7 @@ import java.util.Map;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;

View File

@@ -1,9 +1,9 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.Producer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.media;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.room;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Recorder;
import com.acgist.taoyao.signal.party.room.Recorder;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,7 +1,7 @@
package com.acgist.taoyao.signal.event.room;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
/**
* 关闭房间事件

View File

@@ -2,7 +2,7 @@ package com.acgist.taoyao.signal.event.room;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -2,7 +2,7 @@ package com.acgist.taoyao.signal.event.room;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.event.RoomEventAdapter;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -4,6 +4,8 @@ import com.acgist.taoyao.signal.event.EventPublisher;
import com.acgist.taoyao.signal.event.media.MediaConsumerCloseEvent;
import com.acgist.taoyao.signal.event.media.MediaConsumerPauseEvent;
import com.acgist.taoyao.signal.event.media.MediaConsumerResumeEvent;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -2,6 +2,8 @@ package com.acgist.taoyao.signal.party.media;
import com.acgist.taoyao.signal.event.EventPublisher;
import com.acgist.taoyao.signal.event.media.MediaDataConsumerCloseEvent;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -5,6 +5,8 @@ import java.util.concurrent.ConcurrentHashMap;
import com.acgist.taoyao.signal.event.EventPublisher;
import com.acgist.taoyao.signal.event.media.MediaDataProducerCloseEvent;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -7,6 +7,8 @@ import com.acgist.taoyao.signal.event.EventPublisher;
import com.acgist.taoyao.signal.event.media.MediaProducerCloseEvent;
import com.acgist.taoyao.signal.event.media.MediaProducerPauseEvent;
import com.acgist.taoyao.signal.event.media.MediaProducerResumeEvent;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -7,6 +7,7 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.event.EventPublisher;
import com.acgist.taoyao.signal.event.media.TransportCloseEvent;
import com.acgist.taoyao.signal.party.room.Room;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,4 +1,6 @@
/**
* 不同终端业务管理
*
* @author acgist
*/
package com.acgist.taoyao.signal.party;

View File

@@ -1,9 +1,14 @@
package com.acgist.taoyao.signal.party.media;
package com.acgist.taoyao.signal.party.room;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.media.DataConsumer;
import com.acgist.taoyao.signal.party.media.DataProducer;
import com.acgist.taoyao.signal.party.media.Producer;
import com.acgist.taoyao.signal.party.media.Transport;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.party.media;
package com.acgist.taoyao.signal.party.room;
import java.io.File;
import java.io.IOException;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.party.media;
package com.acgist.taoyao.signal.party.room;
import java.util.List;
import java.util.Map;
@@ -11,6 +11,12 @@ import com.acgist.taoyao.signal.client.ClientStatus;
import com.acgist.taoyao.signal.event.EventPublisher;
import com.acgist.taoyao.signal.event.room.RoomCloseEvent;
import com.acgist.taoyao.signal.event.room.RoomLeaveEvent;
import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.media.DataConsumer;
import com.acgist.taoyao.signal.party.media.DataProducer;
import com.acgist.taoyao.signal.party.media.OperatorAdapter;
import com.acgist.taoyao.signal.party.media.Producer;
import com.acgist.taoyao.signal.party.media.Transport;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.party.media;
package com.acgist.taoyao.signal.party.room;
import java.util.ArrayList;
import java.util.List;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.party.media;
package com.acgist.taoyao.signal.party.room;
import java.util.List;
import java.util.Map;

View File

@@ -0,0 +1,27 @@
package com.acgist.taoyao.signal.party.room;
import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants.ComponentModel;
import org.mapstruct.MappingTarget;
@Mapper(componentModel = ComponentModel.SPRING)
public interface RoomMapstruct {
/**
* 对象拷贝
*
* @param source 原始对象
*
* @return 目标对象
*/
RoomStatus copy(RoomStatus source);
/**
* 对象拷贝
*
* @param source 原始对象
* @param target 目标对象
*/
void copy(RoomStatus source, @MappingTarget RoomStatus target);
}

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.party.media;
package com.acgist.taoyao.signal.party.room;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.party.media;
package com.acgist.taoyao.signal.party.room;
/**
* 媒体路由类型

View File

@@ -1,4 +1,7 @@
package com.acgist.taoyao.signal.party.media;
package com.acgist.taoyao.signal.party.room;
import com.acgist.taoyao.signal.party.media.Kind;
import com.acgist.taoyao.signal.party.media.Producer;
/**
* 媒体订阅类型

View File

@@ -1,6 +1,7 @@
package com.acgist.taoyao.signal.party.session;
import java.io.Closeable;
import java.util.Objects;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
@@ -52,11 +53,13 @@ public class Session implements Closeable {
* @param clientId 当前终端ID
* @param message 消息
*/
public void pushOther(String clientId, Message message) {
if(this.source.getClientId().equals(clientId)) {
public void pushRemote(String clientId, Message message) {
if(Objects.equals(clientId, this.source.getClientId())) {
this.target.push(message);
} else {
} else if(Objects.equals(clientId, this.target.getClientId())) {
this.source.push(message);
} else {
// 不会出现
}
}
@@ -69,6 +72,20 @@ public class Session implements Closeable {
return this.source == client || this.target == client;
}
/**
* @return 来源终端ID
*/
public String getSourceClientId() {
return this.source == null ? null : this.source.getClientId();
}
/**
* @return 目标终端ID
*/
public String getTargetClientId() {
return this.target == null ? null : this.target.getClientId();
}
@Override
public void close() {
EventPublisher.publishEvent(new SessionCloseEvent(this));

View File

@@ -19,6 +19,10 @@ import lombok.extern.slf4j.Slf4j;
public class SessionManager {
private final IdService idService;
/**
* 会话列表
*/
private final Map<String, Session> sessions;
public SessionManager(IdService idService) {
@@ -35,7 +39,7 @@ public class SessionManager {
public Session call(Client source, Client target) {
final Session session = new Session(this.idService.buildUuid(), source, target);
this.sessions.put(session.getId(), session);
log.info("创建视频会话:{} - {} - {}", session.getId(), session.getSource().getClientId(), session.getTarget().getClientId());
log.info("创建视频会话:{} - {} - {}", session.getId(), session.getSourceClientId(), session.getTargetClientId());
return session;
}
@@ -56,7 +60,7 @@ public class SessionManager {
public Session remove(String sessionId) {
final Session session = this.sessions.remove(sessionId);
if(session != null) {
log.info("视频会话关闭{} - {} - {}", sessionId, session.getSource().getClientId(), session.getTarget().getClientId());
log.info("移除视频会话:{} - {} - {}", sessionId, session.getSourceClientId(), session.getTargetClientId());
}
return session;
}

View File

@@ -13,7 +13,7 @@ import com.acgist.taoyao.boot.model.MessageCode;
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.party.media.RoomManager;
import com.acgist.taoyao.signal.party.room.RoomManager;
import com.acgist.taoyao.signal.party.session.SessionManager;
import lombok.extern.slf4j.Slf4j;

View File

@@ -8,7 +8,7 @@ import com.acgist.taoyao.boot.model.MessageCodeException;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
/**
* 房间信令适配器

View File

@@ -17,10 +17,10 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.room.RecorderCloseEvent;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.Kind;
import com.acgist.taoyao.signal.party.media.Recorder;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Recorder;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolControlAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -15,11 +15,11 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaConsumeEvent;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.media.Producer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.media.Transport;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -14,7 +14,7 @@ import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaConsumerCloseEvent;
import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -14,7 +14,7 @@ import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaConsumerPauseEvent;
import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -8,7 +8,7 @@ import com.acgist.taoyao.boot.config.Constant;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -14,7 +14,7 @@ import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaConsumerResumeEvent;
import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -8,7 +8,7 @@ import com.acgist.taoyao.boot.config.Constant;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -10,11 +10,11 @@ import com.acgist.taoyao.boot.model.MessageCodeException;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.DataConsumer;
import com.acgist.taoyao.signal.party.media.DataProducer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.media.Transport;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -14,7 +14,7 @@ import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaDataConsumerCloseEvent;
import com.acgist.taoyao.signal.party.media.DataConsumer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -9,9 +9,9 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.DataProducer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -14,7 +14,7 @@ import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaDataProducerCloseEvent;
import com.acgist.taoyao.signal.party.media.DataProducer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -10,9 +10,9 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaConsumeEvent;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.Producer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -14,7 +14,7 @@ import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaProducerCloseEvent;
import com.acgist.taoyao.signal.party.media.Producer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -13,7 +13,7 @@ import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaProducerPauseEvent;
import com.acgist.taoyao.signal.party.media.Producer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -13,7 +13,7 @@ import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaProducerResumeEvent;
import com.acgist.taoyao.signal.party.media.Producer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -13,8 +13,8 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.TransportCloseEvent;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.media.Transport;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -12,10 +12,10 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.boot.utils.NetUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.media.Transport;
import com.acgist.taoyao.signal.party.media.Transport.Direction;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -9,7 +9,7 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -15,10 +15,10 @@ import com.acgist.taoyao.boot.utils.NetUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.media.MediaConsumeEvent;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.media.Transport;
import com.acgist.taoyao.signal.party.media.Transport.Direction;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import lombok.extern.slf4j.Slf4j;

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -9,12 +9,12 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.Consumer;
import com.acgist.taoyao.signal.party.media.Kind;
import com.acgist.taoyao.signal.party.media.Producer;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.media.RoomClientId;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.party.room.RoomClientId;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -12,7 +12,7 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.room.RoomEnterEvent;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -11,7 +11,7 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.room.RoomCloseEvent;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -13,7 +13,7 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.room.RoomCreateEvent;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolClientAdapter;
/**

View File

@@ -14,9 +14,9 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.room.RoomEnterEvent;
import com.acgist.taoyao.signal.party.media.ClientWrapper;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.media.SubscribeType;
import com.acgist.taoyao.signal.party.room.ClientWrapper;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.party.room.SubscribeType;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -9,7 +9,7 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -9,7 +9,7 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -12,7 +12,7 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.room.RoomLeaveEvent;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -7,7 +7,7 @@ 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.client.ClientType;
import com.acgist.taoyao.signal.party.media.Room;
import com.acgist.taoyao.signal.party.room.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
/**

View File

@@ -56,7 +56,7 @@ public class SessionExchangeProtocol extends ProtocolSessionAdapter {
@Override
public void execute(String clientId, ClientType clientType, Session session, Client client, Message message, Map<String, Object> body) {
session.pushOther(clientId, message);
session.pushRemote(clientId, message);
}
}

View File

@@ -35,7 +35,7 @@ public class SessionPauseProtocol extends ProtocolSessionAdapter {
@Override
public void execute(String clientId, ClientType clientType, Session session, Client client, Message message, Map<String, Object> body) {
session.pushOther(clientId, message);
session.pushRemote(clientId, message);
}
}

View File

@@ -35,7 +35,7 @@ public class SessionResumeProtocol extends ProtocolSessionAdapter {
@Override
public void execute(String clientId, ClientType clientType, Session session, Client client, Message message, Map<String, Object> body) {
session.pushOther(clientId, message);
session.pushRemote(clientId, message);
}
}