OpenTerminal v0.2.1: terminal suite with SSH, split panes, themes and keyword highlighting
- Local terminal (node-pty) + SSH sessions (ssh2) with unified data plane - dockview split panes, per-group '+' tab bar button, layout templates - Session replay buffer (late-subscriber catch-up), host key pinning, credential encryption via safeStorage - 12 builtin themes + custom theme editor, system font enumeration - Keyword highlighting: regex rules with priority, ANSI truecolor injection, chunk-boundary-safe stream (carry-over of partial escape sequences) - Dark antd theme app-wide, settings dialog redesign, error boundary - Tests: ssh loopback, session e2e, highlight split-chunk regression
This commit is contained in:
954801926@qq.com committed
commit
551723c2d4
58 files changed
+11929
No files matched your search
@@ -0,0 +1,12 @@
|
||||
// Minimal electron stub for bundling src/main/pty.ts under plain Node
|
||||
// (tests/ssh-session-e2e.mjs). Only what broadcast.ts touches.
|
||||
module.exports = {
|
||||
BrowserWindow: {
|
||||
getAllWindows: () => []
|
||||
},
|
||||
app: {},
|
||||
ipcMain: {},
|
||||
safeStorage: {
|
||||
isEncryptionAvailable: () => false
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
// Split-chunk regression test for HighlightStream.
|
||||
// Builds the engine + TerminalView-free stream, feeds a kimi-like banner in
|
||||
// deliberately nasty chunk splits, and requires byte-identical output vs the
|
||||
// single-chunk reference.
|
||||
import { compileRules, applyHighlights, HighlightStream } from '../src/renderer/src/terminal/highlightEngine.ts'
|
||||
|
||||
const rules = compileRules([
|
||||
{ id: 'okstate', pattern: '\\b(SUCCESS|PASS|OK|DONE)\\b', enabled: true, priority: 5, color: { fg: '#3fb950' } },
|
||||
{ id: 'badstate', pattern: '\\b(ERROR|FAILED)\\b', enabled: true, priority: 6, color: { fg: '#f85149' } },
|
||||
{ id: 'numbers', pattern: '\\b\\d+(?:\\.\\d+)?(?:%)?\\b', enabled: true, priority: 25, color: { fg: '#f2cc60' } },
|
||||
{ id: 'url', pattern: 'https?://[^\\s]+', enabled: true, priority: 30, color: { fg: '#58a6ff' } }
|
||||
])
|
||||
|
||||
// kimi-like: truecolor SGR, OSC title, box drawing, per-line repaints
|
||||
const banner =
|
||||
'\x1b]0;kimi — session\x07' +
|
||||
'\x1b[38;2;79;168;255m╭───────╮\x1b[0m\r\n' +
|
||||
'\x1b[38;2;136;136;136mWelcome to Kimi Code!\x1b[0m \x1b[38;2;79;168;255m│\x1b[0m send /help\r\n' +
|
||||
'\x1b[38;2;224;224;224mModel: MiniMax-M3 0.41.038 ERROR 99% https://example.com/x\x1b[0m\r\n'
|
||||
|
||||
const reference = applyHighlights(banner, rules)
|
||||
|
||||
// every possible single split point + a few double splits
|
||||
let failed = 0
|
||||
const splitAt = (s, i) => [s.slice(0, i), s.slice(i)]
|
||||
|
||||
for (let i = 1; i < banner.length - 1; i++) {
|
||||
const [a, b] = splitAt(banner, i)
|
||||
const stream = new HighlightStream(rules)
|
||||
const out = stream.push(a) + stream.push(b) + stream.flush()
|
||||
if (out !== reference) {
|
||||
failed++
|
||||
if (failed <= 3) {
|
||||
console.log(`MISMATCH at split ${i}:`)
|
||||
console.log(' got: ' + JSON.stringify(out.slice(0, 120)))
|
||||
console.log(' expected: ' + JSON.stringify(reference.slice(0, 120)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// double splits at 1/3 and 2/3, plus a pathological 1-byte-per-push feed
|
||||
{
|
||||
const i = Math.floor(banner.length / 3)
|
||||
const j = Math.floor((banner.length * 2) / 3)
|
||||
const stream = new HighlightStream(rules)
|
||||
const out = stream.push(banner.slice(0, i)) + stream.push(banner.slice(i, j)) + stream.push(banner.slice(j)) + stream.flush()
|
||||
if (out !== reference) failed++
|
||||
}
|
||||
|
||||
{
|
||||
const stream = new HighlightStream(rules)
|
||||
let out = ''
|
||||
for (const ch of banner) out += stream.push(ch)
|
||||
out += stream.flush()
|
||||
if (out !== reference) failed++
|
||||
}
|
||||
|
||||
if (failed === 0) {
|
||||
console.log('SPLIT-SMOKE PASS: all split points byte-identical to single-chunk reference')
|
||||
process.exit(0)
|
||||
} else {
|
||||
console.log(`SPLIT-SMOKE FAIL: ${failed} mismatches`)
|
||||
process.exit(1)
|
||||
}
|
||||
@@ -0,0 +1,163 @@
|
||||
/**
|
||||
* SSH loopback verification (M2). Pure Node ESM, no Electron.
|
||||
*
|
||||
* Spins up an in-process ssh2.Server (127.0.0.1, random port), then connects
|
||||
* with a plain ssh2.Client using the exact same connect parameters the main
|
||||
* process ssh service uses (host/port/username/password/keepalive/hostVerifier),
|
||||
* and confirms the full data plane round-trip:
|
||||
*
|
||||
* ready -> shell -> banner "LOOPBACK-OK" -> write data -> echo -> close
|
||||
*
|
||||
* Run: `node tests/ssh-loopback.mjs` (must exit 0)
|
||||
*/
|
||||
|
||||
import pkg from 'ssh2'
|
||||
const { Server, Client, utils } = pkg
|
||||
import { createHash } from 'crypto'
|
||||
|
||||
function fingerprintOf(key) {
|
||||
return 'SHA256:' + createHash('sha256').update(key).digest('base64').replace(/=+$/, '')
|
||||
}
|
||||
|
||||
const fail = (msg) => {
|
||||
console.error(`FAIL: ${msg}`)
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
// ---- 1. Boot the loopback server -------------------------------------------
|
||||
const serverKey = utils.generateKeyPairSync('ed25519')
|
||||
let serverPort = 0
|
||||
let seenWindowChange = { cols: 0, rows: 0 }
|
||||
|
||||
const srv = new Server({ hostKeys: [serverKey.private] }, (client) => {
|
||||
client.on('authentication', (ctx) => {
|
||||
if (ctx.method === 'password' && ctx.username === 'test' && ctx.password === 'test') {
|
||||
ctx.accept()
|
||||
} else {
|
||||
ctx.reject(['password'])
|
||||
}
|
||||
})
|
||||
|
||||
client.on('ready', () => {
|
||||
client.on('session', (accept, reject) => {
|
||||
const session = accept()
|
||||
session.on('pty', (accept) => accept())
|
||||
session.on('window-change', (accept, reject, info) => {
|
||||
seenWindowChange = { cols: info.cols, rows: info.rows }
|
||||
accept && accept()
|
||||
})
|
||||
session.on('shell', (accept, reject) => {
|
||||
const stream = accept()
|
||||
stream.write('LOOPBACK-OK\n')
|
||||
stream.on('data', (d) => {
|
||||
const data = d.toString('utf8')
|
||||
stream.write(data) // echo back
|
||||
if (data.includes('exit')) {
|
||||
stream.end()
|
||||
client.end()
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
client.on('error', (err) => console.error('[server] client error', err.message))
|
||||
})
|
||||
|
||||
await new Promise((resolve, reject) => {
|
||||
srv.on('error', reject)
|
||||
srv.listen(0, '127.0.0.1', () => {
|
||||
serverPort = srv.address().port
|
||||
resolve()
|
||||
})
|
||||
})
|
||||
console.log(`[loopback] ssh server listening on 127.0.0.1:${serverPort}`)
|
||||
|
||||
// ---- 2. Connect with the same params the main ssh service uses --------------
|
||||
const client = new Client()
|
||||
let bannerSeen = false
|
||||
let echoed = false
|
||||
let output = ''
|
||||
let verifyCalls = 0
|
||||
let resolveDone
|
||||
const done = new Promise((r) => (resolveDone = r))
|
||||
const timer = setTimeout(() => {
|
||||
fail(`timed out (client connected: ${client._stream ? 'yes' : 'no'})`)
|
||||
}, 10000)
|
||||
|
||||
client.on('ready', () => {
|
||||
console.log('[loopback] client ready')
|
||||
client.shell({ term: 'xterm-256color', cols: 80, rows: 24 }, (err, stream) => {
|
||||
if (err) return fail(`shell error: ${err.message}`)
|
||||
console.log('[loopback] shell open')
|
||||
let sentInput = false
|
||||
let sentExit = false
|
||||
|
||||
stream.on('data', (d) => {
|
||||
const chunk = d.toString('utf8')
|
||||
output += chunk
|
||||
if (output.includes('LOOPBACK-OK') && !sentInput) {
|
||||
bannerSeen = true
|
||||
console.log('[loopback] banner received')
|
||||
// exercise resize while the session is live
|
||||
stream.setWindow(40, 120, 0, 0)
|
||||
sentInput = true
|
||||
stream.write('hello loopback\n')
|
||||
}
|
||||
if (output.includes('hello loopback') && echoed === false) {
|
||||
echoed = true
|
||||
console.log('[loopback] echo received')
|
||||
}
|
||||
if (bannerSeen && echoed && !sentExit) {
|
||||
sentExit = true
|
||||
stream.write('exit\n')
|
||||
}
|
||||
})
|
||||
|
||||
stream.on('close', () => {
|
||||
clearTimeout(timer)
|
||||
console.log('[loopback] stream closed')
|
||||
client.end()
|
||||
resolveDone()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
client.on('error', (err) => fail(`client error: ${err.message}`))
|
||||
|
||||
// hostVerifier mirrors ssh.ts (SHA256 fingerprint; loopback accepts the key)
|
||||
client.connect({
|
||||
host: '127.0.0.1',
|
||||
port: serverPort,
|
||||
username: 'test',
|
||||
password: 'test',
|
||||
keepaliveInterval: 0,
|
||||
hostVerifier: (hostKey, verify) => {
|
||||
verifyCalls++
|
||||
const fp = fingerprintOf(hostKey)
|
||||
console.log(`[loopback] hostVerifier called (${verifyCalls}), fp=${fp}`)
|
||||
verify(true)
|
||||
}
|
||||
})
|
||||
|
||||
// ---- 3. Assertions ----------------------------------------------------------
|
||||
await done
|
||||
srv.close()
|
||||
|
||||
const checks = [
|
||||
['client reached ready', bannerSeen],
|
||||
['banner LOOPBACK-OK received', bannerSeen],
|
||||
['typed data echoed back', echoed],
|
||||
['host key verified exactly once', verifyCalls === 1],
|
||||
['resize propagated to server (40x120)', seenWindowChange.cols === 120 && seenWindowChange.rows === 40]
|
||||
]
|
||||
|
||||
let ok = true
|
||||
for (const [label, pass] of checks) {
|
||||
console.log(`[loopback] ${pass ? 'PASS' : 'FAIL'}: ${label}`)
|
||||
if (!pass) ok = false
|
||||
}
|
||||
|
||||
if (!ok) fail('one or more checks failed')
|
||||
console.log('[loopback] ALL CHECKS PASSED')
|
||||
process.exit(0)
|
||||
@@ -0,0 +1,151 @@
|
||||
/**
|
||||
* Session-layer e2e (M2). Drives the REAL session routing (src/main/pty.ts +
|
||||
* src/main/ssh.ts, bundled by esbuild with an electron stub) against an
|
||||
* in-process ssh2.Server — the same openSession/write/resize/kill pipeline the
|
||||
* app uses, minus the IPC + renderer shells.
|
||||
*
|
||||
* Pre-req: npx esbuild src/main/pty.ts --bundle --platform=node --format=cjs
|
||||
* --outfile=tests/.session-e2e.cjs --external:@lydell/node-pty
|
||||
* --external:ssh2 --alias:electron=./tests/electron-stub.cjs
|
||||
* Run: node tests/ssh-session-e2e.mjs (must exit 0)
|
||||
*/
|
||||
|
||||
import pkg from 'ssh2'
|
||||
import { createHash } from 'crypto'
|
||||
import { createRequire } from 'module'
|
||||
const require_ = createRequire(import.meta.url)
|
||||
const { Server, utils } = pkg
|
||||
|
||||
const fail = (msg) => {
|
||||
console.error(`FAIL: ${msg}`)
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
// ---- 1. Loopback ssh server --------------------------------------------------
|
||||
const serverKey = utils.generateKeyPairSync('ed25519')
|
||||
let serverPort = 0
|
||||
let seenWindowChange = { cols: 0, rows: 0 }
|
||||
|
||||
const srv = new Server({ hostKeys: [serverKey.private] }, (client) => {
|
||||
client.on('authentication', (ctx) => {
|
||||
if (ctx.method === 'password' && ctx.username === 'test' && ctx.password === 'test') {
|
||||
ctx.accept()
|
||||
} else {
|
||||
ctx.reject(['password'])
|
||||
}
|
||||
})
|
||||
client.on('ready', () => {
|
||||
client.on('session', (accept) => {
|
||||
const session = accept()
|
||||
session.on('pty', (accept) => accept())
|
||||
session.on('window-change', (accept, reject, info) => {
|
||||
seenWindowChange = { cols: info.cols, rows: info.rows }
|
||||
accept && accept()
|
||||
})
|
||||
session.on('shell', (accept) => {
|
||||
const stream = accept()
|
||||
stream.write('SESSION-E2E-BANNER\n')
|
||||
stream.on('data', (d) => {
|
||||
const data = d.toString('utf8')
|
||||
stream.write(data)
|
||||
if (data.includes('exit')) {
|
||||
stream.end()
|
||||
client.end()
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
client.on('error', () => {})
|
||||
})
|
||||
|
||||
await new Promise((resolve, reject) => {
|
||||
srv.on('error', reject)
|
||||
srv.listen(0, '127.0.0.1', () => {
|
||||
serverPort = srv.address().port
|
||||
resolve()
|
||||
})
|
||||
})
|
||||
console.log(`[e2e] ssh server listening on 127.0.0.1:${serverPort}`)
|
||||
|
||||
// ---- 2. Load the real session layer ------------------------------------------
|
||||
// esbuild replaces 'electron' with tests/electron-stub.cjs via --alias.
|
||||
const sessionLayer = require_('./.session-e2e.cjs')
|
||||
|
||||
const events = []
|
||||
sessionLayer.configureSessionRuntime({
|
||||
broadcast: (channel, payload) => events.push({ channel, payload }),
|
||||
getConnection: (id) => {
|
||||
if (id !== 'conn-1') fail(`unexpected connectionId ${id}`)
|
||||
return {
|
||||
id: 'conn-1',
|
||||
name: 'loopback',
|
||||
host: '127.0.0.1',
|
||||
port: serverPort,
|
||||
username: 'test',
|
||||
auth: 'password',
|
||||
askPasswordAtConnect: false,
|
||||
askPassphraseAtConnect: false,
|
||||
keepaliveIntervalSec: 0,
|
||||
createdAt: Date.now(),
|
||||
savedAuth: { hasPassword: true, hasKeyContent: false, hasPassphrase: false }
|
||||
}
|
||||
},
|
||||
getSecret: (conn, field) => (field === 'password' ? 'test' : undefined),
|
||||
touch: (id) => events.push({ channel: 'touched', payload: id }),
|
||||
knownHosts: {
|
||||
check: (host, port, key) => {
|
||||
const fp = 'SHA256:' + createHash('sha256').update(key).digest('base64').replace(/=+$/, '')
|
||||
return { status: 'match', fingerprint: fp }
|
||||
},
|
||||
accept: () => {}
|
||||
},
|
||||
promptHostKey: () => fail('promptHostKey must not fire for matching keys')
|
||||
})
|
||||
|
||||
// ---- 3. Drive the pipeline ----------------------------------------------------
|
||||
const timer = setTimeout(() => fail('e2e timed out'), 15000)
|
||||
const openResult = await sessionLayer.openSession({ kind: 'ssh', connectionId: 'conn-1' })
|
||||
if (!openResult?.id) fail('openSession did not resolve with an id')
|
||||
console.log(`[e2e] session open: ${openResult.id}`)
|
||||
|
||||
const wait = (ms) => new Promise((r) => setTimeout(r, ms))
|
||||
const seenData = (needle) =>
|
||||
events.some((e) => e.channel === 'pty:data' && typeof e.payload?.data === 'string' && e.payload.data.includes(needle))
|
||||
|
||||
// banner should already have streamed once the shell opened
|
||||
for (let i = 0; i < 50 && !seenData('SESSION-E2E-BANNER'); i++) await wait(100)
|
||||
if (!seenData('SESSION-E2E-BANNER')) fail('banner never arrived via PTY_DATA broadcast')
|
||||
console.log('[e2e] banner received through session data plane')
|
||||
|
||||
// replay buffer: a late subscriber must still get the banner
|
||||
const replay = await sessionLayer.getSessionReplay(openResult.id)
|
||||
if (!replay.includes('SESSION-E2E-BANNER')) fail('replay buffer missing the banner')
|
||||
console.log('[e2e] replay buffer serves the banner to late subscribers')
|
||||
|
||||
sessionLayer.writePty(openResult.id, 'ping-session-e2e\n')
|
||||
for (let i = 0; i < 50 && !seenData('ping-session-e2e'); i++) await wait(100)
|
||||
if (!seenData('ping-session-e2e')) fail('written data never echoed back')
|
||||
console.log('[e2e] write -> echo round-trip ok')
|
||||
|
||||
sessionLayer.resizePty(openResult.id, 111, 33)
|
||||
for (let i = 0; i < 50 && seenWindowChange.cols !== 111; i++) await wait(100)
|
||||
if (seenWindowChange.cols !== 111 || seenWindowChange.rows !== 33) fail(`resize not propagated (${JSON.stringify(seenWindowChange)})`)
|
||||
console.log('[e2e] resize propagated (111x33)')
|
||||
|
||||
sessionLayer.killPty(openResult.id)
|
||||
const exited = events.find((e) => e.channel === 'pty:exit' && e.payload?.id === openResult.id)
|
||||
if (!exited) {
|
||||
// 'close' on the client stream may lag slightly behind kill
|
||||
for (let i = 0; i < 50 && !events.some((e) => e.channel === 'pty:exit' && e.payload?.id === openResult.id); i++) await wait(100)
|
||||
}
|
||||
if (!events.some((e) => e.channel === 'pty:exit' && e.payload?.id === openResult.id)) fail('PTY_EXIT never broadcast after killPty')
|
||||
console.log('[e2e] kill -> PTY_EXIT ok')
|
||||
|
||||
if (!events.some((e) => e.channel === 'touched' && e.payload === 'conn-1')) fail('lastConnectedAt touch not recorded')
|
||||
console.log('[e2e] connection touch recorded')
|
||||
|
||||
clearTimeout(timer)
|
||||
srv.close()
|
||||
console.log('[e2e] ALL CHECKS PASSED')
|
||||
process.exit(0)
|
||||
Reference in new issue
Block a user