block-proxy 0.1.12 → 0.1.14

package/client/tests/test_config.py

@@ -0,0 +1,72 @@
+import json
+import os
+import tempfile
+import pytest
+import sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
+from config import Config, DEFAULT_CONFIG
+
+
+class TestConfig:
+    def setup_method(self):
+        self.tmp_dir = tempfile.mkdtemp()
+        self.config_path = os.path.join(self.tmp_dir, "config.json")
+        self.config = Config(config_path=self.config_path)
+
+    def test_default_config_created_on_first_load(self):
+        data = self.config.load()
+        assert data["server"]["port"] == 8002
+        assert data["server"]["tls"] is True
+        assert data["server"]["allowInsecure"] is True
+        assert data["local"]["socks_port"] == 1080
+        assert data["local"]["http_port"] == 1087
+        assert data["local"]["udp"] is True
+        assert data["mode"] == "global"
+        assert os.path.exists(self.config_path)
+
+    def test_save_and_load_roundtrip(self):
+        self.config.load()
+        self.config.data["server"]["address"] = "10.0.0.1"
+        self.config.data["server"]["port"] = 9002
+        self.config.data["server"]["username"] = "user1"
+        self.config.data["server"]["password"] = "pass1"
+        self.config.save()
+
+        config2 = Config(config_path=self.config_path)
+        data = config2.load()
+        assert data["server"]["address"] == "10.0.0.1"
+        assert data["server"]["port"] == 9002
+        assert data["server"]["username"] == "user1"
+        assert data["server"]["password"] == "pass1"
+
+    def test_load_existing_config(self):
+        existing = {
+            "server": {
+                "address": "example.com",
+                "port": 443,
+                "username": "abc",
+                "password": "def",
+                "tls": False,
+                "allowInsecure": False,
+            },
+            "local": {"socks_port": 2080, "http_port": 2087, "udp": False},
+            "mode": "manual",
+        }
+        with open(self.config_path, "w") as f:
+            json.dump(existing, f)
+
+        data = self.config.load()
+        assert data["server"]["address"] == "example.com"
+        assert data["server"]["tls"] is False
+        assert data["local"]["socks_port"] == 2080
+        assert data["mode"] == "manual"
+
+    def test_is_configured_false_when_no_address(self):
+        self.config.load()
+        assert self.config.is_configured() is False
+
+    def test_is_configured_true_when_address_set(self):
+        self.config.load()
+        self.config.data["server"]["address"] = "10.0.0.1"
+        assert self.config.is_configured() is True

package/client/tests/test_system_proxy.py

@@ -0,0 +1,69 @@
+import pytest
+import sys
+import os
+from unittest.mock import patch, call, MagicMock
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
+from system_proxy import SystemProxy
+
+
+class TestSystemProxy:
+    def setup_method(self):
+        self.proxy = SystemProxy()
+
+    @patch("system_proxy.SystemProxy._get_active_interfaces")
+    @patch("system_proxy.subprocess.run")
+    def test_enable_sets_all_proxy_types(self, mock_run, mock_interfaces):
+        mock_interfaces.return_value = ["Wi-Fi"]
+        mock_run.return_value = MagicMock(returncode=0, stdout="Enabled: Yes\n", stderr="")
+
+        self.proxy.enable(socks_port=1080, http_port=1087)
+
+        expected_calls = [
+            call(["networksetup", "-setsocksfirewallproxy", "Wi-Fi", "127.0.0.1", "1080"], capture_output=True, text=True),
+            call(["networksetup", "-setsocksfirewallproxystate", "Wi-Fi", "on"], capture_output=True, text=True),
+            call(["networksetup", "-setwebproxy", "Wi-Fi", "127.0.0.1", "1087"], capture_output=True, text=True),
+            call(["networksetup", "-setwebproxystate", "Wi-Fi", "on"], capture_output=True, text=True),
+            call(["networksetup", "-setsecurewebproxy", "Wi-Fi", "127.0.0.1", "1087"], capture_output=True, text=True),
+            call(["networksetup", "-setsecurewebproxystate", "Wi-Fi", "on"], capture_output=True, text=True),
+        ]
+        mock_run.assert_has_calls(expected_calls, any_order=True)
+
+    @patch("system_proxy.SystemProxy._get_active_interfaces")
+    @patch("system_proxy.subprocess.run")
+    def test_disable_clears_all_proxy_types(self, mock_run, mock_interfaces):
+        mock_interfaces.return_value = ["Wi-Fi"]
+        mock_run.return_value = MagicMock(returncode=0, stdout="", stderr="")
+
+        self.proxy.disable()
+
+        expected_calls = [
+            call(["networksetup", "-setsocksfirewallproxystate", "Wi-Fi", "off"], capture_output=True, text=True),
+            call(["networksetup", "-setwebproxystate", "Wi-Fi", "off"], capture_output=True, text=True),
+            call(["networksetup", "-setsecurewebproxystate", "Wi-Fi", "off"], capture_output=True, text=True),
+        ]
+        mock_run.assert_has_calls(expected_calls, any_order=True)
+
+    @patch("system_proxy.SystemProxy._get_active_interfaces")
+    @patch("system_proxy.subprocess.run")
+    def test_enable_multiple_interfaces(self, mock_run, mock_interfaces):
+        mock_interfaces.return_value = ["Wi-Fi", "Ethernet"]
+        mock_run.return_value = MagicMock(returncode=0, stdout="Enabled: Yes\n", stderr="")
+
+        self.proxy.enable(socks_port=1080, http_port=1087)
+
+        # 6 set calls per interface x 2 + 3 verify calls per interface x 2 = 18
+        assert mock_run.call_count == 18
+
+    @patch("system_proxy.subprocess.run")
+    def test_get_active_interfaces(self, mock_run):
+        mock_run.return_value = MagicMock(
+            stdout="An asterisk (*) denotes that a network service is disabled.\nWi-Fi\n*Bluetooth PAN\nEthernet\n",
+            returncode=0,
+        )
+
+        interfaces = self.proxy._get_active_interfaces()
+
+        assert "Wi-Fi" in interfaces
+        assert "Ethernet" in interfaces
+        assert "Bluetooth PAN" not in interfaces

package/client/watch-icons.js

@@ -0,0 +1,31 @@
+const { execSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+
+const ICONS_DIR = path.join(__dirname, "icons");
+const SOURCES = ["socks_on_G.png", "socks_on_M.png"];
+
+function resize(source) {
+  const name = path.basename(source, ".png");
+  const dest = path.join(ICONS_DIR, `${name}_bar.png`);
+  execSync(`sips -z 40 39 "${source}" --out "${dest}"`, { stdio: "ignore" });
+  console.log(`${new Date().toLocaleTimeString()}  regenerated ${name}_bar.png`);
+}
+
+function regenAll() {
+  SOURCES.forEach((f) => resize(path.join(ICONS_DIR, f)));
+}
+
+const cmd = process.argv[2];
+if (cmd === "--watch") {
+  console.log("Watching icons for changes...");
+  regenAll();
+  SOURCES.forEach((f) => {
+    const filePath = path.join(ICONS_DIR, f);
+    fs.watch(filePath, (eventType) => {
+      if (eventType === "change") resize(filePath);
+    });
+  });
+} else {
+  regenAll();
+}

package/config.json

@@ -1,202 +1,7 @@
 {
-  "network_scanning_status": "1",
-  "progress_time_stamp": "1766571511705",
-  "block_hosts": [
-    {
-      "filter_host": "bilibili.com",
-      "filter_match_rule": "",
-      "filter_start_time": "00:00",
-      "filter_end_time": "23:59",
-      "filter_weekday": [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7
-      ],
-      "filter_mac": "6E:FB:18:4D:9C:3E"
-    },
-    {
-      "filter_host": "doubao.com",
-      "filter_match_rule": "",
-      "filter_start_time": "00:00",
-      "filter_end_time": "23:59",
-      "filter_weekday": [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7
-      ],
-      "filter_mac": "6E:FB:18:4D:9C:3E"
-    },
-    {
-      "filter_host": "dburl.net",
-      "filter_match_rule": "",
-      "filter_start_time": "00:00",
-      "filter_end_time": "23:59",
-      "filter_weekday": [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7
-      ],
-      "filter_mac": "6E:FB:18:4D:9C:3E"
-    },
-    {
-      "filter_host": "baidu.com",
-      "filter_match_rule": "",
-      "filter_start_time": "00:00",
-      "filter_end_time": "23:59",
-      "filter_weekday": [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7
-      ],
-      "filter_mac": "6E:FB:18:4D:9C:3E"
-    },
-    {
-      "filter_host": "youtube.com",
-      "filter_match_rule": "^https?:\\/\\/(www|s)\\.youtube\\.com\\/(pagead|ptracking)",
-      "filter_start_time": "00:00",
-      "filter_end_time": "23:59",
-      "filter_weekday": [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7
-      ],
-      "compiledFilterRegexp": {}
-    },
-    {
-      "filter_host": "youtube.com",
-      "filter_match_rule": "^https?:\\/\\/s\\.youtube\\.com\\/api\\/stats\\/qoe\\?adcontext",
-      "filter_start_time": "00:00",
-      "filter_end_time": "23:59",
-      "filter_weekday": [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7
-      ],
-      "compiledFilterRegexp": {}
-    },
-    {
-      "filter_host": "youtube.com",
-      "filter_match_rule": "^https?:\\/\\/(www|s)\\.youtube\\.com\\/api\\/stats\\/ads",
-      "filter_start_time": "00:00",
-      "filter_end_time": "23:59",
-      "filter_weekday": [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7
-      ],
-      "compiledFilterRegexp": {}
-    },
-    {
-      "filter_host": "googlevideo.com",
-      "filter_match_rule": "^https?:\\/\\/[\\w-]+\\.googlevideo\\.com\\/(?!(dclk_video_ads|videoplayback\\?)).+&oad",
-      "filter_start_time": "00:00",
-      "filter_end_time": "23:59",
-      "filter_weekday": [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7
-      ],
-      "compiledFilterRegexp": {}
-    }
-  ],
+  "block_hosts": [],
   "proxy_port": 8001,
-  "web_interface_port": 8003,
-  "your_domain": "yui.cool",
-  "vpn_proxy": "",
-  "auth_username": "lijing",
-  "auth_password": "lijing",
-  "enable_express": "1",
-  "enable_socks5": "1",
   "socks5_port": 8002,
-  "enable_webinterface": "1",
-  "devices": [
-    {
-      "ip": "192.168.124.1",
-      "mac": "FA:27:3C:E5:31:5F"
-    },
-    {
-      "ip": "192.168.124.2",
-      "mac": "7C:DE:78:A9:83:A0"
-    },
-    {
-      "ip": "192.168.124.6",
-      "mac": "0:DD:B6:EB:26:5C"
-    },
-    {
-      "ip": "192.168.124.10",
-      "mac": "FA:27:3C:E5:31:5F"
-    },
-    {
-      "ip": "192.168.124.34",
-      "mac": "D6:A0:61:69:67:F6"
-    },
-    {
-      "ip": "192.168.124.37",
-      "mac": "DE:1E:87:ED:17:8B"
-    },
-    {
-      "ip": "192.168.124.49",
-      "mac": "62:A1:CC:42:55:E4"
-    },
-    {
-      "ip": "192.168.124.107",
-      "mac": "6:26:EA:5A:9E:6C"
-    },
-    {
-      "ip": "192.168.124.111",
-      "mac": "74:3F:C2:67:74:98"
-    },
-    {
-      "ip": "192.168.124.125",
-      "mac": "14:C0:50:14:6E:A5"
-    },
-    {
-      "ip": "192.168.124.128",
-      "mac": "48:F3:F3:CA:1D:E"
-    },
-    {
-      "ip": "192.168.124.200",
-      "mac": "54:52:84:95:DF:5E"
-    },
-    {
-      "ip": "192.168.124.240",
-      "mac": "F4:6B:8C:90:29:5"
-    },
-    {
-      "ip": "192.168.124.251",
-      "mac": "6E:FB:18:4D:9C:3E"
-    }
-  ]
-}
+  "auth_username": "admin",
+  "auth_password": "admin"
+}