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

moonraker: update request handlers to accept WebRequest objects 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-11-09 07:00:20 -05:00
parent faa415a823
commit ac38899d1f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
moonraker/moonraker.py
View File

@ -362,14 +362,16 @@ class Server:
self.klippy_state = state self.klippy_state = state
self.send_event("server:status_update", status) self.send_event("server:status_update", status)
async def make_request(self, rpc_method, params): async def make_request(self, web_request):
# XXX - This adds the "response_template" to a subscription # XXX - This adds the "response_template" to a subscription
# request and tracks all subscriptions so that each # request and tracks all subscriptions so that each
# client gets what its requesting. In the future we should # client gets what its requesting. In the future we should
# track subscriptions per client and send clients only # track subscriptions per client and send clients only
# the data they are asking for. # the data they are asking for.
rpc_method = web_request.get_endpoint()
args = web_request.get_args()
if rpc_method == "objects/subscribe": if rpc_method == "objects/subscribe":
for obj, items in params.get('objects', {}).items(): for obj, items in args.get('objects', {}).items():
if obj in self.all_subscriptions: if obj in self.all_subscriptions:
pi = self.all_subscriptions[obj] pi = self.all_subscriptions[obj]
if items is None or pi is None: if items is None or pi is None:
@ -379,10 +381,11 @@ class Server:
self.all_subscriptions[obj] = uitems self.all_subscriptions[obj] = uitems
else: else:
self.all_subscriptions[obj] = items self.all_subscriptions[obj] = items
params['objects'] = dict(self.all_subscriptions) args['objects'] = dict(self.all_subscriptions)
params['response_template'] = {'method': "process_status_update"} args['response_template'] = {'method': "process_status_update"}
base_request = BaseRequest(rpc_method, params) # Create a base klippy request
base_request = BaseRequest(rpc_method, args)
self.pending_requests[base_request.id] = base_request self.pending_requests[base_request.id] = base_request
self.ioloop.spawn_callback( self.ioloop.spawn_callback(
self.klippy_connection.send_request, base_request) self.klippy_connection.send_request, base_request)
@ -402,11 +405,11 @@ class Server:
await self.moonraker_app.close() await self.moonraker_app.close()
self.ioloop.stop() self.ioloop.stop()
async def _handle_server_restart(self, path, method, args): async def _handle_server_restart(self, web_request):
self.ioloop.spawn_callback(self._stop_server) self.ioloop.spawn_callback(self._stop_server)
return "ok" return "ok"
async def _handle_info_request(self, path, method, args): async def _handle_info_request(self, web_request):
return { return {
'klippy_connected': self.klippy_connection.is_connected(), 'klippy_connected': self.klippy_connection.is_connected(),
'klippy_state': self.klippy_state, 'klippy_state': self.klippy_state,