diff --git a/.gitignore b/.gitignore index ff4cdf1..5e15727 100644 --- a/.gitignore +++ b/.gitignore @@ -13,10 +13,13 @@ dist/ record/ config2.yaml config1.yaml -monibuca_linux +monibuca_* ps ps2 ps3 devices.json dump -.DS_Store \ No newline at end of file +.DS_Store +main +monitor +.history \ No newline at end of file diff --git a/go.mod b/go.mod index 57337df..670ef58 100644 --- a/go.mod +++ b/go.mod @@ -3,28 +3,28 @@ module monibuca go 1.19 require ( - m7s.live/engine/v4 v4.11.18 + m7s.live/engine/v4 v4.12.0 m7s.live/plugin/debug/v4 v4.0.0-20220506113031-34f3a736ceb2 m7s.live/plugin/edge/v4 v4.0.4 - m7s.live/plugin/fmp4/v4 v4.0.1 - m7s.live/plugin/gb28181/v4 v4.2.10 - m7s.live/plugin/hdl/v4 v4.1.2 - m7s.live/plugin/hls/v4 v4.1.9 + m7s.live/plugin/fmp4/v4 v4.0.2 + m7s.live/plugin/gb28181/v4 v4.2.11 + m7s.live/plugin/hdl/v4 v4.1.3 + m7s.live/plugin/hls/v4 v4.1.10 m7s.live/plugin/hook/v4 v4.0.2 m7s.live/plugin/jessica/v4 v4.1.1 m7s.live/plugin/logrotate/v4 v4.0.3 - m7s.live/plugin/preview/v4 v4.0.3 - m7s.live/plugin/record/v4 v4.2.7 - m7s.live/plugin/room/v4 v4.0.6 + m7s.live/plugin/monitor/v4 v4.0.0-20230404120701-2c46d5171360 + m7s.live/plugin/preview/v4 v4.0.4 + m7s.live/plugin/record/v4 v4.2.8 + m7s.live/plugin/room/v4 v4.0.7 m7s.live/plugin/rtmp/v4 v4.1.8 m7s.live/plugin/rtsp/v4 v4.1.5 m7s.live/plugin/snap/v4 v4.0.4 - m7s.live/plugin/webrtc/v4 v4.1.1 + m7s.live/plugin/webrtc/v4 v4.1.2 m7s.live/plugin/webtransport/v4 v4.0.2 ) require ( - github.com/aler9/gortsplib v1.0.1 // indirect github.com/aler9/gortsplib/v2 v2.2.2 // indirect github.com/cnotch/ipchub v1.1.0 // indirect github.com/denisbrodbeck/machineid v1.0.1 // indirect diff --git a/go.sum b/go.sum index 9c14ac6..ac534fd 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,4 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/aler9/gortsplib v1.0.1 h1:R13+hxlvg2Hvu98+0hzg0o5fPjyUA9ZPJneMIBxKGXk= -github.com/aler9/gortsplib v1.0.1/go.mod h1:BOWNZ/QBkY/eVcRqUzJbPFEsRJshwxaxBT01K260Jeo= github.com/aler9/gortsplib/v2 v2.2.2 h1:tTw8pdKSOEjlZjjE1S4ftXPHJkYOqjNNv3hjQ0Nto9M= github.com/aler9/gortsplib/v2 v2.2.2/go.mod h1:k6uBVHGwsIc/0L5SLLqWwi6bSJUb4VR0HfvncyHlKQI= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= @@ -354,39 +352,41 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -m7s.live/engine/v4 v4.11.18 h1:tgINiHqrrLdWEnoFZ0n2gSwoQwPwBgz+V/NXgo5K4Ks= -m7s.live/engine/v4 v4.11.18/go.mod h1:YoOThdhOpkf7MUDWciy449vfBF7i1p+dtf5o32hOvXY= +m7s.live/engine/v4 v4.12.0 h1:CRPbJ0jhHVZArc5mvV7e6Seb4Ye816kGzs3FOVKnfHw= +m7s.live/engine/v4 v4.12.0/go.mod h1:AiJPBwdA77DM3fymlcH2qYPR8ivL6ib9UVLm1Rft/to= m7s.live/plugin/debug/v4 v4.0.0-20220506113031-34f3a736ceb2 h1:0QWJvozTHy7m+G/lOIGiejQ9okFIDjwzVsgXe6ZaJg8= m7s.live/plugin/debug/v4 v4.0.0-20220506113031-34f3a736ceb2/go.mod h1:A/C1ViacCOK7EPeeCfiwlUrC2TUtRdEqzrR0Yd9b1KQ= m7s.live/plugin/edge/v4 v4.0.4 h1:NvvYeAbpA1/Vg8dx5e4as/o+PbSCiSI2xoRkKOXBjhI= m7s.live/plugin/edge/v4 v4.0.4/go.mod h1:AWeJV1Nu2UWsEdlcCATlQW+bz6Pz/3A11AZG9Z4hIc0= -m7s.live/plugin/fmp4/v4 v4.0.1 h1:HX6bkrkHm214DnmpBkyt/a/cE4aeIEHcu4o65OTh7sk= -m7s.live/plugin/fmp4/v4 v4.0.1/go.mod h1:9/DlkfpXuBtZziwARFHZogLRnT+vjXPbO5eTrbGkY+8= -m7s.live/plugin/gb28181/v4 v4.2.10 h1:3XVNgZcyETWhWym5e9XTM0TXzvjdVNdti797zXkI0KI= -m7s.live/plugin/gb28181/v4 v4.2.10/go.mod h1:p9BXmPzsl7DtW0AdT9Jtd/nMpcB1vMsrswXu08ExwqM= -m7s.live/plugin/hdl/v4 v4.1.2 h1:3I6diqnkdu6FDsMckCKFuC/iEkO2pcBHXQR73yLzWa4= -m7s.live/plugin/hdl/v4 v4.1.2/go.mod h1:eHwc7USoFXwutbf4nmtA+lqJF6VU0VjQtNgRhDHhAFU= -m7s.live/plugin/hls/v4 v4.1.9 h1:1FZGsIvEZl+o8ZasHz2h8+kmDLxUpbQ2OSQdrhnbvUI= -m7s.live/plugin/hls/v4 v4.1.9/go.mod h1:IKtc23TgtKpetR96JvxkSvauNcg/juhvrb3ujs6Beo4= +m7s.live/plugin/fmp4/v4 v4.0.2 h1:IHAFEEktDzHoEhsfonCzMt9lNttp1Qz2R2u4wfOCDos= +m7s.live/plugin/fmp4/v4 v4.0.2/go.mod h1:9/DlkfpXuBtZziwARFHZogLRnT+vjXPbO5eTrbGkY+8= +m7s.live/plugin/gb28181/v4 v4.2.11 h1:Y83krnW0ziiI5hiK2v50fPBhAKo5+h+aGNSN6ZiXGfQ= +m7s.live/plugin/gb28181/v4 v4.2.11/go.mod h1:zz6vOdI97lwLVPIJEeYQlASrKfWn3QPt+g4yt7gVx5c= +m7s.live/plugin/hdl/v4 v4.1.3 h1:op0C9NGL0R+Oidn9xJTSU+qCLtkjlYeSSTikCOaDBvQ= +m7s.live/plugin/hdl/v4 v4.1.3/go.mod h1:tUcbO5AZLj4Kg5UILxhYrDdSHnNNWPMQxN/+NFQuaTE= +m7s.live/plugin/hls/v4 v4.1.10 h1:ncvs7jQB/DcXJIaM0LtK41LmazVye+cB1LfHHAUV6xc= +m7s.live/plugin/hls/v4 v4.1.10/go.mod h1:PH2AORCqWeBUveHFXxkCYLXoFCwgAVoE7hCqgj4lPR8= m7s.live/plugin/hook/v4 v4.0.2 h1:fKwsx7gDAzfKfCz0C+knoY4wg/qnlQloM996l3jUWNc= m7s.live/plugin/hook/v4 v4.0.2/go.mod h1:zoyGSwIIdt4NGFdqrKHLFCwwMk4oAOF+dlvSV6cizGU= m7s.live/plugin/jessica/v4 v4.1.1 h1:+0rW+z5vZC2M2MpFRlk/VW8ugvfdil1s5UPMdeHoigo= m7s.live/plugin/jessica/v4 v4.1.1/go.mod h1:PiKCNriToVPytx5WMAtE26i8k1g7eP7Pud1msrU3X6g= m7s.live/plugin/logrotate/v4 v4.0.3 h1:f+teASc5Y5vDOrxXFc/ri3t7jdi6GIb6V9UMjhacb7I= m7s.live/plugin/logrotate/v4 v4.0.3/go.mod h1:a8hIV59GjpQDE+Ip790CU7yOHaG4+Iweci0sLvo43FU= -m7s.live/plugin/preview/v4 v4.0.3 h1:p1t+LXg0HZvHqjPn3+TeO6rB4EtwHnanlH2VgtFZtNY= -m7s.live/plugin/preview/v4 v4.0.3/go.mod h1:iYhWqFbTvTNDFplbTOrE5X9M6ED7gCKkKMuM5QmBocg= -m7s.live/plugin/record/v4 v4.2.7 h1:Io7iT+xRXloo1i0PZ6rIwWk42C3gCcz0iqhvpGgzSNs= -m7s.live/plugin/record/v4 v4.2.7/go.mod h1:5+3AxoDjNdKHHXaStyim1YIbPQEdnMWvIc6f2X7RKRE= -m7s.live/plugin/room/v4 v4.0.6 h1:wtkiHTQVwZKfbU77NFjSse1lrIxz4EBm6gu8b97RIxY= -m7s.live/plugin/room/v4 v4.0.6/go.mod h1:D8CXXlUkzILMwHyFzaglJZMyK2Ry4ZGwaMk7kbnvgzU= +m7s.live/plugin/monitor/v4 v4.0.0-20230404120701-2c46d5171360 h1:ZX77mDdR3Yg4OxVrBgm5SFSyehlRY1f4AbkgwqaP31E= +m7s.live/plugin/monitor/v4 v4.0.0-20230404120701-2c46d5171360/go.mod h1:wYcjvXM03RK00DGA/R7zfiENNT7jDFQhp0rEBvO1mTw= +m7s.live/plugin/preview/v4 v4.0.4 h1:xDS0817CLo3hx+wAcncE46gPDiPN5AsIWdAdbBltGDA= +m7s.live/plugin/preview/v4 v4.0.4/go.mod h1:iYhWqFbTvTNDFplbTOrE5X9M6ED7gCKkKMuM5QmBocg= +m7s.live/plugin/record/v4 v4.2.8 h1:G22FOb/hlU0NQO4a24paz0bJxMBouR8fbgZ1HbBnHvo= +m7s.live/plugin/record/v4 v4.2.8/go.mod h1:SlOV0HCGNPn+AI1EjgttnA3KgQ2xccEUomBeVv4KKKM= +m7s.live/plugin/room/v4 v4.0.7 h1:K+KKLa+tr3eDCsQCgmpF8/QXYkro6zhmAFCOgkvLUro= +m7s.live/plugin/room/v4 v4.0.7/go.mod h1:etzDx/MHFm1XPDNwqprJbtY8iXLYiG3KeMg62z7MiSw= m7s.live/plugin/rtmp/v4 v4.1.8 h1:r2bojw5+ZrwGEpb2quB8N3mbjqZtuCIN//vfapq9yxA= m7s.live/plugin/rtmp/v4 v4.1.8/go.mod h1:7+3oO93TIsSlASnv482PCE3CXhYqyRIAwA8FllnOTgE= m7s.live/plugin/rtsp/v4 v4.1.5 h1:lpsYfK+InnyHO4ckyvWOV8a3obMhVXqCefLT0+3LM50= m7s.live/plugin/rtsp/v4 v4.1.5/go.mod h1:+fIAAY/NLV0PgfvddPCgcm07EusqTC+nVUF/KhYYtCo= m7s.live/plugin/snap/v4 v4.0.4 h1:v9QGkIFA3Q25shs0YYZ1sju8UfBvlo57fEdp0RwLEpo= m7s.live/plugin/snap/v4 v4.0.4/go.mod h1:XHggonZ0lIKEX/OP2rXjV2mPpG4urmvMT3foIaFRsus= -m7s.live/plugin/webrtc/v4 v4.1.1 h1:mz0TtoGUFNnnPuxtgK2JIdRKHk0GBeAMFqATkHYrnHY= -m7s.live/plugin/webrtc/v4 v4.1.1/go.mod h1:UaiRtZYS3pYjy1JSVqLn71FlIkK8hRbKxCrtBmtwUoc= +m7s.live/plugin/webrtc/v4 v4.1.2 h1:JEsM2f6rUB3XgA0UOktn5u/wQNNXMSfWGn3HwBvpBNs= +m7s.live/plugin/webrtc/v4 v4.1.2/go.mod h1:0kDXvyiPUputAR9MT6U9zu8yuJ5JhkYEMHB6aYEBRU8= m7s.live/plugin/webtransport/v4 v4.0.2 h1:skL5jxg8rJ4PGJZVJ8pZmxRuJHp8i+pXlH6uQzOdEN0= m7s.live/plugin/webtransport/v4 v4.0.2/go.mod h1:If9KBJmsoz8Ae37+fds4EBinbNV8a8tqPjLGLvVAr28= diff --git a/main.go b/main.go index 5ce85cb..6a1dee4 100644 --- a/main.go +++ b/main.go @@ -57,6 +57,7 @@ import ( _ "m7s.live/plugin/webtransport/v4" _ "m7s.live/plugin/edge/v4" _ "m7s.live/plugin/fmp4/v4" + _ "m7s.live/plugin/monitor/v4" ) var (