Skip to content

Commit 240e196

Browse files
authored
Merge branch 'master' into python3.13
2 parents 72890d5 + a107d13 commit 240e196

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2549
-1036
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Setup Go
2121
uses: actions/setup-go@v5
22-
with: { go-version: '1.24' }
22+
with: { go-version: '1.25' }
2323

2424
- name: Build go2rtc_win64
2525
env: { GOOS: windows, GOARCH: amd64 }
@@ -29,7 +29,7 @@ jobs:
2929
with: { name: go2rtc_win64, path: go2rtc.exe }
3030

3131
- name: Build go2rtc_win32
32-
env: { GOOS: windows, GOARCH: 386, GOTOOLCHAIN: go1.20.14 }
32+
env: { GOOS: windows, GOARCH: 386 }
3333
run: go build -ldflags "-s -w" -trimpath
3434
- name: Upload go2rtc_win32
3535
uses: actions/upload-artifact@v4
@@ -85,7 +85,7 @@ jobs:
8585
with: { name: go2rtc_linux_mipsel, path: go2rtc }
8686

8787
- name: Build go2rtc_mac_amd64
88-
env: { GOOS: darwin, GOARCH: amd64, GOTOOLCHAIN: go1.20.14 }
88+
env: { GOOS: darwin, GOARCH: amd64 }
8989
run: go build -ldflags "-s -w" -trimpath
9090
- name: Upload go2rtc_mac_amd64
9191
uses: actions/upload-artifact@v4
@@ -124,7 +124,7 @@ jobs:
124124
uses: docker/metadata-action@v5
125125
with:
126126
images: |
127-
${{ github.repository }}
127+
name=${{ github.repository }},enable=${{ github.event.repository.fork == false }}
128128
ghcr.io/${{ github.repository }}
129129
tags: |
130130
type=ref,event=branch
@@ -138,14 +138,14 @@ jobs:
138138
uses: docker/setup-buildx-action@v3
139139

140140
- name: Login to DockerHub
141-
if: github.event_name != 'pull_request'
141+
if: github.event_name == 'push' && github.event.repository.fork == false
142142
uses: docker/login-action@v3
143143
with:
144144
username: ${{ secrets.DOCKERHUB_USERNAME }}
145145
password: ${{ secrets.DOCKERHUB_TOKEN }}
146146

147147
- name: Login to GitHub Container Registry
148-
if: github.event_name != 'pull_request'
148+
if: github.event_name == 'push'
149149
uses: docker/login-action@v3
150150
with:
151151
registry: ghcr.io
@@ -181,7 +181,7 @@ jobs:
181181
uses: docker/metadata-action@v5
182182
with:
183183
images: |
184-
${{ github.repository }}
184+
name=${{ github.repository }},enable=${{ github.event.repository.fork == false }}
185185
ghcr.io/${{ github.repository }}
186186
flavor: |
187187
suffix=-hardware,onlatest=true
@@ -198,14 +198,14 @@ jobs:
198198
uses: docker/setup-buildx-action@v3
199199

200200
- name: Login to DockerHub
201-
if: github.event_name != 'pull_request'
201+
if: github.event_name == 'push' && github.event.repository.fork == false
202202
uses: docker/login-action@v3
203203
with:
204204
username: ${{ secrets.DOCKERHUB_USERNAME }}
205205
password: ${{ secrets.DOCKERHUB_TOKEN }}
206-
206+
207207
- name: Login to GitHub Container Registry
208-
if: github.event_name != 'pull_request'
208+
if: github.event_name == 'push'
209209
uses: docker/login-action@v3
210210
with:
211211
registry: ghcr.io
@@ -236,7 +236,7 @@ jobs:
236236
uses: docker/metadata-action@v5
237237
with:
238238
images: |
239-
${{ github.repository }}
239+
name=${{ github.repository }},enable=${{ github.event.repository.fork == false }}
240240
ghcr.io/${{ github.repository }}
241241
flavor: |
242242
suffix=-rockchip,onlatest=true
@@ -253,14 +253,14 @@ jobs:
253253
uses: docker/setup-buildx-action@v3
254254

255255
- name: Login to DockerHub
256-
if: github.event_name != 'pull_request'
256+
if: github.event_name == 'push' && github.event.repository.fork == false
257257
uses: docker/login-action@v3
258258
with:
259259
username: ${{ secrets.DOCKERHUB_USERNAME }}
260260
password: ${{ secrets.DOCKERHUB_TOKEN }}
261261

262262
- name: Login to GitHub Container Registry
263-
if: github.event_name != 'pull_request'
263+
if: github.event_name == 'push'
264264
uses: docker/login-action@v3
265265
with:
266266
registry: ghcr.io

README.md

Lines changed: 199 additions & 160 deletions
Large diffs are not rendered by default.

api/openapi.yaml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,54 @@ paths:
237237

238238

239239

240+
/api/preload:
241+
put:
242+
summary: Preload new stream
243+
tags: [ Streams list ]
244+
parameters:
245+
- name: src
246+
in: query
247+
description: Stream source (name)
248+
required: true
249+
schema: { type: string }
250+
example: "camera1"
251+
- name: video
252+
in: query
253+
description: Video codecs filter
254+
required: false
255+
schema: { type: string }
256+
example: all,h264,h265,...
257+
- name: audio
258+
in: query
259+
description: Audio codecs filter
260+
required: false
261+
schema: { type: string }
262+
example: all,aac,opus,...
263+
- name: microphone
264+
in: query
265+
description: Microphone codecs filter
266+
required: false
267+
schema: { type: string }
268+
example: all,aac,opus,...
269+
responses:
270+
default:
271+
description: Default response
272+
delete:
273+
summary: Delete preloaded stream
274+
tags: [ Streams list ]
275+
parameters:
276+
- name: src
277+
in: query
278+
description: Stream source (name)
279+
required: true
280+
schema: { type: string }
281+
example: "camera1"
282+
responses:
283+
default:
284+
description: Default response
285+
286+
287+
240288
/api/streams?src={src}:
241289
get:
242290
summary: Get stream info in JSON format

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# 0. Prepare images
44
ARG PYTHON_VERSION="3.13"
5-
ARG GO_VERSION="1.24"
5+
ARG GO_VERSION="1.25"
66

77

88
# 1. Build go2rtc binary

docker/hardware.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# only debian 13 (trixie) has latest ffmpeg
55
# https://packages.debian.org/trixie/ffmpeg
66
ARG DEBIAN_VERSION="trixie-slim"
7-
ARG GO_VERSION="1.24-bookworm"
7+
ARG GO_VERSION="1.25-bookworm"
88

99

1010
# 1. Build go2rtc binary

docker/rockchip.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# 0. Prepare images
44
ARG PYTHON_VERSION="3.13-slim-bookworm"
5-
ARG GO_VERSION="1.24-bookworm"
5+
ARG GO_VERSION="1.25-bookworm"
66

77

88
# 1. Build go2rtc binary

go.mod

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
module github.com/AlexxIT/go2rtc
22

3-
go 1.20
3+
go 1.23.0
44

55
require (
66
github.com/asticode/go-astits v1.13.0
7-
github.com/expr-lang/expr v1.17.2
7+
github.com/expr-lang/expr v1.17.5
88
github.com/google/uuid v1.6.0
99
github.com/gorilla/websocket v1.5.3
1010
github.com/mattn/go-isatty v0.0.20
11-
github.com/miekg/dns v1.1.63
12-
github.com/pion/ice/v4 v4.0.9
13-
github.com/pion/interceptor v0.1.37
11+
github.com/miekg/dns v1.1.66
12+
github.com/pion/ice/v4 v4.0.10
13+
github.com/pion/interceptor v0.1.40
1414
github.com/pion/rtcp v1.2.15
15-
github.com/pion/rtp v1.8.13
16-
github.com/pion/sdp/v3 v3.0.11
17-
github.com/pion/srtp/v3 v3.0.4
15+
github.com/pion/rtp v1.8.20
16+
github.com/pion/sdp/v3 v3.0.14
17+
github.com/pion/srtp/v3 v3.0.6
1818
github.com/pion/stun/v3 v3.0.0
19-
github.com/pion/webrtc/v4 v4.0.14
19+
github.com/pion/webrtc/v4 v4.1.3
2020
github.com/rs/zerolog v1.34.0
2121
github.com/sigurn/crc16 v0.0.0-20240131213347-83fcde1e29d1
2222
github.com/sigurn/crc8 v0.0.0-20220107193325-2243fe600f9f
2323
github.com/stretchr/testify v1.10.0
2424
github.com/tadglines/go-pkgs v0.0.0-20210623144937-b983b20f54f9
25-
golang.org/x/crypto v0.33.0
25+
golang.org/x/crypto v0.39.0
2626
gopkg.in/yaml.v3 v3.0.1
2727
)
2828

2929
require (
30-
github.com/asticode/go-astikit v0.54.0 // indirect
30+
github.com/asticode/go-astikit v0.56.0 // indirect
3131
github.com/davecgh/go-spew v1.1.1 // indirect
3232
github.com/kr/pretty v0.3.1 // indirect
3333
github.com/mattn/go-colorable v0.1.14 // indirect
3434
github.com/pion/datachannel v1.5.10 // indirect
3535
github.com/pion/dtls/v3 v3.0.6 // indirect
36-
github.com/pion/logging v0.2.3 // indirect
36+
github.com/pion/logging v0.2.4 // indirect
3737
github.com/pion/mdns/v2 v2.0.7 // indirect
3838
github.com/pion/randutil v0.1.0 // indirect
39-
github.com/pion/sctp v1.8.37 // indirect
39+
github.com/pion/sctp v1.8.39 // indirect
4040
github.com/pion/transport/v3 v3.0.7 // indirect
41-
github.com/pion/turn/v4 v4.0.0 // indirect
41+
github.com/pion/turn/v4 v4.0.2 // indirect
4242
github.com/pmezard/go-difflib v1.0.0 // indirect
4343
github.com/wlynxg/anet v0.0.5 // indirect
44-
golang.org/x/mod v0.20.0 // indirect
45-
golang.org/x/net v0.35.0 // indirect
46-
golang.org/x/sync v0.11.0 // indirect
47-
golang.org/x/sys v0.30.0 // indirect
48-
golang.org/x/tools v0.24.0 // indirect
44+
golang.org/x/mod v0.25.0 // indirect
45+
golang.org/x/net v0.41.0 // indirect
46+
golang.org/x/sync v0.15.0 // indirect
47+
golang.org/x/sys v0.33.0 // indirect
48+
golang.org/x/tools v0.34.0 // indirect
4949
)

go.sum

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
github.com/asticode/go-astikit v0.30.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
22
github.com/asticode/go-astikit v0.54.0 h1:uq9eurgisdkYwJU9vSWIQaPH4MH0cac82sQH00kmSNQ=
33
github.com/asticode/go-astikit v0.54.0/go.mod h1:fV43j20UZYfXzP9oBn33udkvCvDvCDhzjVqoLFuuYZE=
4+
github.com/asticode/go-astikit v0.56.0 h1:DmD2p7YnvxiPdF0h+dRmos3bsejNEXbycENsY5JfBqw=
5+
github.com/asticode/go-astikit v0.56.0/go.mod h1:fV43j20UZYfXzP9oBn33udkvCvDvCDhzjVqoLFuuYZE=
46
github.com/asticode/go-astits v1.13.0 h1:XOgkaadfZODnyZRR5Y0/DWkA9vrkLLPLeeOvDwfKZ1c=
57
github.com/asticode/go-astits v1.13.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
68
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -10,6 +12,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
1012
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1113
github.com/expr-lang/expr v1.17.2 h1:o0A99O/Px+/DTjEnQiodAgOIK9PPxL8DtXhBRKC+Iso=
1214
github.com/expr-lang/expr v1.17.2/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
15+
github.com/expr-lang/expr v1.17.5 h1:i1WrMvcdLF249nSNlpQZN1S6NXuW9WaOfF5tPi3aw3k=
16+
github.com/expr-lang/expr v1.17.5/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
1317
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
1418
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
1519
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -28,16 +32,24 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
2832
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
2933
github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
3034
github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
35+
github.com/miekg/dns v1.1.66 h1:FeZXOS3VCVsKnEAd+wBkjMC3D2K+ww66Cq3VnCINuJE=
36+
github.com/miekg/dns v1.1.66/go.mod h1:jGFzBsSNbJw6z1HYut1RKBKHA9PBdxeHrZG8J+gC2WE=
3137
github.com/pion/datachannel v1.5.10 h1:ly0Q26K1i6ZkGf42W7D4hQYR90pZwzFOjTq5AuCKk4o=
3238
github.com/pion/datachannel v1.5.10/go.mod h1:p/jJfC9arb29W7WrxyKbepTU20CFgyx5oLo8Rs4Py/M=
3339
github.com/pion/dtls/v3 v3.0.6 h1:7Hkd8WhAJNbRgq9RgdNh1aaWlZlGpYTzdqjy9x9sK2E=
3440
github.com/pion/dtls/v3 v3.0.6/go.mod h1:iJxNQ3Uhn1NZWOMWlLxEEHAN5yX7GyPvvKw04v9bzYU=
3541
github.com/pion/ice/v4 v4.0.9 h1:VKgU4MwA2LUDVLq+WBkpEHTcAb8c5iCvFMECeuPOZNk=
3642
github.com/pion/ice/v4 v4.0.9/go.mod h1:y3M18aPhIxLlcO/4dn9X8LzLLSma84cx6emMSu14FGw=
43+
github.com/pion/ice/v4 v4.0.10 h1:P59w1iauC/wPk9PdY8Vjl4fOFL5B+USq1+xbDcN6gT4=
44+
github.com/pion/ice/v4 v4.0.10/go.mod h1:y3M18aPhIxLlcO/4dn9X8LzLLSma84cx6emMSu14FGw=
3745
github.com/pion/interceptor v0.1.37 h1:aRA8Zpab/wE7/c0O3fh1PqY0AJI3fCSEM5lRWJVorwI=
3846
github.com/pion/interceptor v0.1.37/go.mod h1:JzxbJ4umVTlZAf+/utHzNesY8tmRkM2lVmkS82TTj8Y=
47+
github.com/pion/interceptor v0.1.40 h1:e0BjnPcGpr2CFQgKhrQisBU7V3GXK6wrfYrGYaU6Jq4=
48+
github.com/pion/interceptor v0.1.40/go.mod h1:Z6kqH7M/FYirg3frjGJ21VLSRJGBXB/KqaTIrdqnOic=
3949
github.com/pion/logging v0.2.3 h1:gHuf0zpoh1GW67Nr6Gj4cv5Z9ZscU7g/EaoC/Ke/igI=
4050
github.com/pion/logging v0.2.3/go.mod h1:z8YfknkquMe1csOrxK5kc+5/ZPAzMxbKLX5aXpbpC90=
51+
github.com/pion/logging v0.2.4 h1:tTew+7cmQ+Mc1pTBLKH2puKsOvhm32dROumOZ655zB8=
52+
github.com/pion/logging v0.2.4/go.mod h1:DffhXTKYdNZU+KtJ5pyQDjvOAh/GsNSyv1lbkFbe3so=
4153
github.com/pion/mdns/v2 v2.0.7 h1:c9kM8ewCgjslaAmicYMFQIde2H9/lrZpjBkN8VwoVtM=
4254
github.com/pion/mdns/v2 v2.0.7/go.mod h1:vAdSYNAT0Jy3Ru0zl2YiW3Rm/fJCwIeM0nToenfOJKA=
4355
github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
@@ -46,20 +58,32 @@ github.com/pion/rtcp v1.2.15 h1:LZQi2JbdipLOj4eBjK4wlVoQWfrZbh3Q6eHtWtJBZBo=
4658
github.com/pion/rtcp v1.2.15/go.mod h1:jlGuAjHMEXwMUHK78RgX0UmEJFV4zUKOFHR7OP+D3D0=
4759
github.com/pion/rtp v1.8.13 h1:8uSUPpjSL4OlwZI8Ygqu7+h2p9NPFB+yAZ461Xn5sNg=
4860
github.com/pion/rtp v1.8.13/go.mod h1:8uMBJj32Pa1wwx8Fuv/AsFhn8jsgw+3rUC2PfoBZ8p4=
61+
github.com/pion/rtp v1.8.20 h1:8zcyqohadZE8FCBeGdyEvHiclPIezcwRQH9zfapFyYI=
62+
github.com/pion/rtp v1.8.20/go.mod h1:bAu2UFKScgzyFqvUKmbvzSdPr+NGbZtv6UB2hesqXBk=
4963
github.com/pion/sctp v1.8.37 h1:ZDmGPtRPX9mKCiVXtMbTWybFw3z/hVKAZgU81wcOrqs=
5064
github.com/pion/sctp v1.8.37/go.mod h1:cNiLdchXra8fHQwmIoqw0MbLLMs+f7uQ+dGMG2gWebE=
65+
github.com/pion/sctp v1.8.39 h1:PJma40vRHa3UTO3C4MyeJDQ+KIobVYRZQZ0Nt7SjQnE=
66+
github.com/pion/sctp v1.8.39/go.mod h1:cNiLdchXra8fHQwmIoqw0MbLLMs+f7uQ+dGMG2gWebE=
5167
github.com/pion/sdp/v3 v3.0.11 h1:VhgVSopdsBKwhCFoyyPmT1fKMeV9nLMrEKxNOdy3IVI=
5268
github.com/pion/sdp/v3 v3.0.11/go.mod h1:88GMahN5xnScv1hIMTqLdu/cOcUkj6a9ytbncwMCq2E=
69+
github.com/pion/sdp/v3 v3.0.14 h1:1h7gBr9FhOWH5GjWWY5lcw/U85MtdcibTyt/o6RxRUI=
70+
github.com/pion/sdp/v3 v3.0.14/go.mod h1:88GMahN5xnScv1hIMTqLdu/cOcUkj6a9ytbncwMCq2E=
5371
github.com/pion/srtp/v3 v3.0.4 h1:2Z6vDVxzrX3UHEgrUyIGM4rRouoC7v+NiF1IHtp9B5M=
5472
github.com/pion/srtp/v3 v3.0.4/go.mod h1:1Jx3FwDoxpRaTh1oRV8A/6G1BnFL+QI82eK4ms8EEJQ=
73+
github.com/pion/srtp/v3 v3.0.6 h1:E2gyj1f5X10sB/qILUGIkL4C2CqK269Xq167PbGCc/4=
74+
github.com/pion/srtp/v3 v3.0.6/go.mod h1:BxvziG3v/armJHAaJ87euvkhHqWe9I7iiOy50K2QkhY=
5575
github.com/pion/stun/v3 v3.0.0 h1:4h1gwhWLWuZWOJIJR9s2ferRO+W3zA/b6ijOI6mKzUw=
5676
github.com/pion/stun/v3 v3.0.0/go.mod h1:HvCN8txt8mwi4FBvS3EmDghW6aQJ24T+y+1TKjB5jyU=
5777
github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0=
5878
github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo=
5979
github.com/pion/turn/v4 v4.0.0 h1:qxplo3Rxa9Yg1xXDxxH8xaqcyGUtbHYw4QSCvmFWvhM=
6080
github.com/pion/turn/v4 v4.0.0/go.mod h1:MuPDkm15nYSklKpN8vWJ9W2M0PlyQZqYt1McGuxG7mA=
81+
github.com/pion/turn/v4 v4.0.2 h1:ZqgQ3+MjP32ug30xAbD6Mn+/K4Sxi3SdNOTFf+7mpps=
82+
github.com/pion/turn/v4 v4.0.2/go.mod h1:pMMKP/ieNAG/fN5cZiN4SDuyKsXtNTr0ccN7IToA1zs=
6183
github.com/pion/webrtc/v4 v4.0.14 h1:nyds/sFRR+HvmWoBa6wrL46sSfpArE0qR883MBW96lg=
6284
github.com/pion/webrtc/v4 v4.0.14/go.mod h1:R3+qTnQTS03UzwDarYecgioNf7DYgTsldxnCXB821Kk=
85+
github.com/pion/webrtc/v4 v4.1.3 h1:YZ67Boj9X/hk190jJZ8+HFGQ6DqSZ/fYP3sLAZv7c3c=
86+
github.com/pion/webrtc/v4 v4.1.3/go.mod h1:rsq+zQ82ryfR9vbb0L1umPJ6Ogq7zm8mcn9fcGnxomM=
6387
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
6488
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
6589
github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
@@ -84,19 +108,31 @@ github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
84108
github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
85109
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
86110
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
111+
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
112+
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
87113
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
88114
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
115+
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
116+
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
89117
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
90118
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
119+
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
120+
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
91121
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
92122
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
123+
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
124+
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
93125
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
94126
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
95127
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
96128
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
97129
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
130+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
131+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
98132
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
99133
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
134+
golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
135+
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
100136
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
101137
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
102138
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/api/ws/ws.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/AlexxIT/go2rtc/internal/api"
1313
"github.com/AlexxIT/go2rtc/internal/app"
14+
"github.com/AlexxIT/go2rtc/pkg/core"
1415
"github.com/gorilla/websocket"
1516
"github.com/rs/zerolog"
1617
)
@@ -132,7 +133,8 @@ func apiWS(w http.ResponseWriter, r *http.Request) {
132133
if handler := wsHandlers[msg.Type]; handler != nil {
133134
go func() {
134135
if err = handler(tr, msg); err != nil {
135-
tr.Write(&Message{Type: "error", Value: msg.Type + ": " + err.Error()})
136+
errMsg := core.StripUserinfo(err.Error())
137+
tr.Write(&Message{Type: "error", Value: msg.Type + ": " + errMsg})
136138
}
137139
}()
138140
}

0 commit comments

Comments
 (0)