Make function receiveMessage more clear

Author: haeter525

quark/script/frida/__init__.py

@@ -59,30 +59,30 @@ def stopWatchingMethodCall(
         if methodId in self.watchedMethods:
             del self.watchedMethods[methodId]
 
-    def receiveMessage(self, messageFromFridaAgent: dict, _) -> None:
-        if messageFromFridaAgent["type"] == "error":
-            errorDescription = messageFromFridaAgent["description"]
+    def handleCapturedEvent(self, eventWrapperFromFrida: dict, _) -> None:
         """Send the event captured by Frida to the corresponding
          buffers.
 
         :param eventWrapperFromFrida: python dict containing captured events
         """
+        if eventWrapperFromFrida["type"] == "error":
+            errorDescription = eventWrapperFromFrida["description"]
             print(errorDescription, file=sys.stderr)
             return
 
-        receivedEvent = json.loads(messageFromFridaAgent["payload"])
+        methodCallEvent = json.loads(eventWrapperFromFrida["payload"])
 
-        eventType = receivedEvent.get("type", None)
+        eventType = methodCallEvent.get("type", None)
 
         if eventType == "CallCaptured":
-            methodId = tuple(receivedEvent["identifier"][0:2])
+            methodId = tuple(methodCallEvent["identifier"][0:2])
 
             if methodId in self.watchedMethods:
                 messageBuffer = self.watchedMethods[methodId]
-                messageBuffer.append(receivedEvent)
+                messageBuffer.append(methodCallEvent)
 
         elif eventType == "FailedToWatch":
-            methodId = tuple(receivedEvent["identifier"])
+            methodId = tuple(methodCallEvent["identifier"])
             self.watchedMethods.pop(methodId)
 
 
@@ -128,7 +128,7 @@ def _injectAgent(frida: FridaSession) -> MethodCallEventDispatcher:
 
     with open(pathToFridaAgentSource, "r") as fridaAgentSource:
         fridaAgent = dispatcher.frida.create_script(fridaAgentSource.read())
-        fridaAgent.on("message", dispatcher.receiveMessage)
+        fridaAgent.on("message", dispatcher.handleCapturedEvent)
         fridaAgent.load()
         dispatcher.script = fridaAgent
 

tests/script/test_frida.py

@@ -87,7 +87,7 @@ def testStartWatchingMethodFailed(dispatcherThatHooksOneMethod):
             ),
         }
 
-        dispatcher.receiveMessage(failedToWatchMessage, None)
+        dispatcher.handleCapturedEvent(failedToWatchMessage, None)
 
         assert (
             dispatcher._getMethodIdentifier(targetMethod, methodParamTypes)
@@ -147,7 +147,7 @@ def testDispatchCallMessage(dispatcherThatHooksOneMethod):
             "payload": json.dumps(expectedEvent),
         }
 
-        dispatcher.receiveMessage(callMessage, None)
+        dispatcher.handleCapturedEvent(callMessage, None)
 
         assert expectedEvent in buffer
 
@@ -157,7 +157,7 @@ def testDispatchErrorMessage(dispatcherThatHooksOneMethod, capsys):
 
         errorMessage = {"type": "error", "description": "Any description."}
 
-        dispatcher.receiveMessage(errorMessage, None)
+        dispatcher.handleCapturedEvent(errorMessage, None)
 
         captured = capsys.readouterr()