CI / typecheck + test + build (windows) (push) Canceled after 0s
P1: - settingsStore: back up an unparseable settings.json to .bak before falling back to defaults, so the next mutation can no longer silently wipe custom themes/highlight rules - ptyDispatcher: fan out per-session data/exit handlers (Set instead of a single slot) so SSH split panes stop stealing each other's stream - FilePanel: monotonic refresh token keeps stale listings from painting over a newer navigation; upload finish no longer yanks the panel back - settings.css: active settings-tab label derives from --chrome-fg so it stays visible on the shipped light themes P2 (main/renderer): - paste guard: a paste ending in a newline always confirms - Workspace: closing an SSH pane no longer seeds the local cwd with a remote path - tray: skip close-dialog continuation on a destroyed window - commands: close zombie 'in-progress' session logs at hydrate - zmodem: clear the stale offer timer before arming a new one - connectionsStore: coerce/validate renderer input before persisting - sftp: OperationError marker class keeps translated errors out of the transport-retry classifier - CommandsPanel: surface save failures inside the dialog - ConnectionSidebar: drop a tautological tooltip condition P2 (i18n/tooling/tests): - localize the 16 ANSI color labels and the highlight sample text (21 new keys across zh-CN/zh-TW/en/ja) - sync-changelog: keep ### subheadings, normalize CRLF notes - release.cjs: GitHub release reuse-by-tag (idempotent re-runs); fail loudly on a failed Gitea asset listing - commands-store test: absent historyEnabled now truly tests absence
478 lines
17 KiB
TypeScript
478 lines
17 KiB
TypeScript
/**
|
|
* Command history / command library + session output logs (M5).
|
|
*
|
|
* Persistence mirrors the connections store: plain JSON files under
|
|
* <userData>/ without sqlite. Two concerns live here:
|
|
*
|
|
* - Commands: <userData>/commands.json as `{ history, library }`.
|
|
* History is capped, deduped against the newest entry and sorted by
|
|
* lastUsedAt; library items are sorted by createdAt and support id-based
|
|
* update-or-create.
|
|
* - Session logs: <userData>/logs/<YYYYMMDD-HHmmss>-<id8>.log plain-text
|
|
* files plus an index file (<userData>/logs/index.json) of SessionLogMeta
|
|
* that survives restart. PTY data is pushed in by the session layer via the
|
|
* registered data logger; streams stop on session close.
|
|
*
|
|
* The only Electron binding is `app.getPath` (data dir) and `shell.openPath`
|
|
* (open the logs folder). Both are injectable so this module can be bundled
|
|
* and tested under plain Node.
|
|
*/
|
|
|
|
import { app, shell } from 'electron'
|
|
import { randomUUID } from 'crypto'
|
|
import { mkdirSync, readFileSync, writeFileSync, existsSync, realpathSync, statSync } from 'fs'
|
|
import { appendFile } from 'fs/promises'
|
|
import { basename, dirname, join, resolve, sep } from 'path'
|
|
import type { CommandItem, SessionLogMeta } from '../shared/commands'
|
|
import { DEFAULT_SETTINGS } from '../shared/settings'
|
|
import { loadSettings } from './settingsStore'
|
|
import { LogSanitizer } from './logSanitizer'
|
|
import { writeJson } from './store'
|
|
|
|
/** Upper bound on recorded history entries when no limit is configured. */
|
|
const HISTORY_CAP = 500
|
|
/** Hard ceiling: the history is also the completion source, so it stays small. */
|
|
export const HISTORY_LIMIT_MAX = 500
|
|
|
|
interface CommandsFile {
|
|
history: CommandItem[]
|
|
library: CommandItem[]
|
|
}
|
|
|
|
function emptyFile(): CommandsFile {
|
|
return { history: [], library: [] }
|
|
}
|
|
|
|
/** Default data root: <userData> (computed by the store itself). */
|
|
export function defaultCommandsPath(userDataPath: string): string {
|
|
return userDataPath
|
|
}
|
|
|
|
function two(n: number): string {
|
|
return String(n).padStart(2, '0')
|
|
}
|
|
|
|
/** YYYYMMDD-HHmmss timestamp used in log file names. */
|
|
function stamp(d = new Date()): string {
|
|
return (
|
|
`${d.getFullYear()}${two(d.getMonth() + 1)}${two(d.getDate())}` +
|
|
`-${two(d.getHours())}${two(d.getMinutes())}${two(d.getSeconds())}`
|
|
)
|
|
}
|
|
|
|
export class CommandsStore {
|
|
/** <userData>/commands.json */
|
|
private readonly file: string
|
|
/** <userData>/logs */
|
|
private readonly logsDir: string
|
|
/** <userData>/logs/index.json */
|
|
private readonly indexFile: string
|
|
private readonly openPathImpl?: (p: string) => Promise<unknown>
|
|
|
|
/** All known logs keyed by absolute file path (hydrated from index on boot). */
|
|
private readonly metasByFile = new Map<string, SessionLogMeta>()
|
|
/** Logs currently accumulating output, keyed by sessionId. */
|
|
private readonly activeBySession = new Map<string, SessionLogMeta>()
|
|
/**
|
|
* Buffered plain text per log file, flushed by a single drain loop per file.
|
|
* Writes land in the buffer synchronously (so order is preserved) and the
|
|
* drain merges everything that accumulated during the previous appendFile
|
|
* round trip into one append call — burst output costs one syscall per IO
|
|
* tick instead of one Promise chain link per logWrite.
|
|
*/
|
|
private readonly logBuffers = new Map<string, string>()
|
|
/** In-flight drain loop per log file; absent when the file is settled. */
|
|
private readonly logDrains = new Map<string, Promise<void>>()
|
|
/** Plain-text transformer per actively-logged session (see logSanitizer). */
|
|
private readonly sanitizers = new Map<string, LogSanitizer>()
|
|
|
|
constructor(userData?: string, openPathImpl?: (p: string) => Promise<unknown>) {
|
|
const ud = userData ?? app.getPath('userData')
|
|
this.file = join(ud, 'commands.json')
|
|
this.logsDir = join(ud, 'logs')
|
|
this.indexFile = join(this.logsDir, 'index.json')
|
|
this.openPathImpl = openPathImpl
|
|
this.hydrateIndex()
|
|
}
|
|
|
|
// ---- commands file (history + library) -----------------------------------
|
|
|
|
private loadCommands(): CommandsFile {
|
|
try {
|
|
const raw: unknown = JSON.parse(readFileSync(this.file, 'utf8'))
|
|
if (raw && typeof raw === 'object' && Array.isArray((raw as CommandsFile).history)) {
|
|
const data = raw as CommandsFile
|
|
return {
|
|
history: Array.isArray(data.history) ? data.history : [],
|
|
library: Array.isArray(data.library) ? data.library : []
|
|
}
|
|
}
|
|
} catch {
|
|
// missing / corrupted file -> start fresh
|
|
}
|
|
return emptyFile()
|
|
}
|
|
|
|
private saveCommands(data: CommandsFile): void {
|
|
writeJson(this.file, data)
|
|
}
|
|
|
|
/**
|
|
* Record one executed command.
|
|
*
|
|
* Deduplication is over the *whole* history, not just the newest entry: a
|
|
* command used three commands ago is the same command, so re-running it moves
|
|
* the existing entry to the front (refreshing `lastUsedAt`) instead of adding
|
|
* a second copy. History reads back sorted by `lastUsedAt`, so hoisting is
|
|
* exactly what "most recently used" means — and it keeps the list from
|
|
* filling up with one line repeated.
|
|
*
|
|
* Silently does nothing when 设置 → 终端 → 记录命令历史 is off: the setting is
|
|
* read here (not at the call site) so every recording path honours it, and
|
|
* existing history is left untouched rather than cleared.
|
|
*/
|
|
recordCommand(cmd: string): void {
|
|
// The line arrives from the renderer's line buffer, which can still hold
|
|
// editing bytes (Ctrl+U, a stray ESC): only the printable text is a command.
|
|
const trimmed = cmd.replace(/[\x00-\x1f\x7f]/g, '').trim()
|
|
if (!trimmed) return
|
|
const { historyEnabled, historyLimit } = loadHistoryPrefs()
|
|
if (!historyEnabled) return
|
|
const cap = normalizeLimit(historyLimit)
|
|
const data = this.loadCommands()
|
|
const existing = data.history.findIndex((item) => item.command === trimmed)
|
|
if (existing >= 0) {
|
|
const [item] = data.history.splice(existing, 1)
|
|
item.lastUsedAt = Date.now()
|
|
data.history.unshift(item)
|
|
} else {
|
|
data.history.unshift({
|
|
id: randomUUID(),
|
|
command: trimmed,
|
|
createdAt: Date.now(),
|
|
lastUsedAt: Date.now()
|
|
})
|
|
}
|
|
if (data.history.length > cap) data.history.length = cap
|
|
this.saveCommands(data)
|
|
}
|
|
|
|
/**
|
|
* History sorted by most recently used, trimmed to the configured limit.
|
|
*
|
|
* The trim happens on read as well as on write so lowering the limit in
|
|
* settings takes effect at once instead of waiting for the next command.
|
|
*/
|
|
listHistory(): CommandItem[] {
|
|
const { historyLimit } = loadHistoryPrefs()
|
|
return this.loadCommands()
|
|
.history.slice()
|
|
.sort((a, b) => (b.lastUsedAt ?? 0) - (a.lastUsedAt ?? 0))
|
|
.slice(0, normalizeLimit(historyLimit))
|
|
}
|
|
|
|
clearHistory(): void {
|
|
const data = this.loadCommands()
|
|
data.history = []
|
|
this.saveCommands(data)
|
|
}
|
|
|
|
/** Library sorted newest first. */
|
|
listLibrary(): CommandItem[] {
|
|
return this.loadCommands()
|
|
.library.slice()
|
|
.sort((a, b) => b.createdAt - a.createdAt)
|
|
}
|
|
|
|
/** Insert (no id) or update (has id); returns the stored entry. */
|
|
saveLibraryItem(item: CommandItem): CommandItem {
|
|
const data = this.loadCommands()
|
|
let stored: CommandItem | undefined
|
|
if (typeof item.id === 'string' && item.id.length > 0) {
|
|
stored = data.library.find((x) => x.id === item.id)
|
|
}
|
|
if (stored) {
|
|
stored.name = item.name
|
|
stored.command = item.command
|
|
stored.note = item.note
|
|
stored.group = item.group
|
|
stored.params = item.params
|
|
} else {
|
|
stored = {
|
|
id: item.id && item.id.length > 0 ? item.id : randomUUID(),
|
|
name: item.name,
|
|
command: item.command,
|
|
note: item.note,
|
|
group: item.group,
|
|
params: item.params,
|
|
createdAt: Date.now()
|
|
}
|
|
data.library.push(stored)
|
|
}
|
|
this.saveCommands(data)
|
|
return stored
|
|
}
|
|
|
|
deleteLibraryItem(id: string): void {
|
|
const data = this.loadCommands()
|
|
const next = data.library.filter((x) => x.id !== id)
|
|
if (next.length < data.library.length) {
|
|
data.library = next
|
|
this.saveCommands(data)
|
|
}
|
|
}
|
|
|
|
// ---- session logs -----------------------------------------------------------
|
|
|
|
private hydrateIndex(): void {
|
|
try {
|
|
if (!existsSync(this.indexFile)) return
|
|
const raw: unknown = JSON.parse(readFileSync(this.indexFile, 'utf8'))
|
|
if (!Array.isArray(raw)) return
|
|
let closed = false
|
|
for (const x of raw) {
|
|
if (
|
|
x &&
|
|
typeof (x as SessionLogMeta).sessionId === 'string' &&
|
|
typeof (x as SessionLogMeta).file === 'string'
|
|
) {
|
|
const meta = x as SessionLogMeta
|
|
// index.json is data, not trust: a tampered or hand-edited `file`
|
|
// must never turn logWrite into an arbitrary-path append.
|
|
if (!this.isLoggableFile(meta.file)) continue
|
|
// A log still "in progress" here was interrupted by a crash or a
|
|
// force-kill: its session id belonged to the previous run, so no
|
|
// logStop will ever match it and its sanitizer is gone (logWrite
|
|
// would be a permanent no-op). Close it instead of reviving it as
|
|
// an active entry nothing can ever end.
|
|
if (meta.endedAt === undefined) {
|
|
meta.endedAt = Date.now()
|
|
closed = true
|
|
}
|
|
this.metasByFile.set(meta.file, meta)
|
|
}
|
|
}
|
|
if (closed) this.persistIndex()
|
|
} catch {
|
|
// index missing / corrupt -> rebuild on next write
|
|
}
|
|
}
|
|
|
|
/**
|
|
* True when `file` resolves to a regular file inside the logs directory.
|
|
*
|
|
* Applied to every entry hydrated from index.json before it can ever reach
|
|
* logWrite. `..` segments collapse via resolve(); containment is compared
|
|
* case-insensitively on Windows so drive-letter or name-case spelling cannot
|
|
* sneak a path past it. Symlinks are followed (realpathSync): an entry that
|
|
* resolves outside the logs dir is dropped, and a path that exists but is
|
|
* not a regular file (a directory, a device) is dropped too. A path that is
|
|
* simply not on disk yet stays eligible — appendFile creates it lazily, and
|
|
* the directory it would land in is still resolved.
|
|
*/
|
|
private isLoggableFile(file: string): boolean {
|
|
if (file.length === 0) return false
|
|
const dirReal = this.logsDirReal()
|
|
let target: string
|
|
let exists = true
|
|
try {
|
|
target = realpathSync(file)
|
|
} catch (err) {
|
|
if ((err as NodeJS.ErrnoException).code !== 'ENOENT') return false
|
|
// Not on disk yet: appendFile would create it, so the directory it would
|
|
// land in is what decides containment. Judging the literal path alone
|
|
// would let a symlinked subdirectory point the append outside the dir.
|
|
target = this.pendingPathReal(file)
|
|
exists = false
|
|
}
|
|
if (exists) {
|
|
try {
|
|
if (!statSync(target).isFile()) return false
|
|
} catch {
|
|
// Vanished between realpath and stat: appends would recreate it, and
|
|
// the containment check below already passed for this path.
|
|
}
|
|
}
|
|
const norm = (p: string): string => (process.platform === 'win32' ? p.toLowerCase() : p)
|
|
const dirN = norm(dirReal)
|
|
return norm(target).startsWith(dirN + sep)
|
|
}
|
|
|
|
/** Real path of the logs dir; falls back to resolve() when it does not exist yet. */
|
|
private logsDirReal(): string {
|
|
try {
|
|
return realpathSync(this.logsDir)
|
|
} catch {
|
|
return resolve(this.logsDir)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Where a log file that is not on disk yet would actually be written: its
|
|
* parent resolved through any symlinks, the leaf kept as written (it does not
|
|
* exist, so it has nothing to resolve). Falls back to the literal resolve()
|
|
* when the parent is missing as well — the containment check then decides.
|
|
*/
|
|
private pendingPathReal(file: string): string {
|
|
try {
|
|
return join(realpathSync(dirname(file)), basename(file))
|
|
} catch {
|
|
return resolve(file)
|
|
}
|
|
}
|
|
|
|
/** Write the full log index so listSessionLogs survives restart. */
|
|
private persistIndex(): void {
|
|
try {
|
|
const all = Array.from(this.metasByFile.values()).sort(
|
|
(a, b) => b.startedAt - a.startedAt
|
|
)
|
|
writeJson(this.indexFile, all)
|
|
} catch {
|
|
// best effort: never break the session over an index write failure
|
|
}
|
|
}
|
|
|
|
/** Finalize a log (set endedAt, drop from active, persist index). */
|
|
private finishLog(meta: SessionLogMeta): void {
|
|
meta.endedAt = Date.now()
|
|
this.activeBySession.delete(meta.sessionId)
|
|
this.persistIndex()
|
|
}
|
|
|
|
/** Start logging a session; any prior active log for the id is stopped first. */
|
|
logStart(sessionId: string): SessionLogMeta {
|
|
const prev = this.activeBySession.get(sessionId)
|
|
if (prev) this.finishLog(prev)
|
|
|
|
mkdirSync(this.logsDir, { recursive: true })
|
|
// The id comes from the renderer and lands in a file name: keep only the
|
|
// characters a session id is made of so it can never reach outside logsDir.
|
|
const safeId = sessionId.replace(/[^A-Za-z0-9_-]/g, '').slice(0, 8) || 'session'
|
|
const fileName = `${stamp()}-${safeId}.log`
|
|
const file = join(this.logsDir, fileName)
|
|
// Create the file eagerly so the first async append cannot race a missing fd.
|
|
describeFile(file)
|
|
const meta: SessionLogMeta = { sessionId, file, fileName, startedAt: Date.now() }
|
|
this.metasByFile.set(file, meta)
|
|
this.activeBySession.set(sessionId, meta)
|
|
this.sanitizers.set(sessionId, new LogSanitizer())
|
|
this.persistIndex()
|
|
return meta
|
|
}
|
|
|
|
/** Append output for an active session. No-op when not logging (post-stop safe). */
|
|
logWrite(sessionId: string, data: string): void {
|
|
const meta = this.activeBySession.get(sessionId)
|
|
if (!meta) {
|
|
// not logging (or already stopped) -> ignore, prevents stop/append race
|
|
return
|
|
}
|
|
// Raw PTY output is escape-sequence soup in a text file; log plain text.
|
|
const clean = this.sanitizers.get(sessionId)?.push(data) ?? ''
|
|
if (!clean) return
|
|
this.logBuffers.set(meta.file, (this.logBuffers.get(meta.file) ?? '') + clean)
|
|
this.drainLog(meta.file)
|
|
}
|
|
|
|
/**
|
|
* Flush a log file's buffer, keeping at most one drain (and therefore one
|
|
* in-flight appendFile) per file. New writes that arrive mid-flush re-enter
|
|
* the buffer and are picked up by the next loop iteration, merged.
|
|
*/
|
|
private drainLog(file: string): Promise<void> {
|
|
const existing = this.logDrains.get(file)
|
|
if (existing) return existing
|
|
const run = (async (): Promise<void> => {
|
|
for (;;) {
|
|
const chunk = this.logBuffers.get(file)
|
|
if (chunk === undefined) break
|
|
this.logBuffers.delete(file)
|
|
try {
|
|
await appendFile(file, chunk, 'utf8')
|
|
} catch {
|
|
// file may have been removed after stop -> ignore
|
|
}
|
|
}
|
|
})()
|
|
run.finally(() => {
|
|
if (this.logDrains.get(file) === run) this.logDrains.delete(file)
|
|
})
|
|
this.logDrains.set(file, run)
|
|
return run
|
|
}
|
|
|
|
/** Stop logging a session, stamping endedAt into the registry + index. */
|
|
logStop(sessionId: string): void {
|
|
const meta = this.activeBySession.get(sessionId)
|
|
if (!meta) return
|
|
const tail = this.sanitizers.get(sessionId)?.flush() ?? ''
|
|
this.sanitizers.delete(sessionId)
|
|
if (tail) {
|
|
// Best effort: the trailing partial line belongs in the file too.
|
|
this.logBuffers.set(meta.file, (this.logBuffers.get(meta.file) ?? '') + tail)
|
|
this.drainLog(meta.file)
|
|
}
|
|
this.finishLog(meta)
|
|
}
|
|
|
|
/** All known session logs (including persisted ones), newest first. */
|
|
listSessionLogs(): SessionLogMeta[] {
|
|
return Array.from(this.metasByFile.values()).sort((a, b) => b.startedAt - a.startedAt)
|
|
}
|
|
|
|
/** Reveal the logs directory in the OS file manager. */
|
|
openLogsDir(): void {
|
|
try {
|
|
mkdirSync(this.logsDir, { recursive: true })
|
|
if (this.openPathImpl) {
|
|
void this.openPathImpl(this.logsDir)
|
|
} else {
|
|
void shell.openPath(this.logsDir)
|
|
}
|
|
} catch {
|
|
// best effort
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Create a log file empty so the path is real before async writes begin. */
|
|
function describeFile(p: string): void {
|
|
try {
|
|
writeFileSync(p, '', 'utf8')
|
|
} catch {
|
|
// best effort; appends will also create it lazily
|
|
}
|
|
}
|
|
|
|
/**
|
|
* History preferences straight from settings.
|
|
*
|
|
* Read on every use rather than cached: the store is constructed once at boot
|
|
* but the user can flip the switch at any time, and a stale copy would keep
|
|
* recording after they turned it off.
|
|
*/
|
|
function loadHistoryPrefs(): { historyEnabled: boolean; historyLimit: number } {
|
|
try {
|
|
const terminal = loadSettings().terminal
|
|
return {
|
|
historyEnabled: terminal.historyEnabled === true,
|
|
historyLimit: normalizeLimit(terminal.historyLimit)
|
|
}
|
|
} catch {
|
|
// Settings unreadable (e.g. store used outside Electron in a test): fall
|
|
// back to the same defaults the app ships with.
|
|
return {
|
|
historyEnabled: DEFAULT_SETTINGS.terminal.historyEnabled,
|
|
historyLimit: DEFAULT_SETTINGS.terminal.historyLimit
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Clamp a configured limit into 1..HISTORY_LIMIT_MAX; unusable → the default. */
|
|
function normalizeLimit(value: unknown): number {
|
|
if (typeof value !== 'number' || !Number.isFinite(value)) return DEFAULT_SETTINGS.terminal.historyLimit
|
|
const rounded = Math.floor(value)
|
|
if (rounded < 1) return 1
|
|
return Math.min(rounded, HISTORY_LIMIT_MAX)
|
|
} |