mirror of
https://github.com/EthanShoeDev/fressh.git
synced 2026-01-11 14:22:51 +00:00
sorta working but bad init
This commit is contained in:
@@ -19,6 +19,9 @@ export default function TabsShellDetail() {
|
|||||||
|
|
||||||
function ShellDetail() {
|
function ShellDetail() {
|
||||||
const xtermRef = useRef<XtermWebViewHandle>(null);
|
const xtermRef = useRef<XtermWebViewHandle>(null);
|
||||||
|
const terminalReadyRef = useRef(false); // gate for initial SSH output buffering
|
||||||
|
const pendingOutputRef = useRef<Uint8Array[]>([]); // bytes we got before xterm init
|
||||||
|
|
||||||
const { connectionId, channelId } = useLocalSearchParams<{
|
const { connectionId, channelId } = useLocalSearchParams<{
|
||||||
connectionId?: string;
|
connectionId?: string;
|
||||||
channelId?: string;
|
channelId?: string;
|
||||||
@@ -37,22 +40,28 @@ function ShellDetail() {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* SSH -> xterm (remote output)
|
* SSH -> xterm (remote output)
|
||||||
* Send bytes only; batching is handled inside XtermJsWebView.
|
* If xterm isn't ready yet, buffer and flush on 'initialized'.
|
||||||
*/
|
*/
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!connection) return;
|
if (!connection) return;
|
||||||
|
|
||||||
const xterm = xtermRef.current;
|
const xterm = xtermRef.current;
|
||||||
|
|
||||||
const listenerId = connection.addChannelListener((data: ArrayBuffer) => {
|
const listenerId = connection.addChannelListener((ab: ArrayBuffer) => {
|
||||||
// Forward bytes to terminal (no string conversion)
|
const bytes = new Uint8Array(ab);
|
||||||
const uInt8 = new Uint8Array(data);
|
if (!terminalReadyRef.current) {
|
||||||
xterm?.write(uInt8);
|
// Buffer until WebView->xterm has signaled 'initialized'
|
||||||
|
pendingOutputRef.current.push(bytes);
|
||||||
|
// Debug
|
||||||
|
console.log('SSH->buffer', { len: bytes.length });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Forward bytes immediately
|
||||||
|
console.log('SSH->xterm', { len: bytes.length });
|
||||||
|
xterm?.write(bytes);
|
||||||
});
|
});
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
connection.removeChannelListener(listenerId);
|
connection.removeChannelListener(listenerId);
|
||||||
// Flush any buffered writes on unmount
|
|
||||||
xterm?.flush?.();
|
xterm?.flush?.();
|
||||||
};
|
};
|
||||||
}, [connection]);
|
}, [connection]);
|
||||||
@@ -95,6 +104,7 @@ function ShellDetail() {
|
|||||||
<XtermJsWebView
|
<XtermJsWebView
|
||||||
ref={xtermRef}
|
ref={xtermRef}
|
||||||
style={{ flex: 1 }}
|
style={{ flex: 1 }}
|
||||||
|
// WebView controls that make terminals feel right:
|
||||||
keyboardDisplayRequiresUserAction={false}
|
keyboardDisplayRequiresUserAction={false}
|
||||||
setSupportMultipleWindows={false}
|
setSupportMultipleWindows={false}
|
||||||
overScrollMode="never"
|
overScrollMode="never"
|
||||||
@@ -106,35 +116,62 @@ function ShellDetail() {
|
|||||||
allowsLinkPreview={false}
|
allowsLinkPreview={false}
|
||||||
textInteractionEnabled={false}
|
textInteractionEnabled={false}
|
||||||
onRenderProcessGone={() => {
|
onRenderProcessGone={() => {
|
||||||
|
console.log('WebView render process gone, clearing terminal');
|
||||||
xtermRef.current?.clear?.();
|
xtermRef.current?.clear?.();
|
||||||
}}
|
}}
|
||||||
onContentProcessDidTerminate={() => {
|
onContentProcessDidTerminate={() => {
|
||||||
|
console.log(
|
||||||
|
'WKWebView content process terminated, clearing terminal',
|
||||||
|
);
|
||||||
xtermRef.current?.clear?.();
|
xtermRef.current?.clear?.();
|
||||||
}}
|
}}
|
||||||
// Optional: set initial theme/font
|
// xterm-flavored props for styling/behavior
|
||||||
|
fontFamily="Menlo, ui-monospace, monospace"
|
||||||
|
fontSize={15}
|
||||||
|
cursorBlink
|
||||||
|
scrollback={10000}
|
||||||
|
themeBackground={theme.colors.background}
|
||||||
|
themeForeground={theme.colors.textPrimary}
|
||||||
|
// page load => we can push initial options/theme right away;
|
||||||
|
// xterm itself will still send 'initialized' once it's truly ready.
|
||||||
onLoadEnd={() => {
|
onLoadEnd={() => {
|
||||||
// Set theme bg/fg and font settings once WebView loads; the page will
|
console.log('WebView onLoadEnd');
|
||||||
// still send 'initialized' after xterm is ready.
|
|
||||||
xtermRef.current?.setTheme?.(
|
|
||||||
theme.colors.background,
|
|
||||||
theme.colors.textPrimary,
|
|
||||||
);
|
|
||||||
xtermRef.current?.setFont?.('Menlo, ui-monospace, monospace', 50);
|
|
||||||
}}
|
}}
|
||||||
onMessage={(message) => {
|
onMessage={(m) => {
|
||||||
if (message.type === 'initialized') {
|
console.log('received msg', m);
|
||||||
// Terminal is ready; you could send a greeting or focus it
|
if (m.type === 'initialized') {
|
||||||
|
terminalReadyRef.current = true;
|
||||||
|
|
||||||
|
// Flush any buffered SSH output (welcome banners, etc.)
|
||||||
|
if (pendingOutputRef.current.length) {
|
||||||
|
const total = pendingOutputRef.current.reduce(
|
||||||
|
(n, a) => n + a.length,
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
console.log('Flushing buffered output', {
|
||||||
|
chunks: pendingOutputRef.current.length,
|
||||||
|
bytes: total,
|
||||||
|
});
|
||||||
|
for (const chunk of pendingOutputRef.current) {
|
||||||
|
xtermRef.current?.write(chunk);
|
||||||
|
}
|
||||||
|
pendingOutputRef.current = [];
|
||||||
|
xtermRef.current?.flush?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Focus after ready to pop the soft keyboard (iOS needs this prop)
|
||||||
xtermRef.current?.focus?.();
|
xtermRef.current?.focus?.();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (message.type === 'data') {
|
if (m.type === 'data') {
|
||||||
// xterm user input -> SSH
|
// xterm user input -> SSH
|
||||||
// NOTE: msg.data is a fresh Uint8Array starting at offset 0
|
// NOTE: msg.data is a fresh Uint8Array starting at offset 0
|
||||||
void shell?.sendData(message.data.buffer as ArrayBuffer);
|
console.log('xterm->SSH', { len: m.data.length });
|
||||||
|
void shell?.sendData(m.data.buffer as ArrayBuffer);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (message.type === 'debug') {
|
if (m.type === 'debug') {
|
||||||
console.log('xterm.debug', message.message);
|
console.log('xterm.debug', m.message);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ const root = document.getElementById('terminal')!;
|
|||||||
term.open(root);
|
term.open(root);
|
||||||
fitAddon.fit();
|
fitAddon.fit();
|
||||||
|
|
||||||
// Expose for debugging (optional)
|
// Expose for debugging (typed via vite-env.d.ts)
|
||||||
window.terminal = term;
|
window.terminal = term;
|
||||||
window.fitAddon = fitAddon;
|
window.fitAddon = fitAddon;
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@ const post = (msg: unknown) =>
|
|||||||
window.ReactNativeWebView?.postMessage?.(JSON.stringify(msg));
|
window.ReactNativeWebView?.postMessage?.(JSON.stringify(msg));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encode/decode helpers
|
* Encode helper
|
||||||
*/
|
*/
|
||||||
const enc = new TextEncoder();
|
const enc = new TextEncoder();
|
||||||
|
|
||||||
@@ -50,74 +50,123 @@ term.onData((data /* string */) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Message handler for RN -> WebView control/data
|
* RN -> WebView control/data
|
||||||
* We support: write, resize, setFont, setTheme, clear, focus
|
* Supported: write, resize, setFont, setTheme, setOptions, clear, focus
|
||||||
|
* NOTE: Never spread term.options (it contains cols/rows). Only set keys you intend.
|
||||||
*/
|
*/
|
||||||
window.addEventListener('message', (e: MessageEvent<string>) => {
|
window.addEventListener('message', (e: MessageEvent<string>) => {
|
||||||
try {
|
try {
|
||||||
const msg = JSON.parse(e.data);
|
const msg = JSON.parse(e.data) as
|
||||||
|
| { type: 'write'; b64?: string; chunks?: string[] }
|
||||||
|
| { type: 'resize'; cols?: number; rows?: number }
|
||||||
|
| { type: 'setFont'; family?: string; size?: number }
|
||||||
|
| { type: 'setTheme'; background?: string; foreground?: string }
|
||||||
|
| {
|
||||||
|
type: 'setOptions';
|
||||||
|
opts: Partial<{
|
||||||
|
cursorBlink: boolean;
|
||||||
|
scrollback: number;
|
||||||
|
fontFamily: string;
|
||||||
|
fontSize: number;
|
||||||
|
}>;
|
||||||
|
}
|
||||||
|
| { type: 'clear' }
|
||||||
|
| { type: 'focus' };
|
||||||
|
|
||||||
if (!msg || typeof msg.type !== 'string') return;
|
if (!msg || typeof msg.type !== 'string') return;
|
||||||
|
|
||||||
switch (msg.type) {
|
switch (msg.type) {
|
||||||
case 'write': {
|
case 'write': {
|
||||||
// Either a single b64 or an array of chunks
|
|
||||||
if (typeof msg.b64 === 'string') {
|
if (typeof msg.b64 === 'string') {
|
||||||
const bytes = Base64.toUint8Array(msg.b64);
|
const bytes = Base64.toUint8Array(msg.b64);
|
||||||
term.write(bytes);
|
term.write(bytes);
|
||||||
|
post({ type: 'debug', message: `write(bytes=${bytes.length})` });
|
||||||
} else if (Array.isArray(msg.chunks)) {
|
} else if (Array.isArray(msg.chunks)) {
|
||||||
for (const b64 of msg.chunks) {
|
for (const b64 of msg.chunks) {
|
||||||
const bytes = Base64.toUint8Array(b64);
|
const bytes = Base64.toUint8Array(b64);
|
||||||
term.write(bytes);
|
term.write(bytes);
|
||||||
}
|
}
|
||||||
|
post({
|
||||||
|
type: 'debug',
|
||||||
|
message: `write(chunks=${msg.chunks.length})`,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'resize': {
|
case 'resize': {
|
||||||
|
// Prefer fitAddon.fit(); only call resize if explicit cols/rows provided.
|
||||||
if (typeof msg.cols === 'number' && typeof msg.rows === 'number') {
|
if (typeof msg.cols === 'number' && typeof msg.rows === 'number') {
|
||||||
try {
|
term.resize(msg.cols, msg.rows);
|
||||||
term.resize(msg.cols, msg.rows);
|
post({ type: 'debug', message: `resize(${msg.cols}x${msg.rows})` });
|
||||||
} finally {
|
|
||||||
fitAddon.fit();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// If cols/rows not provided, try fit
|
|
||||||
fitAddon.fit();
|
|
||||||
}
|
}
|
||||||
|
fitAddon.fit();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'setFont': {
|
case 'setFont': {
|
||||||
const { family, size } = msg;
|
const { family, size } = msg;
|
||||||
if (family) document.body.style.fontFamily = family;
|
const patch: Partial<import('@xterm/xterm').ITerminalOptions> = {};
|
||||||
if (typeof size === 'number')
|
if (family) patch.fontFamily = family;
|
||||||
document.body.style.fontSize = `${size}px`;
|
if (typeof size === 'number') patch.fontSize = size;
|
||||||
fitAddon.fit();
|
if (Object.keys(patch).length) {
|
||||||
|
term.options = patch; // no spread -> avoids cols/rows setters
|
||||||
|
post({
|
||||||
|
type: 'debug',
|
||||||
|
message: `setFont(${family ?? ''}, ${size ?? ''})`,
|
||||||
|
});
|
||||||
|
fitAddon.fit();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'setTheme': {
|
case 'setTheme': {
|
||||||
const { background, foreground } = msg;
|
const { background, foreground } = msg;
|
||||||
if (background) document.body.style.backgroundColor = background;
|
const theme: Partial<import('@xterm/xterm').ITheme> = {};
|
||||||
// xterm theme API (optional)
|
if (background) {
|
||||||
term.options = {
|
theme.background = background;
|
||||||
...term.options,
|
document.body.style.backgroundColor = background;
|
||||||
theme: {
|
}
|
||||||
...(term.options.theme ?? {}),
|
if (foreground) theme.foreground = foreground;
|
||||||
background,
|
if (Object.keys(theme).length) {
|
||||||
foreground,
|
term.options = { theme }; // set only theme
|
||||||
},
|
post({
|
||||||
};
|
type: 'debug',
|
||||||
|
message: `setTheme(bg=${background ?? ''}, fg=${foreground ?? ''})`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 'setOptions': {
|
||||||
|
const opts = msg.opts ?? {};
|
||||||
|
// Filter out cols/rows defensively
|
||||||
|
const { cursorBlink, scrollback, fontFamily, fontSize } = opts;
|
||||||
|
const patch: Partial<import('@xterm/xterm').ITerminalOptions> = {};
|
||||||
|
if (typeof cursorBlink === 'boolean') patch.cursorBlink = cursorBlink;
|
||||||
|
if (typeof scrollback === 'number') patch.scrollback = scrollback;
|
||||||
|
if (fontFamily) patch.fontFamily = fontFamily;
|
||||||
|
if (typeof fontSize === 'number') patch.fontSize = fontSize;
|
||||||
|
if (Object.keys(patch).length) {
|
||||||
|
term.options = patch;
|
||||||
|
post({
|
||||||
|
type: 'debug',
|
||||||
|
message: `setOptions(${Object.keys(patch).join(',')})`,
|
||||||
|
});
|
||||||
|
if (patch.fontFamily || patch.fontSize) fitAddon.fit();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'clear': {
|
case 'clear': {
|
||||||
term.clear();
|
term.clear();
|
||||||
|
post({ type: 'debug', message: 'clear()' });
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'focus': {
|
case 'focus': {
|
||||||
term.focus();
|
term.focus();
|
||||||
|
post({ type: 'debug', message: 'focus()' });
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -127,7 +176,7 @@ window.addEventListener('message', (e: MessageEvent<string>) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle container resize
|
* Keep terminal size in sync with container
|
||||||
*/
|
*/
|
||||||
new ResizeObserver(() => {
|
new ResizeObserver(() => {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -16,105 +16,115 @@ type OutboundMessage =
|
|||||||
| { type: 'resize'; cols?: number; rows?: number }
|
| { type: 'resize'; cols?: number; rows?: number }
|
||||||
| { type: 'setFont'; family?: string; size?: number }
|
| { type: 'setFont'; family?: string; size?: number }
|
||||||
| { type: 'setTheme'; background?: string; foreground?: string }
|
| { type: 'setTheme'; background?: string; foreground?: string }
|
||||||
|
| {
|
||||||
|
type: 'setOptions';
|
||||||
|
opts: Partial<{
|
||||||
|
cursorBlink: boolean;
|
||||||
|
scrollback: number;
|
||||||
|
fontFamily: string;
|
||||||
|
fontSize: number;
|
||||||
|
}>;
|
||||||
|
}
|
||||||
| { type: 'clear' }
|
| { type: 'clear' }
|
||||||
| { type: 'focus' };
|
| { type: 'focus' };
|
||||||
|
|
||||||
|
export type XtermInbound =
|
||||||
|
| { type: 'initialized' }
|
||||||
|
| { type: 'data'; data: Uint8Array }
|
||||||
|
| { type: 'debug'; message: string };
|
||||||
|
|
||||||
export type XtermWebViewHandle = {
|
export type XtermWebViewHandle = {
|
||||||
/**
|
write: (data: Uint8Array) => void; // bytes in (batched)
|
||||||
* Push raw bytes (Uint8Array) into the terminal.
|
flush: () => void; // force-flush outgoing writes
|
||||||
* Writes are batched (rAF or >=8KB) for performance.
|
|
||||||
*/
|
|
||||||
write: (data: Uint8Array) => void;
|
|
||||||
|
|
||||||
/** Force-flush any buffered output immediately. */
|
|
||||||
flush: () => void;
|
|
||||||
|
|
||||||
/** Resize the terminal to given cols/rows (optional, fit addon also runs). */
|
|
||||||
resize: (cols?: number, rows?: number) => void;
|
resize: (cols?: number, rows?: number) => void;
|
||||||
|
|
||||||
/** Set font props inside the WebView page. */
|
|
||||||
setFont: (family?: string, size?: number) => void;
|
setFont: (family?: string, size?: number) => void;
|
||||||
|
|
||||||
/** Set basic theme colors (background/foreground). */
|
|
||||||
setTheme: (background?: string, foreground?: string) => void;
|
setTheme: (background?: string, foreground?: string) => void;
|
||||||
|
setOptions: (
|
||||||
/** Clear terminal contents. */
|
opts: OutboundMessage extends { type: 'setOptions'; opts: infer O }
|
||||||
|
? O
|
||||||
|
: never,
|
||||||
|
) => void;
|
||||||
clear: () => void;
|
clear: () => void;
|
||||||
|
|
||||||
/** Focus the terminal input. */
|
|
||||||
focus: () => void;
|
focus: () => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export interface XtermJsWebViewProps
|
||||||
|
extends StrictOmit<
|
||||||
|
React.ComponentProps<typeof WebView>,
|
||||||
|
'source' | 'originWhitelist' | 'onMessage'
|
||||||
|
> {
|
||||||
|
ref: React.RefObject<XtermWebViewHandle | null>;
|
||||||
|
onMessage?: (msg: XtermInbound) => void;
|
||||||
|
|
||||||
|
// xterm-ish props (applied via setOptions before/after init)
|
||||||
|
fontFamily?: string;
|
||||||
|
fontSize?: number;
|
||||||
|
cursorBlink?: boolean;
|
||||||
|
scrollback?: number;
|
||||||
|
themeBackground?: string;
|
||||||
|
themeForeground?: string;
|
||||||
|
}
|
||||||
|
|
||||||
export function XtermJsWebView({
|
export function XtermJsWebView({
|
||||||
ref,
|
ref,
|
||||||
onMessage,
|
onMessage,
|
||||||
|
fontFamily,
|
||||||
|
fontSize,
|
||||||
|
cursorBlink,
|
||||||
|
scrollback,
|
||||||
|
themeBackground,
|
||||||
|
themeForeground,
|
||||||
...props
|
...props
|
||||||
}: StrictOmit<
|
}: XtermJsWebViewProps) {
|
||||||
React.ComponentProps<typeof WebView>,
|
const webRef = useRef<WebView>(null);
|
||||||
'source' | 'originWhitelist' | 'onMessage'
|
|
||||||
> & {
|
|
||||||
ref: React.RefObject<XtermWebViewHandle | null>;
|
|
||||||
onMessage?: (
|
|
||||||
msg:
|
|
||||||
| { type: 'initialized' }
|
|
||||||
| { type: 'data'; data: Uint8Array } // input from xterm (user typed)
|
|
||||||
| { type: 'debug'; message: string },
|
|
||||||
) => void;
|
|
||||||
}) {
|
|
||||||
const webViewRef = useRef<WebView>(null);
|
|
||||||
|
|
||||||
// ---- RN -> WebView message sender via injectJavaScript + window MessageEvent
|
// ---- RN -> WebView message sender
|
||||||
const send = (obj: OutboundMessage) => {
|
const send = (obj: OutboundMessage) => {
|
||||||
const payload = JSON.stringify(obj);
|
const payload = JSON.stringify(obj);
|
||||||
console.log('sending msg', payload);
|
console.log('sending msg', payload);
|
||||||
const js = `window.dispatchEvent(new MessageEvent('message',{data:${JSON.stringify(
|
const js = `window.dispatchEvent(new MessageEvent('message',{data:${JSON.stringify(
|
||||||
payload,
|
payload,
|
||||||
)}})); true;`;
|
)}})); true;`;
|
||||||
webViewRef.current?.injectJavaScript(js);
|
webRef.current?.injectJavaScript(js);
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---- rAF + 8KB coalescer for writes
|
// ---- rAF + 8KB coalescer for writes
|
||||||
const writeBufferRef = useRef<Uint8Array | null>(null);
|
const bufRef = useRef<Uint8Array | null>(null);
|
||||||
const rafIdRef = useRef<number | null>(null);
|
const rafRef = useRef<number | null>(null);
|
||||||
const THRESHOLD = 8 * 1024; // 8KB
|
const THRESHOLD = 8 * 1024;
|
||||||
|
|
||||||
const flush = () => {
|
const flush = () => {
|
||||||
if (!writeBufferRef.current) return;
|
if (!bufRef.current) return;
|
||||||
const b64 = Base64.fromUint8Array(writeBufferRef.current);
|
const b64 = Base64.fromUint8Array(bufRef.current);
|
||||||
writeBufferRef.current = null;
|
bufRef.current = null;
|
||||||
if (rafIdRef.current != null) {
|
if (rafRef.current != null) {
|
||||||
cancelAnimationFrame(rafIdRef.current);
|
cancelAnimationFrame(rafRef.current);
|
||||||
rafIdRef.current = null;
|
rafRef.current = null;
|
||||||
}
|
}
|
||||||
send({ type: 'write', b64 });
|
send({ type: 'write', b64 });
|
||||||
};
|
};
|
||||||
|
|
||||||
const scheduleFlush = () => {
|
const schedule = () => {
|
||||||
if (rafIdRef.current != null) return;
|
if (rafRef.current != null) return;
|
||||||
rafIdRef.current = requestAnimationFrame(() => {
|
rafRef.current = requestAnimationFrame(() => {
|
||||||
rafIdRef.current = null;
|
rafRef.current = null;
|
||||||
flush();
|
flush();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const write = (data: Uint8Array) => {
|
const write = (data: Uint8Array) => {
|
||||||
if (!data || data.length === 0) return;
|
if (!data || data.length === 0) return;
|
||||||
const chunk = data; // already a fresh Uint8Array per caller
|
if (!bufRef.current) {
|
||||||
if (!writeBufferRef.current) {
|
bufRef.current = data;
|
||||||
writeBufferRef.current = chunk;
|
|
||||||
} else {
|
} else {
|
||||||
// concat
|
const a = bufRef.current;
|
||||||
const a = writeBufferRef.current;
|
const merged = new Uint8Array(a.length + data.length);
|
||||||
const merged = new Uint8Array(a.length + chunk.length);
|
|
||||||
merged.set(a, 0);
|
merged.set(a, 0);
|
||||||
merged.set(chunk, a.length);
|
merged.set(data, a.length);
|
||||||
writeBufferRef.current = merged;
|
bufRef.current = merged;
|
||||||
}
|
|
||||||
if ((writeBufferRef.current?.length ?? 0) >= THRESHOLD) {
|
|
||||||
flush();
|
|
||||||
} else {
|
|
||||||
scheduleFlush();
|
|
||||||
}
|
}
|
||||||
|
if ((bufRef.current?.length ?? 0) >= THRESHOLD) flush();
|
||||||
|
else schedule();
|
||||||
};
|
};
|
||||||
|
|
||||||
useImperativeHandle(ref, () => ({
|
useImperativeHandle(ref, () => ({
|
||||||
@@ -126,6 +136,7 @@ export function XtermJsWebView({
|
|||||||
send({ type: 'setFont', family, size }),
|
send({ type: 'setFont', family, size }),
|
||||||
setTheme: (background?: string, foreground?: string) =>
|
setTheme: (background?: string, foreground?: string) =>
|
||||||
send({ type: 'setTheme', background, foreground }),
|
send({ type: 'setTheme', background, foreground }),
|
||||||
|
setOptions: (opts) => send({ type: 'setOptions', opts }),
|
||||||
clear: () => send({ type: 'clear' }),
|
clear: () => send({ type: 'clear' }),
|
||||||
focus: () => send({ type: 'focus' }),
|
focus: () => send({ type: 'focus' }),
|
||||||
}));
|
}));
|
||||||
@@ -133,29 +144,46 @@ export function XtermJsWebView({
|
|||||||
// Cleanup pending rAF on unmount
|
// Cleanup pending rAF on unmount
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
return () => {
|
return () => {
|
||||||
if (rafIdRef.current != null) {
|
if (rafRef.current != null) cancelAnimationFrame(rafRef.current);
|
||||||
cancelAnimationFrame(rafIdRef.current);
|
rafRef.current = null;
|
||||||
rafIdRef.current = null;
|
bufRef.current = null;
|
||||||
}
|
|
||||||
writeBufferRef.current = null;
|
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// Push initial options/theme whenever props change
|
||||||
|
useEffect(() => {
|
||||||
|
const opts: Record<string, unknown> = {};
|
||||||
|
if (typeof cursorBlink === 'boolean') opts.cursorBlink = cursorBlink;
|
||||||
|
if (typeof scrollback === 'number') opts.scrollback = scrollback;
|
||||||
|
if (fontFamily) opts.fontFamily = fontFamily;
|
||||||
|
if (typeof fontSize === 'number') opts.fontSize = fontSize;
|
||||||
|
if (Object.keys(opts).length) send({ type: 'setOptions', opts });
|
||||||
|
}, [cursorBlink, scrollback, fontFamily, fontSize]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (themeBackground || themeForeground) {
|
||||||
|
send({
|
||||||
|
type: 'setTheme',
|
||||||
|
background: themeBackground,
|
||||||
|
foreground: themeForeground,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [themeBackground, themeForeground]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<WebView
|
<WebView
|
||||||
ref={webViewRef}
|
ref={webRef}
|
||||||
originWhitelist={['*']}
|
originWhitelist={['*']}
|
||||||
source={{ html: htmlString }}
|
source={{ html: htmlString }}
|
||||||
onMessage={(event) => {
|
onMessage={(e) => {
|
||||||
try {
|
try {
|
||||||
const msg: InboundMessage = JSON.parse(event.nativeEvent.data);
|
const msg: InboundMessage = JSON.parse(e.nativeEvent.data);
|
||||||
console.log('received msg', msg);
|
console.log('received msg', msg);
|
||||||
if (msg.type === 'initialized') {
|
if (msg.type === 'initialized') {
|
||||||
onMessage?.({ type: 'initialized' });
|
onMessage?.({ type: 'initialized' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (msg.type === 'input') {
|
if (msg.type === 'input') {
|
||||||
// Convert base64 -> bytes for the caller (SSH writer)
|
|
||||||
const bytes = Base64.toUint8Array(msg.b64);
|
const bytes = Base64.toUint8Array(msg.b64);
|
||||||
onMessage?.({ type: 'data', data: bytes });
|
onMessage?.({ type: 'data', data: bytes });
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user