sok-ble 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

sok_ble/sok_bluetooth_device.py

@@ -9,10 +9,14 @@ import struct
 import logging
 import statistics
 
+import async_timeout
+from bleak import BleakError
+
 from bleak.backends.device import BLEDevice
 
 from sok_ble.const import UUID_RX, UUID_TX, _sok_command
 from sok_ble.sok_parser import SokParser
+from sok_ble.exceptions import BLEConnectionError
 
 logger = logging.getLogger(__name__)
 
@@ -48,51 +52,86 @@ class SokBluetoothDevice:
     async def _connect(self) -> AsyncIterator[BleakClientWithServiceCache]:
         """Connect to the device and yield a BLE client."""
         logger.debug("Connecting to %s", self._ble_device.address)
-        if establish_connection:
-            client = await establish_connection(
-                BleakClientWithServiceCache,
-                self._ble_device,
-                self._ble_device.name or self._ble_device.address,
-                adapter=self._adapter,
-            )
-        else:
-            client = BleakClientWithServiceCache(
-                self._ble_device,
-                adapter=self._adapter,
-            )
-            await client.connect()
-        try:
-            yield client
-        finally:
-            await client.disconnect()
-            logger.debug("Disconnected from %s", self._ble_device.address)
+        last_err: Exception | None = None
+        for attempt in range(3):
+            try:
+                if establish_connection:
+                    client = await establish_connection(
+                        BleakClientWithServiceCache,
+                        self._ble_device,
+                        self._ble_device.name or self._ble_device.address,
+                        adapter=self._adapter,
+                    )
+                else:
+                    client = BleakClientWithServiceCache(
+                        self._ble_device, adapter=self._adapter
+                    )
+                    await client.connect()
+
+                # Force service discovery
+                async with async_timeout.timeout(5):
+                    _ = client.services
+                await asyncio.sleep(0.15)
+
+                try:
+                    yield client
+                finally:
+                    await client.disconnect()
+                    logger.debug(
+                        "Disconnected from %s", self._ble_device.address
+                    )
+                return
+            except (BleakError, asyncio.TimeoutError) as err:
+                last_err = err
+                logger.debug(
+                    "BLE connect attempt %s failed for %s: %s",
+                    attempt + 1,
+                    self._ble_device.address,
+                    err,
+                )
+                await asyncio.sleep(0.5)
+
+        raise BLEConnectionError(
+            f"Unable to establish GATT connection to {self._ble_device.address}"
+        ) from last_err
 
     async def _send_command(
         self, client: BleakClientWithServiceCache, cmd: int, expected: int
     ) -> bytes:
         """Send a command and return the response bytes with the given header."""
 
-        # If the client supports notifications (real BLE client), prefer that
-        start_notify = getattr(client, "start_notify", None)
-        if start_notify is None:
-            await client.write_gatt_char(UUID_TX, _sok_command(cmd))
-            data = bytes(await client.read_gatt_char(UUID_RX))
-            return data
-
-        queue: asyncio.Queue[bytes] = asyncio.Queue()
-
-        def handler(_: int, data: bytearray) -> None:
-            queue.put_nowait(bytes(data))
-
-        await client.start_notify(UUID_RX, handler)
-        try:
-            await client.write_gatt_char(UUID_TX, _sok_command(cmd))
-            while True:
-                data = await asyncio.wait_for(queue.get(), 5.0)
-                if struct.unpack_from(">H", data)[0] == expected:
+        for attempt in range(2):
+            try:
+                start_notify = getattr(client, "start_notify", None)
+                if start_notify is None:
+                    await client.write_gatt_char(UUID_TX, _sok_command(cmd))
+                    data = bytes(await client.read_gatt_char(UUID_RX))
                     return data
-        finally:
-            await client.stop_notify(UUID_RX)
+
+                queue: asyncio.Queue[bytes] = asyncio.Queue()
+
+                def handler(_: int, data: bytearray) -> None:
+                    queue.put_nowait(bytes(data))
+
+                await client.start_notify(UUID_RX, handler)
+                try:
+                    await client.write_gatt_char(UUID_TX, _sok_command(cmd))
+                    while True:
+                        data = await asyncio.wait_for(queue.get(), 5.0)
+                        if struct.unpack_from(">H", data)[0] == expected:
+                            return data
+                finally:
+                    await client.stop_notify(UUID_RX)
+            except BleakError as err:
+                if attempt == 0:
+                    logger.debug(
+                        "BLE command attempt failed for %s: %s",
+                        self._ble_device.address,
+                        err,
+                    )
+                    await asyncio.sleep(0.2)
+                    continue
+                raise
 
     async def async_update(self) -> None:
         """Poll the device for all telemetry and update attributes."""

{sok_ble-0.1.1.dist-info → sok_ble-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sok-ble
-Version: 0.1.1
+Version: 0.1.3
 Summary: SOK BLE battery interface library
 Author-email: Mitchell Carlson <mitchell.carlson.pro@gmail.com>
 License: Apache-2.0
@@ -12,8 +12,9 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
+Requires-Dist: async-timeout>=5.0.1
 Requires-Dist: bleak>=0.22.3
-Requires-Dist: bleak-retry-connector>=3.10.0
+Requires-Dist: bleak-retry-connector>=3.9.0
 
 # SOK BLE
 
@@ -38,3 +39,7 @@ async def main() -> None:
 
 asyncio.run(main())
 ```
+
+## References
+[@zuccaro's comment](https://github.com/Louisvdw/dbus-serialbattery/issues/350#issuecomment-1500658941)
+[Bluetooth-Devices/inkbird-ble](https://github.com/Bluetooth-Devices/inkbird-ble)

{sok_ble-0.1.1.dist-info → sok_ble-0.1.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
 sok_ble/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sok_ble/const.py,sha256=mHtJTbWz_dG3v1lhZrLDzMf-QAG9v5QWlHU9ZKsyYdg,998
 sok_ble/exceptions.py,sha256=7H1yUqqnrKyi3LwxRCMF7RkuGp_rgdy9j35nrMOgz44,247
-sok_ble/sok_bluetooth_device.py,sha256=ig11wLwjZFC6HEFi7hzB7_Jy1T8syyNDOTYWUbkJR4Y,6353
+sok_ble/sok_bluetooth_device.py,sha256=DlTqxtw5ZZtN-Y8gN3Gm8xGeiRVLQ_IpIxtXtHEBuWo,7878
 sok_ble/sok_parser.py,sha256=KXYxsR4868vWFs2AAI7o7XfzjNZiDgfpsmz3dFgjLco,4323
-sok_ble-0.1.1.dist-info/METADATA,sha256=Hub0gJn6lH2WJVXpSFaiYQ2vKv4nVdDvypZyNITBN2g,1233
-sok_ble-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sok_ble-0.1.1.dist-info/top_level.txt,sha256=WTVtlZ2sADYAxKEBkDJPUn4hFAH9NfIZ9Q2HP2RKpbw,8
-sok_ble-0.1.1.dist-info/RECORD,,
+sok_ble-0.1.3.dist-info/METADATA,sha256=m-hMy2a7HnPx3w40ViluiR5B56tNF7RsqG9PeroSe6I,1469
+sok_ble-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sok_ble-0.1.3.dist-info/top_level.txt,sha256=WTVtlZ2sADYAxKEBkDJPUn4hFAH9NfIZ9Q2HP2RKpbw,8
+sok_ble-0.1.3.dist-info/RECORD,,