@wwkit/sshproxy 1.0.1 → 1.0.3

package/README.md

@@ -79,6 +79,26 @@ sshproxy debug           # 全链路检查（验证代理是否可用）
 sshproxy help            # 显示帮助
 ```
 
+### SSH 远程管理（ssh）
+
+代理之外，`sshproxy ssh ...` 提供基于同一连接配置的远程管理命令（`src/SshCommands.js`）：
+
+```bash
+sshproxy ssh connect                      # 测试 SSH 连接
+sshproxy ssh exec <命令>                   # 执行远程命令
+sshproxy ssh upload <本地> <远程> [-x] [--rm]   # 上传（-x 自动解压 zip/rar，--rm 解压后删除压缩包）
+sshproxy ssh download <远程> <本地> [-x] [--rm] # 下载（-x 自动解压）
+sshproxy ssh rsync <本地目录> [-r 远程目录] [-d] [-n]  # rsync 同步到远程
+sshproxy ssh root                         # 显示远程 $HOME
+sshproxy ssh login [-f]                   # 安装本地 SSH 公钥到远程（免密登录；-f 覆盖 authorized_keys）
+sshproxy ssh open                         # 打开终端窗口并建立 SSH 连接
+sshproxy ssh services [-a] [-f 名称]       # 列出远程服务
+sshproxy ssh port <端口>                   # 查看远程端口监听进程
+sshproxy ssh config                       # 显示 SSH 配置
+```
+
+公钥探测/安装逻辑与初始化流程共用 `src/sshkey.js`。
+
 ## 本地开发调用示例
 
 在 monorepo 根目录或 `packages/sshproxy` 内均可运行。若未全局安装 `sshproxy`，用以下方式调用：

package/bin/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { ProxyManager } from '../src/ProxyManager.js'
+import { SshCommands } from '../src/SshCommands.js'
 import { clientAddr, loadConfig } from '../src/config.js'
 
 const args = process.argv.slice(2)
@@ -15,6 +16,8 @@ async function main() {
       return handleProxy(sub)
     case 'chrome':
       return handleChrome(sub)
+    case 'ssh':
+      return handleSsh(args.slice(1))
     case 'start':
       return handleStart()
     case 'stop':
@@ -37,6 +40,140 @@ function printResult(result) {
   if (result.ok === false) process.exitCode = 1
 }
 
+function parseOptions(tokens, flagDefs) {
+  const options = {}
+  const positional = []
+  for (let i = 0; i < tokens.length; i++) {
+    const t = tokens[i]
+    const flag = flagDefs.find((f) => f.flag === t || (f.short && f.short === t))
+    if (flag) {
+      if (flag.boolean) {
+        options[flag.name] = true
+      } else {
+        options[flag.name] = tokens[i + 1]
+        i++
+      }
+    } else {
+      positional.push(t)
+    }
+  }
+  return { options, positional }
+}
+
+async function handleSsh(rest) {
+  const sub = rest[0] ?? 'help'
+  const commands = new SshCommands()
+  switch (sub) {
+    case 'connect':
+      await commands.connect()
+      break
+    case 'exec':
+      await commands.exec(rest.slice(1))
+      break
+    case 'upload': {
+      const { options, positional } = parseOptions(rest.slice(1), [
+        { flag: '-x', name: 'extract', boolean: true },
+        { flag: '--rm', name: 'rm', boolean: true },
+      ])
+      await commands.upload(positional[0], positional[1], options)
+      break
+    }
+    case 'download': {
+      const { options, positional } = parseOptions(rest.slice(1), [
+        { flag: '-x', name: 'extract', boolean: true },
+        { flag: '--rm', name: 'rm', boolean: true },
+      ])
+      await commands.download(positional[0], positional[1], options)
+      break
+    }
+    case 'rsync': {
+      const { options, positional } = parseOptions(rest.slice(1), [
+        { flag: '-r', name: 'remote' },
+        { flag: '-d', name: 'delete', boolean: true },
+        { flag: '-n', name: 'dryRun', boolean: true },
+        { flag: '-t', name: 'timeout' },
+      ])
+      await commands.rsync(positional[0], options)
+      break
+    }
+    case 'root':
+      await commands.root()
+      break
+    case 'login': {
+      const { options } = parseOptions(rest.slice(1), [
+        { flag: '-f', name: 'force', boolean: true },
+      ])
+      await commands.login(options)
+      break
+    }
+    case 'open':
+      await commands.open()
+      break
+    case 'services': {
+      const { options } = parseOptions(rest.slice(1), [
+        { flag: '-a', name: 'all', boolean: true },
+        { flag: '-f', name: 'find' },
+      ])
+      await commands.services(options)
+      break
+    }
+    case 'port':
+      await commands.port(rest[1])
+      break
+    case 'config':
+      commands.config()
+      break
+    case 'help':
+    default:
+      printSshHelp()
+  }
+}
+
+function printSshHelp() {
+  console.log(`sshproxy ssh - SSH 命令
+
+用法:
+  sshproxy ssh connect                       测试 SSH 连接
+  sshproxy ssh exec <命令>                    执行远程命令
+  sshproxy ssh upload <本地> <远程> [选项]      上传文件到远程
+    -x, --extract                            上传后自动解压（zip/rar）
+    --rm                                     解压后删除压缩包
+  sshproxy ssh download <远程> <本地> [选项]    从远程下载文件
+    -x, --extract                            下载后自动解压（zip/rar）
+    --rm                                     解压后删除压缩包
+  sshproxy ssh rsync <本地目录> [选项]          通过 rsync 同步目录到远程
+    -r, --remote <目录>                       远程目标目录（默认 /htdocs）
+    -d, --delete                            镜像同步（删除远程多余文件）
+    -n, --dry-run                            试运行（只显示将传输的文件）
+    -t, --timeout <秒>                       连接超时（默认 30）
+  sshproxy ssh root                          显示远程主目录（$HOME）
+  sshproxy ssh login [选项]                   安装本地公钥到远程实现免密登录
+    -f, --force                              强制覆盖 authorized_keys
+  sshproxy ssh open                          打开终端窗口并建立 SSH 连接
+  sshproxy ssh services [选项]                列出远程服务器运行中的服务
+    -a, --all                                列出所有服务（不仅运行中）
+    -f, --find <名称>                         按名称筛选服务
+  sshproxy ssh port <端口>                    查看指定端口上的监听进程
+  sshproxy ssh config                        显示 SSH 配置
+  sshproxy ssh help                          显示本帮助
+
+示例:
+  sshproxy ssh exec ls -la /root
+  sshproxy ssh upload ./config.py /root/config.py
+  sshproxy ssh download /root/log/app.log ./app.log
+  sshproxy ssh upload ./app.zip /root/app.zip -x --rm
+  sshproxy ssh download /root/backup.zip ./backup.zip -x
+  sshproxy ssh rsync ./webwork/
+  sshproxy ssh rsync ./webwork/ -r /htdocs -d
+  sshproxy ssh rsync ./webwork/ -r /htdocs -n
+  sshproxy ssh services
+  sshproxy ssh services -f nginx
+  sshproxy ssh port 80
+  sshproxy ssh login
+  sshproxy ssh open
+`)
+}
+
 async function handleTunnel(sub) {
   const manager = new ProxyManager()
   if (sub === 'off') return printResult(await manager.tunnelStop())
@@ -159,6 +296,7 @@ function printHelp() {
 状态与工具:
   sshproxy status            查看全部状态
   sshproxy debug             全链路检查（验证代理是否可用）
+  sshproxy ssh                SSH 远程管理命令（connect/exec/upload/...）
   sshproxy web               启动 Web 管理页（后台，默认 http://127.0.0.1:1081）
   sshproxy web on            启动 Web 管理页
   sshproxy web off           关闭 Web 管理页

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/sshproxy",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "author": "bluesliu <langcai163@163.com>",
   "description": "SOCKS5 proxy manager (client SSH tunnel / server remote), CLI + web UI",
   "type": "module",
@@ -37,7 +37,7 @@
     "dotenv": "^16.4.5",
     "json5": "^2.2.3",
     "ssh2": "^1.16.0",
-    "@wwkit/shared": "1.0.1"
+    "@wwkit/shared": "1.0.3"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/scripts/postinstall.js

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
 
+import { spawnSync } from 'node:child_process'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { createConfigLoader, getXdgConfigDir } from '@wwkit/shared'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const src = path.join(__dirname, '..', 'src', 'config.json5')
+const bin = path.join(__dirname, '..', 'bin', 'index.js')
 
 const loader = createConfigLoader({
   builtinConfigPath: src,
@@ -15,4 +17,16 @@ const loader = createConfigLoader({
 
 if (loader.copyBuiltinConfig()) {
   console.log(`sshproxy: wrote default config to ${loader.userConfigPath}`)
+}
+
+const tunnel = spawnSync('node', [bin, 'tunnel', 'on'], { stdio: 'inherit' })
+if (tunnel.status !== 0) {
+  console.error('sshproxy: postinstall (tunnel on) failed')
+}
+
+spawnSync('node', [bin, 'web', 'off'], { stdio: 'inherit' })
+
+const web = spawnSync('node', [bin, 'web', 'on'], { stdio: 'inherit' })
+if (web.status !== 0) {
+  console.error('sshproxy: postinstall (web on) failed')
 }

package/src/SshCommands.js

@@ -0,0 +1,275 @@
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { spawnSync } from 'node:child_process'
+
+import { loadConfig } from './config.js'
+import { SshClient } from './SshClient.js'
+import { which } from './OSystem.js'
+import { ensureLocalKey, installPubkeyCommand } from './sshkey.js'
+
+function requireConnection(client) {
+  if (client.checkConnection()) return true
+  console.log('连接失败，请检查 SSH 配置或服务器状态')
+  return false
+}
+
+function extractTool(p) {
+  const lower = String(p).toLowerCase()
+  if (lower.endsWith('.zip')) return { name: 'unzip', command: 'unzip -o' }
+  if (lower.endsWith('.rar')) return { name: 'unrar', command: 'unrar x -o+' }
+  return null
+}
+
+function remoteHasTool(client, name) {
+  const [code, out] = client.execute(`command -v ${name}`)
+  return code === 0 && Boolean(out.trim())
+}
+
+function printMissingTool(name, remote) {
+  const tips = {
+    unzip: 'brew install unzip（macOS）或 apt-get install -y unzip（Linux）',
+    unrar: 'brew install unrar（macOS）或 apt-get install -y unrar（Linux）',
+  }
+  const where = remote ? '远程服务器' : '本地'
+  console.log(`${where}缺少解压命令: ${name}`)
+  console.log(`请先安装: ${tips[name] || `请安装 ${name}`}`)
+  console.log('已停止解压操作')
+}
+
+export class SshCommands {
+  constructor() {
+    this.client = new SshClient()
+  }
+
+  config() {
+    const cfg = loadConfig()
+    const { host, port, user, timeout } = cfg
+    console.log(JSON.stringify({ host, port, user, timeout }, null, 2))
+  }
+
+  async connect() {
+    const client = this.client
+    if (requireConnection(client)) console.log('连接成功')
+  }
+
+  async exec(cmdParts) {
+    const client = this.client
+    if (!requireConnection(client)) return
+    const command = cmdParts.join(' ')
+    const [code, out, err] = await client.execute(command)
+    if (out) console.log(out.endsWith('\n') ? out : out + '\n')
+    if (err) console.log(err.endsWith('\n') ? err : err + '\n')
+    if (code !== 0) console.log(`命令执行失败 (exit=${code})`)
+    else console.log(`OK (exit=${code})`)
+  }
+
+  async root() {
+    const client = this.client
+    if (!requireConnection(client)) return
+    const [code, out, err] = await client.execute('echo $HOME')
+    const home = out.trim()
+    if (code === 0 && home) console.log(home)
+    else console.log(`获取失败: ${err.trim()}`)
+  }
+
+  async upload(local, remote, { extract = false, rm = false } = {}) {
+    const client = this.client
+    if (!requireConnection(client)) return
+    const ok = await client.upload(local, remote)
+    if (!ok) {
+      console.log(`上传失败：${local} -> ${remote}`)
+      return
+    }
+    console.log(`上传成功：${local} -> ${remote}`)
+    if (!extract && !rm) return
+    const tool = extractTool(remote)
+    if (!tool) {
+      console.log('不是 zip/rar 压缩文件，忽略 -x/--rm')
+      return
+    }
+    if (!remoteHasTool(client, tool.name)) {
+      printMissingTool(tool.name, true)
+      return
+    }
+    const remoteDir = path.posix.dirname(remote) || '.'
+    const filename = path.posix.basename(remote)
+    const [code, , err] = await client.execute(`cd ${remoteDir} && ${tool.command} ${filename}`)
+    if (code !== 0) {
+      console.log(`解压失败: ${(err || '').trim()}`)
+      return
+    }
+    if (rm) await client.execute(`rm -f ${remote}`)
+    console.log(`解压完成，结果目录: ${remoteDir}`)
+  }
+
+  async download(remote, local, { extract = false, rm = false } = {}) {
+    const client = this.client
+    if (!requireConnection(client)) return
+    const ok = await client.download(remote, local)
+    if (!ok) {
+      console.log(`下载失败：${remote} -> ${local}`)
+      return
+    }
+    console.log(`下载成功：${remote} -> ${local}`)
+    if (!extract && !rm) return
+    const tool = extractTool(local)
+    if (!tool) {
+      console.log('不是 zip/rar 压缩文件，忽略 -x/--rm')
+      return
+    }
+    if (!which(tool.name)) {
+      printMissingTool(tool.name, false)
+      return
+    }
+    const localDir = path.dirname(path.resolve(local))
+    const result = spawnSync(tool.command.split(' ')[0], [...tool.command.split(' ').slice(1), local, '-d', localDir], { encoding: 'utf-8' })
+    if (result.status !== 0) {
+      console.log(`解压失败: ${(result.stderr || result.stdout || '').trim()}`)
+      return
+    }
+    if (rm) fs.unlinkSync(local)
+    console.log(`解压完成，结果目录: ${localDir}`)
+  }
+
+  async rsync(local, { remote = '/htdocs', delete: del = false, dryRun = false, timeout = 30 } = {}) {
+    if (!which('rsync')) {
+      console.log('未检测到本地 rsync 命令')
+      const system = os.type()
+      if (system === 'Darwin') console.log('请先安装 rsync: brew install rsync')
+      else console.log('请先安装 rsync: apt-get install -y rsync 或 yum install -y rsync')
+      return
+    }
+    if (!local) {
+      console.log('缺少本地目录参数')
+      return
+    }
+    const cfg = loadConfig()
+    const host = cfg.host || ''
+    if (!host) {
+      console.log('SSH config incomplete (host required).')
+      return
+    }
+    const user = cfg.user || 'root'
+    const port = cfg.port || 22
+
+    if (!fs.existsSync(local) || !fs.statSync(local).isDirectory()) {
+      console.log(`本地目录不存在: ${local}`)
+      return
+    }
+    let localDir = local
+    if (!localDir.endsWith('/')) localDir += '/'
+
+    const [code, out] = await this.client.execute('command -v rsync')
+    if (code !== 0 || !out.trim()) {
+      console.log('远程服务器缺少 rsync 命令')
+      console.log('请先在远程服务器安装 rsync: apt-get install -y rsync 或 yum install -y rsync')
+      console.log('已停止同步操作')
+      return
+    }
+
+    const sshCmd = `ssh -p ${port} -o ConnectTimeout=${timeout}`
+    const command = ['rsync', '-avz', '--progress', `--rsh=${sshCmd}`]
+    if (del) command.push('--delete')
+    if (dryRun) command.push('--dry-run')
+    command.push(localDir)
+    command.push(`${user}@${host}:${remote}/`)
+
+    console.log(`rsync: ${command.join(' ')}`)
+    if (dryRun) console.log('[dry-run] 仅显示将传输的文件，不实际执行')
+
+    const result = spawnSync(command[0], command.slice(1), { encoding: 'utf-8', stdio: 'inherit' })
+    if (result.status !== 0) console.log(`rsync 失败 (exit=${result.status})`)
+    else console.log(`同步完成: ${localDir} -> ${user}@${host}:${remote}/`)
+  }
+
+  async login({ force = false } = {}) {
+    const pubKey = ensureLocalKey()
+    if (!pubKey) {
+      console.log('生成密钥失败，请手动执行: ssh-keygen -t ed25519')
+      return
+    }
+    const client = this.client
+    if (!requireConnection(client)) return
+    const command = installPubkeyCommand(pubKey, { force })
+    const [code, , err] = await client.execute(command)
+    if (code !== 0) {
+      console.log(`安装公钥失败: ${(err || '').trim()}`)
+      return
+    }
+    const [vCode, vOut] = await client.execute('echo ok')
+    if (vCode === 0 && vOut.trim() === 'ok') {
+      const cfg = loadConfig()
+      console.log(`免密登录配置成功，可直接执行 ssh ${cfg.user || 'root'}@${cfg.host || '<host>'}`)
+    } else {
+      console.log('公钥已安装，但免密验证未通过')
+    }
+  }
+
+  async open() {
+    const cfg = loadConfig()
+    const host = cfg.host || ''
+    if (!host) {
+      console.log('SSH config incomplete (host required).')
+      return
+    }
+    const user = cfg.user || 'root'
+    const port = cfg.port || 22
+    const command = `ssh ${user}@${host} -p ${port}`
+    const system = os.type()
+    try {
+      if (system === 'Darwin') {
+        spawnSync('osascript', ['-e', `tell application "Terminal" to do script "${command}"`], { stdio: 'ignore' })
+      } else if (system === 'Windows_NT') {
+        spawnSync('cmd', ['/c', 'start', 'cmd', '/k', command], { stdio: 'ignore' })
+      } else {
+        spawnSync('gnome-terminal', ['--', 'bash', '-c', `${command}; exec bash`], { stdio: 'ignore' })
+      }
+      console.log(`已在终端打开 SSH 连接: ${command}`)
+    } catch (e) {
+      console.log(`打开终端失败: ${e.message}`)
+    }
+  }
+
+  async services({ all = false, find = '' } = {}) {
+    const client = this.client
+    if (!requireConnection(client)) return
+    const state = all ? '--all' : '--state=running'
+    let command = `systemctl list-units --type=service ${state} --no-pager --no-legend`
+    if (find) command += ` | grep ${find} || true`
+    const [code, out, err] = await client.execute(command)
+    if (code !== 0) {
+      console.log(`获取服务列表失败: ${(err || out || '').trim()}`)
+      return
+    }
+    const lines = out.split('\n').map((l) => l.trim()).filter(Boolean)
+    if (lines.length === 0) {
+      console.log('未找到匹配的服务')
+      return
+    }
+    console.log('UNIT\tLOAD\tACTIVE\tSUB\tDESCRIPTION')
+    for (const line of lines) {
+      const parts = line.split(/\s+/, 5)
+      if (parts.length >= 5) console.log(`${parts[0]}\t${parts[1]}\t${parts[2]}\t${parts[3]}\t${parts[4]}`)
+      else console.log(line)
+    }
+  }
+
+  async port(number) {
+    const client = this.client
+    if (!requireConnection(client)) return
+    const command = `ss -tlnp | grep ":${number} " || true`
+    const [code, out, err] = await client.execute(command)
+    if (code !== 0) {
+      console.log(`获取端口信息失败: ${(err || out || '').trim()}`)
+      return
+    }
+    const lines = out.split('\n').map((l) => l.trim()).filter(Boolean)
+    if (lines.length === 0) {
+      console.log(`未发现监听 ${number} 端口的进程`)
+      return
+    }
+    console.log(`端口 ${number} 的监听进程:`)
+    for (const line of lines) console.log(line)
+  }
+}

package/src/index.js

@@ -1,4 +1,5 @@
 export { ProxyManager } from './ProxyManager.js'
 export { SshClient } from './SshClient.js'
+export { SshCommands } from './SshCommands.js'
 export { loadConfig, defaultConfig, getConfigPath, getConfigDir, getProxyConfig, clientAddr, sshAlias } from './config.js'
 export { initClient } from './init.js'

package/src/init.js

@@ -1,30 +1,10 @@
 import fs from 'node:fs'
-import path from 'node:path'
 import { spawnSync } from 'node:child_process'
 
 import { clientAddr, getResolvedStaticConfig, loadConfig, sshAlias } from './config.js'
 import { getOsType, which } from './OSystem.js'
 import { SshClient } from './SshClient.js'
-
-function ensureLocalKey() {
-  const s = getResolvedStaticConfig()
-  const sshDir = s.paths.sshDir
-  for (const name of s.ssh.keyCandidates) {
-    const pubPath = path.join(sshDir, `${name}.pub`)
-    if (fs.existsSync(pubPath)) {
-      return fs.readFileSync(pubPath, 'utf-8').trim()
-    }
-  }
-  const keyPath = path.join(sshDir, s.ssh.defaultKeyName)
-  fs.mkdirSync(sshDir, { recursive: true })
-  const result = spawnSync('ssh-keygen', ['-t', 'ed25519', '-C', s.ssh.keygenComment, '-N', '', '-f', keyPath], { encoding: 'utf-8' })
-  if (result.status !== 0) return null
-  const pubPath = `${keyPath}.pub`
-  if (fs.existsSync(pubPath)) {
-    return fs.readFileSync(pubPath, 'utf-8').trim()
-  }
-  return null
-}
+import { ensureLocalKey, installPubkeyCommand } from './sshkey.js'
 
 function writeSshConfig(host, user, port, alias, localPort) {
   const s = getResolvedStaticConfig()
@@ -110,11 +90,7 @@ export async function initClient() {
   lines.push(`  ✓ SSH 连接正常 (${host})`)
 
   lines.push('[3/5] 安装公钥到远程服务器...')
-  const command = (
-    `mkdir -p ~/.ssh && chmod 700 ~/.ssh && `
-    + `grep -qF '${pubKey}' ~/.ssh/authorized_keys 2>/dev/null || `
-    + `echo '${pubKey}' >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys`
-  )
+  const command = installPubkeyCommand(pubKey)
   const [code, , err] = await client.execute(command)
   if (code !== 0) {
     lines.push(`  ✗ 安装公钥失败: ${(err ?? '').trim()}`)

package/src/sshkey.js

@@ -0,0 +1,43 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { spawnSync } from 'node:child_process'
+
+import { getResolvedStaticConfig } from './config.js'
+
+export function ensureLocalKey() {
+  const s = getResolvedStaticConfig()
+  const sshDir = s.paths.sshDir
+  for (const name of s.ssh.keyCandidates) {
+    const pubPath = path.join(sshDir, `${name}.pub`)
+    if (fs.existsSync(pubPath)) {
+      return fs.readFileSync(pubPath, 'utf-8').trim()
+    }
+  }
+  const keyPath = path.join(sshDir, s.ssh.defaultKeyName)
+  fs.mkdirSync(sshDir, { recursive: true })
+  const result = spawnSync(
+    'ssh-keygen',
+    ['-t', 'ed25519', '-C', s.ssh.keygenComment, '-N', '', '-f', keyPath],
+    { encoding: 'utf-8' }
+  )
+  if (result.status !== 0) return null
+  const pubPath = `${keyPath}.pub`
+  if (fs.existsSync(pubPath)) {
+    return fs.readFileSync(pubPath, 'utf-8').trim()
+  }
+  return null
+}
+
+export function installPubkeyCommand(pubKey, { force = false } = {}) {
+  if (force) {
+    return (
+      `mkdir -p ~/.ssh && chmod 700 ~/.ssh && `
+      + `echo '${pubKey}' > ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys`
+    )
+  }
+  return (
+    `mkdir -p ~/.ssh && chmod 700 ~/.ssh && `
+    + `grep -qF '${pubKey}' ~/.ssh/authorized_keys 2>/dev/null || `
+    + `echo '${pubKey}' >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys`
+  )
+}