2026-03-18 17:33:38 +03:00
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
|
|
|
|
|
|
import os
|
|
|
|
|
|
import subprocess
|
|
|
|
|
|
import sys
|
|
|
|
|
|
import threading
|
|
|
|
|
|
import time
|
|
|
|
|
|
import webbrowser
|
|
|
|
|
|
from pathlib import Path
|
2026-03-29 15:21:56 +03:00
|
|
|
|
from typing import Optional
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
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
|
2026-03-27 08:54:36 +03:00
|
|
|
|
from proxy import __version__
|
2026-03-28 15:45:08 +03:00
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
from utils.tray_common import (
|
|
|
|
|
|
APP_DIR, APP_NAME, DEFAULT_CONFIG, FIRST_RUN_MARKER, IPV6_WARN_MARKER,
|
|
|
|
|
|
LOG_FILE, acquire_lock, apply_proxy_config, ensure_dirs, load_config,
|
|
|
|
|
|
log, release_lock, save_config, setup_logging, stop_proxy, tg_proxy_url,
|
|
|
|
|
|
)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
MENUBAR_ICON_PATH = APP_DIR / "menubar_icon.png"
|
|
|
|
|
|
|
|
|
|
|
|
_proxy_thread: Optional[threading.Thread] = None
|
|
|
|
|
|
_async_stop: Optional[object] = None
|
|
|
|
|
|
_app: Optional[object] = None
|
|
|
|
|
|
_config: dict = {}
|
|
|
|
|
|
_exiting: bool = False
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
# osascript dialogs
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _esc(text: str) -> str:
|
|
|
|
|
|
return text.replace("\\", "\\\\").replace('"', '\\"')
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _osascript(script: str) -> str:
|
|
|
|
|
|
r = subprocess.run(["osascript", "-e", script], capture_output=True, text=True)
|
|
|
|
|
|
return r.stdout.strip()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _show_error(text: str, title: str = "TG WS Proxy") -> None:
|
|
|
|
|
|
_osascript(
|
|
|
|
|
|
f'display dialog "{_esc(text)}" with title "{_esc(title)}" '
|
|
|
|
|
|
f'buttons {{"OK"}} default button "OK" with icon stop'
|
|
|
|
|
|
)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _show_info(text: str, title: str = "TG WS Proxy") -> None:
|
|
|
|
|
|
_osascript(
|
|
|
|
|
|
f'display dialog "{_esc(text)}" with title "{_esc(title)}" '
|
|
|
|
|
|
f'buttons {{"OK"}} default button "OK" with icon note'
|
|
|
|
|
|
)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _ask_yes_no(text: str, title: str = "TG WS Proxy") -> bool:
|
|
|
|
|
|
return _ask_yes_no_close(text, title) is True
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _ask_yes_no_close(text: str, title: str = "TG WS Proxy") -> Optional[bool]:
|
|
|
|
|
|
r = subprocess.run(
|
|
|
|
|
|
[
|
|
|
|
|
|
"osascript", "-e",
|
|
|
|
|
|
f'button returned of (display dialog "{_esc(text)}" '
|
|
|
|
|
|
f'with title "{_esc(title)}" '
|
|
|
|
|
|
f'buttons {{"Закрыть", "Нет", "Да"}} '
|
|
|
|
|
|
f'default button "Да" cancel button "Закрыть" with icon note)',
|
|
|
|
|
|
],
|
|
|
|
|
|
capture_output=True, text=True,
|
|
|
|
|
|
)
|
|
|
|
|
|
if r.returncode != 0:
|
|
|
|
|
|
return None
|
|
|
|
|
|
btn = r.stdout.strip()
|
|
|
|
|
|
if btn == "Да":
|
|
|
|
|
|
return True
|
|
|
|
|
|
if btn == "Нет":
|
|
|
|
|
|
return False
|
|
|
|
|
|
return None
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _osascript_input(prompt: str, default: str, title: str = "TG WS Proxy") -> Optional[str]:
|
|
|
|
|
|
r = subprocess.run(
|
|
|
|
|
|
[
|
|
|
|
|
|
"osascript", "-e",
|
|
|
|
|
|
f'text returned of (display dialog "{_esc(prompt)}" '
|
|
|
|
|
|
f'default answer "{_esc(default)}" '
|
|
|
|
|
|
f'with title "{_esc(title)}" '
|
|
|
|
|
|
f'buttons {{"Закрыть", "OK"}} '
|
|
|
|
|
|
f'default button "OK" cancel button "Закрыть")',
|
|
|
|
|
|
],
|
|
|
|
|
|
capture_output=True, text=True,
|
2026-03-22 02:54:03 +03:00
|
|
|
|
)
|
2026-03-29 15:21:56 +03:00
|
|
|
|
if r.returncode != 0:
|
|
|
|
|
|
return None
|
|
|
|
|
|
return r.stdout.rstrip("\r\n")
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
# menubar icon
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
2026-03-29 15:21:56 +03:00
|
|
|
|
draw.ellipse([margin, margin, size - margin, size - margin], fill=(0, 0, 0, 255))
|
2026-03-18 17:33:38 +03:00
|
|
|
|
try:
|
2026-03-29 15:21:56 +03:00
|
|
|
|
font = ImageFont.truetype("/System/Library/Fonts/Helvetica.ttc", size=int(size * 0.55))
|
2026-03-18 17:33:38 +03:00
|
|
|
|
except Exception:
|
|
|
|
|
|
font = ImageFont.load_default()
|
|
|
|
|
|
bbox = draw.textbbox((0, 0), "T", font=font)
|
|
|
|
|
|
tw, th = bbox[2] - bbox[0], bbox[3] - bbox[1]
|
2026-03-29 15:21:56 +03:00
|
|
|
|
draw.text(
|
|
|
|
|
|
((size - tw) // 2 - bbox[0], (size - th) // 2 - bbox[1]),
|
|
|
|
|
|
"T", fill=(255, 255, 255, 255), font=font,
|
|
|
|
|
|
)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
return img
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
|
|
|
|
|
|
def _ensure_menubar_icon() -> None:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
if MENUBAR_ICON_PATH.exists():
|
|
|
|
|
|
return
|
2026-03-29 15:21:56 +03:00
|
|
|
|
ensure_dirs()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
img = _make_menubar_icon(44)
|
|
|
|
|
|
if img:
|
|
|
|
|
|
img.save(str(MENUBAR_ICON_PATH), "PNG")
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
# proxy lifecycle (macOS-local)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
import asyncio as _asyncio
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _run_proxy_thread() -> None:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
global _async_stop
|
|
|
|
|
|
loop = _asyncio.new_event_loop()
|
|
|
|
|
|
_asyncio.set_event_loop(loop)
|
|
|
|
|
|
stop_ev = _asyncio.Event()
|
|
|
|
|
|
_async_stop = (loop, stop_ev)
|
|
|
|
|
|
try:
|
2026-03-29 15:21:56 +03:00
|
|
|
|
loop.run_until_complete(tg_ws_proxy._run(stop_event=stop_ev))
|
2026-03-18 17:33:38 +03:00
|
|
|
|
except Exception as exc:
|
|
|
|
|
|
log.error("Proxy thread crashed: %s", exc)
|
|
|
|
|
|
if "Address already in use" in str(exc):
|
|
|
|
|
|
_show_error(
|
|
|
|
|
|
"Не удалось запустить прокси:\n"
|
|
|
|
|
|
"Порт уже используется другим приложением.\n\n"
|
|
|
|
|
|
"Закройте приложение, использующее этот порт, "
|
2026-03-29 15:21:56 +03:00
|
|
|
|
"или измените порт в настройках прокси и перезапустите."
|
|
|
|
|
|
)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
finally:
|
|
|
|
|
|
loop.close()
|
|
|
|
|
|
_async_stop = None
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _start_proxy() -> None:
|
|
|
|
|
|
global _proxy_thread
|
2026-03-18 17:33:38 +03:00
|
|
|
|
if _proxy_thread and _proxy_thread.is_alive():
|
|
|
|
|
|
log.info("Proxy already running")
|
|
|
|
|
|
return
|
2026-03-29 15:21:56 +03:00
|
|
|
|
if not apply_proxy_config(_config):
|
|
|
|
|
|
_show_error("Ошибка конфигурации DC → IP.")
|
2026-03-18 17:33:38 +03:00
|
|
|
|
return
|
2026-03-29 15:21:56 +03:00
|
|
|
|
pc = tg_ws_proxy.proxy_config
|
|
|
|
|
|
log.info("Starting proxy on %s:%d ...", pc.host, pc.port)
|
|
|
|
|
|
_proxy_thread = threading.Thread(target=_run_proxy_thread, daemon=True, name="proxy")
|
2026-03-18 17:33:38 +03:00
|
|
|
|
_proxy_thread.start()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _stop_proxy() -> None:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
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")
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _restart_proxy() -> None:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
log.info("Restarting proxy...")
|
2026-03-29 15:21:56 +03:00
|
|
|
|
_stop_proxy()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
time.sleep(0.3)
|
2026-03-29 15:21:56 +03:00
|
|
|
|
_start_proxy()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
# menu callbacks
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
2026-03-28 15:45:08 +03:00
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _on_open_in_telegram(_=None) -> None:
|
|
|
|
|
|
url = tg_proxy_url(_config)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
log.info("Opening %s", url)
|
|
|
|
|
|
try:
|
2026-03-29 15:21:56 +03:00
|
|
|
|
result = subprocess.call(["open", url])
|
2026-03-18 17:33:38 +03:00
|
|
|
|
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:
|
2026-03-29 15:21:56 +03:00
|
|
|
|
subprocess.run(["pbcopy"], input=url.encode(), check=True)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
_show_info(
|
|
|
|
|
|
"Не удалось открыть Telegram автоматически.\n\n"
|
2026-03-29 15:21:56 +03:00
|
|
|
|
f"Ссылка скопирована в буфер обмена:\n{url}"
|
|
|
|
|
|
)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
except Exception as exc:
|
|
|
|
|
|
log.error("Clipboard copy failed: %s", exc)
|
|
|
|
|
|
_show_error(f"Не удалось скопировать ссылку:\n{exc}")
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 17:57:55 +03:00
|
|
|
|
def _on_copy_link(_=None) -> None:
|
|
|
|
|
|
url = tg_proxy_url(_config)
|
|
|
|
|
|
log.info("Copying link: %s", url)
|
|
|
|
|
|
try:
|
|
|
|
|
|
if pyperclip:
|
|
|
|
|
|
pyperclip.copy(url)
|
|
|
|
|
|
else:
|
|
|
|
|
|
subprocess.run(["pbcopy"], input=url.encode(), check=True)
|
|
|
|
|
|
except Exception as exc:
|
|
|
|
|
|
log.error("Clipboard copy failed: %s", exc)
|
|
|
|
|
|
_show_error(f"Не удалось скопировать ссылку:\n{exc}")
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _on_restart(_=None) -> None:
|
|
|
|
|
|
def _do():
|
2026-03-18 17:33:38 +03:00
|
|
|
|
global _config
|
|
|
|
|
|
_config = load_config()
|
|
|
|
|
|
if _app:
|
|
|
|
|
|
_app.update_menu_title()
|
2026-03-29 15:21:56 +03:00
|
|
|
|
_restart_proxy()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
threading.Thread(target=_do, daemon=True).start()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _on_open_logs(_=None) -> None:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
log.info("Opening log file: %s", LOG_FILE)
|
|
|
|
|
|
if LOG_FILE.exists():
|
2026-03-29 15:21:56 +03:00
|
|
|
|
subprocess.call(["open", str(LOG_FILE)])
|
2026-03-18 17:33:38 +03:00
|
|
|
|
else:
|
|
|
|
|
|
_show_info("Файл логов ещё не создан.")
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _on_edit_config(_=None) -> None:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
threading.Thread(target=_edit_config_dialog, daemon=True).start()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-27 08:54:36 +03:00
|
|
|
|
def _check_updates_menu_title() -> str:
|
|
|
|
|
|
on = bool(_config.get("check_updates", True))
|
2026-03-29 15:21:56 +03:00
|
|
|
|
return "✓ Проверять обновления при запуске" if on else "Проверять обновления при запуске (выкл)"
|
2026-03-27 08:54:36 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _toggle_check_updates(_=None) -> None:
|
2026-03-27 08:54:36 +03:00
|
|
|
|
global _config
|
|
|
|
|
|
_config["check_updates"] = not bool(_config.get("check_updates", True))
|
|
|
|
|
|
save_config(_config)
|
|
|
|
|
|
if _app is not None:
|
|
|
|
|
|
_app._check_updates_item.title = _check_updates_menu_title()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _on_open_release_page(_=None) -> None:
|
2026-03-27 08:54:36 +03:00
|
|
|
|
from utils.update_check import RELEASES_PAGE_URL
|
|
|
|
|
|
webbrowser.open(RELEASES_PAGE_URL)
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
# update check
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _maybe_notify_update_async() -> None:
|
2026-03-27 08:54:36 +03:00
|
|
|
|
def _work():
|
|
|
|
|
|
time.sleep(1.5)
|
|
|
|
|
|
if _exiting:
|
|
|
|
|
|
return
|
|
|
|
|
|
if not _config.get("check_updates", True):
|
|
|
|
|
|
return
|
|
|
|
|
|
try:
|
|
|
|
|
|
from utils.update_check import RELEASES_PAGE_URL, get_status, run_check
|
|
|
|
|
|
run_check(__version__)
|
|
|
|
|
|
st = get_status()
|
|
|
|
|
|
if not st.get("has_update"):
|
|
|
|
|
|
return
|
|
|
|
|
|
url = (st.get("html_url") or "").strip() or RELEASES_PAGE_URL
|
|
|
|
|
|
ver = st.get("latest") or "?"
|
|
|
|
|
|
if _ask_yes_no(
|
2026-03-29 15:21:56 +03:00
|
|
|
|
f"Доступна новая версия: {ver}\n\nОткрыть страницу релиза в браузере?",
|
2026-03-27 08:54:36 +03:00
|
|
|
|
"TG WS Proxy — обновление",
|
|
|
|
|
|
):
|
|
|
|
|
|
webbrowser.open(url)
|
|
|
|
|
|
except Exception as exc:
|
|
|
|
|
|
log.debug("Update check failed: %s", exc)
|
|
|
|
|
|
|
|
|
|
|
|
threading.Thread(target=_work, daemon=True, name="update-check").start()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
# settings dialog
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _edit_config_dialog() -> None:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
cfg = load_config()
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
host = _osascript_input("IP-адрес прокси:", cfg.get("host", DEFAULT_CONFIG["host"]))
|
2026-03-18 17:33:38 +03:00
|
|
|
|
if host is None:
|
|
|
|
|
|
return
|
|
|
|
|
|
host = host.strip()
|
|
|
|
|
|
import socket as _sock
|
|
|
|
|
|
try:
|
|
|
|
|
|
_sock.inet_aton(host)
|
|
|
|
|
|
except OSError:
|
|
|
|
|
|
_show_error("Некорректный IP-адрес.")
|
|
|
|
|
|
return
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
port_str = _osascript_input("Порт прокси:", str(cfg.get("port", DEFAULT_CONFIG["port"])))
|
2026-03-18 17:33:38 +03:00
|
|
|
|
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
|
|
|
|
|
|
|
2026-03-28 15:45:08 +03:00
|
|
|
|
secret_str = _osascript_input(
|
2026-03-29 15:21:56 +03:00
|
|
|
|
"MTProto Secret (32 hex символа):", cfg.get("secret", DEFAULT_CONFIG["secret"])
|
|
|
|
|
|
)
|
2026-03-28 15:45:08 +03:00
|
|
|
|
if secret_str is None:
|
|
|
|
|
|
return
|
|
|
|
|
|
secret_str = secret_str.strip().lower()
|
|
|
|
|
|
if len(secret_str) != 32 or not all(c in "0123456789abcdef" for c in secret_str):
|
|
|
|
|
|
_show_error("Secret должен быть строкой из 32 шестнадцатеричных символов.")
|
|
|
|
|
|
return
|
|
|
|
|
|
|
2026-03-18 17:33:38 +03:00
|
|
|
|
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",
|
2026-03-29 15:21:56 +03:00
|
|
|
|
dc_default,
|
|
|
|
|
|
)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
if dc_str is None:
|
|
|
|
|
|
return
|
2026-03-29 15:21:56 +03:00
|
|
|
|
dc_lines = [s.strip() for s in dc_str.replace(",", "\n").splitlines() if s.strip()]
|
2026-03-18 17:33:38 +03:00
|
|
|
|
try:
|
|
|
|
|
|
tg_ws_proxy.parse_dc_ip_list(dc_lines)
|
|
|
|
|
|
except ValueError as e:
|
|
|
|
|
|
_show_error(str(e))
|
|
|
|
|
|
return
|
|
|
|
|
|
|
2026-03-23 12:39:00 +07:00
|
|
|
|
verbose = _ask_yes_no_close("Включить подробное логирование (verbose)?")
|
|
|
|
|
|
if verbose is None:
|
|
|
|
|
|
return
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
2026-03-22 02:54:03 +03:00
|
|
|
|
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'])},"
|
2026-03-29 15:21:56 +03:00
|
|
|
|
f"{cfg.get('log_max_mb', DEFAULT_CONFIG['log_max_mb'])}",
|
|
|
|
|
|
)
|
2026-03-23 12:39:00 +07:00
|
|
|
|
if adv_str is None:
|
|
|
|
|
|
return
|
2026-03-22 02:54:03 +03:00
|
|
|
|
|
|
|
|
|
|
adv = {}
|
|
|
|
|
|
if adv_str:
|
2026-03-29 15:21:56 +03:00
|
|
|
|
parts = [s.strip() for s in adv_str.split(",")]
|
|
|
|
|
|
keys = [("buf_kb", int), ("pool_size", int), ("log_max_mb", float)]
|
2026-03-22 02:54:03 +03:00
|
|
|
|
for i, (k, typ) in enumerate(keys):
|
|
|
|
|
|
if i < len(parts):
|
|
|
|
|
|
try:
|
|
|
|
|
|
adv[k] = typ(parts[i])
|
|
|
|
|
|
except ValueError:
|
|
|
|
|
|
pass
|
|
|
|
|
|
|
2026-03-18 17:33:38 +03:00
|
|
|
|
new_cfg = {
|
|
|
|
|
|
"host": host,
|
|
|
|
|
|
"port": port,
|
2026-03-28 15:45:08 +03:00
|
|
|
|
"secret": secret_str,
|
2026-03-18 17:33:38 +03:00
|
|
|
|
"dc_ip": dc_lines,
|
|
|
|
|
|
"verbose": verbose,
|
2026-03-22 02:54:03 +03:00
|
|
|
|
"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"])),
|
2026-03-29 15:21:56 +03:00
|
|
|
|
"check_updates": cfg.get("check_updates", True),
|
2026-03-18 17:33:38 +03:00
|
|
|
|
}
|
|
|
|
|
|
save_config(new_cfg)
|
|
|
|
|
|
log.info("Config saved: %s", new_cfg)
|
|
|
|
|
|
|
|
|
|
|
|
global _config
|
|
|
|
|
|
_config = new_cfg
|
|
|
|
|
|
if _app:
|
|
|
|
|
|
_app.update_menu_title()
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
if _ask_yes_no_close("Настройки сохранены.\n\nПерезапустить прокси сейчас?"):
|
|
|
|
|
|
_restart_proxy()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
# first run & ipv6
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
|
|
|
|
|
|
def _show_first_run() -> None:
|
|
|
|
|
|
ensure_dirs()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
if FIRST_RUN_MARKER.exists():
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
|
|
|
|
port = _config.get("port", DEFAULT_CONFIG["port"])
|
2026-03-28 15:45:08 +03:00
|
|
|
|
secret = _config.get("secret", DEFAULT_CONFIG["secret"])
|
2026-03-29 15:21:56 +03:00
|
|
|
|
tg_url = tg_proxy_url(_config)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
text = (
|
|
|
|
|
|
f"Прокси запущен и работает в строке меню.\n\n"
|
|
|
|
|
|
f"Как подключить Telegram Desktop:\n\n"
|
|
|
|
|
|
f"Автоматически:\n"
|
|
|
|
|
|
f" Нажмите «Открыть в Telegram» в меню\n"
|
|
|
|
|
|
f" Или ссылка: {tg_url}\n\n"
|
|
|
|
|
|
f"Вручную:\n"
|
|
|
|
|
|
f" Настройки → Продвинутые → Тип подключения → Прокси\n"
|
2026-03-28 15:45:08 +03:00
|
|
|
|
f" MTProto → {host} : {port} \n"
|
|
|
|
|
|
f" Secret: dd{secret} \n\n"
|
2026-03-18 17:33:38 +03:00
|
|
|
|
f"Открыть прокси в Telegram сейчас?"
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
FIRST_RUN_MARKER.touch()
|
|
|
|
|
|
if _ask_yes_no(text, "TG WS Proxy"):
|
|
|
|
|
|
_on_open_in_telegram()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def _check_ipv6_warning() -> None:
|
|
|
|
|
|
ensure_dirs()
|
|
|
|
|
|
if IPV6_WARN_MARKER.exists():
|
|
|
|
|
|
return
|
|
|
|
|
|
|
2026-03-18 17:33:38 +03:00
|
|
|
|
import socket as _sock
|
2026-03-29 15:21:56 +03:00
|
|
|
|
has = False
|
2026-03-18 17:33:38 +03:00
|
|
|
|
try:
|
2026-03-29 15:21:56 +03:00
|
|
|
|
for addr in _sock.getaddrinfo(_sock.gethostname(), None, _sock.AF_INET6):
|
2026-03-18 17:33:38 +03:00
|
|
|
|
ip = addr[4][0]
|
2026-03-29 15:21:56 +03:00
|
|
|
|
if ip and not ip.startswith("::1") and not ip.startswith("fe80::1"):
|
|
|
|
|
|
has = True
|
|
|
|
|
|
break
|
2026-03-18 17:33:38 +03:00
|
|
|
|
except Exception:
|
|
|
|
|
|
pass
|
2026-03-29 15:21:56 +03:00
|
|
|
|
if not has:
|
|
|
|
|
|
try:
|
|
|
|
|
|
s = _sock.socket(_sock.AF_INET6, _sock.SOCK_STREAM)
|
|
|
|
|
|
s.bind(("::1", 0))
|
|
|
|
|
|
s.close()
|
|
|
|
|
|
has = True
|
|
|
|
|
|
except Exception:
|
|
|
|
|
|
pass
|
|
|
|
|
|
if not has:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
IPV6_WARN_MARKER.touch()
|
|
|
|
|
|
_show_info(
|
|
|
|
|
|
"На вашем компьютере включена поддержка подключения по IPv6.\n\n"
|
|
|
|
|
|
"Telegram может пытаться подключаться через IPv6, "
|
|
|
|
|
|
"что не поддерживается и может привести к ошибкам.\n\n"
|
|
|
|
|
|
"Если прокси не работает, попробуйте отключить "
|
|
|
|
|
|
"попытку соединения по IPv6 в настройках прокси Telegram.\n\n"
|
2026-03-29 15:21:56 +03:00
|
|
|
|
"Это предупреждение будет показано только один раз."
|
|
|
|
|
|
)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
# rumps app
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
_TgWsProxyAppBase = rumps.App if rumps else object
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TgWsProxyApp(_TgWsProxyAppBase):
|
|
|
|
|
|
def __init__(self):
|
|
|
|
|
|
_ensure_menubar_icon()
|
2026-03-29 15:21:56 +03:00
|
|
|
|
icon_path = str(MENUBAR_ICON_PATH) if MENUBAR_ICON_PATH.exists() else None
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
|
|
|
|
port = _config.get("port", DEFAULT_CONFIG["port"])
|
2026-03-28 15:45:08 +03:00
|
|
|
|
link_host = tg_ws_proxy.get_link_host(host)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
self._open_tg_item = rumps.MenuItem(
|
2026-03-29 15:21:56 +03:00
|
|
|
|
f"Открыть в Telegram ({link_host}:{port})", callback=_on_open_in_telegram
|
|
|
|
|
|
)
|
2026-03-29 17:57:55 +03:00
|
|
|
|
self._copy_link_item = rumps.MenuItem("Скопировать ссылку", callback=_on_copy_link)
|
2026-03-29 15:21:56 +03:00
|
|
|
|
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)
|
2026-03-27 08:54:36 +03:00
|
|
|
|
self._release_page_item = rumps.MenuItem(
|
2026-03-29 15:21:56 +03:00
|
|
|
|
"Страница релиза на GitHub…", callback=_on_open_release_page
|
|
|
|
|
|
)
|
2026-03-27 08:54:36 +03:00
|
|
|
|
self._check_updates_item = rumps.MenuItem(
|
2026-03-29 15:21:56 +03:00
|
|
|
|
_check_updates_menu_title(), callback=_toggle_check_updates
|
|
|
|
|
|
)
|
|
|
|
|
|
self._version_item = rumps.MenuItem(f"Версия {__version__}", callback=lambda _: None)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
super().__init__(
|
|
|
|
|
|
"TG WS Proxy",
|
|
|
|
|
|
icon=icon_path,
|
2026-03-18 22:27:16 +05:00
|
|
|
|
template=False,
|
2026-03-18 17:33:38 +03:00
|
|
|
|
quit_button="Выход",
|
|
|
|
|
|
menu=[
|
|
|
|
|
|
self._open_tg_item,
|
2026-03-29 17:57:55 +03:00
|
|
|
|
self._copy_link_item,
|
2026-03-18 17:33:38 +03:00
|
|
|
|
None,
|
|
|
|
|
|
self._restart_item,
|
|
|
|
|
|
self._settings_item,
|
|
|
|
|
|
self._logs_item,
|
2026-03-27 08:54:36 +03:00
|
|
|
|
None,
|
|
|
|
|
|
self._release_page_item,
|
|
|
|
|
|
self._check_updates_item,
|
|
|
|
|
|
None,
|
|
|
|
|
|
self._version_item,
|
2026-03-29 15:21:56 +03:00
|
|
|
|
],
|
|
|
|
|
|
)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def update_menu_title(self) -> None:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
host = _config.get("host", DEFAULT_CONFIG["host"])
|
|
|
|
|
|
port = _config.get("port", DEFAULT_CONFIG["port"])
|
2026-03-28 15:45:08 +03:00
|
|
|
|
link_host = tg_ws_proxy.get_link_host(host)
|
2026-03-29 15:21:56 +03:00
|
|
|
|
self._open_tg_item.title = f"Открыть в Telegram ({link_host}:{port})"
|
|
|
|
|
|
|
2026-03-28 15:45:08 +03:00
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
# entry point
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def run_menubar() -> None:
|
2026-03-18 17:33:38 +03:00
|
|
|
|
global _app, _config
|
|
|
|
|
|
|
|
|
|
|
|
_config = load_config()
|
|
|
|
|
|
save_config(_config)
|
|
|
|
|
|
|
|
|
|
|
|
if LOG_FILE.exists():
|
|
|
|
|
|
try:
|
|
|
|
|
|
LOG_FILE.unlink()
|
|
|
|
|
|
except Exception:
|
|
|
|
|
|
pass
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
setup_logging(
|
|
|
|
|
|
_config.get("verbose", False),
|
|
|
|
|
|
log_max_mb=_config.get("log_max_mb", DEFAULT_CONFIG["log_max_mb"]),
|
|
|
|
|
|
)
|
2026-03-27 08:54:36 +03:00
|
|
|
|
log.info("TG WS Proxy версия %s, menubar app starting", __version__)
|
2026-03-18 17:33:38 +03:00
|
|
|
|
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")
|
2026-03-29 15:21:56 +03:00
|
|
|
|
_start_proxy()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
try:
|
|
|
|
|
|
while True:
|
|
|
|
|
|
time.sleep(1)
|
|
|
|
|
|
except KeyboardInterrupt:
|
2026-03-29 15:21:56 +03:00
|
|
|
|
_stop_proxy()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
return
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
_start_proxy()
|
2026-03-27 08:54:36 +03:00
|
|
|
|
_maybe_notify_update_async()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
_show_first_run()
|
|
|
|
|
|
_check_ipv6_warning()
|
|
|
|
|
|
|
|
|
|
|
|
_app = TgWsProxyApp()
|
|
|
|
|
|
log.info("Menubar app running")
|
|
|
|
|
|
_app.run()
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
_stop_proxy()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
log.info("Menubar app exited")
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-03-29 15:21:56 +03:00
|
|
|
|
def main() -> None:
|
|
|
|
|
|
if not acquire_lock("macos.py"):
|
2026-03-18 17:33:38 +03:00
|
|
|
|
_show_info("Приложение уже запущено.")
|
|
|
|
|
|
return
|
|
|
|
|
|
try:
|
|
|
|
|
|
run_menubar()
|
|
|
|
|
|
finally:
|
2026-03-29 15:21:56 +03:00
|
|
|
|
release_lock()
|
2026-03-18 17:33:38 +03:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
|
|
main()
|