fix:

- data track push data panic
- g711 new track attach block
- didn't stop all publisher and subscriber when rtmp closed
- ps-plugin audio not enabled

desc:
- 数据轨道写入时引发panic
- 在事件回调中创建g711会导致阻塞
- rtmp关闭时没有停止所有发布者和订阅者
- ps-plugin音频未启用

Dockerfile

@@ -6,8 +6,6 @@ WORKDIR /opt
 ADD monibuca_linux /opt
 ADD favicon.ico /opt
 ADD config.yaml /opt
-ADD local.monibuca.com.key /opt
-ADD local.monibuca.com_bundle.pem /opt
 # RUN apk --no-cache add ffmpeg 
 #暴露端口
 EXPOSE 8080 8443 1935 554 58200 5060 8000-9000

go.mod

@@ -4,11 +4,11 @@ go 1.19
 
 require (
 	go.uber.org/zap v1.24.0
-	m7s.live/engine/v4 v4.13.5
+	m7s.live/engine/v4 v4.13.6
 	m7s.live/plugin/debug/v4 v4.0.0
 	m7s.live/plugin/edge/v4 v4.0.5
 	m7s.live/plugin/fmp4/v4 v4.0.3
-	m7s.live/plugin/gb28181/v4 v4.3.6
+	m7s.live/plugin/gb28181/v4 v4.3.7
 	m7s.live/plugin/hdl/v4 v4.1.6
 	m7s.live/plugin/hls/v4 v4.3.1
 	m7s.live/plugin/hook/v4 v4.0.2
@@ -18,7 +18,7 @@ require (
 	m7s.live/plugin/preview/v4 v4.1.2
 	m7s.live/plugin/record/v4 v4.3.7
 	m7s.live/plugin/room/v4 v4.0.10
-	m7s.live/plugin/rtmp/v4 v4.2.2
+	m7s.live/plugin/rtmp/v4 v4.2.3
 	m7s.live/plugin/rtsp/v4 v4.2.3
 	m7s.live/plugin/snap/v4 v4.0.6
 	m7s.live/plugin/webrtc/v4 v4.1.7
@@ -102,5 +102,5 @@ require (
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/tools v0.6.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	m7s.live/plugin/ps/v4 v4.0.6 // indirect
+	m7s.live/plugin/ps/v4 v4.0.7 // indirect
 )

go.sum

@@ -398,16 +398,16 @@ 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.13.5 h1:umdkd9vHI9c96pjLQ0VarQk88ODJE6+jTS2CuEzKvOU=
-m7s.live/engine/v4 v4.13.5/go.mod h1:LoALBfV5rmsz5TJQr6cmLxM33mfUE5BKBq/sMtXOVlc=
+m7s.live/engine/v4 v4.13.6 h1:JOootTxNbuo9J6/e4mlI69MOr6ITO3NLOALKKqcuWb8=
+m7s.live/engine/v4 v4.13.6/go.mod h1:LoALBfV5rmsz5TJQr6cmLxM33mfUE5BKBq/sMtXOVlc=
 m7s.live/plugin/debug/v4 v4.0.0 h1:yVFI/XB/EwR9NyihwvTIC/tocibPdE/NQZjDnOtRq/M=
 m7s.live/plugin/debug/v4 v4.0.0/go.mod h1:A/C1ViacCOK7EPeeCfiwlUrC2TUtRdEqzrR0Yd9b1KQ=
 m7s.live/plugin/edge/v4 v4.0.5 h1:0CEfbMAmD2jAUeb+jaZD5vvq968wrJli30PUkaNpbDo=
 m7s.live/plugin/edge/v4 v4.0.5/go.mod h1:AWeJV1Nu2UWsEdlcCATlQW+bz6Pz/3A11AZG9Z4hIc0=
 m7s.live/plugin/fmp4/v4 v4.0.3 h1:4wdIuM+COZG1J+0fvdwlsUnUKtMm2sOItM/IYw0zvMw=
 m7s.live/plugin/fmp4/v4 v4.0.3/go.mod h1:9/DlkfpXuBtZziwARFHZogLRnT+vjXPbO5eTrbGkY+8=
-m7s.live/plugin/gb28181/v4 v4.3.6 h1:S3UnMGa4fLx/HCvUgc77T7Bal4N0vEbKzkNhRcrZBao=
-m7s.live/plugin/gb28181/v4 v4.3.6/go.mod h1:8OT8exFBJX+Er6V0rrFwrZSG26mnGvE5vPNNYQduLHc=
+m7s.live/plugin/gb28181/v4 v4.3.7 h1:IZJ5J4RR/YNoI3anxBpHTHkGGPS3Co0PEDfAxPXsdtg=
+m7s.live/plugin/gb28181/v4 v4.3.7/go.mod h1:8OT8exFBJX+Er6V0rrFwrZSG26mnGvE5vPNNYQduLHc=
 m7s.live/plugin/hdl/v4 v4.1.6 h1:vgc+9MJ0eZcnUF1ZdpZa029UKlFDB2Tz3zZvemMW7BY=
 m7s.live/plugin/hdl/v4 v4.1.6/go.mod h1:tUcbO5AZLj4Kg5UILxhYrDdSHnNNWPMQxN/+NFQuaTE=
 m7s.live/plugin/hls/v4 v4.3.1 h1:FXcQShWnNTE0Guxg6YMzb5pbvMpn6MKiwcZ05N6nzhs=
@@ -422,14 +422,14 @@ m7s.live/plugin/monitor/v4 v4.0.3 h1:hu0Sh3W8+gcpmZ5LW6Gt/h1Mvl04+k1px5KtddsPPVw
 m7s.live/plugin/monitor/v4 v4.0.3/go.mod h1:wYcjvXM03RK00DGA/R7zfiENNT7jDFQhp0rEBvO1mTw=
 m7s.live/plugin/preview/v4 v4.1.2 h1:ENjeg36xWiPqI2FM0lJzs0t8gyeomEvUFtT5ygu+BrQ=
 m7s.live/plugin/preview/v4 v4.1.2/go.mod h1:iYhWqFbTvTNDFplbTOrE5X9M6ED7gCKkKMuM5QmBocg=
-m7s.live/plugin/ps/v4 v4.0.6 h1:oHtQf35ic1dCEvi/LFM3sGuPcAN/ho9q6rYlIu8RRz4=
-m7s.live/plugin/ps/v4 v4.0.6/go.mod h1:2JaJqcfJQjQEC34uu1QeH8ci4aXGhE48Cragl2Wsf4A=
+m7s.live/plugin/ps/v4 v4.0.7 h1:+TXkwgyDLRtiY37fMTZRkF/JINaOJYY8x6XAwu3wEbw=
+m7s.live/plugin/ps/v4 v4.0.7/go.mod h1:2JaJqcfJQjQEC34uu1QeH8ci4aXGhE48Cragl2Wsf4A=
 m7s.live/plugin/record/v4 v4.3.7 h1:C6sAx/YvTQDMO1di1Q1Pvq0jX+a/YWJOHrDaZQVVpfQ=
 m7s.live/plugin/record/v4 v4.3.7/go.mod h1:8TWcAJAjMcsHOiuT/SVCxdknSmlXH93iZowkQLOfFU0=
 m7s.live/plugin/room/v4 v4.0.10 h1:wa/bidlvNmjuYjtoGMhZifhFypvANWFkvKJWC5f6EVg=
 m7s.live/plugin/room/v4 v4.0.10/go.mod h1:EljepngX6Kdrtvfh6Lz7WmItvs/W/fV2jBaW9Tz8A1Q=
-m7s.live/plugin/rtmp/v4 v4.2.2 h1:rHSm6oDNEHppYVhVk8MYRSJZcapqByUsuAtCIcnKEOQ=
-m7s.live/plugin/rtmp/v4 v4.2.2/go.mod h1:d1U5Kg7SLTrRbw2VN9uVbnAswsQrVuzGenk95dv50Pw=
+m7s.live/plugin/rtmp/v4 v4.2.3 h1:fHQxG2EVWNQGBQaJ2HlYp9grqBO6jxQcY5gTWZW1A8s=
+m7s.live/plugin/rtmp/v4 v4.2.3/go.mod h1:d1U5Kg7SLTrRbw2VN9uVbnAswsQrVuzGenk95dv50Pw=
 m7s.live/plugin/rtsp/v4 v4.2.3 h1:oIMTZyxcoh4rdGT0hfsJP1XokyIthCBQVusPJxBx9CM=
 m7s.live/plugin/rtsp/v4 v4.2.3/go.mod h1:xSBM9wFXbqTIueJnTtVqrWKK78yWb7B027ToYhseraI=
 m7s.live/plugin/snap/v4 v4.0.6 h1:Hz0WEN6YrKDWvwpAwpfPl+V40eW0k/+8qzqS2OupzxA=