Skip to content

Timeout when unable to connect to device after 40 seconds. #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Feb 21, 2022
Merged

Timeout when unable to connect to device after 40 seconds. #40

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
05304c5
Use timeout on _sendcommand.
RenierM26 Feb 19, 2022
2e99a94
Update __init__.py
RenierM26 Feb 19, 2022
2f9934c
Update __init__.py
RenierM26 Feb 19, 2022
f8f5fa3
Revert "Update __init__.py"
RenierM26 Feb 19, 2022
0d8ec6d
Revert "Update __init__.py"
RenierM26 Feb 19, 2022
06dee3e
Revert "Use timeout on _sendcommand."
RenierM26 Feb 19, 2022
a8649cb
Update __init__.py
RenierM26 Feb 19, 2022
1c56b58
Revert "Update __init__.py"
RenierM26 Feb 19, 2022
1d10da7
Update __init__.py
RenierM26 Feb 19, 2022
c15b86f
Update __init__.py
RenierM26 Feb 19, 2022
a3a0140
Update __init__.py
RenierM26 Feb 19, 2022
f13160c
Update __init__.py
RenierM26 Feb 19, 2022
86cc824
Update __init__.py
RenierM26 Feb 19, 2022
c81b67b
Update __init__.py
RenierM26 Feb 20, 2022
a06c7cc
Update __init__.py
RenierM26 Feb 20, 2022
0342578
Update __init__.py
RenierM26 Feb 20, 2022
57ca5ac
Update __init__.py
RenierM26 Feb 20, 2022
924ae1f
Alternative handling of disc state
RenierM26 Feb 20, 2022
d458741
Update __init__.py
RenierM26 Feb 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions switchbot/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,9 @@ def _connect(self, retry: int, timeout: int | None = None) -> None:

if retry < 1: # failsafe
self._stopHelper()
return
raise bluepy.btle.BTLEDisconnectError(
"Failed to connect to peripheral %s" % self._mac
)

if self._helper is None:
self._startHelper(self._interface)
Expand All @@ -277,13 +279,20 @@ def _connect(self, retry: int, timeout: int | None = None) -> None:

rsp = self._getResp(["stat", "err"], timeout)

while rsp.get("state") and rsp["state"][0] in [
while rsp and rsp["state"][0] in [
"tryconn",
"scan",
"disc",
]: # Wait for any operations to finish.
rsp = self._getResp(["stat", "err"], timeout)

# If operation in progress, disc is returned.
# Bluepy helper can't handle state. Execute stop, wait and retry.
if rsp and rsp["state"][0] == "disc":
_LOGGER.warning("Bluepy busy, waiting before retry")
self._stopHelper()
time.sleep(self._scan_timeout)
return self._connect(retry - 1, timeout)

if rsp and rsp["rsp"][0] == "err":
errcode = rsp["code"][0]
_LOGGER.debug(
Expand All @@ -306,16 +315,16 @@ def _connect(self, retry: int, timeout: int | None = None) -> None:
"Error from bluepy-helper (%s)" % errcode, rsp
)

if not rsp or rsp["state"][0] != "conn":
_LOGGER.warning("Bluehelper returned unable to connect state: %s", rsp)
if rsp is None or rsp["state"][0] != "conn":
self._stopHelper()

if rsp is None:
raise bluepy.btle.BTLEDisconnectError(
"Timed out while trying to connect to peripheral %s" % self._mac,
rsp,
_LOGGER.warning(
"Timed out while trying to connect to peripheral %s", self._mac
)

_LOGGER.warning("Bluehelper returned unable to connect state: %s", rsp)

raise bluepy.btle.BTLEDisconnectError(
"Failed to connect to peripheral %s, rsp: %s" % (self._mac, rsp)
)
Expand Down Expand Up @@ -383,7 +392,7 @@ def _readkey(self) -> bytes:

return b"\x00"

def _sendcommand(self, key: str, retry: int, timeout: int | None = None) -> bytes:
def _sendcommand(self, key: str, retry: int, timeout: int | None = 40) -> bytes:
command = self._commandkey(key)
send_success = False
notify_msg = None
Expand Down