核心修复:
- 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
250 lines
7.5 KiB
TypeScript
250 lines
7.5 KiB
TypeScript
/**
|
|
* SFTP IPC Handlers
|
|
* 处理 SFTP 连接和文件操作相关 IPC
|
|
*/
|
|
|
|
import { ipcMain, IpcMainInvokeEvent } from 'electron'
|
|
import type { SSHService } from '../services/ssh-service'
|
|
|
|
// IPC channel names
|
|
export const SFTP_CHANNELS = {
|
|
CONNECT: 'sftp:connect',
|
|
LIST_DIRECTORY: 'sftp:listDirectory',
|
|
UPLOAD: 'sftp:upload',
|
|
DOWNLOAD: 'sftp:download',
|
|
RENAME: 'sftp:rename',
|
|
DELETE: 'sftp:delete',
|
|
MKDIR: 'sftp:mkdir',
|
|
STAT: 'sftp:stat',
|
|
CHMOD: 'sftp:chmod',
|
|
PROGRESS: 'sftp:progress',
|
|
} as const
|
|
|
|
export interface SFTPIPCOptions {
|
|
sshService: SSHService
|
|
mainWindowGetter: () => Electron.BrowserWindow | null
|
|
}
|
|
|
|
// ===== 彩色调试日志 =====
|
|
const _DEBUG = true
|
|
function logHeader(msg: string) {
|
|
console.log(`%c${msg}`, 'background: #16a085; color: #fff; padding: 4px 8px; border-radius: 4px; font-weight: bold;')
|
|
}
|
|
function logInfo(label: string, value: unknown) {
|
|
console.log(`%c${label}:%c ${value}`, 'background: #2c3e50; color: #fff; padding: 2px 6px; border-radius: 3px;', 'color: #1abc9c; font-weight: bold;')
|
|
}
|
|
function logSuccess(msg: string) {
|
|
console.log(`%c✓ ${msg}`, 'color: #27ae60; font-weight: bold;')
|
|
}
|
|
function logError(msg: string) {
|
|
console.log(`%c✗ ${msg}`, 'color: #e74c3c; font-weight: bold;')
|
|
}
|
|
|
|
export function registerSFTPIPCHandlers(options: SFTPIPCOptions): void {
|
|
const { sshService, mainWindowGetter } = options
|
|
|
|
// SFTP connect
|
|
ipcMain.handle(SFTP_CHANNELS.CONNECT, async (_event: IpcMainInvokeEvent, connectionId: string) => {
|
|
logHeader('📁 SFTP IPC CONNECT')
|
|
logInfo('connectionId', connectionId)
|
|
|
|
try {
|
|
const sftp = await sshService.createSFTP(connectionId)
|
|
logSuccess(`SFTP connected: ${sftp.id}`)
|
|
return { success: true, sftpId: sftp.id }
|
|
} catch (error: unknown) {
|
|
const message = error instanceof Error ? error.message : String(error)
|
|
logError(`SFTP connect failed: ${message}`)
|
|
return { success: false, error: message }
|
|
}
|
|
})
|
|
|
|
// SFTP list directory
|
|
ipcMain.handle(SFTP_CHANNELS.LIST_DIRECTORY, async (_event: IpcMainInvokeEvent, sftpId: string, dirPath: string) => {
|
|
logHeader('📁 SFTP IPC LIST')
|
|
logInfo('sftpId', sftpId)
|
|
logInfo('dirPath', dirPath)
|
|
|
|
try {
|
|
const files = await sshService.sftpListDirectory(sftpId, dirPath)
|
|
logSuccess(`Listed ${files.length} items`)
|
|
return { success: true, files }
|
|
} catch (error: unknown) {
|
|
const message = error instanceof Error ? error.message : String(error)
|
|
logError(`List failed: ${message}`)
|
|
return { success: false, error: message }
|
|
}
|
|
})
|
|
|
|
// SFTP upload file
|
|
ipcMain.handle(SFTP_CHANNELS.UPLOAD, async (
|
|
_event: IpcMainInvokeEvent,
|
|
sftpId: string,
|
|
localPath: string,
|
|
remotePath: string
|
|
) => {
|
|
logHeader('📤 SFTP IPC UPLOAD')
|
|
logInfo('sftpId', sftpId)
|
|
logInfo('localPath', localPath)
|
|
logInfo('remotePath', remotePath)
|
|
|
|
try {
|
|
const mainWindow = mainWindowGetter()
|
|
await sshService.sftpUpload(sftpId, localPath, remotePath, (transferred, total) => {
|
|
mainWindow?.webContents.send(SFTP_CHANNELS.PROGRESS, sftpId, {
|
|
transferred,
|
|
total,
|
|
percentage: Math.round((transferred / total) * 100),
|
|
})
|
|
})
|
|
logSuccess('Upload complete')
|
|
return { success: true }
|
|
} catch (error: unknown) {
|
|
const message = error instanceof Error ? error.message : String(error)
|
|
logError(`Upload failed: ${message}`)
|
|
return { success: false, error: message }
|
|
}
|
|
})
|
|
|
|
// SFTP download file
|
|
ipcMain.handle(SFTP_CHANNELS.DOWNLOAD, async (
|
|
_event: IpcMainInvokeEvent,
|
|
sftpId: string,
|
|
remotePath: string,
|
|
localPath: string
|
|
) => {
|
|
logHeader('📥 SFTP IPC DOWNLOAD')
|
|
logInfo('sftpId', sftpId)
|
|
logInfo('remotePath', remotePath)
|
|
logInfo('localPath', localPath)
|
|
|
|
try {
|
|
const mainWindow = mainWindowGetter()
|
|
await sshService.sftpDownload(sftpId, remotePath, localPath, (transferred, total) => {
|
|
mainWindow?.webContents.send(SFTP_CHANNELS.PROGRESS, sftpId, {
|
|
transferred,
|
|
total,
|
|
percentage: Math.round((transferred / total) * 100),
|
|
})
|
|
})
|
|
logSuccess('Download complete')
|
|
return { success: true }
|
|
} catch (error: unknown) {
|
|
const message = error instanceof Error ? error.message : String(error)
|
|
logError(`Download failed: ${message}`)
|
|
return { success: false, error: message }
|
|
}
|
|
})
|
|
|
|
// SFTP rename
|
|
ipcMain.handle(SFTP_CHANNELS.RENAME, async (
|
|
_event: IpcMainInvokeEvent,
|
|
sftpId: string,
|
|
oldPath: string,
|
|
newPath: string
|
|
) => {
|
|
logHeader('📁 SFTP IPC RENAME')
|
|
logInfo('sftpId', sftpId)
|
|
logInfo('oldPath', oldPath)
|
|
logInfo('newPath', newPath)
|
|
|
|
try {
|
|
await sshService.sftpRename(sftpId, oldPath, newPath)
|
|
logSuccess('Rename complete')
|
|
return { success: true }
|
|
} catch (error: unknown) {
|
|
const message = error instanceof Error ? error.message : String(error)
|
|
logError(`Rename failed: ${message}`)
|
|
return { success: false, error: message }
|
|
}
|
|
})
|
|
|
|
// SFTP delete
|
|
ipcMain.handle(SFTP_CHANNELS.DELETE, async (
|
|
_event: IpcMainInvokeEvent,
|
|
sftpId: string,
|
|
filePath: string,
|
|
isDirectory: boolean
|
|
) => {
|
|
logHeader('📁 SFTP IPC DELETE')
|
|
logInfo('sftpId', sftpId)
|
|
logInfo('filePath', filePath)
|
|
logInfo('isDirectory', isDirectory)
|
|
|
|
try {
|
|
await sshService.sftpDelete(sftpId, filePath, isDirectory)
|
|
logSuccess('Delete complete')
|
|
return { success: true }
|
|
} catch (error: unknown) {
|
|
const message = error instanceof Error ? error.message : String(error)
|
|
logError(`Delete failed: ${message}`)
|
|
return { success: false, error: message }
|
|
}
|
|
})
|
|
|
|
// SFTP mkdir
|
|
ipcMain.handle(SFTP_CHANNELS.MKDIR, async (
|
|
_event: IpcMainInvokeEvent,
|
|
sftpId: string,
|
|
dirPath: string
|
|
) => {
|
|
logHeader('📁 SFTP IPC MKDIR')
|
|
logInfo('sftpId', sftpId)
|
|
logInfo('dirPath', dirPath)
|
|
|
|
try {
|
|
await sshService.sftpMkdir(sftpId, dirPath)
|
|
logSuccess('Mkdir complete')
|
|
return { success: true }
|
|
} catch (error: unknown) {
|
|
const message = error instanceof Error ? error.message : String(error)
|
|
logError(`Mkdir failed: ${message}`)
|
|
return { success: false, error: message }
|
|
}
|
|
})
|
|
|
|
// SFTP stat
|
|
ipcMain.handle(SFTP_CHANNELS.STAT, async (
|
|
_event: IpcMainInvokeEvent,
|
|
sftpId: string,
|
|
filePath: string
|
|
) => {
|
|
logHeader('📋 SFTP IPC STAT')
|
|
logInfo('sftpId', sftpId)
|
|
logInfo('filePath', filePath)
|
|
|
|
try {
|
|
const stats = await sshService.sftpStat(sftpId, filePath)
|
|
logSuccess(`Stat complete: ${stats.size} bytes`)
|
|
return { success: true, stats }
|
|
} catch (error: unknown) {
|
|
const message = error instanceof Error ? error.message : String(error)
|
|
logError(`Stat failed: ${message}`)
|
|
return { success: false, error: message }
|
|
}
|
|
})
|
|
|
|
// SFTP chmod
|
|
ipcMain.handle(SFTP_CHANNELS.CHMOD, async (
|
|
_event: IpcMainInvokeEvent,
|
|
sftpId: string,
|
|
filePath: string,
|
|
mode: number
|
|
) => {
|
|
logHeader('🔒 SFTP IPC CHMOD')
|
|
logInfo('sftpId', sftpId)
|
|
logInfo('filePath', filePath)
|
|
logInfo('mode', mode.toString(8))
|
|
|
|
try {
|
|
await sshService.sftpChmod(sftpId, filePath, mode)
|
|
logSuccess('Chmod complete')
|
|
return { success: true }
|
|
} catch (error: unknown) {
|
|
const message = error instanceof Error ? error.message : String(error)
|
|
logError(`Chmod failed: ${message}`)
|
|
return { success: false, error: message }
|
|
}
|
|
})
|
|
}
|