update protocol for protojson (#4510)

This commit is contained in:
Paul Wells
2026-05-07 00:55:00 -07:00
committed by GitHub
parent 3de6f517e5
commit 8fbc5adfce
6 changed files with 17 additions and 8 deletions
+9
View File
@@ -2,8 +2,15 @@ version: "2"
linters:
default: none
enable:
- depguard
- staticcheck
settings:
depguard:
rules:
protojson:
deny:
- pkg: google.golang.org/protobuf/encoding/protojson
desc: use github.com/livekit/protocol/utils/protojson instead — it sets DiscardUnknown by default to avoid schema-drift footguns
staticcheck:
checks:
- "all"
@@ -14,3 +21,5 @@ linters:
- "-ST1022"
- "-SA1019"
- "-QF1008"
exclusions:
generated: strict
+1 -1
View File
@@ -21,7 +21,7 @@ require (
github.com/jxskiss/base62 v1.1.0
github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731
github.com/livekit/mediatransportutil v0.0.0-20260501135216-8818f1b77e59
github.com/livekit/protocol v1.45.8-0.20260506075942-ff4d6b682dc7
github.com/livekit/protocol v1.45.9-0.20260507061522-7c27b667f698
github.com/livekit/psrpc v0.7.1
github.com/mackerelio/go-osstat v0.2.7
github.com/magefile/mage v1.17.0
+2 -2
View File
@@ -181,8 +181,8 @@ 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-20260501135216-8818f1b77e59 h1:lWRMrb4ReRJu/e/BAp1kpT6fQOjS8WjCxdp0PGjgrBc=
github.com/livekit/mediatransportutil v0.0.0-20260501135216-8818f1b77e59/go.mod h1:RCd46PT+6sEztld6XpkCrG1xskb0u3SqxIjy4G897Ss=
github.com/livekit/protocol v1.45.8-0.20260506075942-ff4d6b682dc7 h1:MR+ZMMPFas+H0WXg4N1WdSZwhDByqz16/Ayh+Tuc9XE=
github.com/livekit/protocol v1.45.8-0.20260506075942-ff4d6b682dc7/go.mod h1:KEPIJ/ZdMFQ9tmmfv/uT9TjQEuEcZupCZBabuRGEC1k=
github.com/livekit/protocol v1.45.9-0.20260507061522-7c27b667f698 h1:b8bEbpfgUO5IP6O4OeJ59Fw1XFrx0F0YfjB565tvB3s=
github.com/livekit/protocol v1.45.9-0.20260507061522-7c27b667f698/go.mod h1:KEPIJ/ZdMFQ9tmmfv/uT9TjQEuEcZupCZBabuRGEC1k=
github.com/livekit/psrpc v0.7.1 h1:ms37az0QTD3UXIWuUC5D/SkmKOlRMVRsI261eBWu/Vw=
github.com/livekit/psrpc v0.7.1/go.mod h1:bZ4iHFQptTkbPnB0LasvRNu/OBYXEu1NA6O5BMFo9kk=
github.com/mackerelio/go-osstat v0.2.7 h1:TCavZi10wF49bT6iQZ9eT2keGZQpC69MTDfdJej5e94=
+1 -1
View File
@@ -21,7 +21,6 @@ import (
"time"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
"github.com/livekit/livekit-server/pkg/config"
@@ -31,6 +30,7 @@ import (
"github.com/livekit/livekit-server/pkg/telemetry/prometheus"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils/protojson"
"github.com/livekit/psrpc"
)
+3 -3
View File
@@ -22,18 +22,18 @@ import (
"time"
"github.com/gorilla/websocket"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils/protojson"
"github.com/livekit/livekit-server/pkg/rtc/types"
)
const (
pingFrequency = 10 * time.Second
pingTimeout = 2 * time.Second
pingFrequency = 10 * time.Second
pingTimeout = 2 * time.Second
closeWriteTimeout = 5 * time.Second
)
+1 -1
View File
@@ -25,12 +25,12 @@ import (
"time"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/encoding/protojson"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils/guid"
"github.com/livekit/protocol/utils/protojson"
"github.com/livekit/protocol/webhook"
"github.com/livekit/livekit-server/pkg/config"