Skip to content

add pinger routine #128

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
kenanfarukcakir wants to merge 5 commits into
base: main
Choose a base branch
from
Open

add pinger routine #128

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad3c146
add pinger routine
kenanfarukcakir Mar 3, 2026
b5cbead
handle pong
kenanfarukcakir Mar 3, 2026
43d5f01
exception
kenanfarukcakir Mar 3, 2026
061b8f9
some refactor
kenanfarukcakir Mar 3, 2026
d01f071
update
kenanfarukcakir Mar 3, 2026
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
Prev Previous commit
Next Next commit
some refactor
  • Loading branch information
@kenanfarukcakir
kenanfarukcakir committed Mar 3, 2026
commit 061b8f91e871e68879813d3c8c5c944c074d8b92
80 changes: 46 additions & 34 deletions lighter/ws_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def __init__(

self.ws = None
self.ping_interval = ping_interval
self.stop_event = threading.Event()

def on_message(self, ws, message):
if isinstance(message, str):
Expand All @@ -60,7 +59,6 @@ def on_message(self, ws, message):
# Respond to ping with pong
ws.send(json.dumps({"type": "pong"}))
elif message_type == "pong":
# Noop
pass
else:
self.handle_unhandled_message(message)
Expand Down Expand Up @@ -160,57 +158,71 @@ def handle_unhandled_message(self, message):
raise Exception(f"Unhandled message: {message}")

def on_error(self, ws, error):
self.stop_event.set()
raise Exception(f"Error: {error}")

def on_close(self, ws, close_status_code, close_msg):
self.stop_event.set()
raise Exception(f"Closed: {close_status_code} {close_msg}")

def _ping_loop(self):
while not self.stop_event.is_set():
time.sleep(self.ping_interval)
if self.ws and not self.stop_event.is_set():
def _ping_loop(self, stop_event):
while not stop_event.is_set():
stop_event.wait(self.ping_interval)
if self.ws and not stop_event.is_set():
try:
self.ws.send(json.dumps({"type": "ping"}))
except Exception:
except Exception as e:
print(f"Ping failed: {e}")
break

async def _ping_loop_async(self):
while not self.stop_event.is_set():
await asyncio.sleep(self.ping_interval)
if self.ws and not self.stop_event.is_set():
try:
async def _ping_loop_async(self, stop_event):
while not stop_event.is_set():
try:
await asyncio.sleep(self.ping_interval)
if self.ws and not stop_event.is_set():
await self.ws.send(json.dumps({"type": "ping"}))
except Exception:
break
except asyncio.CancelledError:
break
except Exception as e:
print(f"Async ping failed: {e}")
break

def run(self):
self.stop_event.clear()
ws = connect(self.base_url)
self.ws = ws
stop_event = threading.Event()
ping_thread = None
try:
with connect(self.base_url) as ws:
self.ws = ws
ping_thread = threading.Thread(target=self._ping_loop, args=(stop_event,), daemon=True)
ping_thread.start()

ping_thread = threading.Thread(target=self._ping_loop, daemon=True)
ping_thread.start()
for message in ws:
self.on_message(ws, message)

try:
for message in ws:
self.on_message(ws, message)
except Exception as e:
print(f"Connection terminated unexpectedly: {e}")
finally:
self.stop_event.set()
stop_event.set()
self.ws = None
if ping_thread:
ping_thread.join(timeout=1)

async def run_async(self):
self.stop_event.clear()
ws = await connect_async(self.base_url)
self.ws = ws
stop_event = asyncio.Event()
ping_task = None
try:
async with connect_async(self.base_url) as ws:
self.ws = ws
ping_task = asyncio.create_task(self._ping_loop_async(stop_event))

ping_task = asyncio.create_task(self._ping_loop_async())
async for message in ws:
await self.on_message_async(ws, message)

try:
async for message in ws:
await self.on_message_async(ws, message)
except Exception as e:
print(f"Connection terminated unexpectedly: {e}")
finally:
self.stop_event.set()
ping_task.cancel()
stop_event.set()
if ping_task:
ping_task.cancel()
# Wait for the task to acknowledge cancellation
await asyncio.gather(ping_task, return_exceptions=True)
self.ws = None