refactor: SDK 包结构——transports/firmware 分包、bridge_server 入包+ppclock-bridge 入口、fw 工具入 SDK 域,151 测试全绿
This commit is contained in:
1 parent
c13958db10
commit
a613c76114
14 files changed
+126
-69
No files matched your search
+6
-6
@@ -42,13 +42,13 @@ def _emit(args, cmd, data=None, error=None):
|
||||
|
||||
def _make_transport(args):
|
||||
"""工厂函数——测试用 monkeypatch 替换为 FakeTransport。"""
|
||||
from .bridge import BridgeTransport, parse_via
|
||||
from .transports.bridge import BridgeTransport, parse_via
|
||||
via = parse_via(getattr(args, "via", None))
|
||||
if via:
|
||||
host, port = via
|
||||
return BridgeTransport(address=args.mac, timeout=args.timeout,
|
||||
host=host, port=port)
|
||||
from .transport import BLETransport
|
||||
from .transports.local import BLETransport
|
||||
return BLETransport(address=args.mac, timeout=args.timeout)
|
||||
|
||||
|
||||
@@ -316,12 +316,12 @@ async def _run_batch(args) -> list:
|
||||
|
||||
async def _dispatch(args) -> dict | list | None:
|
||||
if args.cmd == "scan":
|
||||
from .bridge import parse_via
|
||||
from .transports.bridge import parse_via
|
||||
via = parse_via(getattr(args, "via", None))
|
||||
if via:
|
||||
from .bridge import scan as bridge_scan
|
||||
from .transports.bridge import scan as bridge_scan
|
||||
return {"devices": await bridge_scan(via[0], via[1], timeout=args.timeout)}
|
||||
from .transport import scan
|
||||
from .transports.local import scan
|
||||
return {"devices": await scan(timeout=args.timeout)}
|
||||
if args.cmd == "batch":
|
||||
return {"results": await _run_batch(args)}
|
||||
@@ -338,7 +338,7 @@ def main(argv=None) -> int:
|
||||
_emit(args, args.cmd, error=str(e))
|
||||
return EXIT_USAGE
|
||||
except Exception as e:
|
||||
from .transport import TransportError
|
||||
from .transports.base import TransportError
|
||||
code = EXIT_TRANSPORT if isinstance(e, TransportError) else EXIT_ERROR
|
||||
_emit(args, args.cmd, error=f"{type(e).__name__}: {e}")
|
||||
return code
|
||||
|
||||
Reference in new issue
Block a user