* 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>
389 lines
11 KiB
TypeScript
389 lines
11 KiB
TypeScript
/**
|
|
* Internal OAuth sub-manager for InspectorClient.
|
|
* Holds OAuth config, state machine, and guided state; orchestrates normal and guided flows.
|
|
* Not part of the public API; InspectorClient delegates to this module.
|
|
*/
|
|
|
|
import { BaseOAuthClientProvider } from "../auth/providers.js";
|
|
import type { AuthGuidedState, OAuthStep } from "../auth/types.js";
|
|
import { EMPTY_GUIDED_STATE } from "../auth/types.js";
|
|
import { OAuthStateMachine } from "../auth/state-machine.js";
|
|
import type { OAuthTokens } from "@modelcontextprotocol/sdk/shared/auth.js";
|
|
import { auth } from "@modelcontextprotocol/sdk/client/auth.js";
|
|
import type { OAuthClientInformation } from "@modelcontextprotocol/sdk/shared/auth.js";
|
|
import { parseOAuthState } from "../auth/utils.js";
|
|
import type {
|
|
InspectorClientOptions,
|
|
InspectorClientEnvironment,
|
|
} from "./types.js";
|
|
|
|
export type OAuthManagerConfig = NonNullable<InspectorClientOptions["oauth"]> &
|
|
NonNullable<InspectorClientEnvironment["oauth"]>;
|
|
|
|
export interface OAuthManagerParams {
|
|
getServerUrl: () => string;
|
|
effectiveAuthFetch: typeof fetch;
|
|
getEventTarget: () => EventTarget;
|
|
onBeforeOAuthRedirect?: (sessionId: string) => Promise<void>;
|
|
initialConfig: OAuthManagerConfig;
|
|
dispatchOAuthStepChange: (detail: {
|
|
step: OAuthStep;
|
|
previousStep: OAuthStep;
|
|
state: Partial<AuthGuidedState>;
|
|
}) => void;
|
|
dispatchOAuthComplete: (detail: { tokens: OAuthTokens }) => void;
|
|
dispatchOAuthAuthorizationRequired: (detail: { url: URL }) => void;
|
|
dispatchOAuthError: (detail: { error: Error }) => void;
|
|
}
|
|
|
|
/**
|
|
* Internal manager for OAuth flow orchestration.
|
|
* InspectorClient creates this when oauth is configured and delegates all OAuth methods.
|
|
*/
|
|
export class OAuthManager {
|
|
private oauthConfig: OAuthManagerConfig;
|
|
private oauthStateMachine: OAuthStateMachine | null = null;
|
|
private oauthState: AuthGuidedState | null = null;
|
|
|
|
constructor(private params: OAuthManagerParams) {
|
|
this.oauthConfig = { ...params.initialConfig };
|
|
}
|
|
|
|
setOAuthConfig(config: {
|
|
clientId?: string;
|
|
clientSecret?: string;
|
|
clientMetadataUrl?: string;
|
|
scope?: string;
|
|
}): void {
|
|
this.oauthConfig = {
|
|
...this.oauthConfig,
|
|
...config,
|
|
} as OAuthManagerConfig;
|
|
}
|
|
|
|
private getServerUrl(): string {
|
|
return this.params.getServerUrl();
|
|
}
|
|
|
|
private async createOAuthProvider(
|
|
mode: "normal" | "guided",
|
|
): Promise<BaseOAuthClientProvider> {
|
|
if (
|
|
!this.oauthConfig.storage ||
|
|
!this.oauthConfig.redirectUrlProvider ||
|
|
!this.oauthConfig.navigation
|
|
) {
|
|
throw new Error(
|
|
"OAuth environment components (storage, navigation, redirectUrlProvider) are required.",
|
|
);
|
|
}
|
|
|
|
const serverUrl = this.getServerUrl();
|
|
const provider = new BaseOAuthClientProvider(
|
|
serverUrl,
|
|
{
|
|
storage: this.oauthConfig.storage,
|
|
redirectUrlProvider: this.oauthConfig.redirectUrlProvider,
|
|
navigation: this.oauthConfig.navigation,
|
|
clientMetadataUrl: this.oauthConfig.clientMetadataUrl,
|
|
},
|
|
mode,
|
|
);
|
|
|
|
provider.setEventTarget(this.params.getEventTarget());
|
|
|
|
if (this.oauthConfig.scope) {
|
|
await provider.saveScope(this.oauthConfig.scope);
|
|
}
|
|
|
|
if (this.oauthConfig.clientId) {
|
|
const clientInfo: OAuthClientInformation = {
|
|
client_id: this.oauthConfig.clientId,
|
|
...(this.oauthConfig.clientSecret && {
|
|
client_secret: this.oauthConfig.clientSecret,
|
|
}),
|
|
};
|
|
await provider.savePreregisteredClientInformation(clientInfo);
|
|
}
|
|
|
|
return provider;
|
|
}
|
|
|
|
async authenticate(): Promise<URL> {
|
|
const provider = await this.createOAuthProvider("normal");
|
|
const serverUrl = this.getServerUrl();
|
|
|
|
provider.clearCapturedAuthUrl();
|
|
|
|
const result = await auth(provider, {
|
|
serverUrl,
|
|
scope: provider.scope,
|
|
fetchFn: this.params.effectiveAuthFetch,
|
|
});
|
|
|
|
if (result === "AUTHORIZED") {
|
|
throw new Error(
|
|
"Unexpected: auth() returned AUTHORIZED without authorization code",
|
|
);
|
|
}
|
|
|
|
const capturedUrl = provider.getCapturedAuthUrl();
|
|
if (!capturedUrl) {
|
|
throw new Error("Failed to capture authorization URL");
|
|
}
|
|
|
|
const stateParam = capturedUrl.searchParams.get("state");
|
|
if (stateParam && this.params.onBeforeOAuthRedirect) {
|
|
const parsedState = parseOAuthState(stateParam);
|
|
if (parsedState?.authId) {
|
|
await this.params.onBeforeOAuthRedirect(parsedState.authId);
|
|
}
|
|
}
|
|
|
|
const clientInfo = await provider.clientInformation();
|
|
this.oauthState = {
|
|
...EMPTY_GUIDED_STATE,
|
|
authType: "normal",
|
|
oauthStep: "authorization_code",
|
|
authorizationUrl: capturedUrl,
|
|
oauthClientInfo: clientInfo ?? null,
|
|
};
|
|
return capturedUrl;
|
|
}
|
|
|
|
async beginGuidedAuth(): Promise<void> {
|
|
const provider = await this.createOAuthProvider("guided");
|
|
const serverUrl = this.getServerUrl();
|
|
|
|
this.oauthState = { ...EMPTY_GUIDED_STATE };
|
|
if (this.oauthConfig.clientId) {
|
|
this.oauthState.oauthClientInfo = {
|
|
client_id: this.oauthConfig.clientId,
|
|
...(this.oauthConfig.clientSecret && {
|
|
client_secret: this.oauthConfig.clientSecret,
|
|
}),
|
|
};
|
|
}
|
|
this.oauthStateMachine = new OAuthStateMachine(
|
|
serverUrl,
|
|
provider,
|
|
(updates) => {
|
|
const state = this.oauthState;
|
|
if (!state) throw new Error("OAuth state not initialized");
|
|
const previousStep = state.oauthStep;
|
|
this.oauthState = { ...state, ...updates };
|
|
if (updates.oauthStep === "complete") {
|
|
this.oauthState!.completedAt = Date.now();
|
|
}
|
|
const step = updates.oauthStep ?? previousStep;
|
|
this.params.dispatchOAuthStepChange({
|
|
step,
|
|
previousStep,
|
|
state: updates,
|
|
});
|
|
},
|
|
this.params.effectiveAuthFetch,
|
|
);
|
|
|
|
await this.oauthStateMachine.executeStep(this.oauthState);
|
|
}
|
|
|
|
async runGuidedAuth(): Promise<URL | undefined> {
|
|
if (!this.oauthStateMachine || !this.oauthState) {
|
|
await this.beginGuidedAuth();
|
|
}
|
|
|
|
const machine = this.oauthStateMachine;
|
|
if (!machine) {
|
|
throw new Error("Guided auth failed to initialize state");
|
|
}
|
|
|
|
while (true) {
|
|
const state = this.oauthState;
|
|
if (!state) {
|
|
throw new Error("Guided auth failed to initialize state");
|
|
}
|
|
if (
|
|
state.oauthStep === "authorization_code" ||
|
|
state.oauthStep === "complete"
|
|
) {
|
|
break;
|
|
}
|
|
await machine.executeStep(state);
|
|
}
|
|
|
|
const state = this.oauthState;
|
|
if (state?.oauthStep === "complete") {
|
|
return undefined;
|
|
}
|
|
if (!state?.authorizationUrl) {
|
|
throw new Error("Failed to generate authorization URL");
|
|
}
|
|
|
|
const stateParam = state.authorizationUrl.searchParams.get("state");
|
|
if (stateParam && this.params.onBeforeOAuthRedirect) {
|
|
const parsedState = parseOAuthState(stateParam);
|
|
if (parsedState?.authId) {
|
|
await this.params.onBeforeOAuthRedirect(parsedState.authId);
|
|
}
|
|
}
|
|
|
|
this.params.dispatchOAuthAuthorizationRequired({
|
|
url: state.authorizationUrl,
|
|
});
|
|
|
|
return state.authorizationUrl;
|
|
}
|
|
|
|
async setGuidedAuthorizationCode(
|
|
authorizationCode: string,
|
|
completeFlow: boolean = false,
|
|
): Promise<void> {
|
|
if (!this.oauthStateMachine || !this.oauthState) {
|
|
throw new Error(
|
|
"Not in guided OAuth flow. Call beginGuidedAuth() first.",
|
|
);
|
|
}
|
|
const currentStep = this.oauthState.oauthStep;
|
|
if (currentStep !== "authorization_code") {
|
|
throw new Error(
|
|
`Cannot set authorization code at step ${currentStep}. Expected step: authorization_code`,
|
|
);
|
|
}
|
|
|
|
this.oauthState.authorizationCode = authorizationCode;
|
|
|
|
if (completeFlow) {
|
|
await this.oauthStateMachine.executeStep(this.oauthState);
|
|
let step: OAuthStep = this.oauthState.oauthStep;
|
|
while (step !== "complete") {
|
|
await this.oauthStateMachine.executeStep(this.oauthState);
|
|
step = this.oauthState.oauthStep;
|
|
}
|
|
|
|
if (!this.oauthState.oauthTokens) {
|
|
throw new Error("Failed to exchange authorization code for tokens");
|
|
}
|
|
|
|
this.params.dispatchOAuthComplete({
|
|
tokens: this.oauthState.oauthTokens,
|
|
});
|
|
} else {
|
|
this.params.dispatchOAuthStepChange({
|
|
step: this.oauthState.oauthStep,
|
|
previousStep: this.oauthState.oauthStep,
|
|
state: { authorizationCode },
|
|
});
|
|
}
|
|
}
|
|
|
|
async completeOAuthFlow(authorizationCode: string): Promise<void> {
|
|
try {
|
|
if (this.oauthStateMachine && this.oauthState) {
|
|
await this.setGuidedAuthorizationCode(authorizationCode, true);
|
|
} else {
|
|
const provider = await this.createOAuthProvider("normal");
|
|
const serverUrl = this.getServerUrl();
|
|
|
|
const result = await auth(provider, {
|
|
serverUrl,
|
|
authorizationCode,
|
|
fetchFn: this.params.effectiveAuthFetch,
|
|
});
|
|
|
|
if (result !== "AUTHORIZED") {
|
|
throw new Error(
|
|
`Expected AUTHORIZED after providing authorization code, got: ${result}`,
|
|
);
|
|
}
|
|
|
|
const tokens = await provider.tokens();
|
|
if (!tokens) {
|
|
throw new Error("Failed to retrieve tokens after authorization");
|
|
}
|
|
|
|
const clientInfo = await provider.clientInformation();
|
|
const completedAt = Date.now();
|
|
this.oauthState = this.oauthState
|
|
? {
|
|
...this.oauthState,
|
|
oauthStep: "complete",
|
|
oauthTokens: tokens,
|
|
oauthClientInfo: clientInfo ?? null,
|
|
completedAt,
|
|
}
|
|
: {
|
|
...EMPTY_GUIDED_STATE,
|
|
authType: "normal",
|
|
oauthStep: "complete",
|
|
oauthTokens: tokens,
|
|
oauthClientInfo: clientInfo ?? null,
|
|
completedAt,
|
|
};
|
|
|
|
this.params.dispatchOAuthComplete({ tokens });
|
|
}
|
|
} catch (error) {
|
|
this.params.dispatchOAuthError({
|
|
error: error instanceof Error ? error : new Error(String(error)),
|
|
});
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
async getOAuthTokens(): Promise<OAuthTokens | undefined> {
|
|
if (this.oauthState?.oauthTokens) {
|
|
return this.oauthState.oauthTokens;
|
|
}
|
|
|
|
const provider = await this.createOAuthProvider("normal");
|
|
try {
|
|
return await provider.tokens();
|
|
} catch {
|
|
return undefined;
|
|
}
|
|
}
|
|
|
|
clearOAuthTokens(): void {
|
|
if (!this.oauthConfig?.storage) {
|
|
return;
|
|
}
|
|
|
|
const serverUrl = this.getServerUrl();
|
|
this.oauthConfig.storage.clear(serverUrl);
|
|
|
|
this.oauthState = null;
|
|
this.oauthStateMachine = null;
|
|
}
|
|
|
|
async isOAuthAuthorized(): Promise<boolean> {
|
|
const tokens = await this.getOAuthTokens();
|
|
return tokens !== undefined;
|
|
}
|
|
|
|
getOAuthState(): AuthGuidedState | undefined {
|
|
return this.oauthState ? { ...this.oauthState } : undefined;
|
|
}
|
|
|
|
getOAuthStep(): OAuthStep | undefined {
|
|
return this.oauthState?.oauthStep;
|
|
}
|
|
|
|
async proceedOAuthStep(): Promise<void> {
|
|
if (!this.oauthStateMachine || !this.oauthState) {
|
|
throw new Error(
|
|
"Not in guided OAuth flow. Call authenticateGuided() first.",
|
|
);
|
|
}
|
|
|
|
await this.oauthStateMachine.executeStep(this.oauthState);
|
|
}
|
|
|
|
/**
|
|
* Create an OAuth provider for transport auth (connect()).
|
|
* Used only when isHttpOAuthConfig() is true.
|
|
*/
|
|
async createOAuthProviderForTransport(): Promise<BaseOAuthClientProvider> {
|
|
return this.createOAuthProvider("normal");
|
|
}
|
|
}
|