dsh-app-deploy 0.1.0 → 0.3.0

package/server/local-tools.js

@@ -16,13 +16,22 @@ function run(cmd, args, options = {}) {
   })
 }
 
-// 等价旧 Bun.which：找到返回绝对路径，找不到返回 null
+const IS_WIN = process.platform === 'win32'
+
+// 等价旧 Bun.which：找到返回绝对路径，找不到返回 null（Windows 用 where）
 export async function which(command) {
-  const { code, stdout } = await run('which', [command])
-  const found = stdout.trim()
+  const { code, stdout } = await run(IS_WIN ? 'where' : 'which', [command])
+  const found = stdout.split('\n')[0].trim()
   return code === 0 && found ? found : null
 }
 
+// rclone obscure 密码混淆（--sftp-pass 只接受混淆值）；失败返回 null
+export async function rcloneObscure(bin, password) {
+  const { code, stdout } = await run(bin, ['obscure', password])
+  const v = stdout.trim()
+  return code === 0 && v ? v : null
+}
+
 // 列出目录所在 git 仓库的全部 worktree（含主工作区）；非 git 仓库/失败返回空数组
 export async function listWorktrees(dir) {
   const worktrees = []
@@ -98,16 +107,32 @@ export async function listJdks() {
       for (const v of vers) found.add(path.join(vdir, v, 'libexec/openjdk.jdk/Contents/Home'))
     }
   } catch {}
+  // Windows：JAVA_HOME + 常见厂商安装目录（Oracle / Temurin / Microsoft / Zulu / Corretto）
+  if (IS_WIN) {
+    if (process.env.JAVA_HOME) found.add(process.env.JAVA_HOME)
+    const roots = [process.env.ProgramFiles, process.env['ProgramFiles(x86)']].filter(Boolean)
+    const vendors = ['Java', 'Eclipse Adoptium', 'Eclipse Foundation', 'Microsoft', 'Zulu', 'Amazon Corretto']
+    for (const root of roots) {
+      for (const vendor of vendors) {
+        try { for (const n of await fsp.readdir(path.join(root, vendor))) found.add(path.join(root, vendor, n)) } catch {}
+      }
+    }
+  }
   // 只保留 bin/java 真实存在者，生成友好短名
   const jdks = []
-  for (const p of found) if (await fileExists(`${p}/bin/java`)) {
-    const m = p.match(/\/JavaVirtualMachines\/([^/]+)\.jdk\/Contents\/Home$/)
+  for (const p of found) if (await fileExists(path.join(p, 'bin', IS_WIN ? 'java.exe' : 'java'))) {
+    // 标签推导统一用正斜杠视图（Windows 反斜杠路径也能复用同一套正则）
+    const pv = p.replace(/\\/g, '/')
+    const m = pv.match(/\/JavaVirtualMachines\/([^/]+)\.jdk\/Contents\/Home$/)
     let label
     if (m) label = (m[1].match(/\d+(?:\.\d+)*/) || [])[1] || m[1]
-    else if (p.includes('/opt/homebrew/')) {
-      const v = (p.match(/openjdk@?(\d+)/) || [])[1] || (p.match(/\/(\d+(?:\.\d+)+)\/libexec/) || [])[1]
+    else if (pv.includes('/opt/homebrew/')) {
+      const v = (pv.match(/openjdk@?(\d+)/) || [])[1] || (pv.match(/\/(\d+(?:\.\d+)+)\/libexec/) || [])[1]
       label = v ? 'homebrew-' + v : 'homebrew'
-    } else label = p.split('/').filter(Boolean).pop()
+    } else if (/^[a-zA-Z]:\//.test(pv)) {
+      const segs = pv.split('/').filter(Boolean)
+      label = segs.pop() || pv
+    } else label = pv.split('/').filter(Boolean).pop()
     jdks.push({ label, path: p })
   }
   // 短名去重：同名者追加版本/opt-cellar 段区分
@@ -135,11 +160,78 @@ export async function listJdks() {
   return out.sort((a, b) => a.label.localeCompare(b.label))
 }
 
+// 探测本机包管理器可执行文件（npm/pnpm/yarn），返回 [{label, path}]，path 为可执行文件路径
+export async function listPackageManagers() {
+  const home = process.env.HOME || process.env.USERPROFILE || ''
+  const exts = IS_WIN ? ['.exe', '.cmd', '.ps1', ''] : ['']
+  const candidates = []
+  const tryBin = async (dir, name) => {
+    for (const ext of exts) {
+      const p = path.join(dir, name + ext)
+      if (await fileExists(p)) { candidates.push({ label: name, path: p }); return }
+    }
+  }
+  // PATH 中的（which 返回可执行文件全路径）
+  for (const name of ['npm', 'pnpm', 'yarn']) {
+    const w = await which(name).catch(() => '')
+    if (w) candidates.push({ label: name, path: w })
+  }
+  // pnpm/yarn 全局 bin 的常见固定位置（不经 PATH）
+  if (home) {
+    await tryBin(path.join(home, '.local/share/pnpm'), 'pnpm')
+    await tryBin(path.join(home, '.volta/bin'), 'pnpm')
+    await tryBin(path.join(home, '.volta/bin'), 'yarn')
+  }
+  await tryBin('/opt/homebrew/bin', 'pnpm')
+  await tryBin('/usr/local/bin', 'pnpm')
+  await tryBin('/opt/homebrew/bin', 'yarn')
+  // 去重（同路径只留一个）
+  const seen = new Set()
+  return candidates.filter((c) => (seen.has(c.path) ? false : (seen.add(c.path), true)))
+}
+
+// 探测本机已装 Node（nvm / n / fnm / volta / nvm-windows），返回 [{label, path}]，path 为版本目录（含 bin/node）
+export async function listNodes() {
+  const found = new Set()
+  const home = process.env.HOME || process.env.USERPROFILE || ''
+  const scan = async (base) => {
+    try { for (const n of await fsp.readdir(base)) found.add(path.join(base, n)) } catch {}
+  }
+  if (home) {
+    await scan(path.join(home, '.nvm/versions/node'))
+    await scan(path.join(home, '.local/share/fnm/node-versions'))
+    await scan(path.join(home, '.volta/tools/image/node'))
+  }
+  await scan('/usr/local/n/versions/node')
+  await scan('/usr/lib/n/versions/node')
+  if (IS_WIN && process.env.NVM_HOME) await scan(process.env.NVM_HOME)
+  const binName = IS_WIN ? 'node.exe' : 'node'
+  const out = []
+  for (const p of found) {
+    // 支持 <dir>/bin/node、<dir>/node.exe（nvm-windows）、<dir>/installation/bin/node（fnm）
+    for (const cand of [p, path.join(p, 'installation')]) {
+      if (await fileExists(path.join(cand, 'bin', binName)) || await fileExists(path.join(cand, binName))) {
+        const label = path.basename(cand).replace(/^v/, '')
+        out.push({ label, path: cand })
+        break
+      }
+    }
+  }
+  // 版本号倒序，新者在前
+  out.sort((a, b) => b.label.localeCompare(a.label, undefined, { numeric: true }))
+  return out
+}
+
 // 目录浏览：非法/不可读抛出错误，由 RPC 层转成 ok:false
 export async function browseDirectory(args = {}) {
   let p = typeof args.path === 'string' ? args.path : ''
   const showHidden = args.hidden === true || args.hidden === '1' || args.hidden === 1
-  if (!p) p = process.env.HOME || '/'
+  const pickFile = args.file === true || args.file === '1' || args.file === 1
+  // 展开 ~/（私钥选择等场景直接从 ~/.ssh 起步）
+  if (p === '~' || p.startsWith('~/') || p.startsWith('~\\')) {
+    p = path.join(process.env.HOME || process.env.USERPROFILE || '/', p.slice(2))
+  }
+  if (!p) p = process.env.HOME || (IS_WIN ? (process.env.USERPROFILE || 'C:\\') : '/')
   if (!path.isAbsolute(p)) throw new Error('必须为绝对路径')
   p = path.resolve(p)
   try {
@@ -148,7 +240,10 @@ export async function browseDirectory(args = {}) {
     const dirs = entries.filter(d => d.isDirectory() && (showHidden || !d.name.startsWith('.'))).map(d => d.name).sort().slice(0, 200)
     // 若当前目录属于 git 仓库（含子目录/任意 worktree），列出全部 worktree 供前端切换
     const worktrees = await listWorktrees(p)
-    return { path: p, parent, dirs, worktrees }
+    const out = { path: p, parent, dirs, worktrees }
+    // 文件选择模式（如私钥）：额外列出普通文件
+    if (pickFile) out.files = entries.filter(d => d.isFile() && (showHidden || !d.name.startsWith('.'))).map(d => d.name).sort().slice(0, 200)
+    return out
   } catch {
     throw new Error('目录不可读')
   }

package/server/rpc.js

@@ -1,8 +1,13 @@
 import { promises as fsp } from 'node:fs'
 import { getEnvs, saveEnvs, normalizeEnv, isNewSchema, templateEnv, validateEnv, frontEnvFile, getDefaultProjectPath } from './config.js'
 import { getHistory, replaceHistory, HIST_LIMIT } from './history.js'
-import { activeRecord } from './deployment.js'
-import { listJdks, listWorktrees, readGitInfo, browseDirectory, which } from './local-tools.js'
+import { activeRecord, testSsh } from './deployment.js'
+import { listJdks, listNodes, listPackageManagers, listWorktrees, readGitInfo, browseDirectory, which } from './local-tools.js'
+
+// sshpass 无 Windows 版本；警告文案按平台给出可操作的下一步（保存/导入两处共用）
+const SSHPASS_HINT = process.platform === 'win32'
+  ? '但本机没有 sshpass（Windows 无此工具），部署时无法使用密码认证；请改用密钥认证（SSH 自定义选项填 -i 私钥路径，并清空密码）'
+  : '但本机未安装 sshpass，部署时无法使用密码认证。请先执行: brew install hudochenkov/sshpass/sshpass'
 
 // JSON-RPC 方法表：与旧 server.ts 的 /api/* 逐一对齐（字段名不变）
 const methods = {
@@ -26,8 +31,8 @@ const methods = {
     if (i >= 0) envs[i] = env; else envs.push(env)
     await saveEnvs()
     let warning = ''
-    if (env.ssh.password && !(await which('sshpass'))) {
-      warning = '已保存，但本机未安装 sshpass，部署时无法使用密码认证。请先执行: brew install hudochenkov/sshpass/sshpass'
+    if ((env.sshs || []).some(s => s.password) && !(await which('sshpass'))) {
+      warning = '已保存，' + SSHPASS_HINT
     }
     return { envs: getEnvs(), warning }
   },
@@ -67,8 +72,8 @@ const methods = {
     await saveEnvs(order.map(id => byId.get(id)))
     const touched = new Set([...added, ...overwritten])
     let warning = ''
-    if (getEnvs().some(e => touched.has(e.id) && e.ssh.password) && !(await which('sshpass'))) {
-      warning = '已导入，但本机未安装 sshpass，部署时无法使用密码认证。请先执行: brew install hudochenkov/sshpass/sshpass'
+    if (getEnvs().some(e => touched.has(e.id) && (e.sshs || []).some(s => s.password)) && !(await which('sshpass'))) {
+      warning = '已导入，' + SSHPASS_HINT
     }
     return { envs: getEnvs(), added, overwritten, warning }
   },
@@ -84,6 +89,13 @@ const methods = {
     try { return { text: await fsp.readFile(p, 'utf8') } } catch { return { text: '' } }
   },
   jdks: () => listJdks(),
+  nodes: () => listNodes(),
+  packageManagers: () => listPackageManagers(),
+  // 测试 SSH 连通性：target 直接用表单当前值（无需先保存环境）
+  sshTest: async ({ target } = {}) => {
+    if (!target || typeof target !== 'object') throw new Error('缺少测试目标')
+    return testSsh(target)
+  },
   browse: (args) => browseDirectory(args ?? {}),
   git: async ({ env: id, path: sel } = {}) => {
     const e = getEnvs().find(x => x.id === id)