combine.

Author: janiversen

pymodbus/framer/base.py

@@ -63,28 +63,24 @@ def buildFrame(self, message: ModbusPDU) -> bytes:
         frame = self.encode(data, message.dev_id, message.transaction_id)
         return frame
 
-    def handleFrame(self, data: bytes, _exp_devid: int, _exp_tid: int) -> tuple[int, ModbusPDU | None]:
+    def handleFrame(self, data: bytes, exp_devid: int, exp_tid: int) -> tuple[int, ModbusPDU | None]:
         """Process incoming data."""
         used_len = 0
         while True:
             if used_len >= len(data):
                 return used_len, None
             Log.debug("Processing: {}", data, ":hex")
-            data_len, pdu = self._internHandleFrame(data[used_len:])
+            data_len, dev_id, tid, frame_data = self.decode(data)
             used_len += data_len
-            if not data_len:
+            if (    not frame_data
+                    or (exp_devid and dev_id != exp_devid)
+                    or (exp_tid and tid != exp_tid)
+            ):
+                if data_len:
+                    continue
                 return used_len, None
-            if pdu:
-                return used_len, pdu
-
-    def _internHandleFrame(self, data: bytes) -> tuple[int, ModbusPDU | None]:
-        """Assemble PDU."""
-        used_len, dev_id, tid, frame_data = self.decode(data)
-        if not frame_data:
-            return used_len, None
-        if (result := self.decoder.decode(frame_data)) is None:
-            raise ModbusIOException("Unable to decode request")
-        result.dev_id = dev_id
-        result.transaction_id = tid
-        Log.debug("Frame advanced, resetting header!!")
-        return used_len, result
+            if (pdu := self.decoder.decode(frame_data)) is None:
+                raise ModbusIOException("Unable to decode request")
+            pdu.dev_id = dev_id
+            pdu.transaction_id = tid
+            return used_len, pdu

test/framer/test_framer.py

@@ -391,8 +391,8 @@ def test_framer_decode(self, test_framer):
     async def test_handleFrame_no(self, test_framer):
         """Test handleFrame."""
         msg = b"\x00\x01\x00\x00\x00\x01\xfc\x1b"
-        with mock.patch.object(test_framer, "_internHandleFrame") as mock_process:
-            mock_process.side_effect = [(5, None), (0, None)]
+        with mock.patch.object(test_framer, "decode") as mock_process:
+            mock_process.side_effect = [(5, 0, 0, None), (0, 0, 0, None)]
             used_len, pdu = test_framer.handleFrame(msg, 0, 0)
             assert used_len == 5
             assert not pdu