From d5c691836fe40a182c8e705946e9a2e643e26134 Mon Sep 17 00:00:00 2001 From: Paul Wells Date: Sun, 20 Sep 2026 16:45:40 -0700 Subject: [PATCH] deps: update psrpc to v0.8.0 (#4882) * deps: update psrpc to v0.8.0 psrpc v0.8.0 splits the brokers into leaf packages so importing psrpc no longer pulls in nats.go and go-redis, and drops the root constructors: - return psrpc.NewRedisMessageBus(rc, opts...) + return redisbus.New(rc, opts...) getMessageBus keeps its NewLocalMessageBus branch -- that shim stays at the root because localbus costs no dependency. wire_gen.go carries a verbatim copy of the provider, so it gets the identical edit rather than a wire rerun, which would churn unrelated output. redisbus.New takes ...bus.BusOption and psrpc.BusOption is an alias for it, so PSRPCConfig.BusOptions() spreads in unchanged. The nats-io requirements drop out of go.mod; this module only ever used the Redis bus, and nats came in indirectly through psrpc's root package. * Reorder import statements in ioservice_sip_test.go --- go.mod | 7 ++----- go.sum | 8 ++++---- pkg/service/ioservice_sip_test.go | 11 ++++++----- pkg/service/wire.go | 3 ++- pkg/service/wire_gen.go | 3 ++- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 98c7a332d..5223127a3 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ require ( github.com/jxskiss/base62 v1.1.0 github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731 github.com/livekit/mediatransportutil v0.0.0-20260821083140-f234b534b095 - github.com/livekit/protocol v1.51.1-0.20260914053631-a879e945e713 - github.com/livekit/psrpc v0.7.7 + github.com/livekit/protocol v1.52.1-0.20260920231100-26af364d0319 + github.com/livekit/psrpc v0.8.0 github.com/mackerelio/go-osstat v0.2.8 github.com/magefile/mage v1.17.2 github.com/mitchellh/go-homedir v1.1.0 @@ -129,9 +129,6 @@ require ( github.com/mdlayher/socket v0.6.1 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/nats-io/nats.go v1.53.1 // indirect - github.com/nats-io/nkeys v0.4.16 // indirect - github.com/nats-io/nuid v1.0.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.1 // indirect github.com/pion/logging v0.2.4 diff --git a/go.sum b/go.sum index a70375306..df63e63fd 100644 --- a/go.sum +++ b/go.sum @@ -164,10 +164,10 @@ github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731 h1:9x+U2HGLrSw5AT github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ= github.com/livekit/mediatransportutil v0.0.0-20260821083140-f234b534b095 h1:BcliKAXoMhl/nWmzQweQ5kmh4Qqagxl4s3Z5pvM/7AY= github.com/livekit/mediatransportutil v0.0.0-20260821083140-f234b534b095/go.mod h1:o8CFmAdrVwzJNOCsQCLUzXRjokkufNshnQHOe4fRaqU= -github.com/livekit/protocol v1.51.1-0.20260914053631-a879e945e713 h1:dGJJP2/ix4fCL4wK6eaNWApURJNetzp8w8QoNb/MdMg= -github.com/livekit/protocol v1.51.1-0.20260914053631-a879e945e713/go.mod h1:vlreOPeiOr2pSCVCHDr2xIbSGf+2++y4QFaTgZ6rjp4= -github.com/livekit/psrpc v0.7.7 h1:eZ/jYlayQ3Y+C/3+NPtwTJBXZo/aN4vJf2MmBK6AfT4= -github.com/livekit/psrpc v0.7.7/go.mod h1:Twno03W8gpTNRpmc2cQwSoxYEo/nJxf+65iMq+9IuHo= +github.com/livekit/protocol v1.52.1-0.20260920231100-26af364d0319 h1:mEfaX/HY18LBI9Oy1U57O3qqowkpRFNqk8wybUb+fkM= +github.com/livekit/protocol v1.52.1-0.20260920231100-26af364d0319/go.mod h1:Ke1q64xQzwZ1S1ZH66SudXHsaaQQAFoX+TL1iLpu7XU= +github.com/livekit/psrpc v0.8.0 h1:uo3x+DL8pK2OIaCxg/s9sLUO2cIocS5HwdPhhI+m+fQ= +github.com/livekit/psrpc v0.8.0/go.mod h1:6KnU8vULoizX0Er9NNfeKJDV8ug87j3fuo19M0bhj6Q= github.com/livekit/webrtc-pion/v4 v4.2.18-warp.1 h1:fH+v4W+NFp9FfPzON6FaUFNmazGcctaAhb2P+Ksf+1s= github.com/livekit/webrtc-pion/v4 v4.2.18-warp.1/go.mod h1:rbKGHo2OpNUImWTvRIV776/3xjjq/t47H3IZiTtwluc= github.com/mackerelio/go-osstat v0.2.8 h1:I2duicTaCGWoM53XwAwA9OIe1inu0xnVs8/pqOWWVr4= diff --git a/pkg/service/ioservice_sip_test.go b/pkg/service/ioservice_sip_test.go index 2a8b75288..3c34ccbc8 100644 --- a/pkg/service/ioservice_sip_test.go +++ b/pkg/service/ioservice_sip_test.go @@ -16,19 +16,20 @@ package service_test import ( "context" - "github.com/dennwc/iters" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/psrpc" "slices" "testing" - "github.com/livekit/protocol/livekit" + "github.com/dennwc/iters" "github.com/stretchr/testify/require" + + "github.com/livekit/livekit-server/pkg/service" + "github.com/livekit/protocol/livekit" + "github.com/livekit/psrpc/pkg/bus/redisbus" ) func ioStoreDocker(t testing.TB) (*service.IOInfoService, *service.RedisStore) { r := redisClientDocker(t) - bus := psrpc.NewRedisMessageBus(r) + bus := redisbus.New(r) rs := service.NewRedisStore(r) io, err := service.NewIOInfoService(bus, rs, rs, rs, nil) require.NoError(t, err) diff --git a/pkg/service/wire.go b/pkg/service/wire.go index 9d1842b4b..f8f19759d 100644 --- a/pkg/service/wire.go +++ b/pkg/service/wire.go @@ -35,6 +35,7 @@ import ( "github.com/livekit/protocol/utils" "github.com/livekit/protocol/webhook" "github.com/livekit/psrpc" + "github.com/livekit/psrpc/pkg/bus/redisbus" "github.com/livekit/psrpc/pkg/middleware/otelpsrpc" "github.com/livekit/livekit-server/pkg/agent" @@ -198,7 +199,7 @@ func getMessageBus(rc redis.UniversalClient, psrpcConf rpc.PSRPCConfig) psrpc.Me if rc == nil { return psrpc.NewLocalMessageBus(opts...) } - return psrpc.NewRedisMessageBus(rc, opts...) + return redisbus.New(rc, opts...) } func getEgressStore(s ObjectStore) EgressStore { diff --git a/pkg/service/wire_gen.go b/pkg/service/wire_gen.go index f7c5a6267..3308626a3 100644 --- a/pkg/service/wire_gen.go +++ b/pkg/service/wire_gen.go @@ -21,6 +21,7 @@ import ( "github.com/livekit/protocol/utils" "github.com/livekit/protocol/webhook" "github.com/livekit/psrpc" + "github.com/livekit/psrpc/pkg/bus/redisbus" "github.com/livekit/psrpc/pkg/middleware/otelpsrpc" "github.com/pion/turn/v5" "github.com/pkg/errors" @@ -259,7 +260,7 @@ func getMessageBus(rc redis.UniversalClient, psrpcConf rpc.PSRPCConfig) psrpc.Me if rc == nil { return psrpc.NewLocalMessageBus(opts...) } - return psrpc.NewRedisMessageBus(rc, opts...) + return redisbus.New(rc, opts...) } func getEgressStore(s ObjectStore) EgressStore {