fix(wcdb): 修复dll选择路径

Author: 2977094657

src/wechat_decrypt_tool/wcdb_realtime.py

@@ -26,25 +26,41 @@ class WCDBRealtimeError(RuntimeError):
 _WCDB_API_DLL_SELECTED: Optional[Path] = None
 
 
+def _is_project_wcdb_api_dll_path(path: Path) -> bool:
+    try:
+        resolved = path.resolve(strict=False)
+    except Exception:
+        resolved = path
+
+    try:
+        default_resolved = _DEFAULT_WCDB_API_DLL.resolve(strict=False)
+    except Exception:
+        default_resolved = _DEFAULT_WCDB_API_DLL
+
+    if resolved == default_resolved:
+        return True
+
+    parts = tuple(str(part).lower() for part in resolved.parts)
+    allowed_suffixes = (
+        ("backend", "native", "wcdb_api.dll"),
+        ("wechat_decrypt_tool", "native", "wcdb_api.dll"),
+    )
+    return any(parts[-len(suffix) :] == suffix for suffix in allowed_suffixes)
+
+
 def _candidate_wcdb_api_dll_paths() -> list[Path]:
-    """Return possible locations for wcdb_api.dll (prefer WeFlow's newer build when present)."""
+    """Return allowed locations for wcdb_api.dll."""
     cands: list[Path] = []
 
     env = str(os.environ.get("WECHAT_TOOL_WCDB_API_DLL_PATH", "") or "").strip()
     if env:
-        cands.append(Path(env))
-
-    # Repo checkout convenience: reuse bundled WeFlow / echotrace DLLs when available.
-    try:
-        repo_root = Path(__file__).resolve().parents[2]
-    except Exception:
-        repo_root = Path.cwd()
+        env_path = Path(env)
+        if _is_project_wcdb_api_dll_path(env_path):
+            cands.append(env_path)
+        else:
+            logger.warning("[wcdb] ignore external wcdb_api.dll override: %s", env_path)
 
-    for p in [
-        repo_root / "WeFlow" / "resources" / "wcdb_api.dll",
-        repo_root / "echotrace" / "assets" / "dll" / "wcdb_api.dll",
-        _DEFAULT_WCDB_API_DLL,
-    ]:
+    for p in (_DEFAULT_WCDB_API_DLL,):
         if p not in cands:
             cands.append(p)
 

tests/test_wcdb_realtime_dll_path_selection.py

@@ -0,0 +1,45 @@
+import os
+import sys
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+
+
+ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(ROOT / "src"))
+
+from wechat_decrypt_tool import wcdb_realtime
+
+
+class TestWcdbRealtimeDllPathSelection(unittest.TestCase):
+    def setUp(self) -> None:
+        wcdb_realtime._WCDB_API_DLL_SELECTED = None
+
+    def tearDown(self) -> None:
+        wcdb_realtime._WCDB_API_DLL_SELECTED = None
+
+    def test_resolve_prefers_project_dll_over_weflow(self) -> None:
+        weflow_dll = ROOT / "WeFlow" / "resources" / "wcdb_api.dll"
+        self.assertTrue(weflow_dll.exists())
+        self.assertTrue(wcdb_realtime._DEFAULT_WCDB_API_DLL.exists())
+
+        with patch.dict(os.environ, {"WECHAT_TOOL_WCDB_API_DLL_PATH": str(weflow_dll)}, clear=False):
+            resolved = wcdb_realtime._resolve_wcdb_api_dll_path()
+
+        self.assertEqual(
+            resolved.resolve(),
+            wcdb_realtime._DEFAULT_WCDB_API_DLL.resolve(),
+        )
+
+    def test_resolve_accepts_project_packaged_override(self) -> None:
+        packaged_dll = ROOT / "desktop" / "resources" / "backend" / "native" / "wcdb_api.dll"
+        self.assertTrue(packaged_dll.exists())
+
+        with patch.dict(os.environ, {"WECHAT_TOOL_WCDB_API_DLL_PATH": str(packaged_dll)}, clear=False):
+            resolved = wcdb_realtime._resolve_wcdb_api_dll_path()
+
+        self.assertEqual(resolved.resolve(), packaged_dll.resolve())
+
+
+if __name__ == "__main__":
+    unittest.main()