nfcscript 0.0.10__tar.gz → 0.0.12__tar.gz

{nfcscript-0.0.10 → nfcscript-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nfcscript
-Version: 0.0.10
+Version: 0.0.12
 Summary: A plugin-based core engine for DSL-style NFC testing automation.
 Author: crthu
 Requires-Python: >=3.14
@@ -123,14 +123,14 @@ connect()
 trace.set_layer("DRIVER", True)
 trace.set_layer("PROTOCOL", True)
 
-# 寻卡
+# 寻卡（自动切换协议解析器）
 card_info = active()
 ASSERT_IS_NOT_NONE(card_info, "未扫描到卡片")
-print(f"UID: {card_info['uid'].hex().upper()}")
+print(f"UID: {' '.join(f'{b:02X}' for b in card_info.uid)}")
 
 # 创建卡片实例
 from nfctester.registry import CardRegistry
-card = CardRegistry.create("mifare", reader=get_reader())
+card = CardRegistry.create("mifare_classic", reader=get_reader())
 
 # 关闭连接
 close()
@@ -142,8 +142,8 @@ close()
 from nfc import *
 
 with session() as reader:
-    card_info = reader.find()
-    print(card_info)
+    card_info = reader.active()
+    print(card_info.uid)
 # 自动断开连接
 ```
 
@@ -167,7 +167,7 @@ with session() as reader:
 |------|------|
 | `connect(port, reader_type)` | 连接读卡器 |
 | `get_reader()` | 获取当前读卡器实例 |
-| `active(low_layer, ignore_error, reqa_cmd)` | 寻卡，返回 uid/atq/sak |
+| `active(low_layer, ignore_error, reqa_cmd)` | 寻卡，返回 CardInfo (uid/atq/sak)，自动切换协议解析器 |
 | `transceive(data, tx_crc, rx_crc)` | 底层帧交互 |
 | `transceive_bits(data, last_tx_bits, tx_crc, rx_crc)` | 位控制帧交互 |
 | `reqa()` | ISO14443-A REQA |
@@ -185,6 +185,9 @@ with session() as reader:
 |------|------|
 | `trace.set_layer(layer, enable)` | 开启/关闭追踪层 |
 | `trace.set_level(level)` | 设置日志级别 |
+| `trace.set_parse(level)` | 设置解析级别 (0=关闭, 1=hex+摘要) |
+| `trace.add_sink(fn)` | 注册结构化 trace 事件回调 |
+| `trace.remove_sink(fn)` | 移除已注册的回调 |
 | `trace.info(msg)` / `trace.error(msg)` / `trace.warning(msg)` / `trace.success(msg)` / `trace.debug(msg)` | 输出日志 |
 
 ### assertions.py

{nfcscript-0.0.10 → nfcscript-0.0.12}/README.md

@@ -113,14 +113,14 @@ connect()
 trace.set_layer("DRIVER", True)
 trace.set_layer("PROTOCOL", True)
 
-# 寻卡
+# 寻卡（自动切换协议解析器）
 card_info = active()
 ASSERT_IS_NOT_NONE(card_info, "未扫描到卡片")
-print(f"UID: {card_info['uid'].hex().upper()}")
+print(f"UID: {' '.join(f'{b:02X}' for b in card_info.uid)}")
 
 # 创建卡片实例
 from nfctester.registry import CardRegistry
-card = CardRegistry.create("mifare", reader=get_reader())
+card = CardRegistry.create("mifare_classic", reader=get_reader())
 
 # 关闭连接
 close()
@@ -132,8 +132,8 @@ close()
 from nfc import *
 
 with session() as reader:
-    card_info = reader.find()
-    print(card_info)
+    card_info = reader.active()
+    print(card_info.uid)
 # 自动断开连接
 ```
 
@@ -157,7 +157,7 @@ with session() as reader:
 |------|------|
 | `connect(port, reader_type)` | 连接读卡器 |
 | `get_reader()` | 获取当前读卡器实例 |
-| `active(low_layer, ignore_error, reqa_cmd)` | 寻卡，返回 uid/atq/sak |
+| `active(low_layer, ignore_error, reqa_cmd)` | 寻卡，返回 CardInfo (uid/atq/sak)，自动切换协议解析器 |
 | `transceive(data, tx_crc, rx_crc)` | 底层帧交互 |
 | `transceive_bits(data, last_tx_bits, tx_crc, rx_crc)` | 位控制帧交互 |
 | `reqa()` | ISO14443-A REQA |
@@ -175,6 +175,9 @@ with session() as reader:
 |------|------|
 | `trace.set_layer(layer, enable)` | 开启/关闭追踪层 |
 | `trace.set_level(level)` | 设置日志级别 |
+| `trace.set_parse(level)` | 设置解析级别 (0=关闭, 1=hex+摘要) |
+| `trace.add_sink(fn)` | 注册结构化 trace 事件回调 |
+| `trace.remove_sink(fn)` | 移除已注册的回调 |
 | `trace.info(msg)` / `trace.error(msg)` / `trace.warning(msg)` / `trace.success(msg)` / `trace.debug(msg)` | 输出日志 |
 
 ### assertions.py

{nfcscript-0.0.10 → nfcscript-0.0.12}/pyproject.toml

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

{nfcscript-0.0.10 → nfcscript-0.0.12}/src/nfc/cli.py

@@ -59,8 +59,6 @@ def main():
     parser.add_argument("--trace-protocol", action="store_true", help="开启 PROTOCOL 层追踪")
     parser.add_argument("--trace-parse", type=int, default=None, choices=[0, 1, 2],
                         help="解析级别: 0=关闭 1=简单 2=复杂 (默认: NFC_TRACE_PARSE 或 1)")
-    parser.add_argument("--trace-card-type", default=None,
-                        help="卡片类型标识 (默认: NFC_TRACE_CARD_TYPE)")
     parser.add_argument("--trace-level", default="INFO", help="日志级别 (默认: INFO)")
 
     args, extra = parser.parse_known_args()
@@ -87,7 +85,6 @@ def main():
     trace_driver = os.environ.get("NFC_TRACE_DRIVER", "").lower() in ("1", "true", "yes")
     trace_protocol = os.environ.get("NFC_TRACE_PROTOCOL", "").lower() in ("1", "true", "yes")
     trace_parse = os.environ.get("NFC_TRACE_PARSE", "1")
-    trace_card_type = os.environ.get("NFC_TRACE_CARD_TYPE")
     trace_width = os.environ.get("NFC_TRACE_WIDTH")
 
     if args.trace_level != "INFO":
@@ -98,15 +95,11 @@ def main():
         trace_protocol = True
     if args.trace_parse is not None:
         trace_parse = str(args.trace_parse)
-    if args.trace_card_type is not None:
-        trace_card_type = args.trace_card_type
 
     trace.set_level(trace_level)
     trace.set_layer("DRIVER", trace_driver)
     trace.set_layer("PROTOCOL", trace_protocol)
     trace.set_parse(_parse_level(trace_parse))
-    if trace_card_type is not None:
-        trace.set_card_type(trace_card_type)
     if trace_width is not None:
         os.environ["CRFT_TRACE_WIDTH"] = trace_width
 

{nfcscript-0.0.10 → nfcscript-0.0.12}/src/nfc/reader.py

@@ -2,6 +2,7 @@ import os
 from contextlib import contextmanager
 from nfctester.drivers.card_reader import CardInfo, TransceiveBits
 from nfctester.registry import CardReaderRegistry
+from nfctester.trace import trace as _trace
 from .assertions import ASSERT_EQUAL, ASSERT_IS_NOT_NONE, ASSERT_LEN
 from .checksum import GET_BCC
 from .hex_util import FORMAT_HEX
@@ -146,7 +147,10 @@ def active(low_layer: bool = False, ignore_error: bool = False, reqa_cmd: int =
             sak = sak_res[0] if sak_res else 0
             break
 
-    return CardInfo(uid=full_uid, atq=atq, sak=sak)
+    info = CardInfo(uid=full_uid, atq=atq, sak=sak)
+    atqa = int.from_bytes(atq, "little")
+    _trace.set_parser(atqa, sak)
+    return info
 
 
 def transceive(data: list[int], tx_crc: bool = True, rx_crc: bool = True) -> list[int]:

{nfcscript-0.0.10 → nfcscript-0.0.12}/src/nfc/trace.py

@@ -4,7 +4,8 @@ NFC Script Trace 模块
 提供日志追踪控制，包装 nfctester.trace 的功能。
 """
 
-from nfctester.trace import trace as _trace
+from typing import Callable
+from nfctester.trace import TraceEvent, trace as _trace
 
 
 def set_layer(layer: str, enable: bool = True):
@@ -33,21 +34,11 @@ def set_parse(level: int = 1):
     设置解析级别。
 
     Args:
-        level: 0=关闭, 1=简单(一行摘要), 2=复杂(树状结构)
+        level: 0=关闭(hex), 1=简单(hex + 摘要标签)
     """
     _trace.set_parse(level)
 
 
-def set_card_type(card_type: str):
-    """
-    设置当前卡片类型，注入到所有协议解析器的 state 中。
-
-    Args:
-        card_type: 卡片类型标识，如 "mifare_classic_1k", "ntag213"
-    """
-    _trace.set_card_type(card_type)
-
-
 def info(msg: str):
     """输出 INFO 级别日志"""
     _trace.info(msg)
@@ -71,3 +62,23 @@ def success(msg: str):
 def debug(msg: str):
     """输出 DEBUG 级别日志"""
     _trace.debug(msg)
+
+
+def add_sink(fn: Callable[[TraceEvent], None]):
+    """
+    注册结构化 trace 事件回调。
+
+    Args:
+        fn: 回调函数，接收 TraceEvent 对象
+    """
+    _trace.add_sink(fn)
+
+
+def remove_sink(fn: Callable[[TraceEvent], None]):
+    """
+    移除结构化 trace 事件回调。
+
+    Args:
+        fn: 之前注册的回调函数
+    """
+    _trace.remove_sink(fn)

{nfcscript-0.0.10 → nfcscript-0.0.12}/src/nfcscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nfcscript
-Version: 0.0.10
+Version: 0.0.12
 Summary: A plugin-based core engine for DSL-style NFC testing automation.
 Author: crthu
 Requires-Python: >=3.14
@@ -123,14 +123,14 @@ connect()
 trace.set_layer("DRIVER", True)
 trace.set_layer("PROTOCOL", True)
 
-# 寻卡
+# 寻卡（自动切换协议解析器）
 card_info = active()
 ASSERT_IS_NOT_NONE(card_info, "未扫描到卡片")
-print(f"UID: {card_info['uid'].hex().upper()}")
+print(f"UID: {' '.join(f'{b:02X}' for b in card_info.uid)}")
 
 # 创建卡片实例
 from nfctester.registry import CardRegistry
-card = CardRegistry.create("mifare", reader=get_reader())
+card = CardRegistry.create("mifare_classic", reader=get_reader())
 
 # 关闭连接
 close()
@@ -142,8 +142,8 @@ close()
 from nfc import *
 
 with session() as reader:
-    card_info = reader.find()
-    print(card_info)
+    card_info = reader.active()
+    print(card_info.uid)
 # 自动断开连接
 ```
 
@@ -167,7 +167,7 @@ with session() as reader:
 |------|------|
 | `connect(port, reader_type)` | 连接读卡器 |
 | `get_reader()` | 获取当前读卡器实例 |
-| `active(low_layer, ignore_error, reqa_cmd)` | 寻卡，返回 uid/atq/sak |
+| `active(low_layer, ignore_error, reqa_cmd)` | 寻卡，返回 CardInfo (uid/atq/sak)，自动切换协议解析器 |
 | `transceive(data, tx_crc, rx_crc)` | 底层帧交互 |
 | `transceive_bits(data, last_tx_bits, tx_crc, rx_crc)` | 位控制帧交互 |
 | `reqa()` | ISO14443-A REQA |
@@ -185,6 +185,9 @@ with session() as reader:
 |------|------|
 | `trace.set_layer(layer, enable)` | 开启/关闭追踪层 |
 | `trace.set_level(level)` | 设置日志级别 |
+| `trace.set_parse(level)` | 设置解析级别 (0=关闭, 1=hex+摘要) |
+| `trace.add_sink(fn)` | 注册结构化 trace 事件回调 |
+| `trace.remove_sink(fn)` | 移除已注册的回调 |
 | `trace.info(msg)` / `trace.error(msg)` / `trace.warning(msg)` / `trace.success(msg)` / `trace.debug(msg)` | 输出日志 |
 
 ### assertions.py

{nfcscript-0.0.10 → nfcscript-0.0.12}/tests/test_trace.py

@@ -37,14 +37,6 @@ class TestSetParse:
         mock_trace.set_parse.assert_called_once_with(2)
 
 
-class TestSetCardType:
-
-    @patch("nfc.trace._trace")
-    def test_set_card_type(self, mock_trace):
-        trace.set_card_type("mifare_classic_1k")
-        mock_trace.set_card_type.assert_called_once_with("mifare_classic_1k")
-
-
 class TestLogFunctions:
 
     @patch("nfc.trace._trace")