{connectionError}
diff --git a/ui/src/components/Dashboard.tsx b/ui/src/components/Dashboard.tsx
index 5e25278..a1b8e2e 100644
--- a/ui/src/components/Dashboard.tsx
+++ b/ui/src/components/Dashboard.tsx
@@ -23,7 +23,7 @@ import { NewFactoryModal } from "./factory/NewFactoryModal";
import { deriveFactories } from "./factory/useFactory";
import type { FactoryInfo, NewFactoryInput } from "./factory/types";
import { factoryInitPrompt, factoryKey, factoryWorkerOf } from "./factory/types";
-import { ConnectionDiagnostics } from "./ConnectionDiagnostics";
+import { CloudConnectionNotice } from "./CloudConnectionNotice";
import { SessionAttentionAlert } from "./SessionAttentionAlert";
import { mergeBridgeOrder } from "@/lib/bridge-order";
import { StatusDot } from "@/lib/StatusDot";
@@ -860,18 +860,31 @@ PY`;
{/* Connection status */}
-
-
+
+ {directlyReachableBridgeIds.size > 0 && (
+ <>
+
+
+ Local/P2P connected
+
+ ·
+
+ )}
+ 0 ? "connecting" : connectionStatus}
+ title={connectionStatus === "connected" ? "Cloud connected" : "Cloud reconnecting"}
+ />
0
+ ? "var(--status-pending)"
+ : connectionStatus === "error" || connectionStatus === "disconnected"
? "var(--status-error)"
: "var(--text-muted)",
- textTransform: "capitalize",
}}
>
- {connectionStatus}
+ {connectionStatus === "connected" ? "Cloud connected" : "Cloud reconnecting"}
@@ -1410,7 +1423,7 @@ PY`;
/>
)}
-
{
+ it.each(['reject', 'hang', 'empty'])('reconnects locally when presence is %s, then refreshes credentials on cloud recovery', async (failure) => {
+ vi.useFakeTimers();
+ let state = 'online';
+ let nonce = 'first-nonce';
+ class PresenceSub extends FakeSubscription {
+ presence(): Promise<{ clients: Record }> {
+ if (state === 'reject') return Promise.reject(new Error('cloud unavailable'));
+ if (state === 'hang') return new Promise(() => {});
+ const clients: Record = state === 'empty' ? {} : {
+ bridge: { connInfo: { bridgeId: 'bridge-1', localPort: 41999, localNonce: nonce } },
+ };
+ return Promise.resolve({ clients });
+ }
+ }
+ class Client extends FakeCentrifugeClient {
+ override newSubscription(channel: string): FakeSubscription {
+ if (channel.startsWith('bridges:presence')) {
+ const sub = new PresenceSub(channel);
+ this.subs.set(channel, sub);
+ return sub;
+ }
+ return super.newSubscription(channel);
+ }
+ }
+ const localPeers: FakePeer[] = [];
+ const loopbackPeerFactory = vi.fn((opts: { bridgeId: string }) => {
+ const p = new FakePeer(opts.bridgeId);
+ localPeers.push(p);
+ return p;
+ });
+ const transport = new HybridTerminalTransport({
+ centrifuge: new Client(), userId: 'user', clientId: 'tab',
+ publishCommand: vi.fn(), loopbackPeerFactory,
+ peerFactory: (opts: PeerFactoryOpts) => {
+ const p = new FakePeer(opts.bridgeId);
+ p.connectMode = 'reject';
+ return p;
+ },
+ upgradeBackoffMs: [1000], upgradeJitter: 0,
+ } as unknown as ConstructorParameters[0]);
+ try {
+ const output = vi.fn();
+ transport.subscribeTerminal('session', 'bridge-1', { onOutput: output, onScreen: vi.fn() });
+ await vi.advanceTimersByTimeAsync(0);
+ expect(transport.getMode('session')).toBe('local');
+ state = failure;
+ transport.sendInput('session', 'still-local');
+ expect(localPeers[0].sendInputCalls).toContainEqual(['session', 'still-local']);
+ localPeers[0].simulateClose();
+ await vi.advanceTimersByTimeAsync(1000 + LOOPBACK_TIMEOUT_MS);
+ expect(localPeers).toHaveLength(2);
+ expect(loopbackPeerFactory).toHaveBeenLastCalledWith(expect.objectContaining({ nonce: 'first-nonce' }));
+ localPeers[1].attachCalls[0][1].onScreen('reconnected');
+ expect(transport.getMode('session')).toBe('local');
+ localPeers[1].attachCalls[0][1].onOutput('working offline');
+ expect(output).toHaveBeenCalledWith('working offline');
+ transport.sendResize('session', 100, 30);
+ expect(localPeers[1].sendResizeCalls).toContainEqual(['session', 100, 30]);
+ state = 'online';
+ nonce = 'rotated-nonce';
+ // Cloud recovery alone must not replace a working direct peer.
+ await vi.advanceTimersByTimeAsync(3000);
+ expect(localPeers).toHaveLength(2);
+ localPeers[1].simulateClose();
+ await vi.advanceTimersByTimeAsync(1000);
+ expect(loopbackPeerFactory).toHaveBeenLastCalledWith(expect.objectContaining({ nonce: 'rotated-nonce' }));
+ localPeers[2].attachCalls[0][1].onScreen('fresh screen');
+ expect(transport.getMode('session')).toBe('local');
+ } finally {
+ transport.dispose();
+ vi.useRealTimers();
+ }
+ });
+});
diff --git a/ui/src/lib/direct-transport/hybrid-terminal-transport.ts b/ui/src/lib/direct-transport/hybrid-terminal-transport.ts
index cb1bb3a..008f607 100644
--- a/ui/src/lib/direct-transport/hybrid-terminal-transport.ts
+++ b/ui/src/lib/direct-transport/hybrid-terminal-transport.ts
@@ -228,6 +228,9 @@ export class HybridTerminalTransport implements TerminalTransportApi {
private readonly upgradeJitter: number;
private readonly peers = new Map();
+ // Scoped to this authenticated transport's lifetime; never persist nonces.
+ // Cloud presence can disappear while the loopback server is still healthy.
+ private readonly localAdverts = new Map();
private readonly sessions = new Map();
private readonly modeChangeCbs = new Set<(sessionId: string, mode: TerminalTransportMode) => void>();
private readonly bridgeReachabilityCbs = new Set<
@@ -396,6 +399,7 @@ export class HybridTerminalTransport implements TerminalTransportApi {
pe.peer?.close();
}
this.peers.clear();
+ this.localAdverts.clear();
this.modeChangeCbs.clear();
this.bridgeReachabilityCbs.clear();
@@ -785,6 +789,9 @@ export class HybridTerminalTransport implements TerminalTransportApi {
*/
private async isBridgeOnlineForUpgrade(bridgeId: string): Promise {
if (this.advertInjected) return true;
+ // Let the authenticated loopback handshake determine local reachability,
+ // even when Fly cannot answer presence queries.
+ if (this.localAdverts.has(bridgeId)) return true;
const sub = this.ensurePresenceSub();
if (typeof sub.presence !== 'function') return false;
const result = await this.readPresenceBounded(sub);
@@ -1191,24 +1198,25 @@ export class HybridTerminalTransport implements TerminalTransportApi {
}
private async defaultGetLocalAdvert(bridgeId: string): Promise {
+ const cached = this.localAdverts.get(bridgeId) ?? null;
const sub = this.ensurePresenceSub();
- if (typeof sub.presence !== 'function') return null;
+ if (typeof sub.presence !== 'function') return cached;
const result = await this.readPresenceBounded(sub);
- if (!result) return null;
+ if (!result) return cached;
for (const info of Object.values(result.clients)) {
const ci = info.connInfo as
| { bridgeId?: string; localPort?: number; localNonce?: string }
| undefined;
if (
ci &&
- ci.bridgeId === bridgeId &&
+ typeof ci.bridgeId === 'string' &&
typeof ci.localPort === 'number' &&
typeof ci.localNonce === 'string'
) {
- return { localPort: ci.localPort, localNonce: ci.localNonce };
+ this.localAdverts.set(ci.bridgeId, { localPort: ci.localPort, localNonce: ci.localNonce });
}
}
- return null;
+ return this.localAdverts.get(bridgeId) ?? null;
}
/**