ethan/fressh
1
0
Fork 0
mirror of https://github.com/EthanShoeDev/fressh.git synced 2026-01-11 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Good changes

Browse Source
This commit is contained in:
EthanShoeDev
2025-09-20 04:08:23 -04:00
parent e1d8dc76c9
commit 0d904dfafe
10 changed files with 218 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/react-native-uniffi-russh/rust/uniffi-russh/src/lib.rs
View File

@@ -186,6 +186,7 @@ pub struct ShellSessionInfo {
#[derive(uniffi::Object)]
pub struct SshConnection {
info: SshConnectionInfo,
on_disconnected_callback: Option<Arc<dyn ConnectionDisconnectedCallback>>,
client_handle: AsyncMutex<ClientHandle<NoopHandler>>,
shells: AsyncMutex<HashMap<u32, Arc<ShellSession>>>,
@@ -490,6 +491,11 @@ impl SshConnection {
let h = self.client_handle.lock().await;
h.disconnect(Disconnect::ByApplication, "bye", "").await?;
if let Some(on_disconnected_callback) = self.on_disconnected_callback.as_ref() {
on_disconnected_callback.on_change(self.info.connection_id.clone());
}
Ok(())
}
}
@@ -775,6 +781,7 @@ pub async fn connect(options: ConnectOptions) -> Result<Arc<SshConnection>, SshE
client_handle: AsyncMutex::new(handle),
shells: AsyncMutex::new(HashMap::new()),
self_weak: AsyncMutex::new(Weak::new()),
on_disconnected_callback: options.on_disconnected_callback.clone(),
});
// Initialize weak self reference.
*conn.self_weak.lock().await = Arc::downgrade(&conn);

14
packages/react-native-uniffi-russh/src/api.ts
View File

@@ -153,7 +153,7 @@ type RusshApi = {
// keySize?: number;
// comment?: string;
) => Promise<string>;
validatePrivateKey: (key: string) => boolean;
validatePrivateKey: (key: string) => { valid: true; error?: never } | { valid: false; error: GeneratedRussh.SshError };
};
// #endregion
@@ -196,6 +196,8 @@ const streamEnumToLiteral = {
[GeneratedRussh.StreamKind.Stderr]: 'stderr',
} as const satisfies Record<GeneratedRussh.StreamKind, StreamKind>;
function generatedConnDetailsToIdeal(
details: GeneratedRussh.ConnectionDetails
): ConnectionDetails {
@@ -379,17 +381,19 @@ async function generateKeyPair(type: 'rsa' | 'ecdsa' | 'ed25519') {
return GeneratedRussh.generateKeyPair(map[type]);
}
function validatePrivateKey(key: string) {
function validatePrivateKey(key: string): { valid: true; error?: never } | { valid: false; error: GeneratedRussh.SshError } {
try {
GeneratedRussh.validatePrivateKey(key);
return true;
} catch {
return false;
return { valid: true };
} catch (e) {
return { valid: false, error: e as GeneratedRussh.SshError };
}
}
// #endregion
export { SshError, SshError_Tags } from './generated/uniffi_russh';
export const RnRussh = {
uniffiInitAsync: GeneratedRussh.uniffiInitAsync,
connect,

2
packages/react-native-xtermjs-webview/index.html
View File

@@ -7,7 +7,7 @@
content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"
/>
</head>
<body style="margin: 0; padding: 8px; width: 100%; height: 100%">
<body style="margin: 0; padding: 0px; width: 100%; height: 100%">
<div
id="terminal"
style="margin: 0; padding: 0; width: 100%; height: 100%"

235
packages/react-native-xtermjs-webview/src-internal/main.tsx
View File

@@ -12,7 +12,10 @@ declare global {
terminal?: Terminal;
fitAddon?: FitAddon;
terminalWriteBase64?: (data: string) => void;
ReactNativeWebView?: { postMessage?: (data: string) => void };
ReactNativeWebView?: {
postMessage?: (data: string) => void;
injectedObjectJson?: () => string | undefined;
};
__FRESSH_XTERM_BRIDGE__?: boolean;
__FRESSH_XTERM_MSG_HANDLER__?: (
e: MessageEvent<BridgeOutboundMessage>,
@@ -27,114 +30,134 @@ const sendToRn = (msg: BridgeInboundMessage) =>
* Idempotent boot guard: ensure we only install once.
* If the script happens to run twice (dev reloads, double-mounts), we bail out early.
*/
if (window.__FRESSH_XTERM_BRIDGE__) {
sendToRn({
type: 'debug',
message: 'bridge already installed; ignoring duplicate boot',
});
} else {
window.__FRESSH_XTERM_BRIDGE__ = true;
// ---- Xterm setup
const term = new Terminal({
allowProposedApi: true,
convertEol: true,
scrollback: 10000,
cursorBlink: true,
});
const fitAddon = new FitAddon();
term.loadAddon(fitAddon);
const root = document.getElementById('terminal')!;
term.open(root);
fitAddon.fit();
// Expose for debugging (typed)
window.terminal = term;
window.fitAddon = fitAddon;
term.onData((data) => {
sendToRn({ type: 'input', str: data });
});
// Remove old handler if any (just in case)
if (window.__FRESSH_XTERM_MSG_HANDLER__)
window.removeEventListener('message', window.__FRESSH_XTERM_MSG_HANDLER__!);
// RN -> WebView handler (write, resize, setFont, setTheme, setOptions, clear, focus)
const handler = (e: MessageEvent<BridgeOutboundMessage>) => {
try {
const msg = e.data;
if (!msg || typeof msg.type !== 'string') return;
// TODO: https://xtermjs.org/docs/guides/flowcontrol/#ideas-for-a-better-mechanism
const termWrite = (bStr: string) => {
const bytes = bStrToBinary(bStr);
term.write(bytes);
};
switch (msg.type) {
case 'write': {
termWrite(msg.bStr);
break;
}
case 'writeMany': {
for (const bStr of msg.chunks) {
termWrite(bStr);
}
break;
}
case 'resize': {
term.resize(msg.cols, msg.rows);
break;
}
case 'fit': {
fitAddon.fit();
break;
}
case 'setOptions': {
const newOpts: ITerminalOptions & { cols?: never; rows?: never } = {
...term.options,
...msg.opts,
theme: {
...term.options.theme,
...msg.opts.theme,
},
};
delete newOpts.cols;
delete newOpts.rows;
term.options = newOpts;
if (
'theme' in newOpts &&
newOpts.theme &&
'background' in newOpts.theme &&
newOpts.theme.background
) {
document.body.style.backgroundColor = newOpts.theme.background;
}
break;
}
case 'clear': {
term.clear();
break;
}
case 'focus': {
term.focus();
break;
}
}
} catch (err) {
window.onload = () => {
try {
if (window.__FRESSH_XTERM_BRIDGE__) {
sendToRn({
type: 'debug',
message: `message handler error: ${String(err)}`,
message: 'bridge already installed; ignoring duplicate boot',
});
return;
}
};
window.__FRESSH_XTERM_MSG_HANDLER__ = handler;
window.addEventListener('message', handler);
const injectedObjectJson =
window.ReactNativeWebView?.injectedObjectJson?.();
if (!injectedObjectJson) {
sendToRn({
type: 'debug',
message: 'injectedObjectJson not found; ignoring duplicate boot',
});
return;
}
// Initial handshake (send once)
setTimeout(() => sendToRn({ type: 'initialized' }), 50);
}
window.__FRESSH_XTERM_BRIDGE__ = true;
const injectedObject = JSON.parse(injectedObjectJson) as ITerminalOptions;
// ---- Xterm setup
const term = new Terminal(injectedObject);
const fitAddon = new FitAddon();
term.loadAddon(fitAddon);
const root = document.getElementById('terminal')!;
term.open(root);
fitAddon.fit();
// Expose for debugging (typed)
window.terminal = term;
window.fitAddon = fitAddon;
term.onData((data) => {
sendToRn({ type: 'input', str: data });
});
// Remove old handler if any (just in case)
if (window.__FRESSH_XTERM_MSG_HANDLER__)
window.removeEventListener(
'message',
window.__FRESSH_XTERM_MSG_HANDLER__!,
);
// RN -> WebView handler (write, resize, setFont, setTheme, setOptions, clear, focus)
const handler = (e: MessageEvent<BridgeOutboundMessage>) => {
try {
const msg = e.data;
if (!msg || typeof msg.type !== 'string') return;
// TODO: https://xtermjs.org/docs/guides/flowcontrol/#ideas-for-a-better-mechanism
const termWrite = (bStr: string) => {
const bytes = bStrToBinary(bStr);
term.write(bytes);
};
switch (msg.type) {
case 'write': {
termWrite(msg.bStr);
break;
}
case 'writeMany': {
for (const bStr of msg.chunks) {
termWrite(bStr);
}
break;
}
case 'resize': {
term.resize(msg.cols, msg.rows);
break;
}
case 'fit': {
fitAddon.fit();
break;
}
case 'setOptions': {
const newOpts: ITerminalOptions & { cols?: never; rows?: never } = {
...term.options,
...msg.opts,
theme: {
...term.options.theme,
...msg.opts.theme,
},
};
delete newOpts.cols;
delete newOpts.rows;
term.options = newOpts;
if (
'theme' in newOpts &&
newOpts.theme &&
'background' in newOpts.theme &&
newOpts.theme.background
) {
document.body.style.backgroundColor = newOpts.theme.background;
}
break;
}
case 'clear': {
term.clear();
break;
}
case 'focus': {
term.focus();
break;
}
}
} catch (err) {
sendToRn({
type: 'debug',
message: `message handler error: ${String(err)}`,
});
}
};
window.__FRESSH_XTERM_MSG_HANDLER__ = handler;
window.addEventListener('message', handler);
// Initial handshake (send once)
setTimeout(() => sendToRn({ type: 'initialized' }), 50);
} catch (e) {
sendToRn({
type: 'debug',
message: `error in xtermjs-webview: ${String(e)}`,
});
}
};

22
packages/react-native-xtermjs-webview/src/index.tsx
View File

@@ -63,15 +63,17 @@ const defaultWebViewProps: WebViewOptions = {
};
const defaultXtermOptions: Partial<ITerminalOptions> = {
fontFamily: 'Menlo, ui-monospace, monospace',
fontSize: 20,
cursorBlink: true,
allowProposedApi: true,
convertEol: true,
scrollback: 10000,
cursorBlink: true,
fontFamily: 'Menlo, ui-monospace, monospace',
fontSize: 10,
};
type UserControllableWebViewProps = StrictOmit<
WebViewOptions,
'source' | 'style'
'source' | 'style' | 'injectedJavaScriptBeforeContentLoaded'
>;
export type XtermJsWebViewProps = {
@@ -259,9 +261,10 @@ export function XtermJsWebView({
if (xTermOptionsEquals(appliedXtermOptions, mergedXTermOptions)) return;
logger?.log?.(`setting options: `, mergedXTermOptions);
sendToWebView({ type: 'setOptions', opts: mergedXTermOptions });
autoFitFn();
appliedXtermOptionsRef.current = mergedXTermOptions;
}, [mergedXTermOptions, sendToWebView, logger, initialized]);
}, [mergedXTermOptions, sendToWebView, logger, initialized, autoFitFn]);
const onMessage = useCallback(
(e: WebViewMessageEvent) => {
@@ -346,6 +349,15 @@ export function XtermJsWebView({
source={{ html: htmlString }}
onMessage={onMessage}
style={style}
injectedJavaScriptObject={mergedXTermOptions}
injectedJavaScriptBeforeContentLoaded={
mergedXTermOptions.theme?.background
? `
document.body.style.backgroundColor = '${mergedXTermOptions.theme.background}';
true;
`
: undefined
}
{...mergedWebViewOptions}
/>
);