From 242862397ac0044895f0d351e86d693c4efdecae Mon Sep 17 00:00:00 2001 From: samosvalishe Date: Wed, 20 May 2026 12:39:26 +0300 Subject: [PATCH] =?UTF-8?q?chore:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D1=8C=20=D0=B2=20github.com/samosvalishe/btp;=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82=D1=8C=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - путь модуля: github.com/cacggghp/vk-turn-proxy → github.com/samosvalishe/btp - директории cmd: cmd/vk-turn-{client,server} → cmd/{client,server} - зависимости: pion/turn v5.0.4, kcp-go v5.6.72, smux v1.5.57, x/crypto v0.51, klauspost/{compress,cpuid,reedsolomon}, x/{net,sys,text,tools,mod,time} - README, workflows, GLOSSARY обновлены под новые пути --- .github/workflows/ci.yml | 4 +- .github/workflows/release.yml | 4 +- README.md | 46 ++++++++-------- cmd/{vk-turn-client => client}/main.go | 22 ++++---- cmd/{vk-turn-server => server}/main.go | 12 ++--- go.mod | 29 +++++----- go.sum | 56 +++++++++----------- internal/client/captcha/captcha.go | 4 +- internal/client/captcha/manual/manual.go | 6 +-- internal/client/dnsdial/doh.go | 2 +- internal/client/vkauth/auto_solver.go | 4 +- internal/client/vkauth/client.go | 2 +- internal/client/vkauth/solver.go | 4 +- internal/client/vkauth/token.go | 6 +-- internal/config/config.go | 4 +- internal/proxy/bondclient/bondclient.go | 8 +-- internal/proxy/bondserver/bondserver.go | 4 +- internal/proxy/bondserver/bondserver_test.go | 2 +- internal/proxy/common/common.go | 4 +- internal/proxy/tcpfwd/tcpfwd.go | 16 +++--- internal/proxy/tcpfwdserver/tcpfwdserver.go | 12 ++--- internal/proxy/udprelay/udprelay.go | 12 ++--- internal/proxy/udpserver/udpserver.go | 4 +- internal/transport/turndial/turndial.go | 2 +- notes/GLOSSARY.md | 8 +-- 25 files changed, 136 insertions(+), 141 deletions(-) rename cmd/{vk-turn-client => client}/main.go (84%) rename cmd/{vk-turn-server => server}/main.go (91%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abf2d15..04568dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -139,12 +139,12 @@ jobs: GOOS=$GOOS GOARCH=$GOARCH \ go build -ldflags "-s -w -checklinkname=0" -trimpath \ -o "dist/client-${GOOS}-${GOARCH}${ext}" \ - ./cmd/vk-turn-client + ./cmd/client GOOS=$GOOS GOARCH=$GOARCH \ go build -ldflags "-s -w -checklinkname=0" -trimpath \ -o "dist/server-${GOOS}-${GOARCH}${ext}" \ - ./cmd/vk-turn-server + ./cmd/server - name: Upload artifact uses: actions/upload-artifact@v6 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d95616..fdd728c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -134,12 +134,12 @@ jobs: GOOS=$GOOS GOARCH=$GOARCH GOARM=$GOARM GOMIPS=$GOMIPS \ go build -ldflags "-s -w -checklinkname=0" -trimpath \ -o "dist/client-${GOOS}-${GOARCH}${EXT}" \ - ./cmd/vk-turn-client + ./cmd/client GOOS=$GOOS GOARCH=$GOARCH GOARM=$GOARM GOMIPS=$GOMIPS \ go build -ldflags "-s -w -checklinkname=0" -trimpath \ -o "dist/server-${GOOS}-${GOARCH}${EXT}" \ - ./cmd/vk-turn-server + ./cmd/server - name: Upload artifact uses: actions/upload-artifact@v6 diff --git a/README.md b/README.md index 230fce0..972f251 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ WireGuard client -> 127.0.0.1:9000 -> VK TURN Proxy client Скачайте бинарник для Linux amd64: ```bash -curl -L -o server https://github.com/cacggghp/vk-turn-proxy/releases/latest/download/server-linux-amd64 +curl -L -o server https://github.com/samosvalishe/btp/releases/latest/download/server-linux-amd64 chmod +x server ``` @@ -99,7 +99,7 @@ MTU = 1280 Linux: ```bash -curl -L -o client https://github.com/cacggghp/vk-turn-proxy/releases/latest/download/client-linux-amd64 +curl -L -o client https://github.com/samosvalishe/btp/releases/latest/download/client-linux-amd64 chmod +x client ./client -listen 127.0.0.1:9000 -peer :56000 -vk-link "" | ./routes.sh ``` @@ -107,14 +107,14 @@ chmod +x client Windows PowerShell от администратора: ```powershell -Invoke-WebRequest -Uri https://github.com/cacggghp/vk-turn-proxy/releases/latest/download/client-windows-amd64.exe -OutFile client.exe +Invoke-WebRequest -Uri https://github.com/samosvalishe/btp/releases/latest/download/client-windows-amd64.exe -OutFile client.exe .\client.exe -listen 127.0.0.1:9000 -peer :56000 -vk-link "" | .\routes.ps1 ``` macOS: ```bash -curl -L -o client https://github.com/cacggghp/vk-turn-proxy/releases/latest/download/client-darwin-arm64 +curl -L -o client https://github.com/samosvalishe/btp/releases/latest/download/client-darwin-arm64 chmod +x client ./client -listen 127.0.0.1:9000 -peer :56000 -vk-link "" | ./routes-macos.sh ``` @@ -132,7 +132,7 @@ chmod +x client ```bash termux-wake-lock -curl -L -o client https://github.com/cacggghp/vk-turn-proxy/releases/latest/download/client-android-arm64 +curl -L -o client https://github.com/samosvalishe/btp/releases/latest/download/client-android-arm64 chmod +x client ./client -listen 127.0.0.1:9000 -peer :56000 -vk-link "" ``` @@ -150,7 +150,7 @@ termux-wake-unlock ```bash apk update apk add curl -curl -L -o client https://github.com/cacggghp/vk-turn-proxy/releases/latest/download/client-linux-386 +curl -L -o client https://github.com/samosvalishe/btp/releases/latest/download/client-linux-386 chmod +x client GOMAXPROCS=1 GODEBUG=asyncpreemptoff=1 ./client -listen 127.0.0.1:9000 -peer :56000 -vk-link "" ``` @@ -163,7 +163,7 @@ cat /dev/location > /dev/null & ## Сервер Как systemd-Сервис -Пример `/etc/systemd/system/vk-turn-proxy.service`: +Пример `/etc/systemd/system/btp.service`: ```ini [Unit] @@ -172,7 +172,7 @@ After=network.target [Service] Type=simple -ExecStart=/opt/vk-turn-proxy/server -listen 0.0.0.0:56000 -connect 127.0.0.1:51820 +ExecStart=/opt/btp/server -listen 0.0.0.0:56000 -connect 127.0.0.1:51820 Restart=always RestartSec=5 User=nobody @@ -186,8 +186,8 @@ WantedBy=multi-user.target ```bash sudo systemctl daemon-reload -sudo systemctl enable --now vk-turn-proxy.service -sudo systemctl status vk-turn-proxy.service +sudo systemctl enable --now btp.service +sudo systemctl status btp.service ``` ## Docker @@ -195,7 +195,7 @@ sudo systemctl status vk-turn-proxy.service Образ публикуется в GitHub Container Registry: ```bash -docker pull ghcr.io/cacggghp/vk-turn-proxy:latest +docker pull ghcr.io/samosvalishe/btp:latest ``` Если backend слушает на хосте, удобнее использовать host network: @@ -203,7 +203,7 @@ docker pull ghcr.io/cacggghp/vk-turn-proxy:latest ```bash docker run --rm --network host \ -e CONNECT_ADDR=127.0.0.1:51820 \ - ghcr.io/cacggghp/vk-turn-proxy:latest + ghcr.io/samosvalishe/btp:latest ``` Bridge mode: @@ -211,7 +211,7 @@ Bridge mode: ```bash docker run --rm -p 56000:56000/udp \ -e CONNECT_ADDR=:51820 \ - ghcr.io/cacggghp/vk-turn-proxy:latest + ghcr.io/samosvalishe/btp:latest ``` Переменные окружения: @@ -230,7 +230,7 @@ docker run --rm -p 56000:56000/udp \ Сборка образа вручную: ```bash -docker build -t vk-turn-proxy . +docker build -t btp . ``` ## VLESS / Xray @@ -346,41 +346,41 @@ docker build -t vk-turn-proxy . Нужен Go 1.25.x. ```bash -go build -o client ./cmd/vk-turn-client -go build -o server ./cmd/vk-turn-server +go build -o client ./cmd/client +go build -o server ./cmd/server go test ./... ``` Кросс-сборка примера для Linux amd64: ```bash -GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -ldflags "-s -w" -o server-linux-amd64 ./cmd/vk-turn-server -GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -ldflags "-s -w" -o client-linux-amd64 ./cmd/vk-turn-client +GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -ldflags "-s -w" -o server-linux-amd64 ./cmd/server +GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -ldflags "-s -w" -o client-linux-amd64 ./cmd/client ``` Android arm64 клиент как `.so` для упаковки в приложение (PowerShell): ```powershell -$env:GOOS="android"; $env:GOARCH="arm64"; $env:CGO_ENABLED="0"; go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn.so .\cmd\vk-turn-client +$env:GOOS="android"; $env:GOARCH="arm64"; $env:CGO_ENABLED="0"; go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn.so .\cmd\client ``` То же из bash: ```bash -GOOS=android GOARCH=arm64 CGO_ENABLED=0 go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn.so ./cmd/vk-turn-client +GOOS=android GOARCH=arm64 CGO_ENABLED=0 go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn.so ./cmd/client ``` Linux arm64 клиент как `.so` (для упаковки в Android-приложение в обход NDK; ABI совпадает): ```bash -GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn.so ./cmd/vk-turn-client +GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn.so ./cmd/client ``` Linux amd64 клиент/сервер как `.so`: ```bash -GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn-client.so ./cmd/vk-turn-client -GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn-server.so ./cmd/vk-turn-server +GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn-client.so ./cmd/client +GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w -checklinkname=0" -trimpath -o libvkturn-server.so ./cmd/server ``` Все `.so` выше — обычные ELF-бинари под `.so`-именем (`CGO_ENABLED=0`, не настоящий shared library). Если нужен настоящий `c-shared` — `CGO_ENABLED=1` + NDK toolchain (см. `.github/workflows/release.yml`). diff --git a/cmd/vk-turn-client/main.go b/cmd/client/main.go similarity index 84% rename from cmd/vk-turn-client/main.go rename to cmd/client/main.go index 73a353c..4071d4f 100644 --- a/cmd/vk-turn-client/main.go +++ b/cmd/client/main.go @@ -11,17 +11,17 @@ import ( "syscall" "time" - "github.com/cacggghp/vk-turn-proxy/internal/client/captcha" - manualcaptcha "github.com/cacggghp/vk-turn-proxy/internal/client/captcha/manual" - "github.com/cacggghp/vk-turn-proxy/internal/client/dnsdial" - "github.com/cacggghp/vk-turn-proxy/internal/client/vkauth" - "github.com/cacggghp/vk-turn-proxy/internal/config" - "github.com/cacggghp/vk-turn-proxy/internal/logx" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/bondclient" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/tcpfwd" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/udprelay" - "github.com/cacggghp/vk-turn-proxy/internal/transport/dtlsdial" - "github.com/cacggghp/vk-turn-proxy/internal/wire/srtpmimicry" + "github.com/samosvalishe/btp/internal/client/captcha" + manualcaptcha "github.com/samosvalishe/btp/internal/client/captcha/manual" + "github.com/samosvalishe/btp/internal/client/dnsdial" + "github.com/samosvalishe/btp/internal/client/vkauth" + "github.com/samosvalishe/btp/internal/config" + "github.com/samosvalishe/btp/internal/logx" + "github.com/samosvalishe/btp/internal/proxy/bondclient" + "github.com/samosvalishe/btp/internal/proxy/tcpfwd" + "github.com/samosvalishe/btp/internal/proxy/udprelay" + "github.com/samosvalishe/btp/internal/transport/dtlsdial" + "github.com/samosvalishe/btp/internal/wire/srtpmimicry" ) // manualCaptchaSolver bridges the vkauth.ManualSolveFunc contract to the diff --git a/cmd/vk-turn-server/main.go b/cmd/server/main.go similarity index 91% rename from cmd/vk-turn-server/main.go rename to cmd/server/main.go index 8a26f55..abb9181 100644 --- a/cmd/vk-turn-server/main.go +++ b/cmd/server/main.go @@ -11,12 +11,12 @@ import ( "syscall" "time" - "github.com/cacggghp/vk-turn-proxy/internal/config" - "github.com/cacggghp/vk-turn-proxy/internal/logx" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/bondserver" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/tcpfwdserver" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/udpserver" - "github.com/cacggghp/vk-turn-proxy/internal/wire/srtpmimicry" + "github.com/samosvalishe/btp/internal/config" + "github.com/samosvalishe/btp/internal/logx" + "github.com/samosvalishe/btp/internal/proxy/bondserver" + "github.com/samosvalishe/btp/internal/proxy/tcpfwdserver" + "github.com/samosvalishe/btp/internal/proxy/udpserver" + "github.com/samosvalishe/btp/internal/wire/srtpmimicry" "github.com/pion/dtls/v3" "github.com/pion/dtls/v3/pkg/crypto/selfsign" ) diff --git a/go.mod b/go.mod index b365b7f..9936aee 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cacggghp/vk-turn-proxy +module github.com/samosvalishe/btp go 1.25.5 @@ -11,11 +11,11 @@ require ( github.com/pion/dtls/v3 v3.1.2 github.com/pion/logging v0.2.4 github.com/pion/transport/v4 v4.0.1 - github.com/pion/turn/v5 v5.0.3 - github.com/xtaci/kcp-go/v5 v5.6.18 - github.com/xtaci/smux v1.5.34 - golang.org/x/crypto v0.49.0 - golang.org/x/crypto/x509roots/fallback v0.0.0-20260511143831-44decbfe70e2 + github.com/pion/turn/v5 v5.0.4 + github.com/xtaci/kcp-go/v5 v5.6.72 + github.com/xtaci/smux v1.5.57 + golang.org/x/crypto v0.51.0 + golang.org/x/crypto/x509roots/fallback v0.0.0-20260518184440-a749d17980b8 ) require ( @@ -27,21 +27,20 @@ require ( github.com/bogdanfinn/websocket v1.5.5-barnius // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/klauspost/compress v1.18.5 // indirect - github.com/klauspost/cpuid/v2 v2.2.9 // indirect - github.com/klauspost/reedsolomon v1.12.4 // indirect + github.com/klauspost/cpuid/v2 v2.3.0 // indirect + github.com/klauspost/reedsolomon v1.14.0 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/stun/v3 v3.1.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/quic-go/qpack v0.6.0 // indirect github.com/tam7t/hpkp v0.0.0-20160821193359-2b70b4024ed5 // indirect - github.com/templexxx/cpu v0.1.1 // indirect - github.com/templexxx/xorsimd v0.4.3 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect github.com/wlynxg/anet v0.0.5 // indirect - golang.org/x/mod v0.34.0 // indirect - golang.org/x/net v0.52.0 // indirect + golang.org/x/mod v0.35.0 // indirect + golang.org/x/net v0.54.0 // indirect golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.43.0 // indirect - golang.org/x/text v0.35.0 // indirect - golang.org/x/tools v0.43.0 // indirect + golang.org/x/sys v0.44.0 // indirect + golang.org/x/text v0.37.0 // indirect + golang.org/x/time v0.15.0 // indirect + golang.org/x/tools v0.44.0 // indirect ) diff --git a/go.sum b/go.sum index c45a74e..fb92fd8 100644 --- a/go.sum +++ b/go.sum @@ -47,10 +47,10 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= -github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= -github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= -github.com/klauspost/reedsolomon v1.12.4 h1:5aDr3ZGoJbgu/8+j45KtUJxzYm8k08JGtB9Wx1VQ4OA= -github.com/klauspost/reedsolomon v1.12.4/go.mod h1:d3CzOMOt0JXGIFZm1StgkyF14EYr3xneR2rNWo7NcMU= +github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= +github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/reedsolomon v1.14.0 h1:5YSZeclzSYg5nl349+GDG/agDtQ6MZiwUYXvVKN1Jx0= +github.com/klauspost/reedsolomon v1.14.0/go.mod h1:yjqqjgMTQkBUHSG97/rm4zipffCNbCiZcB3kTqr++sQ= github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI= github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs= github.com/pion/dtls/v3 v3.1.2 h1:gqEdOUXLtCGW+afsBLO0LtDD8GnuBBjEy6HRtyofZTc= @@ -63,8 +63,8 @@ github.com/pion/stun/v3 v3.1.2 h1:86IhD8wFn6IDW4b1/0QzoQS+f5PeA8OHHRn8UZW5ErY= github.com/pion/stun/v3 v3.1.2/go.mod h1:H7gDic7nNwlUL05pbs6T1dtaBehh/KjupxfWw3ZI7cA= github.com/pion/transport/v4 v4.0.1 h1:sdROELU6BZ63Ab7FrOLn13M6YdJLY20wldXW2Cu2k8o= github.com/pion/transport/v4 v4.0.1/go.mod h1:nEuEA4AD5lPdcIegQDpVLgNoDGreqM/YqmEx3ovP4jM= -github.com/pion/turn/v5 v5.0.3 h1:I+Nw0fQgdPWF1SXDj0egWDhCkcff7gWiigdQpOK52Ak= -github.com/pion/turn/v5 v5.0.3/go.mod h1:fs4SogUh/aRGQzonc4Lx3Jp4EU3j3t0PfNDEd9KcD/w= +github.com/pion/turn/v5 v5.0.4 h1:xKAnP1b5eCnjFPd55OgxkqIVoyzbHKZa06SxZ3fopXQ= +github.com/pion/turn/v5 v5.0.4/go.mod h1:zbPsMp+fIVhKt5uWu2jcjk88FcoRbGMBSzVsaTuhcmM= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -76,20 +76,16 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/tam7t/hpkp v0.0.0-20160821193359-2b70b4024ed5 h1:YqAladjX7xpA6BM04leXMWAEjS0mTZ5kUU9KRBriQJc= github.com/tam7t/hpkp v0.0.0-20160821193359-2b70b4024ed5/go.mod h1:2JjD2zLQYH5HO74y5+aE3remJQvl6q4Sn6aWA2wD1Ng= -github.com/templexxx/cpu v0.1.1 h1:isxHaxBXpYFWnk2DReuKkigaZyrjs2+9ypIdGP4h+HI= -github.com/templexxx/cpu v0.1.1/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk= -github.com/templexxx/xorsimd v0.4.3 h1:9AQTFHd7Bhk3dIT7Al2XeBX5DWOvsUPZCuhyAtNbHjU= -github.com/templexxx/xorsimd v0.4.3/go.mod h1:oZQcD6RFDisW2Am58dSAGwwL6rHjbzrlu25VDqfWkQg= github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU= github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA= -github.com/xtaci/kcp-go/v5 v5.6.18 h1:7oV4mc272pcnn39/13BB11Bx7hJM4ogMIEokJYVWn4g= -github.com/xtaci/kcp-go/v5 v5.6.18/go.mod h1:75S1AKYYzNUSXIv30h+jPKJYZUwqpfvLshu63nCNSOM= +github.com/xtaci/kcp-go/v5 v5.6.72 h1:FLaQPalgpufJYQRk0OK+gErEhXGLUPjv6FSRPrFR8Lk= +github.com/xtaci/kcp-go/v5 v5.6.72/go.mod h1:9O3D8WR+cyyUjGiTILYfg17vn72otWuXK2AFfqIe6CM= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= -github.com/xtaci/smux v1.5.34 h1:OUA9JaDFHJDT8ZT3ebwLWPAgEfE6sWo2LaTy3anXqwg= -github.com/xtaci/smux v1.5.34/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY= +github.com/xtaci/smux v1.5.57 h1:N72VbGoSYxgcm6mPOYX0QzEZNVD3UI/JlVvAtXF+WrY= +github.com/xtaci/smux v1.5.57/go.mod h1:IGQ9QYrBphmb/4aTnLEcJby0TNr3NV+OslIOMrX825Q= github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko= @@ -97,16 +93,16 @@ go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= -golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= -golang.org/x/crypto/x509roots/fallback v0.0.0-20260511143831-44decbfe70e2 h1:7Y5FZkvYs5XMyG0VS/pONmKIgD9+9eqcm1DGar541SA= -golang.org/x/crypto/x509roots/fallback v0.0.0-20260511143831-44decbfe70e2/go.mod h1:+UoQFNBq2p2wO+Q6ddVtYc25GZ6VNdOMyyrd4nrqrKs= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= +golang.org/x/crypto/x509roots/fallback v0.0.0-20260518184440-a749d17980b8 h1:tn6ag4iztzzbGmc+gGVmcENmIEN5m6dA6FuD/AVX0zc= +golang.org/x/crypto/x509roots/fallback v0.0.0-20260518184440-a749d17980b8/go.mod h1:+UoQFNBq2p2wO+Q6ddVtYc25GZ6VNdOMyyrd4nrqrKs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI= -golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY= +golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= +golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -114,8 +110,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20211104170005-ce137452f963/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= -golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w= +golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -128,23 +124,23 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= -golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ= +golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= -golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= -golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= -golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= +golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= -golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/internal/client/captcha/captcha.go b/internal/client/captcha/captcha.go index a597561..88e348c 100644 --- a/internal/client/captcha/captcha.go +++ b/internal/client/captcha/captcha.go @@ -21,8 +21,8 @@ import ( fhttp "github.com/bogdanfinn/fhttp" tlsclient "github.com/bogdanfinn/tls-client" - "github.com/cacggghp/vk-turn-proxy/internal/client/browserprofile" - "github.com/cacggghp/vk-turn-proxy/internal/logx" + "github.com/samosvalishe/btp/internal/client/browserprofile" + "github.com/samosvalishe/btp/internal/logx" ) // Log is the package-level logger. Defaults to no-op; main wires it via diff --git a/internal/client/captcha/manual/manual.go b/internal/client/captcha/manual/manual.go index f3cb9aa..d6d9a9c 100644 --- a/internal/client/captcha/manual/manual.go +++ b/internal/client/captcha/manual/manual.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "github.com/cacggghp/vk-turn-proxy/internal/client/browserprofile" - "github.com/cacggghp/vk-turn-proxy/internal/client/ish" - "github.com/cacggghp/vk-turn-proxy/internal/logx" + "github.com/samosvalishe/btp/internal/client/browserprofile" + "github.com/samosvalishe/btp/internal/client/ish" + "github.com/samosvalishe/btp/internal/logx" ) // Debug toggles verbose request/response logging for the proxied browser diff --git a/internal/client/dnsdial/doh.go b/internal/client/dnsdial/doh.go index 60d308a..dbc6db1 100644 --- a/internal/client/dnsdial/doh.go +++ b/internal/client/dnsdial/doh.go @@ -19,7 +19,7 @@ import ( "github.com/miekg/dns" - "github.com/cacggghp/vk-turn-proxy/internal/logx" + "github.com/samosvalishe/btp/internal/logx" // Embedded Mozilla CA roots for CGO_ENABLED=0 builds (Android). _ "golang.org/x/crypto/x509roots/fallback" diff --git a/internal/client/vkauth/auto_solver.go b/internal/client/vkauth/auto_solver.go index 696192b..4678f75 100644 --- a/internal/client/vkauth/auto_solver.go +++ b/internal/client/vkauth/auto_solver.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/cacggghp/vk-turn-proxy/internal/client/browserprofile" - "github.com/cacggghp/vk-turn-proxy/internal/client/captcha" + "github.com/samosvalishe/btp/internal/client/browserprofile" + "github.com/samosvalishe/btp/internal/client/captcha" tlsclient "github.com/bogdanfinn/tls-client" ) diff --git a/internal/client/vkauth/client.go b/internal/client/vkauth/client.go index 706f78e..6ce2f10 100644 --- a/internal/client/vkauth/client.go +++ b/internal/client/vkauth/client.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/cacggghp/vk-turn-proxy/internal/logx" + "github.com/samosvalishe/btp/internal/logx" tlsclient "github.com/bogdanfinn/tls-client" ) diff --git a/internal/client/vkauth/solver.go b/internal/client/vkauth/solver.go index fec0ede..b8afb98 100644 --- a/internal/client/vkauth/solver.go +++ b/internal/client/vkauth/solver.go @@ -4,8 +4,8 @@ import ( "context" "net" - "github.com/cacggghp/vk-turn-proxy/internal/client/browserprofile" - "github.com/cacggghp/vk-turn-proxy/internal/client/captcha" + "github.com/samosvalishe/btp/internal/client/browserprofile" + "github.com/samosvalishe/btp/internal/client/captcha" tlsclient "github.com/bogdanfinn/tls-client" ) diff --git a/internal/client/vkauth/token.go b/internal/client/vkauth/token.go index 011421b..c0daf86 100644 --- a/internal/client/vkauth/token.go +++ b/internal/client/vkauth/token.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/cacggghp/vk-turn-proxy/internal/client/browserprofile" - "github.com/cacggghp/vk-turn-proxy/internal/client/captcha" - "github.com/cacggghp/vk-turn-proxy/internal/client/namegen" + "github.com/samosvalishe/btp/internal/client/browserprofile" + "github.com/samosvalishe/btp/internal/client/captcha" + "github.com/samosvalishe/btp/internal/client/namegen" fhttp "github.com/bogdanfinn/fhttp" tlsclient "github.com/bogdanfinn/tls-client" diff --git a/internal/config/config.go b/internal/config/config.go index 50792b4..c50a743 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -15,8 +15,8 @@ import ( "io" "strings" - "github.com/cacggghp/vk-turn-proxy/internal/transport/kcptun" - "github.com/cacggghp/vk-turn-proxy/internal/wire/srtpmimicry" + "github.com/samosvalishe/btp/internal/transport/kcptun" + "github.com/samosvalishe/btp/internal/wire/srtpmimicry" ) const ( diff --git a/internal/proxy/bondclient/bondclient.go b/internal/proxy/bondclient/bondclient.go index 51a16d9..c03031e 100644 --- a/internal/proxy/bondclient/bondclient.go +++ b/internal/proxy/bondclient/bondclient.go @@ -15,10 +15,10 @@ import ( "sync/atomic" "time" - "github.com/cacggghp/vk-turn-proxy/internal/logx" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/tcpfwd" - "github.com/cacggghp/vk-turn-proxy/internal/stats" - "github.com/cacggghp/vk-turn-proxy/internal/wire/bondframe" + "github.com/samosvalishe/btp/internal/logx" + "github.com/samosvalishe/btp/internal/proxy/tcpfwd" + "github.com/samosvalishe/btp/internal/stats" + "github.com/samosvalishe/btp/internal/wire/bondframe" "github.com/xtaci/smux" ) diff --git a/internal/proxy/bondserver/bondserver.go b/internal/proxy/bondserver/bondserver.go index 5a80722..417782a 100644 --- a/internal/proxy/bondserver/bondserver.go +++ b/internal/proxy/bondserver/bondserver.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/cacggghp/vk-turn-proxy/internal/logx" - "github.com/cacggghp/vk-turn-proxy/internal/wire/bondframe" + "github.com/samosvalishe/btp/internal/logx" + "github.com/samosvalishe/btp/internal/wire/bondframe" "github.com/xtaci/smux" ) diff --git a/internal/proxy/bondserver/bondserver_test.go b/internal/proxy/bondserver/bondserver_test.go index 2d9fcaa..91ab38b 100644 --- a/internal/proxy/bondserver/bondserver_test.go +++ b/internal/proxy/bondserver/bondserver_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/cacggghp/vk-turn-proxy/internal/wire/bondframe" + "github.com/samosvalishe/btp/internal/wire/bondframe" ) // fakeStream implements laneStream over an in-memory ring; reads block when diff --git a/internal/proxy/common/common.go b/internal/proxy/common/common.go index 21aa19a..1b1b134 100644 --- a/internal/proxy/common/common.go +++ b/internal/proxy/common/common.go @@ -9,8 +9,8 @@ import ( "fmt" "net" - "github.com/cacggghp/vk-turn-proxy/internal/transport/turndial" - "github.com/cacggghp/vk-turn-proxy/internal/wire/srtpmimicry" + "github.com/samosvalishe/btp/internal/transport/turndial" + "github.com/samosvalishe/btp/internal/wire/srtpmimicry" ) // GetCredsFunc resolves VK TURN credentials for a (link, streamID) pair. diff --git a/internal/proxy/tcpfwd/tcpfwd.go b/internal/proxy/tcpfwd/tcpfwd.go index e44e31e..ae1012f 100644 --- a/internal/proxy/tcpfwd/tcpfwd.go +++ b/internal/proxy/tcpfwd/tcpfwd.go @@ -7,14 +7,14 @@ import ( "sync" "time" - "github.com/cacggghp/vk-turn-proxy/internal/client/ish" - "github.com/cacggghp/vk-turn-proxy/internal/logx" - "github.com/cacggghp/vk-turn-proxy/internal/netconn" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/common" - "github.com/cacggghp/vk-turn-proxy/internal/stats" - "github.com/cacggghp/vk-turn-proxy/internal/transport/dtlsdial" - "github.com/cacggghp/vk-turn-proxy/internal/transport/kcptun" - "github.com/cacggghp/vk-turn-proxy/internal/wire/srtpmimicry" + "github.com/samosvalishe/btp/internal/client/ish" + "github.com/samosvalishe/btp/internal/logx" + "github.com/samosvalishe/btp/internal/netconn" + "github.com/samosvalishe/btp/internal/proxy/common" + "github.com/samosvalishe/btp/internal/stats" + "github.com/samosvalishe/btp/internal/transport/dtlsdial" + "github.com/samosvalishe/btp/internal/transport/kcptun" + "github.com/samosvalishe/btp/internal/wire/srtpmimicry" "github.com/xtaci/smux" ) diff --git a/internal/proxy/tcpfwdserver/tcpfwdserver.go b/internal/proxy/tcpfwdserver/tcpfwdserver.go index 8de770e..ff0a4f0 100644 --- a/internal/proxy/tcpfwdserver/tcpfwdserver.go +++ b/internal/proxy/tcpfwdserver/tcpfwdserver.go @@ -11,12 +11,12 @@ import ( "sync" "time" - "github.com/cacggghp/vk-turn-proxy/internal/logx" - "github.com/cacggghp/vk-turn-proxy/internal/netconn" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/bondserver" - "github.com/cacggghp/vk-turn-proxy/internal/stats" - "github.com/cacggghp/vk-turn-proxy/internal/transport/kcptun" - "github.com/cacggghp/vk-turn-proxy/internal/wire/bondframe" + "github.com/samosvalishe/btp/internal/logx" + "github.com/samosvalishe/btp/internal/netconn" + "github.com/samosvalishe/btp/internal/proxy/bondserver" + "github.com/samosvalishe/btp/internal/stats" + "github.com/samosvalishe/btp/internal/transport/kcptun" + "github.com/samosvalishe/btp/internal/wire/bondframe" "github.com/xtaci/smux" ) diff --git a/internal/proxy/udprelay/udprelay.go b/internal/proxy/udprelay/udprelay.go index 436ebcb..a18c88c 100644 --- a/internal/proxy/udprelay/udprelay.go +++ b/internal/proxy/udprelay/udprelay.go @@ -14,12 +14,12 @@ import ( "sync/atomic" "time" - "github.com/cacggghp/vk-turn-proxy/internal/client/vkauth" - "github.com/cacggghp/vk-turn-proxy/internal/logx" - "github.com/cacggghp/vk-turn-proxy/internal/proxy/common" - "github.com/cacggghp/vk-turn-proxy/internal/stats" - "github.com/cacggghp/vk-turn-proxy/internal/transport/dtlsdial" - "github.com/cacggghp/vk-turn-proxy/internal/wire/srtpmimicry" + "github.com/samosvalishe/btp/internal/client/vkauth" + "github.com/samosvalishe/btp/internal/logx" + "github.com/samosvalishe/btp/internal/proxy/common" + "github.com/samosvalishe/btp/internal/stats" + "github.com/samosvalishe/btp/internal/transport/dtlsdial" + "github.com/samosvalishe/btp/internal/wire/srtpmimicry" "github.com/cbeuw/connutil" ) diff --git a/internal/proxy/udpserver/udpserver.go b/internal/proxy/udpserver/udpserver.go index c0ab32a..8cb9c5b 100644 --- a/internal/proxy/udpserver/udpserver.go +++ b/internal/proxy/udpserver/udpserver.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/cacggghp/vk-turn-proxy/internal/logx" - "github.com/cacggghp/vk-turn-proxy/internal/stats" + "github.com/samosvalishe/btp/internal/logx" + "github.com/samosvalishe/btp/internal/stats" ) const ( diff --git a/internal/transport/turndial/turndial.go b/internal/transport/turndial/turndial.go index 89b8b77..ec7dda6 100644 --- a/internal/transport/turndial/turndial.go +++ b/internal/transport/turndial/turndial.go @@ -13,7 +13,7 @@ import ( "net" "time" - "github.com/cacggghp/vk-turn-proxy/internal/netconn" + "github.com/samosvalishe/btp/internal/netconn" "github.com/pion/logging" "github.com/pion/turn/v5" ) diff --git a/notes/GLOSSARY.md b/notes/GLOSSARY.md index 9a9270a..e393ec8 100644 --- a/notes/GLOSSARY.md +++ b/notes/GLOSSARY.md @@ -1,4 +1,4 @@ -# Глоссарий vk-turn-proxy +# Глоссарий btp Один абзац на термин. Если читаешь код и не понял слово — сюда. @@ -54,7 +54,7 @@ VK content-filter дропает payload, который не похож на le Один набор VK creds (полученный через VK API) обслуживает группу TURN streams. Флаг `-streams-per-cred` (default 10). В коде иногда называется `streamsPerCache`. То есть «cred» (одна credential) = «cache» (одна запись в `StreamCredentialsCache`). ### Client (4 разных) -1. `cmd/vk-turn-client/` — наш клиентский бинарь. +1. `cmd/client/` — наш клиентский бинарь. 2. `vkauth.Client` — HTTP-клиент к VK API. 3. `bondclient.Handler` — наша клиент-сторона bond. 4. `turn.NewClient` — TURN-protocol-клиент (`pion/turn`). @@ -87,7 +87,7 @@ Conn wrappers (DirectNet, ConnectedUDPConn, SplitFirstWriteConn). Имя не о ### captcha (auto / manual) Один домен, два пути: - **auto** (`internal/client/captcha`): VK slider-puzzle решается программно через `client/internal/captcha`. -- **manual** (пока в `cmd/vk-turn-client/manual_captcha.go`, package main): HTTP-сервер на 127.0.0.1:8765, запуск браузера, gzip-rewrite VK-страниц. Запланирован вынос в `internal/client/captcha/manual` на V2-2. +- **manual** (пока в `cmd/client/manual_captcha.go`, package main): HTTP-сервер на 127.0.0.1:8765, запуск браузера, gzip-rewrite VK-страниц. Запланирован вынос в `internal/client/captcha/manual` на V2-2. Переключение: `vkauth.Client` пробует auto, при провале → manual fallback. Флаг `-manual-captcha` сразу идёт в manual. @@ -95,7 +95,7 @@ Conn wrappers (DirectNet, ConnectedUDPConn, SplitFirstWriteConn). Имя не о Мобильная (Android) сборка клиента в виде shared library. Собирается **вручную** разработчиком и переносится в Android-приложение. CI не строит. Внешних `//export`-функций нет — `package main` ← buildmode определяется на стороне разработчика. ### globalBondRegistry -Server-side глобал, держит активные bond-сессии. Инициализируется на package init — известная фрагильность (`isDebug` ещё false), работает только потому что bondserver `Debug`-поле не читается. Переедет в локальную переменную `cmd/vk-turn-server/main.go` на V2-3. +Server-side глобал, держит активные bond-сессии. Инициализируется на package init — известная фрагильность (`isDebug` ещё false), работает только потому что bondserver `Debug`-поле не читается. Переедет в локальную переменную `cmd/server/main.go` на V2-3. ### `-no-dtls` (УДАЛЕНО) Был помечен DO NOT USE — в проде не работал, VK content-filter дропает payload без DTLS-handshake. Удалён в V2-0.