修改关键词

booker_builtin.py

@@ -283,7 +283,7 @@ class BuiltinBookerGCO:
                     plg_cfg.proxy.id = proxy['id']
                     plg_cfg.proxy.ip = proxy['ip']
                     plg_cfg.proxy.port = proxy['port']
-                    plg_cfg.proxy.scheme = proxy['scheme']
+                    plg_cfg.proxy.proto = proxy['proto']
                     plg_cfg.proxy.username = proxy['username']
                     plg_cfg.proxy.password = proxy['password']
 

booker_order.py

@@ -299,7 +299,7 @@ class OrderBookerGCO:
                     plg_cfg.proxy.id = proxy['id']
                     plg_cfg.proxy.ip = proxy['ip']
                     plg_cfg.proxy.port = proxy['port']
-                    plg_cfg.proxy.scheme = proxy['scheme']
+                    plg_cfg.proxy.proto = proxy['proto']
                     plg_cfg.proxy.username = proxy['username']
                     plg_cfg.proxy.password = proxy['password']
 

plugins/bel_plugin.py

@@ -134,7 +134,7 @@ class BelPlugin(IVSPlg):
                 self._log(f"Tunnel started at {local_proxy}")
                 co.set_argument(f'--proxy-server={local_proxy}')
             else:
-                proxy_str = f"{p.scheme}://{p.ip}:{p.port}"
+                proxy_str = f"{p.proto}://{p.ip}:{p.port}"
                 co.set_argument(f'--proxy-server={proxy_str}')
         else:
             self._log("[WARN] No proxy configured!")

plugins/bls_plugin.py

@@ -413,9 +413,9 @@ class BlsPlugin(IVSPlg):
         if self.config.proxy.ip:
             s = self.config.proxy
             if s.username:
-                proxy_url = f"{s.scheme}://{s.username}:{s.password}@{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.username}:{s.password}@{s.ip}:{s.port}"
             else:
-                proxy_url = f"{s.scheme}://{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.ip}:{s.port}"
         return proxy_url
     
     def _save_debug_html(self, content: str, prefix: str = "debug"):
@@ -1039,7 +1039,7 @@ class BlsPlugin(IVSPlg):
             
         proxy_str = ""
         if self.config.proxy.ip:
-            proxy_str = f"{self.config.proxy.scheme}://"
+            proxy_str = f"{self.config.proxy.proto}://"
         if self.config.proxy.username:
             proxy_str += f"{self.config.proxy.username}:{self.config.proxy.password}@"
         proxy_str += f"{self.config.proxy.ip}:{self.config.proxy.port}"

plugins/de_plugin.py

@@ -147,7 +147,7 @@ class DePlugin(IVSPlg):
                 self._log(f"Tunnel started at {local_proxy}")
                 co.set_argument(f'--proxy-server={local_proxy}')
             else:
-                proxy_str = f"{p.scheme}://{p.ip}:{p.port}"
+                proxy_str = f"{p.proto}://{p.ip}:{p.port}"
                 co.set_argument(f'--proxy-server={proxy_str}')
         else:
             self._log("[WARN] No proxy configured!")

plugins/grc_plugin.py

@@ -522,9 +522,9 @@ class GrcPlugin(IVSPlg):
         if self.config.proxy.ip:
             s = self.config.proxy
             if s.username:
-                proxy_url = f"{s.scheme}://{s.username}:{s.password}@{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.username}:{s.password}@{s.ip}:{s.port}"
             else:
-                proxy_url = f"{s.scheme}://{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.ip}:{s.port}"
         return proxy_url
     
     def _perform_request(self, method, url, headers=None, data=None, json_data=None, params=None):

plugins/ita_plugin.py

@@ -146,7 +146,7 @@ class ItaPlugin(IVSPlg):
                 co.set_argument(f'--proxy-server={local_proxy}')
                 
             else:
-                proxy_str = f"{p.scheme}://{p.ip}:{p.port}"
+                proxy_str = f"{p.proto}://{p.ip}:{p.port}"
                 co.set_argument(f'--proxy-server={proxy_str}')
         else:
             self._log("[WARN] No proxy configured!")
@@ -563,9 +563,9 @@ class ItaPlugin(IVSPlg):
         if self.config.proxy.ip:
             s = self.config.proxy
             if s.username:
-                proxy_url = f"{s.scheme}://{s.username}:{s.password}@{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.username}:{s.password}@{s.ip}:{s.port}"
             else:
-                proxy_url = f"{s.scheme}://{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.ip}:{s.port}"
         return proxy_url
 
     def _solve_and_inject_prenotami_captcha(self):

plugins/pol_plugin.py

@@ -134,7 +134,7 @@ class PolPlugin(IVSPlg):
                 self._log(f"Tunnel started at {local_proxy}")
                 co.set_argument(f'--proxy-server={local_proxy}')
             else:
-                proxy_str = f"{p.scheme}://{p.ip}:{p.port}"
+                proxy_str = f"{p.proto}://{p.ip}:{p.port}"
                 co.set_argument(f'--proxy-server={proxy_str}')
         else:
             self._log("[WARN] No proxy configured!")
@@ -347,9 +347,9 @@ class PolPlugin(IVSPlg):
         if hasattr(self, 'config') and hasattr(self.config, 'proxy') and self.config.proxy.ip:
             p = self.config.proxy
             if p.username and p.password:
-                proxy_str = f"{p.scheme}://{p.username}:{p.password}@{p.ip}:{p.port}"
+                proxy_str = f"{p.proto}://{p.username}:{p.password}@{p.ip}:{p.port}"
             else:
-                proxy_str = f"{p.scheme}://{p.ip}:{p.port}"
+                proxy_str = f"{p.proto}://{p.ip}:{p.port}"
         session_data = VSCloudApi.Instance().create_http_session(
             session_id=str(uuid.uuid4().hex),
             cookies=cookies_str,

plugins/tls_plugin.py

@@ -159,7 +159,7 @@ class TlsPlugin(IVSPlg):
                 co.set_argument(f'--proxy-server={local_proxy}')
                 
             else:
-                proxy_str = f"{p.scheme}://{p.ip}:{p.port}"
+                proxy_str = f"{p.proto}://{p.ip}:{p.port}"
                 co.set_argument(f'--proxy-server={proxy_str}')
         else:
             self._log("[WARN] No proxy configured!")
@@ -653,9 +653,9 @@ class TlsPlugin(IVSPlg):
         if self.config.proxy.ip:
             s = self.config.proxy
             if s.username:
-                proxy_url = f"{s.scheme}://{s.username}:{s.password}@{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.username}:{s.password}@{s.ip}:{s.port}"
             else:
-                proxy_url = f"{s.scheme}://{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.ip}:{s.port}"
         return proxy_url
 
     def _perform_request(self, method, url, headers=None, data=None, json_data=None, params=None, retry_count=0):
@@ -789,7 +789,7 @@ class TlsPlugin(IVSPlg):
             
         # if params.get("proxy"):
         #     p = urlparse(params.get("proxy"))
-        #     task["proxyType"] = p.scheme
+        #     task["proxyType"] = p.proto
         #     task["proxyAddress"] = p.hostname
         #     task["proxyPort"] = p.port
         #     if p.username:

plugins/tls_plugin2.py

@@ -236,12 +236,12 @@ class TlsPlugin(IVSPlg):
             p = self.config.proxy
             if p.username and p.password:
                 proxy_cfg = {
-                    "server": f"{p.scheme}://{p.ip}:{p.port}",
+                    "server": f"{p.proto}://{p.ip}:{p.port}",
                     "username": p.username,
                     "password": p.password,
                 }
             else:
-                proxy_cfg = {"server": f"{p.scheme}://{p.ip}:{p.port}"}
+                proxy_cfg = {"server": f"{p.proto}://{p.ip}:{p.port}"}
         else:
             self._log("[WARN] No proxy configured!")
 
@@ -756,9 +756,9 @@ class TlsPlugin(IVSPlg):
         if self.config.proxy.ip:
             s = self.config.proxy
             if s.username:
-                proxy_url = f"{s.scheme}://{s.username}:{s.password}@{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.username}:{s.password}@{s.ip}:{s.port}"
             else:
-                proxy_url = f"{s.scheme}://{s.ip}:{s.port}"
+                proxy_url = f"{s.proto}://{s.ip}:{s.port}"
         return proxy_url
 
     def _perform_request(self, method, url, headers=None, data=None, json_data=None, params=None, retry_count=0):
@@ -892,7 +892,7 @@ class TlsPlugin(IVSPlg):
             
         # if params.get("proxy"):
         #     p = urlparse(params.get("proxy"))
-        #     task["proxyType"] = p.scheme
+        #     task["proxyType"] = p.proto
         #     task["proxyAddress"] = p.hostname
         #     task["proxyPort"] = p.port
         #     if p.username:

plugins/vfs_plugin.py

@@ -233,7 +233,7 @@ class VfsPlugin(IVSPlg):
                 co.set_argument(f'--proxy-server={local_proxy}')
                 
             else:
-                proxy_str = f"{p.scheme}://{p.ip}:{p.port}"
+                proxy_str = f"{p.proto}://{p.ip}:{p.port}"
                 co.set_argument(f'--proxy-server={proxy_str}')
         else:
             self._log("[WARN] No proxy configured!")
@@ -589,9 +589,9 @@ class VfsPlugin(IVSPlg):
         if self.config.proxy and self.config.proxy.ip:
             s = self.config.proxy
             if s.username:
-                return f"{s.scheme}://{s.username}:{s.password}@{s.ip}:{s.port}"
+                return f"{s.proto}://{s.username}:{s.password}@{s.ip}:{s.port}"
             else:
-                return f"{s.scheme}://{s.ip}:{s.port}"
+                return f"{s.proto}://{s.ip}:{s.port}"
         return None
     
     def _get_realnetwork_ip(self):

sentinel.py

@@ -154,7 +154,7 @@ class SentinelGCO:
                     plg_cfg.proxy.id = proxy['id']
                     plg_cfg.proxy.ip = proxy['ip']
                     plg_cfg.proxy.port = proxy['port']
-                    plg_cfg.proxy.scheme = proxy['scheme']
+                    plg_cfg.proxy.proto = proxy['proto']
                     plg_cfg.proxy.username = proxy['username']
                     plg_cfg.proxy.password = proxy['password']
 

test/tls_standalone.py

@@ -57,7 +57,7 @@ class TlsAutoBot:
         # 2. 代理配置
         proxy_cfg = self.config.get('proxy', {})
 
-        proxy_str = f"{proxy_cfg.get('schema')}://{proxy_cfg.get('ip')}:{proxy_cfg.get('port')}"
+        proxy_str = f"{proxy_cfg.get('proto')}://{proxy_cfg.get('ip')}:{proxy_cfg.get('port')}"
         print(f'set proxy={proxy_str}')
         co.set_argument(f'--proxy-server={proxy_str}')
 
@@ -88,7 +88,7 @@ class TlsAutoBot:
             
         if use_proxy:
             proxy = self.config['proxy']
-            task["proxyType"] = proxy.get('scheme', 'http')
+            task["proxyType"] = proxy.get('proto', 'http')
             task["proxyAddress"] = proxy.get('ip')
             task["proxyPort"] = int(proxy.get('port'))
             if proxy.get('username'):
@@ -735,7 +735,7 @@ if __name__ == "__main__":
         },
         # 代理配置
         "proxy": {
-            "schema": "http",
+            "proto": "http",
             "ip": "127.0.0.1",   
             "port": "7890",      
             "username": "",      

tls_registration_bot.py

@@ -191,7 +191,7 @@ class TlsRegistrator:
                 self._log(f"Tunnel started at {local_proxy}")
                 co.set_argument(f'--proxy-server={local_proxy}')
             else:
-                proxy_str = f"{p.get('scheme', 'http')}://{p['ip']}:{p['port']}"
+                proxy_str = f"{p.get('proto', 'http')}://{p['ip']}:{p['port']}"
                 co.set_argument(f'--proxy-server={proxy_str}')
         else:
             self._log("[WARN] No proxy configured!")
@@ -243,7 +243,7 @@ class TlsRegistrator:
             
         if use_proxy:
             proxy = self.proxy_config
-            task["proxyType"] = proxy.get('scheme', 'http')
+            task["proxyType"] = proxy.get('proto', 'http')
             task["proxyAddress"] = proxy.get('ip')
             task["proxyPort"] = int(proxy.get('port'))
             if proxy.get('username'):

vs_types.py

@@ -128,7 +128,7 @@ class VSAccount(BaseModel):
 
 class VSProxy(BaseModel):
     id: int = 0
-    scheme: str = "http"
+    proto: str = "http"
     ip: str = ""
     port: int = 0
     username: str = ""