baiduwangpan-cli 1.0.1 → 1.0.2

package/bin/bdp.js

@@ -52,12 +52,38 @@ function output(data, jsonFlag, formatter) {
   }
 }
 
+function emitJson(data, args) {
+  const json = JSON.stringify(data, null, 2);
+  if (args.flags.jsonFile) {
+    require("fs").writeFileSync(args.flags.jsonFile, json, "utf-8");
+    console.log(args.flags.jsonFile);
+  } else {
+    console.log(json);
+  }
+}
+
+function verboseLog(args, msg) {
+  if (args.flags.verbose) process.stderr.write(`[verbose] ${msg}\n`);
+}
+
 function parseArgs(argv) {
   const opts = { _: [], flags: {} };
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
     if (arg === "--json") {
       opts.flags.json = true;
+    } else if (arg === "--legacy-json") {
+      opts.flags.legacyJson = true;
+    } else if (arg === "--json-file") {
+      opts.flags.jsonFile = argv[++i];
+    } else if (arg === "--verbose") {
+      opts.flags.verbose = true;
+    } else if (arg === "--unique") {
+      opts.flags.unique = true;
+    } else if (arg === "--no-unique") {
+      opts.flags.unique = false;
+    } else if (arg === "--all") {
+      opts.flags.all = true;
     } else if (arg === "-n" || arg === "--lines") {
       opts.flags.n = parseInt(argv[++i], 10) || 20;
     } else if (arg === "-p" || arg === "--path") {
@@ -76,6 +102,22 @@ function parseArgs(argv) {
       opts.flags.stoken = argv[++i];
     } else if (arg === "--page") {
       opts.flags.page = parseInt(argv[++i], 10) || 1;
+    } else if (arg === "--page-size") {
+      opts.flags.pageSize = parseInt(argv[++i], 10) || 50;
+    } else if (arg === "--limit") {
+      opts.flags.limit = parseInt(argv[++i], 10) || 50;
+    } else if (arg === "--concurrency") {
+      opts.flags.concurrency = parseInt(argv[++i], 10) || 4;
+    } else if (arg === "--depth") {
+      opts.flags.depth = parseInt(argv[++i], 10) || 2;
+    } else if (arg === "--max-nodes") {
+      opts.flags.maxNodes = parseInt(argv[++i], 10) || 2000;
+    } else if (arg === "--from-uk") {
+      opts.flags.fromUk = argv[++i];
+    } else if (arg === "--msg-id") {
+      opts.flags.msgId = argv[++i];
+    } else if (arg === "--parent-fs-id") {
+      opts.flags.parentFsId = argv[++i];
     } else if (arg.startsWith("-")) {
       opts.flags[arg.replace(/^-+/, "")] = true;
     } else {
@@ -350,29 +392,119 @@ cmds.gshares = async (args, json) => {
 cmds.gls = async (args, json) => {
   const gid = args._[0];
   const fsId = args._[1];
-  if (!gid || !fsId) { console.error("Usage: bdp gls <gid> <fs_id>"); process.exit(1); }
-  const result = await group.listFiles(gid, fsId, { page: args.flags.page || 1 });
-  output(result, json, (d) => {
-    console.log(`${d.files.length} items${d.hasMore ? " (has more — use --page)" : ""}:\n`);
-    d.files.forEach((f) => {
+  if (!gid || !fsId) { console.error("Usage: bdp gls <gid> <fs_id> [--page N] [--page-size N]"); process.exit(1); }
+
+  const opts = {
+    page: args.flags.page || 1,
+    pageSize: args.flags.pageSize || 50,
+  };
+  if (args.flags.fromUk) opts.fromUk = args.flags.fromUk;
+  if (args.flags.msgId) opts.msgId = args.flags.msgId;
+  if (args.flags.parentFsId) opts.parentFsId = args.flags.parentFsId;
+
+  verboseLog(args, `gls gid=${gid} fsId=${fsId} page=${opts.page} pageSize=${opts.pageSize}`);
+  const result = await group.listFiles(gid, fsId, opts);
+
+  if (args.flags.legacyJson) {
+    emitJson(result.files, args);
+    return;
+  }
+
+  if (result.fallback) {
+    verboseLog(args, `fallback: ${result.fallback.reason} -> ${result.fallback.resolvedFsId} (${result.fallback.level})`);
+  }
+
+  if (args.flags.jsonFile || json) {
+    emitJson(result, args);
+  } else {
+    if (result.fallback) {
+      console.log(`⚠️  fallback: ${result.fallback.reason} — 已回退到 ${result.fallback.resolvedFsId} (${result.fallback.level})`);
+    }
+    console.log(`${result.files.length} items${result.hasMore ? " (has more — use --page)" : ""}:\n`);
+    result.files.forEach((f) => {
       const dir = f.isDir ? "[DIR] " : "      ";
       console.log(`  ${dir}${f.name}  ${formatSize(f.size)}  fs_id:${f.fsId}`);
     });
-  });
+  }
+};
+
+cmds.gtree = async (args, json) => {
+  const gid = args._[0];
+  if (!gid) { console.error("Usage: bdp gtree <gid> [--depth N] [--concurrency N] [--max-nodes N]"); process.exit(1); }
+
+  const opts = {
+    depth: args.flags.depth || 2,
+    concurrency: args.flags.concurrency || 4,
+    maxNodes: args.flags.maxNodes || 2000,
+  };
+  verboseLog(args, `gtree gid=${gid} depth=${opts.depth} concurrency=${opts.concurrency} maxNodes=${opts.maxNodes}`);
+  const result = await group.treeFiles(gid, opts);
+
+  if (args.flags.jsonFile || json) {
+    emitJson(result, args);
+  } else {
+    console.log(`${result.tree.length} nodes (depth ${result.depth}, ${result.failed.length} failed${result.truncated ? ", truncated" : ""}):\n`);
+    result.tree.forEach((n) => {
+      const dir = n.isDir ? "[DIR] " : "      ";
+      console.log(`  ${dir}${n.path || n.name}  ${formatSize(n.size)}  fs_id:${n.fsId}`);
+    });
+  }
 };
 
 cmds.gsearch = async (args, json) => {
   const gid = args._[0];
   const keyword = args._[1];
-  if (!gid || !keyword) { console.error("Usage: bdp gsearch <gid> <keyword>"); process.exit(1); }
-  const results = await group.searchFiles(gid, keyword);
-  output(results, json, (list) => {
-    console.log(`${list.length} matches for "${keyword}":\n`);
-    list.forEach((r) => {
+  if (!gid || !keyword) { console.error("Usage: bdp gsearch <gid> <keyword> [--page N] [--limit N]"); process.exit(1); }
+
+  const opts = {
+    page: args.flags.page || 1,
+    limit: args.flags.limit || 50,
+    concurrency: args.flags.concurrency || 4,
+    unique: args.flags.unique !== false,
+    all: args.flags.all === true,
+    depth: args.flags.depth || 1,
+  };
+
+  verboseLog(args, `gsearch gid=${gid} keyword="${keyword}" page=${opts.page} limit=${opts.limit} concurrency=${opts.concurrency} unique=${opts.unique} all=${opts.all}`);
+  const result = await group.searchFiles(gid, keyword, opts);
+
+  if (result.partial) {
+    verboseLog(args, `partial: ${result.failedShares}/${result.totalShares} shares failed`);
+  }
+
+  if (args.flags.legacyJson) {
+    emitJson(result.results, args);
+    return;
+  }
+
+  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`);
+    result.results.forEach((r) => {
       const dir = r.isDir ? "[DIR] " : "      ";
       console.log(`  ${dir}${r.path || r.name}  ${formatSize(r.size)}  fs_id:${r.fsId}`);
     });
-  });
+    if (result.partial) {
+      console.error(`[verbose] ${result.failedShares} shares failed (partial result)`);
+    }
+  }
+};
+
+cmds.error = async (args, json) => {
+  const code = args._[0] || "-3";
+  const ERRORS = {
+    "-3": "群分享 API 拒绝请求。已观察到大目录、错误的 msgId/fromUk、过期分享都可能触发。\n" +
+          "处理：减小 --page-size（自动重试 50→20→10），或携带 gsearch 返回的 fromUk/msgId/parentFsId 信息重试；\n" +
+          "      若回退到父目录（fallback level=parent），Agent 应从父目录换路径继续遍历。",
+    "-6": "接口鉴权失败。通常为 access_token/cookie 失效，请重新执行 bdp login。",
+  };
+  const msg = ERRORS[code] || `未知错误码 ${code}，请提交 Issue: https://github.com/NkAntony777/baiduwangpan-cli/issues`;
+  if (args.flags.jsonFile || json) {
+    emitJson({ code, description: msg }, args);
+  } else {
+    console.log(msg);
+  }
 };
 
 // ── Main ───────────────────────────────────────────────
@@ -398,8 +530,13 @@ PAN FILE OPERATIONS (全盘)
 GROUP CHAT OPERATIONS (群聊)
   groups                     List all groups
   gshares <gid>              List share libraries in group
+  gtree <gid>                Build directory tree (BFS)
+                             [--depth N] [--concurrency N] [--max-nodes N]
   gls <gid> <fs_id>          Browse files in a share
+                             [--page N] [--page-size N] [--from-uk X] [--msg-id Y] [--parent-fs-id Z]
   gsearch <gid> <keyword>    Search group file names
+                             [--page N] [--limit N] [--depth N] [--concurrency N] [--no-unique] [--all]
+  error <code>               Explain an error code (e.g. -3)
 
 CONFIGURATION
   login                        Browser QR login (auto-detect cookies)
@@ -409,12 +546,22 @@ CONFIGURATION
 
 OPTIONS
   --json                      Output JSON (for Agent consumption)
+  --json-file <path>          Write JSON to file (UTF-8, bypasses console encoding)
+  --legacy-json               Output bare array (gls/gsearch legacy format)
+  --verbose                   Write progress/log to stderr only
   -n <N>                      Number of lines (head/tail)
   -p <path>                   Search path (search)
   -i                          Ignore case (grep)
   -N                          Show line numbers (cat/grep)
   -o <dir>                    Output directory (get)
-  --page <N>                  Page number (gls)
+  --page <N>                  Page number (gls/gsearch)
+  --page-size <N>             Page size for gls (default 50, max 100)
+  --limit <N>                 Page size for gsearch (default 50)
+  --depth <N>                 Recursive search/tree depth (gsearch default 1, gtree default 2)
+  --max-nodes <N>             Tree node cap (gtree default 2000)
+  --concurrency <N>           Parallel share scans for gsearch/gtree (default 4)
+  --no-unique                 Keep duplicates from different msgId (gsearch)
+  --all                       Fetch all results, no paging (gsearch, not Agent default)
 
 EXAMPLES
   bdp login --bduss abc123 --stoken def456
@@ -424,7 +571,10 @@ EXAMPLES
   bdp groups --json
   bdp gshares 539478953581833690
   bdp gls 539478953581833690 742474845517885 --json
-  bdp gsearch 539478953581833690 "倪海厦"`;
+  bdp gls 539478953581833690 292608024165826 --from-uk 2642611875 --msg-id 5069931974377329661 --json
+  bdp gsearch 539478953581833690 "倪海厦" --limit 20 --json
+  bdp gsearch 539478953581833690 "古籍" --page 2 --limit 20 --json-file result.json
+  bdp error -3`;
 
 async function main() {
   const argv = process.argv.slice(2);
@@ -439,6 +589,7 @@ async function main() {
     process.exit(0);
   }
 
+  let exitCode = 0;
   try {
     await handler(args, json);
   } catch (e) {
@@ -447,12 +598,13 @@ async function main() {
     } else {
       console.error(`[ERROR] ${e.message}`);
     }
-    process.exitCode = 1;
+    exitCode = 1;
   } finally {
     try {
       require("../lib/browser-login").disconnectBrowserSession();
     } catch {}
   }
+  process.exit(exitCode);
 }
 
 main();

package/lib/browser-login.js

@@ -233,8 +233,13 @@ async function openPersistentSession({ browser, profileDir, port, minimized }) {
     proc = launchBrowser(browser, profileDir, port, { minimized });
     await waitForDevTools(port, 15000);
   }
-  const { cdp, tab } = await connectPanTab(port);
-  return { browser, profileDir, port, proc, cdp, tab };
+  try {
+    const { cdp, tab } = await connectPanTab(port);
+    return { browser, profileDir, port, proc, cdp, tab };
+  } catch (e) {
+    if (proc) killBrowser(proc);
+    throw e;
+  }
 }
 
 async function getBrowserSession(settings = {}) {
@@ -379,7 +384,8 @@ async function browserLogin({
 
 function scheduleDisconnect() {
   if (disconnectTimer) clearTimeout(disconnectTimer);
-  disconnectTimer = setTimeout(disconnectBrowserSession, 500);
+  // 空闲 30 秒后断开浏览器会话（批处理请求间隔通常 <30s）
+  disconnectTimer = setTimeout(disconnectBrowserSession, 30000);
   disconnectTimer.unref();
 }
 

package/lib/group.js

@@ -1,6 +1,23 @@
 const http = require("./http");
 const { getBdstoken } = http;
 
+// ── 工具 ──────────────────────────────────────────────
+
+function toStr(v) {
+  if (v === null || v === undefined) return "";
+  return String(v);
+}
+
+class ShareApiError extends Error {
+  constructor(errno, message) {
+    super(message);
+    this.errno = errno;
+    this.name = "ShareApiError";
+  }
+}
+
+// ── 群组列表 ──────────────────────────────────────────
+
 async function listGroups() {
   const bdstoken = await getBdstoken();
   if (!bdstoken) throw new Error("Cannot get bdstoken — check BDUSS/STOKEN config");
@@ -12,19 +29,21 @@ async function listGroups() {
   if (data.errno !== 0) throw new Error(`API error: errno=${data.errno}`);
 
   return (data.records || []).map((g) => ({
-    gid: g.gid,
+    gid: toStr(g.gid),
     name: g.name,
-    gnum: g.gnum,
+    gnum: toStr(g.gnum),
     description: g.gdesc || "",
-    type: g.type,
+    type: toStr(g.type),
     created: g.ctime,
   }));
 }
 
+// ── 群内分享库 ────────────────────────────────────────
+
 async function listShares(gid) {
   const bdstoken = await getBdstoken();
   const data = await http.webJson(
-    `${http.PAN_BASE}/mbox/group/listshare?clienttype=0&app_id=${http.APP_ID}&web=1&type=2&gid=${gid}&limit=50&desc=1&bdstoken=${bdstoken}`,
+    `${http.PAN_BASE}/mbox/group/listshare?clienttype=0&app_id=${http.APP_ID}&web=1&type=2&gid=${toStr(gid)}&limit=50&desc=1&bdstoken=${bdstoken}`,
     { method: "POST", body: "" }
   );
 
@@ -34,90 +53,360 @@ async function listShares(gid) {
   for (const msg of data.records?.msg_list || []) {
     for (const f of msg.file_list || []) {
       shares.push({
-        msgId: msg.msg_id,
-        fromUk: msg.uk,
+        msgId: toStr(msg.msg_id),
+        fromUk: toStr(msg.uk),
         fromUser: msg.uname,
         name: decodeURIComponent(f.path || f.server_filename || ""),
-        fsId: f.fs_id,
+        fsId: toStr(f.fs_id),
         isDir: f.isdir === "1",
-        size: parseInt(f.size || "0"),
+        size: parseInt(f.size || "0", 10),
       });
     }
   }
   return shares;
 }
 
-async function listFiles(gid, fsId, options = {}) {
-  const page = options.page || 1;
-  const num = options.num || 100;
-
-  // First get the fromUk and msgId for this fsId
-  let { fromUk, msgId } = options;
-  if (!fromUk || !msgId) {
-    const shares = await listShares(gid);
-    const match = shares.find((s) => s.fsId === fsId);
-    if (match) {
-      fromUk = match.fromUk;
-      msgId = match.msgId;
-    } else if (shares.length > 0) {
-      fromUk = shares[0].fromUk;
-      msgId = shares[0].msgId;
-    } else {
-      throw new Error("Cannot find share info for this fsId");
-    }
-  }
+// ── 底层 shareinfo 请求 ───────────────────────────────
 
+async function shareInfoRequest(gidS, fsIdS, fromUkS, msgIdS, page, pageSize) {
   const bdstoken = await getBdstoken();
-  const data = await http.webJson(
-    `${http.PAN_BASE}/mbox/msg/shareinfo?type=2&from_uk=${fromUk}&msg_id=${msgId}&to_uk=0&num=${num}&page=${page}&fs_id=${fsId}&gid=${gid}&clienttype=0&app_id=${http.APP_ID}&web=1&bdstoken=${bdstoken}`,
-    { method: "POST", body: "" }
-  );
+  const url =
+    `${http.PAN_BASE}/mbox/msg/shareinfo?type=2&from_uk=${fromUkS}&msg_id=${msgIdS}` +
+    `&to_uk=0&num=${pageSize}&page=${page}&fs_id=${fsIdS}&gid=${gidS}` +
+    `&clienttype=0&app_id=${http.APP_ID}&web=1&bdstoken=${bdstoken}`;
 
-  if (data.errno !== 0) throw new Error(`API error: errno=${data.errno}`);
+  const data = await http.webJson(url, { method: "POST", body: "" });
+
+  if (data.errno !== 0) {
+    throw new ShareApiError(data.errno, `API error: errno=${data.errno}`);
+  }
 
   const files = (Array.isArray(data.records) ? data.records : []).map((f) => ({
     name: f.server_filename || "",
     path: decodeURIComponent(f.path || ""),
     isDir: f.isdir === 1 || f.isdir === "1",
-    size: parseInt(f.size || "0"),
-    fsId: f.fs_id,
+    size: parseInt(f.size || "0", 10),
+    fsId: toStr(f.fs_id),
     md5: f.md5 || "",
-    category: parseInt(f.category || "0"),
-    ctime: f.server_ctime || "",
-    mtime: f.server_mtime || "",
+    category: parseInt(f.category || "0", 10),
+    ctime: toStr(f.server_ctime || ""),
+    mtime: toStr(f.server_mtime || ""),
+    parentFsId: fsIdS,
+    fromUk: fromUkS,
+    msgId: msgIdS,
   }));
 
-  return { files, hasMore: data.has_more === 1, page };
+  return { files, hasMore: data.has_more === 1, page, pageSize };
+}
+
+// ── 列出分享库内容 (gls) ──────────────────────────────
+
+async function listFiles(gid, fsId, options = {}) {
+  const gidS = toStr(gid);
+  const fsIdS = toStr(fsId);
+  const parentFsId = toStr(options.parentFsId || "");
+  const page = options.page || 1;
+  let pageSize = options.pageSize || 50;
+  pageSize = Math.min(Math.max(1, pageSize), 100);
+
+  // 来源解析：显式传入优先；否则仅在顶层分享中精确匹配（禁止"用第一个分享"兜底）
+  let fromUkS = toStr(options.fromUk || "");
+  let msgIdS = toStr(options.msgId || "");
+
+  if (!fromUkS || !msgIdS) {
+    const shares = await listShares(gidS);
+    const match = shares.find((s) => s.fsId === fsIdS);
+    if (!match) {
+      throw new Error(
+        `Cannot determine fromUk/msgId for fsId ${fsIdS} (not a top-level share). ` +
+        `Pass --from-uk and --msg-id explicitly.`
+      );
+    }
+    fromUkS = match.fromUk;
+    msgIdS = match.msgId;
+  }
+
+  // errno=-3 时依次降 page-size: 50 → 20 → 10
+  const attempts = [...new Set([pageSize, 50, 20, 10].filter((n) => n <= pageSize))];
+  let lastErrno = null;
+
+  for (const size of attempts) {
+    try {
+      const result = await shareInfoRequest(gidS, fsIdS, fromUkS, msgIdS, page, size);
+      return {
+        files: result.files,
+        hasMore: result.hasMore,
+        page,
+        pageSize: size,
+        fromUk: fromUkS,
+        msgId: msgIdS,
+        fallback: null,
+      };
+    } catch (e) {
+      if (e instanceof ShareApiError && e.errno === -3) {
+        lastErrno = -3;
+        continue; // 尝试更小的 page-size
+      }
+      throw e;
+    }
+  }
+
+  // 全部 page-size 都失败（errno=-3）→ 回退
+  if (parentFsId) {
+    // 回退到父目录，展示兄弟内容帮助 Agent 换路径
+    try {
+      const parent = await shareInfoRequest(gidS, toStr(parentFsId), fromUkS, msgIdS, 1, 50);
+      return {
+        files: parent.files,
+        hasMore: parent.hasMore,
+        page: 1,
+        pageSize: 50,
+        fromUk: fromUkS,
+        msgId: msgIdS,
+        fallback: {
+          reason: "errno=-3",
+          requestedFsId: fsIdS,
+          resolvedFsId: toStr(parentFsId),
+          level: "parent",
+        },
+      };
+    } catch (e) {
+      throw new ShareApiError(
+        -3,
+        `shareinfo rejected for fsId ${fsIdS} (errno=-3), and parent fallback also failed. ` +
+        `The share may be expired or the directory may be too large for the API.`
+      );
+    }
+  }
+
+  // 目标本身是顶层分享 → 退回 gshares 结果
+  try {
+    const shares = await listShares(gidS);
+    const match = shares.find((s) => s.fsId === fsIdS);
+    if (match) {
+      return {
+        files: [{
+          name: match.name,
+          path: match.name,
+          isDir: match.isDir,
+          size: match.size,
+          fsId: match.fsId,
+          md5: "",
+          category: 0,
+          ctime: "",
+          mtime: "",
+          parentFsId: "",
+          fromUk: match.fromUk,
+          msgId: match.msgId,
+        }],
+        hasMore: false,
+        page: 1,
+        pageSize: 50,
+        fromUk: fromUkS,
+        msgId: msgIdS,
+        fallback: {
+          reason: "errno=-3",
+          requestedFsId: fsIdS,
+          resolvedFsId: fsIdS,
+          level: "group-shares",
+        },
+      };
+    }
+  } catch {}
+
+  throw new ShareApiError(
+    -3,
+    `shareinfo rejected for fsId ${fsIdS} (errno=-3). ` +
+    `群分享 API 拒绝请求：已观察到大目录、错误的 msgId/fromUk、过期分享都可能触发。` +
+    `请减小 --page-size，或携带 gsearch 返回的 fromUk/msgId/parentFsId 信息重试。`
+  );
+}
+
+// ── 目录树 (gtree) ────────────────────────────────────
+
+async function treeFiles(gid, options = {}) {
+  const gidS = toStr(gid);
+  const maxDepth = Math.min(Math.max(1, options.depth || 2), 5);
+  const concurrency = Math.min(Math.max(1, options.concurrency || 4), 8);
+  const maxNodes = options.maxNodes || 2000;
+
+  const shares = await listShares(gidS);
+  const tree = [];
+  const failed = [];
+
+  // BFS: queue 元素 { node, depth, share }
+  const queue = shares.map((s) => ({ node: { ...s, parentFsId: "" }, depth: 1, share: s }));
+  let scanned = 0;
+
+  // 逐层 BFS，层内并发
+  for (let depth = 1; depth <= maxDepth; depth++) {
+    const level = queue.filter((q) => q.depth === depth);
+    if (level.length === 0) break;
+
+    const results = await Promise.all(
+      level.map(async (entry) => {
+        const { node, share } = entry;
+        if (!node.isDir || node.size > 0) return null; // 非目录不进队列
+        scanned++;
+        try {
+          const { files } = await shareInfoRequest(gidS, node.fsId, share.fromUk, share.msgId, 1, 100);
+          return files.map((f) => ({
+            node: {
+              name: f.name,
+              path: f.path,
+              isDir: f.isDir,
+              size: f.size,
+              fsId: f.fsId,
+              md5: f.md5,
+              category: f.category,
+              parentFsId: f.parentFsId,
+              fromUk: f.fromUk,
+              msgId: f.msgId,
+              fromUser: share.fromUser,
+            },
+            depth: depth + 1,
+            share,
+          }));
+        } catch {
+          failed.push({ fsId: node.fsId, name: node.name });
+          return null;
+        }
+      })
+    );
+
+    for (const list of results) {
+      if (!list) continue;
+      for (const item of list) {
+        tree.push(item.node);
+        if (tree.length >= maxNodes) break;
+        if (item.depth <= maxDepth && item.node.isDir) queue.push({ node: item.node, depth: item.depth, share: item.share });
+      }
+      if (tree.length >= maxNodes) break;
+    }
+    if (tree.length >= maxNodes) break;
+  }
+
+  return { tree, failed, scanned, maxDepth, truncated: tree.length >= maxNodes };
 }
 
+// ── 群文件搜索 (gsearch) ──────────────────────────────
+
 async function searchFiles(gid, keyword, options = {}) {
-  const maxDepth = options.maxDepth || 1;
-  const results = [];
+  const gidS = toStr(gid);
   const kw = keyword.toLowerCase();
 
-  const shares = await listShares(gid);
+  const limit = options.limit || 50;
+  const page = options.page || 1;
+  const concurrency = Math.min(Math.max(1, options.concurrency || 4), 8);
+  const unique = options.unique !== false;
+  const fetchAll = options.all === true;
+  const depth = Math.min(Math.max(1, options.depth || 1), 5); // 默认 1 层（兼容旧行为）
+  const startIdx = (page - 1) * limit;
+  const stopAt = fetchAll ? Infinity : startIdx + limit + 1; // +1 判断 hasMore
+
+  const shares = await listShares(gidS);
+  const totalShares = shares.length;
+
+  const seen = new Set();
+  const results = [];
+  let scannedShares = 0;
+  let failedShares = 0;
+  let finished = false;
+
+  const pushIfMatch = (item) => {
+    if (finished) return;
+    const key = unique ? toStr(item.fsId) : `${toStr(item.fsId)}|${toStr(item.msgId)}`;
+    if (unique && seen.has(key)) return;
+    seen.add(key);
+    results.push(item);
+    if (results.length >= stopAt) finished = true;
+  };
 
+  // 阶段 1：顶层分享名称匹配（非目录分享在此完成扫描）
   for (const share of shares) {
+    if (finished) break;
+    if (!share.isDir) scannedShares++;
     if (share.name.toLowerCase().includes(kw)) {
-      results.push({ ...share, group: gid });
+      pushIfMatch({
+        name: share.name,
+        path: share.name,
+        isDir: share.isDir,
+        size: share.size,
+        fsId: share.fsId,
+        md5: "",
+        category: 0,
+        ctime: "",
+        mtime: "",
+        parentFsId: "",
+        fromUk: share.fromUk,
+        msgId: share.msgId,
+        fromUser: share.fromUser,
+        group: gidS,
+      });
     }
+  }
+
+  // 阶段 2：BFS 递归扫描目录（每层 4 个一批并发，默认 depth=1 保持旧行为）
+  const dirShares = shares.filter((s) => s.isDir);
+  let queue = dirShares.map((s) => ({ fsId: s.fsId, fromUk: s.fromUk, msgId: s.msgId, depth: 1 }));
+
+  for (let level = 1; level <= depth && queue.length > 0 && !finished; level++) {
+    const current = queue;
+    queue = [];
 
-    if (share.isDir && maxDepth > 0) {
-      try {
-        const { files } = await listFiles(gid, share.fsId, {
-          fromUk: share.fromUk,
-          msgId: share.msgId,
-        });
-        for (const f of files) {
-          if (f.name.toLowerCase().includes(kw)) {
-            results.push({ ...f, group: gid });
+    for (let i = 0; i < current.length && !finished; i += concurrency) {
+      const batch = current.slice(i, i + concurrency);
+      const batchResults = await Promise.all(
+        batch.map(async (share) => {
+          scannedShares++;
+          try {
+            const { files } = await shareInfoRequest(gidS, share.fsId, share.fromUk, share.msgId, 1, 100);
+            const matches = files.filter((f) => f.name.toLowerCase().includes(kw));
+            const subDirs = files.filter((f) => f.isDir);
+            return { matches, subDirs };
+          } catch {
+            failedShares++;
+            return { matches: [], subDirs: [] };
+          }
+        })
+      );
+
+      for (const { matches, subDirs } of batchResults) {
+        if (finished) break;
+        for (const f of matches) {
+          pushIfMatch({ ...f, group: gidS });
+          if (finished) break;
+        }
+        // 收集下一层待扫描目录
+        if (level < depth && !finished) {
+          for (const d of subDirs) {
+            queue.push({ fsId: d.fsId, fromUk: d.fromUk, msgId: d.msgId, depth: level + 1 });
           }
         }
-      } catch {}
+      }
     }
   }
 
-  return results;
+  const complete = scannedShares >= totalShares;
+  const hasMore = !fetchAll && results.length > startIdx + limit;
+  const pageSlice = fetchAll ? results : results.slice(startIdx, startIdx + limit);
+
+  return {
+    results: pageSlice,
+    page,
+    pageSize: limit,
+    returned: pageSlice.length,
+    total: null,
+    hasMore,
+    nextPage: hasMore ? page + 1 : null,
+    unique,
+    complete,
+    partial: failedShares > 0,
+    scannedShares,
+    totalShares,
+    failedShares,
+    depth,
+  };
 }
 
-module.exports = { listGroups, listShares, listFiles, searchFiles };
+module.exports = { listGroups, listShares, listFiles, treeFiles, searchFiles, ShareApiError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baiduwangpan-cli",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "百度网盘 CLI — 全盘读写 · 免下载读取文件内容 · 群聊文件浏览 (Agent 友好)",
   "main": "lib/index.js",
   "bin": {
@@ -38,7 +38,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/NkAntony777/baiduwangpan-cli.git"
+    "url": "git+https://github.com/NkAntony777/baiduwangpan-cli.git"
   },
   "homepage": "https://github.com/NkAntony777/baiduwangpan-cli",
   "bugs": {