m5/MicroPythonOS
0
0
Fork 0
mirror of https://github.com/m5stack/MicroPythonOS.git synced 2026-05-20 11:51:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

websocket.py: fix on_close() callback

Browse Source
This commit is contained in:
Thomas Farstrike
2025-11-10 07:45:11 +01:00
parent f3f975cba4
commit 4c562deb17
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal_filesystem/lib/websocket.py
+4 -3
View File
@@ -48,7 +48,7 @@ async def _process_callbacks_async():
"""Process queued callbacks asynchronously.""" """Process queued callbacks asynchronously."""
import _thread import _thread
while True: # this stops when "NWCWallet: manage_wallet_thread stopping, closing connections..." while True: # this stops when "NWCWallet: manage_wallet_thread stopping, closing connections..."
#print(f"thread {_thread.get_ident()}: _process_callbacks_async") #print(f"_process_callbacks_async thread {_thread.get_ident()}: _process_callbacks_async")
while _callback_queue: while _callback_queue:
_log_debug("Processing callbacks queue...") _log_debug("Processing callbacks queue...")
try: try:
@@ -260,7 +260,7 @@ class WebSocketApp:
while self.running: while self.running:
_log_debug("Main loop iteration: self.running=True") _log_debug("Main loop iteration: self.running=True")
try: try:
await self._connect_and_run() await self._connect_and_run() # keep waiting for it, until finished
except Exception as e: except Exception as e:
_log_error(f"_async_main got exception: {e}") _log_error(f"_async_main got exception: {e}")
self.has_errored = True self.has_errored = True
@@ -275,6 +275,8 @@ class WebSocketApp:
# Cleanup # Cleanup
_log_debug("Initiating cleanup") _log_debug("Initiating cleanup")
_run_callback(self.on_close, self, None, None)
await asyncio.sleep(1) # wait a bit for _process_callbacks_async to call on_close
self.running = False self.running = False
callback_task.cancel() # Stop callback task callback_task.cancel() # Stop callback task
try: try:
@@ -282,7 +284,6 @@ class WebSocketApp:
except asyncio.CancelledError: except asyncio.CancelledError:
_log_debug("Callback task cancelled") _log_debug("Callback task cancelled")
await self._close_async() await self._close_async()
_run_callback(self.on_close, self, None, None)
_log_debug("_async_main completed") _log_debug("_async_main completed")
async def _connect_and_run(self): async def _connect_and_run(self):