init anroid version
|
|
@ -1,20 +0,0 @@
|
||||||
name: 🐛 Проблема
|
|
||||||
title: '[Проблема] '
|
|
||||||
description: Сообщить о проблеме
|
|
||||||
labels: ['type: проблема', 'status: нуждается в сортировке']
|
|
||||||
|
|
||||||
body:
|
|
||||||
- type: textarea
|
|
||||||
id: description
|
|
||||||
attributes:
|
|
||||||
label: Опишите вашу проблему
|
|
||||||
description: Чётко опишите проблему с которой вы столкнулись
|
|
||||||
placeholder: Описание проблемы
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: additions
|
|
||||||
attributes:
|
|
||||||
label: Дополнительные детали
|
|
||||||
description: Если у вас проблемы с работой прокси, то приложите файл логов в момент возникновения проблемы.
|
|
||||||
|
|
@ -1,349 +0,0 @@
|
||||||
name: Build & Release
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
make_release:
|
|
||||||
description: 'Create Github Release?'
|
|
||||||
type: boolean
|
|
||||||
required: true
|
|
||||||
default: false
|
|
||||||
version:
|
|
||||||
description: "Release version tag (e.g. v1.0.0)"
|
|
||||||
required: false
|
|
||||||
default: "v1.0.0"
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-windows:
|
|
||||||
runs-on: windows-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Setup Python
|
|
||||||
uses: actions/setup-python@v6
|
|
||||||
with:
|
|
||||||
python-version: "3.12"
|
|
||||||
cache: "pip"
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: pip install .
|
|
||||||
|
|
||||||
- name: Install pyinstaller
|
|
||||||
run: pip install "pyinstaller==6.13.0"
|
|
||||||
|
|
||||||
- name: Build EXE with PyInstaller
|
|
||||||
run: pyinstaller packaging/windows.spec --noconfirm
|
|
||||||
|
|
||||||
- name: Rename artifact
|
|
||||||
run: mv dist/TgWsProxy.exe dist/TgWsProxy_windows.exe
|
|
||||||
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
with:
|
|
||||||
name: TgWsProxy
|
|
||||||
path: dist/TgWsProxy_windows.exe
|
|
||||||
|
|
||||||
build-win7:
|
|
||||||
runs-on: windows-latest
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- arch: x64
|
|
||||||
suffix: 64bit
|
|
||||||
- arch: x86
|
|
||||||
suffix: 32bit
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- uses: actions/setup-python@v6
|
|
||||||
with:
|
|
||||||
python-version: "3.8"
|
|
||||||
architecture: ${{ matrix.arch }}
|
|
||||||
cache: "pip"
|
|
||||||
|
|
||||||
- name: Install dependencies & pyinstaller
|
|
||||||
run: pip install . "pyinstaller==5.13.2"
|
|
||||||
|
|
||||||
- name: Build EXE with PyInstaller
|
|
||||||
run: pyinstaller packaging/windows.spec --noconfirm
|
|
||||||
|
|
||||||
- name: Rename artifact
|
|
||||||
run: mv dist/TgWsProxy.exe dist/TgWsProxy_windows_7_${{ matrix.suffix }}.exe
|
|
||||||
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
with:
|
|
||||||
name: TgWsProxy-win7-${{ matrix.suffix }}
|
|
||||||
path: dist/TgWsProxy_windows_7_${{ matrix.suffix }}.exe
|
|
||||||
|
|
||||||
build-macos:
|
|
||||||
runs-on: macos-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Install universal2 Python
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
curl -LO https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg
|
|
||||||
sudo installer -pkg python-3.12.10-macos11.pkg -target /
|
|
||||||
echo "/Library/Frameworks/Python.framework/Versions/3.12/bin" >> "$GITHUB_PATH"
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
python3.12 -m pip install --upgrade pip setuptools wheel
|
|
||||||
python3.12 -m pip install delocate==0.13.0
|
|
||||||
|
|
||||||
mkdir -p wheelhouse/arm64 wheelhouse/x86_64 wheelhouse/universal2
|
|
||||||
|
|
||||||
python3.12 -m pip download \
|
|
||||||
--only-binary=:all: \
|
|
||||||
--platform macosx_11_0_arm64 \
|
|
||||||
--python-version 3.12 \
|
|
||||||
--implementation cp \
|
|
||||||
-d wheelhouse/arm64 \
|
|
||||||
'cffi>=2.0.0' \
|
|
||||||
Pillow==12.1.0 \
|
|
||||||
psutil==7.0.0
|
|
||||||
|
|
||||||
python3.12 -m pip download \
|
|
||||||
--only-binary=:all: \
|
|
||||||
--platform macosx_10_13_x86_64 \
|
|
||||||
--python-version 3.12 \
|
|
||||||
--implementation cp \
|
|
||||||
-d wheelhouse/x86_64 \
|
|
||||||
'cffi>=2.0.0' \
|
|
||||||
Pillow==12.1.0
|
|
||||||
|
|
||||||
python3.12 -m pip download \
|
|
||||||
--only-binary=:all: \
|
|
||||||
--platform macosx_10_9_x86_64 \
|
|
||||||
--python-version 3.12 \
|
|
||||||
--implementation cp \
|
|
||||||
-d wheelhouse/x86_64 \
|
|
||||||
psutil==7.0.0
|
|
||||||
|
|
||||||
delocate-merge \
|
|
||||||
wheelhouse/arm64/cffi-*.whl \
|
|
||||||
wheelhouse/x86_64/cffi-*.whl \
|
|
||||||
-w wheelhouse/universal2
|
|
||||||
|
|
||||||
delocate-merge \
|
|
||||||
wheelhouse/arm64/pillow-12.1.0-*.whl \
|
|
||||||
wheelhouse/x86_64/pillow-12.1.0-*.whl \
|
|
||||||
-w wheelhouse/universal2
|
|
||||||
|
|
||||||
delocate-merge \
|
|
||||||
wheelhouse/arm64/psutil-7.0.0-*.whl \
|
|
||||||
wheelhouse/x86_64/psutil-7.0.0-*.whl \
|
|
||||||
-w wheelhouse/universal2
|
|
||||||
|
|
||||||
python3.12 -m pip install --no-deps wheelhouse/universal2/*.whl
|
|
||||||
python3.12 -m pip install .
|
|
||||||
python3.12 -m pip install pyinstaller==6.13.0
|
|
||||||
|
|
||||||
- name: Create macOS icon from ICO
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
python3.12 - <<'PY'
|
|
||||||
from PIL import Image
|
|
||||||
|
|
||||||
image = Image.open('icon.ico')
|
|
||||||
image = image.resize((1024, 1024), Image.LANCZOS)
|
|
||||||
image.save('icon_1024.png', 'PNG')
|
|
||||||
PY
|
|
||||||
|
|
||||||
mkdir -p icon.iconset
|
|
||||||
sips -z 16 16 icon_1024.png --out icon.iconset/icon_16x16.png
|
|
||||||
sips -z 32 32 icon_1024.png --out icon.iconset/icon_16x16@2x.png
|
|
||||||
sips -z 32 32 icon_1024.png --out icon.iconset/icon_32x32.png
|
|
||||||
sips -z 64 64 icon_1024.png --out icon.iconset/icon_32x32@2x.png
|
|
||||||
sips -z 128 128 icon_1024.png --out icon.iconset/icon_128x128.png
|
|
||||||
sips -z 256 256 icon_1024.png --out icon.iconset/icon_128x128@2x.png
|
|
||||||
sips -z 256 256 icon_1024.png --out icon.iconset/icon_256x256.png
|
|
||||||
sips -z 512 512 icon_1024.png --out icon.iconset/icon_256x256@2x.png
|
|
||||||
sips -z 512 512 icon_1024.png --out icon.iconset/icon_512x512.png
|
|
||||||
sips -z 1024 1024 icon_1024.png --out icon.iconset/icon_512x512@2x.png
|
|
||||||
iconutil -c icns icon.iconset -o icon.icns
|
|
||||||
rm -rf icon.iconset icon_1024.png
|
|
||||||
|
|
||||||
- name: Build app with PyInstaller
|
|
||||||
run: python3.12 -m PyInstaller packaging/macos.spec --noconfirm
|
|
||||||
|
|
||||||
- name: Validate universal2 app bundle
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
found=0
|
|
||||||
while IFS= read -r -d '' file; do
|
|
||||||
if file "$file" | grep -q "Mach-O"; then
|
|
||||||
found=1
|
|
||||||
archs="$(lipo -archs "$file" 2>/dev/null || true)"
|
|
||||||
case "$archs" in
|
|
||||||
*arm64*x86_64*|*x86_64*arm64*) ;;
|
|
||||||
*)
|
|
||||||
echo "Missing universal2 slices in $file: ${archs:-unknown}" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done < <(find "dist/TG WS Proxy.app" -type f -print0)
|
|
||||||
|
|
||||||
if [ "$found" -eq 0 ]; then
|
|
||||||
echo "No Mach-O files found in app bundle" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Create DMG
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
APP_NAME="TG WS Proxy"
|
|
||||||
DMG_TEMP="dist/dmg_temp"
|
|
||||||
|
|
||||||
rm -rf "$DMG_TEMP"
|
|
||||||
mkdir -p "$DMG_TEMP"
|
|
||||||
cp -R "dist/${APP_NAME}.app" "$DMG_TEMP/"
|
|
||||||
ln -s /Applications "$DMG_TEMP/Applications"
|
|
||||||
|
|
||||||
hdiutil create \
|
|
||||||
-volname "$APP_NAME" \
|
|
||||||
-srcfolder "$DMG_TEMP" \
|
|
||||||
-ov \
|
|
||||||
-format UDZO \
|
|
||||||
"dist/TgWsProxy_macos_universal.dmg"
|
|
||||||
|
|
||||||
rm -rf "$DMG_TEMP"
|
|
||||||
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
with:
|
|
||||||
name: TgWsProxy-macOS
|
|
||||||
path: dist/TgWsProxy_macos_universal.dmg
|
|
||||||
|
|
||||||
build-linux:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Install system dependencies
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y \
|
|
||||||
python3-venv \
|
|
||||||
python3-dev \
|
|
||||||
python3-gi \
|
|
||||||
gir1.2-ayatanaappindicator3-0.1 \
|
|
||||||
python3-tk
|
|
||||||
|
|
||||||
- name: Create venv with system site-packages
|
|
||||||
run: python3 -m venv --system-site-packages .venv
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
.venv/bin/pip install --upgrade pip
|
|
||||||
.venv/bin/pip install .
|
|
||||||
.venv/bin/pip install "pyinstaller==6.13.0"
|
|
||||||
|
|
||||||
- name: Build binary with PyInstaller
|
|
||||||
run: .venv/bin/pyinstaller packaging/linux.spec --noconfirm
|
|
||||||
|
|
||||||
- name: Rename binary artifact
|
|
||||||
run: mv dist/TgWsProxy dist/TgWsProxy_linux_amd64
|
|
||||||
|
|
||||||
- name: Create .deb package
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
VERSION="${{ github.event.inputs.version }}"
|
|
||||||
VERSION="${VERSION#v}"
|
|
||||||
PKG_ROOT="pkg"
|
|
||||||
|
|
||||||
rm -rf "$PKG_ROOT"
|
|
||||||
mkdir -p \
|
|
||||||
"$PKG_ROOT/DEBIAN" \
|
|
||||||
"$PKG_ROOT/usr/bin" \
|
|
||||||
"$PKG_ROOT/usr/share/applications" \
|
|
||||||
"$PKG_ROOT/usr/share/icons/hicolor/256x256/apps"
|
|
||||||
|
|
||||||
install -m 755 dist/TgWsProxy_linux_amd64 "$PKG_ROOT/usr/bin/tg-ws-proxy"
|
|
||||||
|
|
||||||
.venv/bin/python - <<PY
|
|
||||||
from PIL import Image
|
|
||||||
|
|
||||||
Image.open("icon.ico").save(
|
|
||||||
"${PKG_ROOT}/usr/share/icons/hicolor/256x256/apps/tg-ws-proxy.png",
|
|
||||||
"PNG",
|
|
||||||
)
|
|
||||||
PY
|
|
||||||
|
|
||||||
cat > "$PKG_ROOT/usr/share/applications/tg-ws-proxy.desktop" <<EOF
|
|
||||||
[Desktop Entry]
|
|
||||||
Type=Application
|
|
||||||
Name=TG WS Proxy
|
|
||||||
GenericName=Telegram Proxy
|
|
||||||
Comment=Telegram Desktop WebSocket Bridge Proxy
|
|
||||||
Exec=tg-ws-proxy
|
|
||||||
Icon=tg-ws-proxy
|
|
||||||
Terminal=false
|
|
||||||
Categories=Network;
|
|
||||||
StartupNotify=true
|
|
||||||
Keywords=telegram;proxy;websocket;
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > "$PKG_ROOT/DEBIAN/control" <<EOF
|
|
||||||
Package: tg-ws-proxy
|
|
||||||
Version: ${VERSION}
|
|
||||||
Section: net
|
|
||||||
Priority: optional
|
|
||||||
Architecture: amd64
|
|
||||||
Maintainer: Flowseal
|
|
||||||
Depends: libgtk-3-0, libayatana-appindicator3-1, python3-tk
|
|
||||||
Description: Telegram Desktop WebSocket Bridge Proxy
|
|
||||||
SOCKS5/WebSocket bridge proxy for Telegram Desktop with tray UI.
|
|
||||||
EOF
|
|
||||||
|
|
||||||
dpkg-deb --build --root-owner-group \
|
|
||||||
"$PKG_ROOT" \
|
|
||||||
"dist/TgWsProxy_linux_amd64.deb"
|
|
||||||
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
with:
|
|
||||||
name: TgWsProxy-linux
|
|
||||||
path: |
|
|
||||||
dist/TgWsProxy_linux_amd64
|
|
||||||
dist/TgWsProxy_linux_amd64.deb
|
|
||||||
|
|
||||||
release:
|
|
||||||
needs: [build-windows, build-win7, build-macos, build-linux]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: ${{ github.event.inputs.make_release == 'true' }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/download-artifact@v8
|
|
||||||
with:
|
|
||||||
pattern: TgWsProxy*
|
|
||||||
path: dist
|
|
||||||
merge-multiple: true
|
|
||||||
|
|
||||||
- name: Create GitHub Release
|
|
||||||
uses: softprops/action-gh-release@v2
|
|
||||||
with:
|
|
||||||
tag_name: ${{ github.event.inputs.version }}
|
|
||||||
name: "TG WS Proxy ${{ github.event.inputs.version }}"
|
|
||||||
body: |
|
|
||||||
## TG WS Proxy ${{ github.event.inputs.version }}
|
|
||||||
files: |
|
|
||||||
dist/TgWsProxy_windows.exe
|
|
||||||
dist/TgWsProxy_windows_7_64bit.exe
|
|
||||||
dist/TgWsProxy_windows_7_32bit.exe
|
|
||||||
dist/TgWsProxy_macos_universal.dmg
|
|
||||||
dist/TgWsProxy_linux_amd64
|
|
||||||
dist/TgWsProxy_linux_amd64.deb
|
|
||||||
draft: false
|
|
||||||
prerelease: false
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
@ -1,30 +1,32 @@
|
||||||
# Python
|
*.iml
|
||||||
__pycache__/
|
.gradle
|
||||||
*.py[cod]
|
/local.properties
|
||||||
*.pyo
|
/.idea/caches
|
||||||
*.egg-info/
|
/.idea/libraries
|
||||||
dist/
|
/.idea/modules.xml
|
||||||
build/
|
/.idea/workspace.xml
|
||||||
*.spec.bak
|
/.idea/navEditor.xml
|
||||||
|
/.idea/assetWizardSettings.xml
|
||||||
# PyInstaller
|
|
||||||
*.manifest
|
|
||||||
*.log
|
|
||||||
|
|
||||||
# IDE
|
|
||||||
.vscode/
|
|
||||||
.idea/
|
|
||||||
*.swp
|
|
||||||
*.swo
|
|
||||||
|
|
||||||
# OS
|
|
||||||
Thumbs.db
|
|
||||||
Desktop.ini
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
/build
|
||||||
|
/captures
|
||||||
|
.externalNativeBuild
|
||||||
|
.cxx
|
||||||
|
/app/build/
|
||||||
|
|
||||||
# Project-specific (not for the repo)
|
# Go files
|
||||||
scan_ips.py
|
/vendor/
|
||||||
scan.txt
|
*.exe
|
||||||
AyuGramDesktop-dev/
|
*.exe~
|
||||||
tweb-master/
|
*.dll
|
||||||
/icon.icns
|
*.so
|
||||||
|
*.dylib
|
||||||
|
*.test
|
||||||
|
*.out
|
||||||
|
*.cgo1.go
|
||||||
|
*.cgo2.c
|
||||||
|
|
||||||
|
# Android specific
|
||||||
|
*.jks
|
||||||
|
*.keystore
|
||||||
|
local.properties
|
||||||
|
|
|
||||||
21
LICENSE
|
|
@ -1,21 +0,0 @@
|
||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2026 Flowseal
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
218
README.md
|
|
@ -1,206 +1,46 @@
|
||||||
|
# TG WS Proxy (Android)
|
||||||
|
|
||||||
|
**Локальный SOCKS5-прокси** для Telegram Android, который **ускоряет работу Telegram**, перенаправляя трафик через WebSocket-соединения. Данные передаются в том же зашифрованном виде, а для работы не нужны сторонние сервера.
|
||||||
|
|
||||||
|
Это мобильный форк популярного SOCKS5/WS прокси, кардинально переработанный для удобного использования на смартфонах.
|
||||||
|
|
||||||
> [!CAUTION]
|
> [!CAUTION]
|
||||||
|
> ### 🔴 ВАЖНО: Рекомендуемая настройка подключения
|
||||||
>
|
>
|
||||||
> ### Реакция антивирусов
|
> Для корректной работы и обхода блокировок провайдера настоятельно рекомендуется **сначала параллельно запустить VPN**.
|
||||||
>
|
> Если этого не сделать, вместо скоростного соединения по **WebSocket** будет происходить фоллбек (fallback) на обычное **TCP-соединение**, что сведет все преимущества прокси к нулю.
|
||||||
> Windows Defender часто ошибочно помечает приложение как **Wacatac**.
|
|
||||||
> Если вы не можете скачать из-за блокировки, то:
|
|
||||||
>
|
|
||||||
> 1) Попробуйте скачать версию win7 (она ничем не отличается в плане функционала)
|
|
||||||
> 2) Отключите антивирус на время скачивания, добавьте файл в исключения и включите обратно
|
|
||||||
>
|
|
||||||
> **Всегда проверяйте, что скачиваете из интернета, тем более из непроверенных источников. Всегда лучше смотреть на детекты широко известных антивирусов на VirusTotal**
|
|
||||||
|
|
||||||
# TG WS Proxy
|
## 🌟 Что нового в Android-версии
|
||||||
|
|
||||||
**Локальный SOCKS5-прокси** для Telegram Desktop, который **ускоряет работу Telegram**, перенаправляя трафик через WebSocket-соединения. Данные передаются в том же зашифрованном виде, а для работы не нужны сторонние сервера.
|
В отличие от консольной утилиты, функции управления вынесены в красивый и удобный **Material 3** интерфейс (Jetpack Compose), без лишней «хуйни», без предупреждений антивирусов (никаких ложных Wacatac-детектов) и без лишних зависимостей.
|
||||||
|
|
||||||
<img width="529" height="487" alt="image" src="https://github.com/user-attachments/assets/6a4cf683-0df8-43af-86c1-0e8f08682b62" />
|
- **Полноценный UI:** Настройка порта, пула датацентров и количества WebSocket соединений делается в 2 клика.
|
||||||
|
- **Интеграция с Telegram:** Кнопка «Применить в телеграмм» автоматически настроит прокси через систему глубоких ссылок (`tg://socks`) для любого установленного клиента (AyuGram, Plus Messenger, NekoGram и др.).
|
||||||
|
- **Стабильная работа в фоне:** Приложение использует «неубиваемый» `Foreground Service` и самоконтроль Wakelock'ов, чтобы Android не "душил" прокси в спящем режиме.
|
||||||
|
- **Встроенный просмотрщик логов:** В реальном времени отображаются логии работы для диагностики.
|
||||||
|
- **Динамические цвета и темы:** Поддержка светлой и темной тем, а также Material You (в Android 12+).
|
||||||
|
|
||||||
## Как это работает
|
## Как это работает
|
||||||
|
|
||||||
```
|
```
|
||||||
Telegram Desktop → SOCKS5 (127.0.0.1:1080) → TG WS Proxy → WSS → Telegram DC
|
Telegram Android → SOCKS5 (по умолчанию 127.0.0.1:1080) → TG WS Proxy → WSS → Telegram DC
|
||||||
```
|
```
|
||||||
|
|
||||||
1. Приложение поднимает локальный SOCKS5-прокси на `127.0.0.1:1080`
|
1. Приложение поднимает локальный SOCKS5-прокси средствами нативного движка на языке **Go**.
|
||||||
2. Перехватывает подключения к IP-адресам Telegram
|
2. Перехватывает подключения к IP-адресам Telegram.
|
||||||
3. Извлекает DC ID из MTProto obfuscation init-пакета
|
3. Извлекает DC ID из MTProto-пакета и устанавливает защищенное WebSocket (TLS) соединение.
|
||||||
4. Устанавливает WebSocket (TLS) соединение к соответствующему DC через домены Telegram
|
4. Эффективно мультиплексирует трафик.
|
||||||
5. Если WS недоступен (302 redirect) — автоматически переключается на прямое TCP-соединение
|
|
||||||
|
|
||||||
## 🚀 Быстрый старт
|
## 🚀 Быстрый старт
|
||||||
|
|
||||||
### Windows
|
1. Перейдите на **[страницу релизов]** и скачайте актуальный `APK`-файл.
|
||||||
|
2. Установите приложение на ваш Android-смартфон.
|
||||||
Перейдите на [страницу релизов](https://github.com/Flowseal/tg-ws-proxy/releases) и скачайте **`TgWsProxy_windows.exe`**. Он собирается автоматически через [Github Actions](https://github.com/Flowseal/tg-ws-proxy/actions) из открытого исходного кода.
|
3. Откройте **TG WS Proxy**.
|
||||||
|
4. Выберите требуемый пул IP-адресов.
|
||||||
При первом запуске откроется окно с инструкцией по подключению Telegram Desktop. Приложение сворачивается в системный трей.
|
5. *(Рекомендуется)* **Включите VPN**.
|
||||||
|
6. Нажмите **«Запустить прокси»** — появится уведомление о работе в фоновом режиме.
|
||||||
**Меню трея:**
|
7. Нажмите **«Применить в телеграмм»** — откроется клиент Telegram, останется только нажать «Подключить».
|
||||||
|
|
||||||
- **Открыть в Telegram** — автоматически настроить прокси через `tg://socks` ссылку
|
|
||||||
- **Перезапустить прокси** — перезапуск без выхода из приложения
|
|
||||||
- **Настройки...** — GUI-редактор конфигурации
|
|
||||||
- **Открыть логи** — открыть файл логов
|
|
||||||
- **Выход** — остановить прокси и закрыть приложение
|
|
||||||
|
|
||||||
### macOS
|
|
||||||
|
|
||||||
Перейдите на [страницу релизов](https://github.com/Flowseal/tg-ws-proxy/releases) и скачайте **`TgWsProxy_macos_universal.dmg`** — универсальная сборка для Apple Silicon и Intel.
|
|
||||||
|
|
||||||
1. Открыть образ
|
|
||||||
2. Перенести **TG WS Proxy.app** в папку **Applications**
|
|
||||||
3. При первом запуске macOS может попросить подтвердить открытие: **Системные настройки → Конфиденциальность и безопасность → Всё равно открыть**
|
|
||||||
|
|
||||||
### Linux
|
|
||||||
|
|
||||||
Для Debian/Ubuntu скачайте со [страницы релизов](https://github.com/Flowseal/tg-ws-proxy/releases) пакет **`TgWsProxy_linux_amd64.deb`**.
|
|
||||||
|
|
||||||
Для Arch и Arch-Based дистрибутивов подготовлены пакеты в AUR: [tg-ws-proxy-bin](https://aur.archlinux.org/packages/tg-ws-proxy-bin), [tg-ws-proxy-git](https://aur.archlinux.org/packages/tg-ws-proxy-git), [tg-ws-proxy-cli](https://aur.archlinux.org/packages/tg-ws-proxy-cli)
|
|
||||||
|
|
||||||
```shell
|
|
||||||
# Установка без AUR-helper
|
|
||||||
git clone https://aur.archlinux.org/tg-ws-proxy-bin.git
|
|
||||||
cd tg-ws-proxy-bin
|
|
||||||
makepkg -si
|
|
||||||
|
|
||||||
# При помощи AUR-helper
|
|
||||||
paru -S tg-ws-proxy-bin
|
|
||||||
|
|
||||||
# Если вы установили -cli пакет, то запуск осуществляется через systemctl, где 8888 это номер порта прокси:
|
|
||||||
sudo systemctl start tg-ws-proxy-cli@8888
|
|
||||||
```
|
|
||||||
|
|
||||||
Для остальных дистрибутивов можно использовать **`TgWsProxy_linux_amd64`** (бинарный файл для x86_64).
|
|
||||||
|
|
||||||
```bash
|
|
||||||
chmod +x TgWsProxy_linux_amd64
|
|
||||||
./TgWsProxy_linux_amd64
|
|
||||||
```
|
|
||||||
|
|
||||||
При первом запуске откроется окно с инструкцией. Приложение работает в системном трее (требуется AppIndicator).
|
|
||||||
|
|
||||||
## Установка из исходников
|
|
||||||
|
|
||||||
### Консольный proxy
|
|
||||||
|
|
||||||
Для запуска только SOCKS5/WebSocket proxy без tray-интерфейса достаточно базовой установки:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
pip install -e .
|
|
||||||
tg-ws-proxy
|
|
||||||
```
|
|
||||||
|
|
||||||
### Windows 7/10+
|
|
||||||
|
|
||||||
```bash
|
|
||||||
pip install -e .
|
|
||||||
tg-ws-proxy-tray-win
|
|
||||||
```
|
|
||||||
|
|
||||||
### macOS
|
|
||||||
|
|
||||||
```bash
|
|
||||||
pip install -e .
|
|
||||||
tg-ws-proxy-tray-macos
|
|
||||||
```
|
|
||||||
|
|
||||||
### Linux
|
|
||||||
|
|
||||||
```bash
|
|
||||||
pip install -e .
|
|
||||||
tg-ws-proxy-tray-linux
|
|
||||||
```
|
|
||||||
|
|
||||||
### Консольный режим из исходников
|
|
||||||
|
|
||||||
```bash
|
|
||||||
tg-ws-proxy [--port PORT] [--host HOST] [--dc-ip DC:IP ...] [-v]
|
|
||||||
```
|
|
||||||
|
|
||||||
**Аргументы:**
|
|
||||||
|
|
||||||
| Аргумент | По умолчанию | Описание |
|
|
||||||
|---|---|---|
|
|
||||||
| `--port` | `1080` | Порт SOCKS5-прокси |
|
|
||||||
| `--host` | `127.0.0.1` | Хост SOCKS5-прокси |
|
|
||||||
| `--dc-ip` | `2:149.154.167.220`, `4:149.154.167.220` | Целевой IP для DC (можно указать несколько раз) |
|
|
||||||
| `-v`, `--verbose` | выкл. | Подробное логирование (DEBUG) |
|
|
||||||
|
|
||||||
**Примеры:**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Стандартный запуск
|
|
||||||
tg-ws-proxy
|
|
||||||
|
|
||||||
# Другой порт и дополнительные DC
|
|
||||||
tg-ws-proxy --port 9050 --dc-ip 1:149.154.175.205 --dc-ip 2:149.154.167.220
|
|
||||||
|
|
||||||
# С подробным логированием
|
|
||||||
tg-ws-proxy -v
|
|
||||||
```
|
|
||||||
|
|
||||||
## CLI-скрипты (pyproject.toml)
|
|
||||||
|
|
||||||
CLI команды объявляются в `pyproject.toml` в секции `[project.scripts]` и должны указывать на `module:function`.
|
|
||||||
|
|
||||||
Пример:
|
|
||||||
|
|
||||||
```toml
|
|
||||||
[project.scripts]
|
|
||||||
tg-ws-proxy = "proxy.tg_ws_proxy:main"
|
|
||||||
tg-ws-proxy-tray-win = "windows:main"
|
|
||||||
tg-ws-proxy-tray-macos = "macos:main"
|
|
||||||
tg-ws-proxy-tray-linux = "linux:main"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Настройка Telegram Desktop
|
|
||||||
|
|
||||||
### Автоматически
|
|
||||||
|
|
||||||
ПКМ по иконке в трее → **«Открыть в Telegram»**
|
|
||||||
|
|
||||||
### Вручную
|
|
||||||
|
|
||||||
1. Telegram → **Настройки** → **Продвинутые настройки** → **Тип подключения** → **Прокси**
|
|
||||||
2. Добавить прокси:
|
|
||||||
- **Тип:** SOCKS5
|
|
||||||
- **Сервер:** `127.0.0.1`
|
|
||||||
- **Порт:** `1080`
|
|
||||||
- **Логин/Пароль:** оставить пустыми
|
|
||||||
|
|
||||||
## Конфигурация
|
|
||||||
|
|
||||||
Tray-приложение хранит данные в:
|
|
||||||
|
|
||||||
- **Windows:** `%APPDATA%/TgWsProxy`
|
|
||||||
- **macOS:** `~/Library/Application Support/TgWsProxy`
|
|
||||||
- **Linux:** `~/.config/TgWsProxy` (или `$XDG_CONFIG_HOME/TgWsProxy`)
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"port": 1080,
|
|
||||||
"dc_ip": [
|
|
||||||
"2:149.154.167.220",
|
|
||||||
"4:149.154.167.220"
|
|
||||||
],
|
|
||||||
"verbose": false
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Автоматическая сборка
|
|
||||||
|
|
||||||
Проект содержит спецификации PyInstaller ([`packaging/windows.spec`](packaging/windows.spec), [`packaging/macos.spec`](packaging/macos.spec), [`packaging/linux.spec`](packaging/linux.spec)) и GitHub Actions workflow ([`.github/workflows/build.yml`](.github/workflows/build.yml)) для автоматической сборки.
|
|
||||||
|
|
||||||
Минимально поддерживаемые версии ОС для текущих бинарных сборок:
|
|
||||||
|
|
||||||
- Windows 10+ для `TgWsProxy_windows.exe`
|
|
||||||
- Windows 7 (x64) для `TgWsProxy_windows_7_64bit.exe`
|
|
||||||
- Windows 7 (x32) для `TgWsProxy_windows_7_32bit.exe`
|
|
||||||
- Intel macOS 10.15+
|
|
||||||
- Apple Silicon macOS 11.0+
|
|
||||||
- Linux x86_64 (требуется AppIndicator для системного трея)
|
|
||||||
|
|
||||||
## Лицензия
|
## Лицензия
|
||||||
|
|
||||||
[MIT License](LICENSE)
|
Этот форк распространяется под лицензией **GPLv3**. (Оригинальный код `tg-ws-proxy` доступен под MIT). Файл лицензии приложен к исходному коду.
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,87 @@
|
||||||
|
plugins {
|
||||||
|
id("com.android.application")
|
||||||
|
id("org.jetbrains.kotlin.android")
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace = "com.example.tgwsproxy"
|
||||||
|
compileSdk = 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
applicationId = "com.example.tgwsproxy"
|
||||||
|
minSdk = 26
|
||||||
|
targetSdk = 34
|
||||||
|
versionCode = 1
|
||||||
|
versionName = "1.0"
|
||||||
|
|
||||||
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
vectorDrawables {
|
||||||
|
useSupportLibrary = true
|
||||||
|
}
|
||||||
|
|
||||||
|
ndk {
|
||||||
|
abiFilters.add("arm64-v8a")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
signingConfigs {
|
||||||
|
create("release") {
|
||||||
|
storeFile = file("release.jks")
|
||||||
|
storePassword = "password"
|
||||||
|
keyAlias = "release"
|
||||||
|
keyPassword = "password"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
signingConfig = signingConfigs.getByName("release")
|
||||||
|
isMinifyEnabled = true
|
||||||
|
isShrinkResources = true
|
||||||
|
proguardFiles(
|
||||||
|
getDefaultProguardFile("proguard-android-optimize.txt"),
|
||||||
|
"proguard-rules.pro"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = "1.8"
|
||||||
|
}
|
||||||
|
buildFeatures {
|
||||||
|
compose = true
|
||||||
|
}
|
||||||
|
composeOptions {
|
||||||
|
kotlinCompilerExtensionVersion = "1.5.8"
|
||||||
|
}
|
||||||
|
packaging {
|
||||||
|
resources {
|
||||||
|
excludes += "/META-INF/{AL2.0,LGPL2.1}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sourceSets {
|
||||||
|
getByName("main") {
|
||||||
|
jniLibs.srcDir("src/main/jniLibs")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation("androidx.core:core-ktx:1.12.0")
|
||||||
|
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
|
||||||
|
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.7.0")
|
||||||
|
implementation("androidx.activity:activity-compose:1.8.2")
|
||||||
|
implementation(platform("androidx.compose:compose-bom:2024.01.00"))
|
||||||
|
implementation("androidx.compose.ui:ui")
|
||||||
|
implementation("androidx.compose.ui:ui-graphics")
|
||||||
|
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||||
|
implementation("androidx.compose.material3:material3")
|
||||||
|
|
||||||
|
// JNA for easy C-shared library calls
|
||||||
|
implementation("net.java.dev.jna:jna:5.14.0@aar")
|
||||||
|
debugImplementation("com.squareup.leakcanary:leakcanary-android:2.14")
|
||||||
|
implementation("androidx.compose.material:material-icons-extended")
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
|
||||||
|
-dontwarn java.awt.**
|
||||||
|
-dontwarn java.beans.**
|
||||||
|
-dontwarn javax.swing.**
|
||||||
|
-dontwarn com.sun.jna.**
|
||||||
|
# Keep JNA interfaces and methods from being removed or obfuscated
|
||||||
|
-keep class com.sun.jna.** { *; }
|
||||||
|
-keep interface com.sun.jna.Library { *; }
|
||||||
|
|
||||||
|
# Keep our proxy library interface and NativeProxy object
|
||||||
|
-keep class com.example.tgwsproxy.NativeProxy { *; }
|
||||||
|
-keep interface com.example.tgwsproxy.ProxyLibrary { *; }
|
||||||
|
-keepclassmembers class * extends com.sun.jna.Library {
|
||||||
|
<methods>;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||||
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
|
||||||
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||||
|
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission" />
|
||||||
|
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
|
||||||
|
|
||||||
|
<application
|
||||||
|
android:allowBackup="true"
|
||||||
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
|
android:label="Telegram WS Proxy"
|
||||||
|
android:supportsRtl="true"
|
||||||
|
android:theme="@android:style/Theme.NoTitleBar"
|
||||||
|
tools:targetApi="33">
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name="com.example.tgwsproxy.MainActivity"
|
||||||
|
android:exported="true"
|
||||||
|
android:configChanges="orientation|screenSize|keyboardHidden|smallestScreenSize"
|
||||||
|
android:theme="@android:style/Theme.NoTitleBar">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<service
|
||||||
|
android:name="com.example.tgwsproxy.ProxyService"
|
||||||
|
android:exported="false"
|
||||||
|
android:foregroundServiceType="specialUse">
|
||||||
|
<property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="Proxy Server" />
|
||||||
|
</service>
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
||||||
|
|
@ -0,0 +1,585 @@
|
||||||
|
package com.example.tgwsproxy
|
||||||
|
|
||||||
|
import android.Manifest
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.pm.PackageManager
|
||||||
|
import android.net.Uri
|
||||||
|
import android.os.Build
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.os.PowerManager
|
||||||
|
import android.provider.Settings
|
||||||
|
import android.content.ClipData
|
||||||
|
import android.content.ClipboardManager
|
||||||
|
import android.widget.Toast
|
||||||
|
import androidx.activity.ComponentActivity
|
||||||
|
import androidx.activity.compose.setContent
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
|
import androidx.compose.animation.*
|
||||||
|
import androidx.compose.animation.core.tween
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
|
import androidx.compose.foundation.layout.*
|
||||||
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
|
import androidx.compose.foundation.lazy.items
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.foundation.text.KeyboardOptions
|
||||||
|
import androidx.compose.foundation.verticalScroll
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.filled.NightsStay
|
||||||
|
import androidx.compose.material.icons.filled.WbSunny
|
||||||
|
import androidx.compose.material.icons.filled.ContentCopy
|
||||||
|
import androidx.compose.material3.*
|
||||||
|
import androidx.compose.runtime.*
|
||||||
|
import androidx.compose.runtime.saveable.rememberSaveable
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.text.input.KeyboardType
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.window.Dialog
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
|
import kotlinx.coroutines.*
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.update
|
||||||
|
import java.io.BufferedReader
|
||||||
|
import java.io.InputStreamReader
|
||||||
|
|
||||||
|
data class DataCenter(val name: String, val ips: String)
|
||||||
|
|
||||||
|
val datacenters = listOf(
|
||||||
|
DataCenter("Нидерланды", "91.108.4.0/22,91.108.8.0/22,149.154.160.0/20"),
|
||||||
|
DataCenter("Финляндия", "91.105.192.0/23,185.76.151.0/24"),
|
||||||
|
DataCenter("Сингапур", "91.108.56.0/22,91.108.16.0/22"),
|
||||||
|
DataCenter("Россия", "91.108.12.0/22,91.108.20.0/22")
|
||||||
|
)
|
||||||
|
|
||||||
|
val telegramApps = listOf(
|
||||||
|
"org.telegram.messenger",
|
||||||
|
"org.thunderdog.challegram",
|
||||||
|
"com.radolyn.ayugram",
|
||||||
|
"app.exteragram.messenger",
|
||||||
|
"ir.ilmili.telegraph",
|
||||||
|
"org.telegram.plus",
|
||||||
|
"tw.nekomimi.nekogram",
|
||||||
|
"tw.nekomimi.nekogramx",
|
||||||
|
"org.telegram.mdgram",
|
||||||
|
"com.iMe.android",
|
||||||
|
"app.nicegram",
|
||||||
|
"org.telegram.bgram",
|
||||||
|
"cc.modery.cherrygram",
|
||||||
|
"io.github.nextalone.nagram"
|
||||||
|
)
|
||||||
|
|
||||||
|
class MainActivity : ComponentActivity() {
|
||||||
|
|
||||||
|
private val requestPermissionLauncher = registerForActivityResult(
|
||||||
|
ActivityResultContracts.RequestPermission()
|
||||||
|
) {
|
||||||
|
// Ignored in this example, but handles Tiramisu+ notifications
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
|
||||||
|
}
|
||||||
|
checkBatteryOptimizations()
|
||||||
|
|
||||||
|
setContent {
|
||||||
|
var isDarkTheme by remember { mutableStateOf(false) }
|
||||||
|
val context = LocalContext.current
|
||||||
|
|
||||||
|
// Dynamic colors logic for Android 12+ (Material You)
|
||||||
|
val colorScheme = when {
|
||||||
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
|
||||||
|
if (isDarkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
|
||||||
|
}
|
||||||
|
isDarkTheme -> darkColorScheme()
|
||||||
|
else -> lightColorScheme()
|
||||||
|
}
|
||||||
|
|
||||||
|
MaterialTheme(colorScheme = colorScheme) {
|
||||||
|
Surface(
|
||||||
|
modifier = Modifier.fillMaxSize(),
|
||||||
|
color = MaterialTheme.colorScheme.background
|
||||||
|
) {
|
||||||
|
ProxyScreen(
|
||||||
|
isDarkTheme = isDarkTheme,
|
||||||
|
onThemeChange = { isDarkTheme = !isDarkTheme }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun checkBatteryOptimizations() {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||||
|
val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
|
||||||
|
if (!pm.isIgnoringBatteryOptimizations(packageName)) {
|
||||||
|
try {
|
||||||
|
val intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
|
||||||
|
intent.data = Uri.parse("package:$packageName")
|
||||||
|
startActivity(intent)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Toast.makeText(this, "Не удалось запросить работу в фоне", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
|
@Composable
|
||||||
|
fun ProxyScreen(isDarkTheme: Boolean, onThemeChange: () -> Unit) {
|
||||||
|
val context = LocalContext.current
|
||||||
|
val isRunning by ProxyService.isRunning.collectAsStateWithLifecycle()
|
||||||
|
var selectedDc by remember { mutableStateOf<DataCenter?>(datacenters[0]) }
|
||||||
|
var showDcModal by remember { mutableStateOf(false) }
|
||||||
|
var portText by remember { mutableStateOf("1080") }
|
||||||
|
var selectedPoolSize by remember { mutableStateOf(4) }
|
||||||
|
var showLogs by rememberSaveable { mutableStateOf(true) }
|
||||||
|
|
||||||
|
LaunchedEffect(showLogs) {
|
||||||
|
if (showLogs) LogManager.startListening() else LogManager.stopListening()
|
||||||
|
}
|
||||||
|
|
||||||
|
val startProxyAction by rememberUpdatedState {
|
||||||
|
val port = portText.toIntOrNull()
|
||||||
|
if (port == null) {
|
||||||
|
Toast.makeText(context, "Неверный порт", Toast.LENGTH_SHORT).show()
|
||||||
|
return@rememberUpdatedState
|
||||||
|
}
|
||||||
|
if (selectedDc == null) {
|
||||||
|
Toast.makeText(context, "Выберите пул датацентров", Toast.LENGTH_SHORT).show()
|
||||||
|
return@rememberUpdatedState
|
||||||
|
}
|
||||||
|
|
||||||
|
val startIntent = Intent(context, ProxyService::class.java).apply {
|
||||||
|
action = ProxyService.ACTION_START
|
||||||
|
putExtra(ProxyService.EXTRA_PORT, port)
|
||||||
|
putExtra(ProxyService.EXTRA_IPS, selectedDc!!.ips)
|
||||||
|
putExtra(ProxyService.EXTRA_POOL_SIZE, selectedPoolSize)
|
||||||
|
}
|
||||||
|
ContextCompat.startForegroundService(context, startIntent)
|
||||||
|
}
|
||||||
|
|
||||||
|
val stopProxyAction by rememberUpdatedState {
|
||||||
|
val stopIntent = Intent(context, ProxyService::class.java).apply {
|
||||||
|
action = ProxyService.ACTION_STOP
|
||||||
|
}
|
||||||
|
context.startService(stopIntent)
|
||||||
|
}
|
||||||
|
|
||||||
|
val applyInTelegramAction by rememberUpdatedState {
|
||||||
|
val port = portText.toIntOrNull() ?: 1080
|
||||||
|
val proxyUrl = "tg://socks?server=127.0.0.1&port=$port"
|
||||||
|
openTelegram(context, proxyUrl)
|
||||||
|
}
|
||||||
|
|
||||||
|
Scaffold(
|
||||||
|
topBar = {
|
||||||
|
TopAppBar(
|
||||||
|
title = { Text("Telegram WS Proxy", fontWeight = FontWeight.SemiBold) },
|
||||||
|
actions = {
|
||||||
|
IconButton(onClick = onThemeChange) {
|
||||||
|
Crossfade(targetState = isDarkTheme, animationSpec = tween(400), label = "themeAnim") { isDark ->
|
||||||
|
if (isDark) {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.Default.WbSunny,
|
||||||
|
contentDescription = "Светлая тема",
|
||||||
|
tint = MaterialTheme.colorScheme.onSurface
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.Default.NightsStay,
|
||||||
|
contentDescription = "Темная тема",
|
||||||
|
tint = MaterialTheme.colorScheme.onSurface
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
colors = TopAppBarDefaults.topAppBarColors(
|
||||||
|
containerColor = Color.Transparent,
|
||||||
|
titleContentColor = MaterialTheme.colorScheme.onSurface,
|
||||||
|
actionIconContentColor = MaterialTheme.colorScheme.onSurface
|
||||||
|
)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
containerColor = MaterialTheme.colorScheme.background
|
||||||
|
) { innerPadding ->
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxSize()
|
||||||
|
.padding(innerPadding),
|
||||||
|
contentAlignment = Alignment.Center
|
||||||
|
) {
|
||||||
|
// Constrain content width for tablets to look good anywhere
|
||||||
|
Column(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxHeight()
|
||||||
|
.widthIn(max = 600.dp)
|
||||||
|
.padding(horizontal = 24.dp, vertical = 24.dp),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
verticalArrangement = Arrangement.Top // Push top fields higher
|
||||||
|
) {
|
||||||
|
|
||||||
|
// Proxy Port Input
|
||||||
|
OutlinedTextField(
|
||||||
|
value = portText,
|
||||||
|
onValueChange = { portText = it },
|
||||||
|
label = { Text("Порт прокси") },
|
||||||
|
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
|
||||||
|
shape = RoundedCornerShape(24.dp),
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(bottom = 10.dp),
|
||||||
|
colors = OutlinedTextFieldDefaults.colors(
|
||||||
|
focusedBorderColor = MaterialTheme.colorScheme.primary,
|
||||||
|
unfocusedBorderColor = MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
|
),
|
||||||
|
singleLine = true
|
||||||
|
)
|
||||||
|
|
||||||
|
// DC selection
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(bottom = 8.dp)
|
||||||
|
.clip(RoundedCornerShape(24.dp))
|
||||||
|
.clickable { showDcModal = true }
|
||||||
|
) {
|
||||||
|
OutlinedTextField(
|
||||||
|
value = selectedDc?.name ?: "",
|
||||||
|
onValueChange = {},
|
||||||
|
label = { Text("Пул датацентров") },
|
||||||
|
enabled = false,
|
||||||
|
shape = RoundedCornerShape(24.dp),
|
||||||
|
colors = OutlinedTextFieldDefaults.colors(
|
||||||
|
disabledTextColor = MaterialTheme.colorScheme.onSurface,
|
||||||
|
disabledLabelColor = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
|
disabledBorderColor = MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
|
),
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// Pool size selector
|
||||||
|
Text(
|
||||||
|
"Размер пула WS",
|
||||||
|
style = MaterialTheme.typography.labelLarge,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
|
modifier = Modifier.padding(bottom = 8.dp)
|
||||||
|
)
|
||||||
|
Row(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(bottom = 16.dp),
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(12.dp)
|
||||||
|
) {
|
||||||
|
listOf(4, 6, 8).forEach { size ->
|
||||||
|
val isSelected = selectedPoolSize == size
|
||||||
|
FilledTonalButton(
|
||||||
|
onClick = { selectedPoolSize = size },
|
||||||
|
enabled = !isRunning,
|
||||||
|
modifier = Modifier.weight(1f).height(48.dp),
|
||||||
|
shape = RoundedCornerShape(12.dp),
|
||||||
|
colors = ButtonDefaults.filledTonalButtonColors(
|
||||||
|
containerColor = if (isSelected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.surfaceVariant,
|
||||||
|
contentColor = if (isSelected) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
"$size",
|
||||||
|
style = MaterialTheme.typography.titleMedium,
|
||||||
|
fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Normal
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Proxy Start/Stop Button
|
||||||
|
AnimatedContent(
|
||||||
|
targetState = isRunning,
|
||||||
|
transitionSpec = {
|
||||||
|
fadeIn(animationSpec = tween(300)) togetherWith fadeOut(animationSpec = tween(300))
|
||||||
|
},
|
||||||
|
label = "runAnim"
|
||||||
|
) { running ->
|
||||||
|
Button(
|
||||||
|
onClick = {
|
||||||
|
if (running) stopProxyAction() else startProxyAction()
|
||||||
|
},
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.height(64.dp),
|
||||||
|
shape = RoundedCornerShape(12.dp),
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = if (running) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
if (running) "Остановить прокси" else "Запустить прокси",
|
||||||
|
style = MaterialTheme.typography.titleMedium,
|
||||||
|
fontWeight = FontWeight.Bold
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(20.dp))
|
||||||
|
|
||||||
|
// Apply in Telegram Button
|
||||||
|
FilledTonalButton(
|
||||||
|
onClick = applyInTelegramAction,
|
||||||
|
enabled = isRunning,
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.height(64.dp),
|
||||||
|
shape = RoundedCornerShape(12.dp)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
"Применить в телеграмм",
|
||||||
|
style = MaterialTheme.typography.titleMedium,
|
||||||
|
fontWeight = FontWeight.Bold
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(12.dp))
|
||||||
|
|
||||||
|
// Logs toggle button — same style as main buttons
|
||||||
|
Button(
|
||||||
|
onClick = { showLogs = !showLogs },
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.height(64.dp),
|
||||||
|
shape = RoundedCornerShape(12.dp),
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = MaterialTheme.colorScheme.secondaryContainer,
|
||||||
|
contentColor = MaterialTheme.colorScheme.onSecondaryContainer
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
if (showLogs) "Скрыть логи" else "Показать логи",
|
||||||
|
style = MaterialTheme.typography.titleMedium,
|
||||||
|
fontWeight = FontWeight.Bold
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (showLogs) {
|
||||||
|
val logs by LogManager.logs.collectAsStateWithLifecycle()
|
||||||
|
val scroll = rememberScrollState()
|
||||||
|
val primaryColor = MaterialTheme.colorScheme.primary
|
||||||
|
|
||||||
|
// Auto-scroll to bottom when new logs arrive
|
||||||
|
LaunchedEffect(logs.size) {
|
||||||
|
scroll.animateScrollTo(scroll.maxValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(12.dp))
|
||||||
|
|
||||||
|
Box(modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.weight(1f)
|
||||||
|
.clip(RoundedCornerShape(12.dp))
|
||||||
|
.background(MaterialTheme.colorScheme.surfaceVariant)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
text = logs.joinToString("\n") { formatLogLine(it) },
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxSize()
|
||||||
|
.padding(start = 12.dp, end = 40.dp, top = 12.dp, bottom = 12.dp)
|
||||||
|
.verticalScroll(scroll),
|
||||||
|
color = primaryColor,
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
lineHeight = MaterialTheme.typography.bodySmall.fontSize * 1.5
|
||||||
|
)
|
||||||
|
IconButton(
|
||||||
|
onClick = {
|
||||||
|
val cm = ContextCompat.getSystemService(context, ClipboardManager::class.java)
|
||||||
|
cm?.setPrimaryClip(ClipData.newPlainText("Logs", logs.joinToString("\n")))
|
||||||
|
Toast.makeText(context, "Логи скопированы!", Toast.LENGTH_SHORT).show()
|
||||||
|
},
|
||||||
|
modifier = Modifier.align(Alignment.TopEnd).padding(4.dp)
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.ContentCopy,
|
||||||
|
"Копировать логи",
|
||||||
|
tint = primaryColor.copy(alpha = 0.6f)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Spacer(modifier = Modifier.weight(1f))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (showDcModal) {
|
||||||
|
DcSelectionDialog(
|
||||||
|
currentValue = selectedDc,
|
||||||
|
onDismiss = { showDcModal = false },
|
||||||
|
onSelect = {
|
||||||
|
selectedDc = it
|
||||||
|
showDcModal = false
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun DcSelectionDialog(
|
||||||
|
currentValue: DataCenter?,
|
||||||
|
onDismiss: () -> Unit,
|
||||||
|
onSelect: (DataCenter) -> Unit
|
||||||
|
) {
|
||||||
|
val currentOnSelect by rememberUpdatedState(onSelect)
|
||||||
|
|
||||||
|
Dialog(onDismissRequest = onDismiss) {
|
||||||
|
Surface(
|
||||||
|
shape = RoundedCornerShape(28.dp),
|
||||||
|
color = MaterialTheme.colorScheme.surfaceVariant,
|
||||||
|
modifier = Modifier.widthIn(max = 400.dp)
|
||||||
|
) {
|
||||||
|
Column(modifier = Modifier.padding(24.dp)) {
|
||||||
|
Text(
|
||||||
|
text = "Пул датацентров",
|
||||||
|
style = MaterialTheme.typography.headlineSmall,
|
||||||
|
color = MaterialTheme.colorScheme.onSurface,
|
||||||
|
modifier = Modifier.padding(bottom = 20.dp),
|
||||||
|
fontWeight = FontWeight.SemiBold
|
||||||
|
)
|
||||||
|
LazyColumn(
|
||||||
|
modifier = Modifier.padding(bottom = 8.dp)
|
||||||
|
) {
|
||||||
|
items(datacenters) { dc ->
|
||||||
|
Row(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clip(RoundedCornerShape(16.dp))
|
||||||
|
.clickable { currentOnSelect(dc) }
|
||||||
|
.padding(vertical = 16.dp, horizontal = 12.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
RadioButton(
|
||||||
|
selected = dc == currentValue,
|
||||||
|
onClick = null
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(16.dp))
|
||||||
|
Text(
|
||||||
|
text = dc.name,
|
||||||
|
style = MaterialTheme.typography.bodyLarge,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(8.dp))
|
||||||
|
|
||||||
|
Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
|
||||||
|
TextButton(onClick = onDismiss) {
|
||||||
|
Text("Отмена", style = MaterialTheme.typography.labelLarge)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun formatLogLine(raw: String): String {
|
||||||
|
// Raw logcat line example:
|
||||||
|
// 03-24 14:30:45.057 I/TgWsProxy(24567): INFO 11:30:45 WS pool warmup started...
|
||||||
|
// We want to extract: "11:30:45 WS pool warmup started..."
|
||||||
|
val infoIdx = raw.indexOf("INFO ")
|
||||||
|
if (infoIdx >= 0) {
|
||||||
|
return "• " + raw.substring(infoIdx + 6).trim()
|
||||||
|
}
|
||||||
|
val warnIdx = raw.indexOf("WARN ")
|
||||||
|
if (warnIdx >= 0) {
|
||||||
|
return "⚠ " + raw.substring(warnIdx + 6).trim()
|
||||||
|
}
|
||||||
|
val errIdx = raw.indexOf("ERROR ")
|
||||||
|
if (errIdx >= 0) {
|
||||||
|
return "✖ " + raw.substring(errIdx + 6).trim()
|
||||||
|
}
|
||||||
|
// Fallback: try to find the message after ):
|
||||||
|
val msgIdx = raw.indexOf("): ")
|
||||||
|
if (msgIdx >= 0) {
|
||||||
|
return "• " + raw.substring(msgIdx + 3).trim()
|
||||||
|
}
|
||||||
|
return raw.trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun openTelegram(context: Context, url: String) {
|
||||||
|
val pm = context.packageManager
|
||||||
|
val uri = Uri.parse(url)
|
||||||
|
|
||||||
|
for (pkg in telegramApps) {
|
||||||
|
try {
|
||||||
|
pm.getPackageInfo(pkg, 0)
|
||||||
|
val intent = Intent(Intent.ACTION_VIEW, uri)
|
||||||
|
intent.setPackage(pkg)
|
||||||
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||||
|
context.startActivity(intent)
|
||||||
|
return
|
||||||
|
} catch (e: PackageManager.NameNotFoundException) {
|
||||||
|
// App not found, skip
|
||||||
|
} catch (e: Exception) {
|
||||||
|
// Activity not found or other err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback: just open any app that handles tg:// link
|
||||||
|
try {
|
||||||
|
val fallbackIntent = Intent(Intent.ACTION_VIEW, uri)
|
||||||
|
fallbackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||||
|
context.startActivity(fallbackIntent)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Toast.makeText(context, "Telegram не найден!", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
object LogManager {
|
||||||
|
val logs = MutableStateFlow<List<String>>(emptyList())
|
||||||
|
private var job: Job? = null
|
||||||
|
|
||||||
|
fun startListening() {
|
||||||
|
if (job?.isActive == true) return
|
||||||
|
job = CoroutineScope(Dispatchers.IO).launch {
|
||||||
|
try {
|
||||||
|
// Clear old logs just to avoid stale
|
||||||
|
Runtime.getRuntime().exec("logcat -c").waitFor()
|
||||||
|
val process = Runtime.getRuntime().exec(arrayOf("logcat", "-v", "time", "*:D"))
|
||||||
|
val reader = BufferedReader(InputStreamReader(process.inputStream))
|
||||||
|
|
||||||
|
val myPid = android.os.Process.myPid().toString()
|
||||||
|
while (isActive) {
|
||||||
|
val line = reader.readLine() ?: break
|
||||||
|
if (line.contains(myPid) && (line.contains("INFO") || line.contains("WARN") || line.contains("ERROR"))) {
|
||||||
|
logs.update { current ->
|
||||||
|
val n = current + line
|
||||||
|
if (n.size > 30) n.takeLast(30) else n
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun stopListening() {
|
||||||
|
job?.cancel()
|
||||||
|
job = null
|
||||||
|
logs.value = emptyList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
package com.example.tgwsproxy
|
||||||
|
|
||||||
|
import com.sun.jna.Library
|
||||||
|
import com.sun.jna.Native
|
||||||
|
import com.sun.jna.Pointer
|
||||||
|
|
||||||
|
interface ProxyLibrary : Library {
|
||||||
|
companion object {
|
||||||
|
val INSTANCE = Native.load("tgwsproxy", ProxyLibrary::class.java) as ProxyLibrary
|
||||||
|
}
|
||||||
|
|
||||||
|
fun StartProxy(host: String, port: Int, dcIps: String, verbose: Int): Int
|
||||||
|
fun StopProxy(): Int
|
||||||
|
fun SetPoolSize(size: Int)
|
||||||
|
fun GetStats(): Pointer?
|
||||||
|
fun FreeString(p: Pointer)
|
||||||
|
}
|
||||||
|
|
||||||
|
object NativeProxy {
|
||||||
|
fun startProxy(host: String, port: Int, dcIps: String, verbose: Int): Int {
|
||||||
|
return ProxyLibrary.INSTANCE.StartProxy(host, port, dcIps, verbose)
|
||||||
|
}
|
||||||
|
fun stopProxy(): Int {
|
||||||
|
return ProxyLibrary.INSTANCE.StopProxy()
|
||||||
|
}
|
||||||
|
fun setPoolSize(size: Int) {
|
||||||
|
ProxyLibrary.INSTANCE.SetPoolSize(size)
|
||||||
|
}
|
||||||
|
fun getStats(): String? {
|
||||||
|
val ptr = ProxyLibrary.INSTANCE.GetStats() ?: return null
|
||||||
|
val res = ptr.getString(0)
|
||||||
|
ProxyLibrary.INSTANCE.FreeString(ptr)
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,196 @@
|
||||||
|
package com.example.tgwsproxy
|
||||||
|
|
||||||
|
import android.app.Notification
|
||||||
|
import android.app.NotificationChannel
|
||||||
|
import android.app.NotificationManager
|
||||||
|
import android.app.PendingIntent
|
||||||
|
import android.app.Service
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.pm.ServiceInfo
|
||||||
|
import android.os.Build
|
||||||
|
import android.os.IBinder
|
||||||
|
import android.os.PowerManager
|
||||||
|
import androidx.core.app.NotificationCompat
|
||||||
|
import kotlinx.coroutines.*
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
|
||||||
|
class ProxyService : Service() {
|
||||||
|
|
||||||
|
private var wakeLock: PowerManager.WakeLock? = null
|
||||||
|
private var statsJob: Job? = null
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val ACTION_START = "com.example.tgwsproxy.START"
|
||||||
|
const val ACTION_STOP = "com.example.tgwsproxy.STOP"
|
||||||
|
const val EXTRA_PORT = "EXTRA_PORT"
|
||||||
|
const val EXTRA_IPS = "EXTRA_IPS"
|
||||||
|
const val EXTRA_POOL_SIZE = "EXTRA_POOL_SIZE"
|
||||||
|
|
||||||
|
private const val NOTIFICATION_ID = 1
|
||||||
|
private const val CHANNEL_ID = "ProxyServiceChannel"
|
||||||
|
|
||||||
|
private val _isRunning = MutableStateFlow(false)
|
||||||
|
val isRunning: StateFlow<Boolean> = _isRunning
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreate() {
|
||||||
|
super.onCreate()
|
||||||
|
createNotificationChannel()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
||||||
|
when (intent?.action) {
|
||||||
|
ACTION_START -> {
|
||||||
|
val port = intent.getIntExtra(EXTRA_PORT, 8080)
|
||||||
|
val ips = intent.getStringExtra(EXTRA_IPS) ?: ""
|
||||||
|
val poolSize = intent.getIntExtra(EXTRA_POOL_SIZE, 4)
|
||||||
|
startProxy(port, ips, poolSize)
|
||||||
|
}
|
||||||
|
ACTION_STOP -> {
|
||||||
|
stopProxy()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return START_STICKY
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun startProxy(port: Int, ips: String, poolSize: Int = 4) {
|
||||||
|
if (_isRunning.value) return
|
||||||
|
|
||||||
|
val notification = createNotification("Запуск прокси...")
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||||
|
startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
|
||||||
|
} else {
|
||||||
|
startForeground(NOTIFICATION_ID, notification)
|
||||||
|
}
|
||||||
|
|
||||||
|
acquireWakeLock()
|
||||||
|
|
||||||
|
Thread {
|
||||||
|
NativeProxy.setPoolSize(poolSize)
|
||||||
|
NativeProxy.startProxy("127.0.0.1", port, ips, 1)
|
||||||
|
}.start()
|
||||||
|
|
||||||
|
_isRunning.value = true
|
||||||
|
|
||||||
|
statsJob = CoroutineScope(Dispatchers.IO).launch {
|
||||||
|
while (isActive) {
|
||||||
|
delay(2000)
|
||||||
|
if (_isRunning.value) {
|
||||||
|
val rawStats = NativeProxy.getStats() ?: continue
|
||||||
|
val upRaw = extractStat(rawStats, "up=")
|
||||||
|
val downRaw = extractStat(rawStats, "down=")
|
||||||
|
|
||||||
|
val totalBytes = parseHumanBytes(upRaw) + parseHumanBytes(downRaw)
|
||||||
|
val text = "Трафик: ${formatBytes(totalBytes)}"
|
||||||
|
val manager = getSystemService(NotificationManager::class.java)
|
||||||
|
manager?.notify(NOTIFICATION_ID, createNotification(text))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun extractStat(stats: String, key: String): String {
|
||||||
|
val idx = stats.indexOf(key)
|
||||||
|
if (idx == -1) return "0B"
|
||||||
|
val start = idx + key.length
|
||||||
|
val end = stats.indexOf(" ", start)
|
||||||
|
return if (end == -1) stats.substring(start) else stats.substring(start, end)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun parseHumanBytes(s: String): Double {
|
||||||
|
val num = s.replace(Regex("[^0-9.]"), "").toDoubleOrNull() ?: 0.0
|
||||||
|
return when {
|
||||||
|
s.endsWith("TB") -> num * 1024.0 * 1024 * 1024 * 1024
|
||||||
|
s.endsWith("GB") -> num * 1024.0 * 1024 * 1024
|
||||||
|
s.endsWith("MB") -> num * 1024.0 * 1024
|
||||||
|
s.endsWith("KB") -> num * 1024.0
|
||||||
|
else -> num
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun formatBytes(bytes: Double): String {
|
||||||
|
if (bytes < 1024) return "%.0fB".format(bytes)
|
||||||
|
if (bytes < 1024 * 1024) return "%.1fKB".format(bytes / 1024)
|
||||||
|
if (bytes < 1024 * 1024 * 1024) return "%.1fMB".format(bytes / (1024 * 1024))
|
||||||
|
return "%.2fGB".format(bytes / (1024 * 1024 * 1024))
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun stopProxy() {
|
||||||
|
statsJob?.cancel()
|
||||||
|
statsJob = null
|
||||||
|
Thread { NativeProxy.stopProxy() }.start()
|
||||||
|
releaseWakeLock()
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||||
|
stopForeground(STOP_FOREGROUND_REMOVE)
|
||||||
|
} else {
|
||||||
|
stopForeground(true)
|
||||||
|
}
|
||||||
|
stopSelf()
|
||||||
|
_isRunning.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun acquireWakeLock() {
|
||||||
|
val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
|
||||||
|
wakeLock = powerManager.newWakeLock(
|
||||||
|
PowerManager.PARTIAL_WAKE_LOCK,
|
||||||
|
"TgWsProxy::ServiceWakeLock"
|
||||||
|
)
|
||||||
|
wakeLock?.acquire()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun releaseWakeLock() {
|
||||||
|
try {
|
||||||
|
wakeLock?.let {
|
||||||
|
if (it.isHeld) {
|
||||||
|
it.release()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
// Ignore wakelock exception
|
||||||
|
}
|
||||||
|
wakeLock = null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun createNotificationChannel() {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
val serviceChannel = NotificationChannel(
|
||||||
|
CHANNEL_ID,
|
||||||
|
"Фоновый Прокси",
|
||||||
|
NotificationManager.IMPORTANCE_LOW
|
||||||
|
)
|
||||||
|
val manager = getSystemService(NotificationManager::class.java)
|
||||||
|
manager?.createNotificationChannel(serviceChannel)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun createNotification(content: String): Notification {
|
||||||
|
val stopIntent = Intent(this, ProxyService::class.java).apply {
|
||||||
|
action = ACTION_STOP
|
||||||
|
}
|
||||||
|
val stopPendingIntent = PendingIntent.getService(
|
||||||
|
this, 0, stopIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
|
||||||
|
)
|
||||||
|
|
||||||
|
return NotificationCompat.Builder(this, CHANNEL_ID)
|
||||||
|
.setContentTitle("Telegram WS Proxy")
|
||||||
|
.setContentText(content)
|
||||||
|
.setSmallIcon(R.drawable.ic_notification) // Local pure vector for Android 16 compatibility
|
||||||
|
.addAction(android.R.drawable.ic_menu_close_clear_cancel, "Отключить", stopPendingIntent)
|
||||||
|
.setOngoing(true)
|
||||||
|
.setOnlyAlertOnce(true) // prevent vibrate/sound on updates
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDestroy() {
|
||||||
|
if (_isRunning.value) {
|
||||||
|
stopProxy()
|
||||||
|
}
|
||||||
|
super.onDestroy()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBind(intent: Intent?): IBinder? {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 84 KiB |
|
|
@ -0,0 +1,9 @@
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24.0"
|
||||||
|
android:viewportHeight="24.0">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M4,4 L20,4 L20,8 L14,8 L14,20 L10,20 L10,8 L4,8 Z"/>
|
||||||
|
</vector>
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1zM12,21.8C7.68,20.62 4.5,16.03 4.5,11V6l7.5,-3.32L19.5,6v5C19.5,16.03 16.32,20.62 12,21.8z"/>
|
||||||
|
</vector>
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M6,6h12v12H6z"/>
|
||||||
|
</vector>
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<path android:fillColor="#00000000" android:pathData="M0,0h108v108h-108z"/>
|
||||||
|
</vector>
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@mipmap/ic_launcher_background_img"/>
|
||||||
|
<foreground android:drawable="@drawable/ic_transparent_fg"/>
|
||||||
|
</adaptive-icon>
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@mipmap/ic_launcher_background_img"/>
|
||||||
|
<foreground android:drawable="@drawable/ic_transparent_fg"/>
|
||||||
|
</adaptive-icon>
|
||||||
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 50 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 5.0 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 83 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 174 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 67 KiB |
|
After Width: | Height: | Size: 292 KiB |
|
After Width: | Height: | Size: 58 KiB |
|
After Width: | Height: | Size: 469 KiB |
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="ic_launcher_background">#1E1E1E</color>
|
||||||
|
</resources>
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<style name="Theme.WDTTClient" parent="android:Theme.Material.Light.NoActionBar">
|
||||||
|
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||||
|
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
plugins {
|
||||||
|
id("com.android.application") version "8.2.2" apply false
|
||||||
|
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
module tg-ws-proxy
|
||||||
|
|
||||||
|
go 1.25
|
||||||
|
|
||||||
|
require (
|
||||||
|
golang.org/x/crypto v0.31.0
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
||||||
|
android.useAndroidX=true
|
||||||
|
android.nonTransitiveRClass=true
|
||||||
871
linux.py
|
|
@ -1,871 +0,0 @@
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import asyncio as _asyncio
|
|
||||||
import json
|
|
||||||
import logging
|
|
||||||
import logging.handlers
|
|
||||||
import os
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
import threading
|
|
||||||
import time
|
|
||||||
from pathlib import Path
|
|
||||||
from typing import Dict, Optional
|
|
||||||
|
|
||||||
import customtkinter as ctk
|
|
||||||
import psutil
|
|
||||||
import pyperclip
|
|
||||||
import pystray
|
|
||||||
from PIL import Image, ImageDraw, ImageFont
|
|
||||||
|
|
||||||
import proxy.tg_ws_proxy as tg_ws_proxy
|
|
||||||
|
|
||||||
APP_NAME = "TgWsProxy"
|
|
||||||
APP_DIR = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config")) / APP_NAME
|
|
||||||
CONFIG_FILE = APP_DIR / "config.json"
|
|
||||||
LOG_FILE = APP_DIR / "proxy.log"
|
|
||||||
FIRST_RUN_MARKER = APP_DIR / ".first_run_done"
|
|
||||||
IPV6_WARN_MARKER = APP_DIR / ".ipv6_warned"
|
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_CONFIG = {
|
|
||||||
"port": 1080,
|
|
||||||
"host": "127.0.0.1",
|
|
||||||
"dc_ip": ["2:149.154.167.220", "4:149.154.167.220"],
|
|
||||||
"verbose": False,
|
|
||||||
"log_max_mb": 5,
|
|
||||||
"buf_kb": 256,
|
|
||||||
"pool_size": 4,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
_proxy_thread: Optional[threading.Thread] = None
|
|
||||||
_async_stop: Optional[object] = None
|
|
||||||
_tray_icon: Optional[object] = None
|
|
||||||
_config: dict = {}
|
|
||||||
_exiting: bool = False
|
|
||||||
_lock_file_path: Optional[Path] = None
|
|
||||||
|
|
||||||
log = logging.getLogger("tg-ws-tray")
|
|
||||||
|
|
||||||
|
|
||||||
def _same_process(lock_meta: dict, proc: psutil.Process) -> bool:
|
|
||||||
try:
|
|
||||||
lock_ct = float(lock_meta.get("create_time", 0.0))
|
|
||||||
proc_ct = float(proc.create_time())
|
|
||||||
if lock_ct > 0 and abs(lock_ct - proc_ct) > 1.0:
|
|
||||||
return False
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
|
||||||
cmdline = proc.cmdline()
|
|
||||||
for arg in cmdline:
|
|
||||||
if "linux.py" in arg:
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
frozen = bool(getattr(sys, "frozen", False))
|
|
||||||
if frozen:
|
|
||||||
return APP_NAME.lower() in proc.name().lower()
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _release_lock():
|
|
||||||
global _lock_file_path
|
|
||||||
if not _lock_file_path:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
_lock_file_path.unlink(missing_ok=True)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
_lock_file_path = None
|
|
||||||
|
|
||||||
|
|
||||||
def _acquire_lock() -> bool:
|
|
||||||
global _lock_file_path
|
|
||||||
_ensure_dirs()
|
|
||||||
lock_files = list(APP_DIR.glob("*.lock"))
|
|
||||||
|
|
||||||
for f in lock_files:
|
|
||||||
pid = None
|
|
||||||
meta: dict = {}
|
|
||||||
|
|
||||||
try:
|
|
||||||
pid = int(f.stem)
|
|
||||||
except Exception:
|
|
||||||
f.unlink(missing_ok=True)
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
raw = f.read_text(encoding="utf-8").strip()
|
|
||||||
if raw:
|
|
||||||
meta = json.loads(raw)
|
|
||||||
except Exception:
|
|
||||||
meta = {}
|
|
||||||
|
|
||||||
try:
|
|
||||||
proc = psutil.Process(pid)
|
|
||||||
if _same_process(meta, proc):
|
|
||||||
return False
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
f.unlink(missing_ok=True)
|
|
||||||
|
|
||||||
lock_file = APP_DIR / f"{os.getpid()}.lock"
|
|
||||||
try:
|
|
||||||
proc = psutil.Process(os.getpid())
|
|
||||||
payload = {
|
|
||||||
"create_time": proc.create_time(),
|
|
||||||
}
|
|
||||||
lock_file.write_text(json.dumps(payload, ensure_ascii=False), encoding="utf-8")
|
|
||||||
except Exception:
|
|
||||||
lock_file.touch()
|
|
||||||
|
|
||||||
_lock_file_path = lock_file
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def _ensure_dirs():
|
|
||||||
APP_DIR.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
|
|
||||||
def load_config() -> dict:
|
|
||||||
_ensure_dirs()
|
|
||||||
if CONFIG_FILE.exists():
|
|
||||||
try:
|
|
||||||
with open(CONFIG_FILE, "r", encoding="utf-8") as f:
|
|
||||||
data = json.load(f)
|
|
||||||
for k, v in DEFAULT_CONFIG.items():
|
|
||||||
data.setdefault(k, v)
|
|
||||||
return data
|
|
||||||
except Exception as exc:
|
|
||||||
log.warning("Failed to load config: %s", exc)
|
|
||||||
return dict(DEFAULT_CONFIG)
|
|
||||||
|
|
||||||
|
|
||||||
def save_config(cfg: dict):
|
|
||||||
_ensure_dirs()
|
|
||||||
with open(CONFIG_FILE, "w", encoding="utf-8") as f:
|
|
||||||
json.dump(cfg, f, indent=2, ensure_ascii=False)
|
|
||||||
|
|
||||||
|
|
||||||
def setup_logging(verbose: bool = False, log_max_mb: float = 5):
|
|
||||||
_ensure_dirs()
|
|
||||||
root = logging.getLogger()
|
|
||||||
root.setLevel(logging.DEBUG if verbose else logging.INFO)
|
|
||||||
|
|
||||||
fh = logging.handlers.RotatingFileHandler(
|
|
||||||
str(LOG_FILE),
|
|
||||||
maxBytes=max(32 * 1024, log_max_mb * 1024 * 1024),
|
|
||||||
backupCount=0,
|
|
||||||
encoding='utf-8',
|
|
||||||
)
|
|
||||||
fh.setLevel(logging.DEBUG)
|
|
||||||
fh.setFormatter(
|
|
||||||
logging.Formatter(
|
|
||||||
"%(asctime)s %(levelname)-5s %(name)s %(message)s",
|
|
||||||
datefmt="%Y-%m-%d %H:%M:%S",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
root.addHandler(fh)
|
|
||||||
|
|
||||||
if not getattr(sys, "frozen", False):
|
|
||||||
ch = logging.StreamHandler(sys.stdout)
|
|
||||||
ch.setLevel(logging.DEBUG if verbose else logging.INFO)
|
|
||||||
ch.setFormatter(
|
|
||||||
logging.Formatter(
|
|
||||||
"%(asctime)s %(levelname)-5s %(message)s", datefmt="%H:%M:%S"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
root.addHandler(ch)
|
|
||||||
|
|
||||||
|
|
||||||
def _make_icon_image(size: int = 64):
|
|
||||||
if Image is None:
|
|
||||||
raise RuntimeError("Pillow is required for tray icon")
|
|
||||||
img = Image.new("RGBA", (size, size), (0, 0, 0, 0))
|
|
||||||
draw = ImageDraw.Draw(img)
|
|
||||||
|
|
||||||
margin = 2
|
|
||||||
draw.ellipse(
|
|
||||||
[margin, margin, size - margin, size - margin], fill=(0, 136, 204, 255)
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
|
||||||
font = ImageFont.truetype(
|
|
||||||
"/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf",
|
|
||||||
size=int(size * 0.55),
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
try:
|
|
||||||
font = ImageFont.truetype(
|
|
||||||
"/usr/share/fonts/TTF/DejaVuSans-Bold.ttf", size=int(size * 0.55)
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
font = ImageFont.load_default()
|
|
||||||
bbox = draw.textbbox((0, 0), "T", font=font)
|
|
||||||
tw, th = bbox[2] - bbox[0], bbox[3] - bbox[1]
|
|
||||||
tx = (size - tw) // 2 - bbox[0]
|
|
||||||
ty = (size - th) // 2 - bbox[1]
|
|
||||||
draw.text((tx, ty), "T", fill=(255, 255, 255, 255), font=font)
|
|
||||||
|
|
||||||
return img
|
|
||||||
|
|
||||||
|
|
||||||
def _load_icon():
|
|
||||||
icon_path = Path(__file__).parent / "icon.ico"
|
|
||||||
if icon_path.exists() and Image:
|
|
||||||
try:
|
|
||||||
return Image.open(str(icon_path))
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
return _make_icon_image()
|
|
||||||
|
|
||||||
|
|
||||||
def _run_proxy_thread(
|
|
||||||
port: int, dc_opt: Dict[int, str], verbose: bool, host: str = "127.0.0.1"
|
|
||||||
):
|
|
||||||
global _async_stop
|
|
||||||
loop = _asyncio.new_event_loop()
|
|
||||||
_asyncio.set_event_loop(loop)
|
|
||||||
stop_ev = _asyncio.Event()
|
|
||||||
_async_stop = (loop, stop_ev)
|
|
||||||
|
|
||||||
try:
|
|
||||||
loop.run_until_complete(
|
|
||||||
tg_ws_proxy._run(port, dc_opt, stop_event=stop_ev, host=host)
|
|
||||||
)
|
|
||||||
except Exception as exc:
|
|
||||||
log.error("Proxy thread crashed: %s", exc)
|
|
||||||
if "Address already in use" in str(exc):
|
|
||||||
_show_error(
|
|
||||||
"Не удалось запустить прокси:\nПорт уже используется другим приложением.\n\nЗакройте приложение, использующее этот порт, или измените порт в настройках прокси и перезапустите."
|
|
||||||
)
|
|
||||||
finally:
|
|
||||||
loop.close()
|
|
||||||
_async_stop = None
|
|
||||||
|
|
||||||
|
|
||||||
def start_proxy():
|
|
||||||
global _proxy_thread, _config
|
|
||||||
if _proxy_thread and _proxy_thread.is_alive():
|
|
||||||
log.info("Proxy already running")
|
|
||||||
return
|
|
||||||
|
|
||||||
cfg = _config
|
|
||||||
port = cfg.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
host = cfg.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
dc_ip_list = cfg.get("dc_ip", DEFAULT_CONFIG["dc_ip"])
|
|
||||||
verbose = cfg.get("verbose", False)
|
|
||||||
|
|
||||||
try:
|
|
||||||
dc_opt = tg_ws_proxy.parse_dc_ip_list(dc_ip_list)
|
|
||||||
except ValueError as e:
|
|
||||||
log.error("Bad config dc_ip: %s", e)
|
|
||||||
_show_error(f"Ошибка конфигурации:\n{e}")
|
|
||||||
return
|
|
||||||
|
|
||||||
log.info("Starting proxy on %s:%d ...", host, port)
|
|
||||||
|
|
||||||
buf_kb = cfg.get("buf_kb", DEFAULT_CONFIG["buf_kb"])
|
|
||||||
pool_size = cfg.get("pool_size", DEFAULT_CONFIG["pool_size"])
|
|
||||||
tg_ws_proxy._RECV_BUF = max(4, buf_kb) * 1024
|
|
||||||
tg_ws_proxy._SEND_BUF = tg_ws_proxy._RECV_BUF
|
|
||||||
tg_ws_proxy._WS_POOL_SIZE = max(0, pool_size)
|
|
||||||
|
|
||||||
_proxy_thread = threading.Thread(
|
|
||||||
target=_run_proxy_thread,
|
|
||||||
args=(port, dc_opt, verbose, host),
|
|
||||||
daemon=True,
|
|
||||||
name="proxy",
|
|
||||||
)
|
|
||||||
_proxy_thread.start()
|
|
||||||
|
|
||||||
|
|
||||||
def stop_proxy():
|
|
||||||
global _proxy_thread, _async_stop
|
|
||||||
if _async_stop:
|
|
||||||
loop, stop_ev = _async_stop
|
|
||||||
loop.call_soon_threadsafe(stop_ev.set)
|
|
||||||
if _proxy_thread:
|
|
||||||
_proxy_thread.join(timeout=2)
|
|
||||||
_proxy_thread = None
|
|
||||||
log.info("Proxy stopped")
|
|
||||||
|
|
||||||
|
|
||||||
def restart_proxy():
|
|
||||||
log.info("Restarting proxy...")
|
|
||||||
stop_proxy()
|
|
||||||
time.sleep(0.3)
|
|
||||||
start_proxy()
|
|
||||||
|
|
||||||
|
|
||||||
def _show_error(text: str, title: str = "TG WS Proxy — Ошибка"):
|
|
||||||
import tkinter as _tk
|
|
||||||
from tkinter import messagebox as _mb
|
|
||||||
|
|
||||||
root = _tk.Tk()
|
|
||||||
root.withdraw()
|
|
||||||
_mb.showerror(title, text, parent=root)
|
|
||||||
root.destroy()
|
|
||||||
|
|
||||||
|
|
||||||
def _show_info(text: str, title: str = "TG WS Proxy"):
|
|
||||||
import tkinter as _tk
|
|
||||||
from tkinter import messagebox as _mb
|
|
||||||
|
|
||||||
root = _tk.Tk()
|
|
||||||
root.withdraw()
|
|
||||||
_mb.showinfo(title, text, parent=root)
|
|
||||||
root.destroy()
|
|
||||||
|
|
||||||
|
|
||||||
def _on_open_in_telegram(icon=None, item=None):
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
url = f"tg://socks?server=127.0.0.1&port={port}"
|
|
||||||
log.info("Copying %s", url)
|
|
||||||
|
|
||||||
try:
|
|
||||||
pyperclip.copy(url)
|
|
||||||
_show_info(
|
|
||||||
f"Ссылка скопирована в буфер обмена, отправьте её в Telegram и нажмите по ней ЛКМ:\n{url}",
|
|
||||||
"TG WS Proxy",
|
|
||||||
)
|
|
||||||
except Exception as exc:
|
|
||||||
log.error("Clipboard copy failed: %s", exc)
|
|
||||||
_show_error(f"Не удалось скопировать ссылку:\n{exc}")
|
|
||||||
|
|
||||||
|
|
||||||
def _on_restart(icon=None, item=None):
|
|
||||||
threading.Thread(target=restart_proxy, daemon=True).start()
|
|
||||||
|
|
||||||
|
|
||||||
def _on_edit_config(icon=None, item=None):
|
|
||||||
threading.Thread(target=_edit_config_dialog, daemon=True).start()
|
|
||||||
|
|
||||||
|
|
||||||
def _edit_config_dialog():
|
|
||||||
if ctk is None:
|
|
||||||
_show_error("customtkinter не установлен.")
|
|
||||||
return
|
|
||||||
|
|
||||||
cfg = dict(_config)
|
|
||||||
|
|
||||||
ctk.set_appearance_mode("light")
|
|
||||||
ctk.set_default_color_theme("blue")
|
|
||||||
|
|
||||||
root = ctk.CTk()
|
|
||||||
root.title("TG WS Proxy — Настройки")
|
|
||||||
root.resizable(False, False)
|
|
||||||
root.attributes("-topmost", True)
|
|
||||||
|
|
||||||
icon_img = _load_icon()
|
|
||||||
if icon_img:
|
|
||||||
from PIL import ImageTk
|
|
||||||
|
|
||||||
_photo = ImageTk.PhotoImage(icon_img.resize((64, 64)))
|
|
||||||
root.iconphoto(False, _photo)
|
|
||||||
|
|
||||||
TG_BLUE = "#3390ec"
|
|
||||||
TG_BLUE_HOVER = "#2b7cd4"
|
|
||||||
BG = "#ffffff"
|
|
||||||
FIELD_BG = "#f0f2f5"
|
|
||||||
FIELD_BORDER = "#d6d9dc"
|
|
||||||
TEXT_PRIMARY = "#000000"
|
|
||||||
TEXT_SECONDARY = "#707579"
|
|
||||||
FONT_FAMILY = "Sans"
|
|
||||||
|
|
||||||
w, h = 420, 540
|
|
||||||
sw = root.winfo_screenwidth()
|
|
||||||
sh = root.winfo_screenheight()
|
|
||||||
root.geometry(f"{w}x{h}+{(sw - w) // 2}+{(sh - h) // 2}")
|
|
||||||
root.configure(fg_color=BG)
|
|
||||||
|
|
||||||
frame = ctk.CTkFrame(root, fg_color=BG, corner_radius=0)
|
|
||||||
frame.pack(fill="both", expand=True, padx=24, pady=20)
|
|
||||||
|
|
||||||
# Host
|
|
||||||
ctk.CTkLabel(
|
|
||||||
frame,
|
|
||||||
text="IP-адрес прокси",
|
|
||||||
font=(FONT_FAMILY, 13),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
anchor="w",
|
|
||||||
).pack(anchor="w", pady=(0, 4))
|
|
||||||
host_var = ctk.StringVar(value=cfg.get("host", "127.0.0.1"))
|
|
||||||
host_entry = ctk.CTkEntry(
|
|
||||||
frame,
|
|
||||||
textvariable=host_var,
|
|
||||||
width=200,
|
|
||||||
height=36,
|
|
||||||
font=(FONT_FAMILY, 13),
|
|
||||||
corner_radius=10,
|
|
||||||
fg_color=FIELD_BG,
|
|
||||||
border_color=FIELD_BORDER,
|
|
||||||
border_width=1,
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
)
|
|
||||||
host_entry.pack(anchor="w", pady=(0, 12))
|
|
||||||
|
|
||||||
# Port
|
|
||||||
ctk.CTkLabel(
|
|
||||||
frame,
|
|
||||||
text="Порт прокси",
|
|
||||||
font=(FONT_FAMILY, 13),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
anchor="w",
|
|
||||||
).pack(anchor="w", pady=(0, 4))
|
|
||||||
port_var = ctk.StringVar(value=str(cfg.get("port", 1080)))
|
|
||||||
port_entry = ctk.CTkEntry(
|
|
||||||
frame,
|
|
||||||
textvariable=port_var,
|
|
||||||
width=120,
|
|
||||||
height=36,
|
|
||||||
font=(FONT_FAMILY, 13),
|
|
||||||
corner_radius=10,
|
|
||||||
fg_color=FIELD_BG,
|
|
||||||
border_color=FIELD_BORDER,
|
|
||||||
border_width=1,
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
)
|
|
||||||
port_entry.pack(anchor="w", pady=(0, 12))
|
|
||||||
|
|
||||||
# DC-IP mappings
|
|
||||||
ctk.CTkLabel(
|
|
||||||
frame,
|
|
||||||
text="DC → IP маппинги (по одному на строку, формат DC:IP)",
|
|
||||||
font=(FONT_FAMILY, 13),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
anchor="w",
|
|
||||||
).pack(anchor="w", pady=(0, 4))
|
|
||||||
dc_textbox = ctk.CTkTextbox(
|
|
||||||
frame,
|
|
||||||
width=370,
|
|
||||||
height=120,
|
|
||||||
font=("Monospace", 12),
|
|
||||||
corner_radius=10,
|
|
||||||
fg_color=FIELD_BG,
|
|
||||||
border_color=FIELD_BORDER,
|
|
||||||
border_width=1,
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
)
|
|
||||||
dc_textbox.pack(anchor="w", pady=(0, 12))
|
|
||||||
dc_textbox.insert("1.0", "\n".join(cfg.get("dc_ip", DEFAULT_CONFIG["dc_ip"])))
|
|
||||||
|
|
||||||
# Verbose
|
|
||||||
verbose_var = ctk.BooleanVar(value=cfg.get("verbose", False))
|
|
||||||
ctk.CTkCheckBox(
|
|
||||||
frame,
|
|
||||||
text="Подробное логирование (verbose)",
|
|
||||||
variable=verbose_var,
|
|
||||||
font=(FONT_FAMILY, 13),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
fg_color=TG_BLUE,
|
|
||||||
hover_color=TG_BLUE_HOVER,
|
|
||||||
corner_radius=6,
|
|
||||||
border_width=2,
|
|
||||||
border_color=FIELD_BORDER,
|
|
||||||
).pack(anchor="w", pady=(0, 8))
|
|
||||||
|
|
||||||
# Advanced: buf_kb, pool_size, log_max_mb
|
|
||||||
adv_frame = ctk.CTkFrame(frame, fg_color="transparent")
|
|
||||||
adv_frame.pack(anchor="w", fill="x", pady=(4, 8))
|
|
||||||
|
|
||||||
for col, (lbl, key, w_) in enumerate([
|
|
||||||
("Буфер (KB, 256 default)", "buf_kb", 120),
|
|
||||||
("WS пулов (4 default)", "pool_size", 120),
|
|
||||||
("Log size (MB, 5 def)", "log_max_mb", 120),
|
|
||||||
]):
|
|
||||||
col_frame = ctk.CTkFrame(adv_frame, fg_color="transparent")
|
|
||||||
col_frame.pack(side="left", padx=(0, 10))
|
|
||||||
ctk.CTkLabel(col_frame, text=lbl, font=(FONT_FAMILY, 11),
|
|
||||||
text_color=TEXT_SECONDARY, anchor="w").pack(anchor="w")
|
|
||||||
ctk.CTkEntry(col_frame, width=w_, height=30, font=(FONT_FAMILY, 12),
|
|
||||||
corner_radius=8, fg_color=FIELD_BG,
|
|
||||||
border_color=FIELD_BORDER, border_width=1,
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
textvariable=ctk.StringVar(
|
|
||||||
value=str(cfg.get(key, DEFAULT_CONFIG[key]))
|
|
||||||
)).pack(anchor="w")
|
|
||||||
|
|
||||||
_adv_entries = list(adv_frame.winfo_children())
|
|
||||||
_adv_keys = ["buf_kb", "pool_size", "log_max_mb"]
|
|
||||||
|
|
||||||
def on_save():
|
|
||||||
import socket as _sock
|
|
||||||
|
|
||||||
host_val = host_var.get().strip()
|
|
||||||
try:
|
|
||||||
_sock.inet_aton(host_val)
|
|
||||||
except OSError:
|
|
||||||
_show_error("Некорректный IP-адрес.")
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
port_val = int(port_var.get().strip())
|
|
||||||
if not (1 <= port_val <= 65535):
|
|
||||||
raise ValueError
|
|
||||||
except ValueError:
|
|
||||||
_show_error("Порт должен быть числом 1-65535")
|
|
||||||
return
|
|
||||||
|
|
||||||
lines = [
|
|
||||||
l.strip()
|
|
||||||
for l in dc_textbox.get("1.0", "end").strip().splitlines()
|
|
||||||
if l.strip()
|
|
||||||
]
|
|
||||||
try:
|
|
||||||
tg_ws_proxy.parse_dc_ip_list(lines)
|
|
||||||
except ValueError as e:
|
|
||||||
_show_error(str(e))
|
|
||||||
return
|
|
||||||
|
|
||||||
new_cfg = {
|
|
||||||
"host": host_val,
|
|
||||||
"port": port_val,
|
|
||||||
"dc_ip": lines,
|
|
||||||
"verbose": verbose_var.get(),
|
|
||||||
}
|
|
||||||
|
|
||||||
for i, key in enumerate(_adv_keys):
|
|
||||||
col_frame = _adv_entries[i]
|
|
||||||
entry = col_frame.winfo_children()[1]
|
|
||||||
try:
|
|
||||||
val = float(entry.get().strip())
|
|
||||||
if key in ("buf_kb", "pool_size"):
|
|
||||||
val = int(val)
|
|
||||||
new_cfg[key] = val
|
|
||||||
except ValueError:
|
|
||||||
new_cfg[key] = DEFAULT_CONFIG[key]
|
|
||||||
save_config(new_cfg)
|
|
||||||
_config.update(new_cfg)
|
|
||||||
log.info("Config saved: %s", new_cfg)
|
|
||||||
|
|
||||||
_tray_icon.menu = _build_menu()
|
|
||||||
|
|
||||||
from tkinter import messagebox
|
|
||||||
|
|
||||||
if messagebox.askyesno(
|
|
||||||
"Перезапустить?",
|
|
||||||
"Настройки сохранены.\n\nПерезапустить прокси сейчас?",
|
|
||||||
parent=root,
|
|
||||||
):
|
|
||||||
root.destroy()
|
|
||||||
restart_proxy()
|
|
||||||
else:
|
|
||||||
root.destroy()
|
|
||||||
|
|
||||||
def on_cancel():
|
|
||||||
root.destroy()
|
|
||||||
|
|
||||||
btn_frame = ctk.CTkFrame(frame, fg_color="transparent")
|
|
||||||
btn_frame.pack(fill="x", pady=(20, 0))
|
|
||||||
ctk.CTkButton(btn_frame, text="Сохранить", height=38,
|
|
||||||
font=(FONT_FAMILY, 14, "bold"), corner_radius=10,
|
|
||||||
fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
|
|
||||||
text_color="#ffffff",
|
|
||||||
command=on_save).pack(side="left", fill="x", expand=True, padx=(0, 8))
|
|
||||||
ctk.CTkButton(btn_frame, text="Отмена", height=38,
|
|
||||||
font=(FONT_FAMILY, 14), corner_radius=10,
|
|
||||||
fg_color=FIELD_BG, hover_color=FIELD_BORDER,
|
|
||||||
text_color=TEXT_PRIMARY, border_width=1,
|
|
||||||
border_color=FIELD_BORDER,
|
|
||||||
command=on_cancel).pack(side="right", fill="x", expand=True)
|
|
||||||
|
|
||||||
root.mainloop()
|
|
||||||
|
|
||||||
|
|
||||||
def _on_open_logs(icon=None, item=None):
|
|
||||||
log.info("Opening log file: %s", LOG_FILE)
|
|
||||||
if LOG_FILE.exists():
|
|
||||||
env = os.environ.copy()
|
|
||||||
env.pop("VIRTUAL_ENV", None)
|
|
||||||
env.pop("PYTHONPATH", None)
|
|
||||||
env.pop("PYTHONHOME", None)
|
|
||||||
|
|
||||||
subprocess.Popen(
|
|
||||||
["xdg-open", str(LOG_FILE)],
|
|
||||||
env=env,
|
|
||||||
stdout=subprocess.DEVNULL,
|
|
||||||
stderr=subprocess.DEVNULL,
|
|
||||||
stdin=subprocess.DEVNULL,
|
|
||||||
start_new_session=True,
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
_show_info("Файл логов ещё не создан.", "TG WS Proxy")
|
|
||||||
|
|
||||||
|
|
||||||
def _on_exit(icon=None, item=None):
|
|
||||||
global _exiting
|
|
||||||
if _exiting:
|
|
||||||
os._exit(0)
|
|
||||||
return
|
|
||||||
_exiting = True
|
|
||||||
log.info("User requested exit")
|
|
||||||
|
|
||||||
def _force_exit():
|
|
||||||
time.sleep(3)
|
|
||||||
os._exit(0)
|
|
||||||
|
|
||||||
threading.Thread(target=_force_exit, daemon=True, name="force-exit").start()
|
|
||||||
|
|
||||||
if icon:
|
|
||||||
icon.stop()
|
|
||||||
|
|
||||||
|
|
||||||
def _show_first_run():
|
|
||||||
_ensure_dirs()
|
|
||||||
if FIRST_RUN_MARKER.exists():
|
|
||||||
return
|
|
||||||
|
|
||||||
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
tg_url = f"tg://socks?server={host}&port={port}"
|
|
||||||
|
|
||||||
if ctk is None:
|
|
||||||
FIRST_RUN_MARKER.touch()
|
|
||||||
return
|
|
||||||
|
|
||||||
ctk.set_appearance_mode("light")
|
|
||||||
ctk.set_default_color_theme("blue")
|
|
||||||
|
|
||||||
TG_BLUE = "#3390ec"
|
|
||||||
TG_BLUE_HOVER = "#2b7cd4"
|
|
||||||
BG = "#ffffff"
|
|
||||||
FIELD_BG = "#f0f2f5"
|
|
||||||
FIELD_BORDER = "#d6d9dc"
|
|
||||||
TEXT_PRIMARY = "#000000"
|
|
||||||
TEXT_SECONDARY = "#707579"
|
|
||||||
FONT_FAMILY = "Sans"
|
|
||||||
|
|
||||||
root = ctk.CTk()
|
|
||||||
root.title("TG WS Proxy")
|
|
||||||
root.resizable(False, False)
|
|
||||||
root.attributes("-topmost", True)
|
|
||||||
|
|
||||||
icon_img = _load_icon()
|
|
||||||
if icon_img:
|
|
||||||
from PIL import ImageTk
|
|
||||||
|
|
||||||
_photo = ImageTk.PhotoImage(icon_img.resize((64, 64)))
|
|
||||||
root.iconphoto(False, _photo)
|
|
||||||
|
|
||||||
w, h = 520, 440
|
|
||||||
sw = root.winfo_screenwidth()
|
|
||||||
sh = root.winfo_screenheight()
|
|
||||||
root.geometry(f"{w}x{h}+{(sw - w) // 2}+{(sh - h) // 2}")
|
|
||||||
root.configure(fg_color=BG)
|
|
||||||
|
|
||||||
frame = ctk.CTkFrame(root, fg_color=BG, corner_radius=0)
|
|
||||||
frame.pack(fill="both", expand=True, padx=28, pady=24)
|
|
||||||
|
|
||||||
title_frame = ctk.CTkFrame(frame, fg_color="transparent")
|
|
||||||
title_frame.pack(anchor="w", pady=(0, 16), fill="x")
|
|
||||||
|
|
||||||
# Blue accent bar
|
|
||||||
accent_bar = ctk.CTkFrame(
|
|
||||||
title_frame, fg_color=TG_BLUE, width=4, height=32, corner_radius=2
|
|
||||||
)
|
|
||||||
accent_bar.pack(side="left", padx=(0, 12))
|
|
||||||
|
|
||||||
ctk.CTkLabel(
|
|
||||||
title_frame,
|
|
||||||
text="Прокси запущен и работает в системном трее",
|
|
||||||
font=(FONT_FAMILY, 17, "bold"),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
).pack(side="left")
|
|
||||||
|
|
||||||
# Info sections
|
|
||||||
sections = [
|
|
||||||
("Как подключить Telegram Desktop:", True),
|
|
||||||
(" Автоматически:", True),
|
|
||||||
(f" ПКМ по иконке в трее → «Открыть в Telegram»", False),
|
|
||||||
(f" Или ссылка: {tg_url}", False),
|
|
||||||
("\n Вручную:", True),
|
|
||||||
(" Настройки → Продвинутые → Тип подключения → Прокси", False),
|
|
||||||
(f" SOCKS5 → {host} : {port} (без логина/пароля)", False),
|
|
||||||
]
|
|
||||||
|
|
||||||
for text, bold in sections:
|
|
||||||
weight = "bold" if bold else "normal"
|
|
||||||
ctk.CTkLabel(
|
|
||||||
frame,
|
|
||||||
text=text,
|
|
||||||
font=(FONT_FAMILY, 13, weight),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
anchor="w",
|
|
||||||
justify="left",
|
|
||||||
).pack(anchor="w", pady=1)
|
|
||||||
|
|
||||||
# Spacer
|
|
||||||
ctk.CTkFrame(frame, fg_color="transparent", height=16).pack()
|
|
||||||
|
|
||||||
# Separator
|
|
||||||
ctk.CTkFrame(frame, fg_color=FIELD_BORDER, height=1, corner_radius=0).pack(
|
|
||||||
fill="x", pady=(0, 12)
|
|
||||||
)
|
|
||||||
|
|
||||||
# Checkbox
|
|
||||||
auto_var = ctk.BooleanVar(value=True)
|
|
||||||
ctk.CTkCheckBox(
|
|
||||||
frame,
|
|
||||||
text="Открыть прокси в Telegram сейчас",
|
|
||||||
variable=auto_var,
|
|
||||||
font=(FONT_FAMILY, 13),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
fg_color=TG_BLUE,
|
|
||||||
hover_color=TG_BLUE_HOVER,
|
|
||||||
corner_radius=6,
|
|
||||||
border_width=2,
|
|
||||||
border_color=FIELD_BORDER,
|
|
||||||
).pack(anchor="w", pady=(0, 16))
|
|
||||||
|
|
||||||
def on_ok():
|
|
||||||
FIRST_RUN_MARKER.touch()
|
|
||||||
open_tg = auto_var.get()
|
|
||||||
root.destroy()
|
|
||||||
if open_tg:
|
|
||||||
_on_open_in_telegram()
|
|
||||||
|
|
||||||
ctk.CTkButton(
|
|
||||||
frame,
|
|
||||||
text="Начать",
|
|
||||||
width=180,
|
|
||||||
height=42,
|
|
||||||
font=(FONT_FAMILY, 15, "bold"),
|
|
||||||
corner_radius=10,
|
|
||||||
fg_color=TG_BLUE,
|
|
||||||
hover_color=TG_BLUE_HOVER,
|
|
||||||
text_color="#ffffff",
|
|
||||||
command=on_ok,
|
|
||||||
).pack(pady=(0, 0))
|
|
||||||
|
|
||||||
root.protocol("WM_DELETE_WINDOW", on_ok)
|
|
||||||
root.mainloop()
|
|
||||||
|
|
||||||
|
|
||||||
def _has_ipv6_enabled() -> bool:
|
|
||||||
import socket as _sock
|
|
||||||
|
|
||||||
try:
|
|
||||||
addrs = _sock.getaddrinfo(_sock.gethostname(), None, _sock.AF_INET6)
|
|
||||||
for addr in addrs:
|
|
||||||
ip = addr[4][0]
|
|
||||||
if ip and not ip.startswith("::1") and not ip.startswith("fe80::1"):
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
s = _sock.socket(_sock.AF_INET6, _sock.SOCK_STREAM)
|
|
||||||
s.bind(("::1", 0))
|
|
||||||
s.close()
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _check_ipv6_warning():
|
|
||||||
_ensure_dirs()
|
|
||||||
if IPV6_WARN_MARKER.exists():
|
|
||||||
return
|
|
||||||
if not _has_ipv6_enabled():
|
|
||||||
return
|
|
||||||
|
|
||||||
IPV6_WARN_MARKER.touch()
|
|
||||||
|
|
||||||
threading.Thread(target=_show_ipv6_dialog, daemon=True).start()
|
|
||||||
|
|
||||||
|
|
||||||
def _show_ipv6_dialog():
|
|
||||||
_show_info(
|
|
||||||
"На вашем компьютере включена поддержка подключения по IPv6.\n\n"
|
|
||||||
"Telegram может пытаться подключаться через IPv6, "
|
|
||||||
"что не поддерживается и может привести к ошибкам.\n\n"
|
|
||||||
"Если прокси не работает или в логах присутствуют ошибки, "
|
|
||||||
"связанные с попытками подключения по IPv6 - "
|
|
||||||
"попробуйте отключить в настройках прокси Telegram попытку соединения "
|
|
||||||
"по IPv6. Если данная мера не помогает, попробуйте отключить IPv6 "
|
|
||||||
"в системе.\n\n"
|
|
||||||
"Это предупреждение будет показано только один раз.",
|
|
||||||
"TG WS Proxy",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _build_menu():
|
|
||||||
if pystray is None:
|
|
||||||
return None
|
|
||||||
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
return pystray.Menu(
|
|
||||||
pystray.MenuItem(
|
|
||||||
f"Открыть в Telegram ({host}:{port})", _on_open_in_telegram, default=True
|
|
||||||
),
|
|
||||||
pystray.Menu.SEPARATOR,
|
|
||||||
pystray.MenuItem("Перезапустить прокси", _on_restart),
|
|
||||||
pystray.MenuItem("Настройки...", _on_edit_config),
|
|
||||||
pystray.MenuItem("Открыть логи", _on_open_logs),
|
|
||||||
pystray.Menu.SEPARATOR,
|
|
||||||
pystray.MenuItem("Выход", _on_exit),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def run_tray():
|
|
||||||
global _tray_icon, _config
|
|
||||||
|
|
||||||
_config = load_config()
|
|
||||||
save_config(_config)
|
|
||||||
|
|
||||||
if LOG_FILE.exists():
|
|
||||||
try:
|
|
||||||
LOG_FILE.unlink()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
setup_logging(_config.get("verbose", False),
|
|
||||||
log_max_mb=_config.get("log_max_mb", DEFAULT_CONFIG["log_max_mb"]))
|
|
||||||
log.info("TG WS Proxy tray app starting")
|
|
||||||
log.info("Config: %s", _config)
|
|
||||||
log.info("Log file: %s", LOG_FILE)
|
|
||||||
|
|
||||||
if pystray is None or Image is None:
|
|
||||||
log.error("pystray or Pillow not installed; running in console mode")
|
|
||||||
start_proxy()
|
|
||||||
try:
|
|
||||||
while True:
|
|
||||||
time.sleep(1)
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
stop_proxy()
|
|
||||||
return
|
|
||||||
|
|
||||||
start_proxy()
|
|
||||||
|
|
||||||
_show_first_run()
|
|
||||||
_check_ipv6_warning()
|
|
||||||
|
|
||||||
icon_image = _load_icon()
|
|
||||||
_tray_icon = pystray.Icon(APP_NAME, icon_image, "TG WS Proxy", menu=_build_menu())
|
|
||||||
|
|
||||||
log.info("Tray icon running")
|
|
||||||
_tray_icon.run()
|
|
||||||
|
|
||||||
stop_proxy()
|
|
||||||
log.info("Tray app exited")
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
if not _acquire_lock():
|
|
||||||
_show_info("Приложение уже запущено.", os.path.basename(sys.argv[0]))
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
run_tray()
|
|
||||||
finally:
|
|
||||||
_release_lock()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
691
macos.py
|
|
@ -1,691 +0,0 @@
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import json
|
|
||||||
import logging
|
|
||||||
import logging.handlers
|
|
||||||
import os
|
|
||||||
import psutil
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
import threading
|
|
||||||
import time
|
|
||||||
import webbrowser
|
|
||||||
import asyncio as _asyncio
|
|
||||||
from pathlib import Path
|
|
||||||
from typing import Dict, Optional
|
|
||||||
|
|
||||||
try:
|
|
||||||
import rumps
|
|
||||||
except ImportError:
|
|
||||||
rumps = None
|
|
||||||
|
|
||||||
try:
|
|
||||||
from PIL import Image, ImageDraw, ImageFont
|
|
||||||
except ImportError:
|
|
||||||
Image = ImageDraw = ImageFont = None
|
|
||||||
|
|
||||||
try:
|
|
||||||
import pyperclip
|
|
||||||
except ImportError:
|
|
||||||
pyperclip = None
|
|
||||||
|
|
||||||
import proxy.tg_ws_proxy as tg_ws_proxy
|
|
||||||
|
|
||||||
APP_NAME = "TgWsProxy"
|
|
||||||
APP_DIR = Path.home() / "Library" / "Application Support" / APP_NAME
|
|
||||||
CONFIG_FILE = APP_DIR / "config.json"
|
|
||||||
LOG_FILE = APP_DIR / "proxy.log"
|
|
||||||
FIRST_RUN_MARKER = APP_DIR / ".first_run_done"
|
|
||||||
IPV6_WARN_MARKER = APP_DIR / ".ipv6_warned"
|
|
||||||
MENUBAR_ICON_PATH = APP_DIR / "menubar_icon.png"
|
|
||||||
|
|
||||||
DEFAULT_CONFIG = {
|
|
||||||
"port": 1080,
|
|
||||||
"host": "127.0.0.1",
|
|
||||||
"dc_ip": ["2:149.154.167.220", "4:149.154.167.220"],
|
|
||||||
"verbose": False,
|
|
||||||
"log_max_mb": 5,
|
|
||||||
"buf_kb": 256,
|
|
||||||
"pool_size": 4,
|
|
||||||
}
|
|
||||||
|
|
||||||
_proxy_thread: Optional[threading.Thread] = None
|
|
||||||
_async_stop: Optional[object] = None
|
|
||||||
_app: Optional[object] = None
|
|
||||||
_config: dict = {}
|
|
||||||
_exiting: bool = False
|
|
||||||
_lock_file_path: Optional[Path] = None
|
|
||||||
|
|
||||||
log = logging.getLogger("tg-ws-tray")
|
|
||||||
|
|
||||||
|
|
||||||
# Single-instance lock
|
|
||||||
|
|
||||||
def _same_process(lock_meta: dict, proc: psutil.Process) -> bool:
|
|
||||||
try:
|
|
||||||
lock_ct = float(lock_meta.get("create_time", 0.0))
|
|
||||||
proc_ct = float(proc.create_time())
|
|
||||||
if lock_ct > 0 and abs(lock_ct - proc_ct) > 1.0:
|
|
||||||
return False
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
frozen = bool(getattr(sys, "frozen", False))
|
|
||||||
if frozen:
|
|
||||||
return APP_NAME.lower() in proc.name().lower()
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _release_lock():
|
|
||||||
global _lock_file_path
|
|
||||||
if not _lock_file_path:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
_lock_file_path.unlink(missing_ok=True)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
_lock_file_path = None
|
|
||||||
|
|
||||||
|
|
||||||
def _acquire_lock() -> bool:
|
|
||||||
global _lock_file_path
|
|
||||||
_ensure_dirs()
|
|
||||||
lock_files = list(APP_DIR.glob("*.lock"))
|
|
||||||
|
|
||||||
for f in lock_files:
|
|
||||||
pid = None
|
|
||||||
meta: dict = {}
|
|
||||||
|
|
||||||
try:
|
|
||||||
pid = int(f.stem)
|
|
||||||
except Exception:
|
|
||||||
f.unlink(missing_ok=True)
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
raw = f.read_text(encoding="utf-8").strip()
|
|
||||||
if raw:
|
|
||||||
meta = json.loads(raw)
|
|
||||||
except Exception:
|
|
||||||
meta = {}
|
|
||||||
|
|
||||||
try:
|
|
||||||
proc = psutil.Process(pid)
|
|
||||||
if _same_process(meta, proc):
|
|
||||||
return False
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
f.unlink(missing_ok=True)
|
|
||||||
|
|
||||||
lock_file = APP_DIR / f"{os.getpid()}.lock"
|
|
||||||
try:
|
|
||||||
proc = psutil.Process(os.getpid())
|
|
||||||
payload = {"create_time": proc.create_time()}
|
|
||||||
lock_file.write_text(json.dumps(payload, ensure_ascii=False),
|
|
||||||
encoding="utf-8")
|
|
||||||
except Exception:
|
|
||||||
lock_file.touch()
|
|
||||||
|
|
||||||
_lock_file_path = lock_file
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
# Filesystem helpers
|
|
||||||
|
|
||||||
def _ensure_dirs():
|
|
||||||
APP_DIR.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
|
|
||||||
def load_config() -> dict:
|
|
||||||
_ensure_dirs()
|
|
||||||
if CONFIG_FILE.exists():
|
|
||||||
try:
|
|
||||||
with open(CONFIG_FILE, "r", encoding="utf-8") as f:
|
|
||||||
data = json.load(f)
|
|
||||||
for k, v in DEFAULT_CONFIG.items():
|
|
||||||
data.setdefault(k, v)
|
|
||||||
return data
|
|
||||||
except Exception as exc:
|
|
||||||
log.warning("Failed to load config: %s", exc)
|
|
||||||
return dict(DEFAULT_CONFIG)
|
|
||||||
|
|
||||||
|
|
||||||
def save_config(cfg: dict):
|
|
||||||
_ensure_dirs()
|
|
||||||
with open(CONFIG_FILE, "w", encoding="utf-8") as f:
|
|
||||||
json.dump(cfg, f, indent=2, ensure_ascii=False)
|
|
||||||
|
|
||||||
|
|
||||||
def setup_logging(verbose: bool = False, log_max_mb: float = 5):
|
|
||||||
_ensure_dirs()
|
|
||||||
root = logging.getLogger()
|
|
||||||
root.setLevel(logging.DEBUG if verbose else logging.INFO)
|
|
||||||
|
|
||||||
fh = logging.handlers.RotatingFileHandler(
|
|
||||||
str(LOG_FILE),
|
|
||||||
maxBytes=max(32 * 1024, log_max_mb * 1024 * 1024),
|
|
||||||
backupCount=0,
|
|
||||||
encoding='utf-8',
|
|
||||||
)
|
|
||||||
fh.setLevel(logging.DEBUG)
|
|
||||||
fh.setFormatter(logging.Formatter(
|
|
||||||
"%(asctime)s %(levelname)-5s %(name)s %(message)s",
|
|
||||||
datefmt="%Y-%m-%d %H:%M:%S"))
|
|
||||||
root.addHandler(fh)
|
|
||||||
|
|
||||||
if not getattr(sys, "frozen", False):
|
|
||||||
ch = logging.StreamHandler(sys.stdout)
|
|
||||||
ch.setLevel(logging.DEBUG if verbose else logging.INFO)
|
|
||||||
ch.setFormatter(logging.Formatter(
|
|
||||||
"%(asctime)s %(levelname)-5s %(message)s",
|
|
||||||
datefmt="%H:%M:%S"))
|
|
||||||
root.addHandler(ch)
|
|
||||||
|
|
||||||
|
|
||||||
# Menubar icon
|
|
||||||
|
|
||||||
def _make_menubar_icon(size: int = 44):
|
|
||||||
if Image is None:
|
|
||||||
return None
|
|
||||||
img = Image.new("RGBA", (size, size), (0, 0, 0, 0))
|
|
||||||
draw = ImageDraw.Draw(img)
|
|
||||||
|
|
||||||
margin = size // 11
|
|
||||||
draw.ellipse([margin, margin, size - margin, size - margin],
|
|
||||||
fill=(0, 0, 0, 255))
|
|
||||||
|
|
||||||
try:
|
|
||||||
font = ImageFont.truetype(
|
|
||||||
"/System/Library/Fonts/Helvetica.ttc",
|
|
||||||
size=int(size * 0.55))
|
|
||||||
except Exception:
|
|
||||||
font = ImageFont.load_default()
|
|
||||||
|
|
||||||
bbox = draw.textbbox((0, 0), "T", font=font)
|
|
||||||
tw, th = bbox[2] - bbox[0], bbox[3] - bbox[1]
|
|
||||||
tx = (size - tw) // 2 - bbox[0]
|
|
||||||
ty = (size - th) // 2 - bbox[1]
|
|
||||||
draw.text((tx, ty), "T", fill=(255, 255, 255, 255), font=font)
|
|
||||||
return img
|
|
||||||
|
|
||||||
# Generate menubar icon PNG if it does not exist.
|
|
||||||
def _ensure_menubar_icon():
|
|
||||||
if MENUBAR_ICON_PATH.exists():
|
|
||||||
return
|
|
||||||
_ensure_dirs()
|
|
||||||
img = _make_menubar_icon(44)
|
|
||||||
if img:
|
|
||||||
img.save(str(MENUBAR_ICON_PATH), "PNG")
|
|
||||||
|
|
||||||
|
|
||||||
# Native macOS dialogs
|
|
||||||
|
|
||||||
def _escape_osascript_text(text: str) -> str:
|
|
||||||
return text.replace('\\', '\\\\').replace('"', '\\"')
|
|
||||||
|
|
||||||
|
|
||||||
def _osascript(script: str) -> str:
|
|
||||||
r = subprocess.run(
|
|
||||||
['osascript', '-e', script],
|
|
||||||
capture_output=True, text=True)
|
|
||||||
return r.stdout.strip()
|
|
||||||
|
|
||||||
|
|
||||||
def _show_error(text: str, title: str = "TG WS Proxy"):
|
|
||||||
text_esc = _escape_osascript_text(text)
|
|
||||||
title_esc = _escape_osascript_text(title)
|
|
||||||
_osascript(
|
|
||||||
f'display dialog "{text_esc}" with title "{title_esc}" '
|
|
||||||
f'buttons {{"OK"}} default button "OK" with icon stop')
|
|
||||||
|
|
||||||
|
|
||||||
def _show_info(text: str, title: str = "TG WS Proxy"):
|
|
||||||
text_esc = _escape_osascript_text(text)
|
|
||||||
title_esc = _escape_osascript_text(title)
|
|
||||||
_osascript(
|
|
||||||
f'display dialog "{text_esc}" with title "{title_esc}" '
|
|
||||||
f'buttons {{"OK"}} default button "OK" with icon note')
|
|
||||||
|
|
||||||
|
|
||||||
def _ask_yes_no(text: str, title: str = "TG WS Proxy") -> bool:
|
|
||||||
result = _ask_yes_no_close(text, title)
|
|
||||||
return result is True
|
|
||||||
|
|
||||||
|
|
||||||
def _ask_yes_no_close(text: str,
|
|
||||||
title: str = "TG WS Proxy") -> Optional[bool]:
|
|
||||||
text_esc = _escape_osascript_text(text)
|
|
||||||
title_esc = _escape_osascript_text(title)
|
|
||||||
r = subprocess.run(
|
|
||||||
['osascript', '-e',
|
|
||||||
f'button returned of (display dialog "{text_esc}" '
|
|
||||||
f'with title "{title_esc}" '
|
|
||||||
f'buttons {{"Закрыть", "Нет", "Да"}} '
|
|
||||||
f'default button "Да" cancel button "Закрыть" with icon note)'],
|
|
||||||
capture_output=True, text=True)
|
|
||||||
if r.returncode != 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
result = r.stdout.strip()
|
|
||||||
if result == "Да":
|
|
||||||
return True
|
|
||||||
if result == "Нет":
|
|
||||||
return False
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
# Proxy lifecycle
|
|
||||||
|
|
||||||
def _run_proxy_thread(port: int, dc_opt: Dict[int, str], verbose: bool,
|
|
||||||
host: str = '127.0.0.1'):
|
|
||||||
global _async_stop
|
|
||||||
loop = _asyncio.new_event_loop()
|
|
||||||
_asyncio.set_event_loop(loop)
|
|
||||||
stop_ev = _asyncio.Event()
|
|
||||||
_async_stop = (loop, stop_ev)
|
|
||||||
|
|
||||||
try:
|
|
||||||
loop.run_until_complete(
|
|
||||||
tg_ws_proxy._run(port, dc_opt, stop_event=stop_ev, host=host))
|
|
||||||
except Exception as exc:
|
|
||||||
log.error("Proxy thread crashed: %s", exc)
|
|
||||||
if "Address already in use" in str(exc):
|
|
||||||
_show_error(
|
|
||||||
"Не удалось запустить прокси:\n"
|
|
||||||
"Порт уже используется другим приложением.\n\n"
|
|
||||||
"Закройте приложение, использующее этот порт, "
|
|
||||||
"или измените порт в настройках прокси и перезапустите.")
|
|
||||||
finally:
|
|
||||||
loop.close()
|
|
||||||
_async_stop = None
|
|
||||||
|
|
||||||
|
|
||||||
def start_proxy():
|
|
||||||
global _proxy_thread, _config
|
|
||||||
if _proxy_thread and _proxy_thread.is_alive():
|
|
||||||
log.info("Proxy already running")
|
|
||||||
return
|
|
||||||
|
|
||||||
cfg = _config
|
|
||||||
port = cfg.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
host = cfg.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
dc_ip_list = cfg.get("dc_ip", DEFAULT_CONFIG["dc_ip"])
|
|
||||||
verbose = cfg.get("verbose", False)
|
|
||||||
|
|
||||||
try:
|
|
||||||
dc_opt = tg_ws_proxy.parse_dc_ip_list(dc_ip_list)
|
|
||||||
except ValueError as e:
|
|
||||||
log.error("Bad config dc_ip: %s", e)
|
|
||||||
_show_error(f"Ошибка конфигурации:\n{e}")
|
|
||||||
return
|
|
||||||
|
|
||||||
log.info("Starting proxy on %s:%d ...", host, port)
|
|
||||||
|
|
||||||
buf_kb = cfg.get("buf_kb", DEFAULT_CONFIG["buf_kb"])
|
|
||||||
pool_size = cfg.get("pool_size", DEFAULT_CONFIG["pool_size"])
|
|
||||||
tg_ws_proxy._RECV_BUF = max(4, buf_kb) * 1024
|
|
||||||
tg_ws_proxy._SEND_BUF = tg_ws_proxy._RECV_BUF
|
|
||||||
tg_ws_proxy._WS_POOL_SIZE = max(0, pool_size)
|
|
||||||
|
|
||||||
_proxy_thread = threading.Thread(
|
|
||||||
target=_run_proxy_thread,
|
|
||||||
args=(port, dc_opt, verbose, host),
|
|
||||||
daemon=True, name="proxy")
|
|
||||||
_proxy_thread.start()
|
|
||||||
|
|
||||||
|
|
||||||
def stop_proxy():
|
|
||||||
global _proxy_thread, _async_stop
|
|
||||||
if _async_stop:
|
|
||||||
loop, stop_ev = _async_stop
|
|
||||||
loop.call_soon_threadsafe(stop_ev.set)
|
|
||||||
if _proxy_thread:
|
|
||||||
_proxy_thread.join(timeout=2)
|
|
||||||
_proxy_thread = None
|
|
||||||
log.info("Proxy stopped")
|
|
||||||
|
|
||||||
|
|
||||||
def restart_proxy():
|
|
||||||
log.info("Restarting proxy...")
|
|
||||||
stop_proxy()
|
|
||||||
time.sleep(0.3)
|
|
||||||
start_proxy()
|
|
||||||
|
|
||||||
|
|
||||||
# Menu callbacks
|
|
||||||
|
|
||||||
def _on_open_in_telegram(_=None):
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
url = f"tg://socks?server=127.0.0.1&port={port}"
|
|
||||||
log.info("Opening %s", url)
|
|
||||||
try:
|
|
||||||
result = subprocess.call(['open', url])
|
|
||||||
if result != 0:
|
|
||||||
raise RuntimeError("open command failed")
|
|
||||||
except Exception:
|
|
||||||
log.info("open command failed, trying webbrowser")
|
|
||||||
try:
|
|
||||||
if not webbrowser.open(url):
|
|
||||||
raise RuntimeError("webbrowser.open returned False")
|
|
||||||
except Exception:
|
|
||||||
log.info("Browser open failed, copying to clipboard")
|
|
||||||
try:
|
|
||||||
if pyperclip:
|
|
||||||
pyperclip.copy(url)
|
|
||||||
else:
|
|
||||||
subprocess.run(['pbcopy'], input=url.encode(),
|
|
||||||
check=True)
|
|
||||||
_show_info(
|
|
||||||
"Не удалось открыть Telegram автоматически.\n\n"
|
|
||||||
f"Ссылка скопирована в буфер обмена:\n{url}")
|
|
||||||
except Exception as exc:
|
|
||||||
log.error("Clipboard copy failed: %s", exc)
|
|
||||||
_show_error(f"Не удалось скопировать ссылку:\n{exc}")
|
|
||||||
|
|
||||||
|
|
||||||
def _on_restart(_=None):
|
|
||||||
def _do_restart():
|
|
||||||
global _config
|
|
||||||
_config = load_config()
|
|
||||||
if _app:
|
|
||||||
_app.update_menu_title()
|
|
||||||
restart_proxy()
|
|
||||||
|
|
||||||
threading.Thread(target=_do_restart, daemon=True).start()
|
|
||||||
|
|
||||||
|
|
||||||
def _on_open_logs(_=None):
|
|
||||||
log.info("Opening log file: %s", LOG_FILE)
|
|
||||||
if LOG_FILE.exists():
|
|
||||||
subprocess.call(['open', str(LOG_FILE)])
|
|
||||||
else:
|
|
||||||
_show_info("Файл логов ещё не создан.")
|
|
||||||
|
|
||||||
# Show a native text input dialog. Returns None if cancelled.
|
|
||||||
def _osascript_input(prompt: str, default: str,
|
|
||||||
title: str = "TG WS Proxy") -> Optional[str]:
|
|
||||||
prompt_esc = _escape_osascript_text(prompt)
|
|
||||||
default_esc = _escape_osascript_text(default)
|
|
||||||
title_esc = _escape_osascript_text(title)
|
|
||||||
r = subprocess.run(
|
|
||||||
['osascript', '-e',
|
|
||||||
f'text returned of (display dialog "{prompt_esc}" '
|
|
||||||
f'default answer "{default_esc}" '
|
|
||||||
f'with title "{title_esc}" '
|
|
||||||
f'buttons {{"Закрыть", "OK"}} '
|
|
||||||
f'default button "OK" cancel button "Закрыть")'],
|
|
||||||
capture_output=True, text=True)
|
|
||||||
if r.returncode != 0:
|
|
||||||
return None
|
|
||||||
return r.stdout.rstrip("\r\n")
|
|
||||||
|
|
||||||
|
|
||||||
def _on_edit_config(_=None):
|
|
||||||
threading.Thread(target=_edit_config_dialog, daemon=True).start()
|
|
||||||
|
|
||||||
|
|
||||||
# Settings via native macOS dialogs
|
|
||||||
def _edit_config_dialog():
|
|
||||||
cfg = load_config()
|
|
||||||
|
|
||||||
# Host
|
|
||||||
host = _osascript_input(
|
|
||||||
"IP-адрес прокси:",
|
|
||||||
cfg.get("host", DEFAULT_CONFIG["host"]))
|
|
||||||
if host is None:
|
|
||||||
return
|
|
||||||
host = host.strip()
|
|
||||||
|
|
||||||
import socket as _sock
|
|
||||||
try:
|
|
||||||
_sock.inet_aton(host)
|
|
||||||
except OSError:
|
|
||||||
_show_error("Некорректный IP-адрес.")
|
|
||||||
return
|
|
||||||
|
|
||||||
# Port
|
|
||||||
port_str = _osascript_input(
|
|
||||||
"Порт прокси:",
|
|
||||||
str(cfg.get("port", DEFAULT_CONFIG["port"])))
|
|
||||||
if port_str is None:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
port = int(port_str.strip())
|
|
||||||
if not (1 <= port <= 65535):
|
|
||||||
raise ValueError
|
|
||||||
except ValueError:
|
|
||||||
_show_error("Порт должен быть числом 1-65535")
|
|
||||||
return
|
|
||||||
|
|
||||||
# DC-IP mappings
|
|
||||||
dc_default = ", ".join(cfg.get("dc_ip", DEFAULT_CONFIG["dc_ip"]))
|
|
||||||
dc_str = _osascript_input(
|
|
||||||
"DC → IP маппинги (через запятую, формат DC:IP):\n"
|
|
||||||
"Например: 2:149.154.167.220, 4:149.154.167.220",
|
|
||||||
dc_default)
|
|
||||||
if dc_str is None:
|
|
||||||
return
|
|
||||||
dc_lines = [s.strip() for s in dc_str.replace(',', '\n').splitlines()
|
|
||||||
if s.strip()]
|
|
||||||
try:
|
|
||||||
tg_ws_proxy.parse_dc_ip_list(dc_lines)
|
|
||||||
except ValueError as e:
|
|
||||||
_show_error(str(e))
|
|
||||||
return
|
|
||||||
|
|
||||||
# Verbose
|
|
||||||
verbose = _ask_yes_no_close("Включить подробное логирование (verbose)?")
|
|
||||||
if verbose is None:
|
|
||||||
return
|
|
||||||
|
|
||||||
# Advanced settings
|
|
||||||
adv_str = _osascript_input(
|
|
||||||
"Расширенные настройки (буфер KB, WS пул, лог MB):\n"
|
|
||||||
"Формат: buf_kb,pool_size,log_max_mb",
|
|
||||||
f"{cfg.get('buf_kb', DEFAULT_CONFIG['buf_kb'])},"
|
|
||||||
f"{cfg.get('pool_size', DEFAULT_CONFIG['pool_size'])},"
|
|
||||||
f"{cfg.get('log_max_mb', DEFAULT_CONFIG['log_max_mb'])}")
|
|
||||||
if adv_str is None:
|
|
||||||
return
|
|
||||||
|
|
||||||
adv = {}
|
|
||||||
if adv_str:
|
|
||||||
parts = [s.strip() for s in adv_str.split(',')]
|
|
||||||
keys = [("buf_kb", int), ("pool_size", int),
|
|
||||||
("log_max_mb", float)]
|
|
||||||
for i, (k, typ) in enumerate(keys):
|
|
||||||
if i < len(parts):
|
|
||||||
try:
|
|
||||||
adv[k] = typ(parts[i])
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
new_cfg = {
|
|
||||||
"host": host,
|
|
||||||
"port": port,
|
|
||||||
"dc_ip": dc_lines,
|
|
||||||
"verbose": verbose,
|
|
||||||
"buf_kb": adv.get("buf_kb", cfg.get("buf_kb", DEFAULT_CONFIG["buf_kb"])),
|
|
||||||
"pool_size": adv.get("pool_size", cfg.get("pool_size", DEFAULT_CONFIG["pool_size"])),
|
|
||||||
"log_max_mb": adv.get("log_max_mb", cfg.get("log_max_mb", DEFAULT_CONFIG["log_max_mb"])),
|
|
||||||
}
|
|
||||||
save_config(new_cfg)
|
|
||||||
log.info("Config saved: %s", new_cfg)
|
|
||||||
|
|
||||||
global _config
|
|
||||||
_config = new_cfg
|
|
||||||
if _app:
|
|
||||||
_app.update_menu_title()
|
|
||||||
|
|
||||||
if _ask_yes_no_close(
|
|
||||||
"Настройки сохранены.\n\nПерезапустить прокси сейчас?"):
|
|
||||||
restart_proxy()
|
|
||||||
|
|
||||||
|
|
||||||
# First-run & IPv6 dialogs
|
|
||||||
|
|
||||||
def _show_first_run():
|
|
||||||
_ensure_dirs()
|
|
||||||
if FIRST_RUN_MARKER.exists():
|
|
||||||
return
|
|
||||||
|
|
||||||
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
tg_url = f"tg://socks?server={host}&port={port}"
|
|
||||||
|
|
||||||
text = (
|
|
||||||
f"Прокси запущен и работает в строке меню.\n\n"
|
|
||||||
f"Как подключить Telegram Desktop:\n\n"
|
|
||||||
f"Автоматически:\n"
|
|
||||||
f" Нажмите «Открыть в Telegram» в меню\n"
|
|
||||||
f" Или ссылка: {tg_url}\n\n"
|
|
||||||
f"Вручную:\n"
|
|
||||||
f" Настройки → Продвинутые → Тип подключения → Прокси\n"
|
|
||||||
f" SOCKS5 → {host} : {port} (без логина/пароля)\n\n"
|
|
||||||
f"Открыть прокси в Telegram сейчас?"
|
|
||||||
)
|
|
||||||
|
|
||||||
FIRST_RUN_MARKER.touch()
|
|
||||||
|
|
||||||
if _ask_yes_no(text, "TG WS Proxy"):
|
|
||||||
_on_open_in_telegram()
|
|
||||||
|
|
||||||
|
|
||||||
def _has_ipv6_enabled() -> bool:
|
|
||||||
import socket as _sock
|
|
||||||
try:
|
|
||||||
addrs = _sock.getaddrinfo(_sock.gethostname(), None, _sock.AF_INET6)
|
|
||||||
for addr in addrs:
|
|
||||||
ip = addr[4][0]
|
|
||||||
if ip and not ip.startswith('::1') and not ip.startswith('fe80::1'):
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
s = _sock.socket(_sock.AF_INET6, _sock.SOCK_STREAM)
|
|
||||||
s.bind(('::1', 0))
|
|
||||||
s.close()
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _check_ipv6_warning():
|
|
||||||
_ensure_dirs()
|
|
||||||
if IPV6_WARN_MARKER.exists():
|
|
||||||
return
|
|
||||||
if not _has_ipv6_enabled():
|
|
||||||
return
|
|
||||||
|
|
||||||
IPV6_WARN_MARKER.touch()
|
|
||||||
|
|
||||||
_show_info(
|
|
||||||
"На вашем компьютере включена поддержка подключения по IPv6.\n\n"
|
|
||||||
"Telegram может пытаться подключаться через IPv6, "
|
|
||||||
"что не поддерживается и может привести к ошибкам.\n\n"
|
|
||||||
"Если прокси не работает, попробуйте отключить "
|
|
||||||
"попытку соединения по IPv6 в настройках прокси Telegram.\n\n"
|
|
||||||
"Это предупреждение будет показано только один раз.")
|
|
||||||
|
|
||||||
|
|
||||||
# rumps menubar app
|
|
||||||
|
|
||||||
_TgWsProxyAppBase = rumps.App if rumps else object
|
|
||||||
|
|
||||||
|
|
||||||
class TgWsProxyApp(_TgWsProxyAppBase):
|
|
||||||
def __init__(self):
|
|
||||||
_ensure_menubar_icon()
|
|
||||||
icon_path = (str(MENUBAR_ICON_PATH)
|
|
||||||
if MENUBAR_ICON_PATH.exists() else None)
|
|
||||||
|
|
||||||
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
|
|
||||||
self._open_tg_item = rumps.MenuItem(
|
|
||||||
f"Открыть в Telegram ({host}:{port})",
|
|
||||||
callback=_on_open_in_telegram)
|
|
||||||
self._restart_item = rumps.MenuItem(
|
|
||||||
"Перезапустить прокси",
|
|
||||||
callback=_on_restart)
|
|
||||||
self._settings_item = rumps.MenuItem(
|
|
||||||
"Настройки...",
|
|
||||||
callback=_on_edit_config)
|
|
||||||
self._logs_item = rumps.MenuItem(
|
|
||||||
"Открыть логи",
|
|
||||||
callback=_on_open_logs)
|
|
||||||
|
|
||||||
super().__init__(
|
|
||||||
"TG WS Proxy",
|
|
||||||
icon=icon_path,
|
|
||||||
template=False,
|
|
||||||
quit_button="Выход",
|
|
||||||
menu=[
|
|
||||||
self._open_tg_item,
|
|
||||||
None,
|
|
||||||
self._restart_item,
|
|
||||||
self._settings_item,
|
|
||||||
self._logs_item,
|
|
||||||
])
|
|
||||||
|
|
||||||
def update_menu_title(self):
|
|
||||||
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
self._open_tg_item.title = (
|
|
||||||
f"Открыть в Telegram ({host}:{port})")
|
|
||||||
|
|
||||||
|
|
||||||
def run_menubar():
|
|
||||||
global _app, _config
|
|
||||||
|
|
||||||
_config = load_config()
|
|
||||||
save_config(_config)
|
|
||||||
|
|
||||||
if LOG_FILE.exists():
|
|
||||||
try:
|
|
||||||
LOG_FILE.unlink()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
setup_logging(_config.get("verbose", False),
|
|
||||||
log_max_mb=_config.get("log_max_mb", DEFAULT_CONFIG["log_max_mb"]))
|
|
||||||
log.info("TG WS Proxy menubar app starting")
|
|
||||||
log.info("Config: %s", _config)
|
|
||||||
log.info("Log file: %s", LOG_FILE)
|
|
||||||
|
|
||||||
if rumps is None or Image is None:
|
|
||||||
log.error("rumps or Pillow not installed; running in console mode")
|
|
||||||
start_proxy()
|
|
||||||
try:
|
|
||||||
while True:
|
|
||||||
time.sleep(1)
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
stop_proxy()
|
|
||||||
return
|
|
||||||
|
|
||||||
start_proxy()
|
|
||||||
_show_first_run()
|
|
||||||
_check_ipv6_warning()
|
|
||||||
|
|
||||||
_app = TgWsProxyApp()
|
|
||||||
log.info("Menubar app running")
|
|
||||||
_app.run()
|
|
||||||
|
|
||||||
stop_proxy()
|
|
||||||
log.info("Menubar app exited")
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
if not _acquire_lock():
|
|
||||||
_show_info("Приложение уже запущено.")
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
run_menubar()
|
|
||||||
finally:
|
|
||||||
_release_lock()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
|
|
@ -1,80 +0,0 @@
|
||||||
# -*- mode: python ; coding: utf-8 -*-
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
import glob
|
|
||||||
|
|
||||||
from PyInstaller.utils.hooks import collect_submodules, collect_data_files
|
|
||||||
|
|
||||||
block_cipher = None
|
|
||||||
|
|
||||||
# customtkinter ships JSON themes + assets that must be bundled
|
|
||||||
import customtkinter
|
|
||||||
ctk_path = os.path.dirname(customtkinter.__file__)
|
|
||||||
|
|
||||||
# Collect gi (PyGObject) submodules and data so pystray._appindicator works
|
|
||||||
gi_hiddenimports = collect_submodules('gi')
|
|
||||||
gi_datas = collect_data_files('gi')
|
|
||||||
|
|
||||||
# Collect GObject typelib files from the system
|
|
||||||
typelib_dirs = glob.glob('/usr/lib/*/girepository-1.0')
|
|
||||||
typelib_datas = []
|
|
||||||
for d in typelib_dirs:
|
|
||||||
typelib_datas.append((d, 'gi_typelibs'))
|
|
||||||
|
|
||||||
a = Analysis(
|
|
||||||
[os.path.join(os.path.dirname(SPEC), os.pardir, 'linux.py')],
|
|
||||||
pathex=[],
|
|
||||||
binaries=[],
|
|
||||||
datas=[(ctk_path, 'customtkinter/')] + gi_datas + typelib_datas,
|
|
||||||
hiddenimports=[
|
|
||||||
'pystray._appindicator',
|
|
||||||
'PIL._tkinter_finder',
|
|
||||||
'customtkinter',
|
|
||||||
'cryptography.hazmat.primitives.ciphers',
|
|
||||||
'cryptography.hazmat.primitives.ciphers.algorithms',
|
|
||||||
'cryptography.hazmat.primitives.ciphers.modes',
|
|
||||||
'cryptography.hazmat.backends.openssl',
|
|
||||||
'gi',
|
|
||||||
'_gi',
|
|
||||||
'gi.repository.GLib',
|
|
||||||
'gi.repository.GObject',
|
|
||||||
'gi.repository.Gtk',
|
|
||||||
'gi.repository.Gdk',
|
|
||||||
'gi.repository.AyatanaAppIndicator3',
|
|
||||||
] + gi_hiddenimports,
|
|
||||||
hookspath=[],
|
|
||||||
hooksconfig={},
|
|
||||||
runtime_hooks=[],
|
|
||||||
excludes=[],
|
|
||||||
noarchive=False,
|
|
||||||
cipher=block_cipher,
|
|
||||||
)
|
|
||||||
|
|
||||||
icon_path = os.path.join(os.path.dirname(SPEC), os.pardir, 'icon.ico')
|
|
||||||
if os.path.exists(icon_path):
|
|
||||||
a.datas += [('icon.ico', icon_path, 'DATA')]
|
|
||||||
|
|
||||||
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
|
|
||||||
|
|
||||||
exe = EXE(
|
|
||||||
pyz,
|
|
||||||
a.scripts,
|
|
||||||
a.binaries,
|
|
||||||
a.zipfiles,
|
|
||||||
a.datas,
|
|
||||||
[],
|
|
||||||
name='TgWsProxy',
|
|
||||||
debug=False,
|
|
||||||
bootloader_ignore_signals=False,
|
|
||||||
strip=True,
|
|
||||||
upx=True,
|
|
||||||
upx_exclude=[],
|
|
||||||
runtime_tmpdir=None,
|
|
||||||
console=False,
|
|
||||||
disable_windowed_traceback=False,
|
|
||||||
argv_emulation=False,
|
|
||||||
target_arch=None,
|
|
||||||
codesign_identity=None,
|
|
||||||
entitlements_file=None,
|
|
||||||
)
|
|
||||||
|
|
@ -1,83 +0,0 @@
|
||||||
# -*- mode: python ; coding: utf-8 -*-
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
|
|
||||||
block_cipher = None
|
|
||||||
|
|
||||||
a = Analysis(
|
|
||||||
[os.path.join(os.path.dirname(SPEC), os.pardir, 'macos.py')],
|
|
||||||
pathex=[],
|
|
||||||
binaries=[],
|
|
||||||
datas=[],
|
|
||||||
hiddenimports=[
|
|
||||||
'rumps',
|
|
||||||
'objc',
|
|
||||||
'Foundation',
|
|
||||||
'AppKit',
|
|
||||||
'PyObjCTools',
|
|
||||||
'PyObjCTools.AppHelper',
|
|
||||||
'cryptography.hazmat.primitives.ciphers',
|
|
||||||
'cryptography.hazmat.primitives.ciphers.algorithms',
|
|
||||||
'cryptography.hazmat.primitives.ciphers.modes',
|
|
||||||
'cryptography.hazmat.backends.openssl',
|
|
||||||
],
|
|
||||||
hookspath=[],
|
|
||||||
hooksconfig={},
|
|
||||||
runtime_hooks=[],
|
|
||||||
excludes=[],
|
|
||||||
noarchive=False,
|
|
||||||
cipher=block_cipher,
|
|
||||||
)
|
|
||||||
|
|
||||||
icon_path = os.path.join(os.path.dirname(SPEC), os.pardir, 'icon.icns')
|
|
||||||
if not os.path.exists(icon_path):
|
|
||||||
icon_path = None
|
|
||||||
|
|
||||||
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
|
|
||||||
|
|
||||||
exe = EXE(
|
|
||||||
pyz,
|
|
||||||
a.scripts,
|
|
||||||
[],
|
|
||||||
exclude_binaries=True,
|
|
||||||
name='TgWsProxy',
|
|
||||||
debug=False,
|
|
||||||
bootloader_ignore_signals=False,
|
|
||||||
strip=False,
|
|
||||||
upx=False,
|
|
||||||
console=False,
|
|
||||||
argv_emulation=False,
|
|
||||||
target_arch='universal2',
|
|
||||||
codesign_identity=None,
|
|
||||||
entitlements_file=None,
|
|
||||||
)
|
|
||||||
|
|
||||||
coll = COLLECT(
|
|
||||||
exe,
|
|
||||||
a.binaries,
|
|
||||||
a.zipfiles,
|
|
||||||
a.datas,
|
|
||||||
strip=False,
|
|
||||||
upx=False,
|
|
||||||
upx_exclude=[],
|
|
||||||
name='TgWsProxy',
|
|
||||||
)
|
|
||||||
|
|
||||||
app = BUNDLE(
|
|
||||||
coll,
|
|
||||||
name='TG WS Proxy.app',
|
|
||||||
icon=icon_path,
|
|
||||||
bundle_identifier='com.tgwsproxy.app',
|
|
||||||
info_plist={
|
|
||||||
'CFBundleName': 'TG WS Proxy',
|
|
||||||
'CFBundleDisplayName': 'TG WS Proxy',
|
|
||||||
'CFBundleShortVersionString': '1.0.0',
|
|
||||||
'CFBundleVersion': '1.0.0',
|
|
||||||
'LSMinimumSystemVersion': '10.15',
|
|
||||||
'LSUIElement': True,
|
|
||||||
'NSHighResolutionCapable': True,
|
|
||||||
'NSAppleEventsUsageDescription':
|
|
||||||
'TG WS Proxy needs to display dialogs.',
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
@ -1,63 +0,0 @@
|
||||||
# -*- mode: python ; coding: utf-8 -*-
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
|
|
||||||
block_cipher = None
|
|
||||||
|
|
||||||
# customtkinter ships JSON themes + assets that must be bundled
|
|
||||||
import customtkinter
|
|
||||||
ctk_path = os.path.dirname(customtkinter.__file__)
|
|
||||||
|
|
||||||
a = Analysis(
|
|
||||||
[os.path.join(os.path.dirname(SPEC), os.pardir, 'windows.py')],
|
|
||||||
pathex=[],
|
|
||||||
binaries=[],
|
|
||||||
datas=[(ctk_path, 'customtkinter/')],
|
|
||||||
hiddenimports=[
|
|
||||||
'pystray._win32',
|
|
||||||
'PIL._tkinter_finder',
|
|
||||||
'customtkinter',
|
|
||||||
'cryptography.hazmat.primitives.ciphers',
|
|
||||||
'cryptography.hazmat.primitives.ciphers.algorithms',
|
|
||||||
'cryptography.hazmat.primitives.ciphers.modes',
|
|
||||||
'cryptography.hazmat.backends.openssl',
|
|
||||||
],
|
|
||||||
hookspath=[],
|
|
||||||
hooksconfig={},
|
|
||||||
runtime_hooks=[],
|
|
||||||
excludes=[],
|
|
||||||
win_no_prefer_redirects=False,
|
|
||||||
win_private_assemblies=False,
|
|
||||||
cipher=block_cipher,
|
|
||||||
noarchive=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
icon_path = os.path.join(os.path.dirname(SPEC), os.pardir, 'icon.ico')
|
|
||||||
if os.path.exists(icon_path):
|
|
||||||
a.datas += [('icon.ico', icon_path, 'DATA')]
|
|
||||||
|
|
||||||
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
|
|
||||||
|
|
||||||
exe = EXE(
|
|
||||||
pyz,
|
|
||||||
a.scripts,
|
|
||||||
a.binaries,
|
|
||||||
a.zipfiles,
|
|
||||||
a.datas,
|
|
||||||
[],
|
|
||||||
name='TgWsProxy',
|
|
||||||
debug=False,
|
|
||||||
bootloader_ignore_signals=False,
|
|
||||||
strip=False,
|
|
||||||
upx=True,
|
|
||||||
upx_exclude=[],
|
|
||||||
runtime_tmpdir=None,
|
|
||||||
console=False,
|
|
||||||
disable_windowed_traceback=False,
|
|
||||||
argv_emulation=False,
|
|
||||||
target_arch=None,
|
|
||||||
codesign_identity=None,
|
|
||||||
entitlements_file=None,
|
|
||||||
icon=icon_path if os.path.exists(icon_path) else None,
|
|
||||||
)
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
__version__ = "1.3.0"
|
|
||||||
1193
proxy/tg_ws_proxy.py
|
|
@ -1,73 +0,0 @@
|
||||||
[build-system]
|
|
||||||
requires = ["hatchling>=1.25.0"]
|
|
||||||
build-backend = "hatchling.build"
|
|
||||||
|
|
||||||
[project]
|
|
||||||
name = "tg-ws-proxy"
|
|
||||||
dynamic=["version"]
|
|
||||||
|
|
||||||
description = "Telegram Desktop WebSocket Bridge Proxy"
|
|
||||||
readme = "README.md"
|
|
||||||
requires-python = ">=3.8"
|
|
||||||
|
|
||||||
license = { name = "MIT", file = "LICENSE" }
|
|
||||||
|
|
||||||
authors = [
|
|
||||||
{ name = "Flowseal" }
|
|
||||||
]
|
|
||||||
|
|
||||||
keywords = [
|
|
||||||
"telegram",
|
|
||||||
"tdesktop",
|
|
||||||
"proxy",
|
|
||||||
"bypass",
|
|
||||||
"websocket",
|
|
||||||
"socks5",
|
|
||||||
]
|
|
||||||
classifiers = [
|
|
||||||
"Development Status :: 5 - Production/Stable",
|
|
||||||
"Environment :: Console",
|
|
||||||
"Intended Audience :: Customer Service",
|
|
||||||
"Programming Language :: Python :: 3",
|
|
||||||
"License :: OSI Approved :: MIT License",
|
|
||||||
"Operating System :: OS Independent",
|
|
||||||
"Topic :: System :: Networking :: Firewalls",
|
|
||||||
]
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
"pyperclip==1.9.0",
|
|
||||||
|
|
||||||
"psutil==5.9.8; platform_system == 'Windows' and python_version < '3.9'",
|
|
||||||
"cryptography==41.0.7; platform_system == 'Windows' and python_version < '3.9'",
|
|
||||||
"Pillow==10.4.0; platform_system == 'Windows' and python_version < '3.9'",
|
|
||||||
|
|
||||||
"psutil==7.0.0; platform_system != 'Windows' or python_version >= '3.9'",
|
|
||||||
"cryptography==46.0.5; platform_system != 'Windows' or python_version >= '3.9'",
|
|
||||||
"Pillow==12.1.1; (platform_system != 'Windows' or python_version >= '3.9') and platform_system != 'Darwin'",
|
|
||||||
|
|
||||||
"customtkinter==5.2.2; platform_system != 'Darwin'",
|
|
||||||
"pystray==0.19.5; platform_system != 'Darwin'",
|
|
||||||
"rumps==0.4.0; platform_system == 'Darwin'",
|
|
||||||
"Pillow==12.1.0; platform_system == 'Darwin'",
|
|
||||||
]
|
|
||||||
|
|
||||||
[project.scripts]
|
|
||||||
tg-ws-proxy = "proxy.tg_ws_proxy:main"
|
|
||||||
tg-ws-proxy-tray-win = "windows:main"
|
|
||||||
tg-ws-proxy-tray-macos = "macos:main"
|
|
||||||
tg-ws-proxy-tray-linux = "linux:main"
|
|
||||||
|
|
||||||
[project.urls]
|
|
||||||
Source = "https://github.com/Flowseal/tg-ws-proxy"
|
|
||||||
Issues = "https://github.com/Flowseal/tg-ws-proxy/issues"
|
|
||||||
|
|
||||||
[tool.hatch.build.targets.wheel]
|
|
||||||
packages = ["proxy"]
|
|
||||||
|
|
||||||
[tool.hatch.build.force-include]
|
|
||||||
"windows.py" = "windows.py"
|
|
||||||
"macos.py" = "macos.py"
|
|
||||||
"linux.py" = "linux.py"
|
|
||||||
|
|
||||||
[tool.hatch.version]
|
|
||||||
path = "proxy/__init__.py"
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
mavenCentral()
|
||||||
|
gradlePluginPortal()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dependencyResolutionManagement {
|
||||||
|
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rootProject.name = "TgWsProxy"
|
||||||
|
include(":app")
|
||||||
842
windows.py
|
|
@ -1,842 +0,0 @@
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import ctypes
|
|
||||||
import json
|
|
||||||
import logging
|
|
||||||
import logging.handlers
|
|
||||||
import os
|
|
||||||
import winreg
|
|
||||||
import psutil
|
|
||||||
import sys
|
|
||||||
import threading
|
|
||||||
import time
|
|
||||||
import webbrowser
|
|
||||||
import pyperclip
|
|
||||||
import asyncio as _asyncio
|
|
||||||
from pathlib import Path
|
|
||||||
from typing import Dict, Optional
|
|
||||||
|
|
||||||
import pystray
|
|
||||||
import customtkinter as ctk
|
|
||||||
from PIL import Image, ImageDraw, ImageFont
|
|
||||||
|
|
||||||
import proxy.tg_ws_proxy as tg_ws_proxy
|
|
||||||
|
|
||||||
|
|
||||||
IS_FROZEN = bool(getattr(sys, "frozen", False))
|
|
||||||
|
|
||||||
APP_NAME = "TgWsProxy"
|
|
||||||
APP_DIR = Path(os.environ.get("APPDATA", Path.home())) / APP_NAME
|
|
||||||
CONFIG_FILE = APP_DIR / "config.json"
|
|
||||||
LOG_FILE = APP_DIR / "proxy.log"
|
|
||||||
FIRST_RUN_MARKER = APP_DIR / ".first_run_done"
|
|
||||||
IPV6_WARN_MARKER = APP_DIR / ".ipv6_warned"
|
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_CONFIG = {
|
|
||||||
"port": 1080,
|
|
||||||
"host": "127.0.0.1",
|
|
||||||
"dc_ip": ["2:149.154.167.220", "4:149.154.167.220"],
|
|
||||||
"verbose": False,
|
|
||||||
"autostart": False,
|
|
||||||
"log_max_mb": 5,
|
|
||||||
"buf_kb": 256,
|
|
||||||
"pool_size": 4,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
_proxy_thread: Optional[threading.Thread] = None
|
|
||||||
_async_stop: Optional[object] = None
|
|
||||||
_tray_icon: Optional[object] = None
|
|
||||||
_config: dict = {}
|
|
||||||
_exiting: bool = False
|
|
||||||
_lock_file_path: Optional[Path] = None
|
|
||||||
|
|
||||||
log = logging.getLogger("tg-ws-tray")
|
|
||||||
|
|
||||||
|
|
||||||
def _same_process(lock_meta: dict, proc: psutil.Process) -> bool:
|
|
||||||
try:
|
|
||||||
lock_ct = float(lock_meta.get("create_time", 0.0))
|
|
||||||
proc_ct = float(proc.create_time())
|
|
||||||
if lock_ct > 0 and abs(lock_ct - proc_ct) > 1.0:
|
|
||||||
return False
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
frozen = bool(getattr(sys, "frozen", False))
|
|
||||||
if frozen:
|
|
||||||
return os.path.basename(sys.executable) == proc.name()
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _release_lock():
|
|
||||||
global _lock_file_path
|
|
||||||
if not _lock_file_path:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
_lock_file_path.unlink(missing_ok=True)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
_lock_file_path = None
|
|
||||||
|
|
||||||
|
|
||||||
def _acquire_lock() -> bool:
|
|
||||||
global _lock_file_path
|
|
||||||
_ensure_dirs()
|
|
||||||
lock_files = list(APP_DIR.glob("*.lock"))
|
|
||||||
|
|
||||||
for f in lock_files:
|
|
||||||
pid = None
|
|
||||||
meta: dict = {}
|
|
||||||
|
|
||||||
try:
|
|
||||||
pid = int(f.stem)
|
|
||||||
except Exception:
|
|
||||||
f.unlink(missing_ok=True)
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
raw = f.read_text(encoding="utf-8").strip()
|
|
||||||
if raw:
|
|
||||||
meta = json.loads(raw)
|
|
||||||
except Exception:
|
|
||||||
meta = {}
|
|
||||||
|
|
||||||
try:
|
|
||||||
proc = psutil.Process(pid)
|
|
||||||
if _same_process(meta, proc):
|
|
||||||
return False
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
f.unlink(missing_ok=True)
|
|
||||||
|
|
||||||
lock_file = APP_DIR / f"{os.getpid()}.lock"
|
|
||||||
try:
|
|
||||||
proc = psutil.Process(os.getpid())
|
|
||||||
payload = {
|
|
||||||
"create_time": proc.create_time(),
|
|
||||||
}
|
|
||||||
lock_file.write_text(json.dumps(payload, ensure_ascii=False),
|
|
||||||
encoding="utf-8")
|
|
||||||
except Exception:
|
|
||||||
lock_file.touch()
|
|
||||||
|
|
||||||
_lock_file_path = lock_file
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def _ensure_dirs():
|
|
||||||
APP_DIR.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
|
|
||||||
def load_config() -> dict:
|
|
||||||
_ensure_dirs()
|
|
||||||
if CONFIG_FILE.exists():
|
|
||||||
try:
|
|
||||||
with open(CONFIG_FILE, "r", encoding="utf-8") as f:
|
|
||||||
data = json.load(f)
|
|
||||||
for k, v in DEFAULT_CONFIG.items():
|
|
||||||
data.setdefault(k, v)
|
|
||||||
return data
|
|
||||||
except Exception as exc:
|
|
||||||
log.warning("Failed to load config: %s", exc)
|
|
||||||
return dict(DEFAULT_CONFIG)
|
|
||||||
|
|
||||||
|
|
||||||
def save_config(cfg: dict):
|
|
||||||
_ensure_dirs()
|
|
||||||
with open(CONFIG_FILE, "w", encoding="utf-8") as f:
|
|
||||||
json.dump(cfg, f, indent=2, ensure_ascii=False)
|
|
||||||
|
|
||||||
|
|
||||||
def setup_logging(verbose: bool = False, log_max_mb: float = 5):
|
|
||||||
_ensure_dirs()
|
|
||||||
root = logging.getLogger()
|
|
||||||
root.setLevel(logging.DEBUG if verbose else logging.INFO)
|
|
||||||
|
|
||||||
fh = logging.handlers.RotatingFileHandler(
|
|
||||||
str(LOG_FILE),
|
|
||||||
maxBytes=max(32 * 1024, log_max_mb * 1024 * 1024),
|
|
||||||
backupCount=0,
|
|
||||||
encoding='utf-8',
|
|
||||||
)
|
|
||||||
fh.setLevel(logging.DEBUG)
|
|
||||||
fh.setFormatter(logging.Formatter(
|
|
||||||
"%(asctime)s %(levelname)-5s %(name)s %(message)s",
|
|
||||||
datefmt="%Y-%m-%d %H:%M:%S"))
|
|
||||||
root.addHandler(fh)
|
|
||||||
|
|
||||||
if not getattr(sys, "frozen", False):
|
|
||||||
ch = logging.StreamHandler(sys.stdout)
|
|
||||||
ch.setLevel(logging.DEBUG if verbose else logging.INFO)
|
|
||||||
ch.setFormatter(logging.Formatter(
|
|
||||||
"%(asctime)s %(levelname)-5s %(message)s",
|
|
||||||
datefmt="%H:%M:%S"))
|
|
||||||
root.addHandler(ch)
|
|
||||||
|
|
||||||
|
|
||||||
def _autostart_reg_name() -> str:
|
|
||||||
return APP_NAME
|
|
||||||
|
|
||||||
|
|
||||||
def _supports_autostart() -> bool:
|
|
||||||
return IS_FROZEN
|
|
||||||
|
|
||||||
|
|
||||||
def _autostart_command() -> str:
|
|
||||||
return f'"{sys.executable}"'
|
|
||||||
|
|
||||||
|
|
||||||
def is_autostart_enabled() -> bool:
|
|
||||||
try:
|
|
||||||
with winreg.OpenKey(
|
|
||||||
winreg.HKEY_CURRENT_USER,
|
|
||||||
r"Software\Microsoft\Windows\CurrentVersion\Run",
|
|
||||||
0,
|
|
||||||
winreg.KEY_READ,
|
|
||||||
) as k:
|
|
||||||
val, _ = winreg.QueryValueEx(k, _autostart_reg_name())
|
|
||||||
stored = str(val).strip()
|
|
||||||
expected = _autostart_command().strip()
|
|
||||||
return stored == expected
|
|
||||||
except FileNotFoundError:
|
|
||||||
return False
|
|
||||||
except OSError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def set_autostart_enabled(enabled: bool) -> None:
|
|
||||||
try:
|
|
||||||
with winreg.CreateKey(
|
|
||||||
winreg.HKEY_CURRENT_USER,
|
|
||||||
r"Software\Microsoft\Windows\CurrentVersion\Run",
|
|
||||||
) as k:
|
|
||||||
if enabled:
|
|
||||||
winreg.SetValueEx(
|
|
||||||
k,
|
|
||||||
_autostart_reg_name(),
|
|
||||||
0,
|
|
||||||
winreg.REG_SZ,
|
|
||||||
_autostart_command(),
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
winreg.DeleteValue(k, _autostart_reg_name())
|
|
||||||
except FileNotFoundError:
|
|
||||||
pass
|
|
||||||
except OSError as exc:
|
|
||||||
log.error("Failed to update autostart: %s", exc)
|
|
||||||
_show_error(
|
|
||||||
"Не удалось изменить автозапуск.\n\n"
|
|
||||||
"Попробуйте запустить приложение от имени пользователя с правами на реестр.\n\n"
|
|
||||||
f"Ошибка: {exc}"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _make_icon_image(size: int = 64):
|
|
||||||
if Image is None:
|
|
||||||
raise RuntimeError("Pillow is required for tray icon")
|
|
||||||
img = Image.new("RGBA", (size, size), (0, 0, 0, 0))
|
|
||||||
draw = ImageDraw.Draw(img)
|
|
||||||
|
|
||||||
margin = 2
|
|
||||||
draw.ellipse([margin, margin, size - margin, size - margin],
|
|
||||||
fill=(0, 136, 204, 255))
|
|
||||||
|
|
||||||
try:
|
|
||||||
font = ImageFont.truetype("arial.ttf", size=int(size * 0.55))
|
|
||||||
except Exception:
|
|
||||||
font = ImageFont.load_default()
|
|
||||||
bbox = draw.textbbox((0, 0), "T", font=font)
|
|
||||||
tw, th = bbox[2] - bbox[0], bbox[3] - bbox[1]
|
|
||||||
tx = (size - tw) // 2 - bbox[0]
|
|
||||||
ty = (size - th) // 2 - bbox[1]
|
|
||||||
draw.text((tx, ty), "T", fill=(255, 255, 255, 255), font=font)
|
|
||||||
|
|
||||||
return img
|
|
||||||
|
|
||||||
|
|
||||||
def _load_icon():
|
|
||||||
icon_path = Path(__file__).parent / "icon.ico"
|
|
||||||
if icon_path.exists() and Image:
|
|
||||||
try:
|
|
||||||
return Image.open(str(icon_path))
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
return _make_icon_image()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def _run_proxy_thread(port: int, dc_opt: Dict[int, str], verbose: bool,
|
|
||||||
host: str = '127.0.0.1'):
|
|
||||||
global _async_stop
|
|
||||||
loop = _asyncio.new_event_loop()
|
|
||||||
_asyncio.set_event_loop(loop)
|
|
||||||
stop_ev = _asyncio.Event()
|
|
||||||
_async_stop = (loop, stop_ev)
|
|
||||||
|
|
||||||
try:
|
|
||||||
loop.run_until_complete(
|
|
||||||
tg_ws_proxy._run(port, dc_opt, stop_event=stop_ev, host=host))
|
|
||||||
except Exception as exc:
|
|
||||||
log.error("Proxy thread crashed: %s", exc)
|
|
||||||
if "10048" in str(exc) or "Address already in use" in str(exc):
|
|
||||||
_show_error("Не удалось запустить прокси:\nПорт уже используется другим приложением.\n\nЗакройте приложение, использующее этот порт, или измените порт в настройках прокси и перезапустите.")
|
|
||||||
finally:
|
|
||||||
loop.close()
|
|
||||||
_async_stop = None
|
|
||||||
|
|
||||||
|
|
||||||
def start_proxy():
|
|
||||||
global _proxy_thread, _config
|
|
||||||
if _proxy_thread and _proxy_thread.is_alive():
|
|
||||||
log.info("Proxy already running")
|
|
||||||
return
|
|
||||||
|
|
||||||
cfg = _config
|
|
||||||
port = cfg.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
host = cfg.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
dc_ip_list = cfg.get("dc_ip", DEFAULT_CONFIG["dc_ip"])
|
|
||||||
verbose = cfg.get("verbose", False)
|
|
||||||
|
|
||||||
try:
|
|
||||||
dc_opt = tg_ws_proxy.parse_dc_ip_list(dc_ip_list)
|
|
||||||
except ValueError as e:
|
|
||||||
log.error("Bad config dc_ip: %s", e)
|
|
||||||
_show_error(f"Ошибка конфигурации:\n{e}")
|
|
||||||
return
|
|
||||||
|
|
||||||
log.info("Starting proxy on %s:%d ...", host, port)
|
|
||||||
|
|
||||||
buf_kb = cfg.get("buf_kb", DEFAULT_CONFIG["buf_kb"])
|
|
||||||
pool_size = cfg.get("pool_size", DEFAULT_CONFIG["pool_size"])
|
|
||||||
tg_ws_proxy._RECV_BUF = max(4, buf_kb) * 1024
|
|
||||||
tg_ws_proxy._SEND_BUF = tg_ws_proxy._RECV_BUF
|
|
||||||
tg_ws_proxy._WS_POOL_SIZE = max(0, pool_size)
|
|
||||||
|
|
||||||
_proxy_thread = threading.Thread(
|
|
||||||
target=_run_proxy_thread,
|
|
||||||
args=(port, dc_opt, verbose, host),
|
|
||||||
daemon=True, name="proxy")
|
|
||||||
_proxy_thread.start()
|
|
||||||
|
|
||||||
|
|
||||||
def stop_proxy():
|
|
||||||
global _proxy_thread, _async_stop
|
|
||||||
if _async_stop:
|
|
||||||
loop, stop_ev = _async_stop
|
|
||||||
loop.call_soon_threadsafe(stop_ev.set)
|
|
||||||
if _proxy_thread:
|
|
||||||
_proxy_thread.join(timeout=2)
|
|
||||||
_proxy_thread = None
|
|
||||||
log.info("Proxy stopped")
|
|
||||||
|
|
||||||
|
|
||||||
def restart_proxy():
|
|
||||||
log.info("Restarting proxy...")
|
|
||||||
stop_proxy()
|
|
||||||
time.sleep(0.3)
|
|
||||||
start_proxy()
|
|
||||||
|
|
||||||
|
|
||||||
def _show_error(text: str, title: str = "TG WS Proxy — Ошибка"):
|
|
||||||
ctypes.windll.user32.MessageBoxW(0, text, title, 0x10)
|
|
||||||
|
|
||||||
|
|
||||||
def _show_info(text: str, title: str = "TG WS Proxy"):
|
|
||||||
ctypes.windll.user32.MessageBoxW(0, text, title, 0x40)
|
|
||||||
|
|
||||||
|
|
||||||
def _on_open_in_telegram(icon=None, item=None):
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
url = f"tg://socks?server=127.0.0.1&port={port}"
|
|
||||||
log.info("Opening %s", url)
|
|
||||||
try:
|
|
||||||
result = webbrowser.open(url)
|
|
||||||
if not result:
|
|
||||||
raise RuntimeError("webbrowser.open returned False")
|
|
||||||
except Exception:
|
|
||||||
log.info("Browser open failed, copying to clipboard")
|
|
||||||
try:
|
|
||||||
pyperclip.copy(url)
|
|
||||||
_show_info(
|
|
||||||
f"Не удалось открыть Telegram автоматически.\n\n"
|
|
||||||
f"Ссылка скопирована в буфер обмена, отправьте её в Telegram и нажмите по ней ЛКМ:\n{url}",
|
|
||||||
"TG WS Proxy")
|
|
||||||
except Exception as exc:
|
|
||||||
log.error("Clipboard copy failed: %s", exc)
|
|
||||||
_show_error(f"Не удалось скопировать ссылку:\n{exc}")
|
|
||||||
|
|
||||||
|
|
||||||
def _on_restart(icon=None, item=None):
|
|
||||||
threading.Thread(target=restart_proxy, daemon=True).start()
|
|
||||||
|
|
||||||
|
|
||||||
def _on_edit_config(icon=None, item=None):
|
|
||||||
threading.Thread(target=_edit_config_dialog, daemon=True).start()
|
|
||||||
|
|
||||||
|
|
||||||
def _edit_config_dialog():
|
|
||||||
if ctk is None:
|
|
||||||
_show_error("customtkinter не установлен.")
|
|
||||||
return
|
|
||||||
|
|
||||||
cfg = dict(_config)
|
|
||||||
cfg["autostart"] = is_autostart_enabled()
|
|
||||||
|
|
||||||
# Make sure that the autostart key is removed if autostart
|
|
||||||
# is disabled, even if the executable file is moved.
|
|
||||||
if _supports_autostart() and not cfg["autostart"]:
|
|
||||||
set_autostart_enabled(False)
|
|
||||||
|
|
||||||
ctk.set_appearance_mode("light")
|
|
||||||
ctk.set_default_color_theme("blue")
|
|
||||||
|
|
||||||
root = ctk.CTk()
|
|
||||||
root.title("TG WS Proxy — Настройки")
|
|
||||||
root.resizable(False, False)
|
|
||||||
root.attributes("-topmost", True)
|
|
||||||
icon_path = str(Path(__file__).parent / "icon.ico")
|
|
||||||
root.iconbitmap(icon_path)
|
|
||||||
|
|
||||||
TG_BLUE = "#3390ec"
|
|
||||||
TG_BLUE_HOVER = "#2b7cd4"
|
|
||||||
BG = "#ffffff"
|
|
||||||
FIELD_BG = "#f0f2f5"
|
|
||||||
FIELD_BORDER = "#d6d9dc"
|
|
||||||
TEXT_PRIMARY = "#000000"
|
|
||||||
TEXT_SECONDARY = "#707579"
|
|
||||||
FONT_FAMILY = "Segoe UI"
|
|
||||||
|
|
||||||
w, h = 420, 540
|
|
||||||
|
|
||||||
if _supports_autostart():
|
|
||||||
h += 70
|
|
||||||
|
|
||||||
sw = root.winfo_screenwidth()
|
|
||||||
sh = root.winfo_screenheight()
|
|
||||||
root.geometry(f"{w}x{h}+{(sw-w)//2}+{(sh-h)//2}")
|
|
||||||
root.configure(fg_color=BG)
|
|
||||||
|
|
||||||
frame = ctk.CTkFrame(root, fg_color=BG, corner_radius=0)
|
|
||||||
frame.pack(fill="both", expand=True, padx=24, pady=20)
|
|
||||||
|
|
||||||
# Host
|
|
||||||
ctk.CTkLabel(frame, text="IP-адрес прокси",
|
|
||||||
font=(FONT_FAMILY, 13), text_color=TEXT_PRIMARY,
|
|
||||||
anchor="w").pack(anchor="w", pady=(0, 4))
|
|
||||||
host_var = ctk.StringVar(value=cfg.get("host", "127.0.0.1"))
|
|
||||||
host_entry = ctk.CTkEntry(frame, textvariable=host_var, width=200, height=36,
|
|
||||||
font=(FONT_FAMILY, 13), corner_radius=10,
|
|
||||||
fg_color=FIELD_BG, border_color=FIELD_BORDER,
|
|
||||||
border_width=1, text_color=TEXT_PRIMARY)
|
|
||||||
host_entry.pack(anchor="w", pady=(0, 12))
|
|
||||||
|
|
||||||
# Port
|
|
||||||
ctk.CTkLabel(frame, text="Порт прокси",
|
|
||||||
font=(FONT_FAMILY, 13), text_color=TEXT_PRIMARY,
|
|
||||||
anchor="w").pack(anchor="w", pady=(0, 4))
|
|
||||||
port_var = ctk.StringVar(value=str(cfg.get("port", 1080)))
|
|
||||||
port_entry = ctk.CTkEntry(frame, textvariable=port_var, width=120, height=36,
|
|
||||||
font=(FONT_FAMILY, 13), corner_radius=10,
|
|
||||||
fg_color=FIELD_BG, border_color=FIELD_BORDER,
|
|
||||||
border_width=1, text_color=TEXT_PRIMARY)
|
|
||||||
port_entry.pack(anchor="w", pady=(0, 12))
|
|
||||||
|
|
||||||
# DC-IP mappings
|
|
||||||
ctk.CTkLabel(frame, text="DC → IP маппинги (по одному на строку, формат DC:IP)",
|
|
||||||
font=(FONT_FAMILY, 13), text_color=TEXT_PRIMARY,
|
|
||||||
anchor="w").pack(anchor="w", pady=(0, 4))
|
|
||||||
dc_textbox = ctk.CTkTextbox(frame, width=370, height=120,
|
|
||||||
font=("Consolas", 12), corner_radius=10,
|
|
||||||
fg_color=FIELD_BG, border_color=FIELD_BORDER,
|
|
||||||
border_width=1, text_color=TEXT_PRIMARY)
|
|
||||||
dc_textbox.pack(anchor="w", pady=(0, 12))
|
|
||||||
dc_textbox.insert("1.0", "\n".join(cfg.get("dc_ip", DEFAULT_CONFIG["dc_ip"])))
|
|
||||||
|
|
||||||
# Verbose
|
|
||||||
verbose_var = ctk.BooleanVar(value=cfg.get("verbose", False))
|
|
||||||
ctk.CTkCheckBox(frame, text="Подробное логирование (verbose)",
|
|
||||||
variable=verbose_var, font=(FONT_FAMILY, 13),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
|
|
||||||
corner_radius=6, border_width=2,
|
|
||||||
border_color=FIELD_BORDER).pack(anchor="w", pady=(0, 8))
|
|
||||||
|
|
||||||
# Advanced: buf_kb, pool_size, log_max_mb
|
|
||||||
adv_frame = ctk.CTkFrame(frame, fg_color="transparent")
|
|
||||||
adv_frame.pack(anchor="w", fill="x", pady=(4, 8))
|
|
||||||
|
|
||||||
for col, (lbl, key, w_) in enumerate([
|
|
||||||
("Буфер (KB, 256 default)", "buf_kb", 120),
|
|
||||||
("WS пулов (4 default)", "pool_size", 120),
|
|
||||||
("Log size (MB, 5 def)", "log_max_mb", 120),
|
|
||||||
]):
|
|
||||||
col_frame = ctk.CTkFrame(adv_frame, fg_color="transparent")
|
|
||||||
col_frame.pack(side="left", padx=(0, 10))
|
|
||||||
ctk.CTkLabel(col_frame, text=lbl, font=(FONT_FAMILY, 11),
|
|
||||||
text_color=TEXT_SECONDARY, anchor="w").pack(anchor="w")
|
|
||||||
ctk.CTkEntry(col_frame, width=w_, height=30, font=(FONT_FAMILY, 12),
|
|
||||||
corner_radius=8, fg_color=FIELD_BG,
|
|
||||||
border_color=FIELD_BORDER, border_width=1,
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
textvariable=ctk.StringVar(
|
|
||||||
value=str(cfg.get(key, DEFAULT_CONFIG[key]))
|
|
||||||
)).pack(anchor="w")
|
|
||||||
|
|
||||||
_adv_entries = list(adv_frame.winfo_children())
|
|
||||||
_adv_keys = ["buf_kb", "pool_size", "log_max_mb"]
|
|
||||||
|
|
||||||
autostart_var = None
|
|
||||||
if _supports_autostart():
|
|
||||||
autostart_var = ctk.BooleanVar(value=cfg["autostart"])
|
|
||||||
ctk.CTkCheckBox(frame, text="Автозапуск при включении Windows",
|
|
||||||
variable=autostart_var, font=(FONT_FAMILY, 13),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
|
|
||||||
corner_radius=6, border_width=2,
|
|
||||||
border_color=FIELD_BORDER).pack(anchor="w", pady=(0, 8))
|
|
||||||
ctk.CTkLabel(frame, text="При перемещении файла или открытии из другой папки\nавтозапуск будет сброшен",
|
|
||||||
font=(FONT_FAMILY, 13), text_color=TEXT_SECONDARY,
|
|
||||||
anchor="w", justify="left").pack(anchor="w", pady=(0, 8))
|
|
||||||
|
|
||||||
def on_save():
|
|
||||||
import socket as _sock
|
|
||||||
host_val = host_var.get().strip()
|
|
||||||
try:
|
|
||||||
_sock.inet_aton(host_val)
|
|
||||||
except OSError:
|
|
||||||
_show_error("Некорректный IP-адрес.")
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
port_val = int(port_var.get().strip())
|
|
||||||
if not (1 <= port_val <= 65535):
|
|
||||||
raise ValueError
|
|
||||||
except ValueError:
|
|
||||||
_show_error("Порт должен быть числом 1-65535")
|
|
||||||
return
|
|
||||||
|
|
||||||
lines = [l.strip() for l in dc_textbox.get("1.0", "end").strip().splitlines()
|
|
||||||
if l.strip()]
|
|
||||||
try:
|
|
||||||
tg_ws_proxy.parse_dc_ip_list(lines)
|
|
||||||
except ValueError as e:
|
|
||||||
_show_error(str(e))
|
|
||||||
return
|
|
||||||
|
|
||||||
new_cfg = {
|
|
||||||
"host": host_val,
|
|
||||||
"port": port_val,
|
|
||||||
"dc_ip": lines,
|
|
||||||
"verbose": verbose_var.get(),
|
|
||||||
"autostart": (autostart_var.get() if autostart_var is not None else False),
|
|
||||||
}
|
|
||||||
|
|
||||||
for i, key in enumerate(_adv_keys):
|
|
||||||
col_frame = _adv_entries[i]
|
|
||||||
entry = col_frame.winfo_children()[1]
|
|
||||||
try:
|
|
||||||
val = float(entry.get().strip())
|
|
||||||
if key in ("buf_kb", "pool_size"):
|
|
||||||
val = int(val)
|
|
||||||
new_cfg[key] = val
|
|
||||||
except ValueError:
|
|
||||||
new_cfg[key] = DEFAULT_CONFIG[key]
|
|
||||||
save_config(new_cfg)
|
|
||||||
_config.update(new_cfg)
|
|
||||||
log.info("Config saved: %s", new_cfg)
|
|
||||||
|
|
||||||
if _supports_autostart():
|
|
||||||
set_autostart_enabled(bool(new_cfg.get("autostart", False)))
|
|
||||||
|
|
||||||
_tray_icon.menu = _build_menu()
|
|
||||||
|
|
||||||
from tkinter import messagebox
|
|
||||||
if messagebox.askyesno("Перезапустить?",
|
|
||||||
"Настройки сохранены.\n\n"
|
|
||||||
"Перезапустить прокси сейчас?",
|
|
||||||
parent=root):
|
|
||||||
root.destroy()
|
|
||||||
restart_proxy()
|
|
||||||
else:
|
|
||||||
root.destroy()
|
|
||||||
|
|
||||||
def on_cancel():
|
|
||||||
root.destroy()
|
|
||||||
|
|
||||||
btn_frame = ctk.CTkFrame(frame, fg_color="transparent")
|
|
||||||
btn_frame.pack(fill="x", pady=(20, 0))
|
|
||||||
ctk.CTkButton(btn_frame, text="Сохранить", height=38,
|
|
||||||
font=(FONT_FAMILY, 14, "bold"), corner_radius=10,
|
|
||||||
fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
|
|
||||||
text_color="#ffffff",
|
|
||||||
command=on_save).pack(side="left", fill="x", expand=True, padx=(0, 8))
|
|
||||||
ctk.CTkButton(btn_frame, text="Отмена", height=38,
|
|
||||||
font=(FONT_FAMILY, 14), corner_radius=10,
|
|
||||||
fg_color=FIELD_BG, hover_color=FIELD_BORDER,
|
|
||||||
text_color=TEXT_PRIMARY, border_width=1,
|
|
||||||
border_color=FIELD_BORDER,
|
|
||||||
command=on_cancel).pack(side="right", fill="x", expand=True)
|
|
||||||
|
|
||||||
root.mainloop()
|
|
||||||
|
|
||||||
|
|
||||||
def _on_open_logs(icon=None, item=None):
|
|
||||||
log.info("Opening log file: %s", LOG_FILE)
|
|
||||||
if LOG_FILE.exists():
|
|
||||||
os.startfile(str(LOG_FILE))
|
|
||||||
else:
|
|
||||||
_show_info("Файл логов ещё не создан.", "TG WS Proxy")
|
|
||||||
|
|
||||||
|
|
||||||
def _on_exit(icon=None, item=None):
|
|
||||||
global _exiting
|
|
||||||
if _exiting:
|
|
||||||
os._exit(0)
|
|
||||||
return
|
|
||||||
_exiting = True
|
|
||||||
log.info("User requested exit")
|
|
||||||
|
|
||||||
def _force_exit():
|
|
||||||
time.sleep(3)
|
|
||||||
os._exit(0)
|
|
||||||
threading.Thread(target=_force_exit, daemon=True, name="force-exit").start()
|
|
||||||
|
|
||||||
if icon:
|
|
||||||
icon.stop()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def _show_first_run():
|
|
||||||
_ensure_dirs()
|
|
||||||
if FIRST_RUN_MARKER.exists():
|
|
||||||
return
|
|
||||||
|
|
||||||
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
tg_url = f"tg://socks?server={host}&port={port}"
|
|
||||||
|
|
||||||
if ctk is None:
|
|
||||||
FIRST_RUN_MARKER.touch()
|
|
||||||
return
|
|
||||||
|
|
||||||
ctk.set_appearance_mode("light")
|
|
||||||
ctk.set_default_color_theme("blue")
|
|
||||||
|
|
||||||
TG_BLUE = "#3390ec"
|
|
||||||
TG_BLUE_HOVER = "#2b7cd4"
|
|
||||||
BG = "#ffffff"
|
|
||||||
FIELD_BG = "#f0f2f5"
|
|
||||||
FIELD_BORDER = "#d6d9dc"
|
|
||||||
TEXT_PRIMARY = "#000000"
|
|
||||||
TEXT_SECONDARY = "#707579"
|
|
||||||
FONT_FAMILY = "Segoe UI"
|
|
||||||
|
|
||||||
root = ctk.CTk()
|
|
||||||
root.title("TG WS Proxy")
|
|
||||||
root.resizable(False, False)
|
|
||||||
root.attributes("-topmost", True)
|
|
||||||
icon_path = str(Path(__file__).parent / "icon.ico")
|
|
||||||
root.iconbitmap(icon_path)
|
|
||||||
|
|
||||||
w, h = 520, 440
|
|
||||||
sw = root.winfo_screenwidth()
|
|
||||||
sh = root.winfo_screenheight()
|
|
||||||
root.geometry(f"{w}x{h}+{(sw-w)//2}+{(sh-h)//2}")
|
|
||||||
root.configure(fg_color=BG)
|
|
||||||
|
|
||||||
frame = ctk.CTkFrame(root, fg_color=BG, corner_radius=0)
|
|
||||||
frame.pack(fill="both", expand=True, padx=28, pady=24)
|
|
||||||
|
|
||||||
title_frame = ctk.CTkFrame(frame, fg_color="transparent")
|
|
||||||
title_frame.pack(anchor="w", pady=(0, 16), fill="x")
|
|
||||||
|
|
||||||
# Blue accent bar
|
|
||||||
accent_bar = ctk.CTkFrame(title_frame, fg_color=TG_BLUE,
|
|
||||||
width=4, height=32, corner_radius=2)
|
|
||||||
accent_bar.pack(side="left", padx=(0, 12))
|
|
||||||
|
|
||||||
ctk.CTkLabel(title_frame, text="Прокси запущен и работает в системном трее",
|
|
||||||
font=(FONT_FAMILY, 17, "bold"),
|
|
||||||
text_color=TEXT_PRIMARY).pack(side="left")
|
|
||||||
|
|
||||||
# Info sections
|
|
||||||
sections = [
|
|
||||||
("Как подключить Telegram Desktop:", True),
|
|
||||||
(" Автоматически:", True),
|
|
||||||
(f" ПКМ по иконке в трее → «Открыть в Telegram»", False),
|
|
||||||
(f" Или ссылка: {tg_url}", False),
|
|
||||||
("\n Вручную:", True),
|
|
||||||
(" Настройки → Продвинутые → Тип подключения → Прокси", False),
|
|
||||||
(f" SOCKS5 → {host} : {port} (без логина/пароля)", False),
|
|
||||||
]
|
|
||||||
|
|
||||||
for text, bold in sections:
|
|
||||||
weight = "bold" if bold else "normal"
|
|
||||||
ctk.CTkLabel(frame, text=text,
|
|
||||||
font=(FONT_FAMILY, 13, weight),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
anchor="w", justify="left").pack(anchor="w", pady=1)
|
|
||||||
|
|
||||||
# Spacer
|
|
||||||
ctk.CTkFrame(frame, fg_color="transparent", height=16).pack()
|
|
||||||
|
|
||||||
# Separator
|
|
||||||
ctk.CTkFrame(frame, fg_color=FIELD_BORDER, height=1,
|
|
||||||
corner_radius=0).pack(fill="x", pady=(0, 12))
|
|
||||||
|
|
||||||
# Checkbox
|
|
||||||
auto_var = ctk.BooleanVar(value=True)
|
|
||||||
ctk.CTkCheckBox(frame, text="Открыть прокси в Telegram сейчас",
|
|
||||||
variable=auto_var, font=(FONT_FAMILY, 13),
|
|
||||||
text_color=TEXT_PRIMARY,
|
|
||||||
fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
|
|
||||||
corner_radius=6, border_width=2,
|
|
||||||
border_color=FIELD_BORDER).pack(anchor="w", pady=(0, 16))
|
|
||||||
|
|
||||||
def on_ok():
|
|
||||||
FIRST_RUN_MARKER.touch()
|
|
||||||
open_tg = auto_var.get()
|
|
||||||
root.destroy()
|
|
||||||
if open_tg:
|
|
||||||
_on_open_in_telegram()
|
|
||||||
|
|
||||||
ctk.CTkButton(frame, text="Начать", width=180, height=42,
|
|
||||||
font=(FONT_FAMILY, 15, "bold"), corner_radius=10,
|
|
||||||
fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
|
|
||||||
text_color="#ffffff",
|
|
||||||
command=on_ok).pack(pady=(0, 0))
|
|
||||||
|
|
||||||
root.protocol("WM_DELETE_WINDOW", on_ok)
|
|
||||||
root.mainloop()
|
|
||||||
|
|
||||||
|
|
||||||
def _has_ipv6_enabled() -> bool:
|
|
||||||
import socket as _sock
|
|
||||||
try:
|
|
||||||
addrs = _sock.getaddrinfo(_sock.gethostname(), None, _sock.AF_INET6)
|
|
||||||
for addr in addrs:
|
|
||||||
ip = addr[4][0]
|
|
||||||
if ip and not ip.startswith('::1') and not ip.startswith('fe80::1'):
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
s = _sock.socket(_sock.AF_INET6, _sock.SOCK_STREAM)
|
|
||||||
s.bind(('::1', 0))
|
|
||||||
s.close()
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _check_ipv6_warning():
|
|
||||||
_ensure_dirs()
|
|
||||||
if IPV6_WARN_MARKER.exists():
|
|
||||||
return
|
|
||||||
if not _has_ipv6_enabled():
|
|
||||||
return
|
|
||||||
|
|
||||||
IPV6_WARN_MARKER.touch()
|
|
||||||
|
|
||||||
threading.Thread(target=_show_ipv6_dialog, daemon=True).start()
|
|
||||||
|
|
||||||
|
|
||||||
def _show_ipv6_dialog():
|
|
||||||
_show_info(
|
|
||||||
"На вашем компьютере включена поддержка подключения по IPv6.\n\n"
|
|
||||||
"Telegram может пытаться подключаться через IPv6, "
|
|
||||||
"что не поддерживается и может привести к ошибкам.\n\n"
|
|
||||||
"Если прокси не работает или в логах присутствуют ошибки, "
|
|
||||||
"связанные с попытками подключения по IPv6 - "
|
|
||||||
"попробуйте отключить в настройках прокси Telegram попытку соединения "
|
|
||||||
"по IPv6. Если данная мера не помогает, попробуйте отключить IPv6 "
|
|
||||||
"в системе.\n\n"
|
|
||||||
"Это предупреждение будет показано только один раз.",
|
|
||||||
"TG WS Proxy")
|
|
||||||
|
|
||||||
|
|
||||||
def _build_menu():
|
|
||||||
if pystray is None:
|
|
||||||
return None
|
|
||||||
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
||||||
port = _config.get("port", DEFAULT_CONFIG["port"])
|
|
||||||
return pystray.Menu(
|
|
||||||
pystray.MenuItem(
|
|
||||||
f"Открыть в Telegram ({host}:{port})",
|
|
||||||
_on_open_in_telegram,
|
|
||||||
default=True),
|
|
||||||
pystray.Menu.SEPARATOR,
|
|
||||||
pystray.MenuItem("Перезапустить прокси", _on_restart),
|
|
||||||
pystray.MenuItem("Настройки...", _on_edit_config),
|
|
||||||
pystray.MenuItem("Открыть логи", _on_open_logs),
|
|
||||||
pystray.Menu.SEPARATOR,
|
|
||||||
pystray.MenuItem("Выход", _on_exit),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def run_tray():
|
|
||||||
global _tray_icon, _config
|
|
||||||
|
|
||||||
_config = load_config()
|
|
||||||
save_config(_config)
|
|
||||||
|
|
||||||
if LOG_FILE.exists():
|
|
||||||
try:
|
|
||||||
LOG_FILE.unlink()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
setup_logging(_config.get("verbose", False),
|
|
||||||
log_max_mb=_config.get("log_max_mb", DEFAULT_CONFIG["log_max_mb"]))
|
|
||||||
log.info("TG WS Proxy tray app starting")
|
|
||||||
log.info("Config: %s", _config)
|
|
||||||
log.info("Log file: %s", LOG_FILE)
|
|
||||||
|
|
||||||
if pystray is None or Image is None:
|
|
||||||
log.error("pystray or Pillow not installed; "
|
|
||||||
"running in console mode")
|
|
||||||
start_proxy()
|
|
||||||
try:
|
|
||||||
while True:
|
|
||||||
time.sleep(1)
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
stop_proxy()
|
|
||||||
return
|
|
||||||
|
|
||||||
start_proxy()
|
|
||||||
|
|
||||||
_show_first_run()
|
|
||||||
_check_ipv6_warning()
|
|
||||||
|
|
||||||
icon_image = _load_icon()
|
|
||||||
_tray_icon = pystray.Icon(
|
|
||||||
APP_NAME,
|
|
||||||
icon_image,
|
|
||||||
"TG WS Proxy",
|
|
||||||
menu=_build_menu())
|
|
||||||
|
|
||||||
log.info("Tray icon running")
|
|
||||||
_tray_icon.run()
|
|
||||||
|
|
||||||
stop_proxy()
|
|
||||||
log.info("Tray app exited")
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
if not _acquire_lock():
|
|
||||||
_show_info("Приложение уже запущено.", os.path.basename(sys.argv[0]))
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
run_tray()
|
|
||||||
finally:
|
|
||||||
_release_lock()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||