* wip(core): bulk-copy v1.5 InspectorClient runtime files (#1302) Verbatim ports from origin/v1.5/main into v2/main core/: - logging/ (2 files) - storage/ + storage/adapters/ (4 files) - auth/ + auth/browser/ + auth/node/ + auth/remote/ (16 files) - mcp/config.ts + mcp/node/ (4 files, stdio transport) - mcp/remote/ + mcp/remote/node/ (12 files, HTTP/SSE transport) - mcp/inspectorClient.ts (~2169 LOC), messageTrackingTransport, fetchTracking, oauthManager, index, state/index Total: ~7,800 LOC of source files, copied unmodified via `git show origin/v1.5/main:<path> > <dest>`. Also: - Add deps: pino, hono, @hono/node-server, atomically, zustand, @types/node - tsconfig.app.json: extend paths to resolve new node-only deps from core/, add "node" to types, disable erasableSyntaxOnly (v1.5 code uses parameter properties — TODO to re-enable in follow-up) Compiles down to 47 type errors, all in three categories: - 24 TS2305: v2 dropped v1.5 type exports (InspectorClientOptions, CreateTransport, InspectorClientEnvironment, AppRendererClient, SamplingCreateMessage class, ElicitationCreateMessage class, jsonUtils helpers, OAuth events). Per user direction, will re-add these to v2's diverged files (types.ts, samplingCreateMessage.ts, etc.) so the ported code stays verbatim. - 15 TS7006: implicit-any params in v1.5 code (v1.5 tsconfig was looser than v2's noImplicitAny). Need explicit annotations. - 8 other TS errors: ../package.json import, Transport|null narrowing, hono Context generic mismatch, one unused parameter. Tests not yet ported (19 files, ~11,170 LOC). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * wip(core): integrate ported v1.5 InspectorClient + port tests (#1302) Source integration (typecheck + build now pass): - Re-add v1.5 types/classes dropped during v2 evolution: - types.ts: CreateTransport*, AppRendererClient, InspectorClient{Environment,Options} - samplingCreateMessage.ts / elicitationCreateMessage.ts: classes + keep v2's InspectorPending{Sampling,Elicitation} interface - inspectorClientEventTarget.ts: oauth* event keys - json/jsonUtils.ts: convertParameterValue / convertToolParameters / convertPromptArguments + ParameterSchema - inspectorClient.ts: replace `../package.json` import (v2 has no core/package.json) with a hardcoded identity constant - remote/node/server.ts: cast hono Context for streamSSE (hono's generic typing tightened since v1.5) - oauth-callback-server.ts: drop unused hostname field - tsconfig: enable @types/node, add paths for new bare-module deps (pino, zustand, hono, atomically) in app + test configs - vite.config.ts: mirror those module aliases for the unit project (which runs from repoRoot) Tests ported (19 files, ~11K LOC) under clients/web/src/test/core/: - All core/__tests__/auth/* (7 files) - inspectorClient.test.ts + 4 OAuth variants - mcp/oauthManager.test.ts, jsonUtils.test.ts - transport, remote-transport, remote-server-config, storage-adapters - helpers/oauth-client-fixtures.ts Bulk-rewrote `from "../mcp/…"` → `from "@inspector/core/mcp/…"` etc. Current state: - typecheck: 0 errors - build: passes (vite v8, 788 modules) - unit tests: 1014 / 1034 pass (937 pre-existing + 77 new core tests) - 20 failures in 13 files; failure modes: - 13 file-load failures needing the v1.5 `test-servers/` package (@modelcontextprotocol/inspector-test-server) which isn't in v2 yet or real fs/network not available in happy-dom - 7 assertion failures in discovery.test.ts + state-machine.test.ts (SDK 1.29 vs 1.25 API drift — mocks don't match new shape) Coverage gate not yet checked against new files. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * wip(core): port test-servers, more types, partial test integration (#1302) - Port v1.5 test-servers/ package (12 files, ~5K LOC) under repo-root/test-servers/, wire @modelcontextprotocol/inspector-test-server alias in both vite.config.ts (regex form) and tsconfig.test.json. - Add deps: express ^5, yaml ^2, @types/express ^5. - Re-export InspectorClientOptions/Environment/Transport* from inspectorClient.ts so v1.5 tests that import them from that module path keep resolving. - Switch InspectorClientEventMap to use SamplingCreateMessage / ElicitationCreateMessage classes (matches v1.5 event payload contracts) while keeping the InspectorPending{Sampling,Elicitation} interfaces in the *.ts modules for v2 consumers that still use them. - Fix verbatim-module-syntax issue in test-servers and drop unused stdio config field. - Adjust inspectorClient.test.ts task types to TaskWithOptionalCreatedAt (SDK 1.29 tightened Task shape vs v1.5's 1.25). - Drop spurious maxMessages/maxFetchRequests/maxStderrLogEvents from remote-transport.test.ts (never on InspectorClientOptions). State: - typecheck: 0 errors - build: passes - unit tests: 1099 / 1270 pass - 171 failures in 10 test files, almost all integration tests that need real HTTP/fs/network (happy-dom can't host them). Next: add a node-env vitest project to run these properly. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(core): port v1.5 InspectorClient + transports + auth subsystem (#1302) Bulk-port of the v1.5 core runtime (~7,800 LOC source + ~16K LOC tests + ~5K LOC test-servers/) into v2. Files copied verbatim from origin/v1.5/main via `git show >`; only minimal adapters added on the v2 side. Subsystems landed ----------------- - core/logging/, core/storage/, core/auth/ (browser + node + remote) - core/mcp/ runtime: inspectorClient.ts (2169 LOC), oauthManager, messageTrackingTransport, fetchTracking, config, index - core/mcp/node/ (stdio transport) - core/mcp/remote/ + remote/node/ (HTTP/SSE transport + Hono server) - test-servers/ package (composable MCP test servers, fixtures, harness) v2 adapter layer ---------------- - types.ts: append CreateTransport*, AppRendererClient, InspectorClient{Environment,Options} (v2 had pruned these — v1.5 needs them) - samplingCreateMessage / elicitationCreateMessage: keep v1.5 classes AND v2's Inspector Pending* interfaces in the same files - inspectorClientEventTarget: add oauth* event keys; switch pending sampling/elicitation payloads to the classes (matches v1.5 contracts) - json/jsonUtils: append convertParameterValue/convertToolParameters/ convertPromptArguments + ParameterSchema - inspectorClient.ts: re-export Options/Environment/Transport* so tests that import these from `inspectorClient.js` keep resolving; replace `../package.json` import with a hardcoded identity (v2 has no core/package.json) - remote/node/server.ts: cast hono Context for streamSSE (hono generic tightened since v1.5) - oauth-callback-server: drop unused hostname field - tsconfig.app.json / tsconfig.test.json: add @types/node + paths for pino/zustand/hono/@hono/node-server/atomically/express/yaml, disable erasableSyntaxOnly (parameter-property syntax from v1.5) - vite.config.ts: regex-form module aliases (so the package's exports field handles subpaths like `hono/streaming`, `zustand/middleware`), alias for @modelcontextprotocol/inspector-test-server → test-servers/src Tests ----- - 19 v1.5 test files copied under clients/web/src/test/core/, imports rewired to @inspector/core/* and @modelcontextprotocol/inspector-test-server - 1004 unit tests pass; 298 storybook tests pass; coverage gate passes Known follow-ups (out-of-scope here, tracked in TODOs) ------------------------------------------------------ - 13 integration test files are excluded from the unit project (spawn real HTTP/stdio servers; run real OAuth flows; mock SDK auth → happy-dom CORS). Needs a node-env vitest project. Files listed under `test.projects[0].test.exclude`. - Source files exercised only by those integration tests are excluded from the coverage gate pending the node-env project. Listed under `test.coverage.exclude` with comment. - Manual smoke tests against real stdio / HTTP / OAuth server per the AC on #1302 still need verification locally. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs/fix: address #1306 review (AGENTS tree, #1307 links, @types/node, .substr) - AGENTS.md: expand the project-structure tree to include all v1.5-ported subsystems (core/auth/{browser,node,remote}, core/storage, core/logging, core/mcp/{node,remote/{,node}}, core/mcp/state) plus the new top-level test-servers/ directory (with a note about its @modelcontextprotocol/ inspector-test-server alias). - vite.config.ts: reference #1307 from both the test exclude block and the coverage exclude block so the next person editing either sees the marching order for shrinking the lists. - package.json: restore @types/node to ^24 (an earlier `npm install --save-dev @types/node@^22` accidentally pinned it lower than the repo was using; nothing here required ^22). - core/mcp/fetchTracking.ts: replace deprecated .substr(2, 9) with .slice(2, 11) to match the convention in core/mcp/inspectorClient.ts. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
255 lines
7.1 KiB
TypeScript
255 lines
7.1 KiB
TypeScript
import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
|
|
import type {
|
|
OAuthClientInformation,
|
|
OAuthClientMetadata,
|
|
OAuthTokens,
|
|
OAuthMetadata,
|
|
} from "@modelcontextprotocol/sdk/shared/auth.js";
|
|
import type { OAuthStorage } from "./storage.js";
|
|
import { generateOAuthStateWithMode } from "./utils.js";
|
|
|
|
/**
|
|
* Redirect URL provider. Returns the redirect URL for the requested mode.
|
|
* Caller populates the URLs before authenticate() (e.g. from callback server).
|
|
*/
|
|
export interface RedirectUrlProvider {
|
|
getRedirectUrl(mode?: "normal" | "guided"): string;
|
|
}
|
|
|
|
/**
|
|
* Mutable redirect URL provider for TUI/CLI. Caller sets redirectUrl
|
|
* before authenticate(); same URL is used for both normal and guided flows.
|
|
*/
|
|
export class MutableRedirectUrlProvider implements RedirectUrlProvider {
|
|
redirectUrl = "";
|
|
|
|
getRedirectUrl(): string {
|
|
return this.redirectUrl;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Navigation handler interface
|
|
* Handles navigation to authorization URLs
|
|
*/
|
|
export interface OAuthNavigation {
|
|
/**
|
|
* Navigate to the authorization URL
|
|
* @param authorizationUrl - The OAuth authorization URL
|
|
*/
|
|
navigateToAuthorization(authorizationUrl: URL): void;
|
|
}
|
|
|
|
export type OAuthNavigationCallback = (
|
|
authorizationUrl: URL,
|
|
) => void | Promise<void>;
|
|
|
|
/**
|
|
* Callback navigation handler
|
|
* Invokes the provided callback when navigation is requested.
|
|
* The caller always handles navigation.
|
|
*/
|
|
export class CallbackNavigation implements OAuthNavigation {
|
|
private authorizationUrl: URL | null = null;
|
|
|
|
constructor(private callback: OAuthNavigationCallback) {}
|
|
|
|
navigateToAuthorization(authorizationUrl: URL): void {
|
|
this.authorizationUrl = authorizationUrl;
|
|
const result = this.callback(authorizationUrl);
|
|
if (result instanceof Promise) {
|
|
void result;
|
|
}
|
|
}
|
|
|
|
getAuthorizationUrl(): URL | null {
|
|
return this.authorizationUrl;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Console navigation handler
|
|
* Prints the authorization URL to console, optionally invokes an extra callback.
|
|
*/
|
|
export class ConsoleNavigation extends CallbackNavigation {
|
|
constructor(callback?: OAuthNavigationCallback) {
|
|
super((url) => {
|
|
console.log(`Please navigate to: ${url.href}`);
|
|
return callback?.(url);
|
|
});
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Config passed to BaseOAuthClientProvider. Provider assigns to members and
|
|
* accesses as needed.
|
|
*/
|
|
export type OAuthProviderConfig = {
|
|
storage: OAuthStorage;
|
|
redirectUrlProvider: RedirectUrlProvider;
|
|
navigation: OAuthNavigation;
|
|
clientMetadataUrl?: string;
|
|
};
|
|
|
|
/**
|
|
* Base OAuth client provider
|
|
* Implements common OAuth provider functionality.
|
|
* Use with injected storage, redirect URL provider, and navigation.
|
|
*/
|
|
export class BaseOAuthClientProvider implements OAuthClientProvider {
|
|
private capturedAuthUrl: URL | null = null;
|
|
private eventTarget: EventTarget | null = null;
|
|
|
|
protected storage: OAuthStorage;
|
|
protected redirectUrlProvider: RedirectUrlProvider;
|
|
protected navigation: OAuthNavigation;
|
|
public clientMetadataUrl?: string;
|
|
protected mode: "normal" | "guided";
|
|
|
|
constructor(
|
|
protected serverUrl: string,
|
|
oauthConfig: OAuthProviderConfig,
|
|
mode: "normal" | "guided" = "normal",
|
|
) {
|
|
this.storage = oauthConfig.storage;
|
|
this.redirectUrlProvider = oauthConfig.redirectUrlProvider;
|
|
this.navigation = oauthConfig.navigation;
|
|
this.clientMetadataUrl = oauthConfig.clientMetadataUrl;
|
|
this.mode = mode;
|
|
}
|
|
|
|
/**
|
|
* Set the event target for dispatching oauthAuthorizationRequired events
|
|
*/
|
|
setEventTarget(eventTarget: EventTarget): void {
|
|
this.eventTarget = eventTarget;
|
|
}
|
|
|
|
/**
|
|
* Get the captured authorization URL (for return value)
|
|
*/
|
|
getCapturedAuthUrl(): URL | null {
|
|
return this.capturedAuthUrl;
|
|
}
|
|
|
|
/**
|
|
* Clear the captured authorization URL
|
|
*/
|
|
clearCapturedAuthUrl(): void {
|
|
this.capturedAuthUrl = null;
|
|
}
|
|
|
|
get scope(): string | undefined {
|
|
return this.storage.getScope(this.serverUrl);
|
|
}
|
|
|
|
/** Redirect URL for the current flow (normal or guided). */
|
|
get redirectUrl(): string {
|
|
return this.redirectUrlProvider.getRedirectUrl(this.mode);
|
|
}
|
|
|
|
get redirect_uris(): string[] {
|
|
return [this.redirectUrlProvider.getRedirectUrl("normal")];
|
|
}
|
|
|
|
get clientMetadata(): OAuthClientMetadata {
|
|
const metadata: OAuthClientMetadata = {
|
|
redirect_uris: this.redirect_uris,
|
|
token_endpoint_auth_method: "none",
|
|
grant_types: ["authorization_code", "refresh_token"],
|
|
response_types: ["code"],
|
|
client_name: "MCP Inspector",
|
|
client_uri: "https://github.com/modelcontextprotocol/inspector",
|
|
scope: this.scope ?? "",
|
|
};
|
|
|
|
// Note: clientMetadataUrl for CIMD mode is passed to registerClient() directly,
|
|
// not as part of clientMetadata. The SDK handles CIMD separately.
|
|
|
|
return metadata;
|
|
}
|
|
|
|
state(): string | Promise<string> {
|
|
return generateOAuthStateWithMode(this.mode);
|
|
}
|
|
|
|
async clientInformation(): Promise<OAuthClientInformation | undefined> {
|
|
// Try preregistered first, then dynamically registered
|
|
const preregistered = await this.storage.getClientInformation(
|
|
this.serverUrl,
|
|
true,
|
|
);
|
|
if (preregistered) {
|
|
return preregistered;
|
|
}
|
|
return await this.storage.getClientInformation(this.serverUrl, false);
|
|
}
|
|
|
|
async saveClientInformation(
|
|
clientInformation: OAuthClientInformation,
|
|
): Promise<void> {
|
|
await this.storage.saveClientInformation(this.serverUrl, clientInformation);
|
|
}
|
|
|
|
async saveScope(scope: string | undefined): Promise<void> {
|
|
await this.storage.saveScope(this.serverUrl, scope);
|
|
}
|
|
|
|
async savePreregisteredClientInformation(
|
|
clientInformation: OAuthClientInformation,
|
|
): Promise<void> {
|
|
await this.storage.savePreregisteredClientInformation(
|
|
this.serverUrl,
|
|
clientInformation,
|
|
);
|
|
}
|
|
|
|
async tokens(): Promise<OAuthTokens | undefined> {
|
|
return await this.storage.getTokens(this.serverUrl);
|
|
}
|
|
|
|
async saveTokens(tokens: OAuthTokens): Promise<void> {
|
|
await this.storage.saveTokens(this.serverUrl, tokens);
|
|
}
|
|
|
|
redirectToAuthorization(authorizationUrl: URL): void {
|
|
// Capture URL for return value
|
|
this.capturedAuthUrl = authorizationUrl;
|
|
|
|
// Dispatch event if event target is set
|
|
if (this.eventTarget) {
|
|
this.eventTarget.dispatchEvent(
|
|
new CustomEvent("oauthAuthorizationRequired", {
|
|
detail: { url: authorizationUrl },
|
|
}),
|
|
);
|
|
}
|
|
|
|
// Original navigation behavior
|
|
this.navigation.navigateToAuthorization(authorizationUrl);
|
|
}
|
|
|
|
async saveCodeVerifier(codeVerifier: string): Promise<void> {
|
|
await this.storage.saveCodeVerifier(this.serverUrl, codeVerifier);
|
|
}
|
|
|
|
codeVerifier(): string {
|
|
const verifier = this.storage.getCodeVerifier(this.serverUrl);
|
|
if (!verifier) {
|
|
throw new Error("No code verifier saved for session");
|
|
}
|
|
return verifier;
|
|
}
|
|
|
|
clear(): void {
|
|
this.storage.clear(this.serverUrl);
|
|
}
|
|
|
|
getServerMetadata(): OAuthMetadata | null {
|
|
return this.storage.getServerMetadata(this.serverUrl);
|
|
}
|
|
|
|
async saveServerMetadata(metadata: OAuthMetadata): Promise<void> {
|
|
await this.storage.saveServerMetadata(this.serverUrl, metadata);
|
|
}
|
|
}
|