andy/nexus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix clipboard on OSX, build-all and unicode support

Browse Source
This commit is contained in:
Andy Dixon
2026-04-20 12:49:24 +01:00
parent f5aa35ac27
commit 1d97e907e0
10 changed files with 370 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/index.html
+1
View File
@@ -193,6 +193,7 @@
<script src="/src/js/lib/xterm.min.js"></script>
<script src="/src/js/lib/xterm-addon-fit.min.js"></script>
<script src="/src/js/lib/xterm-addon-search.min.js"></script>
<script src="/src/js/lib/xterm-addon-unicode11.min.js"></script>
<script src="/src/js/lib/xterm-addon-web-links.min.js"></script>
<!-- Application scripts (loaded in dependency order) -->
frontend/package-lock.json
Generated
+11
View File
@@ -12,6 +12,7 @@
"xterm": "5.3.0",
"xterm-addon-fit": "0.8.0",
"xterm-addon-search": "0.13.0",
"xterm-addon-unicode11": "0.6.0",
"xterm-addon-web-links": "0.9.0"
}
},
@@ -42,6 +43,16 @@
"xterm": "^5.0.0"
}
},
"node_modules/xterm-addon-unicode11": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/xterm-addon-unicode11/-/xterm-addon-unicode11-0.6.0.tgz",
"integrity": "sha512-5pkb8YoS/deRtNqQRw8t640mu+Ga8B2MG3RXGQu0bwgcfr8XiXIRI880TWM49ICAHhTmnOLPzIIBIjEnCq7k2A==",
"deprecated": "This package is now deprecated. Move to @xterm/addon-unicode11 instead.",
"license": "MIT",
"peerDependencies": {
"xterm": "^5.0.0"
}
},
"node_modules/xterm-addon-web-links": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/xterm-addon-web-links/-/xterm-addon-web-links-0.9.0.tgz",
frontend/package.json
+1
View File
@@ -13,6 +13,7 @@
"xterm": "5.3.0",
"xterm-addon-fit": "0.8.0",
"xterm-addon-search": "0.13.0",
"xterm-addon-unicode11": "0.6.0",
"xterm-addon-web-links": "0.9.0"
}
}
frontend/package.json.md5
+1 -1
View File
@@ -1 +1 @@
a25ea4f4df93e50eb6c41092b5187a9d
ce0d75b28075a7688ba4535c94b4784c
frontend/scripts/copy-assets.js
+4
View File
@@ -29,6 +29,10 @@ const assets = [
src: 'xterm-addon-search/lib/xterm-addon-search.js',
dest: 'src/js/lib/xterm-addon-search.min.js',
},
{
src: 'xterm-addon-unicode11/lib/xterm-addon-unicode11.js',
dest: 'src/js/lib/xterm-addon-unicode11.min.js',
},
{
src: 'xterm-addon-web-links/lib/xterm-addon-web-links.js',
dest: 'src/js/lib/xterm-addon-web-links.min.js',
frontend/src/js/app.js
+71
View File
@@ -483,6 +483,23 @@ class App {
return;
}
const existingSessions = this.state.getAllSessions().filter((session) => {
if (session.profileId !== profileId) return false;
return session.state === 'connected' || session.state === 'connecting' || session.state === 'reconnecting';
});
if (existingSessions.length > 0) {
const preferred = existingSessions.find((s) => s.id === this.state.activeSessionId) || existingSessions[0];
const decision = await this._confirmReuseSession(profile, preferred);
if (decision === 'existing') {
this.tabs.setActive(preferred.id);
if (preferred.protocol !== 'raw' && preferred.protocol !== 'github') {
this.terminals.focusTerminal(preferred.id);
}
return;
}
if (decision !== 'new') return;
}
try {
const sessionInfo = await window.go.api.Service.ConnectSession(profileId);
this.state.addSession(sessionInfo);
@@ -628,6 +645,60 @@ class App {
}
}
/**
* Prompts to reuse an existing session for a profile.
* @param {Object} profile
* @param {Object} session
* @returns {Promise<'existing'|'new'|null>}
* @private
*/
_confirmReuseSession(profile, session) {
const createElement = window.NexusTerminal.createElement;
const label = (profile.displayName || profile.host || 'Untitled').trim();
const stateLabel = session.state === 'connected' ? 'connected' : 'connecting';
return new Promise((resolve) => {
const backdrop = createElement('div', 'modal-backdrop');
const modal = createElement('div', 'modal modal-sm');
modal.innerHTML = `
<div class="modal-header">
<h3 class="modal-title">Connection Already Open</h3>
<button class="btn btn-icon btn-xs modal-close">&times;</button>
</div>
<div class="modal-body">
<p style="font-size:var(--text-sm);color:var(--text-secondary)">
<strong>${label}</strong> is already ${stateLabel}.
Do you want to use the existing session or open a new one?
</p>
</div>
<div class="modal-footer">
<button class="btn btn-sm confirm-cancel">Cancel</button>
<button class="btn btn-sm confirm-new">New Connection</button>
<button class="btn btn-sm btn-primary confirm-ok">Use Existing</button>
</div>
`;
backdrop.appendChild(modal);
document.body.appendChild(backdrop);
requestAnimationFrame(() => {
backdrop.classList.add('is-visible');
modal.classList.add('is-visible');
});
const close = (val) => {
backdrop.classList.remove('is-visible');
modal.classList.remove('is-visible');
setTimeout(() => backdrop.remove(), 200);
resolve(val);
};
modal.querySelector('.modal-close').addEventListener('click', () => close(null));
modal.querySelector('.confirm-cancel').addEventListener('click', () => close(null));
modal.querySelector('.confirm-ok').addEventListener('click', () => close('existing'));
modal.querySelector('.confirm-new').addEventListener('click', () => close('new'));
backdrop.addEventListener('click', (e) => { if (e.target === backdrop) close(null); });
});
}
// ── Import / Export ──────────────────────────────────────────────
/**
frontend/src/js/terminal.js
+26 -2
View File
@@ -5,7 +5,7 @@
* Handles data routing, resizing, and search.
*/
/* global Terminal, FitAddon, SearchAddon, WebLinksAddon */
/* global Terminal, FitAddon, SearchAddon, WebLinksAddon, Unicode11Addon */
class TerminalManager {
/**
@@ -36,7 +36,7 @@ class TerminalManager {
const themeName = (this.app.state.preferences || {}).terminalTheme || 'charcoal';
const term = new Terminal({
theme: window.NexusTerminal.getTerminalTheme(themeName),
fontFamily: profile.terminalFontFamily || 'JetBrains Mono, Menlo, Monaco, Consolas, monospace',
fontFamily: profile.terminalFontFamily || 'JetBrains Mono, Menlo, Monaco, Consolas, "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", monospace',
fontSize: profile.terminalFontSize || 14,
scrollback: profile.terminalScrollback || 10000,
cursorStyle: profile.terminalCursorStyle || 'block',
@@ -50,10 +50,19 @@ class TerminalManager {
const fitAddon = new FitAddon.FitAddon();
const searchAddon = new SearchAddon.SearchAddon();
let webLinksAddon = null;
let unicode11Addon = null;
term.loadAddon(fitAddon);
term.loadAddon(searchAddon);
try {
unicode11Addon = new Unicode11Addon.Unicode11Addon();
term.loadAddon(unicode11Addon);
term.unicode.activeVersion = '11';
} catch (_) {
// Unicode 11 addon is optional; fall back to default unicode handling.
}
// WebLinksAddon may not always be available
try {
webLinksAddon = new WebLinksAddon.WebLinksAddon((_event, uri) => {
@@ -68,6 +77,19 @@ class TerminalManager {
const container = document.getElementById(containerId);
term.open(container);
let suppressPasteEvent = false;
const attachPasteGuard = () => {
const inputEl = term.textarea || container.querySelector('textarea');
if (!inputEl) return;
inputEl.addEventListener('paste', (e) => {
if (!suppressPasteEvent) return;
e.preventDefault();
e.stopPropagation();
suppressPasteEvent = false;
});
};
attachPasteGuard();
// Right-click context menu on the terminal viewport
const termEl = container.querySelector('.xterm');
if (termEl) {
@@ -131,6 +153,8 @@ class TerminalManager {
// Cmd/Ctrl+V — paste from clipboard
if (mod && e.key === 'v' && e.type === 'keydown') {
suppressPasteEvent = true;
setTimeout(() => { suppressPasteEvent = false; }, 250);
if (window.runtime && window.runtime.ClipboardGetText) {
window.runtime.ClipboardGetText().then(function(text) {
if (text) term.paste(text);