fix v3 btminers timing out when getting their data (#422)

Co-authored-by: jamaal <jamaal@sustainhash.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 3 people

pyasic/miners/factory.py

@@ -956,8 +956,16 @@ async def _get_miner_socket(self, ip: str) -> MinerTypes | None:
             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
+            return self._parse_socket_type(data)
+
+        data_v3 = await self._socket_ping_btminer_v3(ip, "get.device.info")
+        if data_v3 is not None:
+            try:
+                parsed = json.loads(data_v3)
+                if isinstance(parsed.get("msg"), dict) and "miner" in parsed["msg"]:
+                    return MinerTypes.WHATSMINER
+            except (json.JSONDecodeError, AttributeError):
+                pass
         return None
 
     @staticmethod
@@ -1011,6 +1019,51 @@ async def _socket_ping(ip: str, cmd: str) -> str | None:
             return data.decode("utf-8")
         return None
 
+    @staticmethod
+    async def _socket_ping_btminer_v3(ip: str, cmd: str) -> str | None:
+        try:
+            reader, writer = await asyncio.wait_for(
+                asyncio.open_connection(str(ip), 4433),
+                timeout=settings.get("factory_get_timeout", 3),
+            )
+        except (ConnectionError, OSError, asyncio.TimeoutError):
+            return None
+
+        command_dict = {"cmd": cmd}
+        json_cmd = json.dumps(command_dict).encode("utf-8")
+        try:
+            writer.write(len(json_cmd).to_bytes(4, byteorder="little"))
+            writer.write(json_cmd)
+            await writer.drain()
+
+            resp_len_bytes = await asyncio.wait_for(
+                reader.readexactly(4),
+                timeout=settings.get("btminer_v3_ping_timeout", 1),
+            )
+            data = await asyncio.wait_for(
+                reader.readexactly(int.from_bytes(resp_len_bytes, byteorder="little")),
+                timeout=settings.get("factory_get_timeout", 3),
+            )
+        except (
+            ConnectionError,
+            OSError,
+            asyncio.TimeoutError,
+            asyncio.IncompleteReadError,
+        ):
+            return None
+        except asyncio.CancelledError:
+            raise
+        finally:
+            writer.close()
+            try:
+                await writer.wait_closed()
+            except (ConnectionError, OSError):
+                pass
+
+        if data:
+            return data.decode("utf-8")
+        return None
+
     @staticmethod
     def _parse_socket_type(data: str) -> MinerTypes | None:
         upper_data = data.upper()
@@ -1308,6 +1361,16 @@ async def get_miner_version_whatsminer(self, ip: str) -> str | None:
                 return version
             except LookupError:
                 pass
+
+            sock_json_data_v3 = await self.send_btminer_v3_api_command(
+                ip, "get.device.info"
+            )
+            if sock_json_data_v3 is not None:
+                try:
+                    version = sock_json_data_v3["msg"]["system"]["fwversion"]
+                    return version
+                except (TypeError, LookupError):
+                    pass
         return None
 
     async def get_miner_model_avalonminer(self, ip: str) -> str | None:

pyasic/settings/__init__.py

@@ -27,6 +27,7 @@ class Settings(BaseModel):
     network_scan_semaphore: int | None = Field(default=None)
     factory_get_retries: int = Field(default=1)
     factory_get_timeout: int = Field(default=3)
+    btminer_v3_ping_timeout: int = Field(default=1)
     get_data_retries: int = Field(default=1)
     api_function_timeout: int = Field(default=5)
     antminer_mining_mode_as_str: bool = Field(default=False)