fish-dock-plugin-filemgr 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fish-dock-plugin-filemgr",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "FISH Dock 文件管理插件：目录浏览 + 文件预览（Markdown / 图片 / Office / 代码）+ 文件暂存中转站，兼容 FISH Dock v1.2.3 及更早官方发行版。",
   "type": "module",
   "files": [

package/plugin.json

@@ -2,7 +2,7 @@
   "schema": 1,
   "id": "jassdingk.filemgr",
   "name": "文件管理",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "hostApi": 1,
   "platforms": [
     "windows-x86_64"
@@ -27,15 +27,15 @@
   ],
   "files": {
     "bridge.js": "f38f93994e3cb2b71f2ff1810b3f68fb42f4261550f8ab01b0bfa3eecd5f94ee",
-    "package.json": "d2b066289c54ebfb40da8591f8dbaf261c8cbd0dcb80ea03f5206c7f0aa50e35",
-    "plugins/filemgr/backend.mjs": "b448aa688ff11f2abc4c5281b4714646ed6c384473d873cfe431a8e64b066d26",
+    "package.json": "330dcaaf54a8291462d17ef6a28d7b49465d7a603add478f03fb35feb49a4bee",
+    "plugins/filemgr/backend.mjs": "7cd37f01f6d4ae8b9693d2b1642f5078855fd405dae1e1cf9a6c10d7a8c15b15",
     "plugins/filemgr/clip.ps1": "b0a32fca35cf2d25133338f46e20a0db20d78c5bb6b5c2aab899998bfbd6c6ab",
     "plugins/filemgr/dock.css": "e795214dd39de3b473ac0b1a7b79f6922a88c761fca4d3ea4da8fd9b60188bcf",
-    "plugins/filemgr/filemgr.css": "79b878b29499284935d71dfa877716232f85ed40d864437382a059fa8ced0479",
+    "plugins/filemgr/filemgr.css": "c6d6e4041901e37d023205d8d7025b597294a8503bb74be74ed774eeb86fe1e3",
     "plugins/filemgr/FolderPicker.ps1": "4b7f86c543e06fd8f93fa5d8002997d944c8189cb0ae031bedf864ea89196427",
     "plugins/filemgr/page.css": "0801a05b5148cd091a68957beac21cc982a7818ef4707cd06fd11b20adbc7765",
-    "plugins/filemgr/page.html": "3cfda31be29cd23b1e0f7f6004b6c03522c3526b78f9df4711e320962a660831",
-    "plugins/filemgr/page.js": "74a7ccae18f7857be9656f14db07c2bddbf4591fff57a7eb16722ee4128e739d",
+    "plugins/filemgr/page.html": "415e9ae0d7ed85040974498d4d5581d707a668d55c917181025d4fee4dda67de",
+    "plugins/filemgr/page.js": "ab67c2a1f5e4a48c1912b630a712524ed3a65a592ae1a6a69d9a12058ca84ee4",
     "plugins/filemgr/pick-files.ps1": "88bff92d9a2e5b69e9411bb372441ff0b86899b7f5b31f5ed8d154c4f6fc2f37",
     "plugins/filemgr/pick-folder.ps1": "ff031c14df32149c1c80c7ab6a21710c1a68e823e96e3068c458a60902ae3b6f",
     "plugins/filemgr/preview.mjs": "a5596e77180fe7928443244a0148b6d3ea8381a1f886ee01f9a08be038c7ee80",
@@ -43,5 +43,8 @@
     "plugins/filemgr/stash.css": "fce2aaa13a86dbd7675b685c533f0bb916c7e610fc612a3ade660c67069f5662",
     "plugins/filemgr/stash.mjs": "c33cea6b845a3847950d26a10b9aba1ef68d39b1f9fc423b23055dead7638866",
     "README.md": "e9fb4ca9831b778a1d530b67518fcaf2b42cf02494b9d68deaad16bf2b947687"
+  },
+  "behaviors": {
+    "autostart": true
   }
 }

package/plugins/filemgr/backend.mjs

@@ -2,6 +2,7 @@
 // 所有业务方法都返回 {ok:true,...} 或 {ok:false,error}，便于页面显示真实原因。
 import path from 'node:path'
 import fs from 'node:fs'
+import http from 'node:http'
 import { spawn } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 import { createPlugin } from './sdk.mjs'
@@ -21,12 +22,6 @@ function logCrash(where, error) {
 process.on('uncaughtException', error => logCrash('uncaughtException', error))
 process.on('unhandledRejection', error => logCrash('unhandledRejection', error))
 
-// [诊断探针] 宿主每次 spawn 本后端都会留下这行痕迹，用于判定"宿主到底有没有拉起插件"。
-try {
-  const fs = await import('node:fs')
-  fs.appendFileSync(path.join(HERE, '_spawn-probe.log'),
-    `${new Date().toISOString()} pid=${process.pid} argv=${JSON.stringify(process.argv)} cwd=${process.cwd()} node=${process.execPath}\n`)
-} catch { /* 探针失败不影响业务 */ }
 
 // 宿主对插件方法的单次调用有 15 秒硬超时（plugin_runtime.rs:42），
 // 而用户挑文件夹可能盯着一分钟。所以选择操作拆成两步：
@@ -165,6 +160,161 @@ function guard(fn) {
 
 function activeRoots() { return roots(extraRoots) }
 
+// ---- 全局文件搜索：遍历「位置」里所有根目录，按文件名匹配关键字 ----
+// 宿主对单次插件调用有 15 秒硬超时，这里用 8 秒 deadline + 扫描/命中上限主动收敛，
+// 并把系统/缓存等超大类目录跳过，避免全盘扫描拖死页面。
+const SEARCH_HIDDEN = new Set([
+  'node_modules', '.git', '.svn', '.hg', '__pycache__', '.idea', '.vscode', 'target', 'dist', '.next', '.cache',
+  '$RECYCLE.BIN', 'System Volume Information', 'AppData', 'Windows', 'Program Files', 'Program Files (x86)',
+  'ProgramData', 'Recovery', 'PerfLogs', '$WinREAgent', 'OneDriveTemp',
+])
+async function searchFiles(query, list) {
+  const raw = String(query || '').trim()
+  const needle = raw.toLowerCase()
+  if (!needle) return { query: raw, results: [], scanned: 0, dirs: 0, truncated: false, timedOut: false }
+  const MAX_RESULTS = 300
+  const MAX_SCAN = 80000
+  const MAX_DEPTH = 14
+  const deadline = Date.now() + 8000
+  const results = []
+  let scanned = 0
+  let dirs = 0
+  let truncated = false
+  let timedOut = false
+  const stack = list.map(r => ({ dir: r.path, depth: 0, root: r.label }))
+  while (stack.length) {
+    if (results.length >= MAX_RESULTS || scanned >= MAX_SCAN || Date.now() > deadline) { truncated = true; timedOut = Date.now() > deadline; break }
+    const cur = stack.pop()
+    let ents
+    try { ents = await fs.promises.readdir(cur.dir, { withFileTypes: true }) } catch { continue }
+    dirs++
+    for (const e of ents) {
+      if (results.length >= MAX_RESULTS || scanned >= MAX_SCAN || Date.now() > deadline) { truncated = true; timedOut = Date.now() > deadline; break }
+      const name = e.name
+      if (!name || name.startsWith('.')) continue
+      if (e.isSymbolicLink && e.isSymbolicLink()) continue
+      const isDir = e.isDirectory()
+      if (isDir && SEARCH_HIDDEN.has(name)) continue
+      const full = path.join(cur.dir, name)
+      scanned++
+      if (!isDir) {
+        if (name.toLowerCase().includes(needle)) {
+          let size = 0, mtime = 0
+          try { const s = await fs.promises.stat(full); size = s.size; mtime = s.mtimeMs } catch { /* 用 0 兜底 */ }
+          results.push({ name, path: full, dir: cur.dir, root: cur.root, size, mtime })
+        }
+      } else if (cur.depth < MAX_DEPTH) {
+        stack.push({ dir: full, depth: cur.depth + 1, root: cur.root })
+      }
+    }
+  }
+  results.sort((a, b) => {
+    const ea = a.name.toLowerCase() === needle ? 1 : 0
+    const eb = b.name.toLowerCase() === needle ? 1 : 0
+    if (ea !== eb) return eb - ea
+    return (b.mtime || 0) - (a.mtime || 0)
+  })
+  return { query: raw, results, scanned, dirs, truncated, timedOut }
+}
+
+// ---- Everything 索引搜索（优先）：调用本机 Everything 的 HTTP JSON 接口 ----
+// Everything 用 NTFS USN/MFT 索引，全盘搜索是毫秒级；没装/没开则返回 null，让上层回退到 searchFiles 遍历。
+// 端口优先 8090（本机已配），再试默认 80 / 8080；命中后缓存端口。
+const EVERYTHING_PORTS = [8090, 80, 8080]
+let everythingPort = null
+
+function httpGetJson(url, timeoutMs) {
+  return new Promise(resolve => {
+    let req
+    try {
+      req = http.get(url, res => {
+        let body = ''
+        res.on('data', d => { body += d })
+        res.on('end', () => { try { resolve(JSON.parse(body)) } catch { resolve(null) } })
+        res.on('error', () => resolve(null))
+      })
+    } catch { return resolve(null) }
+    req.on('error', () => resolve(null))
+    req.setTimeout(timeoutMs, () => { try { req.destroy() } catch { /* ignore */ } resolve(null) })
+  })
+}
+
+async function probeEverything(requireHits) {
+  // 缓存端口也必须验证存活：用户可能随时关掉 Everything，不能盲信缓存否则不会触发重新拉起
+  if (everythingPort) {
+    const j = await httpGetJson(`http://127.0.0.1:${everythingPort}/?json=1&search=&count=1`, 1500)
+    if (j && typeof j.totalResults === 'number' && (!requireHits || j.totalResults > 0)) return everythingPort
+    everythingPort = null  // 已失效，清缓存，下面重新探测（必要时由 searchViaEverything 拉起）
+  }
+  for (const p of EVERYTHING_PORTS) {
+    const j = await httpGetJson(`http://127.0.0.1:${p}/?json=1&search=&count=1`, 1500)
+    if (j && typeof j.totalResults === 'number' && (!requireHits || j.totalResults > 0)) { everythingPort = p; return p }
+  }
+  return null
+}
+
+// 首次启用 / 用户没开 Everything 时：后台拉起主程序，不弹出窗口（-minimized + windowsHide）。
+function findEverythingExe() {
+  const cands = [
+    process.env.EVERYTHING_EXE,
+    'D:\\Everything\\Everything.exe',
+    'C:\\Program Files\\Everything\\Everything.exe',
+    'C:\\Program Files (x86)\\Everything\\Everything.exe',
+  ]
+  for (const p of cands) { try { if (p && fs.existsSync(p)) return p } catch { /* ignore */ } }
+  return null
+}
+
+function spawnEverythingBackground() {
+  const exe = findEverythingExe()
+  if (!exe) return false
+  try {
+    // -startup：按 ini 的 minimize_to_tray=1 隐藏到托盘（-minimized 只是最小化到任务栏，仍占任务栏）
+    const child = spawn(exe, ['-startup'], { detached: true, stdio: 'ignore', windowsHide: true })
+    child.unref()
+    return true
+  } catch { return false }
+}
+
+async function waitForEverything(maxWaitMs) {
+  const deadline = Date.now() + maxWaitMs
+  while (Date.now() < deadline) {
+    const p = await probeEverything(true)  // 等到索引真的有命中，而不只是 HTTP 通了
+    if (p) return p
+    await new Promise(r => setTimeout(r, 800))
+  }
+  return null
+}
+
+function filetimeToMs(ft) {
+  const n = Number(ft)
+  return Number.isFinite(n) && n > 0 ? Math.round(n / 10000 - 11644473600000) : 0
+}
+
+async function searchViaEverything(query, maxResults) {
+  let port = await probeEverything()
+  if (!port) {
+    // 首次启用 / 用户没开 Everything：后台拉起（-minimized + windowsHide，不显示窗口），最多等 10 秒索引就绪
+    if (spawnEverythingBackground()) port = await waitForEverything(10000)
+    if (!port) return null
+  }
+  // 用双引号包裹用户输入，避免 . * ? 空格等被 Everything 当作搜索语法解析
+  const wrapped = '"' + String(query).replace(/"/g, '') + '"'
+  const count = Math.max(1, Math.min(maxResults || 300, 1000))
+  const url = `http://127.0.0.1:${port}/?json=1&search=${encodeURIComponent(wrapped)}&count=${count}&path_column=1&size_column=1&date_modified_column=1`
+  const j = await httpGetJson(url, 8000)
+  if (!j || !Array.isArray(j.results)) return null
+  const results = j.results.map(x => {
+    const parent = x.path || ''
+    const full = parent ? path.join(parent, x.name || '') : (x.name || '')
+    return {
+      name: x.name || '', path: full, dir: parent,
+      isDir: x.type === 'folder', size: Number(x.size) || 0, mtime: filetimeToMs(x.date_modified),
+    }
+  })
+  return { query, results, total: j.totalResults || results.length, source: 'everything' }
+}
+
 async function loadConfig() {
   const raw = await context.storage.read('config', 'prefs.json').catch(() => null)
   if (!raw) return { roots: [], layout, sideW, recent, favorites, pinned, stash: undefined }
@@ -338,6 +488,17 @@ createPlugin({
       return { name: row.name, ext: row.ext, kind: row.isDir ? 'dir' : kindOf(row.ext), size: row.size, mtime: row.mtime }
     }),
 
+    // 全局文件搜索：有 Everything 走它的索引（秒级全盘），没有则回退 searchFiles 遍历
+    'preview.search': guard(async params => {
+      const q = String(params.query || '').trim()
+      if (q) {
+        const via = await searchViaEverything(q, 300)
+        if (via) return { ...via, scanned: null, dirs: null, truncated: via.total > via.results.length, timedOut: false }
+      }
+      const r = await searchFiles(q, activeRoots())
+      return { ...r, source: 'scan' }
+    }),
+
     // ── stash 命令 ──────────────────────────────────────────────
 
     'stash.list': guard(async () => stash.list()),

package/plugins/filemgr/filemgr.css

@@ -11,6 +11,19 @@ body.fm-layout, main.fm{height:820px;display:flex;flex-direction:column;padding:
 .fm-head .fm-meta{color:var(--dock-muted);font-size:12px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;min-width:0;max-width:52vw}
 .fm-head .fm-meta:empty{display:none}
 
+/* 预览工具栏右侧的全局搜索框（在「📌 固定当前文件夹」右边） */
+.search-box{display:flex;align-items:center;gap:4px;margin-left:auto;min-width:0;max-width:260px;flex:0 1 auto}
+.search-box input[type=search]{width:180px;min-width:80px;height:26px;padding:0 9px;font:inherit;font-size:12px;color:var(--dock-fg);background:var(--dock-control);border:1px solid var(--dock-line);border-radius:999px;outline:none}
+.search-box input[type=search]:focus{border-color:var(--dock-accent)}
+.search-box #search-clear{margin:0;padding:2px 7px;border-radius:999px;flex:none}
+.search-head{padding:6px 2px 8px;color:var(--dock-muted);font-size:12px}
+/* 搜索结果行用独立类 srow，彻底避开 .filelist .row 的多套列宽/隐藏规则冲突 */
+.search-list .srow{display:grid;grid-template-columns:minmax(0,1.6fr) minmax(0,0.9fr) 74px;align-items:center;gap:8px;width:100%;text-align:left;border:0;background:transparent;border-radius:9px;padding:5px 9px;min-height:28px;cursor:pointer;font:inherit;color:inherit}
+.search-list .srow:hover{background:var(--dock-control)}
+.search-list .srow .nm{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0;text-align:left;color:var(--dock-fg);font-size:13px}
+.search-list .srow .dt{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0;color:var(--dock-muted);font-size:11px;text-align:left}
+.search-list .srow .sz{text-align:right;color:var(--dock-muted);font-size:11px;font-variant-numeric:tabular-nums;white-space:nowrap}
+
 /* 错误条跨全宽 */
 main.fm > #error{margin:0 8px 8px;flex:none}
 

package/plugins/filemgr/page.html

@@ -76,6 +76,10 @@
         <button id="refresh" title="刷新">刷新</button>
         <button id="fav-open" title="常用文件夹" class="ghost">★</button>
         <button id="fav-pin-btn" title="固定当前文件夹" class="ghost" hidden>📌</button>
+        <div id="search-box" class="search-box">
+          <input id="search-input" type="search" placeholder="搜索所有磁盘…" autocomplete="off" spellcheck="false" aria-label="搜索所有磁盘里的文件" title="输入关键字后停顿或回车，检索「位置」里所有磁盘/根目录下的文件">
+          <button id="search-clear" class="ghost tiny" type="button" title="清除搜索" hidden>✕</button>
+        </div>
         <!-- 浮层必须放在 .preview-toolbar 里面：它是 position:relative 的定位祖先，
              放到 nav 外面会以 #preview-col 为基准、top:100% 直接掉到整个预览列下面看不见。 -->
         <div id="fav-pop" class="fav-pop" hidden>

package/plugins/filemgr/page.js

@@ -1311,6 +1311,94 @@
     guard(() => openPath(value))()
   }
 
+  // ---------------------------------------------------------------- 全局文件搜索
+  // 固定当前文件夹按钮右侧的搜索框：停止输入 350ms 或回车后，检索所有已添加磁盘/根目录的文件。
+  let searchTimer = null
+  let searchSeq = 0
+
+  function twoUp(dir) {
+    const parts = String(dir || '').split(/[\\/]+/).filter(Boolean)
+    if (parts.length <= 2) return parts.join('\\')
+    return '…\\' + parts.slice(-2).join('\\')
+  }
+
+  function drawSearchResults(query, row) {
+    const view = clear($('view'))
+    const count = row ? row.results.length : 0
+    let headText
+    if (row && row.source === 'everything') {
+      headText = `搜索「${query}」：找到 ${count} 项（Everything 索引，共匹配 ${row.total} 项）`
+      if (row.truncated) headText += `，仅显示前 ${count} 项`
+    } else {
+      headText = `搜索「${query}」：找到 ${count} 项（扫描 ${row ? row.scanned : 0} 个文件）`
+      if (row && row.truncated) headText += row.timedOut ? '，已达时间上限，结果可能不全' : '，已达数量上限，结果可能不全'
+    }
+    view.append(el('div', { class: 'search-head' }, [el('span', { text: headText })]))
+    if (!row || !count) {
+      view.append(el('p', { class: 'empty', text: row && row.scanned ? '没有匹配的文件' : '没有可搜索的磁盘或目录' }))
+      return
+    }
+    const list = el('div', { class: 'filelist search-list' })
+    for (const item of row.results) {
+      list.append(el('button', {
+        type: 'button', class: 'srow',
+        title: item.path,
+        onclick: guard(async () => {
+          $('search-input').value = ''
+          $('search-clear').hidden = true
+          await openPath(item.path)
+        }),
+      }, [
+        el('span', { class: 'nm', text: item.name }),
+        el('span', { class: 'dt', text: twoUp(item.dir) }),
+        el('span', { class: 'sz', text: bytes(item.size) }),
+      ]))
+    }
+    view.append(list)
+  }
+
+  function wireSearch() {
+    const box = $('search-input')
+    const clearBtn = $('search-clear')
+    if (!box) return
+    const run = async () => {
+      const query = box.value.trim()
+      if (clearBtn) clearBtn.hidden = !query
+      if (!query) {
+        // 清空搜索：恢复当前目录/文件视图
+        if (state.file) guard(() => openFile(state.file.path))()
+        else if (state.path) guard(() => openDir(state.path))()
+        else drawDir()
+        return
+      }
+      const seq = ++searchSeq
+      say('正在搜索…')
+      bad('')
+      try {
+        const row = await call('preview.search', { query })
+        if (seq !== searchSeq) return
+        say('')
+        drawSearchResults(query, row)
+      } catch (error) {
+        if (seq !== searchSeq) return
+        say('')
+        bad(error && error.message ? error.message : String(error))
+      }
+    }
+    box.addEventListener('input', () => {
+      const query = box.value.trim()
+      if (clearBtn) clearBtn.hidden = !query
+      if (searchTimer) { clearTimeout(searchTimer); searchTimer = null }
+      if (!query) { run(); return }
+      searchTimer = setTimeout(() => { searchTimer = null; run() }, 350)
+    })
+    box.addEventListener('keydown', event => {
+      if (event.key === 'Enter') { event.preventDefault(); if (searchTimer) { clearTimeout(searchTimer); searchTimer = null } run() }
+      else if (event.key === 'Escape') { box.value = ''; if (clearBtn) clearBtn.hidden = true; run() }
+    })
+    if (clearBtn) clearBtn.onclick = () => { box.value = ''; clearBtn.hidden = true; run() }
+  }
+
   // ---------------------------------------------------------------- 启动
 
   async function bootPreview() {
@@ -2046,6 +2134,7 @@
   wireFmSplit()
   wireSplitter()
   wireBrowseSelect()
+  wireSearch()
   drawSide()
   // 两套 boot 只读数据、不互斥；不能用 guard（它会因共享 state.busy 把第二个启动挡掉）。
   const bootSafe = fn => Promise.resolve().then(fn).catch(error => bad(error && error.message ? error.message : String(error)))