* feat(web): reorderable ServerCards — drag-and-drop + keyboard (#1369) Let users control the order of servers on the Servers screen instead of hand-editing mcp.json. Each ServerCard gets a grip handle (in the header, left of the name) that drives an @dnd-kit sortable; pointer and keyboard sensors both work, with live-region announcements for screen readers. - Backend: PUT /api/servers/order rewrites mcp.json in the supplied order inside the write lock, reusing the atomic-write + watcher-notify path. Registered before /:id so "order" isn't captured as a server id. Rejects with 409 when the id set no longer matches disk and 400 on duplicate / malformed bodies, so a reorder racing an external edit can't drop or duplicate an entry. - Hook: useServers.reorderServers(orderedIds) — optimistic local reorder, PUT, refresh-to-disk-truth on failure. - UI: SortableServerCard wrapper owns the dnd-kit concerns; ServerListScreen wraps the grid in DndContext + SortableContext (rect strategy) with pointer + keyboard sensors and announcements. Reorder math and a11y copy extracted to reorderIds.ts / serverReorder.ts for direct unit testing. Renders plain cards (no grip) when no onReorder is wired. - Wired onServerReorder through InspectorView -> App.tsx. Tests: pure-helper units, hook (persist / optimistic / 409 revert), 9 backend integration tests (incl. id-set-mismatch rejection and the route-registration guard), ServerCard/ServerListScreen units, and a real-browser Storybook keyboard-reorder play (the dnd-kit keyboard sensor needs layout rects that happy-dom doesn't provide). Adds @dnd-kit/core, @dnd-kit/sortable, @dnd-kit/utilities. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(web): notify on reorder failure; skip reorder glue when not reorderable Address PR #1447 review: - App.tsx: catch reorderServers rejection (409 from a racing external edit, or a network error) and show a red toast, matching the error-handling pattern used by every other mutation — previously the rejection was discarded with `void` and the drag silently bounced back. - ServerListScreen: only build handleDragEnd / announcements when `reorderable`, so the four-closure announcements object isn't allocated every render when no onReorder is wired. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
313 lines
11 KiB
TypeScript
313 lines
11 KiB
TypeScript
/**
|
|
* React hook over the `/api/servers` endpoints. Fetches the list on mount,
|
|
* holds it in local state, and exposes addServer / updateServer / removeServer
|
|
* mutators that round-trip through the backend (re-fetching after each write
|
|
* to stay in sync with the on-disk truth).
|
|
*/
|
|
|
|
import { useCallback, useEffect, useState } from "react";
|
|
import { mcpConfigToServerEntries } from "../mcp/serverList.js";
|
|
import type {
|
|
InspectorServerSettings,
|
|
MCPConfig,
|
|
MCPServerConfig,
|
|
ServerEntry,
|
|
} from "../mcp/types.js";
|
|
|
|
export interface UseServersOptions {
|
|
/** Base URL of the remote server (typically `window.location.origin`). */
|
|
baseUrl: string;
|
|
/** Optional auth token for the `x-mcp-remote-auth` header. */
|
|
authToken?: string;
|
|
/** Fetch function to use (default: globalThis.fetch). Useful in tests. */
|
|
fetchFn?: typeof fetch;
|
|
}
|
|
|
|
export interface UseServersResult {
|
|
servers: ServerEntry[];
|
|
loading: boolean;
|
|
error: string | undefined;
|
|
refresh: () => Promise<void>;
|
|
addServer: (id: string, config: MCPServerConfig) => Promise<void>;
|
|
updateServer: (
|
|
originalId: string,
|
|
newId: string,
|
|
config: MCPServerConfig,
|
|
) => Promise<void>;
|
|
/**
|
|
* Patch only the `settings` node on an existing server entry, leaving the
|
|
* transport config and id untouched. Routes through `PUT /api/servers/:id`
|
|
* with the current `config` plus the new settings.
|
|
*/
|
|
updateServerSettings: (
|
|
id: string,
|
|
settings: InspectorServerSettings,
|
|
) => Promise<void>;
|
|
removeServer: (id: string) => Promise<void>;
|
|
/**
|
|
* Persist a new ordering for the server list. `orderedIds` must be the
|
|
* complete set of current server ids in the desired order. The local list
|
|
* is reordered optimistically so the grid reflows instantly; on backend
|
|
* failure (e.g. the on-disk set changed underneath us) we re-fetch to snap
|
|
* back to disk truth. Routes through `PUT /api/servers/order`.
|
|
*/
|
|
reorderServers: (orderedIds: string[]) => Promise<void>;
|
|
}
|
|
|
|
function buildHeaders(
|
|
authToken: string | undefined,
|
|
includeJsonBody: boolean,
|
|
): Record<string, string> {
|
|
const headers: Record<string, string> = {};
|
|
if (includeJsonBody) headers["Content-Type"] = "application/json";
|
|
if (authToken) headers["x-mcp-remote-auth"] = `Bearer ${authToken}`;
|
|
return headers;
|
|
}
|
|
|
|
async function readErrorMessage(res: Response): Promise<string> {
|
|
try {
|
|
const body = (await res.json()) as { error?: unknown };
|
|
if (typeof body?.error === "string") return body.error;
|
|
} catch {
|
|
/* ignore */
|
|
}
|
|
return `HTTP ${res.status}`;
|
|
}
|
|
|
|
export function useServers(opts: UseServersOptions): UseServersResult {
|
|
const { baseUrl, authToken, fetchFn } = opts;
|
|
const doFetch = fetchFn ?? globalThis.fetch;
|
|
// Normalize once — saves us from re-string-munging on every mutator call.
|
|
const base = baseUrl.replace(/\/$/, "");
|
|
|
|
const [servers, setServers] = useState<ServerEntry[]>([]);
|
|
const [loading, setLoading] = useState<boolean>(true);
|
|
const [error, setError] = useState<string | undefined>(undefined);
|
|
|
|
// Inner refresh that the public `refresh` and the SSE-triggered background
|
|
// refresh both share. `background` skips the loading-state toggle so
|
|
// consumers rendering a spinner or skeleton don't flash on every external
|
|
// mcp.json edit — the existing list stays on screen while the re-fetch
|
|
// resolves. `error` is still reset / set either way so a real error
|
|
// surfaces even from a background refresh.
|
|
const refreshInternal = useCallback(
|
|
async (background: boolean): Promise<void> => {
|
|
if (!background) setLoading(true);
|
|
setError(undefined);
|
|
try {
|
|
const res = await doFetch(`${base}/api/servers`, {
|
|
method: "GET",
|
|
headers: buildHeaders(authToken, false),
|
|
});
|
|
if (!res.ok) {
|
|
throw new Error(await readErrorMessage(res));
|
|
}
|
|
const body = (await res.json()) as MCPConfig;
|
|
setServers(mcpConfigToServerEntries(body));
|
|
} catch (err) {
|
|
setError(err instanceof Error ? err.message : String(err));
|
|
} finally {
|
|
if (!background) setLoading(false);
|
|
}
|
|
},
|
|
[base, authToken, doFetch],
|
|
);
|
|
|
|
const refresh = useCallback(
|
|
(): Promise<void> => refreshInternal(false),
|
|
[refreshInternal],
|
|
);
|
|
|
|
useEffect(() => {
|
|
void refresh();
|
|
}, [refresh]);
|
|
|
|
// Subscribe to `/api/servers/events` so external edits to mcp.json
|
|
// (the user editing the file by hand, or `mcp.json` written by another
|
|
// tool) propagate without a manual page refresh. We deliberately use
|
|
// fetch() + ReadableStream rather than EventSource because EventSource
|
|
// can't send the existing `x-mcp-remote-auth: Bearer …` header — the
|
|
// backend's auth contract is unchanged. The event payload itself is
|
|
// ignored: any signal triggers a re-fetch, since the GET handler is the
|
|
// sole source of truth for the list shape.
|
|
useEffect(() => {
|
|
const controller = new AbortController();
|
|
void (async () => {
|
|
try {
|
|
const res = await doFetch(`${base}/api/servers/events`, {
|
|
method: "GET",
|
|
headers: buildHeaders(authToken, false),
|
|
signal: controller.signal,
|
|
});
|
|
if (!res.ok || !res.body) return;
|
|
const reader = res.body.getReader();
|
|
const decoder = new TextDecoder();
|
|
let buffer = "";
|
|
// SSE frames are separated by a blank line (`\n\n`). We don't parse
|
|
// the event type or data — `refreshInternal()` re-fetches the
|
|
// canonical state regardless — so we just count frames and fire a
|
|
// single background refresh per decode chunk. Two `change`
|
|
// broadcasts landing in the same chunk become one re-fetch instead
|
|
// of two concurrent ones whose setState order is unspecified.
|
|
// Cross-chunk debounce is not added: `awaitWriteFinish`'s 100ms
|
|
// stability threshold already serializes external edits at the
|
|
// source, and chained fetches against the same GET endpoint are
|
|
// idempotent enough that a rare back-to-back pair just costs one
|
|
// extra round-trip.
|
|
while (true) {
|
|
const { done, value } = await reader.read();
|
|
if (done) break;
|
|
buffer += decoder.decode(value, { stream: true });
|
|
let sawFrame = false;
|
|
let frameEnd = buffer.indexOf("\n\n");
|
|
while (frameEnd !== -1) {
|
|
buffer = buffer.slice(frameEnd + 2);
|
|
sawFrame = true;
|
|
frameEnd = buffer.indexOf("\n\n");
|
|
}
|
|
if (sawFrame) void refreshInternal(true);
|
|
}
|
|
} catch {
|
|
// AbortError on unmount, or a transient network blip. No reconnect:
|
|
// a real failure leaves the hook in last-known-good state and the
|
|
// user can hit refresh manually. The dev-tool reload story is fine.
|
|
}
|
|
})();
|
|
return () => controller.abort();
|
|
}, [base, authToken, doFetch, refreshInternal]);
|
|
|
|
const addServer = useCallback(
|
|
async (id: string, config: MCPServerConfig): Promise<void> => {
|
|
const res = await doFetch(`${base}/api/servers`, {
|
|
method: "POST",
|
|
headers: buildHeaders(authToken, true),
|
|
body: JSON.stringify({ id, config }),
|
|
});
|
|
if (!res.ok) {
|
|
throw new Error(await readErrorMessage(res));
|
|
}
|
|
await refresh();
|
|
},
|
|
[base, authToken, doFetch, refresh],
|
|
);
|
|
|
|
const updateServer = useCallback(
|
|
async (
|
|
originalId: string,
|
|
newId: string,
|
|
config: MCPServerConfig,
|
|
): Promise<void> => {
|
|
// `settings` is intentionally omitted from the body. The backend route
|
|
// treats omission as "preserve the existing settings node on disk", so
|
|
// a config-only save (e.g. ServerConfigModal) cannot silently wipe
|
|
// persisted headers / metadata / OAuth credentials. To explicitly
|
|
// clear settings, send `settings: null`.
|
|
const res = await doFetch(
|
|
`${base}/api/servers/${encodeURIComponent(originalId)}`,
|
|
{
|
|
method: "PUT",
|
|
headers: buildHeaders(authToken, true),
|
|
body: JSON.stringify({ id: newId, config }),
|
|
},
|
|
);
|
|
if (!res.ok) {
|
|
throw new Error(await readErrorMessage(res));
|
|
}
|
|
await refresh();
|
|
},
|
|
[base, authToken, doFetch, refresh],
|
|
);
|
|
|
|
const updateServerSettings = useCallback(
|
|
async (id: string, settings: InspectorServerSettings): Promise<void> => {
|
|
// Settings-only PUT — we deliberately omit `config` so the route
|
|
// preserves the on-disk transport config inside its write lock.
|
|
// Reading `existing.config` from in-memory `servers` here would pin a
|
|
// stale snapshot at scheduling time and could silently revert a
|
|
// separate concurrent edit (e.g. a future file-watcher refreshing
|
|
// `servers` between debounce schedule and flush). The server is the
|
|
// single source of truth for config.
|
|
const res = await doFetch(
|
|
`${base}/api/servers/${encodeURIComponent(id)}`,
|
|
{
|
|
method: "PUT",
|
|
headers: buildHeaders(authToken, true),
|
|
body: JSON.stringify({ id, settings }),
|
|
},
|
|
);
|
|
if (!res.ok) {
|
|
throw new Error(await readErrorMessage(res));
|
|
}
|
|
await refresh();
|
|
},
|
|
[base, authToken, doFetch, refresh],
|
|
);
|
|
|
|
const removeServer = useCallback(
|
|
async (id: string): Promise<void> => {
|
|
const res = await doFetch(
|
|
`${base}/api/servers/${encodeURIComponent(id)}`,
|
|
{
|
|
method: "DELETE",
|
|
headers: buildHeaders(authToken, false),
|
|
},
|
|
);
|
|
if (!res.ok) {
|
|
throw new Error(await readErrorMessage(res));
|
|
}
|
|
await refresh();
|
|
},
|
|
[base, authToken, doFetch, refresh],
|
|
);
|
|
|
|
const reorderServers = useCallback(
|
|
async (orderedIds: string[]): Promise<void> => {
|
|
// Optimistic reorder: rebuild the local list in the requested order so
|
|
// the grid reflows immediately, before the round-trip resolves. Built
|
|
// from a lookup off the previous state (inside the setter) so we never
|
|
// capture a stale snapshot, and any id not currently present is simply
|
|
// skipped rather than producing an `undefined` hole.
|
|
setServers((prev) => {
|
|
const byId = new Map(prev.map((s) => [s.id, s]));
|
|
const reordered = orderedIds
|
|
.map((id) => byId.get(id))
|
|
.filter((s): s is ServerEntry => s !== undefined);
|
|
// Defensive: if the requested order dropped any entries (shouldn't
|
|
// happen — callers pass the full set), keep the strays at the end so
|
|
// nothing vanishes from the UI before the refresh reconciles.
|
|
if (reordered.length !== prev.length) {
|
|
const seen = new Set(orderedIds);
|
|
for (const s of prev) if (!seen.has(s.id)) reordered.push(s);
|
|
}
|
|
return reordered;
|
|
});
|
|
try {
|
|
const res = await doFetch(`${base}/api/servers/order`, {
|
|
method: "PUT",
|
|
headers: buildHeaders(authToken, true),
|
|
body: JSON.stringify({ order: orderedIds }),
|
|
});
|
|
if (!res.ok) {
|
|
throw new Error(await readErrorMessage(res));
|
|
}
|
|
} catch (err) {
|
|
// Revert to disk truth — the optimistic order may not have landed.
|
|
await refresh();
|
|
throw err instanceof Error ? err : new Error(String(err));
|
|
}
|
|
},
|
|
[base, authToken, doFetch, refresh],
|
|
);
|
|
|
|
return {
|
|
servers,
|
|
loading,
|
|
error,
|
|
refresh,
|
|
addServer,
|
|
updateServer,
|
|
updateServerSettings,
|
|
removeServer,
|
|
reorderServers,
|
|
};
|
|
}
|