增加查看流数据的功能

config.toml

@@ -4,9 +4,9 @@ EnableVideo = true
 # 发布流默认过期时间单位秒
 PublishTimeout = 60
 # 自动关闭触发后延迟的秒数(期间内如果有新的订阅则取消触发关闭)
-# AutoCloseDelay = 10
+AutoCloseDelay = 10
 # RTP包乱序重排
-# RTPReorder = false
+RTPReorder = false
 [Summary]
 # 1秒中采样一次
 SampleRate = 1
@@ -14,9 +14,9 @@ SampleRate = 1
 ListenAddr = ":1935"
 [GateWay]
 ListenAddr = ":8080"
-#ListenAddrTLS = ":8082"
-#CertFile = "xxx.cert"
-#KeyFile = "xxx.key"
+ListenAddrTLS = ":8082"
+CertFile = "server.crt"
+KeyFile = "server.pem"
 [Jessica]
 #ListenAddr = ":8081"
 #ListenAddrTLS = ":8083"
@@ -65,7 +65,6 @@ Reconnect = true
 #启动后自动拉流，可以配置多个
 # [RTSP.AutoPullList]
 # "live/rtc" = "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mp4"
-# "live/test" = "rtsp://admin:qwer1234@42.193.7.166:9013/cam/realmonitor?channel=1&subtype=0"
 #"live/rtsp2" = "rtsp://admin:admin@192.168.1.212:554/cam/realmonitor?channel=1&subtype=1"
 [WebRTC]
 # 端口范围不配置的话是自动分配

go.mod

@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/Monibuca/engine/v3 v3.3.16
-	github.com/Monibuca/plugin-gateway/v3 v3.0.0-20211019071855-0dcd7beaae5b
-	github.com/Monibuca/plugin-gb28181/v3 v3.0.0-20211129032309-a2bfeec94895
+	github.com/Monibuca/plugin-gateway/v3 v3.0.4
+	github.com/Monibuca/plugin-gb28181/v3 v3.0.0
 	github.com/Monibuca/plugin-hdl/v3 v3.0.0-20210807135828-9d98f5b8dd6c
 	github.com/Monibuca/plugin-hls/v3 v3.0.0
 	github.com/Monibuca/plugin-jessica/v3 v3.0.0-20210807235919-48ac5fbec646
@@ -18,6 +18,8 @@ require (
 	github.com/Monibuca/plugin-webrtc/v3 v3.0.0-20211102085549-53e36c75fded
 )
 
+// replace github.com/Monibuca/plugin-gateway/v3 => ../plugin-gateway
+
 // replace github.com/Monibuca/plugin-rtsp/v3 => ../plugin-rtsp
 
 // replace github.com/Monibuca/plugin-gb28181/v3 => ../plugin-gb28181

go.sum

@@ -6,16 +6,13 @@ github.com/Monibuca/engine/v3 v3.1.1/go.mod h1:yz6cssED2VlYu+g/LrxseBB9pcvsLM/o2
 github.com/Monibuca/engine/v3 v3.3.0/go.mod h1:odyqD/VTQDN4qgzajsgn7kW7MWDIzTHt+j+BcI8i+4g=
 github.com/Monibuca/engine/v3 v3.3.9/go.mod h1:odyqD/VTQDN4qgzajsgn7kW7MWDIzTHt+j+BcI8i+4g=
 github.com/Monibuca/engine/v3 v3.3.11/go.mod h1:LowMZ/iw4t6tfTZkSYZHIA0Z1HE8b7xfTDLO4WhX3Hg=
-github.com/Monibuca/engine/v3 v3.3.15 h1:0sTCHQnesLos+k3GtbozIjQIh4rh9ZfotW5GQ9Dj3J4=
 github.com/Monibuca/engine/v3 v3.3.15/go.mod h1:LowMZ/iw4t6tfTZkSYZHIA0Z1HE8b7xfTDLO4WhX3Hg=
 github.com/Monibuca/engine/v3 v3.3.16 h1:3F5vBDU0wE6DgluWiTFAfPvOL9e2Hj87rrYqMgniPj4=
 github.com/Monibuca/engine/v3 v3.3.16/go.mod h1:rgAUey5ziRhlh6WugWyA5fYKyGOvcwhtTMDk4sukE7E=
-github.com/Monibuca/plugin-gateway/v3 v3.0.0-20211019071855-0dcd7beaae5b h1:E53fkYCIhHDORcJXR1FyymPLWJJDUh6K8q254etoTjY=
-github.com/Monibuca/plugin-gateway/v3 v3.0.0-20211019071855-0dcd7beaae5b/go.mod h1:bDI6d64yb50+3rMczouVQoTYWbGOZhVFgu3k/yKJdXU=
-github.com/Monibuca/plugin-gb28181/v3 v3.0.0-20211122043224-c07309f14fa6 h1:AgLTjBQOxYWVPzDdrV9ysi5mTGum0ZZ97gEXyop4ips=
-github.com/Monibuca/plugin-gb28181/v3 v3.0.0-20211122043224-c07309f14fa6/go.mod h1:foflXhJgzpYvMu3mlwQ/8JQ4ieo6RPSiubZ9t12FIbA=
-github.com/Monibuca/plugin-gb28181/v3 v3.0.0-20211129032309-a2bfeec94895 h1:y0oFeOvUXoo2Rw4VW8fcpIHMEasNMpWR7HiUMf0IUec=
-github.com/Monibuca/plugin-gb28181/v3 v3.0.0-20211129032309-a2bfeec94895/go.mod h1:foflXhJgzpYvMu3mlwQ/8JQ4ieo6RPSiubZ9t12FIbA=
+github.com/Monibuca/plugin-gateway/v3 v3.0.4 h1:W5UaWba6bjvJBTmUrtx7hZZxf+6VRtcGFSTZHZZlPSw=
+github.com/Monibuca/plugin-gateway/v3 v3.0.4/go.mod h1:GPQDIll0o9+txwJ+ZwDcQTcR8rTE2SFZ/UbgmDKZTdg=
+github.com/Monibuca/plugin-gb28181/v3 v3.0.0 h1:o9a3Dnud7eoHwDF1cmwX6ipr4u4VW/1/9X0yzi1jQ9Q=
+github.com/Monibuca/plugin-gb28181/v3 v3.0.0/go.mod h1:foflXhJgzpYvMu3mlwQ/8JQ4ieo6RPSiubZ9t12FIbA=
 github.com/Monibuca/plugin-hdl/v3 v3.0.0-20210807135828-9d98f5b8dd6c h1:crcVwFF4qW8b3UoucGIK+wG0U03cx7numcI+bkRV9ng=
 github.com/Monibuca/plugin-hdl/v3 v3.0.0-20210807135828-9d98f5b8dd6c/go.mod h1:T4LdSfJIAMqmvmy9lXUL1RJ73JvhSBH2RdMKvs4N858=
 github.com/Monibuca/plugin-hls/v3 v3.0.0 h1:yL+EaWDcPGlGQeHdrVArqMxevO3DMRbB/qbcH/Zgd7U=
@@ -39,7 +36,6 @@ github.com/Monibuca/plugin-webrtc/v3 v3.0.0-20211102085549-53e36c75fded/go.mod h
 github.com/Monibuca/utils/v3 v3.0.0/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE=
 github.com/Monibuca/utils/v3 v3.0.1/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE=
 github.com/Monibuca/utils/v3 v3.0.2/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE=
-github.com/Monibuca/utils/v3 v3.0.4 h1:PssGhww+qePzw4qpB3g2DCG5Buru0Cu64UiqtAPuHjc=
 github.com/Monibuca/utils/v3 v3.0.4/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE=
 github.com/Monibuca/utils/v3 v3.0.5 h1:w14x0HkWTbF4MmHbINLlOwe4VJNoSOeaQChMk5E/4es=
 github.com/Monibuca/utils/v3 v3.0.5/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE=

server.crt

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDPTCCAiWgAwIBAgIUFnIxXBFC9OMqd2AB2+ZtSoy/P+swDQYJKoZIhvcNAQEL
+BQAwLjELMAkGA1UEBhMCQ0gxDDAKBgNVBAoMA203czERMA8GA1UEAwwIbW9uaWJ1
+Y2EwHhcNMjExMjExMDgyNzE3WhcNMjIwMTEwMDgyNzE3WjAuMQswCQYDVQQGEwJD
+SDEMMAoGA1UECgwDbTdzMREwDwYDVQQDDAhtb25pYnVjYTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALDGa4R44OYDkAtLPV5I2vgZf69T0/TNsets8i3b
+q/JKWAbROzqGyOeDhxEp6cyheY0NsNcaOhCnhGbGmtd5di4u/0UkaCeUv1qQMBZS
+3K5tEs7n9/sYV18Bqb+1zx+pJSi3/g1qXs7+IrFlXKUxKhNBcr1kzlEb0FwK40/2
+d7bTSTmEW3/m0mcDGo2ZIMnh8VFiUhX4NXFmJ0aWbWpbMtlhkFnCW4lrzlT78mej
+/2jrEqEkhrbhQJmCr9gv0AuyQhQ0S320ZenwNChZSi1kK1cL2iXHKbSMgN6W4PPn
+XmfH0cTT0miNw3WJvdrNqE1KJqNttOVH8qj52yZVserWGdsCAwEAAaNTMFEwHQYD
+VR0OBBYEFCB2Cb43kRRDf5TJkNWL3TkXdIm+MB8GA1UdIwQYMBaAFCB2Cb43kRRD
+f5TJkNWL3TkXdIm+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
+AGN3WlRsx8HIgEvyyEHke0/dpm7Q1dDZ0fkOqsc/mG34psJbhcFJS5wq2P6phygN
+vc+NHS9mF2jVXdlx5aO5vO2KBh5KV2MuUoWj0uJL6oTvXaEBYT0i+vNCdVB/R0Lt
+vsroUnXyj7g0islrm2IbBcT8MT2wzXHHfkToiO+WotIW7eYuLCj0QXDbxUGHlq5O
+GNsDCSs1YF8uWlNe8QdAnZxLDKtpYnM9RMu77USG+RZ9OqSqNKSCQ0+XZFh2n7we
+XINPuxCwEUcm8LgS+AylovQdvxTUJ3KDve/9DgngbpZZKAMnTGL/8Q0VT2sAIfe+
+gFYY+/bcmraEr8xSfP+AhSw=
+-----END CERTIFICATE-----

server.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAsMZrhHjg5gOQC0s9Xkja+Bl/r1PT9M2x62zyLdur8kpYBtE7
+OobI54OHESnpzKF5jQ2w1xo6EKeEZsaa13l2Li7/RSRoJ5S/WpAwFlLcrm0Szuf3
++xhXXwGpv7XPH6klKLf+DWpezv4isWVcpTEqE0FyvWTOURvQXArjT/Z3ttNJOYRb
+f+bSZwMajZkgyeHxUWJSFfg1cWYnRpZtalsy2WGQWcJbiWvOVPvyZ6P/aOsSoSSG
+tuFAmYKv2C/QC7JCFDRLfbRl6fA0KFlKLWQrVwvaJccptIyA3pbg8+deZ8fRxNPS
+aI3DdYm92s2oTUomo2205UfyqPnbJlWx6tYZ2wIDAQABAoIBAQCXWDmDAC6kHta7
+JJ6U01FNah9MTzu/cj/qbKrnIhSTapz0sTvBPtZQh+YihrzZakHzxo3pi1W9Hn6X
+s1+sLRxGLAx2+NWHVa2CbsIMysKPP2kD5cwEmPFssLLRJGoBFEJxGx2SBMjI9QFk
+2YA5Gd+I/taqWdzdyi9YLiYxNrWFuu98v2nEiPqkys9KCw/d2MLfJFUiRV51z/Wi
+8DxJ6BlJmEudHh8TFP38Id62q26qIosJoN28UBxwlrT1ZuP4te81W5jDLeIJMe3k
+wWLZ9J1ko1+MqSc3wPUcbYegkULkA4dRr+7oHXi2Wh6Gl3+VwWxSPqb+/5OZmu39
+YILgr4MpAoGBAOd/std1j1u9LBnumcFKlEWoRqE1F1nzfXXFDEBdxFCVwaRP8EYT
+Piazygv0Iev7O/hEz2Ma9LqOiiiSDzN3DYpD1571nJeuJgDtXKsZ9q3EE4RS14bH
+tv1DV8U3+S4LrWZBb+GZTiR+Otiqv1C7q4FZ3+qhU5kmhCZyz221rkNNAoGBAMN8
+BOftsc9u9BtGsmvoZ0SJzuNn6MLNlTOGgR9ylC1n+faEQyuWzN1W49Jv+d0zMhx2
+lf56blMczPLzFvb3bqEffuf8uPMB4KlAVAl7aR0LCgTSAbWQRdg5632CUdQLY8sY
+/sScqEJcXpBI2nXlGcGsJWXdFa0j6YmAbRyomG3HAoGAKIT6eanzCLyoznUr5mA2
+aabVjfvr9WugBxARX+bJqM09kpQHW0yc8UtAzyzRDyvvSDpLDm62bTzrw8Qk8v4g
+mZXcVM9qtEXgEwN41934hluuitexL78fMV8rKrLsY3nZxO8pNRSPT+XkSO5CBFCE
+6WQgxEGujzzlnpEz62EEenUCgYASttK5aVX2Z8bSvafjELKiKxc1SgNMcuXvsta1
+rgBlgGi7otnTWHJwVhslUDb5aCdJ9khRvmLFbiJot8DhD7r1jdBWYSlLikh5q4Dg
+D4J2l1H0OC6VtSQamSDkOQ+gXx7EmLX7GIw7HiCna3IOi0o18kb6Q3oJw0BeO382
+mSVOjQKBgDruvLIiaB7TPmti6z3U2yNHmn+7e0Ua7W2moy3l/rCVcgySBuw4Yjgs
+KC5ZbItx8xnV16K8LKfzWso76nmT7N3pPdNI+szzphDNyRe8vW5EaIF0fi4OZupP
+B7Hx5HGGjluRLWO4FjchYdjcD/nxhQtzCT4SvPn9KUxmRJ4c3lIz
+-----END RSA PRIVATE KEY-----