CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: move client into web ping to try to fix scanning failing.

Browse Source
This commit is contained in:
Upstream Data
2024-04-26 13:07:08 -06:00
parent 5c79c6cb0c
commit 1c1f7f1098
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pyasic/miners/factory.py
View File

@@ -542,25 +542,22 @@ class MinerFactory:
async def _get_miner_web(self, ip: str) -> MinerTypes | None: async def _get_miner_web(self, ip: str) -> MinerTypes | None:
urls = [f"http://{ip}/", f"https://{ip}/"] urls = [f"http://{ip}/", f"https://{ip}/"]
async with httpx.AsyncClient( tasks = [asyncio.create_task(self._web_ping(url)) for url in urls]
transport=settings.transport(verify=False)
) as session:
tasks = [asyncio.create_task(self._web_ping(session, url)) for url in urls]
text, resp = await concurrent_get_first_result( text, resp = await concurrent_get_first_result(
tasks, tasks,
lambda x: x[0] is not None lambda x: x[0] is not None and self._parse_web_type(x[0], x[1]) is not None,
and self._parse_web_type(x[0], x[1]) is not None, )
) if text is not None:
if text is not None: return self._parse_web_type(text, resp)
return self._parse_web_type(text, resp)
@staticmethod @staticmethod
async def _web_ping( async def _web_ping(url: str) -> tuple[str | None, httpx.Response | None]:
session: httpx.AsyncClient, url: str
) -> tuple[str | None, httpx.Response | None]:
try: try:
resp = await session.get(url, follow_redirects=True) async with httpx.AsyncClient(
transport=settings.transport(verify=False)
) as c:
resp = await c.get(url, follow_redirects=True)
return resp.text, resp return resp.text, resp
except ( except (
httpx.HTTPError, httpx.HTTPError,