Fix exception processing (#15)

.gitignore

@@ -4,3 +4,6 @@
 ### direnv ###
 .direnv
 .envrc
+
+### VisualStudioCode ###
+.vscode/*

debian/changelog

@@ -1,3 +1,9 @@
+python-mqttrpc (1.2.5) stable; urgency=medium
+
+  * Fix exception processing
+
+ -- Petr Krasnoshchekov <petr.krasnoshchekov@wirenboard.com>  Tue, 23 Jul 2024 12:49:49 +0500
+
 python-mqttrpc (1.2.4) stable; urgency=medium
 
   * mqtt-rpc-client: fix error handling

mqttrpc/dispatcher.py

@@ -3,11 +3,11 @@
 For usage examples see :meth:`Dispatcher.add_method`
 
 """
+
 from collections.abc import MutableMapping
 
 
 class Dispatcher(MutableMapping):
-
     """Dictionary like object which maps method_name to method."""
 
     def __init__(self, prototype=None):

mqttrpc/manager.py

@@ -18,7 +18,6 @@
 
 
 class MQTTRPCResponseManager(object):
-
     """MQTT-RPC response manager.
 
     Method brings syntactic sugar into library. Given dispatcher it handles
@@ -56,7 +55,7 @@ def handle(cls, request_str, service_id, method_id, dispatcher):
             return erroneous_response
 
     @classmethod
-    def _process_exception(cls, request, e):
+    def _process_exception(cls, request, method, e):
         data = {
             "type": e.__class__.__name__,
             "args": e.args,
@@ -91,7 +90,7 @@ def handle_request(cls, request, service_id, method_id, dispatcher):
             try:
                 result = method(*request.args, **request.kwargs)
             except Exception as e:
-                output = cls._process_exception(request, e)
+                output = cls._process_exception(request, method, e)
             else:
                 output = MQTTRPC10Response(_id=request._id, result=result)
         finally:
@@ -124,7 +123,7 @@ async def handle_request(cls, request, service_id, method_id, dispatcher):
             try:
                 result = await method(*request.args, **request.kwargs)
             except Exception as e:
-                output = cls._process_exception(request, e)
+                output = cls._process_exception(request, method, e)
             else:
                 output = MQTTRPC10Response(_id=request._id, result=result)
         finally:

mqttrpc/protocol.py

@@ -6,7 +6,6 @@
 
 
 class MQTTRPCBaseRequest(JSONSerializable):
-
     """Base class for JSON-RPC 1.0 and JSON-RPC 2.0 requests."""
 
     def __init__(self, params=None, _id=None, is_notification=None):
@@ -50,7 +49,6 @@ def json(self):
 
 
 class MQTTRPCBaseResponse(JSONSerializable):
-
     """Base class for JSON-RPC 1.0 and JSON-RPC 2.0 responses."""
 
     def __init__(self, result=None, error=None, _id=None):
@@ -80,7 +78,6 @@ def json(self):
 
 
 class MQTTRPC10Request(MQTTRPCBaseRequest):
-
     """A rpc call is represented by sending a Request object to a Server.
 
     :param params: A Structured value that holds the parameter values to be
@@ -181,7 +178,6 @@ def from_json(cls, json_str):
 
 
 class MQTTRPC10Response(MQTTRPCBaseResponse):
-
     """JSON-RPC response object to JSONRPC20Request.
 
     When a rpc call is made, the Server MUST reply with a Response, except for