block-proxy 0.1.11 → 0.1.13

package/client/app.py

@@ -0,0 +1,312 @@
+import os
+import sys
+import subprocess
+import threading
+import platform
+import rumps
+from PyObjCTools import AppHelper
+from Foundation import NSObject
+from config import Config
+from proxy_core import ProxyCore
+from system_proxy import SystemProxy
+
+
+def _is_tahoe_or_newer():
+    try:
+        ver = tuple(map(int, platform.mac_ver()[0].split(".")))
+        return ver >= (26, 0)
+    except Exception:
+        return False
+
+
+class _MenuOpenDelegate(NSObject):
+    def menuWillOpen_(self, menu):
+        cb = getattr(self, "_on_open", None)
+        if cb:
+            cb()
+
+
+class SocksClient(rumps.App):
+    def __init__(self):
+        super().__init__("SocksClient", quit_button=None)
+        self.template = _is_tahoe_or_newer()
+
+        self.config = Config()
+        self.config.load()
+        self.proxy = ProxyCore()
+        self.sys_proxy = SystemProxy()
+        self.connected = False
+
+        self._measuring = False
+        self._build_menu()
+        self._setup_menu_delegate()
+        self._update_icon()
+        self._start_health_check()
+
+    def run(self, **options):
+        if not _is_tahoe_or_newer():
+            def _fix_highlight():
+                try:
+                    self._nsapp.nsstatusitem.setHighlightMode_(False)
+                except Exception:
+                    pass
+            AppHelper.callAfter(_fix_highlight)
+        super().run(**options)
+
+    def _build_menu(self):
+        self.toggle_item = rumps.MenuItem("启动代理", callback=self.toggle_proxy)
+        self.config_item = rumps.MenuItem("Socks 节点配置...", callback=self.open_config)
+
+        self.global_item = rumps.MenuItem("全局代理（设置系统代理）", callback=self.set_global_mode)
+        self.manual_item = rumps.MenuItem("手动模式（关闭系统代理）", callback=self.set_manual_mode)
+
+        self.about_item = rumps.MenuItem("关于", callback=self.show_about)
+        self.quit_item = rumps.MenuItem("退出", callback=self.quit_app)
+
+        self.menu = [
+            self.toggle_item,
+            self.config_item,
+            None,
+            self.global_item,
+            self.manual_item,
+            None,
+            self.about_item,
+            None,
+            self.quit_item,
+        ]
+
+        try:
+            from AppKit import NSCommandKeyMask
+            self.quit_item._menuitem.setKeyEquivalent_("q")
+            self.quit_item._menuitem.setKeyEquivalentModifierMask_(NSCommandKeyMask)
+        except Exception:
+            pass
+
+        self._update_mode_menu()
+
+    def _update_mode_menu(self):
+        is_global = self.config.data["mode"] == "global"
+        self.global_item.state = 1 if is_global else 0
+        self.manual_item.state = 1 if not is_global else 0
+
+    def _update_icon(self):
+        if self.connected:
+            icon_name = "socks_on_G_bar.png" if self.config.data["mode"] == "global" else "socks_on_M_bar.png"
+        else:
+            icon_name = "christmas-sock_light_bar.png"
+        icon_path = os.path.join(self._icon_dir(), icon_name)
+        if os.path.exists(icon_path):
+            self.icon = icon_path
+        self.title = None
+
+    def _is_compiled(self):
+        return "__compiled__" in globals() or getattr(sys, "frozen", False)
+
+    def _bundle_resource_dir(self):
+        if self._is_compiled():
+            return os.path.dirname(sys.executable)
+        return os.path.dirname(os.path.abspath(__file__))
+
+    def _icon_dir(self):
+        return os.path.join(self._bundle_resource_dir(), "icons")
+
+    def toggle_proxy(self, sender):
+        if self.connected:
+            self._disconnect()
+        else:
+            self._connect()
+
+    def _connect(self):
+        if not self.config.is_configured():
+            rumps.alert("请先配置节点信息")
+            return
+
+        def _start():
+            try:
+                self.proxy.start(self.config.data)
+            except OSError as e:
+                if e.errno == 48:
+                    rumps.notification(
+                        "SocksClient", "启动失败",
+                        f"端口被占用，请检查端口是否已被其他程序使用",
+                    )
+                else:
+                    rumps.notification(
+                        "SocksClient", "启动失败", str(e),
+                    )
+                return
+            if self.config.data["mode"] == "global":
+                try:
+                    self.sys_proxy.enable(
+                        socks_port=self.config.data["local"]["socks_port"],
+                        http_port=self.config.data["local"]["http_port"],
+                    )
+                except Exception as e:
+                    rumps.notification(
+                        "SocksClient", "系统代理设置失败", str(e),
+                    )
+
+            def _update_ui():
+                self.connected = True
+                self.toggle_item.title = "关闭代理"
+                self._update_icon()
+
+            AppHelper.callAfter(_update_ui)
+
+        threading.Thread(target=_start, daemon=True).start()
+
+    def _disconnect(self):
+        self.sys_proxy.disable()
+        self.proxy.stop()
+        self.connected = False
+        self.toggle_item.title = "启动代理"
+        self._update_icon()
+
+    def open_config(self, sender):
+        self._show_config_window()
+
+    def _find_python(self):
+        for p in [
+            "/Library/Frameworks/Python.framework/Versions/3.13/bin/python3",
+            "/usr/local/bin/python3",
+            "/usr/bin/python3",
+        ]:
+            if os.path.exists(p):
+                return p
+        return "python3"
+
+    def _show_config_window(self):
+        self.config.save()
+        script_path = os.path.join(self._bundle_resource_dir(), "config_window.py")
+        python_path = self._find_python() if self._is_compiled() else sys.executable
+        proc = subprocess.Popen([python_path, script_path, self.config.config_path])
+
+        def _reload_after_window():
+            proc.wait()
+            old_data = self.config.data.copy()
+            self.config.load()
+            if self.connected and self.config.data != old_data:
+                self._disconnect()
+                self._connect()
+
+        threading.Thread(target=_reload_after_window, daemon=True).start()
+
+    def set_global_mode(self, sender):
+        self.config.data["mode"] = "global"
+        self.config.save()
+        self._update_mode_menu()
+        self._update_icon()
+        if self.connected:
+            self.sys_proxy.enable(
+                socks_port=self.config.data["local"]["socks_port"],
+                http_port=self.config.data["local"]["http_port"],
+            )
+
+    def set_manual_mode(self, sender):
+        self.config.data["mode"] = "manual"
+        self.config.save()
+        self._update_mode_menu()
+        self._update_icon()
+        if self.connected:
+            self.sys_proxy.disable()
+
+    def show_about(self, sender):
+        try:
+            from AppKit import (
+                NSAlert, NSTextField, NSMutableAttributedString,
+                NSAttributedString, NSFont, NSColor, NSMakeRect,
+                NSApp,
+            )
+            from Foundation import NSURL, NSRange
+
+            NSApp.activateIgnoringOtherApps_(True)
+            alert = NSAlert.alloc().init()
+            alert.setMessageText_("关于 SocksClient")
+            alert.addButtonWithTitle_("好")
+
+            url = "https://github.com/jayli/block-proxy"
+            text = f"项目：block-proxy\n作者：lijing00333\n地址：{url}\n版本：v0.1.0"
+
+            attr_str = NSMutableAttributedString.alloc().initWithString_(text)
+            full_range = NSRange(0, len(text))
+            font = NSFont.systemFontOfSize_(13)
+            attr_str.addAttribute_value_range_("NSFont", font, full_range)
+
+            link_start = text.index(url)
+            link_range = NSRange(link_start, len(url))
+            attr_str.addAttribute_value_range_("NSLink", NSURL.URLWithString_(url), link_range)
+            attr_str.addAttribute_value_range_("NSColor", NSColor.linkColor(), link_range)
+
+            text_field = NSTextField.wrappingLabelWithString_("")
+            text_field.setAttributedStringValue_(attr_str)
+            text_field.setAllowsEditingTextAttributes_(True)
+            text_field.setSelectable_(True)
+            text_field.setFrame_(NSMakeRect(0, 0, 300, 80))
+
+            alert.setAccessoryView_(text_field)
+            alert.runModal()
+        except Exception:
+            rumps.alert(
+                title="关于 SocksClient",
+                message=(
+                    "项目：block-proxy\n"
+                    "作者：lijing00333\n"
+                    "地址：https://github.com/jayli/block-proxy\n"
+                    "版本：v0.1.0"
+                ),
+            )
+
+    def quit_app(self, sender):
+        if self.connected:
+            self.sys_proxy.disable()
+            threading.Thread(target=self.proxy.stop, daemon=True).start()
+        rumps.quit_application()
+
+    def _setup_menu_delegate(self):
+        try:
+            delegate = _MenuOpenDelegate.alloc().init()
+            delegate._on_open = self._on_menu_open
+            self._menu._menu.setDelegate_(delegate)
+            self._menu_delegate = delegate
+        except Exception:
+            pass
+
+    def _on_menu_open(self):
+        if not self.connected or self._measuring:
+            return
+
+        self._measuring = True
+
+        def _check():
+            try:
+                latency = self.proxy.measure_latency()
+
+                def _update():
+                    if not self.connected:
+                        return
+                    if latency is not None:
+                        self.toggle_item.title = f"关闭代理（{latency}ms）"
+                    else:
+                        self.toggle_item.title = "关闭代理（超时）"
+
+                AppHelper.callAfter(_update)
+            finally:
+                self._measuring = False
+
+        threading.Thread(target=_check, daemon=True).start()
+
+    def _start_health_check(self):
+        def check():
+            while True:
+                import time
+                time.sleep(5)
+                if self.connected and not self.proxy.is_running():
+                    self._disconnect()
+                    rumps.notification(
+                        "SocksClient",
+                        "代理已断开",
+                        "代理进程意外退出",
+                    )
+
+        t = threading.Thread(target=check, daemon=True)
+        t.start()

package/client/build.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+set -e
+
+APP_NAME="SocksClient"
+BUNDLE_ID="com.jaylli.socksclient"
+VERSION="0.1.0"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+DIST_DIR="$SCRIPT_DIR/dist"
+APP_DIR="$DIST_DIR/$APP_NAME.app"
+
+# Detect architecture
+ARCH=$(uname -m)
+ZIP_NAME="SocksClient-macos-${ARCH}.zip"
+
+echo "==> Detected architecture: $ARCH"
+
+echo "==> Cleaning old build..."
+rm -rf "$DIST_DIR" "$SCRIPT_DIR/main.build" "$SCRIPT_DIR/main.dist"
+rm -f "$DIST_DIR"/*.zip
+
+# Find python3 from PATH
+PYTHON=$(command -v python3 || true)
+if [ -z "$PYTHON" ]; then
+    echo "ERROR: python3 not found in PATH"
+    exit 1
+fi
+echo "==> Using Python: $PYTHON ($($PYTHON --version))"
+
+# Check nuitka
+if ! $PYTHON -m nuitka --version &>/dev/null; then
+    echo "ERROR: nuitka not installed. Run: $PYTHON -m pip install nuitka"
+    exit 1
+fi
+
+echo "==> Generating app.icns from app_icon.png..."
+ICONSET=$(mktemp -d)/app.iconset
+mkdir -p "$ICONSET"
+sips -z 16 16 "$SCRIPT_DIR/icons/app_icon.png" --out "$ICONSET/icon_16x16.png" &>/dev/null
+sips -z 32 32 "$SCRIPT_DIR/icons/app_icon.png" --out "$ICONSET/icon_16x16@2x.png" &>/dev/null
+sips -z 32 32 "$SCRIPT_DIR/icons/app_icon.png" --out "$ICONSET/icon_32x32.png" &>/dev/null
+sips -z 64 64 "$SCRIPT_DIR/icons/app_icon.png" --out "$ICONSET/icon_32x32@2x.png" &>/dev/null
+sips -z 128 128 "$SCRIPT_DIR/icons/app_icon.png" --out "$ICONSET/icon_128x128.png" &>/dev/null
+sips -z 256 256 "$SCRIPT_DIR/icons/app_icon.png" --out "$ICONSET/icon_128x128@2x.png" &>/dev/null
+sips -z 256 256 "$SCRIPT_DIR/icons/app_icon.png" --out "$ICONSET/icon_256x256.png" &>/dev/null
+sips -z 512 512 "$SCRIPT_DIR/icons/app_icon.png" --out "$ICONSET/icon_256x256@2x.png" &>/dev/null
+iconutil -c icns "$ICONSET" -o "$SCRIPT_DIR/icons/app.icns"
+rm -rf "$(dirname "$ICONSET")"
+
+echo "==> Building with Nuitka..."
+cd "$SCRIPT_DIR"
+$PYTHON -m nuitka \
+    --standalone \
+    --macos-create-app-bundle \
+    --macos-app-name="$APP_NAME" \
+    --macos-app-icon=icons/app.icns \
+    --macos-app-mode=ui-element \
+    --include-data-dir=icons=icons \
+    --include-data-files=config_window.py=config_window.py \
+    --enable-plugin=no-qt \
+    --output-dir="$DIST_DIR" \
+    main.py
+
+echo "==> Renaming app bundle..."
+mv "$DIST_DIR/main.app" "$APP_DIR"
+
+echo "==> Fixing executable name..."
+mv "$APP_DIR/Contents/MacOS/main" "$APP_DIR/Contents/MacOS/$APP_NAME"
+
+echo "==> Patching Info.plist..."
+plutil -replace CFBundleExecutable -string "$APP_NAME" "$APP_DIR/Contents/Info.plist"
+plutil -replace CFBundleIdentifier -string "$BUNDLE_ID" "$APP_DIR/Contents/Info.plist"
+plutil -replace CFBundleVersion -string "$VERSION" "$APP_DIR/Contents/Info.plist"
+plutil -replace CFBundleShortVersionString -string "$VERSION" "$APP_DIR/Contents/Info.plist"
+
+echo "==> Cleaning Nuitka build artifacts..."
+rm -rf "$DIST_DIR/main.build" "$DIST_DIR/main.dist"
+
+echo "==> Packaging..."
+cd "$DIST_DIR"
+rm -f "$ZIP_NAME"
+zip -r -q "$ZIP_NAME" "$APP_NAME.app"
+
+echo "==> Build complete: $APP_DIR"
+echo "==> Package: $DIST_DIR/$ZIP_NAME"

package/client/config.py

@@ -0,0 +1,49 @@
+import json
+import os
+import copy
+
+DEFAULT_CONFIG = {
+    "server": {
+        "address": "",
+        "port": 8002,
+        "username": "",
+        "password": "",
+        "tls": True,
+        "allowInsecure": True,
+    },
+    "local": {
+        "socks_port": 1080,
+        "http_port": 1087,
+        "udp": True,
+    },
+    "mode": "global",
+}
+
+DEFAULT_CONFIG_DIR = os.path.expanduser(
+    "~/Library/Application Support/SocksClient"
+)
+
+
+class Config:
+    def __init__(self, config_path=None):
+        if config_path is None:
+            config_path = os.path.join(DEFAULT_CONFIG_DIR, "config.json")
+        self.config_path = config_path
+        self.data = None
+
+    def load(self):
+        if os.path.exists(self.config_path):
+            with open(self.config_path, "r") as f:
+                self.data = json.load(f)
+        else:
+            self.data = copy.deepcopy(DEFAULT_CONFIG)
+            self.save()
+        return self.data
+
+    def save(self):
+        os.makedirs(os.path.dirname(self.config_path), exist_ok=True)
+        with open(self.config_path, "w") as f:
+            json.dump(self.data, f, indent=2)
+
+    def is_configured(self):
+        return bool(self.data and self.data["server"]["address"])

package/client/config_window.py

@@ -0,0 +1,155 @@
+import json
+import platform
+import sys
+import tkinter as tk
+from tkinter import ttk
+
+
+def _macos_setup():
+    try:
+        from AppKit import NSApp
+        NSApp.setActivationPolicy_(1)  # NSApplicationActivationPolicyAccessory
+        NSApp.activateIgnoringOtherApps_(True)
+    except ImportError:
+        pass
+
+
+def _center_on_mouse_screen(w, h):
+    if platform.system() == "Darwin":
+        try:
+            from AppKit import NSScreen, NSEvent
+            mouse_loc = NSEvent.mouseLocation()
+            primary_h = NSScreen.screens()[0].frame().size.height
+            for screen in NSScreen.screens():
+                sf = screen.frame()
+                if (sf.origin.x <= mouse_loc.x < sf.origin.x + sf.size.width and
+                        sf.origin.y <= mouse_loc.y < sf.origin.y + sf.size.height):
+                    vf = screen.visibleFrame()
+                    x = int(vf.origin.x + (vf.size.width - w) / 2)
+                    y = int(primary_h - vf.origin.y - vf.size.height +
+                            (vf.size.height - h) / 2)
+                    return x, y
+        except Exception:
+            pass
+    return None
+
+
+def show_config_window(config_path):
+    with open(config_path, "r") as f:
+        config = json.load(f)
+
+    def save_and_close():
+        config["server"]["address"] = entries["address"].get()
+        config["server"]["port"] = int(entries["port"].get())
+        config["server"]["username"] = entries["username"].get()
+        config["server"]["password"] = entries["password"].get()
+        config["server"]["tls"] = tls_var.get()
+        config["server"]["allowInsecure"] = insecure_var.get() == "true"
+        config["local"]["socks_port"] = int(entries["socks_port"].get())
+        config["local"]["http_port"] = int(entries["http_port"].get())
+        config["local"]["udp"] = udp_var.get()
+        config["local"]["proxy_private"] = proxy_private_var.get()
+        config["autostart"] = autostart_var.get()
+
+        with open(config_path, "w") as f:
+            json.dump(config, f, indent=2)
+        root.destroy()
+
+    pos = _center_on_mouse_screen(400, 460)
+
+    root = tk.Tk()
+    root.title("Socks 节点配置")
+    root.resizable(False, False)
+    w, h = 400, 460
+    if pos:
+        x, y = pos
+    else:
+        x = (root.winfo_screenwidth() - w) // 2
+        y = (root.winfo_screenheight() - h) // 2
+    root.geometry(f"{w}x{h}+{x}+{y}")
+
+    if platform.system() == "Darwin":
+        root.after(50, _macos_setup)
+
+    frame = ttk.Frame(root, padding=20)
+    frame.pack(fill="both", expand=True)
+    frame.grid_columnconfigure(1, weight=1)
+
+    entries = {}
+    fields = [
+        ("address", "地址:", config["server"]["address"]),
+        ("port", "端口:", str(config["server"]["port"])),
+        ("username", "用户名:", config["server"]["username"]),
+        ("password", "密码:", config["server"]["password"]),
+        ("socks_port", "本地SOCKS端口:", str(config["local"]["socks_port"])),
+        ("http_port", "本地HTTP端口:", str(config["local"]["http_port"])),
+    ]
+
+    for i, (key, label, default) in enumerate(fields):
+        ttk.Label(frame, text=label).grid(row=i, column=0, sticky="w", pady=4, padx=(0, 8))
+        entry = ttk.Entry(frame)
+        entry.insert(0, default)
+        entry.grid(row=i, column=1, sticky="ew", pady=4)
+        entries[key] = entry
+
+    row = len(fields)
+
+    tls_var = tk.BooleanVar(value=config["server"]["tls"])
+    ttk.Label(frame, text="启用 TLS:").grid(row=row, column=0, sticky="w", pady=4, padx=(0, 8))
+    ttk.Checkbutton(frame, variable=tls_var).grid(
+        row=row, column=1, sticky="w", pady=4
+    )
+    row += 1
+
+    ttk.Label(frame, text="allowInsecure:").grid(row=row, column=0, sticky="w", pady=4)
+    insecure_var = tk.StringVar(
+        value="true" if config["server"]["allowInsecure"] else "false"
+    )
+    insecure_combo = ttk.Combobox(
+        frame, textvariable=insecure_var, values=["true", "false"], state="readonly", width=10
+    )
+    insecure_combo.grid(row=row, column=1, sticky="w", pady=4)
+    row += 1
+
+    udp_var = tk.BooleanVar(value=config["local"]["udp"])
+    ttk.Label(frame, text="启用 UDP:").grid(row=row, column=0, sticky="w", pady=4, padx=(0, 8))
+    ttk.Checkbutton(frame, variable=udp_var).grid(
+        row=row, column=1, sticky="w", pady=4
+    )
+    row += 1
+
+    proxy_private_var = tk.BooleanVar(value=config["local"].get("proxy_private", False))
+    ttk.Label(frame, text="代理私有地址段:").grid(row=row, column=0, sticky="w", pady=4, padx=(0, 8))
+    ttk.Checkbutton(frame, variable=proxy_private_var).grid(
+        row=row, column=1, sticky="w", pady=4
+    )
+    row += 1
+
+    ttk.Separator(frame, orient="horizontal").grid(
+        row=row, column=0, columnspan=2, sticky="ew", pady=10
+    )
+    row += 1
+
+    autostart_var = tk.BooleanVar(value=config.get("autostart", False))
+    ttk.Label(frame, text="开机启动:").grid(row=row, column=0, sticky="w", pady=4, padx=(0, 8))
+    ttk.Checkbutton(frame, variable=autostart_var).grid(
+        row=row, column=1, sticky="w", pady=4
+    )
+    row += 1
+
+    ttk.Button(frame, text="保存", command=save_and_close).grid(
+        row=row, column=0, columnspan=2, pady=15
+    )
+
+    root.lift()
+    root.attributes("-topmost", True)
+    if platform.system() != "Darwin":
+        root.after(100, lambda: root.focus_force())
+    root.mainloop()
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print("Usage: python config_window.py <config_path>")
+        sys.exit(1)
+    show_config_window(sys.argv[1])

package/client/main.py

@@ -0,0 +1,28 @@
+import os
+import sys
+import fcntl
+
+LOCK_PATH = os.path.expanduser("~/Library/Application Support/SocksClient/.lock")
+
+
+def acquire_lock():
+    os.makedirs(os.path.dirname(LOCK_PATH), exist_ok=True)
+    fp = open(LOCK_PATH, "w")
+    try:
+        fcntl.flock(fp, fcntl.LOCK_EX | fcntl.LOCK_NB)
+    except OSError:
+        sys.exit(0)
+    fp.write(str(os.getpid()))
+    fp.flush()
+    return fp
+
+
+def main():
+    lock = acquire_lock()
+    from app import SocksClient
+    client = SocksClient()
+    client.run()
+
+
+if __name__ == "__main__":
+    main()