Skip to content

Commit eea64a7

Browse files
committed
Upgrade some dependencies
1 parent bf93d16 commit eea64a7

Some content is hidden

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

57 files changed

+215
-213
lines changed

cmd/streamcli/commands/commands.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var (
4242
l.Error("unable to get the value of the flag 'go-net-pprof-addr': %v", err)
4343
}
4444
if netPprofAddr != "" {
45-
observability.Go(ctx, func() {
45+
observability.Go(ctx, func(ctx context.Context) {
4646
if netPprofAddr == "" {
4747
netPprofAddr = "localhost:0"
4848
}

cmd/streamd/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func main() {
9191
ctx = logger.CtxWithLogger(ctx, l)
9292

9393
if *netPprofAddr != "" || (forceNetPProfOnAndroid && runtime.GOOS == "android") {
94-
observability.Go(ctx, func() {
94+
observability.Go(ctx, func(ctx context.Context) {
9595
if *netPprofAddr == "" {
9696
*netPprofAddr = "localhost:0"
9797
}
@@ -175,7 +175,7 @@ func main() {
175175
l.Fatalf("unable to initialize the streamd instance: %v", err)
176176
}
177177

178-
observability.Go(ctx, func() {
178+
observability.Go(ctx, func(ctx context.Context) {
179179
if err = streamD.Run(ctx); err != nil {
180180
l.Errorf("streamd returned an error: %v", err)
181181
}
@@ -186,7 +186,7 @@ func main() {
186186
log.Fatalf("failed to listen: %v", err)
187187
}
188188

189-
observability.Go(ctx, func() {
189+
observability.Go(ctx, func(ctx context.Context) {
190190
<-ctx.Done()
191191
listener.Close()
192192
})

cmd/streampanel/context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func getContext(
100100
closeFile = func() { f.Close() }
101101
}
102102
rotateFunc()
103-
observability.Go(ctx, func() {
103+
observability.Go(ctx, func(ctx context.Context) {
104104
defer func() {
105105
logger.Debugf(ctx, "log rotator is closed")
106106
}()

cmd/streampanel/fork.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func runSplitProcesses(
147147
logger.Fatalf(ctx, "failed to start process manager: %v", err)
148148
}
149149
defer m.Close()
150-
observability.Go(ctx, func() {
150+
observability.Go(ctx, func(ctx context.Context) {
151151
m.Serve(ctx, func(ctx context.Context, source ProcessName, content any) error {
152152
switch content.(type) {
153153
case GetFlags:
@@ -170,7 +170,7 @@ func runSplitProcesses(
170170
return nil
171171
})
172172
})
173-
observability.Go(ctx, func() {
173+
observability.Go(ctx, func(ctx context.Context) {
174174
select {
175175
case <-ctx.Done():
176176
return
@@ -289,7 +289,7 @@ func runFork(
289289
logger.Errorf(ctx, "unable to register the command %v to be auto-killed: %v (GOOS: %v)", args, err, runtime.GOOS)
290290
}
291291
}
292-
observability.Go(ctx, func() {
292+
observability.Go(ctx, func(ctx context.Context) {
293293
err := cmd.Wait()
294294
stderrLogger.Flush()
295295
stdoutLogger.Flush()
@@ -307,10 +307,10 @@ func runFork(
307307
func fakeFork(ctx context.Context, procName ProcessName, addr, password string) error {
308308
switch procName {
309309
case ProcessNameStreamd:
310-
observability.Go(ctx, func() { forkUI(ctx, addr, password) })
310+
observability.Go(ctx, func(ctx context.Context) { forkUI(ctx, addr, password) })
311311
return nil
312312
case ProcessNameUI:
313-
observability.Go(ctx, func() { forkStreamd(ctx, addr, password) })
313+
observability.Go(ctx, func(ctx context.Context) { forkStreamd(ctx, addr, password) })
314314
return nil
315315
}
316316
return fmt.Errorf("unexpected process name: %s", procName)

cmd/streampanel/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func main() {
4949
}
5050
ctx = belt.WithField(ctx, "process", ProcessNameMain)
5151
defer func() { observability.PanicIfNotNil(ctx, recover()) }()
52-
observability.Go(ctx, func() {
52+
observability.Go(ctx, func(ctx context.Context) {
5353
<-ctx.Done()
5454
logger.Debugf(ctx, "context is cancelled")
5555
})
@@ -125,7 +125,7 @@ func runPanel(
125125
return err
126126
}
127127

128-
observability.Go(ctx, func() {
128+
observability.Go(ctx, func(ctx context.Context) {
129129
err = grpcServer.Serve(listener)
130130
if err != nil {
131131
logger.Panicf(ctx, "unable to server the gRPC server: %v", err)
@@ -135,7 +135,7 @@ func runPanel(
135135

136136
if mainProcess != nil {
137137
setReadyFor(ctx, mainProcess, StreamDDied{}, UpdateStreamDConfig{})
138-
observability.Go(ctx, func() {
138+
observability.Go(ctx, func(ctx context.Context) {
139139
err := mainProcess.Serve(
140140
ctx,
141141
func(ctx context.Context, source mainprocess.ProcessName, content any) error {

cmd/streampanel/runtime.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func initRuntime(
3030
l := logger.FromCtx(ctx)
3131

3232
if ForceDebug {
33-
observability.Go(ctx, func() {
33+
observability.Go(ctx, func(ctx context.Context) {
3434
t := time.NewTicker(time.Second)
3535
defer t.Stop()
3636
for {
@@ -88,7 +88,7 @@ func initRuntime(
8888
}
8989

9090
if netPprofAddr != "" {
91-
observability.Go(ctx, func() {
91+
observability.Go(ctx, func(ctx context.Context) {
9292
http.Handle(
9393
"/metrics",
9494
promhttp.Handler(),
@@ -104,7 +104,7 @@ func initRuntime(
104104
runtime.GOMAXPROCS(4)
105105
}
106106

107-
observability.Go(ctx, func() {
107+
observability.Go(ctx, func(ctx context.Context) {
108108
t := time.NewTicker(time.Second)
109109
defer t.Stop()
110110
for {

cmd/streampanel/signal_handler.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func mainProcessSignalHandler(
1717
) chan<- os.Signal {
1818
c := make(chan os.Signal, 1)
1919
signal.Notify(c, os.Interrupt)
20-
observability.Go(ctx, func() {
20+
observability.Go(ctx, func(ctx context.Context) {
2121
for range c {
2222
cancelFn()
2323
forkLocker.Do(ctx, func() {
@@ -26,7 +26,7 @@ func mainProcessSignalHandler(
2626
wg.Add(1)
2727
{
2828
name, f := name, f
29-
observability.Go(ctx, func() {
29+
observability.Go(ctx, func(ctx context.Context) {
3030
defer wg.Done()
3131
logger.Debugf(ctx, "interrupting '%s'", name)
3232
err := f.Process.Signal(os.Interrupt)
@@ -37,7 +37,7 @@ func mainProcessSignalHandler(
3737
return
3838
}
3939

40-
observability.Go(ctx, func() {
40+
observability.Go(ctx, func(ctx context.Context) {
4141
time.Sleep(5 * time.Second)
4242
logger.Debugf(ctx, "killing '%s'", name)
4343
err := f.Process.Kill()
@@ -67,7 +67,7 @@ func childProcessSignalHandler(
6767
) chan<- os.Signal {
6868
c := make(chan os.Signal, 1)
6969
signal.Notify(c, os.Interrupt)
70-
observability.Go(ctx, func() {
70+
observability.Go(ctx, func(ctx context.Context) {
7171
for range c {
7272
logger.Infof(ctx, "received an interruption signal")
7373
cancelFunc()

cmd/streampanel/streamd.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func forkStreamd(preCtx context.Context, mainProcessAddr, password string) {
5757
logger.Debugf(ctx, "flags == %#+v", flags)
5858
ctx, cancelFunc := initRuntime(ctx, flags, procName)
5959
defer cancelFunc()
60-
observability.Go(ctx, func() {
60+
observability.Go(ctx, func(ctx context.Context) {
6161
<-ctx.Done()
6262
logger.Debugf(ctx, "context is cancelled")
6363
})
@@ -187,7 +187,7 @@ func runStreamd(
187187
if mainProcess != nil {
188188
logger.Debugf(ctx, "starting the IPC server")
189189
setReadyFor(ctx, mainProcess, GetStreamdAddress{}, RequestStreamDConfig{})
190-
observability.Go(ctx, func() {
190+
observability.Go(ctx, func(ctx context.Context) {
191191
err := mainProcess.Serve(
192192
ctx,
193193
func(
@@ -267,7 +267,7 @@ func initGRPCServers(
267267
}
268268

269269
obsGRPC, obsGRPCClose, err := streamD.OBS(ctx)
270-
observability.Go(ctx, func() {
270+
observability.Go(ctx, func(ctx context.Context) {
271271
<-ctx.Done()
272272
listener.Close()
273273
if obsGRPCClose != nil {
@@ -298,7 +298,7 @@ func initGRPCServers(
298298
registerGRPCServices(grpcServer, streamdGRPC, obsGRPC, proxyGRPC)
299299

300300
// start the server:
301-
observability.Go(ctx, func() {
301+
observability.Go(ctx, func(ctx context.Context) {
302302
logger.Infof(ctx, "started server at %s", listener.Addr().String())
303303
err = grpcServer.Serve(listener)
304304
select {

cmd/streampanel/ui.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func forkUI(preCtx context.Context, mainProcessAddr, password string) {
2929
ctx, cancelFunc := initRuntime(ctx, flags, procName)
3030
defer cancelFunc()
3131
defer belt.Flush(ctx)
32-
observability.Go(ctx, func() {
32+
observability.Go(ctx, func(ctx context.Context) {
3333
<-ctx.Done()
3434
logger.Debugf(ctx, "context is cancelled")
3535
})

go.mod

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ replace github.com/wlynxg/anet => github.com/BieHDC/anet v0.0.6-0.20241226223613
2323

2424
replace github.com/nicklaw5/helix/v2 v2.30.1-0.20240715193454-0151ccccf980 => github.com/xaionaro-go/helix/v2 v2.0.0-20250309182928-f54c9d4c8a29
2525

26-
replace github.com/asticode/go-astiav v0.35.1 => github.com/xaionaro-go/astiav v0.0.0-20250406220418-87d14d2908f9
26+
replace github.com/asticode/go-astiav v0.36.0 => github.com/xaionaro-go/astiav v0.0.0-20250521203320-7402f3e25a7c
2727

2828
replace github.com/bluenviron/mediacommon/v2 v2.0.1-0.20250324151931-b8ce69d15d3d => github.com/xaionaro-go/mediacommon/v2 v2.0.0-20250420012906-03d6d69ac3b7
2929

@@ -207,11 +207,12 @@ require (
207207
github.com/volatiletech/sqlboiler/v4 v4.16.2 // indirect
208208
github.com/volatiletech/strmangle v0.0.6 // indirect
209209
github.com/wlynxg/anet v0.0.6-0.20250109065809-5501d401a269 // indirect
210-
github.com/xaionaro-go/avmediacodec v0.0.0-20250421150856-ddd390422c21 // indirect
210+
github.com/xaionaro-go/avcommon v0.0.0-20250510235605-840f8210b727 // indirect
211+
github.com/xaionaro-go/avmediacodec v0.0.0-20250505012527-c819676502d8 // indirect
211212
github.com/xaionaro-go/gorex v0.0.0-20241010205749-bcd59d639c4d // indirect
212-
github.com/xaionaro-go/libsrt v0.0.0-20250105232601-e760c79b2bc3 // indirect
213+
github.com/xaionaro-go/libsrt v0.0.0-20250505013920-61d894a3b7e9 // indirect
213214
github.com/xaionaro-go/ndk v0.0.0-20250420195304-361bb98583bf // indirect
214-
github.com/xaionaro-go/proxy v0.0.0-20250111150848-1f0e7b262638 // indirect
215+
github.com/xaionaro-go/proxy v0.0.0-20250525144747-579f5a891c15 // indirect
215216
github.com/xaionaro-go/spinlock v0.0.0-20200518175509-30e6d1ce68a1 // indirect
216217
github.com/xanzy/ssh-agent v0.3.3 // indirect
217218
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
@@ -255,7 +256,7 @@ require (
255256
github.com/andreykaipov/goobs v1.4.1
256257
github.com/anthonynsimon/bild v0.14.0
257258
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
258-
github.com/asticode/go-astiav v0.35.1
259+
github.com/asticode/go-astiav v0.36.0
259260
github.com/bamiaux/rez v0.0.0-20170731184118-29f4463c688b
260261
github.com/bluenviron/gortsplib/v4 v4.12.4-0.20250324174248-61372cfa6800
261262
github.com/chai2010/webp v1.1.1
@@ -289,7 +290,7 @@ require (
289290
github.com/spf13/pflag v1.0.6
290291
github.com/stretchr/testify v1.10.0
291292
github.com/xaionaro-go/audio v0.0.0-20250210102901-abfced9d5ef3
292-
github.com/xaionaro-go/avpipeline v0.0.0-20250428012319-401ac2ebe66c
293+
github.com/xaionaro-go/avpipeline v0.0.0-20250525204026-17104bc4baca
293294
github.com/xaionaro-go/datacounter v1.0.4
294295
github.com/xaionaro-go/go-rtmp v0.0.0-20241009130244-1e3160f27f42
295296
github.com/xaionaro-go/grpcproxy v0.0.0-20241103205849-a8fef42e72f9
@@ -300,9 +301,9 @@ require (
300301
github.com/xaionaro-go/mediamtx v0.0.0-20250406132618-79ecbc3e138f
301302
github.com/xaionaro-go/object v0.0.0-20241026212449-753ce10ec94c
302303
github.com/xaionaro-go/obs-grpc-proxy v0.0.0-20241018162120-5faf4e7a684a
303-
github.com/xaionaro-go/observability v0.0.0-20250420133500-5c4d2e045932
304-
github.com/xaionaro-go/player v0.0.0-20250427220051-e366ad8a1fb5
305-
github.com/xaionaro-go/recoder v0.0.0-20250503155018-6f353978d332
304+
github.com/xaionaro-go/observability v0.0.0-20250622130956-24b7017284e4
305+
github.com/xaionaro-go/player v0.0.0-20250622133132-5473824ef0d0
306+
github.com/xaionaro-go/recoder v0.0.0-20250622133456-7bd1af83fda5
306307
github.com/xaionaro-go/secret v0.0.0-20250111141743-ced12e1082c2
307308
github.com/xaionaro-go/serializable v0.0.0-20250412140540-5ac572306599
308309
github.com/xaionaro-go/timeapiio v0.0.0-20240915203246-b907cf699af3
@@ -315,7 +316,7 @@ require (
315316
github.com/xaionaro-go/xsync v0.0.0-20250614210231-b74f647f859f
316317
github.com/yutopp/go-flv v0.3.1
317318
golang.org/x/crypto v0.38.0
318-
google.golang.org/grpc v1.71.1
319+
google.golang.org/grpc v1.72.1
319320
google.golang.org/protobuf v1.36.6
320321
gopkg.in/yaml.v2 v2.4.0
321322
gopkg.in/yaml.v3 v3.0.1

0 commit comments

Comments
 (0)