ソースを参照

feat: start_proxy docker deploy

hujiarui 1 ヶ月 前
親
コミット
c7d75d2011
5 ファイル変更、102 行追加、12 行削除
  1. 3 3
      configure.py
  2. 49 4
      docker-compose.yml
  3. 43 2
      start_proxy.py
  4. 4 2
      toolkit/proxy_manager.py
  5. 3 1
      tools/generate_clash_multi_port.py

+ 3 - 3
configure.py

@@ -80,17 +80,17 @@ TEST_PROXY = None
 
 # Node ID config: highest priority, then NODE_ID env var, then default "node01"
 NODE_ID = None
-NODE_ID = "jerry_macos"
+# NODE_ID = "node"
 
 
 # Chrome binary path: highest priority, then CHROME_BIN env var, then default
 CHROME_PATH = None
-# CHROME_PATH = "E:/ungoogled-chromium_144.0.7559.132-1.1_windows_x64/chrome.exe"
+# CHROME_PATH = "E:/ungoogled-chromium_148.0.7778.215-1.1_windows_x64/chrome.exe"
 
 
 # Mihomo binary path: highest priority, then MIHOMO_BIN env var, then default
 MIHOMO_BIN_PATH = None
-MIHOMO_BIN_PATH = 'downloads/mihomo'
+# MIHOMO_BIN_PATH = 'downloads/mihomo'
 
 
 # Proxy tunnel relay nodes, randomly chosen from list

+ 49 - 4
docker-compose.yml

@@ -1,12 +1,48 @@
 version: '3.8'
 
 services:
+  # ----------------------------------------------------
+  # Mihomo 多端口代理池微服务 (供其他服务及宿主机使用)
+  # ----------------------------------------------------
+  proxy:
+    build: .
+    image: coordinator:latest
+    container_name: coordinator-proxy
+    command: ["python3", "start_proxy.py", "-f", "config/mihomo_config.yaml"]
+    restart: unless-stopped
+    volumes:
+      - ./config:/app/config
+      - ./logs:/app/logs
+    environment:
+      - TZ=Asia/Shanghai
+      - MIHOMO_BIN=/bin/mihomo
+      - ALLOW_LAN=true
+    ports:
+      # 全局混杂端口 (Mixed-port)
+      - "16000:16000"
+      # 多节点独立端口池 (覆盖 proxies.yaml 中的所有独立出口端口)
+      - "16001-16350:16001-16350"
+    healthcheck:
+      test: ["CMD", "python3", "start_proxy.py", "--check-health"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
+    deploy:
+      resources:
+        limits:
+          cpus: '1.0'
+          memory: 512M
+
   visa-sentinel:
     build: .
     image: coordinator:latest
     container_name: coordinator-sentinel
     command: ["python3", "main.py", "sentinel"]
     restart: unless-stopped
+    depends_on:
+      proxy:
+        condition: service_healthy
     shm_size: '2gb'
     volumes:
       - ./config:/app/config
@@ -18,7 +54,8 @@ services:
       - DISPLAY=:99
       - CHROME_BIN=/opt/ungoogled-chromium/chrome
       - MIHOMO_BIN=/bin/mihomo
-      - NODE_ID=${NODE_ID:-yecaoyun}
+      - PROXY_HOST=proxy
+      - NODE_ID=${NODE_ID:-testnode}
     deploy:
       resources:
         limits:
@@ -31,6 +68,9 @@ services:
     container_name: coordinator-booker
     command: ["python3", "main.py", "booker"]
     restart: unless-stopped
+    depends_on:
+      proxy:
+        condition: service_healthy
     shm_size: '2gb'
     volumes:
       - ./config:/app/config
@@ -42,7 +82,8 @@ services:
       - DISPLAY=:99
       - CHROME_BIN=/opt/ungoogled-chromium/chrome
       - MIHOMO_BIN=/bin/mihomo
-      - NODE_ID=${NODE_ID:-yecaoyun}
+      - PROXY_HOST=proxy
+      - NODE_ID=${NODE_ID:-testnode}
     deploy:
       resources:
         limits:
@@ -55,6 +96,9 @@ services:
     container_name: coordinator-standalone
     command: ["python3", "main.py", "standalone"]
     restart: unless-stopped
+    depends_on:
+      proxy:
+        condition: service_healthy
     shm_size: '2gb'
     volumes:
       - ./config:/app/config
@@ -66,7 +110,8 @@ services:
       - DISPLAY=:99
       - CHROME_BIN=/opt/ungoogled-chromium/chrome
       - MIHOMO_BIN=/bin/mihomo
-      - NODE_ID=${NODE_ID:-yecaoyun}
+      - PROXY_HOST=proxy
+      - NODE_ID=${NODE_ID:-testnode}
     deploy:
       resources:
         limits:
@@ -85,7 +130,7 @@ services:
       - ./logs:/app/logs
     environment:
       - TZ=Asia/Shanghai
-      - NODE_ID=${NODE_ID:-yecaoyun}
+      - NODE_ID=${NODE_ID:-testnode}
     deploy:
       resources:
         limits:

+ 43 - 2
start_proxy.py

@@ -241,6 +241,25 @@ def check_status(config_path):
         print("⚪ 代理服务当前未运行。")
 
 
+def check_health(config_path):
+    """用于 Docker HEALTHCHECK / 容器就绪探测的健康检查 (就绪返回码 0,未就绪返回 1)"""
+    mixed_port = 10000
+    if os.path.isfile(config_path):
+        try:
+            with open(config_path, "r", encoding="utf-8") as f:
+                data = yaml.safe_load(f) or {}
+                mixed_port = data.get("mixed-port", 10000)
+        except Exception:
+            pass
+
+    if is_port_listening("127.0.0.1", mixed_port, timeout=1.5):
+        print(f"OK - Proxy is healthy (Mixed-Port {mixed_port} listening)", flush=True)
+        sys.exit(0)
+    else:
+        print(f"FAIL - Proxy is not ready (Mixed-Port {mixed_port} not listening)", file=sys.stderr, flush=True)
+        sys.exit(1)
+
+
 def start_service(args):
     """启动代理服务"""
     bin_path = find_mihomo_bin(args.bin)
@@ -255,8 +274,23 @@ def start_service(args):
         print("👉 请先运行: python tools/generate_clash_multi_port.py 生成配置。")
         sys.exit(1)
 
-    print(f"[*] Mihomo 程序: {bin_path}")
-    print(f"[*] 配置文件路径: {config_path}")
+    print(f"[*] Mihomo 程序: {bin_path}", flush=True)
+    print(f"[*] 配置文件路径: {config_path}", flush=True)
+
+    # 自动适配 Docker / 外部连接:确保 allow-lan 开启
+    allow_lan_env = os.getenv("ALLOW_LAN", "").lower() in ("1", "true", "yes")
+    in_docker = os.path.exists("/.dockerenv") or os.getenv("DOCKER_CONTAINER") == "true"
+    if getattr(args, "allow_lan", False) or allow_lan_env or in_docker:
+        try:
+            with open(config_path, "r", encoding="utf-8") as f:
+                content = f.read()
+            if "allow-lan: false" in content:
+                print("[*] 正在为容器/局域网环境自动修正 allow-lan: true ...", flush=True)
+                content = content.replace("allow-lan: false", "allow-lan: true")
+                with open(config_path, "w", encoding="utf-8") as f:
+                    f.write(content)
+        except Exception as e:
+            print(f"⚠️ 自动配置 allow-lan 提示: {e}", flush=True)
 
     # 读取配置概要
     try:
@@ -360,9 +394,16 @@ def main():
     parser.add_argument("--log-file", type=str, default=None, help="后台运行日志输出文件 (默认: logs/mihomo.log)")
     parser.add_argument("--status", action="store_true", help="检查代理服务运行状态")
     parser.add_argument("--stop", action="store_true", help="停止后台代理服务")
+    parser.add_argument("--check-health", action="store_true", help="检查服务端口健康状态 (正常监听返回 0,未就绪返回 1)")
+    parser.add_argument("--allow-lan", action="store_true", help="强制确保 allow-lan 开启 (允许局域网/跨主机访问)")
 
     args = parser.parse_args()
 
+    if args.check_health:
+        config_path = find_config_file(args.config)
+        check_health(config_path)
+        return
+
     if args.stop:
         stop_service()
         return

+ 4 - 2
toolkit/proxy_manager.py

@@ -91,7 +91,8 @@ class ProxyManager:
 
         def _do_probe():
             try:
-                proxy_url = f"{proto}://127.0.0.1:{port}"
+                host = os.getenv("PROXY_HOST") or "127.0.0.1"
+                proxy_url = f"{proto}://{host}:{port}"
                 proxies = {"http": proxy_url, "https": proxy_url}
                 # Try lightweight public IP endpoint
                 resp = requests.get("http://api.ipify.org", proxies=proxies, timeout=2.5)
@@ -344,10 +345,11 @@ class ProxyManager:
         """Formats and normalizes the proxy dictionary."""
         port = int(chosen.get("port", 80))
         egress_ip = self._resolve_ip_identifier(chosen, trigger_probe=True)
+        proxy_ip = os.getenv("PROXY_HOST") or chosen.get("ip", "127.0.0.1")
         return {
             "id": chosen.get("id", 0),
             "proto": chosen.get("proto", "http"),
-            "ip": chosen.get("ip", "127.0.0.1"),
+            "ip": proxy_ip,
             "port": port,
             "username": chosen.get("username", ""),
             "password": chosen.get("password", ""),

+ 3 - 1
tools/generate_clash_multi_port.py

@@ -104,6 +104,7 @@ def main():
     parser.add_argument("--pool-prefix", type=str, default="local", help="国家池子的前缀 (默认: 'local' -> 生成 'local_de', 'local_ie' 等)")
     parser.add_argument("--all-pool-name", type=str, default="local_multi_pool", help="全量汇总池的名称 (默认: 'local_multi_pool',设为 'none' 则不生成汇总池)")
     parser.add_argument("--output-yaml", type=str, default="config/mihomo_config.yaml", help="生成的多端口 clash / mihomo 配置文件路径")
+    parser.add_argument("--allow-lan", action="store_true", default=True, help="允许局域网/Docker容器访问 (默认: True)")
     
     args = parser.parse_args()
 
@@ -179,7 +180,8 @@ def main():
 
     clean_config = {
         "mixed-port": args.start_port - 1,
-        "allow-lan": False,
+        "allow-lan": args.allow_lan,
+        "bind-address": "*",
         "mode": "rule",
         "log-level": "info",
         "ipv6": False,