Skip to content

fix(ws): bound endpoint discovery request timeout #170

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

Open
dajiaohuang wants to merge 1 commit into
base: v2_main
Choose a base branch
from
Open

fix(ws): bound endpoint discovery request timeout #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions lark_oapi/ws/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
from lark_oapi.ws.pb.google.protobuf.internal.containers import RepeatedCompositeFieldContainer
from lark_oapi.ws.pb.pbbp2_pb2 import Frame


_ENDPOINT_CONNECT_TIMEOUT = 10
_ENDPOINT_READ_TIMEOUT = 30

try:
loop = asyncio.get_event_loop()
except RuntimeError:
Expand Down Expand Up @@ -262,6 +266,7 @@ def _get_conn_url(self) -> str:
url,
headers=headers,
json=body,
timeout=(_ENDPOINT_CONNECT_TIMEOUT, _ENDPOINT_READ_TIMEOUT),
)
if response.status_code != http.HTTPStatus.OK:
msg = "system busy"
Expand Down
4 changes: 3 additions & 1 deletion lark_oapi/ws/tests/test_websockets_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@ def test_parse_ws_connection_exception_keeps_legacy_headers_behavior():
def test_get_conn_url_sends_custom_headers(monkeypatch):
captured = {}

def fake_post(url, *, headers=None, json=None):
def fake_post(url, *, headers=None, json=None, timeout=None):
captured["url"] = url
captured["headers"] = headers
captured["json"] = json
captured["timeout"] = timeout
return SimpleNamespace(
status_code=200,
content=b'{"code":0,"data":{"URL":"ws://example.test/callback?device_id=device&service_id=42"}}',
Expand All @@ -76,6 +77,7 @@ def fake_post(url, *, headers=None, json=None):
assert client._get_conn_url() == "ws://example.test/callback?device_id=device&service_id=42"
assert captured["url"] == client._domain + ws_client.GEN_ENDPOINT_URI
assert captured["json"] == {"AppID": "app_id", "AppSecret": "app_secret"}
assert captured["timeout"] == (10, 30)
assert captured["headers"]["x-tt-env"] == "boe"
assert captured["headers"]["x-use-ppe"] == "1"
assert captured["headers"]["locale"] == "zh"
Expand Down