mirror of
https://github.com/YuzuZensai/Termix.git
synced 2026-11-12 15:36:40 +00:00
* feat(sshid) - sshid.io equivalent for termix (#919) * feat(ssh-id): database schema, migrations and field encryption Adds ssh_identities, ssh_identity_keys and ssh_identity_ca tables (public keys stored plaintext for the unauthenticated resolver; CA private key registered for per-user field encryption), with UNIQUE(user_id), an index on ssh_identity_keys(identity_id), and idempotent CREATE TABLE migrations. * feat(ssh-id): backend API — resolver, key management, CA and certificates Mounts /sshid (nginx route added). Public text/plain authorized_keys resolver (+ exact /:algo filter, HTML viewer) and CA public-key endpoint; no-store + noindex headers on every resolver response including early 404s. Authenticated management: claim/rename/delete handle, add/import/generate/enable/delete keys, and a per-user CA (create/rotate/delete) with pure-Node OpenSSH certificate issuance. Audit logging on all mutations; UNIQUE races map to a precise 409. Unit tests for key parsing and certificate signing (ssh-keygen-validated). * feat(ssh-id): frontend panel, API client and i18n SSH ID panel wired into the app rail and AppShell: claim handle, resolver URL + curl one-liner, key list, generate, paste/import, CA enable/rotate/remove with server trust command, and per-key certificate issuance. API client re-exported through main-axios.ts; all strings i18n'd. * style(ssh-id): align panel and resolver page with Termix theme - Rebuild the SSH ID sidebar panel with the theme's square components (SectionCard / SettingRow / FakeSwitch) instead of rounded ad-hoc cards; use accent-brand and destructive tokens rather than raw red/green. - Fix panel scrolling: move overflow to a block scroll container so the cards keep their natural height instead of being clipped. - Restyle the public resolver HTML page (/sshid/u/:handle) to the Termix dark theme: square corners, #18181b/#303032 palette, #f59145 accent, uppercase section labels. - Tidy copy: 'Save To Credentials' label, drop the redundant generate intro, and correct the generate tooltip (the key is stored when saving to vault). * feat: rename to Termix ID, improve UI, backend inconsistencies, and general bug fixes --------- Co-authored-by: LukeGus <bugattiguy527@gmail.com> * ci(deps): bump actions/checkout from 6 to 7 in the github-actions group (#922) Bumps the github-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 6 to 7 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump the dev-patch-updates group with 11 updates (#923) Bumps the dev-patch-updates group with 11 updates: | Package | From | To | | --- | --- | --- | | [@codemirror/search](https://github.com/codemirror/search) | `6.7.0` | `6.7.1` | | [@codemirror/view](https://github.com/codemirror/view) | `6.43.0` | `6.43.1` | | [@tailwindcss/vite](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite) | `4.3.0` | `4.3.1` | | [@vitest/coverage-v8](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-v8) | `4.1.8` | `4.1.9` | | [@vitest/ui](https://github.com/vitest-dev/vitest/tree/HEAD/packages/ui) | `4.1.8` | `4.1.9` | | [eslint-plugin-react-refresh](https://github.com/ArnaudBarre/eslint-plugin-react-refresh) | `0.5.2` | `0.5.3` | | [lint-staged](https://github.com/lint-staged/lint-staged) | `17.0.7` | `17.0.8` | | [prettier](https://github.com/prettier/prettier) | `3.8.3` | `3.8.4` | | [sharp](https://github.com/lovell/sharp) | `0.35.1` | `0.35.2` | | [tailwindcss](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/tailwindcss) | `4.3.0` | `4.3.1` | | [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) | `4.1.8` | `4.1.9` | Updates `@codemirror/search` from 6.7.0 to 6.7.1 - [Changelog](https://github.com/codemirror/search/blob/main/CHANGELOG.md) - [Commits](https://github.com/codemirror/search/commits) Updates `@codemirror/view` from 6.43.0 to 6.43.1 - [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md) - [Commits](https://github.com/codemirror/view/commits) Updates `@tailwindcss/vite` from 4.3.0 to 4.3.1 - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.3.1/packages/@tailwindcss-vite) Updates `@vitest/coverage-v8` from 4.1.8 to 4.1.9 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md) - [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.9/packages/coverage-v8) Updates `@vitest/ui` from 4.1.8 to 4.1.9 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md) - [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.9/packages/ui) Updates `eslint-plugin-react-refresh` from 0.5.2 to 0.5.3 - [Release notes](https://github.com/ArnaudBarre/eslint-plugin-react-refresh/releases) - [Changelog](https://github.com/ArnaudBarre/eslint-plugin-react-refresh/blob/main/CHANGELOG.md) - [Commits](https://github.com/ArnaudBarre/eslint-plugin-react-refresh/compare/v0.5.2...v0.5.3) Updates `lint-staged` from 17.0.7 to 17.0.8 - [Release notes](https://github.com/lint-staged/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/main/CHANGELOG.md) - [Commits](https://github.com/lint-staged/lint-staged/compare/v17.0.7...v17.0.8) Updates `prettier` from 3.8.3 to 3.8.4 - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.8.3...3.8.4) Updates `sharp` from 0.35.1 to 0.35.2 - [Release notes](https://github.com/lovell/sharp/releases) - [Commits](https://github.com/lovell/sharp/compare/v0.35.1...v0.35.2) Updates `tailwindcss` from 4.3.0 to 4.3.1 - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.3.1/packages/tailwindcss) Updates `vitest` from 4.1.8 to 4.1.9 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md) - [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.9/packages/vitest) --- updated-dependencies: - dependency-name: "@codemirror/search" dependency-version: 6.7.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: "@codemirror/view" dependency-version: 6.43.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: "@tailwindcss/vite" dependency-version: 4.3.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: "@vitest/coverage-v8" dependency-version: 4.1.9 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: "@vitest/ui" dependency-version: 4.1.9 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: eslint-plugin-react-refresh dependency-version: 0.5.3 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: lint-staged dependency-version: 17.0.8 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: prettier dependency-version: 3.8.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: sharp dependency-version: 0.35.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: tailwindcss dependency-version: 4.3.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates - dependency-name: vitest dependency-version: 4.1.9 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-patch-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump nanoid in the prod-patch-updates group (#925) Bumps the prod-patch-updates group with 1 update: [nanoid](https://github.com/ai/nanoid). Updates `nanoid` from 5.1.11 to 5.1.15 - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/5.1.11...5.1.15) --- updated-dependencies: - dependency-name: nanoid dependency-version: 5.1.15 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-patch-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump the major-updates group with 5 updates (#926) Bumps the major-updates group with 5 updates: | Package | From | To | | --- | --- | --- | | [js-yaml](https://github.com/nodeca/js-yaml) | `4.2.0` | `5.0.0` | | [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) | `9.39.4` | `10.0.1` | | [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `25.9.2` | `26.0.0` | | [concurrently](https://github.com/open-cli-tools/concurrently) | `9.2.1` | `10.0.3` | | [eslint](https://github.com/eslint/eslint) | `9.39.4` | `10.5.0` | Updates `js-yaml` from 4.2.0 to 5.0.0 - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/4.2.0...5.0.0) Updates `@eslint/js` from 9.39.4 to 10.0.1 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/commits/v10.0.1/packages/js) Updates `@types/node` from 25.9.2 to 26.0.0 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Updates `concurrently` from 9.2.1 to 10.0.3 - [Release notes](https://github.com/open-cli-tools/concurrently/releases) - [Commits](https://github.com/open-cli-tools/concurrently/compare/v9.2.1...v10.0.3) Updates `eslint` from 9.39.4 to 10.5.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/compare/v9.39.4...v10.5.0) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major-updates - dependency-name: "@eslint/js" dependency-version: 10.0.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major-updates - dependency-name: "@types/node" dependency-version: 26.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major-updates - dependency-name: concurrently dependency-version: 10.0.3 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major-updates - dependency-name: eslint dependency-version: 10.5.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat(ssh): add HashiCorp Vault SSH signer authentication * fix: small fixes to vault feature to align with Termix codebase * chore: add view docs links for vault/termix id * fix: file upload fails with 400 and missing schema migrations on upgrade (#929) Two bugs introduced in v2.4.1: 1. uploadFileStream uses fileManagerApi.post() which triggers axios's transformRequest to JSON-serialize the FormData because the instance default Content-Type is application/json. Change to postForm() which sets Content-Type: multipart/form-data so the browser XHR sends the correct multipart body with boundary. 2. Two schema items added to schema.ts were not included in migrateSchema() in db/index.ts, causing 500 errors on existing installations upgrading from v2.4.0: - user_preferences.status_color_scheme (no such column) - dashboard_service_links table (no such table) Fixes #928 Co-authored-by: sash <sash@fominykh.io> * fix: support PuTTY PPK ssh keys (#930) * fix: chunk large file manager uploads (#932) * fix: route dashboard hosts by protocol (#934) * fix: resolve tunnel endpoints reliably (#935) * Fix Electron OIDC browser auth failures (#936) * Allow RDP connections without stored credentials (#937) * Sync role credential shares for OIDC users (#938) * Fix terminal link dialog layering (#940) * Confirm large files before opening editor (#942) * Confirm closing active host connections (#943) * Preserve file path case in file manager UI (#941) * fix: preserve unicode guacamole tokens (#933) * Persist VNC authentication settings (#944) * Fix Guacamole websocket base path (#946) * Promote file manager terminals to tabs (#939) * Guard Guacamole disconnect during startup (#945) * chore: increment ver * feat: bitwarden ssh agent integration * feat: serial connections support * fix: various small bug fixes * feat: open all sessions in a folder and terminal custom theme color support * feat: cross host file manager clipboard and several small bug fixes * feat: tailscale/wireguard support and added a new status state for when backend is checking status * feat: grafana like server stats history, new alert system, ntfy/webhook support * feat: new grid and widget based homepage function * feat: new donate button in dashboard * fix: alert ui incorrectly using termix css and fixed issue with alert system not loading * chore: fix ci checks (#966) * Fix dashboard service link creation (#950) * Fix jump host SOCKS5 proxy selection (#951) * Fix jump host SOCKS5 proxy selection * fix: type jump host socks proxy config * Fix tmux detection path handling (#949) * Support GUACD_URL environment config (#952) * Retry autostart tunnel host fetches (#953) * Retry autostart tunnel host fetches * chore: format tunnel route * Fix PUID html ownership in Docker entrypoint (#954) * feat: allow custom tunnel endpoints (#977) * fix: skip metrics start for non-ssh hosts (#976) * Fix Proxmox import auth fallback (#956) * Fix Proxmox import auth fallback * chore: format proxmox import auth * Fix SSH heading syntax highlighting (#955) * Fix SSH heading syntax highlighting * chore: format terminal highlighter * Initialize auth before fullscreen terminal routes (#957) * Add WebAuthn passkey authentication (#959) * chore: add Biome tooling (#965) * chore: add biome tooling * chore: support tailwind syntax in biome * Fix VNC required argument handshake (#968) * Prioritize host results in command palette search (#969) * Prevent sidebar host hover layout shift (#970) * Add terminal font zoom with mouse wheel (#971) * Add host temperature metrics card (#972) * Make file downloads reliable in desktop app (#973) * Add app rail hover expansion setting (#974) * fix: use correct translation key for nav.close (#964) * fix(tunnel): skip endpoint credential validation for direct tunnels (#963) * fix: SSH port connection bug (#975) * fix: chunked upload for files >=1.5GB to bypass browser ArrayBuffer limit (#948) * feat: support SSH agent auth across SSH features (#960) * feat: add Podman container runtime support (#958) * chore: update readme and release notes * fix: stabilize Windows app icon (#978) * Add safe host sharing export (#979) * Add external editor support for file manager (#985) * Rework SSH credential password handling (#984) * Support password fallback for SSH key credentials * Complete SSH credential password fallback * Fix runtime base path for auth callbacks (#982) * Fix TUI terminal output highlighting (#983) Co-authored-by: LukeGus <bugattiguy527@gmail.com> * Add app fullscreen mode (#993) * Fix host metrics startup polling (#986) * chore: update release notes * fix: line chart text overlap * chore: update RELEASE_NOTES.md * chore: add donation goal to readme * chore: update readme * fix: hide full-screen button in electron app * fix: failed unit tests * chore: lint, format, and bump version to 2.5.0 * chore: remove timeout from crowdin translate * chore: sync Crowdin translations for 2.5.0 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: DivByZero <mr.oplus@yahoo.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: devdanetra <46488477+devdanetra@users.noreply.github.com> Co-authored-by: Aleksandr Fominykh <neoformalex@users.noreply.github.com> Co-authored-by: sash <sash@fominykh.io> Co-authored-by: ZacharyZcR <zacharyzcr1984@gmail.com>
427 lines
12 KiB
TypeScript
427 lines
12 KiB
TypeScript
const ANSI = {
|
|
reset: "\x1b[0m",
|
|
red: "\x1b[31m",
|
|
green: "\x1b[32m",
|
|
yellow: "\x1b[33m",
|
|
blue: "\x1b[34m",
|
|
magenta: "\x1b[35m",
|
|
cyan: "\x1b[36m",
|
|
brightBlack: "\x1b[90m",
|
|
brightRed: "\x1b[91m",
|
|
brightGreen: "\x1b[92m",
|
|
brightYellow: "\x1b[93m",
|
|
brightBlue: "\x1b[94m",
|
|
brightCyan: "\x1b[96m",
|
|
bold: "\x1b[1m",
|
|
underline: "\x1b[4m",
|
|
} as const;
|
|
|
|
export interface SyntaxHighlightOptions {
|
|
logLevels?: boolean;
|
|
paths?: boolean;
|
|
timestamps?: boolean;
|
|
ipAddresses?: boolean;
|
|
urls?: boolean;
|
|
numbers?: boolean;
|
|
}
|
|
|
|
interface HighlightPattern {
|
|
name: string;
|
|
regex: RegExp;
|
|
ansiCode: string;
|
|
priority: number;
|
|
category: keyof SyntaxHighlightOptions;
|
|
}
|
|
|
|
interface MatchResult {
|
|
start: number;
|
|
end: number;
|
|
ansiCode: string;
|
|
priority: number;
|
|
// capture group offset: some patterns capture a sub-group rather than whole match
|
|
captureStart?: number;
|
|
captureEnd?: number;
|
|
}
|
|
|
|
interface TextSegment {
|
|
isAnsi: boolean;
|
|
content: string;
|
|
// the last active SGR code before this segment (for state restoration)
|
|
activeSgr?: string;
|
|
}
|
|
|
|
interface ProtectedRange {
|
|
start: number;
|
|
end: number;
|
|
}
|
|
|
|
const MAX_LINE_LENGTH = 2000;
|
|
|
|
// Cursor-positioning, erase, and private mode sequences used by TUI apps
|
|
// (mc, nano, vim, htop). If a chunk contains these, highlighting can inject
|
|
// extra SGR bytes into a full-screen redraw and corrupt xterm's cursor state.
|
|
const TUI_SEQUENCE = /\x1b\[(?:[\d;]*[ABCDEFGHJKST]|\?[\d;]*[hl])/;
|
|
|
|
// A bare \r (not immediately followed by \n) means the terminal is overwriting
|
|
// the current line (shell prompts, progress bars). Highlighting mid-rewrite
|
|
// chunks corrupts the cursor state, so we skip the whole chunk.
|
|
const MID_LINE_CR = /\r(?!\n)/;
|
|
|
|
// Detects shell prompt lines (user@host:/path$ or similar) after stripping ANSI.
|
|
// These should not be highlighted — the server already colored them, and injecting
|
|
// additional ANSI codes into the prompt fragments causes display corruption.
|
|
const STRIP_ANSI_RE = /\x1b(?:[@-Z\\-_]|\[[0-9;?>=!]*[@-~])/g;
|
|
const SSH_BRACKET_HEADING_RE =
|
|
/(?:(?<=^)|(?<=\s))\[[\w.-]+@[\w.-]+(?:[^\]\r\n]*)?\]/g;
|
|
|
|
function isShellPromptLine(bare: string): boolean {
|
|
const plain = bare.replace(STRIP_ANSI_RE, "");
|
|
// Matches a trailing prompt: "user@host:~$ ", "root@pi:/home/pi# ", "[user@host dir]$ "
|
|
if (/(?:[\w.-]+@[\w.-]+|[\w.-]+).*?[$#%>]\s*$/.test(plain)) return true;
|
|
// Matches a leading prompt followed by a command: "user@host:/path$ cmd arg"
|
|
// This is the echoed command line — the shell colors the prompt prefix itself,
|
|
// so injecting extra ANSI codes into it causes visual corruption / doubled paths.
|
|
if (/^(?:\[?[\w.-]+@[\w.-]+[\w./ ~-]*\]?|[\w.-]+).*?[$#%>]\s+\S/.test(plain))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
// Matches any complete ANSI escape sequence
|
|
const ANSI_REGEX = /\x1b(?:[@-Z\\-_]|\[[0-9;?>=!]*[@-~])/g;
|
|
|
|
// Matches SGR sequences (color/style setters) specifically — used to track active color state
|
|
const SGR_REGEX = /\x1b\[[0-9;]*m/;
|
|
|
|
// All patterns, ordered roughly by specificity. Priority determines which wins on overlap.
|
|
const ALL_PATTERNS: HighlightPattern[] = [
|
|
// IPv4 with optional :port — well-bounded, very specific
|
|
{
|
|
name: "ipv4",
|
|
regex:
|
|
/(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(?::\d{1,5})?/g,
|
|
ansiCode: ANSI.magenta,
|
|
priority: 10,
|
|
category: "ipAddresses",
|
|
},
|
|
|
|
// Bracket timestamps [HH:MM] or [HH:MM:SS] — tight range checks prevent false positives
|
|
{
|
|
name: "timestamp-bracket",
|
|
regex: /\[(?:[01]\d|2[0-3]):[0-5]\d(?::[0-5]\d)?\]/g,
|
|
ansiCode: ANSI.brightBlack,
|
|
priority: 9,
|
|
category: "timestamps",
|
|
},
|
|
|
|
// ISO 8601 date with optional time. Require non-digit before to avoid matching
|
|
// inside version strings like "1.2024.3". The \b on the right ensures we don't
|
|
// match partial tokens.
|
|
{
|
|
name: "timestamp-iso",
|
|
regex:
|
|
/(?<![0-9])\b\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\d|3[01])(?:[T ]\d{2}:\d{2}(?::\d{2})?(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?)?\b/g,
|
|
ansiCode: ANSI.brightBlack,
|
|
priority: 9,
|
|
category: "timestamps",
|
|
},
|
|
|
|
// Error-level keywords — case-insensitive, catches "Error", "error", "FAILED", etc.
|
|
{
|
|
name: "log-error",
|
|
regex:
|
|
/\b(?:error|fatal|critical|fail(?:ed)?|denied|exception)\b|\[(?:error|fatal|critical)\]/gi,
|
|
ansiCode: ANSI.brightRed,
|
|
priority: 9,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// Warning-level keywords — case-insensitive
|
|
{
|
|
name: "log-warn",
|
|
regex: /\b(?:warn(?:ing)?|alert|caution)\b|\[warn(?:ing)?\]/gi,
|
|
ansiCode: ANSI.brightYellow,
|
|
priority: 9,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// Success keywords — kept conservative to avoid noise.
|
|
// Negative lookahead prevents matching when directly followed by a path separator
|
|
// (e.g. shell `cd` output that prints "success~/new/dir").
|
|
{
|
|
name: "log-success",
|
|
regex:
|
|
/\b(?:success(?:ful(?:ly)?)?|pass(?:ed)?|complete(?:d)?|ok\b)\b(?![\\/~])/gi,
|
|
ansiCode: ANSI.brightGreen,
|
|
priority: 8,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// URLs — blue + underline
|
|
{
|
|
name: "url",
|
|
regex: /https?:\/\/[^\s\])}>"']+/g,
|
|
ansiCode: `${ANSI.blue}${ANSI.underline}`,
|
|
priority: 8,
|
|
category: "urls",
|
|
},
|
|
|
|
// Absolute paths — permissive character class that allows *, ?, [], globs, etc.
|
|
// Requires at least one slash after the root segment so we don't match bare /dev or /tmp.
|
|
// Boundary: must start at beginning of text or after whitespace/colon/comma/paren.
|
|
{
|
|
name: "path-absolute",
|
|
regex:
|
|
/(?:(?<=^)|(?<=[\s:,;('"]))\/[^\s"'`|<>&;\\]+(?:\/[^\s"'`|<>&;\\]+)+/g,
|
|
ansiCode: ANSI.cyan,
|
|
priority: 7,
|
|
category: "paths",
|
|
},
|
|
|
|
// Home-relative paths
|
|
{
|
|
name: "path-home",
|
|
regex: /~\/[^\s"'`|<>&;(){}[\]\\]+/g,
|
|
ansiCode: ANSI.cyan,
|
|
priority: 7,
|
|
category: "paths",
|
|
},
|
|
|
|
// Info keyword
|
|
{
|
|
name: "log-info",
|
|
regex: /\binfo\b|\[info\]/gi,
|
|
ansiCode: ANSI.blue,
|
|
priority: 6,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// Debug/trace
|
|
{
|
|
name: "log-debug",
|
|
regex: /\b(?:debug|trace|verbose)\b|\[(?:debug|trace)\]/gi,
|
|
ansiCode: ANSI.brightBlack,
|
|
priority: 6,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// Labeled numbers: port 8080, exit 1, code 127, status 404, signal 9, returned 0
|
|
// Captures just the number portion so only the digit is highlighted.
|
|
{
|
|
name: "number-labeled",
|
|
regex: /\b(?:port|exit|code|status|signal|returned?)\s+(\d+)\b/gi,
|
|
ansiCode: ANSI.brightCyan,
|
|
priority: 5,
|
|
category: "numbers",
|
|
},
|
|
];
|
|
|
|
function hasIncompleteAnsiSequence(text: string): boolean {
|
|
return /\x1b\[[0-9;?>=!]*$/.test(text);
|
|
}
|
|
|
|
function parseAnsiSegments(text: string): TextSegment[] {
|
|
const segments: TextSegment[] = [];
|
|
ANSI_REGEX.lastIndex = 0;
|
|
let lastIndex = 0;
|
|
let activeSgr = "";
|
|
let match;
|
|
|
|
while ((match = ANSI_REGEX.exec(text)) !== null) {
|
|
if (match.index > lastIndex) {
|
|
segments.push({
|
|
isAnsi: false,
|
|
content: text.slice(lastIndex, match.index),
|
|
activeSgr,
|
|
});
|
|
}
|
|
const seq = match[0];
|
|
segments.push({ isAnsi: true, content: seq });
|
|
// Track the active SGR state so we can restore it after a highlight reset
|
|
if (SGR_REGEX.test(seq)) {
|
|
activeSgr = seq === ANSI.reset ? "" : seq;
|
|
}
|
|
lastIndex = ANSI_REGEX.lastIndex;
|
|
}
|
|
|
|
if (lastIndex < text.length) {
|
|
segments.push({ isAnsi: false, content: text.slice(lastIndex), activeSgr });
|
|
}
|
|
|
|
return segments;
|
|
}
|
|
|
|
function highlightPlainText(
|
|
text: string,
|
|
activePatterns: HighlightPattern[],
|
|
activeSgr: string,
|
|
): string {
|
|
if (text.length > MAX_LINE_LENGTH || !text.trim()) return text;
|
|
|
|
const matches: MatchResult[] = [];
|
|
const protectedRanges = getProtectedRanges(text);
|
|
|
|
for (const pattern of activePatterns) {
|
|
pattern.regex.lastIndex = 0;
|
|
let m;
|
|
while ((m = pattern.regex.exec(text)) !== null) {
|
|
// For patterns with a capture group (labeled numbers), highlight only the capture
|
|
if (m[1] !== undefined) {
|
|
const captureOffset = m[0].indexOf(m[1], m[0].search(/\d/));
|
|
const captureStart = m.index + captureOffset;
|
|
const captureEnd = captureStart + m[1].length;
|
|
if (isProtectedRange(captureStart, captureEnd, protectedRanges)) {
|
|
continue;
|
|
}
|
|
matches.push({
|
|
start: m.index,
|
|
end: m.index + m[0].length,
|
|
ansiCode: pattern.ansiCode,
|
|
priority: pattern.priority,
|
|
captureStart,
|
|
captureEnd,
|
|
});
|
|
} else {
|
|
if (isProtectedRange(m.index, m.index + m[0].length, protectedRanges)) {
|
|
continue;
|
|
}
|
|
matches.push({
|
|
start: m.index,
|
|
end: m.index + m[0].length,
|
|
ansiCode: pattern.ansiCode,
|
|
priority: pattern.priority,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
if (matches.length === 0) return text;
|
|
|
|
// Highest priority wins; ties broken by earlier start position
|
|
matches.sort((a, b) =>
|
|
a.priority !== b.priority ? b.priority - a.priority : a.start - b.start,
|
|
);
|
|
|
|
const used: Array<{ start: number; end: number }> = [];
|
|
const final = matches.filter((m) => {
|
|
const overlaps = used.some(
|
|
(r) =>
|
|
(m.start >= r.start && m.start < r.end) ||
|
|
(m.end > r.start && m.end <= r.end) ||
|
|
(m.start <= r.start && m.end >= r.end),
|
|
);
|
|
if (!overlaps) {
|
|
used.push({ start: m.start, end: m.end });
|
|
return true;
|
|
}
|
|
return false;
|
|
});
|
|
|
|
// Apply in reverse order so indices stay valid as we insert escape codes
|
|
final.sort((a, b) => a.start - b.start).reverse();
|
|
|
|
let result = text;
|
|
for (const m of final) {
|
|
const hs = m.captureStart ?? m.start;
|
|
const he = m.captureEnd ?? m.end;
|
|
|
|
// After reset, re-emit the SGR that was active before this plain-text segment
|
|
// so we don't clobber colors set by the server earlier in the line.
|
|
const restore = activeSgr || "";
|
|
result =
|
|
result.slice(0, hs) +
|
|
m.ansiCode +
|
|
result.slice(hs, he) +
|
|
ANSI.reset +
|
|
restore +
|
|
result.slice(he);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
function getProtectedRanges(text: string): ProtectedRange[] {
|
|
const ranges: ProtectedRange[] = [];
|
|
SSH_BRACKET_HEADING_RE.lastIndex = 0;
|
|
|
|
let match;
|
|
while ((match = SSH_BRACKET_HEADING_RE.exec(text)) !== null) {
|
|
ranges.push({
|
|
start: match.index,
|
|
end: match.index + match[0].length,
|
|
});
|
|
}
|
|
|
|
return ranges;
|
|
}
|
|
|
|
function isProtectedRange(
|
|
start: number,
|
|
end: number,
|
|
ranges: ProtectedRange[],
|
|
): boolean {
|
|
return ranges.some((range) => start < range.end && end > range.start);
|
|
}
|
|
|
|
function buildActivePatterns(
|
|
options: SyntaxHighlightOptions,
|
|
): HighlightPattern[] {
|
|
return ALL_PATTERNS.filter((p) => options[p.category] !== false);
|
|
}
|
|
|
|
function highlightLine(
|
|
line: string,
|
|
activePatterns: HighlightPattern[],
|
|
): string {
|
|
const cr = line.endsWith("\r");
|
|
const bare = cr ? line.slice(0, -1) : line;
|
|
|
|
if (!bare.trim()) return line;
|
|
if (isShellPromptLine(bare)) return line;
|
|
|
|
const segments = parseAnsiSegments(bare);
|
|
const result = segments
|
|
.map((s) =>
|
|
s.isAnsi
|
|
? s.content
|
|
: highlightPlainText(s.content, activePatterns, s.activeSgr ?? ""),
|
|
)
|
|
.join("");
|
|
|
|
return cr ? result + "\r" : result;
|
|
}
|
|
|
|
export function highlightTerminalOutput(
|
|
text: string,
|
|
options: SyntaxHighlightOptions = {},
|
|
): string {
|
|
if (!text || !text.trim()) return text;
|
|
if (hasIncompleteAnsiSequence(text)) return text;
|
|
|
|
if (TUI_SEQUENCE.test(text)) return text;
|
|
if (MID_LINE_CR.test(text)) return text;
|
|
|
|
const activePatterns = buildActivePatterns(options);
|
|
if (activePatterns.length === 0) return text;
|
|
|
|
const lines = text.split("\n");
|
|
const endsWithNewline = text.endsWith("\n");
|
|
const hasMultipleLines = lines.length > 1;
|
|
|
|
// When a multi-line chunk has a trailing fragment without \n, that fragment
|
|
// could be a live readline input line that bash will redraw with \r +
|
|
// cursor-positioning sequences. Injecting ANSI bytes into it adds invisible
|
|
// chars that bash doesn't count, so bash's cursor arithmetic diverges from
|
|
// xterm's actual column position — causing the cursor to jump and text to
|
|
// shift when the user types or navigates with arrow keys.
|
|
// Only skip the last fragment when the chunk already has complete lines
|
|
// before it (single-line chunks with no \n are plain output, not input).
|
|
const highlightCount =
|
|
hasMultipleLines && !endsWithNewline ? lines.length - 1 : lines.length;
|
|
|
|
return lines
|
|
.map((line, i) =>
|
|
i < highlightCount ? highlightLine(line, activePatterns) : line,
|
|
)
|
|
.join("\n");
|
|
}
|