核心修复:
- 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
115 lines
3.8 KiB
TypeScript
115 lines
3.8 KiB
TypeScript
/**
|
|
* Vitest Setup - 测试环境配置
|
|
*/
|
|
|
|
import '@testing-library/jest-dom'
|
|
import { vi } from 'vitest'
|
|
|
|
// Mock Electron API
|
|
const mockElectronAPI = {
|
|
// SSH
|
|
sshConnect: vi.fn().mockResolvedValue({ success: true, connectionId: 'test-conn-1' }),
|
|
sshDisconnect: vi.fn().mockResolvedValue({ success: true }),
|
|
sshExec: vi.fn().mockResolvedValue({ success: true, stdout: '', stderr: '' }),
|
|
sshCreateShell: vi.fn().mockResolvedValue({ success: true, shellId: 'test-shell-1' }),
|
|
sshShellWrite: vi.fn().mockResolvedValue({ success: true }),
|
|
sshShellResize: vi.fn().mockResolvedValue({ success: true }),
|
|
sshForwardLocal: vi.fn().mockResolvedValue({ success: true }),
|
|
sshForwardRemote: vi.fn().mockResolvedValue({ success: true }),
|
|
|
|
// SFTP
|
|
sftpConnect: vi.fn().mockResolvedValue({ success: true, sftpId: 'test-sftp-1' }),
|
|
sftpListDirectory: vi.fn().mockResolvedValue({ success: true, files: [] }),
|
|
sftpUpload: vi.fn().mockResolvedValue({ success: true }),
|
|
sftpDownload: vi.fn().mockResolvedValue({ success: true }),
|
|
sftpRename: vi.fn().mockResolvedValue({ success: true }),
|
|
sftpDelete: vi.fn().mockResolvedValue({ success: true }),
|
|
sftpMkdir: vi.fn().mockResolvedValue({ success: true }),
|
|
onSFTPProgress: vi.fn(),
|
|
|
|
// Session
|
|
getSessions: vi.fn().mockResolvedValue({ success: true, sessions: [] }),
|
|
getSession: vi.fn().mockResolvedValue({ success: true, session: null }),
|
|
createSession: vi.fn().mockResolvedValue({ success: true, id: 'test-session-1' }),
|
|
updateSession: vi.fn().mockResolvedValue({ success: true }),
|
|
deleteSession: vi.fn().mockResolvedValue({ success: true }),
|
|
|
|
// Settings
|
|
getSettings: vi.fn().mockResolvedValue({ success: true, settings: {} }),
|
|
setSettings: vi.fn().mockResolvedValue({ success: true }),
|
|
|
|
// Dialog
|
|
showSaveDialog: vi.fn().mockResolvedValue({ success: true, canceled: false, filePath: '/tmp/test' }),
|
|
showOpenDialog: vi.fn().mockResolvedValue({ success: true, canceled: false, filePaths: ['/tmp/test'] }),
|
|
|
|
// File
|
|
localReadDir: vi.fn().mockResolvedValue({ success: true, files: [] }),
|
|
localReadFile: vi.fn().mockResolvedValue({ success: true, content: '' }),
|
|
localWriteFile: vi.fn().mockResolvedValue({ success: true }),
|
|
localRename: vi.fn().mockResolvedValue({ success: true }),
|
|
localDelete: vi.fn().mockResolvedValue({ success: true }),
|
|
localMkdir: vi.fn().mockResolvedValue({ success: true }),
|
|
getHomePath: vi.fn().mockResolvedValue({ success: true, path: '/Users/test' }),
|
|
getDownloadsPath: vi.fn().mockResolvedValue({ success: true, path: '/Users/test/Downloads' }),
|
|
|
|
// Zmodem
|
|
onZmodemSend: vi.fn(),
|
|
|
|
// App
|
|
getVersion: vi.fn().mockResolvedValue('1.0.0'),
|
|
getPlatform: vi.fn().mockReturnValue('darwin'),
|
|
|
|
// Event listeners
|
|
onShellData: vi.fn(),
|
|
removeListener: vi.fn(),
|
|
}
|
|
|
|
window.electronAPI = mockElectronAPI as unknown as typeof window.electronAPI
|
|
|
|
// Mock navigator
|
|
Object.defineProperty(window, 'navigator', {
|
|
value: { platform: 'MacIntel' },
|
|
writable: true
|
|
})
|
|
|
|
// Mock ResizeObserver
|
|
class ResizeObserverMock {
|
|
observe() {}
|
|
unobserve() {}
|
|
disconnect() {}
|
|
}
|
|
window.ResizeObserver = ResizeObserverMock
|
|
|
|
// Mock matchMedia
|
|
Object.defineProperty(window, 'matchMedia', {
|
|
writable: true,
|
|
value: vi.fn().mockImplementation(query => ({
|
|
matches: false,
|
|
media: query,
|
|
onchange: null,
|
|
addListener: vi.fn(),
|
|
removeListener: vi.fn(),
|
|
addEventListener: vi.fn(),
|
|
removeEventListener: vi.fn(),
|
|
dispatchEvent: vi.fn(),
|
|
})),
|
|
})
|
|
|
|
// Suppress console errors in tests
|
|
const originalError = console.error
|
|
beforeAll(() => {
|
|
console.error = (...args: unknown[]) => {
|
|
if (
|
|
typeof args[0] === 'string' &&
|
|
(args[0].includes('Warning:') || args[0].includes('ReactDOM.render'))
|
|
) {
|
|
return
|
|
}
|
|
originalError.call(console, ...args)
|
|
}
|
|
})
|
|
|
|
afterAll(() => {
|
|
console.error = originalError
|
|
})
|