From 8dbe9bdbb33806741289126cad476e6f84c3140f Mon Sep 17 00:00:00 2001 From: lukasIO Date: Wed, 6 Mar 2024 14:21:15 +0100 Subject: [PATCH] Move go code back to root --- .changeset/config.json | 2 +- .github/workflows/buildtest.yaml | 3 - .github/workflows/generate.yaml | 13 ++-- .github/workflows/release-js.yaml | 60 ------------------- .github/workflows/release.yaml | 4 ++ {packages/golang/auth => auth}/accesstoken.go | 0 .../golang/auth => auth}/accesstoken_test.go | 0 .../authfakes/fake_key_provider.go | 0 .../authfakes/fake_token_verifier.go | 0 {packages/golang/auth => auth}/grants.go | 0 {packages/golang/auth => auth}/grants_test.go | 0 {packages/golang/auth => auth}/interfaces.go | 0 {packages/golang/auth => auth}/provider.go | 0 .../golang/auth => auth}/provider_test.go | 0 {packages/golang/auth => auth}/verifier.go | 0 .../golang/auth => auth}/verifier_test.go | 0 packages/golang/bootstrap.sh => bootstrap.sh | 0 {packages/golang/egress => egress}/errors.go | 0 {packages/golang/egress => egress}/token.go | 0 {packages/golang/egress => egress}/types.go | 0 .../golang/egress => egress}/types_test.go | 0 packages/golang/go.mod => go.mod | 0 packages/golang/go.sum => go.sum | 0 go.work | 3 - go.work.sum | 1 - {packages/golang/infra => infra}/link.pb.go | 0 .../golang/infra => infra}/link_grpc.pb.go | 0 .../golang/ingress => ingress}/errors.go | 0 {packages/golang/ingress => ingress}/token.go | 0 .../golang/ingress => ingress}/validation.go | 0 .../ingress => ingress}/validation_test.go | 0 .../golang/livekit => livekit}/README.md | 0 .../livekit => livekit}/livekit_agent.pb.go | 0 .../livekit_analytics.pb.go | 0 .../livekit_analytics_grpc.pb.go | 0 .../livekit => livekit}/livekit_egress.pb.go | 0 .../livekit_egress.twirp.go | 0 .../livekit => livekit}/livekit_ingress.pb.go | 0 .../livekit_ingress.twirp.go | 0 .../livekit_internal.pb.go | 0 .../livekit => livekit}/livekit_models.pb.go | 0 .../livekit => livekit}/livekit_room.pb.go | 0 .../livekit => livekit}/livekit_room.twirp.go | 0 .../livekit => livekit}/livekit_rtc.pb.go | 0 .../livekit => livekit}/livekit_sip.pb.go | 0 .../livekit => livekit}/livekit_sip.twirp.go | 0 .../livekit => livekit}/livekit_webhook.pb.go | 0 {packages/golang/livekit => livekit}/types.go | 0 {packages/golang/logger => logger}/config.go | 0 {packages/golang/logger => logger}/logger.go | 0 .../golang/logger => logger}/logger_test.go | 0 .../pionlogger/logadapter.go | 0 .../logger => logger}/pionlogger/logger.go | 0 {packages/golang/logger => logger}/proto.go | 0 .../logger => logger}/zaputil/deferrer.go | 0 .../zaputil/deferrer_test.go | 0 .../logger => logger}/zaputil/encoder.go | 0 .../logger => logger}/zaputil/fieldsampler.go | 0 .../zaputil/fieldsampler_test.go | 0 .../logger => logger}/zaputil/sampler.go | 0 .../logger => logger}/zaputil/zaputil.go | 0 .../logger => logger}/zaputil/zaputil_test.go | 0 packages/golang/magefile.go => magefile.go | 8 +-- package.json | 3 +- packages/golang/package.json | 5 -- pnpm-workspace.yaml | 1 + {packages/golang/pprof => pprof}/pprof.go | 0 .../golang/psrpc => psrpc}/compilercheck.go | 0 {packages/golang/psrpc => psrpc}/errors.go | 0 {packages/golang/redis => redis}/redis.go | 0 {packages/golang/rpc => rpc}/agent.pb.go | 0 {packages/golang/rpc => rpc}/agent.psrpc.go | 0 {packages/golang/rpc => rpc}/egress.pb.go | 0 {packages/golang/rpc => rpc}/egress.psrpc.go | 0 {packages/golang/rpc => rpc}/egress_client.go | 0 {packages/golang/rpc => rpc}/ingress.pb.go | 0 {packages/golang/rpc => rpc}/ingress.psrpc.go | 0 .../golang/rpc => rpc}/ingress_client.go | 0 {packages/golang/rpc => rpc}/io.pb.go | 0 {packages/golang/rpc => rpc}/io.psrpc.go | 0 {packages/golang/rpc => rpc}/keepalive.pb.go | 0 .../golang/rpc => rpc}/keepalive.psrpc.go | 0 {packages/golang/rpc => rpc}/logging.go | 0 {packages/golang/rpc => rpc}/metrics.go | 0 .../golang/rpc => rpc}/participant.pb.go | 0 .../golang/rpc => rpc}/participant.psrpc.go | 0 {packages/golang/rpc => rpc}/race.go | 0 {packages/golang/rpc => rpc}/room.pb.go | 0 {packages/golang/rpc => rpc}/room.psrpc.go | 0 .../rpcfakes/fake_keepalive_pub_sub.go | 0 .../rpcfakes/fake_typed_participant_client.go | 0 .../rpcfakes/fake_typed_room_client.go | 0 {packages/golang/rpc => rpc}/signal.pb.go | 0 {packages/golang/rpc => rpc}/signal.psrpc.go | 0 {packages/golang/rpc => rpc}/sip.pb.go | 0 {packages/golang/rpc => rpc}/sip.psrpc.go | 0 {packages/golang/rpc => rpc}/sip_client.go | 0 {packages/golang/rpc => rpc}/typed_api.go | 0 {packages/golang/sdp => sdp}/sdp.go | 0 {packages/golang/sip => sip}/sip.go | 0 {packages/golang/sip => sip}/sip_test.go | 0 {packages/golang/sip => sip}/token.go | 0 {packages/golang/tools => tools}/tools.go | 0 {packages/golang/tracer => tracer}/tracer.go | 0 {packages/golang/utils => utils}/bitmap.go | 0 .../golang/utils => utils}/bitmap_test.go | 0 {packages/golang/utils => utils}/codec.go | 0 .../utils => utils}/connectionquality.go | 0 {packages/golang/utils => utils}/cpu.go | 0 {packages/golang/utils => utils}/cpu_all.go | 0 .../golang/utils => utils}/cpu_darwin.go | 0 {packages/golang/utils => utils}/cpu_linux.go | 0 {packages/golang/utils => utils}/cpu_null.go | 0 .../golang/utils => utils}/dedupedslice.go | 0 .../utils => utils}/dedupedslice_test.go | 0 {packages/golang/utils => utils}/err_array.go | 0 .../golang/utils => utils}/err_array_test.go | 0 .../golang/utils => utils}/event_emitter.go | 0 .../utils => utils}/event_emitter_test.go | 0 {packages/golang/utils => utils}/graph.go | 0 .../golang/utils => utils}/graph_test.go | 0 {packages/golang/utils => utils}/id.go | 0 {packages/golang/utils => utils}/id_test.go | 0 .../golang/utils => utils}/lock_tracker.go | 0 .../utils => utils}/lock_tracker_test.go | 0 {packages/golang/utils => utils}/math.go | 0 {packages/golang/utils => utils}/messaging.go | 0 .../golang/utils => utils}/multitonservice.go | 0 .../utils => utils}/multitonservice_test.go | 0 {packages/golang/utils => utils}/must.go | 0 {packages/golang/utils => utils}/must/must.go | 0 {packages/golang/utils => utils}/parallel.go | 0 .../golang/utils => utils}/parallel_test.go | 0 .../golang/utils => utils}/protoproxy.go | 0 .../golang/utils => utils}/protoproxy_test.go | 0 {packages/golang/utils => utils}/redact.go | 0 {packages/golang/utils => utils}/rtpstats.go | 0 {packages/golang/utils => utils}/secret.go | 0 .../utils => utils}/timed_aggregator.go | 0 .../utils => utils}/timed_aggregator_test.go | 0 .../golang/utils => utils}/timed_version.go | 0 .../utils => utils}/timed_version_test.go | 0 .../golang/utils => utils}/timeoutqueue.go | 0 .../utils => utils}/timeoutqueue_test.go | 0 .../utils => utils}/timeseries/timeseries.go | 0 .../timeseries/timeseries_test.go | 0 {packages/golang/utils => utils}/welford.go | 0 .../golang/utils => utils}/workergroup.go | 0 .../golang/webhook => webhook}/consts.go | 0 .../golang/webhook => webhook}/notifier.go | 0 .../webhook => webhook}/url_notifier.go | 0 .../golang/webhook => webhook}/verifier.go | 0 .../webhook => webhook}/webhook_test.go | 0 {packages/golang/xtls => xtls}/tls.go | 0 154 files changed, 18 insertions(+), 85 deletions(-) delete mode 100644 .github/workflows/release-js.yaml rename {packages/golang/auth => auth}/accesstoken.go (100%) rename {packages/golang/auth => auth}/accesstoken_test.go (100%) rename {packages/golang/auth => auth}/authfakes/fake_key_provider.go (100%) rename {packages/golang/auth => auth}/authfakes/fake_token_verifier.go (100%) rename {packages/golang/auth => auth}/grants.go (100%) rename {packages/golang/auth => auth}/grants_test.go (100%) rename {packages/golang/auth => auth}/interfaces.go (100%) rename {packages/golang/auth => auth}/provider.go (100%) rename {packages/golang/auth => auth}/provider_test.go (100%) rename {packages/golang/auth => auth}/verifier.go (100%) rename {packages/golang/auth => auth}/verifier_test.go (100%) rename packages/golang/bootstrap.sh => bootstrap.sh (100%) rename {packages/golang/egress => egress}/errors.go (100%) rename {packages/golang/egress => egress}/token.go (100%) rename {packages/golang/egress => egress}/types.go (100%) rename {packages/golang/egress => egress}/types_test.go (100%) rename packages/golang/go.mod => go.mod (100%) rename packages/golang/go.sum => go.sum (100%) delete mode 100644 go.work delete mode 100644 go.work.sum rename {packages/golang/infra => infra}/link.pb.go (100%) rename {packages/golang/infra => infra}/link_grpc.pb.go (100%) rename {packages/golang/ingress => ingress}/errors.go (100%) rename {packages/golang/ingress => ingress}/token.go (100%) rename {packages/golang/ingress => ingress}/validation.go (100%) rename {packages/golang/ingress => ingress}/validation_test.go (100%) rename {packages/golang/livekit => livekit}/README.md (100%) rename {packages/golang/livekit => livekit}/livekit_agent.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_analytics.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_analytics_grpc.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_egress.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_egress.twirp.go (100%) rename {packages/golang/livekit => livekit}/livekit_ingress.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_ingress.twirp.go (100%) rename {packages/golang/livekit => livekit}/livekit_internal.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_models.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_room.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_room.twirp.go (100%) rename {packages/golang/livekit => livekit}/livekit_rtc.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_sip.pb.go (100%) rename {packages/golang/livekit => livekit}/livekit_sip.twirp.go (100%) rename {packages/golang/livekit => livekit}/livekit_webhook.pb.go (100%) rename {packages/golang/livekit => livekit}/types.go (100%) rename {packages/golang/logger => logger}/config.go (100%) rename {packages/golang/logger => logger}/logger.go (100%) rename {packages/golang/logger => logger}/logger_test.go (100%) rename {packages/golang/logger => logger}/pionlogger/logadapter.go (100%) rename {packages/golang/logger => logger}/pionlogger/logger.go (100%) rename {packages/golang/logger => logger}/proto.go (100%) rename {packages/golang/logger => logger}/zaputil/deferrer.go (100%) rename {packages/golang/logger => logger}/zaputil/deferrer_test.go (100%) rename {packages/golang/logger => logger}/zaputil/encoder.go (100%) rename {packages/golang/logger => logger}/zaputil/fieldsampler.go (100%) rename {packages/golang/logger => logger}/zaputil/fieldsampler_test.go (100%) rename {packages/golang/logger => logger}/zaputil/sampler.go (100%) rename {packages/golang/logger => logger}/zaputil/zaputil.go (100%) rename {packages/golang/logger => logger}/zaputil/zaputil_test.go (100%) rename packages/golang/magefile.go => magefile.go (98%) delete mode 100644 packages/golang/package.json rename {packages/golang/pprof => pprof}/pprof.go (100%) rename {packages/golang/psrpc => psrpc}/compilercheck.go (100%) rename {packages/golang/psrpc => psrpc}/errors.go (100%) rename {packages/golang/redis => redis}/redis.go (100%) rename {packages/golang/rpc => rpc}/agent.pb.go (100%) rename {packages/golang/rpc => rpc}/agent.psrpc.go (100%) rename {packages/golang/rpc => rpc}/egress.pb.go (100%) rename {packages/golang/rpc => rpc}/egress.psrpc.go (100%) rename {packages/golang/rpc => rpc}/egress_client.go (100%) rename {packages/golang/rpc => rpc}/ingress.pb.go (100%) rename {packages/golang/rpc => rpc}/ingress.psrpc.go (100%) rename {packages/golang/rpc => rpc}/ingress_client.go (100%) rename {packages/golang/rpc => rpc}/io.pb.go (100%) rename {packages/golang/rpc => rpc}/io.psrpc.go (100%) rename {packages/golang/rpc => rpc}/keepalive.pb.go (100%) rename {packages/golang/rpc => rpc}/keepalive.psrpc.go (100%) rename {packages/golang/rpc => rpc}/logging.go (100%) rename {packages/golang/rpc => rpc}/metrics.go (100%) rename {packages/golang/rpc => rpc}/participant.pb.go (100%) rename {packages/golang/rpc => rpc}/participant.psrpc.go (100%) rename {packages/golang/rpc => rpc}/race.go (100%) rename {packages/golang/rpc => rpc}/room.pb.go (100%) rename {packages/golang/rpc => rpc}/room.psrpc.go (100%) rename {packages/golang/rpc => rpc}/rpcfakes/fake_keepalive_pub_sub.go (100%) rename {packages/golang/rpc => rpc}/rpcfakes/fake_typed_participant_client.go (100%) rename {packages/golang/rpc => rpc}/rpcfakes/fake_typed_room_client.go (100%) rename {packages/golang/rpc => rpc}/signal.pb.go (100%) rename {packages/golang/rpc => rpc}/signal.psrpc.go (100%) rename {packages/golang/rpc => rpc}/sip.pb.go (100%) rename {packages/golang/rpc => rpc}/sip.psrpc.go (100%) rename {packages/golang/rpc => rpc}/sip_client.go (100%) rename {packages/golang/rpc => rpc}/typed_api.go (100%) rename {packages/golang/sdp => sdp}/sdp.go (100%) rename {packages/golang/sip => sip}/sip.go (100%) rename {packages/golang/sip => sip}/sip_test.go (100%) rename {packages/golang/sip => sip}/token.go (100%) rename {packages/golang/tools => tools}/tools.go (100%) rename {packages/golang/tracer => tracer}/tracer.go (100%) rename {packages/golang/utils => utils}/bitmap.go (100%) rename {packages/golang/utils => utils}/bitmap_test.go (100%) rename {packages/golang/utils => utils}/codec.go (100%) rename {packages/golang/utils => utils}/connectionquality.go (100%) rename {packages/golang/utils => utils}/cpu.go (100%) rename {packages/golang/utils => utils}/cpu_all.go (100%) rename {packages/golang/utils => utils}/cpu_darwin.go (100%) rename {packages/golang/utils => utils}/cpu_linux.go (100%) rename {packages/golang/utils => utils}/cpu_null.go (100%) rename {packages/golang/utils => utils}/dedupedslice.go (100%) rename {packages/golang/utils => utils}/dedupedslice_test.go (100%) rename {packages/golang/utils => utils}/err_array.go (100%) rename {packages/golang/utils => utils}/err_array_test.go (100%) rename {packages/golang/utils => utils}/event_emitter.go (100%) rename {packages/golang/utils => utils}/event_emitter_test.go (100%) rename {packages/golang/utils => utils}/graph.go (100%) rename {packages/golang/utils => utils}/graph_test.go (100%) rename {packages/golang/utils => utils}/id.go (100%) rename {packages/golang/utils => utils}/id_test.go (100%) rename {packages/golang/utils => utils}/lock_tracker.go (100%) rename {packages/golang/utils => utils}/lock_tracker_test.go (100%) rename {packages/golang/utils => utils}/math.go (100%) rename {packages/golang/utils => utils}/messaging.go (100%) rename {packages/golang/utils => utils}/multitonservice.go (100%) rename {packages/golang/utils => utils}/multitonservice_test.go (100%) rename {packages/golang/utils => utils}/must.go (100%) rename {packages/golang/utils => utils}/must/must.go (100%) rename {packages/golang/utils => utils}/parallel.go (100%) rename {packages/golang/utils => utils}/parallel_test.go (100%) rename {packages/golang/utils => utils}/protoproxy.go (100%) rename {packages/golang/utils => utils}/protoproxy_test.go (100%) rename {packages/golang/utils => utils}/redact.go (100%) rename {packages/golang/utils => utils}/rtpstats.go (100%) rename {packages/golang/utils => utils}/secret.go (100%) rename {packages/golang/utils => utils}/timed_aggregator.go (100%) rename {packages/golang/utils => utils}/timed_aggregator_test.go (100%) rename {packages/golang/utils => utils}/timed_version.go (100%) rename {packages/golang/utils => utils}/timed_version_test.go (100%) rename {packages/golang/utils => utils}/timeoutqueue.go (100%) rename {packages/golang/utils => utils}/timeoutqueue_test.go (100%) rename {packages/golang/utils => utils}/timeseries/timeseries.go (100%) rename {packages/golang/utils => utils}/timeseries/timeseries_test.go (100%) rename {packages/golang/utils => utils}/welford.go (100%) rename {packages/golang/utils => utils}/workergroup.go (100%) rename {packages/golang/webhook => webhook}/consts.go (100%) rename {packages/golang/webhook => webhook}/notifier.go (100%) rename {packages/golang/webhook => webhook}/url_notifier.go (100%) rename {packages/golang/webhook => webhook}/verifier.go (100%) rename {packages/golang/webhook => webhook}/webhook_test.go (100%) rename {packages/golang/xtls => xtls}/tls.go (100%) diff --git a/.changeset/config.json b/.changeset/config.json index 3de7c939..e1935b98 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -5,7 +5,7 @@ { "repo": "livekit/protocol" } ], "commit": false, - "fixed": [], + "fixed": [["github.com/livekit/protocol", "@livekit/protocol"]], "linked": [], "access": "public", "baseBranch": "main", diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml index c63ddf1c..5fe7250b 100644 --- a/.github/workflows/buildtest.yaml +++ b/.github/workflows/buildtest.yaml @@ -43,7 +43,6 @@ jobs: - name: Set up gotestfmt run: go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@v2.4.1 - working-directory: ./packages/golang - name: Download Go modules run: go mod download @@ -54,10 +53,8 @@ jobs: with: checks: '["all", "-ST1000", "-ST1003", "-ST1020", "-ST1021", "-ST1022", "-SA1019"]' install-go: false - working-directory: ./packages/golang - name: Test run: | set -euo pipefail MallocNanoZone=0 go test -race -json -v ./... 2>&1 | gotestfmt - working-directory: ./packages/golang diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index a63d08fa..aa354b5f 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -34,8 +34,6 @@ jobs: uses: actions/setup-go@v5 with: go-version: ">=1.20" - cache-dependency-path: | - packages/golang/go.sum - name: Go mod tidy run: go mod tidy @@ -49,29 +47,30 @@ jobs: - name: Bootstrap run: mage bootstrap - working-directory: ./packages/golang - name: Generate Protobuf run: mage proto - working-directory: ./packages/golang - uses: pnpm/action-setup@v2 with: version: 8 + - name: Use Node.js 20 uses: actions/setup-node@v4 with: node-version: 20 cache: "pnpm" - - name: Install dependencies + - name: Install JS dependencies run: pnpm install - - name: Generate JS files + + - name: Test generate JS files run: | pnpm --filter @livekit/protocol run generate:proto + - name: Add changes uses: EndBug/add-and-commit@v9 with: - add: '["packages"]' + add: '["livekit", "rpc", "infra"]' default_author: github_actions message: generated protobuf diff --git a/.github/workflows/release-js.yaml b/.github/workflows/release-js.yaml deleted file mode 100644 index 44238ca4..00000000 --- a/.github/workflows/release-js.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2023 LiveKit, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: Generate and release JS protocol package - -on: - workflow_dispatch: - push: - branches: ["main"] - -defaults: - run: - working-directory: ./packages/js - -jobs: - generate: - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v2 - with: - version: 8 - - name: Use Node.js 20 - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: "pnpm" - cache-dependency-path: "packages/js/pnpm-lock.yaml" - - name: Install Protoc - uses: arduino/setup-protoc@v3 - - name: Install dependencies - run: pnpm install - - name: Version package - if: startsWith(github.event.ref, 'refs/tags/v') - run: npm version from-git - - name: Generate files - run: | - pnpm generate:version - pnpm generate:proto - - name: Add changes - uses: EndBug/add-and-commit@v9 - with: - add: '["packages/js"]' - default_author: github_actions - message: auto-generated JS files - - name: Publish - if: startsWith(github.event.ref, 'refs/tags/v') - run: pnpm ci:publish diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0b965519..877c0da7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,16 +13,20 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v2 with: version: 8 + - name: Use Node.js 20 uses: actions/setup-node@v4 with: node-version: 20 cache: "pnpm" + - name: Install dependencies run: pnpm install + - name: Create Release Pull Request or Publish packages id: changesets uses: changesets/action@v1 diff --git a/packages/golang/auth/accesstoken.go b/auth/accesstoken.go similarity index 100% rename from packages/golang/auth/accesstoken.go rename to auth/accesstoken.go diff --git a/packages/golang/auth/accesstoken_test.go b/auth/accesstoken_test.go similarity index 100% rename from packages/golang/auth/accesstoken_test.go rename to auth/accesstoken_test.go diff --git a/packages/golang/auth/authfakes/fake_key_provider.go b/auth/authfakes/fake_key_provider.go similarity index 100% rename from packages/golang/auth/authfakes/fake_key_provider.go rename to auth/authfakes/fake_key_provider.go diff --git a/packages/golang/auth/authfakes/fake_token_verifier.go b/auth/authfakes/fake_token_verifier.go similarity index 100% rename from packages/golang/auth/authfakes/fake_token_verifier.go rename to auth/authfakes/fake_token_verifier.go diff --git a/packages/golang/auth/grants.go b/auth/grants.go similarity index 100% rename from packages/golang/auth/grants.go rename to auth/grants.go diff --git a/packages/golang/auth/grants_test.go b/auth/grants_test.go similarity index 100% rename from packages/golang/auth/grants_test.go rename to auth/grants_test.go diff --git a/packages/golang/auth/interfaces.go b/auth/interfaces.go similarity index 100% rename from packages/golang/auth/interfaces.go rename to auth/interfaces.go diff --git a/packages/golang/auth/provider.go b/auth/provider.go similarity index 100% rename from packages/golang/auth/provider.go rename to auth/provider.go diff --git a/packages/golang/auth/provider_test.go b/auth/provider_test.go similarity index 100% rename from packages/golang/auth/provider_test.go rename to auth/provider_test.go diff --git a/packages/golang/auth/verifier.go b/auth/verifier.go similarity index 100% rename from packages/golang/auth/verifier.go rename to auth/verifier.go diff --git a/packages/golang/auth/verifier_test.go b/auth/verifier_test.go similarity index 100% rename from packages/golang/auth/verifier_test.go rename to auth/verifier_test.go diff --git a/packages/golang/bootstrap.sh b/bootstrap.sh similarity index 100% rename from packages/golang/bootstrap.sh rename to bootstrap.sh diff --git a/packages/golang/egress/errors.go b/egress/errors.go similarity index 100% rename from packages/golang/egress/errors.go rename to egress/errors.go diff --git a/packages/golang/egress/token.go b/egress/token.go similarity index 100% rename from packages/golang/egress/token.go rename to egress/token.go diff --git a/packages/golang/egress/types.go b/egress/types.go similarity index 100% rename from packages/golang/egress/types.go rename to egress/types.go diff --git a/packages/golang/egress/types_test.go b/egress/types_test.go similarity index 100% rename from packages/golang/egress/types_test.go rename to egress/types_test.go diff --git a/packages/golang/go.mod b/go.mod similarity index 100% rename from packages/golang/go.mod rename to go.mod diff --git a/packages/golang/go.sum b/go.sum similarity index 100% rename from packages/golang/go.sum rename to go.sum diff --git a/go.work b/go.work deleted file mode 100644 index a4d6f1c3..00000000 --- a/go.work +++ /dev/null @@ -1,3 +0,0 @@ -go 1.21.5 - -use ./packages/golang diff --git a/go.work.sum b/go.work.sum deleted file mode 100644 index fae0abd7..00000000 --- a/go.work.sum +++ /dev/null @@ -1 +0,0 @@ -google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= diff --git a/packages/golang/infra/link.pb.go b/infra/link.pb.go similarity index 100% rename from packages/golang/infra/link.pb.go rename to infra/link.pb.go diff --git a/packages/golang/infra/link_grpc.pb.go b/infra/link_grpc.pb.go similarity index 100% rename from packages/golang/infra/link_grpc.pb.go rename to infra/link_grpc.pb.go diff --git a/packages/golang/ingress/errors.go b/ingress/errors.go similarity index 100% rename from packages/golang/ingress/errors.go rename to ingress/errors.go diff --git a/packages/golang/ingress/token.go b/ingress/token.go similarity index 100% rename from packages/golang/ingress/token.go rename to ingress/token.go diff --git a/packages/golang/ingress/validation.go b/ingress/validation.go similarity index 100% rename from packages/golang/ingress/validation.go rename to ingress/validation.go diff --git a/packages/golang/ingress/validation_test.go b/ingress/validation_test.go similarity index 100% rename from packages/golang/ingress/validation_test.go rename to ingress/validation_test.go diff --git a/packages/golang/livekit/README.md b/livekit/README.md similarity index 100% rename from packages/golang/livekit/README.md rename to livekit/README.md diff --git a/packages/golang/livekit/livekit_agent.pb.go b/livekit/livekit_agent.pb.go similarity index 100% rename from packages/golang/livekit/livekit_agent.pb.go rename to livekit/livekit_agent.pb.go diff --git a/packages/golang/livekit/livekit_analytics.pb.go b/livekit/livekit_analytics.pb.go similarity index 100% rename from packages/golang/livekit/livekit_analytics.pb.go rename to livekit/livekit_analytics.pb.go diff --git a/packages/golang/livekit/livekit_analytics_grpc.pb.go b/livekit/livekit_analytics_grpc.pb.go similarity index 100% rename from packages/golang/livekit/livekit_analytics_grpc.pb.go rename to livekit/livekit_analytics_grpc.pb.go diff --git a/packages/golang/livekit/livekit_egress.pb.go b/livekit/livekit_egress.pb.go similarity index 100% rename from packages/golang/livekit/livekit_egress.pb.go rename to livekit/livekit_egress.pb.go diff --git a/packages/golang/livekit/livekit_egress.twirp.go b/livekit/livekit_egress.twirp.go similarity index 100% rename from packages/golang/livekit/livekit_egress.twirp.go rename to livekit/livekit_egress.twirp.go diff --git a/packages/golang/livekit/livekit_ingress.pb.go b/livekit/livekit_ingress.pb.go similarity index 100% rename from packages/golang/livekit/livekit_ingress.pb.go rename to livekit/livekit_ingress.pb.go diff --git a/packages/golang/livekit/livekit_ingress.twirp.go b/livekit/livekit_ingress.twirp.go similarity index 100% rename from packages/golang/livekit/livekit_ingress.twirp.go rename to livekit/livekit_ingress.twirp.go diff --git a/packages/golang/livekit/livekit_internal.pb.go b/livekit/livekit_internal.pb.go similarity index 100% rename from packages/golang/livekit/livekit_internal.pb.go rename to livekit/livekit_internal.pb.go diff --git a/packages/golang/livekit/livekit_models.pb.go b/livekit/livekit_models.pb.go similarity index 100% rename from packages/golang/livekit/livekit_models.pb.go rename to livekit/livekit_models.pb.go diff --git a/packages/golang/livekit/livekit_room.pb.go b/livekit/livekit_room.pb.go similarity index 100% rename from packages/golang/livekit/livekit_room.pb.go rename to livekit/livekit_room.pb.go diff --git a/packages/golang/livekit/livekit_room.twirp.go b/livekit/livekit_room.twirp.go similarity index 100% rename from packages/golang/livekit/livekit_room.twirp.go rename to livekit/livekit_room.twirp.go diff --git a/packages/golang/livekit/livekit_rtc.pb.go b/livekit/livekit_rtc.pb.go similarity index 100% rename from packages/golang/livekit/livekit_rtc.pb.go rename to livekit/livekit_rtc.pb.go diff --git a/packages/golang/livekit/livekit_sip.pb.go b/livekit/livekit_sip.pb.go similarity index 100% rename from packages/golang/livekit/livekit_sip.pb.go rename to livekit/livekit_sip.pb.go diff --git a/packages/golang/livekit/livekit_sip.twirp.go b/livekit/livekit_sip.twirp.go similarity index 100% rename from packages/golang/livekit/livekit_sip.twirp.go rename to livekit/livekit_sip.twirp.go diff --git a/packages/golang/livekit/livekit_webhook.pb.go b/livekit/livekit_webhook.pb.go similarity index 100% rename from packages/golang/livekit/livekit_webhook.pb.go rename to livekit/livekit_webhook.pb.go diff --git a/packages/golang/livekit/types.go b/livekit/types.go similarity index 100% rename from packages/golang/livekit/types.go rename to livekit/types.go diff --git a/packages/golang/logger/config.go b/logger/config.go similarity index 100% rename from packages/golang/logger/config.go rename to logger/config.go diff --git a/packages/golang/logger/logger.go b/logger/logger.go similarity index 100% rename from packages/golang/logger/logger.go rename to logger/logger.go diff --git a/packages/golang/logger/logger_test.go b/logger/logger_test.go similarity index 100% rename from packages/golang/logger/logger_test.go rename to logger/logger_test.go diff --git a/packages/golang/logger/pionlogger/logadapter.go b/logger/pionlogger/logadapter.go similarity index 100% rename from packages/golang/logger/pionlogger/logadapter.go rename to logger/pionlogger/logadapter.go diff --git a/packages/golang/logger/pionlogger/logger.go b/logger/pionlogger/logger.go similarity index 100% rename from packages/golang/logger/pionlogger/logger.go rename to logger/pionlogger/logger.go diff --git a/packages/golang/logger/proto.go b/logger/proto.go similarity index 100% rename from packages/golang/logger/proto.go rename to logger/proto.go diff --git a/packages/golang/logger/zaputil/deferrer.go b/logger/zaputil/deferrer.go similarity index 100% rename from packages/golang/logger/zaputil/deferrer.go rename to logger/zaputil/deferrer.go diff --git a/packages/golang/logger/zaputil/deferrer_test.go b/logger/zaputil/deferrer_test.go similarity index 100% rename from packages/golang/logger/zaputil/deferrer_test.go rename to logger/zaputil/deferrer_test.go diff --git a/packages/golang/logger/zaputil/encoder.go b/logger/zaputil/encoder.go similarity index 100% rename from packages/golang/logger/zaputil/encoder.go rename to logger/zaputil/encoder.go diff --git a/packages/golang/logger/zaputil/fieldsampler.go b/logger/zaputil/fieldsampler.go similarity index 100% rename from packages/golang/logger/zaputil/fieldsampler.go rename to logger/zaputil/fieldsampler.go diff --git a/packages/golang/logger/zaputil/fieldsampler_test.go b/logger/zaputil/fieldsampler_test.go similarity index 100% rename from packages/golang/logger/zaputil/fieldsampler_test.go rename to logger/zaputil/fieldsampler_test.go diff --git a/packages/golang/logger/zaputil/sampler.go b/logger/zaputil/sampler.go similarity index 100% rename from packages/golang/logger/zaputil/sampler.go rename to logger/zaputil/sampler.go diff --git a/packages/golang/logger/zaputil/zaputil.go b/logger/zaputil/zaputil.go similarity index 100% rename from packages/golang/logger/zaputil/zaputil.go rename to logger/zaputil/zaputil.go diff --git a/packages/golang/logger/zaputil/zaputil_test.go b/logger/zaputil/zaputil_test.go similarity index 100% rename from packages/golang/logger/zaputil/zaputil_test.go rename to logger/zaputil/zaputil_test.go diff --git a/packages/golang/magefile.go b/magefile.go similarity index 98% rename from packages/golang/magefile.go rename to magefile.go index 4b6ff08f..7dc6cfcc 100644 --- a/packages/golang/magefile.go +++ b/magefile.go @@ -101,7 +101,7 @@ func Proto() error { "--twirp_opt=paths=source_relative", "--plugin=go=" + protocGoPath, "--plugin=twirp=" + twirpPath, - "-I=../../protobufs", + "-I=./protobufs", }, twirpProtoFiles...) cmd := exec.Command(protoc, args...) connectStd(cmd) @@ -116,7 +116,7 @@ func Proto() error { "--go-grpc_opt=paths=source_relative", "--plugin=go=" + protocGoPath, "--plugin=go-grpc=" + protocGrpcGoPath, - "-I=../../protobufs", + "-I=./protobufs", }, grpcProtoFiles...) cmd = exec.Command(protoc, args...) connectStd(cmd) @@ -131,7 +131,7 @@ func Proto() error { "--go-grpc_opt=paths=source_relative", "--plugin=go=" + protocGoPath, "--plugin=go-grpc=" + protocGrpcGoPath, - "-I=../../protobufs", + "-I=./protobufs", }, infraProtoFiles...) cmd = exec.Command(protoc, args...) connectStd(cmd) @@ -161,7 +161,7 @@ func Proto() error { "--plugin=go=" + protocGoPath, "--plugin=psrpc=" + psrpcPath, "-I" + psrpcDir + "/protoc-gen-psrpc/options", - "-I=../../protobufs", + "-I=./protobufs", }, psrpcProtoFiles...) cmd = exec.Command(protoc, args...) mageutil.ConnectStd(cmd) diff --git a/package.json b/package.json index 8be9c647..600a8eb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { + "name": "github.com/livekit/protocol", "private": true, - "version": "0.0.1", + "version": "1.10.1", "scripts": { "version": "changeset version", "publish:ci": "pnpm --filter @livekit/protocol run build && changeset publish --dry-run" diff --git a/packages/golang/package.json b/packages/golang/package.json deleted file mode 100644 index 156f70f7..00000000 --- a/packages/golang/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "github.com/livekit/protocol", - "private": true, - "version": "1.10.1" -} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 46a22fbf..0093d24c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,3 @@ packages: - "packages/javascript" + - "./" diff --git a/packages/golang/pprof/pprof.go b/pprof/pprof.go similarity index 100% rename from packages/golang/pprof/pprof.go rename to pprof/pprof.go diff --git a/packages/golang/psrpc/compilercheck.go b/psrpc/compilercheck.go similarity index 100% rename from packages/golang/psrpc/compilercheck.go rename to psrpc/compilercheck.go diff --git a/packages/golang/psrpc/errors.go b/psrpc/errors.go similarity index 100% rename from packages/golang/psrpc/errors.go rename to psrpc/errors.go diff --git a/packages/golang/redis/redis.go b/redis/redis.go similarity index 100% rename from packages/golang/redis/redis.go rename to redis/redis.go diff --git a/packages/golang/rpc/agent.pb.go b/rpc/agent.pb.go similarity index 100% rename from packages/golang/rpc/agent.pb.go rename to rpc/agent.pb.go diff --git a/packages/golang/rpc/agent.psrpc.go b/rpc/agent.psrpc.go similarity index 100% rename from packages/golang/rpc/agent.psrpc.go rename to rpc/agent.psrpc.go diff --git a/packages/golang/rpc/egress.pb.go b/rpc/egress.pb.go similarity index 100% rename from packages/golang/rpc/egress.pb.go rename to rpc/egress.pb.go diff --git a/packages/golang/rpc/egress.psrpc.go b/rpc/egress.psrpc.go similarity index 100% rename from packages/golang/rpc/egress.psrpc.go rename to rpc/egress.psrpc.go diff --git a/packages/golang/rpc/egress_client.go b/rpc/egress_client.go similarity index 100% rename from packages/golang/rpc/egress_client.go rename to rpc/egress_client.go diff --git a/packages/golang/rpc/ingress.pb.go b/rpc/ingress.pb.go similarity index 100% rename from packages/golang/rpc/ingress.pb.go rename to rpc/ingress.pb.go diff --git a/packages/golang/rpc/ingress.psrpc.go b/rpc/ingress.psrpc.go similarity index 100% rename from packages/golang/rpc/ingress.psrpc.go rename to rpc/ingress.psrpc.go diff --git a/packages/golang/rpc/ingress_client.go b/rpc/ingress_client.go similarity index 100% rename from packages/golang/rpc/ingress_client.go rename to rpc/ingress_client.go diff --git a/packages/golang/rpc/io.pb.go b/rpc/io.pb.go similarity index 100% rename from packages/golang/rpc/io.pb.go rename to rpc/io.pb.go diff --git a/packages/golang/rpc/io.psrpc.go b/rpc/io.psrpc.go similarity index 100% rename from packages/golang/rpc/io.psrpc.go rename to rpc/io.psrpc.go diff --git a/packages/golang/rpc/keepalive.pb.go b/rpc/keepalive.pb.go similarity index 100% rename from packages/golang/rpc/keepalive.pb.go rename to rpc/keepalive.pb.go diff --git a/packages/golang/rpc/keepalive.psrpc.go b/rpc/keepalive.psrpc.go similarity index 100% rename from packages/golang/rpc/keepalive.psrpc.go rename to rpc/keepalive.psrpc.go diff --git a/packages/golang/rpc/logging.go b/rpc/logging.go similarity index 100% rename from packages/golang/rpc/logging.go rename to rpc/logging.go diff --git a/packages/golang/rpc/metrics.go b/rpc/metrics.go similarity index 100% rename from packages/golang/rpc/metrics.go rename to rpc/metrics.go diff --git a/packages/golang/rpc/participant.pb.go b/rpc/participant.pb.go similarity index 100% rename from packages/golang/rpc/participant.pb.go rename to rpc/participant.pb.go diff --git a/packages/golang/rpc/participant.psrpc.go b/rpc/participant.psrpc.go similarity index 100% rename from packages/golang/rpc/participant.psrpc.go rename to rpc/participant.psrpc.go diff --git a/packages/golang/rpc/race.go b/rpc/race.go similarity index 100% rename from packages/golang/rpc/race.go rename to rpc/race.go diff --git a/packages/golang/rpc/room.pb.go b/rpc/room.pb.go similarity index 100% rename from packages/golang/rpc/room.pb.go rename to rpc/room.pb.go diff --git a/packages/golang/rpc/room.psrpc.go b/rpc/room.psrpc.go similarity index 100% rename from packages/golang/rpc/room.psrpc.go rename to rpc/room.psrpc.go diff --git a/packages/golang/rpc/rpcfakes/fake_keepalive_pub_sub.go b/rpc/rpcfakes/fake_keepalive_pub_sub.go similarity index 100% rename from packages/golang/rpc/rpcfakes/fake_keepalive_pub_sub.go rename to rpc/rpcfakes/fake_keepalive_pub_sub.go diff --git a/packages/golang/rpc/rpcfakes/fake_typed_participant_client.go b/rpc/rpcfakes/fake_typed_participant_client.go similarity index 100% rename from packages/golang/rpc/rpcfakes/fake_typed_participant_client.go rename to rpc/rpcfakes/fake_typed_participant_client.go diff --git a/packages/golang/rpc/rpcfakes/fake_typed_room_client.go b/rpc/rpcfakes/fake_typed_room_client.go similarity index 100% rename from packages/golang/rpc/rpcfakes/fake_typed_room_client.go rename to rpc/rpcfakes/fake_typed_room_client.go diff --git a/packages/golang/rpc/signal.pb.go b/rpc/signal.pb.go similarity index 100% rename from packages/golang/rpc/signal.pb.go rename to rpc/signal.pb.go diff --git a/packages/golang/rpc/signal.psrpc.go b/rpc/signal.psrpc.go similarity index 100% rename from packages/golang/rpc/signal.psrpc.go rename to rpc/signal.psrpc.go diff --git a/packages/golang/rpc/sip.pb.go b/rpc/sip.pb.go similarity index 100% rename from packages/golang/rpc/sip.pb.go rename to rpc/sip.pb.go diff --git a/packages/golang/rpc/sip.psrpc.go b/rpc/sip.psrpc.go similarity index 100% rename from packages/golang/rpc/sip.psrpc.go rename to rpc/sip.psrpc.go diff --git a/packages/golang/rpc/sip_client.go b/rpc/sip_client.go similarity index 100% rename from packages/golang/rpc/sip_client.go rename to rpc/sip_client.go diff --git a/packages/golang/rpc/typed_api.go b/rpc/typed_api.go similarity index 100% rename from packages/golang/rpc/typed_api.go rename to rpc/typed_api.go diff --git a/packages/golang/sdp/sdp.go b/sdp/sdp.go similarity index 100% rename from packages/golang/sdp/sdp.go rename to sdp/sdp.go diff --git a/packages/golang/sip/sip.go b/sip/sip.go similarity index 100% rename from packages/golang/sip/sip.go rename to sip/sip.go diff --git a/packages/golang/sip/sip_test.go b/sip/sip_test.go similarity index 100% rename from packages/golang/sip/sip_test.go rename to sip/sip_test.go diff --git a/packages/golang/sip/token.go b/sip/token.go similarity index 100% rename from packages/golang/sip/token.go rename to sip/token.go diff --git a/packages/golang/tools/tools.go b/tools/tools.go similarity index 100% rename from packages/golang/tools/tools.go rename to tools/tools.go diff --git a/packages/golang/tracer/tracer.go b/tracer/tracer.go similarity index 100% rename from packages/golang/tracer/tracer.go rename to tracer/tracer.go diff --git a/packages/golang/utils/bitmap.go b/utils/bitmap.go similarity index 100% rename from packages/golang/utils/bitmap.go rename to utils/bitmap.go diff --git a/packages/golang/utils/bitmap_test.go b/utils/bitmap_test.go similarity index 100% rename from packages/golang/utils/bitmap_test.go rename to utils/bitmap_test.go diff --git a/packages/golang/utils/codec.go b/utils/codec.go similarity index 100% rename from packages/golang/utils/codec.go rename to utils/codec.go diff --git a/packages/golang/utils/connectionquality.go b/utils/connectionquality.go similarity index 100% rename from packages/golang/utils/connectionquality.go rename to utils/connectionquality.go diff --git a/packages/golang/utils/cpu.go b/utils/cpu.go similarity index 100% rename from packages/golang/utils/cpu.go rename to utils/cpu.go diff --git a/packages/golang/utils/cpu_all.go b/utils/cpu_all.go similarity index 100% rename from packages/golang/utils/cpu_all.go rename to utils/cpu_all.go diff --git a/packages/golang/utils/cpu_darwin.go b/utils/cpu_darwin.go similarity index 100% rename from packages/golang/utils/cpu_darwin.go rename to utils/cpu_darwin.go diff --git a/packages/golang/utils/cpu_linux.go b/utils/cpu_linux.go similarity index 100% rename from packages/golang/utils/cpu_linux.go rename to utils/cpu_linux.go diff --git a/packages/golang/utils/cpu_null.go b/utils/cpu_null.go similarity index 100% rename from packages/golang/utils/cpu_null.go rename to utils/cpu_null.go diff --git a/packages/golang/utils/dedupedslice.go b/utils/dedupedslice.go similarity index 100% rename from packages/golang/utils/dedupedslice.go rename to utils/dedupedslice.go diff --git a/packages/golang/utils/dedupedslice_test.go b/utils/dedupedslice_test.go similarity index 100% rename from packages/golang/utils/dedupedslice_test.go rename to utils/dedupedslice_test.go diff --git a/packages/golang/utils/err_array.go b/utils/err_array.go similarity index 100% rename from packages/golang/utils/err_array.go rename to utils/err_array.go diff --git a/packages/golang/utils/err_array_test.go b/utils/err_array_test.go similarity index 100% rename from packages/golang/utils/err_array_test.go rename to utils/err_array_test.go diff --git a/packages/golang/utils/event_emitter.go b/utils/event_emitter.go similarity index 100% rename from packages/golang/utils/event_emitter.go rename to utils/event_emitter.go diff --git a/packages/golang/utils/event_emitter_test.go b/utils/event_emitter_test.go similarity index 100% rename from packages/golang/utils/event_emitter_test.go rename to utils/event_emitter_test.go diff --git a/packages/golang/utils/graph.go b/utils/graph.go similarity index 100% rename from packages/golang/utils/graph.go rename to utils/graph.go diff --git a/packages/golang/utils/graph_test.go b/utils/graph_test.go similarity index 100% rename from packages/golang/utils/graph_test.go rename to utils/graph_test.go diff --git a/packages/golang/utils/id.go b/utils/id.go similarity index 100% rename from packages/golang/utils/id.go rename to utils/id.go diff --git a/packages/golang/utils/id_test.go b/utils/id_test.go similarity index 100% rename from packages/golang/utils/id_test.go rename to utils/id_test.go diff --git a/packages/golang/utils/lock_tracker.go b/utils/lock_tracker.go similarity index 100% rename from packages/golang/utils/lock_tracker.go rename to utils/lock_tracker.go diff --git a/packages/golang/utils/lock_tracker_test.go b/utils/lock_tracker_test.go similarity index 100% rename from packages/golang/utils/lock_tracker_test.go rename to utils/lock_tracker_test.go diff --git a/packages/golang/utils/math.go b/utils/math.go similarity index 100% rename from packages/golang/utils/math.go rename to utils/math.go diff --git a/packages/golang/utils/messaging.go b/utils/messaging.go similarity index 100% rename from packages/golang/utils/messaging.go rename to utils/messaging.go diff --git a/packages/golang/utils/multitonservice.go b/utils/multitonservice.go similarity index 100% rename from packages/golang/utils/multitonservice.go rename to utils/multitonservice.go diff --git a/packages/golang/utils/multitonservice_test.go b/utils/multitonservice_test.go similarity index 100% rename from packages/golang/utils/multitonservice_test.go rename to utils/multitonservice_test.go diff --git a/packages/golang/utils/must.go b/utils/must.go similarity index 100% rename from packages/golang/utils/must.go rename to utils/must.go diff --git a/packages/golang/utils/must/must.go b/utils/must/must.go similarity index 100% rename from packages/golang/utils/must/must.go rename to utils/must/must.go diff --git a/packages/golang/utils/parallel.go b/utils/parallel.go similarity index 100% rename from packages/golang/utils/parallel.go rename to utils/parallel.go diff --git a/packages/golang/utils/parallel_test.go b/utils/parallel_test.go similarity index 100% rename from packages/golang/utils/parallel_test.go rename to utils/parallel_test.go diff --git a/packages/golang/utils/protoproxy.go b/utils/protoproxy.go similarity index 100% rename from packages/golang/utils/protoproxy.go rename to utils/protoproxy.go diff --git a/packages/golang/utils/protoproxy_test.go b/utils/protoproxy_test.go similarity index 100% rename from packages/golang/utils/protoproxy_test.go rename to utils/protoproxy_test.go diff --git a/packages/golang/utils/redact.go b/utils/redact.go similarity index 100% rename from packages/golang/utils/redact.go rename to utils/redact.go diff --git a/packages/golang/utils/rtpstats.go b/utils/rtpstats.go similarity index 100% rename from packages/golang/utils/rtpstats.go rename to utils/rtpstats.go diff --git a/packages/golang/utils/secret.go b/utils/secret.go similarity index 100% rename from packages/golang/utils/secret.go rename to utils/secret.go diff --git a/packages/golang/utils/timed_aggregator.go b/utils/timed_aggregator.go similarity index 100% rename from packages/golang/utils/timed_aggregator.go rename to utils/timed_aggregator.go diff --git a/packages/golang/utils/timed_aggregator_test.go b/utils/timed_aggregator_test.go similarity index 100% rename from packages/golang/utils/timed_aggregator_test.go rename to utils/timed_aggregator_test.go diff --git a/packages/golang/utils/timed_version.go b/utils/timed_version.go similarity index 100% rename from packages/golang/utils/timed_version.go rename to utils/timed_version.go diff --git a/packages/golang/utils/timed_version_test.go b/utils/timed_version_test.go similarity index 100% rename from packages/golang/utils/timed_version_test.go rename to utils/timed_version_test.go diff --git a/packages/golang/utils/timeoutqueue.go b/utils/timeoutqueue.go similarity index 100% rename from packages/golang/utils/timeoutqueue.go rename to utils/timeoutqueue.go diff --git a/packages/golang/utils/timeoutqueue_test.go b/utils/timeoutqueue_test.go similarity index 100% rename from packages/golang/utils/timeoutqueue_test.go rename to utils/timeoutqueue_test.go diff --git a/packages/golang/utils/timeseries/timeseries.go b/utils/timeseries/timeseries.go similarity index 100% rename from packages/golang/utils/timeseries/timeseries.go rename to utils/timeseries/timeseries.go diff --git a/packages/golang/utils/timeseries/timeseries_test.go b/utils/timeseries/timeseries_test.go similarity index 100% rename from packages/golang/utils/timeseries/timeseries_test.go rename to utils/timeseries/timeseries_test.go diff --git a/packages/golang/utils/welford.go b/utils/welford.go similarity index 100% rename from packages/golang/utils/welford.go rename to utils/welford.go diff --git a/packages/golang/utils/workergroup.go b/utils/workergroup.go similarity index 100% rename from packages/golang/utils/workergroup.go rename to utils/workergroup.go diff --git a/packages/golang/webhook/consts.go b/webhook/consts.go similarity index 100% rename from packages/golang/webhook/consts.go rename to webhook/consts.go diff --git a/packages/golang/webhook/notifier.go b/webhook/notifier.go similarity index 100% rename from packages/golang/webhook/notifier.go rename to webhook/notifier.go diff --git a/packages/golang/webhook/url_notifier.go b/webhook/url_notifier.go similarity index 100% rename from packages/golang/webhook/url_notifier.go rename to webhook/url_notifier.go diff --git a/packages/golang/webhook/verifier.go b/webhook/verifier.go similarity index 100% rename from packages/golang/webhook/verifier.go rename to webhook/verifier.go diff --git a/packages/golang/webhook/webhook_test.go b/webhook/webhook_test.go similarity index 100% rename from packages/golang/webhook/webhook_test.go rename to webhook/webhook_test.go diff --git a/packages/golang/xtls/tls.go b/xtls/tls.go similarity index 100% rename from packages/golang/xtls/tls.go rename to xtls/tls.go