diff --git a/docs/Deploy.md b/docs/Deploy.md index 5b66967..56b0ee1 100644 --- a/docs/Deploy.md +++ b/docs/Deploy.md @@ -412,5 +412,41 @@ firewall-cmd --list-ports ## 证书 ``` -keytool -genkeypair -keyalg RSA -dname "CN=localhost, OU=acgist, O=taoyao, L=GZ, ST=GD, C=CN" -alias taoyao -validity 3650 -ext ku:c=dig,keyE -ext eku=serverAuth -ext SAN=dns:localhost,ip:127.0.0.1 -keystore taoyao.jks -keypass 123456 -storepass 123456 +mkdir /data/certs +cd /data/certs +vim server.ext + +--- +keyUsage = nonRepudiation, digitalSignature, keyEncipherment +extendedKeyUsage = serverAuth, clientAuth +subjectAltName=@SubjectAlternativeName + +[ SubjectAlternativeName ] +IP.1=127.0.0.1 +IP.2=192.168.1.100 +IP.3=192.168.1.110 +IP.4=192.168.8.100 +IP.5=192.168.8.110 +DNS.1=localhost +DNS.2=acgist.com +DNS.3=www.acgist.com +DNS.4=taoyao.acgist.com +--- + +# CA +openssl genrsa -out ca.key 2048 +openssl req -x509 -new -key ca.key -out ca.crt -days 3650 +openssl x509 -in ca.crt -subject -issuer -noout +# subject= /C=cn/ST=gd/L=gz/O=acgist/OU=acgist/CN=acgist.com +# issuer= /C=cn/ST=gd/L=gz/O=acgist/OU=acgist/CN=acgist.com + +# Server + +openssl genrsa -out server.key 2048 +openssl req -new -key server.key -out server.csr +openssl x509 -req -in server.csr -out server.crt -CA ca.crt -CAkey ca.key -CAcreateserial -days 3650 -extfile server.ext +openssl x509 -in server.crt -subject -issuer -noout +# subject= /C=cn/ST=gd/L=gz/O=acgist/OU=taoyao/CN=taoyao.acgist.com +# issuer= /C=cn/ST=gd/L=gz/O=acgist/OU=acgist/CN=acgist.com +openssl pkcs12 -export -clcerts -in server.crt -inkey server.key -out server.p12 -name taoyao ``` diff --git a/docs/Learning.md b/docs/Learning.md index 17c129d..cb9df3c 100644 --- a/docs/Learning.md +++ b/docs/Learning.md @@ -26,6 +26,7 @@ https://www.cnblogs.com/ssyfj/p/14843082.html ## 更多资料 +https://zhuanlan.zhihu.com/p/466172240 http://koca.szkingdom.com/forum/t/topic/218 http://www.manoner.com/post/音视频基础/WebRTC核心组件和协议栈/ https://blog.csdn.net/ababab12345/article/details/115585378 diff --git a/docs/certs/ca.crt b/docs/certs/ca.crt new file mode 100644 index 0000000..3c4b0e1 --- /dev/null +++ b/docs/certs/ca.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDjzCCAnegAwIBAgIJAKPjuujtbFnoMA0GCSqGSIb3DQEBCwUAMF4xCzAJBgNV +BAYTAmNuMQswCQYDVQQIDAJnZDELMAkGA1UEBwwCZ3oxDzANBgNVBAoMBmFjZ2lz +dDEPMA0GA1UECwwGYWNnaXN0MRMwEQYDVQQDDAphY2dpc3QuY29tMB4XDTIzMDIy +NzEzMzUyNloXDTMzMDIyNDEzMzUyNlowXjELMAkGA1UEBhMCY24xCzAJBgNVBAgM +AmdkMQswCQYDVQQHDAJnejEPMA0GA1UECgwGYWNnaXN0MQ8wDQYDVQQLDAZhY2dp +c3QxEzARBgNVBAMMCmFjZ2lzdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQDbt9orZnoTtzbaI9+S8uqqvi8rqOzi+b3tRHOYE+JVQNxWf8vTvKJ5 +mDDrBqICVy2SCtwkxXgrjDcRQVKK1IiDqxQ4oY6DCZetx4gQhYk9ychYsPPKnRg8 +bQEG48DM1EhmxhozUv7kaiUMS0LNODfzLTH/C25Nhgt3laGCtcIWOQliO9AVOxam +EasfYP01AfL2qahk1s5N7fK9poLpbR9BS8ZUYMxZ5xOIUcc5eithBgGvuHUv9nEY +Dart6XPC4z3YE9liwrxYwcBxztdvCA2EWeh1k0wNcrT/eJG3cuGgzsPDjI/BORq1 +DWFKJOXrWmhmIlw+VaQ6PIiD4/aQ50xfAgMBAAGjUDBOMB0GA1UdDgQWBBR98tbO +eDI9mBcuZ96keDld1w54OzAfBgNVHSMEGDAWgBR98tbOeDI9mBcuZ96keDld1w54 +OzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCavKK+pJCmWDqFNMoX +YwdRPDJS7LoCFV7C8oTkX5myCKNOi11bzlyqP/EkelubtRgaNr+GZCyhwxPiJvRx +ZrWsoWpOH8OEdADM9lU+UXR23Ufmo9jFFEL7jZ9u9OmOJWAM5xM1KqCBd5+KRvfE +oEHXdayfy6l00F+rsgaMm6IKdZcthAxVVEKO60GfwavcuvIiHVVLxW21H8BMoqd6 +Erigq7wJRRH+qm7Q5fVpmo1L7E6T2cBvGcFHKuQFdoxDlH4N6tPRDuRSODKFE//O +D1ViQY65nn35mawbz2AgUUPvWiBDYYomeKIiGl859PukeP1jwDZcECFtrhH4s1p+ +at2z +-----END CERTIFICATE----- diff --git a/docs/certs/ca.key b/docs/certs/ca.key new file mode 100644 index 0000000..ebb4f08 --- /dev/null +++ b/docs/certs/ca.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEA27faK2Z6E7c22iPfkvLqqr4vK6js4vm97URzmBPiVUDcVn/L +07yieZgw6waiAlctkgrcJMV4K4w3EUFSitSIg6sUOKGOgwmXrceIEIWJPcnIWLDz +yp0YPG0BBuPAzNRIZsYaM1L+5GolDEtCzTg38y0x/wtuTYYLd5WhgrXCFjkJYjvQ +FTsWphGrH2D9NQHy9qmoZNbOTe3yvaaC6W0fQUvGVGDMWecTiFHHOXorYQYBr7h1 +L/ZxGA2q7elzwuM92BPZYsK8WMHAcc7XbwgNhFnodZNMDXK0/3iRt3LhoM7Dw4yP +wTkatQ1hSiTl61poZiJcPlWkOjyIg+P2kOdMXwIDAQABAoIBAQC7SeS2yguVcr9X +Au05Hcfa83LSDJSghbHX5lmCcLClazxmn1jnjAwTCh/otyaySA2YR5mP3qOou0TV +eJEbtj8HvXTnMQ+Bs1OP1l2td6ac/LvCnlOximd2WpRdgxZ9gxaURJlg1oZfvfsG +l8DBngJTT1smxF+pxXFQ5kNeYACpXzDEN38paW2M4YFbEvFwp0lB1GbuozJ23RPw +lb1muYHPk8vqJHjnrJJAuX01HMB+RwOyVvLd+mdtmARga1yRFHxyoEml1APH8Kxq +KK11JsEGNOs+L8nC2NozoFxdR8OLi1p0c/n96XZevz3bSVrPddpc3YQ5Cn4ILR91 +d2d6EizBAoGBAO1aSji+KoF8hDgdNtG1QWDAd4L/E6vuzvTpmLqWnFZ3NAvhPrx7 +O5dQwXWhRnYzJu7iikeJowUPwlYz+SmnKCAhfR5bWvQPpb5/N0fna8T64QdBWa3k +YV6RUEe3jKqgZvadTSI3XrAV4m5bH6SbJXpaZKdPnxt7+yG5R1Iwg+GVAoGBAOz6 +5DHSt8JV8+L8NL59sieidwcQvKPrkcM4Dk4Tulh+U5Qvh4Yw1mfiBIq3y1irxAJM +ToaQvs/4BQHVw97t7+sgOPhe2e+H42up1ZeIGrvPuRoo/jplLcy2jM/k+Ll/ZwEG +XEAIwYEhXCmxXHqlgzpvDgZcqeP6lYn5P8uPTmEjAoGBAJQ3ZtPqRKbZd8OG0r2/ +31Sou7jMyp76ILilyt7xwCzqgVDN1pxipALIxhZLoLGdHbndM5aap3c4sRWdnQFa +xd7SqswzJif0QX8k+ANpy02VkMI0F+lUDU29lpFCWJAQXFuyPQGZ7AIvmFdrheYH +kC7IlcQ5H1VNZbRYe+YiL6jFAoGAdReqtSuG/JD3xsoTTaRR6N+PrIAKlXwKM8l4 +1/9LbfpNVcT+U8HBzuaQk/IomZGVcgU+L6NJhPzpjHSRKY+roiPzwlUrnf0o08PA +8/SeMPp8XX6vzy67KJFyli5u70kSHiGEZ2dsJV/UaA1ownkRlEfXSDF1CF6CkQAF +E5Glir0CgYEAxhcwMb1gbmdE9iFdS0J7mef7A6PBrQjNzRbqEb9+kFbUzr12LJ0j +5RJ9VXUBLwXDJ5lR1rtkdG9sgOoC5YQKVqiwpZbe9AO7a7+wSrteQKKMGBafBtVh +2VTpqC6pnVGfhKiM5nP/a89eoe9QazZSiEvJV5Q7K/yrp/lklJq4E2I= +-----END RSA PRIVATE KEY----- diff --git a/docs/certs/ca.srl b/docs/certs/ca.srl new file mode 100644 index 0000000..d9e8f10 --- /dev/null +++ b/docs/certs/ca.srl @@ -0,0 +1 @@ +C75F31B213340862 diff --git a/docs/certs/server.crt b/docs/certs/server.crt new file mode 100644 index 0000000..1efc4dc --- /dev/null +++ b/docs/certs/server.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2TCCAsGgAwIBAgIJAMdfMbITNAhiMA0GCSqGSIb3DQEBCwUAMF4xCzAJBgNV +BAYTAmNuMQswCQYDVQQIDAJnZDELMAkGA1UEBwwCZ3oxDzANBgNVBAoMBmFjZ2lz +dDEPMA0GA1UECwwGYWNnaXN0MRMwEQYDVQQDDAphY2dpc3QuY29tMB4XDTIzMDIy +NzEzMzg0OFoXDTMzMDIyNDEzMzg0OFowZTELMAkGA1UEBhMCY24xCzAJBgNVBAgM +AmdkMQswCQYDVQQHDAJnejEPMA0GA1UECgwGYWNnaXN0MQ8wDQYDVQQLDAZ0YW95 +YW8xGjAYBgNVBAMMEXRhb3lhby5hY2dpc3QuY29tMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAmeQvh6OwHR87DKvm04z1xjbHgh6fxi6y+5jMJ7K7LvPT +l+7haNB/eeSgEnHL38Naaw2cQvNkSAVPK210q574tQZW6Am2icRb9EJnMx2tKdaG +8QtTGxddScebyO++7qzf8CwECPRpsZRRp1a5ompCouDXY4VWJatXBMnZX05ZqUJH +0u6nioDwvd+YBOui4nGCxoF8tcVsidvHWx0JTfC7simyMp/5VvVYt7V4ENuU+3NT +wDF7sEW1z8Sx1ErE4NLQIyy+PpGmV+h2HgNb0Bnre+jq7v/1Ue2Irsd6xe9iHf3P +ji/mnkrRdAxd36KszFvmQjLAClJM1tRjc7gGyO8yCQIDAQABo4GSMIGPMAsGA1Ud +DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwYQYDVR0RBFow +WIcEfwAAAYcEwKgBZIcEwKgBbocEwKgIZIcEwKgIboIJbG9jYWxob3N0ggphY2dp +c3QuY29tgg53d3cuYWNnaXN0LmNvbYIRdGFveWFvLmFjZ2lzdC5jb20wDQYJKoZI +hvcNAQELBQADggEBAKDYyUUMFDchfTYwEhUWHHtUpJTzVz2opAoKjUU2yH4pT4dT +Fb1s4NAuopoU9ycX4MJaApmxMioWwQzkoBLbnr+4RPfOYR9nlU0s+dx5JcpOgJtR +6X08ZDmW2DqhfIqR89uvIOgOU0oc6nUxQ0+doihDYyuyvXkvkZLjl8hrv6phuL8e +qhtx9++4umD3RYbRsASRmB8/iYTgi7WAvFyNM9kkS5pwkJOaHN+vtKx5xpytEROT +pbdUgGdXcYzYwzqDJ7Wbe0pIKeZ97rx6mF+0/92sWhd2U54jn5M1gp1sCQqG/syd +tER+0jG77mvqkls5VCNmUE1+pOa53MvB5TuTTsA= +-----END CERTIFICATE----- diff --git a/docs/certs/server.csr b/docs/certs/server.csr new file mode 100644 index 0000000..115e83b --- /dev/null +++ b/docs/certs/server.csr @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICqjCCAZICAQAwZTELMAkGA1UEBhMCY24xCzAJBgNVBAgMAmdkMQswCQYDVQQH +DAJnejEPMA0GA1UECgwGYWNnaXN0MQ8wDQYDVQQLDAZ0YW95YW8xGjAYBgNVBAMM +EXRhb3lhby5hY2dpc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAmeQvh6OwHR87DKvm04z1xjbHgh6fxi6y+5jMJ7K7LvPTl+7haNB/eeSgEnHL +38Naaw2cQvNkSAVPK210q574tQZW6Am2icRb9EJnMx2tKdaG8QtTGxddScebyO++ +7qzf8CwECPRpsZRRp1a5ompCouDXY4VWJatXBMnZX05ZqUJH0u6nioDwvd+YBOui +4nGCxoF8tcVsidvHWx0JTfC7simyMp/5VvVYt7V4ENuU+3NTwDF7sEW1z8Sx1ErE +4NLQIyy+PpGmV+h2HgNb0Bnre+jq7v/1Ue2Irsd6xe9iHf3Pji/mnkrRdAxd36Ks +zFvmQjLAClJM1tRjc7gGyO8yCQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAC2M +KwMJv8TKM7QL6UE3skEoMhXgxwwODuIBiiloySHmRsb+fVEYcF1f+gN9UxSVwaIx +BP7sb/+xy/N9G+28QVTbVlSc1MneQRPHjlx2MQqRHhfxtJ2/Zf6qFUuR2LimuHth +HwIgQotnUbe6C2630bNeYV5mOyF/rltw0pSoaPlMG9WsNtzZJ1LYzyNp5ztXPR3W +O2MkNQ3ZWqsR7dQXdUJbgruniwfxVGKxab6wBg+GZsHjiHujEmljjt3MIwimVDT+ +Z1V/R8C1Rlk98lJY5hSVBXZ09C5hox9NAvYkGfZ+ZqupOLoPOrvux7zETsDPxzV9 +mvAXPwkT0zVn/YvUCvo= +-----END CERTIFICATE REQUEST----- diff --git a/docs/certs/server.ext b/docs/certs/server.ext new file mode 100644 index 0000000..399f686 --- /dev/null +++ b/docs/certs/server.ext @@ -0,0 +1,14 @@ +keyUsage = nonRepudiation, digitalSignature, keyEncipherment +extendedKeyUsage = serverAuth, clientAuth +subjectAltName=@SubjectAlternativeName + +[ SubjectAlternativeName ] +IP.1=127.0.0.1 +IP.2=192.168.1.100 +IP.3=192.168.1.110 +IP.4=192.168.8.100 +IP.5=192.168.8.110 +DNS.1=localhost +DNS.2=acgist.com +DNS.3=www.acgist.com +DNS.4=taoyao.acgist.com diff --git a/docs/certs/server.key b/docs/certs/server.key new file mode 100644 index 0000000..a5522dc --- /dev/null +++ b/docs/certs/server.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAmeQvh6OwHR87DKvm04z1xjbHgh6fxi6y+5jMJ7K7LvPTl+7h +aNB/eeSgEnHL38Naaw2cQvNkSAVPK210q574tQZW6Am2icRb9EJnMx2tKdaG8QtT +GxddScebyO++7qzf8CwECPRpsZRRp1a5ompCouDXY4VWJatXBMnZX05ZqUJH0u6n +ioDwvd+YBOui4nGCxoF8tcVsidvHWx0JTfC7simyMp/5VvVYt7V4ENuU+3NTwDF7 +sEW1z8Sx1ErE4NLQIyy+PpGmV+h2HgNb0Bnre+jq7v/1Ue2Irsd6xe9iHf3Pji/m +nkrRdAxd36KszFvmQjLAClJM1tRjc7gGyO8yCQIDAQABAoIBAFSpGhTO0lZTFhM0 +hrofNB6liEBnRJKsoj6Tosy8IQoFjYRqIIufGGIgiodbH0OsnxOB21Nhvut4MEO9 +5Y9812oPYMQqg8dqxQOtfES8sMTxhi8ZgdDHm8S5EVULv8hiRphEPrwGahcNd5ZN +ubZGKv6cHyJa+jei+S5jNTifS+g2+hEvKyxRdoWFaRJTPeBPr4ayJevDY8zlllh6 +APqLYuJxMrgp0J/XSlwtFZ7O83opj0dt5sZiHV1drNytZU9PMSy6krkXPVV1Ahgo +QpIFKmrWjjk5ehyyGyexFmVKWCZenrLN14oOvxgKezV7PQwAhWWlpxMLEwP+e4Nu +o1aqgAECgYEAyMWFZnB5s0R//QhQm8uZEMbauAJtIWvfjWSR1Gtb9g+ykoYOv5TB +2nG/yCrbtrDvMPYP9ZTG/dB0+PmtJQPNy+ZyIdOeeVACKAzvBQnfUKV8soSsh79+ +RI/GJXfNJ+GcJv1F5t3pEOY/xmp6aZIdTCBkjzseyJAaRLLQzZXMKAECgYEAxDlT +aSbjyeZomsaN/WSny0qT61spfYOgJyy/B5SLY6ZFRS7p60IjSeAr5LoD4pmqK4B9 +pM7KHPvWyRGkeCqx8A7rJ1VkpwapZn+Lv9SsUpyW9SWqo/0cQ0U/Hu1dBfULdypH +uQDS1xIrQqLEeA9yLyB90pEvTHHjHybZvcUxygkCgYEAjCqqGXyI2okGOedmL36S +3E2YQUMgYWboadQ+o2hYiY8oAnepMENwm0sys1KIliEsvKftOGyoCGdSYsgdA2yG +bsXyBH+zccpT1xZAgOoFiE4goplRwmwEgWVG1r2u8xrlY6sK9EUVBAFboPCRicbC +wXUT/5MsyKUiUbftYrokEAECgYEAgF/wzg5/YIu5S+ky4+CCVmHIPGY70r3WfUqs +/8yTFPKmxwhWSW/PnnlmvhFkkU9vIV7C1JvlZujsMEe2jleAakmYVvdrDksxcLlp +OGtvAe0oZeHqrbbeUrRvA1DPVyJmCeRDYCnFxqdAXiwW1WVlkqdzKduKUj0AFlVY +husIE+ECgYEAt3DPoPHcAb5PSyoWm2r1FS7j7a0tMGHSDIkUwSRRaB77g7IP1I1N +jzJmd5VZm69vwXbaxPtJ0YM5SrIq8HbBfNjJmPRinEZjkeq2vrUw8lzoTTZh35Wg +wgni/eFijGhBkSXcvDuZ2QNi3jtQtaiMwBohGNCjCtfGss/41RNpmGU= +-----END RSA PRIVATE KEY----- diff --git a/docs/certs/server.p12 b/docs/certs/server.p12 new file mode 100644 index 0000000..ae37c90 Binary files /dev/null and b/docs/certs/server.p12 differ diff --git a/taoyao-signal-server/docs/nginx/nginx.conf b/docs/nginx/nginx.conf similarity index 92% rename from taoyao-signal-server/docs/nginx/nginx.conf rename to docs/nginx/nginx.conf index eb519cf..88ef679 100644 --- a/taoyao-signal-server/docs/nginx/nginx.conf +++ b/docs/nginx/nginx.conf @@ -37,8 +37,8 @@ http { server { listen 80 default_server; listen 443 ssl default_server; - ssl_certificate /data/ssl/taoyao.acgist.pem; - ssl_certificate_key /data/ssl/taoyao.acgist.key; + ssl_certificate /data/certs/server.crt; + ssl_certificate_key /data/certs/server.key; error_page 497 https://$host:$server_port$request_uri; return 301 https://taoyao.acgist.com$request_uri; } @@ -49,8 +49,8 @@ http { access_log /var/log/nginx/taoyao.acgist.com.log main buffer=32k flush=10s; - ssl_certificate /data/ssl/taoyao.acgist.com.pem; - ssl_certificate_key /data/ssl/taoyao.acgist.com.key; + ssl_certificate /data/certs/server.crt; + ssl_certificate_key /data/certs/server.key; ssl_ciphers TLS13-AES-128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-CBC-SHA256:ECDHE-ECDSA-AES128-CBC-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; ssl_protocols TLSv1.2 TLSv1.3; ssl_session_timeout 30m; diff --git a/taoyao-client-media/README.md b/taoyao-client-media/README.md index 6022ec8..e4096a3 100644 --- a/taoyao-client-media/README.md +++ b/taoyao-client-media/README.md @@ -31,7 +31,7 @@ make -C worker ``` +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | HTTPS / WSS | | SCTP | SRTP / SRTCP | -+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ ICE / SDP / SIP +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ ICE / SDP +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | TLS | | | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ DTLS +-+-+-+-+-+-+-+-+-+ | HTTP / WS | NAT / STUN / TURN | | RTP / RTCP | @@ -44,18 +44,15 @@ make -C worker ### 协议简介 -* 会话通道：ICE/SIP/SDP +* 会话通道：ICE/SDP * 媒体通道：RTP/RTCP/SRTP/SRTCP -* RTP：实时传输协议（音频视频） -* RTCP：RTP传输控制协议（监控数据传输质量并给予数据发送方反馈） -* SCTP：流控制传输协议（自定义的应用数据传输） -* RTMP：实时消息传送协议 -* RTSP：可以控制媒体（点播） - -### ICE/SDP/SIP - -ICE信息的描述格式通常采用标准的SDP，其全称为Session Description Protocol，即会话描述协议。
-SDP只是一种信息格式的描述标准，不属于传输协议，但是可以被其他传输协议用来交换必要的信息，例如：SIP、RTSP等等。 +* SDP：会话描述协议（只是信息格式描述标准不是传输协议） +* ICE：交互式连接建立（使用标准SDP描述） +* RTP：实时传输协议 +* RTCP：RTP控制协议（监控数据传输质量提供反馈） +* SCTP：流控制传输协议 +* RTSP：实时流传输协议（依赖RTP协议实时性好适合视频聊天视频监控） +* RTMP：实时消息传输协议 ## 其他常见WebRTC媒体服务 diff --git a/taoyao-client-media/src/Config.js b/taoyao-client-media/src/Config.js index 783c7c6..94d81b6 100644 --- a/taoyao-client-media/src/Config.js +++ b/taoyao-client-media/src/Config.js @@ -117,20 +117,20 @@ module.exports = { // WebRtcServer：https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcServerOptions webRtcServerOptions: { listenInfos: [ + // UDP { protocol: "udp", ip: process.env.MEDIASOUP_LISTEN_IP || "0.0.0.0", port: 44444, - // 公网地址 - announcedIp: process.env.MEDIASOUP_ANNOUNCED_IP || "192.168.1.110", - }, - { - protocol: "tcp", - ip: process.env.MEDIASOUP_LISTEN_IP || "0.0.0.0", - port: 44444, - // 公网地址 announcedIp: process.env.MEDIASOUP_ANNOUNCED_IP || "192.168.1.110", }, + // TCP + // { + // protocol: "tcp", + // ip: process.env.MEDIASOUP_LISTEN_IP || "0.0.0.0", + // port: 44444, + // announcedIp: process.env.MEDIASOUP_ANNOUNCED_IP || "192.168.1.110", + // }, ], }, // WebRtcTransport：https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions @@ -138,7 +138,6 @@ module.exports = { listenIps: [ { ip: process.env.MEDIASOUP_LISTEN_IP || "0.0.0.0", - // 公网地址 announcedIp: process.env.MEDIASOUP_ANNOUNCED_IP || "192.168.1.110", }, ], @@ -151,7 +150,6 @@ module.exports = { plainTransportOptions: { listenIp: { ip: process.env.MEDIASOUP_LISTEN_IP || "0.0.0.0", - // 公网地址 announcedIp: process.env.MEDIASOUP_ANNOUNCED_IP || "192.168.1.110", }, maxSctpMessageSize: 262144, diff --git a/taoyao-client-media/src/Server.js b/taoyao-client-media/src/Server.js index 6966b18..a5cc552 100644 --- a/taoyao-client-media/src/Server.js +++ b/taoyao-client-media/src/Server.js @@ -44,7 +44,7 @@ async function buildMediasoupWorkers() { JSON.stringify(config.mediasoup.webRtcServerOptions) ); for (const listenInfo of webRtcServerOptions.listenInfos) { - listenInfo.port = listenInfo.port + mediasoupWorkers.length - 1; + listenInfo.port = listenInfo.port + mediasoupWorkers.length; } const webRtcServer = await worker.createWebRtcServer(webRtcServerOptions); worker.appData.webRtcServer = webRtcServer; diff --git a/taoyao-client-media/src/Signal.js b/taoyao-client-media/src/Signal.js index a714a25..de0afb7 100644 --- a/taoyao-client-media/src/Signal.js +++ b/taoyao-client-media/src/Signal.js @@ -9,15 +9,23 @@ const protocol = { // 当前索引 index: 0, // 最大索引 - maxIndex: 1000, + maxIndex: 999, + // 终端索引 + clientIndex: 99999, /** * @returns 索引 */ buildId() { - if (++this.index >= this.maxIndex) { + if (++this.index > this.maxIndex) { this.index = 0; } - return Date.now() * 1000 + this.index; + const date = new Date(); + return 100000000000000 * date.getDate() + + 1000000000000 * date.getHours() + + 10000000000 * date.getMinutes() + + 100000000 * date.getSeconds() + + 1000 * this.clientIndex + + this.index; }, /** * 生成信令消息 @@ -188,15 +196,15 @@ const signalChannel = { ); }, /** - * 推送消息 + * 异步请求 * * @param {*} message 消息 */ - push(message) { + push(message) { try { this.channel.send(JSON.stringify(message)); } catch (error) { - console.error("推送消息异常：", message, error); + console.error("异步请求异常：", message, error); } }, /** @@ -375,6 +383,9 @@ class Signal { case "client::shutdown": this.clientShutdown(message, body); break; + case "client::register": + protocol.clientIndex = body.index; + break; case "media::ice::restart": this.mediaIceRestart(message, body); break; @@ -400,15 +411,19 @@ class Signal { } /** - * 通知信令 + * 异步请求 * * @param {*} message 消息 */ push(message) { - signalChannel.push(message); + try { + signalChannel.channel.send(JSON.stringify(message)); + } catch (error) { + console.error("异步请求异常：", message, error); + } } - /** + /** * 同步请求 * * @param {*} message 消息 @@ -416,24 +431,24 @@ class Signal { * @returns Promise */ async request(message) { - const self = this; + const me = this; return new Promise((resolve, reject) => { let done = false; // 注册回调 - self.callbackMapping.set(message.header.id, (response) => { + me.callbackMapping.set(message.header.id, (response) => { resolve(response); done = true; }); // 发送消息 try { - self.channel.send(JSON.stringify(message)); + signalChannel.channel.send(JSON.stringify(message)); } catch (error) { - console.error("请求消息异常：", message, error); + reject("同步请求异常", error); } // 设置超时 setTimeout(() => { if (!done) { - self.callbackMapping.delete(message.header.id); + me.callbackMapping.delete(message.header.id); reject("请求超时", message); } }, 5000); diff --git a/taoyao-client-web/src/App.vue b/taoyao-client-web/src/App.vue index f925729..0795c0a 100644 --- a/taoyao-client-web/src/App.vue +++ b/taoyao-client-web/src/App.vue @@ -83,7 +83,7 @@
连接信令 - 选择房间 + 选择房间 创建房间 邀请终端 退出房间 @@ -212,7 +212,7 @@ export default { .menus{width:100%;top:1rem;left:0;text-align:center;position:fixed;z-index:1;} .clients{width:100%;height:100%;top:0;left:0;position:fixed;} .client{float:left;width:50vw;height:50vh;box-shadow:0 0 1px 0px rgba(0,0,0,0.4);} -.client .buttons{width:100%;bottom:1rem;left:0;text-align:center;position:absolute;padding:0.8rem 0;background: rgba(0,0,0,0.4);text-align:center;} +.client .buttons{width:100%;bottom:1rem;left:0;text-align:center;position:absolute;padding:0.8rem 0;background:rgba(0,0,0,0.4);} .client audio{display:none;} .client video{width:100%;height:100%;} \ No newline at end of file diff --git a/taoyao-client-web/src/certs/server.crt b/taoyao-client-web/src/certs/server.crt new file mode 100644 index 0000000..1efc4dc --- /dev/null +++ b/taoyao-client-web/src/certs/server.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2TCCAsGgAwIBAgIJAMdfMbITNAhiMA0GCSqGSIb3DQEBCwUAMF4xCzAJBgNV +BAYTAmNuMQswCQYDVQQIDAJnZDELMAkGA1UEBwwCZ3oxDzANBgNVBAoMBmFjZ2lz +dDEPMA0GA1UECwwGYWNnaXN0MRMwEQYDVQQDDAphY2dpc3QuY29tMB4XDTIzMDIy +NzEzMzg0OFoXDTMzMDIyNDEzMzg0OFowZTELMAkGA1UEBhMCY24xCzAJBgNVBAgM +AmdkMQswCQYDVQQHDAJnejEPMA0GA1UECgwGYWNnaXN0MQ8wDQYDVQQLDAZ0YW95 +YW8xGjAYBgNVBAMMEXRhb3lhby5hY2dpc3QuY29tMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAmeQvh6OwHR87DKvm04z1xjbHgh6fxi6y+5jMJ7K7LvPT +l+7haNB/eeSgEnHL38Naaw2cQvNkSAVPK210q574tQZW6Am2icRb9EJnMx2tKdaG +8QtTGxddScebyO++7qzf8CwECPRpsZRRp1a5ompCouDXY4VWJatXBMnZX05ZqUJH +0u6nioDwvd+YBOui4nGCxoF8tcVsidvHWx0JTfC7simyMp/5VvVYt7V4ENuU+3NT +wDF7sEW1z8Sx1ErE4NLQIyy+PpGmV+h2HgNb0Bnre+jq7v/1Ue2Irsd6xe9iHf3P +ji/mnkrRdAxd36KszFvmQjLAClJM1tRjc7gGyO8yCQIDAQABo4GSMIGPMAsGA1Ud +DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwYQYDVR0RBFow +WIcEfwAAAYcEwKgBZIcEwKgBbocEwKgIZIcEwKgIboIJbG9jYWxob3N0ggphY2dp +c3QuY29tgg53d3cuYWNnaXN0LmNvbYIRdGFveWFvLmFjZ2lzdC5jb20wDQYJKoZI +hvcNAQELBQADggEBAKDYyUUMFDchfTYwEhUWHHtUpJTzVz2opAoKjUU2yH4pT4dT +Fb1s4NAuopoU9ycX4MJaApmxMioWwQzkoBLbnr+4RPfOYR9nlU0s+dx5JcpOgJtR +6X08ZDmW2DqhfIqR89uvIOgOU0oc6nUxQ0+doihDYyuyvXkvkZLjl8hrv6phuL8e +qhtx9++4umD3RYbRsASRmB8/iYTgi7WAvFyNM9kkS5pwkJOaHN+vtKx5xpytEROT +pbdUgGdXcYzYwzqDJ7Wbe0pIKeZ97rx6mF+0/92sWhd2U54jn5M1gp1sCQqG/syd +tER+0jG77mvqkls5VCNmUE1+pOa53MvB5TuTTsA= +-----END CERTIFICATE----- diff --git a/taoyao-client-web/src/certs/server.key b/taoyao-client-web/src/certs/server.key new file mode 100644 index 0000000..a5522dc --- /dev/null +++ b/taoyao-client-web/src/certs/server.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAmeQvh6OwHR87DKvm04z1xjbHgh6fxi6y+5jMJ7K7LvPTl+7h +aNB/eeSgEnHL38Naaw2cQvNkSAVPK210q574tQZW6Am2icRb9EJnMx2tKdaG8QtT +GxddScebyO++7qzf8CwECPRpsZRRp1a5ompCouDXY4VWJatXBMnZX05ZqUJH0u6n +ioDwvd+YBOui4nGCxoF8tcVsidvHWx0JTfC7simyMp/5VvVYt7V4ENuU+3NTwDF7 +sEW1z8Sx1ErE4NLQIyy+PpGmV+h2HgNb0Bnre+jq7v/1Ue2Irsd6xe9iHf3Pji/m +nkrRdAxd36KszFvmQjLAClJM1tRjc7gGyO8yCQIDAQABAoIBAFSpGhTO0lZTFhM0 +hrofNB6liEBnRJKsoj6Tosy8IQoFjYRqIIufGGIgiodbH0OsnxOB21Nhvut4MEO9 +5Y9812oPYMQqg8dqxQOtfES8sMTxhi8ZgdDHm8S5EVULv8hiRphEPrwGahcNd5ZN +ubZGKv6cHyJa+jei+S5jNTifS+g2+hEvKyxRdoWFaRJTPeBPr4ayJevDY8zlllh6 +APqLYuJxMrgp0J/XSlwtFZ7O83opj0dt5sZiHV1drNytZU9PMSy6krkXPVV1Ahgo +QpIFKmrWjjk5ehyyGyexFmVKWCZenrLN14oOvxgKezV7PQwAhWWlpxMLEwP+e4Nu +o1aqgAECgYEAyMWFZnB5s0R//QhQm8uZEMbauAJtIWvfjWSR1Gtb9g+ykoYOv5TB +2nG/yCrbtrDvMPYP9ZTG/dB0+PmtJQPNy+ZyIdOeeVACKAzvBQnfUKV8soSsh79+ +RI/GJXfNJ+GcJv1F5t3pEOY/xmp6aZIdTCBkjzseyJAaRLLQzZXMKAECgYEAxDlT +aSbjyeZomsaN/WSny0qT61spfYOgJyy/B5SLY6ZFRS7p60IjSeAr5LoD4pmqK4B9 +pM7KHPvWyRGkeCqx8A7rJ1VkpwapZn+Lv9SsUpyW9SWqo/0cQ0U/Hu1dBfULdypH +uQDS1xIrQqLEeA9yLyB90pEvTHHjHybZvcUxygkCgYEAjCqqGXyI2okGOedmL36S +3E2YQUMgYWboadQ+o2hYiY8oAnepMENwm0sys1KIliEsvKftOGyoCGdSYsgdA2yG +bsXyBH+zccpT1xZAgOoFiE4goplRwmwEgWVG1r2u8xrlY6sK9EUVBAFboPCRicbC +wXUT/5MsyKUiUbftYrokEAECgYEAgF/wzg5/YIu5S+ky4+CCVmHIPGY70r3WfUqs +/8yTFPKmxwhWSW/PnnlmvhFkkU9vIV7C1JvlZujsMEe2jleAakmYVvdrDksxcLlp +OGtvAe0oZeHqrbbeUrRvA1DPVyJmCeRDYCnFxqdAXiwW1WVlkqdzKduKUj0AFlVY +husIE+ECgYEAt3DPoPHcAb5PSyoWm2r1FS7j7a0tMGHSDIkUwSRRaB77g7IP1I1N +jzJmd5VZm69vwXbaxPtJ0YM5SrIq8HbBfNjJmPRinEZjkeq2vrUw8lzoTTZh35Wg +wgni/eFijGhBkSXcvDuZ2QNi3jtQtaiMwBohGNCjCtfGss/41RNpmGU= +-----END RSA PRIVATE KEY----- diff --git a/taoyao-client-web/src/components/Config.js b/taoyao-client-web/src/components/Config.js index 437a453..5ec301e 100644 --- a/taoyao-client-web/src/components/Config.js +++ b/taoyao-client-web/src/components/Config.js @@ -1,44 +1,3 @@ -/** - * 信令 - */ -const protocol = { - // 当前索引 - index: 0, - // 最大索引 - maxIndex: 1000, - /** - * @returns 索引 - */ - buildId() { - if (++this.index >= this.maxIndex) { - this.index = 0; - } - return Date.now() * 1000 + this.index; - }, - /** - * @param {*} signal 信令标识 - * @param {*} body 消息主体 - * @param {*} id 消息标识 - * @param {*} v 消息版本 - * - * @returns 信令消息 - */ - buildMessage(signal, body = {}, id, v) { - if (!signal) { - throw new Error("信令标识缺失"); - } - const message = { - header: { - v: v || "1.0.0", - id: id || this.buildId(), - signal: signal, - }, - body: body, - }; - return message; - }, -}; - /** * 音频默认配置 */ @@ -97,8 +56,23 @@ const defaultRTCPeerConnectionConfig = { iceCandidatePoolSize: 8, }; +/** + * VP9 + */ +const ksvcEncodings = [{ scalabilityMode: "S3T3_KEY" }]; + +/** + * simulcast + */ +const simulcastEncodings = [ + { scaleResolutionDownBy: 4, maxBitrate: 500000, scalabilityMode: "S1T2" }, + { scaleResolutionDownBy: 2, maxBitrate: 1000000, scalabilityMode: "S1T2" }, + { scaleResolutionDownBy: 1, maxBitrate: 5000000, scalabilityMode: "S1T2" }, +]; + export { - protocol, + ksvcEncodings, + simulcastEncodings, defaultAudioConfig, defaultVideoConfig, defaultRTCPeerConnectionConfig, diff --git a/taoyao-client-web/src/components/Taoyao.js b/taoyao-client-web/src/components/Taoyao.js index 7c6fe62..3cf36c2 100644 --- a/taoyao-client-web/src/components/Taoyao.js +++ b/taoyao-client-web/src/components/Taoyao.js @@ -3,21 +3,61 @@ */ import * as mediasoupClient from "mediasoup-client"; import { - protocol, + ksvcEncodings, + simulcastEncodings, defaultAudioConfig, defaultVideoConfig, defaultRTCPeerConnectionConfig, } from "./Config.js"; -// Used for simulcast webcam video. -const WEBCAM_SIMULCAST_ENCODINGS = [ - { scaleResolutionDownBy: 4, maxBitrate: 500000, scalabilityMode: "S1T2" }, - { scaleResolutionDownBy: 2, maxBitrate: 1000000, scalabilityMode: "S1T2" }, - { scaleResolutionDownBy: 1, maxBitrate: 5000000, scalabilityMode: "S1T2" }, -]; - -// Used for VP9 webcam video. -const WEBCAM_KSVC_ENCODINGS = [{ scalabilityMode: "S3T3_KEY" }]; +/** + * 信令 + */ +const protocol = { + // 当前索引 + index: 0, + // 最大索引 + maxIndex: 999, + // 终端索引 + clientIndex: 99999, + /** + * @returns 索引 + */ + buildId() { + if (++this.index > this.maxIndex) { + this.index = 0; + } + const date = new Date(); + return 100000000000000 * date.getDate() + + 1000000000000 * date.getHours() + + 10000000000 * date.getMinutes() + + 100000000 * date.getSeconds() + + 1000 * this.clientIndex + + this.index; + }, + /** + * @param {*} signal 信令标识 + * @param {*} body 消息主体 + * @param {*} id 消息标识 + * @param {*} v 消息版本 + * + * @returns 信令消息 + */ + buildMessage(signal, body = {}, id, v) { + if (!signal) { + throw new Error("信令标识缺失"); + } + const message = { + header: { + v: v || "1.0.0", + id: id || this.buildId(), + signal: signal, + }, + body: body, + }; + return message; + }, +}; /** * 信令通道 @@ -29,8 +69,6 @@ const signalChannel = { channel: null, // 地址 address: null, - // 请求回调 - callbackMapping: new Map(), // 心跳时间 heartbeatTime: 30 * 1000, // 心跳定时器 @@ -76,12 +114,11 @@ const signalChannel = { * 连接 * * @param {*} address 地址 - * @param {*} callback 回调 * @param {*} reconnection 是否重连 * * @returns Promise */ - async connect(address, callback, reconnection = true) { + async connect(address, reconnection = true) { const self = this; if (self.channel && self.channel.readyState === WebSocket.OPEN) { return new Promise((resolve, reject) => { @@ -89,7 +126,6 @@ const signalChannel = { }); } self.address = address; - self.callback = callback; self.reconnection = reconnection; return new Promise((resolve, reject) => { console.debug("连接信令通道：", self.address); @@ -132,36 +168,12 @@ const signalChannel = { } // 不要失败回调 }; - /** - * 回调策略： - * 1. 如果注册请求回调，同时执行结果返回true不再执行后面所有回调。 - * 2. 执行前置回调 - * 3. 如果注册全局回调，同时执行结果返回true不再执行后面所有回调。 - * 3. 执行后置回调 - */ self.channel.onmessage = async function (e) { console.debug("信令通道消息：", e.data); - let done = false; - const message = JSON.parse(e.data); - // 请求回调 - if (self.callbackMapping.has(message.header.id)) { - try { - done = self.callbackMapping.get(message.header.id)(message); - } finally { - self.callbackMapping.delete(message.header.id); - } - } - // 前置回调 - if (!done) { - await self.taoyao.preCallback(message); - } - // 全局回调 - if (!done && self.callback) { - done = await self.taoyao.callback(message); - } - // 后置回调 - if (!done) { - await self.taoyao.postCallback(message); + try { + self.taoyao.on(JSON.parse(e.data)); + } catch (error) { + console.error("处理信令消息异常：", message, error); } }; }); @@ -184,7 +196,7 @@ const signalChannel = { // 定时重连 self.reconnectTimer = setTimeout(function () { console.info("信令通道重连：", self.address); - self.connect(self.address, self.callback, self.reconnection); + self.connect(self.address, self.reconnection); self.lockReconnect = false; }, self.connectionTimeout); self.connectionTimeout = Math.min( @@ -196,54 +208,15 @@ const signalChannel = { * 异步请求 * * @param {*} message 消息 - * @param {*} callback 回调 */ - push(message, callback) { - const self = this; - // 注册回调 - if (callback) { - self.callbackMapping.set(message.header.id, callback); - } + push(message, callback) { // 发送消息 try { - self.channel.send(JSON.stringify(message)); + signalChannel.channel.send(JSON.stringify(message)); } catch (error) { - console.error("推送消息异常：", message, error); + console.error("异步请求异常：", message, error); } }, - /** - * 同步请求 - * - * @param {*} message 消息 - * - * @returns Promise - */ - async request(message) { - const self = this; - return new Promise((resolve, reject) => { - let done = false; - // 注册回调 - self.callbackMapping.set(message.header.id, (response) => { - resolve(response); - done = true; - // 返回true不要继续执行回调 - return true; - }); - // 发送消息 - try { - self.channel.send(JSON.stringify(message)); - } catch (error) { - console.error("请求消息异常：", message, error); - } - // 设置超时 - setTimeout(() => { - if (!done) { - self.callbackMapping.delete(message.header.id); - reject("请求超时", message); - } - }, 5000); - }); - }, /** * 关闭通道 */ @@ -276,16 +249,14 @@ class Taoyao { callback; // 媒体回调 callbackMedia; + // 请求回调 + callbackMapping = new Map(); // 音频媒体配置 audio; // 视频媒体配置 video; // WebRTC配置 webrtc; - // 发送信令 - push; - // 请求信令 - request; // 信令通道 signalChannel; // 发送媒体通道 @@ -306,7 +277,7 @@ class Taoyao { forceVP9; // 强制使用H264 forceH264; - // + // 同时上送多种质量媒体 useSimulcast; // 是否生产数据 dataProduce; @@ -367,17 +338,89 @@ class Taoyao { self.callbackMedia = callbackMedia; self.signalChannel = signalChannel; signalChannel.taoyao = self; - // 不能直接this.push = this.signalChannel.push这样导致this对象错误 - self.push = function (data, pushCallback) { - self.signalChannel.push(data, pushCallback); - }; - self.request = async function (data) { - return await self.signalChannel.request(data); - }; - return self.signalChannel.connect( - `wss://${self.host}:${self.port}/websocket.signal`, - callback - ); + return self.signalChannel.connect(`wss://${self.host}:${self.port}/websocket.signal`); + } + /** + * 异步请求 + * + * @param {*} message 消息 + * @param {*} callback 回调 + */ + push(message, callback) { + const me = this; + // 请求回调 + if (callback) { + me.callbackMapping.set(message.header.id, callback); + } + // 发送消息 + try { + signalChannel.channel.send(JSON.stringify(message)); + } catch (error) { + console.error("异步请求异常：", message, error); + } + } + /** + * 同步请求 + * + * @param {*} message 消息 + * + * @returns Promise + */ + async request(message) { + const me = this; + return new Promise((resolve, reject) => { + let done = false; + // 请求回调 + me.callbackMapping.set(message.header.id, (response) => { + resolve(response); + done = true; + return true; + }); + // 发送消息 + try { + signalChannel.channel.send(JSON.stringify(message)); + } catch (error) { + reject("同步请求异常", error); + } + // 设置超时 + setTimeout(() => { + if (!done) { + me.callbackMapping.delete(message.header.id); + reject("请求超时", message); + } + }, 5000); + }); + } + /** + * 回调策略： + * 1. 如果注册请求回调，同时执行结果返回true不再执行后面所有回调。 + * 2. 执行前置回调 + * 3. 如果注册全局回调，同时执行结果返回true不再执行后面所有回调。 + * 4. 执行后置回调 + */ + async on(message) { + const me = this; + let done = false; + // 请求回调 + if (me.callbackMapping.has(message.header.id)) { + try { + done = me.callbackMapping.get(message.header.id)(message); + } finally { + me.callbackMapping.delete(message.header.id); + } + } + // 前置回调 + if (!done) { + await me.preCallback(message); + } + // 全局回调 + if (!done && me.callback) { + done = await me.callback(message); + } + // 后置回调 + if (!done) { + await me.postCallback(message); + } } /** * 前置回调 @@ -391,7 +434,7 @@ class Taoyao { self.defaultClientConfig(message); break; case "client::register": - console.info("终端注册成功"); + protocol.clientIndex = message.body.index; break; case "media::consume": await self.consumeMedia(message); @@ -918,9 +961,9 @@ class Taoyao { (this.forceVP9 && codec) || firstVideoCodec.mimeType.toLowerCase() === "video/vp9" ) { - encodings = WEBCAM_KSVC_ENCODINGS; + encodings = ksvcEncodings; } else { - encodings = WEBCAM_SIMULCAST_ENCODINGS; + encodings = simulcastEncodings; } } this.videoProducer = await this.sendTransport.produce({ diff --git a/taoyao-client-web/vite.config.js b/taoyao-client-web/vite.config.js index f8f923a..9d210ec 100644 --- a/taoyao-client-web/vite.config.js +++ b/taoyao-client-web/vite.config.js @@ -1,12 +1,17 @@ import { defineConfig } from "vite"; import vue from "@vitejs/plugin-vue"; import { fileURLToPath, URL } from "node:url"; +import fs from "node:fs"; export default defineConfig({ plugins: [vue()], server: { port: 8443, host: "0.0.0.0", + https: { + cert: fs.readFileSync("src/certs/server.crt"), + key: fs.readFileSync("src/certs/server.key"), + }, }, resolve: { alias: { diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/Description.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/Description.java index 3e00652..e0a5278 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/Description.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/annotation/Description.java @@ -27,7 +27,7 @@ public @interface Description { /** * @return 数据流向 */ - String[] flow() default { "终端->信令服务->终端" }; + String[] flow() default { "终端=>信令服务->终端" }; /** * @return 描述信息 diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/Constant.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/Constant.java index 25382d6..ea81c87 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/Constant.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/Constant.java @@ -1,234 +1,238 @@ package com.acgist.taoyao.boot.config; /** - * 字符常量 + * 常量 * * @author acgist */ public interface Constant { + /** + * 接收方的终端标识 + */ + String TO = "to"; /** * 换行 */ String LINE = "\n"; - /** - * IP - */ - String IP = "ip"; - /** - * 接收方 - */ - String TO = "to"; - /** - * 状态 - */ - String STATUS = "status"; - /** - * 配置 - */ - String CONFIG = "config"; - /** - * 纬度 - */ - String LATITUDE = "latitude"; - /** - * 经度 - */ - String LONGITUDE = "longitude"; - /** - * 湿度 - */ - String HUMIDITY = "humidity"; - /** - * 温度 - */ - String TEMPERATURE = "temperature"; - /** - * 信号强度（0~100） - */ - String SIGNAL = "signal"; - /** - * 电池电量（0~100） - */ - String BATTERY = "battery"; - /** - * 是否正在运行 - */ - String RUNNING = "running"; - /** - * 是否正在充电 - */ - String CHARGING = "charging"; - /** - * 是否正在录像 - */ - String RECORDING = "recording"; - /** - * 地址 - */ - String URLS = "urls"; - /** - * 凭证 - */ - String CREDENTIAL = "credential"; - /** - * 最小 - */ - String MIN = "min"; - /** - * 最大 - */ - String MAX = "max"; - /** - * 建议 - */ - String IDEAL = "ideal"; - /** - * 最小宽度 - */ - Integer MIN_WIDTH = 720; - /** - * 最大宽度 - */ - Integer MAX_WIDTH = 4096; - /** - * 最小高度 - */ - Integer MIN_HEIGHT = 480; - /** - * 最大高度 - */ - Integer MAX_HEIGHT = 2160; - /** - * 名称 - */ - String NAME = "name"; - /** - * 类型 - */ - String CLIENT_TYPE = "clientType"; - /** - * 脚本 - */ - String SCRIPT = "script"; - /** - * 结果 - */ - String RESULT = "result"; - /** - * 消息 - */ - String MESSAGE = "message"; - /** - * 请求 - */ - String REQUEST = "request"; - /** - * 帐号 - */ - String USERNAME = "username"; - /** - * 密码 - */ - String PASSWORD = "password"; - /** - * 媒体类型 - */ - String KIND = "kind"; - /** - * 媒体 - */ - String MEDIA = "media"; - /** - * WebRTC - */ - String WEBRTC = "webrtc"; - /** - * 日期时间 - */ - String DATETIME = "datetime"; - /** - * 房间ID - */ - String ROOM_ID = "roomId"; - /** - * 媒体服务ID - */ - String MEDIA_ID = "mediaId"; - /** - * 媒体流ID - */ - String STREAM_ID = "streamId"; - /** - * 终端ID - */ - String CLIENT_ID = "clientId"; - /** - * 来源终端ID - */ - String SOURCE_ID = "sourceId"; - /** - * 路由ID - */ - String ROUTER_ID = "routerId"; - /** - * 传输通道ID - */ - String TRANSPORT_ID = "transportId"; - /** - * 生产者ID - */ - String PRODUCER_ID = "producerId"; - /** - * 消费者ID - */ - String CONSUMER_ID = "consumerId"; - /** - * 数据生产者ID - */ - String DATA_PRODUCER_ID = "dataProducerId"; - /** - * 数据消费者ID - */ - String DATA_CONSUMER_ID = "dataConsumerId"; - /** - * ICE服务：P2P直连使用 - */ - String ICE_SERVERS = "iceServers"; - /** - * ICE候选 - */ - String ICE_CANDIDATES = "iceCandidates"; - /** - * ICE参数 - */ - String ICE_PARAMETERS = "iceParameters"; - /** - * DTLS参数 - */ - String DTLS_PARAMETERS = "dtlsParameters"; - /** - * SCTP参数 - */ - String SCTP_PARAMETERS = "sctpParameters"; - /** - * RTP能力 - */ - String RTP_CAPABILITIES = "rtpCapabilities"; - /** - * SCTP能力 - */ - String SCTP_CAPABILITIES = "sctpCapabilities"; - /** - * 生产者 - */ + /** + * IP + */ + String IP = "ip"; + /** + * 状态对象 + */ + String STATUS = "status"; + /** + * 配置对象 + */ + String CONFIG = "config"; + /** + * 纬度 + */ + String LATITUDE = "latitude"; + /** + * 经度 + */ + String LONGITUDE = "longitude"; + /** + * 湿度 + */ + String HUMIDITY = "humidity"; + /** + * 温度 + */ + String TEMPERATURE = "temperature"; + /** + * 信号强度（0~100） + */ + String SIGNAL = "signal"; + /** + * 电池电量（0~100） + */ + String BATTERY = "battery"; + /** + * 是否正在充电 + */ + String CHARGING = "charging"; + /** + * 是否正在录像 + */ + String RECORDING = "recording"; + /** + * 地址 + */ + String URLS = "urls"; + /** + * 凭证 + */ + String CREDENTIAL = "credential"; + /** + * 最小 + */ + String MIN = "min"; + /** + * 最大 + */ + String MAX = "max"; + /** + * 建议 + */ + String IDEAL = "ideal"; + /** + * 最小宽度 + */ + Integer MIN_WIDTH = 720; + /** + * 最大宽度 + */ + Integer MAX_WIDTH = 4096; + /** + * 最小高度 + */ + Integer MIN_HEIGHT = 480; + /** + * 最大高度 + */ + Integer MAX_HEIGHT = 2160; + /** + * 脚本 + */ + String SCRIPT = "script"; + /** + * 结果 + */ + String RESULT = "result"; + /** + * 消息 + */ + String MESSAGE = "message"; + /** + * 请求 + */ + String REQUEST = "request"; + /** + * 响应 + */ + String RESPONSE = "response"; + /** + * 帐号 + */ + String USERNAME = "username"; + /** + * 密码 + */ + String PASSWORD = "password"; + /** + * 名称 + */ + String NAME = "name"; + /** + * 媒体类型 + */ + String KIND = "kind"; + /** + * 索引 + */ + String INDEX = "index"; + /** + * 媒体 + */ + String MEDIA = "media"; + /** + * WebRTC + */ + String WEBRTC = "webrtc"; + /** + * 日期时间 + */ + String DATETIME = "datetime"; + /** + * 终端类型 + */ + String CLIENT_TYPE = "clientType"; + /** + * 房间ID + */ + String ROOM_ID = "roomId"; + /** + * 媒体服务ID + */ + String MEDIA_ID = "mediaId"; + /** + * 媒体流ID + */ + String STREAM_ID = "streamId"; + /** + * 终端ID + */ + String CLIENT_ID = "clientId"; + /** + * 来源终端ID + */ + String SOURCE_ID = "sourceId"; + /** + * 传输通道ID + */ + String TRANSPORT_ID = "transportId"; + /** + * 生产者ID + */ + String PRODUCER_ID = "producerId"; + /** + * 消费者ID + */ + String CONSUMER_ID = "consumerId"; + /** + * 数据生产者ID + */ + String DATA_PRODUCER_ID = "dataProducerId"; + /** + * 数据消费者ID + */ + String DATA_CONSUMER_ID = "dataConsumerId"; + /** + * ICE服务 + */ + String ICE_SERVERS = "iceServers"; + /** + * ICE候选 + */ + String ICE_CANDIDATES = "iceCandidates"; + /** + * ICE参数 + */ + String ICE_PARAMETERS = "iceParameters"; + /** + * RTP参数 + */ + String RTP_PARAMETERS = "rtpParameters"; + /** + * RTP能力 + */ + String RTP_CAPABILITIES = "rtpCapabilities"; + /** + * DTLS参数 + */ + String DTLS_PARAMETERS = "dtlsParameters"; + /** + * SCTP参数 + */ + String SCTP_PARAMETERS = "sctpParameters"; + /** + * SCTP能力 + */ + String SCTP_CAPABILITIES = "sctpCapabilities"; + /** + * 是否是消费者 + */ String CONSUMING = "consuming"; /** - * 消费者 + * 是否是生产者 */ String PRODUCING = "producing"; /** - * 订阅类型 + * 媒体订阅类型 */ String SUBSCRIBE_TYPE = "subscribeType"; diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/IdProperties.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/IdProperties.java index 9078fd4..0d736a3 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/IdProperties.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/config/IdProperties.java @@ -9,6 +9,14 @@ import lombok.Setter; /** * ID配置 * + * 服务端：日期 + 两位机器序号 + 六位索引 + * 范围：00000000~09999999 + * 并发：1000000 / S + * + * 终端：日期 + 五位机器序号 + 三位索引 + * 范围：10000000~99999999 + * 并发：1000 / S + * * @author acgist */ @Getter @@ -17,9 +25,13 @@ import lombok.Setter; @ConfigurationProperties(prefix = "taoyao.id") public class IdProperties { - @Schema(title = "机器序号", description = "机器序号") - private Integer index; @Schema(title = "最大序号", description = "最大序号") private Integer maxIndex; + @Schema(title = "机器序号", description = "机器序号") + private Integer serverIndex; + @Schema(title = "最小终端序号", description = "最小终端序号") + private Integer minClientIndex; + @Schema(title = "最大终端序号", description = "最大终端序号") + private Integer maxClientIndex; } diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java index 463d92d..9c3e681 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Header.java @@ -16,7 +16,7 @@ import lombok.Setter; */ @Getter @Setter -@Schema( title = "消息头部", description = "消息头部") +@Schema(title = "消息头部", description = "消息头部") @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Message.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Message.java index 14909bf..39f8624 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Message.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/model/Message.java @@ -6,6 +6,7 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import com.acgist.taoyao.boot.utils.JSONUtils; +import com.fasterxml.jackson.annotation.JsonIncludeProperties; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -26,6 +27,7 @@ import lombok.Setter; @Builder @NoArgsConstructor @AllArgsConstructor +@JsonIncludeProperties(value = { "code", "message", "header", "body" }) public class Message implements Cloneable, Serializable { private static final long serialVersionUID = 1L; @@ -183,7 +185,7 @@ public class Message implements Cloneable, Serializable { * @return Map消息主体 */ @SuppressWarnings({ "rawtypes", "unchecked" }) - public Map mapBody() { + public Map body() { if(this.body instanceof Map map) { return map; } else if(this.body == null) { diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/IdService.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/IdService.java index 3840739..7993561 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/IdService.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/IdService.java @@ -1,22 +1,27 @@ package com.acgist.taoyao.boot.service; /** - * ID生成器 - * 只能用于生成消息标识 + * 生成ID服务 * * @author acgist */ public interface IdService { /** - * 生成十六位的ID：ddHHmmss(8) + index(2) + xxxxxx(6) + * 生成十六位的消息ID：ddHHmmss(8) + index(2) + xxxxxx(6) + * 只能用于生成消息ID：JS超过`Number.MAX_SAFE_INTEGER`丢失精度 * * @return ID */ long buildId(); /** - * 生成唯一ID + * @return 终端索引 + */ + long buildClientIndex(); + + /** + * 生成三十二位唯一ID * * @return ID */ diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/impl/IdServiceImpl.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/impl/IdServiceImpl.java index 81114d0..bfab30f 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/impl/IdServiceImpl.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/service/impl/IdServiceImpl.java @@ -8,23 +8,48 @@ import com.acgist.taoyao.boot.service.IdService; public class IdServiceImpl implements IdService { - private final IdProperties idProperties; - public IdServiceImpl(IdProperties idProperties) { - this.idProperties = idProperties; + this.index = 0; + this.serverIndex = idProperties.getServerIndex(); + this.maxIndex = idProperties.getMaxIndex(); + this.clientIndex = idProperties.getMinClientIndex(); + this.minClientIndex = idProperties.getMinClientIndex(); + this.maxClientIndex = idProperties.getMaxClientIndex(); } /** * 当前索引 */ private int index; + /** + * 机器序号 + */ + private final int serverIndex; + /** + * 最大序号 + */ + private final int maxIndex; + /** + * 当前终端索引 + */ + private int clientIndex; + /** + * 最小终端序号 + */ + private final int minClientIndex; + /** + * 最大终端序号 + */ + private final int maxClientIndex; @Override public long buildId() { + int index; synchronized (this) { - if (++this.index > this.idProperties.getMaxIndex()) { + if (++this.index > this.maxIndex) { this.index = 0; } + index = this.index; } final LocalDateTime time = LocalDateTime.now(); return @@ -32,14 +57,25 @@ public class IdServiceImpl implements IdService { 1000000000000L * time.getHour() + 10000000000L * time.getMinute() + 100000000L * time.getSecond() + - 1000000L * this.idProperties.getIndex() + - // 每秒并发数量 - this.index; + 1000000L * this.serverIndex + + index; } + @Override + public long buildClientIndex() { + int index; + synchronized (this) { + if(++this.clientIndex > this.maxClientIndex) { + this.clientIndex = this.minClientIndex; + } + index = this.clientIndex; + } + return index; + } + @Override public String buildUuid() { return UUID.randomUUID().toString(); } - + } diff --git a/taoyao-signal-server/taoyao-boot/src/test/java/com/acgist/taoyao/boot/model/MessageTest.java b/taoyao-signal-server/taoyao-boot/src/test/java/com/acgist/taoyao/boot/model/MessageTest.java new file mode 100644 index 0000000..9b9b7e7 --- /dev/null +++ b/taoyao-signal-server/taoyao-boot/src/test/java/com/acgist/taoyao/boot/model/MessageTest.java @@ -0,0 +1,25 @@ +package com.acgist.taoyao.boot.model; + +import java.util.Map; + +import org.junit.jupiter.api.Test; + +import com.acgist.taoyao.boot.utils.JSONUtils; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class MessageTest { + + @Test + public void testJSON() { + final Message message = Message.builder() + .code("0000") + .message("acgist") + .body(Map.of("1", "2")) + .build(); + final String json = JSONUtils.toJSON(message); + log.info("{}", json); + } + +} diff --git a/taoyao-signal-server/taoyao-server/src/main/resources/application.yml b/taoyao-signal-server/taoyao-server/src/main/resources/application.yml index 61a07f3..0a261ea 100644 --- a/taoyao-signal-server/taoyao-server/src/main/resources/application.yml +++ b/taoyao-signal-server/taoyao-server/src/main/resources/application.yml @@ -4,7 +4,8 @@ server: enabled: true ssl: key-alias: taoyao - key-store: classpath:taoyao.jks + key-store: classpath:server.p12 + key-store-type: PKCS12 key-store-password: 123456 key-password: 123456 tomcat: @@ -55,8 +56,10 @@ taoyao: description: 桃夭WebRTC信令服务 timeout: 5000 id: - index: 0 max-index: 999999 + server-index: 0 + min-client-index: 10000 + max-client-index: 99999 # 媒体配置 media: # 默认音频 diff --git a/taoyao-signal-server/taoyao-server/src/main/resources/server.p12 b/taoyao-signal-server/taoyao-server/src/main/resources/server.p12 new file mode 100644 index 0000000..ae37c90 Binary files /dev/null and b/taoyao-signal-server/taoyao-server/src/main/resources/server.p12 differ diff --git a/taoyao-signal-server/taoyao-server/src/main/resources/taoyao.jks b/taoyao-signal-server/taoyao-server/src/main/resources/taoyao.jks deleted file mode 100644 index e238110..0000000 Binary files a/taoyao-signal-server/taoyao-server/src/main/resources/taoyao.jks and /dev/null differ diff --git a/taoyao-signal-server/taoyao-server/src/test/java/com/acgist/taoyao/service/IdServiceTest.java b/taoyao-signal-server/taoyao-server/src/test/java/com/acgist/taoyao/service/IdServiceTest.java index 493c4f0..952c8e3 100644 --- a/taoyao-signal-server/taoyao-server/src/test/java/com/acgist/taoyao/service/IdServiceTest.java +++ b/taoyao-signal-server/taoyao-server/src/test/java/com/acgist/taoyao/service/IdServiceTest.java @@ -34,4 +34,10 @@ class IdServiceTest { this.idService.buildId(); } + @Test + @CostedTest(count = 100000, thread = 10) + void testUuidCosted() { + this.idService.buildUuid(); + } + } diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientStatus.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientStatus.java index 2db4d16..aaf696d 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientStatus.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientStatus.java @@ -41,8 +41,6 @@ public class ClientStatus { private Integer signal; @Schema(title = "电池电量（0~100）", description = "电池电量（0~100）") private Integer battery; - @Schema(title = "是否正在运行", description = "是否正在运行") - private Boolean running; @Schema(title = "是否正在充电", description = "是否正在充电") private Boolean charging; @Schema(title = "是否正在录像", description = "是否正在录像") @@ -66,7 +64,6 @@ public class ClientStatus { this.setTemperature(MapUtils.get(body, Constant.TEMPERATURE)); this.setSignal(MapUtils.get(body, Constant.SIGNAL)); this.setBattery(MapUtils.get(body, Constant.BATTERY)); - this.setRunning(MapUtils.get(body, Constant.RUNNING)); this.setCharging(MapUtils.get(body, Constant.CHARGING)); this.setRecording(MapUtils.get(body, Constant.RECORDING)); this.setLastHeartbeat(LocalDateTime.now()); diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientType.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientType.java index 98fe0ad..c41d3ff 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientType.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/client/ClientType.java @@ -18,7 +18,7 @@ public enum ClientType { OTHER("其他终端"); /** - * 名称 + * 终端名称 */ private final String name; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/ProtocolController.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/ProtocolController.java index 97fa742..1a3cceb 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/ProtocolController.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/ProtocolController.java @@ -49,7 +49,7 @@ public class ProtocolController { "code": "状态编码", "message": "状态描述", "body": { - // 消息主体 + ... } } ``` @@ -57,10 +57,11 @@ public class ProtocolController { ### 符号解释 ``` - -[消息类型]> 异步请求 | 定向单播 + -[消息类型]> 异步请求 | 单播 =[消息类型]> 同步请求 -[消息类型]) 全员广播：对所有的终端广播信令（排除自己） +[消息类型]) 全员广播：对所有的终端广播信令（包含自己） + ...：其他自定义的透传内容 ``` > 没有指定消息类型时表示和信令消息类型相同 @@ -79,13 +80,9 @@ public class ProtocolController { return; } // 信令名称 - builder.append("### ").append(name).append("（").append(signal).append("）").append(Constant.LINE).append(Constant.LINE); - // 描述信息 - final String memo = annotation.memo().strip(); - if(StringUtils.isNotEmpty(memo)) { - builder.append(memo).append(Constant.LINE).append(Constant.LINE); - } - builder.append("```").append(Constant.LINE); + builder.append("### ").append(name).append("（").append(signal).append("）") + .append(Constant.LINE).append(Constant.LINE) + .append("```").append(Constant.LINE); // 消息主体 builder.append("# 消息主体").append(Constant.LINE); Stream.of(annotation.body()).forEach(line -> builder.append(line.strip()).append(Constant.LINE)); @@ -93,6 +90,11 @@ public class ProtocolController { builder.append("# 数据流向").append(Constant.LINE); Stream.of(annotation.flow()).forEach(line -> builder.append(line.strip()).append(Constant.LINE)); builder.append("```").append(Constant.LINE).append(Constant.LINE); + // 描述信息 + final String memo = annotation.memo().strip(); + if(StringUtils.isNotEmpty(memo)) { + builder.append(memo).append(Constant.LINE).append(Constant.LINE); + } }); return builder.toString(); } 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 44449bc..c9f8485 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 @@ -9,9 +9,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.flute.media.Room; -import com.acgist.taoyao.signal.flute.media.RoomManager; -import com.acgist.taoyao.signal.flute.media.RoomStatus; +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 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/MediaProduceEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/MediaProduceEvent.java index 02923b5..b446815 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/MediaProduceEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/MediaProduceEvent.java @@ -1,7 +1,7 @@ package com.acgist.taoyao.signal.event; -import com.acgist.taoyao.signal.flute.media.Producer; -import com.acgist.taoyao.signal.flute.media.Room; +import com.acgist.taoyao.signal.party.media.Producer; +import com.acgist.taoyao.signal.party.media.Room; import lombok.Getter; import lombok.Setter; 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 0d5e613..ab976fc 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 @@ -3,7 +3,7 @@ package com.acgist.taoyao.signal.event; import java.util.Map; import com.acgist.taoyao.boot.model.Message; -import com.acgist.taoyao.signal.flute.media.Room; +import com.acgist.taoyao.signal.party.media.Room; import lombok.Getter; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/package-info.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/package-info.java deleted file mode 100644 index 4ed74a8..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 不同终端管理 - */ -package com.acgist.taoyao.signal.flute; \ No newline at end of file diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/ClientWrapper.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/ClientWrapper.java similarity index 96% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/ClientWrapper.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/ClientWrapper.java index 74a79f1..69d22b1 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/ClientWrapper.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/ClientWrapper.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -19,7 +19,7 @@ import lombok.Setter; public class ClientWrapper { /** - * 订阅类型 + * 媒体订阅类型 * * @author acgist */ @@ -71,7 +71,7 @@ public class ClientWrapper { */ private final String clientId; /** - * 订阅类型 + * 媒体订阅类型 * 指定订阅类型终端注册或者生成媒体后会自动进行媒体推流拉流 * 没有订阅任何媒体时需要用户自己对媒体进行消费控制 */ diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Consumer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Consumer.java similarity index 94% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Consumer.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Consumer.java index 99ba53d..735c58c 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Consumer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Consumer.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; import lombok.Getter; import lombok.Setter; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataConsumer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataConsumer.java similarity index 93% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataConsumer.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataConsumer.java index 923e1ad..0e4f531 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataConsumer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataConsumer.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; import lombok.Getter; import lombok.Setter; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataProducer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataProducer.java similarity index 94% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataProducer.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataProducer.java index d2c2ffc..4fef17e 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataProducer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/DataProducer.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Kind.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Kind.java similarity index 92% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Kind.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Kind.java index 0552db9..a78f099 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Kind.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Kind.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; import com.acgist.taoyao.boot.model.MessageCodeException; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Producer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Producer.java similarity index 95% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Producer.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Producer.java index 7f82c2d..5bb9ade 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Producer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Producer.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Room.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Room.java similarity index 97% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Room.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Room.java index 6d6ebc5..0b802c7 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Room.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Room.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; import java.io.Closeable; import java.util.List; @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; /** * 房间 + * 房间和媒体路由一对一关联 * * @author acgist */ diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomManager.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomManager.java similarity index 98% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomManager.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomManager.java index 490a50c..044f629 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomManager.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomManager.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; import java.util.List; import java.util.Map; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomStatus.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomStatus.java similarity index 93% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomStatus.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomStatus.java index d5ab879..f75f37b 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomStatus.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/RoomStatus.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; 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/flute/media/Transport.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Transport.java similarity index 97% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Transport.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Transport.java index 861c2f5..8dab6a9 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Transport.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Transport.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.flute.media; +package com.acgist.taoyao.signal.party.media; import java.io.Closeable; import java.util.Map; 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 new file mode 100644 index 0000000..63ae9c6 --- /dev/null +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/package-info.java @@ -0,0 +1,4 @@ +/** + * 不同终端业务管理 + */ +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/protocol/ProtocolAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java index cc64680..ae60b42 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 @@ -1,5 +1,8 @@ package com.acgist.taoyao.signal.protocol; +import java.util.Map; + +import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -10,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.flute.media.RoomManager; +import com.acgist.taoyao.signal.party.media.RoomManager; import lombok.extern.slf4j.Slf4j; @@ -109,17 +112,34 @@ public abstract class ProtocolAdapter implements Protocol { return build; } + /** + * 精简消息主体 + * + * @param body 消息主体 + * @param keys 清理键 + */ + protected void pure(Map body, String ... keys) { + if(ArrayUtils.isEmpty(keys)) { + return; + } + for (String key : keys) { + body.remove(key); + } + } + /** * @param args 参数 */ protected void logNoAdapter(Object ... args) { - final StringBuilder builder = new StringBuilder(this.name); - builder.append("没有适配信令消息："); - for (final Object object : args) { - builder.append(object).append(" "); - } - builder.setLength(builder.length() - 1); - log.debug(builder.toString()); + if(log.isDebugEnabled()) { + final StringBuilder builder = new StringBuilder(this.name); + builder.append("没有适配信令消息："); + for (final Object object : args) { + builder.append(object).append(" "); + } + builder.setLength(builder.length() - 1); + log.debug(builder.toString()); + } } } diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolClientAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolClientAdapter.java index 1ce223e..f85eecf 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolClientAdapter.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolClientAdapter.java @@ -19,7 +19,7 @@ public abstract class ProtocolClientAdapter extends ProtocolAdapter { @Override public void execute(Client client, Message message) { - this.execute(client.clientId(), client.clientType(), client, message, message.mapBody()); + this.execute(client.clientId(), client.clientType(), client, message, message.body()); } /** 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 b9baf5b..3c29dce 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.flute.media.Room; +import com.acgist.taoyao.signal.party.media.Room; /** * 房间信令适配器 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientBroadcastProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientBroadcastProtocol.java index 1dfee75..5053590 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientBroadcastProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientBroadcastProtocol.java @@ -24,10 +24,12 @@ import com.acgist.taoyao.signal.protocol.ProtocolClientAdapter; """ { "clientType": "终端类型（可选）" + ... } """ }, - flow = "终端->信令服务-)终端" + flow = "终端->信令服务-)终端", + memo = "没有指定终端类型时广播所有类型终端" ) public class ClientBroadcastProtocol extends ProtocolClientAdapter { diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientHeartbeatProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientHeartbeatProtocol.java index c5623be..716d56a 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientHeartbeatProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientHeartbeatProtocol.java @@ -25,7 +25,6 @@ import com.acgist.taoyao.signal.protocol.ProtocolClientAdapter; "temperature": 温度, "signal": 信号强度（0~100）, "battery": 电池电量（0~100）, - "running": 是否正在运行（true|false）, "charging": 是否正在充电（true|false）, "recording": 是否正在录像（true|false）, "status": {更多状态}, diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientListProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientListProtocol.java index f2c89b8..71f125d 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientListProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientListProtocol.java @@ -36,7 +36,6 @@ import com.acgist.taoyao.signal.protocol.ProtocolClientAdapter; "temperature": 温度, "signal": 信号强度（0~100）, "battery": 电池电量（0~100）, - "running": 是否正在运行（true|false）, "charging": 是否正在充电（true|false）, "recording": 是否正在录像（true|false）, "status": {更多状态}, diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientOnlineProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientOnlineProtocol.java index 33b3d82..e32f339 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientOnlineProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientOnlineProtocol.java @@ -23,7 +23,6 @@ import com.acgist.taoyao.signal.protocol.ProtocolClientAdapter; "temperature": 温度, "signal": 信号强度（0~100）, "battery": 电池电量（0~100）, - "running": 是否正在运行（true|false）, "charging": 是否正在充电（true|false）, "recording": 是否正在录像（true|false）, "status": {更多状态}, diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java index ea5764c..8199eec 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientRegisterProtocol.java @@ -40,7 +40,6 @@ import lombok.extern.slf4j.Slf4j; "temperature": 温度, "signal": 信号强度（0~100）, "battery": 电池电量（0~100）, - "running": 是否正在运行（true|false）, "charging": 是否正在充电（true|false）, "recording": 是否正在录像（true|false）, "status": {更多状态}, @@ -87,7 +86,9 @@ public class ClientRegisterProtocol extends ProtocolClientAdapter { } final ClientType clientType = ClientType.of(MapUtils.get(body, Constant.CLIENT_TYPE)); // 推送消息 - client.push(message.cloneWithoutBody()); + final Message registerResponse = message.cloneWithoutBody(); + registerResponse.setBody(Map.of(Constant.INDEX, this.idService.buildClientIndex())); + client.push(registerResponse); // 下发配置 client.push(this.clientConfigProtocol.build(clientType)); // 终端状态 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlRecordProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlRecordProtocol.java index 248b75c..c559d2a 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlRecordProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlRecordProtocol.java @@ -16,11 +16,11 @@ import com.acgist.taoyao.signal.protocol.ProtocolControlAdapter; */ @Protocol @Description( - memo = "状态通过心跳回传", flow = { "信令服务->终端", "终端->信令服务->终端" - } + }, + memo = "状态通过心跳回传" ) public class ControlRecordProtocol extends ProtocolControlAdapter { diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioActiveSpeakerProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioActiveSpeakerProtocol.java index ac39413..536f34b 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioActiveSpeakerProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioActiveSpeakerProtocol.java @@ -6,7 +6,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.flute.media.Room; +import com.acgist.taoyao.signal.party.media.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 b447bbf..1728289 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 @@ -14,11 +14,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.MediaProduceEvent; -import com.acgist.taoyao.signal.flute.media.ClientWrapper; -import com.acgist.taoyao.signal.flute.media.Consumer; -import com.acgist.taoyao.signal.flute.media.Producer; -import com.acgist.taoyao.signal.flute.media.Room; -import com.acgist.taoyao.signal.flute.media.Transport; +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.protocol.ProtocolRoomAdapter; import lombok.extern.slf4j.Slf4j; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPlainCreateProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPlainCreateProtocol.java new file mode 100644 index 0000000..54fdcb4 --- /dev/null +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaPlainCreateProtocol.java @@ -0,0 +1,10 @@ +package com.acgist.taoyao.signal.protocol.media; + +/** + * RTP + * + * @author acgist + */ +public class MediaPlainCreateProtocol { + +} 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 d35832c..a640602 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.MediaProduceEvent; -import com.acgist.taoyao.signal.flute.media.ClientWrapper; -import com.acgist.taoyao.signal.flute.media.Producer; -import com.acgist.taoyao.signal.flute.media.Room; +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.protocol.ProtocolRoomAdapter; import lombok.extern.slf4j.Slf4j; @@ -53,7 +53,7 @@ public class MediaProduceProtocol extends ProtocolRoomAdapter { body.put(Constant.CLIENT_ID, clientId); body.put(Constant.STREAM_ID, streamId); final Message response = room.request(message); - final Map responseBody = response.mapBody(); + final Map responseBody = response.body(); final String producerId = MapUtils.get(responseBody, Constant.PRODUCER_ID); final ClientWrapper clientWrapper = room.clientWrapper(client); final Map producers = clientWrapper.getProducers(); 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 8f573b3..1a04df8 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.flute.media.Room; +import com.acgist.taoyao.signal.party.media.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 e008118..25939ae 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.flute.media.Room; +import com.acgist.taoyao.signal.party.media.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 8bb17d9..a617564 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.flute.media.Room; +import com.acgist.taoyao.signal.party.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; import lombok.extern.slf4j.Slf4j; @@ -40,7 +40,7 @@ public class MediaTransportWebRtcConnectProtocol extends ProtocolRoomAdapter { public void execute(String clientId, ClientType clientType, Room room, Client client, Client mediaClient, Message message, Map body) { if(clientType == ClientType.WEB || clientType == ClientType.CAMERA) { final Message response = room.request(message); - final Map responseBody = response.mapBody(); + final Map responseBody = response.body(); client.push(response); final String transportId = MapUtils.get(responseBody, Constant.TRANSPORT_ID); log.info("{} 连接WebRTC信令通道：{}", clientId, transportId); 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 c60a5dd..351a20a 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,9 +15,9 @@ 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.MediaProduceEvent; -import com.acgist.taoyao.signal.flute.media.ClientWrapper; -import com.acgist.taoyao.signal.flute.media.Room; -import com.acgist.taoyao.signal.flute.media.Transport; +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.protocol.ProtocolRoomAdapter; import lombok.extern.slf4j.Slf4j; @@ -59,7 +59,7 @@ public class MediaTransportWebRtcCreateProtocol extends ProtocolRoomAdapter { public void execute(String clientId, ClientType clientType, Room room, Client client, Client mediaClient, Message message, Map body) { body.put(Constant.CLIENT_ID, clientId); final Message response = room.request(message); - final Map responseBody = response.mapBody(); + final Map responseBody = response.body(); final String transportId = MapUtils.get(responseBody, Constant.TRANSPORT_ID); // 重写地址 this.rewriteIp(client.ip(), responseBody); 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 8bdf57c..afe2779 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 @@ -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.flute.media.Room; +import com.acgist.taoyao.signal.party.media.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 4b08b49..9ba13db 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 @@ -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.flute.media.Room; +import com.acgist.taoyao.signal.party.media.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 c01af19..00ee918 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.MediaClientRegisterEvent; -import com.acgist.taoyao.signal.flute.media.Room; +import com.acgist.taoyao.signal.party.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolClientAdapter; import lombok.extern.slf4j.Slf4j; 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 95cbc3b..86fc7bb 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 @@ -11,9 +11,9 @@ 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.flute.media.ClientWrapper; -import com.acgist.taoyao.signal.flute.media.ClientWrapper.SubscribeType; -import com.acgist.taoyao.signal.flute.media.Room; +import com.acgist.taoyao.signal.party.media.ClientWrapper; +import com.acgist.taoyao.signal.party.media.Room; +import com.acgist.taoyao.signal.party.media.ClientWrapper.SubscribeType; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; import lombok.extern.slf4j.Slf4j;