nfcscript 0.0.17__tar.gz → 0.0.18__tar.gz

{nfcscript-0.0.17 → nfcscript-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nfcscript
-Version: 0.0.17
+Version: 0.0.18
 Summary: A plugin-based core engine for DSL-style NFC testing automation.
 Author: crthu
 Requires-Python: >=3.14

{nfcscript-0.0.17 → nfcscript-0.0.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nfcscript"
-version = "0.0.17"
+version = "0.0.18"
 description = "A plugin-based core engine for DSL-style NFC testing automation."
 readme = "README.md"
 requires-python = ">=3.14"
@@ -31,7 +31,7 @@ dev = [
 ]
 
 [tool.bumpversion]
-current_version = "0.0.17"
+current_version = "0.0.18"
 commit = true
 tag = true
 allow_dirty = true

{nfcscript-0.0.17 → nfcscript-0.0.18}/src/nfc/reader.py

@@ -254,7 +254,12 @@ def active(low_layer: bool = False, ignore_error: bool = False, reqa_cmd: int =
     return info
 
 
-def transceive(data: list[int] | bytes, tx_crc: bool = True, rx_crc: bool = True) -> list[int]:
+def transceive(
+    data: list[int] | bytes,
+    tx_crc: bool = True,
+    rx_crc: bool = True,
+    timeout: float = 0.5,
+) -> list[int]:
     """
     使用底层帧交互方式发送数据。
 
@@ -262,13 +267,14 @@ def transceive(data: list[int] | bytes, tx_crc: bool = True, rx_crc: bool = True
         data: 要发送的字节列表或 bytes。
         tx_crc: 发送时是否自动添加 CRC。False 则原样发送。
         rx_crc: 接收时是否自动校验 CRC。False 则原样接收不校验。
+        timeout: 接收超时时间 (秒)，默认 0.5s。
 
     Returns:
         list[int]: 接收到的数据字节列表。
     """
     rdr = get_reader()
     raw_list = list(data) if isinstance(data, (bytes, bytearray)) else data
-    res = rdr.transceive(raw_list, tx_crc=tx_crc, rx_crc=rx_crc)
+    res = rdr.transceive(raw_list, tx_crc=tx_crc, rx_crc=rx_crc, timeout=timeout)
     return res.data if res and res.data else []
 
 
@@ -277,6 +283,7 @@ def transceive_bits(
     last_tx_bits: int = 0,
     tx_crc: bool = True,
     rx_crc: bool = True,
+    timeout: float = 0.5,
 ) -> TransceiveBits:
     """
     使用底层帧交互方式发送数据，并支持对最后一个字节进行位控制。
@@ -286,13 +293,14 @@ def transceive_bits(
         last_tx_bits: 最后一个字节实际发送的有效位数 (1-7)，0 表示发送完整字节。
         tx_crc: 发送时是否自动添加 CRC。False 则原样发送。
         rx_crc: 接收时是否自动校验 CRC。False 则原样接收不校验。
+        timeout: 接收超时时间 (秒)，默认 0.5s。
 
     Returns:
         TransceiveBits: 包含 data 和 bits 属性，失败返回空的 TransceiveBits(data=[], bits=0)。
     """
     rdr = get_reader()
     raw_list = list(data) if isinstance(data, (bytes, bytearray)) else data
-    res = rdr.transceive(raw_list, last_tx_bits=last_tx_bits, tx_crc=tx_crc, rx_crc=rx_crc)
+    res = rdr.transceive(raw_list, last_tx_bits=last_tx_bits, tx_crc=tx_crc, rx_crc=rx_crc, timeout=timeout)
     return res if res else TransceiveBits(data=[], bits=0)
 
 

{nfcscript-0.0.17 → nfcscript-0.0.18}/src/nfcscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nfcscript
-Version: 0.0.17
+Version: 0.0.18
 Summary: A plugin-based core engine for DSL-style NFC testing automation.
 Author: crthu
 Requires-Python: >=3.14

{nfcscript-0.0.17 → nfcscript-0.0.18}/tests/test_reader.py

@@ -92,14 +92,21 @@ class TestTransceive:
         reader._connected = True
         result = nfc.transceive([0x30, 0x00])
         assert result == [0xAA, 0xBB]
-        mock.transceive.assert_called_once_with([0x30, 0x00], tx_crc=True, rx_crc=True)
+        mock.transceive.assert_called_once_with([0x30, 0x00], tx_crc=True, rx_crc=True, timeout=0.5)
 
     def test_transceive_no_crc(self):
         mock = _mock_reader()
         reader._target = mock
         reader._connected = True
         nfc.transceive([0x30], tx_crc=False, rx_crc=False)
-        mock.transceive.assert_called_once_with([0x30], tx_crc=False, rx_crc=False)
+        mock.transceive.assert_called_once_with([0x30], tx_crc=False, rx_crc=False, timeout=0.5)
+
+    def test_transceive_with_timeout(self):
+        mock = _mock_reader()
+        reader._target = mock
+        reader._connected = True
+        nfc.transceive([0x30], timeout=1.2)
+        mock.transceive.assert_called_once_with([0x30], tx_crc=True, rx_crc=True, timeout=1.2)
 
     def test_transceive_empty_result(self):
         mock = _mock_reader()
@@ -131,7 +138,7 @@ class TestTransceiveBits:
         reader._target = mock
         reader._connected = True
         nfc.transceive_bits([0x26], last_tx_bits=7, tx_crc=False, rx_crc=False)
-        mock.transceive.assert_called_once_with([0x26], last_tx_bits=7, tx_crc=False, rx_crc=False)
+        mock.transceive.assert_called_once_with([0x26], last_tx_bits=7, tx_crc=False, rx_crc=False, timeout=0.5)
 
 
 class TestReqa: