From 877d230df2d7d8c4224defd9c51c79df75fd3634 Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Wed, 26 Jul 2023 07:38:49 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E6=97=A5=E5=B8=B8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taoyao-client-media/src/Taoyao.js | 20 ++++++--- .../taoyao/boot/model/MessageMapstruct.java | 44 +++++++++++++++++++ .../java/com/acgist/taoyao/RecorderTest.java | 2 +- .../taoyao/signal/client/ClientMapstruct.java | 27 ++++++++++++ .../signal/controller/RoomController.java | 6 +-- .../taoyao/signal/event/RoomEventAdapter.java | 2 +- .../signal/event/media/MediaConsumeEvent.java | 4 +- .../event/media/MediaConsumerCloseEvent.java | 2 +- .../event/media/MediaConsumerPauseEvent.java | 2 +- .../event/media/MediaConsumerResumeEvent.java | 2 +- .../media/MediaDataConsumerCloseEvent.java | 2 +- .../media/MediaDataProducerCloseEvent.java | 2 +- .../event/media/MediaProducerCloseEvent.java | 2 +- .../event/media/MediaProducerPauseEvent.java | 2 +- .../event/media/MediaProducerResumeEvent.java | 2 +- .../event/media/TransportCloseEvent.java | 2 +- .../signal/event/room/RecorderCloseEvent.java | 2 +- .../signal/event/room/RoomCloseEvent.java | 2 +- .../signal/event/room/RoomEnterEvent.java | 2 +- .../signal/event/room/RoomLeaveEvent.java | 2 +- .../taoyao/signal/party/media/Consumer.java | 2 + .../signal/party/media/DataConsumer.java | 2 + .../signal/party/media/DataProducer.java | 2 + .../taoyao/signal/party/media/Producer.java | 2 + .../taoyao/signal/party/media/Transport.java | 1 + .../taoyao/signal/party/package-info.java | 2 + .../party/{media => room}/ClientWrapper.java | 7 ++- .../party/{media => room}/Recorder.java | 2 +- .../signal/party/{media => room}/Room.java | 8 +++- .../party/{media => room}/RoomClientId.java | 2 +- .../party/{media => room}/RoomManager.java | 2 +- .../signal/party/room/RoomMapstruct.java | 27 ++++++++++++ .../party/{media => room}/RoomStatus.java | 2 +- .../party/{media => room}/RouterType.java | 2 +- .../party/{media => room}/SubscribeType.java | 5 ++- .../taoyao/signal/party/session/Session.java | 25 +++++++++-- .../signal/party/session/SessionManager.java | 10 +++-- .../signal/protocol/ProtocolAdapter.java | 2 +- .../signal/protocol/ProtocolRoomAdapter.java | 2 +- .../control/ControlServerRecordProtocol.java | 6 +-- .../media/MediaAudioVolumeProtocol.java | 2 +- .../protocol/media/MediaConsumeProtocol.java | 4 +- .../media/MediaConsumerCloseProtocol.java | 2 +- .../media/MediaConsumerPauseProtocol.java | 2 +- .../MediaConsumerRequestKeyFrameProtocol.java | 2 +- .../media/MediaConsumerResumeProtocol.java | 2 +- .../media/MediaConsumerScoreProtocol.java | 2 +- ...diaConsumerSetPreferredLayersProtocol.java | 2 +- .../MediaConsumerSetPriorityProtocol.java | 2 +- .../media/MediaConsumerStatusProtocol.java | 2 +- .../media/MediaDataConsumeProtocol.java | 4 +- .../media/MediaDataConsumerCloseProtocol.java | 2 +- .../MediaDataConsumerStatusProtocol.java | 2 +- .../media/MediaDataProduceProtocol.java | 4 +- .../media/MediaDataProducerCloseProtocol.java | 2 +- .../MediaDataProducerStatusProtocol.java | 2 +- .../media/MediaIceRestartProtocol.java | 2 +- .../protocol/media/MediaProduceProtocol.java | 4 +- .../media/MediaProducerCloseProtocol.java | 2 +- .../media/MediaProducerPauseProtocol.java | 2 +- .../media/MediaProducerResumeProtocol.java | 2 +- .../media/MediaProducerScoreProtocol.java | 2 +- .../media/MediaProducerStatusProtocol.java | 2 +- .../MediaRouterRtpCapabilitiesProtocol.java | 2 +- .../media/MediaSetRouterTypeProtocol.java | 2 +- .../media/MediaTransportCloseProtocol.java | 2 +- .../media/MediaTransportPlainProtocol.java | 4 +- .../media/MediaTransportStatusProtocol.java | 2 +- .../MediaTransportWebRtcConnectProtocol.java | 2 +- .../MediaTransportWebRtcCreateProtocol.java | 4 +- .../MediaVideoOrientationChangeProtocol.java | 2 +- .../protocol/room/RoomBroadcastProtocol.java | 2 +- .../room/RoomClientListIdProtocol.java | 6 +-- .../protocol/room/RoomClientListProtocol.java | 2 +- .../protocol/room/RoomCloseProtocol.java | 2 +- .../protocol/room/RoomCreateProtocol.java | 2 +- .../protocol/room/RoomEnterProtocol.java | 6 +-- .../protocol/room/RoomExpelProtocol.java | 2 +- .../protocol/room/RoomInviteProtocol.java | 2 +- .../protocol/room/RoomLeaveProtocol.java | 2 +- .../protocol/room/RoomStatusProtocol.java | 2 +- .../session/SessionExchangeProtocol.java | 2 +- .../session/SessionPauseProtocol.java | 2 +- .../session/SessionResumeProtocol.java | 2 +- 84 files changed, 251 insertions(+), 101 deletions(-) create mode 100644 taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/MessageMapstruct.java create mode 100644 taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientMapstruct.java rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/{media => room}/ClientWrapper.java (92%) rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/{media => room}/Recorder.java (99%) rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/{media => room}/Room.java (96%) rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/{media => room}/RoomClientId.java (97%) rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/{media => room}/RoomManager.java (99%) create mode 100644 taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomMapstruct.java rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/{media => room}/RoomStatus.java (93%) rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/{media => room}/RouterType.java (88%) rename taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/{media => room}/SubscribeType.java (88%) diff --git a/taoyao-client-media/src/Taoyao.js b/taoyao-client-media/src/Taoyao.js index 955fa6f..dec6b16 100644 --- a/taoyao-client-media/src/Taoyao.js +++ b/taoyao-client-media/src/Taoyao.js @@ -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); } } diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/MessageMapstruct.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/MessageMapstruct.java new file mode 100644 index 0000000..42a2779 --- /dev/null +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/MessageMapstruct.java @@ -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); + +} diff --git a/taoyao-signal-server/taoyao-server/src/test/java/com/acgist/taoyao/RecorderTest.java b/taoyao-signal-server/taoyao-server/src/test/java/com/acgist/taoyao/RecorderTest.java index 08b913b..e27c092 100644 --- a/taoyao-signal-server/taoyao-server/src/test/java/com/acgist/taoyao/RecorderTest.java +++ b/taoyao-signal-server/taoyao-server/src/test/java/com/acgist/taoyao/RecorderTest.java @@ -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 { diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientMapstruct.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientMapstruct.java new file mode 100644 index 0000000..f611bdc --- /dev/null +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientMapstruct.java @@ -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); + +} 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 595f1fb..c3b4dc4 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 @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/RoomEventAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/RoomEventAdapter.java index 4621071..f99c4bd 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/RoomEventAdapter.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/RoomEventAdapter.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumeEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumeEvent.java index 0bd18ad..5698c79 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumeEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumeEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerCloseEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerCloseEvent.java index 937efcb..46c5009 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerCloseEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerCloseEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerPauseEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerPauseEvent.java index 7d00910..553d40c 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerPauseEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerPauseEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerResumeEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerResumeEvent.java index 0d29168..d34c632 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerResumeEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaConsumerResumeEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaDataConsumerCloseEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaDataConsumerCloseEvent.java index 2576c25..5a5b367 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaDataConsumerCloseEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaDataConsumerCloseEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaDataProducerCloseEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaDataProducerCloseEvent.java index 5e59210..81d777a 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaDataProducerCloseEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaDataProducerCloseEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerCloseEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerCloseEvent.java index f5c5f8d..11f75d2 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerCloseEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerCloseEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerPauseEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerPauseEvent.java index ec8403b..bb44cb0 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerPauseEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerPauseEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerResumeEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerResumeEvent.java index c1e5faa..a73ee01 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerResumeEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/MediaProducerResumeEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/TransportCloseEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/TransportCloseEvent.java index 5da5875..37768e2 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/TransportCloseEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/media/TransportCloseEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RecorderCloseEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RecorderCloseEvent.java index aaf1a75..09b4457 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RecorderCloseEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RecorderCloseEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomCloseEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomCloseEvent.java index 31c740f..1b28536 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomCloseEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomCloseEvent.java @@ -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; /** * 关闭房间事件 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomEnterEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomEnterEvent.java index ef6a99a..c6ad89d 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomEnterEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomEnterEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomLeaveEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomLeaveEvent.java index b02b00f..8e2c465 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomLeaveEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/room/RoomLeaveEvent.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Consumer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Consumer.java index ac3770a..dcc45f6 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Consumer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Consumer.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataConsumer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataConsumer.java index c619cd6..3f0bd91 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataConsumer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataConsumer.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataProducer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataProducer.java index 10180ae..73b8cea 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataProducer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataProducer.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Producer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Producer.java index 4e1acae..811c50e 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Producer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Producer.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Transport.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Transport.java index 286e024..564e7c2 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Transport.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Transport.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/package-info.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/package-info.java index 63ae9c6..bbf1839 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/package-info.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/package-info.java @@ -1,4 +1,6 @@ /** * 不同终端业务管理 + * + * @author acgist */ package com.acgist.taoyao.signal.party; \ No newline at end of file diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/ClientWrapper.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/ClientWrapper.java similarity index 92% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/ClientWrapper.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/ClientWrapper.java index 39f17ab..9d7aca1 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/ClientWrapper.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/ClientWrapper.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Recorder.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Recorder.java similarity index 99% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Recorder.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Recorder.java index e2d513f..9a0cdfe 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Recorder.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Recorder.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Room.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Room.java similarity index 96% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Room.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Room.java index 1f86cac..3d5e3bc 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Room.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Room.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomClientId.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomClientId.java similarity index 97% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomClientId.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomClientId.java index 850fe1d..fee724e 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomClientId.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomClientId.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomManager.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomManager.java similarity index 99% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomManager.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomManager.java index 43bd353..0efb37c 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomManager.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomManager.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomMapstruct.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomMapstruct.java new file mode 100644 index 0000000..afc5d68 --- /dev/null +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomMapstruct.java @@ -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); + +} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomStatus.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomStatus.java similarity index 93% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomStatus.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomStatus.java index e55beb4..74d3d16 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomStatus.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RoomStatus.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RouterType.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RouterType.java similarity index 88% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RouterType.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RouterType.java index 7d3d0ac..abbee3c 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RouterType.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/RouterType.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.party.media; +package com.acgist.taoyao.signal.party.room; /** * 媒体路由类型 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/SubscribeType.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/SubscribeType.java similarity index 88% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/SubscribeType.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/SubscribeType.java index 4476ca0..73e0e55 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/SubscribeType.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/SubscribeType.java @@ -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; /** * 媒体订阅类型 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/Session.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/Session.java index 33ccbfb..129f082 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/Session.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/Session.java @@ -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; @@ -31,7 +32,7 @@ public class Session implements Closeable { private final Client target; public Session(String id, Client source, Client target) { - this.id = id; + this.id = id; this.source = source; this.target = target; } @@ -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)); diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/SessionManager.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/SessionManager.java index 7606176..8ce8dda 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/SessionManager.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/session/SessionManager.java @@ -19,11 +19,15 @@ import lombok.extern.slf4j.Slf4j; public class SessionManager { private final IdService idService; + + /** + * 会话列表 + */ private final Map sessions; public SessionManager(IdService idService) { this.idService = idService; - this.sessions = new ConcurrentHashMap<>(); + this.sessions = new ConcurrentHashMap<>(); } /** @@ -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; } 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 5e9229f..ceb9b95 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 @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolRoomAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolRoomAdapter.java index 8ebb508..2bdde41 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolRoomAdapter.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolRoomAdapter.java @@ -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; /** * 房间信令适配器 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java index 3a70012..96adce9 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioVolumeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioVolumeProtocol.java index fc4dea4..443b2e9 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioVolumeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioVolumeProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumeProtocol.java index 475062a..695d336 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumeProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerCloseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerCloseProtocol.java index 59bf80b..62409f9 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerCloseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerCloseProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerPauseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerPauseProtocol.java index 19a37af..20f2d63 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerPauseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerPauseProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerRequestKeyFrameProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerRequestKeyFrameProtocol.java index 30051f3..59bb1b0 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerRequestKeyFrameProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerRequestKeyFrameProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerResumeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerResumeProtocol.java index 5768b8a..193f164 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerResumeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerResumeProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerScoreProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerScoreProtocol.java index 497ef89..30968af 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerScoreProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerScoreProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerSetPreferredLayersProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerSetPreferredLayersProtocol.java index 4525954..7eb2b49 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerSetPreferredLayersProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerSetPreferredLayersProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerSetPriorityProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerSetPriorityProtocol.java index ba98987..d3df007 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerSetPriorityProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerSetPriorityProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerStatusProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerStatusProtocol.java index 21fd855..f1956e1 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerStatusProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerStatusProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumeProtocol.java index 95f8d2a..907fba8 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumeProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumerCloseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumerCloseProtocol.java index 7fadb0e..6c3884f 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumerCloseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumerCloseProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumerStatusProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumerStatusProtocol.java index fe51cb9..9b6cb1a 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumerStatusProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataConsumerStatusProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProduceProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProduceProtocol.java index 60163f6..05b7b0a 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProduceProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProduceProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProducerCloseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProducerCloseProtocol.java index 32f6c5c..6f74ec3 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProducerCloseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProducerCloseProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProducerStatusProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProducerStatusProtocol.java index 201e949..12d779f 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProducerStatusProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaDataProducerStatusProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaIceRestartProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaIceRestartProtocol.java index 9d10d46..e09f703 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaIceRestartProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaIceRestartProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProduceProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProduceProtocol.java index 4ed2b95..888c794 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProduceProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProduceProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerCloseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerCloseProtocol.java index 4f43882..d44eca7 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerCloseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerCloseProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerPauseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerPauseProtocol.java index 1bfeb54..4c53d47 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerPauseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerPauseProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerResumeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerResumeProtocol.java index 691cb5e..3effeb2 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerResumeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerResumeProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerScoreProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerScoreProtocol.java index ca80223..8008f2b 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerScoreProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerScoreProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerStatusProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerStatusProtocol.java index 46683d9..27b4fd3 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerStatusProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerStatusProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRouterRtpCapabilitiesProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRouterRtpCapabilitiesProtocol.java index 902b2f7..261a742 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRouterRtpCapabilitiesProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRouterRtpCapabilitiesProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaSetRouterTypeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaSetRouterTypeProtocol.java index 9c88c09..1285fd9 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaSetRouterTypeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaSetRouterTypeProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportCloseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportCloseProtocol.java index 32195db..80b6ac8 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportCloseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportCloseProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportPlainProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportPlainProtocol.java index f62c0d6..d81f5b1 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportPlainProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportPlainProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportStatusProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportStatusProtocol.java index 314b1ff..907ae7a 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportStatusProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportStatusProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcConnectProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcConnectProtocol.java index c9a8aa3..3e85b8d 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcConnectProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcConnectProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcCreateProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcCreateProtocol.java index 884458b..37c80c5 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcCreateProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcCreateProtocol.java @@ -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; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaVideoOrientationChangeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaVideoOrientationChangeProtocol.java index a3d6f9d..7f4018b 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaVideoOrientationChangeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaVideoOrientationChangeProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomBroadcastProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomBroadcastProtocol.java index 5d6debc..51f120f 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomBroadcastProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomBroadcastProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListIdProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListIdProtocol.java index 6533bb9..9664380 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListIdProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListIdProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListProtocol.java index 6c3b617..4d54911 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomClientListProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCloseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCloseProtocol.java index ce6a384..3563ab1 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCloseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCloseProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java index afb7c82..db6561d 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomEnterProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomEnterProtocol.java index 413ff10..6560705 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomEnterProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomEnterProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomExpelProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomExpelProtocol.java index ffc34f2..82f258c 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomExpelProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomExpelProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomInviteProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomInviteProtocol.java index b4c6b04..61e136b 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomInviteProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomInviteProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomLeaveProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomLeaveProtocol.java index 70e297f..5088452 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomLeaveProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomLeaveProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomStatusProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomStatusProtocol.java index 6eb165b..4c7e252 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomStatusProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomStatusProtocol.java @@ -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; /** diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionExchangeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionExchangeProtocol.java index 20e2580..15b70a3 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionExchangeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionExchangeProtocol.java @@ -56,7 +56,7 @@ public class SessionExchangeProtocol extends ProtocolSessionAdapter { @Override public void execute(String clientId, ClientType clientType, Session session, Client client, Message message, Map body) { - session.pushOther(clientId, message); + session.pushRemote(clientId, message); } } diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionPauseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionPauseProtocol.java index 6efcfca..5550cdc 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionPauseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionPauseProtocol.java @@ -35,7 +35,7 @@ public class SessionPauseProtocol extends ProtocolSessionAdapter { @Override public void execute(String clientId, ClientType clientType, Session session, Client client, Message message, Map body) { - session.pushOther(clientId, message); + session.pushRemote(clientId, message); } } diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionResumeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionResumeProtocol.java index 558bd21..e434e06 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionResumeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionResumeProtocol.java @@ -35,7 +35,7 @@ public class SessionResumeProtocol extends ProtocolSessionAdapter { @Override public void execute(String clientId, ClientType clientType, Session session, Client client, Message message, Map body) { - session.pushOther(clientId, message); + session.pushRemote(clientId, message); } }