fix(desktop): isolate remote runtime auth and embeds
Fix remote Desktop runtime bootstrapping across context-panel session chats, additional windows, and host switches.\n\n- Bootstrap embedded session-chat frames through a same-origin parent handshake that supplies the active endpoint, bearer token, runtime headers, local origin, and a credential-free relay descriptor.\n- Keep relay pairing grants out of iframe state and explicitly rebind the SDK after embedded bootstrap or relay restoration.\n- Preserve each additional and Mini Chat window's own init script instead of overwriting it when the main window's host configuration changes.\n- Replace direct iframe global calls with same-origin postMessage synchronization for theme, chat settings, and visibility.\n\nHarden Desktop host authentication and probing.\n\n- Bind password, passkey, session-status, and token-persistence completions to the runtime identity that started them, so a late result cannot alter a newly selected host.\n- Cancel active passkey operations and reset transient auth UI state on endpoint changes.\n- Verify stored client authentication via /auth/session for direct and relay host probes, distinguishing reachable hosts from hosts that require re-authentication.\n- Bound every relay probe request with an aborting timeout so a stalled auth request cannot hang refresh or host switching.\n\nAdd regression coverage for the embedded bootstrap handshake, credential-free relay descriptor exposure, runtime configuration, stale password completion after an A-to-B switch, and SDK errors that carry a zero response status.\n\nAlso preserve SDK response status on session-message loader errors so callers can distinguish transport and server failures.
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
import { getRuntimeExtraHeadersSync, refreshLocalRuntimeUrlAuthToken, refreshRuntimeUrlAuthToken, setRuntimeBearerToken, setRuntimeExtraHeaders } from '@openchamber/ui/lib/runtime-auth';
|
||||
import { installRuntimeFetchBridge } from '@openchamber/ui/lib/runtime-fetch';
|
||||
import { initializeRuntimeEndpoint } from '@openchamber/ui/lib/runtime-switch';
|
||||
import { initializeRuntimeEndpoint, switchRuntimeEndpoint } from '@openchamber/ui/lib/runtime-switch';
|
||||
import { restoreDesktopRelayRuntime } from '@openchamber/ui/lib/desktopRelayRestore';
|
||||
import { configureRuntimeUrlResolver } from '@openchamber/ui/lib/runtime-url';
|
||||
import type { EmbeddedSessionRuntimeBootstrap } from '@openchamber/ui/components/layout/contextPanelEmbeddedChat';
|
||||
import { opencodeClient } from '@openchamber/ui/lib/opencode/client';
|
||||
import { createWebAPIs } from './api';
|
||||
|
||||
const sameOrigin = (left: string, right: string): boolean => {
|
||||
@@ -20,24 +22,29 @@ declare global {
|
||||
__OPENCHAMBER_CLIENT_TOKEN__?: string;
|
||||
__OPENCHAMBER_RUNTIME_HEADERS__?: Record<string, string>;
|
||||
__OPENCHAMBER_LOCAL_ORIGIN__?: string;
|
||||
__OPENCHAMBER_RELAY_HOST_ID__?: string;
|
||||
}
|
||||
}
|
||||
|
||||
export const readRuntimeBootstrapConfig = (): EmbeddedSessionRuntimeBootstrap => {
|
||||
const readString = (value: unknown): string => typeof value === 'string' ? value.trim() : '';
|
||||
|
||||
return {
|
||||
apiBaseUrl: readString(window.__OPENCHAMBER_API_BASE_URL__),
|
||||
clientToken: readString(window.__OPENCHAMBER_CLIENT_TOKEN__),
|
||||
localOrigin: readString(window.__OPENCHAMBER_LOCAL_ORIGIN__),
|
||||
runtimeHeaders: window.__OPENCHAMBER_RUNTIME_HEADERS__,
|
||||
relayHostId: readString(window.__OPENCHAMBER_RELAY_HOST_ID__),
|
||||
};
|
||||
};
|
||||
|
||||
// Resolved once the desktop relay-host restore (if any) has picked a transport.
|
||||
// Immediately-resolved everywhere else. See createConfiguredWebAPIs.
|
||||
let desktopRelayRestoreReady: Promise<void> = Promise.resolve();
|
||||
export const getDesktopRelayRestoreReady = (): Promise<void> => desktopRelayRestoreReady;
|
||||
|
||||
export const createConfiguredWebAPIs = () => {
|
||||
const apiBaseUrl = typeof window.__OPENCHAMBER_API_BASE_URL__ === 'string'
|
||||
? window.__OPENCHAMBER_API_BASE_URL__.trim()
|
||||
: '';
|
||||
const clientToken = typeof window.__OPENCHAMBER_CLIENT_TOKEN__ === 'string'
|
||||
? window.__OPENCHAMBER_CLIENT_TOKEN__.trim()
|
||||
: '';
|
||||
const localOrigin = typeof window.__OPENCHAMBER_LOCAL_ORIGIN__ === 'string'
|
||||
? window.__OPENCHAMBER_LOCAL_ORIGIN__.trim()
|
||||
: '';
|
||||
export const createConfiguredWebAPIs = (bootstrap?: EmbeddedSessionRuntimeBootstrap | null) => {
|
||||
const { apiBaseUrl, clientToken, localOrigin, runtimeHeaders, relayHostId, relay } = bootstrap ?? readRuntimeBootstrapConfig();
|
||||
|
||||
const urls = configureRuntimeUrlResolver({
|
||||
apiBaseUrl: apiBaseUrl || undefined,
|
||||
@@ -48,7 +55,19 @@ export const createConfiguredWebAPIs = () => {
|
||||
runtimeKey: sameOrigin(apiBaseUrl, localOrigin) ? 'local' : null,
|
||||
});
|
||||
setRuntimeBearerToken(clientToken || null);
|
||||
setRuntimeExtraHeaders(window.__OPENCHAMBER_RUNTIME_HEADERS__ || null);
|
||||
setRuntimeExtraHeaders(runtimeHeaders || null);
|
||||
if (relay) {
|
||||
switchRuntimeEndpoint({
|
||||
apiBaseUrl,
|
||||
clientToken: clientToken || null,
|
||||
requestHeaders: runtimeHeaders || null,
|
||||
runtimeKey: relayHostId ? `host:${relayHostId}` : null,
|
||||
relay,
|
||||
});
|
||||
}
|
||||
// createWebAPIs imports UI stores, which instantiate the SDK singleton before
|
||||
// an embedded frame's asynchronous parent bootstrap is available.
|
||||
opencodeClient.reconnectToRuntimeBaseUrl();
|
||||
void refreshRuntimeUrlAuthToken(apiBaseUrl || undefined).catch(() => {});
|
||||
if (localOrigin && !sameOrigin(apiBaseUrl, localOrigin) && Object.keys(getRuntimeExtraHeadersSync()).length > 0) {
|
||||
void refreshLocalRuntimeUrlAuthToken(localOrigin).catch(() => {});
|
||||
@@ -60,11 +79,16 @@ export const createConfiguredWebAPIs = () => {
|
||||
// relay host is involved. main.tsx holds the app render on this promise so
|
||||
// the user sees the splash instead of a transient auth screen against an
|
||||
// endpoint that is still being selected.
|
||||
const relayHostId = (window as typeof window & { __OPENCHAMBER_RELAY_HOST_ID__?: string }).__OPENCHAMBER_RELAY_HOST_ID__;
|
||||
desktopRelayRestoreReady = Promise.race([
|
||||
restoreDesktopRelayRuntime(typeof relayHostId === 'string' && relayHostId ? relayHostId : undefined).catch(() => {}),
|
||||
// Never hold the app hostage: a stuck probe/tunnel gives up to the UI.
|
||||
new Promise<void>((resolve) => { window.setTimeout(resolve, 10_000); }),
|
||||
]);
|
||||
desktopRelayRestoreReady = relay
|
||||
? Promise.resolve()
|
||||
: Promise.race([
|
||||
restoreDesktopRelayRuntime(relayHostId || undefined).catch(() => {}),
|
||||
// Never hold the app hostage: a stuck probe/tunnel gives up to the UI.
|
||||
new Promise<void>((resolve) => { window.setTimeout(resolve, 10_000); }),
|
||||
]).then(() => {
|
||||
// Relay-capable windows may select a reachable direct leg before React
|
||||
// subscribes to runtime-change events, so bind the SDK explicitly.
|
||||
opencodeClient.reconnectToRuntimeBaseUrl();
|
||||
});
|
||||
return createWebAPIs({ urls });
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user