diff --git a/taoyao-media-server/README.md b/taoyao-media-server/README.md index 79b17a9..31c611b 100644 --- a/taoyao-media-server/README.md +++ b/taoyao-media-server/README.md @@ -6,9 +6,6 @@ ``` sudo npm install - -# 跳过mediasoup -npm install --skip=mediasoup ``` ## Mediasoup diff --git a/taoyao-media-server/src/Server.js b/taoyao-media-server/src/Server.js index b6e23a5..55c07df 100644 --- a/taoyao-media-server/src/Server.js +++ b/taoyao-media-server/src/Server.js @@ -190,7 +190,6 @@ async function onmessage(message, session) { data.message = "授权失败"; session.send(JSON.stringify(data)); } - // 不要传递授权信息 return; } // 处理信令 diff --git a/taoyao-signal-server/README.md b/taoyao-signal-server/README.md index 1e3b02a..551ea44 100644 --- a/taoyao-signal-server/README.md +++ b/taoyao-signal-server/README.md @@ -29,6 +29,8 @@ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | taoyao-signal | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| taoyao-node | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | taoyao-boot | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ ``` diff --git a/taoyao-signal-server/taoyao-media/README.md b/taoyao-signal-server/taoyao-media/README.md index 5fcd8c5..98c7206 100644 --- a/taoyao-signal-server/taoyao-media/README.md +++ b/taoyao-signal-server/taoyao-media/README.md @@ -22,7 +22,7 @@ ### 终端 -#### 授权信息 +#### 授权信息（6000） ``` ``` diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/MediasoupClient.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/MediasoupClient.java index c529f78..0e6877f 100644 --- a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/MediasoupClient.java +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/MediasoupClient.java @@ -59,6 +59,15 @@ public class MediasoupClient { @Autowired private AuthorizeProtocol authorizeProtocol; + /** + * 最大重试次数 + */ + private static final int MAX_RETRY = 12; + + /** + * 重试次数 + */ + private int retry = 1; /** * Mediasoup WebSocket通道 */ @@ -95,7 +104,10 @@ public class MediasoupClient { .get(); } catch (InterruptedException | ExecutionException e) { log.error("连接Mediasoup异常：{}", uri, e); - this.taskSchedulerl.schedule(this::buildClient, Instant.now().plusSeconds(5)); + this.taskSchedulerl.schedule( + this::buildClient, + Instant.now().plusSeconds(Math.min(this.retry++, MAX_RETRY) * 5) + ); } } @@ -181,6 +193,8 @@ public class MediasoupClient { if(MediasoupClient.this.webSocket != null && !(MediasoupClient.this.webSocket.isInputClosed() && MediasoupClient.this.webSocket.isOutputClosed())) { MediasoupClient.this.webSocket.abort(); } + // 重置重试次数 + MediasoupClient.this.retry = 1; // 设置新的通道 MediasoupClient.this.webSocket = webSocket; // 发送授权消息 @@ -206,7 +220,10 @@ public class MediasoupClient { try { return Listener.super.onClose(webSocket, statusCode, reason); } finally { - MediasoupClient.this.taskSchedulerl.schedule(MediasoupClient.this::buildClient, Instant.now().plusSeconds(5)); + MediasoupClient.this.taskSchedulerl.schedule( + MediasoupClient.this::buildClient, + Instant.now().plusSeconds(Math.min(MediasoupClient.this.retry++, MAX_RETRY) * 5) + ); } } @@ -216,7 +233,10 @@ public class MediasoupClient { try { Listener.super.onError(webSocket, error); } finally { - MediasoupClient.this.taskSchedulerl.schedule(MediasoupClient.this::buildClient, Instant.now().plusSeconds(5)); + MediasoupClient.this.taskSchedulerl.schedule( + MediasoupClient.this::buildClient, + Instant.now().plusSeconds(Math.min(MediasoupClient.this.retry++, MAX_RETRY) * 5) + ); } } diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ApplyNetworkThrottleProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ApplyNetworkThrottleProtocol.java new file mode 100644 index 0000000..e24afa8 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ApplyNetworkThrottleProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class ApplyNetworkThrottleProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ChangeDisplayNameProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ChangeDisplayNameProtocol.java new file mode 100644 index 0000000..975ef2f --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ChangeDisplayNameProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class ChangeDisplayNameProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/CloseProducerProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/CloseProducerProtocol.java new file mode 100644 index 0000000..86913fc --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/CloseProducerProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class CloseProducerProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ConnectWebRtcTransportProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ConnectWebRtcTransportProtocol.java new file mode 100644 index 0000000..8f5bd83 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ConnectWebRtcTransportProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class ConnectWebRtcTransportProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/CreateWebRtcTransportProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/CreateWebRtcTransportProtocol.java new file mode 100644 index 0000000..8cf3b22 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/CreateWebRtcTransportProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class CreateWebRtcTransportProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetConsumerStatsProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetConsumerStatsProtocol.java new file mode 100644 index 0000000..c0e19a1 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetConsumerStatsProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class GetConsumerStatsProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetDataConsumerStatsProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetDataConsumerStatsProtocol.java new file mode 100644 index 0000000..10ba2af --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetDataConsumerStatsProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class GetDataConsumerStatsProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetDataProducerStatsProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetDataProducerStatsProtocol.java new file mode 100644 index 0000000..9f86633 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetDataProducerStatsProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class GetDataProducerStatsProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetProducerStatsProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetProducerStatsProtocol.java new file mode 100644 index 0000000..7132837 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetProducerStatsProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class GetProducerStatsProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetTransportStatsProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetTransportStatsProtocol.java new file mode 100644 index 0000000..9c6d916 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/GetTransportStatsProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class GetTransportStatsProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/NewPeerProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/NewPeerProtocol.java new file mode 100644 index 0000000..503b363 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/NewPeerProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class NewPeerProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/PauseConsumerProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/PauseConsumerProtocol.java new file mode 100644 index 0000000..6643c12 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/PauseConsumerProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class PauseConsumerProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/PauseProducerProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/PauseProducerProtocol.java new file mode 100644 index 0000000..0e5dcfb --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/PauseProducerProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class PauseProducerProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ProduceDataProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ProduceDataProtocol.java new file mode 100644 index 0000000..fd59597 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ProduceDataProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class ProduceDataProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ProduceProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ProduceProtocol.java new file mode 100644 index 0000000..f0f8e44 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ProduceProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class ProduceProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ProducerScoreProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ProducerScoreProtocol.java new file mode 100644 index 0000000..06481ea --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ProducerScoreProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class ProducerScoreProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/RequestConsumerKeyFrameProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/RequestConsumerKeyFrameProtocol.java new file mode 100644 index 0000000..5a1ec76 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/RequestConsumerKeyFrameProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class RequestConsumerKeyFrameProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ResetNetworkThrottleProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ResetNetworkThrottleProtocol.java new file mode 100644 index 0000000..24b8f16 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ResetNetworkThrottleProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class ResetNetworkThrottleProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/RestartIceProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/RestartIceProtocol.java new file mode 100644 index 0000000..b176c40 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/RestartIceProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class RestartIceProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ResumeConsumerProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ResumeConsumerProtocol.java new file mode 100644 index 0000000..5bafa8b --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ResumeConsumerProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class ResumeConsumerProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ResumeProducerProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ResumeProducerProtocol.java new file mode 100644 index 0000000..8e7294d --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/ResumeProducerProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class ResumeProducerProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/SetConsumerPreferredLayersProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/SetConsumerPreferredLayersProtocol.java new file mode 100644 index 0000000..aee56cf --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/SetConsumerPreferredLayersProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class SetConsumerPreferredLayersProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/SetConsumerPriorityProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/SetConsumerPriorityProtocol.java new file mode 100644 index 0000000..53ebe3d --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/SetConsumerPriorityProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class SetConsumerPriorityProtocol { + +} diff --git a/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/VideoorientationchangeProtocol.java b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/VideoorientationchangeProtocol.java new file mode 100644 index 0000000..bb1f123 --- /dev/null +++ b/taoyao-signal-server/taoyao-media/src/main/java/com/acgist/taoyao/mediasoup/protocol/media/VideoorientationchangeProtocol.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.mediasoup.protocol.media; + +public class VideoorientationchangeProtocol { + +} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAnswerProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAnswerProtocol.java deleted file mode 100644 index a07d997..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAnswerProtocol.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -import java.util.Map; - -import com.acgist.taoyao.boot.annotation.Protocol; -import com.acgist.taoyao.boot.model.Message; -import com.acgist.taoyao.signal.client.ClientSession; -import com.acgist.taoyao.signal.event.media.MediaAnswerEvent; -import com.acgist.taoyao.signal.protocol.ProtocolMapAdapter; - -/** - * Answer信令 - * - * @author acgist - */ -@Protocol -public class MediaAnswerProtocol extends ProtocolMapAdapter { - - public static final Integer PID = 5998; - - public MediaAnswerProtocol() { - super(PID, "Answer信令"); - } - - @Override - public void execute(String sn, Map body, Message message, ClientSession session) { - this.publishEvent(new MediaAnswerEvent(sn, body, message, session)); - } - -} \ No newline at end of file diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaCandidateProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaCandidateProtocol.java deleted file mode 100644 index fb00a02..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaCandidateProtocol.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -import java.util.Map; - -import com.acgist.taoyao.boot.annotation.Protocol; -import com.acgist.taoyao.boot.model.Message; -import com.acgist.taoyao.signal.client.ClientSession; -import com.acgist.taoyao.signal.event.media.MediaCandidateEvent; -import com.acgist.taoyao.signal.protocol.ProtocolMapAdapter; - -/** - * 候选信令 - * - * @author acgist - */ -@Protocol -public class MediaCandidateProtocol extends ProtocolMapAdapter { - - public static final Integer PID = 5999; - - public MediaCandidateProtocol() { - super(PID, "候选信令"); - } - - @Override - public void execute(String sn, Map body, Message message, ClientSession session) { - this.publishEvent(new MediaCandidateEvent(sn, body, message, session)); - } - -} \ No newline at end of file diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaOfferProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaOfferProtocol.java deleted file mode 100644 index c5c7f53..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaOfferProtocol.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -import java.util.Map; - -import com.acgist.taoyao.boot.annotation.Protocol; -import com.acgist.taoyao.boot.model.Message; -import com.acgist.taoyao.signal.client.ClientSession; -import com.acgist.taoyao.signal.event.media.MediaOfferEvent; -import com.acgist.taoyao.signal.protocol.ProtocolMapAdapter; - -/** - * Offer信令 - * - * @author acgist - */ -@Protocol -public class MediaOfferProtocol extends ProtocolMapAdapter { - - public static final Integer PID = 5997; - - public MediaOfferProtocol() { - super(PID, "Offer信令"); - } - - @Override - public void execute(String sn, Map body, Message message, ClientSession session) { - this.publishEvent(new MediaOfferEvent(sn, body, message, session)); - } - -} \ No newline at end of file diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPauseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPauseProtocol.java deleted file mode 100644 index 752d2ae..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPauseProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -public class MediaPauseProtocol { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPublishProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPublishProtocol.java deleted file mode 100644 index dbca678..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPublishProtocol.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -import java.util.Map; - -import com.acgist.taoyao.boot.annotation.Protocol; -import com.acgist.taoyao.boot.model.Message; -import com.acgist.taoyao.signal.client.ClientSession; -import com.acgist.taoyao.signal.event.media.MediaPublishEvent; -import com.acgist.taoyao.signal.protocol.ProtocolMapAdapter; - -/** - * 发布信令 - * - * @author acgist - */ -@Protocol -public class MediaPublishProtocol extends ProtocolMapAdapter { - - public static final Integer PID = 5000; - - public MediaPublishProtocol() { - super(PID, "发布信令"); - } - - @Override - public void execute(String sn, Map body, Message message, ClientSession session) { - this.publishEvent(new MediaPublishEvent(sn, body, message, session)); - } - -} \ No newline at end of file diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaResumeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaResumeProtocol.java deleted file mode 100644 index 2f85a26..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaResumeProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -public class MediaResumeProtocol { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaStartRecordProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaStartRecordProtocol.java deleted file mode 100644 index dc9637a..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaStartRecordProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -public class MediaStartRecordProtocol { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaStopRecordProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaStopRecordProtocol.java deleted file mode 100644 index 330b47d..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaStopRecordProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -public class MediaStopRecordProtocol { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaSubscribeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaSubscribeProtocol.java deleted file mode 100644 index 6796e20..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaSubscribeProtocol.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -import java.util.Map; - -import com.acgist.taoyao.boot.annotation.Protocol; -import com.acgist.taoyao.boot.model.Message; -import com.acgist.taoyao.signal.client.ClientSession; -import com.acgist.taoyao.signal.event.media.MediaSubscribeEvent; -import com.acgist.taoyao.signal.protocol.ProtocolMapAdapter; - -/** - * 订阅指令 - * - * @author acgist - */ -@Protocol -public class MediaSubscribeProtocol extends ProtocolMapAdapter { - - public static final Integer PID = 5002; - - public MediaSubscribeProtocol() { - super(PID, "订阅指令"); - } - - @Override - public void execute(String sn, Map body, Message message, ClientSession session) { - this.publishEvent(new MediaSubscribeEvent(sn, body, message, session)); - } - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaUnpublishProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaUnpublishProtocol.java deleted file mode 100644 index b0b9313..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaUnpublishProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -public class MediaUnpublishProtocol { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaUnsubscribeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaUnsubscribeProtocol.java deleted file mode 100644 index 7497057..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaUnsubscribeProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.protocol.media; - -public class MediaUnsubscribeProtocol { - -}