dsh-remote 0.8.5 → 0.8.7

package/lib/ignore.js

@@ -1,123 +1,123 @@
-// dsh-remote — gitignore-style ignore matcher for mirror sync / remote search.
-import { readFileSync } from 'node:fs'
-//
-// Deliberately a SUBSET of gitignore semantics (documented, no surprises):
-//   - blank lines and `#` comments are skipped
-//   - `!` negation is NOT supported (later rules never un-ignore)
-//   - a trailing `/` matches directories only (and everything under them)
-//   - a pattern containing `/` (or starting with `/`) is anchored to the
-//     workspace root; otherwise it matches the basename at ANY depth
-//   - `*` matches any run of chars except `/`; `**` matches any run incl. `/`;
-//     `?` matches one char except `/`
-//   - character classes (`[abc]`) are not supported (treated literally)
-
-/** Convert one glob segment to a regex source (no `/` crossing). A leading
- * double-star-slash (`**` + `/`) matches zero or more directories (gitignore). */
-function globToRe(glob) {
-  let out = ''
-  let i = 0
-  const s = String(glob)
-  if (s.startsWith('**/')) { out = '(?:.*/)?'; i = 3 }
-  while (i < s.length) {
-    const c = s[i]
-    if (c === '*') {
-      if (s[i + 1] === '*') { out += '.*'; i += 2; continue }
-      out += '[^/]*'; i++; continue
-    }
-    if (c === '?') { out += '[^/]'; i++; continue }
-    if ('\\^$+{}[]()|.'.includes(c)) out += '\\' + c
-    else out += c
-    i++
-  }
-  return out
-}
-
-/**
- * Compile a list of ignore patterns into a matcher.
- * @param {string[]|string} patterns lines or an array of lines
- * @returns {(relPath: string, isDir?: boolean) => boolean} true = ignored.
- *   `relPath` is POSIX-style ('/' separated, no leading '/').
- */
-export function compileIgnore(patterns) {
-  const rules = []
-  const lines = Array.isArray(patterns) ? patterns : String(patterns || '').split('\n')
-  for (let raw of lines) {
-    let line = String(raw || '').trim()
-    if (!line || line.startsWith('#')) continue
-    let dirOnly = false
-    if (line.endsWith('/')) { dirOnly = true; line = line.slice(0, -1) }
-    let anchored = line.startsWith('/')
-    if (anchored) line = line.slice(1)
-    if (!line) continue
-    const hasSlash = line.includes('/')
-    const isAnchored = anchored || hasSlash
-    const segRe = globToRe(line)
-    let re
-    if (isAnchored) {
-      // Root-anchored: match the full path from the root.
-      re = dirOnly
-        ? new RegExp('^' + segRe + '(/.*)?$')
-        : new RegExp('^' + segRe + '$')
-    } else {
-      // Basename at any depth; a dir pattern also covers everything under it.
-      re = dirOnly
-        ? new RegExp('(^|/)' + segRe + '(/|$)')
-        : new RegExp('(^|/)' + segRe + '$')
-    }
-    rules.push({ re, dirOnly })
-  }
-  return function isIgnored(relPath, isDir) {
-    const rel = String(relPath || '').replace(/^\/+/, '').replace(/\\/g, '/')
-    if (!rel) return false
-    for (const r of rules) {
-      if (r.re.test(rel)) return true
-    }
-    return false
-  }
-}
-
-/** Built-in defaults: never pull/push these into/from a mirror. */
-export const DEFAULT_IGNORE = [
-  '.git/',
-  '.svn/',
-  '.hg/',
-  'node_modules/',
-  'target/',
-  'dist/',
-  'build/',
-  '.venv/',
-  'venv/',
-  '__pycache__/',
-  '.idea/',
-  '.vscode/',
-  '*.o',
-  '*.a',
-  '*.so',
-  '*.dylib',
-  '*.exe',
-  '*.dll',
-  '*.class',
-  '*.jar',
-  '*.log',
-  '*.tmp',
-  '.DS_Store',
-  'Thumbs.db',
-  '.dsh-remote-meta.json',
-  '.dsh-remote-sync-state.json',
-]
-
-/**
- * Load the user ignore file (gitignore syntax) and merge with defaults.
- * Returns `{ patterns, fromFile }`.
- */
-export function loadIgnore(ignoreFile) {
-  let fromFile = []
-  if (ignoreFile) {
-    try {
-      const text = readFileSync(ignoreFile, 'utf8')
-      fromFile = text.split('\n').map((l) => l.trim()).filter((l) => l && !l.startsWith('#'))
-    } catch { /* missing file → defaults only */ }
-  }
-  const patterns = DEFAULT_IGNORE.concat(fromFile)
-  return { patterns, fromFile, matcher: compileIgnore(patterns) }
-}
+// dsh-remote — gitignore-style ignore matcher for mirror sync / remote search.
+import { readFileSync } from 'node:fs'
+//
+// Deliberately a SUBSET of gitignore semantics (documented, no surprises):
+//   - blank lines and `#` comments are skipped
+//   - `!` negation is NOT supported (later rules never un-ignore)
+//   - a trailing `/` matches directories only (and everything under them)
+//   - a pattern containing `/` (or starting with `/`) is anchored to the
+//     workspace root; otherwise it matches the basename at ANY depth
+//   - `*` matches any run of chars except `/`; `**` matches any run incl. `/`;
+//     `?` matches one char except `/`
+//   - character classes (`[abc]`) are not supported (treated literally)
+
+/** Convert one glob segment to a regex source (no `/` crossing). A leading
+ * double-star-slash (`**` + `/`) matches zero or more directories (gitignore). */
+function globToRe(glob) {
+  let out = ''
+  let i = 0
+  const s = String(glob)
+  if (s.startsWith('**/')) { out = '(?:.*/)?'; i = 3 }
+  while (i < s.length) {
+    const c = s[i]
+    if (c === '*') {
+      if (s[i + 1] === '*') { out += '.*'; i += 2; continue }
+      out += '[^/]*'; i++; continue
+    }
+    if (c === '?') { out += '[^/]'; i++; continue }
+    if ('\\^$+{}[]()|.'.includes(c)) out += '\\' + c
+    else out += c
+    i++
+  }
+  return out
+}
+
+/**
+ * Compile a list of ignore patterns into a matcher.
+ * @param {string[]|string} patterns lines or an array of lines
+ * @returns {(relPath: string, isDir?: boolean) => boolean} true = ignored.
+ *   `relPath` is POSIX-style ('/' separated, no leading '/').
+ */
+export function compileIgnore(patterns) {
+  const rules = []
+  const lines = Array.isArray(patterns) ? patterns : String(patterns || '').split('\n')
+  for (let raw of lines) {
+    let line = String(raw || '').trim()
+    if (!line || line.startsWith('#')) continue
+    let dirOnly = false
+    if (line.endsWith('/')) { dirOnly = true; line = line.slice(0, -1) }
+    let anchored = line.startsWith('/')
+    if (anchored) line = line.slice(1)
+    if (!line) continue
+    const hasSlash = line.includes('/')
+    const isAnchored = anchored || hasSlash
+    const segRe = globToRe(line)
+    let re
+    if (isAnchored) {
+      // Root-anchored: match the full path from the root.
+      re = dirOnly
+        ? new RegExp('^' + segRe + '(/.*)?$')
+        : new RegExp('^' + segRe + '$')
+    } else {
+      // Basename at any depth; a dir pattern also covers everything under it.
+      re = dirOnly
+        ? new RegExp('(^|/)' + segRe + '(/|$)')
+        : new RegExp('(^|/)' + segRe + '$')
+    }
+    rules.push({ re, dirOnly })
+  }
+  return function isIgnored(relPath, isDir) {
+    const rel = String(relPath || '').replace(/^\/+/, '').replace(/\\/g, '/')
+    if (!rel) return false
+    for (const r of rules) {
+      if (r.re.test(rel)) return true
+    }
+    return false
+  }
+}
+
+/** Built-in defaults: never pull/push these into/from a mirror. */
+export const DEFAULT_IGNORE = [
+  '.git/',
+  '.svn/',
+  '.hg/',
+  'node_modules/',
+  'target/',
+  'dist/',
+  'build/',
+  '.venv/',
+  'venv/',
+  '__pycache__/',
+  '.idea/',
+  '.vscode/',
+  '*.o',
+  '*.a',
+  '*.so',
+  '*.dylib',
+  '*.exe',
+  '*.dll',
+  '*.class',
+  '*.jar',
+  '*.log',
+  '*.tmp',
+  '.DS_Store',
+  'Thumbs.db',
+  '.dsh-remote-meta.json',
+  '.dsh-remote-sync-state.json',
+]
+
+/**
+ * Load the user ignore file (gitignore syntax) and merge with defaults.
+ * Returns `{ patterns, fromFile }`.
+ */
+export function loadIgnore(ignoreFile) {
+  let fromFile = []
+  if (ignoreFile) {
+    try {
+      const text = readFileSync(ignoreFile, 'utf8')
+      fromFile = text.split('\n').map((l) => l.trim()).filter((l) => l && !l.startsWith('#'))
+    } catch { /* missing file → defaults only */ }
+  }
+  const patterns = DEFAULT_IGNORE.concat(fromFile)
+  return { patterns, fromFile, matcher: compileIgnore(patterns) }
+}

package/lib/index.js

@@ -1818,6 +1818,34 @@ export async function apply(ctx, config) {
     throw new Error('当前系统不支持自动打开目录选择器，请在输入框直接填本地路径')
   }
 
+  /** The ctx.directoryPicker capability object, or null when the service is
+   * absent/unusable. Never throws — callers fall through to pickLocalNative. */
+  const localPickCapability = async () => {
+    const dp = (ctx && typeof ctx.get === 'function') ? (ctx.get('directoryPicker') || null) : null
+    if (!dp || typeof dp.capability !== 'function') return null
+    try {
+      return await Promise.resolve(dp.capability())
+    } catch {
+      return null
+    }
+  }
+
+  /** Windows has no single filesystem root — enumerate fixed/mapped drive
+   * letters so the in-app browser can switch between them (the browse
+   * backend's crumbs stop at the current drive's root). Empty on POSIX. */
+  const listLocalDrives = () => {
+    if (process.platform !== 'win32') return []
+    const out = []
+    for (let i = 67; i <= 90; i++) { // C..Z (A/B are legacy floppy — skip)
+      const root = String.fromCharCode(i) + ':\\'
+      try {
+        statSync(root)
+        out.push({ name: root.slice(0, -1), path: root })
+      } catch {}
+    }
+    return out
+  }
+
   // ── route helpers ─────────────────────────────────────────────────────────
   const routes = [
     {
@@ -2180,25 +2208,35 @@ export async function apply(ctx, config) {
         try {
           let outcome = null
           let via = 'service'
-          const dp = (ctx && typeof ctx.get === 'function') ? (ctx.get('directoryPicker') || null) : null
-          if (dp && typeof dp.capability === 'function') {
+          const cap = await localPickCapability()
+          if (cap && cap.kind === 'native' && typeof cap.pick === 'function') {
             try {
-              const cap = await Promise.resolve(dp.capability())
-              if (cap && cap.kind === 'native' && typeof cap.pick === 'function') {
-                const pickAbort = new AbortController()
-                const p = await Promise.resolve(cap.pick(pickAbort.signal || null))
-                pickAbort.abort()
-                outcome = (typeof p === 'string' && p) ? { path: p } : { cancelled: true }
-              }
+              const pickAbort = new AbortController()
+              const p = await Promise.resolve(cap.pick(pickAbort.signal || null))
+              pickAbort.abort()
+              outcome = (typeof p === 'string' && p) ? { path: p } : { cancelled: true }
             } catch (err) {
               outcome = null
             }
           }
+          // Prefer a REAL OS dialog over the browse backend: operators expect
+          // an Explorer-style chooser, and the own spawn (PowerShell
+          // FolderBrowserDialog / osascript / zenity-kdialog) works even where
+          // the host mounted browse — DSH Desktop (Electron) deliberately
+          // mounts browse on win32 because the native backend's koffi dialog
+          // worker cannot run under Electron, but a plain child process can.
           if (!outcome) {
             via = 'own'
             try {
               outcome = await pickLocalNative()
             } catch (err) {
+              // No usable OS dialog (headless host, missing chooser binary):
+              // fall back to the host's browse capability — fs-only, works
+              // display-less — served as an in-app browser by the client
+              // (backed by /dsh-remote/local-list + /dsh-remote/local-mkdir).
+              if (cap && cap.kind === 'browse' && typeof cap.list === 'function') {
+                return sendJson(res, 200, { ok: true, kind: 'browse', via: 'browse' })
+              }
               return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) + ' — 可直接在输入框填本地路径' })
             }
           }
@@ -2209,6 +2247,51 @@ export async function apply(ctx, config) {
         }
       },
     },
+    {
+      kind: 'exact',
+      path: '/dsh-remote/local-list',
+      handler: async (req, res) => {
+        if (req.method !== 'GET') return sendJson(res, 405, { ok: false, error: 'method not allowed' })
+        try {
+          const cap = await localPickCapability()
+          if (!cap || cap.kind !== 'browse' || typeof cap.list !== 'function') return sendJson(res, 400, { ok: false, error: '当前目录选择器不是浏览后端，无法列出本机目录' })
+          const m = (req.url || '').match(/path=([^&]*)/)
+          const raw = m ? decodeURIComponent(m[1]) : ''
+          // No path → the browse backend lists the host home directory.
+          try {
+            const out = await Promise.resolve(cap.list(raw ? raw : undefined))
+            return sendJson(res, 200, { ok: true, ...out, drives: listLocalDrives() })
+          } catch (listErr) {
+            return sendJson(res, 400, { ok: false, error: String((listErr && listErr.message) || listErr), code: (listErr && listErr.code) || 'directory-unreadable' })
+          }
+        } catch (err) {
+          return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) })
+        }
+      },
+    },
+    {
+      kind: 'exact',
+      path: '/dsh-remote/local-mkdir',
+      handler: async (req, res) => {
+        if (req.method !== 'POST') return sendJson(res, 405, { ok: false, error: 'method not allowed' })
+        try {
+          const cap = await localPickCapability()
+          if (!cap || cap.kind !== 'browse' || typeof cap.createDirectory !== 'function') return sendJson(res, 400, { ok: false, error: '当前目录选择器不是浏览后端，无法新建文件夹' })
+          const payload = JSON.parse((await readBody(req)) || '{}')
+          const p = String(payload.path || '')
+          const name = String(payload.name || '')
+          if (!p.trim() || !name.trim()) return sendJson(res, 400, { ok: false, error: 'path and name required' })
+          try {
+            const created = await Promise.resolve(cap.createDirectory(p, name))
+            return sendJson(res, 200, { ok: true, path: created })
+          } catch (mkErr) {
+            return sendJson(res, 400, { ok: false, error: String((mkErr && mkErr.message) || mkErr), code: (mkErr && mkErr.code) || 'directory-create-failed' })
+          }
+        } catch (err) {
+          return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) })
+        }
+      },
+    },
     {
       kind: 'exact',
       path: '/dsh-remote/machines',