优化v2ray代理池，增加系统代理开关

Author: xhunmon

002-V2rayPool/README.md

@@ -28,25 +28,27 @@
 1. 下载[v2ray-core-v4.31.0](https://github.com/v2fly/v2ray-core/releases/download/v4.31.0/v2ray-macos-64.zip)
 2. 配置解压目录的路径：
 ```python
-Config.set_v2ray_core_path('xxx/Downloads/v2ray-macos-64')
+Config.set_v2ray_core_path('xxx/v2ray-macos-64')
 ```
 3. 查看是否能正常启动：
 ```python
-client.Creator().v2ray_start('ss://[email protected]:43893#github.com/freefq%20-%20%E7%BD%97%E9%A9%AC%E5%B0%BC%E4%BA%9A%20%2041')
+client.Creator().v2ray_start('xxx')
+#如果需要开启全局代理
+client.Creator().v2ray_start('xxx',True)
 ```
 
-## 2022-1-4检测可用测试节点(注意去掉后面","开始的内容)：
+## 2022-1-11检测可用测试节点(注意去掉后面","开始的内容)：
 ```shell
-vmess://ew0KICAidiI6ICIyIiwNCiAgInBzIjogIkBTU1JTVUItVjMyLeS7mOi0ueaOqOiNkDpzdW8ueXQvc3Nyc3ViIiwNCiAgImFkZCI6ICIxMzcuMTc1LjMwLjI1MSIsDQogICJwb3J0IjogIjExMSIsDQogICJpZCI6ICI3N2NkNzc1Yy0xYzBhLTExZWMtYTFhOC0wMDE2M2MxMzkzYTgiLA0KICAiYWlkIjogIjAiLA0KICAic2N5IjogImF1dG8iLA0KICAibmV0IjogInRjcCIsDQogICJ0eXBlIjogIm5vbmUiLA0KICAiaG9zdCI6ICIxMzcuMTc1LjMwLjI1MSIsDQogICJwYXRoIjogIiIsDQogICJ0bHMiOiAiIiwNCiAgInNuaSI6ICIiDQp9,137.175.30.251,美国加利福尼亚圣何塞
-vmess://ew0KICAidiI6ICIyIiwNCiAgInBzIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbHZpbjk5OTkvbmV3LXBhYy93aWtpIOS/hOe9l+aWr2czIiwNCiAgImFkZCI6ICIxOTQuMTU2LjEyMC41MiIsDQogICJwb3J0IjogIjQxMDAyIiwNCiAgImlkIjogImViYjkzZTg0LTViYjctMTFlYy04YmM2LTZhNWM2ZTA1NGU0ZCIsDQogICJhaWQiOiAiMCIsDQogICJuZXQiOiAidGNwIiwNCiAgInR5cGUiOiAibm9uZSIsDQogICJob3N0IjogIiIsDQogICJwYXRoIjogIiIsDQogICJ0bHMiOiAiIiwNCiAgInNuaSI6ICIiDQp9,194.156.120.52,俄罗斯新西伯利亚
-vmess://eyJ2IjoiMiIsInBzIjoi57+75aKZ5YWaZmFucWlhbmdkYW5nLmNvbV9DTl8xMiIsImFkZCI6InNoY24yLTAxLmlwbGMxODguY29tIiwicG9ydCI6IjEwMDE2IiwiaWQiOiI4OTdhMTlmMC04ZGYxLTRiYTEtYTRhOC0wNTMzMWE4MmMyYWIiLCJhaWQiOiIwIiwic2N5IjoiYXV0byIsIm5ldCI6InRjcCIsInR5cGUiOiJub25lIiwiaG9zdCI6InNoY24yLTAxLmlwbGMxODguY29tIiwicGF0aCI6Ii8iLCJ0bHMiOiIiLCJzbmkiOiIifQ==,44.242.96.255,美国俄勒冈波特兰 亚马逊云
-vmess://eyJ2IjoiMiIsInBzIjoi57+75aKZ5YWaZmFucWlhbmdkYW5nLmNvbV9DTl8xNCIsImFkZCI6InNoY24yLTAxLmlwbGMxODguY29tIiwicG9ydCI6IjEwMDEyIiwiaWQiOiI4OTdhMTlmMC04ZGYxLTRiYTEtYTRhOC0wNTMzMWE4MmMyYWIiLCJhaWQiOiIwIiwic2N5IjoiYXV0byIsIm5ldCI6InRjcCIsInR5cGUiOiJub25lIiwiaG9zdCI6InVzYS1idWZmYWxvLmx2dWZ0LmNvbSIsInBhdGgiOiIvd3MiLCJ0bHMiOiIiLCJzbmkiOiIifQ==,136.175.179.25,美国加利福尼亚洛杉矶
-vmess://eyJ2IjoiMiIsInBzIjoi57+75aKZ5YWaZmFucWlhbmdkYW5nLmNvbV9DTl8xNiIsImFkZCI6InNoY24yLTAxLmlwbGMxODguY29tIiwicG9ydCI6IjEwMDE0IiwiaWQiOiI4OTdhMTlmMC04ZGYxLTRiYTEtYTRhOC0wNTMzMWE4MmMyYWIiLCJhaWQiOiIwIiwic2N5IjoiYXV0byIsIm5ldCI6InRjcCIsInR5cGUiOiJub25lIiwiaG9zdCI6InY5LnNzcnN1Yi5jb20iLCJwYXRoIjoiL3NzcnN1YiIsInRscyI6IiIsInNuaSI6IiJ9,3.70.63.126,德国法兰克福 亚马逊云
-vmess://eyJ2IjoiMiIsInBzIjoi57+75aKZ5YWaZmFucWlhbmdkYW5nLmNvbV9DTl8yMyIsImFkZCI6InNoY24yLTAxLmlwbGMxODguY29tIiwicG9ydCI6IjEwMDExIiwiaWQiOiI4OTdhMTlmMC04ZGYxLTRiYTEtYTRhOC0wNTMzMWE4MmMyYWIiLCJhaWQiOiIxIiwic2N5IjoiYXV0byIsIm5ldCI6InRjcCIsInR5cGUiOiJub25lIiwiaG9zdCI6IiIsInBhdGgiOiIiLCJ0bHMiOiIiLCJzbmkiOiIifQ==,103.138.75.27,中国香港
-<p><font face="宋体">v2ray客户端电脑版最新版本可添加trojan及vless,114.43.135.233,中国台湾台北 中華電信
+ss://YWVzLTI1Ni1nY206MWY2YWNhM2NlYmQyMWE0Y2Q1YTgwNzE4ZWQxNmI3NGNAMTIwLjIzMi4yMTQuMzY6NTAwMg#%F0%9F%87%B8%F0%9F%87%ACSingapore,8.25.96.100,美国 Level3
+ss://[email protected]:8119#github.com/freefq%20-%20%E6%96%B0%E5%8A%A0%E5%9D%A1OVH%201,139.99.62.207,新加坡 OVH
+ss://[email protected]:7002#github.com/freefq%20-%20%E7%91%9E%E5%85%B8%20%203,167.88.61.60,美国加利福尼亚圣克拉拉
+ss://[email protected]:3389#github.com/freefq%20-%20%E7%BE%8E%E5%9B%BD%E5%8D%8E%E7%9B%9B%E9%A1%BFCogent%E9%80%9A%E4%BF%A1%E5%85%AC%E5%8F%B8%204,38.143.66.71,美国华盛顿西雅图 Cogent
+trojan://[email protected]:8443#github.com/freefq%20-%20%E5%8A%A0%E6%8B%BF%E5%A4%A7%20%2012,142.47.89.64,加拿大安大略
+ss://[email protected]:9101#github.com/freefq%20-%20%E7%BE%8E%E5%9B%BD%20%2013,172.99.190.87,美国乔治亚亚特兰大
+ss://[email protected]:8091#github.com/freefq%20-%20%E6%8C%AA%E5%A8%81%20%2019,46.29.218.6,挪威
 ```
 
-注意：本程序虽可跨平台，但因博主能力有限，无法在更多系统上去尝试和改进，望谅解！
+注意：本程序虽可跨平台，但因博主能力有限，只在macos系统操作过，无法在更多系统上去尝试和改进，望谅解！
 
 -------
 

002-V2rayPool/base/net_proxy.py

@@ -42,6 +42,10 @@ def get_header(self, headers, key):
         else:
             return ''
 
+    def update_agent(self):
+        self.USER_AGENT = self._ua.random()  # 随机生成的agent
+        self._headers = {"user-agent": self.USER_AGENT, 'Connection': 'close'}
+
     def get_urls(self) -> []:
         """需子类实现"""
         pass

002-V2rayPool/core/client.py

@@ -9,6 +9,7 @@
 from core.conf import Config
 from core.group import Vmess, Vless, Socks, SS, Mtproto, Trojan, Group, Dyport
 from core.utils import ProtocolType
+import core.utils as util
 
 
 class ClientWriter:
@@ -251,25 +252,27 @@ def __kill_threading(self):
                 a = os.popen("kill %d" % int(pid)).read()
             except Exception as e:
                 pass
+        util.sys_proxy_off()
 
-    def __child_thread(self, url: str):
+    def __child_thread(self, url: str, isSysOn: False):
         self.generateAndWrite(url)
         # 执行就可，不需要知道结果
-        cur_dir = os.path.dirname(os.path.abspath(__file__))
         if Config.get_v2ray_core_path() is None:
             raise Exception('请先调用#Config.set_v2ray_core_path 设置路径')
         v2ray_path = os.path.join(Config.get_v2ray_core_path(), 'v2ray')
-        config_path = os.path.join(cur_dir, 'config.json')
+        config_path = os.path.join(Config.get_v2ray_core_path(), 'config.json')
         os.popen("%s -config %s >/dev/null 2>&1" % (v2ray_path, config_path))
         print("%s -config %s >/dev/null 2>&1" % (v2ray_path, config_path))
+        if isSysOn:
+            util.sys_v2ray_on()
 
-    def v2ray_start(self, url: str):
+    def v2ray_start(self, url: str, isSysOn: False):
         self.__kill_threading()
-        self.__child_thread(url)
+        self.__child_thread(url, isSysOn)
 
-    def v2ray_start_with_log(self, url: str):
+    def v2ray_start_with_log(self, url: str, isSysOn: False):
         try:
-            self.v2ray_start(url)
+            self.v2ray_start(url, isSysOn)
         except Exception as e:
             print(e)
             print("启动异常：%s" % url)

002-V2rayPool/core/config.json

@@ -16,38 +16,29 @@
     "clients": null
    },
    "streamSettings": null
+  },
+  {
+   "listen": "127.0.0.1",
+   "protocol": "http",
+   "settings": {
+    "timeout": 360
+   },
+   "port": "1087"
   }
  ],
  "outbounds": [
   {
-   "protocol": "vmess",
+   "protocol": "shadowsocks",
    "settings": {
-    "vnext": [
+    "servers": [
      {
-      "address": "api.ssfree.ru",
-      "port": 443,
-      "users": [
-       {
-        "id": "8a94a54e-6e40-11ec-bb14-000017022008",
-        "alterId": 64,
-        "security": "aes-128-gcm"
-       }
-      ]
+      "address": "139.99.62.207",
+      "method": "aes-256-gcm",
+      "ota": false,
+      "password": "cdBIDV42DCwnfIN",
+      "port": 8119
      }
     ]
-   },
-   "streamSettings": {
-    "security": "",
-    "tlsSettings": {},
-    "wsSettings": {},
-    "httpSettings": {},
-    "network": "tcp",
-    "kcpSettings": {},
-    "tcpSettings": {},
-    "quicSettings": {}
-   },
-   "mux": {
-    "enabled": true
    }
   },
   {
@@ -58,13 +49,6 @@
    "tag": "direct"
   }
  ],
- "dns": {
-  "servers": [
-   "8.8.8.8",
-   "8.8.4.4",
-   "localhost"
-  ]
- },
  "routing": {
   "domainStrategy": "IPIfNonMatch",
   "rules": [

002-V2rayPool/core/json_template/client.json

@@ -16,6 +16,14 @@
         "clients": null
       },
       "streamSettings": null
+    },
+    {
+      "listen": "127.0.0.1",
+      "protocol": "http",
+      "settings": {
+        "timeout": 360
+      },
+      "port": "1087"
     }
   ],
   "outbounds": [

002-V2rayPool/core/json_template/client_socks.json

@@ -16,6 +16,14 @@
         "clients": null
       },
       "streamSettings": null
+    },
+    {
+      "listen": "127.0.0.1",
+      "protocol": "http",
+      "settings": {
+        "timeout": 360
+      },
+      "port": "1087"
     }
   ],
     "outbounds": 

002-V2rayPool/core/json_template/client_ss.json

@@ -16,6 +16,14 @@
         "clients": null
       },
       "streamSettings": null
+    },
+    {
+      "listen": "127.0.0.1",
+      "protocol": "http",
+      "settings": {
+        "timeout": 360
+      },
+      "port": "1087"
     }
   ],
   "outbounds": [

002-V2rayPool/core/json_template/client_trojan.json

@@ -16,6 +16,14 @@
         "clients": null
       },
       "streamSettings": null
+    },
+    {
+      "listen": "127.0.0.1",
+      "protocol": "http",
+      "settings": {
+        "timeout": 360
+      },
+      "port": "1087"
     }
   ],
   "outbounds": [

002-V2rayPool/core/utils.py

@@ -198,6 +198,7 @@ def kill_all_v2ray():
             a = os.popen("kill %d" % int(pid)).read()
         except Exception as e:
             pass
+    sys_proxy_off()
 
 
 # netstat -nlp | grep :1080 | awk '{print $7}' | awk -F\" / \" '{ print $1 }'
@@ -207,3 +208,24 @@ def kill_process_by_port(port):
         print(pids)
     except:
         pass
+
+
+def sys_proxy_on(proxy, port):
+    ''''控制macOS系统代理'''
+    os.system('networksetup -setwebproxy wi-fi %s %d' % (proxy, port))  # http
+    os.system('networksetup -setsecurewebproxy wi-fi %s %d' % (proxy, port))  # https
+    os.system('networksetup -setsocksfirewallproxy wi-fi %s %d' % (proxy, port))  # socks
+
+
+def sys_v2ray_on():
+    # proxy_on("127.0.0.1", 1080)
+    '''端口要对应起v2ray开启的，具体要看写入config.json文件中inbounds节点部分'''
+    os.system('networksetup -setwebproxy wi-fi 127.0.0.1 1087')
+    os.system('networksetup -setsecurewebproxy wi-fi 127.0.0.1 1087')
+    os.system('networksetup -setsocksfirewallproxy wi-fi 127.0.0.1 1080')
+
+
+def sys_proxy_off():
+    os.system('networksetup -setwebproxystate wi-fi off')
+    os.system('networksetup -setsecurewebproxystate wi-fi off')
+    os.system('networksetup -setsocksfirewallproxystate wi-fi off')

002-V2rayPool/db/local.py

@@ -185,7 +185,7 @@ def init(self, config_path, def_url=None):
         """
         if def_url is not None:
             self.__default_url = def_url
-        if len(config_path) < len('config.json'):
+        if len(config_path) < len('(参考用)config.json'):
             return False
         if not os.path.isfile(config_path):
             return False