ubuntu/debian version, install scripts
This commit is contained in:
Dusha01
parent
cf3e3b2aec
commit
2b4323c71a
|
|
@ -1,4 +1,5 @@
|
|||
# Python
|
||||
.venv/
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
*.pyo
|
||||
|
|
|
|||
61
README.md
61
README.md
|
|
@ -35,12 +35,10 @@ Telegram Desktop → SOCKS5 (127.0.0.1:1080) → TG WS Proxy → WSS (kws*.web.t
|
|||
|
||||
При первом запуске откроется окно с инструкцией по подключению Telegram Desktop. Приложение сворачивается в системный трей.
|
||||
|
||||
**Меню трея:**
|
||||
- **Открыть в Telegram** — автоматически настроить прокси через `tg://socks` ссылку
|
||||
- **Перезапустить прокси** — перезапуск без выхода из приложения
|
||||
- **Настройки...** — GUI-редактор конфигурации
|
||||
- **Открыть логи** — открыть файл логов
|
||||
- **Выход** — остановить прокси и закрыть приложение
|
||||
**Linux (окно приложения):**
|
||||
- Окно остаётся открытым, можно свернуть
|
||||
- Кнопки: «Открыть в Telegram», «Настройки», «Открыть логи»
|
||||
- Закрытие окна (×) — полная остановка приложения
|
||||
|
||||
## Установка из исходников
|
||||
|
||||
|
|
@ -48,13 +46,39 @@ Telegram Desktop → SOCKS5 (127.0.0.1:1080) → TG WS Proxy → WSS (kws*.web.t
|
|||
pip install -r requirements.txt
|
||||
```
|
||||
|
||||
### Linux (Debian, Ubuntu)
|
||||
|
||||
**Системные зависимости:**
|
||||
```bash
|
||||
sudo apt install python3 python3-venv python3-tk
|
||||
```
|
||||
|
||||
**Вариант 1 — установка как приложение** (пункт в меню, окно можно свернуть):
|
||||
```bash
|
||||
./packaging/install-linux.sh
|
||||
```
|
||||
После установки приложение появится в меню приложений.
|
||||
|
||||
**Вариант 2 — запуск из исходников:**
|
||||
```bash
|
||||
python3 -m venv .venv
|
||||
.venv/bin/pip install -r requirements.txt
|
||||
.venv/bin/python linux.py
|
||||
```
|
||||
|
||||
**Вариант 3 — сборка standalone-бинарника:**
|
||||
```bash
|
||||
./packaging/build-linux.sh
|
||||
# Результат: dist/tg-ws-proxy
|
||||
```
|
||||
|
||||
### Windows (Tray-приложение)
|
||||
|
||||
```bash
|
||||
python windows.py
|
||||
```
|
||||
|
||||
### Консольный режим
|
||||
### Консольный режим (все платформы)
|
||||
|
||||
```bash
|
||||
python proxy/tg_ws_proxy.py [--port PORT] [--dc-ip DC:IP ...] [-v]
|
||||
|
|
@ -98,27 +122,28 @@ python proxy/tg_ws_proxy.py -v
|
|||
|
||||
## Конфигурация
|
||||
|
||||
Tray-приложение хранит данные в `%APPDATA%/TgWsProxy`:
|
||||
| Платформа | Путь |
|
||||
|-----------|------|
|
||||
| Windows | `%APPDATA%/TgWsProxy/config.json` |
|
||||
| Linux | `~/.config/TgWsProxy/config.json` |
|
||||
|
||||
```json
|
||||
{
|
||||
"port": 1080,
|
||||
"dc_ip": [
|
||||
"2:149.154.167.220",
|
||||
"4:149.154.167.220"
|
||||
],
|
||||
"host": "127.0.0.1",
|
||||
"dc_ip": ["2:149.154.167.220", "4:149.154.167.220"],
|
||||
"verbose": false
|
||||
}
|
||||
```
|
||||
|
||||
## Автоматическая сборка
|
||||
## Сборка
|
||||
|
||||
Проект содержит спецификацию PyInstaller ([`windows.spec`](packaging/windows.spec)) и GitHub Actions workflow ([`.github/workflows/build.yml`](.github/workflows/build.yml)) для автоматической сборки.
|
||||
| Платформа | Спека | Команда |
|
||||
|-----------|-------|---------|
|
||||
| Windows | [`packaging/windows.spec`](packaging/windows.spec) | `pyinstaller packaging/windows.spec` |
|
||||
| Linux | [`packaging/linux.spec`](packaging/linux.spec) | `./packaging/build-linux.sh` |
|
||||
|
||||
```bash
|
||||
pip install pyinstaller
|
||||
pyinstaller packaging/windows.spec
|
||||
```
|
||||
GitHub Actions: [`.github/workflows/build.yml`](.github/workflows/build.yml)
|
||||
|
||||
## Лицензия
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,662 @@
|
|||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
import webbrowser
|
||||
import pyperclip
|
||||
import asyncio as _asyncio
|
||||
import customtkinter as ctk
|
||||
from pathlib import Path
|
||||
from typing import Dict, Optional
|
||||
|
||||
import proxy.tg_ws_proxy as tg_ws_proxy
|
||||
|
||||
|
||||
APP_NAME = "TgWsProxy"
|
||||
# XDG_CONFIG_HOME или ~/.config
|
||||
_CONFIG_DIR = Path(
|
||||
os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config")
|
||||
) / APP_NAME
|
||||
APP_DIR = _CONFIG_DIR
|
||||
CONFIG_FILE = APP_DIR / "config.json"
|
||||
LOG_FILE = APP_DIR / "proxy.log"
|
||||
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,
|
||||
}
|
||||
|
||||
|
||||
_proxy_thread: Optional[threading.Thread] = None
|
||||
_async_stop: Optional[object] = None
|
||||
_config: dict = {}
|
||||
_lock_file_path: Optional[Path] = None
|
||||
|
||||
log = logging.getLogger("tg-ws-tray")
|
||||
|
||||
|
||||
def _same_process(lock_meta: dict, proc) -> bool:
|
||||
try:
|
||||
import psutil
|
||||
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
|
||||
import psutil
|
||||
_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):
|
||||
_ensure_dirs()
|
||||
root = logging.getLogger()
|
||||
root.setLevel(logging.DEBUG if verbose else logging.INFO)
|
||||
|
||||
fh = logging.FileHandler(str(LOG_FILE), 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 _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)
|
||||
err_str = str(exc).lower()
|
||||
if "address already in use" in err_str or "eaddrinuse" in err_str:
|
||||
_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)
|
||||
_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 — Ошибка"):
|
||||
"""Диалог ошибки через zenity/kdialog или tkinter."""
|
||||
try:
|
||||
r = subprocess.run(
|
||||
["zenity", "--error", f"--text={text}", f"--title={title}"],
|
||||
capture_output=True, timeout=5)
|
||||
if r.returncode == 0:
|
||||
return
|
||||
except (FileNotFoundError, subprocess.TimeoutExpired):
|
||||
pass
|
||||
try:
|
||||
r = subprocess.run(
|
||||
["kdialog", "--error", text, "--title", title],
|
||||
capture_output=True, timeout=5)
|
||||
if r.returncode == 0:
|
||||
return
|
||||
except (FileNotFoundError, subprocess.TimeoutExpired):
|
||||
pass
|
||||
try:
|
||||
from tkinter import messagebox
|
||||
root = ctk.CTk()
|
||||
root.withdraw()
|
||||
messagebox.showerror(title, text)
|
||||
root.destroy()
|
||||
except Exception:
|
||||
log.error("%s: %s", title, text)
|
||||
|
||||
|
||||
def _show_info(text: str, title: str = "TG WS Proxy"):
|
||||
"""Информационный диалог."""
|
||||
try:
|
||||
subprocess.run(
|
||||
["zenity", "--info", f"--text={text}", f"--title={title}"],
|
||||
capture_output=True, timeout=5)
|
||||
return
|
||||
except (FileNotFoundError, subprocess.TimeoutExpired):
|
||||
pass
|
||||
try:
|
||||
subprocess.run(
|
||||
["kdialog", "--msgbox", text, "--title", title],
|
||||
capture_output=True, timeout=5)
|
||||
return
|
||||
except (FileNotFoundError, subprocess.TimeoutExpired):
|
||||
pass
|
||||
try:
|
||||
from tkinter import messagebox
|
||||
root = ctk.CTk()
|
||||
root.withdraw()
|
||||
messagebox.showinfo(title, text)
|
||||
root.destroy()
|
||||
except Exception:
|
||||
log.info("%s: %s", title, text)
|
||||
|
||||
|
||||
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, trying xdg-open")
|
||||
try:
|
||||
subprocess.Popen(["xdg-open", url], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||
except Exception:
|
||||
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)
|
||||
|
||||
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)
|
||||
|
||||
TG_BLUE = "#3390ec"
|
||||
TG_BLUE_HOVER = "#2b7cd4"
|
||||
BG = "#ffffff"
|
||||
FIELD_BG = "#f0f2f5"
|
||||
FIELD_BORDER = "#d6d9dc"
|
||||
TEXT_PRIMARY = "#000000"
|
||||
TEXT_SECONDARY = "#707579"
|
||||
FONT_FAMILY = "DejaVu Sans" if os.path.exists("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf") else "Sans"
|
||||
|
||||
w, h = 460, 500
|
||||
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)
|
||||
|
||||
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))
|
||||
|
||||
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))
|
||||
|
||||
ctk.CTkLabel(frame, text="DC → IP (по одному на строку, формат DC:IP)",
|
||||
font=(FONT_FAMILY, 12), text_color=TEXT_PRIMARY,
|
||||
anchor="w", width=400).pack(anchor="w", pady=(0, 4))
|
||||
dc_textbox = ctk.CTkTextbox(frame, width=400, height=120,
|
||||
font=("DejaVu Sans Mono", 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_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))
|
||||
|
||||
ctk.CTkLabel(frame, text="Изменения вступят в силу после перезапуска прокси.",
|
||||
font=(FONT_FAMILY, 11), text_color=TEXT_SECONDARY,
|
||||
anchor="w").pack(anchor="w", pady=(0, 16))
|
||||
|
||||
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(),
|
||||
}
|
||||
save_config(new_cfg)
|
||||
_config.update(new_cfg)
|
||||
log.info("Config saved: %s", new_cfg)
|
||||
|
||||
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")
|
||||
ctk.CTkButton(btn_frame, text="Сохранить", width=140, 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", padx=(0, 10))
|
||||
ctk.CTkButton(btn_frame, text="Отмена", width=140, 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="left")
|
||||
|
||||
root.mainloop()
|
||||
|
||||
|
||||
def _on_open_logs(icon=None, item=None):
|
||||
log.info("Opening log file: %s", LOG_FILE)
|
||||
if LOG_FILE.exists():
|
||||
try:
|
||||
subprocess.Popen(["xdg-open", str(LOG_FILE)],
|
||||
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||
except Exception:
|
||||
_show_info(f"Логи: {LOG_FILE}", "TG WS Proxy")
|
||||
else:
|
||||
_show_info("Файл логов ещё не создан.", "TG WS Proxy")
|
||||
|
||||
|
||||
def _run_main_window():
|
||||
"""Главное окно — остаётся открытым."""
|
||||
_ensure_dirs()
|
||||
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:
|
||||
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 = "DejaVu Sans"
|
||||
|
||||
root = ctk.CTk()
|
||||
root.title("TG WS Proxy")
|
||||
root.resizable(False, False)
|
||||
|
||||
w, h = 520, 420
|
||||
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")
|
||||
|
||||
accent_bar = ctk.CTkFrame(title_frame, fg_color=TG_BLUE,
|
||||
width=4, height=28, corner_radius=2)
|
||||
accent_bar.pack(side="left", padx=(0, 12))
|
||||
|
||||
ctk.CTkLabel(title_frame, text="Прокси запущен",
|
||||
font=(FONT_FAMILY, 15, "bold"),
|
||||
text_color=TEXT_PRIMARY, width=400).pack(side="left", fill="x", expand=True)
|
||||
|
||||
sections = [
|
||||
("Как подключить Telegram Desktop:", True),
|
||||
(f" Ссылка: {tg_url}", False),
|
||||
(" Вручную: Настройки → Продвинутые → Тип подключения → Прокси", 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, 12, weight),
|
||||
text_color=TEXT_PRIMARY,
|
||||
anchor="w", justify="left", width=450).pack(anchor="w", pady=1)
|
||||
|
||||
ctk.CTkFrame(frame, fg_color="transparent", height=12).pack()
|
||||
ctk.CTkFrame(frame, fg_color=FIELD_BORDER, height=1,
|
||||
corner_radius=0).pack(fill="x", pady=(0, 12))
|
||||
|
||||
btn_frame = ctk.CTkFrame(frame, fg_color="transparent")
|
||||
btn_frame.pack(fill="x", pady=(0, 8))
|
||||
|
||||
ctk.CTkButton(btn_frame, text="Открыть в Telegram", width=180, height=38,
|
||||
font=(FONT_FAMILY, 13, "bold"), corner_radius=10,
|
||||
fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
|
||||
text_color="#ffffff",
|
||||
command=_on_open_in_telegram).pack(side="left", padx=(0, 10))
|
||||
|
||||
ctk.CTkButton(btn_frame, text="Настройки", width=120, height=38,
|
||||
font=(FONT_FAMILY, 13), corner_radius=10,
|
||||
fg_color=FIELD_BG, hover_color=FIELD_BORDER,
|
||||
text_color=TEXT_PRIMARY, border_width=1,
|
||||
border_color=FIELD_BORDER,
|
||||
command=_edit_config_dialog).pack(side="left", padx=(0, 10))
|
||||
|
||||
ctk.CTkButton(btn_frame, text="Открыть логи", width=120, height=38,
|
||||
font=(FONT_FAMILY, 13), corner_radius=10,
|
||||
fg_color=FIELD_BG, hover_color=FIELD_BORDER,
|
||||
text_color=TEXT_PRIMARY, border_width=1,
|
||||
border_color=FIELD_BORDER,
|
||||
command=_on_open_logs).pack(side="left")
|
||||
|
||||
ctk.CTkLabel(frame, text="Закрытие окна (×) — полная остановка приложения.",
|
||||
font=(FONT_FAMILY, 11), text_color=TEXT_SECONDARY,
|
||||
anchor="w").pack(anchor="w", pady=(16, 0))
|
||||
|
||||
def on_close():
|
||||
stop_proxy()
|
||||
root.destroy()
|
||||
root.quit()
|
||||
|
||||
root.protocol("WM_DELETE_WINDOW", on_close)
|
||||
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 run_gui():
|
||||
"""Запуск с GUI: главное окно. Закрытие окна = выход."""
|
||||
global _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.info("TG WS Proxy starting (Linux GUI)")
|
||||
log.info("Config: %s", _config)
|
||||
log.info("Config dir: %s", APP_DIR)
|
||||
log.info("Log file: %s", LOG_FILE)
|
||||
|
||||
if ctk is None:
|
||||
log.error("customtkinter not installed; running in console mode")
|
||||
start_proxy()
|
||||
try:
|
||||
while True:
|
||||
time.sleep(1)
|
||||
except KeyboardInterrupt:
|
||||
stop_proxy()
|
||||
return
|
||||
|
||||
start_proxy()
|
||||
_check_ipv6_warning()
|
||||
_run_main_window()
|
||||
stop_proxy()
|
||||
log.info("App exited")
|
||||
|
||||
|
||||
def main():
|
||||
if not _acquire_lock():
|
||||
_show_info("Приложение уже запущено.", os.path.basename(sys.argv[0]))
|
||||
return
|
||||
|
||||
try:
|
||||
run_gui()
|
||||
finally:
|
||||
_release_lock()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
#!/bin/bash
|
||||
# Сборка TG WS Proxy в standalone-бинарник (PyInstaller)
|
||||
# Результат: dist/tg-ws-proxy
|
||||
|
||||
set -e
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
ROOT="$(dirname "$SCRIPT_DIR")"
|
||||
|
||||
cd "$ROOT"
|
||||
|
||||
echo "=== TG WS Proxy — сборка для Linux ==="
|
||||
|
||||
# venv
|
||||
if [ ! -d .venv ]; then
|
||||
echo "Создание .venv..."
|
||||
python3 -m venv .venv
|
||||
fi
|
||||
.venv/bin/pip install -q -r requirements.txt
|
||||
.venv/bin/pip install -q pyinstaller
|
||||
|
||||
# Системные зависимости для tray (нужны при сборке и на целевой системе)
|
||||
echo ""
|
||||
echo "Для tray-иконки на целевой системе потребуются:"
|
||||
echo " sudo apt install libappindicator3-1 gir1.2-appindicator3-0.1 libgtk-3-0"
|
||||
echo ""
|
||||
|
||||
# Сборка
|
||||
echo "Запуск PyInstaller..."
|
||||
.venv/bin/pyinstaller packaging/linux.spec --noconfirm
|
||||
|
||||
echo ""
|
||||
echo "=== Сборка завершена ==="
|
||||
echo "Бинарник: dist/tg-ws-proxy"
|
||||
echo ""
|
||||
echo "Запуск: ./dist/tg-ws-proxy"
|
||||
echo "Или скопируйте в /usr/local/bin для глобальной установки"
|
||||
echo ""
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 248 B |
|
|
@ -0,0 +1,77 @@
|
|||
#!/bin/bash
|
||||
# Установка TG WS Proxy как Linux-приложения
|
||||
# Устанавливает в ~/.local/share/tg-ws-proxy и добавляет в меню приложений
|
||||
|
||||
set -e
|
||||
|
||||
INSTALL_DIR="${HOME}/.local/share/tg-ws-proxy"
|
||||
BIN_DIR="${HOME}/.local/bin"
|
||||
APPS_DIR="${HOME}/.local/share/applications"
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
ROOT="$(dirname "$SCRIPT_DIR")"
|
||||
|
||||
echo "=== TG WS Proxy — установка для Linux ==="
|
||||
echo "Каталог установки: $INSTALL_DIR"
|
||||
echo ""
|
||||
|
||||
# Системные зависимости
|
||||
echo "Проверка системных зависимостей..."
|
||||
for pkg in python3 python3-venv python3-tk; do
|
||||
if ! dpkg -l "$pkg" &>/dev/null 2>/dev/null; then
|
||||
echo " Требуется: $pkg"
|
||||
echo " Установите: sudo apt install $pkg"
|
||||
MISSING=1
|
||||
fi
|
||||
done
|
||||
if [ -n "$MISSING" ]; then
|
||||
echo ""
|
||||
read -p "Продолжить без установки недостающих пакетов? (y/N) " -n 1 -r
|
||||
echo
|
||||
[[ ! $REPLY =~ ^[Yy]$ ]] && exit 1
|
||||
fi
|
||||
|
||||
# Копирование файлов
|
||||
echo ""
|
||||
echo "Копирование файлов..."
|
||||
mkdir -p "$INSTALL_DIR"
|
||||
cp -r "$ROOT/proxy" "$INSTALL_DIR/"
|
||||
cp "$ROOT/linux.py" "$INSTALL_DIR/"
|
||||
cp "$ROOT/requirements.txt" "$INSTALL_DIR/"
|
||||
|
||||
# Создание venv
|
||||
echo "Создание виртуального окружения..."
|
||||
cd "$INSTALL_DIR"
|
||||
python3 -m venv .venv
|
||||
.venv/bin/pip install -q --upgrade pip
|
||||
.venv/bin/pip install -q -r requirements.txt
|
||||
|
||||
# Launcher
|
||||
echo "Создание launcher..."
|
||||
cat > "$INSTALL_DIR/run.sh" << 'LAUNCHER'
|
||||
#!/bin/bash
|
||||
cd "$(dirname "$0")"
|
||||
exec .venv/bin/python linux.py
|
||||
LAUNCHER
|
||||
chmod +x "$INSTALL_DIR/run.sh"
|
||||
|
||||
# .desktop файл
|
||||
echo "Установка .desktop файла..."
|
||||
mkdir -p "$APPS_DIR"
|
||||
sed "s|__INSTALL_DIR__|$INSTALL_DIR|g" "$SCRIPT_DIR/tg-ws-proxy.desktop" \
|
||||
> "$APPS_DIR/tg-ws-proxy.desktop"
|
||||
|
||||
# Опционально: симлинк в ~/.local/bin
|
||||
mkdir -p "$BIN_DIR"
|
||||
ln -sf "$INSTALL_DIR/run.sh" "$BIN_DIR/tg-ws-proxy" 2>/dev/null || true
|
||||
|
||||
echo ""
|
||||
echo "=== Установка завершена ==="
|
||||
echo ""
|
||||
echo "TG WS Proxy установлен. Запуск:"
|
||||
echo " • Из меню приложений: найдите «TG WS Proxy»"
|
||||
echo " • Из терминала: $INSTALL_DIR/run.sh"
|
||||
echo " • Или: ~/.local/bin/tg-ws-proxy (если ~/.local/bin в PATH)"
|
||||
echo ""
|
||||
echo "Конфигурация: ~/.config/TgWsProxy/config.json"
|
||||
echo ""
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
# -*- mode: python ; coding: utf-8 -*-
|
||||
# Сборка TG WS Proxy для Linux (Debian/Ubuntu)
|
||||
# Требует на целевой системе: libappindicator3-1, gir1.2-appindicator3-0.1, libgtk-3-0
|
||||
|
||||
import sys
|
||||
import os
|
||||
|
||||
SPEC = os.path.dirname(os.path.abspath(__file__))
|
||||
ROOT = os.path.dirname(SPEC)
|
||||
|
||||
block_cipher = None
|
||||
|
||||
import customtkinter
|
||||
ctk_path = os.path.dirname(customtkinter.__file__)
|
||||
|
||||
a = Analysis(
|
||||
[os.path.join(ROOT, 'linux.py')],
|
||||
pathex=[ROOT],
|
||||
binaries=[],
|
||||
datas=[
|
||||
(ctk_path, 'customtkinter/'),
|
||||
(os.path.join(ROOT, 'proxy'), 'proxy'),
|
||||
],
|
||||
hiddenimports=[
|
||||
'pystray._appindicator',
|
||||
'pystray._gtk',
|
||||
'pystray._util.gtk',
|
||||
'PIL._tkinter_finder',
|
||||
'customtkinter',
|
||||
'cryptography.hazmat.primitives.ciphers',
|
||||
'cryptography.hazmat.primitives.ciphers.algorithms',
|
||||
'cryptography.hazmat.primitives.ciphers.modes',
|
||||
'cryptography.hazmat.backends.openssl',
|
||||
'gi',
|
||||
'gi.repository.Gtk',
|
||||
'gi.repository.GLib',
|
||||
'gi.repository.GObject',
|
||||
],
|
||||
hookspath=[],
|
||||
hooksconfig={},
|
||||
runtime_hooks=[],
|
||||
excludes=[],
|
||||
cipher=block_cipher,
|
||||
noarchive=False,
|
||||
)
|
||||
|
||||
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
|
||||
|
||||
exe = EXE(
|
||||
pyz,
|
||||
a.scripts,
|
||||
a.binaries,
|
||||
a.zipfiles,
|
||||
a.datas,
|
||||
[],
|
||||
name='tg-ws-proxy',
|
||||
debug=False,
|
||||
bootloader_ignore_signals=False,
|
||||
strip=True,
|
||||
upx=True,
|
||||
upx_exclude=[],
|
||||
runtime_tmpdir=None,
|
||||
console=False,
|
||||
disable_windowed_traceback=False,
|
||||
)
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Name=TG WS Proxy
|
||||
Comment=SOCKS5-прокси для Telegram Desktop через WebSocket
|
||||
Exec=__INSTALL_DIR__/run.sh
|
||||
Icon=network-server
|
||||
Terminal=false
|
||||
Categories=Network;Utility;
|
||||
StartupNotify=false
|
||||
Keywords=telegram;proxy;socks5;websocket;
|
||||
Loading…
Reference in New Issue