Compare commits
3 Commits
v0.61.7
...
dev_scan_f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
54f0292712 | ||
|
|
46c56134f7 | ||
|
|
1c1f7f1098 |
@@ -47,8 +47,8 @@ def backend_str(backend: MinerTypes) -> str:
|
|||||||
return "Stock Firmware Goldshells"
|
return "Stock Firmware Goldshells"
|
||||||
case MinerTypes.LUX_OS:
|
case MinerTypes.LUX_OS:
|
||||||
return "LuxOS Firmware Miners"
|
return "LuxOS Firmware Miners"
|
||||||
case MinerTypes.EPIC:
|
case MinerTypes.MARATHON:
|
||||||
return "ePIC Firmware Miners"
|
return "Mara Firmware Miners"
|
||||||
|
|
||||||
|
|
||||||
def create_url_str(mtype: str):
|
def create_url_str(mtype: str):
|
||||||
|
|||||||
@@ -608,7 +608,7 @@ details {
|
|||||||
</ul>
|
</ul>
|
||||||
</details>
|
</details>
|
||||||
<details>
|
<details>
|
||||||
<summary>None:</summary>
|
<summary>Mara Firmware Miners:</summary>
|
||||||
<ul>
|
<ul>
|
||||||
<details>
|
<details>
|
||||||
<summary>X19 Series:</summary>
|
<summary>X19 Series:</summary>
|
||||||
|
|||||||
@@ -542,25 +542,25 @@ 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 asyncio.wait_for(
|
||||||
|
c.get(url, follow_redirects=True),
|
||||||
|
settings.get("api_function_timeout", 5),
|
||||||
|
)
|
||||||
return resp.text, resp
|
return resp.text, resp
|
||||||
except (
|
except (
|
||||||
httpx.HTTPError,
|
httpx.HTTPError,
|
||||||
|
|||||||
Reference in New Issue
Block a user