midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2026-03-02 01:15:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

use readURL / fix LINTING errors.

Browse Source
This commit is contained in:
gerlofvanek
2024-09-11 12:55:20 +02:00
parent b6d29a33d2
commit cdfb9132ad
4 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
basicswap/base.py
View File

@@ -179,27 +179,20 @@ class BaseApp:
return False
def readURL(self, url: str, timeout: int = 120, headers={}) -> bytes:
use_tor = self.is_tor_available()
try:
if use_tor:
proxy_handler = SocksiPyHandler(socks.PROXY_TYPE_SOCKS5, self.tor_proxy_host, self.tor_proxy_port)
opener = urllib.request.build_opener(proxy_handler)
else:
opener = urllib.request.build_opener()
opener.addheaders = [(key, value) for key, value in headers.items()]
request = urllib.request.Request(url)
with opener.open(request, timeout=timeout) as response:
return response.read()
except urllib.error.URLError as e:
if isinstance(e.reason, ConnectionRefusedError) and use_tor:
error_msg = f"Connection refused. Tor proxy might not be running. Error: {str(e)}"
else:
error_msg = f"URLError: {str(e)}"
except Exception as e:
error_msg = f"Unexpected error: {str(e)}"
return json.dumps({"Error": error_msg}).encode()
open_handler = None
if self.use_tor_proxy:
open_handler = SocksiPyHandler(socks.PROXY_TYPE_SOCKS5, self.tor_proxy_host, self.tor_proxy_port)
opener = urllib.request.build_opener(open_handler) if self.use_tor_proxy else urllib.request.build_opener()
if headers is None:
opener.addheaders = [('User-agent', 'Mozilla/5.0')]
request = urllib.request.Request(url, headers=headers)
return opener.open(request, timeout=timeout).read()
def logException(self, message) -> None:
self.log.error(message)
if self.debug:
self.log.error(traceback.format_exc())
def torControl(self, query):
try: