v2.0.0: 主题系统+SSH私钥解析修复+会话持久化+连接池优化+UI打磨

核心修复:
- ssh-service.ts: 新增 resolvePrivateKey(),将私钥文件路径(~/.ssh/id_rsa)解析为内容后传给 ssh2,
  解决 'Cannot parse privateKey: Unsupported key format' 错误
- useTerminalConnection.ts + sessionHelper.ts: 根据 authType 过滤字段,password/agent 认证不再传 privateKey
- sessionStore.ts: addSession() 现在先调用 sessionCreate() 持久化到 SQLite,解决恢复标签'无可用连接信息'问题
- database-service.ts: updateSession() 补充 private_key_path 字段持久化
- SessionDialog.tsx: 默认 username='root'、privateKey='~/.ssh/id_rsa'

UI/UX:
- 语义化主题系统(app-theme.ts),强制深色模式,全局无边框设计
- macOS 标题栏支持双击最大化(window:toggleMaximize IPC)
- macOS 菜单栏('OpsXShell' 应用菜单 + Settings Cmd+,)
- WelcomeView 4卡片布局,移除 Settings 按钮
- TabBar/TabItem 背景色统一(bg-dark-800/900),消除白色边框线

架构优化:
- SFTP 生命周期修复(useSFTP.ts useRef + autoConnectAttempted guard)
- 连接池竞态修复,支持快速多标签连接
- IPC 接口规范化,安全错误处理
- Vite 代码分割优化

质量: lint零错误 | tsc零错误 | build成功 | 49 tests pass
This commit is contained in:
Logan.Li committed 2026-04-22 11:15:41 +08:00
1 parent 37e65be823
commit 514d62644e
77 files changed
+2563 -931

No files matched your search

+58 -37
View File
@@ -1,30 +1,32 @@
import { Client, ClientChannel } from 'ssh2'
import { SFTPWrapper } from 'ssh2'
import { Client, ClientChannel, SFTPWrapper, FileEntryWithStats } from 'ssh2'
import { v4 as uuidv4 } from 'uuid'
import { createLogger } from '../utils/logger'
import * as net from 'net'
import * as fs from 'fs'
import * as os from 'os'
import * as path from 'path'
const logger = createLogger('SSHService')
// ===== 彩色调试日志 =====
const DEBUG = true
function debug(...args: any[]) {
if (DEBUG) console.log('[SSHService]', ...args)
// 生产环境日志:使用结构化日志,不输出敏感信息
const DEBUG = process.env.NODE_ENV === 'development'
function debug(...args: unknown[]) {
if (DEBUG) logger.debug('[SSHService]', ...args)
}
function logHeader(msg: string) {
console.log(`%c${msg}`, 'background: #e74c3c; color: #fff; padding: 4px 8px; border-radius: 4px; font-weight: bold;')
logger.info(`[${msg}]`)
}
function logInfo(label: string, value: any) {
console.log(`%c${label}:%c ${value}`, 'background: #2c3e50; color: #fff; padding: 2px 6px; border-radius: 3px;', 'color: #3498db; font-weight: bold;')
function logInfo(label: string, value: unknown) {
logger.info(`${label}: ${value}`)
}
function logSuccess(msg: string) {
console.log(`%c✓ ${msg}`, 'color: #27ae60; font-weight: bold;')
logger.info(`[OK] ${msg}`)
}
function logError(msg: string) {
console.log(`%c✗ ${msg}`, 'color: #e74c3c; font-weight: bold;')
logger.error(msg)
}
function logWarning(msg: string) {
console.log(`%c⚠ ${msg}`, 'color: #f39c12; font-weight: bold;')
function _logWarning(msg: string) {
logger.warn(msg)
}
export interface SSHConfig {
@@ -63,11 +65,34 @@ export class SSHService {
private shells: Map<string, ShellSession> = new Map()
private sftps: Map<string, SFTPSession> = new Map()
private resolvePrivateKey(privateKey?: string): string | Buffer | undefined {
if (!privateKey) return undefined
// 如果已经是 PEM 格式内容,直接返回
if (privateKey.includes('-----BEGIN')) {
return privateKey
}
// 展开 ~ 为用户主目录
let keyPath = privateKey
if (keyPath.startsWith('~')) {
keyPath = path.join(os.homedir(), keyPath.slice(1))
}
// 当作文件路径读取
try {
const content = fs.readFileSync(keyPath)
debug('>>> Private key loaded from:', keyPath)
return content
} catch (err) {
const msg = err instanceof Error ? err.message : String(err)
logger.error(`Failed to read private key file: ${keyPath} - ${msg}`)
throw new Error(`私钥文件读取失败: ${keyPath}`)
}
}
async connect(config: SSHConfig): Promise<Connection> {
console.log('=== SSHService connect ===')
console.log(' host:', config.host)
console.log(' port:', config.port || 22)
console.log(' username:', config.username)
debug('SSHService connect', config.host, config.port || 22, config.username)
return new Promise((resolve, reject) => {
const client = new Client()
@@ -105,13 +130,24 @@ export class SSHService {
this.connections.delete(connectionId)
})
// 解析私钥(路径 → 内容)
let resolvedPrivateKey: string | Buffer | undefined
try {
resolvedPrivateKey = this.resolvePrivateKey(config.privateKey)
} catch (err) {
connection.status = 'error'
this.connections.delete(connectionId)
reject(err)
return
}
debug('>>> Starting SSH client.connect...')
client.connect({
host: config.host,
port: config.port || 22,
username: config.username,
password: config.password,
privateKey: config.privateKey,
privateKey: resolvedPrivateKey,
passphrase: config.passphrase,
agent: config.agent,
readyTimeout: config.readyTimeout || 20000,
@@ -190,14 +226,10 @@ export class SSHService {
onData?: (shellId: string, data: Buffer) => void,
preferredShellId?: string
): Promise<ShellSession> {
console.log('=== SSHService createShell ===')
console.log(' connectionId:', connectionId)
console.log(' options:', options)
console.log(' preferredShellId:', preferredShellId)
debug('SSHService createShell', connectionId, options, preferredShellId)
const connection = this.connections.get(connectionId)
console.log(' connection found:', !!connection)
console.log(' connection status:', connection?.status)
debug('connection found:', !!connection, 'status:', connection?.status)
if (!connection || connection.status !== 'connected') {
throw new Error('Connection not established')
@@ -236,19 +268,8 @@ export class SSHService {
if (onData) {
debug('>>> Setting up channel.on(data) handler')
channel.on('data', (data: Buffer) => {
// Log first few chunks for debugging
const text = data.toString('utf-8')
console.log('=== SSHService channel.on(data) ===')
console.log(' shellId:', shellId)
console.log(' data length:', data.length)
console.log(' data preview:', text.substring(0, 100).replace(/\n/g, '\\n'))
if (text.includes('Last login') || text.includes('Welcome')) {
logger.info('[SSHService] Shell data (first 200 chars):', text.substring(0, 200))
}
debug('>>> Calling onData callback...')
debug('SSHService channel.on(data) shellId:', shellId, 'data length:', data.length)
onData(shellId, data)
debug('>>> onData callback returned')
})
} else {
debug('>>> WARNING: onData callback is undefined!')
@@ -321,7 +342,7 @@ export class SSHService {
})
}
async sftpListDirectory(sftpId: string, path: string): Promise<any[]> {
async sftpListDirectory(sftpId: string, path: string): Promise<FileEntryWithStats[]> {
logHeader('📁 SFTP LIST DIRECTORY')
logInfo('sftpId', sftpId)
logInfo('path', path)