From 87c83b7193dc8a44e1dd13be309d8e24c944dd14 Mon Sep 17 00:00:00 2001 From: Zomatree Date: Thu, 23 Oct 2025 15:00:35 +0100 Subject: [PATCH] rename everything --- .github/workflows/docker.yaml | 14 +++-- .github/workflows/slack-notifier.yaml | 25 --------- cmd/server/commands.go | 14 ++--- cmd/server/main.go | 14 ++--- go.mod | 4 +- go.sum | 2 - magefile.go | 2 +- pkg/agent/agent_test.go | 14 ++--- pkg/agent/client.go | 10 ++-- pkg/agent/testutils/server.go | 20 +++---- pkg/agent/worker.go | 12 ++-- pkg/clientconfiguration/conf.go | 6 +- pkg/clientconfiguration/conf_test.go | 4 +- pkg/clientconfiguration/match.go | 2 +- .../staticconfiguration.go | 8 +-- pkg/clientconfiguration/types.go | 2 +- pkg/config/config.go | 26 ++++----- pkg/config/config_test.go | 2 +- pkg/metric/metric_timestamper.go | 8 +-- pkg/metric/metrics_collector.go | 8 +-- pkg/metric/metrics_reporter.go | 8 +-- pkg/routing/interfaces.go | 12 ++-- pkg/routing/localrouter.go | 6 +- pkg/routing/messagechannel.go | 2 +- pkg/routing/messagechannel_test.go | 4 +- pkg/routing/node.go | 8 +-- pkg/routing/nodestats.go | 8 +-- pkg/routing/redisrouter.go | 8 +-- pkg/routing/roommanager.go | 6 +- pkg/routing/routingfakes/fake_message_sink.go | 4 +- .../routingfakes/fake_message_source.go | 4 +- .../routingfakes/fake_room_manager_client.go | 4 +- pkg/routing/routingfakes/fake_router.go | 4 +- .../routingfakes/fake_signal_client.go | 4 +- 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 | 4 +- pkg/routing/selector/interfaces.go | 6 +- pkg/routing/selector/regionaware.go | 4 +- pkg/routing/selector/regionaware_test.go | 10 ++-- pkg/routing/selector/sortby_test.go | 4 +- pkg/routing/selector/sysload.go | 2 +- pkg/routing/selector/sysload_test.go | 4 +- pkg/routing/selector/utils.go | 4 +- pkg/routing/selector/utils_test.go | 4 +- pkg/routing/signal.go | 14 ++--- pkg/rtc/clientinfo.go | 2 +- pkg/rtc/clientinfo_test.go | 2 +- pkg/rtc/config.go | 6 +- pkg/rtc/dynacast/dynacastmanager_test.go | 6 +- pkg/rtc/dynacast/dynacastmanageraudio.go | 6 +- pkg/rtc/dynacast/dynacastmanagerbase.go | 6 +- pkg/rtc/dynacast/dynacastmanagervideo.go | 8 +-- pkg/rtc/dynacast/dynacastqualityaudio.go | 6 +- pkg/rtc/dynacast/dynacastqualityvideo.go | 6 +- pkg/rtc/dynacast/interfaces.go | 6 +- pkg/rtc/egress.go | 10 ++-- pkg/rtc/mediaengine.go | 4 +- pkg/rtc/mediaengine_test.go | 4 +- pkg/rtc/medialossproxy.go | 6 +- pkg/rtc/mediatrack.go | 22 ++++---- pkg/rtc/mediatrack_test.go | 6 +- pkg/rtc/mediatrackreceiver.go | 20 +++---- pkg/rtc/mediatracksubscriptions.go | 12 ++-- pkg/rtc/migrationdatacache.go | 2 +- pkg/rtc/migrationdatacache_test.go | 2 +- pkg/rtc/participant.go | 56 +++++++++---------- pkg/rtc/participant_internal_test.go | 34 +++++------ pkg/rtc/participant_sdp.go | 12 ++-- pkg/rtc/participant_signal.go | 10 ++-- pkg/rtc/room.go | 32 +++++------ pkg/rtc/room_test.go | 28 +++++----- pkg/rtc/roomtrackmanager.go | 6 +- pkg/rtc/signalling/interfaces.go | 6 +- pkg/rtc/signalling/signalhandler.go | 6 +- pkg/rtc/signalling/signallerasync.go | 10 ++-- pkg/rtc/signalling/signallerasyncbase.go | 6 +- pkg/rtc/signalling/signallerunimplemented.go | 4 +- pkg/rtc/signalling/signalling.go | 4 +- pkg/rtc/signalling/signallingunimplemented.go | 2 +- pkg/rtc/subscribedtrack.go | 20 +++---- pkg/rtc/subscriptionmanager.go | 14 ++--- pkg/rtc/subscriptionmanager_test.go | 12 ++-- pkg/rtc/supervisor/participant_supervisor.go | 6 +- pkg/rtc/supervisor/publication_monitor.go | 6 +- pkg/rtc/testutils.go | 14 ++--- pkg/rtc/transport.go | 40 ++++++------- pkg/rtc/transport/handler.go | 6 +- .../transport/transportfakes/fake_handler.go | 8 +-- pkg/rtc/transport_test.go | 10 ++-- pkg/rtc/transportmanager.go | 20 +++---- pkg/rtc/types/ice.go | 6 +- pkg/rtc/types/interfaces.go | 22 ++++---- pkg/rtc/types/trafficstats.go | 2 +- .../typesfakes/fake_local_media_track.go | 10 ++-- .../typesfakes/fake_local_participant.go | 22 ++++---- .../fake_local_participant_helper.go | 4 +- pkg/rtc/types/typesfakes/fake_media_track.go | 10 ++-- pkg/rtc/types/typesfakes/fake_participant.go | 6 +- pkg/rtc/types/typesfakes/fake_room.go | 4 +- .../types/typesfakes/fake_subscribed_track.go | 6 +- .../types/typesfakes/fake_websocket_client.go | 2 +- pkg/rtc/unhandlesimulcast.go | 2 +- pkg/rtc/uptrackmanager.go | 8 +-- pkg/rtc/uptrackmanager_test.go | 10 ++-- pkg/rtc/user_packet_deduper.go | 2 +- pkg/rtc/utils.go | 6 +- pkg/rtc/utils_test.go | 4 +- pkg/rtc/wrappedreceiver.go | 10 ++-- pkg/service/agent_dispatch_service.go | 12 ++-- pkg/service/agentservice.go | 22 ++++---- pkg/service/auth.go | 4 +- pkg/service/auth_test.go | 6 +- pkg/service/clients.go | 4 +- pkg/service/egress.go | 14 ++--- pkg/service/ingress.go | 16 +++--- pkg/service/interfaces.go | 2 +- pkg/service/ioservice.go | 8 +-- pkg/service/ioservice_ingress.go | 6 +- pkg/service/ioservice_sip.go | 8 +-- pkg/service/ioservice_sip_test.go | 4 +- pkg/service/localstore.go | 4 +- pkg/service/redisstore.go | 12 ++-- pkg/service/redisstore_sip.go | 2 +- pkg/service/redisstore_sip_test.go | 8 +-- pkg/service/redisstore_test.go | 10 ++-- pkg/service/roomallocator.go | 14 ++--- pkg/service/roomallocator_test.go | 12 ++-- pkg/service/roommanager.go | 38 ++++++------- pkg/service/roommanager_service.go | 12 ++-- pkg/service/roomservice.go | 16 +++--- pkg/service/roomservice_test.go | 16 +++--- pkg/service/rtcservice.go | 16 +++--- pkg/service/server.go | 14 ++--- pkg/service/servicefakes/fake_agent_store.go | 4 +- pkg/service/servicefakes/fake_egress_store.go | 4 +- .../servicefakes/fake_ingress_store.go | 4 +- pkg/service/servicefakes/fake_ioclient.go | 6 +- pkg/service/servicefakes/fake_object_store.go | 4 +- .../servicefakes/fake_room_allocator.go | 4 +- .../servicefakes/fake_service_store.go | 4 +- .../servicefakes/fake_session_handler.go | 8 +-- pkg/service/servicefakes/fake_sipstore.go | 4 +- pkg/service/signal.go | 14 ++--- pkg/service/signal_test.go | 14 ++--- pkg/service/sip.go | 16 +++--- pkg/service/turn.go | 14 ++--- pkg/service/twirp.go | 8 +-- pkg/service/utils.go | 16 +++--- pkg/service/utils_test.go | 2 +- pkg/service/whipservice.go | 18 +++--- pkg/service/wire.go | 24 ++++---- pkg/service/wire_gen.go | 24 ++++---- pkg/service/wsprotocol.go | 6 +- pkg/sfu/buffer/buffer.go | 20 +++---- pkg/sfu/buffer/datastats.go | 2 +- pkg/sfu/buffer/datastats_test.go | 2 +- pkg/sfu/buffer/dependencydescriptorparser.go | 6 +- pkg/sfu/buffer/fps.go | 2 +- pkg/sfu/buffer/fps_test.go | 4 +- pkg/sfu/buffer/frameintegrity.go | 2 +- pkg/sfu/buffer/frameintegrity_test.go | 2 +- pkg/sfu/buffer/helpers.go | 2 +- pkg/sfu/buffer/streamstats.go | 2 +- pkg/sfu/buffer/videolayerutils.go | 6 +- pkg/sfu/buffer/videolayerutils_test.go | 4 +- pkg/sfu/bwe/bwe.go | 2 +- pkg/sfu/bwe/null_bwe.go | 2 +- pkg/sfu/bwe/remotebwe/channel_observer.go | 4 +- pkg/sfu/bwe/remotebwe/nack_tracker.go | 2 +- pkg/sfu/bwe/remotebwe/probe_controller.go | 8 +-- pkg/sfu/bwe/remotebwe/remote_bwe.go | 8 +-- .../bwe/sendsidebwe/congestion_detector.go | 8 +-- pkg/sfu/bwe/sendsidebwe/packet_group.go | 4 +- pkg/sfu/bwe/sendsidebwe/packet_info.go | 2 +- pkg/sfu/bwe/sendsidebwe/packet_tracker.go | 6 +- pkg/sfu/bwe/sendsidebwe/probe_packet_group.go | 6 +- pkg/sfu/bwe/sendsidebwe/send_side_bwe.go | 6 +- 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/codecmunger.go | 2 +- pkg/sfu/codecmunger/null.go | 4 +- pkg/sfu/codecmunger/vp8.go | 6 +- pkg/sfu/codecmunger/vp8_test.go | 6 +- pkg/sfu/connectionquality/connectionstats.go | 10 ++-- .../connectionquality/connectionstats_test.go | 10 ++-- pkg/sfu/connectionquality/scorer.go | 6 +- pkg/sfu/datachannel/bitrate.go | 2 +- pkg/sfu/datachannel/datachannel_writer.go | 2 +- pkg/sfu/downtrack.go | 28 +++++----- pkg/sfu/downtrackspreader.go | 6 +- pkg/sfu/forwarder.go | 24 ++++---- pkg/sfu/forwarder_test.go | 8 +-- pkg/sfu/forwardstats.go | 8 +-- pkg/sfu/interceptor/rtx.go | 4 +- pkg/sfu/mime/mimetype.go | 2 +- pkg/sfu/pacer/base.go | 6 +- pkg/sfu/pacer/leaky_bucket.go | 4 +- pkg/sfu/pacer/no_queue.go | 4 +- pkg/sfu/pacer/pacer.go | 2 +- pkg/sfu/pacer/pass_through.go | 4 +- pkg/sfu/pacer/probe_observer.go | 6 +- pkg/sfu/playoutdelay.go | 6 +- pkg/sfu/playoutdelay_test.go | 6 +- pkg/sfu/receiver.go | 20 +++---- pkg/sfu/redprimaryreceiver.go | 6 +- pkg/sfu/redreceiver.go | 6 +- pkg/sfu/redreceiver_test.go | 4 +- pkg/sfu/rtpmunger.go | 8 +-- pkg/sfu/rtpmunger_test.go | 4 +- pkg/sfu/rtpstats/rtpstats_base.go | 6 +- pkg/sfu/rtpstats/rtpstats_base_lite.go | 6 +- pkg/sfu/rtpstats/rtpstats_receiver.go | 10 ++-- pkg/sfu/rtpstats/rtpstats_receiver_lite.go | 6 +- 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 | 4 +- pkg/sfu/sequencer_test.go | 2 +- pkg/sfu/streamallocator/streamallocator.go | 16 +++--- pkg/sfu/streamallocator/streamstateupdate.go | 2 +- pkg/sfu/streamallocator/track.go | 8 +-- pkg/sfu/streamtracker/interfaces.go | 2 +- pkg/sfu/streamtracker/streamtracker.go | 4 +- pkg/sfu/streamtracker/streamtracker_dd.go | 4 +- .../streamtracker/streamtracker_dd_test.go | 6 +- pkg/sfu/streamtracker/streamtracker_frame.go | 2 +- pkg/sfu/streamtracker/streamtracker_packet.go | 2 +- .../streamtracker_packet_test.go | 4 +- pkg/sfu/streamtrackermanager.go | 12 ++-- pkg/sfu/testutils/data.go | 2 +- pkg/sfu/utils/helpers.go | 4 +- pkg/sfu/videolayerselector/base.go | 6 +- pkg/sfu/videolayerselector/decodetarget.go | 4 +- .../dependencydescriptor.go | 6 +- .../dependencydescriptor_test.go | 6 +- pkg/sfu/videolayerselector/framechain.go | 4 +- .../videolayerselector/framenumberwrapper.go | 2 +- .../framenumberwrapper_test.go | 4 +- pkg/sfu/videolayerselector/null.go | 2 +- pkg/sfu/videolayerselector/simulcast.go | 4 +- .../temporallayerselector/null.go | 2 +- .../temporallayerselector.go | 2 +- .../temporallayerselector/vp8.go | 4 +- .../videolayerselector/videolayerselector.go | 6 +- pkg/sfu/videolayerselector/vp9.go | 4 +- pkg/telemetry/analyticsservice.go | 14 ++--- pkg/telemetry/events.go | 38 ++++++++++--- pkg/telemetry/events_test.go | 4 +- 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 | 4 +- pkg/telemetry/stats_test.go | 8 +-- pkg/telemetry/statsconn.go | 2 +- pkg/telemetry/statsworker.go | 8 +-- .../telemetryfakes/fake_analytics_service.go | 6 +- .../telemetryfakes/fake_telemetry_service.go | 8 +-- pkg/telemetry/telemetryservice.go | 14 ++--- pkg/utils/context.go | 2 +- pkg/utils/iceconfigcache.go | 2 +- pkg/utils/iceconfigcache_test.go | 2 +- pkg/utils/incrementaldispatcher_test.go | 4 +- pkg/utils/opsqueue.go | 2 +- pkg/utils/protocol.go | 4 +- test/agent.go | 2 +- test/agent_test.go | 6 +- test/client/client.go | 18 +++--- test/client/datachannel_reader.go | 2 +- test/client/trackwriter.go | 4 +- test/integration_helpers.go | 20 +++---- test/multinode_roomservice_test.go | 4 +- test/multinode_test.go | 10 ++-- test/scenarios.go | 8 +-- test/singlenode_test.go | 18 +++--- test/webhook_test.go | 20 +++---- 283 files changed, 1118 insertions(+), 1117 deletions(-) delete mode 100644 .github/workflows/slack-notifier.yaml diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 8da0f170..2455847b 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -33,7 +33,7 @@ jobs: with: # list of Docker images to use as base name for tags images: | - livekit/livekit-server + ghcr.io/stoatchat/livekit-server # generate Docker tags based on the following events/attributes tags: | type=ref,event=branch @@ -57,12 +57,14 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Login to DockerHub + # Authenticate with Docker Hub and GHCR + - name: Login to Github Container Registry if: github.event_name != 'pull_request' - uses: docker/login-action@v3 + uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push id: docker_build @@ -72,4 +74,4 @@ jobs: push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/.github/workflows/slack-notifier.yaml b/.github/workflows/slack-notifier.yaml deleted file mode 100644 index 7770345b..00000000 --- a/.github/workflows/slack-notifier.yaml +++ /dev/null @@ -1,25 +0,0 @@ -name: PR Slack Notifier - -on: - pull_request: - types: [review_requested, reopened, closed] - pull_request_review: - types: [submitted] - -permissions: - contents: read - pull-requests: write - issues: write - -concurrency: - group: pr-slack-${{ github.event.pull_request.number }}-${{ github.workflow }} - cancel-in-progress: false - -jobs: - notify-devs: - runs-on: ubuntu-latest - steps: - - uses: livekit/slack-notifier-action@main - with: - config_json: ${{ secrets.SLACK_NOTIFY_CONFIG_JSON }} - slack_token: ${{ secrets.SLACK_PR_NOTIFIER_TOKEN }} diff --git a/cmd/server/commands.go b/cmd/server/commands.go index dfbd0da8..2857f428 100644 --- a/cmd/server/commands.go +++ b/cmd/server/commands.go @@ -27,14 +27,14 @@ import ( "github.com/urfave/cli/v3" "gopkg.in/yaml.v3" - "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-protocol/auth" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils" + "github.com/stoatchat/livekit-protocol/utils/guid" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/service" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/service" ) func generateKeys(_ context.Context, _ *cli.Command) error { diff --git a/cmd/server/main.go b/cmd/server/main.go index 86cfa3e7..cd323b89 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -28,14 +28,14 @@ import ( "github.com/urfave/cli/v3" - "github.com/livekit/livekit-server/pkg/rtc" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/rtc" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/livekit-server/version" + "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-server/version" ) var baseFlags = []cli.Flag{ diff --git a/go.mod b/go.mod index cf27ee43..2f0565da 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/livekit/livekit-server +module github.com/stoatchat/livekit-server go 1.24.0 @@ -150,3 +150,5 @@ require ( google.golang.org/grpc v1.76.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) + +replace github.com/livekit/protocol => github.com/stoatchat/livekit-protocol \ No newline at end of file diff --git a/go.sum b/go.sum index a1ebcfe4..e73de951 100644 --- a/go.sum +++ b/go.sum @@ -171,8 +171,6 @@ github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731 h1:9x+U2HGLrSw5AT github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ= github.com/livekit/mediatransportutil v0.0.0-20250922175932-f537f0880397 h1:Z7j2mY+bvG05UC80MpnJkitlJju8sSDWsr0Bb4dPceo= github.com/livekit/mediatransportutil v0.0.0-20250922175932-f537f0880397/go.mod h1:mSNtYzSf6iY9xM3UX42VEI+STHvMgHmrYzEHPcdhB8A= -github.com/livekit/protocol v1.42.2-0.20251015173118-0236ffc17f5e h1:2pgUHq8atL01StoCTrK760eYTKDoDz1nC4a90knEw5g= -github.com/livekit/protocol v1.42.2-0.20251015173118-0236ffc17f5e/go.mod h1:vhMS30QoEyH2p34vi6X1eWkC4EMV72ZGZwQb74ajY7A= github.com/livekit/psrpc v0.7.0 h1:rtfqfjYN06WJYloE/S0nmkJ/Y04x4pxLQLe8kQ4FVHU= github.com/livekit/psrpc v0.7.0/go.mod h1:AuDC5uOoEjQJEc69v4Li3t77Ocz0e0NdjQEuFfO+vfk= github.com/mackerelio/go-osstat v0.2.6 h1:gs4U8BZeS1tjrL08tt5VUliVvSWP26Ai2Ob8Lr7f2i0= diff --git a/magefile.go b/magefile.go index 629e0e6a..28537b69 100644 --- a/magefile.go +++ b/magefile.go @@ -27,7 +27,7 @@ import ( "github.com/magefile/mage/mg" - "github.com/livekit/livekit-server/version" + "github.com/stoatchat/livekit-server/version" "github.com/livekit/mageutil" _ "github.com/livekit/psrpc" ) diff --git a/pkg/agent/agent_test.go b/pkg/agent/agent_test.go index 5e317c24..f8c4d499 100644 --- a/pkg/agent/agent_test.go +++ b/pkg/agent/agent_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/agent" - "github.com/livekit/livekit-server/pkg/agent/testutils" - "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/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/psrpc" ) diff --git a/pkg/agent/client.go b/pkg/agent/client.go index 4a465255..f9bc1f1a 100644 --- a/pkg/agent/client.go +++ b/pkg/agent/client.go @@ -23,11 +23,11 @@ import ( "github.com/gammazero/workerpool" "google.golang.org/protobuf/types/known/emptypb" - serverutils "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/rpc" - "github.com/livekit/protocol/utils" + 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/psrpc" ) diff --git a/pkg/agent/testutils/server.go b/pkg/agent/testutils/server.go index 3eb2b0e1..9e3c7edb 100644 --- a/pkg/agent/testutils/server.go +++ b/pkg/agent/testutils/server.go @@ -13,16 +13,16 @@ import ( "github.com/gammazero/deque" "golang.org/x/exp/maps" - "github.com/livekit/livekit-server/pkg/agent" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/service" - "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/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/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/psrpc" ) diff --git a/pkg/agent/worker.go b/pkg/agent/worker.go index f7aed2ae..15f9c920 100644 --- a/pkg/agent/worker.go +++ b/pkg/agent/worker.go @@ -23,12 +23,12 @@ import ( "google.golang.org/protobuf/proto" - 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" + 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" "github.com/livekit/psrpc" ) diff --git a/pkg/clientconfiguration/conf.go b/pkg/clientconfiguration/conf.go index a8f8ff61..e0e2aa40 100644 --- a/pkg/clientconfiguration/conf.go +++ b/pkg/clientconfiguration/conf.go @@ -15,9 +15,9 @@ package clientconfiguration import ( - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/utils/must" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/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 55d3812a..28c7e372 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/livekit/protocol/livekit" - "github.com/livekit/protocol/utils/must" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils/must" ) func TestScriptMatchConfiguration(t *testing.T) { diff --git a/pkg/clientconfiguration/match.go b/pkg/clientconfiguration/match.go index b79559fa..73d103c8 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) type Match interface { diff --git a/pkg/clientconfiguration/staticconfiguration.go b/pkg/clientconfiguration/staticconfiguration.go index d8145c26..f6526fc8 100644 --- a/pkg/clientconfiguration/staticconfiguration.go +++ b/pkg/clientconfiguration/staticconfiguration.go @@ -17,10 +17,10 @@ package clientconfiguration import ( "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - protoutils "github.com/livekit/protocol/utils" + "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" ) type ConfigurationItem struct { diff --git a/pkg/clientconfiguration/types.go b/pkg/clientconfiguration/types.go index b014518c..17771e87 100644 --- a/pkg/clientconfiguration/types.go +++ b/pkg/clientconfiguration/types.go @@ -15,7 +15,7 @@ package clientconfiguration import ( - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) type ClientConfigurationManager interface { diff --git a/pkg/config/config.go b/pkg/config/config.go index 4b6a8bc6..036e9d22 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -26,20 +26,20 @@ import ( "github.com/urfave/cli/v3" "gopkg.in/yaml.v3" - "github.com/livekit/livekit-server/pkg/agent" - "github.com/livekit/livekit-server/pkg/metric" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/bwe/remotebwe" - "github.com/livekit/livekit-server/pkg/sfu/bwe/sendsidebwe" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/pacer" - "github.com/livekit/livekit-server/pkg/sfu/streamallocator" + "github.com/stoatchat/livekit-server/pkg/agent" + "github.com/stoatchat/livekit-server/pkg/metric" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe/remotebwe" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe/sendsidebwe" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu/pacer" + "github.com/stoatchat/livekit-server/pkg/sfu/streamallocator" "github.com/livekit/mediatransportutil/pkg/rtcconfig" - "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" + "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" ) const ( diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index da2b2e69..af307780 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/require" "github.com/urfave/cli/v3" - "github.com/livekit/livekit-server/pkg/config/configtest" + "github.com/stoatchat/livekit-server/pkg/config/configtest" ) func TestConfig_UnmarshalKeys(t *testing.T) { diff --git a/pkg/metric/metric_timestamper.go b/pkg/metric/metric_timestamper.go index c14f935f..3224b44e 100644 --- a/pkg/metric/metric_timestamper.go +++ b/pkg/metric/metric_timestamper.go @@ -18,10 +18,10 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/sfu/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "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" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/pkg/metric/metrics_collector.go b/pkg/metric/metrics_collector.go index bcd28093..05c62f4f 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/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/mono" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/utils" ) type MetricsCollectorProvider interface { diff --git a/pkg/metric/metrics_reporter.go b/pkg/metric/metrics_reporter.go index 78f4b4c8..c944dea5 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/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/mono" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/utils" ) type MetricsReporterConsumer interface { diff --git a/pkg/routing/interfaces.go b/pkg/routing/interfaces.go index 04565b32..e6724cab 100644 --- a/pkg/routing/interfaces.go +++ b/pkg/routing/interfaces.go @@ -23,12 +23,12 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/auth" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/rpc" + "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" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/pkg/routing/localrouter.go b/pkg/routing/localrouter.go index b3e2db17..3376871d 100644 --- a/pkg/routing/localrouter.go +++ b/pkg/routing/localrouter.go @@ -20,9 +20,9 @@ import ( "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) var _ Router = (*LocalRouter)(nil) diff --git a/pkg/routing/messagechannel.go b/pkg/routing/messagechannel.go index e761f3ad..6807579c 100644 --- a/pkg/routing/messagechannel.go +++ b/pkg/routing/messagechannel.go @@ -17,7 +17,7 @@ package routing import ( "sync" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" "google.golang.org/protobuf/proto" ) diff --git a/pkg/routing/messagechannel_test.go b/pkg/routing/messagechannel_test.go index bac68ef1..a9c1be03 100644 --- a/pkg/routing/messagechannel_test.go +++ b/pkg/routing/messagechannel_test.go @@ -18,9 +18,9 @@ import ( "sync" "testing" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/routing" ) func TestMessageChannel_WriteMessageClosed(t *testing.T) { diff --git a/pkg/routing/node.go b/pkg/routing/node.go index 183faff5..558bb6d0 100644 --- a/pkg/routing/node.go +++ b/pkg/routing/node.go @@ -19,11 +19,11 @@ import ( "sync" "time" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/utils" - "github.com/livekit/protocol/utils/guid" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils" + "github.com/stoatchat/livekit-protocol/utils/guid" - "github.com/livekit/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/config" ) type LocalNode interface { diff --git a/pkg/routing/nodestats.go b/pkg/routing/nodestats.go index 999ae9cb..937aa864 100644 --- a/pkg/routing/nodestats.go +++ b/pkg/routing/nodestats.go @@ -18,11 +18,11 @@ import ( "sync" "time" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" ) type NodeStats struct { diff --git a/pkg/routing/redisrouter.go b/pkg/routing/redisrouter.go index 44859b4d..05c320f3 100644 --- a/pkg/routing/redisrouter.go +++ b/pkg/routing/redisrouter.go @@ -25,11 +25,11 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/proto" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/rpc" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/rpc" - "github.com/livekit/livekit-server/pkg/routing/selector" + "github.com/stoatchat/livekit-server/pkg/routing/selector" ) const ( diff --git a/pkg/routing/roommanager.go b/pkg/routing/roommanager.go index 796ffe76..6b870050 100644 --- a/pkg/routing/roommanager.go +++ b/pkg/routing/roommanager.go @@ -17,9 +17,9 @@ package routing import ( "context" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/rpc" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/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 5069f8bd..b9459a2d 100644 --- a/pkg/routing/routingfakes/fake_message_sink.go +++ b/pkg/routing/routingfakes/fake_message_sink.go @@ -4,8 +4,8 @@ package routingfakes import ( "sync" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/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 37eec2f1..46c44cc8 100644 --- a/pkg/routing/routingfakes/fake_message_source.go +++ b/pkg/routing/routingfakes/fake_message_source.go @@ -4,8 +4,8 @@ package routingfakes import ( "sync" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/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 6e7e652d..fab6b084 100644 --- a/pkg/routing/routingfakes/fake_room_manager_client.go +++ b/pkg/routing/routingfakes/fake_room_manager_client.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-protocol/livekit" "github.com/livekit/psrpc" ) diff --git a/pkg/routing/routingfakes/fake_router.go b/pkg/routing/routingfakes/fake_router.go index 48fec0b1..6d14681b 100644 --- a/pkg/routing/routingfakes/fake_router.go +++ b/pkg/routing/routingfakes/fake_router.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/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 c7eeff1b..8e847344 100644 --- a/pkg/routing/routingfakes/fake_signal_client.go +++ b/pkg/routing/routingfakes/fake_signal_client.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-protocol/livekit" ) type FakeSignalClient struct { diff --git a/pkg/routing/selector/any.go b/pkg/routing/selector/any.go index 592e2ed7..f312c514 100644 --- a/pkg/routing/selector/any.go +++ b/pkg/routing/selector/any.go @@ -15,7 +15,7 @@ package selector import ( - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/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 a38f80ca..b3ef235d 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/livekit/protocol/livekit" + "github.com/stoatchat/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 f84b4a3c..5ea393d0 100644 --- a/pkg/routing/selector/cpuload.go +++ b/pkg/routing/selector/cpuload.go @@ -15,7 +15,7 @@ package selector import ( - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/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 ec23c1df..f62ab00e 100644 --- a/pkg/routing/selector/cpuload_test.go +++ b/pkg/routing/selector/cpuload_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/routing/selector" + "github.com/stoatchat/livekit-server/pkg/routing/selector" ) func TestCPULoadSelector_SelectNode(t *testing.T) { diff --git a/pkg/routing/selector/interfaces.go b/pkg/routing/selector/interfaces.go index 6fc223ef..c2f05ad2 100644 --- a/pkg/routing/selector/interfaces.go +++ b/pkg/routing/selector/interfaces.go @@ -17,10 +17,10 @@ package selector import ( "errors" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/config" ) var ErrUnsupportedSelector = errors.New("unsupported node selector") diff --git a/pkg/routing/selector/regionaware.go b/pkg/routing/selector/regionaware.go index 756781ae..5193b4b9 100644 --- a/pkg/routing/selector/regionaware.go +++ b/pkg/routing/selector/regionaware.go @@ -17,9 +17,9 @@ package selector import ( "math" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/config" ) // RegionAwareSelector prefers available nodes that are closest to the region of the current instance diff --git a/pkg/routing/selector/regionaware_test.go b/pkg/routing/selector/regionaware_test.go index 74331015..8cc18bbf 100644 --- a/pkg/routing/selector/regionaware_test.go +++ b/pkg/routing/selector/regionaware_test.go @@ -20,12 +20,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/utils" - "github.com/livekit/protocol/utils/guid" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils" + "github.com/stoatchat/livekit-protocol/utils/guid" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing/selector" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/routing/selector" ) const ( diff --git a/pkg/routing/selector/sortby_test.go b/pkg/routing/selector/sortby_test.go index 889f84f3..f3be4488 100644 --- a/pkg/routing/selector/sortby_test.go +++ b/pkg/routing/selector/sortby_test.go @@ -17,9 +17,9 @@ package selector_test import ( "testing" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/routing/selector" + "github.com/stoatchat/livekit-server/pkg/routing/selector" ) func SortByTest(t *testing.T, sortBy string) { diff --git a/pkg/routing/selector/sysload.go b/pkg/routing/selector/sysload.go index 285fca49..d0b0fd3e 100644 --- a/pkg/routing/selector/sysload.go +++ b/pkg/routing/selector/sysload.go @@ -15,7 +15,7 @@ package selector import ( - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/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 9f3349a5..1fcc0665 100644 --- a/pkg/routing/selector/sysload_test.go +++ b/pkg/routing/selector/sysload_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/routing/selector" + "github.com/stoatchat/livekit-server/pkg/routing/selector" ) var ( diff --git a/pkg/routing/selector/utils.go b/pkg/routing/selector/utils.go index 88b6f29b..51344936 100644 --- a/pkg/routing/selector/utils.go +++ b/pkg/routing/selector/utils.go @@ -21,9 +21,9 @@ import ( "github.com/thoas/go-funk" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/config" ) const AvailableSeconds = 5 diff --git a/pkg/routing/selector/utils_test.go b/pkg/routing/selector/utils_test.go index 4f62f6db..85ebc09c 100644 --- a/pkg/routing/selector/utils_test.go +++ b/pkg/routing/selector/utils_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/routing/selector" + "github.com/stoatchat/livekit-server/pkg/routing/selector" ) func TestIsAvailable(t *testing.T) { diff --git a/pkg/routing/signal.go b/pkg/routing/signal.go index 4aaa9a87..c9a9888f 100644 --- a/pkg/routing/signal.go +++ b/pkg/routing/signal.go @@ -23,13 +23,13 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/rpc" - "github.com/livekit/protocol/utils/guid" + "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/psrpc" "github.com/livekit/psrpc/pkg/middleware" ) diff --git a/pkg/rtc/clientinfo.go b/pkg/rtc/clientinfo.go index 25205935..4228b652 100644 --- a/pkg/rtc/clientinfo.go +++ b/pkg/rtc/clientinfo.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) type ClientInfo struct { diff --git a/pkg/rtc/clientinfo_test.go b/pkg/rtc/clientinfo_test.go index 56640243..2af6b661 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) func TestClientInfo_CompareVersion(t *testing.T) { diff --git a/pkg/rtc/config.go b/pkg/rtc/config.go index a107a910..82c43a18 100644 --- a/pkg/rtc/config.go +++ b/pkg/rtc/config.go @@ -18,9 +18,9 @@ import ( "github.com/pion/sdp/v3" "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" "github.com/livekit/mediatransportutil/pkg/rtcconfig" ) diff --git a/pkg/rtc/dynacast/dynacastmanager_test.go b/pkg/rtc/dynacast/dynacastmanager_test.go index 9bb876db..e6a6acb1 100644 --- a/pkg/rtc/dynacast/dynacastmanager_test.go +++ b/pkg/rtc/dynacast/dynacastmanager_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" ) type testDynacastManagerListener struct { diff --git a/pkg/rtc/dynacast/dynacastmanageraudio.go b/pkg/rtc/dynacast/dynacastmanageraudio.go index 542a58a1..8e2589b3 100644 --- a/pkg/rtc/dynacast/dynacastmanageraudio.go +++ b/pkg/rtc/dynacast/dynacastmanageraudio.go @@ -15,10 +15,10 @@ package dynacast import ( - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" ) var _ DynacastManager = (*dynacastManagerAudio)(nil) diff --git a/pkg/rtc/dynacast/dynacastmanagerbase.go b/pkg/rtc/dynacast/dynacastmanagerbase.go index 94812acb..adfd2e03 100644 --- a/pkg/rtc/dynacast/dynacastmanagerbase.go +++ b/pkg/rtc/dynacast/dynacastmanagerbase.go @@ -19,10 +19,10 @@ import ( "golang.org/x/exp/maps" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/utils" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/utils" ) type dynacastManagerBaseParams struct { diff --git a/pkg/rtc/dynacast/dynacastmanagervideo.go b/pkg/rtc/dynacast/dynacastmanagervideo.go index 93120c84..e681f2c5 100644 --- a/pkg/rtc/dynacast/dynacastmanagervideo.go +++ b/pkg/rtc/dynacast/dynacastmanagervideo.go @@ -19,11 +19,11 @@ import ( "github.com/bep/debounce" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" ) var _ DynacastManager = (*dynacastManagerVideo)(nil) diff --git a/pkg/rtc/dynacast/dynacastqualityaudio.go b/pkg/rtc/dynacast/dynacastqualityaudio.go index 2414b5b6..eb2a348a 100644 --- a/pkg/rtc/dynacast/dynacastqualityaudio.go +++ b/pkg/rtc/dynacast/dynacastqualityaudio.go @@ -17,9 +17,9 @@ package dynacast import ( "sync" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) var _ dynacastQuality = (*dynacastQualityAudio)(nil) diff --git a/pkg/rtc/dynacast/dynacastqualityvideo.go b/pkg/rtc/dynacast/dynacastqualityvideo.go index 47f9f388..2f60eb9c 100644 --- a/pkg/rtc/dynacast/dynacastqualityvideo.go +++ b/pkg/rtc/dynacast/dynacastqualityvideo.go @@ -18,9 +18,9 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) var _ dynacastQuality = (*dynacastQualityVideo)(nil) diff --git a/pkg/rtc/dynacast/interfaces.go b/pkg/rtc/dynacast/interfaces.go index 42d1147a..e0c91e3d 100644 --- a/pkg/rtc/dynacast/interfaces.go +++ b/pkg/rtc/dynacast/interfaces.go @@ -15,10 +15,10 @@ package dynacast import ( - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" ) type DynacastManagerListener interface { diff --git a/pkg/rtc/egress.go b/pkg/rtc/egress.go index 06ff4eaf..2506feb6 100644 --- a/pkg/rtc/egress.go +++ b/pkg/rtc/egress.go @@ -20,11 +20,11 @@ import ( "fmt" "strings" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/rpc" - "github.com/livekit/protocol/webhook" + "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" ) type EgressLauncher interface { diff --git a/pkg/rtc/mediaengine.go b/pkg/rtc/mediaengine.go index e1e7180a..1fe1f197 100644 --- a/pkg/rtc/mediaengine.go +++ b/pkg/rtc/mediaengine.go @@ -20,8 +20,8 @@ import ( "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" ) var ( diff --git a/pkg/rtc/mediaengine_test.go b/pkg/rtc/mediaengine_test.go index 122861a8..6d3fbdba 100644 --- a/pkg/rtc/mediaengine_test.go +++ b/pkg/rtc/mediaengine_test.go @@ -20,8 +20,8 @@ import ( "github.com/pion/webrtc/v4" "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" ) func TestIsCodecEnabled(t *testing.T) { diff --git a/pkg/rtc/medialossproxy.go b/pkg/rtc/medialossproxy.go index 0ac54b7e..b055b522 100644 --- a/pkg/rtc/medialossproxy.go +++ b/pkg/rtc/medialossproxy.go @@ -20,10 +20,10 @@ import ( "github.com/pion/rtcp" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu" ) const ( diff --git a/pkg/rtc/mediatrack.go b/pkg/rtc/mediatrack.go index f192d18c..ae0821da 100644 --- a/pkg/rtc/mediatrack.go +++ b/pkg/rtc/mediatrack.go @@ -24,18 +24,18 @@ import ( "github.com/pion/webrtc/v4" "go.uber.org/atomic" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/observability/roomobs" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/observability/roomobs" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/rtc/dynacast" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/connectionquality" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/rtc/dynacast" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/connectionquality" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/telemetry" util "github.com/livekit/mediatransportutil" ) diff --git a/pkg/rtc/mediatrack_test.go b/pkg/rtc/mediatrack_test.go index 7839a943..0efe046b 100644 --- a/pkg/rtc/mediatrack_test.go +++ b/pkg/rtc/mediatrack_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) func TestTrackInfo(t *testing.T) { diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go index b43e3d9c..ff861ae3 100644 --- a/pkg/rtc/mediatrackreceiver.go +++ b/pkg/rtc/mediatrackreceiver.go @@ -28,17 +28,17 @@ import ( "golang.org/x/exp/slices" "google.golang.org/protobuf/proto" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/rtpstats" - "github.com/livekit/livekit-server/pkg/telemetry" - sutils "github.com/livekit/livekit-server/pkg/utils" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu" + "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-server/pkg/telemetry" + sutils "github.com/stoatchat/livekit-server/pkg/utils" ) const ( diff --git a/pkg/rtc/mediatracksubscriptions.go b/pkg/rtc/mediatracksubscriptions.go index f350596c..ac1e401c 100644 --- a/pkg/rtc/mediatracksubscriptions.go +++ b/pkg/rtc/mediatracksubscriptions.go @@ -19,15 +19,15 @@ import ( "slices" "sync" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" "github.com/pion/webrtc/v4" "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/telemetry" ) var ( diff --git a/pkg/rtc/migrationdatacache.go b/pkg/rtc/migrationdatacache.go index 8c44eac6..eb349a0a 100644 --- a/pkg/rtc/migrationdatacache.go +++ b/pkg/rtc/migrationdatacache.go @@ -3,7 +3,7 @@ package rtc import ( "time" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) type MigrationDataCacheState int diff --git a/pkg/rtc/migrationdatacache_test.go b/pkg/rtc/migrationdatacache_test.go index 046b2ddf..25de8509 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) func TestMigrationDataCache_Add(t *testing.T) { diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index 0a42204b..831c128a 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -37,34 +37,34 @@ import ( "google.golang.org/protobuf/proto" "github.com/livekit/mediatransportutil/pkg/twcc" - "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/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/psrpc" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/metric" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/signalling" - "github.com/livekit/livekit-server/pkg/rtc/supervisor" - "github.com/livekit/livekit-server/pkg/rtc/transport" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/connectionquality" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/pacer" - "github.com/livekit/livekit-server/pkg/sfu/streamallocator" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - sutils "github.com/livekit/livekit-server/pkg/utils" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/metric" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/rtc/signalling" + "github.com/stoatchat/livekit-server/pkg/rtc/supervisor" + "github.com/stoatchat/livekit-server/pkg/rtc/transport" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/connectionquality" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu/pacer" + "github.com/stoatchat/livekit-server/pkg/sfu/streamallocator" + "github.com/stoatchat/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" + sutils "github.com/stoatchat/livekit-server/pkg/utils" ) var _ types.LocalParticipant = (*ParticipantImpl)(nil) @@ -3171,9 +3171,9 @@ func (p *ParticipantImpl) setTrackMuted(mute *livekit.MuteTrackRequest, fromAdmi if trackInfo != nil && changed { if mute.Muted { - p.params.Telemetry.TrackMuted(context.Background(), p.ID(), trackInfo) + p.params.Telemetry.TrackMuted(context.Background(), p.ID(), p.Identity(), trackInfo) } else { - p.params.Telemetry.TrackUnmuted(context.Background(), p.ID(), trackInfo) + p.params.Telemetry.TrackUnmuted(context.Background(), p.ID(), p.Identity(), trackInfo) } } diff --git a/pkg/rtc/participant_internal_test.go b/pkg/rtc/participant_internal_test.go index 0e7d5094..f11d4215 100644 --- a/pkg/rtc/participant_internal_test.go +++ b/pkg/rtc/participant_internal_test.go @@ -25,24 +25,24 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/telemetry/telemetryfakes" - "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/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/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/routing/routingfakes" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/rtc/types/typesfakes" - "github.com/livekit/livekit-server/pkg/testutils" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/routing/routingfakes" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/rtc/types/typesfakes" + "github.com/stoatchat/livekit-server/pkg/testutils" ) func TestIsReady(t *testing.T) { diff --git a/pkg/rtc/participant_sdp.go b/pkg/rtc/participant_sdp.go index 6dc20f60..e4540835 100644 --- a/pkg/rtc/participant_sdp.go +++ b/pkg/rtc/participant_sdp.go @@ -23,12 +23,12 @@ import ( "github.com/pion/sdp/v3" "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - lksdp "github.com/livekit/protocol/sdp" - "github.com/livekit/protocol/utils" + "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" ) 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 ae7d8bbf..611db925 100644 --- a/pkg/rtc/participant_signal.go +++ b/pkg/rtc/participant_signal.go @@ -19,12 +19,12 @@ import ( "github.com/pion/webrtc/v4" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - protosignalling "github.com/livekit/protocol/signalling" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + protosignalling "github.com/stoatchat/livekit-protocol/signalling" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/rtc/types" ) func (p *ParticipantImpl) SetResponseSink(sink routing.MessageSink) { diff --git a/pkg/rtc/room.go b/pkg/rtc/room.go index ab8f7ebb..3efd6786 100644 --- a/pkg/rtc/room.go +++ b/pkg/rtc/room.go @@ -28,24 +28,24 @@ import ( "golang.org/x/exp/maps" "google.golang.org/protobuf/proto" - "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/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/psrpc" - "github.com/livekit/livekit-server/pkg/agent" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/connectionquality" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - sutils "github.com/livekit/livekit-server/pkg/utils" + "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/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/connectionquality" + "github.com/stoatchat/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" + sutils "github.com/stoatchat/livekit-server/pkg/utils" ) const ( diff --git a/pkg/rtc/room_test.go b/pkg/rtc/room_test.go index 03b4835c..4978e2e5 100644 --- a/pkg/rtc/room_test.go +++ b/pkg/rtc/room_test.go @@ -22,22 +22,22 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "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-protocol/auth/authfakes" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils" + "github.com/stoatchat/livekit-protocol/webhook" - "github.com/livekit/livekit-server/version" + "github.com/stoatchat/livekit-server/version" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/rtc/types/typesfakes" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/audio" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/livekit-server/pkg/telemetry/telemetryfakes" - "github.com/livekit/livekit-server/pkg/testutils" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/rtc/types/typesfakes" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/audio" + "github.com/stoatchat/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-server/pkg/telemetry/telemetryfakes" + "github.com/stoatchat/livekit-server/pkg/testutils" ) func init() { diff --git a/pkg/rtc/roomtrackmanager.go b/pkg/rtc/roomtrackmanager.go index cd66f6d7..4a8262a1 100644 --- a/pkg/rtc/roomtrackmanager.go +++ b/pkg/rtc/roomtrackmanager.go @@ -19,9 +19,9 @@ package rtc import ( "sync" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/utils" + "github.com/stoatchat/livekit-protocol/livekit" "golang.org/x/exp/slices" ) diff --git a/pkg/rtc/signalling/interfaces.go b/pkg/rtc/signalling/interfaces.go index e4983245..5933d212 100644 --- a/pkg/rtc/signalling/interfaces.go +++ b/pkg/rtc/signalling/interfaces.go @@ -15,10 +15,10 @@ package signalling import ( - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/rtc/types" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rtc/signalling/signalhandler.go b/pkg/rtc/signalling/signalhandler.go index 9c9ef888..b0374821 100644 --- a/pkg/rtc/signalling/signalhandler.go +++ b/pkg/rtc/signalling/signalhandler.go @@ -17,11 +17,11 @@ package signalling import ( "fmt" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/rtc/types" ) var _ ParticipantSignalHandler = (*signalhandler)(nil) diff --git a/pkg/rtc/signalling/signallerasync.go b/pkg/rtc/signalling/signallerasync.go index 15fb5814..beef5f02 100644 --- a/pkg/rtc/signalling/signallerasync.go +++ b/pkg/rtc/signalling/signallerasync.go @@ -17,13 +17,13 @@ package signalling import ( "fmt" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" "github.com/livekit/psrpc" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/rtc/types" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rtc/signalling/signallerasyncbase.go b/pkg/rtc/signalling/signallerasyncbase.go index 271b3618..c66e7cd3 100644 --- a/pkg/rtc/signalling/signallerasyncbase.go +++ b/pkg/rtc/signalling/signallerasyncbase.go @@ -17,10 +17,10 @@ package signalling import ( "sync" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/rtc/types" ) type signallerAsyncBaseParams struct { diff --git a/pkg/rtc/signalling/signallerunimplemented.go b/pkg/rtc/signalling/signallerunimplemented.go index 4c4be8bf..68ec15a8 100644 --- a/pkg/rtc/signalling/signallerunimplemented.go +++ b/pkg/rtc/signalling/signallerunimplemented.go @@ -15,8 +15,8 @@ package signalling import ( - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/rtc/types" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rtc/signalling/signalling.go b/pkg/rtc/signalling/signalling.go index 8b08a6d0..d88da364 100644 --- a/pkg/rtc/signalling/signalling.go +++ b/pkg/rtc/signalling/signalling.go @@ -15,8 +15,8 @@ package signalling import ( - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rtc/signalling/signallingunimplemented.go b/pkg/rtc/signalling/signallingunimplemented.go index 595877b0..2deacaba 100644 --- a/pkg/rtc/signalling/signallingunimplemented.go +++ b/pkg/rtc/signalling/signallingunimplemented.go @@ -15,7 +15,7 @@ package signalling import ( - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rtc/subscribedtrack.go b/pkg/rtc/subscribedtrack.go index 5309976e..73ed1714 100644 --- a/pkg/rtc/subscribedtrack.go +++ b/pkg/rtc/subscribedtrack.go @@ -23,17 +23,17 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/telemetry" - sutils "github.com/livekit/livekit-server/pkg/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/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/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" ) const ( diff --git a/pkg/rtc/subscriptionmanager.go b/pkg/rtc/subscriptionmanager.go index c7d6c705..7013effd 100644 --- a/pkg/rtc/subscriptionmanager.go +++ b/pkg/rtc/subscriptionmanager.go @@ -26,13 +26,13 @@ import ( "go.uber.org/atomic" "golang.org/x/exp/maps" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "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" + "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" ) // using var instead of const to override in tests diff --git a/pkg/rtc/subscriptionmanager_test.go b/pkg/rtc/subscriptionmanager_test.go index a4646975..cdebe471 100644 --- a/pkg/rtc/subscriptionmanager_test.go +++ b/pkg/rtc/subscriptionmanager_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/rtc/types/typesfakes" - "github.com/livekit/livekit-server/pkg/telemetry/telemetryfakes" - "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "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" ) func init() { diff --git a/pkg/rtc/supervisor/participant_supervisor.go b/pkg/rtc/supervisor/participant_supervisor.go index 1dc6b9d3..2d58cbf2 100644 --- a/pkg/rtc/supervisor/participant_supervisor.go +++ b/pkg/rtc/supervisor/participant_supervisor.go @@ -20,9 +20,9 @@ import ( "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/rtc/supervisor/publication_monitor.go b/pkg/rtc/supervisor/publication_monitor.go index 199d2188..437c686e 100644 --- a/pkg/rtc/supervisor/publication_monitor.go +++ b/pkg/rtc/supervisor/publication_monitor.go @@ -21,9 +21,9 @@ import ( "github.com/gammazero/deque" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/rtc/testutils.go b/pkg/rtc/testutils.go index 213175fc..17b4ba3c 100644 --- a/pkg/rtc/testutils.go +++ b/pkg/rtc/testutils.go @@ -15,14 +15,14 @@ package rtc import ( - "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-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/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/rtc/types/typesfakes" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/rtc/types/typesfakes" ) func NewMockParticipant(identity livekit.ParticipantIdentity, protocol types.ProtocolVersion, hidden bool, publisher bool) *typesfakes.FakeLocalParticipant { diff --git a/pkg/rtc/transport.go b/pkg/rtc/transport.go index f8e5b5a0..97461d43 100644 --- a/pkg/rtc/transport.go +++ b/pkg/rtc/transport.go @@ -38,28 +38,28 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/rtc/transport" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/livekit-server/pkg/sfu/bwe/remotebwe" - "github.com/livekit/livekit-server/pkg/sfu/bwe/sendsidebwe" - "github.com/livekit/livekit-server/pkg/sfu/datachannel" - sfuinterceptor "github.com/livekit/livekit-server/pkg/sfu/interceptor" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/pacer" - pd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/playoutdelay" - "github.com/livekit/livekit-server/pkg/sfu/streamallocator" - sfuutils "github.com/livekit/livekit-server/pkg/sfu/utils" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/livekit-server/pkg/utils" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/rtc/transport" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe/remotebwe" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe/sendsidebwe" + "github.com/stoatchat/livekit-server/pkg/sfu/datachannel" + sfuinterceptor "github.com/stoatchat/livekit-server/pkg/sfu/interceptor" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu/pacer" + pd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/playoutdelay" + "github.com/stoatchat/livekit-server/pkg/sfu/streamallocator" + sfuutils "github.com/stoatchat/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-server/pkg/utils" lkinterceptor "github.com/livekit/mediatransportutil/pkg/interceptor" lktwcc "github.com/livekit/mediatransportutil/pkg/twcc" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/logger/pionlogger" - lksdp "github.com/livekit/protocol/sdp" + "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" ) const ( diff --git a/pkg/rtc/transport/handler.go b/pkg/rtc/transport/handler.go index 980f28a7..f6302a6d 100644 --- a/pkg/rtc/transport/handler.go +++ b/pkg/rtc/transport/handler.go @@ -19,9 +19,9 @@ import ( "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu/streamallocator" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu/streamallocator" + "github.com/stoatchat/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 ce332e14..19529fbc 100644 --- a/pkg/rtc/transport/transportfakes/fake_handler.go +++ b/pkg/rtc/transport/transportfakes/fake_handler.go @@ -4,10 +4,10 @@ package transportfakes import ( "sync" - "github.com/livekit/livekit-server/pkg/rtc/transport" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu/streamallocator" - "github.com/livekit/protocol/livekit" + "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" webrtc "github.com/pion/webrtc/v4" ) diff --git a/pkg/rtc/transport_test.go b/pkg/rtc/transport_test.go index d27ec0af..bfe0b342 100644 --- a/pkg/rtc/transport_test.go +++ b/pkg/rtc/transport_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/rtc/transport" - "github.com/livekit/livekit-server/pkg/rtc/transport/transportfakes" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/testutils" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/rtc/transport" + "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" ) func TestMissingAnswerDuringICERestart(t *testing.T) { diff --git a/pkg/rtc/transportmanager.go b/pkg/rtc/transportmanager.go index adf8d06c..921ca191 100644 --- a/pkg/rtc/transportmanager.go +++ b/pkg/rtc/transportmanager.go @@ -30,17 +30,17 @@ import ( "google.golang.org/protobuf/proto" "github.com/livekit/mediatransportutil/pkg/twcc" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/rtc/transport" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/datachannel" - "github.com/livekit/livekit-server/pkg/sfu/pacer" - "github.com/livekit/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/rtc/transport" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/datachannel" + "github.com/stoatchat/livekit-server/pkg/sfu/pacer" + "github.com/stoatchat/livekit-server/pkg/telemetry" ) const ( diff --git a/pkg/rtc/types/ice.go b/pkg/rtc/types/ice.go index fbcbc5a4..70db1603 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/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/observability/roomobs" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/observability/roomobs" ) type ICEConnectionType int diff --git a/pkg/rtc/types/interfaces.go b/pkg/rtc/types/interfaces.go index 2e4b5b82..5218edda 100644 --- a/pkg/rtc/types/interfaces.go +++ b/pkg/rtc/types/interfaces.go @@ -21,18 +21,18 @@ import ( "github.com/pion/rtcp" "github.com/pion/webrtc/v4" - "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-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/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/pacer" - "github.com/livekit/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu/pacer" + "github.com/stoatchat/livekit-server/pkg/telemetry" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rtc/types/trafficstats.go b/pkg/rtc/types/trafficstats.go index f5c0b386..13d2ad2e 100644 --- a/pkg/rtc/types/trafficstats.go +++ b/pkg/rtc/types/trafficstats.go @@ -17,7 +17,7 @@ package types import ( "time" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/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 a327509d..815eda33 100644 --- a/pkg/rtc/types/typesfakes/fake_local_media_track.go +++ b/pkg/rtc/types/typesfakes/fake_local_media_track.go @@ -4,11 +4,11 @@ package typesfakes import ( "sync" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "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" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/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 7b433d11..1f4b4ce4 100644 --- a/pkg/rtc/types/typesfakes/fake_local_participant.go +++ b/pkg/rtc/types/typesfakes/fake_local_participant.go @@ -5,17 +5,17 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/pacer" - "github.com/livekit/livekit-server/pkg/telemetry" - "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/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu" + "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/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 3deea6b0..b82cee81 100644 --- a/pkg/rtc/types/typesfakes/fake_local_participant_helper.go +++ b/pkg/rtc/types/typesfakes/fake_local_participant_helper.go @@ -4,8 +4,8 @@ package typesfakes import ( "sync" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/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 ba44585f..769a0d8e 100644 --- a/pkg/rtc/types/typesfakes/fake_media_track.go +++ b/pkg/rtc/types/typesfakes/fake_media_track.go @@ -4,11 +4,11 @@ package typesfakes import ( "sync" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "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" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/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 8c55fd97..491d784d 100644 --- a/pkg/rtc/types/typesfakes/fake_participant.go +++ b/pkg/rtc/types/typesfakes/fake_participant.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/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 38519ca4..c7b90cd3 100644 --- a/pkg/rtc/types/typesfakes/fake_room.go +++ b/pkg/rtc/types/typesfakes/fake_room.go @@ -4,8 +4,8 @@ package typesfakes import ( "sync" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/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 2123548b..b84ee81f 100644 --- a/pkg/rtc/types/typesfakes/fake_subscribed_track.go +++ b/pkg/rtc/types/typesfakes/fake_subscribed_track.go @@ -4,9 +4,9 @@ package typesfakes import ( "sync" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-protocol/livekit" webrtc "github.com/pion/webrtc/v4" ) diff --git a/pkg/rtc/types/typesfakes/fake_websocket_client.go b/pkg/rtc/types/typesfakes/fake_websocket_client.go index 6d5b44c8..78c17e40 100644 --- a/pkg/rtc/types/typesfakes/fake_websocket_client.go +++ b/pkg/rtc/types/typesfakes/fake_websocket_client.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/rtc/types" ) type FakeWebsocketClient struct { diff --git a/pkg/rtc/unhandlesimulcast.go b/pkg/rtc/unhandlesimulcast.go index 3146cba3..9aa22f56 100644 --- a/pkg/rtc/unhandlesimulcast.go +++ b/pkg/rtc/unhandlesimulcast.go @@ -20,7 +20,7 @@ import ( "github.com/pion/sdp/v3" "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" ) const ( diff --git a/pkg/rtc/uptrackmanager.go b/pkg/rtc/uptrackmanager.go index eef19fae..de5ab33a 100644 --- a/pkg/rtc/uptrackmanager.go +++ b/pkg/rtc/uptrackmanager.go @@ -18,12 +18,12 @@ import ( "errors" "sync" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" "golang.org/x/exp/maps" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-protocol/utils" ) var ( diff --git a/pkg/rtc/uptrackmanager_test.go b/pkg/rtc/uptrackmanager_test.go index 2bee32e3..e9f47fd8 100644 --- a/pkg/rtc/uptrackmanager_test.go +++ b/pkg/rtc/uptrackmanager_test.go @@ -19,12 +19,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/rtc/types/typesfakes" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/rtc/types/typesfakes" ) var defaultUptrackManagerParams = UpTrackManagerParams{ diff --git a/pkg/rtc/user_packet_deduper.go b/pkg/rtc/user_packet_deduper.go index cd2ed406..50b2ebb5 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) const ( diff --git a/pkg/rtc/utils.go b/pkg/rtc/utils.go index 8a70c6e9..ef0f437f 100644 --- a/pkg/rtc/utils.go +++ b/pkg/rtc/utils.go @@ -23,9 +23,9 @@ import ( "github.com/pion/webrtc/v4" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/rtc/utils_test.go b/pkg/rtc/utils_test.go index 37a6f010..efca7bfc 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/livekit/protocol/livekit" - "github.com/livekit/protocol/utils/guid" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils/guid" ) func TestPackStreamId(t *testing.T) { diff --git a/pkg/rtc/wrappedreceiver.go b/pkg/rtc/wrappedreceiver.go index e47036fb..bc860557 100644 --- a/pkg/rtc/wrappedreceiver.go +++ b/pkg/rtc/wrappedreceiver.go @@ -23,12 +23,12 @@ import ( "golang.org/x/exp/maps" "golang.org/x/exp/slices" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" ) // wrapper around WebRTC receiver, overriding its ID diff --git a/pkg/service/agent_dispatch_service.go b/pkg/service/agent_dispatch_service.go index 2cf918c7..7ebeb3a8 100644 --- a/pkg/service/agent_dispatch_service.go +++ b/pkg/service/agent_dispatch_service.go @@ -18,12 +18,12 @@ import ( "context" "fmt" - "github.com/livekit/livekit-server/pkg/routing" - "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/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" ) type AgentDispatchService struct { diff --git a/pkg/service/agentservice.go b/pkg/service/agentservice.go index b4fc76d2..f92cdad0 100644 --- a/pkg/service/agentservice.go +++ b/pkg/service/agentservice.go @@ -28,17 +28,17 @@ import ( "github.com/gorilla/websocket" "google.golang.org/protobuf/types/known/emptypb" - "github.com/livekit/livekit-server/pkg/agent" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/version" - "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/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/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/psrpc" ) diff --git a/pkg/service/auth.go b/pkg/service/auth.go index bd0cae1f..2c6db728 100644 --- a/pkg/service/auth.go +++ b/pkg/service/auth.go @@ -22,8 +22,8 @@ import ( "github.com/twitchtv/twirp" - "github.com/livekit/protocol/auth" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/auth" + "github.com/stoatchat/livekit-protocol/livekit" ) const ( diff --git a/pkg/service/auth_test.go b/pkg/service/auth_test.go index 00b89bc4..55a1eeca 100644 --- a/pkg/service/auth_test.go +++ b/pkg/service/auth_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/auth" - "github.com/livekit/protocol/auth/authfakes" + "github.com/stoatchat/livekit-protocol/auth" + "github.com/stoatchat/livekit-protocol/auth/authfakes" - "github.com/livekit/livekit-server/pkg/service" + "github.com/stoatchat/livekit-server/pkg/service" ) func TestAuthMiddleware(t *testing.T) { diff --git a/pkg/service/clients.go b/pkg/service/clients.go index d8fb3378..81c26539 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/livekit/protocol/livekit" - "github.com/livekit/protocol/rpc" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/rpc" ) //counterfeiter:generate . IOClient diff --git a/pkg/service/egress.go b/pkg/service/egress.go index 84852134..66c8345e 100644 --- a/pkg/service/egress.go +++ b/pkg/service/egress.go @@ -23,15 +23,15 @@ import ( "github.com/twitchtv/twirp" - "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/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/psrpc" - "github.com/livekit/livekit-server/pkg/rtc" + "github.com/stoatchat/livekit-server/pkg/rtc" ) type EgressService struct { diff --git a/pkg/service/ingress.go b/pkg/service/ingress.go index 10bf198d..ea2087ee 100644 --- a/pkg/service/ingress.go +++ b/pkg/service/ingress.go @@ -19,14 +19,14 @@ import ( "fmt" "net/url" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/telemetry" - "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/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/psrpc" ) diff --git a/pkg/service/interfaces.go b/pkg/service/interfaces.go index 0e5b5fa5..0d9c9cb1 100644 --- a/pkg/service/interfaces.go +++ b/pkg/service/interfaces.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/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 b724d1f5..f14cb612 100644 --- a/pkg/service/ioservice.go +++ b/pkg/service/ioservice.go @@ -19,12 +19,12 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/rpc" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/rpc" "github.com/livekit/psrpc" - "github.com/livekit/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/telemetry" ) type IOInfoService struct { diff --git a/pkg/service/ioservice_ingress.go b/pkg/service/ioservice_ingress.go index b802c888..f1977144 100644 --- a/pkg/service/ioservice_ingress.go +++ b/pkg/service/ioservice_ingress.go @@ -18,9 +18,9 @@ import ( "context" "errors" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/rpc" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/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 0140466f..0ff32b07 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/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/rpc" - "github.com/livekit/protocol/sip" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/rpc" + "github.com/stoatchat/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 2a8b7528..89c5d95f 100644 --- a/pkg/service/ioservice_sip_test.go +++ b/pkg/service/ioservice_sip_test.go @@ -17,12 +17,12 @@ package service_test import ( "context" "github.com/dennwc/iters" - "github.com/livekit/livekit-server/pkg/service" + "github.com/stoatchat/livekit-server/pkg/service" "github.com/livekit/psrpc" "slices" "testing" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" "github.com/stretchr/testify/require" ) diff --git a/pkg/service/localstore.go b/pkg/service/localstore.go index 64bd508c..c9a14700 100644 --- a/pkg/service/localstore.go +++ b/pkg/service/localstore.go @@ -21,8 +21,8 @@ import ( "github.com/thoas/go-funk" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils" ) // encapsulates CRUD operations for room settings diff --git a/pkg/service/redisstore.go b/pkg/service/redisstore.go index 990dba1d..2ec09484 100644 --- a/pkg/service/redisstore.go +++ b/pkg/service/redisstore.go @@ -27,14 +27,14 @@ import ( "github.com/redis/go-redis/v9" "google.golang.org/protobuf/proto" - "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/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/psrpc" - "github.com/livekit/livekit-server/version" + "github.com/stoatchat/livekit-server/version" ) const ( diff --git a/pkg/service/redisstore_sip.go b/pkg/service/redisstore_sip.go index ba2931a5..c6062667 100644 --- a/pkg/service/redisstore_sip.go +++ b/pkg/service/redisstore_sip.go @@ -17,7 +17,7 @@ package service import ( "context" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) const ( diff --git a/pkg/service/redisstore_sip_test.go b/pkg/service/redisstore_sip_test.go index bfa029d4..6e7aeb06 100644 --- a/pkg/service/redisstore_sip_test.go +++ b/pkg/service/redisstore_sip_test.go @@ -22,13 +22,13 @@ import ( "testing" "github.com/dennwc/iters" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/utils" - "github.com/livekit/protocol/utils/guid" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils" + "github.com/stoatchat/livekit-protocol/utils/guid" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/service" + "github.com/stoatchat/livekit-server/pkg/service" ) func TestSIPStoreDispatch(t *testing.T) { diff --git a/pkg/service/redisstore_test.go b/pkg/service/redisstore_test.go index e84a6c41..4fa41450 100644 --- a/pkg/service/redisstore_test.go +++ b/pkg/service/redisstore_test.go @@ -24,12 +24,12 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/proto" - "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-protocol/ingress" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils" + "github.com/stoatchat/livekit-protocol/utils/guid" - "github.com/livekit/livekit-server/pkg/service" + "github.com/stoatchat/livekit-server/pkg/service" ) func redisStoreDocker(t testing.TB) *service.RedisStore { diff --git a/pkg/service/roomallocator.go b/pkg/service/roomallocator.go index bcb2fd12..0b3fb413 100644 --- a/pkg/service/roomallocator.go +++ b/pkg/service/roomallocator.go @@ -19,15 +19,15 @@ import ( "errors" "time" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils" - "github.com/livekit/protocol/utils/guid" + "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/psrpc" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/routing/selector" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/routing/selector" ) type StandardRoomAllocator struct { diff --git a/pkg/service/roomallocator_test.go b/pkg/service/roomallocator_test.go index 3d3dd29d..5d9889b3 100644 --- a/pkg/service/roomallocator_test.go +++ b/pkg/service/roomallocator_test.go @@ -20,13 +20,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/routing/routingfakes" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/livekit-server/pkg/service/servicefakes" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/routing/routingfakes" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/livekit-server/pkg/service/servicefakes" ) func TestCreateRoom(t *testing.T) { diff --git a/pkg/service/roommanager.go b/pkg/service/roommanager.go index 6c2c164e..e3ee0556 100644 --- a/pkg/service/roommanager.go +++ b/pkg/service/roommanager.go @@ -24,29 +24,29 @@ import ( "github.com/pkg/errors" "golang.org/x/exp/maps" - "github.com/livekit/livekit-server/pkg/agent" - "github.com/livekit/livekit-server/pkg/sfu" - sutils "github.com/livekit/livekit-server/pkg/utils" + "github.com/stoatchat/livekit-server/pkg/agent" + "github.com/stoatchat/livekit-server/pkg/sfu" + sutils "github.com/stoatchat/livekit-server/pkg/utils" "github.com/livekit/mediatransportutil/pkg/rtcconfig" - "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/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/psrpc" "github.com/livekit/psrpc/pkg/middleware" - "github.com/livekit/livekit-server/pkg/clientconfiguration" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/livekit-server/version" + "github.com/stoatchat/livekit-server/pkg/clientconfiguration" + "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-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-server/version" ) const ( diff --git a/pkg/service/roommanager_service.go b/pkg/service/roommanager_service.go index c6f9333c..699648a7 100644 --- a/pkg/service/roommanager_service.go +++ b/pkg/service/roommanager_service.go @@ -10,12 +10,12 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/emptypb" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/rpc" + "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/psrpc" ) diff --git a/pkg/service/roomservice.go b/pkg/service/roomservice.go index 2a17c691..b522e64a 100644 --- a/pkg/service/roomservice.go +++ b/pkg/service/roomservice.go @@ -21,14 +21,14 @@ import ( "github.com/twitchtv/twirp" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc" - "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/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" ) type RoomService struct { diff --git a/pkg/service/roomservice_test.go b/pkg/service/roomservice_test.go index d34d5103..cbf08082 100644 --- a/pkg/service/roomservice_test.go +++ b/pkg/service/roomservice_test.go @@ -21,15 +21,15 @@ import ( "github.com/stretchr/testify/require" "github.com/twitchtv/twirp" - "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-protocol/auth" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/rpc" + "github.com/stoatchat/livekit-protocol/rpc/rpcfakes" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing/routingfakes" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/livekit-server/pkg/service/servicefakes" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/routing/routingfakes" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/livekit-server/pkg/service/servicefakes" ) func TestDeleteRoom(t *testing.T) { diff --git a/pkg/service/rtcservice.go b/pkg/service/rtcservice.go index 149b2577..e875c5ef 100644 --- a/pkg/service/rtcservice.go +++ b/pkg/service/rtcservice.go @@ -35,16 +35,16 @@ import ( "golang.org/x/exp/maps" "google.golang.org/protobuf/proto" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" "github.com/livekit/psrpc" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/livekit-server/pkg/utils" + "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-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-server/pkg/utils" ) type RTCService struct { diff --git a/pkg/service/server.go b/pkg/service/server.go index ffd7b778..34fa63ba 100644 --- a/pkg/service/server.go +++ b/pkg/service/server.go @@ -35,14 +35,14 @@ import ( "go.uber.org/atomic" "golang.org/x/sync/errgroup" - "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-protocol/auth" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/xtwirp" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/version" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/version" ) type LivekitServer struct { diff --git a/pkg/service/servicefakes/fake_agent_store.go b/pkg/service/servicefakes/fake_agent_store.go index 6727597e..f7e96eb5 100644 --- a/pkg/service/servicefakes/fake_agent_store.go +++ b/pkg/service/servicefakes/fake_agent_store.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/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 b642eb9a..e512b73e 100644 --- a/pkg/service/servicefakes/fake_egress_store.go +++ b/pkg/service/servicefakes/fake_egress_store.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/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 f959ad4b..4102da15 100644 --- a/pkg/service/servicefakes/fake_ingress_store.go +++ b/pkg/service/servicefakes/fake_ingress_store.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/livekit-protocol/livekit" ) type FakeIngressStore struct { diff --git a/pkg/service/servicefakes/fake_ioclient.go b/pkg/service/servicefakes/fake_ioclient.go index 0cdda412..297a081e 100644 --- a/pkg/service/servicefakes/fake_ioclient.go +++ b/pkg/service/servicefakes/fake_ioclient.go @@ -5,9 +5,9 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/rpc" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/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 80ce6f47..0a6a2159 100644 --- a/pkg/service/servicefakes/fake_object_store.go +++ b/pkg/service/servicefakes/fake_object_store.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/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 b15ae564..3a1bb2dd 100644 --- a/pkg/service/servicefakes/fake_room_allocator.go +++ b/pkg/service/servicefakes/fake_room_allocator.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/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 8b3f411a..f13907d9 100644 --- a/pkg/service/servicefakes/fake_service_store.go +++ b/pkg/service/servicefakes/fake_service_store.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/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 e112e677..965c4df9 100644 --- a/pkg/service/servicefakes/fake_session_handler.go +++ b/pkg/service/servicefakes/fake_session_handler.go @@ -5,10 +5,10 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "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" ) type FakeSessionHandler struct { diff --git a/pkg/service/servicefakes/fake_sipstore.go b/pkg/service/servicefakes/fake_sipstore.go index ba88c873..3cd706b8 100644 --- a/pkg/service/servicefakes/fake_sipstore.go +++ b/pkg/service/servicefakes/fake_sipstore.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/livekit-protocol/livekit" ) type FakeSIPStore struct { diff --git a/pkg/service/signal.go b/pkg/service/signal.go index f6c9316e..d3b5655d 100644 --- a/pkg/service/signal.go +++ b/pkg/service/signal.go @@ -20,13 +20,13 @@ import ( "github.com/pkg/errors" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/rpc" + "github.com/stoatchat/livekit-server/pkg/config" + "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/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 81755cde..7318e42b 100644 --- a/pkg/service/signal_test.go +++ b/pkg/service/signal_test.go @@ -24,13 +24,13 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/livekit-server/pkg/service/servicefakes" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "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-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/psrpc" ) diff --git a/pkg/service/sip.go b/pkg/service/sip.go index 0ce3c9c1..f7ac17b7 100644 --- a/pkg/service/sip.go +++ b/pkg/service/sip.go @@ -23,16 +23,16 @@ import ( "github.com/twitchtv/twirp" "google.golang.org/protobuf/types/known/emptypb" - "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/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/psrpc" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/telemetry" ) type SIPService struct { diff --git a/pkg/service/turn.go b/pkg/service/turn.go index f37ff3e6..15f604d2 100644 --- a/pkg/service/turn.go +++ b/pkg/service/turn.go @@ -26,14 +26,14 @@ import ( "github.com/pion/turn/v4" "github.com/pkg/errors" - "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-protocol/auth" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/logger/pionlogger" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" ) const ( diff --git a/pkg/service/twirp.go b/pkg/service/twirp.go index 2226c64d..b214ecb3 100644 --- a/pkg/service/twirp.go +++ b/pkg/service/twirp.go @@ -26,10 +26,10 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" + "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" ) type twirpRequestFields struct { diff --git a/pkg/service/utils.go b/pkg/service/utils.go index 446be1d9..ee58b927 100644 --- a/pkg/service/utils.go +++ b/pkg/service/utils.go @@ -29,14 +29,14 @@ import ( "github.com/ua-parser/uap-go/uaparser" "gopkg.in/yaml.v3" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/routing/selector" - "github.com/livekit/livekit-server/pkg/rtc" - "github.com/livekit/livekit-server/pkg/utils" - "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/routing" + "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" ) func handleError(w http.ResponseWriter, r *http.Request, status int, err error, keysAndValues ...interface{}) { diff --git a/pkg/service/utils_test.go b/pkg/service/utils_test.go index 5d8cdcaf..98f783c7 100644 --- a/pkg/service/utils_test.go +++ b/pkg/service/utils_test.go @@ -22,7 +22,7 @@ import ( "github.com/redis/go-redis/v9" "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/service" + "github.com/stoatchat/livekit-server/pkg/service" ) func redisClientDocker(t testing.TB) *redis.Client { diff --git a/pkg/service/whipservice.go b/pkg/service/whipservice.go index 83f29ecf..1f779c23 100644 --- a/pkg/service/whipservice.go +++ b/pkg/service/whipservice.go @@ -26,15 +26,15 @@ import ( "github.com/pion/webrtc/v4" "github.com/tomnomnom/linkheader" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc" - "github.com/livekit/livekit-server/pkg/rtc/types" - sutils "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "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" + "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/psrpc" ) diff --git a/pkg/service/wire.go b/pkg/service/wire.go index 48bd84db..05612177 100644 --- a/pkg/service/wire.go +++ b/pkg/service/wire.go @@ -27,18 +27,18 @@ import ( "github.com/redis/go-redis/v9" "gopkg.in/yaml.v3" - "github.com/livekit/livekit-server/pkg/agent" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/telemetry" - "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/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" + 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/psrpc" ) diff --git a/pkg/service/wire_gen.go b/pkg/service/wire_gen.go index b33cc174..9011d394 100644 --- a/pkg/service/wire_gen.go +++ b/pkg/service/wire_gen.go @@ -8,18 +8,18 @@ package service import ( "fmt" - "github.com/livekit/livekit-server/pkg/agent" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/telemetry" - "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/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" diff --git a/pkg/service/wsprotocol.go b/pkg/service/wsprotocol.go index 3752753f..e51350eb 100644 --- a/pkg/service/wsprotocol.go +++ b/pkg/service/wsprotocol.go @@ -25,10 +25,10 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/rtc/types" ) const ( diff --git a/pkg/sfu/buffer/buffer.go b/pkg/sfu/buffer/buffer.go index 72c32a6b..85a2c5c7 100644 --- a/pkg/sfu/buffer/buffer.go +++ b/pkg/sfu/buffer/buffer.go @@ -31,19 +31,19 @@ import ( "github.com/pion/webrtc/v4" "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/sfu/audio" - "github.com/livekit/livekit-server/pkg/sfu/mime" - act "github.com/livekit/livekit-server/pkg/sfu/rtpextension/abscapturetime" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/livekit/livekit-server/pkg/sfu/rtpstats" - "github.com/livekit/livekit-server/pkg/sfu/utils" - sutils "github.com/livekit/livekit-server/pkg/utils" + "github.com/stoatchat/livekit-server/pkg/sfu/audio" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + act "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/abscapturetime" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" + sutils "github.com/stoatchat/livekit-server/pkg/utils" "github.com/livekit/mediatransportutil/pkg/bucket" "github.com/livekit/mediatransportutil/pkg/nack" "github.com/livekit/mediatransportutil/pkg/twcc" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/mono" ) const ( diff --git a/pkg/sfu/buffer/datastats.go b/pkg/sfu/buffer/datastats.go index 795f8a0f..76940073 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) type DataStatsParam struct { diff --git a/pkg/sfu/buffer/datastats_test.go b/pkg/sfu/buffer/datastats_test.go index 5803fe9d..43e2f86e 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) func TestDataStats(t *testing.T) { diff --git a/pkg/sfu/buffer/dependencydescriptorparser.go b/pkg/sfu/buffer/dependencydescriptorparser.go index 9926517c..8f2467f4 100644 --- a/pkg/sfu/buffer/dependencydescriptorparser.go +++ b/pkg/sfu/buffer/dependencydescriptorparser.go @@ -22,10 +22,10 @@ import ( "github.com/pion/rtp" "go.uber.org/atomic" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/livekit/livekit-server/pkg/sfu/utils" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/sfu/buffer/fps.go b/pkg/sfu/buffer/fps.go index 5622198f..b20ddd86 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/livekit/protocol/logger" + "github.com/stoatchat/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 f560d8d1..0d5ffcee 100644 --- a/pkg/sfu/buffer/fps_test.go +++ b/pkg/sfu/buffer/fps_test.go @@ -20,8 +20,8 @@ import ( "github.com/pion/rtp" "github.com/stretchr/testify/require" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/livekit/protocol/logger" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-protocol/logger" ) type testFrameInfo struct { diff --git a/pkg/sfu/buffer/frameintegrity.go b/pkg/sfu/buffer/frameintegrity.go index 935263b7..94039a00 100644 --- a/pkg/sfu/buffer/frameintegrity.go +++ b/pkg/sfu/buffer/frameintegrity.go @@ -15,7 +15,7 @@ package buffer import ( - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" ) type FrameEntity struct { diff --git a/pkg/sfu/buffer/frameintegrity_test.go b/pkg/sfu/buffer/frameintegrity_test.go index 2815cf5e..a68d66b9 100644 --- a/pkg/sfu/buffer/frameintegrity_test.go +++ b/pkg/sfu/buffer/frameintegrity_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/require" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" ) func TestFrameIntegrityChecker(t *testing.T) { diff --git a/pkg/sfu/buffer/helpers.go b/pkg/sfu/buffer/helpers.go index ccd0c076..76840321 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/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" ) var ( diff --git a/pkg/sfu/buffer/streamstats.go b/pkg/sfu/buffer/streamstats.go index e45cb2ee..fd5ca132 100644 --- a/pkg/sfu/buffer/streamstats.go +++ b/pkg/sfu/buffer/streamstats.go @@ -14,7 +14,7 @@ package buffer -import "github.com/livekit/livekit-server/pkg/sfu/rtpstats" +import "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" type StreamStatsWithLayers struct { RTPStats *rtpstats.RTPDeltaInfo diff --git a/pkg/sfu/buffer/videolayerutils.go b/pkg/sfu/buffer/videolayerutils.go index 2754b59a..55a1cc8c 100644 --- a/pkg/sfu/buffer/videolayerutils.go +++ b/pkg/sfu/buffer/videolayerutils.go @@ -17,9 +17,9 @@ package buffer import ( "slices" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/sfu/buffer/videolayerutils_test.go b/pkg/sfu/buffer/videolayerutils_test.go index a7c5ad26..04749446 100644 --- a/pkg/sfu/buffer/videolayerutils_test.go +++ b/pkg/sfu/buffer/videolayerutils_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/livekit" ) func TestRidConversion(t *testing.T) { diff --git a/pkg/sfu/bwe/bwe.go b/pkg/sfu/bwe/bwe.go index ad61a700..deb231e2 100644 --- a/pkg/sfu/bwe/bwe.go +++ b/pkg/sfu/bwe/bwe.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" "github.com/pion/rtcp" ) diff --git a/pkg/sfu/bwe/null_bwe.go b/pkg/sfu/bwe/null_bwe.go index 2a1c394e..43738715 100644 --- a/pkg/sfu/bwe/null_bwe.go +++ b/pkg/sfu/bwe/null_bwe.go @@ -17,7 +17,7 @@ package bwe import ( "time" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" "github.com/pion/rtcp" ) diff --git a/pkg/sfu/bwe/remotebwe/channel_observer.go b/pkg/sfu/bwe/remotebwe/channel_observer.go index bf112e67..a7824649 100644 --- a/pkg/sfu/bwe/remotebwe/channel_observer.go +++ b/pkg/sfu/bwe/remotebwe/channel_observer.go @@ -20,8 +20,8 @@ import ( "go.uber.org/zap/zapcore" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-protocol/logger" ) // ------------------------------------------------ diff --git a/pkg/sfu/bwe/remotebwe/nack_tracker.go b/pkg/sfu/bwe/remotebwe/nack_tracker.go index 106115f8..cec1833a 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/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" ) // ------------------------------------------------ diff --git a/pkg/sfu/bwe/remotebwe/probe_controller.go b/pkg/sfu/bwe/remotebwe/probe_controller.go index 1efa3f65..367db0fb 100644 --- a/pkg/sfu/bwe/remotebwe/probe_controller.go +++ b/pkg/sfu/bwe/remotebwe/probe_controller.go @@ -18,10 +18,10 @@ import ( "fmt" "time" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "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" ) // --------------------------------------------------------------------------- diff --git a/pkg/sfu/bwe/remotebwe/remote_bwe.go b/pkg/sfu/bwe/remotebwe/remote_bwe.go index f6eb4bac..fb12580b 100644 --- a/pkg/sfu/bwe/remotebwe/remote_bwe.go +++ b/pkg/sfu/bwe/remotebwe/remote_bwe.go @@ -18,10 +18,10 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "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" ) var _ bwe.BWE = (*RemoteBWE)(nil) diff --git a/pkg/sfu/bwe/sendsidebwe/congestion_detector.go b/pkg/sfu/bwe/sendsidebwe/congestion_detector.go index 4fe77fd6..62004ee9 100644 --- a/pkg/sfu/bwe/sendsidebwe/congestion_detector.go +++ b/pkg/sfu/bwe/sendsidebwe/congestion_detector.go @@ -19,10 +19,10 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "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/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 b64727fd..5f979525 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/livekit/protocol/logger" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/bwe/sendsidebwe/packet_info.go b/pkg/sfu/bwe/sendsidebwe/packet_info.go index 730e2a7e..e12fc794 100644 --- a/pkg/sfu/bwe/sendsidebwe/packet_info.go +++ b/pkg/sfu/bwe/sendsidebwe/packet_info.go @@ -15,7 +15,7 @@ package sendsidebwe import ( - "github.com/livekit/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/bwe/sendsidebwe/packet_tracker.go b/pkg/sfu/bwe/sendsidebwe/packet_tracker.go index a41e50fe..ec66ed82 100644 --- a/pkg/sfu/bwe/sendsidebwe/packet_tracker.go +++ b/pkg/sfu/bwe/sendsidebwe/packet_tracker.go @@ -18,9 +18,9 @@ import ( "math/rand" "sync" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/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 68a1b0c7..00189e71 100644 --- a/pkg/sfu/bwe/sendsidebwe/probe_packet_group.go +++ b/pkg/sfu/bwe/sendsidebwe/probe_packet_group.go @@ -17,9 +17,9 @@ package sendsidebwe import ( "time" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/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 c31be1e7..10f79b48 100644 --- a/pkg/sfu/bwe/sendsidebwe/send_side_bwe.go +++ b/pkg/sfu/bwe/sendsidebwe/send_side_bwe.go @@ -17,9 +17,9 @@ package sendsidebwe import ( "time" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/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 f1c07d54..e8c329a5 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/livekit/protocol/logger" + "github.com/stoatchat/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 f6e10e1b..3efd7822 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/livekit/protocol/logger" + "github.com/stoatchat/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 ed0940bd..0b374085 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/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/mono" ) // ------------------------------------------------ diff --git a/pkg/sfu/ccutils/prober.go b/pkg/sfu/ccutils/prober.go index 577042ad..3bc8b8c8 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/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/mono" ) type ProberListener interface { diff --git a/pkg/sfu/ccutils/trenddetector.go b/pkg/sfu/ccutils/trenddetector.go index c3f8ff67..e0517af4 100644 --- a/pkg/sfu/ccutils/trenddetector.go +++ b/pkg/sfu/ccutils/trenddetector.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/codecmunger/codecmunger.go b/pkg/sfu/codecmunger/codecmunger.go index 8f225385..de0c8109 100644 --- a/pkg/sfu/codecmunger/codecmunger.go +++ b/pkg/sfu/codecmunger/codecmunger.go @@ -17,7 +17,7 @@ package codecmunger import ( "errors" - "github.com/livekit/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" ) var ( diff --git a/pkg/sfu/codecmunger/null.go b/pkg/sfu/codecmunger/null.go index 9d575701..0b2eca41 100644 --- a/pkg/sfu/codecmunger/null.go +++ b/pkg/sfu/codecmunger/null.go @@ -15,8 +15,8 @@ package codecmunger import ( - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-protocol/logger" ) type Null struct { diff --git a/pkg/sfu/codecmunger/vp8.go b/pkg/sfu/codecmunger/vp8.go index 696c355b..2d166208 100644 --- a/pkg/sfu/codecmunger/vp8.go +++ b/pkg/sfu/codecmunger/vp8.go @@ -17,10 +17,10 @@ package codecmunger import ( "github.com/elliotchance/orderedmap/v2" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" ) const ( diff --git a/pkg/sfu/codecmunger/vp8_test.go b/pkg/sfu/codecmunger/vp8_test.go index 31d33dd6..dc1ac4ca 100644 --- a/pkg/sfu/codecmunger/vp8_test.go +++ b/pkg/sfu/codecmunger/vp8_test.go @@ -20,10 +20,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/testutils" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/testutils" ) func compare(expected *VP8, actual *VP8) bool { diff --git a/pkg/sfu/connectionquality/connectionstats.go b/pkg/sfu/connectionquality/connectionstats.go index 0668b9ca..5a174a1c 100644 --- a/pkg/sfu/connectionquality/connectionstats.go +++ b/pkg/sfu/connectionquality/connectionstats.go @@ -22,12 +22,12 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/rtpstats" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" ) const ( diff --git a/pkg/sfu/connectionquality/connectionstats_test.go b/pkg/sfu/connectionquality/connectionstats_test.go index 1e74eb41..dd2a4e08 100644 --- a/pkg/sfu/connectionquality/connectionstats_test.go +++ b/pkg/sfu/connectionquality/connectionstats_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/rtpstats" - "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" + "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) // ----------------------------------------------- diff --git a/pkg/sfu/connectionquality/scorer.go b/pkg/sfu/connectionquality/scorer.go index af929002..43f3caab 100644 --- a/pkg/sfu/connectionquality/scorer.go +++ b/pkg/sfu/connectionquality/scorer.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/datachannel/bitrate.go b/pkg/sfu/datachannel/bitrate.go index b95198aa..80dcc93c 100644 --- a/pkg/sfu/datachannel/bitrate.go +++ b/pkg/sfu/datachannel/bitrate.go @@ -6,7 +6,7 @@ import ( "github.com/gammazero/deque" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/utils/mono" ) const ( diff --git a/pkg/sfu/datachannel/datachannel_writer.go b/pkg/sfu/datachannel/datachannel_writer.go index 707c9203..e0cc7665 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/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/utils/mono" ) const ( diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go index d6ebd8d5..5ed00d52 100644 --- a/pkg/sfu/downtrack.go +++ b/pkg/sfu/downtrack.go @@ -33,21 +33,21 @@ import ( "go.uber.org/atomic" "go.uber.org/zap/zapcore" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/mono" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/livekit-server/pkg/sfu/connectionquality" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/pacer" - act "github.com/livekit/livekit-server/pkg/sfu/rtpextension/abscapturetime" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - pd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/playoutdelay" - "github.com/livekit/livekit-server/pkg/sfu/rtpstats" - "github.com/livekit/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-server/pkg/sfu/connectionquality" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu/pacer" + act "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/abscapturetime" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + pd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/playoutdelay" + "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" ) // TrackSender defines an interface send media to remote peer diff --git a/pkg/sfu/downtrackspreader.go b/pkg/sfu/downtrackspreader.go index 98057a0d..95d85232 100644 --- a/pkg/sfu/downtrackspreader.go +++ b/pkg/sfu/downtrackspreader.go @@ -17,9 +17,9 @@ package sfu import ( "sync" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" ) type DownTrackSpreaderParams struct { diff --git a/pkg/sfu/forwarder.go b/pkg/sfu/forwarder.go index 66b63670..d37f7522 100644 --- a/pkg/sfu/forwarder.go +++ b/pkg/sfu/forwarder.go @@ -27,19 +27,19 @@ import ( "go.uber.org/zap/zapcore" "github.com/livekit/mediatransportutil" - "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-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" + "github.com/stoatchat/livekit-protocol/utils/mono" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/codecmunger" - "github.com/livekit/livekit-server/pkg/sfu/mime" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/livekit/livekit-server/pkg/sfu/rtpstats" - sfuutils "github.com/livekit/livekit-server/pkg/sfu/utils" - "github.com/livekit/livekit-server/pkg/sfu/videolayerselector" - "github.com/livekit/livekit-server/pkg/sfu/videolayerselector/temporallayerselector" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/codecmunger" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" + sfuutils "github.com/stoatchat/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-server/pkg/sfu/videolayerselector" + "github.com/stoatchat/livekit-server/pkg/sfu/videolayerselector/temporallayerselector" ) const ( diff --git a/pkg/sfu/forwarder_test.go b/pkg/sfu/forwarder_test.go index ee2743b9..cec22dc7 100644 --- a/pkg/sfu/forwarder_test.go +++ b/pkg/sfu/forwarder_test.go @@ -20,11 +20,11 @@ import ( "github.com/pion/webrtc/v4" "github.com/stretchr/testify/require" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/testutils" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/testutils" ) func disable(f *Forwarder) { diff --git a/pkg/sfu/forwardstats.go b/pkg/sfu/forwardstats.go index 4e685f08..6226ab1f 100644 --- a/pkg/sfu/forwardstats.go +++ b/pkg/sfu/forwardstats.go @@ -4,10 +4,10 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils" - "github.com/livekit/protocol/utils/mono" + "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" ) const ( diff --git a/pkg/sfu/interceptor/rtx.go b/pkg/sfu/interceptor/rtx.go index 69e00dfa..ed15641a 100644 --- a/pkg/sfu/interceptor/rtx.go +++ b/pkg/sfu/interceptor/rtx.go @@ -21,8 +21,8 @@ import ( "github.com/pion/sdp/v3" "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/sfu/utils" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/sfu/mime/mimetype.go b/pkg/sfu/mime/mimetype.go index d336bccf..99fceebc 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/livekit/protocol/observability/roomobs" + "github.com/stoatchat/livekit-protocol/observability/roomobs" ) const ( diff --git a/pkg/sfu/pacer/base.go b/pkg/sfu/pacer/base.go index b7097786..988be3ef 100644 --- a/pkg/sfu/pacer/base.go +++ b/pkg/sfu/pacer/base.go @@ -19,9 +19,9 @@ import ( "io" "time" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/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 db5c8931..0ed159f4 100644 --- a/pkg/sfu/pacer/leaky_bucket.go +++ b/pkg/sfu/pacer/leaky_bucket.go @@ -20,8 +20,8 @@ import ( "github.com/frostbyte73/core" "github.com/gammazero/deque" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/sfu/pacer/no_queue.go b/pkg/sfu/pacer/no_queue.go index 7d785899..2e477d2c 100644 --- a/pkg/sfu/pacer/no_queue.go +++ b/pkg/sfu/pacer/no_queue.go @@ -19,8 +19,8 @@ import ( "github.com/frostbyte73/core" "github.com/gammazero/deque" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe" + "github.com/stoatchat/livekit-protocol/logger" ) type NoQueue struct { diff --git a/pkg/sfu/pacer/pacer.go b/pkg/sfu/pacer/pacer.go index 8532fe26..b768f1e5 100644 --- a/pkg/sfu/pacer/pacer.go +++ b/pkg/sfu/pacer/pacer.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" "github.com/pion/rtp" "github.com/pion/webrtc/v4" ) diff --git a/pkg/sfu/pacer/pass_through.go b/pkg/sfu/pacer/pass_through.go index 21fd07e2..aa6da32d 100644 --- a/pkg/sfu/pacer/pass_through.go +++ b/pkg/sfu/pacer/pass_through.go @@ -15,8 +15,8 @@ package pacer import ( - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe" + "github.com/stoatchat/livekit-protocol/logger" ) type PassThrough struct { diff --git a/pkg/sfu/pacer/probe_observer.go b/pkg/sfu/pacer/probe_observer.go index ff51b816..83b77c73 100644 --- a/pkg/sfu/pacer/probe_observer.go +++ b/pkg/sfu/pacer/probe_observer.go @@ -20,9 +20,9 @@ import ( "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/mono" ) type ProbeObserver struct { diff --git a/pkg/sfu/playoutdelay.go b/pkg/sfu/playoutdelay.go index 42217f74..4d74d14b 100644 --- a/pkg/sfu/playoutdelay.go +++ b/pkg/sfu/playoutdelay.go @@ -18,9 +18,9 @@ import ( "sync" "time" - pd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/playoutdelay" - "github.com/livekit/livekit-server/pkg/sfu/rtpstats" - "github.com/livekit/protocol/logger" + pd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/playoutdelay" + "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" + "github.com/stoatchat/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 419f4730..9c6f0aef 100644 --- a/pkg/sfu/playoutdelay_test.go +++ b/pkg/sfu/playoutdelay_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" - pd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/playoutdelay" - "github.com/livekit/livekit-server/pkg/sfu/rtpstats" - "github.com/livekit/protocol/logger" + pd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/playoutdelay" + "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" + "github.com/stoatchat/livekit-protocol/logger" ) func TestPlayoutDelay(t *testing.T) { diff --git a/pkg/sfu/receiver.go b/pkg/sfu/receiver.go index 02e3b6ca..2af9cf06 100644 --- a/pkg/sfu/receiver.go +++ b/pkg/sfu/receiver.go @@ -26,17 +26,17 @@ import ( "go.uber.org/atomic" "github.com/livekit/mediatransportutil/pkg/bucket" - "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-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" + "github.com/stoatchat/livekit-protocol/utils/mono" - "github.com/livekit/livekit-server/pkg/sfu/audio" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/connectionquality" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/rtpstats" - "github.com/livekit/livekit-server/pkg/sfu/streamtracker" + "github.com/stoatchat/livekit-server/pkg/sfu/audio" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/connectionquality" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu/rtpstats" + "github.com/stoatchat/livekit-server/pkg/sfu/streamtracker" ) var ( diff --git a/pkg/sfu/redprimaryreceiver.go b/pkg/sfu/redprimaryreceiver.go index e18a5714..e62fb473 100644 --- a/pkg/sfu/redprimaryreceiver.go +++ b/pkg/sfu/redprimaryreceiver.go @@ -23,9 +23,9 @@ import ( "github.com/pion/rtp" "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) var ( diff --git a/pkg/sfu/redreceiver.go b/pkg/sfu/redreceiver.go index 9151d259..7023da7b 100644 --- a/pkg/sfu/redreceiver.go +++ b/pkg/sfu/redreceiver.go @@ -23,10 +23,10 @@ import ( "github.com/pion/rtp" "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" "github.com/livekit/mediatransportutil/pkg/bucket" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/sfu/redreceiver_test.go b/pkg/sfu/redreceiver_test.go index 16a1340b..77a978ad 100644 --- a/pkg/sfu/redreceiver_test.go +++ b/pkg/sfu/redreceiver_test.go @@ -21,8 +21,8 @@ import ( "github.com/pion/webrtc/v4" "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/sfu/rtpmunger.go b/pkg/sfu/rtpmunger.go index ed3f8587..21caba67 100644 --- a/pkg/sfu/rtpmunger.go +++ b/pkg/sfu/rtpmunger.go @@ -15,11 +15,11 @@ package sfu import ( - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" ) // RTPMunger diff --git a/pkg/sfu/rtpmunger_test.go b/pkg/sfu/rtpmunger_test.go index df90ec2d..6978e60e 100644 --- a/pkg/sfu/rtpmunger_test.go +++ b/pkg/sfu/rtpmunger_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu/testutils" + "github.com/stoatchat/livekit-server/pkg/sfu/testutils" ) func newRTPMunger() *RTPMunger { diff --git a/pkg/sfu/rtpstats/rtpstats_base.go b/pkg/sfu/rtpstats/rtpstats_base.go index a4a9107c..17ea2509 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/livekit/protocol/livekit" - "github.com/livekit/protocol/utils" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils" + "github.com/stoatchat/livekit-protocol/utils/mono" ) const ( diff --git a/pkg/sfu/rtpstats/rtpstats_base_lite.go b/pkg/sfu/rtpstats/rtpstats_base_lite.go index c54b3665..c621f776 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/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/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 4b2424f1..46ab889a 100644 --- a/pkg/sfu/rtpstats/rtpstats_receiver.go +++ b/pkg/sfu/rtpstats/rtpstats_receiver.go @@ -22,12 +22,12 @@ import ( "github.com/pion/rtcp" "go.uber.org/zap/zapcore" - "github.com/livekit/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" "github.com/livekit/mediatransportutil" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - protoutils "github.com/livekit/protocol/utils" - "github.com/livekit/protocol/utils/mono" + "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" ) const ( diff --git a/pkg/sfu/rtpstats/rtpstats_receiver_lite.go b/pkg/sfu/rtpstats/rtpstats_receiver_lite.go index 84812a32..f107215f 100644 --- a/pkg/sfu/rtpstats/rtpstats_receiver_lite.go +++ b/pkg/sfu/rtpstats/rtpstats_receiver_lite.go @@ -17,9 +17,9 @@ package rtpstats import ( "go.uber.org/zap/zapcore" - "github.com/livekit/livekit-server/pkg/sfu/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/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 d895b57c..7b536812 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/livekit/protocol/logger" + "github.com/stoatchat/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 db43fa21..4209d29b 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/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/mono" ) // ------------------------------------------------------------------- diff --git a/pkg/sfu/rtpstats/rtpstats_sender_lite.go b/pkg/sfu/rtpstats/rtpstats_sender_lite.go index ae422352..b777d5cc 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/livekit/protocol/livekit" - "github.com/livekit/protocol/utils/mono" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils/mono" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/sequencer.go b/pkg/sfu/sequencer.go index 1e08ef9c..f5e3d60c 100644 --- a/pkg/sfu/sequencer.go +++ b/pkg/sfu/sequencer.go @@ -19,8 +19,8 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/sfu/utils" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-protocol/logger" "go.uber.org/zap/zapcore" ) diff --git a/pkg/sfu/sequencer_test.go b/pkg/sfu/sequencer_test.go index 862ac531..328e8b99 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/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" ) func Test_sequencer(t *testing.T) { diff --git a/pkg/sfu/streamallocator/streamallocator.go b/pkg/sfu/streamallocator/streamallocator.go index 19c9aca2..501030df 100644 --- a/pkg/sfu/streamallocator/streamallocator.go +++ b/pkg/sfu/streamallocator/streamallocator.go @@ -25,15 +25,15 @@ import ( "github.com/pion/webrtc/v4" "go.uber.org/atomic" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/bwe" - "github.com/livekit/livekit-server/pkg/sfu/ccutils" - "github.com/livekit/livekit-server/pkg/sfu/pacer" - "github.com/livekit/livekit-server/pkg/utils" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/bwe" + "github.com/stoatchat/livekit-server/pkg/sfu/ccutils" + "github.com/stoatchat/livekit-server/pkg/sfu/pacer" + "github.com/stoatchat/livekit-server/pkg/utils" ) const ( diff --git a/pkg/sfu/streamallocator/streamstateupdate.go b/pkg/sfu/streamallocator/streamstateupdate.go index 53156de3..5a55a0f2 100644 --- a/pkg/sfu/streamallocator/streamstateupdate.go +++ b/pkg/sfu/streamallocator/streamstateupdate.go @@ -17,7 +17,7 @@ package streamallocator import ( "fmt" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) // ------------------------------------------------ diff --git a/pkg/sfu/streamallocator/track.go b/pkg/sfu/streamallocator/track.go index a094aa50..d913e025 100644 --- a/pkg/sfu/streamallocator/track.go +++ b/pkg/sfu/streamallocator/track.go @@ -15,11 +15,11 @@ package streamallocator import ( - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/sfu" - "github.com/livekit/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" ) type Track struct { diff --git a/pkg/sfu/streamtracker/interfaces.go b/pkg/sfu/streamtracker/interfaces.go index f3ad5e69..c56fa9f9 100644 --- a/pkg/sfu/streamtracker/interfaces.go +++ b/pkg/sfu/streamtracker/interfaces.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/livekit/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" ) // ------------------------------------------------------------ diff --git a/pkg/sfu/streamtracker/streamtracker.go b/pkg/sfu/streamtracker/streamtracker.go index b45723a7..c3948142 100644 --- a/pkg/sfu/streamtracker/streamtracker.go +++ b/pkg/sfu/streamtracker/streamtracker.go @@ -21,8 +21,8 @@ import ( "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-protocol/logger" ) // ------------------------------------------------------------ diff --git a/pkg/sfu/streamtracker/streamtracker_dd.go b/pkg/sfu/streamtracker/streamtracker_dd.go index 5feb33d9..da37ff9c 100644 --- a/pkg/sfu/streamtracker/streamtracker_dd.go +++ b/pkg/sfu/streamtracker/streamtracker_dd.go @@ -20,8 +20,8 @@ import ( "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" ) type StreamTrackerDependencyDescriptor struct { diff --git a/pkg/sfu/streamtracker/streamtracker_dd_test.go b/pkg/sfu/streamtracker/streamtracker_dd_test.go index 8e3f4001..76654ae7 100644 --- a/pkg/sfu/streamtracker/streamtracker_dd_test.go +++ b/pkg/sfu/streamtracker/streamtracker_dd_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/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 e0f9f577..ba2dd826 100644 --- a/pkg/sfu/streamtracker/streamtracker_frame.go +++ b/pkg/sfu/streamtracker/streamtracker_frame.go @@ -18,7 +18,7 @@ import ( "math" "time" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/sfu/streamtracker/streamtracker_packet.go b/pkg/sfu/streamtracker/streamtracker_packet.go index 1ff3be1c..6effe1f8 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/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" ) // -------------------------------------------- diff --git a/pkg/sfu/streamtracker/streamtracker_packet_test.go b/pkg/sfu/streamtracker/streamtracker_packet_test.go index 3f1b65f0..f999ad99 100644 --- a/pkg/sfu/streamtracker/streamtracker_packet_test.go +++ b/pkg/sfu/streamtracker/streamtracker_packet_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/livekit/livekit-server/pkg/testutils" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/testutils" + "github.com/stoatchat/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 b1026739..fac103ae 100644 --- a/pkg/sfu/streamtrackermanager.go +++ b/pkg/sfu/streamtrackermanager.go @@ -23,13 +23,13 @@ import ( "github.com/frostbyte73/core" "go.uber.org/atomic" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/sfu/streamtracker" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/sfu/streamtracker" ) // --------------------------------------------------- diff --git a/pkg/sfu/testutils/data.go b/pkg/sfu/testutils/data.go index a4ebc7be..8c5cb355 100644 --- a/pkg/sfu/testutils/data.go +++ b/pkg/sfu/testutils/data.go @@ -20,7 +20,7 @@ import ( "github.com/pion/rtp" "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" ) // ----------------------------------------------------------- diff --git a/pkg/sfu/utils/helpers.go b/pkg/sfu/utils/helpers.go index bfd40194..bf22a4a9 100644 --- a/pkg/sfu/utils/helpers.go +++ b/pkg/sfu/utils/helpers.go @@ -22,8 +22,8 @@ import ( "github.com/pion/rtp" "github.com/pion/webrtc/v4" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/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 181e5d3f..7b128df3 100644 --- a/pkg/sfu/videolayerselector/base.go +++ b/pkg/sfu/videolayerselector/base.go @@ -15,9 +15,9 @@ package videolayerselector import ( - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/videolayerselector/temporallayerselector" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/videolayerselector/temporallayerselector" + "github.com/stoatchat/livekit-protocol/logger" ) type Base struct { diff --git a/pkg/sfu/videolayerselector/decodetarget.go b/pkg/sfu/videolayerselector/decodetarget.go index 70114f21..243d206e 100644 --- a/pkg/sfu/videolayerselector/decodetarget.go +++ b/pkg/sfu/videolayerselector/decodetarget.go @@ -17,8 +17,8 @@ package videolayerselector import ( "fmt" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" ) type DecodeTarget struct { diff --git a/pkg/sfu/videolayerselector/dependencydescriptor.go b/pkg/sfu/videolayerselector/dependencydescriptor.go index 0cb15709..e423edd3 100644 --- a/pkg/sfu/videolayerselector/dependencydescriptor.go +++ b/pkg/sfu/videolayerselector/dependencydescriptor.go @@ -19,9 +19,9 @@ import ( "runtime/debug" "sync" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - dede "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + dede "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-protocol/logger" ) const ( diff --git a/pkg/sfu/videolayerselector/dependencydescriptor_test.go b/pkg/sfu/videolayerselector/dependencydescriptor_test.go index a562988f..1346950d 100644 --- a/pkg/sfu/videolayerselector/dependencydescriptor_test.go +++ b/pkg/sfu/videolayerselector/dependencydescriptor_test.go @@ -21,9 +21,9 @@ import ( "github.com/pion/rtp" "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-protocol/logger" ) func TestDecodeTarget(t *testing.T) { diff --git a/pkg/sfu/videolayerselector/framechain.go b/pkg/sfu/videolayerselector/framechain.go index 19ddf7e2..4f4c6121 100644 --- a/pkg/sfu/videolayerselector/framechain.go +++ b/pkg/sfu/videolayerselector/framechain.go @@ -15,8 +15,8 @@ package videolayerselector import ( - dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" - "github.com/livekit/protocol/logger" + dd "github.com/stoatchat/livekit-server/pkg/sfu/rtpextension/dependencydescriptor" + "github.com/stoatchat/livekit-protocol/logger" ) type FrameChain struct { diff --git a/pkg/sfu/videolayerselector/framenumberwrapper.go b/pkg/sfu/videolayerselector/framenumberwrapper.go index 43c9c02d..d5a98934 100644 --- a/pkg/sfu/videolayerselector/framenumberwrapper.go +++ b/pkg/sfu/videolayerselector/framenumberwrapper.go @@ -14,7 +14,7 @@ package videolayerselector -import "github.com/livekit/protocol/logger" +import "github.com/stoatchat/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 b18f509d..ce93d753 100644 --- a/pkg/sfu/videolayerselector/framenumberwrapper_test.go +++ b/pkg/sfu/videolayerselector/framenumberwrapper_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/sfu/utils" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/utils" + "github.com/stoatchat/livekit-protocol/logger" ) func TestFrameNumberWrapper(t *testing.T) { diff --git a/pkg/sfu/videolayerselector/null.go b/pkg/sfu/videolayerselector/null.go index 644a8f95..0528f709 100644 --- a/pkg/sfu/videolayerselector/null.go +++ b/pkg/sfu/videolayerselector/null.go @@ -15,7 +15,7 @@ package videolayerselector import ( - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" ) type Null struct { diff --git a/pkg/sfu/videolayerselector/simulcast.go b/pkg/sfu/videolayerselector/simulcast.go index 9720bbe4..ece8e87a 100644 --- a/pkg/sfu/videolayerselector/simulcast.go +++ b/pkg/sfu/videolayerselector/simulcast.go @@ -15,8 +15,8 @@ package videolayerselector import ( - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-protocol/logger" ) type Simulcast struct { diff --git a/pkg/sfu/videolayerselector/temporallayerselector/null.go b/pkg/sfu/videolayerselector/temporallayerselector/null.go index 51f2fb59..cfde7c8d 100644 --- a/pkg/sfu/videolayerselector/temporallayerselector/null.go +++ b/pkg/sfu/videolayerselector/temporallayerselector/null.go @@ -15,7 +15,7 @@ package temporallayerselector import ( - "github.com/livekit/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" ) type Null struct{} diff --git a/pkg/sfu/videolayerselector/temporallayerselector/temporallayerselector.go b/pkg/sfu/videolayerselector/temporallayerselector/temporallayerselector.go index 1d691b40..aea3cde6 100644 --- a/pkg/sfu/videolayerselector/temporallayerselector/temporallayerselector.go +++ b/pkg/sfu/videolayerselector/temporallayerselector/temporallayerselector.go @@ -14,7 +14,7 @@ package temporallayerselector -import "github.com/livekit/livekit-server/pkg/sfu/buffer" +import "github.com/stoatchat/livekit-server/pkg/sfu/buffer" type TemporalLayerSelector interface { Select(extPkt *buffer.ExtPacket, current int32, target int32) (this int32, next int32) diff --git a/pkg/sfu/videolayerselector/temporallayerselector/vp8.go b/pkg/sfu/videolayerselector/temporallayerselector/vp8.go index c0a86c4f..4e6da977 100644 --- a/pkg/sfu/videolayerselector/temporallayerselector/vp8.go +++ b/pkg/sfu/videolayerselector/temporallayerselector/vp8.go @@ -15,8 +15,8 @@ package temporallayerselector import ( - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-protocol/logger" ) type VP8 struct { diff --git a/pkg/sfu/videolayerselector/videolayerselector.go b/pkg/sfu/videolayerselector/videolayerselector.go index 883e46ae..c86dcd1a 100644 --- a/pkg/sfu/videolayerselector/videolayerselector.go +++ b/pkg/sfu/videolayerselector/videolayerselector.go @@ -15,9 +15,9 @@ package videolayerselector import ( - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/videolayerselector/temporallayerselector" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/videolayerselector/temporallayerselector" + "github.com/stoatchat/livekit-protocol/logger" ) type VideoLayerSelectorResult struct { diff --git a/pkg/sfu/videolayerselector/vp9.go b/pkg/sfu/videolayerselector/vp9.go index dc5999c4..df3a864e 100644 --- a/pkg/sfu/videolayerselector/vp9.go +++ b/pkg/sfu/videolayerselector/vp9.go @@ -17,8 +17,8 @@ package videolayerselector import ( "github.com/pion/rtp/codecs" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-protocol/logger" ) type VP9 struct { diff --git a/pkg/telemetry/analyticsservice.go b/pkg/telemetry/analyticsservice.go index 98b912ec..d21fa968 100644 --- a/pkg/telemetry/analyticsservice.go +++ b/pkg/telemetry/analyticsservice.go @@ -20,14 +20,14 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/types/known/timestamppb" - "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-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/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/routing" ) //counterfeiter:generate . AnalyticsService diff --git a/pkg/telemetry/events.go b/pkg/telemetry/events.go index 520b6f46..c50e6453 100644 --- a/pkg/telemetry/events.go +++ b/pkg/telemetry/events.go @@ -20,13 +20,13 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "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" + "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" ) func (t *telemetryService) NotifyEvent(ctx context.Context, event *livekit.WebhookEvent, opts ...webhook.NotifyOption) { @@ -384,10 +384,22 @@ func (t *telemetryService) TrackUnpublished( func (t *telemetryService) TrackMuted( ctx context.Context, participantID livekit.ParticipantID, + identity livekit.ParticipantIdentity, track *livekit.TrackInfo, ) { t.enqueue(func() { room := t.getRoomDetails(participantID) + participant := &livekit.ParticipantInfo{ + Sid: string(participantID), + Identity: string(identity), + } + t.NotifyEvent(ctx, &livekit.WebhookEvent{ + Event: webhook.EventTrackMuted, + Room: room, + Participant: participant, + Track: track, + }) + t.SendEvent(ctx, newTrackEvent(livekit.AnalyticsEventType_TRACK_MUTED, room, participantID, track)) }) } @@ -395,10 +407,22 @@ func (t *telemetryService) TrackMuted( func (t *telemetryService) TrackUnmuted( ctx context.Context, participantID livekit.ParticipantID, + identity livekit.ParticipantIdentity, track *livekit.TrackInfo, ) { t.enqueue(func() { room := t.getRoomDetails(participantID) + participant := &livekit.ParticipantInfo{ + Sid: string(participantID), + Identity: string(identity), + } + t.NotifyEvent(ctx, &livekit.WebhookEvent{ + Event: webhook.EventTrackMuted, + Room: room, + Participant: participant, + Track: track, + }) + t.SendEvent(ctx, newTrackEvent(livekit.AnalyticsEventType_TRACK_UNMUTED, room, participantID, track)) }) } diff --git a/pkg/telemetry/events_test.go b/pkg/telemetry/events_test.go index 0be7de17..d137bcbf 100644 --- a/pkg/telemetry/events_test.go +++ b/pkg/telemetry/events_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/telemetry" + "github.com/stoatchat/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 541016d8..57e60326 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) var ( diff --git a/pkg/telemetry/prometheus/node.go b/pkg/telemetry/prometheus/node.go index 5668db3c..078cd1d7 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/livekit/protocol/livekit" - "github.com/livekit/protocol/rpc" - "github.com/livekit/protocol/utils/hwstats" - "github.com/livekit/protocol/webhook" + "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" ) const ( diff --git a/pkg/telemetry/prometheus/packets.go b/pkg/telemetry/prometheus/packets.go index 760e5bda..a545bfa3 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) type Direction string diff --git a/pkg/telemetry/prometheus/quality.go b/pkg/telemetry/prometheus/quality.go index b55a3f8b..537409ab 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) var ( diff --git a/pkg/telemetry/prometheus/rooms.go b/pkg/telemetry/prometheus/rooms.go index 9214c7e4..b1a2ba61 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) var ( diff --git a/pkg/telemetry/signalanddatastats.go b/pkg/telemetry/signalanddatastats.go index 898aa989..0853f4aa 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/livekit/protocol/livekit" - "github.com/livekit/protocol/observability/roomobs" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/observability/roomobs" + "github.com/stoatchat/livekit-protocol/utils" ) type BytesTrackType string diff --git a/pkg/telemetry/stats.go b/pkg/telemetry/stats.go index 7ff082ab..12415e07 100644 --- a/pkg/telemetry/stats.go +++ b/pkg/telemetry/stats.go @@ -15,8 +15,8 @@ package telemetry import ( - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-protocol/livekit" ) type StatsKey struct { diff --git a/pkg/telemetry/stats_test.go b/pkg/telemetry/stats_test.go index 8db18df6..1f1b18e7 100644 --- a/pkg/telemetry/stats_test.go +++ b/pkg/telemetry/stats_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/livekit-server/pkg/telemetry/telemetryfakes" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-server/pkg/telemetry/telemetryfakes" ) func init() { diff --git a/pkg/telemetry/statsconn.go b/pkg/telemetry/statsconn.go index 308dc380..9722234a 100644 --- a/pkg/telemetry/statsconn.go +++ b/pkg/telemetry/statsconn.go @@ -19,7 +19,7 @@ import ( "github.com/pion/turn/v4" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-server/pkg/telemetry/prometheus" ) type Listener struct { diff --git a/pkg/telemetry/statsworker.go b/pkg/telemetry/statsworker.go index 3a0c63ee..dd4fc42c 100644 --- a/pkg/telemetry/statsworker.go +++ b/pkg/telemetry/statsworker.go @@ -21,10 +21,10 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" - "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - protoutils "github.com/livekit/protocol/utils" + "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" ) type ReferenceGuard struct { diff --git a/pkg/telemetry/telemetryfakes/fake_analytics_service.go b/pkg/telemetry/telemetryfakes/fake_analytics_service.go index 14c4dea7..19ff3e19 100644 --- a/pkg/telemetry/telemetryfakes/fake_analytics_service.go +++ b/pkg/telemetry/telemetryfakes/fake_analytics_service.go @@ -5,9 +5,9 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/observability/roomobs" + "github.com/stoatchat/livekit-server/pkg/telemetry" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/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 5f1267fa..894f71cf 100644 --- a/pkg/telemetry/telemetryfakes/fake_telemetry_service.go +++ b/pkg/telemetry/telemetryfakes/fake_telemetry_service.go @@ -5,10 +5,10 @@ import ( "context" "sync" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/telemetry" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/observability/roomobs" + "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" ) type FakeTelemetryService struct { diff --git a/pkg/telemetry/telemetryservice.go b/pkg/telemetry/telemetryservice.go index 02bb625a..4739daf1 100644 --- a/pkg/telemetry/telemetryservice.go +++ b/pkg/telemetry/telemetryservice.go @@ -19,11 +19,11 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/utils" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/webhook" + "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" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate @@ -59,9 +59,9 @@ type TelemetryService interface { // TrackSubscribeFailed - failure to subscribe to a track TrackSubscribeFailed(ctx context.Context, participantID livekit.ParticipantID, trackID livekit.TrackID, err error, isUserError bool) // TrackMuted - the publisher has muted the Track - TrackMuted(ctx context.Context, participantID livekit.ParticipantID, track *livekit.TrackInfo) + TrackMuted(ctx context.Context, participantID livekit.ParticipantID, identity livekit.ParticipantIdentity, track *livekit.TrackInfo) // TrackUnmuted - the publisher has muted the Track - TrackUnmuted(ctx context.Context, participantID livekit.ParticipantID, track *livekit.TrackInfo) + TrackUnmuted(ctx context.Context, participantID livekit.ParticipantID, identity livekit.ParticipantIdentity, track *livekit.TrackInfo) // TrackPublishedUpdate - track metadata has been updated TrackPublishedUpdate(ctx context.Context, participantID livekit.ParticipantID, track *livekit.TrackInfo) // TrackMaxSubscribedVideoQuality - publisher is notified of the max quality subscribers desire diff --git a/pkg/utils/context.go b/pkg/utils/context.go index 4ad9086d..99c10811 100644 --- a/pkg/utils/context.go +++ b/pkg/utils/context.go @@ -19,7 +19,7 @@ package utils import ( "context" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" ) type attemptKey struct{} diff --git a/pkg/utils/iceconfigcache.go b/pkg/utils/iceconfigcache.go index e42ed2bb..57db2516 100644 --- a/pkg/utils/iceconfigcache.go +++ b/pkg/utils/iceconfigcache.go @@ -5,7 +5,7 @@ import ( "github.com/jellydator/ttlcache/v3" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) const ( diff --git a/pkg/utils/iceconfigcache_test.go b/pkg/utils/iceconfigcache_test.go index 78feebb0..a3673fcd 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) func TestIceConfigCache(t *testing.T) { diff --git a/pkg/utils/incrementaldispatcher_test.go b/pkg/utils/incrementaldispatcher_test.go index 3e2d40ed..decc6c71 100644 --- a/pkg/utils/incrementaldispatcher_test.go +++ b/pkg/utils/incrementaldispatcher_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/testutils" - "github.com/livekit/livekit-server/pkg/utils" + "github.com/stoatchat/livekit-server/pkg/testutils" + "github.com/stoatchat/livekit-server/pkg/utils" ) func TestForEach(t *testing.T) { diff --git a/pkg/utils/opsqueue.go b/pkg/utils/opsqueue.go index 5e88b959..b607cb91 100644 --- a/pkg/utils/opsqueue.go +++ b/pkg/utils/opsqueue.go @@ -19,7 +19,7 @@ import ( "github.com/gammazero/deque" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/logger" ) type OpsQueueParams struct { diff --git a/pkg/utils/protocol.go b/pkg/utils/protocol.go index 77d324b9..4fc4bb88 100644 --- a/pkg/utils/protocol.go +++ b/pkg/utils/protocol.go @@ -17,8 +17,8 @@ package utils import ( - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/utils" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/utils" ) func ClientInfoWithoutAddress(c *livekit.ClientInfo) *livekit.ClientInfo { diff --git a/test/agent.go b/test/agent.go index 36405241..f8cab832 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/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" ) type agentClient struct { diff --git a/test/agent_test.go b/test/agent_test.go index 0b1a42f4..9f6b3e3e 100644 --- a/test/agent_test.go +++ b/test/agent_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/livekit-server/pkg/testutils" - "github.com/livekit/protocol/auth" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-server/pkg/testutils" + "github.com/stoatchat/livekit-protocol/auth" + "github.com/stoatchat/livekit-protocol/livekit" ) var ( diff --git a/test/client/client.go b/test/client/client.go index 55b01d43..fa442bcf 100644 --- a/test/client/client.go +++ b/test/client/client.go @@ -37,16 +37,16 @@ import ( "google.golang.org/protobuf/proto" "github.com/livekit/mediatransportutil/pkg/rtcconfig" - "github.com/livekit/protocol/auth" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/signalling" + "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/livekit-server/pkg/rtc" - "github.com/livekit/livekit-server/pkg/rtc/transport/transportfakes" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/sfu/buffer" - "github.com/livekit/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/rtc" + "github.com/stoatchat/livekit-server/pkg/rtc/transport/transportfakes" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/sfu/buffer" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" ) type SignalRequestHandler func(msg *livekit.SignalRequest) error diff --git a/test/client/datachannel_reader.go b/test/client/datachannel_reader.go index eb3b6420..0a899902 100644 --- a/test/client/datachannel_reader.go +++ b/test/client/datachannel_reader.go @@ -3,7 +3,7 @@ package client import ( "time" - "github.com/livekit/livekit-server/pkg/sfu/datachannel" + "github.com/stoatchat/livekit-server/pkg/sfu/datachannel" ) type DataChannelReader struct { diff --git a/test/client/trackwriter.go b/test/client/trackwriter.go index 803bf334..a0af7d1e 100644 --- a/test/client/trackwriter.go +++ b/test/client/trackwriter.go @@ -26,8 +26,8 @@ import ( "github.com/pion/webrtc/v4/pkg/media/ivfreader" "github.com/pion/webrtc/v4/pkg/media/oggreader" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-protocol/logger" ) // Writes a file to an RTP track. diff --git a/test/integration_helpers.go b/test/integration_helpers.go index 6fed71ac..1082ff09 100644 --- a/test/integration_helpers.go +++ b/test/integration_helpers.go @@ -26,17 +26,17 @@ import ( "github.com/twitchtv/twirp" "github.com/livekit/mediatransportutil/pkg/rtcconfig" - "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-protocol/auth" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" + "github.com/stoatchat/livekit-protocol/utils/guid" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/livekit-server/pkg/telemetry/prometheus" - "github.com/livekit/livekit-server/pkg/testutils" - testclient "github.com/livekit/livekit-server/test/client" + "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-server/pkg/telemetry/prometheus" + "github.com/stoatchat/livekit-server/pkg/testutils" + testclient "github.com/stoatchat/livekit-server/test/client" ) const ( diff --git a/test/multinode_roomservice_test.go b/test/multinode_roomservice_test.go index 7bec21b4..6ec5fcbf 100644 --- a/test/multinode_roomservice_test.go +++ b/test/multinode_roomservice_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/testutils" + "github.com/stoatchat/livekit-server/pkg/testutils" ) func TestMultiNodeRoomList(t *testing.T) { diff --git a/test/multinode_test.go b/test/multinode_test.go index 25372e3a..c0c764a2 100644 --- a/test/multinode_test.go +++ b/test/multinode_test.go @@ -21,12 +21,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/livekit/protocol/auth" - "github.com/livekit/protocol/livekit" + "github.com/stoatchat/livekit-protocol/auth" + "github.com/stoatchat/livekit-protocol/livekit" - "github.com/livekit/livekit-server/pkg/rtc" - "github.com/livekit/livekit-server/pkg/testutils" - "github.com/livekit/livekit-server/test/client" + "github.com/stoatchat/livekit-server/pkg/rtc" + "github.com/stoatchat/livekit-server/pkg/testutils" + "github.com/stoatchat/livekit-server/test/client" ) func TestMultiNodeRouting(t *testing.T) { diff --git a/test/scenarios.go b/test/scenarios.go index ef73aa41..79293f3c 100644 --- a/test/scenarios.go +++ b/test/scenarios.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/testutils" - testclient "github.com/livekit/livekit-server/test/client" + "github.com/stoatchat/livekit-server/pkg/testutils" + testclient "github.com/stoatchat/livekit-server/test/client" ) // a scenario with lots of clients connecting, publishing, and leaving at random periods diff --git a/test/singlenode_test.go b/test/singlenode_test.go index 510fcf08..292322e9 100644 --- a/test/singlenode_test.go +++ b/test/singlenode_test.go @@ -32,16 +32,16 @@ import ( "github.com/twitchtv/twirp" "go.uber.org/atomic" - "github.com/livekit/protocol/auth" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" + "github.com/stoatchat/livekit-protocol/auth" + "github.com/stoatchat/livekit-protocol/livekit" + "github.com/stoatchat/livekit-protocol/logger" - "github.com/livekit/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/rtc" - "github.com/livekit/livekit-server/pkg/sfu/datachannel" - "github.com/livekit/livekit-server/pkg/sfu/mime" - "github.com/livekit/livekit-server/pkg/testutils" - testclient "github.com/livekit/livekit-server/test/client" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/rtc" + "github.com/stoatchat/livekit-server/pkg/sfu/datachannel" + "github.com/stoatchat/livekit-server/pkg/sfu/mime" + "github.com/stoatchat/livekit-server/pkg/testutils" + testclient "github.com/stoatchat/livekit-server/test/client" ) const ( diff --git a/test/webhook_test.go b/test/webhook_test.go index 040130dc..a991f46c 100644 --- a/test/webhook_test.go +++ b/test/webhook_test.go @@ -27,17 +27,17 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" - "github.com/livekit/protocol/auth" - "github.com/livekit/protocol/livekit" - "github.com/livekit/protocol/logger" - "github.com/livekit/protocol/utils/guid" - "github.com/livekit/protocol/webhook" + "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/livekit-server/pkg/config" - "github.com/livekit/livekit-server/pkg/routing" - "github.com/livekit/livekit-server/pkg/rtc/types" - "github.com/livekit/livekit-server/pkg/service" - "github.com/livekit/livekit-server/pkg/testutils" + "github.com/stoatchat/livekit-server/pkg/config" + "github.com/stoatchat/livekit-server/pkg/routing" + "github.com/stoatchat/livekit-server/pkg/rtc/types" + "github.com/stoatchat/livekit-server/pkg/service" + "github.com/stoatchat/livekit-server/pkg/testutils" ) func TestWebhooks(t *testing.T) {