hmdev-cli 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hmdev-cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "HarmonyOS 开发 CLI 工具 — 文档查询、项目构建、设备部署",
   "keywords": [
     "harmonyos",

package/python/builder.py

@@ -193,6 +193,10 @@ class HDCTool:
             )
         return subprocess.run([self._hdc_path] + args, capture_output=True, text=True, timeout=timeout)
 
+    @staticmethod
+    def succeeded(result: subprocess.CompletedProcess) -> bool:
+        return result.returncode == 0 and "[Fail]" not in result.stdout and "[Fail]" not in result.stderr
+
     def list_devices(self) -> list[dict]:
         result = self._run(["list", "targets"])
         devices = []
@@ -221,5 +225,5 @@ class HDCTool:
         args.extend(["shell", "aa", "start", "-a", ability, "-b", bundle])
         return self._run(args, timeout=30)
 
-    def connect_wireless(self, ip_port: str, timeout: int = 10) -> subprocess.CompletedProcess:
+    def connect_wireless(self, ip_port: str, timeout: int = 30) -> subprocess.CompletedProcess:
         return self._run(["tconn", ip_port], timeout=timeout)

package/python/cli.py

@@ -16,6 +16,8 @@ Usage:
 import asyncio
 import json
 import re
+import shutil
+import subprocess
 import subprocess
 import time
 from argparse import ArgumentParser, RawDescriptionHelpFormatter, SUPPRESS
@@ -23,6 +25,8 @@ from html.parser import HTMLParser
 from typing import Any
 
 import httpx
+from rapidfuzz import fuzz
+import jieba
 
 from builder import HvigorTool, HDCTool
 from config import Config
@@ -293,6 +297,67 @@ async def build_index() -> dict[str, Any]:
     return result
 
 
+# ── Search Ranking ─────────────────────────────────────────────────────────────
+
+def compute_relevance_score(query: str, title: str, object_id: str, catalog_name: str) -> float:
+    """
+    Compute a relevance score for a document against the query.
+
+    Combines:
+    - Exact substring/title/ID/category match (highest weight)
+    - Fuzzy string matching via rapidfuzz (partial_ratio, token_sort, token_set)
+    - Chinese word segmentation overlap via jieba (semantic-like matching)
+    - Word prefix bonus
+
+    Higher score = more relevant.
+    """
+    q = query.lower().strip()
+    t = title.lower()
+    o = object_id.lower()
+    c = catalog_name.lower()
+
+    score = 0.0
+
+    # ── 1. Exact match (strongest signal) ──
+    if t == q:
+        score += 5.0
+    elif t.startswith(q):
+        score += 4.0
+    elif q in t:
+        score += 3.0
+
+    if q in o:
+        score += 1.5
+    if q in c:
+        score += 0.5
+
+    # ── 2. Fuzzy match on title ──
+    score += (fuzz.partial_ratio(q, t) / 100.0) * 2.0
+    score += (fuzz.token_sort_ratio(q, t) / 100.0) * 1.5
+    score += (fuzz.token_set_ratio(q, t) / 100.0) * 1.0
+
+    # ── 3. Fuzzy match on object_id ──
+    score += (fuzz.partial_ratio(q, o) / 100.0) * 0.8
+
+    # ── 4. Word overlap via jieba (handles Chinese segmentation) ──
+    q_words = set(w for w in jieba.lcut(q) if w.strip())
+    t_words = set(w for w in jieba.lcut(t) if w.strip())
+    if q_words and t_words:
+        common = q_words & t_words
+        score += (len(common) / len(q_words)) * 2.0
+
+        # ── 5. Prefix match: query word is prefix of title word ──
+        for qw in q_words:
+            if len(qw) < 2:
+                continue
+            for tw in t_words:
+                if tw != qw and tw.startswith(qw):
+                    score += 0.5
+                    break
+
+    return score
+
+
 # ── CLI Helpers ────────────────────────────────────────────────────────────────
 
 def parse_doc_url(url: str) -> tuple[str, str]:
@@ -343,34 +408,58 @@ async def cmd_index(args):
 
 async def cmd_search(args):
     index = await build_index()
-    query_lower = args.query.lower()
-    results = []
+    query = args.query.strip()
+    if not query:
+        print("请提供搜索关键词。")
+        return
+
+    query_lower = query.lower()
     seen = set()
+    scored = []
 
     for page in index.get("all_pages", []):
-        title = page.get("title", "").lower()
-        obj_id = page.get("object_id", "").lower()
-        if query_lower in title or query_lower in obj_id or query_lower in page.get("catalog_name", ""):
+        title = page.get("title", "")
+        obj_id = page.get("object_id", "")
+        catalog = page.get("catalog_name", "")
+
+        score = compute_relevance_score(query, title, obj_id, catalog)
+
+        # Include if exact match exists or fuzzy score is significant
+        if (query_lower in title.lower()
+                or query_lower in obj_id.lower()
+                or query_lower in catalog.lower()
+                or score >= 1.5):
             if page.get("url") not in seen:
                 seen.add(page["url"])
-                results.append(page)
+                page = dict(page)
+                page["_score"] = round(score, 2)
+                scored.append(page)
+
+    # Sort: higher score first, shorter title as tiebreaker
+    scored.sort(key=lambda p: (-p["_score"], len(p.get("title", ""))))
 
     if args.json:
-        print_json({"query": args.query, "total": len(results), "results": results[:50]})
+        out = {
+            "query": args.query,
+            "total": len(scored),
+            "results": scored[:50],
+        }
+        print_json(out)
         return
 
-    if not results:
+    if not scored:
         print(f"未找到与 '{args.query}' 相关的文档。")
         print(f"可用分类: {', '.join(f'{v}({k})' for k, v in CATALOGS.items())}")
         return
 
-    print(f"搜索结果: '{args.query}' (共 {len(results)} 篇)\n")
-    for page in results[:30]:
+    print(f"搜索结果: '{args.query}' (共 {len(scored)} 篇)\n")
+    for page in scored[:30]:
         cat = CATALOGS.get(page.get("catalog_name", ""), page.get("catalog_name", ""))
-        print(f"  [{cat}] {page['title']}")
-        print(f"         {page['url']}")
-    if len(results) > 30:
-        print(f"\n...及另外 {len(results) - 30} 篇")
+        bar = "█" * min(int(page["_score"]), 10) + "░" * (10 - min(int(page["_score"]), 10))
+        print(f"  {bar}  [{cat}] {page['title']}")
+        print(f"           {page['url']}")
+    if len(scored) > 30:
+        print(f"\n...及另外 {len(scored) - 30} 篇")
 
 
 async def cmd_get(args):
@@ -477,7 +566,7 @@ async def cmd_deploy(args):
     if args.tconn:
         print(f"[hmdev] 无线连接: {args.tconn}")
         tr = hdc.connect_wireless(args.tconn)
-        if tr.returncode != 0:
+        if not HDCTool.succeeded(tr):
             print(f"[hmdev] ❌ 无线连接失败: {tr.stderr.strip()}")
             return
         print(f"[hmdev] ✅ 无线连接成功")
@@ -493,7 +582,7 @@ async def cmd_deploy(args):
 
     print(f"[hmdev] 正在安装: {hap_path}")
     ir = hdc.install_hap(hap_path, device_id)
-    if ir.returncode != 0:
+    if not HDCTool.succeeded(ir):
         err = ir.stderr.strip() or ir.stdout.strip()
         print(f"[hmdev] ❌ 安装失败: {err}")
         return
@@ -507,7 +596,7 @@ async def cmd_deploy(args):
         else:
             print(f"[hmdev] 正在启动: {bundle}")
             sr = hdc.start_app(bundle, args.ability, device_id)
-            if sr.returncode != 0:
+            if not HDCTool.succeeded(sr):
                 print(f"[hmdev] ❌ 启动失败: {sr.stderr.strip()}")
             else:
                 print(f"[hmdev] ✅ 应用已启动")
@@ -668,6 +757,20 @@ async def cmd_config(args):
         print()
 
 
+async def cmd_update(args):
+    npm = shutil.which("npm") or shutil.which("npm.cmd")
+    if not npm:
+        print("[hmdev] ❌ 未找到 npm。请确保 Node.js 已安装。")
+        return
+    print("[hmdev] 正在更新 hmdev-cli ...")
+    result = subprocess.run([npm, "update", "-g", "hmdev-cli"], capture_output=True, text=True)
+    if result.returncode == 0:
+        print("[hmdev] ✅ 更新成功")
+    else:
+        err = result.stderr.strip() or result.stdout.strip()
+        print(f"[hmdev] ❌ 更新失败: {err}")
+
+
 # ── CLI Registration ──────────────────────────────────────────────────────────
 
 CLI_COMMANDS = {
@@ -682,6 +785,7 @@ CLI_COMMANDS = {
     "run": cmd_run,
     "connect": cmd_connect,
     "config": cmd_config,
+    "update": cmd_update,
 }
 
 
@@ -765,6 +869,10 @@ def build_cli_parser():
     p.add_argument("--reset", metavar="KEY", help="重置配置项")
     p.add_argument("--json", action="store_true", dest="json", help=SUPPRESS)
 
+    # update
+    p = sub.add_parser("update", help="更新 hmdev-cli 到最新版本 (npm update -g)")
+    p.add_argument("--json", action="store_true", dest="json", help=SUPPRESS)
+
     return parser
 
 

package/scripts/runner.js

@@ -102,8 +102,8 @@ async function ensurePython() {
     });
   } catch { /* non-fatal */ }
 
-  console.error(`${TAG} 正在安装 Python 依赖 (httpx)...`);
-  execSync(`"${getVenvPip()}" install httpx`, {
+  console.error(`${TAG} 正在安装 Python 依赖 (httpx, rapidfuzz, jieba)...`);
+  execSync(`"${getVenvPip()}" install httpx rapidfuzz jieba`, {
     stdio: 'pipe',
     timeout: 120000,
     env: cleanEnv,