Compare commits

...
4 Commits
Author SHA1 Message Date
Bill 3c193a48a7 chore: bump version to 1.0.6 2026-09-14 17:31:00 +08:00
Bill 9467b78560 chore: name installed NSIS shortcuts OTerminal 2026-09-14 17:22:15 +08:00
Bill be7332db17 perf: route PTY stream through a single shared IPC listener
Every pane registered its own global onPtyData/onPtyExit listener, so each
output chunk woke N listeners and N-1 discarded it after an id compare.
With many terminals under heavy output that fan-out is pure overhead.
Now one IPC listener dispatches through a Map keyed by sessionId: one
lookup per chunk, only the owning pane runs.
2026-09-14 16:59:57 +08:00
Bill bbee1d642d polish: about-page logo now uses the app icon instead of an OT text mark 2026-09-14 15:06:19 +08:00
6 changed files with 65 additions and 17 deletions

No files matched your search

+3
View File
@@ -37,6 +37,9 @@ nsis:
oneClick: false
allowToChangeInstallationDirectory: true
perMachine: false
# Installed shortcuts read "OTerminal"; productName stays OpenTerminal so the
# userData dir and window title are untouched.
shortcutName: OTerminal
createDesktopShortcut: true
createStartMenuShortcut: true
artifactName: ${productName}-${version}-setup.${ext}
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "open-terminal",
"productName": "OpenTerminal",
"version": "1.0.5",
"version": "1.0.6",
"description": "Open-source terminal with SSH, split panes, themes and fonts",
"main": "out/main/index.js",
"author": "Bill",
+2 -1
View File
@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react'
import { Button, Progress, Select, Switch, Tag } from 'antd'
import type { AppInfo, ReleaseNote, UpdateState, UpdateStatus } from '@shared/ipc'
import { useSettingsStore } from './store'
import appIconUrl from '../../../../build/icon.png'
const STATUS_TEXT: Record<UpdateStatus, string> = {
idle: '点击检查更新',
@@ -34,7 +35,7 @@ export function AboutTab(): React.JSX.Element {
return (
<div className="about-tab">
<div className="about-header">
<div className="about-logo">OT</div>
<img className="about-logo" src={appIconUrl} alt="OpenTerminal" draggable={false} />
<div>
<div className="about-name">OpenTerminal</div>
<div className="about-version">
+2 -7
View File
@@ -380,13 +380,8 @@
width: 48px;
height: 48px;
border-radius: 12px;
background: var(--chrome-hover);
color: #3fd06a;
display: flex;
align-items: center;
justify-content: center;
font-weight: 700;
font-size: 18px;
object-fit: cover;
display: block;
}
.about-name {
+9 -8
View File
@@ -9,11 +9,11 @@ import '@xterm/xterm/css/xterm.css'
import { ClearOutlined, CopyOutlined, FolderOpenOutlined, PauseOutlined, SearchOutlined, SelectOutlined, SnippetsOutlined, SoundOutlined } from '@ant-design/icons'
import { getThemeById } from '@shared/theme'
import type { CommandItem } from '@shared/commands'
import type { PtyDataEvent, PtyExitEvent } from '@shared/ipc'
import type { TerminalSettings } from '@shared/settings'
import { useSettingsStore } from '@renderer/settings/store'
import { writeBroadcast } from '@renderer/workspace/broadcastStore'
import { compileRules, HighlightStream, type CompiledRule } from './highlightEngine'
import { subscribePtyData, subscribePtyExit } from './ptyDispatcher'
import { cdArgument, conemuCwd } from './cwdTracker'
import { getSessionCwd, setSessionCwd } from '@renderer/workspace/sessionCwdStore'
import './terminal.css'
@@ -792,18 +792,19 @@ export const TerminalView: ForwardRefExoticComponent<TerminalViewProps & { ref?:
let replayDone = false
const pending: string[] = []
const unsubscribes: (() => void)[] = [
window.api.onPtyData((e: PtyDataEvent) => {
if (e.id !== sessionId || deadRef.current) return
// Routed via the shared dispatcher (one IPC listener for all panes)
// instead of a per-pane global listener.
subscribePtyData(sessionId, (data: string) => {
if (deadRef.current) return
if (!replayDone) {
pending.push(e.data)
pending.push(data)
return
}
writeHighlighted(e.data)
writeHighlighted(data)
}),
window.api.onPtyExit((e: PtyExitEvent) => {
if (e.id !== sessionId) return
subscribePtyExit(sessionId, (code: number) => {
deadRef.current = true
setExitCode(e.exitCode)
setExitCode(code)
setDead(true)
})
]
@@ -0,0 +1,48 @@
import type { PtyDataEvent, PtyExitEvent } from '@shared/ipc'
/**
* Single shared PTY stream listener. Every pane used to register its own
* window.api.onPtyData/onPtyExit listener, so each output chunk woke N
* listeners (N = pane count) and N-1 of them discarded it after an id
* compare. With many terminals under heavy output that per-chunk fan-out is
* pure overhead. Here one IPC listener dispatches through a Map keyed by
* sessionId: one lookup per chunk, and only the owning pane runs.
*/
type DataHandler = (data: string) => void
type ExitHandler = (exitCode: number) => void
const dataHandlers = new Map<string, DataHandler>()
const exitHandlers = new Map<string, ExitHandler>()
let bound = false
function ensureBound(): void {
if (bound) return
bound = true
window.api.onPtyData((e: PtyDataEvent) => {
dataHandlers.get(e.id)?.(e.data)
})
window.api.onPtyExit((e: PtyExitEvent) => {
exitHandlers.get(e.id)?.(e.exitCode)
})
}
/** Subscribe to one session's output. Returns the unsubscribe function. */
export function subscribePtyData(id: string, cb: DataHandler): () => void {
ensureBound()
dataHandlers.set(id, cb)
return () => {
// A rebind (template apply) may have replaced the handler already; only
// delete when this subscription is still the registered one.
if (dataHandlers.get(id) === cb) dataHandlers.delete(id)
}
}
/** Subscribe to one session's exit. Returns the unsubscribe function. */
export function subscribePtyExit(id: string, cb: ExitHandler): () => void {
ensureBound()
exitHandlers.set(id, cb)
return () => {
if (exitHandlers.get(id) === cb) exitHandlers.delete(id)
}
}