rename most things back

This commit is contained in:
Zomatree
2025-10-23 15:24:12 +01:00
parent 87c83b7193
commit 3bf8c583ea
257 changed files with 574 additions and 572 deletions
+4 -4
View File
@@ -27,10 +27,10 @@ import (
"github.com/urfave/cli/v3"
"gopkg.in/yaml.v3"
"github.com/stoatchat/livekit-protocol/auth"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils"
"github.com/livekit/protocol/utils/guid"
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/routing"
+1 -1
View File
@@ -30,7 +30,7 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc"
"github.com/stoatchat/livekit-server/pkg/telemetry/prometheus"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/logger"
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/routing"
+2 -2
View File
@@ -23,7 +23,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-20250922175932-f537f0880397
github.com/livekit/protocol v1.42.2-0.20251015173118-0236ffc17f5e
github.com/livekit/protocol v1.42.2
github.com/livekit/psrpc v0.7.0
github.com/mackerelio/go-osstat v0.2.6
github.com/magefile/mage v1.15.0
@@ -151,4 +151,4 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
)
replace github.com/livekit/protocol => github.com/stoatchat/livekit-protocol
replace github.com/livekit/protocol => github.com/stoatchat/livekit-protocol v0.0.0-20251023140146-6a2a05af5917
+2
View File
@@ -293,6 +293,8 @@ github.com/shoenig/test v1.7.0 h1:eWcHtTXa6QLnBvm0jgEabMRN/uJ4DMV3M8xUGgRkZmk=
github.com/shoenig/test v1.7.0/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stoatchat/livekit-protocol v0.0.0-20251023140146-6a2a05af5917 h1:E77eTbNDcyEyxHSlavFby/0EvwzCCJbuPbD5lzG1nNU=
github.com/stoatchat/livekit-protocol v0.0.0-20251023140146-6a2a05af5917/go.mod h1:agKVo+fsjzhxafUplrMzT8TzD/P+VN9/W25jkockTis=
github.com/stoewer/go-strcase v1.3.1 h1:iS0MdW+kVTxgMoE1LAZyMiYJFKlOzLooE4MxjirtkAs=
github.com/stoewer/go-strcase v1.3.1/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+5 -5
View File
@@ -12,11 +12,11 @@ import (
"github.com/stoatchat/livekit-server/pkg/agent"
"github.com/stoatchat/livekit-server/pkg/agent/testutils"
"github.com/stoatchat/livekit-protocol/auth"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/stoatchat/livekit-protocol/utils/must"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/rpc"
"github.com/livekit/protocol/utils/guid"
"github.com/livekit/protocol/utils/must"
"github.com/livekit/psrpc"
)
+4 -4
View File
@@ -24,10 +24,10 @@ import (
"google.golang.org/protobuf/types/known/emptypb"
serverutils "github.com/stoatchat/livekit-server/pkg/utils"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/rpc"
"github.com/livekit/protocol/utils"
"github.com/livekit/psrpc"
)
+6 -6
View File
@@ -17,12 +17,12 @@ import (
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-server/pkg/service"
"github.com/stoatchat/livekit-protocol/auth"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/utils/events"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/stoatchat/livekit-protocol/utils/must"
"github.com/stoatchat/livekit-protocol/utils/options"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils/events"
"github.com/livekit/protocol/utils/guid"
"github.com/livekit/protocol/utils/must"
"github.com/livekit/protocol/utils/options"
"github.com/livekit/psrpc"
)
+6 -6
View File
@@ -23,12 +23,12 @@ import (
"google.golang.org/protobuf/proto"
pagent "github.com/stoatchat/livekit-protocol/agent"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/stoatchat/livekit-protocol/utils/guid"
pagent "github.com/livekit/protocol/agent"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/rpc"
"github.com/livekit/protocol/utils"
"github.com/livekit/protocol/utils/guid"
"github.com/livekit/psrpc"
)
+2 -2
View File
@@ -16,8 +16,8 @@ package clientconfiguration
import (
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/utils/must"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils/must"
)
// StaticConfigurations list specific device-side limitations that should be disabled at a global level
+2 -2
View File
@@ -19,8 +19,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/utils/must"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils/must"
)
func TestScriptMatchConfiguration(t *testing.T) {
+1 -1
View File
@@ -23,7 +23,7 @@ import (
"github.com/d5/tengo/v2/token"
"golang.org/x/mod/semver"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type Match interface {
@@ -18,9 +18,9 @@ import (
"google.golang.org/protobuf/proto"
"github.com/stoatchat/livekit-server/pkg/utils"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
protoutils "github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
protoutils "github.com/livekit/protocol/utils"
)
type ConfigurationItem struct {
+1 -1
View File
@@ -15,7 +15,7 @@
package clientconfiguration
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type ClientConfigurationManager interface {
+5 -5
View File
@@ -35,11 +35,11 @@ import (
"github.com/stoatchat/livekit-server/pkg/sfu/pacer"
"github.com/stoatchat/livekit-server/pkg/sfu/streamallocator"
"github.com/livekit/mediatransportutil/pkg/rtcconfig"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
redisLiveKit "github.com/stoatchat/livekit-protocol/redis"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/stoatchat/livekit-protocol/webhook"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
redisLiveKit "github.com/livekit/protocol/redis"
"github.com/livekit/protocol/rpc"
"github.com/livekit/protocol/webhook"
)
const (
+3 -3
View File
@@ -19,9 +19,9 @@ import (
"time"
"github.com/stoatchat/livekit-server/pkg/sfu/utils"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/utils/mono"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils/mono"
"google.golang.org/protobuf/types/known/timestamppb"
)
+4 -4
View File
@@ -19,11 +19,11 @@ import (
"time"
"github.com/frostbyte73/core"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/utils/mono"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils/mono"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/utils"
)
type MetricsCollectorProvider interface {
+4 -4
View File
@@ -19,11 +19,11 @@ import (
"time"
"github.com/frostbyte73/core"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/utils/mono"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils/mono"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/utils"
)
type MetricsReporterConsumer interface {
+4 -4
View File
@@ -25,10 +25,10 @@ import (
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/utils"
"github.com/stoatchat/livekit-protocol/auth"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/rpc"
)
//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
+2 -2
View File
@@ -21,8 +21,8 @@ import (
"go.uber.org/atomic"
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
var _ Router = (*LocalRouter)(nil)
+1 -1
View File
@@ -17,7 +17,7 @@ package routing
import (
"sync"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"google.golang.org/protobuf/proto"
)
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"sync"
"testing"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/stoatchat/livekit-server/pkg/routing"
)
+3 -3
View File
@@ -19,9 +19,9 @@ import (
"sync"
"time"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils"
"github.com/livekit/protocol/utils/guid"
"github.com/stoatchat/livekit-server/pkg/config"
)
+2 -2
View File
@@ -18,8 +18,8 @@ import (
"sync"
"time"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/telemetry/prometheus"
+3 -3
View File
@@ -25,9 +25,9 @@ import (
"go.uber.org/atomic"
"google.golang.org/protobuf/proto"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/rpc"
"github.com/stoatchat/livekit-server/pkg/routing/selector"
)
+2 -2
View File
@@ -18,8 +18,8 @@ import (
"context"
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/rpc"
"github.com/livekit/psrpc"
"github.com/livekit/psrpc/pkg/middleware"
)
@@ -5,7 +5,7 @@ import (
"sync"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"google.golang.org/protobuf/proto"
)
@@ -5,7 +5,7 @@ import (
"sync"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"google.golang.org/protobuf/proto"
)
@@ -6,7 +6,7 @@ import (
"sync"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/livekit/psrpc"
)
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"sync"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type FakeRouter struct {
@@ -6,7 +6,7 @@ import (
"sync"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type FakeSignalClient struct {
+1 -1
View File
@@ -15,7 +15,7 @@
package selector
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
// AnySelector selects any available node with no limitations
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
func createTestNode(id string, cpuLoad float32, numRooms int32, numClients int32, state livekit.NodeState) *livekit.Node {
+1 -1
View File
@@ -15,7 +15,7 @@
package selector
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
// CPULoadSelector eliminates nodes that have CPU usage higher than CPULoadLimit
+1 -1
View File
@@ -19,7 +19,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/stoatchat/livekit-server/pkg/routing/selector"
)
+2 -2
View File
@@ -17,8 +17,8 @@ package selector
import (
"errors"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/stoatchat/livekit-server/pkg/config"
)
+1 -1
View File
@@ -17,7 +17,7 @@ package selector
import (
"math"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/stoatchat/livekit-server/pkg/config"
)
+3 -3
View File
@@ -20,9 +20,9 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils"
"github.com/livekit/protocol/utils/guid"
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/routing/selector"
+1 -1
View File
@@ -17,7 +17,7 @@ package selector_test
import (
"testing"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/stoatchat/livekit-server/pkg/routing/selector"
)
+1 -1
View File
@@ -15,7 +15,7 @@
package selector
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
// SystemLoadSelector eliminates nodes that surpass has a per-cpu node higher than SysloadLimit
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/stoatchat/livekit-server/pkg/routing/selector"
)
+1 -1
View File
@@ -21,7 +21,7 @@ import (
"github.com/thoas/go-funk"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/stoatchat/livekit-server/pkg/config"
)
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/stoatchat/livekit-server/pkg/routing/selector"
)
+4 -4
View File
@@ -26,10 +26,10 @@ import (
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/telemetry/prometheus"
"github.com/stoatchat/livekit-server/pkg/utils"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/rpc"
"github.com/livekit/protocol/utils/guid"
"github.com/livekit/psrpc"
"github.com/livekit/psrpc/pkg/middleware"
)
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"strconv"
"strings"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type ClientInfo struct {
+1 -1
View File
@@ -21,7 +21,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
func TestClientInfo_CompareVersion(t *testing.T) {
+1 -1
View File
@@ -24,7 +24,7 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type testDynacastManagerListener struct {
+2 -2
View File
@@ -15,8 +15,8 @@
package dynacast
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
)
+1 -1
View File
@@ -19,7 +19,7 @@ import (
"golang.org/x/exp/maps"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/logger"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-server/pkg/utils"
+2 -2
View File
@@ -19,8 +19,8 @@ import (
"github.com/bep/debounce"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
+2 -2
View File
@@ -18,8 +18,8 @@ import (
"sync"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
var _ dynacastQuality = (*dynacastQualityAudio)(nil)
+2 -2
View File
@@ -19,8 +19,8 @@ import (
"time"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
var _ dynacastQuality = (*dynacastQualityVideo)(nil)
+1 -1
View File
@@ -15,7 +15,7 @@
package dynacast
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
+3 -3
View File
@@ -22,9 +22,9 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/telemetry"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/stoatchat/livekit-protocol/webhook"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/rpc"
"github.com/livekit/protocol/webhook"
)
type EgressLauncher interface {
+1 -1
View File
@@ -21,7 +21,7 @@ import (
"github.com/pion/webrtc/v4"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
var (
+1 -1
View File
@@ -21,7 +21,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
func TestIsCodecEnabled(t *testing.T) {
+2 -2
View File
@@ -20,8 +20,8 @@ import (
"github.com/pion/rtcp"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/stoatchat/livekit-server/pkg/sfu"
)
+3 -3
View File
@@ -24,9 +24,9 @@ import (
"github.com/pion/webrtc/v4"
"go.uber.org/atomic"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/observability/roomobs"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability/roomobs"
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/rtc/dynacast"
+2 -2
View File
@@ -20,8 +20,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
func TestTrackInfo(t *testing.T) {
+3 -3
View File
@@ -28,9 +28,9 @@ import (
"golang.org/x/exp/slices"
"google.golang.org/protobuf/proto"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu"
+2 -2
View File
@@ -20,8 +20,8 @@ import (
"sync"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/pion/webrtc/v4"
"go.uber.org/atomic"
+1 -1
View File
@@ -3,7 +3,7 @@ package rtc
import (
"time"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type MigrationDataCacheState int
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
func TestMigrationDataCache_Add(t *testing.T) {
+10 -10
View File
@@ -37,16 +37,16 @@ import (
"google.golang.org/protobuf/proto"
"github.com/livekit/mediatransportutil/pkg/twcc"
"github.com/stoatchat/livekit-protocol/auth"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/observability"
"github.com/stoatchat/livekit-protocol/observability/roomobs"
protosdp "github.com/stoatchat/livekit-protocol/sdp"
protosignalling "github.com/stoatchat/livekit-protocol/signalling"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/stoatchat/livekit-protocol/utils/pointer"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability"
"github.com/livekit/protocol/observability/roomobs"
protosdp "github.com/livekit/protocol/sdp"
protosignalling "github.com/livekit/protocol/signalling"
"github.com/livekit/protocol/utils"
"github.com/livekit/protocol/utils/guid"
"github.com/livekit/protocol/utils/pointer"
"github.com/livekit/psrpc"
"github.com/stoatchat/livekit-server/pkg/config"
+8 -8
View File
@@ -28,14 +28,14 @@ import (
"github.com/stoatchat/livekit-server/pkg/sfu/buffer"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-server/pkg/telemetry/telemetryfakes"
"github.com/stoatchat/livekit-protocol/auth"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/observability/roomobs"
lksdp "github.com/stoatchat/livekit-protocol/sdp"
"github.com/stoatchat/livekit-protocol/signalling"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability/roomobs"
lksdp "github.com/livekit/protocol/sdp"
"github.com/livekit/protocol/signalling"
"github.com/livekit/protocol/utils"
"github.com/livekit/protocol/utils/guid"
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/routing"
+4 -4
View File
@@ -25,10 +25,10 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
lksdp "github.com/stoatchat/livekit-protocol/sdp"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
lksdp "github.com/livekit/protocol/sdp"
"github.com/livekit/protocol/utils"
)
func (p *ParticipantImpl) populateSdpCid(parsedOffer *sdp.SessionDescription) ([]*sdp.MediaDescription, []*sdp.MediaDescription) {
+3 -3
View File
@@ -19,9 +19,9 @@ import (
"github.com/pion/webrtc/v4"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
protosignalling "github.com/stoatchat/livekit-protocol/signalling"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
protosignalling "github.com/livekit/protocol/signalling"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
+6 -6
View File
@@ -28,12 +28,12 @@ import (
"golang.org/x/exp/maps"
"google.golang.org/protobuf/proto"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/observability/roomobs"
"github.com/stoatchat/livekit-protocol/rpc"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability/roomobs"
"github.com/livekit/protocol/rpc"
"github.com/livekit/protocol/utils"
"github.com/livekit/protocol/utils/guid"
"github.com/livekit/psrpc"
"github.com/stoatchat/livekit-server/pkg/agent"
+4 -4
View File
@@ -22,10 +22,10 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"
"github.com/stoatchat/livekit-protocol/auth/authfakes"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/stoatchat/livekit-protocol/webhook"
"github.com/livekit/protocol/auth/authfakes"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils"
"github.com/livekit/protocol/webhook"
"github.com/stoatchat/livekit-server/version"
+1 -1
View File
@@ -21,7 +21,7 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/utils"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"golang.org/x/exp/slices"
)
+1 -1
View File
@@ -15,7 +15,7 @@
package signalling
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
+2 -2
View File
@@ -17,8 +17,8 @@ package signalling
import (
"fmt"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"google.golang.org/protobuf/proto"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
+3 -3
View File
@@ -17,9 +17,9 @@ package signalling
import (
"fmt"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils"
"github.com/livekit/psrpc"
"github.com/stoatchat/livekit-server/pkg/routing"
+1 -1
View File
@@ -17,7 +17,7 @@ package signalling
import (
"sync"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/logger"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
+2 -2
View File
@@ -15,8 +15,8 @@
package signalling
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"google.golang.org/protobuf/proto"
)
@@ -15,7 +15,7 @@
package signalling
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
"google.golang.org/protobuf/proto"
)
+4 -4
View File
@@ -25,10 +25,10 @@ import (
"github.com/stoatchat/livekit-server/pkg/telemetry"
sutils "github.com/stoatchat/livekit-server/pkg/utils"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/observability/roomobs"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability/roomobs"
"github.com/livekit/protocol/utils"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu"
+3 -3
View File
@@ -30,9 +30,9 @@ import (
"github.com/stoatchat/livekit-server/pkg/sfu"
"github.com/stoatchat/livekit-server/pkg/telemetry"
"github.com/stoatchat/livekit-server/pkg/telemetry/prometheus"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils"
)
// using var instead of const to override in tests
+2 -2
View File
@@ -28,8 +28,8 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/types/typesfakes"
"github.com/stoatchat/livekit-server/pkg/telemetry/telemetryfakes"
"github.com/stoatchat/livekit-server/pkg/utils"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
func init() {
+2 -2
View File
@@ -21,8 +21,8 @@ import (
"go.uber.org/atomic"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
const (
+2 -2
View File
@@ -22,8 +22,8 @@ import (
"github.com/gammazero/deque"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
const (
+5 -5
View File
@@ -15,11 +15,11 @@
package rtc
import (
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/observability/roomobs"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/stoatchat/livekit-protocol/utils/guid"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability/roomobs"
"github.com/livekit/protocol/utils"
"github.com/livekit/protocol/utils/guid"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/rtc/types/typesfakes"
+4 -4
View File
@@ -56,10 +56,10 @@ import (
"github.com/stoatchat/livekit-server/pkg/utils"
lkinterceptor "github.com/livekit/mediatransportutil/pkg/interceptor"
lktwcc "github.com/livekit/mediatransportutil/pkg/twcc"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/logger/pionlogger"
lksdp "github.com/stoatchat/livekit-protocol/sdp"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/logger/pionlogger"
lksdp "github.com/livekit/protocol/sdp"
)
const (
+1 -1
View File
@@ -21,7 +21,7 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu/streamallocator"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
@@ -7,7 +7,7 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/transport"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu/streamallocator"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
webrtc "github.com/pion/webrtc/v4"
)
+1 -1
View File
@@ -30,7 +30,7 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/transport/transportfakes"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-server/pkg/testutils"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
func TestMissingAnswerDuringICERestart(t *testing.T) {
+3 -3
View File
@@ -30,9 +30,9 @@ import (
"google.golang.org/protobuf/proto"
"github.com/livekit/mediatransportutil/pkg/twcc"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils"
"github.com/stoatchat/livekit-server/pkg/config"
"github.com/stoatchat/livekit-server/pkg/rtc/transport"
+3 -3
View File
@@ -25,9 +25,9 @@ import (
"github.com/pion/webrtc/v4"
"golang.org/x/exp/slices"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/observability/roomobs"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability/roomobs"
)
type ICEConnectionType int
+5 -5
View File
@@ -21,11 +21,11 @@ import (
"github.com/pion/rtcp"
"github.com/pion/webrtc/v4"
"github.com/stoatchat/livekit-protocol/auth"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/observability/roomobs"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability/roomobs"
"github.com/livekit/protocol/utils"
"github.com/stoatchat/livekit-server/pkg/routing"
"github.com/stoatchat/livekit-server/pkg/sfu"
+1 -1
View File
@@ -17,7 +17,7 @@ package types
import (
"time"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type TrafficStats struct {
@@ -7,8 +7,8 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
type FakeLocalMediaTrack struct {
@@ -11,11 +11,11 @@ import (
"github.com/stoatchat/livekit-server/pkg/sfu/buffer"
"github.com/stoatchat/livekit-server/pkg/sfu/pacer"
"github.com/stoatchat/livekit-server/pkg/telemetry"
"github.com/stoatchat/livekit-protocol/auth"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/observability/roomobs"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/observability/roomobs"
"github.com/livekit/protocol/utils"
"github.com/pion/rtcp"
webrtc "github.com/pion/webrtc/v4"
"google.golang.org/protobuf/proto"
@@ -5,7 +5,7 @@ import (
"sync"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type FakeLocalParticipantHelper struct {
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
type FakeMediaTrack struct {
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"time"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils"
)
type FakeParticipant struct {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"sync"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
type FakeRoom struct {
@@ -6,7 +6,7 @@ import (
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/sfu"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
webrtc "github.com/pion/webrtc/v4"
)
+3 -3
View File
@@ -18,12 +18,12 @@ import (
"errors"
"sync"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"golang.org/x/exp/maps"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/utils"
)
var (
+3 -3
View File
@@ -19,9 +19,9 @@ import (
"github.com/stretchr/testify/require"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/stoatchat/livekit-protocol/utils"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils"
"github.com/stoatchat/livekit-server/pkg/rtc/types"
"github.com/stoatchat/livekit-server/pkg/rtc/types/typesfakes"
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"sync"
"github.com/google/uuid"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/livekit/protocol/livekit"
)
const (
+2 -2
View File
@@ -24,8 +24,8 @@ import (
"google.golang.org/protobuf/proto"
"github.com/stoatchat/livekit-server/pkg/sfu/mime"
"github.com/stoatchat/livekit-protocol/livekit"
"github.com/stoatchat/livekit-protocol/logger"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
)
const (

Some files were not shown because too many files have changed in this diff Show More