From dd462ca6e28c3feab77e9f9dfa69e9ac93403330 Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Fri, 3 Feb 2023 07:22:04 +0800
Subject: [PATCH] =?UTF-8?q?[+]=20=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                       |  5 +--
 .gitmodules                      |  1 +
 docs/Deploy.md                   |  4 +++
 taoyao-media-server/README.md    |  1 +
 taoyao-media-server/config.js    | 53 ++++++++++++--------------------
 taoyao-media-server/package.json |  2 +-
 6 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0abb7c8..ea015b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@
 *.classpath
 *.factorypath
 
-logs/
-target/
\ No newline at end of file
+logs
+target
+node_modules
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 3755afd..5c08316 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "taoyao-media-server/mediasoup"]
 	path = taoyao-media-server/mediasoup
 	url = git@github.com:acgist/mediasoup.git
+	branch = taoyao
diff --git a/docs/Deploy.md b/docs/Deploy.md
index e525f64..d252488 100644
--- a/docs/Deploy.md
+++ b/docs/Deploy.md
@@ -143,6 +143,10 @@ systemctl enable taoyao
 
 ## 防火墙
 
+### taoyao-media-server
+
+RTC port for ICE, DTLS, RTP, etc.：40000-49999
+
 ```
 firewall-cmd --zone=public --add-port=8888/tcp --permanent
 firewall-cmd --zone=public --add-port=45535-65535/udp --permanent
diff --git a/taoyao-media-server/README.md b/taoyao-media-server/README.md
index 7e09efd..e13caa7 100644
--- a/taoyao-media-server/README.md
+++ b/taoyao-media-server/README.md
@@ -8,6 +8,7 @@
 # 更新
 git submodule init  
 git submodule update --remote
+# git config -f .gitmodules submodule.mediasoup.branch taoyao
 
 # 编译
 
diff --git a/taoyao-media-server/config.js b/taoyao-media-server/config.js
index 250b480..66c62f7 100644
--- a/taoyao-media-server/config.js
+++ b/taoyao-media-server/config.js
@@ -5,52 +5,48 @@ const os = require('os');
 
 module.exports =
 {
-	// Listening hostname (just for `gulp live` task).
 	domain : process.env.DOMAIN || 'localhost',
-	// Signaling settings (protoo WebSocket server and HTTP API server).
-	https  :
+	// Signal
+	https :
 	{
 		listenIp   : '0.0.0.0',
-		// NOTE: Don't change listenPort (client app assumes 4443).
 		listenPort : process.env.PROTOO_LISTEN_PORT || 4443,
-		// NOTE: Set your own valid certificate files.
 		tls        :
 		{
 			cert : process.env.HTTPS_CERT_FULLCHAIN || `${__dirname}/certs/fullchain.pem`,
-			key  : process.env.HTTPS_CERT_PRIVKEY || `${__dirname}/certs/privkey.pem`
+			key  : process.env.HTTPS_CERT_PRIVKEY   || `${__dirname}/certs/privkey.pem`
 		}
 	},
-	// mediasoup settings.
+	// Mediasoup
 	mediasoup :
 	{
-		// Number of mediasoup workers to launch.
+		// 按照CPU数量配置进程数量
 		numWorkers     : Object.keys(os.cpus()).length,
-		// mediasoup WorkerSettings.
-		// See https://mediasoup.org/documentation/v3/mediasoup/api/#WorkerSettings
+		// Worker：https://mediasoup.org/documentation/v3/mediasoup/api/#WorkerSettings
 		workerSettings :
 		{
 			logLevel : 'warn',
 			logTags  :
 			[
-				'info',
+				'bwe',
 				'ice',
-				'dtls',
 				'rtp',
+				'rtx',
+				'svc',
+				'dtls',
+				'info',
+				'sctp',
 				'srtp',
 				'rtcp',
-				'rtx',
-				'bwe',
 				'score',
-				'simulcast',
-				'svc',
-				'sctp'
+				'message',
+				'simulcast'
 			],
 			rtcMinPort : process.env.MEDIASOUP_MIN_PORT || 40000,
 			rtcMaxPort : process.env.MEDIASOUP_MAX_PORT || 49999
 		},
-		// mediasoup Router options.
-		// See https://mediasoup.org/documentation/v3/mediasoup/api/#RouterOptions
-		routerOptions :
+		// Router：https://mediasoup.org/documentation/v3/mediasoup/api/#RouterOptions
+		routerOptions   :
 		{
 			mediaCodecs :
 			[
@@ -105,11 +101,7 @@ module.exports =
 				}
 			]
 		},
-		// mediasoup WebRtcServer options for WebRTC endpoints (mediasoup-client,
-		// libmediasoupclient).
-		// See https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcServerOptions
-		// NOTE: mediasoup-demo/server/lib/Room.js will increase this port for
-		// each mediasoup Worker since each Worker is a separate process.
+		// WebRtcServer：https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcServerOptions
 		webRtcServerOptions :
 		{
 			listenInfos :
@@ -128,13 +120,9 @@ module.exports =
 				}
 			],
 		},
-		// mediasoup WebRtcTransport options for WebRTC endpoints (mediasoup-client,
-		// libmediasoupclient).
-		// See https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions
+		// WebRtcTransport：https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions
 		webRtcTransportOptions :
 		{
-			// listenIps is not needed since webRtcServer is used.
-			// However passing MEDIASOUP_USE_WEBRTC_SERVER=false will change it.
 			listenIps :
 			[
 				{
@@ -145,12 +133,9 @@ module.exports =
 			initialAvailableOutgoingBitrate : 1000000,
 			minimumAvailableOutgoingBitrate : 600000,
 			maxSctpMessageSize              : 262144,
-			// Additional options that are not part of WebRtcTransportOptions.
 			maxIncomingBitrate              : 1500000
 		},
-		// mediasoup PlainTransport options for legacy RTP endpoints (FFmpeg,
-		// GStreamer).
-		// See https://mediasoup.org/documentation/v3/mediasoup/api/#PlainTransportOptions
+		// PlainTransport：https://mediasoup.org/documentation/v3/mediasoup/api/#PlainTransportOptions
 		plainTransportOptions :
 		{
 			listenIp :
diff --git a/taoyao-media-server/package.json b/taoyao-media-server/package.json
index 336520d..a117036 100644
--- a/taoyao-media-server/package.json
+++ b/taoyao-media-server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "taoyao-media",
+  "name": "taoyao-media-server",
   "author": "acgist",
   "version": "1.0.0",
   "private": true,