unshackle-dl/unshackle
1
0
Fork 0
forked from kenzuya/unshackle
Code Pull Requests 1 Activity

fix(proxies): harden surfshark and windscribe selection

Browse Source
This commit is contained in:
Andy
2026-02-07 20:34:31 -07:00
parent 71adee4ec6
commit 984a8b9efa
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
unshackle/core/proxies/surfsharkvpn.py
View File

@@ -142,12 +142,17 @@ class SurfsharkVPN(Proxy):
) )
# Get connection names from filtered servers # Get connection names from filtered servers
connection_names = [x["connectionName"] for x in servers] if not servers:
raise ValueError(f"Could not get random server for country '{country_id}': no servers found.")
# Only include servers that actually have a connection name to avoid KeyError.
connection_names = [x["connectionName"] for x in servers if "connectionName" in x]
if not connection_names:
raise ValueError(
f"Could not get random server for country '{country_id}': no servers with connectionName found."
)
try:
return random.choice(connection_names) return random.choice(connection_names)
except (IndexError, KeyError):
raise ValueError(f"Could not get random server for country '{country_id}'.")
@staticmethod @staticmethod
def get_countries() -> list[dict]: def get_countries() -> list[dict]:

2
unshackle/core/proxies/windscribevpn.py
View File

@@ -62,7 +62,7 @@ class WindscribeVPN(Proxy):
server_map_key = f"{query}:{city}" if city else query server_map_key = f"{query}:{city}" if city else query
if server_map_key in self.server_map: if server_map_key in self.server_map:
hostname = self.server_map[server_map_key] hostname = self.server_map[server_map_key]
elif query in self.server_map and not city: elif query in self.server_map:
hostname = self.server_map[query] hostname = self.server_map[query]
else: else:
server_match = re.match(r"^([a-z]{2})(\d+)$", query) server_match = re.match(r"^([a-z]{2})(\d+)$", query)