nfcscript 0.0.18__tar.gz → 0.0.20__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "nfcscript"
-version = "0.0.18"
+version = "0.0.20"
 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.18"
+current_version = "0.0.20"
 commit = true
 tag = true
 allow_dirty = true

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

@@ -83,6 +83,26 @@ class _ReaderFacade:
         """获取 Mifare 硬件加密状态。"""
         return getattr(get_reader(), "mf_crypto", False)
 
+    @property
+    def name(self) -> str:
+        """读卡器驱动名称 (如 'pn532', 'clrc663')。"""
+        return getattr(get_reader(), "name", "")
+
+    @property
+    def fifo_size(self) -> int:
+        """读卡器内部物理硬件 FIFO 深度 (字节)。"""
+        return getattr(get_reader(), "fifo_size", 64)
+
+    @property
+    def lazy_crc(self) -> bool:
+        """是否启用惰性 CRC 状态缓存。"""
+        return getattr(get_reader(), "lazy_crc", True)
+
+    @lazy_crc.setter
+    def lazy_crc(self, value: bool) -> None:
+        """设置是否启用惰性 CRC 状态缓存。"""
+        get_reader().lazy_crc = value
+
     @property
     def target(self) -> Any:
         """获取当前连接的底层 CardReader 实例。"""
@@ -197,7 +217,9 @@ def active(low_layer: bool = False, ignore_error: bool = False, reqa_cmd: int =
     """
     rdr = get_reader()
 
-    if not low_layer:
+    # PN532 固件在未激活 Target 前无法通过 InCommunicateThru (0x42) 发送裸位 REQA；
+    # 当使用标准 REQA (0x26) 时，自动路由至 PN532 原生 InListPassiveTarget 硬件寻卡
+    if not low_layer or (getattr(rdr, "name", "") == "pn532" and reqa_cmd == 0x26):
         return rdr.active()
 
     # 手动底层寻卡流程

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

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

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

@@ -25,6 +25,9 @@ def _mock_reader():
     mock.active.return_value = CardInfo(uid=[0x01, 0x02, 0x03, 0x04], atq=[0x44, 0x00], sak=0x00)
     mock.rf_field = False
     mock.mf_crypto = False
+    mock.name = "pn532"
+    mock.fifo_size = 64
+    mock.lazy_crc = True
     return mock
 
 
@@ -84,6 +87,28 @@ class TestGetReader:
             nfc.get_reader()
 
 
+class TestReaderFacadeCapabilities:
+    def test_reader_properties(self):
+        mock = _mock_reader()
+        mock.name = "clrc663"
+        mock.fifo_size = 512
+        mock.lazy_crc = True
+        reader._target = mock
+        reader._connected = True
+
+        assert reader.name == "clrc663"
+        assert reader.fifo_size == 512
+        assert reader.lazy_crc is True
+
+    def test_reader_lazy_crc_setter(self):
+        mock = _mock_reader()
+        reader._target = mock
+        reader._connected = True
+
+        reader.lazy_crc = False
+        assert mock.lazy_crc is False
+
+
 class TestTransceive:
 
     def test_transceive_returns_data(self):
@@ -305,6 +330,37 @@ class TestGetSelCmd:
             _get_sel_cmd(4)
 
 
+class TestActive:
+
+    def test_active_pn532_routes_to_rdr_active_on_std_reqa(self):
+        mock = _mock_reader()
+        mock.name = "pn532"
+        reader._target = mock
+        reader._connected = True
+
+        res = nfc.active(low_layer=True)
+        assert res is not None
+        mock.active.assert_called_once()
+
+    @patch("nfc.reader.anticoll")
+    @patch("nfc.reader.select")
+    @patch("nfc.reader.reqa")
+    def test_active_clrc663_executes_low_layer(self, mock_reqa, mock_select, mock_anticoll):
+        mock = _mock_reader()
+        mock.name = "clrc663"
+        reader._target = mock
+        reader._connected = True
+
+        mock_reqa.return_value = TransceiveBits(data=[0x44, 0x00], bits=8)
+        mock_anticoll.return_value = TransceiveBits(data=[0x01, 0x02, 0x03, 0x04, 0x04], bits=40)
+        mock_select.return_value = [0x00]
+
+        res = nfc.active(low_layer=True)
+        assert res is not None
+        assert res.uid == [0x01, 0x02, 0x03, 0x04]
+        mock.active.assert_not_called()
+
+
 class TestReaderSingletonProxy:
 
     @patch.object(CardReaderRegistry, "create")