* fix(core): make "error" the canonical terminal status on a mid-session crash (#1490) On a real mid-session transport crash many SDK transports fire BOTH `onclose` and `onerror` in a transport-dependent order. The `onclose` guard (`if status !== "disconnected"`) let a trailing `onclose` downgrade a crash's `"error"` status back to `"disconnected"`, so the persistent terminal status differed by ordering: - onerror-then-onclose → "disconnected" - onclose-then-onerror → "error" `onclose` now treats `"error"` as terminal (only `"connected"`/ `"connecting"` → `"disconnected"`), so `"error"` is the canonical resting status in both orderings. It still emits the `disconnect` event exactly once so session-teardown consumers fire identically either way. Because the state managers gated list/message/subscription/task teardown on `getStatus() === "disconnected"`, holding the status at `"error"` would have left them stale in the onerror-first ordering — swapping one ordering-dependence for another. Introduce `isTerminalStatus()` (disconnected || error) and key every teardown guard off it so they clear identically regardless of crash ordering. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(core): single disconnect event when explicitly disconnecting from "error" (#1490 re-review) Addresses the non-blocking observation from the PR review: explicitly calling disconnect() from a held-"error" status could fire the `disconnect` event twice. close() can trigger the transport's onclose synchronously; onclose (holding status at "error") fired `disconnect`, then disconnect()'s own guard saw status still != "disconnected" and fired it again — a timing-dependence on whether the SDK closes sync. Add a `disconnecting` ownership flag: onclose defers its status set + `disconnect` event to disconnect() while it is set, so the explicit-disconnect path emits exactly one `disconnect` regardless of sync/async close. Crash-path onclose (flag unset) is unchanged. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(core): deterministically pin the sync-close disconnect double-fire (#1490 re-review) The real-stdio test asserts the single-disconnect invariant but may not exercise the sync-close branch (the one that double-fired) if the SDK stdio transport closes asynchronously. Add a test that overrides the SDK client's close() to invoke the transport's onclose synchronously, forcing the exact timing the `disconnecting` flag guards. Verified it asserts 2 (fails) without the flag and 1 (passes) with it. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
81 lines
2.5 KiB
TypeScript
81 lines
2.5 KiB
TypeScript
/**
|
|
* PagedResourcesState: holds an aggregated list of resources loaded via loadPage(cursor).
|
|
* Does not load on connect; caller drives loading. Clears on disconnect.
|
|
*
|
|
* Intentionally does NOT subscribe to `resourcesListChanged`: cursors are
|
|
* tied to the server's prior list, so a list change mid-pagination would
|
|
* invalidate them. The caller decides how to react.
|
|
*
|
|
* Ported from v1.5/main. v2 substitutes `InspectorClientProtocol` for the
|
|
* concrete `InspectorClient` since the runtime class is not yet ported.
|
|
*/
|
|
|
|
import type { InspectorClientProtocol } from "../inspectorClientProtocol.js";
|
|
import type { Resource } from "@modelcontextprotocol/sdk/types.js";
|
|
import { isTerminalStatus } from "../types.js";
|
|
import { TypedEventTarget } from "../typedEventTarget.js";
|
|
|
|
export interface PagedResourcesStateEventMap {
|
|
resourcesChange: Resource[];
|
|
}
|
|
|
|
export interface LoadPageResult {
|
|
resources: Resource[];
|
|
nextCursor?: string;
|
|
}
|
|
|
|
export class PagedResourcesState extends TypedEventTarget<PagedResourcesStateEventMap> {
|
|
private resources: Resource[] = [];
|
|
private client: InspectorClientProtocol | null = null;
|
|
private unsubscribe: (() => void) | null = null;
|
|
|
|
constructor(client: InspectorClientProtocol) {
|
|
super();
|
|
this.client = client;
|
|
const onStatusChange = (): void => {
|
|
if (isTerminalStatus(this.client?.getStatus())) {
|
|
this.resources = [];
|
|
this.dispatchTypedEvent("resourcesChange", []);
|
|
}
|
|
};
|
|
this.client.addEventListener("statusChange", onStatusChange);
|
|
this.unsubscribe = () => {
|
|
if (this.client) {
|
|
this.client.removeEventListener("statusChange", onStatusChange);
|
|
}
|
|
this.client = null;
|
|
};
|
|
}
|
|
|
|
getResources(): Resource[] {
|
|
return [...this.resources];
|
|
}
|
|
|
|
clear(): void {
|
|
this.resources = [];
|
|
this.dispatchTypedEvent("resourcesChange", this.resources);
|
|
}
|
|
|
|
async loadPage(
|
|
cursor?: string,
|
|
metadata?: Record<string, string>,
|
|
): Promise<LoadPageResult> {
|
|
const c = this.client;
|
|
if (!c || c.getStatus() !== "connected") {
|
|
return { resources: [], nextCursor: undefined };
|
|
}
|
|
const result = await c.listResources(cursor, metadata);
|
|
this.resources =
|
|
cursor === undefined
|
|
? [...result.resources]
|
|
: [...this.resources, ...result.resources];
|
|
this.dispatchTypedEvent("resourcesChange", this.resources);
|
|
return { resources: result.resources, nextCursor: result.nextCursor };
|
|
}
|
|
|
|
destroy(): void {
|
|
this.unsubscribe?.();
|
|
this.unsubscribe = null;
|
|
this.resources = [];
|
|
}
|
|
}
|