From 3bf8c583ea6a6e8b0fe861d657ee4b2113ae4384 Mon Sep 17 00:00:00 2001 From: Zomatree Date: Thu, 23 Oct 2025 15:24:12 +0100 Subject: [PATCH] rename most things back --- cmd/server/commands.go | 8 +++---- cmd/server/main.go | 2 +- go.mod | 4 ++-- go.sum | 2 ++ pkg/agent/agent_test.go | 10 ++++----- pkg/agent/client.go | 8 +++---- pkg/agent/testutils/server.go | 12 +++++----- pkg/agent/worker.go | 12 +++++----- pkg/clientconfiguration/conf.go | 4 ++-- pkg/clientconfiguration/conf_test.go | 4 ++-- pkg/clientconfiguration/match.go | 2 +- .../staticconfiguration.go | 6 ++--- pkg/clientconfiguration/types.go | 2 +- pkg/config/config.go | 10 ++++----- pkg/metric/metric_timestamper.go | 6 ++--- pkg/metric/metrics_collector.go | 8 +++---- pkg/metric/metrics_reporter.go | 8 +++---- pkg/routing/interfaces.go | 8 +++---- pkg/routing/localrouter.go | 4 ++-- pkg/routing/messagechannel.go | 2 +- pkg/routing/messagechannel_test.go | 2 +- pkg/routing/node.go | 6 ++--- pkg/routing/nodestats.go | 4 ++-- pkg/routing/redisrouter.go | 6 ++--- pkg/routing/roommanager.go | 4 ++-- pkg/routing/routingfakes/fake_message_sink.go | 2 +- .../routingfakes/fake_message_source.go | 2 +- .../routingfakes/fake_room_manager_client.go | 2 +- pkg/routing/routingfakes/fake_router.go | 2 +- .../routingfakes/fake_signal_client.go | 2 +- pkg/routing/selector/any.go | 2 +- pkg/routing/selector/any_test.go | 2 +- pkg/routing/selector/cpuload.go | 2 +- pkg/routing/selector/cpuload_test.go | 2 +- pkg/routing/selector/interfaces.go | 4 ++-- pkg/routing/selector/regionaware.go | 2 +- pkg/routing/selector/regionaware_test.go | 6 ++--- pkg/routing/selector/sortby_test.go | 2 +- pkg/routing/selector/sysload.go | 2 +- pkg/routing/selector/sysload_test.go | 2 +- pkg/routing/selector/utils.go | 2 +- pkg/routing/selector/utils_test.go | 2 +- pkg/routing/signal.go | 8 +++---- pkg/rtc/clientinfo.go | 2 +- pkg/rtc/clientinfo_test.go | 2 +- pkg/rtc/dynacast/dynacastmanager_test.go | 2 +- pkg/rtc/dynacast/dynacastmanageraudio.go | 4 ++-- pkg/rtc/dynacast/dynacastmanagerbase.go | 2 +- pkg/rtc/dynacast/dynacastmanagervideo.go | 4 ++-- pkg/rtc/dynacast/dynacastqualityaudio.go | 4 ++-- pkg/rtc/dynacast/dynacastqualityvideo.go | 4 ++-- pkg/rtc/dynacast/interfaces.go | 2 +- pkg/rtc/egress.go | 6 ++--- pkg/rtc/mediaengine.go | 2 +- pkg/rtc/mediaengine_test.go | 2 +- pkg/rtc/medialossproxy.go | 4 ++-- pkg/rtc/mediatrack.go | 6 ++--- pkg/rtc/mediatrack_test.go | 4 ++-- pkg/rtc/mediatrackreceiver.go | 6 ++--- pkg/rtc/mediatracksubscriptions.go | 4 ++-- pkg/rtc/migrationdatacache.go | 2 +- pkg/rtc/migrationdatacache_test.go | 2 +- pkg/rtc/participant.go | 20 ++++++++--------- pkg/rtc/participant_internal_test.go | 16 +++++++------- pkg/rtc/participant_sdp.go | 8 +++---- pkg/rtc/participant_signal.go | 6 ++--- pkg/rtc/room.go | 12 +++++----- pkg/rtc/room_test.go | 8 +++---- pkg/rtc/roomtrackmanager.go | 2 +- pkg/rtc/signalling/interfaces.go | 2 +- pkg/rtc/signalling/signalhandler.go | 4 ++-- pkg/rtc/signalling/signallerasync.go | 6 ++--- pkg/rtc/signalling/signallerasyncbase.go | 2 +- pkg/rtc/signalling/signalling.go | 4 ++-- pkg/rtc/signalling/signallingunimplemented.go | 2 +- pkg/rtc/subscribedtrack.go | 8 +++---- pkg/rtc/subscriptionmanager.go | 6 ++--- pkg/rtc/subscriptionmanager_test.go | 4 ++-- pkg/rtc/supervisor/participant_supervisor.go | 4 ++-- pkg/rtc/supervisor/publication_monitor.go | 4 ++-- pkg/rtc/testutils.go | 10 ++++----- pkg/rtc/transport.go | 8 +++---- pkg/rtc/transport/handler.go | 2 +- .../transport/transportfakes/fake_handler.go | 2 +- pkg/rtc/transport_test.go | 2 +- pkg/rtc/transportmanager.go | 6 ++--- pkg/rtc/types/ice.go | 6 ++--- pkg/rtc/types/interfaces.go | 10 ++++----- pkg/rtc/types/trafficstats.go | 2 +- .../typesfakes/fake_local_media_track.go | 4 ++-- .../typesfakes/fake_local_participant.go | 10 ++++----- .../fake_local_participant_helper.go | 2 +- pkg/rtc/types/typesfakes/fake_media_track.go | 4 ++-- pkg/rtc/types/typesfakes/fake_participant.go | 4 ++-- pkg/rtc/types/typesfakes/fake_room.go | 2 +- .../types/typesfakes/fake_subscribed_track.go | 2 +- pkg/rtc/uptrackmanager.go | 6 ++--- pkg/rtc/uptrackmanager_test.go | 6 ++--- pkg/rtc/user_packet_deduper.go | 2 +- pkg/rtc/utils.go | 4 ++-- pkg/rtc/utils_test.go | 4 ++-- pkg/rtc/wrappedreceiver.go | 4 ++-- pkg/service/agent_dispatch_service.go | 10 ++++----- pkg/service/agentservice.go | 10 ++++----- pkg/service/auth.go | 4 ++-- pkg/service/auth_test.go | 4 ++-- pkg/service/clients.go | 4 ++-- pkg/service/egress.go | 12 +++++----- pkg/service/ingress.go | 12 +++++----- pkg/service/interfaces.go | 2 +- pkg/service/ioservice.go | 6 ++--- pkg/service/ioservice_ingress.go | 6 ++--- pkg/service/ioservice_sip.go | 8 +++---- pkg/service/ioservice_sip_test.go | 2 +- pkg/service/localstore.go | 4 ++-- pkg/service/redisstore.go | 10 ++++----- pkg/service/redisstore_sip.go | 2 +- pkg/service/redisstore_sip_test.go | 6 ++--- pkg/service/redisstore_test.go | 8 +++---- pkg/service/roomallocator.go | 8 +++---- pkg/service/roomallocator_test.go | 2 +- pkg/service/roommanager.go | 16 +++++++------- pkg/service/roommanager_service.go | 6 ++--- pkg/service/roomservice.go | 10 ++++----- pkg/service/roomservice_test.go | 8 +++---- pkg/service/rtcservice.go | 4 ++-- pkg/service/server.go | 8 +++---- pkg/service/servicefakes/fake_agent_store.go | 2 +- pkg/service/servicefakes/fake_egress_store.go | 2 +- .../servicefakes/fake_ingress_store.go | 2 +- pkg/service/servicefakes/fake_ioclient.go | 4 ++-- pkg/service/servicefakes/fake_object_store.go | 2 +- .../servicefakes/fake_room_allocator.go | 2 +- .../servicefakes/fake_service_store.go | 2 +- .../servicefakes/fake_session_handler.go | 4 ++-- pkg/service/servicefakes/fake_sipstore.go | 2 +- pkg/service/signal.go | 6 ++--- pkg/service/signal_test.go | 4 ++-- pkg/service/sip.go | 12 +++++----- pkg/service/turn.go | 8 +++---- pkg/service/twirp.go | 2 +- pkg/service/utils.go | 6 ++--- pkg/service/whipservice.go | 8 +++---- pkg/service/wire.go | 14 ++++++------ pkg/service/wire_gen.go | 22 +++++++++---------- pkg/service/wsprotocol.go | 4 ++-- pkg/sfu/buffer/buffer.go | 6 ++--- pkg/sfu/buffer/datastats.go | 2 +- pkg/sfu/buffer/datastats_test.go | 2 +- pkg/sfu/buffer/dependencydescriptorparser.go | 2 +- pkg/sfu/buffer/fps.go | 2 +- pkg/sfu/buffer/fps_test.go | 2 +- pkg/sfu/buffer/helpers.go | 2 +- pkg/sfu/buffer/videolayerutils.go | 4 ++-- pkg/sfu/buffer/videolayerutils_test.go | 2 +- pkg/sfu/bwe/remotebwe/channel_observer.go | 2 +- pkg/sfu/bwe/remotebwe/nack_tracker.go | 2 +- pkg/sfu/bwe/remotebwe/probe_controller.go | 4 ++-- pkg/sfu/bwe/remotebwe/remote_bwe.go | 4 ++-- .../bwe/sendsidebwe/congestion_detector.go | 4 ++-- pkg/sfu/bwe/sendsidebwe/packet_group.go | 4 ++-- pkg/sfu/bwe/sendsidebwe/packet_tracker.go | 4 ++-- pkg/sfu/bwe/sendsidebwe/probe_packet_group.go | 4 ++-- pkg/sfu/bwe/sendsidebwe/send_side_bwe.go | 2 +- pkg/sfu/bwe/sendsidebwe/traffic_stats.go | 2 +- pkg/sfu/bwe/sendsidebwe/twcc_feedback.go | 2 +- pkg/sfu/ccutils/probe_regulator.go | 4 ++-- pkg/sfu/ccutils/prober.go | 4 ++-- pkg/sfu/ccutils/trenddetector.go | 2 +- pkg/sfu/codecmunger/null.go | 2 +- pkg/sfu/codecmunger/vp8.go | 4 ++-- pkg/sfu/codecmunger/vp8_test.go | 2 +- pkg/sfu/connectionquality/connectionstats.go | 4 ++-- .../connectionquality/connectionstats_test.go | 4 ++-- pkg/sfu/connectionquality/scorer.go | 6 ++--- pkg/sfu/datachannel/bitrate.go | 2 +- pkg/sfu/datachannel/datachannel_writer.go | 2 +- pkg/sfu/downtrack.go | 6 ++--- pkg/sfu/downtrackspreader.go | 6 ++--- pkg/sfu/forwarder.go | 8 +++---- pkg/sfu/forwarder_test.go | 4 ++-- pkg/sfu/forwardstats.go | 6 ++--- pkg/sfu/interceptor/rtx.go | 2 +- pkg/sfu/mime/mimetype.go | 2 +- pkg/sfu/pacer/base.go | 4 ++-- pkg/sfu/pacer/leaky_bucket.go | 2 +- pkg/sfu/pacer/no_queue.go | 2 +- pkg/sfu/pacer/pass_through.go | 2 +- pkg/sfu/pacer/probe_observer.go | 4 ++-- pkg/sfu/playoutdelay.go | 2 +- pkg/sfu/playoutdelay_test.go | 2 +- pkg/sfu/receiver.go | 8 +++---- pkg/sfu/redprimaryreceiver.go | 4 ++-- pkg/sfu/redreceiver.go | 4 ++-- pkg/sfu/redreceiver_test.go | 2 +- pkg/sfu/rtpmunger.go | 4 ++-- pkg/sfu/rtpmunger_test.go | 2 +- pkg/sfu/rtpstats/rtpstats_base.go | 6 ++--- pkg/sfu/rtpstats/rtpstats_base_lite.go | 6 ++--- pkg/sfu/rtpstats/rtpstats_receiver.go | 8 +++---- pkg/sfu/rtpstats/rtpstats_receiver_lite.go | 4 ++-- pkg/sfu/rtpstats/rtpstats_receiver_test.go | 2 +- pkg/sfu/rtpstats/rtpstats_sender.go | 6 ++--- pkg/sfu/rtpstats/rtpstats_sender_lite.go | 4 ++-- pkg/sfu/sequencer.go | 2 +- pkg/sfu/sequencer_test.go | 2 +- pkg/sfu/streamallocator/streamallocator.go | 4 ++-- pkg/sfu/streamallocator/streamstateupdate.go | 2 +- pkg/sfu/streamallocator/track.go | 4 ++-- pkg/sfu/streamtracker/streamtracker.go | 2 +- .../streamtracker/streamtracker_dd_test.go | 2 +- pkg/sfu/streamtracker/streamtracker_frame.go | 2 +- pkg/sfu/streamtracker/streamtracker_packet.go | 2 +- .../streamtracker_packet_test.go | 2 +- pkg/sfu/streamtrackermanager.go | 6 ++--- pkg/sfu/utils/helpers.go | 2 +- pkg/sfu/videolayerselector/base.go | 2 +- .../dependencydescriptor.go | 2 +- .../dependencydescriptor_test.go | 2 +- pkg/sfu/videolayerselector/framechain.go | 2 +- .../videolayerselector/framenumberwrapper.go | 2 +- .../framenumberwrapper_test.go | 2 +- pkg/sfu/videolayerselector/null.go | 2 +- pkg/sfu/videolayerselector/simulcast.go | 2 +- .../temporallayerselector/vp8.go | 2 +- .../videolayerselector/videolayerselector.go | 2 +- pkg/sfu/videolayerselector/vp9.go | 2 +- pkg/telemetry/analyticsservice.go | 10 ++++----- pkg/telemetry/events.go | 10 ++++----- pkg/telemetry/events_test.go | 2 +- pkg/telemetry/prometheus/datapacket.go | 2 +- pkg/telemetry/prometheus/node.go | 8 +++---- pkg/telemetry/prometheus/packets.go | 2 +- pkg/telemetry/prometheus/quality.go | 2 +- pkg/telemetry/prometheus/rooms.go | 2 +- pkg/telemetry/signalanddatastats.go | 6 ++--- pkg/telemetry/stats.go | 2 +- pkg/telemetry/stats_test.go | 2 +- pkg/telemetry/statsworker.go | 6 ++--- .../telemetryfakes/fake_analytics_service.go | 4 ++-- .../telemetryfakes/fake_telemetry_service.go | 4 ++-- pkg/telemetry/telemetryservice.go | 6 ++--- pkg/utils/context.go | 2 +- pkg/utils/iceconfigcache.go | 2 +- pkg/utils/iceconfigcache_test.go | 2 +- pkg/utils/opsqueue.go | 2 +- pkg/utils/protocol.go | 4 ++-- test/agent.go | 2 +- test/agent_test.go | 4 ++-- test/client/client.go | 8 +++---- test/client/trackwriter.go | 2 +- test/integration_helpers.go | 8 +++---- test/multinode_roomservice_test.go | 2 +- test/multinode_test.go | 4 ++-- test/scenarios.go | 4 ++-- test/singlenode_test.go | 6 ++--- test/webhook_test.go | 10 ++++----- 257 files changed, 574 insertions(+), 572 deletions(-) diff --git a/cmd/server/commands.go b/cmd/server/commands.go index 2857f428..8507bcb3 100644 --- a/cmd/server/commands.go +++ b/cmd/server/commands.go @@ -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" diff --git a/cmd/server/main.go b/cmd/server/main.go index cd323b89..eab6b44f 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -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" diff --git a/go.mod b/go.mod index 2f0565da..d3aab63d 100644 --- a/go.mod +++ b/go.mod @@ -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 \ No newline at end of file +replace github.com/livekit/protocol => github.com/stoatchat/livekit-protocol v0.0.0-20251023140146-6a2a05af5917 diff --git a/go.sum b/go.sum index e73de951..afa840eb 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/agent/agent_test.go b/pkg/agent/agent_test.go index f8c4d499..02c2ba15 100644 --- a/pkg/agent/agent_test.go +++ b/pkg/agent/agent_test.go @@ -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" ) diff --git a/pkg/agent/client.go b/pkg/agent/client.go index f9bc1f1a..148d477e 100644 --- a/pkg/agent/client.go +++ b/pkg/agent/client.go @@ -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" ) diff --git a/pkg/agent/testutils/server.go b/pkg/agent/testutils/server.go index 9e3c7edb..bf419177 100644 --- a/pkg/agent/testutils/server.go +++ b/pkg/agent/testutils/server.go @@ -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" ) diff --git a/pkg/agent/worker.go b/pkg/agent/worker.go index 15f9c920..f7aed2ae 100644 --- a/pkg/agent/worker.go +++ b/pkg/agent/worker.go @@ -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" ) diff --git a/pkg/clientconfiguration/conf.go b/pkg/clientconfiguration/conf.go index e0e2aa40..8e87afc3 100644 --- a/pkg/clientconfiguration/conf.go +++ b/pkg/clientconfiguration/conf.go @@ -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 diff --git a/pkg/clientconfiguration/conf_test.go b/pkg/clientconfiguration/conf_test.go index 28c7e372..55d3812a 100644 --- a/pkg/clientconfiguration/conf_test.go +++ b/pkg/clientconfiguration/conf_test.go @@ -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) { diff --git a/pkg/clientconfiguration/match.go b/pkg/clientconfiguration/match.go index 73d103c8..b79559fa 100644 --- a/pkg/clientconfiguration/match.go +++ b/pkg/clientconfiguration/match.go @@ -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 { diff --git a/pkg/clientconfiguration/staticconfiguration.go b/pkg/clientconfiguration/staticconfiguration.go index f6526fc8..cfb3e191 100644 --- a/pkg/clientconfiguration/staticconfiguration.go +++ b/pkg/clientconfiguration/staticconfiguration.go @@ -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 { diff --git a/pkg/clientconfiguration/types.go b/pkg/clientconfiguration/types.go index 17771e87..b014518c 100644 --- a/pkg/clientconfiguration/types.go +++ b/pkg/clientconfiguration/types.go @@ -15,7 +15,7 @@ package clientconfiguration import ( - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type ClientConfigurationManager interface { diff --git a/pkg/config/config.go b/pkg/config/config.go index 036e9d22..6975c64d 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -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 ( diff --git a/pkg/metric/metric_timestamper.go b/pkg/metric/metric_timestamper.go index 3224b44e..40e3c428 100644 --- a/pkg/metric/metric_timestamper.go +++ b/pkg/metric/metric_timestamper.go @@ -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" ) diff --git a/pkg/metric/metrics_collector.go b/pkg/metric/metrics_collector.go index 05c62f4f..bcd28093 100644 --- a/pkg/metric/metrics_collector.go +++ b/pkg/metric/metrics_collector.go @@ -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 { diff --git a/pkg/metric/metrics_reporter.go b/pkg/metric/metrics_reporter.go index c944dea5..78f4b4c8 100644 --- a/pkg/metric/metrics_reporter.go +++ b/pkg/metric/metrics_reporter.go @@ -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 { diff --git a/pkg/routing/interfaces.go b/pkg/routing/interfaces.go index e6724cab..d819e8ca 100644 --- a/pkg/routing/interfaces.go +++ b/pkg/routing/interfaces.go @@ -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 diff --git a/pkg/routing/localrouter.go b/pkg/routing/localrouter.go index 3376871d..c91068e6 100644 --- a/pkg/routing/localrouter.go +++ b/pkg/routing/localrouter.go @@ -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) diff --git a/pkg/routing/messagechannel.go b/pkg/routing/messagechannel.go index 6807579c..e761f3ad 100644 --- a/pkg/routing/messagechannel.go +++ b/pkg/routing/messagechannel.go @@ -17,7 +17,7 @@ package routing import ( "sync" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" "google.golang.org/protobuf/proto" ) diff --git a/pkg/routing/messagechannel_test.go b/pkg/routing/messagechannel_test.go index a9c1be03..e4d25495 100644 --- a/pkg/routing/messagechannel_test.go +++ b/pkg/routing/messagechannel_test.go @@ -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" ) diff --git a/pkg/routing/node.go b/pkg/routing/node.go index 558bb6d0..bf1eeb9d 100644 --- a/pkg/routing/node.go +++ b/pkg/routing/node.go @@ -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" ) diff --git a/pkg/routing/nodestats.go b/pkg/routing/nodestats.go index 937aa864..bdfbd81c 100644 --- a/pkg/routing/nodestats.go +++ b/pkg/routing/nodestats.go @@ -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" diff --git a/pkg/routing/redisrouter.go b/pkg/routing/redisrouter.go index 05c320f3..52979e4b 100644 --- a/pkg/routing/redisrouter.go +++ b/pkg/routing/redisrouter.go @@ -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" ) diff --git a/pkg/routing/roommanager.go b/pkg/routing/roommanager.go index 6b870050..74a47285 100644 --- a/pkg/routing/roommanager.go +++ b/pkg/routing/roommanager.go @@ -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" ) diff --git a/pkg/routing/routingfakes/fake_message_sink.go b/pkg/routing/routingfakes/fake_message_sink.go index b9459a2d..4be07860 100644 --- a/pkg/routing/routingfakes/fake_message_sink.go +++ b/pkg/routing/routingfakes/fake_message_sink.go @@ -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" ) diff --git a/pkg/routing/routingfakes/fake_message_source.go b/pkg/routing/routingfakes/fake_message_source.go index 46c44cc8..40b11a4f 100644 --- a/pkg/routing/routingfakes/fake_message_source.go +++ b/pkg/routing/routingfakes/fake_message_source.go @@ -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" ) diff --git a/pkg/routing/routingfakes/fake_room_manager_client.go b/pkg/routing/routingfakes/fake_room_manager_client.go index fab6b084..11ec4e93 100644 --- a/pkg/routing/routingfakes/fake_room_manager_client.go +++ b/pkg/routing/routingfakes/fake_room_manager_client.go @@ -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" ) diff --git a/pkg/routing/routingfakes/fake_router.go b/pkg/routing/routingfakes/fake_router.go index 6d14681b..eb20fdeb 100644 --- a/pkg/routing/routingfakes/fake_router.go +++ b/pkg/routing/routingfakes/fake_router.go @@ -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 { diff --git a/pkg/routing/routingfakes/fake_signal_client.go b/pkg/routing/routingfakes/fake_signal_client.go index 8e847344..08beebaa 100644 --- a/pkg/routing/routingfakes/fake_signal_client.go +++ b/pkg/routing/routingfakes/fake_signal_client.go @@ -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 { diff --git a/pkg/routing/selector/any.go b/pkg/routing/selector/any.go index f312c514..592e2ed7 100644 --- a/pkg/routing/selector/any.go +++ b/pkg/routing/selector/any.go @@ -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 diff --git a/pkg/routing/selector/any_test.go b/pkg/routing/selector/any_test.go index b3ef235d..a38f80ca 100644 --- a/pkg/routing/selector/any_test.go +++ b/pkg/routing/selector/any_test.go @@ -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 { diff --git a/pkg/routing/selector/cpuload.go b/pkg/routing/selector/cpuload.go index 5ea393d0..f84b4a3c 100644 --- a/pkg/routing/selector/cpuload.go +++ b/pkg/routing/selector/cpuload.go @@ -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 diff --git a/pkg/routing/selector/cpuload_test.go b/pkg/routing/selector/cpuload_test.go index f62ab00e..d4a8a9c8 100644 --- a/pkg/routing/selector/cpuload_test.go +++ b/pkg/routing/selector/cpuload_test.go @@ -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" ) diff --git a/pkg/routing/selector/interfaces.go b/pkg/routing/selector/interfaces.go index c2f05ad2..d5cea26e 100644 --- a/pkg/routing/selector/interfaces.go +++ b/pkg/routing/selector/interfaces.go @@ -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" ) diff --git a/pkg/routing/selector/regionaware.go b/pkg/routing/selector/regionaware.go index 5193b4b9..11476e47 100644 --- a/pkg/routing/selector/regionaware.go +++ b/pkg/routing/selector/regionaware.go @@ -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" ) diff --git a/pkg/routing/selector/regionaware_test.go b/pkg/routing/selector/regionaware_test.go index 8cc18bbf..f8f87b23 100644 --- a/pkg/routing/selector/regionaware_test.go +++ b/pkg/routing/selector/regionaware_test.go @@ -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" diff --git a/pkg/routing/selector/sortby_test.go b/pkg/routing/selector/sortby_test.go index f3be4488..a6186a31 100644 --- a/pkg/routing/selector/sortby_test.go +++ b/pkg/routing/selector/sortby_test.go @@ -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" ) diff --git a/pkg/routing/selector/sysload.go b/pkg/routing/selector/sysload.go index d0b0fd3e..285fca49 100644 --- a/pkg/routing/selector/sysload.go +++ b/pkg/routing/selector/sysload.go @@ -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 diff --git a/pkg/routing/selector/sysload_test.go b/pkg/routing/selector/sysload_test.go index 1fcc0665..411b7c5c 100644 --- a/pkg/routing/selector/sysload_test.go +++ b/pkg/routing/selector/sysload_test.go @@ -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" ) diff --git a/pkg/routing/selector/utils.go b/pkg/routing/selector/utils.go index 51344936..340ed5d3 100644 --- a/pkg/routing/selector/utils.go +++ b/pkg/routing/selector/utils.go @@ -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" ) diff --git a/pkg/routing/selector/utils_test.go b/pkg/routing/selector/utils_test.go index 85ebc09c..77d863f7 100644 --- a/pkg/routing/selector/utils_test.go +++ b/pkg/routing/selector/utils_test.go @@ -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" ) diff --git a/pkg/routing/signal.go b/pkg/routing/signal.go index c9a9888f..66f2f49a 100644 --- a/pkg/routing/signal.go +++ b/pkg/routing/signal.go @@ -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" ) diff --git a/pkg/rtc/clientinfo.go b/pkg/rtc/clientinfo.go index 4228b652..25205935 100644 --- a/pkg/rtc/clientinfo.go +++ b/pkg/rtc/clientinfo.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type ClientInfo struct { diff --git a/pkg/rtc/clientinfo_test.go b/pkg/rtc/clientinfo_test.go index 2af6b661..56640243 100644 --- a/pkg/rtc/clientinfo_test.go +++ b/pkg/rtc/clientinfo_test.go @@ -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) { diff --git a/pkg/rtc/dynacast/dynacastmanager_test.go b/pkg/rtc/dynacast/dynacastmanager_test.go index e6a6acb1..61a8ca7d 100644 --- a/pkg/rtc/dynacast/dynacastmanager_test.go +++ b/pkg/rtc/dynacast/dynacastmanager_test.go @@ -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 { diff --git a/pkg/rtc/dynacast/dynacastmanageraudio.go b/pkg/rtc/dynacast/dynacastmanageraudio.go index 8e2589b3..77e03a37 100644 --- a/pkg/rtc/dynacast/dynacastmanageraudio.go +++ b/pkg/rtc/dynacast/dynacastmanageraudio.go @@ -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" ) diff --git a/pkg/rtc/dynacast/dynacastmanagerbase.go b/pkg/rtc/dynacast/dynacastmanagerbase.go index adfd2e03..a26e371a 100644 --- a/pkg/rtc/dynacast/dynacastmanagerbase.go +++ b/pkg/rtc/dynacast/dynacastmanagerbase.go @@ -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" diff --git a/pkg/rtc/dynacast/dynacastmanagervideo.go b/pkg/rtc/dynacast/dynacastmanagervideo.go index e681f2c5..031b7e2a 100644 --- a/pkg/rtc/dynacast/dynacastmanagervideo.go +++ b/pkg/rtc/dynacast/dynacastmanagervideo.go @@ -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" diff --git a/pkg/rtc/dynacast/dynacastqualityaudio.go b/pkg/rtc/dynacast/dynacastqualityaudio.go index eb2a348a..709256ab 100644 --- a/pkg/rtc/dynacast/dynacastqualityaudio.go +++ b/pkg/rtc/dynacast/dynacastqualityaudio.go @@ -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) diff --git a/pkg/rtc/dynacast/dynacastqualityvideo.go b/pkg/rtc/dynacast/dynacastqualityvideo.go index 2f60eb9c..e33f1d4a 100644 --- a/pkg/rtc/dynacast/dynacastqualityvideo.go +++ b/pkg/rtc/dynacast/dynacastqualityvideo.go @@ -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) diff --git a/pkg/rtc/dynacast/interfaces.go b/pkg/rtc/dynacast/interfaces.go index e0c91e3d..865b5687 100644 --- a/pkg/rtc/dynacast/interfaces.go +++ b/pkg/rtc/dynacast/interfaces.go @@ -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" diff --git a/pkg/rtc/egress.go b/pkg/rtc/egress.go index 2506feb6..14db8edf 100644 --- a/pkg/rtc/egress.go +++ b/pkg/rtc/egress.go @@ -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 { diff --git a/pkg/rtc/mediaengine.go b/pkg/rtc/mediaengine.go index 1fe1f197..14dea09d 100644 --- a/pkg/rtc/mediaengine.go +++ b/pkg/rtc/mediaengine.go @@ -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 ( diff --git a/pkg/rtc/mediaengine_test.go b/pkg/rtc/mediaengine_test.go index 6d3fbdba..b8a96419 100644 --- a/pkg/rtc/mediaengine_test.go +++ b/pkg/rtc/mediaengine_test.go @@ -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) { diff --git a/pkg/rtc/medialossproxy.go b/pkg/rtc/medialossproxy.go index b055b522..374b4357 100644 --- a/pkg/rtc/medialossproxy.go +++ b/pkg/rtc/medialossproxy.go @@ -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" ) diff --git a/pkg/rtc/mediatrack.go b/pkg/rtc/mediatrack.go index ae0821da..c55c97ac 100644 --- a/pkg/rtc/mediatrack.go +++ b/pkg/rtc/mediatrack.go @@ -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" diff --git a/pkg/rtc/mediatrack_test.go b/pkg/rtc/mediatrack_test.go index 0efe046b..4764a66d 100644 --- a/pkg/rtc/mediatrack_test.go +++ b/pkg/rtc/mediatrack_test.go @@ -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) { diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go index ff861ae3..49d44969 100644 --- a/pkg/rtc/mediatrackreceiver.go +++ b/pkg/rtc/mediatrackreceiver.go @@ -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" diff --git a/pkg/rtc/mediatracksubscriptions.go b/pkg/rtc/mediatracksubscriptions.go index ac1e401c..a41c8794 100644 --- a/pkg/rtc/mediatracksubscriptions.go +++ b/pkg/rtc/mediatracksubscriptions.go @@ -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" diff --git a/pkg/rtc/migrationdatacache.go b/pkg/rtc/migrationdatacache.go index eb349a0a..8c44eac6 100644 --- a/pkg/rtc/migrationdatacache.go +++ b/pkg/rtc/migrationdatacache.go @@ -3,7 +3,7 @@ package rtc import ( "time" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type MigrationDataCacheState int diff --git a/pkg/rtc/migrationdatacache_test.go b/pkg/rtc/migrationdatacache_test.go index 25de8509..046b2ddf 100644 --- a/pkg/rtc/migrationdatacache_test.go +++ b/pkg/rtc/migrationdatacache_test.go @@ -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) { diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index 831c128a..a02657f8 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -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" diff --git a/pkg/rtc/participant_internal_test.go b/pkg/rtc/participant_internal_test.go index f11d4215..28ec72da 100644 --- a/pkg/rtc/participant_internal_test.go +++ b/pkg/rtc/participant_internal_test.go @@ -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" diff --git a/pkg/rtc/participant_sdp.go b/pkg/rtc/participant_sdp.go index e4540835..6887d0d8 100644 --- a/pkg/rtc/participant_sdp.go +++ b/pkg/rtc/participant_sdp.go @@ -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) { diff --git a/pkg/rtc/participant_signal.go b/pkg/rtc/participant_signal.go index 611db925..3de6c9b0 100644 --- a/pkg/rtc/participant_signal.go +++ b/pkg/rtc/participant_signal.go @@ -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" diff --git a/pkg/rtc/room.go b/pkg/rtc/room.go index 3efd6786..5fb3311c 100644 --- a/pkg/rtc/room.go +++ b/pkg/rtc/room.go @@ -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" diff --git a/pkg/rtc/room_test.go b/pkg/rtc/room_test.go index 4978e2e5..82652347 100644 --- a/pkg/rtc/room_test.go +++ b/pkg/rtc/room_test.go @@ -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" diff --git a/pkg/rtc/roomtrackmanager.go b/pkg/rtc/roomtrackmanager.go index 4a8262a1..a023aa58 100644 --- a/pkg/rtc/roomtrackmanager.go +++ b/pkg/rtc/roomtrackmanager.go @@ -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" ) diff --git a/pkg/rtc/signalling/interfaces.go b/pkg/rtc/signalling/interfaces.go index 5933d212..678a03de 100644 --- a/pkg/rtc/signalling/interfaces.go +++ b/pkg/rtc/signalling/interfaces.go @@ -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" diff --git a/pkg/rtc/signalling/signalhandler.go b/pkg/rtc/signalling/signalhandler.go index b0374821..ddb132c9 100644 --- a/pkg/rtc/signalling/signalhandler.go +++ b/pkg/rtc/signalling/signalhandler.go @@ -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" diff --git a/pkg/rtc/signalling/signallerasync.go b/pkg/rtc/signalling/signallerasync.go index beef5f02..ab211222 100644 --- a/pkg/rtc/signalling/signallerasync.go +++ b/pkg/rtc/signalling/signallerasync.go @@ -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" diff --git a/pkg/rtc/signalling/signallerasyncbase.go b/pkg/rtc/signalling/signallerasyncbase.go index c66e7cd3..58f26f43 100644 --- a/pkg/rtc/signalling/signallerasyncbase.go +++ b/pkg/rtc/signalling/signallerasyncbase.go @@ -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" diff --git a/pkg/rtc/signalling/signalling.go b/pkg/rtc/signalling/signalling.go index d88da364..8b08a6d0 100644 --- a/pkg/rtc/signalling/signalling.go +++ b/pkg/rtc/signalling/signalling.go @@ -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" ) diff --git a/pkg/rtc/signalling/signallingunimplemented.go b/pkg/rtc/signalling/signallingunimplemented.go index 2deacaba..595877b0 100644 --- a/pkg/rtc/signalling/signallingunimplemented.go +++ b/pkg/rtc/signalling/signallingunimplemented.go @@ -15,7 +15,7 @@ package signalling import ( - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rtc/subscribedtrack.go b/pkg/rtc/subscribedtrack.go index 73ed1714..740917f1 100644 --- a/pkg/rtc/subscribedtrack.go +++ b/pkg/rtc/subscribedtrack.go @@ -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" diff --git a/pkg/rtc/subscriptionmanager.go b/pkg/rtc/subscriptionmanager.go index 7013effd..dda74dfe 100644 --- a/pkg/rtc/subscriptionmanager.go +++ b/pkg/rtc/subscriptionmanager.go @@ -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 diff --git a/pkg/rtc/subscriptionmanager_test.go b/pkg/rtc/subscriptionmanager_test.go index cdebe471..79e86f1c 100644 --- a/pkg/rtc/subscriptionmanager_test.go +++ b/pkg/rtc/subscriptionmanager_test.go @@ -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() { diff --git a/pkg/rtc/supervisor/participant_supervisor.go b/pkg/rtc/supervisor/participant_supervisor.go index 2d58cbf2..fb71037c 100644 --- a/pkg/rtc/supervisor/participant_supervisor.go +++ b/pkg/rtc/supervisor/participant_supervisor.go @@ -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 ( diff --git a/pkg/rtc/supervisor/publication_monitor.go b/pkg/rtc/supervisor/publication_monitor.go index 437c686e..96341322 100644 --- a/pkg/rtc/supervisor/publication_monitor.go +++ b/pkg/rtc/supervisor/publication_monitor.go @@ -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 ( diff --git a/pkg/rtc/testutils.go b/pkg/rtc/testutils.go index 17b4ba3c..a87d6f16 100644 --- a/pkg/rtc/testutils.go +++ b/pkg/rtc/testutils.go @@ -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" diff --git a/pkg/rtc/transport.go b/pkg/rtc/transport.go index 97461d43..d4c639d4 100644 --- a/pkg/rtc/transport.go +++ b/pkg/rtc/transport.go @@ -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 ( diff --git a/pkg/rtc/transport/handler.go b/pkg/rtc/transport/handler.go index f6302a6d..af384c6f 100644 --- a/pkg/rtc/transport/handler.go +++ b/pkg/rtc/transport/handler.go @@ -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 diff --git a/pkg/rtc/transport/transportfakes/fake_handler.go b/pkg/rtc/transport/transportfakes/fake_handler.go index 19529fbc..7146fa49 100644 --- a/pkg/rtc/transport/transportfakes/fake_handler.go +++ b/pkg/rtc/transport/transportfakes/fake_handler.go @@ -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" ) diff --git a/pkg/rtc/transport_test.go b/pkg/rtc/transport_test.go index bfe0b342..f6450dda 100644 --- a/pkg/rtc/transport_test.go +++ b/pkg/rtc/transport_test.go @@ -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) { diff --git a/pkg/rtc/transportmanager.go b/pkg/rtc/transportmanager.go index 921ca191..435f8ee5 100644 --- a/pkg/rtc/transportmanager.go +++ b/pkg/rtc/transportmanager.go @@ -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" diff --git a/pkg/rtc/types/ice.go b/pkg/rtc/types/ice.go index 70db1603..fbcbc5a4 100644 --- a/pkg/rtc/types/ice.go +++ b/pkg/rtc/types/ice.go @@ -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 diff --git a/pkg/rtc/types/interfaces.go b/pkg/rtc/types/interfaces.go index 5218edda..ec9ba4ac 100644 --- a/pkg/rtc/types/interfaces.go +++ b/pkg/rtc/types/interfaces.go @@ -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" diff --git a/pkg/rtc/types/trafficstats.go b/pkg/rtc/types/trafficstats.go index 13d2ad2e..f5c0b386 100644 --- a/pkg/rtc/types/trafficstats.go +++ b/pkg/rtc/types/trafficstats.go @@ -17,7 +17,7 @@ package types import ( "time" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type TrafficStats struct { diff --git a/pkg/rtc/types/typesfakes/fake_local_media_track.go b/pkg/rtc/types/typesfakes/fake_local_media_track.go index 815eda33..5ae1e780 100644 --- a/pkg/rtc/types/typesfakes/fake_local_media_track.go +++ b/pkg/rtc/types/typesfakes/fake_local_media_track.go @@ -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 { diff --git a/pkg/rtc/types/typesfakes/fake_local_participant.go b/pkg/rtc/types/typesfakes/fake_local_participant.go index 1f4b4ce4..2c6259b0 100644 --- a/pkg/rtc/types/typesfakes/fake_local_participant.go +++ b/pkg/rtc/types/typesfakes/fake_local_participant.go @@ -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" diff --git a/pkg/rtc/types/typesfakes/fake_local_participant_helper.go b/pkg/rtc/types/typesfakes/fake_local_participant_helper.go index b82cee81..789f21ad 100644 --- a/pkg/rtc/types/typesfakes/fake_local_participant_helper.go +++ b/pkg/rtc/types/typesfakes/fake_local_participant_helper.go @@ -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 { diff --git a/pkg/rtc/types/typesfakes/fake_media_track.go b/pkg/rtc/types/typesfakes/fake_media_track.go index 769a0d8e..7f625a6d 100644 --- a/pkg/rtc/types/typesfakes/fake_media_track.go +++ b/pkg/rtc/types/typesfakes/fake_media_track.go @@ -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 { diff --git a/pkg/rtc/types/typesfakes/fake_participant.go b/pkg/rtc/types/typesfakes/fake_participant.go index 491d784d..3917fdfd 100644 --- a/pkg/rtc/types/typesfakes/fake_participant.go +++ b/pkg/rtc/types/typesfakes/fake_participant.go @@ -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 { diff --git a/pkg/rtc/types/typesfakes/fake_room.go b/pkg/rtc/types/typesfakes/fake_room.go index c7b90cd3..59df5765 100644 --- a/pkg/rtc/types/typesfakes/fake_room.go +++ b/pkg/rtc/types/typesfakes/fake_room.go @@ -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 { diff --git a/pkg/rtc/types/typesfakes/fake_subscribed_track.go b/pkg/rtc/types/typesfakes/fake_subscribed_track.go index b84ee81f..7fd0aa62 100644 --- a/pkg/rtc/types/typesfakes/fake_subscribed_track.go +++ b/pkg/rtc/types/typesfakes/fake_subscribed_track.go @@ -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" ) diff --git a/pkg/rtc/uptrackmanager.go b/pkg/rtc/uptrackmanager.go index de5ab33a..b052a3ec 100644 --- a/pkg/rtc/uptrackmanager.go +++ b/pkg/rtc/uptrackmanager.go @@ -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 ( diff --git a/pkg/rtc/uptrackmanager_test.go b/pkg/rtc/uptrackmanager_test.go index e9f47fd8..425922ac 100644 --- a/pkg/rtc/uptrackmanager_test.go +++ b/pkg/rtc/uptrackmanager_test.go @@ -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" diff --git a/pkg/rtc/user_packet_deduper.go b/pkg/rtc/user_packet_deduper.go index 50b2ebb5..cd2ed406 100644 --- a/pkg/rtc/user_packet_deduper.go +++ b/pkg/rtc/user_packet_deduper.go @@ -18,7 +18,7 @@ import ( "sync" "github.com/google/uuid" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) const ( diff --git a/pkg/rtc/utils.go b/pkg/rtc/utils.go index ef0f437f..5193cfb5 100644 --- a/pkg/rtc/utils.go +++ b/pkg/rtc/utils.go @@ -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 ( diff --git a/pkg/rtc/utils_test.go b/pkg/rtc/utils_test.go index efca7bfc..37a6f010 100644 --- a/pkg/rtc/utils_test.go +++ b/pkg/rtc/utils_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/utils/guid" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/utils/guid" ) func TestPackStreamId(t *testing.T) { diff --git a/pkg/rtc/wrappedreceiver.go b/pkg/rtc/wrappedreceiver.go index bc860557..8ce2654e 100644 --- a/pkg/rtc/wrappedreceiver.go +++ b/pkg/rtc/wrappedreceiver.go @@ -23,8 +23,8 @@ import ( "golang.org/x/exp/maps" "golang.org/x/exp/slices" - "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" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" diff --git a/pkg/service/agent_dispatch_service.go b/pkg/service/agent_dispatch_service.go index 7ebeb3a8..8eb8740c 100644 --- a/pkg/service/agent_dispatch_service.go +++ b/pkg/service/agent_dispatch_service.go @@ -19,11 +19,11 @@ import ( "fmt" "github.com/stoatchat/livekit-server/pkg/routing" - "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" + "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" ) type AgentDispatchService struct { diff --git a/pkg/service/agentservice.go b/pkg/service/agentservice.go index f92cdad0..7d391547 100644 --- a/pkg/service/agentservice.go +++ b/pkg/service/agentservice.go @@ -34,11 +34,11 @@ import ( "github.com/stoatchat/livekit-server/pkg/rtc" "github.com/stoatchat/livekit-server/pkg/rtc/types" "github.com/stoatchat/livekit-server/version" - "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/stoatchat/livekit-protocol/utils" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/rpc" + "github.com/livekit/protocol/utils" "github.com/livekit/psrpc" ) diff --git a/pkg/service/auth.go b/pkg/service/auth.go index 2c6db728..bd0cae1f 100644 --- a/pkg/service/auth.go +++ b/pkg/service/auth.go @@ -22,8 +22,8 @@ import ( "github.com/twitchtv/twirp" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" ) const ( diff --git a/pkg/service/auth_test.go b/pkg/service/auth_test.go index 55a1eeca..b3b24c57 100644 --- a/pkg/service/auth_test.go +++ b/pkg/service/auth_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/auth/authfakes" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/auth/authfakes" "github.com/stoatchat/livekit-server/pkg/service" ) diff --git a/pkg/service/clients.go b/pkg/service/clients.go index 81c26539..d8fb3378 100644 --- a/pkg/service/clients.go +++ b/pkg/service/clients.go @@ -19,8 +19,8 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/rpc" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/rpc" ) //counterfeiter:generate . IOClient diff --git a/pkg/service/egress.go b/pkg/service/egress.go index 66c8345e..64f6d1cc 100644 --- a/pkg/service/egress.go +++ b/pkg/service/egress.go @@ -23,12 +23,12 @@ import ( "github.com/twitchtv/twirp" - "github.com/stoatchat/livekit-protocol/egress" - "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" + "github.com/livekit/protocol/egress" + "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" "github.com/stoatchat/livekit-server/pkg/rtc" diff --git a/pkg/service/ingress.go b/pkg/service/ingress.go index ea2087ee..c81de483 100644 --- a/pkg/service/ingress.go +++ b/pkg/service/ingress.go @@ -21,12 +21,12 @@ import ( "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/telemetry" - "github.com/stoatchat/livekit-protocol/ingress" - "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" + "github.com/livekit/protocol/ingress" + "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" ) diff --git a/pkg/service/interfaces.go b/pkg/service/interfaces.go index 0d9c9cb1..0e5b5fa5 100644 --- a/pkg/service/interfaces.go +++ b/pkg/service/interfaces.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/pkg/service/ioservice.go b/pkg/service/ioservice.go index f14cb612..e5ea04ff 100644 --- a/pkg/service/ioservice.go +++ b/pkg/service/ioservice.go @@ -19,9 +19,9 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "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/livekit/psrpc" "github.com/stoatchat/livekit-server/pkg/telemetry" diff --git a/pkg/service/ioservice_ingress.go b/pkg/service/ioservice_ingress.go index f1977144..b802c888 100644 --- a/pkg/service/ioservice_ingress.go +++ b/pkg/service/ioservice_ingress.go @@ -18,9 +18,9 @@ import ( "context" "errors" - "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" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/service/ioservice_sip.go b/pkg/service/ioservice_sip.go index 0ff32b07..0140466f 100644 --- a/pkg/service/ioservice_sip.go +++ b/pkg/service/ioservice_sip.go @@ -22,10 +22,10 @@ import ( "github.com/dennwc/iters" "github.com/twitchtv/twirp" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/rpc" - "github.com/stoatchat/livekit-protocol/sip" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/rpc" + "github.com/livekit/protocol/sip" ) // matchSIPTrunk finds a SIP Trunk definition matching the request. diff --git a/pkg/service/ioservice_sip_test.go b/pkg/service/ioservice_sip_test.go index 89c5d95f..df923fd8 100644 --- a/pkg/service/ioservice_sip_test.go +++ b/pkg/service/ioservice_sip_test.go @@ -22,7 +22,7 @@ import ( "slices" "testing" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" "github.com/stretchr/testify/require" ) diff --git a/pkg/service/localstore.go b/pkg/service/localstore.go index c9a14700..64bd508c 100644 --- a/pkg/service/localstore.go +++ b/pkg/service/localstore.go @@ -21,8 +21,8 @@ import ( "github.com/thoas/go-funk" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/utils" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/utils" ) // encapsulates CRUD operations for room settings diff --git a/pkg/service/redisstore.go b/pkg/service/redisstore.go index 2ec09484..358b2f87 100644 --- a/pkg/service/redisstore.go +++ b/pkg/service/redisstore.go @@ -27,11 +27,11 @@ import ( "github.com/redis/go-redis/v9" "google.golang.org/protobuf/proto" - "github.com/stoatchat/livekit-protocol/ingress" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils" - "github.com/stoatchat/livekit-protocol/utils/guid" + "github.com/livekit/protocol/ingress" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/utils/guid" "github.com/livekit/psrpc" "github.com/stoatchat/livekit-server/version" diff --git a/pkg/service/redisstore_sip.go b/pkg/service/redisstore_sip.go index c6062667..ba2931a5 100644 --- a/pkg/service/redisstore_sip.go +++ b/pkg/service/redisstore_sip.go @@ -17,7 +17,7 @@ package service import ( "context" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) const ( diff --git a/pkg/service/redisstore_sip_test.go b/pkg/service/redisstore_sip_test.go index 6e7aeb06..dc9e2052 100644 --- a/pkg/service/redisstore_sip_test.go +++ b/pkg/service/redisstore_sip_test.go @@ -22,9 +22,9 @@ import ( "testing" "github.com/dennwc/iters" - "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/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/pkg/service/redisstore_test.go b/pkg/service/redisstore_test.go index 4fa41450..4026c375 100644 --- a/pkg/service/redisstore_test.go +++ b/pkg/service/redisstore_test.go @@ -24,10 +24,10 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/proto" - "github.com/stoatchat/livekit-protocol/ingress" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/utils" - "github.com/stoatchat/livekit-protocol/utils/guid" + "github.com/livekit/protocol/ingress" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/utils/guid" "github.com/stoatchat/livekit-server/pkg/service" ) diff --git a/pkg/service/roomallocator.go b/pkg/service/roomallocator.go index 0b3fb413..e8de7c92 100644 --- a/pkg/service/roomallocator.go +++ b/pkg/service/roomallocator.go @@ -19,10 +19,10 @@ import ( "errors" "time" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "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/utils" + "github.com/livekit/protocol/utils/guid" "github.com/livekit/psrpc" "github.com/stoatchat/livekit-server/pkg/config" diff --git a/pkg/service/roomallocator_test.go b/pkg/service/roomallocator_test.go index 5d9889b3..312b8fad 100644 --- a/pkg/service/roomallocator_test.go +++ b/pkg/service/roomallocator_test.go @@ -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/config" "github.com/stoatchat/livekit-server/pkg/routing" diff --git a/pkg/service/roommanager.go b/pkg/service/roommanager.go index e3ee0556..e2d6fb94 100644 --- a/pkg/service/roommanager.go +++ b/pkg/service/roommanager.go @@ -28,14 +28,14 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu" sutils "github.com/stoatchat/livekit-server/pkg/utils" "github.com/livekit/mediatransportutil/pkg/rtcconfig" - "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/rpc" - "github.com/stoatchat/livekit-protocol/utils" - "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/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/protocol/utils/must" "github.com/livekit/psrpc" "github.com/livekit/psrpc/pkg/middleware" diff --git a/pkg/service/roommanager_service.go b/pkg/service/roommanager_service.go index 699648a7..ed1e2da4 100644 --- a/pkg/service/roommanager_service.go +++ b/pkg/service/roommanager_service.go @@ -13,9 +13,9 @@ import ( "github.com/stoatchat/livekit-server/pkg/routing" "github.com/stoatchat/livekit-server/pkg/rtc/types" "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/rpc" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/rpc" "github.com/livekit/psrpc" ) diff --git a/pkg/service/roomservice.go b/pkg/service/roomservice.go index b522e64a..0836c303 100644 --- a/pkg/service/roomservice.go +++ b/pkg/service/roomservice.go @@ -24,11 +24,11 @@ import ( "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/routing" "github.com/stoatchat/livekit-server/pkg/rtc" - "github.com/stoatchat/livekit-protocol/egress" - "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/egress" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/rpc" + "github.com/livekit/protocol/utils" ) type RoomService struct { diff --git a/pkg/service/roomservice_test.go b/pkg/service/roomservice_test.go index cbf08082..89a8185c 100644 --- a/pkg/service/roomservice_test.go +++ b/pkg/service/roomservice_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" "github.com/twitchtv/twirp" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/rpc" - "github.com/stoatchat/livekit-protocol/rpc/rpcfakes" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/rpc" + "github.com/livekit/protocol/rpc/rpcfakes" "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/routing/routingfakes" diff --git a/pkg/service/rtcservice.go b/pkg/service/rtcservice.go index e875c5ef..80afdcda 100644 --- a/pkg/service/rtcservice.go +++ b/pkg/service/rtcservice.go @@ -35,8 +35,8 @@ 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/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" "github.com/livekit/psrpc" "github.com/stoatchat/livekit-server/pkg/config" diff --git a/pkg/service/server.go b/pkg/service/server.go index 34fa63ba..6d0db12a 100644 --- a/pkg/service/server.go +++ b/pkg/service/server.go @@ -35,10 +35,10 @@ import ( "go.uber.org/atomic" "golang.org/x/sync/errgroup" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/xtwirp" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/xtwirp" "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/routing" diff --git a/pkg/service/servicefakes/fake_agent_store.go b/pkg/service/servicefakes/fake_agent_store.go index f7e96eb5..a8d0eb76 100644 --- a/pkg/service/servicefakes/fake_agent_store.go +++ b/pkg/service/servicefakes/fake_agent_store.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/stoatchat/livekit-server/pkg/service" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type FakeAgentStore struct { diff --git a/pkg/service/servicefakes/fake_egress_store.go b/pkg/service/servicefakes/fake_egress_store.go index e512b73e..f417da04 100644 --- a/pkg/service/servicefakes/fake_egress_store.go +++ b/pkg/service/servicefakes/fake_egress_store.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/stoatchat/livekit-server/pkg/service" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type FakeEgressStore struct { diff --git a/pkg/service/servicefakes/fake_ingress_store.go b/pkg/service/servicefakes/fake_ingress_store.go index 4102da15..da6a40b8 100644 --- a/pkg/service/servicefakes/fake_ingress_store.go +++ b/pkg/service/servicefakes/fake_ingress_store.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/stoatchat/livekit-server/pkg/service" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type FakeIngressStore struct { diff --git a/pkg/service/servicefakes/fake_ioclient.go b/pkg/service/servicefakes/fake_ioclient.go index 297a081e..c8a98396 100644 --- a/pkg/service/servicefakes/fake_ioclient.go +++ b/pkg/service/servicefakes/fake_ioclient.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/stoatchat/livekit-server/pkg/service" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/rpc" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/rpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/service/servicefakes/fake_object_store.go b/pkg/service/servicefakes/fake_object_store.go index 0a6a2159..6481efd9 100644 --- a/pkg/service/servicefakes/fake_object_store.go +++ b/pkg/service/servicefakes/fake_object_store.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stoatchat/livekit-server/pkg/service" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type FakeObjectStore struct { diff --git a/pkg/service/servicefakes/fake_room_allocator.go b/pkg/service/servicefakes/fake_room_allocator.go index 3a1bb2dd..4b1fc70c 100644 --- a/pkg/service/servicefakes/fake_room_allocator.go +++ b/pkg/service/servicefakes/fake_room_allocator.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/stoatchat/livekit-server/pkg/service" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type FakeRoomAllocator struct { diff --git a/pkg/service/servicefakes/fake_service_store.go b/pkg/service/servicefakes/fake_service_store.go index f13907d9..5b591813 100644 --- a/pkg/service/servicefakes/fake_service_store.go +++ b/pkg/service/servicefakes/fake_service_store.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/stoatchat/livekit-server/pkg/service" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type FakeServiceStore struct { diff --git a/pkg/service/servicefakes/fake_session_handler.go b/pkg/service/servicefakes/fake_session_handler.go index 965c4df9..6937147e 100644 --- a/pkg/service/servicefakes/fake_session_handler.go +++ b/pkg/service/servicefakes/fake_session_handler.go @@ -7,8 +7,8 @@ import ( "github.com/stoatchat/livekit-server/pkg/routing" "github.com/stoatchat/livekit-server/pkg/service" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" ) type FakeSessionHandler struct { diff --git a/pkg/service/servicefakes/fake_sipstore.go b/pkg/service/servicefakes/fake_sipstore.go index 3cd706b8..fe7a9a99 100644 --- a/pkg/service/servicefakes/fake_sipstore.go +++ b/pkg/service/servicefakes/fake_sipstore.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/stoatchat/livekit-server/pkg/service" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type FakeSIPStore struct { diff --git a/pkg/service/signal.go b/pkg/service/signal.go index d3b5655d..cc72d945 100644 --- a/pkg/service/signal.go +++ b/pkg/service/signal.go @@ -24,9 +24,9 @@ import ( "github.com/stoatchat/livekit-server/pkg/routing" "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/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/rpc" "github.com/livekit/psrpc" "github.com/livekit/psrpc/pkg/metadata" "github.com/livekit/psrpc/pkg/middleware" diff --git a/pkg/service/signal_test.go b/pkg/service/signal_test.go index 7318e42b..38f160f0 100644 --- a/pkg/service/signal_test.go +++ b/pkg/service/signal_test.go @@ -29,8 +29,8 @@ import ( "github.com/stoatchat/livekit-server/pkg/service" "github.com/stoatchat/livekit-server/pkg/service/servicefakes" "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" "github.com/livekit/psrpc" ) diff --git a/pkg/service/sip.go b/pkg/service/sip.go index f7ac17b7..1fd48d44 100644 --- a/pkg/service/sip.go +++ b/pkg/service/sip.go @@ -23,12 +23,12 @@ import ( "github.com/twitchtv/twirp" "google.golang.org/protobuf/types/known/emptypb" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/rpc" - "github.com/stoatchat/livekit-protocol/sip" - "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/rpc" + "github.com/livekit/protocol/sip" + "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/utils/guid" "github.com/livekit/psrpc" "github.com/stoatchat/livekit-server/pkg/config" diff --git a/pkg/service/turn.go b/pkg/service/turn.go index 15f604d2..95fec6fa 100644 --- a/pkg/service/turn.go +++ b/pkg/service/turn.go @@ -26,10 +26,10 @@ import ( "github.com/pion/turn/v4" "github.com/pkg/errors" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/logger/pionlogger" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/logger/pionlogger" "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/telemetry" diff --git a/pkg/service/twirp.go b/pkg/service/twirp.go index b214ecb3..de7d8ecd 100644 --- a/pkg/service/twirp.go +++ b/pkg/service/twirp.go @@ -29,7 +29,7 @@ import ( "github.com/stoatchat/livekit-server/pkg/telemetry" "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" "github.com/stoatchat/livekit-server/pkg/utils" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type twirpRequestFields struct { diff --git a/pkg/service/utils.go b/pkg/service/utils.go index ee58b927..56c72502 100644 --- a/pkg/service/utils.go +++ b/pkg/service/utils.go @@ -34,9 +34,9 @@ import ( "github.com/stoatchat/livekit-server/pkg/routing/selector" "github.com/stoatchat/livekit-server/pkg/rtc" "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/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" ) func handleError(w http.ResponseWriter, r *http.Request, status int, err error, keysAndValues ...interface{}) { diff --git a/pkg/service/whipservice.go b/pkg/service/whipservice.go index 1f779c23..6160675f 100644 --- a/pkg/service/whipservice.go +++ b/pkg/service/whipservice.go @@ -31,10 +31,10 @@ import ( "github.com/stoatchat/livekit-server/pkg/rtc" "github.com/stoatchat/livekit-server/pkg/rtc/types" 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/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" ) diff --git a/pkg/service/wire.go b/pkg/service/wire.go index 05612177..d8322ced 100644 --- a/pkg/service/wire.go +++ b/pkg/service/wire.go @@ -32,13 +32,13 @@ import ( "github.com/stoatchat/livekit-server/pkg/routing" "github.com/stoatchat/livekit-server/pkg/sfu" "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" - redisLiveKit "github.com/stoatchat/livekit-protocol/redis" - "github.com/stoatchat/livekit-protocol/rpc" - "github.com/stoatchat/livekit-protocol/utils" - "github.com/stoatchat/livekit-protocol/webhook" + "github.com/livekit/protocol/auth" + "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/utils" + "github.com/livekit/protocol/webhook" "github.com/livekit/psrpc" ) diff --git a/pkg/service/wire_gen.go b/pkg/service/wire_gen.go index 9011d394..115467d0 100644 --- a/pkg/service/wire_gen.go +++ b/pkg/service/wire_gen.go @@ -8,22 +8,22 @@ package service import ( "fmt" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + redis2 "github.com/livekit/protocol/redis" + "github.com/livekit/protocol/rpc" + "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/webhook" + "github.com/livekit/psrpc" + "github.com/pion/turn/v4" + "github.com/pkg/errors" + "github.com/redis/go-redis/v9" "github.com/stoatchat/livekit-server/pkg/agent" "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/routing" "github.com/stoatchat/livekit-server/pkg/sfu" "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" - redis2 "github.com/stoatchat/livekit-protocol/redis" - "github.com/stoatchat/livekit-protocol/rpc" - "github.com/stoatchat/livekit-protocol/utils" - "github.com/stoatchat/livekit-protocol/webhook" - "github.com/livekit/psrpc" - "github.com/pion/turn/v4" - "github.com/pkg/errors" - "github.com/redis/go-redis/v9" "gopkg.in/yaml.v3" "os" ) diff --git a/pkg/service/wsprotocol.go b/pkg/service/wsprotocol.go index e51350eb..adcd1bac 100644 --- a/pkg/service/wsprotocol.go +++ b/pkg/service/wsprotocol.go @@ -25,8 +25,8 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "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" ) diff --git a/pkg/sfu/buffer/buffer.go b/pkg/sfu/buffer/buffer.go index 85a2c5c7..6e2e510a 100644 --- a/pkg/sfu/buffer/buffer.go +++ b/pkg/sfu/buffer/buffer.go @@ -41,9 +41,9 @@ import ( "github.com/livekit/mediatransportutil/pkg/bucket" "github.com/livekit/mediatransportutil/pkg/nack" "github.com/livekit/mediatransportutil/pkg/twcc" - "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" ) const ( diff --git a/pkg/sfu/buffer/datastats.go b/pkg/sfu/buffer/datastats.go index 76940073..795f8a0f 100644 --- a/pkg/sfu/buffer/datastats.go +++ b/pkg/sfu/buffer/datastats.go @@ -20,7 +20,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type DataStatsParam struct { diff --git a/pkg/sfu/buffer/datastats_test.go b/pkg/sfu/buffer/datastats_test.go index 43e2f86e..5803fe9d 100644 --- a/pkg/sfu/buffer/datastats_test.go +++ b/pkg/sfu/buffer/datastats_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) func TestDataStats(t *testing.T) { diff --git a/pkg/sfu/buffer/dependencydescriptorparser.go b/pkg/sfu/buffer/dependencydescriptorparser.go index 8f2467f4..bfdae5ef 100644 --- a/pkg/sfu/buffer/dependencydescriptorparser.go +++ b/pkg/sfu/buffer/dependencydescriptorparser.go @@ -25,7 +25,7 @@ import ( dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" "github.com/stoatchat/livekit-server/pkg/sfu/utils" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) const ( diff --git a/pkg/sfu/buffer/fps.go b/pkg/sfu/buffer/fps.go index b20ddd86..5622198f 100644 --- a/pkg/sfu/buffer/fps.go +++ b/pkg/sfu/buffer/fps.go @@ -19,7 +19,7 @@ import ( "github.com/pion/rtp/codecs" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) var minFramesForCalculation = [...]int{8, 15, 40, 60} diff --git a/pkg/sfu/buffer/fps_test.go b/pkg/sfu/buffer/fps_test.go index 0d5ffcee..ae2d5b29 100644 --- a/pkg/sfu/buffer/fps_test.go +++ b/pkg/sfu/buffer/fps_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type testFrameInfo struct { diff --git a/pkg/sfu/buffer/helpers.go b/pkg/sfu/buffer/helpers.go index 76840321..ccd0c076 100644 --- a/pkg/sfu/buffer/helpers.go +++ b/pkg/sfu/buffer/helpers.go @@ -20,7 +20,7 @@ import ( "github.com/pion/rtp/codecs" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) var ( diff --git a/pkg/sfu/buffer/videolayerutils.go b/pkg/sfu/buffer/videolayerutils.go index 55a1cc8c..6cfaf81c 100644 --- a/pkg/sfu/buffer/videolayerutils.go +++ b/pkg/sfu/buffer/videolayerutils.go @@ -18,8 +18,8 @@ import ( "slices" "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 ( diff --git a/pkg/sfu/buffer/videolayerutils_test.go b/pkg/sfu/buffer/videolayerutils_test.go index 04749446..fd94c088 100644 --- a/pkg/sfu/buffer/videolayerutils_test.go +++ b/pkg/sfu/buffer/videolayerutils_test.go @@ -20,7 +20,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 TestRidConversion(t *testing.T) { diff --git a/pkg/sfu/bwe/remotebwe/channel_observer.go b/pkg/sfu/bwe/remotebwe/channel_observer.go index a7824649..45c38e3b 100644 --- a/pkg/sfu/bwe/remotebwe/channel_observer.go +++ b/pkg/sfu/bwe/remotebwe/channel_observer.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap/zapcore" "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) // ------------------------------------------------ diff --git a/pkg/sfu/bwe/remotebwe/nack_tracker.go b/pkg/sfu/bwe/remotebwe/nack_tracker.go index cec1833a..106115f8 100644 --- a/pkg/sfu/bwe/remotebwe/nack_tracker.go +++ b/pkg/sfu/bwe/remotebwe/nack_tracker.go @@ -19,7 +19,7 @@ import ( "go.uber.org/zap/zapcore" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) // ------------------------------------------------ diff --git a/pkg/sfu/bwe/remotebwe/probe_controller.go b/pkg/sfu/bwe/remotebwe/probe_controller.go index 367db0fb..5d1c2713 100644 --- a/pkg/sfu/bwe/remotebwe/probe_controller.go +++ b/pkg/sfu/bwe/remotebwe/probe_controller.go @@ -20,8 +20,8 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/bwe" "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/mono" ) // --------------------------------------------------------------------------- diff --git a/pkg/sfu/bwe/remotebwe/remote_bwe.go b/pkg/sfu/bwe/remotebwe/remote_bwe.go index fb12580b..0b73b9bb 100644 --- a/pkg/sfu/bwe/remotebwe/remote_bwe.go +++ b/pkg/sfu/bwe/remotebwe/remote_bwe.go @@ -20,8 +20,8 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/bwe" "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/mono" ) var _ bwe.BWE = (*RemoteBWE)(nil) diff --git a/pkg/sfu/bwe/sendsidebwe/congestion_detector.go b/pkg/sfu/bwe/sendsidebwe/congestion_detector.go index 62004ee9..75c82f7f 100644 --- a/pkg/sfu/bwe/sendsidebwe/congestion_detector.go +++ b/pkg/sfu/bwe/sendsidebwe/congestion_detector.go @@ -21,8 +21,8 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/bwe" "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/mono" "github.com/pion/rtcp" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/bwe/sendsidebwe/packet_group.go b/pkg/sfu/bwe/sendsidebwe/packet_group.go index 5f979525..b64727fd 100644 --- a/pkg/sfu/bwe/sendsidebwe/packet_group.go +++ b/pkg/sfu/bwe/sendsidebwe/packet_group.go @@ -18,8 +18,8 @@ import ( "errors" "time" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/bwe/sendsidebwe/packet_tracker.go b/pkg/sfu/bwe/sendsidebwe/packet_tracker.go index ec66ed82..7af0e50e 100644 --- a/pkg/sfu/bwe/sendsidebwe/packet_tracker.go +++ b/pkg/sfu/bwe/sendsidebwe/packet_tracker.go @@ -19,8 +19,8 @@ import ( "sync" "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/mono" ) // ------------------------------------------------------------------------------- diff --git a/pkg/sfu/bwe/sendsidebwe/probe_packet_group.go b/pkg/sfu/bwe/sendsidebwe/probe_packet_group.go index 00189e71..cb2b04c2 100644 --- a/pkg/sfu/bwe/sendsidebwe/probe_packet_group.go +++ b/pkg/sfu/bwe/sendsidebwe/probe_packet_group.go @@ -18,8 +18,8 @@ import ( "time" "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/mono" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/bwe/sendsidebwe/send_side_bwe.go b/pkg/sfu/bwe/sendsidebwe/send_side_bwe.go index 10f79b48..cb072c05 100644 --- a/pkg/sfu/bwe/sendsidebwe/send_side_bwe.go +++ b/pkg/sfu/bwe/sendsidebwe/send_side_bwe.go @@ -19,7 +19,7 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/bwe" "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" "github.com/pion/rtcp" ) diff --git a/pkg/sfu/bwe/sendsidebwe/traffic_stats.go b/pkg/sfu/bwe/sendsidebwe/traffic_stats.go index e8c329a5..f1c07d54 100644 --- a/pkg/sfu/bwe/sendsidebwe/traffic_stats.go +++ b/pkg/sfu/bwe/sendsidebwe/traffic_stats.go @@ -18,7 +18,7 @@ import ( "math" "time" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/bwe/sendsidebwe/twcc_feedback.go b/pkg/sfu/bwe/sendsidebwe/twcc_feedback.go index 3efd7822..f6e10e1b 100644 --- a/pkg/sfu/bwe/sendsidebwe/twcc_feedback.go +++ b/pkg/sfu/bwe/sendsidebwe/twcc_feedback.go @@ -18,7 +18,7 @@ import ( "errors" "time" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" "github.com/pion/rtcp" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/ccutils/probe_regulator.go b/pkg/sfu/ccutils/probe_regulator.go index 0b374085..ed0940bd 100644 --- a/pkg/sfu/ccutils/probe_regulator.go +++ b/pkg/sfu/ccutils/probe_regulator.go @@ -17,8 +17,8 @@ package ccutils import ( "time" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/mono" ) // ------------------------------------------------ diff --git a/pkg/sfu/ccutils/prober.go b/pkg/sfu/ccutils/prober.go index 3bc8b8c8..577042ad 100644 --- a/pkg/sfu/ccutils/prober.go +++ b/pkg/sfu/ccutils/prober.go @@ -129,8 +129,8 @@ import ( "go.uber.org/atomic" "go.uber.org/zap/zapcore" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/mono" ) type ProberListener interface { diff --git a/pkg/sfu/ccutils/trenddetector.go b/pkg/sfu/ccutils/trenddetector.go index e0517af4..c3f8ff67 100644 --- a/pkg/sfu/ccutils/trenddetector.go +++ b/pkg/sfu/ccutils/trenddetector.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/codecmunger/null.go b/pkg/sfu/codecmunger/null.go index 0b2eca41..a849dc09 100644 --- a/pkg/sfu/codecmunger/null.go +++ b/pkg/sfu/codecmunger/null.go @@ -16,7 +16,7 @@ package codecmunger import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type Null struct { diff --git a/pkg/sfu/codecmunger/vp8.go b/pkg/sfu/codecmunger/vp8.go index 2d166208..566a97c5 100644 --- a/pkg/sfu/codecmunger/vp8.go +++ b/pkg/sfu/codecmunger/vp8.go @@ -17,8 +17,8 @@ package codecmunger import ( "github.com/elliotchance/orderedmap/v2" - "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/buffer" ) diff --git a/pkg/sfu/codecmunger/vp8_test.go b/pkg/sfu/codecmunger/vp8_test.go index dc1ac4ca..d7ae4704 100644 --- a/pkg/sfu/codecmunger/vp8_test.go +++ b/pkg/sfu/codecmunger/vp8_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/testutils" diff --git a/pkg/sfu/connectionquality/connectionstats.go b/pkg/sfu/connectionquality/connectionstats.go index 5a174a1c..9916e06d 100644 --- a/pkg/sfu/connectionquality/connectionstats.go +++ b/pkg/sfu/connectionquality/connectionstats.go @@ -22,8 +22,8 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/types/known/timestamppb" - "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/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/mime" diff --git a/pkg/sfu/connectionquality/connectionstats_test.go b/pkg/sfu/connectionquality/connectionstats_test.go index dd2a4e08..7d5416e7 100644 --- a/pkg/sfu/connectionquality/connectionstats_test.go +++ b/pkg/sfu/connectionquality/connectionstats_test.go @@ -24,8 +24,8 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/mime" "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" ) // ----------------------------------------------- diff --git a/pkg/sfu/connectionquality/scorer.go b/pkg/sfu/connectionquality/scorer.go index 43f3caab..af929002 100644 --- a/pkg/sfu/connectionquality/scorer.go +++ b/pkg/sfu/connectionquality/scorer.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "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" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/datachannel/bitrate.go b/pkg/sfu/datachannel/bitrate.go index 80dcc93c..b95198aa 100644 --- a/pkg/sfu/datachannel/bitrate.go +++ b/pkg/sfu/datachannel/bitrate.go @@ -6,7 +6,7 @@ import ( "github.com/gammazero/deque" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/utils/mono" ) const ( diff --git a/pkg/sfu/datachannel/datachannel_writer.go b/pkg/sfu/datachannel/datachannel_writer.go index e0cc7665..707c9203 100644 --- a/pkg/sfu/datachannel/datachannel_writer.go +++ b/pkg/sfu/datachannel/datachannel_writer.go @@ -8,7 +8,7 @@ import ( "github.com/pion/datachannel" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/utils/mono" ) const ( diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go index 5ed00d52..4309f2e9 100644 --- a/pkg/sfu/downtrack.go +++ b/pkg/sfu/downtrack.go @@ -33,9 +33,9 @@ import ( "go.uber.org/atomic" "go.uber.org/zap/zapcore" - "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-server/pkg/sfu/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/bwe" diff --git a/pkg/sfu/downtrackspreader.go b/pkg/sfu/downtrackspreader.go index 95d85232..98057a0d 100644 --- a/pkg/sfu/downtrackspreader.go +++ b/pkg/sfu/downtrackspreader.go @@ -17,9 +17,9 @@ package sfu import ( "sync" - "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" ) type DownTrackSpreaderParams struct { diff --git a/pkg/sfu/forwarder.go b/pkg/sfu/forwarder.go index d37f7522..2b039831 100644 --- a/pkg/sfu/forwarder.go +++ b/pkg/sfu/forwarder.go @@ -27,10 +27,10 @@ import ( "go.uber.org/zap/zapcore" "github.com/livekit/mediatransportutil" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/utils/mono" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/codecmunger" diff --git a/pkg/sfu/forwarder_test.go b/pkg/sfu/forwarder_test.go index cec22dc7..09e85774 100644 --- a/pkg/sfu/forwarder_test.go +++ b/pkg/sfu/forwarder_test.go @@ -20,8 +20,8 @@ import ( "github.com/pion/webrtc/v4" "github.com/stretchr/testify/require" - "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/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/testutils" diff --git a/pkg/sfu/forwardstats.go b/pkg/sfu/forwardstats.go index 6226ab1f..fbb54dfe 100644 --- a/pkg/sfu/forwardstats.go +++ b/pkg/sfu/forwardstats.go @@ -5,9 +5,9 @@ import ( "time" "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/utils/mono" ) const ( diff --git a/pkg/sfu/interceptor/rtx.go b/pkg/sfu/interceptor/rtx.go index ed15641a..ebe5c4dc 100644 --- a/pkg/sfu/interceptor/rtx.go +++ b/pkg/sfu/interceptor/rtx.go @@ -22,7 +22,7 @@ import ( "github.com/pion/webrtc/v4" "github.com/stoatchat/livekit-server/pkg/sfu/utils" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) const ( diff --git a/pkg/sfu/mime/mimetype.go b/pkg/sfu/mime/mimetype.go index 99fceebc..d336bccf 100644 --- a/pkg/sfu/mime/mimetype.go +++ b/pkg/sfu/mime/mimetype.go @@ -19,7 +19,7 @@ import ( "github.com/pion/webrtc/v4" - "github.com/stoatchat/livekit-protocol/observability/roomobs" + "github.com/livekit/protocol/observability/roomobs" ) const ( diff --git a/pkg/sfu/pacer/base.go b/pkg/sfu/pacer/base.go index 988be3ef..70e9f7be 100644 --- a/pkg/sfu/pacer/base.go +++ b/pkg/sfu/pacer/base.go @@ -20,8 +20,8 @@ import ( "time" "github.com/stoatchat/livekit-server/pkg/sfu/bwe" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/mono" "github.com/pion/rtp" "go.uber.org/atomic" ) diff --git a/pkg/sfu/pacer/leaky_bucket.go b/pkg/sfu/pacer/leaky_bucket.go index 0ed159f4..01f22275 100644 --- a/pkg/sfu/pacer/leaky_bucket.go +++ b/pkg/sfu/pacer/leaky_bucket.go @@ -21,7 +21,7 @@ import ( "github.com/frostbyte73/core" "github.com/gammazero/deque" "github.com/stoatchat/livekit-server/pkg/sfu/bwe" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) const ( diff --git a/pkg/sfu/pacer/no_queue.go b/pkg/sfu/pacer/no_queue.go index 2e477d2c..178672e4 100644 --- a/pkg/sfu/pacer/no_queue.go +++ b/pkg/sfu/pacer/no_queue.go @@ -20,7 +20,7 @@ import ( "github.com/frostbyte73/core" "github.com/gammazero/deque" "github.com/stoatchat/livekit-server/pkg/sfu/bwe" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type NoQueue struct { diff --git a/pkg/sfu/pacer/pass_through.go b/pkg/sfu/pacer/pass_through.go index aa6da32d..ba5b6037 100644 --- a/pkg/sfu/pacer/pass_through.go +++ b/pkg/sfu/pacer/pass_through.go @@ -16,7 +16,7 @@ package pacer import ( "github.com/stoatchat/livekit-server/pkg/sfu/bwe" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type PassThrough struct { diff --git a/pkg/sfu/pacer/probe_observer.go b/pkg/sfu/pacer/probe_observer.go index 83b77c73..418ae2ff 100644 --- a/pkg/sfu/pacer/probe_observer.go +++ b/pkg/sfu/pacer/probe_observer.go @@ -21,8 +21,8 @@ import ( "go.uber.org/atomic" "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/mono" ) type ProbeObserver struct { diff --git a/pkg/sfu/playoutdelay.go b/pkg/sfu/playoutdelay.go index 4d74d14b..66b28eec 100644 --- a/pkg/sfu/playoutdelay.go +++ b/pkg/sfu/playoutdelay.go @@ -20,7 +20,7 @@ import ( pd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/playoutdelay" "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" "go.uber.org/atomic" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/playoutdelay_test.go b/pkg/sfu/playoutdelay_test.go index 9c6f0aef..d393689b 100644 --- a/pkg/sfu/playoutdelay_test.go +++ b/pkg/sfu/playoutdelay_test.go @@ -22,7 +22,7 @@ import ( pd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/playoutdelay" "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) func TestPlayoutDelay(t *testing.T) { diff --git a/pkg/sfu/receiver.go b/pkg/sfu/receiver.go index 2af9cf06..10a3b942 100644 --- a/pkg/sfu/receiver.go +++ b/pkg/sfu/receiver.go @@ -26,10 +26,10 @@ import ( "go.uber.org/atomic" "github.com/livekit/mediatransportutil/pkg/bucket" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/utils/mono" "github.com/stoatchat/livekit-server/pkg/sfu/audio" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" diff --git a/pkg/sfu/redprimaryreceiver.go b/pkg/sfu/redprimaryreceiver.go index e62fb473..4328acfe 100644 --- a/pkg/sfu/redprimaryreceiver.go +++ b/pkg/sfu/redprimaryreceiver.go @@ -24,8 +24,8 @@ import ( "github.com/pion/webrtc/v4" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" ) var ( diff --git a/pkg/sfu/redreceiver.go b/pkg/sfu/redreceiver.go index 7023da7b..0809c2e7 100644 --- a/pkg/sfu/redreceiver.go +++ b/pkg/sfu/redreceiver.go @@ -25,8 +25,8 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" "github.com/livekit/mediatransportutil/pkg/bucket" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" ) const ( diff --git a/pkg/sfu/redreceiver_test.go b/pkg/sfu/redreceiver_test.go index 77a978ad..494a3aab 100644 --- a/pkg/sfu/redreceiver_test.go +++ b/pkg/sfu/redreceiver_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) const ( diff --git a/pkg/sfu/rtpmunger.go b/pkg/sfu/rtpmunger.go index 21caba67..8a14b90e 100644 --- a/pkg/sfu/rtpmunger.go +++ b/pkg/sfu/rtpmunger.go @@ -15,8 +15,8 @@ package sfu 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/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/utils" diff --git a/pkg/sfu/rtpmunger_test.go b/pkg/sfu/rtpmunger_test.go index 6978e60e..24578455 100644 --- a/pkg/sfu/rtpmunger_test.go +++ b/pkg/sfu/rtpmunger_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" "github.com/stoatchat/livekit-server/pkg/sfu/testutils" ) diff --git a/pkg/sfu/rtpstats/rtpstats_base.go b/pkg/sfu/rtpstats/rtpstats_base.go index 17ea2509..a4a9107c 100644 --- a/pkg/sfu/rtpstats/rtpstats_base.go +++ b/pkg/sfu/rtpstats/rtpstats_base.go @@ -22,9 +22,9 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "github.com/livekit/mediatransportutil" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/utils" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/utils/mono" ) const ( diff --git a/pkg/sfu/rtpstats/rtpstats_base_lite.go b/pkg/sfu/rtpstats/rtpstats_base_lite.go index c621f776..c54b3665 100644 --- a/pkg/sfu/rtpstats/rtpstats_base_lite.go +++ b/pkg/sfu/rtpstats/rtpstats_base_lite.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "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" "go.uber.org/zap/zapcore" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/pkg/sfu/rtpstats/rtpstats_receiver.go b/pkg/sfu/rtpstats/rtpstats_receiver.go index 46ab889a..316ed7ba 100644 --- a/pkg/sfu/rtpstats/rtpstats_receiver.go +++ b/pkg/sfu/rtpstats/rtpstats_receiver.go @@ -24,10 +24,10 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/utils" "github.com/livekit/mediatransportutil" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - protoutils "github.com/stoatchat/livekit-protocol/utils" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + protoutils "github.com/livekit/protocol/utils" + "github.com/livekit/protocol/utils/mono" ) const ( diff --git a/pkg/sfu/rtpstats/rtpstats_receiver_lite.go b/pkg/sfu/rtpstats/rtpstats_receiver_lite.go index f107215f..afc1dc68 100644 --- a/pkg/sfu/rtpstats/rtpstats_receiver_lite.go +++ b/pkg/sfu/rtpstats/rtpstats_receiver_lite.go @@ -18,8 +18,8 @@ import ( "go.uber.org/zap/zapcore" "github.com/stoatchat/livekit-server/pkg/sfu/utils" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/utils/mono" ) type RTPFlowStateLite struct { diff --git a/pkg/sfu/rtpstats/rtpstats_receiver_test.go b/pkg/sfu/rtpstats/rtpstats_receiver_test.go index 7b536812..d895b57c 100644 --- a/pkg/sfu/rtpstats/rtpstats_receiver_test.go +++ b/pkg/sfu/rtpstats/rtpstats_receiver_test.go @@ -22,7 +22,7 @@ import ( "github.com/pion/rtp" "github.com/stretchr/testify/require" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) func getPacket(sn uint16, ts uint32, payloadSize int) *rtp.Packet { diff --git a/pkg/sfu/rtpstats/rtpstats_sender.go b/pkg/sfu/rtpstats/rtpstats_sender.go index 4209d29b..db43fa21 100644 --- a/pkg/sfu/rtpstats/rtpstats_sender.go +++ b/pkg/sfu/rtpstats/rtpstats_sender.go @@ -25,9 +25,9 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "github.com/livekit/mediatransportutil" - "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" ) // ------------------------------------------------------------------- diff --git a/pkg/sfu/rtpstats/rtpstats_sender_lite.go b/pkg/sfu/rtpstats/rtpstats_sender_lite.go index b777d5cc..ae422352 100644 --- a/pkg/sfu/rtpstats/rtpstats_sender_lite.go +++ b/pkg/sfu/rtpstats/rtpstats_sender_lite.go @@ -15,8 +15,8 @@ package rtpstats import ( - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/utils/mono" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/utils/mono" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/sequencer.go b/pkg/sfu/sequencer.go index f5e3d60c..cf0bcf48 100644 --- a/pkg/sfu/sequencer.go +++ b/pkg/sfu/sequencer.go @@ -20,7 +20,7 @@ import ( "time" "github.com/stoatchat/livekit-server/pkg/sfu/utils" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/sequencer_test.go b/pkg/sfu/sequencer_test.go index 328e8b99..862ac531 100644 --- a/pkg/sfu/sequencer_test.go +++ b/pkg/sfu/sequencer_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) func Test_sequencer(t *testing.T) { diff --git a/pkg/sfu/streamallocator/streamallocator.go b/pkg/sfu/streamallocator/streamallocator.go index 501030df..85b20d46 100644 --- a/pkg/sfu/streamallocator/streamallocator.go +++ b/pkg/sfu/streamallocator/streamallocator.go @@ -25,8 +25,8 @@ import ( "github.com/pion/webrtc/v4" "go.uber.org/atomic" - "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" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" diff --git a/pkg/sfu/streamallocator/streamstateupdate.go b/pkg/sfu/streamallocator/streamstateupdate.go index 5a55a0f2..53156de3 100644 --- a/pkg/sfu/streamallocator/streamstateupdate.go +++ b/pkg/sfu/streamallocator/streamstateupdate.go @@ -17,7 +17,7 @@ package streamallocator import ( "fmt" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) // ------------------------------------------------ diff --git a/pkg/sfu/streamallocator/track.go b/pkg/sfu/streamallocator/track.go index d913e025..398c6aa5 100644 --- a/pkg/sfu/streamallocator/track.go +++ b/pkg/sfu/streamallocator/track.go @@ -15,8 +15,8 @@ package streamallocator 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" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" diff --git a/pkg/sfu/streamtracker/streamtracker.go b/pkg/sfu/streamtracker/streamtracker.go index c3948142..267cb505 100644 --- a/pkg/sfu/streamtracker/streamtracker.go +++ b/pkg/sfu/streamtracker/streamtracker.go @@ -22,7 +22,7 @@ import ( "go.uber.org/atomic" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) // ------------------------------------------------------------ diff --git a/pkg/sfu/streamtracker/streamtracker_dd_test.go b/pkg/sfu/streamtracker/streamtracker_dd_test.go index 76654ae7..11b7dbb0 100644 --- a/pkg/sfu/streamtracker/streamtracker_dd_test.go +++ b/pkg/sfu/streamtracker/streamtracker_dd_test.go @@ -22,7 +22,7 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) func createDescriptorDependencyForTargets(maxSpatial, maxTemporal int) *buffer.ExtDependencyDescriptor { diff --git a/pkg/sfu/streamtracker/streamtracker_frame.go b/pkg/sfu/streamtracker/streamtracker_frame.go index ba2dd826..e0f9f577 100644 --- a/pkg/sfu/streamtracker/streamtracker_frame.go +++ b/pkg/sfu/streamtracker/streamtracker_frame.go @@ -18,7 +18,7 @@ import ( "math" "time" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) const ( diff --git a/pkg/sfu/streamtracker/streamtracker_packet.go b/pkg/sfu/streamtracker/streamtracker_packet.go index 6effe1f8..1ff3be1c 100644 --- a/pkg/sfu/streamtracker/streamtracker_packet.go +++ b/pkg/sfu/streamtracker/streamtracker_packet.go @@ -17,7 +17,7 @@ package streamtracker import ( "time" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) // -------------------------------------------- diff --git a/pkg/sfu/streamtracker/streamtracker_packet_test.go b/pkg/sfu/streamtracker/streamtracker_packet_test.go index f999ad99..b5fb0f4a 100644 --- a/pkg/sfu/streamtracker/streamtracker_packet_test.go +++ b/pkg/sfu/streamtracker/streamtracker_packet_test.go @@ -24,7 +24,7 @@ import ( "go.uber.org/atomic" "github.com/stoatchat/livekit-server/pkg/testutils" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) func newStreamTrackerPacket(samplesRequired uint32, cyclesRequired uint32, cycleDuration time.Duration) *StreamTracker { diff --git a/pkg/sfu/streamtrackermanager.go b/pkg/sfu/streamtrackermanager.go index fac103ae..5779f241 100644 --- a/pkg/sfu/streamtrackermanager.go +++ b/pkg/sfu/streamtrackermanager.go @@ -23,9 +23,9 @@ import ( "github.com/frostbyte73/core" "go.uber.org/atomic" - "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/sfu/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/mime" diff --git a/pkg/sfu/utils/helpers.go b/pkg/sfu/utils/helpers.go index bf22a4a9..86d67c15 100644 --- a/pkg/sfu/utils/helpers.go +++ b/pkg/sfu/utils/helpers.go @@ -23,7 +23,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" ) // Do a fuzzy find for a codec in the list of codecs diff --git a/pkg/sfu/videolayerselector/base.go b/pkg/sfu/videolayerselector/base.go index 7b128df3..3177905d 100644 --- a/pkg/sfu/videolayerselector/base.go +++ b/pkg/sfu/videolayerselector/base.go @@ -17,7 +17,7 @@ package videolayerselector import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/videolayerselector/temporallayerselector" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type Base struct { diff --git a/pkg/sfu/videolayerselector/dependencydescriptor.go b/pkg/sfu/videolayerselector/dependencydescriptor.go index e423edd3..61103a30 100644 --- a/pkg/sfu/videolayerselector/dependencydescriptor.go +++ b/pkg/sfu/videolayerselector/dependencydescriptor.go @@ -21,7 +21,7 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" dede "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) const ( diff --git a/pkg/sfu/videolayerselector/dependencydescriptor_test.go b/pkg/sfu/videolayerselector/dependencydescriptor_test.go index 1346950d..38a38034 100644 --- a/pkg/sfu/videolayerselector/dependencydescriptor_test.go +++ b/pkg/sfu/videolayerselector/dependencydescriptor_test.go @@ -23,7 +23,7 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) func TestDecodeTarget(t *testing.T) { diff --git a/pkg/sfu/videolayerselector/framechain.go b/pkg/sfu/videolayerselector/framechain.go index 4f4c6121..bb479eb0 100644 --- a/pkg/sfu/videolayerselector/framechain.go +++ b/pkg/sfu/videolayerselector/framechain.go @@ -16,7 +16,7 @@ package videolayerselector import ( dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type FrameChain struct { diff --git a/pkg/sfu/videolayerselector/framenumberwrapper.go b/pkg/sfu/videolayerselector/framenumberwrapper.go index d5a98934..43c9c02d 100644 --- a/pkg/sfu/videolayerselector/framenumberwrapper.go +++ b/pkg/sfu/videolayerselector/framenumberwrapper.go @@ -14,7 +14,7 @@ package videolayerselector -import "github.com/stoatchat/livekit-protocol/logger" +import "github.com/livekit/protocol/logger" type FrameNumberWrapper struct { offset uint64 diff --git a/pkg/sfu/videolayerselector/framenumberwrapper_test.go b/pkg/sfu/videolayerselector/framenumberwrapper_test.go index ce93d753..48977890 100644 --- a/pkg/sfu/videolayerselector/framenumberwrapper_test.go +++ b/pkg/sfu/videolayerselector/framenumberwrapper_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stoatchat/livekit-server/pkg/sfu/utils" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) func TestFrameNumberWrapper(t *testing.T) { diff --git a/pkg/sfu/videolayerselector/null.go b/pkg/sfu/videolayerselector/null.go index 0528f709..644a8f95 100644 --- a/pkg/sfu/videolayerselector/null.go +++ b/pkg/sfu/videolayerselector/null.go @@ -15,7 +15,7 @@ package videolayerselector import ( - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type Null struct { diff --git a/pkg/sfu/videolayerselector/simulcast.go b/pkg/sfu/videolayerselector/simulcast.go index ece8e87a..1257a902 100644 --- a/pkg/sfu/videolayerselector/simulcast.go +++ b/pkg/sfu/videolayerselector/simulcast.go @@ -16,7 +16,7 @@ package videolayerselector import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type Simulcast struct { diff --git a/pkg/sfu/videolayerselector/temporallayerselector/vp8.go b/pkg/sfu/videolayerselector/temporallayerselector/vp8.go index 4e6da977..ab7b5f8c 100644 --- a/pkg/sfu/videolayerselector/temporallayerselector/vp8.go +++ b/pkg/sfu/videolayerselector/temporallayerselector/vp8.go @@ -16,7 +16,7 @@ package temporallayerselector import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type VP8 struct { diff --git a/pkg/sfu/videolayerselector/videolayerselector.go b/pkg/sfu/videolayerselector/videolayerselector.go index c86dcd1a..a3be61c2 100644 --- a/pkg/sfu/videolayerselector/videolayerselector.go +++ b/pkg/sfu/videolayerselector/videolayerselector.go @@ -17,7 +17,7 @@ package videolayerselector import ( "github.com/stoatchat/livekit-server/pkg/sfu/buffer" "github.com/stoatchat/livekit-server/pkg/sfu/videolayerselector/temporallayerselector" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type VideoLayerSelectorResult struct { diff --git a/pkg/sfu/videolayerselector/vp9.go b/pkg/sfu/videolayerselector/vp9.go index df3a864e..793ea708 100644 --- a/pkg/sfu/videolayerselector/vp9.go +++ b/pkg/sfu/videolayerselector/vp9.go @@ -18,7 +18,7 @@ import ( "github.com/pion/rtp/codecs" "github.com/stoatchat/livekit-server/pkg/sfu/buffer" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type VP9 struct { diff --git a/pkg/telemetry/analyticsservice.go b/pkg/telemetry/analyticsservice.go index d21fa968..795989e9 100644 --- a/pkg/telemetry/analyticsservice.go +++ b/pkg/telemetry/analyticsservice.go @@ -20,11 +20,11 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/types/known/timestamppb" - "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/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/guid" "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/routing" diff --git a/pkg/telemetry/events.go b/pkg/telemetry/events.go index c50e6453..2c618c87 100644 --- a/pkg/telemetry/events.go +++ b/pkg/telemetry/events.go @@ -22,11 +22,11 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/mime" "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" - "github.com/stoatchat/livekit-protocol/egress" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/guid" - "github.com/stoatchat/livekit-protocol/webhook" + "github.com/livekit/protocol/egress" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/utils/guid" + "github.com/livekit/protocol/webhook" ) func (t *telemetryService) NotifyEvent(ctx context.Context, event *livekit.WebhookEvent, opts ...webhook.NotifyOption) { diff --git a/pkg/telemetry/events_test.go b/pkg/telemetry/events_test.go index d137bcbf..39f99b21 100644 --- a/pkg/telemetry/events_test.go +++ b/pkg/telemetry/events_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stoatchat/livekit-server/pkg/telemetry" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) func Test_OnParticipantJoin_EventIsSent(t *testing.T) { diff --git a/pkg/telemetry/prometheus/datapacket.go b/pkg/telemetry/prometheus/datapacket.go index 57e60326..541016d8 100644 --- a/pkg/telemetry/prometheus/datapacket.go +++ b/pkg/telemetry/prometheus/datapacket.go @@ -20,7 +20,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) var ( diff --git a/pkg/telemetry/prometheus/node.go b/pkg/telemetry/prometheus/node.go index 078cd1d7..5668db3c 100644 --- a/pkg/telemetry/prometheus/node.go +++ b/pkg/telemetry/prometheus/node.go @@ -21,10 +21,10 @@ import ( "github.com/twitchtv/twirp" "go.uber.org/atomic" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/rpc" - "github.com/stoatchat/livekit-protocol/utils/hwstats" - "github.com/stoatchat/livekit-protocol/webhook" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/rpc" + "github.com/livekit/protocol/utils/hwstats" + "github.com/livekit/protocol/webhook" ) const ( diff --git a/pkg/telemetry/prometheus/packets.go b/pkg/telemetry/prometheus/packets.go index a545bfa3..760e5bda 100644 --- a/pkg/telemetry/prometheus/packets.go +++ b/pkg/telemetry/prometheus/packets.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/atomic" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type Direction string diff --git a/pkg/telemetry/prometheus/quality.go b/pkg/telemetry/prometheus/quality.go index 537409ab..b55a3f8b 100644 --- a/pkg/telemetry/prometheus/quality.go +++ b/pkg/telemetry/prometheus/quality.go @@ -17,7 +17,7 @@ package prometheus import ( "github.com/prometheus/client_golang/prometheus" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) var ( diff --git a/pkg/telemetry/prometheus/rooms.go b/pkg/telemetry/prometheus/rooms.go index b1a2ba61..9214c7e4 100644 --- a/pkg/telemetry/prometheus/rooms.go +++ b/pkg/telemetry/prometheus/rooms.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/atomic" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) var ( diff --git a/pkg/telemetry/signalanddatastats.go b/pkg/telemetry/signalanddatastats.go index 0853f4aa..898aa989 100644 --- a/pkg/telemetry/signalanddatastats.go +++ b/pkg/telemetry/signalanddatastats.go @@ -23,9 +23,9 @@ import ( "github.com/frostbyte73/core" "go.uber.org/atomic" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/observability/roomobs" - "github.com/stoatchat/livekit-protocol/utils" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/observability/roomobs" + "github.com/livekit/protocol/utils" ) type BytesTrackType string diff --git a/pkg/telemetry/stats.go b/pkg/telemetry/stats.go index 12415e07..a379d9e8 100644 --- a/pkg/telemetry/stats.go +++ b/pkg/telemetry/stats.go @@ -16,7 +16,7 @@ package telemetry import ( "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type StatsKey struct { diff --git a/pkg/telemetry/stats_test.go b/pkg/telemetry/stats_test.go index 1f1b18e7..b685b88a 100644 --- a/pkg/telemetry/stats_test.go +++ b/pkg/telemetry/stats_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stoatchat/livekit-server/pkg/telemetry" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" "github.com/stoatchat/livekit-server/pkg/telemetry/telemetryfakes" diff --git a/pkg/telemetry/statsworker.go b/pkg/telemetry/statsworker.go index dd4fc42c..caf0d675 100644 --- a/pkg/telemetry/statsworker.go +++ b/pkg/telemetry/statsworker.go @@ -22,9 +22,9 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "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 ReferenceGuard struct { diff --git a/pkg/telemetry/telemetryfakes/fake_analytics_service.go b/pkg/telemetry/telemetryfakes/fake_analytics_service.go index 19ff3e19..87b89dc9 100644 --- a/pkg/telemetry/telemetryfakes/fake_analytics_service.go +++ b/pkg/telemetry/telemetryfakes/fake_analytics_service.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/stoatchat/livekit-server/pkg/telemetry" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/observability/roomobs" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/observability/roomobs" ) type FakeAnalyticsService struct { diff --git a/pkg/telemetry/telemetryfakes/fake_telemetry_service.go b/pkg/telemetry/telemetryfakes/fake_telemetry_service.go index 894f71cf..b636616b 100644 --- a/pkg/telemetry/telemetryfakes/fake_telemetry_service.go +++ b/pkg/telemetry/telemetryfakes/fake_telemetry_service.go @@ -7,8 +7,8 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/mime" "github.com/stoatchat/livekit-server/pkg/telemetry" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/observability/roomobs" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/observability/roomobs" ) type FakeTelemetryService struct { diff --git a/pkg/telemetry/telemetryservice.go b/pkg/telemetry/telemetryservice.go index 4739daf1..089162d5 100644 --- a/pkg/telemetry/telemetryservice.go +++ b/pkg/telemetry/telemetryservice.go @@ -21,9 +21,9 @@ import ( "github.com/stoatchat/livekit-server/pkg/sfu/mime" "github.com/stoatchat/livekit-server/pkg/utils" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/webhook" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/webhook" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/pkg/utils/context.go b/pkg/utils/context.go index 99c10811..4ad9086d 100644 --- a/pkg/utils/context.go +++ b/pkg/utils/context.go @@ -19,7 +19,7 @@ package utils import ( "context" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type attemptKey struct{} diff --git a/pkg/utils/iceconfigcache.go b/pkg/utils/iceconfigcache.go index 57db2516..e42ed2bb 100644 --- a/pkg/utils/iceconfigcache.go +++ b/pkg/utils/iceconfigcache.go @@ -5,7 +5,7 @@ import ( "github.com/jellydator/ttlcache/v3" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) const ( diff --git a/pkg/utils/iceconfigcache_test.go b/pkg/utils/iceconfigcache_test.go index a3673fcd..78feebb0 100644 --- a/pkg/utils/iceconfigcache_test.go +++ b/pkg/utils/iceconfigcache_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) func TestIceConfigCache(t *testing.T) { diff --git a/pkg/utils/opsqueue.go b/pkg/utils/opsqueue.go index b607cb91..5e88b959 100644 --- a/pkg/utils/opsqueue.go +++ b/pkg/utils/opsqueue.go @@ -19,7 +19,7 @@ import ( "github.com/gammazero/deque" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) type OpsQueueParams struct { diff --git a/pkg/utils/protocol.go b/pkg/utils/protocol.go index 4fc4bb88..77d324b9 100644 --- a/pkg/utils/protocol.go +++ b/pkg/utils/protocol.go @@ -17,8 +17,8 @@ package utils import ( - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/utils" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/utils" ) func ClientInfoWithoutAddress(c *livekit.ClientInfo) *livekit.ClientInfo { diff --git a/test/agent.go b/test/agent.go index f8cab832..36405241 100644 --- a/test/agent.go +++ b/test/agent.go @@ -24,7 +24,7 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/proto" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/livekit" ) type agentClient struct { diff --git a/test/agent_test.go b/test/agent_test.go index 9f6b3e3e..3b76fad9 100644 --- a/test/agent_test.go +++ b/test/agent_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stoatchat/livekit-server/pkg/testutils" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" ) var ( diff --git a/test/client/client.go b/test/client/client.go index fa442bcf..5c367b7e 100644 --- a/test/client/client.go +++ b/test/client/client.go @@ -37,10 +37,10 @@ import ( "google.golang.org/protobuf/proto" "github.com/livekit/mediatransportutil/pkg/rtcconfig" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/signalling" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" + "github.com/livekit/protocol/signalling" "github.com/stoatchat/livekit-server/pkg/rtc" "github.com/stoatchat/livekit-server/pkg/rtc/transport/transportfakes" diff --git a/test/client/trackwriter.go b/test/client/trackwriter.go index a0af7d1e..92f608a0 100644 --- a/test/client/trackwriter.go +++ b/test/client/trackwriter.go @@ -27,7 +27,7 @@ import ( "github.com/pion/webrtc/v4/pkg/media/oggreader" "github.com/stoatchat/livekit-server/pkg/sfu/mime" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/logger" ) // Writes a file to an RTP track. diff --git a/test/integration_helpers.go b/test/integration_helpers.go index 1082ff09..3a2a8609 100644 --- a/test/integration_helpers.go +++ b/test/integration_helpers.go @@ -26,10 +26,10 @@ import ( "github.com/twitchtv/twirp" "github.com/livekit/mediatransportutil/pkg/rtcconfig" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "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/utils/guid" "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/routing" diff --git a/test/multinode_roomservice_test.go b/test/multinode_roomservice_test.go index 6ec5fcbf..24c2b0a7 100644 --- a/test/multinode_roomservice_test.go +++ b/test/multinode_roomservice_test.go @@ -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/testutils" ) diff --git a/test/multinode_test.go b/test/multinode_test.go index c0c764a2..3d1acdd3 100644 --- a/test/multinode_test.go +++ b/test/multinode_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" "github.com/stoatchat/livekit-server/pkg/rtc" "github.com/stoatchat/livekit-server/pkg/testutils" diff --git a/test/scenarios.go b/test/scenarios.go index 79293f3c..0af7dc87 100644 --- a/test/scenarios.go +++ b/test/scenarios.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "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/testutils" testclient "github.com/stoatchat/livekit-server/test/client" diff --git a/test/singlenode_test.go b/test/singlenode_test.go index 292322e9..b73603ea 100644 --- a/test/singlenode_test.go +++ b/test/singlenode_test.go @@ -32,9 +32,9 @@ import ( "github.com/twitchtv/twirp" "go.uber.org/atomic" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" + "github.com/livekit/protocol/auth" + "github.com/livekit/protocol/livekit" + "github.com/livekit/protocol/logger" "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/rtc" diff --git a/test/webhook_test.go b/test/webhook_test.go index a991f46c..ffd78803 100644 --- a/test/webhook_test.go +++ b/test/webhook_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" - "github.com/stoatchat/livekit-protocol/auth" - "github.com/stoatchat/livekit-protocol/livekit" - "github.com/stoatchat/livekit-protocol/logger" - "github.com/stoatchat/livekit-protocol/utils/guid" - "github.com/stoatchat/livekit-protocol/webhook" + "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/webhook" "github.com/stoatchat/livekit-server/pkg/config" "github.com/stoatchat/livekit-server/pkg/routing"