[+] 定义事件

taoyao-media-server/README.md

@@ -6,9 +6,6 @@
 
 ```
 sudo npm install
-
-# 跳过mediasoup
-npm install --skip=mediasoup
 ```
 
 ## Mediasoup

taoyao-media-server/src/Server.js

@@ -190,7 +190,6 @@ async function onmessage(message, session) {
         data.message = "授权失败";
         session.send(JSON.stringify(data));
       }
-      // 不要传递授权信息
       return;
     }
     // 处理信令

taoyao-signal-server/README.md

@@ -29,6 +29,8 @@
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 |                       taoyao-signal                     |
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|                       taoyao-node                       |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 |                       taoyao-boot                       |
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 ```

taoyao-signal-server/taoyao-media/README.md

@@ -22,7 +22,7 @@
 
 ### 终端
 
-#### 授权信息
+#### 授权信息（6000）
 
 ```
 ```

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)
+				);
 			}
     	}
     	

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

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 {
+
+}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAnswerProtocol.java

@@ -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));
-	}
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaCandidateProtocol.java

@@ -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));
-	}
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaOfferProtocol.java

@@ -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));
-	}
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPauseProtocol.java

@@ -1,5 +0,0 @@
-package com.acgist.taoyao.signal.protocol.media;
-
-public class MediaPauseProtocol {
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPublishProtocol.java

@@ -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));
-	}
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaResumeProtocol.java

@@ -1,5 +0,0 @@
-package com.acgist.taoyao.signal.protocol.media;
-
-public class MediaResumeProtocol {
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaStartRecordProtocol.java

@@ -1,5 +0,0 @@
-package com.acgist.taoyao.signal.protocol.media;
-
-public class MediaStartRecordProtocol {
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaStopRecordProtocol.java

@@ -1,5 +0,0 @@
-package com.acgist.taoyao.signal.protocol.media;
-
-public class MediaStopRecordProtocol {
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaSubscribeProtocol.java

@@ -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));
-	}
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaUnpublishProtocol.java

@@ -1,5 +0,0 @@
-package com.acgist.taoyao.signal.protocol.media;
-
-public class MediaUnpublishProtocol {
-
-}

taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaUnsubscribeProtocol.java

@@ -1,5 +0,0 @@
-package com.acgist.taoyao.signal.protocol.media;
-
-public class MediaUnsubscribeProtocol {
-
-}