admin/ProxyCat
1
0
Fork 0
mirror of https://github.com/honmashironeko/ProxyCat.git synced 2025-05-08 19:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
本间白猫 2025-01-03 15:49:47 +08:00
parent 627285fd56
commit afbb055033
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/proxyserver.py
View File

@ -64,7 +64,7 @@ class AsyncProxyServer:
valid_proxies.append(new_ip) valid_proxies.append(new_ip)
break break
else: else:
logging.error("Failed to get a valid proxy after multiple attempts") logging.error(get_message('multiple_proxy_fail', self.language))
exit(1) exit(1)
return valid_proxies[0] return valid_proxies[0]
@ -74,11 +74,11 @@ class AsyncProxyServer:
proxies = [line.strip() for line in file if '://' in line] proxies = [line.strip() for line in file if '://' in line]
valid_proxies = [p for p in proxies if validate_proxy(p)] valid_proxies = [p for p in proxies if validate_proxy(p)]
if not valid_proxies: if not valid_proxies:
logging.error("No valid proxies found in the file") logging.error(get_message('no_valid_proxies', self.language))
exit(1) exit(1)
return valid_proxies return valid_proxies
except FileNotFoundError: except FileNotFoundError:
logging.error(f"Proxy file not found: {self.proxy_file}") logging.error(get_message('proxy_file_not_found', self.language, self.proxy_file))
exit(1) exit(1)
async def get_proxy(self): async def get_proxy(self):
@ -87,7 +87,7 @@ class AsyncProxyServer:
else: else:
self.current_proxy = next(self.proxy_cycle) self.current_proxy = next(self.proxy_cycle)
self.last_switch_time = time.time() self.last_switch_time = time.time()
logging.info(f"Switched to proxy: {self.current_proxy}") logging.info(get_message('proxy_switch', self.language, self.current_proxy))
async def custom_proxy_switch(self): async def custom_proxy_switch(self):
return self.proxies[0] if self.proxies else "No proxies available" return self.proxies[0] if self.proxies else "No proxies available"
@ -369,11 +369,11 @@ class AsyncProxyServer:
self._pipe(remote_reader, writer) self._pipe(remote_reader, writer)
) )
except asyncio.TimeoutError: except asyncio.TimeoutError:
logging.error("Connection timeout") logging.error(get_message('connect_timeout', self.language))
writer.write(b'HTTP/1.1 504 Gateway Timeout\r\n\r\n') writer.write(b'HTTP/1.1 504 Gateway Timeout\r\n\r\n')
await writer.drain() await writer.drain()
except Exception as e: except Exception as e:
logging.error("Proxy invalid, switching") logging.error(get_message('proxy_invalid_switch', self.language))
if not self.proxy_failed: if not self.proxy_failed:
self.proxy_failed = True self.proxy_failed = True
await self.get_proxy() await self.get_proxy()

10
requirements.txt
View File

@ -1,6 +1,4 @@
requests colorama==0.4.6
pysocks httpx==0.27.2
colorama packaging==24.1
httpx Requests==2.32.3
packaging
httpx[socks]