dsh-mcloud 0.2.1 → 0.3.0

package/lib/index.js

@@ -61,16 +61,23 @@ const MCLOUD_RETRY_DELAY_MS = 400
 
 /**
  * 目录分页大小。
- * 实测（同一个 100 项的目录，各测 3 次取中位数）：
- *   pageSize= 10 →  1353 ms
- *   pageSize= 20 →  6631 ms
- *   pageSize= 30 → 13692 ms
- *   pageSize= 50 → 16088 ms
- *   pageSize=100 → 25311 ms（还会超时/ECONNRESET）
- * 这个接口对「一次要多少条」极度敏感，几乎是二次方恶化。
- * 所以只请求 10 项 —— 首屏要的是「快」，剩下的靠「加载更多」。
+ *
+ * ⚠️ 这里的数据修正过一次。早期测出来的结论是「pageSize 越大越慢，几乎二次方恶化」
+ * （10 → 1.3s，100 → 25s），于是定成了 10。但后来在真实的大目录
+ * （手机图片，几百上千张）上重测，结果完全不同：
+ *
+ *   pageSize= 10 →  218 ms   每 100 项约 2180 ms
+ *   pageSize= 30 →  248 ms   每 100 项约  827 ms
+ *   pageSize= 50 →  296 ms   每 100 项约  592 ms
+ *   pageSize=100 →  451 ms   每 100 项约  451 ms
+ *
+ * 也就是说：**瓶颈是每次请求的固定开销，不是条目数**。
+ * 一次多拿几十条几乎不要钱，但每页只拿 10 条就要多跑好几倍的往返。
+ *
+ * 取 50：相比 10 把「单位成本」降到 1/3.7，同时给单次响应留了余量
+ * （某些目录条目体积大时，100 档的尾部延迟会更明显）。
  */
-const LIST_PAGE_SIZE = 10
+const LIST_PAGE_SIZE = 50
 
 /**
  * 目录列表缓存。点文件夹「慢」的很大一部分原因是每次进出都重新拉一遍，
@@ -504,6 +511,21 @@ $script:timer.Stop()
 if ($r -eq [System.Windows.Forms.DialogResult]::OK) { & $emit $d.SelectedPath }
 `
 
+/**
+ * 选「下载目录」专用的对话框。
+ *
+ * 和上传那个分开：文案不同，而且这里允许「新建文件夹」——
+ * 用户选下载目录时往往是想就地建一个，不给这个按钮反而别扭。
+ */
+const PICKER_DOWNLOAD_DIR = `${PICKER_PRELUDE}
+$d = New-Object System.Windows.Forms.FolderBrowserDialog
+$d.Description = '选择文件下载到本地的目录'
+$d.ShowNewFolderButton = $true
+$r = $d.ShowDialog()
+$script:timer.Stop()
+if ($r -eq [System.Windows.Forms.DialogResult]::OK) { & $emit $d.SelectedPath }
+`
+
 /**
  * 弹系统原生的「打开文件 / 选择文件夹」对话框，返回选中的真实路径。
  * 走的是宿主端进程，所以拿到的是磁盘真实路径 —— 上传时直接从磁盘流式读，
@@ -513,7 +535,8 @@ function pickLocalPaths(mode) {
   if (!windows) {
     return Promise.reject(new Error('原生文件对话框目前只支持 Windows，请直接手填路径'))
   }
-  const script = mode === 'folder' ? PICKER_FOLDER : PICKER_FILES
+  const script =
+    mode === 'download-dir' ? PICKER_DOWNLOAD_DIR : mode === 'folder' ? PICKER_FOLDER : PICKER_FILES
   return new Promise((resolvePick, rejectPick) => {
     const child = spawn(powershellPath(), ['-NoProfile', '-STA', '-Command', script], {
       windowsHide: true,
@@ -1029,6 +1052,24 @@ function createClient(store, logger, config) {
     return true
   }
 
+  /**
+   * 清空「已经结束」的任务记录。
+   *
+   * ⚠️ 只动内存里的记录表，**不碰网盘和本地文件**。
+   * 正在跑的任务不能删 —— 删了界面就再也看不到它的进度了，
+   * 而且用户点「清空」时想清的显然是历史，不是眼前这条。
+   */
+  function clearFinishedJobs() {
+    let removed = 0
+    for (const [id, job] of jobs) {
+      if (job.state !== 'running') {
+        jobs.delete(id)
+        removed += 1
+      }
+    }
+    return removed
+  }
+
   /**
    * 上传本地文件。流程见 transfer.js 顶部的注释。
    * 注意：整个文件只流式读一遍算哈希，分片也是流式 PUT，不把文件读进内存。
@@ -1465,6 +1506,82 @@ function createClient(store, logger, config) {
     return { cancelled: true }
   }
 
+  /**
+   * 界面用的搜索：在当前目录及其子目录里按名字找。
+   *
+   * 和模型工具 `mcloud_search` 的差别：
+   *   · 工具版是 BFS 走 10 页，适合「帮我找找」，用户等得起；
+   *   · 界面版是人在输入框里打字，必须**尽快出第一批结果**，并且要能中途取消。
+   *
+   * 所以这里：先只搜当前这一层（最快），够了就停；不够再往下走，
+   * 且总量封顶，避免用户搜个常见字把整个网盘翻一遍。
+   */
+  async function searchFiles(keyword, parentFileId = ROOT_ID, options = {}) {
+    const needle = String(keyword ?? '').trim().toLowerCase()
+    if (!needle) return { items: [], truncated: false }
+
+    // 只在磁盘上跑：limit 是「返回上限」，pages 是「最多翻多少页」
+    const limit = Math.max(1, Math.min(500, Number(options.limit) || 120))
+    const maxPages = Math.max(1, Math.min(60, Number(options.maxPages) || 24))
+    const depthLimit = Math.max(0, Math.min(8, Number(options.depth) ?? 4))
+
+    const matches = []
+    let pages = 0
+    let truncated = false
+
+    /** 走一层：返回这一层里的文件夹 id，供下一层继续。 */
+    async function scanFolder(folderId, depth, pathLabel) {
+      const children = []
+      let cursor = ''
+      do {
+        if (pages >= maxPages || matches.length >= limit) {
+          truncated = true
+          return children
+        }
+        const page = await listFiles(folderId, cursor)
+        pages += 1
+        for (const item of page.items) {
+          const hit = String(item.name || '').toLowerCase().includes(needle)
+          if (hit) {
+            matches.push({
+              ...item,
+              parent: folderId,
+              parentPath: pathLabel,
+            })
+            if (matches.length >= limit) {
+              truncated = true
+              return children
+            }
+          }
+          if (item.type === 'folder') children.push(item)
+        }
+        cursor = page.nextCursor || ''
+      } while (cursor)
+      return children
+    }
+
+    // 第一层（当前目录）：优先、同步完成
+    const level1 = await scanFolder(parentFileId, 0, '/')
+
+    if (depthLimit > 0 && matches.length < limit && pages < maxPages) {
+      let frontier = level1.map((folder) => ({ id: folder.id, path: '/' + folder.name }))
+      for (let depth = 1; depth <= depthLimit && frontier.length && matches.length < limit; depth += 1) {
+        const next = []
+        for (const folder of frontier) {
+          if (pages >= maxPages || matches.length >= limit) {
+            truncated = true
+            break
+          }
+          const kids = await scanFolder(folder.id, depth, folder.path)
+          for (const kid of kids) next.push({ id: kid.id, path: folder.path + '/' + kid.name })
+        }
+        frontier = next
+      }
+    }
+
+    return { items: matches, truncated, pages }
+  }
+
   return {
     status,
     authorize,
@@ -1475,6 +1592,7 @@ function createClient(store, logger, config) {
     cancelScan,
     forget,
     listFiles,
+    searchFiles,
     getDownloadUrl,
     makeDir,
     renameNode,
@@ -1485,6 +1603,7 @@ function createClient(store, logger, config) {
     getJob,
     listJobs,
     cancelJob,
+    clearFinishedJobs,
     ensureFolder,
     uploadFile,
     uploadFolder,
@@ -1997,6 +2116,36 @@ function createRoutes(client) {
         }
       },
     },
+    {
+      kind: 'exact',
+      path: `${base}/search`,
+      handler: async (req, res) => {
+        if (!guard(req, res)) return
+        try {
+          const url = new URL(req.url, 'http://127.0.0.1')
+          const keyword = url.searchParams.get('keyword') || ''
+          const parentFileId = url.searchParams.get('parentFileId') || ROOT_ID
+          const depth = url.searchParams.get('depth')
+          const result = await client.searchFiles(keyword, parentFileId, {
+            depth: depth === null ? undefined : Number(depth),
+          })
+          writeJson(res, 200, { ok: true, ...result })
+        } catch (error) {
+          writeJson(res, 500, { ok: false, error: errorMessage(error) })
+        }
+      },
+    },
+    {
+      kind: 'exact',
+      path: `${base}/pick-dir`,
+      handler: async (req, res) => {
+        if (!guardWrite(req, res)) return
+        await post(req, res, async () => {
+          const paths = await pickLocalPaths('download-dir')
+          return { path: paths[0] || '', cancelled: paths.length === 0 }
+        })
+      },
+    },
     {
       kind: 'exact',
       path: `${base}/link`,
@@ -2060,6 +2209,18 @@ function createRoutes(client) {
         })
       },
     },
+    {
+      kind: 'exact',
+      path: `${base}/transfers/clear`,
+      handler: async (req, res) => {
+        if (!guardWrite(req, res)) return
+        await post(req, res, async () => {
+          // 只清记录，不碰网盘文件，也不需要用户确认
+          const removed = client.clearFinishedJobs()
+          return { removed }
+        })
+      },
+    },
     {
       kind: 'exact',
       path: `${base}/transfers`,

package/package.json

@@ -1,64 +1,64 @@
-{
-  "name": "dsh-mcloud",
-  "version": "0.2.1",
-  "description": "中国移动云盘（139）接入 DeepSeek Harness：容量查询、列目录、上传下载、转移、以及在会话页提供一个可操作的标签面板。",
-  "type": "module",
-  "main": "lib/index.js",
-  "icon": "./icon.svg",
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./locale/*.json": "./locale/*.json",
-    "./icon": "./icon.svg",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "locale/*.json",
-    "icon.svg",
-    "cordis.patch.yml",
-    "README.md",
-    "CHANGELOG.md",
-    "CONTRIBUTING.md",
-    "FAQ.md",
-    "LICENSE"
-  ],
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "immediately": true,
-      "inject": [
-        "@deepseek-ai/dsh-client-locale"
-      ]
-    }
-  },
-  "keywords": [
-    "dsh",
-    "dsh-plugin",
-    "deepseek-harness",
-    "139",
-    "mobile-cloud",
-    "china-mobile",
-    "yun139"
-  ],
-  "engines": {
-    "node": ">=22",
-    "dsh": ">=0.2.1-rc.5 <0.3.0-0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/GIYN-S/dsh-mcloud.git"
-  },
-  "homepage": "https://github.com/GIYN-S/dsh-mcloud#readme",
-  "bugs": {
-    "url": "https://github.com/GIYN-S/dsh-mcloud/issues"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "license": "MIT"
-}
+{
+  "name": "dsh-mcloud",
+  "version": "0.3.0",
+  "description": "中国移动云盘（139）接入 DeepSeek Harness：容量查询、列目录、上传下载、转移、以及在会话页提供一个可操作的标签面板。",
+  "type": "module",
+  "main": "lib/index.js",
+  "icon": "./icon.svg",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./locale/*.json": "./locale/*.json",
+    "./icon": "./icon.svg",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "locale/*.json",
+    "icon.svg",
+    "cordis.patch.yml",
+    "README.md",
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "FAQ.md",
+    "LICENSE"
+  ],
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "immediately": true,
+      "inject": [
+        "@deepseek-ai/dsh-client-locale"
+      ]
+    }
+  },
+  "keywords": [
+    "dsh",
+    "dsh-plugin",
+    "deepseek-harness",
+    "139",
+    "mobile-cloud",
+    "china-mobile",
+    "yun139"
+  ],
+  "engines": {
+    "node": ">=22",
+    "dsh": ">=0.2.1-rc.5 <0.3.0-0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/GIYN-S/dsh-mcloud.git"
+  },
+  "homepage": "https://github.com/GIYN-S/dsh-mcloud#readme",
+  "bugs": {
+    "url": "https://github.com/GIYN-S/dsh-mcloud/issues"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "license": "MIT"
+}