Files
opsxshell/electron/ipc/zmodem.ipc.ts
T
Logan.Li 514d62644e 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
2026-04-22 11:15:41 +08:00

142 lines
4.3 KiB
TypeScript

/**
* Zmodem IPC Handlers
* 处理 rz/sz 文件传输
*/
import { ipcMain, IpcMainInvokeEvent, app, dialog } from 'electron'
import fs from 'fs'
import path from 'path'
import type { SSHService } from '../services/ssh-service'
import type { ZmodemService } from '../services/zmodem-service'
import { createLogger } from '../utils/logger'
const logger = createLogger('Zmodem_IPC')
// IPC channel names
export const ZMODEM_CHANNELS = {
SEND: 'zmodem:send',
RECEIVE: 'zmodem:receive',
CANCEL: 'zmodem:cancel',
PROGRESS: 'zmodem:progress',
COMPLETE: 'zmodem:complete',
} as const
export interface ZmodemIPCOptions {
sshService: SSHService
zmodemService: ZmodemService
mainWindowGetter: () => Electron.BrowserWindow | null
}
export function registerZmodemIPCHandlers(options: ZmodemIPCOptions): void {
const { sshService, zmodemService, mainWindowGetter } = options
// Zmodem send (rz) - send file to server
ipcMain.handle(ZMODEM_CHANNELS.SEND, async (_event: IpcMainInvokeEvent, shellId: string) => {
try {
const mainWindow = mainWindowGetter()
if (!mainWindow) {
return { success: false, error: 'Window not available' }
}
// Open file dialog to select file
const result = await dialog.showOpenDialog(mainWindow, {
title: '选择要发送的文件',
properties: ['openFile'],
})
if (result.canceled || !result.filePaths.length) {
return { success: false, canceled: true }
}
const filePath = result.filePaths[0]
const fileName = path.basename(filePath)
// Read file
const fileData = fs.readFileSync(filePath)
// Get shell write function
const shell = sshService.getShell(shellId)
if (!shell) {
return { success: false, error: 'Shell not found' }
}
// Send file via Zmodem protocol
const sessionId = zmodemService.sendFile(
shellId,
fileName,
fileData,
(data) => {
shell.channel.write(data)
},
(progress) => {
mainWindow.webContents.send(ZMODEM_CHANNELS.PROGRESS, sessionId, progress)
},
(success, error) => {
mainWindow.webContents.send(ZMODEM_CHANNELS.COMPLETE, sessionId, { success, error })
}
)
return { success: true, sessionId, fileName }
} catch (error: unknown) {
logger.error('Zmodem send error:', error)
return { success: false, error: error instanceof Error ? error.message : String(error) }
}
})
// Zmodem receive (sz) - receive file from server
ipcMain.handle(ZMODEM_CHANNELS.RECEIVE, async (_event: IpcMainInvokeEvent, shellId: string) => {
try {
const mainWindow = mainWindowGetter()
if (!mainWindow) {
return { success: false, error: 'Window not available' }
}
// Get shell to monitor for incoming data
const shell = sshService.getShell(shellId)
if (!shell) {
return { success: false, error: 'Shell not found' }
}
// Open save dialog to select destination
const result = await dialog.showSaveDialog(mainWindow, {
title: '保存文件',
defaultPath: app.getPath('downloads'),
})
if (result.canceled || !result.filePath) {
return { success: false, canceled: true }
}
// Start Zmodem receive session
const sessionId = zmodemService.receiveFile(
shellId,
result.filePath,
(data) => {
shell.channel.write(data)
},
(progress) => {
mainWindow.webContents.send(ZMODEM_CHANNELS.PROGRESS, sessionId, progress)
},
(success, error) => {
mainWindow.webContents.send(ZMODEM_CHANNELS.COMPLETE, sessionId, { success, error })
}
)
return { success: true, sessionId }
} catch (error: unknown) {
logger.error('Zmodem receive error:', error)
return { success: false, error: error instanceof Error ? error.message : String(error) }
}
})
// Zmodem cancel transfer
ipcMain.handle(ZMODEM_CHANNELS.CANCEL, async (_event: IpcMainInvokeEvent, sessionId: string) => {
try {
zmodemService.cancelSession(sessionId)
return { success: true }
} catch (error: unknown) {
return { success: false, error: error instanceof Error ? error.message : String(error) }
}
})
}