baiduwangpan-cli 1.1.1 → 1.1.3

package/README.md

@@ -146,7 +146,8 @@ bdp gtree <gid> [--depth N] [--concurrency N] [--max-nodes N]
 bdp gsearch <gid> <keyword>      搜索群文件名 (全量遍历目录)
                                   [--page N] [--limit N] [--depth N] [--concurrency N]
                                   [--max-pages N] [--max-requests N] [--no-unique]
-                                  [--all|--all-results] [--timeout N] [--no-cache]
+                                  [--all|--all-results] [--timeout N] [--save-partial]
+                                  [--any-word] [--exact] [--no-cache]
 bdp cache [clear]                查看 / 清空会话缓存 (~/.bdp/cache/)
 ```
 
@@ -174,6 +175,9 @@ bdp cache [clear]                查看 / 清空会话缓存 (~/.bdp/cache/)
 --no-unique                      保留不同 msgId 的重复项 (gsearch)
 --all, --all-results             忽略分页获取全部结果 (gsearch; 不限时, 慢但完整)
 --timeout <N>                    超时秒数，到点返回已扫到的部分结果 (gsearch; 0=不限时, 默认 0)
+--save-partial                    未完整时自动把已搜到的结果存为 JSON 并打印路径 (gsearch; 配 --json-file 时写该文件)
+--any-word                        空格分隔关键词命中任意一个即可 (gsearch; 默认=全部命中 AND)
+--exact                           按文件名精确匹配，忽略路径前缀 (gsearch; 大小写不敏感)
 --no-cache                       禁用会话缓存 (gsearch/gtree/gshares/gls)
 ```
 

package/bin/bdp.js

@@ -34,6 +34,7 @@
 const { config } = require("../lib");
 const pan = require("../lib/pan");
 const group = require("../lib/group");
+const partial = require("../lib/partial");
 
 // ── Utils ──────────────────────────────────────────────
 
@@ -88,6 +89,12 @@ function parseArgs(argv) {
       opts.flags.timeout = parseInt(argv[++i], 10) || 0;
     } else if (arg === "--timeout-ms") {
       opts.flags.timeoutMs = parseInt(argv[++i], 10) || 0;
+    } else if (arg === "--save-partial") {
+      opts.flags.savePartial = true;
+    } else if (arg === "--any-word") {
+      opts.flags.anyWord = true;
+    } else if (arg === "--exact") {
+      opts.flags.exact = true;
     } else if (arg === "-n" || arg === "--lines") {
       opts.flags.n = parseInt(argv[++i], 10) || 20;
     } else if (arg === "-p" || arg === "--path") {
@@ -480,6 +487,8 @@ cmds.gsearch = async (args, json) => {
     concurrency: args.flags.concurrency || 4,
     unique: args.flags.unique !== false,
     all: args.flags.all === true,
+    exact: args.flags.exact === true,
+    anyWord: args.flags.anyWord === true,
     timeoutMs: args.flags.timeoutMs || (args.flags.timeout ? args.flags.timeout * 1000 : 0),
     depth: args.flags.depth || 1,
     maxPages: args.flags.maxPages || 50,
@@ -487,20 +496,26 @@ cmds.gsearch = async (args, json) => {
     cache: args.flags.noCache !== true,
   };
 
-  // --json-file：扫描过程中持续写部分结果，即使被外部超时/杀掉，部分结果也已落盘
+  // --save-partial：未完整（超时/限流/预算/失败）时自动把已搜到的结果落盘；
+  // 未指定 --json-file 时自动生成路径（bdp-gsearch-<gid>-<kw>-partial-<ts>.json）
+  const savePartial = args.flags.savePartial === true;
   const jsonFile = args.flags.jsonFile;
+  const partialFile = jsonFile || (savePartial ? partial.defaultPartialFile(gid, keyword) : null);
   const fsMod = require("fs");
+
+  // 扫描过程中持续写部分结果（--json-file 或 --save-partial 自动文件），
+  // 即使被外部超时/杀掉，已搜到的结果也已落盘
   let lastProgressWrite = 0;
-  if (jsonFile) {
-    fsMod.writeFileSync(jsonFile, JSON.stringify({ running: true, results: [], complete: false, partial: true }, null, 2), "utf-8");
+  if (partialFile) {
+    fsMod.writeFileSync(partialFile, JSON.stringify({ running: true, results: [], complete: false, partial: true }, null, 2), "utf-8");
   }
   opts.onProgress = (snap) => {
-    if (!jsonFile) return;
+    if (!partialFile) return;
     const now = Date.now();
     if (snap.running && now - lastProgressWrite < 400) return; // 节流，避免频繁写盘
     lastProgressWrite = now;
     fsMod.writeFileSync(
-      jsonFile,
+      partialFile,
       JSON.stringify(
         {
           running: snap.running,
@@ -527,7 +542,7 @@ cmds.gsearch = async (args, json) => {
     );
   };
 
-  verboseLog(args, `gsearch gid=${gid} keyword="${keyword}" page=${opts.page} limit=${opts.limit} concurrency=${opts.concurrency} unique=${opts.unique} all=${opts.all} timeoutMs=${opts.timeoutMs} depth=${opts.depth} maxPages=${opts.maxPages} maxRequests=${opts.maxRequests} cache=${opts.cache}`);
+  verboseLog(args, `gsearch gid=${gid} keyword="${keyword}" page=${opts.page} limit=${opts.limit} concurrency=${opts.concurrency} unique=${opts.unique} all=${opts.all} exact=${opts.exact} anyWord=${opts.anyWord} timeoutMs=${opts.timeoutMs} savePartial=${savePartial} depth=${opts.depth} maxPages=${opts.maxPages} maxRequests=${opts.maxRequests} cache=${opts.cache}`);
   const result = await group.searchFiles(gid, keyword, opts);
 
   if (result.partial) {
@@ -542,10 +557,7 @@ cmds.gsearch = async (args, json) => {
 
   if (args.flags.legacyJson) {
     emitJson(result.results, args);
-    return;
-  }
-
-  if (args.flags.jsonFile || json) {
+  } else if (args.flags.jsonFile || json) {
     emitJson(result, args);
   } else {
     console.log(`${result.returned} matches for "${keyword}"${result.hasMore ? " (has more — use --page " + (result.nextPage || "?") + ")" : ""}:\n`);
@@ -561,6 +573,21 @@ cmds.gsearch = async (args, json) => {
       console.error(`[verbose] ${result.failedShares} shares failed (partial result)`);
     }
   }
+
+  // --save-partial：未完整时把已搜到的结果写盘并告知路径（stderr，不污染 JSON stdout）
+  if (savePartial && partialFile && result.partial) {
+    if (!jsonFile) {
+      fsMod.writeFileSync(
+        partialFile,
+        JSON.stringify(partial.buildPartialPayload(result, { gid, keyword }), null, 2),
+        "utf-8"
+      );
+    }
+    console.error(`💾 部分结果已保存: ${partialFile}`);
+  } else if (savePartial && partialFile && !result.partial && !jsonFile) {
+    // 自动生成的文件且搜索完整 → 清理占位文件，避免留下垃圾
+    try { fsMod.unlinkSync(partialFile); } catch {}
+  }
 };
 
 cmds.cache = async (args, json) => {
@@ -638,7 +665,8 @@ GROUP CHAT OPERATIONS (群聊)
   gsearch <gid> <keyword>    Search group file names (全量遍历目录, 缓存命中秒回)
                              [--page N] [--limit N] [--depth N] [--concurrency N]
                              [--max-pages N] [--max-requests N] [--no-unique]
-                             [--all|--all-results] [--timeout N] [--no-cache]
+                             [--all|--all-results] [--timeout N] [--save-partial]
+                             [--any-word] [--exact] [--no-cache]
   cache [clear]              Show cache info or clear session cache
   error <code>               Explain an error code (e.g. -3)
 
@@ -670,6 +698,9 @@ OPTIONS
   --no-unique                 Keep duplicates from different msgId (gsearch)
   --all, --all-results        Fetch all results, no paging (gsearch; slow but never truncates)
   --timeout <N>               Abort after N seconds and return partial results (gsearch; 0=unlimited)
+  --save-partial              Auto-save partial results to JSON when scan is incomplete (gsearch)
+  --any-word                  Match ANY of the space-separated keywords (OR) (gsearch; default=ALL)
+  --exact                     Match exact file name (case-insensitive) instead of substring (gsearch)
 
 EXAMPLES
   bdp login --bduss abc123 --stoken def456

package/lib/group.js

@@ -514,7 +514,25 @@ async function treeFiles(gid, options = {}) {
 
 async function searchFiles(gid, keyword, options = {}) {
   const gidS = toStr(gid);
-  const kw = keyword.toLowerCase();
+
+  // 关键词解析：空格分隔多关键词。
+  //  - 默认（all）：每个词都要出现（AND，可换序）→ "玄空 飞星" 只命中同时含两者的名字（精确收窄）
+  //  - --any-word：任一词出现即可（OR，更宽）→ "玄空 飞星" 命中含"玄空"或"飞星"的名字
+  //  - --exact：整名精确相等（最严格）；单关键词默认仍是子串包含（兼容旧行为）
+  const rawKw = String(keyword).toLowerCase();
+  const words = rawKw.split(/\s+/).filter(Boolean);
+  const matchMode = options.exact ? "exact" : (options.anyWord ? "any" : "all");
+  const matchesName = (name) => {
+    const n = String(name || "").toLowerCase();
+    if (matchMode === "exact") {
+      // 精确匹配按文件名（去掉路径前缀），顶层分享 name 形如 "/xxx"，子目录文件 name 无前缀
+      const base = n.includes("/") ? n.slice(n.lastIndexOf("/") + 1) : n;
+      return base === rawKw;
+    }
+    if (words.length <= 1) return n.includes(rawKw);
+    if (matchMode === "any") return words.some((w) => n.includes(w));
+    return words.every((w) => n.includes(w));
+  };
 
   const limit = options.limit || 50;
   const page = options.page || 1;
@@ -570,7 +588,7 @@ async function searchFiles(gid, keyword, options = {}) {
   for (const share of shares) {
     if (finished) break;
     if (!share.isDir) scannedShares++;
-    if (share.name.toLowerCase().includes(kw)) {
+    if (matchesName(share.name)) {
       pushIfMatch({
         name: share.name,
         path: share.name,
@@ -617,7 +635,7 @@ async function searchFiles(gid, keyword, options = {}) {
               maxPages, cache, budget, throttleState,
             });
             if (cached) cachedDirs++;
-            const matches = files.filter((f) => f.name.toLowerCase().includes(kw));
+            const matches = files.filter((f) => matchesName(f.name));
             const subDirs = files.filter((f) => f.isDir);
             return { matches, subDirs };
           } catch (e) {

package/lib/partial.js

@@ -0,0 +1,54 @@
+/**
+ * lib/partial.js — gsearch --save-partial 的纯工具函数
+ *
+ * 用途：搜索未完整（超时/限流/预算耗尽/失败）时，自动把已搜到的部分结果
+ * 落盘到 JSON 文件，避免"跑完了才发现只有 partial:true、结果却没保存"。
+ */
+
+const path = require("path");
+
+// 非法文件名字符（Windows/Linux 通用）
+const ILLEGAL = /[\\/:*?"<>|]/g;
+
+/**
+ * --save-partial 未指定 --json-file 时的默认保存路径：
+ *   <cwd>/bdp-gsearch-<gid>-<keyword>-partial-<timestamp>.json
+ */
+function defaultPartialFile(gid, keyword, options = {}) {
+  const cwd = options.cwd || process.cwd();
+  const date = options.date || new Date();
+  const safeKw = String(keyword == null ? "" : keyword).replace(ILLEGAL, "_").slice(0, 40) || "search";
+  const ts = date.toISOString().replace(/[:.]/g, "-");
+  return path.join(cwd, `bdp-gsearch-${String(gid)}-${safeKw}-partial-${ts}.json`);
+}
+
+/**
+ * 部分结果落盘对象：results 为已搜到的全部匹配（不翻页切片），
+ * 附带扫描诊断（scannedShares/totalShares/failedShares/stoppedReason 等），
+ * 供 Agent / 用户超时后直接读取。
+ */
+function buildPartialPayload(result, meta = {}) {
+  return {
+    saved: "partial",
+    partial: true,
+    complete: false,
+    timedOut: !!result.timedOut,
+    stoppedReason: result.stoppedReason || null,
+    gid: meta.gid,
+    keyword: meta.keyword,
+    page: result.page,
+    pageSize: result.pageSize,
+    total: result.results.length,
+    results: result.results,
+    scannedShares: result.scannedShares,
+    totalShares: result.totalShares,
+    failedShares: result.failedShares,
+    throttledShares: result.throttledShares,
+    cachedDirs: result.cachedDirs,
+    budgetUsed: result.budgetUsed,
+    depth: result.depth,
+    maxPages: result.maxPages,
+  };
+}
+
+module.exports = { defaultPartialFile, buildPartialPayload };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baiduwangpan-cli",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "百度网盘 CLI — 全盘读写 · 免下载读取文件内容 · 群聊文件浏览 (Agent 友好)",
   "main": "lib/index.js",
   "bin": {