Skip to content

Commit 45eba58

Browse files
authored
Merge pull request #216 from screego/update-fixes
Update & fixes
2 parents 40529d4 + 2654df5 commit 45eba58

File tree

8 files changed

+781
-779
lines changed

8 files changed

+781
-779
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
steps:
88
- uses: actions/setup-go@v5
99
with:
10-
go-version: 1.23.x
10+
go-version: 1.24.x
1111
- uses: actions/setup-node@v4
1212
with:
1313
node-version: '22'
@@ -18,7 +18,7 @@ jobs:
1818
- run: (cd ui && yarn testformat)
1919
- uses: golangci/golangci-lint-action@v6
2020
with:
21-
version: v1.60.3
21+
version: v1.64.6
2222
- run: go build ./...
2323
- run: go test -race ./...
2424
- if: startsWith(github.ref, 'refs/tags/v')

go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/screego/server
22

3-
go 1.23
3+
go 1.23.0
44

5-
toolchain go1.23.1
5+
toolchain go1.24.1
66

77
require (
88
github.com/gorilla/handlers v1.5.2
@@ -13,14 +13,14 @@ require (
1313
github.com/kelseyhightower/envconfig v1.4.0
1414
github.com/pion/randutil v0.1.0
1515
github.com/pion/turn/v4 v4.0.0
16-
github.com/prometheus/client_golang v1.20.5
16+
github.com/prometheus/client_golang v1.22.0
1717
github.com/rs/xid v1.6.0
18-
github.com/rs/zerolog v1.33.0
18+
github.com/rs/zerolog v1.34.0
1919
github.com/stretchr/testify v1.10.0
2020
github.com/urfave/cli v1.22.16
21-
golang.org/x/crypto v0.30.0
22-
golang.org/x/term v0.27.0
23-
golang.org/x/text v0.21.0
21+
golang.org/x/crypto v0.37.0
22+
golang.org/x/term v0.31.0
23+
golang.org/x/text v0.24.0
2424
)
2525

2626
require (
@@ -30,7 +30,7 @@ require (
3030
github.com/davecgh/go-spew v1.1.1 // indirect
3131
github.com/felixge/httpsnoop v1.0.3 // indirect
3232
github.com/gorilla/securecookie v1.1.2 // indirect
33-
github.com/klauspost/compress v1.17.9 // indirect
33+
github.com/klauspost/compress v1.18.0 // indirect
3434
github.com/kr/text v0.2.0 // indirect
3535
github.com/mattn/go-colorable v0.1.13 // indirect
3636
github.com/mattn/go-isatty v0.0.19 // indirect
@@ -41,11 +41,11 @@ require (
4141
github.com/pion/transport/v3 v3.0.7 // indirect
4242
github.com/pmezard/go-difflib v1.0.0 // indirect
4343
github.com/prometheus/client_model v0.6.1 // indirect
44-
github.com/prometheus/common v0.55.0 // indirect
44+
github.com/prometheus/common v0.62.0 // indirect
4545
github.com/prometheus/procfs v0.15.1 // indirect
4646
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4747
github.com/wlynxg/anet v0.0.4 // indirect
48-
golang.org/x/sys v0.28.0 // indirect
49-
google.golang.org/protobuf v1.34.2 // indirect
48+
golang.org/x/sys v0.32.0 // indirect
49+
google.golang.org/protobuf v1.36.5 // indirect
5050
gopkg.in/yaml.v3 v3.0.1 // indirect
5151
)

go.sum

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw
1818
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
1919
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
2020
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
21+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
2122
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
2223
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
2324
github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
@@ -36,6 +37,8 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv
3637
github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
3738
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
3839
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
40+
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
41+
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
3942
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
4043
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
4144
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -68,10 +71,14 @@ github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zI
6871
github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
6972
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
7073
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
74+
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
75+
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
7176
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
7277
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
7378
github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
7479
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
80+
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
81+
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
7582
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
7683
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
7784
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -81,6 +88,8 @@ github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
8188
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
8289
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
8390
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
91+
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
92+
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
8493
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
8594
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
8695
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -104,25 +113,38 @@ golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
104113
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
105114
golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
106115
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
116+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
117+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
107118
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
108119
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
120+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
109121
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
110122
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
111123
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
112124
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
113125
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
114126
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
115127
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
128+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
129+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
130+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
131+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
116132
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
117133
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
118134
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
119135
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
136+
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
137+
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
120138
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
121139
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
122140
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
123141
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
142+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
143+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
124144
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
125145
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
146+
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
147+
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
126148
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
127149
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
128150
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

ui/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
"dependencies": {
77
"@emotion/react": "^11.13.3",
88
"@emotion/styled": "^11.13.0",
9-
"@mui/icons-material": "^6.1.1",
10-
"@mui/material": "^6.1.1",
9+
"@mui/icons-material": "7.0.2",
10+
"@mui/material": "7.0.2",
1111
"@mui/styles": "^6.1.1",
12-
"@types/react": "^18.3.9",
13-
"@types/react-dom": "^18.3.0",
12+
"@types/react": "19.1.1",
13+
"@types/react-dom": "19.1.2",
1414
"@vitejs/plugin-react-swc": "^3.7.0",
1515
"notistack": "^3.0.1",
1616
"prettier": "^3.3.3",
17-
"react": "^18.3.1",
18-
"react-dom": "^18.3.1",
19-
"react-hotkeys-hook": "^4.5.1",
20-
"typescript": "~5.6.2",
17+
"react": "19.1.0",
18+
"react-dom": "19.1.0",
19+
"react-hotkeys-hook": "5.0.1",
20+
"typescript": "5.8.3",
2121
"use-http": "^1.0.28",
22-
"vite": "^5.4.8",
22+
"vite": "6.2.6",
2323
"vite-plugin-svgr": "^4.2.0",
2424
"vite-tsconfig-paths": "^5.0.1"
2525
},

ui/src/Room.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, {useCallback} from 'react';
2-
import {Badge, IconButton, Paper, Theme, Tooltip, Typography} from '@mui/material';
2+
import {Badge, IconButton, Paper, Tooltip, Typography} from '@mui/material';
33
import CancelPresentationIcon from '@mui/icons-material/CancelPresentation';
44
import PresentToAllIcon from '@mui/icons-material/PresentToAll';
55
import FullScreenIcon from '@mui/icons-material/Fullscreen';
@@ -353,11 +353,10 @@ const useShowOnMouseMovement = (doShow: (s: boolean) => void) => {
353353
);
354354
};
355355

356-
const useStyles = makeStyles((theme: Theme) => ({
356+
const useStyles = makeStyles(() => ({
357357
title: {
358358
padding: 15,
359359
position: 'fixed',
360-
background: theme.palette.background.paper,
361360
top: '30px',
362361
left: '50%',
363362
transform: 'translateX(-50%)',
@@ -373,7 +372,6 @@ const useStyles = makeStyles((theme: Theme) => ({
373372
control: {
374373
padding: 15,
375374
position: 'fixed',
376-
background: theme.palette.background.paper,
377375
bottom: '30px',
378376
left: '50%',
379377
transform: 'translateX(-50%)',

ui/src/RoomManage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const RoomManage = ({room, config}: {room: FCreateRoom; config: UseConfig
8383
style={{paddingTop: 50, maxWidth: 400, width: '100%', margin: '0 auto'}}
8484
spacing={4}
8585
>
86-
<Grid item xs={12}>
86+
<Grid size={12}>
8787
<Typography align="center" gutterBottom>
8888
<img src="./logo.svg" style={{width: 230}} alt="logo" />
8989
</Typography>

ui/src/useRoom.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const hostSession = async ({
8585
const mimeMatch: RTCRtpCodec[] = [];
8686
const others: RTCRtpCodec[] = [];
8787

88-
RTCRtpSender.getCapabilities('video')?.codecs.forEach((codec) => {
88+
RTCRtpReceiver.getCapabilities('video')?.codecs.forEach((codec) => {
8989
if (codec.mimeType === preferCodec.mimeType) {
9090
if (codec.sdpFmtpLine === preferCodec.sdpFmtpLine) {
9191
exactMatch.push(codec);
@@ -157,10 +157,10 @@ export type FCreateRoom = (room: RoomCreate | JoinRoom) => Promise<void>;
157157
export const useRoom = (config: UIConfig): UseRoom => {
158158
const [roomID, setRoomID] = useRoomID();
159159
const {enqueueSnackbar} = useSnackbar();
160-
const conn = React.useRef<WebSocket>();
160+
const conn = React.useRef<WebSocket | undefined>(undefined);
161161
const host = React.useRef<Record<string, RTCPeerConnection>>({});
162162
const client = React.useRef<Record<string, RTCPeerConnection>>({});
163-
const stream = React.useRef<MediaStream>();
163+
const stream = React.useRef<MediaStream>(undefined);
164164

165165
const [state, setState] = React.useState<RoomState>(false);
166166

0 commit comments

Comments
 (0)