Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function App() {
const [hiddenSites, setHiddenSites] = useState<Set<string>>(new Set());
const [hiddenGatewayPools, setHiddenGatewayPools] = useState<Set<string>>(new Set());
const [selectedNodeName, setSelectedNodeName] = useState<string | null>(null);
const { detail, load: loadNodeDetail } = useNodeDetails(selectedNodeName);
const { detail, load: loadNodeDetail, cancel: cancelNodeDetail } = useNodeDetails(selectedNodeName);
const [selectedNodeDetailTab, setSelectedNodeDetailTab] = useState<'peerings' | 'routes' | 'bpf'>('peerings');
const [pullEnabledOptimistic, setPullEnabledOptimistic] = useState<boolean | null>(null);
const [selectedNodeTypesFilter, setSelectedNodeTypesFilter] = useState<Set<string>>(new Set(['Gateway', 'Worker']));
Expand Down Expand Up @@ -178,12 +178,14 @@ export default function App() {
};

const handleSelectNode = useCallback((nodeName: string) => {
cancelNodeDetail();
setSelectedNodeName(nodeName);
}, []);
}, [cancelNodeDetail]);

const handleCloseModal = useCallback(() => {
cancelNodeDetail();
setSelectedNodeName(null);
}, []);
}, [cancelNodeDetail]);

const {
effectivePullEnabled,
Expand Down Expand Up @@ -216,9 +218,9 @@ export default function App() {
// Check if node still exists in the cluster
const exists = nodeSummaries.some((ns) => ns.name === selectedNodeName);
if (!exists) {
setSelectedNodeName(null);
handleCloseModal();
}
}, [nodeSummaries, selectedNodeName]);
}, [nodeSummaries, selectedNodeName, handleCloseModal]);

const wsState = wsConnected ? 'ok' : summary ? 'warn' : 'err';
const wsLabel = wsConnected
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/hooks/useNodeDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ export default function useNodeDetails(selectedNodeName: string | null) {
const load = useCallback((forceRefresh = false) => {
if (selectedNodeName) store.load(selectedNodeName, forceRefresh);
}, [store, selectedNodeName]);
const cancel = useCallback(() => {
if (selectedNodeName) store.cancel(selectedNodeName);
}, [store, selectedNodeName]);
return {
detail: selectedNodeName ? store.read(selectedNodeName) : { state: 'not-loaded' as const },
load,
load, cancel,
};
}
40 changes: 30 additions & 10 deletions frontend/src/state/nodeDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ export class NodeDetails {
this.expiryTimers.delete(name);
}

private scheduleExpiry(name: string) {
this.clearExpiry(name);
const snapshot = this.views.get(name)?.snapshot;
if (!snapshot) return;
const delay = Date.parse(snapshot.expiresAt) - this.clock.now();
this.expiryTimers.set(name, this.clock.setTimeout(() => {
this.expire(name);
if (this.views.get(name)?.snapshot) this.scheduleExpiry(name);
this.changed();
}, Math.min(Math.max(0, delay), 2147483647)));
}

private publish(name: string, view: DetailView) {
this.views.set(name, view);
this.changed();
Expand Down Expand Up @@ -89,6 +101,7 @@ export class NodeDetails {

load(name: string, forceRefresh = false) {
if (!name) return;
if (!forceRefresh && this.operations.has(name)) return;
const view = this.read(name);
if (!forceRefresh && view.snapshot) {
this.publish(name, { state: 'loaded', snapshot: view.snapshot });
Expand Down Expand Up @@ -122,6 +135,17 @@ export class NodeDetails {
this.publish(name, { state, error, snapshot: this.read(name).snapshot });
}

private armDeadline(name: string, op: Operation) {
op.timer = this.clock.setTimeout(() => {
if (!this.current(name, op)) return;
if (this.clock.now() >= op.deadline) {
this.fail(name, op, 'Detail request deadline expired', 'expired');
} else {
this.armDeadline(name, op);
}
}, Math.min(Math.max(0, op.deadline - this.clock.now()), 2147483647));
}

private accept(name: string, op: Operation, result: NodeDetailResult) {
if (!this.current(name, op)) return;
if (this.clock.now() >= op.deadline) {
Expand All @@ -146,17 +170,17 @@ export class NodeDetails {
this.fail(name, op, 'Detail request deadline expired', 'expired');
return;
}
this.publish(name, { ...this.read(name), state: 'loading', deadline: new Date(op.deadline).toISOString() });
this.publish(name, {
...this.read(name), state: 'loading', error: result.error,
deadline: new Date(op.deadline).toISOString(),
});
op.timer = this.clock.setTimeout(() => {
if (!this.current(name, op)) return;
if (this.clock.now() >= op.deadline) {
this.fail(name, op, 'Detail request deadline expired', 'expired');
return;
}
op.timer = this.clock.setTimeout(
() => this.fail(name, op, 'Detail request deadline expired', 'expired'),
op.deadline - this.clock.now()
);
this.armDeadline(name, op);
void this.transport.poll(name, op.requestId!, op.abort.signal)
.then((next) => this.accept(name, op, next))
.catch((error) => this.fail(name, op, String(error.message || error)));
Expand All @@ -179,11 +203,7 @@ export class NodeDetails {
return;
}
this.finish(name, op);
this.clearExpiry(name);
this.publish(name, { state: 'loaded', snapshot });
this.expiryTimers.set(name, this.clock.setTimeout(() => {
this.expire(name);
this.changed();
}, expiry - this.clock.now()));
this.scheduleExpiry(name);
}
}
51 changes: 51 additions & 0 deletions frontend/tests/nodeDetails.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ test('expiry actively releases data and read-time expiry cannot extend TTL', asy
f.advance(4999);
assert.equal(f.store.read('node').state, 'loaded');
f.advance(5000, runTimers);
if (runTimers) assert.equal(f.store['views'].get('node').snapshot, undefined, 'expiry releases data before a read');
assert.deepEqual(f.store.read('node'), { state: 'expired', error: undefined, deadline: undefined });
assert.equal(f.calls.length, 1);
}
Expand Down Expand Up @@ -141,3 +142,53 @@ test('dispose cancels pending work, clears timers/cache, and ignores late result
await tick();
assert.equal(f.store.read('node').snapshot, undefined);
});

test('loading twice joins a browser waiter; pending GET failures retain valid previous data', async () => {
const f = fixture();
f.store.load('node');
f.store.load('node');
assert.equal(f.calls.length, 1);
f.calls[0].resolve(f.complete());
await tick();
f.store.load('node', true);
f.calls[1].resolve({ state: 'pending', nodeName: 'node', requestId: 'new', deadline: time(4000) });
await tick();
f.store.load('node');
assert.equal(f.store.read('node').state, 'loading');
f.advance(2000);
f.calls[2].reject(new Error('GET failed'));
await tick();
assert.equal(f.store.read('node').state, 'error');
assert.equal(f.store.read('node').snapshot.requestId, 'a');
f.advance(5000);
assert.equal(f.store['views'].get('node').snapshot, undefined);
});

test('large TTLs rearm browser-safe timers without expiring early', async () => {
const f = fixture();
const expires = 2147483647 + 5000;
f.store.load('node');
f.calls[0].resolve(f.complete('long-lived', expires));
await tick();
f.advance(2147483647 + 1000);
assert.equal(f.store.read('node').state, 'loaded');
f.advance(expires);
assert.equal(f.store['views'].get('node').snapshot, undefined);
});

test('initial POST timeout and GET identity mismatch cannot revive snapshots', async () => {
const f = fixture();
f.store.load('node');
f.advance(121000);
assert.equal(f.calls[0].signal.aborted, true);
f.calls[0].resolve(f.complete('late', 150000));
await tick();
assert.equal(f.store.read('node').snapshot, undefined);
f.store.load('node');
f.calls[1].resolve({ state: 'pending', nodeName: 'node', requestId: 'expected', deadline: time(150000) });
await tick();
f.advance(122000);
f.calls[2].resolve(f.complete('wrong', 150000));
await tick();
assert.match(f.store.read('node').error, /Mismatched/);
});