Merge 8507744c4a into bc79a5e4c1

Fix ModuleNotFoundError by fixing venv permissions and python path
перед этим создал такой же pr и случайно закрыл его, извиняюсь, впервые делаю pr, исправил ошибку "ModuleNotFoundError: No module named 'cryptography'"

.github/cfproxy-domains.txt

@@ -1,2 +1 @@
 virkgj.com
-vmmzovy.com

Dockerfile

@@ -33,7 +33,7 @@ RUN apt-get update \
     && useradd --system --gid app --create-home --home-dir /home/app app
 
 WORKDIR /app
-COPY --from=builder /opt/venv /opt/venv
+COPY --from=builder --chown=app:app /opt/venv /opt/venv
 COPY proxy ./proxy
 COPY docs/README.md LICENSE ./
 
@@ -41,5 +41,5 @@ USER app
 
 EXPOSE 1443/tcp
 
-ENTRYPOINT ["/usr/bin/tini", "--", "/bin/sh", "-lc", "set -eu; args=\"--host ${TG_WS_PROXY_HOST} --port ${TG_WS_PROXY_PORT}\"; for dc in ${TG_WS_PROXY_DC_IPS}; do args=\"$args --dc-ip $dc\"; done; exec python -u proxy/tg_ws_proxy.py $args \"$@\"", "--"]
+ENTRYPOINT ["/usr/bin/tini", "--", "/bin/sh", "-lc", "set -eu; args=\"--host ${TG_WS_PROXY_HOST} --port ${TG_WS_PROXY_PORT}\"; for dc in ${TG_WS_PROXY_DC_IPS}; do args=\"$args --dc-ip $dc\"; done; exec /opt/venv/bin/python -u proxy/tg_ws_proxy.py $args \"$@\"", "--"]
 CMD []

docs/README.md

@@ -166,6 +166,20 @@ 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:main"
+tg-ws-proxy-tray-win = "windows:main"
+tg-ws-proxy-tray-macos = "macos:main"
+tg-ws-proxy-tray-linux = "linux:main"
+```
+
 ## Настройка Telegram Desktop
 
 ### Автоматически

proxy/__init__.py

@@ -1,6 +1,6 @@
 from .config import parse_dc_ip_list, proxy_config
 from .utils import get_link_host
 
-__version__ = "1.6.0"
+__version__ = "1.5.1"
 
 __all__ = ["__version__", "get_link_host", "proxy_config", "parse_dc_ip_list"]

proxy/config.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import string
 import random
 import socket as _socket
 import threading
@@ -54,8 +53,7 @@ proxy_config = ProxyConfig()
 
 def _fetch_cfproxy_domain_list() -> List[str]:
     try:
-        req = Request(CFPROXY_DOMAINS_URL + "?" + "".join(random.choices(string.ascii_letters, k=7)),
+        req = Request(CFPROXY_DOMAINS_URL, headers={'User-Agent': 'tg-ws-proxy'})
-                       headers={'User-Agent': 'tg-ws-proxy'})
         with urlopen(req, timeout=10) as resp:
             text = resp.read().decode('utf-8', errors='replace')
         encoded = [