version: bump version number.

pyasic/API/__init__.py

@@ -173,9 +173,14 @@ If you are sure you want to use this command please use API.send_command("{comma
         writer.write(data)
         logging.debug(f"{self} - ([Hidden] Send Bytes) - Draining")
         await writer.drain()
-
-        # instantiate data
-        ret_data = b""
+        ret_data = await asyncio.wait_for(reader.read(4096), timeout=timeout)
+        try:
+            # Fix for stupid whatsminer bug, reboot/restart seem to not load properly in the loop
+            # have to receive, save the data, check if there is more data by reading with a short timeout
+            # append that data if there is more, and then onto the main loop.
+            ret_data += await asyncio.wait_for(reader.read(1), timeout=1)
+        except asyncio.TimeoutError:
+            return ret_data
 
         # loop to receive all the data
         logging.debug(f"{self} - ([Hidden] Send Bytes) - Receiving")
@@ -185,6 +190,7 @@ If you are sure you want to use this command please use API.send_command("{comma
                     d = await asyncio.wait_for(reader.read(4096), timeout=timeout)
                     if not d:
                         break
+                    print("hello", d)
                     ret_data += d
                 except (asyncio.CancelledError, asyncio.TimeoutError) as e:
                     raise e
@@ -244,6 +250,8 @@ If you are sure you want to use this command please use API.send_command("{comma
         str_data = str_data.replace("}{", "},{")
         # fix an error with a bmminer return having a specific comma that breaks json.loads()
         str_data = str_data.replace("[,{", "[{")
+        # fix an error with a btminer return having a missing comma. (2023-01-06 version)
+        str_data = str_data.replace('""temp0', '","temp0')
         # fix an error with Avalonminers returning inf and nan
         str_data = str_data.replace("info", "1nfo")
         str_data = str_data.replace("inf", "0")

pyasic/API/btminer.py

@@ -247,21 +247,9 @@ class BTMinerAPI(BaseMinerAPI):
         try:
             data = await self._send_bytes(enc_command, timeout)
         except (asyncio.CancelledError, asyncio.TimeoutError) as e:
-            if command["cmd"] in ["reboot", "restart_btminer", "power_on", "power_off"]:
-                logging.info(
-                    f"{self} - (reboot/restart_btminer/power_on/power_off) - Whatsminers currently break this. "
-                    f"Ignoring exception. Command probably worked."
-                )
-                # FAKING IT HERE
-                data = (
-                    b'{"STATUS": "S", "When": 1670966423, "Code": 131, "Msg": "API command OK", "Description": "'
-                    + command["cmd"].encode("utf-8")
-                    + b'"}'
-                )
-            else:
-                if ignore_errors:
-                    return {}
-                raise APIError("No data was returned from the API.")
+            if ignore_errors:
+                return {}
+            raise APIError("No data was returned from the API.")
 
         if not data:
             if ignore_errors:

pyasic/miners/_backends/X19.py

@@ -126,6 +126,13 @@ class X19(BMMiner):
         except KeyError:
             pass
 
+        try:
+            data = await self.send_web_command("get_network_info")
+            if data:
+                return data["macaddr"]
+        except KeyError:
+            pass
+
     async def get_errors(self) -> List[MinerErrorData]:
         errors = []
         data = await self.send_web_command("summary")

pyasic/miners/antminer/bmminer/X9/S9.py

@@ -14,9 +14,54 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
+import json
+from typing import Optional, Union
+
+import httpx
+
 from pyasic.miners._backends import BMMiner  # noqa - Ignore access to _module
 from pyasic.miners._types import S9  # noqa - Ignore access to _module
+from pyasic.settings import PyasicSettings
 
 
 class BMMinerS9(BMMiner, S9):
-    pass
+    def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
+        super().__init__(ip, api_ver=api_ver)
+        self.ip = ip
+        self.uname = "root"
+        self.pwd = PyasicSettings().global_x19_password
+
+    async def send_web_command(
+        self, command: str, params: dict = None
+    ) -> Optional[dict]:
+        url = f"http://{self.ip}/cgi-bin/{command}.cgi"
+        auth = httpx.DigestAuth(self.uname, self.pwd)
+        try:
+            async with httpx.AsyncClient() as client:
+                if params:
+                    data = await client.post(url, data=params, auth=auth)
+                else:
+                    data = await client.get(url, auth=auth)
+        except httpx.HTTPError:
+            pass
+        else:
+            if data.status_code == 200:
+                try:
+                    return data.json()
+                except json.decoder.JSONDecodeError:
+                    pass
+
+    async def get_mac(self) -> Union[str, None]:
+        try:
+            data = await self.send_web_command("get_system_info")
+            if data:
+                return data["macaddr"]
+        except KeyError:
+            pass
+
+        try:
+            data = await self.send_web_command("get_network_info")
+            if data:
+                return data["macaddr"]
+        except KeyError:
+            pass

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.28.0"
+version = "0.28.3"
 description = "A set of modules for interfacing with many common types of ASIC bitcoin miners, using both their API and SSH."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"