3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

websockets: implement "register_notification" method 

Rather than require developers to add new notification handlers to websockets.py directly, implement a method that may be called to register websocket notifications during init.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-02-17 08:14:12 -05:00
parent eb37ce767d
commit b726747261
1 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
moonraker/websockets.py
View File

@ -169,52 +169,14 @@ class WebsocketManager:
self.rpc.register_method("server.websocket.id", self._handle_id_request) self.rpc.register_method("server.websocket.id", self._handle_id_request)
# Register events def register_notification(self, event_name, notify_name=None):
self.server.register_event_handler( if notify_name is None:
"server:klippy_ready", self._handle_klippy_ready) notify_name = event_name.split(':')[-1]
self.server.register_event_handler(
"server:klippy_shutdown", self._handle_klippy_shutdown)
self.server.register_event_handler(
"server:klippy_disconnect", self._handle_klippy_disconnect)
self.server.register_event_handler(
"server:gcode_response", self._handle_gcode_response)
self.server.register_event_handler(
"file_manager:filelist_changed", self._handle_filelist_changed)
self.server.register_event_handler(
"file_manager:metadata_update", self._handle_metadata_update)
self.server.register_event_handler(
"gpio_power:power_changed", self._handle_power_changed)
self.server.register_event_handler(
"update_manager:update_response", self._handle_update_response)
self.server.register_event_handler(
"update_manager:update_refreshed", self._handle_update_refreshed)
async def _handle_klippy_ready(self): async def notify_handler(*args):
await self.notify_websockets("klippy_ready") await self.notify_websockets(notify_name, *args)
self.server.register_event_handler(
async def _handle_klippy_shutdown(self): event_name, notify_handler)
await self.notify_websockets("klippy_shutdown")
async def _handle_klippy_disconnect(self):
await self.notify_websockets("klippy_disconnected")
async def _handle_gcode_response(self, response):
await self.notify_websockets("gcode_response", response)
async def _handle_filelist_changed(self, flist):
await self.notify_websockets("filelist_changed", flist)
async def _handle_metadata_update(self, metadata):
await self.notify_websockets("metadata_update", metadata)
async def _handle_power_changed(self, pstatus):
await self.notify_websockets("power_changed", pstatus)
async def _handle_update_response(self, response):
await self.notify_websockets("update_response", response)
async def _handle_update_refreshed(self, refresh_info):
await self.notify_websockets("update_refreshed", refresh_info)
def register_local_handler(self, api_def, callback): def register_local_handler(self, api_def, callback):
for ws_method, req_method in \ for ws_method, req_method in \