baiduwangpan-cli 1.0.0 → 1.0.2

package/lib/group.js

@@ -1,30 +1,49 @@
 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");
 
-  const data = http.curlJson(
+  const data = await http.webJson(
     `${http.PAN_BASE}/mbox/group/list?clienttype=0&app_id=${http.APP_ID}&web=1&bdstoken=${bdstoken}`
   );
 
   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 = http.curlJson(
-    `${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}`,
+  const data = await http.webJson(
+    `${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 = http.curlJson(
-    `${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/lib/http.js

@@ -1,10 +1,15 @@
 const { spawnSync } = require("child_process");
 const config = require("./config");
 
+function buildCookieHeader(cfg) {
+  if (cfg.cookie) return cfg.cookie;
+  return `BDUSS=${cfg.bduss}; STOKEN=${cfg.stoken}`;
+}
+
 function curlGet(url, extraHeaders = {}) {
   const cfg = config.get();
   const headers = {
-    Cookie: `BDUSS=${cfg.bduss}; STOKEN=${cfg.stoken}`,
+    Cookie: buildCookieHeader(cfg),
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
     Referer: "https://pan.baidu.com/disk/main",
     ...extraHeaders,
@@ -23,7 +28,7 @@ function curlGet(url, extraHeaders = {}) {
 function curlPost(url, body = "", extraHeaders = {}) {
   const cfg = config.get();
   const headers = {
-    Cookie: `BDUSS=${cfg.bduss}; STOKEN=${cfg.stoken}`,
+    Cookie: buildCookieHeader(cfg),
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
     Referer: "https://pan.baidu.com/disk/main",
     "Content-Type": "application/x-www-form-urlencoded",
@@ -67,18 +72,45 @@ function curlJson(url, options = {}) {
   }
 }
 
+async function webJson(url, options = {}) {
+  const cfg = config.get();
+  if (cfg.webTransport !== "browser") return curlJson(url, options);
+
+  const { browserJson } = require("./browser-login");
+  const headers = { ...(options.headers || {}) };
+  if (options.method === "POST" && !headers["Content-Type"]) {
+    headers["Content-Type"] = "application/x-www-form-urlencoded";
+  }
+  return browserJson(
+    url,
+    {
+      method: options.method || "GET",
+      ...(Object.prototype.hasOwnProperty.call(options, "body") ? { body: options.body } : {}),
+      headers,
+    },
+    {
+      profileDir: cfg.browserProfile,
+      port: cfg.browserPort,
+      onPort: (browserPort) => {
+        if (browserPort !== cfg.browserPort) config.update({ browserPort });
+      },
+    }
+  );
+}
+
 async function getBdstoken() {
   const fields = encodeURIComponent('["bdstoken","token","uk","isdocuser","servertime"]');
-  const data = curlJson(
+  const data = await webJson(
     `https://pan.baidu.com/api/gettemplatevariable?clienttype=0&app_id=250528&web=1&fields=${fields}`
   );
   const token = data?.result?.bdstoken || null;
   if (!token) {
     const cfg = require("./config").get();
     throw new Error(
-      `Cannot get bdstoken. Check BDUSS/STOKEN.\n` +
+      `Cannot get bdstoken. The web session is not authenticated.\n` +
       `  BDUSS: ${cfg.bduss ? "set" : "MISSING"}  STOKEN: ${cfg.stoken ? "set" : "MISSING"}\n` +
-      `  Run: bdp login --bduss <value> --stoken <value>`
+      `  Web API transport: ${cfg.webTransport}\n` +
+      `  Run: bdp login, or bdp login --bduss <value> --stoken <value>`
     );
   }
   return token;
@@ -87,4 +119,4 @@ async function getBdstoken() {
 const APP_ID = "250528";
 const PAN_BASE = "https://pan.baidu.com";
 
-module.exports = { curlGet, curlPost, curlRange, curlJson, getBdstoken, APP_ID, PAN_BASE };
+module.exports = { curlGet, curlPost, curlRange, curlJson, webJson, getBdstoken, APP_ID, PAN_BASE };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baiduwangpan-cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "百度网盘 CLI — 全盘读写 · 免下载读取文件内容 · 群聊文件浏览 (Agent 友好)",
   "main": "lib/index.js",
   "bin": {
@@ -8,11 +8,15 @@
   },
   "scripts": {
     "start": "node bin/bdp.js",
+    "test": "node --test",
     "postinstall": "node scripts/postinstall.js"
   },
   "engines": {
     "node": ">=14"
   },
+  "dependencies": {
+    "ws": "^8.18.0"
+  },
   "license": "MIT",
   "keywords": [
     "baidu",
@@ -34,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": {