bug: fix some tasks not being cancelled properly in miner factory.

pyasic/miners/miner_factory.py

@@ -389,24 +389,18 @@ MINER_CLASSES = {
 
 
 async def concurrent_get_first_result(tasks: list, verification_func: Callable):
-    while True:
+    res = None
-        await asyncio.sleep(0)
+    for fut in asyncio.as_completed(tasks):
-        if len(tasks) == 0:
+        res = await fut
-            return
+        if verification_func(res):
-        for task in tasks:
+            break
-            if task.done():
+    for t in tasks:
+        t.cancel()
         try:
-                    result = await task
+            await t
         except asyncio.CancelledError:
-                    for t in tasks:
+            pass
-                        t.cancel()
+    return res
-                    raise
-                else:
-                    if not verification_func(result):
-                        continue
-                    for t in tasks:
-                        t.cancel()
-                    return result
 
 
 class MinerFactory:
@@ -453,7 +447,7 @@ class MinerFactory:
                     task, timeout=settings.get("factory_get_timeout", 3)
                 )
             except asyncio.TimeoutError:
-                task.cancel()
+                continue
             else:
                 if miner_type is not None:
                     break
@@ -481,7 +475,7 @@ class MinerFactory:
                         task, timeout=settings.get("factory_get_timeout", 3)
                     )
                 except asyncio.TimeoutError:
-                    task.cancel()
+                    pass
 
             boser_enabled = None
             if miner_type == MinerTypes.BRAIINS_OS:
@@ -507,11 +501,15 @@ class MinerFactory:
         return await concurrent_get_first_result(tasks, lambda x: x is not None)
 
     async def _get_miner_web(self, ip: str):
+        tasks = []
+        try:
             urls = [f"http://{ip}/", f"https://{ip}/"]
             async with httpx.AsyncClient(
                 transport=settings.transport(verify=False)
             ) as session:
-            tasks = [asyncio.create_task(self._web_ping(session, url)) for url in urls]
+                tasks = [
+                    asyncio.create_task(self._web_ping(session, url)) for url in urls
+                ]
 
                 text, resp = await concurrent_get_first_result(
                     tasks,
@@ -520,6 +518,13 @@ class MinerFactory:
                 )
                 if text is not None:
                     return self._parse_web_type(text, resp)
+        except asyncio.CancelledError:
+            for t in tasks:
+                t.cancel()
+                try:
+                    await t
+                except asyncio.CancelledError:
+                    pass
 
     @staticmethod
     async def _web_ping(
@@ -565,15 +570,27 @@ class MinerFactory:
             return MinerTypes.INNOSILICON
 
     async def _get_miner_socket(self, ip: str):
+        tasks = []
+        try:
             commands = ["version", "devdetails"]
-        tasks = [asyncio.create_task(self._socket_ping(ip, cmd)) for cmd in commands]
+            tasks = [
+                asyncio.create_task(self._socket_ping(ip, cmd)) for cmd in commands
+            ]
 
             data = await concurrent_get_first_result(
-            tasks, lambda x: x is not None and self._parse_socket_type(x) is not None
+                tasks,
+                lambda x: x is not None and self._parse_socket_type(x) is not None,
             )
             if data is not None:
                 d = self._parse_socket_type(data)
                 return d
+        except asyncio.CancelledError:
+            for t in tasks:
+                t.cancel()
+                try:
+                    await t
+                except asyncio.CancelledError:
+                    pass
 
     @staticmethod
     async def _socket_ping(ip: str, cmd: str) -> Optional[str]: